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
827 changes: 599 additions & 228 deletions Cargo.lock

Large diffs are not rendered by default.

46 changes: 23 additions & 23 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -217,18 +217,18 @@ anyerror = { version = "=0.1.13" }
anyhow = { version = "1.0.65" }
apache-avro = { version = "0.17.0", features = ["snappy", "zstandard", "xz", "snappy", "bzip"] }
approx = "0.5.1"
arrow = { version = "55" }
arrow-array = { version = "55" }
arrow-buffer = { version = "55" }
arrow-cast = { version = "55", features = ["prettyprint"] }
arrow-csv = { version = "55" }
arrow-data = { version = "55" }
arrow-flight = { version = "55", features = ["flight-sql-experimental", "tls"] }
arrow-ipc = { version = "55", features = ["lz4", "zstd"] }
arrow-json = { version = "55" }
arrow-ord = { version = "55" }
arrow-schema = { version = "55", features = ["serde"] }
arrow-select = { version = "55" }
arrow = { version = "56" }
arrow-array = { version = "56" }
arrow-buffer = { version = "56" }
arrow-cast = { version = "56", features = ["prettyprint"] }
arrow-csv = { version = "56" }
arrow-data = { version = "56" }
arrow-flight = { version = "56", features = ["flight-sql-experimental", "tls-ring"] }
arrow-ipc = { version = "56", features = ["lz4", "zstd"] }
arrow-json = { version = "56" }
arrow-ord = { version = "56" }
arrow-schema = { version = "56", features = ["serde"] }
arrow-select = { version = "56" }
arrow-udf-runtime = { version = "0.8.0", default-features = false, features = ["javascript", "wasm"] }
async-backtrace = "0.2"
async-channel = "2.3.1"
Expand Down Expand Up @@ -330,13 +330,13 @@ hyper-util = { version = "0.1.9", features = ["client", "client-legacy", "tokio"
lru = "0.12"

## in branch dev
iceberg = { version = "0.4.0", git = "https://github.com/databendlabs/iceberg-rust", rev = "1dace26ea25a9b9e2066367cbd3b7badc75dd7f9", features = [
iceberg = { version = "0.4.0", git = "https://github.com/databendlabs/iceberg-rust", rev = "32b1403", features = [
"storage-all",
] }
iceberg-catalog-glue = { version = "0.4.0", git = "https://github.com/databendlabs/iceberg-rust", rev = "1dace26ea25a9b9e2066367cbd3b7badc75dd7f9" }
iceberg-catalog-hms = { version = "0.4.0", git = "https://github.com/databendlabs/iceberg-rust", rev = "1dace26ea25a9b9e2066367cbd3b7badc75dd7f9" }
iceberg-catalog-rest = { version = "0.4.0", git = "https://github.com/databendlabs/iceberg-rust", rev = "1dace26ea25a9b9e2066367cbd3b7badc75dd7f9" }
iceberg-catalog-s3tables = { version = "0.4.0", git = "https://github.com/databendlabs/iceberg-rust", rev = "1dace26ea25a9b9e2066367cbd3b7badc75dd7f9" }
iceberg-catalog-glue = { version = "0.4.0", git = "https://github.com/databendlabs/iceberg-rust", rev = "32b1403" }
iceberg-catalog-hms = { version = "0.4.0", git = "https://github.com/databendlabs/iceberg-rust", rev = "32b1403" }
iceberg-catalog-rest = { version = "0.4.0", git = "https://github.com/databendlabs/iceberg-rust", rev = "32b1403" }
iceberg-catalog-s3tables = { version = "0.4.0", git = "https://github.com/databendlabs/iceberg-rust", rev = "32b1403" }

# Explicitly specify compatible AWS SDK versions
aws-config = "1.5.18"
Expand Down Expand Up @@ -415,7 +415,7 @@ ordered-float = { version = "5.1.0", default-features = false }
ordq = "0.2.0"
p256 = "0.13"
parking_lot = "0.12.1"
parquet = { version = "55", features = ["async"] }
parquet = { version = "56", features = ["async"] }
passwords = { version = "3.1.16" }
paste = "1.0.15"
percent-encoding = "2.3.1"
Expand Down Expand Up @@ -518,9 +518,9 @@ tokio = { version = "1.35.0", features = ["full"] }
tokio-stream = { version = "0.1.11", features = ["net"] }
tokio-util = { version = "0.7.13" }
toml = { version = "0.8", features = ["parse"] }
tonic = { version = "0.12.3", features = ["transport", "codegen", "prost", "tls-roots", "tls"] }
tonic-build = { version = "0.12.3" }
tonic-reflection = { version = "0.12.3" }
tonic = { version = "0.13", features = ["transport", "codegen", "tls-native-roots"] }
tonic-build = { version = "0.13" }
tonic-reflection = { version = "0.13" }
tower = { version = "0.5.1", features = ["util"] }
tower-service = "0.3.3"
twox-hash = "1.6.3"
Expand Down Expand Up @@ -643,15 +643,15 @@ overflow-checks = true
rpath = true

[patch.crates-io]
arrow-udf-runtime = { git = "https://github.com/datafuse-extras/arrow-udf.git", rev = "a442343" }
arrow-udf-runtime = { git = "https://github.com/datafuse-extras/arrow-udf.git", rev = "2480dccf1" }
async-backtrace = { git = "https://github.com/datafuse-extras/async-backtrace.git", rev = "dea4553" }
async-recursion = { git = "https://github.com/datafuse-extras/async-recursion.git", rev = "a353334" }
backtrace = { git = "https://github.com/rust-lang/backtrace-rs.git", rev = "72265be" }
color-eyre = { git = "https://github.com/eyre-rs/eyre.git", rev = "e5d92c3" }
deltalake = { git = "https://github.com/delta-io/delta-rs", rev = "9954bff" }
map-api = { git = "https://github.com/databendlabs/map-api", tag = "v0.4.2" }
openraft = { git = "https://github.com/databendlabs/openraft", tag = "v0.10.0-alpha.11" }
orc-rust = { git = "https://github.com/datafuse-extras/orc-rust", rev = "d82aa6d" }
orc-rust = { git = "https://github.com/datafuse-extras/orc-rust", rev = "fc812ad7010" }
recursive = { git = "https://github.com/datafuse-extras/recursive.git", rev = "16e433a" }
sled = { git = "https://github.com/datafuse-extras/sled", tag = "v0.34.7-datafuse.1" }
state-machine-api = { git = "https://github.com/databendlabs/state-machine-api.git", tag = "v0.3.4" }
Expand Down
4 changes: 2 additions & 2 deletions src/bendpy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ publish = { workspace = true }
edition = { workspace = true }

[build-dependencies]
pyo3-build-config = "0.24.2"
pyo3-build-config = "0.25"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[lib]
Expand All @@ -32,7 +32,7 @@ databend-query = { workspace = true, features = [
"simd",
"disable_initial_exec_tls",
] }
pyo3 = { version = "0.24", features = ["generate-import-lib", "abi3-py312"] }
pyo3 = { version = "0.25", features = ["generate-import-lib", "abi3-py312"] }
serde_json = { workspace = true }
sysinfo = { workspace = true }
tokio = { workspace = true, features = ["macros", "rt", "rt-multi-thread", "sync"] }
Expand Down
1 change: 1 addition & 0 deletions src/common/cloud_control/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ hyper-util = { workspace = true }
prost = { workspace = true }
serde = { workspace = true }
tonic = { workspace = true }
#tonic-prost = { workspace = true }

[build-dependencies]
lenient_semver = { workspace = true }
Expand Down
6 changes: 4 additions & 2 deletions src/query/service/src/servers/flight/flight_service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,10 @@ impl FlightService {
builder
};

let incoming = TcpIncoming::new(addr, true, None)
.map_err(|e| ErrorCode::CannotListenerPort(format!("{},{}", e, addr)))?;
let incoming = TcpIncoming::bind(addr)
.map_err(|e| ErrorCode::CannotListenerPort(format!("{},{}", e, addr)))?
.with_nodelay(Some(true))
.with_keepalive(None);
let server = builder
.add_service(
FlightServiceServer::new(flight_api_service)
Expand Down
6 changes: 4 additions & 2 deletions src/query/service/src/servers/flight_sql/flight_sql_server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,10 @@ impl FlightSQLServer {
builder
};

let incoming = TcpIncoming::new(addr, true, None)
.map_err(|e| ErrorCode::CannotListenerPort(format!("{},{}", e, addr)))?;
let incoming = TcpIncoming::bind(addr)
.map_err(|e| ErrorCode::CannotListenerPort(format!("{},{}", e, addr)))?
.with_nodelay(Some(true))
.with_keepalive(None);

let server = builder
.add_service(FlightServiceServer::new(flight_sql_service))
Expand Down
6 changes: 4 additions & 2 deletions src/query/service/tests/it/parquet_rs/prune_row_groups.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ use databend_common_catalog::plan::ParquetReadOptions;
use databend_common_expression::FunctionContext;
use databend_common_expression::TableSchema;
use databend_common_storages_parquet::ParquetPruner;
use parquet::file::metadata::ParquetMetaDataReader;

use super::data::make_test_file_rg;
use super::data::Scenario;
Expand Down Expand Up @@ -46,8 +47,9 @@ async fn test_impl_batch(args: &[(Scenario, &str, Vec<usize>)], prune: bool) {
let plan = get_data_source_plan(fixture.new_query_ctx().await.unwrap(), &sql)
.await
.unwrap();
#[allow(deprecated)]
let parquet_meta = parquet::file::footer::parse_metadata(file.as_file()).unwrap();
let parquet_meta = ParquetMetaDataReader::new()
.parse_and_finish(file.as_file())
.unwrap();
let schema = TableSchema::try_from(arrow_schema.as_ref()).unwrap();
let leaf_fields = Arc::new(schema.leaf_fields());

Expand Down
1 change: 1 addition & 0 deletions src/query/storages/delta/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ async-backtrace = { workspace = true }
async-trait = { workspace = true }
deltalake = { workspace = true }
fastrace = { workspace = true }
itertools = { workspace = true }
object_store_opendal = { workspace = true }
parquet = { workspace = true }
serde = { workspace = true }
Expand Down
Loading