From 081c10f0737ed196186190d5c23af5778493f9f5 Mon Sep 17 00:00:00 2001 From: houseme Date: Wed, 15 Jul 2026 20:17:26 +0800 Subject: [PATCH] chore(deps): trim s3select datafusion features (#4869) --- Cargo.lock | 77 +++++++------------------------- Cargo.toml | 2 +- crates/s3select-api/Cargo.toml | 2 +- crates/s3select-query/Cargo.toml | 2 +- rustfs/Cargo.toml | 2 +- 5 files changed, 21 insertions(+), 64 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 05e0e522b..435938e18 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -319,17 +319,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7af50940b73bf4e16c15c448a2b121c63f2d68e3e54b6a8731673cb4aa0cdff5" dependencies = [ "base64ct", - "blake2 0.11.0-rc.6", + "blake2", "cpufeatures 0.3.0", "password-hash", ] -[[package]] -name = "arrayref" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" - [[package]] name = "arrayvec" version = "0.7.8" @@ -1510,15 +1504,6 @@ dependencies = [ "serde_core", ] -[[package]] -name = "blake2" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" -dependencies = [ - "digest 0.10.7", -] - [[package]] name = "blake2" version = "0.11.0-rc.6" @@ -1528,20 +1513,6 @@ dependencies = [ "digest 0.11.3", ] -[[package]] -name = "blake3" -version = "1.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aa83c34e62843d924f905e0f5c866eb1dd6545fc4d719e803d9ba6030371fce" -dependencies = [ - "arrayref", - "arrayvec", - "cc", - "cfg-if", - "constant_time_eq", - "cpufeatures 0.3.0", -] - [[package]] name = "block-buffer" version = "0.10.4" @@ -2628,7 +2599,6 @@ dependencies = [ "arrow", "arrow-schema", "async-trait", - "bzip2", "chrono", "datafusion-catalog", "datafusion-catalog-listing", @@ -2655,11 +2625,9 @@ dependencies = [ "datafusion-physical-plan", "datafusion-session", "datafusion-sql", - "flate2", "futures", "indexmap 2.14.0", "itertools 0.14.0", - "liblzma", "log", "object_store", "parking_lot", @@ -2669,7 +2637,6 @@ dependencies = [ "tokio", "url", "uuid", - "zstd", ] [[package]] @@ -2759,10 +2726,8 @@ version = "54.0.0" source = "git+https://github.com/apache/datafusion.git?rev=dae03ee062b2abf986de8df12ea82fb1578a2d99#dae03ee062b2abf986de8df12ea82fb1578a2d99" dependencies = [ "arrow", - "async-compression", "async-trait", "bytes", - "bzip2", "chrono", "datafusion-common", "datafusion-common-runtime", @@ -2773,19 +2738,15 @@ dependencies = [ "datafusion-physical-expr-common", "datafusion-physical-plan", "datafusion-session", - "flate2", "futures", "glob", "itertools 0.14.0", - "liblzma", "log", "object_store", "parking_lot", "rand 0.9.5", "tokio", - "tokio-util", "url", - "zstd", ] [[package]] @@ -2953,8 +2914,6 @@ dependencies = [ "arrow", "arrow-buffer", "base64 0.22.1", - "blake2 0.10.6", - "blake3", "chrono", "chrono-tz", "datafusion-common", @@ -2967,12 +2926,10 @@ dependencies = [ "hex", "itertools 0.14.0", "log", - "md-5 0.11.0", "memchr", "num-traits", "rand 0.9.5", "regex", - "sha2 0.11.0", "uuid", ] @@ -3632,7 +3589,7 @@ dependencies = [ "libc", "option-ext", "redox_users 0.5.2", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -3966,7 +3923,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -5376,7 +5333,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -6561,7 +6518,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -6698,7 +6655,7 @@ version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51e219e79014df21a225b1860a479e2dcd7cbd9130f4defd4bd0e191ea31d67d" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "chrono", "getrandom 0.2.17", "http 1.4.2", @@ -7820,7 +7777,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf" dependencies = [ "heck", - "itertools 0.10.5", + "itertools 0.14.0", "log", "multimap", "once_cell", @@ -7840,7 +7797,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03da047801ff44bb6a4d407d4860c05fd70bb81714e6b2f3812603d5b145b042" dependencies = [ "heck", - "itertools 0.10.5", + "itertools 0.14.0", "log", "multimap", "petgraph 0.8.3", @@ -7861,7 +7818,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" dependencies = [ "anyhow", - "itertools 0.10.5", + "itertools 0.14.0", "proc-macro2", "quote", "syn 2.0.119", @@ -7874,7 +7831,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b570b25f7617e43d59005d0990ccb79e950a423952cea19671b7a876da390adf" dependencies = [ "anyhow", - "itertools 0.10.5", + "itertools 0.14.0", "proc-macro2", "quote", "syn 2.0.119", @@ -8091,7 +8048,7 @@ dependencies = [ "once_cell", "socket2", "tracing", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -10067,7 +10024,7 @@ name = "rustfs-utils" version = "1.0.0-beta.9" dependencies = [ "base64-simd", - "blake2 0.11.0-rc.6", + "blake2", "brotli", "bytes", "convert_case 0.11.0", @@ -10181,7 +10138,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.12.1", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -10255,7 +10212,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -11415,10 +11372,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.3.4", + "getrandom 0.4.3", "once_cell", "rustix 1.1.4", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -12519,7 +12476,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index c786fcaf0..b19e630b2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -240,7 +240,7 @@ crossbeam-queue = "0.3.13" crossbeam-channel = "0.5.16" crossbeam-deque = "0.8.7" crossbeam-utils = "0.8.22" -datafusion = { git = "https://github.com/apache/datafusion.git", rev = "dae03ee062b2abf986de8df12ea82fb1578a2d99" } +datafusion = { git = "https://github.com/apache/datafusion.git", rev = "dae03ee062b2abf986de8df12ea82fb1578a2d99", default-features = false } derive_builder = "0.20.2" enumset = "1.1.13" faster-hex = "0.10.0" diff --git a/crates/s3select-api/Cargo.toml b/crates/s3select-api/Cargo.toml index ae5e36a41..7381af5da 100644 --- a/crates/s3select-api/Cargo.toml +++ b/crates/s3select-api/Cargo.toml @@ -31,7 +31,7 @@ async-trait.workspace = true bytes.workspace = true chrono.workspace = true rustfs-common.workspace = true -datafusion = { workspace = true } +datafusion = { workspace = true, features = ["parquet", "recursive_protection", "sql"] } rustfs-ecstore.workspace = true rustfs-storage-api.workspace = true futures = { workspace = true } diff --git a/crates/s3select-query/Cargo.toml b/crates/s3select-query/Cargo.toml index f04c3f9e5..40e047337 100644 --- a/crates/s3select-query/Cargo.toml +++ b/crates/s3select-query/Cargo.toml @@ -29,7 +29,7 @@ documentation = "https://docs.rs/rustfs-s3select-query/latest/rustfs_s3select_qu rustfs-s3select-api = { workspace = true } async-recursion = { workspace = true } async-trait.workspace = true -datafusion = { workspace = true } +datafusion = { workspace = true, features = ["parquet", "recursive_protection", "sql"] } derive_builder = { workspace = true } futures = { workspace = true } parking_lot = { workspace = true } diff --git a/rustfs/Cargo.toml b/rustfs/Cargo.toml index dcab98fae..dd9916c9c 100644 --- a/rustfs/Cargo.toml +++ b/rustfs/Cargo.toml @@ -158,7 +158,7 @@ sha2 = { workspace = true } base64-simd.workspace = true clap = { workspace = true } const-str = { workspace = true } -datafusion = { workspace = true } +datafusion = { workspace = true, features = ["parquet", "recursive_protection", "sql"] } hex-simd.workspace = true matchit = { workspace = true } md5.workspace = true