Skip to content

Commit

Permalink
Merge branch 'main' into split2
Browse files Browse the repository at this point in the history
  • Loading branch information
dqhl76 authored Nov 26, 2024
2 parents 7056d31 + 10a37b9 commit c63a9af
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 64 deletions.
80 changes: 23 additions & 57 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ openraft = { version = "0.10.0", features = [
"tracing-log",
"loosen-follower-log-revert", # allows removing all data from a follower and restoring from the leader.
] }
opensrv-mysql = { version = "0.7.0", features = ["tls"] }
opensrv-mysql = { git = "https://github.com/databendlabs/opensrv.git", rev = "a1fb4da", features = ["tls"] }
orc-rust = "0.5.0"
ordered-float = { version = "4.5.0", default-features = false }
ordq = "0.2.0"
Expand Down Expand Up @@ -424,7 +424,7 @@ roaring = { version = "0.10.1", features = ["serde"] }
rotbl = { version = "0.1.2", features = [] }
rust_decimal = "1.26"
rustix = "0.38.37"
rustls = "0.22" # FIXME: we should bump to 0.23
rustls = { version = "0.23.18", features = ["ring", "tls12"], default-features = false }
rustls-pemfile = "2"
rustls-pki-types = "1"
rustyline = "14"
Expand Down Expand Up @@ -536,7 +536,7 @@ tracing-appender = "0.2.3"
tracing-subscriber = { version = "0.3.17", features = ["env-filter", "json", "valuable"] }

# Databend Integration Test
msql-srv = "0.11.0"
msql-srv = { git = "https://github.com/databendlabs/msql-srv.git", rev = "cd443dd" }
mysql_common = "0.32.4"
quickcheck = "1.0"
sqllogictest = "0.21.0"
Expand Down
2 changes: 1 addition & 1 deletion src/query/expression/src/kernels/group_by_hash/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ pub fn serialize_group_columns(
}
builder.commit_row();
}
// For nulllable column it will only serialize valid row data
// For nullable column it will only serialize valid row data
debug_assert!(builder.data.len() <= serialize_size);
builder.build()
}
Expand Down
2 changes: 1 addition & 1 deletion src/query/service/src/servers/admin/admin_service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ impl Server for AdminService {
async fn shutdown(&mut self, _graceful: bool) {
// intendfully do nothing: sometimes we hope to diagnose the backtraces or metrics after
// the process got the sigterm signal, we can still leave the admin service port open until
// the process exited. it's not an user facing service, it's allowed to shutdown forcely.
// the process exited. it's not an user facing service, it's allowed to force shutdown.
}

#[async_backtrace::framed]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{"code":1025,"message":"error: \n --> SQL:1:15\n |\n1 | select * from t1\n | ^^ Unknown table \"default\".\"default\".t1 .\n\n"}
{"code":1025,"message":"error: \n --> SQL:1:15\n |\n1 | select * from system.t1\n | ^^^^^^^^^ Unknown table \"default\".system.t1 .\n\n"}
{"error":{"code":400,"message":"parse error: key must be a string at line 1 column 2"}}
{"error":{"code":404,"message":"not found"}}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)

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

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"
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"

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:
echo ""
Expand Down

0 comments on commit c63a9af

Please sign in to comment.