From ff2a12a49d9e424a62f1db7ecd39ab86f046440f Mon Sep 17 00:00:00 2001 From: dennis zhuang Date: Tue, 18 Nov 2025 10:38:16 +0800 Subject: [PATCH] build: update opensrv-mysql to 0.10 (#7246) * build: update opensrv-mysql to 0.10 Signed-off-by: Dennis Zhuang * fix: format tomal Signed-off-by: Dennis Zhuang * fix: format tomal Signed-off-by: Dennis Zhuang --------- Signed-off-by: Dennis Zhuang --- Cargo.lock | 2 +- src/servers/Cargo.toml | 11 ++++------- src/servers/src/mysql/handler.rs | 4 ++-- src/servers/src/mysql/writer.rs | 2 +- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 94378d6329..7dd24ad890 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8527,7 +8527,7 @@ dependencies = [ [[package]] name = "opensrv-mysql" version = "0.8.0" -source = "git+https://github.com/datafuselabs/opensrv?rev=a1fb4da215c8693c7e4f62be249a01b7fec52997#a1fb4da215c8693c7e4f62be249a01b7fec52997" +source = "git+https://github.com/datafuselabs/opensrv?tag=v0.10.0#074bd8fb81da3c9e6d6a098a482f3380478b9c0b" dependencies = [ "async-trait", "byteorder", diff --git a/src/servers/Cargo.toml b/src/servers/Cargo.toml index ebc45d7aca..b91c90b25a 100644 --- a/src/servers/Cargo.toml +++ b/src/servers/Cargo.toml @@ -81,13 +81,7 @@ notify.workspace = true object-pool = "0.5" once_cell.workspace = true openmetrics-parser = "0.4" -simd-json.workspace = true -socket2 = "0.5" -tracing-opentelemetry.workspace = true -# use crates.io version once the following PRs is merged into the nextest release -# 1. fix: Use After Free in PacketReader in https://github.com/databendlabs/opensrv/pull/67 -# 2. Use ring, instead of aws-lc-rs in https://github.com/databendlabs/opensrv/pull/72 -opensrv-mysql = { git = "https://github.com/datafuselabs/opensrv", rev = "a1fb4da215c8693c7e4f62be249a01b7fec52997" } +opensrv-mysql = { git = "https://github.com/datafuselabs/opensrv", tag = "v0.10.0" } opentelemetry-proto.workspace = true operator.workspace = true otel-arrow-rust.workspace = true @@ -114,8 +108,10 @@ rustls-pki-types = "1.0" serde.workspace = true serde_json.workspace = true session.workspace = true +simd-json.workspace = true snafu.workspace = true snap = "1" +socket2 = "0.5" sql.workspace = true store-api.workspace = true strum.workspace = true @@ -129,6 +125,7 @@ tonic-reflection = "0.13" tower = { workspace = true, features = ["full"] } tower-http = { version = "0.6", features = ["full"] } tracing.workspace = true +tracing-opentelemetry.workspace = true urlencoding = "2.1" uuid.workspace = true vrl.workspace = true diff --git a/src/servers/src/mysql/handler.rs b/src/servers/src/mysql/handler.rs index aa57708ab7..77efb3b838 100644 --- a/src/servers/src/mysql/handler.rs +++ b/src/servers/src/mysql/handler.rs @@ -355,7 +355,7 @@ impl MysqlInstanceShim { let _ = guard.remove(&stmt_key); } - fn auth_plugin(&self) -> &str { + fn auth_plugin(&self) -> &'static str { if self .user_provider .as_ref() @@ -385,7 +385,7 @@ impl AsyncMysqlShim for MysqlInstanceShi self.auth_plugin() } - async fn auth_plugin_for_username<'a, 'user>(&'a self, _user: &'user [u8]) -> &'a str { + async fn auth_plugin_for_username(&self, _user: &[u8]) -> &'static str { self.auth_plugin() } diff --git a/src/servers/src/mysql/writer.rs b/src/servers/src/mysql/writer.rs index 2b8495074a..8475f0ac65 100644 --- a/src/servers/src/mysql/writer.rs +++ b/src/servers/src/mysql/writer.rs @@ -498,10 +498,10 @@ pub(crate) fn create_mysql_column( column_type.map(|column_type| Column { column: column_name.to_string(), coltype: column_type, - // TODO(LFC): Currently "table" and "colflags" are not relevant in MySQL server // implementation, will revisit them again in the future. table: String::default(), + collen: 0, // 0 means "use default". colflags, }) }