fix(connection): move query timeout into per-connection settings

This commit is contained in:
t8y2 committed 2026-05-28 18:18:45 +08:00
1 parent 9f72c38253
commit 486d9bb3a6
20 files changed
+97 -60

No files matched your search

+26 -1
View File
@@ -43,6 +43,8 @@ pub struct ConnectionConfig {
pub ssh_connect_timeout_secs: u64,
#[serde(default = "default_connect_timeout_secs")]
pub connect_timeout_secs: u64,
#[serde(default = "default_query_timeout_secs")]
pub query_timeout_secs: u64,
#[serde(default)]
pub proxy_enabled: bool,
#[serde(default)]
@@ -108,6 +110,10 @@ pub fn default_connect_timeout_secs() -> u64 {
5
}
pub fn default_query_timeout_secs() -> u64 {
30
}
fn default_proxy_port() -> u16 {
1080
}
@@ -208,6 +214,14 @@ impl ConnectionConfig {
}
}
pub fn effective_query_timeout_secs(&self) -> u64 {
if self.query_timeout_secs == 0 {
0
} else {
self.query_timeout_secs.clamp(1, 300)
}
}
pub fn effective_database(&self) -> Option<&str> {
self.database
.as_deref()
@@ -813,7 +827,7 @@ fn bracket_ipv6(host: &str) -> String {
#[cfg(test)]
mod tests {
use super::{default_ssh_connect_timeout_secs, ConnectionConfig, DatabaseType, ProxyType};
use super::{default_query_timeout_secs, default_ssh_connect_timeout_secs, ConnectionConfig, DatabaseType, ProxyType};
use std::str::FromStr;
fn mysql_config(username: &str, password: &str, database: Option<&str>) -> ConnectionConfig {
@@ -841,6 +855,7 @@ mod tests {
ssh_key_passphrase: String::new(),
ssh_expose_lan: false,
ssh_connect_timeout_secs: default_ssh_connect_timeout_secs(),
query_timeout_secs: default_query_timeout_secs(),
proxy_enabled: false,
proxy_type: ProxyType::Socks5,
proxy_host: String::new(),
@@ -889,6 +904,8 @@ mod tests {
assert_eq!(config.ssh_connect_timeout_secs, default_ssh_connect_timeout_secs());
assert_eq!(config.effective_ssh_connect_timeout_secs(), default_ssh_connect_timeout_secs());
assert_eq!(config.query_timeout_secs, default_query_timeout_secs());
assert_eq!(config.effective_query_timeout_secs(), default_query_timeout_secs());
}
#[test]
@@ -964,6 +981,14 @@ mod tests {
assert_eq!(config.effective_ssh_connect_timeout_secs(), default_ssh_connect_timeout_secs());
}
#[test]
fn query_timeout_zero_disables_timeout() {
let mut config = mysql_config("root", "", None);
config.query_timeout_secs = 0;
assert_eq!(config.effective_query_timeout_secs(), 0);
}
#[test]
fn mysql_url_encodes_oceanbase_username() {
let config = mysql_config("user@tenant#cluster", "secret", None);