Skip to content

Commit 10a37b9

Browse files
authored
chore: bump rustls version 0.23.18 (#16936)
* chore: fix flaky ci 09_0001_json_response.sh add sleep, wait table drop success. bump rustls to 0.23.18 * fix typo err
1 parent 04df094 commit 10a37b9

File tree

6 files changed

+30
-64
lines changed

6 files changed

+30
-64
lines changed

Cargo.lock

Lines changed: 23 additions & 57 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ openraft = { version = "0.10.0", features = [
375375
"tracing-log",
376376
"loosen-follower-log-revert", # allows removing all data from a follower and restoring from the leader.
377377
] }
378-
opensrv-mysql = { version = "0.7.0", features = ["tls"] }
378+
opensrv-mysql = { git = "https://github.com/databendlabs/opensrv.git", rev = "a1fb4da", features = ["tls"] }
379379
orc-rust = "0.5.0"
380380
ordered-float = { version = "4.5.0", default-features = false }
381381
ordq = "0.2.0"
@@ -424,7 +424,7 @@ roaring = { version = "0.10.1", features = ["serde"] }
424424
rotbl = { version = "0.1.2", features = [] }
425425
rust_decimal = "1.26"
426426
rustix = "0.38.37"
427-
rustls = "0.22" # FIXME: we should bump to 0.23
427+
rustls = { version = "0.23.18", features = ["ring", "tls12"], default-features = false }
428428
rustls-pemfile = "2"
429429
rustls-pki-types = "1"
430430
rustyline = "14"
@@ -536,7 +536,7 @@ tracing-appender = "0.2.3"
536536
tracing-subscriber = { version = "0.3.17", features = ["env-filter", "json", "valuable"] }
537537

538538
# Databend Integration Test
539-
msql-srv = "0.11.0"
539+
msql-srv = { git = "https://github.com/databendlabs/msql-srv.git", rev = "cd443dd" }
540540
mysql_common = "0.32.4"
541541
quickcheck = "1.0"
542542
sqllogictest = "0.21.0"

src/query/expression/src/kernels/group_by_hash/utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ pub fn serialize_group_columns(
4040
}
4141
builder.commit_row();
4242
}
43-
// For nulllable column it will only serialize valid row data
43+
// For nullable column it will only serialize valid row data
4444
debug_assert!(builder.data.len() <= serialize_size);
4545
builder.build()
4646
}

src/query/service/src/servers/admin/admin_service.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ impl Server for AdminService {
184184
async fn shutdown(&mut self, _graceful: bool) {
185185
// intendfully do nothing: sometimes we hope to diagnose the backtraces or metrics after
186186
// the process got the sigterm signal, we can still leave the admin service port open until
187-
// the process exited. it's not an user facing service, it's allowed to shutdown forcely.
187+
// the process exited. it's not an user facing service, it's allowed to force shutdown.
188188
}
189189

190190
#[async_backtrace::framed]
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
{"code":1025,"message":"error: \n --> SQL:1:15\n |\n1 | select * from t1\n | ^^ Unknown table \"default\".\"default\".t1 .\n\n"}
1+
{"code":1025,"message":"error: \n --> SQL:1:15\n |\n1 | select * from system.t1\n | ^^^^^^^^^ Unknown table \"default\".system.t1 .\n\n"}
22
{"error":{"code":400,"message":"parse error: key must be a string at line 1 column 2"}}
33
{"error":{"code":404,"message":"not found"}}

tests/suites/1_stateful/09_http_handler/09_0001_json_response.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
55

66
echo "drop table if exists t1;" | $BENDSQL_CLIENT_CONNECT
77

8-
curl -s --header 'Content-Type: application/json' --request POST '127.0.0.1:8000/v1/query/' --data-raw '{"sql": "select * from t1", "pagination": { "wait_time_secs": 2}}' -u root: | jq -c ".error"
8+
curl -s --header 'Content-Type: application/json' --request POST '127.0.0.1:8000/v1/query/' --data-raw '{"sql": "select * from system.t1", "pagination": { "wait_time_secs": 2}}' -u root: | jq -c ".error"
99

1010
curl -s --header 'Content-Type: application/json' --request POST '127.0.0.1:8000/v1/query/' --data-raw '{sql": "select * from tx", "pagination": { "wait_time_secs": 2}}' -u root:
1111
echo ""

0 commit comments

Comments
 (0)