xiaoxue_admin
/
dbx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(postgres): skip eager pool validation query

This commit is contained in:
t8y2 2026-07-18 19:42:45 +08:00
parent 834aaf3546
commit c52621bf06
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
crates/dbx-core/src/connection.rs
View File

@ -1044,6 +1044,7 @@ impl AppState {
configs.get(connection_id).ok_or("Connection config not found")?.clone()
};
let db_type = Some(config.db_type);
let validate_existing_pool = should_validate_existing_pool_before_reuse(config.db_type);
let base_pool_key = base_pool_key_for(db_type, connection_id, database, false);
let pool_key = session_scoped_pool_key_for(Some(&config), base_pool_key, client_session_id);
@ -1053,7 +1054,7 @@ impl AppState {
drop(conns);
if self.remove_pool_if_duckdb_isolation_mismatch(&pool_key).await {
// Recreate below using the current DuckDB isolation mode.
} else if !self.remove_stale_connection_pool(&pool_key).await {
} else if !validate_existing_pool || !self.remove_stale_connection_pool(&pool_key).await {
self.touch_pool_activity(&pool_key).await;
return Ok(pool_key);
}
@ -3237,6 +3238,13 @@ fn uses_agent_connection_pool(db_type: &DatabaseType) -> bool {
matches!(*db_type, agent_connection_pool_database_type!())
}
fn should_validate_existing_pool_before_reuse(db_type: DatabaseType) -> bool {
// PostgreSQL uses deadpool's Fast recycling and the query executor's
// ReconnectAndRetry path. An eager SELECT 1 here would add a network
// round-trip before every query without improving recovery behavior.
!matches!(db_type, DatabaseType::Postgres)
}
#[cfg(test)]
fn uses_bare_mysql_pool(db_type: &DatabaseType) -> bool {
matches!(db_type, DatabaseType::Doris | DatabaseType::StarRocks | DatabaseType::ManticoreSearch)
@ -3602,6 +3610,12 @@ mod tests {
assert!(super::uses_agent_connection_pool(&DatabaseType::ZooKeeper));
}
#[test]
fn postgres_pool_reuse_skips_eager_validation_query() {
assert!(!super::should_validate_existing_pool_before_reuse(DatabaseType::Postgres));
assert!(super::should_validate_existing_pool_before_reuse(DatabaseType::Mysql));
}
#[test]
fn validates_h2_database_base_path_when_mv_db_file_exists() {
let dir = std::env::temp_dir().join(format!("dbx-h2-test-{}", uuid::Uuid::new_v4()));