Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
167 changes: 112 additions & 55 deletions Cargo.lock

Large diffs are not rendered by default.

6 changes: 2 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ thiserror = { version = "1" }
clap = { version = "3.2.22", features = ["derive", "env"] }

# server
tonic = { version = "0.8.3", features = ["transport", "codegen", "prost", "tls-roots", "tls"] }
tonic = { version = "0.9", features = ["transport", "codegen", "prost", "tls-roots", "tls"] }

# serialization
prost = { version = "0.11.0" }
Expand Down Expand Up @@ -193,9 +193,7 @@ rpath = false

[patch.crates-io]
# If there are dependencies that need patching, they can be listed below.
# For example:
# arrow-format = { git = "https://github.com/datafuse-extras/arrow-format", rev = "78dacc1" }

arrow2 = { git = "https://github.com/jorgecarleitao/arrow2", rev = "33f6ba1" }
arrow-format = { git = "https://github.com/sundy-li/arrow-format", rev = "c49adfe" }
parquet2 = { git = "https://github.com/jorgecarleitao/parquet2", rev = "ed0e1ff" }
metrics = { git = "https://github.com/datafuse-extras/metrics.git", rev = "fc2ecd1" }
1 change: 0 additions & 1 deletion scripts/ci/deploy/databend-query-sharing.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,3 @@ python3 scripts/ci/wait_tcp.py --timeout 10 --port 23103
echo "Start query node3 with the same tenant and meta server for sharding data"
nohup target/${BUILD_PROFILE}/databend-query -c scripts/ci/deploy/config/databend-query-node-share-3.toml &
python3 scripts/ci/wait_tcp.py --timeout 30 --port 13317

4 changes: 2 additions & 2 deletions src/common/arrow/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ simd = ["arrow/simd"]
# Workspace dependencies

# Crates.io dependencies
arrow = { package = "arrow2", git = "https://github.com/jorgecarleitao/arrow2", rev = "33f6ba1", default-features = false, features = [
arrow = { package = "arrow2", git = "https://github.com/jorgecarleitao/arrow2", rev = "e14c238", default-features = false, features = [
"arrow",
"io_parquet",
"io_parquet_compression",
Expand All @@ -44,7 +44,7 @@ arrow = { package = "arrow2", git = "https://github.com/jorgecarleitao/arrow2",

arrow-format = { version = "0.8.0", features = ["flight-data", "flight-service", "ipc"] }
futures = "0.3.24"
native = { package = "strawboat", git = "https://github.com/sundy-li/strawboat", rev = "0589e19" }
native = { package = "strawboat", git = "https://github.com/sundy-li/strawboat", rev = "533c9c4" }
parquet2 = { version = "0.17.0", default_features = false, features = ["serde_types"] }

[dev-dependencies]
2 changes: 1 addition & 1 deletion src/meta/service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ serde_json = { workspace = true }
serfig = "0.1.0"
tokio-stream = "0.1.10"
tonic = { workspace = true }
tonic-reflection = "0.6.0"
tonic-reflection = "0.9"
tracing = "0.1.36"
tracing-appender = "0.2.2"
tracing-subscriber = { version = "0.3.15", features = ["env-filter", "ansi"] }
Expand Down
5 changes: 5 additions & 0 deletions src/meta/service/src/api/grpc/grpc_service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ use prost::Message;
use tokio_stream;
use tokio_stream::Stream;
use tonic::metadata::MetadataMap;
use tonic::transport::NamedService;
use tonic::Request;
use tonic::Response;
use tonic::Status;
Expand Down Expand Up @@ -87,6 +88,10 @@ impl MetaServiceImpl {
}
}

impl NamedService for MetaServiceImpl {
const NAME: &'static str = "meta_service";
}

#[async_trait::async_trait]
impl MetaService for MetaServiceImpl {
// rpc handshake related type
Expand Down
6 changes: 2 additions & 4 deletions src/query/expression/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,8 @@ common-io = { path = "../../common/io" }
# GitHub dependencies

# Crates.io dependencies
arrow-array = "36.0.0"
arrow-buffer = "36.0.0"
arrow-data = "36.0.0"
arrow-schema = "36.0.0"
arrow-array = "37.0.0"
arrow-schema = "37.0.0"
base64 = "0.21.0"
chrono = { workspace = true }
chrono-tz = { workspace = true }
Expand Down
Loading