rust/greptimedb
1
0
Fork 0
mirror of https://github.com/GreptimeTeam/greptimedb.git synced 2026-01-06 21:32:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: update opensrv-mysql to 0.10 (#7246)

Browse Source 
* build: update opensrv-mysql to 0.10

Signed-off-by: Dennis Zhuang <killme2008@gmail.com>

* fix: format tomal

Signed-off-by: Dennis Zhuang <killme2008@gmail.com>

* fix: format tomal

Signed-off-by: Dennis Zhuang <killme2008@gmail.com>

---------

Signed-off-by: Dennis Zhuang <killme2008@gmail.com>
This commit is contained in:
dennis zhuang
2025-11-18 10:38:16 +08:00
committed by GitHub
parent 77483ad7d4
commit ff2a12a49d
4 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@@ -8527,7 +8527,7 @@ dependencies = [
[[package]] [[package]]
name = "opensrv-mysql" name = "opensrv-mysql"
version = "0.8.0" 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 = [ dependencies = [
"async-trait", "async-trait",
"byteorder", "byteorder",

11
src/servers/Cargo.toml
View File

@@ -81,13 +81,7 @@ notify.workspace = true
object-pool = "0.5" object-pool = "0.5"
once_cell.workspace = true once_cell.workspace = true
openmetrics-parser = "0.4" openmetrics-parser = "0.4"
simd-json.workspace = true opensrv-mysql = { git = "https://github.com/datafuselabs/opensrv", tag = "v0.10.0" }
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" }
opentelemetry-proto.workspace = true opentelemetry-proto.workspace = true
operator.workspace = true operator.workspace = true
otel-arrow-rust.workspace = true otel-arrow-rust.workspace = true
@@ -114,8 +108,10 @@ rustls-pki-types = "1.0"
serde.workspace = true serde.workspace = true
serde_json.workspace = true serde_json.workspace = true
session.workspace = true session.workspace = true
simd-json.workspace = true
snafu.workspace = true snafu.workspace = true
snap = "1" snap = "1"
socket2 = "0.5"
sql.workspace = true sql.workspace = true
store-api.workspace = true store-api.workspace = true
strum.workspace = true strum.workspace = true
@@ -129,6 +125,7 @@ tonic-reflection = "0.13"
tower = { workspace = true, features = ["full"] } tower = { workspace = true, features = ["full"] }
tower-http = { version = "0.6", features = ["full"] } tower-http = { version = "0.6", features = ["full"] }
tracing.workspace = true tracing.workspace = true
tracing-opentelemetry.workspace = true
urlencoding = "2.1" urlencoding = "2.1"
uuid.workspace = true uuid.workspace = true
vrl.workspace = true vrl.workspace = true

4
src/servers/src/mysql/handler.rs
View File

@@ -355,7 +355,7 @@ impl MysqlInstanceShim {
let _ = guard.remove(&stmt_key); let _ = guard.remove(&stmt_key);
} }
fn auth_plugin(&self) -> &str { fn auth_plugin(&self) -> &'static str {
if self if self
.user_provider .user_provider
.as_ref() .as_ref()
@@ -385,7 +385,7 @@ impl<W: AsyncWrite + Send + Sync + Unpin> AsyncMysqlShim<W> for MysqlInstanceShi
self.auth_plugin() 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() self.auth_plugin()
} }

2
src/servers/src/mysql/writer.rs
View File

@@ -498,10 +498,10 @@ pub(crate) fn create_mysql_column(
column_type.map(|column_type| Column { column_type.map(|column_type| Column {
column: column_name.to_string(), column: column_name.to_string(),
coltype: column_type, coltype: column_type,
// TODO(LFC): Currently "table" and "colflags" are not relevant in MySQL server // TODO(LFC): Currently "table" and "colflags" are not relevant in MySQL server
// implementation, will revisit them again in the future. // implementation, will revisit them again in the future.
table: String::default(), table: String::default(),
collen: 0, // 0 means "use default".
colflags, colflags,
}) })
} }