From 931f2bcff846d54fc7aa062af84e2d698375d80d Mon Sep 17 00:00:00 2001 From: Matt Butrovich Date: Wed, 8 Apr 2026 17:37:36 -0400 Subject: [PATCH 01/30] Start testing what will be DataFusion 54.0. --- native/Cargo.lock | 221 +++++++++--------- native/Cargo.toml | 8 +- native/core/Cargo.toml | 2 +- native/core/src/execution/operators/expand.rs | 18 +- .../src/execution/operators/iceberg_scan.rs | 9 +- .../src/execution/operators/parquet_writer.rs | 17 +- native/core/src/execution/operators/scan.rs | 9 +- .../src/execution/operators/shuffle_scan.rs | 9 +- native/core/src/execution/planner.rs | 2 +- native/shuffle/src/shuffle_writer.rs | 16 +- native/spark-expr/src/agg_funcs/avg.rs | 9 +- .../spark-expr/src/agg_funcs/avg_decimal.rs | 7 +- .../spark-expr/src/agg_funcs/correlation.rs | 7 +- native/spark-expr/src/agg_funcs/covariance.rs | 6 - native/spark-expr/src/agg_funcs/stddev.rs | 7 +- .../spark-expr/src/agg_funcs/sum_decimal.rs | 6 +- native/spark-expr/src/agg_funcs/sum_int.rs | 6 +- native/spark-expr/src/agg_funcs/variance.rs | 6 - .../src/array_funcs/array_compact.rs | 5 - native/spark-expr/src/array_funcs/size.rs | 5 - .../src/bloom_filter/bloom_filter_agg.rs | 6 +- .../bloom_filter_might_contain.rs | 5 - native/spark-expr/src/comet_scalar_funcs.rs | 5 - .../src/datetime_funcs/date_diff.rs | 5 - .../src/datetime_funcs/date_trunc.rs | 5 - .../src/datetime_funcs/extract_date_part.rs | 6 +- .../src/datetime_funcs/make_date.rs | 5 - .../src/datetime_funcs/unix_timestamp.rs | 6 +- .../spark-expr/src/string_funcs/contains.rs | 5 - 29 files changed, 184 insertions(+), 239 deletions(-) diff --git a/native/Cargo.lock b/native/Cargo.lock index 0c0c9e97b7..3dbaed308b 100644 --- a/native/Cargo.lock +++ b/native/Cargo.lock @@ -23,7 +23,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" dependencies = [ - "crypto-common", + "crypto-common 0.1.7", "generic-array", ] @@ -184,7 +184,7 @@ checksum = "36fa98bc79671c7981272d91a8753a928ff6a1cd8e4f20a44c45bd5d313840bf" dependencies = [ "bigdecimal", "bon", - "digest", + "digest 0.10.7", "log", "miniz_oxide", "num-bigint", @@ -646,7 +646,7 @@ dependencies = [ "fastrand", "hex", "http 1.4.0", - "sha1", + "sha1 0.10.6", "time", "tokio", "tracing", @@ -1108,7 +1108,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" dependencies = [ - "digest", + "digest 0.10.7", ] [[package]] @@ -1134,6 +1134,15 @@ dependencies = [ "generic-array", ] +[[package]] +name = "block-buffer" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdd35008169921d80bc60d3d0ab416eecb028c4cd653352907921d95084790be" +dependencies = [ + "hybrid-array", +] + [[package]] name = "block-padding" version = "0.3.3" @@ -1377,7 +1386,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ - "crypto-common", + "crypto-common 0.1.7", "inout", ] @@ -1503,6 +1512,12 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" +[[package]] +name = "const-oid" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c" + [[package]] name = "const-random" version = "0.1.18" @@ -1676,6 +1691,15 @@ dependencies = [ "typenum", ] +[[package]] +name = "crypto-common" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77727bb15fa921304124b128af125e7e3b968275d1b108b379190264f4423710" +dependencies = [ + "hybrid-array", +] + [[package]] name = "csv" version = "1.4.0" @@ -1808,13 +1832,11 @@ dependencies = [ [[package]] name = "datafusion" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de9f8117889ba9503440f1dd79ebab32ba52ccf1720bb83cd718a29d4edc0d16" +source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" dependencies = [ "arrow", "arrow-schema", "async-trait", - "bytes", "chrono", "datafusion-catalog", "datafusion-catalog-listing", @@ -1847,8 +1869,6 @@ dependencies = [ "object_store", "parking_lot", "parquet", - "rand 0.9.2", - "regex", "sqlparser", "tempfile", "tokio", @@ -1859,8 +1879,7 @@ dependencies = [ [[package]] name = "datafusion-catalog" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be893b73a13671f310ffcc8da2c546b81efcc54c22e0382c0a28aa3537017137" +source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" dependencies = [ "arrow", "async-trait", @@ -1884,8 +1903,7 @@ dependencies = [ [[package]] name = "datafusion-catalog-listing" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830487b51ed83807d6b32d6325f349c3144ae0c9bf772cf2a712db180c31d5e6" +source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" dependencies = [ "arrow", "async-trait", @@ -2078,13 +2096,13 @@ dependencies = [ [[package]] name = "datafusion-common" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d7663f3af955292f8004e74bcaf8f7ea3d66cc38438749615bb84815b61a293" +source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" dependencies = [ - "ahash", "arrow", "arrow-ipc", + "arrow-schema", "chrono", + "foldhash 0.2.0", "half", "hashbrown 0.16.1", "hex", @@ -2094,17 +2112,16 @@ dependencies = [ "log", "object_store", "parquet", - "paste", "sqlparser", "tokio", + "uuid", "web-time", ] [[package]] name = "datafusion-common-runtime" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f590205c7e32fe1fea48dd53ffb406e56ae0e7a062213a3ac848db8771641bd" +source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" dependencies = [ "futures", "log", @@ -2114,8 +2131,7 @@ dependencies = [ [[package]] name = "datafusion-datasource" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fde1e030a9dc87b743c806fbd631f5ecfa2ccaa4ffb61fa19144a07fea406b79" +source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" dependencies = [ "arrow", "async-compression", @@ -2149,8 +2165,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-arrow" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "331ebae7055dc108f9b54994b93dff91f3a17445539efe5b74e89264f7b36e15" +source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" dependencies = [ "arrow", "arrow-ipc", @@ -2173,8 +2188,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-csv" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e0d475088325e2986876aa27bb30d0574f72a22955a527d202f454681d55c5c" +source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" dependencies = [ "arrow", "async-trait", @@ -2196,8 +2210,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-json" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea1520d81f31770f3ad6ee98b391e75e87a68a5bb90de70064ace5e0a7182fe8" +source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" dependencies = [ "arrow", "async-trait", @@ -2212,7 +2225,6 @@ dependencies = [ "datafusion-session", "futures", "object_store", - "serde_json", "tokio", "tokio-stream", ] @@ -2220,8 +2232,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-parquet" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95be805d0742ab129720f4c51ad9242cd872599cdb076098b03f061fcdc7f946" +source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" dependencies = [ "arrow", "async-trait", @@ -2231,6 +2242,7 @@ dependencies = [ "datafusion-datasource", "datafusion-execution", "datafusion-expr", + "datafusion-functions", "datafusion-functions-aggregate-common", "datafusion-physical-expr", "datafusion-physical-expr-adapter", @@ -2250,19 +2262,16 @@ dependencies = [ [[package]] name = "datafusion-doc" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c93ad9e37730d2c7196e68616f3f2dd3b04c892e03acd3a8eeca6e177f3c06a" +source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" [[package]] name = "datafusion-execution" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9437d3cd5d363f9319f8122182d4d233427de79c7eb748f23054c9aaa0fdd8df" +source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" dependencies = [ "arrow", "arrow-buffer", "async-trait", - "chrono", "dashmap", "datafusion-common", "datafusion-expr", @@ -2280,10 +2289,10 @@ dependencies = [ [[package]] name = "datafusion-expr" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67164333342b86521d6d93fa54081ee39839894fb10f7a700c099af96d7552cf" +source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" dependencies = [ "arrow", + "arrow-schema", "async-trait", "chrono", "datafusion-common", @@ -2294,7 +2303,6 @@ dependencies = [ "datafusion-physical-expr-common", "indexmap 2.13.1", "itertools 0.14.0", - "paste", "serde_json", "sqlparser", ] @@ -2302,21 +2310,18 @@ dependencies = [ [[package]] name = "datafusion-expr-common" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab05fdd00e05d5a6ee362882546d29d6d3df43a6c55355164a7fbee12d163bc9" +source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" dependencies = [ "arrow", "datafusion-common", "indexmap 2.13.1", "itertools 0.14.0", - "paste", ] [[package]] name = "datafusion-functions" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04fb863482d987cf938db2079e07ab0d3bb64595f28907a6c2f8671ad71cca7e" +source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" dependencies = [ "arrow", "arrow-buffer", @@ -2347,10 +2352,8 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829856f4e14275fb376c104f27cbf3c3b57a9cfe24885d98677525f5e43ce8d6" +source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" dependencies = [ - "ahash", "arrow", "datafusion-common", "datafusion-doc", @@ -2360,19 +2363,17 @@ dependencies = [ "datafusion-macros", "datafusion-physical-expr", "datafusion-physical-expr-common", + "foldhash 0.2.0", "half", "log", "num-traits", - "paste", ] [[package]] name = "datafusion-functions-aggregate-common" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08af79cc3d2aa874a362fb97decfcbd73d687190cb096f16a6c85a7780cce311" +source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" dependencies = [ - "ahash", "arrow", "datafusion-common", "datafusion-expr-common", @@ -2382,8 +2383,7 @@ dependencies = [ [[package]] name = "datafusion-functions-nested" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "465ae3368146d49c2eda3e2c0ef114424c87e8a6b509ab34c1026ace6497e790" +source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" dependencies = [ "arrow", "arrow-ord", @@ -2401,14 +2401,13 @@ dependencies = [ "itertools 0.14.0", "itoa", "log", - "paste", + "memchr", ] [[package]] name = "datafusion-functions-table" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6156e6b22fcf1784112fc0173f3ae6e78c8fdb4d3ed0eace9543873b437e2af6" +source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" dependencies = [ "arrow", "async-trait", @@ -2417,14 +2416,12 @@ dependencies = [ "datafusion-expr", "datafusion-physical-plan", "parking_lot", - "paste", ] [[package]] name = "datafusion-functions-window" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca7baec14f866729012efb89011a6973f3a346dc8090c567bfcd328deff551c1" +source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" dependencies = [ "arrow", "datafusion-common", @@ -2435,14 +2432,12 @@ dependencies = [ "datafusion-physical-expr", "datafusion-physical-expr-common", "log", - "paste", ] [[package]] name = "datafusion-functions-window-common" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "159228c3280d342658466bb556dc24de30047fe1d7e559dc5d16ccc5324166f9" +source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" dependencies = [ "datafusion-common", "datafusion-physical-expr-common", @@ -2451,8 +2446,7 @@ dependencies = [ [[package]] name = "datafusion-macros" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5427e5da5edca4d21ea1c7f50e1c9421775fe33d7d5726e5641a833566e7578" +source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" dependencies = [ "datafusion-doc", "quote", @@ -2462,8 +2456,7 @@ dependencies = [ [[package]] name = "datafusion-optimizer" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89099eefcd5b223ec685c36a41d35c69239236310d71d339f2af0fa4383f3f46" +source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" dependencies = [ "arrow", "chrono", @@ -2481,10 +2474,8 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f222df5195d605d79098ef37bdd5323bff0131c9d877a24da6ec98dfca9fe36" +source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" dependencies = [ - "ahash", "arrow", "datafusion-common", "datafusion-expr", @@ -2496,7 +2487,6 @@ dependencies = [ "indexmap 2.13.1", "itertools 0.14.0", "parking_lot", - "paste", "petgraph", "tokio", ] @@ -2504,8 +2494,7 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-adapter" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40838625d63d9c12549d81979db3dd675d159055eb9135009ba272ab0e8d0f64" +source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" dependencies = [ "arrow", "datafusion-common", @@ -2519,10 +2508,8 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-common" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eacbcc4cfd502558184ed58fa3c72e775ec65bf077eef5fd2b3453db676f893c" +source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" dependencies = [ - "ahash", "arrow", "chrono", "datafusion-common", @@ -2536,8 +2523,7 @@ dependencies = [ [[package]] name = "datafusion-physical-optimizer" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d501d0e1d0910f015677121601ac177ec59272ef5c9324d1147b394988f40941" +source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" dependencies = [ "arrow", "datafusion-common", @@ -2554,10 +2540,8 @@ dependencies = [ [[package]] name = "datafusion-physical-plan" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463c88ad6f1ecab1810f4c9f046898bee035b370137eb79b2b2db925e270631d" +source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" dependencies = [ - "ahash", "arrow", "arrow-ord", "arrow-schema", @@ -2586,8 +2570,7 @@ dependencies = [ [[package]] name = "datafusion-pruning" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2857618a0ecbd8cd0cf29826889edd3a25774ec26b2995fc3862095c95d88fc6" +source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" dependencies = [ "arrow", "datafusion-common", @@ -2596,15 +2579,13 @@ dependencies = [ "datafusion-physical-expr", "datafusion-physical-expr-common", "datafusion-physical-plan", - "itertools 0.14.0", "log", ] [[package]] name = "datafusion-session" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8637e35022c5c775003b3ab1debc6b4a8f0eb41b069bdd5475dd3aa93f6eba" +source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" dependencies = [ "async-trait", "datafusion-common", @@ -2617,8 +2598,7 @@ dependencies = [ [[package]] name = "datafusion-spark" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "923a8b871962a9d860f036f743a20af50ff04729f1da2468ed220dab4f61c97d" +source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" dependencies = [ "arrow", "bigdecimal", @@ -2633,10 +2613,11 @@ dependencies = [ "datafusion-functions-aggregate", "datafusion-functions-nested", "log", + "num-traits", "percent-encoding", "rand 0.9.2", "serde_json", - "sha1", + "sha1 0.11.0", "sha2", "url", ] @@ -2644,8 +2625,7 @@ dependencies = [ [[package]] name = "datafusion-sql" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12d9e9f16a1692a11c94bcc418191fa15fd2b4d72a0c1a0c607db93c0b84dd81" +source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" dependencies = [ "arrow", "bigdecimal", @@ -2674,7 +2654,7 @@ version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" dependencies = [ - "const-oid", + "const-oid 0.9.6", "pem-rfc7468", "zeroize", ] @@ -2754,12 +2734,23 @@ version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer", - "const-oid", - "crypto-common", + "block-buffer 0.10.4", + "const-oid 0.9.6", + "crypto-common 0.1.7", "subtle", ] +[[package]] +name = "digest" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4850db49bf08e663084f7fb5c87d202ef91a3907271aff24a94eb97ff039153c" +dependencies = [ + "block-buffer 0.12.0", + "const-oid 0.10.2", + "crypto-common 0.2.1", +] + [[package]] name = "displaydoc" version = "0.2.5" @@ -3310,7 +3301,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest", + "digest 0.10.7", ] [[package]] @@ -3389,6 +3380,15 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424" +[[package]] +name = "hybrid-array" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3944cf8cf766b40e2a1a333ee5e9b563f854d5fa49d6a8ca2764e97c6eddb214" +dependencies = [ + "typenum", +] + [[package]] name = "hyper" version = "1.9.0" @@ -4191,7 +4191,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ "cfg-if", - "digest", + "digest 0.10.7", ] [[package]] @@ -4798,7 +4798,7 @@ version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ - "digest", + "digest 0.10.7", "hmac", ] @@ -5467,7 +5467,7 @@ dependencies = [ "rust-ini", "serde", "serde_json", - "sha1", + "sha1 0.10.6", "sha2", "tokio", ] @@ -5489,7 +5489,7 @@ dependencies = [ "jiff", "log", "percent-encoding", - "sha1", + "sha1 0.10.6", "sha2", "windows-sys 0.61.2", ] @@ -5576,8 +5576,8 @@ version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8573f03f5883dcaebdfcf4725caa1ecb9c15b2ef50c43a07b816e06799bb12d" dependencies = [ - "const-oid", - "digest", + "const-oid 0.9.6", + "digest 0.10.7", "num-bigint-dig", "num-integer", "num-traits", @@ -5965,7 +5965,18 @@ checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures 0.2.17", - "digest", + "digest 0.10.7", +] + +[[package]] +name = "sha1" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aacc4cc499359472b4abe1bf11d0b12e688af9a805fa5e3016f9a386dc2d0214" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.0", + "digest 0.11.2", ] [[package]] @@ -5976,7 +5987,7 @@ checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", "cpufeatures 0.2.17", - "digest", + "digest 0.10.7", ] [[package]] @@ -6001,7 +6012,7 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ - "digest", + "digest 0.10.7", "rand_core 0.6.4", ] @@ -6664,7 +6675,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" dependencies = [ - "crypto-common", + "crypto-common 0.1.7", "subtle", ] diff --git a/native/Cargo.toml b/native/Cargo.toml index b71bc0c73c..6e66056b55 100644 --- a/native/Cargo.toml +++ b/native/Cargo.toml @@ -38,10 +38,10 @@ arrow = { version = "58.1.0", features = ["prettyprint", "ffi", "chrono-tz"] } async-trait = { version = "0.1" } bytes = { version = "1.11.1" } parquet = { version = "58.1.0", default-features = false, features = ["experimental"] } -datafusion = { version = "53.0.0", default-features = false, features = ["unicode_expressions", "crypto_expressions", "nested_expressions", "parquet"] } -datafusion-datasource = { version = "53.0.0" } -datafusion-physical-expr-adapter = { version = "53.0.0" } -datafusion-spark = { version = "53.0.0", features = ["core"] } +datafusion = { git = "https://github.com/mbutrovich/datafusion.git", branch = "dyncomparator", default-features = false, features = ["unicode_expressions", "crypto_expressions", "nested_expressions", "parquet"] } +datafusion-datasource = { git = "https://github.com/mbutrovich/datafusion.git", branch = "dyncomparator" } +datafusion-physical-expr-adapter = { git = "https://github.com/mbutrovich/datafusion.git", branch = "dyncomparator" } +datafusion-spark = { git = "https://github.com/mbutrovich/datafusion.git", branch = "dyncomparator", features = ["core"] } datafusion-comet-spark-expr = { path = "spark-expr" } datafusion-comet-common = { path = "common" } datafusion-comet-jni-bridge = { path = "jni-bridge" } diff --git a/native/core/Cargo.toml b/native/core/Cargo.toml index 872260c02f..c922493d20 100644 --- a/native/core/Cargo.toml +++ b/native/core/Cargo.toml @@ -91,7 +91,7 @@ jni = { version = "0.22.4", features = ["invocation"] } lazy_static = "1.4" assertables = "9" hex = "0.4.3" -datafusion-functions-nested = { version = "53.0.0" } +datafusion-functions-nested = { git = "https://github.com/mbutrovich/datafusion.git", branch = "dyncomparator" } [features] backtrace = ["datafusion/backtrace"] diff --git a/native/core/src/execution/operators/expand.rs b/native/core/src/execution/operators/expand.rs index e06fab23ec..c2c9c671d5 100644 --- a/native/core/src/execution/operators/expand.rs +++ b/native/core/src/execution/operators/expand.rs @@ -17,6 +17,7 @@ use arrow::array::{RecordBatch, RecordBatchOptions}; use arrow::datatypes::SchemaRef; +use datafusion::common::tree_node::TreeNodeRecursion; use datafusion::common::DataFusionError; use datafusion::physical_expr::{EquivalenceProperties, PhysicalExpr}; use datafusion::physical_plan::execution_plan::{Boundedness, EmissionType}; @@ -29,7 +30,6 @@ use datafusion::{ }; use futures::{Stream, StreamExt}; use std::{ - any::Any, pin::Pin, sync::Arc, task::{Context, Poll}, @@ -91,8 +91,20 @@ impl DisplayAs for ExpandExec { } impl ExecutionPlan for ExpandExec { - fn as_any(&self) -> &dyn Any { - self + fn apply_expressions( + &self, + f: &mut dyn FnMut(&dyn PhysicalExpr) -> datafusion::common::Result, + ) -> datafusion::common::Result { + for projection in &self.projections { + for expr in projection { + match f(expr.as_ref())? { + TreeNodeRecursion::Continue => {} + TreeNodeRecursion::Jump => {} + TreeNodeRecursion::Stop => return Ok(TreeNodeRecursion::Stop), + } + } + } + Ok(TreeNodeRecursion::Continue) } fn schema(&self) -> SchemaRef { diff --git a/native/core/src/execution/operators/iceberg_scan.rs b/native/core/src/execution/operators/iceberg_scan.rs index d217ebc34b..a2dae49742 100644 --- a/native/core/src/execution/operators/iceberg_scan.rs +++ b/native/core/src/execution/operators/iceberg_scan.rs @@ -17,7 +17,6 @@ //! Native Iceberg table scan operator using iceberg-rust -use std::any::Any; use std::collections::HashMap; use std::fmt; use std::pin::Pin; @@ -26,6 +25,7 @@ use std::task::{Context, Poll}; use arrow::array::{ArrayRef, RecordBatch, RecordBatchOptions}; use arrow::datatypes::SchemaRef; +use datafusion::common::tree_node::TreeNodeRecursion; use datafusion::common::{DataFusionError, Result as DFResult}; use datafusion::execution::{RecordBatchStream, SendableRecordBatchStream, TaskContext}; use datafusion::physical_expr::expressions::Column; @@ -108,8 +108,11 @@ impl ExecutionPlan for IcebergScanExec { "IcebergScanExec" } - fn as_any(&self) -> &dyn Any { - self + fn apply_expressions( + &self, + _f: &mut dyn FnMut(&dyn PhysicalExpr) -> DFResult, + ) -> DFResult { + Ok(TreeNodeRecursion::Continue) } fn schema(&self) -> SchemaRef { diff --git a/native/core/src/execution/operators/parquet_writer.rs b/native/core/src/execution/operators/parquet_writer.rs index 8ba79098d4..f66bc00186 100644 --- a/native/core/src/execution/operators/parquet_writer.rs +++ b/native/core/src/execution/operators/parquet_writer.rs @@ -18,7 +18,6 @@ //! Parquet writer operator for writing RecordBatches to Parquet files use std::{ - any::Any, collections::HashMap, fmt, fmt::{Debug, Formatter}, @@ -38,6 +37,7 @@ use crate::parquet::parquet_support::{create_hdfs_operator, prepare_object_store use arrow::datatypes::{Schema, SchemaRef}; use arrow::record_batch::RecordBatch; use async_trait::async_trait; +use datafusion::common::tree_node::TreeNodeRecursion; use datafusion::{ error::{DataFusionError, Result}, execution::context::TaskContext, @@ -46,8 +46,8 @@ use datafusion::{ execution_plan::{Boundedness, EmissionType}, metrics::{ExecutionPlanMetricsSet, MetricsSet}, stream::RecordBatchStreamAdapter, - DisplayAs, DisplayFormatType, ExecutionPlan, ExecutionPlanProperties, PlanProperties, - SendableRecordBatchStream, + DisplayAs, DisplayFormatType, ExecutionPlan, ExecutionPlanProperties, PhysicalExpr, + PlanProperties, SendableRecordBatchStream, }, }; use futures::TryStreamExt; @@ -404,14 +404,17 @@ impl DisplayAs for ParquetWriterExec { #[async_trait] impl ExecutionPlan for ParquetWriterExec { - fn as_any(&self) -> &dyn Any { - self - } - fn name(&self) -> &str { "ParquetWriterExec" } + fn apply_expressions( + &self, + _f: &mut dyn FnMut(&dyn PhysicalExpr) -> Result, + ) -> Result { + Ok(TreeNodeRecursion::Continue) + } + fn metrics(&self) -> Option { Some(self.metrics.clone_inner()) } diff --git a/native/core/src/execution/operators/scan.rs b/native/core/src/execution/operators/scan.rs index 90bb741b5e..9ac9e4586a 100644 --- a/native/core/src/execution/operators/scan.rs +++ b/native/core/src/execution/operators/scan.rs @@ -28,6 +28,7 @@ use arrow::compute::{cast_with_options, take, CastOptions}; use arrow::datatypes::{DataType, Field, Schema, SchemaRef}; use arrow::ffi::FFI_ArrowArray; use arrow::ffi::FFI_ArrowSchema; +use datafusion::common::tree_node::TreeNodeRecursion; use datafusion::common::{arrow_datafusion_err, DataFusionError, Result as DataFusionResult}; use datafusion::physical_plan::execution_plan::{Boundedness, EmissionType}; use datafusion::physical_plan::metrics::{ @@ -43,7 +44,6 @@ use itertools::Itertools; use jni::objects::{Global, JObject, JValue}; use std::rc::Rc; use std::{ - any::Any, pin::Pin, sync::{Arc, Mutex}, task::{Context, Poll}, @@ -383,8 +383,11 @@ fn schema_from_data_types(data_types: &[DataType]) -> SchemaRef { } impl ExecutionPlan for ScanExec { - fn as_any(&self) -> &dyn Any { - self + fn apply_expressions( + &self, + _f: &mut dyn FnMut(&dyn PhysicalExpr) -> DataFusionResult, + ) -> DataFusionResult { + Ok(TreeNodeRecursion::Continue) } fn schema(&self) -> SchemaRef { diff --git a/native/core/src/execution/operators/shuffle_scan.rs b/native/core/src/execution/operators/shuffle_scan.rs index 92c4dc8780..18ae134484 100644 --- a/native/core/src/execution/operators/shuffle_scan.rs +++ b/native/core/src/execution/operators/shuffle_scan.rs @@ -24,6 +24,7 @@ use crate::{ }; use arrow::array::ArrayRef; use arrow::datatypes::{DataType, Field, Schema, SchemaRef}; +use datafusion::common::tree_node::TreeNodeRecursion; use datafusion::common::{arrow_datafusion_err, Result as DataFusionResult}; use datafusion::physical_plan::execution_plan::{Boundedness, EmissionType}; use datafusion::physical_plan::metrics::{ @@ -37,7 +38,6 @@ use datafusion::{ use futures::Stream; use jni::objects::{Global, JByteBuffer, JObject}; use std::{ - any::Any, pin::Pin, sync::{Arc, Mutex}, task::{Context, Poll}, @@ -221,8 +221,11 @@ fn schema_from_data_types(data_types: &[DataType]) -> SchemaRef { } impl ExecutionPlan for ShuffleScanExec { - fn as_any(&self) -> &dyn Any { - self + fn apply_expressions( + &self, + _f: &mut dyn FnMut(&dyn PhysicalExpr) -> DataFusionResult, + ) -> DataFusionResult { + Ok(TreeNodeRecursion::Continue) } fn schema(&self) -> SchemaRef { diff --git a/native/core/src/execution/planner.rs b/native/core/src/execution/planner.rs index ac35925ace..7275470db1 100644 --- a/native/core/src/execution/planner.rs +++ b/native/core/src/execution/planner.rs @@ -1704,7 +1704,7 @@ impl PhysicalPlanner { hash_join.as_ref().swap_inputs(PartitionMode::Partitioned)?; let mut additional_native_plans = vec![]; - if swapped_hash_join.as_any().is::() { + if swapped_hash_join.is::() { // a projection was added to the hash join additional_native_plans.push(Arc::clone(swapped_hash_join.children()[0])); } diff --git a/native/shuffle/src/shuffle_writer.rs b/native/shuffle/src/shuffle_writer.rs index 4ac4fc287b..3cc46704be 100644 --- a/native/shuffle/src/shuffle_writer.rs +++ b/native/shuffle/src/shuffle_writer.rs @@ -25,7 +25,8 @@ use crate::partitioners::{ use crate::{CometPartitioning, CompressionCodec}; use async_trait::async_trait; use datafusion::common::exec_datafusion_err; -use datafusion::physical_expr::{EquivalenceProperties, Partitioning}; +use datafusion::common::tree_node::TreeNodeRecursion; +use datafusion::physical_expr::{EquivalenceProperties, Partitioning, PhysicalExpr}; use datafusion::physical_plan::execution_plan::{Boundedness, EmissionType}; use datafusion::physical_plan::EmptyRecordBatchStream; use datafusion::{ @@ -41,7 +42,6 @@ use datafusion::{ use datafusion_comet_common::tracing::with_trace_async; use futures::{StreamExt, TryFutureExt, TryStreamExt}; use std::{ - any::Any, fmt, fmt::{Debug, Formatter}, sync::Arc, @@ -120,15 +120,17 @@ impl DisplayAs for ShuffleWriterExec { #[async_trait] impl ExecutionPlan for ShuffleWriterExec { - /// Return a reference to Any that can be used for downcasting - fn as_any(&self) -> &dyn Any { - self - } - fn name(&self) -> &str { "ShuffleWriterExec" } + fn apply_expressions( + &self, + _f: &mut dyn FnMut(&dyn PhysicalExpr) -> Result, + ) -> Result { + Ok(TreeNodeRecursion::Continue) + } + fn metrics(&self) -> Option { Some(self.metrics.clone_inner()) } diff --git a/native/spark-expr/src/agg_funcs/avg.rs b/native/spark-expr/src/agg_funcs/avg.rs index 3760b42504..24a9a30991 100644 --- a/native/spark-expr/src/agg_funcs/avg.rs +++ b/native/spark-expr/src/agg_funcs/avg.rs @@ -28,7 +28,7 @@ use datafusion::logical_expr::{ Accumulator, AggregateUDFImpl, EmitTo, GroupsAccumulator, ReversedUDAF, Signature, }; use datafusion::physical_expr::expressions::format_state_name; -use std::{any::Any, sync::Arc}; +use std::sync::Arc; use arrow::array::ArrowNativeTypeOp; use datafusion::logical_expr::function::{AccumulatorArgs, StateFieldsArgs}; @@ -67,11 +67,6 @@ impl Avg { } impl AggregateUDFImpl for Avg { - /// Return a reference to Any that can be used for downcasting - fn as_any(&self) -> &dyn Any { - self - } - fn accumulator(&self, _acc_args: AccumulatorArgs) -> Result> { // All numeric types use Float64 accumulation after casting match (&self.input_data_type, &self.result_data_type) { @@ -239,7 +234,7 @@ where impl GroupsAccumulator for AvgGroupsAccumulator where T: ArrowNumericType + Send, - F: Fn(T::Native, i64) -> Result + Send, + F: Fn(T::Native, i64) -> Result + Send + 'static, { fn update_batch( &mut self, diff --git a/native/spark-expr/src/agg_funcs/avg_decimal.rs b/native/spark-expr/src/agg_funcs/avg_decimal.rs index 9e8a31afa5..2722add556 100644 --- a/native/spark-expr/src/agg_funcs/avg_decimal.rs +++ b/native/spark-expr/src/agg_funcs/avg_decimal.rs @@ -28,7 +28,7 @@ use datafusion::logical_expr::{ Accumulator, AggregateUDFImpl, EmitTo, GroupsAccumulator, ReversedUDAF, Signature, }; use datafusion::physical_expr::expressions::format_state_name; -use std::{any::Any, sync::Arc}; +use std::sync::Arc; use crate::utils::{build_bool_state, is_valid_decimal_precision, unlikely}; use crate::{decimal_sum_overflow_error, EvalMode, SparkErrorWithContext}; @@ -108,11 +108,6 @@ impl AvgDecimal { } impl AggregateUDFImpl for AvgDecimal { - /// Return a reference to Any that can be used for downcasting - fn as_any(&self) -> &dyn Any { - self - } - fn accumulator(&self, _acc_args: AccumulatorArgs) -> Result> { match (&self.sum_data_type, &self.result_data_type) { (Decimal128(sum_precision, sum_scale), Decimal128(target_precision, target_scale)) => { diff --git a/native/spark-expr/src/agg_funcs/correlation.rs b/native/spark-expr/src/agg_funcs/correlation.rs index 9803855e35..aebf322620 100644 --- a/native/spark-expr/src/agg_funcs/correlation.rs +++ b/native/spark-expr/src/agg_funcs/correlation.rs @@ -17,7 +17,7 @@ use arrow::compute::{and, filter, is_not_null}; -use std::{any::Any, sync::Arc}; +use std::sync::Arc; use crate::agg_funcs::covariance::CovarianceAccumulator; use crate::agg_funcs::stddev::StddevAccumulator; @@ -58,11 +58,6 @@ impl Correlation { } impl AggregateUDFImpl for Correlation { - /// Return a reference to Any that can be used for downcasting - fn as_any(&self) -> &dyn Any { - self - } - fn name(&self) -> &str { &self.name } diff --git a/native/spark-expr/src/agg_funcs/covariance.rs b/native/spark-expr/src/agg_funcs/covariance.rs index 15759eb155..a2256da525 100644 --- a/native/spark-expr/src/agg_funcs/covariance.rs +++ b/native/spark-expr/src/agg_funcs/covariance.rs @@ -29,7 +29,6 @@ use datafusion::logical_expr::type_coercion::aggregates::NUMERICS; use datafusion::logical_expr::{Accumulator, AggregateUDFImpl, Signature, Volatility}; use datafusion::physical_expr::expressions::format_state_name; use datafusion::physical_expr::expressions::StatsType; -use std::any::Any; use std::sync::Arc; /// COVAR_SAMP and COVAR_POP aggregate expression @@ -73,11 +72,6 @@ impl Covariance { } impl AggregateUDFImpl for Covariance { - /// Return a reference to Any that can be used for downcasting - fn as_any(&self) -> &dyn Any { - self - } - fn name(&self) -> &str { &self.name } diff --git a/native/spark-expr/src/agg_funcs/stddev.rs b/native/spark-expr/src/agg_funcs/stddev.rs index b231b8afa7..2b09339dc1 100644 --- a/native/spark-expr/src/agg_funcs/stddev.rs +++ b/native/spark-expr/src/agg_funcs/stddev.rs @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -use std::{any::Any, sync::Arc}; +use std::sync::Arc; use crate::agg_funcs::variance::VarianceAccumulator; use arrow::datatypes::FieldRef; @@ -78,11 +78,6 @@ impl Stddev { } impl AggregateUDFImpl for Stddev { - /// Return a reference to Any that can be used for downcasting - fn as_any(&self) -> &dyn Any { - self - } - fn name(&self) -> &str { &self.name } diff --git a/native/spark-expr/src/agg_funcs/sum_decimal.rs b/native/spark-expr/src/agg_funcs/sum_decimal.rs index 46db7f36b3..faa51252f8 100644 --- a/native/spark-expr/src/agg_funcs/sum_decimal.rs +++ b/native/spark-expr/src/agg_funcs/sum_decimal.rs @@ -27,7 +27,7 @@ use datafusion::logical_expr::Volatility::Immutable; use datafusion::logical_expr::{ Accumulator, AggregateUDFImpl, EmitTo, GroupsAccumulator, ReversedUDAF, Signature, }; -use std::{any::Any, sync::Arc}; +use std::sync::Arc; #[derive(Debug)] pub struct SumDecimal { @@ -99,10 +99,6 @@ impl SumDecimal { } impl AggregateUDFImpl for SumDecimal { - fn as_any(&self) -> &dyn Any { - self - } - fn accumulator(&self, _args: AccumulatorArgs) -> DFResult> { Ok(Box::new(SumDecimalAccumulator::new( self.precision, diff --git a/native/spark-expr/src/agg_funcs/sum_int.rs b/native/spark-expr/src/agg_funcs/sum_int.rs index 781528521b..7d1df1568b 100644 --- a/native/spark-expr/src/agg_funcs/sum_int.rs +++ b/native/spark-expr/src/agg_funcs/sum_int.rs @@ -29,7 +29,7 @@ use datafusion::logical_expr::Volatility::Immutable; use datafusion::logical_expr::{ Accumulator, AggregateUDFImpl, EmitTo, GroupsAccumulator, ReversedUDAF, Signature, }; -use std::{any::Any, sync::Arc}; +use std::sync::Arc; #[derive(Debug, PartialEq, Eq, Hash)] pub struct SumInteger { @@ -52,10 +52,6 @@ impl SumInteger { } impl AggregateUDFImpl for SumInteger { - fn as_any(&self) -> &dyn Any { - self - } - fn name(&self) -> &str { "sum" } diff --git a/native/spark-expr/src/agg_funcs/variance.rs b/native/spark-expr/src/agg_funcs/variance.rs index c97e664dd6..5f2c249da7 100644 --- a/native/spark-expr/src/agg_funcs/variance.rs +++ b/native/spark-expr/src/agg_funcs/variance.rs @@ -26,7 +26,6 @@ use datafusion::logical_expr::Volatility::Immutable; use datafusion::logical_expr::{Accumulator, AggregateUDFImpl, Signature}; use datafusion::physical_expr::expressions::format_state_name; use datafusion::physical_expr::expressions::StatsType; -use std::any::Any; use std::sync::Arc; /// VAR_SAMP and VAR_POP aggregate expression @@ -71,11 +70,6 @@ impl Variance { } impl AggregateUDFImpl for Variance { - /// Return a reference to Any that can be used for downcasting - fn as_any(&self) -> &dyn Any { - self - } - fn name(&self) -> &str { &self.name } diff --git a/native/spark-expr/src/array_funcs/array_compact.rs b/native/spark-expr/src/array_funcs/array_compact.rs index 4653f966a5..d481242705 100644 --- a/native/spark-expr/src/array_funcs/array_compact.rs +++ b/native/spark-expr/src/array_funcs/array_compact.rs @@ -33,7 +33,6 @@ use datafusion::common::{exec_err, utils::take_function_args, Result}; use datafusion::logical_expr::{ ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, TypeSignature, Volatility, }; -use std::any::Any; use std::sync::Arc; #[derive(Debug, PartialEq, Eq, Hash)] @@ -56,10 +55,6 @@ impl SparkArrayCompact { } impl ScalarUDFImpl for SparkArrayCompact { - fn as_any(&self) -> &dyn Any { - self - } - fn name(&self) -> &str { "spark_array_compact" } diff --git a/native/spark-expr/src/array_funcs/size.rs b/native/spark-expr/src/array_funcs/size.rs index 9777553341..f206b299d6 100644 --- a/native/spark-expr/src/array_funcs/size.rs +++ b/native/spark-expr/src/array_funcs/size.rs @@ -21,7 +21,6 @@ use datafusion::common::{exec_err, DataFusionError, Result as DataFusionResult, use datafusion::logical_expr::{ ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, Volatility, }; -use std::any::Any; use std::sync::Arc; /// Spark size() function that returns the size of arrays or maps. @@ -73,10 +72,6 @@ impl SparkSizeFunc { } impl ScalarUDFImpl for SparkSizeFunc { - fn as_any(&self) -> &dyn Any { - self - } - fn name(&self) -> &str { "size" } diff --git a/native/spark-expr/src/bloom_filter/bloom_filter_agg.rs b/native/spark-expr/src/bloom_filter/bloom_filter_agg.rs index 3436b29201..3e9e5f00ad 100644 --- a/native/spark-expr/src/bloom_filter/bloom_filter_agg.rs +++ b/native/spark-expr/src/bloom_filter/bloom_filter_agg.rs @@ -17,7 +17,7 @@ use arrow::datatypes::{Field, FieldRef}; use datafusion::{arrow::datatypes::DataType, logical_expr::Volatility}; -use std::{any::Any, sync::Arc}; +use std::sync::Arc; use crate::bloom_filter::spark_bloom_filter; use crate::bloom_filter::spark_bloom_filter::SparkBloomFilter; @@ -75,10 +75,6 @@ impl BloomFilterAgg { } impl AggregateUDFImpl for BloomFilterAgg { - fn as_any(&self) -> &dyn Any { - self - } - fn name(&self) -> &str { "bloom_filter_agg" } diff --git a/native/spark-expr/src/bloom_filter/bloom_filter_might_contain.rs b/native/spark-expr/src/bloom_filter/bloom_filter_might_contain.rs index ea246dfb25..66168444d9 100644 --- a/native/spark-expr/src/bloom_filter/bloom_filter_might_contain.rs +++ b/native/spark-expr/src/bloom_filter/bloom_filter_might_contain.rs @@ -22,7 +22,6 @@ use datafusion::error::DataFusionError; use datafusion::logical_expr::{ScalarFunctionArgs, ScalarUDFImpl, Signature, Volatility}; use datafusion::physical_expr::PhysicalExpr; use datafusion::physical_plan::ColumnarValue; -use std::any::Any; use std::sync::Arc; use crate::bloom_filter::spark_bloom_filter::SparkBloomFilter; @@ -63,10 +62,6 @@ fn evaluate_bloom_filter( } impl ScalarUDFImpl for BloomFilterMightContain { - fn as_any(&self) -> &dyn Any { - self - } - fn name(&self) -> &str { "might_contain" } diff --git a/native/spark-expr/src/comet_scalar_funcs.rs b/native/spark-expr/src/comet_scalar_funcs.rs index 9c91bb69c9..ac59dafa76 100644 --- a/native/spark-expr/src/comet_scalar_funcs.rs +++ b/native/spark-expr/src/comet_scalar_funcs.rs @@ -34,7 +34,6 @@ use datafusion::logical_expr::{ Volatility, }; use datafusion::physical_plan::ColumnarValue; -use std::any::Any; use std::fmt::Debug; use std::sync::Arc; @@ -269,10 +268,6 @@ impl CometScalarFunction { } impl ScalarUDFImpl for CometScalarFunction { - fn as_any(&self) -> &dyn Any { - self - } - fn name(&self) -> &str { self.name.as_str() } diff --git a/native/spark-expr/src/datetime_funcs/date_diff.rs b/native/spark-expr/src/datetime_funcs/date_diff.rs index ca148c103a..be3c1d3552 100644 --- a/native/spark-expr/src/datetime_funcs/date_diff.rs +++ b/native/spark-expr/src/datetime_funcs/date_diff.rs @@ -22,7 +22,6 @@ use datafusion::common::{utils::take_function_args, DataFusionError, Result}; use datafusion::logical_expr::{ ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, Volatility, }; -use std::any::Any; use std::sync::Arc; /// Spark-compatible date_diff function. @@ -52,10 +51,6 @@ impl Default for SparkDateDiff { } impl ScalarUDFImpl for SparkDateDiff { - fn as_any(&self) -> &dyn Any { - self - } - fn name(&self) -> &str { "date_diff" } diff --git a/native/spark-expr/src/datetime_funcs/date_trunc.rs b/native/spark-expr/src/datetime_funcs/date_trunc.rs index aeae18e36f..7ceb5234e1 100644 --- a/native/spark-expr/src/datetime_funcs/date_trunc.rs +++ b/native/spark-expr/src/datetime_funcs/date_trunc.rs @@ -22,7 +22,6 @@ use datafusion::common::{ use datafusion::logical_expr::{ ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, Volatility, }; -use std::any::Any; use crate::kernels::temporal::{date_trunc_array_fmt_dyn, date_trunc_dyn}; @@ -51,10 +50,6 @@ impl Default for SparkDateTrunc { } impl ScalarUDFImpl for SparkDateTrunc { - fn as_any(&self) -> &dyn Any { - self - } - fn name(&self) -> &str { "date_trunc" } diff --git a/native/spark-expr/src/datetime_funcs/extract_date_part.rs b/native/spark-expr/src/datetime_funcs/extract_date_part.rs index acb7d2266e..7344a3953a 100644 --- a/native/spark-expr/src/datetime_funcs/extract_date_part.rs +++ b/native/spark-expr/src/datetime_funcs/extract_date_part.rs @@ -22,7 +22,7 @@ use datafusion::common::{internal_datafusion_err, DataFusionError}; use datafusion::logical_expr::{ ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, Volatility, }; -use std::{any::Any, fmt::Debug}; +use std::fmt::Debug; macro_rules! extract_date_part { ($struct_name:ident, $fn_name:expr, $date_part_variant:ident) => { @@ -44,10 +44,6 @@ macro_rules! extract_date_part { } impl ScalarUDFImpl for $struct_name { - fn as_any(&self) -> &dyn Any { - self - } - fn name(&self) -> &str { $fn_name } diff --git a/native/spark-expr/src/datetime_funcs/make_date.rs b/native/spark-expr/src/datetime_funcs/make_date.rs index 58e4108580..ef29431703 100644 --- a/native/spark-expr/src/datetime_funcs/make_date.rs +++ b/native/spark-expr/src/datetime_funcs/make_date.rs @@ -23,7 +23,6 @@ use datafusion::common::{utils::take_function_args, DataFusionError, Result}; use datafusion::logical_expr::{ ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, Volatility, }; -use std::any::Any; use std::sync::Arc; /// Spark-compatible make_date function. @@ -75,10 +74,6 @@ fn make_date(year: i32, month: i32, day: i32) -> Option { } impl ScalarUDFImpl for SparkMakeDate { - fn as_any(&self) -> &dyn Any { - self - } - fn name(&self) -> &str { "make_date" } diff --git a/native/spark-expr/src/datetime_funcs/unix_timestamp.rs b/native/spark-expr/src/datetime_funcs/unix_timestamp.rs index c4f1576293..4b7df90559 100644 --- a/native/spark-expr/src/datetime_funcs/unix_timestamp.rs +++ b/native/spark-expr/src/datetime_funcs/unix_timestamp.rs @@ -24,7 +24,7 @@ use datafusion::logical_expr::{ ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, Volatility, }; use num::integer::div_floor; -use std::{any::Any, fmt::Debug, sync::Arc}; +use std::{fmt::Debug, sync::Arc}; const MICROS_PER_SECOND: i64 = 1_000_000; @@ -46,10 +46,6 @@ impl SparkUnixTimestamp { } impl ScalarUDFImpl for SparkUnixTimestamp { - fn as_any(&self) -> &dyn Any { - self - } - fn name(&self) -> &str { "unix_timestamp" } diff --git a/native/spark-expr/src/string_funcs/contains.rs b/native/spark-expr/src/string_funcs/contains.rs index bc34ce9cba..537227efdf 100644 --- a/native/spark-expr/src/string_funcs/contains.rs +++ b/native/spark-expr/src/string_funcs/contains.rs @@ -27,7 +27,6 @@ use datafusion::common::{exec_err, Result, ScalarValue}; use datafusion::logical_expr::{ ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, Volatility, }; -use std::any::Any; use std::sync::Arc; /// Spark-optimized contains function. @@ -53,10 +52,6 @@ impl SparkContains { } impl ScalarUDFImpl for SparkContains { - fn as_any(&self) -> &dyn Any { - self - } - fn name(&self) -> &str { "contains" } From 8d922b5df0fa063fa17ed8c7c3697e8b6bb44164 Mon Sep 17 00:00:00 2001 From: Matt Butrovich Date: Wed, 8 Apr 2026 17:41:01 -0400 Subject: [PATCH 02/30] fix expandexec --- native/core/src/execution/operators/expand.rs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/native/core/src/execution/operators/expand.rs b/native/core/src/execution/operators/expand.rs index c2c9c671d5..e2677d226d 100644 --- a/native/core/src/execution/operators/expand.rs +++ b/native/core/src/execution/operators/expand.rs @@ -95,16 +95,13 @@ impl ExecutionPlan for ExpandExec { &self, f: &mut dyn FnMut(&dyn PhysicalExpr) -> datafusion::common::Result, ) -> datafusion::common::Result { + let mut tnr = TreeNodeRecursion::Continue; for projection in &self.projections { for expr in projection { - match f(expr.as_ref())? { - TreeNodeRecursion::Continue => {} - TreeNodeRecursion::Jump => {} - TreeNodeRecursion::Stop => return Ok(TreeNodeRecursion::Stop), - } + tnr = tnr.visit_sibling(|| f(expr.as_ref()))?; } } - Ok(TreeNodeRecursion::Continue) + Ok(tnr) } fn schema(&self) -> SchemaRef { From b75c3211745da279dad9c96dd8a91040c4a52e5f Mon Sep 17 00:00:00 2001 From: Matt Butrovich Date: Wed, 15 Apr 2026 15:10:09 -0400 Subject: [PATCH 03/30] Bump commits. --- native/Cargo.lock | 227 ++++++++++++++--------------------------- native/Cargo.toml | 8 +- native/core/Cargo.toml | 2 +- 3 files changed, 84 insertions(+), 153 deletions(-) diff --git a/native/Cargo.lock b/native/Cargo.lock index 3dbaed308b..40ce9aebb3 100644 --- a/native/Cargo.lock +++ b/native/Cargo.lock @@ -372,7 +372,7 @@ dependencies = [ "arrow-schema", "chrono", "half", - "indexmap 2.13.1", + "indexmap 2.14.0", "itoa", "lexical-core", "memchr", @@ -1832,7 +1832,7 @@ dependencies = [ [[package]] name = "datafusion" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ "arrow", "arrow-schema", @@ -1879,7 +1879,7 @@ dependencies = [ [[package]] name = "datafusion-catalog" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ "arrow", "async-trait", @@ -1903,7 +1903,7 @@ dependencies = [ [[package]] name = "datafusion-catalog-listing" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ "arrow", "async-trait", @@ -2096,7 +2096,7 @@ dependencies = [ [[package]] name = "datafusion-common" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ "arrow", "arrow-ipc", @@ -2104,9 +2104,9 @@ dependencies = [ "chrono", "foldhash 0.2.0", "half", - "hashbrown 0.16.1", + "hashbrown 0.17.0", "hex", - "indexmap 2.13.1", + "indexmap 2.14.0", "itertools 0.14.0", "libc", "log", @@ -2121,7 +2121,7 @@ dependencies = [ [[package]] name = "datafusion-common-runtime" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ "futures", "log", @@ -2131,7 +2131,7 @@ dependencies = [ [[package]] name = "datafusion-datasource" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ "arrow", "async-compression", @@ -2165,7 +2165,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-arrow" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ "arrow", "arrow-ipc", @@ -2188,7 +2188,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-csv" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ "arrow", "async-trait", @@ -2210,7 +2210,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-json" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ "arrow", "async-trait", @@ -2232,7 +2232,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-parquet" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ "arrow", "async-trait", @@ -2262,12 +2262,12 @@ dependencies = [ [[package]] name = "datafusion-doc" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" [[package]] name = "datafusion-execution" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ "arrow", "arrow-buffer", @@ -2289,7 +2289,7 @@ dependencies = [ [[package]] name = "datafusion-expr" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ "arrow", "arrow-schema", @@ -2301,7 +2301,7 @@ dependencies = [ "datafusion-functions-aggregate-common", "datafusion-functions-window-common", "datafusion-physical-expr-common", - "indexmap 2.13.1", + "indexmap 2.14.0", "itertools 0.14.0", "serde_json", "sqlparser", @@ -2310,18 +2310,18 @@ dependencies = [ [[package]] name = "datafusion-expr-common" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ "arrow", "datafusion-common", - "indexmap 2.13.1", + "indexmap 2.14.0", "itertools 0.14.0", ] [[package]] name = "datafusion-functions" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ "arrow", "arrow-buffer", @@ -2345,14 +2345,13 @@ dependencies = [ "rand 0.9.2", "regex", "sha2", - "unicode-segmentation", "uuid", ] [[package]] name = "datafusion-functions-aggregate" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ "arrow", "datafusion-common", @@ -2372,7 +2371,7 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate-common" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ "arrow", "datafusion-common", @@ -2383,7 +2382,7 @@ dependencies = [ [[package]] name = "datafusion-functions-nested" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ "arrow", "arrow-ord", @@ -2397,7 +2396,7 @@ dependencies = [ "datafusion-functions-aggregate-common", "datafusion-macros", "datafusion-physical-expr-common", - "hashbrown 0.16.1", + "hashbrown 0.17.0", "itertools 0.14.0", "itoa", "log", @@ -2407,7 +2406,7 @@ dependencies = [ [[package]] name = "datafusion-functions-table" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ "arrow", "async-trait", @@ -2421,7 +2420,7 @@ dependencies = [ [[package]] name = "datafusion-functions-window" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ "arrow", "datafusion-common", @@ -2437,7 +2436,7 @@ dependencies = [ [[package]] name = "datafusion-functions-window-common" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ "datafusion-common", "datafusion-physical-expr-common", @@ -2446,7 +2445,7 @@ dependencies = [ [[package]] name = "datafusion-macros" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ "datafusion-doc", "quote", @@ -2456,7 +2455,7 @@ dependencies = [ [[package]] name = "datafusion-optimizer" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ "arrow", "chrono", @@ -2464,7 +2463,7 @@ dependencies = [ "datafusion-expr", "datafusion-expr-common", "datafusion-physical-expr", - "indexmap 2.13.1", + "indexmap 2.14.0", "itertools 0.14.0", "log", "regex", @@ -2474,7 +2473,7 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ "arrow", "datafusion-common", @@ -2483,8 +2482,8 @@ dependencies = [ "datafusion-functions-aggregate-common", "datafusion-physical-expr-common", "half", - "hashbrown 0.16.1", - "indexmap 2.13.1", + "hashbrown 0.17.0", + "indexmap 2.14.0", "itertools 0.14.0", "parking_lot", "petgraph", @@ -2494,7 +2493,7 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-adapter" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ "arrow", "datafusion-common", @@ -2508,14 +2507,14 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-common" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ "arrow", "chrono", "datafusion-common", "datafusion-expr-common", - "hashbrown 0.16.1", - "indexmap 2.13.1", + "hashbrown 0.17.0", + "indexmap 2.14.0", "itertools 0.14.0", "parking_lot", ] @@ -2523,7 +2522,7 @@ dependencies = [ [[package]] name = "datafusion-physical-optimizer" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ "arrow", "datafusion-common", @@ -2540,7 +2539,7 @@ dependencies = [ [[package]] name = "datafusion-physical-plan" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ "arrow", "arrow-ord", @@ -2557,8 +2556,8 @@ dependencies = [ "datafusion-physical-expr-common", "futures", "half", - "hashbrown 0.16.1", - "indexmap 2.13.1", + "hashbrown 0.17.0", + "indexmap 2.14.0", "itertools 0.14.0", "log", "num-traits", @@ -2570,7 +2569,7 @@ dependencies = [ [[package]] name = "datafusion-pruning" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ "arrow", "datafusion-common", @@ -2585,7 +2584,7 @@ dependencies = [ [[package]] name = "datafusion-session" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ "async-trait", "datafusion-common", @@ -2598,7 +2597,7 @@ dependencies = [ [[package]] name = "datafusion-spark" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ "arrow", "bigdecimal", @@ -2625,7 +2624,7 @@ dependencies = [ [[package]] name = "datafusion-sql" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?branch=dyncomparator#e0d06eea91e4649d853305c0224350dd2503d5f1" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ "arrow", "bigdecimal", @@ -2633,7 +2632,7 @@ dependencies = [ "datafusion-common", "datafusion-expr", "datafusion-functions-nested", - "indexmap 2.13.1", + "indexmap 2.14.0", "log", "regex", "sqlparser", @@ -2854,7 +2853,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -3202,7 +3201,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.4.0", - "indexmap 2.13.1", + "indexmap 2.14.0", "slab", "tokio", "tokio-util", @@ -3247,6 +3246,12 @@ name = "hashbrown" version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" + +[[package]] +name = "hashbrown" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51" dependencies = [ "allocator-api2", "equivalent", @@ -3677,12 +3682,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.13.1" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a8a2b9cb3e0b0c1803dbb0758ffac5de2f425b23c28f518faabd9d805342ff" +checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" dependencies = [ "equivalent", - "hashbrown 0.16.1", + "hashbrown 0.17.0", "serde", "serde_core", ] @@ -3694,7 +3699,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "232929e1d75fe899576a3d5c7416ad0d88dbfbb3c3d6aa00873a7408a50ddb88" dependencies = [ "ahash", - "indexmap 2.13.1", + "indexmap 2.14.0", "is-terminal", "itoa", "log", @@ -3754,7 +3759,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -3810,7 +3815,7 @@ dependencies = [ "portable-atomic-util", "serde_core", "wasm-bindgen", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -4047,9 +4052,9 @@ checksum = "2c4a545a15244c7d945065b5d392b2d2d7f21526fba56ce51467b06ed445e8f7" [[package]] name = "libc" -version = "0.2.184" +version = "0.2.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48f5d2a454e16a5ea0f4ced81bd44e4cfc7bd3a507b61887c99fd3538b28e4af" +checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f" [[package]] name = "libloading" @@ -4750,7 +4755,7 @@ dependencies = [ "arrow-schema", "chrono", "half", - "indexmap 2.13.1", + "indexmap 2.14.0", "simdutf8", "uuid", ] @@ -4765,7 +4770,7 @@ dependencies = [ "arrow-schema", "chrono", "half", - "indexmap 2.13.1", + "indexmap 2.14.0", "parquet-variant", "parquet-variant-json", "serde_json", @@ -4841,7 +4846,7 @@ checksum = "8701b58ea97060d5e5b155d383a69952a60943f0e6dfe30b04c287beb0b27455" dependencies = [ "fixedbitset", "hashbrown 0.15.5", - "indexmap 2.13.1", + "indexmap 2.14.0", "serde", ] @@ -5125,7 +5130,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "343d3bd7056eda839b03204e68deff7d1b13aba7af2b2fd16890697274262ee7" dependencies = [ "heck", - "itertools 0.14.0", + "itertools 0.13.0", "log", "multimap", "petgraph", @@ -5144,7 +5149,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b" dependencies = [ "anyhow", - "itertools 0.14.0", + "itertools 0.13.0", "proc-macro2", "quote", "syn 2.0.117", @@ -5256,7 +5261,7 @@ dependencies = [ "once_cell", "socket2", "tracing", - "windows-sys 0.60.2", + "windows-sys 0.59.0", ] [[package]] @@ -5651,7 +5656,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.12.1", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -5923,7 +5928,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.13.1", + "indexmap 2.14.0", "schemars 0.9.0", "schemars 1.2.1", "serde_core", @@ -5950,7 +5955,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.13.1", + "indexmap 2.14.0", "itoa", "ryu", "serde", @@ -6256,7 +6261,7 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix 1.1.4", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -6875,7 +6880,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" dependencies = [ "anyhow", - "indexmap 2.13.1", + "indexmap 2.14.0", "wasm-encoder", "wasmparser", ] @@ -6901,7 +6906,7 @@ checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" dependencies = [ "bitflags 2.11.0", "hashbrown 0.15.5", - "indexmap 2.13.1", + "indexmap 2.14.0", "semver", ] @@ -6968,7 +6973,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -7063,15 +7068,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-sys" -version = "0.60.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" -dependencies = [ - "windows-targets 0.53.5", -] - [[package]] name = "windows-sys" version = "0.61.2" @@ -7105,30 +7101,13 @@ dependencies = [ "windows_aarch64_gnullvm 0.52.6", "windows_aarch64_msvc 0.52.6", "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm 0.52.6", + "windows_i686_gnullvm", "windows_i686_msvc 0.52.6", "windows_x86_64_gnu 0.52.6", "windows_x86_64_gnullvm 0.52.6", "windows_x86_64_msvc 0.52.6", ] -[[package]] -name = "windows-targets" -version = "0.53.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" -dependencies = [ - "windows-link", - "windows_aarch64_gnullvm 0.53.1", - "windows_aarch64_msvc 0.53.1", - "windows_i686_gnu 0.53.1", - "windows_i686_gnullvm 0.53.1", - "windows_i686_msvc 0.53.1", - "windows_x86_64_gnu 0.53.1", - "windows_x86_64_gnullvm 0.53.1", - "windows_x86_64_msvc 0.53.1", -] - [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" @@ -7141,12 +7120,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" - [[package]] name = "windows_aarch64_msvc" version = "0.42.2" @@ -7159,12 +7132,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" -[[package]] -name = "windows_aarch64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" - [[package]] name = "windows_i686_gnu" version = "0.42.2" @@ -7177,24 +7144,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" -[[package]] -name = "windows_i686_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" - [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" -[[package]] -name = "windows_i686_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" - [[package]] name = "windows_i686_msvc" version = "0.42.2" @@ -7207,12 +7162,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" -[[package]] -name = "windows_i686_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" - [[package]] name = "windows_x86_64_gnu" version = "0.42.2" @@ -7225,12 +7174,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" -[[package]] -name = "windows_x86_64_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" - [[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" @@ -7243,12 +7186,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" - [[package]] name = "windows_x86_64_msvc" version = "0.42.2" @@ -7261,12 +7198,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" -[[package]] -name = "windows_x86_64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" - [[package]] name = "wit-bindgen" version = "0.51.0" @@ -7295,7 +7226,7 @@ checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" dependencies = [ "anyhow", "heck", - "indexmap 2.13.1", + "indexmap 2.14.0", "prettyplease", "syn 2.0.117", "wasm-metadata", @@ -7326,7 +7257,7 @@ checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" dependencies = [ "anyhow", "bitflags 2.11.0", - "indexmap 2.13.1", + "indexmap 2.14.0", "log", "serde", "serde_derive", @@ -7345,7 +7276,7 @@ checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" dependencies = [ "anyhow", "id-arena", - "indexmap 2.13.1", + "indexmap 2.14.0", "log", "semver", "serde", diff --git a/native/Cargo.toml b/native/Cargo.toml index 6e66056b55..1e1055bfd0 100644 --- a/native/Cargo.toml +++ b/native/Cargo.toml @@ -38,10 +38,10 @@ arrow = { version = "58.1.0", features = ["prettyprint", "ffi", "chrono-tz"] } async-trait = { version = "0.1" } bytes = { version = "1.11.1" } parquet = { version = "58.1.0", default-features = false, features = ["experimental"] } -datafusion = { git = "https://github.com/mbutrovich/datafusion.git", branch = "dyncomparator", default-features = false, features = ["unicode_expressions", "crypto_expressions", "nested_expressions", "parquet"] } -datafusion-datasource = { git = "https://github.com/mbutrovich/datafusion.git", branch = "dyncomparator" } -datafusion-physical-expr-adapter = { git = "https://github.com/mbutrovich/datafusion.git", branch = "dyncomparator" } -datafusion-spark = { git = "https://github.com/mbutrovich/datafusion.git", branch = "dyncomparator", features = ["core"] } +datafusion = { git = "https://github.com/mbutrovich/datafusion.git", rev = "0198302544", default-features = false, features = ["unicode_expressions", "crypto_expressions", "nested_expressions", "parquet"] } +datafusion-datasource = { git = "https://github.com/mbutrovich/datafusion.git", rev = "0198302544" } +datafusion-physical-expr-adapter = { git = "https://github.com/mbutrovich/datafusion.git", rev = "0198302544" } +datafusion-spark = { git = "https://github.com/mbutrovich/datafusion.git", rev = "0198302544", features = ["core"] } datafusion-comet-spark-expr = { path = "spark-expr" } datafusion-comet-common = { path = "common" } datafusion-comet-jni-bridge = { path = "jni-bridge" } diff --git a/native/core/Cargo.toml b/native/core/Cargo.toml index c922493d20..2bfb720379 100644 --- a/native/core/Cargo.toml +++ b/native/core/Cargo.toml @@ -91,7 +91,7 @@ jni = { version = "0.22.4", features = ["invocation"] } lazy_static = "1.4" assertables = "9" hex = "0.4.3" -datafusion-functions-nested = { git = "https://github.com/mbutrovich/datafusion.git", branch = "dyncomparator" } +datafusion-functions-nested = { git = "https://github.com/mbutrovich/datafusion.git", rev = "0198302544" } [features] backtrace = ["datafusion/backtrace"] From af84b738e5f929690d341f5d10ca2e9bd2941918 Mon Sep 17 00:00:00 2001 From: Matt Butrovich Date: Wed, 15 Apr 2026 15:26:09 -0400 Subject: [PATCH 04/30] Fix. --- native/Cargo.lock | 2 +- native/core/src/parquet/schema_adapter.rs | 20 +++++++++++++------ .../src/datetime_funcs/date_from_unix_date.rs | 5 ----- native/spark-expr/src/datetime_funcs/hours.rs | 6 +----- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/native/Cargo.lock b/native/Cargo.lock index d7a742df72..d92ee9261b 100644 --- a/native/Cargo.lock +++ b/native/Cargo.lock @@ -5888,7 +5888,7 @@ version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" dependencies = [ - "indexmap 2.13.1", + "indexmap 2.14.0", "itoa", "memchr", "serde", diff --git a/native/core/src/parquet/schema_adapter.rs b/native/core/src/parquet/schema_adapter.rs index af79d9082d..593a0c063a 100644 --- a/native/core/src/parquet/schema_adapter.rs +++ b/native/core/src/parquet/schema_adapter.rs @@ -370,21 +370,29 @@ impl SparkPhysicalExprAdapter { .data() } - /// Replace CastColumnExpr (DataFusion's cast) with Spark's Cast expression. + /// Replace CastExpr (DataFusion's cast) with Spark's Cast expression. fn replace_with_spark_cast( &self, expr: Arc, ) -> DataFusionResult>> { - // Check for CastColumnExpr and replace with spark_expr::Cast - // CastColumnExpr is in datafusion_physical_expr::expressions + // Check for CastExpr and replace with spark_expr::Cast if let Some(cast) = expr .as_any() - .downcast_ref::() + .downcast_ref::() { let child = Arc::clone(cast.expr()); - let physical_type = cast.input_field().data_type(); let target_type = cast.target_field().data_type(); + // Derive input field from the child Column expression and the physical schema + let input_field = if let Some(col) = child.as_any().downcast_ref::() { + Arc::new(self.physical_file_schema.field(col.index()).clone()) + } else { + // Fallback: synthesize a field from the target field name and child data type + let child_type = cast.expr().data_type(&self.physical_file_schema)?; + Arc::new(Field::new(cast.target_field().name(), child_type, true)) + }; + let physical_type = input_field.data_type(); + // For complex nested types (Struct, List, Map), Timestamp timezone // mismatches, and Timestamp→Int64 (nanosAsLong), use CometCastColumnExpr // with spark_parquet_convert which handles field-name-based selection, @@ -413,7 +421,7 @@ impl SparkPhysicalExprAdapter { let comet_cast: Arc = Arc::new( CometCastColumnExpr::new( child, - Arc::clone(cast.input_field()), + input_field, Arc::clone(cast.target_field()), None, ) diff --git a/native/spark-expr/src/datetime_funcs/date_from_unix_date.rs b/native/spark-expr/src/datetime_funcs/date_from_unix_date.rs index 1c88fc47ab..0e624e6472 100644 --- a/native/spark-expr/src/datetime_funcs/date_from_unix_date.rs +++ b/native/spark-expr/src/datetime_funcs/date_from_unix_date.rs @@ -21,7 +21,6 @@ use datafusion::common::{utils::take_function_args, DataFusionError, Result, Sca use datafusion::logical_expr::{ ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, Volatility, }; -use std::any::Any; use std::sync::Arc; /// Spark-compatible date_from_unix_date function. @@ -48,10 +47,6 @@ impl Default for SparkDateFromUnixDate { } impl ScalarUDFImpl for SparkDateFromUnixDate { - fn as_any(&self) -> &dyn Any { - self - } - fn name(&self) -> &str { "date_from_unix_date" } diff --git a/native/spark-expr/src/datetime_funcs/hours.rs b/native/spark-expr/src/datetime_funcs/hours.rs index ea3ef742a4..26ec35ef25 100644 --- a/native/spark-expr/src/datetime_funcs/hours.rs +++ b/native/spark-expr/src/datetime_funcs/hours.rs @@ -32,7 +32,7 @@ use datafusion::logical_expr::{ ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, Volatility, }; use num::integer::div_floor; -use std::{any::Any, fmt::Debug, sync::Arc}; +use std::{fmt::Debug, sync::Arc}; const MICROS_PER_HOUR: i64 = 3_600_000_000; @@ -56,10 +56,6 @@ impl Default for SparkHoursTransform { } impl ScalarUDFImpl for SparkHoursTransform { - fn as_any(&self) -> &dyn Any { - self - } - fn name(&self) -> &str { "hours_transform" } From e19aa50a7e9a52df18933e57f4b6bc2efd5fd24e Mon Sep 17 00:00:00 2001 From: Matt Butrovich Date: Wed, 15 Apr 2026 17:05:28 -0400 Subject: [PATCH 05/30] Fix metrics aggregation for native scan. --- native/core/src/execution/metrics/utils.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/native/core/src/execution/metrics/utils.rs b/native/core/src/execution/metrics/utils.rs index eb7e10bfc9..8547c0c3ca 100644 --- a/native/core/src/execution/metrics/utils.rs +++ b/native/core/src/execution/metrics/utils.rs @@ -68,9 +68,13 @@ pub(crate) fn to_native_metric_node( Some(metrics.aggregate_by_name()) }; - // add metrics + // Aggregate metrics by name using DataFusion's aggregate_by_name(), which + // correctly handles duplicate metric names (e.g. BaselineMetrics registered + // by both FileStream and ParquetMorselizer on the same ExecutionPlanMetricsSet). + // The additional_native_plans branch below already does this. node_metrics .unwrap_or_default() + .aggregate_by_name() .iter() .map(|m| m.value()) .map(|m| (m.name(), m.as_usize() as i64)) From e798f9a451097aecbc2507002d771f71d4bcaf08 Mon Sep 17 00:00:00 2001 From: Matt Butrovich Date: Wed, 15 Apr 2026 17:25:11 -0400 Subject: [PATCH 06/30] enable SMJ with filter by default --- common/src/main/scala/org/apache/comet/CometConf.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common/src/main/scala/org/apache/comet/CometConf.scala b/common/src/main/scala/org/apache/comet/CometConf.scala index 046ccf0b1c..eede60eb76 100644 --- a/common/src/main/scala/org/apache/comet/CometConf.scala +++ b/common/src/main/scala/org/apache/comet/CometConf.scala @@ -313,9 +313,10 @@ object CometConf extends ShimCometConf { val COMET_EXEC_SORT_MERGE_JOIN_WITH_JOIN_FILTER_ENABLED: ConfigEntry[Boolean] = conf("spark.comet.exec.sortMergeJoinWithJoinFilter.enabled") .category(CATEGORY_ENABLE_EXEC) - .doc("Experimental support for Sort Merge Join with filter") + .doc("Support for Sort Merge Join with filter. " + + "Deprecated: this config will be removed in a future release.") .booleanConf - .createWithDefault(false) + .createWithDefault(true) val COMET_TRACING_ENABLED: ConfigEntry[Boolean] = conf("spark.comet.tracing.enabled") .category(CATEGORY_TUNING) From 4236c2709f092b8999f7a176beb9beb86ebf8405 Mon Sep 17 00:00:00 2001 From: Matt Butrovich Date: Wed, 15 Apr 2026 20:03:11 -0400 Subject: [PATCH 07/30] add test for SPARK-43113 --- .../apache/comet/exec/CometJoinSuite.scala | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/spark/src/test/scala/org/apache/comet/exec/CometJoinSuite.scala b/spark/src/test/scala/org/apache/comet/exec/CometJoinSuite.scala index 49fbe10c30..c96332b66b 100644 --- a/spark/src/test/scala/org/apache/comet/exec/CometJoinSuite.scala +++ b/spark/src/test/scala/org/apache/comet/exec/CometJoinSuite.scala @@ -443,4 +443,40 @@ class CometJoinSuite extends CometTestBase { } } } + + // Reproducer for SPARK-43113: full outer SMJ with a join filter that references + // a nullable column should not match when the filter evaluates to NULL. + test("SPARK-43113: Full outer SMJ with NULL in join filter") { + withTempView("l", "r") { + // testData2: (a, b) — all non-null + Seq((1, 1), (1, 2), (2, 1), (2, 2), (3, 1), (3, 2)) + .toDF("a", "b") + .createOrReplaceTempView("l") + + // testData3: (a, b) — b is nullable + Seq((1, None), (2, Some(2))) + .toDF("a", "b") + .createOrReplaceTempView("r") + + val query = + """select /*+ MERGE(r) */ * + |from l + |full outer join r + |on l.a = r.a + |and l.b < (r.b + 1) + |and l.b < (r.a + 1)""".stripMargin + + val expected = Seq( + (Some(1), Some(1), None, None), + (Some(1), Some(2), None, None), + (None, None, Some(1), None), + (Some(2), Some(1), Some(2), Some(2)), + (Some(2), Some(2), Some(2), Some(2)), + (Some(3), Some(1), None, None), + (Some(3), Some(2), None, None)).toDF("a", "b", "a", "b") + + val df = sql(query) + checkAnswer(df, expected) + } + } } From 3bff80bce805628dfad39ffc3301fb82883647b9 Mon Sep 17 00:00:00 2001 From: Matt Butrovich Date: Wed, 15 Apr 2026 20:56:15 -0400 Subject: [PATCH 08/30] test https://github.com/apache/datafusion/pull/21660 --- native/Cargo.lock | 767 +++++++++++++++++++++++++++++++--------------- native/Cargo.toml | 8 +- 2 files changed, 531 insertions(+), 244 deletions(-) diff --git a/native/Cargo.lock b/native/Cargo.lock index d92ee9261b..08e4493ca2 100644 --- a/native/Cargo.lock +++ b/native/Cargo.lock @@ -189,7 +189,7 @@ dependencies = [ "miniz_oxide", "num-bigint", "quad-rand", - "rand 0.9.2", + "rand 0.9.4", "regex-lite", "serde", "serde_bytes", @@ -415,7 +415,7 @@ version = "58.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c30a1365d7a7dc50cc847e54154e6af49e4c4b0fddc9f607b687f29212082743" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.11.1", "serde_core", "serde_json", ] @@ -459,9 +459,9 @@ checksum = "b0f477b951e452a0b6b4a10b53ccd569042d1d01729b519e02074a9c0958a063" [[package]] name = "assertables" -version = "9.8.6" +version = "9.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "098fbfe90e8af520c4a968eaad7a4031908e473394f16c99cd9cce6369328a68" +checksum = "627b0b35c347252505ec6c078827dfcecc4e9dcfa931c54c54066f9245ac752b" dependencies = [ "regex", "walkdir", @@ -668,9 +668,9 @@ dependencies = [ [[package]] name = "aws-lc-rs" -version = "1.16.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a054912289d18629dc78375ba2c3726a3afe3ff71b4edba9dedfca0e3446d1fc" +checksum = "0ec6fb3fe69024a75fa7e1bfb48aa6cf59706a101658ea01bfd33b2b248a038f" dependencies = [ "aws-lc-sys", "zeroize", @@ -678,9 +678,9 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.39.1" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a25cf98105baa966497416dbd42565ce3a8cf8dbfd59803ec9ad46f3126399" +checksum = "f50037ee5e1e41e7b8f9d161680a725bd1626cb6f8c7e901f91f942850852fe7" dependencies = [ "cc", "cmake", @@ -1076,7 +1076,7 @@ version = "0.72.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.11.1", "cexpr", "clang-sys", "itertools 0.13.0", @@ -1098,9 +1098,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af" +checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3" [[package]] name = "blake2" @@ -1281,9 +1281,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.59" +version = "1.2.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7a4d3ec6524d28a329fc53654bbadc9bdd7b0431f5d65f1a56ffb28a1ee5283" +checksum = "43c5703da9466b66a946814e1adf53ea2c90f10063b86290cc9eb67ce3478a20" dependencies = [ "find-msvc-tools", "jobserver", @@ -1326,7 +1326,7 @@ checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601" dependencies = [ "cfg-if", "cpufeatures 0.3.0", - "rand_core 0.10.0", + "rand_core 0.10.1", ] [[package]] @@ -1403,9 +1403,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.6.0" +version = "4.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b193af5b67834b676abd72466a96c1024e6a6ad978a1f484bd90b85c94041351" +checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51" dependencies = [ "clap_builder", "clap_derive", @@ -1425,9 +1425,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.6.0" +version = "4.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1110bd8a634a1ab8cb04345d8d878267d57c3cf1b38d91b71af6686408bbca6a" +checksum = "f2ce8604710f6733aa641a2b3731eaa1e8b3d9973d5e3565da11800813f997a9" dependencies = [ "heck", "proc-macro2", @@ -1832,7 +1832,7 @@ dependencies = [ [[package]] name = "datafusion" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" dependencies = [ "arrow", "arrow-schema", @@ -1840,25 +1840,25 @@ dependencies = [ "chrono", "datafusion-catalog", "datafusion-catalog-listing", - "datafusion-common", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "datafusion-common-runtime", "datafusion-datasource", "datafusion-datasource-arrow", "datafusion-datasource-csv", "datafusion-datasource-json", "datafusion-datasource-parquet", - "datafusion-execution", - "datafusion-expr", - "datafusion-expr-common", - "datafusion-functions", - "datafusion-functions-aggregate", - "datafusion-functions-nested", + "datafusion-execution 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-functions 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-functions-aggregate 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-functions-nested 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "datafusion-functions-table", "datafusion-functions-window", "datafusion-optimizer", - "datafusion-physical-expr", + "datafusion-physical-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "datafusion-physical-expr-adapter", - "datafusion-physical-expr-common", + "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "datafusion-physical-optimizer", "datafusion-physical-plan", "datafusion-session", @@ -1879,17 +1879,17 @@ dependencies = [ [[package]] name = "datafusion-catalog" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" dependencies = [ "arrow", "async-trait", "dashmap", - "datafusion-common", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "datafusion-common-runtime", "datafusion-datasource", - "datafusion-execution", - "datafusion-expr", - "datafusion-physical-expr", + "datafusion-execution 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-physical-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "datafusion-physical-plan", "datafusion-session", "futures", @@ -1903,18 +1903,18 @@ dependencies = [ [[package]] name = "datafusion-catalog-listing" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" dependencies = [ "arrow", "async-trait", "datafusion-catalog", - "datafusion-common", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "datafusion-datasource", - "datafusion-execution", - "datafusion-expr", - "datafusion-physical-expr", + "datafusion-execution 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-physical-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "datafusion-physical-expr-adapter", - "datafusion-physical-expr-common", + "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "datafusion-physical-plan", "futures", "itertools 0.14.0", @@ -1941,7 +1941,7 @@ dependencies = [ "datafusion-comet-shuffle", "datafusion-comet-spark-expr", "datafusion-datasource", - "datafusion-functions-nested", + "datafusion-functions-nested 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", "datafusion-physical-expr-adapter", "datafusion-spark", "futures", @@ -2097,6 +2097,27 @@ dependencies = [ name = "datafusion-common" version = "53.0.0" source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" +dependencies = [ + "arrow", + "arrow-ipc", + "arrow-schema", + "chrono", + "foldhash 0.2.0", + "half", + "hashbrown 0.17.0", + "indexmap 2.14.0", + "itertools 0.14.0", + "libc", + "log", + "tokio", + "uuid", + "web-time", +] + +[[package]] +name = "datafusion-common" +version = "53.0.0" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" dependencies = [ "arrow", "arrow-ipc", @@ -2121,7 +2142,7 @@ dependencies = [ [[package]] name = "datafusion-common-runtime" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" dependencies = [ "futures", "log", @@ -2131,7 +2152,7 @@ dependencies = [ [[package]] name = "datafusion-datasource" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" dependencies = [ "arrow", "async-compression", @@ -2139,13 +2160,13 @@ dependencies = [ "bytes", "bzip2", "chrono", - "datafusion-common", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "datafusion-common-runtime", - "datafusion-execution", - "datafusion-expr", - "datafusion-physical-expr", + "datafusion-execution 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-physical-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "datafusion-physical-expr-adapter", - "datafusion-physical-expr-common", + "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "datafusion-physical-plan", "datafusion-session", "flate2", @@ -2155,7 +2176,7 @@ dependencies = [ "liblzma", "log", "object_store", - "rand 0.9.2", + "rand 0.9.4", "tokio", "tokio-util", "url", @@ -2165,18 +2186,18 @@ dependencies = [ [[package]] name = "datafusion-datasource-arrow" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" dependencies = [ "arrow", "arrow-ipc", "async-trait", "bytes", - "datafusion-common", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "datafusion-common-runtime", "datafusion-datasource", - "datafusion-execution", - "datafusion-expr", - "datafusion-physical-expr-common", + "datafusion-execution 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "datafusion-physical-plan", "datafusion-session", "futures", @@ -2188,17 +2209,17 @@ dependencies = [ [[package]] name = "datafusion-datasource-csv" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" dependencies = [ "arrow", "async-trait", "bytes", - "datafusion-common", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "datafusion-common-runtime", "datafusion-datasource", - "datafusion-execution", - "datafusion-expr", - "datafusion-physical-expr-common", + "datafusion-execution 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "datafusion-physical-plan", "datafusion-session", "futures", @@ -2210,17 +2231,17 @@ dependencies = [ [[package]] name = "datafusion-datasource-json" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" dependencies = [ "arrow", "async-trait", "bytes", - "datafusion-common", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "datafusion-common-runtime", "datafusion-datasource", - "datafusion-execution", - "datafusion-expr", - "datafusion-physical-expr-common", + "datafusion-execution 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "datafusion-physical-plan", "datafusion-session", "futures", @@ -2232,21 +2253,21 @@ dependencies = [ [[package]] name = "datafusion-datasource-parquet" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" dependencies = [ "arrow", "async-trait", "bytes", - "datafusion-common", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "datafusion-common-runtime", "datafusion-datasource", - "datafusion-execution", - "datafusion-expr", - "datafusion-functions", - "datafusion-functions-aggregate-common", - "datafusion-physical-expr", + "datafusion-execution 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-functions 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-functions-aggregate-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-physical-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "datafusion-physical-expr-adapter", - "datafusion-physical-expr-common", + "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "datafusion-physical-plan", "datafusion-pruning", "datafusion-session", @@ -2264,6 +2285,11 @@ name = "datafusion-doc" version = "53.0.0" source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" +[[package]] +name = "datafusion-doc" +version = "53.0.0" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" + [[package]] name = "datafusion-execution" version = "53.0.0" @@ -2273,15 +2299,36 @@ dependencies = [ "arrow-buffer", "async-trait", "dashmap", - "datafusion-common", - "datafusion-expr", - "datafusion-physical-expr-common", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "futures", + "log", + "object_store", + "parking_lot", + "rand 0.9.4", + "tempfile", + "url", +] + +[[package]] +name = "datafusion-execution" +version = "53.0.0" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +dependencies = [ + "arrow", + "arrow-buffer", + "async-trait", + "dashmap", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "futures", "log", "object_store", "parking_lot", "parquet", - "rand 0.9.2", + "rand 0.9.4", "tempfile", "url", ] @@ -2295,12 +2342,33 @@ dependencies = [ "arrow-schema", "async-trait", "chrono", - "datafusion-common", - "datafusion-doc", - "datafusion-expr-common", - "datafusion-functions-aggregate-common", - "datafusion-functions-window-common", - "datafusion-physical-expr-common", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-doc 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-functions-aggregate-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-functions-window-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "indexmap 2.14.0", + "itertools 0.14.0", + "serde_json", + "sqlparser", +] + +[[package]] +name = "datafusion-expr" +version = "53.0.0" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +dependencies = [ + "arrow", + "arrow-schema", + "async-trait", + "chrono", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-doc 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-functions-aggregate-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-functions-window-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "indexmap 2.14.0", "itertools 0.14.0", "serde_json", @@ -2313,7 +2381,18 @@ version = "53.0.0" source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ "arrow", - "datafusion-common", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "indexmap 2.14.0", + "itertools 0.14.0", +] + +[[package]] +name = "datafusion-expr-common" +version = "53.0.0" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +dependencies = [ + "arrow", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "indexmap 2.14.0", "itertools 0.14.0", ] @@ -2322,6 +2401,32 @@ dependencies = [ name = "datafusion-functions" version = "53.0.0" source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" +dependencies = [ + "arrow", + "arrow-buffer", + "base64", + "chrono", + "chrono-tz", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-doc 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-execution 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-macros 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "hex", + "itertools 0.14.0", + "log", + "memchr", + "num-traits", + "rand 0.9.4", + "regex", + "uuid", +] + +[[package]] +name = "datafusion-functions" +version = "53.0.0" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" dependencies = [ "arrow", "arrow-buffer", @@ -2330,19 +2435,19 @@ dependencies = [ "blake3", "chrono", "chrono-tz", - "datafusion-common", - "datafusion-doc", - "datafusion-execution", - "datafusion-expr", - "datafusion-expr-common", - "datafusion-macros", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-doc 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-execution 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-macros 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "hex", "itertools 0.14.0", "log", "md-5", "memchr", "num-traits", - "rand 0.9.2", + "rand 0.9.4", "regex", "sha2", "uuid", @@ -2354,14 +2459,34 @@ version = "53.0.0" source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ "arrow", - "datafusion-common", - "datafusion-doc", - "datafusion-execution", - "datafusion-expr", - "datafusion-functions-aggregate-common", - "datafusion-macros", - "datafusion-physical-expr", - "datafusion-physical-expr-common", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-doc 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-execution 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-functions-aggregate-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-macros 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-physical-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "foldhash 0.2.0", + "half", + "log", + "num-traits", +] + +[[package]] +name = "datafusion-functions-aggregate" +version = "53.0.0" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +dependencies = [ + "arrow", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-doc 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-execution 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-functions-aggregate-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-macros 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-physical-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "foldhash 0.2.0", "half", "log", @@ -2374,9 +2499,20 @@ version = "53.0.0" source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ "arrow", - "datafusion-common", - "datafusion-expr-common", - "datafusion-physical-expr-common", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", +] + +[[package]] +name = "datafusion-functions-aggregate-common" +version = "53.0.0" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +dependencies = [ + "arrow", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", ] [[package]] @@ -2386,16 +2522,40 @@ source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#019830 dependencies = [ "arrow", "arrow-ord", - "datafusion-common", - "datafusion-doc", - "datafusion-execution", - "datafusion-expr", - "datafusion-expr-common", - "datafusion-functions", - "datafusion-functions-aggregate", - "datafusion-functions-aggregate-common", - "datafusion-macros", - "datafusion-physical-expr-common", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-doc 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-execution 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-functions 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-functions-aggregate 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-functions-aggregate-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-macros 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "hashbrown 0.17.0", + "itertools 0.14.0", + "itoa", + "log", + "memchr", +] + +[[package]] +name = "datafusion-functions-nested" +version = "53.0.0" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +dependencies = [ + "arrow", + "arrow-ord", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-doc 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-execution 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-functions 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-functions-aggregate 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-functions-aggregate-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-macros 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "hashbrown 0.17.0", "itertools 0.14.0", "itoa", @@ -2406,13 +2566,13 @@ dependencies = [ [[package]] name = "datafusion-functions-table" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" dependencies = [ "arrow", "async-trait", "datafusion-catalog", - "datafusion-common", - "datafusion-expr", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "datafusion-physical-plan", "parking_lot", ] @@ -2420,16 +2580,16 @@ dependencies = [ [[package]] name = "datafusion-functions-window" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" dependencies = [ "arrow", - "datafusion-common", - "datafusion-doc", - "datafusion-expr", - "datafusion-functions-window-common", - "datafusion-macros", - "datafusion-physical-expr", - "datafusion-physical-expr-common", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-doc 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-functions-window-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-macros 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-physical-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "log", ] @@ -2438,8 +2598,17 @@ name = "datafusion-functions-window-common" version = "53.0.0" source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ - "datafusion-common", - "datafusion-physical-expr-common", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", +] + +[[package]] +name = "datafusion-functions-window-common" +version = "53.0.0" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +dependencies = [ + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", ] [[package]] @@ -2447,7 +2616,17 @@ name = "datafusion-macros" version = "53.0.0" source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ - "datafusion-doc", + "datafusion-doc 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "quote", + "syn 2.0.117", +] + +[[package]] +name = "datafusion-macros" +version = "53.0.0" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +dependencies = [ + "datafusion-doc 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "quote", "syn 2.0.117", ] @@ -2455,14 +2634,14 @@ dependencies = [ [[package]] name = "datafusion-optimizer" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" dependencies = [ "arrow", "chrono", - "datafusion-common", - "datafusion-expr", - "datafusion-expr-common", - "datafusion-physical-expr", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-physical-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "indexmap 2.14.0", "itertools 0.14.0", "log", @@ -2476,11 +2655,31 @@ version = "53.0.0" source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" dependencies = [ "arrow", - "datafusion-common", - "datafusion-expr", - "datafusion-expr-common", - "datafusion-functions-aggregate-common", - "datafusion-physical-expr-common", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-functions-aggregate-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "half", + "hashbrown 0.17.0", + "indexmap 2.14.0", + "itertools 0.14.0", + "parking_lot", + "petgraph", + "tokio", +] + +[[package]] +name = "datafusion-physical-expr" +version = "53.0.0" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +dependencies = [ + "arrow", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-functions-aggregate-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "half", "hashbrown 0.17.0", "indexmap 2.14.0", @@ -2493,14 +2692,14 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-adapter" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" dependencies = [ "arrow", - "datafusion-common", - "datafusion-expr", - "datafusion-functions", - "datafusion-physical-expr", - "datafusion-physical-expr-common", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-functions 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-physical-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "itertools 0.14.0", ] @@ -2511,8 +2710,23 @@ source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#019830 dependencies = [ "arrow", "chrono", - "datafusion-common", - "datafusion-expr-common", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "hashbrown 0.17.0", + "indexmap 2.14.0", + "itertools 0.14.0", + "parking_lot", +] + +[[package]] +name = "datafusion-physical-expr-common" +version = "53.0.0" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +dependencies = [ + "arrow", + "chrono", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "hashbrown 0.17.0", "indexmap 2.14.0", "itertools 0.14.0", @@ -2522,15 +2736,15 @@ dependencies = [ [[package]] name = "datafusion-physical-optimizer" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" dependencies = [ "arrow", - "datafusion-common", - "datafusion-execution", - "datafusion-expr", - "datafusion-expr-common", - "datafusion-physical-expr", - "datafusion-physical-expr-common", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-execution 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-physical-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "datafusion-physical-plan", "datafusion-pruning", "itertools 0.14.0", @@ -2539,21 +2753,21 @@ dependencies = [ [[package]] name = "datafusion-physical-plan" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" dependencies = [ "arrow", "arrow-ord", "arrow-schema", "async-trait", - "datafusion-common", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "datafusion-common-runtime", - "datafusion-execution", - "datafusion-expr", - "datafusion-functions", - "datafusion-functions-aggregate-common", - "datafusion-functions-window-common", - "datafusion-physical-expr", - "datafusion-physical-expr-common", + "datafusion-execution 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-functions 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-functions-aggregate-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-functions-window-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-physical-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "futures", "half", "hashbrown 0.17.0", @@ -2569,14 +2783,14 @@ dependencies = [ [[package]] name = "datafusion-pruning" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" dependencies = [ "arrow", - "datafusion-common", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "datafusion-datasource", - "datafusion-expr-common", - "datafusion-physical-expr", - "datafusion-physical-expr-common", + "datafusion-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-physical-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "datafusion-physical-plan", "log", ] @@ -2584,12 +2798,12 @@ dependencies = [ [[package]] name = "datafusion-session" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" dependencies = [ "async-trait", - "datafusion-common", - "datafusion-execution", - "datafusion-expr", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-execution 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "datafusion-physical-plan", "parking_lot", ] @@ -2597,7 +2811,7 @@ dependencies = [ [[package]] name = "datafusion-spark" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" dependencies = [ "arrow", "bigdecimal", @@ -2605,16 +2819,16 @@ dependencies = [ "crc32fast", "datafusion", "datafusion-catalog", - "datafusion-common", - "datafusion-execution", - "datafusion-expr", - "datafusion-functions", - "datafusion-functions-aggregate", - "datafusion-functions-nested", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-execution 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-functions 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-functions-aggregate 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-functions-nested 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "log", "num-traits", "percent-encoding", - "rand 0.9.2", + "rand 0.9.4", "serde_json", "sha1 0.11.0", "sha2", @@ -2624,14 +2838,14 @@ dependencies = [ [[package]] name = "datafusion-sql" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" +source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" dependencies = [ "arrow", "bigdecimal", "chrono", - "datafusion-common", - "datafusion-expr", - "datafusion-functions-nested", + "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-functions-nested 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", "indexmap 2.14.0", "log", "regex", @@ -2853,7 +3067,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]] @@ -2941,7 +3155,7 @@ version = "25.12.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35f6839d7b3b98adde531effaf34f0c2badc6f4735d26fe74709d8e513a96ef3" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.11.1", "rustc_version", ] @@ -3150,7 +3364,7 @@ dependencies = [ "cfg-if", "libc", "r-efi 6.0.0", - "rand_core 0.10.0", + "rand_core 0.10.1", "wasip2", "wasip3", ] @@ -3417,16 +3631,15 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.7" +version = "0.27.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" +checksum = "33ca68d021ef39cf6463ab54c1d0f5daf03377b70561305bb89a8f83aab66e0f" dependencies = [ "http 1.4.0", "hyper", "hyper-util", "rustls", "rustls-native-certs", - "rustls-pki-types", "tokio", "tokio-rustls", "tower-service", @@ -3759,7 +3972,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -3815,7 +4028,7 @@ dependencies = [ "portable-atomic-util", "serde_core", "wasm-bindgen", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -3932,9 +4145,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.94" +version = "0.3.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e04e2ef80ce82e13552136fabeef8a5ed1f985a96805761cbb9a2c34e7664d9" +checksum = "2964e92d1d9dc3364cae4d718d93f227e3abb088e747d92e0395bfdedf1c12ca" dependencies = [ "cfg-if", "futures-util", @@ -4162,7 +4375,7 @@ dependencies = [ "log-mdc", "mock_instant", "parking_lot", - "rand 0.9.2", + "rand 0.9.4", "serde", "serde-value", "serde_json", @@ -4951,9 +5164,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.32" +version = "0.3.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" +checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e" [[package]] name = "plotters" @@ -5095,7 +5308,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25485360a54d6861439d60facef26de713b1e126bf015ec8f98239467a2b82f7" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.11.1", "chrono", "flate2", "procfs-core", @@ -5108,7 +5321,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6401bf7b6af22f78b563665d15a22e9aef27775b79b149a66ca022468a4e405" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.11.1", "chrono", "hex", ] @@ -5130,7 +5343,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "343d3bd7056eda839b03204e68deff7d1b13aba7af2b2fd16890697274262ee7" dependencies = [ "heck", - "itertools 0.13.0", + "itertools 0.14.0", "log", "multimap", "petgraph", @@ -5149,7 +5362,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b" dependencies = [ "anyhow", - "itertools 0.13.0", + "itertools 0.14.0", "proc-macro2", "quote", "syn 2.0.117", @@ -5238,7 +5451,7 @@ dependencies = [ "bytes", "getrandom 0.3.4", "lru-slab", - "rand 0.9.2", + "rand 0.9.4", "ring", "rustc-hash 2.1.2", "rustls", @@ -5261,7 +5474,7 @@ dependencies = [ "once_cell", "socket2", "tracing", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] @@ -5298,9 +5511,9 @@ dependencies = [ [[package]] name = "rand" -version = "0.9.2" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" +checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea" dependencies = [ "rand_chacha 0.9.0", "rand_core 0.9.5", @@ -5314,7 +5527,7 @@ checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207" dependencies = [ "chacha20", "getrandom 0.4.2", - "rand_core 0.10.0", + "rand_core 0.10.1", ] [[package]] @@ -5357,15 +5570,15 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c8d0fd677905edcbeedbf2edb6494d676f0e98d54d5cf9bda0b061cb8fb8aba" +checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69" [[package]] name = "rayon" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" +checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d" dependencies = [ "either", "rayon-core", @@ -5387,7 +5600,7 @@ version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.11.1", ] [[package]] @@ -5639,7 +5852,7 @@ version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.11.1", "errno", "libc", "linux-raw-sys 0.4.15", @@ -5652,18 +5865,18 @@ version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.11.1", "errno", "libc", "linux-raw-sys 0.12.1", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] name = "rustls" -version = "0.23.37" +version = "0.23.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "758025cb5fccfd3bc2fd74708fd4682be41d99e5dff73c377c0646c6012c73a4" +checksum = "69f9466fb2c14ea04357e91413efb882e2a6d4a406e625449bc0a5d360d53a21" dependencies = [ "aws-lc-rs", "once_cell", @@ -5698,9 +5911,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.10" +version = "0.103.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df33b2b81ac578cabaf06b89b0631153a3f416b0a886e8a7a1707fb51abbd1ef" +checksum = "8279bb85272c9f10811ae6a6c547ff594d6a7f3c6c6b02ee9726d1d0dcfcdd06" dependencies = [ "aws-lc-rs", "ring", @@ -5794,7 +6007,7 @@ version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.11.1", "core-foundation", "core-foundation-sys", "libc", @@ -6183,9 +6396,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "symbolic-common" -version = "12.17.4" +version = "12.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "803d14d7cb9c6fa5b95a6f3de8af95b356a528d391998fa45a07d320a5573e51" +checksum = "6aba7211a1803a826f108af9f4d86d25abe880712f2a6449479279e861b293f8" dependencies = [ "debugid", "memmap2", @@ -6195,9 +6408,9 @@ dependencies = [ [[package]] name = "symbolic-demangle" -version = "12.17.4" +version = "12.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39505731ae891b2dde47b0e4ae2ec40a7ced3476ab1129f1bf829e3fba62bb83" +checksum = "595bddd9d363c2ef6fc9fb33b98416ff209c5aae8bdca89a7dbbf2ef5e0ecc45" dependencies = [ "cpp_demangle", "rustc-demangle", @@ -6259,10 +6472,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.3.4", + "getrandom 0.4.2", "once_cell", "rustix 1.1.4", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -6434,9 +6647,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.51.1" +version = "1.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f66bf9585cda4b724d3e78ab34b73fb2bbaba9011b9bfdf69dc836382ea13b8c" +checksum = "a91135f59b1cbf38c91e73cf3386fca9bb77915c45ce2771460c9d92f0f3d776" dependencies = [ "bytes", "libc", @@ -6516,7 +6729,7 @@ version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.11.1", "bytes", "futures-util", "http 1.4.0", @@ -6583,7 +6796,7 @@ version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ea3136b675547379c4bd395ca6b938e5ad3c3d20fad76e7fe85f9e0d011419c" dependencies = [ - "rand 0.9.2", + "rand 0.9.4", ] [[package]] @@ -6811,9 +7024,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.117" +version = "0.2.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0551fc1bb415591e3372d0bc4780db7e587d84e2a7e79da121051c5c4b89d0b0" +checksum = "0bf938a0bacb0469e83c1e148908bd7d5a6010354cf4fb73279b7447422e3a89" dependencies = [ "cfg-if", "once_cell", @@ -6824,9 +7037,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.67" +version = "0.4.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03623de6905b7206edd0a75f69f747f134b7f0a2323392d664448bf2d3c5d87e" +checksum = "f371d383f2fb139252e0bfac3b81b265689bf45b6874af544ffa4c975ac1ebf8" dependencies = [ "js-sys", "wasm-bindgen", @@ -6834,9 +7047,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.117" +version = "0.2.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fbdf9a35adf44786aecd5ff89b4563a90325f9da0923236f6104e603c7e86be" +checksum = "eeff24f84126c0ec2db7a449f0c2ec963c6a49efe0698c4242929da037ca28ed" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6844,9 +7057,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.117" +version = "0.2.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dca9693ef2bab6d4e6707234500350d8dad079eb508dca05530c85dc3a529ff2" +checksum = "9d08065faf983b2b80a79fd87d8254c409281cf7de75fc4b773019824196c904" dependencies = [ "bumpalo", "proc-macro2", @@ -6857,9 +7070,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.117" +version = "0.2.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39129a682a6d2d841b6c429d0c51e5cb0ed1a03829d8b3d1e69a011e62cb3d3b" +checksum = "5fd04d9e306f1907bd13c6361b5c6bfc7b3b3c095ed3f8a9246390f8dbdee129" dependencies = [ "unicode-ident", ] @@ -6905,7 +7118,7 @@ version = "0.244.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.11.1", "hashbrown 0.15.5", "indexmap 2.14.0", "semver", @@ -6913,9 +7126,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.94" +version = "0.3.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd70027e39b12f0849461e08ffc50b9cd7688d942c1c8e3c7b22273236b4dd0a" +checksum = "4f2dfbb17949fa2088e5d39408c48368947b86f7834484e87b73de55bc14d97d" dependencies = [ "js-sys", "wasm-bindgen", @@ -6974,7 +7187,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]] @@ -7069,6 +7282,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-sys" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" +dependencies = [ + "windows-targets 0.53.5", +] + [[package]] name = "windows-sys" version = "0.61.2" @@ -7102,13 +7324,30 @@ dependencies = [ "windows_aarch64_gnullvm 0.52.6", "windows_aarch64_msvc 0.52.6", "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm", + "windows_i686_gnullvm 0.52.6", "windows_i686_msvc 0.52.6", "windows_x86_64_gnu 0.52.6", "windows_x86_64_gnullvm 0.52.6", "windows_x86_64_msvc 0.52.6", ] +[[package]] +name = "windows-targets" +version = "0.53.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" +dependencies = [ + "windows-link", + "windows_aarch64_gnullvm 0.53.1", + "windows_aarch64_msvc 0.53.1", + "windows_i686_gnu 0.53.1", + "windows_i686_gnullvm 0.53.1", + "windows_i686_msvc 0.53.1", + "windows_x86_64_gnu 0.53.1", + "windows_x86_64_gnullvm 0.53.1", + "windows_x86_64_msvc 0.53.1", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" @@ -7121,6 +7360,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" + [[package]] name = "windows_aarch64_msvc" version = "0.42.2" @@ -7133,6 +7378,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" + [[package]] name = "windows_i686_gnu" version = "0.42.2" @@ -7145,12 +7396,24 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +[[package]] +name = "windows_i686_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" + [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" + [[package]] name = "windows_i686_msvc" version = "0.42.2" @@ -7163,6 +7426,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +[[package]] +name = "windows_i686_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" + [[package]] name = "windows_x86_64_gnu" version = "0.42.2" @@ -7175,6 +7444,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" @@ -7187,6 +7462,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" + [[package]] name = "windows_x86_64_msvc" version = "0.42.2" @@ -7199,6 +7480,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "windows_x86_64_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" + [[package]] name = "wit-bindgen" version = "0.51.0" @@ -7257,7 +7544,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" dependencies = [ "anyhow", - "bitflags 2.11.0", + "bitflags 2.11.1", "indexmap 2.14.0", "log", "serde", diff --git a/native/Cargo.toml b/native/Cargo.toml index 1e1055bfd0..2aeacc8544 100644 --- a/native/Cargo.toml +++ b/native/Cargo.toml @@ -38,10 +38,10 @@ arrow = { version = "58.1.0", features = ["prettyprint", "ffi", "chrono-tz"] } async-trait = { version = "0.1" } bytes = { version = "1.11.1" } parquet = { version = "58.1.0", default-features = false, features = ["experimental"] } -datafusion = { git = "https://github.com/mbutrovich/datafusion.git", rev = "0198302544", default-features = false, features = ["unicode_expressions", "crypto_expressions", "nested_expressions", "parquet"] } -datafusion-datasource = { git = "https://github.com/mbutrovich/datafusion.git", rev = "0198302544" } -datafusion-physical-expr-adapter = { git = "https://github.com/mbutrovich/datafusion.git", rev = "0198302544" } -datafusion-spark = { git = "https://github.com/mbutrovich/datafusion.git", rev = "0198302544", features = ["core"] } +datafusion = { git = "https://github.com/mbutrovich/datafusion.git", rev = "9598c96998", default-features = false, features = ["unicode_expressions", "crypto_expressions", "nested_expressions", "parquet"] } +datafusion-datasource = { git = "https://github.com/mbutrovich/datafusion.git", rev = "9598c96998" } +datafusion-physical-expr-adapter = { git = "https://github.com/mbutrovich/datafusion.git", rev = "9598c96998" } +datafusion-spark = { git = "https://github.com/mbutrovich/datafusion.git", rev = "9598c96998", features = ["core"] } datafusion-comet-spark-expr = { path = "spark-expr" } datafusion-comet-common = { path = "common" } datafusion-comet-jni-bridge = { path = "jni-bridge" } From ec18066beb2f37d1fc7d75f4835f40991341b211 Mon Sep 17 00:00:00 2001 From: Matt Butrovich Date: Wed, 15 Apr 2026 21:13:06 -0400 Subject: [PATCH 09/30] Fix after merging in latest datafusion main in the feature branch. --- native/spark-expr/src/array_funcs/array_insert.rs | 4 ---- .../spark-expr/src/array_funcs/get_array_struct_fields.rs | 4 ---- native/spark-expr/src/array_funcs/list_extract.rs | 4 ---- native/spark-expr/src/bloom_filter/bloom_filter_agg.rs | 2 +- native/spark-expr/src/conditional_funcs/if_expr.rs | 3 --- native/spark-expr/src/conversion_funcs/cast.rs | 4 ---- native/spark-expr/src/csv_funcs/to_csv.rs | 4 ---- native/spark-expr/src/datetime_funcs/timestamp_trunc.rs | 4 ---- native/spark-expr/src/json_funcs/from_json.rs | 4 ---- native/spark-expr/src/json_funcs/to_json.rs | 4 ---- native/spark-expr/src/math_funcs/internal/checkoverflow.rs | 7 ------- .../src/math_funcs/internal/decimal_rescale_check.rs | 7 ------- native/spark-expr/src/math_funcs/internal/normalize_nan.rs | 4 ---- native/spark-expr/src/math_funcs/negative.rs | 3 --- .../spark-expr/src/math_funcs/wide_decimal_binary_expr.rs | 4 ---- .../nondetermenistic_funcs/monotonically_increasing_id.rs | 4 ---- native/spark-expr/src/nondetermenistic_funcs/rand.rs | 4 ---- native/spark-expr/src/nondetermenistic_funcs/randn.rs | 4 ---- native/spark-expr/src/predicate_funcs/rlike.rs | 4 ---- native/spark-expr/src/string_funcs/substring.rs | 4 ---- native/spark-expr/src/struct_funcs/create_named_struct.rs | 4 ---- native/spark-expr/src/struct_funcs/get_struct_field.rs | 4 ---- native/spark-expr/src/unbound.rs | 3 --- 23 files changed, 1 insertion(+), 92 deletions(-) diff --git a/native/spark-expr/src/array_funcs/array_insert.rs b/native/spark-expr/src/array_funcs/array_insert.rs index bce00483bc..af094fbfd0 100644 --- a/native/spark-expr/src/array_funcs/array_insert.rs +++ b/native/spark-expr/src/array_funcs/array_insert.rs @@ -92,10 +92,6 @@ impl ArrayInsert { } impl PhysicalExpr for ArrayInsert { - fn as_any(&self) -> &dyn Any { - self - } - fn fmt_sql(&self, f: &mut Formatter<'_>) -> std::fmt::Result { Display::fmt(self, f) } diff --git a/native/spark-expr/src/array_funcs/get_array_struct_fields.rs b/native/spark-expr/src/array_funcs/get_array_struct_fields.rs index dc05a3b7f0..dd6d340ae5 100644 --- a/native/spark-expr/src/array_funcs/get_array_struct_fields.rs +++ b/native/spark-expr/src/array_funcs/get_array_struct_fields.rs @@ -75,10 +75,6 @@ impl GetArrayStructFields { } impl PhysicalExpr for GetArrayStructFields { - fn as_any(&self) -> &dyn Any { - self - } - fn data_type(&self, input_schema: &Schema) -> DataFusionResult { let struct_field = self.child_field(input_schema)?; match self.child.data_type(input_schema)? { diff --git a/native/spark-expr/src/array_funcs/list_extract.rs b/native/spark-expr/src/array_funcs/list_extract.rs index d3661f496a..26533a75b8 100644 --- a/native/spark-expr/src/array_funcs/list_extract.rs +++ b/native/spark-expr/src/array_funcs/list_extract.rs @@ -113,10 +113,6 @@ impl ListExtract { } impl PhysicalExpr for ListExtract { - fn as_any(&self) -> &dyn Any { - self - } - fn fmt_sql(&self, f: &mut Formatter<'_>) -> std::fmt::Result { Display::fmt(self, f) } diff --git a/native/spark-expr/src/bloom_filter/bloom_filter_agg.rs b/native/spark-expr/src/bloom_filter/bloom_filter_agg.rs index 3e9e5f00ad..455e20a019 100644 --- a/native/spark-expr/src/bloom_filter/bloom_filter_agg.rs +++ b/native/spark-expr/src/bloom_filter/bloom_filter_agg.rs @@ -41,7 +41,7 @@ pub struct BloomFilterAgg { #[inline] fn extract_i32_from_literal(expr: Arc) -> i32 { - match expr.as_any().downcast_ref::().unwrap().value() { + match (*expr).downcast_ref::().unwrap().value() { ScalarValue::Int64(scalar_value) => scalar_value.unwrap() as i32, _ => { unreachable!() diff --git a/native/spark-expr/src/conditional_funcs/if_expr.rs b/native/spark-expr/src/conditional_funcs/if_expr.rs index 6b1291fbbe..bedb515c2f 100644 --- a/native/spark-expr/src/conditional_funcs/if_expr.rs +++ b/native/spark-expr/src/conditional_funcs/if_expr.rs @@ -84,9 +84,6 @@ impl IfExpr { impl PhysicalExpr for IfExpr { /// Return a reference to Any that can be used for down-casting - fn as_any(&self) -> &dyn Any { - self - } fn fmt_sql(&self, f: &mut Formatter<'_>) -> std::fmt::Result { Display::fmt(self, f) diff --git a/native/spark-expr/src/conversion_funcs/cast.rs b/native/spark-expr/src/conversion_funcs/cast.rs index efba0d17d8..1ba9f4a9e7 100644 --- a/native/spark-expr/src/conversion_funcs/cast.rs +++ b/native/spark-expr/src/conversion_funcs/cast.rs @@ -695,10 +695,6 @@ impl Display for Cast { } impl PhysicalExpr for Cast { - fn as_any(&self) -> &dyn Any { - self - } - fn fmt_sql(&self, f: &mut Formatter<'_>) -> std::fmt::Result { Display::fmt(self, f) } diff --git a/native/spark-expr/src/csv_funcs/to_csv.rs b/native/spark-expr/src/csv_funcs/to_csv.rs index f41cb7f918..2d49cde585 100644 --- a/native/spark-expr/src/csv_funcs/to_csv.rs +++ b/native/spark-expr/src/csv_funcs/to_csv.rs @@ -77,10 +77,6 @@ impl Display for ToCsv { } impl PhysicalExpr for ToCsv { - fn as_any(&self) -> &dyn Any { - self - } - fn data_type(&self, _: &Schema) -> Result { Ok(DataType::Utf8) } diff --git a/native/spark-expr/src/datetime_funcs/timestamp_trunc.rs b/native/spark-expr/src/datetime_funcs/timestamp_trunc.rs index 2d7a571b76..9ba281cccc 100644 --- a/native/spark-expr/src/datetime_funcs/timestamp_trunc.rs +++ b/native/spark-expr/src/datetime_funcs/timestamp_trunc.rs @@ -85,10 +85,6 @@ impl Display for TimestampTruncExpr { } impl PhysicalExpr for TimestampTruncExpr { - fn as_any(&self) -> &dyn Any { - self - } - fn fmt_sql(&self, f: &mut Formatter<'_>) -> std::fmt::Result { Display::fmt(self, f) } diff --git a/native/spark-expr/src/json_funcs/from_json.rs b/native/spark-expr/src/json_funcs/from_json.rs index 685ea3c8ec..eaca6db016 100644 --- a/native/spark-expr/src/json_funcs/from_json.rs +++ b/native/spark-expr/src/json_funcs/from_json.rs @@ -86,10 +86,6 @@ impl PartialEq for FromJson { } impl PhysicalExpr for FromJson { - fn as_any(&self) -> &dyn Any { - self - } - fn fmt_sql(&self, f: &mut Formatter<'_>) -> std::fmt::Result { Display::fmt(self, f) } diff --git a/native/spark-expr/src/json_funcs/to_json.rs b/native/spark-expr/src/json_funcs/to_json.rs index 3cc827f210..6dcd8bc045 100644 --- a/native/spark-expr/src/json_funcs/to_json.rs +++ b/native/spark-expr/src/json_funcs/to_json.rs @@ -79,10 +79,6 @@ impl PartialEq for ToJson { } impl PhysicalExpr for ToJson { - fn as_any(&self) -> &dyn Any { - self - } - fn fmt_sql(&self, f: &mut Formatter<'_>) -> std::fmt::Result { Display::fmt(self, f) } diff --git a/native/spark-expr/src/math_funcs/internal/checkoverflow.rs b/native/spark-expr/src/math_funcs/internal/checkoverflow.rs index f1fb9c2f02..2249c9d75f 100644 --- a/native/spark-expr/src/math_funcs/internal/checkoverflow.rs +++ b/native/spark-expr/src/math_funcs/internal/checkoverflow.rs @@ -91,10 +91,6 @@ impl Display for CheckOverflow { } impl PhysicalExpr for CheckOverflow { - fn as_any(&self) -> &dyn Any { - self - } - fn fmt_sql(&self, f: &mut Formatter<'_>) -> std::fmt::Result { Display::fmt(self, f) } @@ -274,9 +270,6 @@ mod tests { } impl PhysicalExpr for ScalarChild { - fn as_any(&self) -> &dyn Any { - self - } fn data_type(&self, _: &Schema) -> datafusion::common::Result { Ok(DataType::Decimal128(self.1, self.2)) } diff --git a/native/spark-expr/src/math_funcs/internal/decimal_rescale_check.rs b/native/spark-expr/src/math_funcs/internal/decimal_rescale_check.rs index 1322404951..420c25b321 100644 --- a/native/spark-expr/src/math_funcs/internal/decimal_rescale_check.rs +++ b/native/spark-expr/src/math_funcs/internal/decimal_rescale_check.rs @@ -154,10 +154,6 @@ fn rescale_and_check( } impl PhysicalExpr for DecimalRescaleCheckOverflow { - fn as_any(&self) -> &dyn Any { - self - } - fn fmt_sql(&self, f: &mut Formatter<'_>) -> std::fmt::Result { Display::fmt(self, f) } @@ -392,9 +388,6 @@ mod tests { } impl PhysicalExpr for ScalarChild { - fn as_any(&self) -> &dyn Any { - self - } fn data_type(&self, _: &Schema) -> datafusion::common::Result { Ok(DataType::Decimal128(self.1, self.2)) } diff --git a/native/spark-expr/src/math_funcs/internal/normalize_nan.rs b/native/spark-expr/src/math_funcs/internal/normalize_nan.rs index b3838f64f4..84a9b4d0c6 100644 --- a/native/spark-expr/src/math_funcs/internal/normalize_nan.rs +++ b/native/spark-expr/src/math_funcs/internal/normalize_nan.rs @@ -57,10 +57,6 @@ impl NormalizeNaNAndZero { } impl PhysicalExpr for NormalizeNaNAndZero { - fn as_any(&self) -> &dyn Any { - self - } - fn fmt_sql(&self, f: &mut Formatter<'_>) -> std::fmt::Result { Display::fmt(self, f) } diff --git a/native/spark-expr/src/math_funcs/negative.rs b/native/spark-expr/src/math_funcs/negative.rs index a268894086..2395520733 100644 --- a/native/spark-expr/src/math_funcs/negative.rs +++ b/native/spark-expr/src/math_funcs/negative.rs @@ -97,9 +97,6 @@ impl std::fmt::Display for NegativeExpr { impl PhysicalExpr for NegativeExpr { /// Return a reference to Any that can be used for downcasting - fn as_any(&self) -> &dyn Any { - self - } fn data_type(&self, input_schema: &Schema) -> Result { self.arg.data_type(input_schema) diff --git a/native/spark-expr/src/math_funcs/wide_decimal_binary_expr.rs b/native/spark-expr/src/math_funcs/wide_decimal_binary_expr.rs index 644252b46b..18821d352c 100644 --- a/native/spark-expr/src/math_funcs/wide_decimal_binary_expr.rs +++ b/native/spark-expr/src/math_funcs/wide_decimal_binary_expr.rs @@ -165,10 +165,6 @@ fn max_for_precision(precision: u8) -> i256 { } impl PhysicalExpr for WideDecimalBinaryExpr { - fn as_any(&self) -> &dyn Any { - self - } - fn data_type(&self, _input_schema: &Schema) -> Result { Ok(DataType::Decimal128( self.output_precision, diff --git a/native/spark-expr/src/nondetermenistic_funcs/monotonically_increasing_id.rs b/native/spark-expr/src/nondetermenistic_funcs/monotonically_increasing_id.rs index 49a5066a38..1daf2e00d4 100644 --- a/native/spark-expr/src/nondetermenistic_funcs/monotonically_increasing_id.rs +++ b/native/spark-expr/src/nondetermenistic_funcs/monotonically_increasing_id.rs @@ -66,10 +66,6 @@ impl Hash for MonotonicallyIncreasingId { } impl PhysicalExpr for MonotonicallyIncreasingId { - fn as_any(&self) -> &dyn Any { - self - } - fn evaluate(&self, batch: &RecordBatch) -> Result { let start = self .current_offset diff --git a/native/spark-expr/src/nondetermenistic_funcs/rand.rs b/native/spark-expr/src/nondetermenistic_funcs/rand.rs index e23a83d84e..3f4272a6f0 100644 --- a/native/spark-expr/src/nondetermenistic_funcs/rand.rs +++ b/native/spark-expr/src/nondetermenistic_funcs/rand.rs @@ -120,10 +120,6 @@ impl Hash for RandExpr { } impl PhysicalExpr for RandExpr { - fn as_any(&self) -> &dyn Any { - self - } - fn data_type(&self, _input_schema: &Schema) -> Result { Ok(DataType::Float64) } diff --git a/native/spark-expr/src/nondetermenistic_funcs/randn.rs b/native/spark-expr/src/nondetermenistic_funcs/randn.rs index 40fafedc20..59376ae064 100644 --- a/native/spark-expr/src/nondetermenistic_funcs/randn.rs +++ b/native/spark-expr/src/nondetermenistic_funcs/randn.rs @@ -131,10 +131,6 @@ impl Hash for RandnExpr { } impl PhysicalExpr for RandnExpr { - fn as_any(&self) -> &dyn Any { - self - } - fn data_type(&self, _input_schema: &Schema) -> datafusion::common::Result { Ok(DataType::Float64) } diff --git a/native/spark-expr/src/predicate_funcs/rlike.rs b/native/spark-expr/src/predicate_funcs/rlike.rs index ed5970a6a2..c76414694b 100644 --- a/native/spark-expr/src/predicate_funcs/rlike.rs +++ b/native/spark-expr/src/predicate_funcs/rlike.rs @@ -102,10 +102,6 @@ impl Display for RLike { } impl PhysicalExpr for RLike { - fn as_any(&self) -> &dyn Any { - self - } - fn data_type(&self, _input_schema: &Schema) -> Result { Ok(DataType::Boolean) } diff --git a/native/spark-expr/src/string_funcs/substring.rs b/native/spark-expr/src/string_funcs/substring.rs index e6f11fc39a..4be306afca 100644 --- a/native/spark-expr/src/string_funcs/substring.rs +++ b/native/spark-expr/src/string_funcs/substring.rs @@ -68,10 +68,6 @@ impl Display for SubstringExpr { } impl PhysicalExpr for SubstringExpr { - fn as_any(&self) -> &dyn Any { - self - } - fn fmt_sql(&self, f: &mut Formatter<'_>) -> std::fmt::Result { Display::fmt(self, f) } diff --git a/native/spark-expr/src/struct_funcs/create_named_struct.rs b/native/spark-expr/src/struct_funcs/create_named_struct.rs index 70e03ad0c0..d610648916 100644 --- a/native/spark-expr/src/struct_funcs/create_named_struct.rs +++ b/native/spark-expr/src/struct_funcs/create_named_struct.rs @@ -53,10 +53,6 @@ impl CreateNamedStruct { } impl PhysicalExpr for CreateNamedStruct { - fn as_any(&self) -> &dyn Any { - self - } - fn fmt_sql(&self, f: &mut Formatter<'_>) -> std::fmt::Result { Display::fmt(self, f) } diff --git a/native/spark-expr/src/struct_funcs/get_struct_field.rs b/native/spark-expr/src/struct_funcs/get_struct_field.rs index 7929cea483..afafcec53b 100644 --- a/native/spark-expr/src/struct_funcs/get_struct_field.rs +++ b/native/spark-expr/src/struct_funcs/get_struct_field.rs @@ -62,10 +62,6 @@ impl GetStructField { } impl PhysicalExpr for GetStructField { - fn as_any(&self) -> &dyn Any { - self - } - fn fmt_sql(&self, f: &mut Formatter<'_>) -> std::fmt::Result { Display::fmt(self, f) } diff --git a/native/spark-expr/src/unbound.rs b/native/spark-expr/src/unbound.rs index cf0adafa91..919701dd1f 100644 --- a/native/spark-expr/src/unbound.rs +++ b/native/spark-expr/src/unbound.rs @@ -60,9 +60,6 @@ impl std::fmt::Display for UnboundColumn { impl PhysicalExpr for UnboundColumn { /// Return a reference to Any that can be used for downcasting - fn as_any(&self) -> &dyn std::any::Any { - self - } fn fmt_sql(&self, f: &mut Formatter<'_>) -> std::fmt::Result { Display::fmt(self, f) From 68f1a095b853208a5ee37d13fd2e3a78166a20fb Mon Sep 17 00:00:00 2001 From: Matt Butrovich Date: Wed, 15 Apr 2026 21:26:55 -0400 Subject: [PATCH 10/30] Fix after merging in latest datafusion main in the feature branch. --- native/spark-expr/src/array_funcs/array_insert.rs | 1 - native/spark-expr/src/array_funcs/get_array_struct_fields.rs | 1 - native/spark-expr/src/array_funcs/list_extract.rs | 1 - native/spark-expr/src/conditional_funcs/if_expr.rs | 4 +--- native/spark-expr/src/conversion_funcs/cast.rs | 1 - native/spark-expr/src/csv_funcs/to_csv.rs | 1 - native/spark-expr/src/datetime_funcs/timestamp_trunc.rs | 1 - native/spark-expr/src/math_funcs/internal/checkoverflow.rs | 1 - .../src/math_funcs/internal/decimal_rescale_check.rs | 1 - native/spark-expr/src/math_funcs/internal/normalize_nan.rs | 1 - native/spark-expr/src/math_funcs/negative.rs | 4 +--- native/spark-expr/src/math_funcs/wide_decimal_binary_expr.rs | 2 +- .../src/nondetermenistic_funcs/monotonically_increasing_id.rs | 1 - native/spark-expr/src/nondetermenistic_funcs/rand.rs | 1 - native/spark-expr/src/nondetermenistic_funcs/randn.rs | 1 - native/spark-expr/src/predicate_funcs/rlike.rs | 1 - native/spark-expr/src/string_funcs/substring.rs | 1 - native/spark-expr/src/struct_funcs/create_named_struct.rs | 1 - native/spark-expr/src/struct_funcs/get_struct_field.rs | 1 - native/spark-expr/src/unbound.rs | 2 -- 20 files changed, 3 insertions(+), 25 deletions(-) diff --git a/native/spark-expr/src/array_funcs/array_insert.rs b/native/spark-expr/src/array_funcs/array_insert.rs index af094fbfd0..e638c440fd 100644 --- a/native/spark-expr/src/array_funcs/array_insert.rs +++ b/native/spark-expr/src/array_funcs/array_insert.rs @@ -30,7 +30,6 @@ use datafusion::logical_expr::ColumnarValue; use datafusion::physical_expr::PhysicalExpr; use std::hash::Hash; use std::{ - any::Any, fmt::{Debug, Display, Formatter}, sync::Arc, }; diff --git a/native/spark-expr/src/array_funcs/get_array_struct_fields.rs b/native/spark-expr/src/array_funcs/get_array_struct_fields.rs index dd6d340ae5..a873392499 100644 --- a/native/spark-expr/src/array_funcs/get_array_struct_fields.rs +++ b/native/spark-expr/src/array_funcs/get_array_struct_fields.rs @@ -27,7 +27,6 @@ use datafusion::logical_expr::ColumnarValue; use datafusion::physical_expr::PhysicalExpr; use std::hash::Hash; use std::{ - any::Any, fmt::{Debug, Display, Formatter}, sync::Arc, }; diff --git a/native/spark-expr/src/array_funcs/list_extract.rs b/native/spark-expr/src/array_funcs/list_extract.rs index 26533a75b8..83fa23f757 100644 --- a/native/spark-expr/src/array_funcs/list_extract.rs +++ b/native/spark-expr/src/array_funcs/list_extract.rs @@ -26,7 +26,6 @@ use datafusion::logical_expr::ColumnarValue; use datafusion::physical_expr::PhysicalExpr; use std::hash::Hash; use std::{ - any::Any, fmt::{Debug, Display, Formatter}, sync::Arc, }; diff --git a/native/spark-expr/src/conditional_funcs/if_expr.rs b/native/spark-expr/src/conditional_funcs/if_expr.rs index bedb515c2f..5e57c54a22 100644 --- a/native/spark-expr/src/conditional_funcs/if_expr.rs +++ b/native/spark-expr/src/conditional_funcs/if_expr.rs @@ -24,7 +24,7 @@ use datafusion::logical_expr::ColumnarValue; use datafusion::physical_expr::{expressions::CaseExpr, PhysicalExpr}; use std::fmt::{Display, Formatter}; use std::hash::Hash; -use std::{any::Any, sync::Arc}; +use std::sync::Arc; /// IfExpr is a wrapper around CaseExpr, because `IF(a, b, c)` is semantically equivalent to /// `CASE WHEN a THEN b ELSE c END`. @@ -83,8 +83,6 @@ impl IfExpr { } impl PhysicalExpr for IfExpr { - /// Return a reference to Any that can be used for down-casting - fn fmt_sql(&self, f: &mut Formatter<'_>) -> std::fmt::Result { Display::fmt(self, f) } diff --git a/native/spark-expr/src/conversion_funcs/cast.rs b/native/spark-expr/src/conversion_funcs/cast.rs index 1ba9f4a9e7..17c318387d 100644 --- a/native/spark-expr/src/conversion_funcs/cast.rs +++ b/native/spark-expr/src/conversion_funcs/cast.rs @@ -62,7 +62,6 @@ use datafusion::common::{internal_err, DataFusionError, Result as DataFusionResu use datafusion::physical_expr::PhysicalExpr; use datafusion::physical_plan::ColumnarValue; use std::{ - any::Any, fmt::{Debug, Display, Formatter}, hash::Hash, sync::Arc, diff --git a/native/spark-expr/src/csv_funcs/to_csv.rs b/native/spark-expr/src/csv_funcs/to_csv.rs index 2d49cde585..01fdc901cb 100644 --- a/native/spark-expr/src/csv_funcs/to_csv.rs +++ b/native/spark-expr/src/csv_funcs/to_csv.rs @@ -23,7 +23,6 @@ use arrow::datatypes::{DataType, Schema}; use datafusion::common::Result; use datafusion::logical_expr::ColumnarValue; use datafusion::physical_expr::PhysicalExpr; -use std::any::Any; use std::fmt::{Display, Formatter}; use std::hash::Hash; use std::sync::Arc; diff --git a/native/spark-expr/src/datetime_funcs/timestamp_trunc.rs b/native/spark-expr/src/datetime_funcs/timestamp_trunc.rs index 9ba281cccc..1e95eb5141 100644 --- a/native/spark-expr/src/datetime_funcs/timestamp_trunc.rs +++ b/native/spark-expr/src/datetime_funcs/timestamp_trunc.rs @@ -23,7 +23,6 @@ use datafusion::logical_expr::ColumnarValue; use datafusion::physical_expr::PhysicalExpr; use std::hash::Hash; use std::{ - any::Any, fmt::{Debug, Display, Formatter}, sync::Arc, }; diff --git a/native/spark-expr/src/math_funcs/internal/checkoverflow.rs b/native/spark-expr/src/math_funcs/internal/checkoverflow.rs index 2249c9d75f..f867fe0c4d 100644 --- a/native/spark-expr/src/math_funcs/internal/checkoverflow.rs +++ b/native/spark-expr/src/math_funcs/internal/checkoverflow.rs @@ -28,7 +28,6 @@ use std::hash::Hash; use crate::SparkError; use std::{ - any::Any, fmt::{Display, Formatter}, sync::Arc, }; diff --git a/native/spark-expr/src/math_funcs/internal/decimal_rescale_check.rs b/native/spark-expr/src/math_funcs/internal/decimal_rescale_check.rs index 420c25b321..667f76939a 100644 --- a/native/spark-expr/src/math_funcs/internal/decimal_rescale_check.rs +++ b/native/spark-expr/src/math_funcs/internal/decimal_rescale_check.rs @@ -29,7 +29,6 @@ use datafusion::logical_expr::ColumnarValue; use datafusion::physical_expr::PhysicalExpr; use std::hash::Hash; use std::{ - any::Any, fmt::{Display, Formatter}, sync::Arc, }; diff --git a/native/spark-expr/src/math_funcs/internal/normalize_nan.rs b/native/spark-expr/src/math_funcs/internal/normalize_nan.rs index 84a9b4d0c6..165ae3acc9 100644 --- a/native/spark-expr/src/math_funcs/internal/normalize_nan.rs +++ b/native/spark-expr/src/math_funcs/internal/normalize_nan.rs @@ -26,7 +26,6 @@ use datafusion::logical_expr::ColumnarValue; use datafusion::physical_expr::PhysicalExpr; use std::hash::Hash; use std::{ - any::Any, fmt::{Display, Formatter}, sync::Arc, }; diff --git a/native/spark-expr/src/math_funcs/negative.rs b/native/spark-expr/src/math_funcs/negative.rs index 2395520733..650fa401ef 100644 --- a/native/spark-expr/src/math_funcs/negative.rs +++ b/native/spark-expr/src/math_funcs/negative.rs @@ -29,7 +29,7 @@ use datafusion::{ }; use std::fmt::{Display, Formatter}; use std::hash::Hash; -use std::{any::Any, sync::Arc}; +use std::sync::Arc; pub fn create_negate_expr( expr: Arc, @@ -96,8 +96,6 @@ impl std::fmt::Display for NegativeExpr { } impl PhysicalExpr for NegativeExpr { - /// Return a reference to Any that can be used for downcasting - fn data_type(&self, input_schema: &Schema) -> Result { self.arg.data_type(input_schema) } diff --git a/native/spark-expr/src/math_funcs/wide_decimal_binary_expr.rs b/native/spark-expr/src/math_funcs/wide_decimal_binary_expr.rs index 18821d352c..d2479857af 100644 --- a/native/spark-expr/src/math_funcs/wide_decimal_binary_expr.rs +++ b/native/spark-expr/src/math_funcs/wide_decimal_binary_expr.rs @@ -31,7 +31,7 @@ use datafusion::logical_expr::ColumnarValue; use datafusion::physical_expr::PhysicalExpr; use std::fmt::{Display, Formatter}; use std::hash::Hash; -use std::{any::Any, sync::Arc}; +use std::sync::Arc; /// The arithmetic operation to perform. #[derive(Debug, Hash, PartialEq, Eq, Clone, Copy)] diff --git a/native/spark-expr/src/nondetermenistic_funcs/monotonically_increasing_id.rs b/native/spark-expr/src/nondetermenistic_funcs/monotonically_increasing_id.rs index 1daf2e00d4..e7404e00c1 100644 --- a/native/spark-expr/src/nondetermenistic_funcs/monotonically_increasing_id.rs +++ b/native/spark-expr/src/nondetermenistic_funcs/monotonically_increasing_id.rs @@ -20,7 +20,6 @@ use arrow::datatypes::{DataType, Schema}; use datafusion::common::Result; use datafusion::logical_expr::ColumnarValue; use datafusion::physical_expr::PhysicalExpr; -use std::any::Any; use std::fmt::{Debug, Display, Formatter}; use std::hash::{Hash, Hasher}; use std::sync::atomic::{AtomicI64, Ordering}; diff --git a/native/spark-expr/src/nondetermenistic_funcs/rand.rs b/native/spark-expr/src/nondetermenistic_funcs/rand.rs index 3f4272a6f0..8f07f37344 100644 --- a/native/spark-expr/src/nondetermenistic_funcs/rand.rs +++ b/native/spark-expr/src/nondetermenistic_funcs/rand.rs @@ -23,7 +23,6 @@ use arrow::datatypes::{DataType, Schema}; use datafusion::common::Result; use datafusion::logical_expr::ColumnarValue; use datafusion::physical_expr::PhysicalExpr; -use std::any::Any; use std::fmt::{Display, Formatter}; use std::hash::{Hash, Hasher}; use std::sync::{Arc, Mutex}; diff --git a/native/spark-expr/src/nondetermenistic_funcs/randn.rs b/native/spark-expr/src/nondetermenistic_funcs/randn.rs index 59376ae064..7d50d24811 100644 --- a/native/spark-expr/src/nondetermenistic_funcs/randn.rs +++ b/native/spark-expr/src/nondetermenistic_funcs/randn.rs @@ -22,7 +22,6 @@ use arrow::array::RecordBatch; use arrow::datatypes::{DataType, Schema}; use datafusion::logical_expr::ColumnarValue; use datafusion::physical_expr::PhysicalExpr; -use std::any::Any; use std::fmt::{Display, Formatter}; use std::hash::{Hash, Hasher}; use std::sync::{Arc, Mutex}; diff --git a/native/spark-expr/src/predicate_funcs/rlike.rs b/native/spark-expr/src/predicate_funcs/rlike.rs index c76414694b..ee005dd1ac 100644 --- a/native/spark-expr/src/predicate_funcs/rlike.rs +++ b/native/spark-expr/src/predicate_funcs/rlike.rs @@ -25,7 +25,6 @@ use datafusion::common::{internal_err, Result, ScalarValue}; use datafusion::physical_expr::PhysicalExpr; use datafusion::physical_plan::ColumnarValue; use regex::Regex; -use std::any::Any; use std::fmt::{Display, Formatter}; use std::hash::{Hash, Hasher}; use std::sync::Arc; diff --git a/native/spark-expr/src/string_funcs/substring.rs b/native/spark-expr/src/string_funcs/substring.rs index 4be306afca..e8c3f12229 100644 --- a/native/spark-expr/src/string_funcs/substring.rs +++ b/native/spark-expr/src/string_funcs/substring.rs @@ -24,7 +24,6 @@ use datafusion::common::DataFusionError; use datafusion::logical_expr::ColumnarValue; use datafusion::physical_expr::PhysicalExpr; use std::{ - any::Any, fmt::{Display, Formatter}, hash::Hash, sync::Arc, diff --git a/native/spark-expr/src/struct_funcs/create_named_struct.rs b/native/spark-expr/src/struct_funcs/create_named_struct.rs index d610648916..1a63cb1cc9 100644 --- a/native/spark-expr/src/struct_funcs/create_named_struct.rs +++ b/native/spark-expr/src/struct_funcs/create_named_struct.rs @@ -22,7 +22,6 @@ use datafusion::common::Result as DataFusionResult; use datafusion::logical_expr::ColumnarValue; use datafusion::physical_expr::PhysicalExpr; use std::{ - any::Any, fmt::{Display, Formatter}, hash::Hash, sync::Arc, diff --git a/native/spark-expr/src/struct_funcs/get_struct_field.rs b/native/spark-expr/src/struct_funcs/get_struct_field.rs index afafcec53b..6684967c3a 100644 --- a/native/spark-expr/src/struct_funcs/get_struct_field.rs +++ b/native/spark-expr/src/struct_funcs/get_struct_field.rs @@ -22,7 +22,6 @@ use datafusion::common::{DataFusionError, Result as DataFusionResult, ScalarValu use datafusion::logical_expr::ColumnarValue; use datafusion::physical_expr::PhysicalExpr; use std::{ - any::Any, fmt::{Display, Formatter}, hash::Hash, sync::Arc, diff --git a/native/spark-expr/src/unbound.rs b/native/spark-expr/src/unbound.rs index 919701dd1f..69187dbc02 100644 --- a/native/spark-expr/src/unbound.rs +++ b/native/spark-expr/src/unbound.rs @@ -59,8 +59,6 @@ impl std::fmt::Display for UnboundColumn { } impl PhysicalExpr for UnboundColumn { - /// Return a reference to Any that can be used for downcasting - fn fmt_sql(&self, f: &mut Formatter<'_>) -> std::fmt::Result { Display::fmt(self, f) } From ab809d1567f0804c38ce1ff25d2a3db010b77a8b Mon Sep 17 00:00:00 2001 From: Matt Butrovich Date: Wed, 15 Apr 2026 21:33:58 -0400 Subject: [PATCH 11/30] Fix after merging in latest datafusion main in the feature branch. --- .../src/execution/expressions/arithmetic.rs | 4 --- .../core/src/execution/expressions/strings.rs | 2 +- .../src/execution/expressions/subquery.rs | 5 --- native/core/src/execution/planner.rs | 33 ++++++------------- native/core/src/parquet/cast_column.rs | 5 --- native/core/src/parquet/schema_adapter.rs | 12 +++---- 6 files changed, 16 insertions(+), 45 deletions(-) diff --git a/native/core/src/execution/expressions/arithmetic.rs b/native/core/src/execution/expressions/arithmetic.rs index 320532d773..8d4c59a010 100644 --- a/native/core/src/execution/expressions/arithmetic.rs +++ b/native/core/src/execution/expressions/arithmetic.rs @@ -77,10 +77,6 @@ impl Hash for CheckedBinaryExpr { } impl PhysicalExpr for CheckedBinaryExpr { - fn as_any(&self) -> &dyn Any { - self - } - fn fmt_sql(&self, f: &mut Formatter<'_>) -> std::fmt::Result { self.child.fmt_sql(f) } diff --git a/native/core/src/execution/expressions/strings.rs b/native/core/src/execution/expressions/strings.rs index 7219395963..4a7c44cc3e 100644 --- a/native/core/src/execution/expressions/strings.rs +++ b/native/core/src/execution/expressions/strings.rs @@ -91,7 +91,7 @@ impl ExpressionBuilder for RlikeBuilder { let left = planner.create_expr(expr.left.as_ref().unwrap(), Arc::clone(&input_schema))?; let right = planner.create_expr(expr.right.as_ref().unwrap(), input_schema)?; - match right.as_any().downcast_ref::().unwrap().value() { + match right.downcast_ref::().unwrap().value() { ScalarValue::Utf8(Some(pattern)) => Ok(Arc::new(RLike::try_new(left, pattern)?)), _ => Err(ExecutionError::GeneralError( "RLike only supports scalar patterns".to_string(), diff --git a/native/core/src/execution/expressions/subquery.rs b/native/core/src/execution/expressions/subquery.rs index 9272ede60c..fc7b8104d2 100644 --- a/native/core/src/execution/expressions/subquery.rs +++ b/native/core/src/execution/expressions/subquery.rs @@ -29,7 +29,6 @@ use jni::{ sys::{jboolean, jbyte, jint, jlong, jshort}, }; use std::{ - any::Any, fmt::{Display, Formatter}, hash::Hash, sync::Arc, @@ -63,10 +62,6 @@ impl Display for Subquery { } impl PhysicalExpr for Subquery { - fn as_any(&self) -> &dyn Any { - self - } - fn fmt_sql(&self, f: &mut Formatter<'_>) -> std::fmt::Result { Display::fmt(self, f) } diff --git a/native/core/src/execution/planner.rs b/native/core/src/execution/planner.rs index 7275470db1..9f70db7d70 100644 --- a/native/core/src/execution/planner.rs +++ b/native/core/src/execution/planner.rs @@ -233,7 +233,6 @@ impl PhysicalPlanner { let literal = self.create_expr(partition_value, Arc::::clone(&empty_schema))?; literal - .as_any() .downcast_ref::() .ok_or_else(|| { GeneralError("Expected literal of partition value".to_string()) @@ -424,11 +423,7 @@ impl PhysicalPlanner { // WideDecimalBinaryExpr already handles overflow — skip redundant check // but only if its output type matches CheckOverflow's declared type - if child - .as_any() - .downcast_ref::() - .is_some() - { + if child.downcast_ref::().is_some() { let child_type = child.data_type(&input_schema)?; if child_type == data_type { return Ok(child); @@ -437,7 +432,7 @@ impl PhysicalPlanner { // Fuse Cast(Decimal128→Decimal128) + CheckOverflow into single rescale+check // Only fuse when the Cast target type matches the CheckOverflow output type - if let Some(cast) = child.as_any().downcast_ref::() { + if let Some(cast) = child.downcast_ref::() { if let ( DataType::Decimal128(p_out, s_out), Ok(DataType::Decimal128(_p_in, s_in)), @@ -1166,12 +1161,10 @@ impl PhysicalPlanner { .iter() .map(|expr| { let literal = self.create_expr(expr, Arc::clone(&required_schema))?; - let df_literal = literal - .as_any() - .downcast_ref::() - .ok_or_else(|| { - GeneralError("Expected literal of default value.".to_string()) - })?; + let df_literal = + literal.downcast_ref::().ok_or_else(|| { + GeneralError("Expected literal of default value.".to_string()) + })?; Ok(df_literal.value().clone()) }) .collect(); @@ -2552,8 +2545,7 @@ impl PhysicalPlanner { &boundary_row.partition_bounds[col_idx], Arc::clone(&input_schema), )?; - let literal_expr = - expr.as_any().downcast_ref::().expect("Literal"); + let literal_expr = expr.downcast_ref::().expect("Literal"); col_values.push(literal_expr.value().clone()); } } @@ -2663,12 +2655,7 @@ impl PhysicalPlanner { // TODO this should try and find scalar let arguments = args .iter() - .map(|e| { - e.as_ref() - .as_any() - .downcast_ref::() - .map(|lit| lit.value()) - }) + .map(|e| e.as_ref().downcast_ref::().map(|lit| lit.value())) .collect::>(); let args = ReturnFieldArgs { @@ -2772,7 +2759,7 @@ fn expr_to_columns( expr.apply(&mut |expr: &Arc| { Ok({ - if let Some(column) = expr.as_any().downcast_ref::() { + if let Some(column) = expr.downcast_ref::() { if column.index() > left_field_len + right_field_len { return Err(DataFusionError::Internal(format!( "Column index {} out of range", @@ -2823,7 +2810,7 @@ impl TreeNodeRewriter for JoinFilterRewriter<'_> { type Node = Arc; fn f_down(&mut self, node: Self::Node) -> datafusion::common::Result> { - if let Some(column) = node.as_any().downcast_ref::() { + if let Some(column) = node.downcast_ref::() { if column.index() < self.left_field_len { // left side let new_index = self diff --git a/native/core/src/parquet/cast_column.rs b/native/core/src/parquet/cast_column.rs index 67558b5266..1cc928d1d5 100644 --- a/native/core/src/parquet/cast_column.rs +++ b/native/core/src/parquet/cast_column.rs @@ -31,7 +31,6 @@ use datafusion::common::ScalarValue; use datafusion::logical_expr::ColumnarValue; use datafusion::physical_expr::PhysicalExpr; use std::{ - any::Any, fmt::{self, Display}, hash::Hash, sync::Arc, @@ -250,10 +249,6 @@ impl Display for CometCastColumnExpr { } impl PhysicalExpr for CometCastColumnExpr { - fn as_any(&self) -> &dyn Any { - self - } - fn data_type(&self, _input_schema: &Schema) -> DataFusionResult { Ok(self.target_field.data_type().clone()) } diff --git a/native/core/src/parquet/schema_adapter.rs b/native/core/src/parquet/schema_adapter.rs index 593a0c063a..1703f05807 100644 --- a/native/core/src/parquet/schema_adapter.rs +++ b/native/core/src/parquet/schema_adapter.rs @@ -216,7 +216,7 @@ impl PhysicalExprAdapter for SparkPhysicalExprAdapter { // Walk the expression tree to find Column references let mut duplicate_err: Option = None; let _ = Arc::::clone(&expr).transform(|e| { - if let Some(col) = e.as_any().downcast_ref::() { + if let Some(col) = e.downcast_ref::() { if let Some((req, matched)) = check_column_duplicate(col.name(), orig_physical) { duplicate_err = Some(DataFusionError::External(Box::new( @@ -266,7 +266,7 @@ impl PhysicalExprAdapter for SparkPhysicalExprAdapter { // the actual parquet stream schema, which uses the original physical names. let expr = if let Some(name_map) = &self.logical_to_physical_names { expr.transform(|e| { - if let Some(col) = e.as_any().downcast_ref::() { + if let Some(col) = e.downcast_ref::() { if let Some(physical_name) = name_map.get(col.name()) { return Ok(Transformed::yes(Arc::new(Column::new( physical_name, @@ -295,7 +295,7 @@ impl SparkPhysicalExprAdapter { expr: Arc, ) -> DataFusionResult> { expr.transform(|e| { - if let Some(column) = e.as_any().downcast_ref::() { + if let Some(column) = e.downcast_ref::() { let col_name = column.name(); // Resolve fields by name because this is the fallback path @@ -376,15 +376,13 @@ impl SparkPhysicalExprAdapter { expr: Arc, ) -> DataFusionResult>> { // Check for CastExpr and replace with spark_expr::Cast - if let Some(cast) = expr - .as_any() - .downcast_ref::() + if let Some(cast) = expr.downcast_ref::() { let child = Arc::clone(cast.expr()); let target_type = cast.target_field().data_type(); // Derive input field from the child Column expression and the physical schema - let input_field = if let Some(col) = child.as_any().downcast_ref::() { + let input_field = if let Some(col) = child.downcast_ref::() { Arc::new(self.physical_file_schema.field(col.index()).clone()) } else { // Fallback: synthesize a field from the target field name and child data type From f716fc368e52e5d4f55304c7858b9a2cf7a6f568 Mon Sep 17 00:00:00 2001 From: Matt Butrovich Date: Wed, 15 Apr 2026 21:53:33 -0400 Subject: [PATCH 12/30] Fix after merging in latest datafusion main in the feature branch. --- native/Cargo.lock | 490 ++++++++++++----------------------------- native/core/Cargo.toml | 2 +- 2 files changed, 139 insertions(+), 353 deletions(-) diff --git a/native/Cargo.lock b/native/Cargo.lock index 08e4493ca2..7a75e11487 100644 --- a/native/Cargo.lock +++ b/native/Cargo.lock @@ -1840,25 +1840,25 @@ dependencies = [ "chrono", "datafusion-catalog", "datafusion-catalog-listing", - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-common", "datafusion-common-runtime", "datafusion-datasource", "datafusion-datasource-arrow", "datafusion-datasource-csv", "datafusion-datasource-json", "datafusion-datasource-parquet", - "datafusion-execution 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-functions 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-functions-aggregate 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-functions-nested 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-execution", + "datafusion-expr", + "datafusion-expr-common", + "datafusion-functions", + "datafusion-functions-aggregate", + "datafusion-functions-nested", "datafusion-functions-table", "datafusion-functions-window", "datafusion-optimizer", - "datafusion-physical-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-physical-expr", "datafusion-physical-expr-adapter", - "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-physical-expr-common", "datafusion-physical-optimizer", "datafusion-physical-plan", "datafusion-session", @@ -1884,12 +1884,12 @@ dependencies = [ "arrow", "async-trait", "dashmap", - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-common", "datafusion-common-runtime", "datafusion-datasource", - "datafusion-execution 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-physical-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-expr", "datafusion-physical-plan", "datafusion-session", "futures", @@ -1908,13 +1908,13 @@ dependencies = [ "arrow", "async-trait", "datafusion-catalog", - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-common", "datafusion-datasource", - "datafusion-execution 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-physical-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-expr", "datafusion-physical-expr-adapter", - "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-physical-expr-common", "datafusion-physical-plan", "futures", "itertools 0.14.0", @@ -1941,7 +1941,7 @@ dependencies = [ "datafusion-comet-shuffle", "datafusion-comet-spark-expr", "datafusion-datasource", - "datafusion-functions-nested 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", + "datafusion-functions-nested", "datafusion-physical-expr-adapter", "datafusion-spark", "futures", @@ -2093,27 +2093,6 @@ dependencies = [ "twox-hash", ] -[[package]] -name = "datafusion-common" -version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" -dependencies = [ - "arrow", - "arrow-ipc", - "arrow-schema", - "chrono", - "foldhash 0.2.0", - "half", - "hashbrown 0.17.0", - "indexmap 2.14.0", - "itertools 0.14.0", - "libc", - "log", - "tokio", - "uuid", - "web-time", -] - [[package]] name = "datafusion-common" version = "53.0.0" @@ -2160,13 +2139,13 @@ dependencies = [ "bytes", "bzip2", "chrono", - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-common", "datafusion-common-runtime", - "datafusion-execution 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-physical-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-expr", "datafusion-physical-expr-adapter", - "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-physical-expr-common", "datafusion-physical-plan", "datafusion-session", "flate2", @@ -2192,12 +2171,12 @@ dependencies = [ "arrow-ipc", "async-trait", "bytes", - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-common", "datafusion-common-runtime", "datafusion-datasource", - "datafusion-execution 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-expr-common", "datafusion-physical-plan", "datafusion-session", "futures", @@ -2214,12 +2193,12 @@ dependencies = [ "arrow", "async-trait", "bytes", - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-common", "datafusion-common-runtime", "datafusion-datasource", - "datafusion-execution 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-expr-common", "datafusion-physical-plan", "datafusion-session", "futures", @@ -2236,12 +2215,12 @@ dependencies = [ "arrow", "async-trait", "bytes", - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-common", "datafusion-common-runtime", "datafusion-datasource", - "datafusion-execution 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-expr-common", "datafusion-physical-plan", "datafusion-session", "futures", @@ -2258,16 +2237,16 @@ dependencies = [ "arrow", "async-trait", "bytes", - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-common", "datafusion-common-runtime", "datafusion-datasource", - "datafusion-execution 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-functions 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-functions-aggregate-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-physical-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-execution", + "datafusion-expr", + "datafusion-functions", + "datafusion-functions-aggregate-common", + "datafusion-physical-expr", "datafusion-physical-expr-adapter", - "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-physical-expr-common", "datafusion-physical-plan", "datafusion-pruning", "datafusion-session", @@ -2280,37 +2259,11 @@ dependencies = [ "tokio", ] -[[package]] -name = "datafusion-doc" -version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" - [[package]] name = "datafusion-doc" version = "53.0.0" source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" -[[package]] -name = "datafusion-execution" -version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" -dependencies = [ - "arrow", - "arrow-buffer", - "async-trait", - "dashmap", - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "futures", - "log", - "object_store", - "parking_lot", - "rand 0.9.4", - "tempfile", - "url", -] - [[package]] name = "datafusion-execution" version = "53.0.0" @@ -2320,9 +2273,9 @@ dependencies = [ "arrow-buffer", "async-trait", "dashmap", - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-common", + "datafusion-expr", + "datafusion-physical-expr-common", "futures", "log", "object_store", @@ -2333,27 +2286,6 @@ dependencies = [ "url", ] -[[package]] -name = "datafusion-expr" -version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" -dependencies = [ - "arrow", - "arrow-schema", - "async-trait", - "chrono", - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "datafusion-doc 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "datafusion-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "datafusion-functions-aggregate-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "datafusion-functions-window-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "indexmap 2.14.0", - "itertools 0.14.0", - "serde_json", - "sqlparser", -] - [[package]] name = "datafusion-expr" version = "53.0.0" @@ -2363,66 +2295,29 @@ dependencies = [ "arrow-schema", "async-trait", "chrono", - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-doc 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-functions-aggregate-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-functions-window-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-common", + "datafusion-doc", + "datafusion-expr-common", + "datafusion-functions-aggregate-common", + "datafusion-functions-window-common", + "datafusion-physical-expr-common", "indexmap 2.14.0", "itertools 0.14.0", "serde_json", "sqlparser", ] -[[package]] -name = "datafusion-expr-common" -version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" -dependencies = [ - "arrow", - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "indexmap 2.14.0", - "itertools 0.14.0", -] - [[package]] name = "datafusion-expr-common" version = "53.0.0" source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" dependencies = [ "arrow", - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-common", "indexmap 2.14.0", "itertools 0.14.0", ] -[[package]] -name = "datafusion-functions" -version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" -dependencies = [ - "arrow", - "arrow-buffer", - "base64", - "chrono", - "chrono-tz", - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "datafusion-doc 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "datafusion-execution 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "datafusion-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "datafusion-macros 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "hex", - "itertools 0.14.0", - "log", - "memchr", - "num-traits", - "rand 0.9.4", - "regex", - "uuid", -] - [[package]] name = "datafusion-functions" version = "53.0.0" @@ -2435,12 +2330,12 @@ dependencies = [ "blake3", "chrono", "chrono-tz", - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-doc 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-execution 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-macros 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-common", + "datafusion-doc", + "datafusion-execution", + "datafusion-expr", + "datafusion-expr-common", + "datafusion-macros", "hex", "itertools 0.14.0", "log", @@ -2453,90 +2348,35 @@ dependencies = [ "uuid", ] -[[package]] -name = "datafusion-functions-aggregate" -version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" -dependencies = [ - "arrow", - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "datafusion-doc 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "datafusion-execution 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "datafusion-functions-aggregate-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "datafusion-macros 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "datafusion-physical-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "foldhash 0.2.0", - "half", - "log", - "num-traits", -] - [[package]] name = "datafusion-functions-aggregate" version = "53.0.0" source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" dependencies = [ "arrow", - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-doc 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-execution 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-functions-aggregate-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-macros 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-physical-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-common", + "datafusion-doc", + "datafusion-execution", + "datafusion-expr", + "datafusion-functions-aggregate-common", + "datafusion-macros", + "datafusion-physical-expr", + "datafusion-physical-expr-common", "foldhash 0.2.0", "half", "log", "num-traits", ] -[[package]] -name = "datafusion-functions-aggregate-common" -version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" -dependencies = [ - "arrow", - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "datafusion-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", -] - [[package]] name = "datafusion-functions-aggregate-common" version = "53.0.0" source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" dependencies = [ "arrow", - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", -] - -[[package]] -name = "datafusion-functions-nested" -version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" -dependencies = [ - "arrow", - "arrow-ord", - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "datafusion-doc 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "datafusion-execution 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "datafusion-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "datafusion-functions 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "datafusion-functions-aggregate 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "datafusion-functions-aggregate-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "datafusion-macros 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "hashbrown 0.17.0", - "itertools 0.14.0", - "itoa", - "log", - "memchr", + "datafusion-common", + "datafusion-expr-common", + "datafusion-physical-expr-common", ] [[package]] @@ -2546,16 +2386,16 @@ source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c9 dependencies = [ "arrow", "arrow-ord", - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-doc 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-execution 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-functions 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-functions-aggregate 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-functions-aggregate-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-macros 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-common", + "datafusion-doc", + "datafusion-execution", + "datafusion-expr", + "datafusion-expr-common", + "datafusion-functions", + "datafusion-functions-aggregate", + "datafusion-functions-aggregate-common", + "datafusion-macros", + "datafusion-physical-expr-common", "hashbrown 0.17.0", "itertools 0.14.0", "itoa", @@ -2571,8 +2411,8 @@ dependencies = [ "arrow", "async-trait", "datafusion-catalog", - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-common", + "datafusion-expr", "datafusion-physical-plan", "parking_lot", ] @@ -2583,42 +2423,23 @@ version = "53.0.0" source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" dependencies = [ "arrow", - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-doc 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-functions-window-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-macros 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-physical-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-common", + "datafusion-doc", + "datafusion-expr", + "datafusion-functions-window-common", + "datafusion-macros", + "datafusion-physical-expr", + "datafusion-physical-expr-common", "log", ] -[[package]] -name = "datafusion-functions-window-common" -version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" -dependencies = [ - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", -] - [[package]] name = "datafusion-functions-window-common" version = "53.0.0" source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" dependencies = [ - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", -] - -[[package]] -name = "datafusion-macros" -version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" -dependencies = [ - "datafusion-doc 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "quote", - "syn 2.0.117", + "datafusion-common", + "datafusion-physical-expr-common", ] [[package]] @@ -2626,7 +2447,7 @@ name = "datafusion-macros" version = "53.0.0" source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" dependencies = [ - "datafusion-doc 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-doc", "quote", "syn 2.0.117", ] @@ -2638,10 +2459,10 @@ source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c9 dependencies = [ "arrow", "chrono", - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-physical-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-common", + "datafusion-expr", + "datafusion-expr-common", + "datafusion-physical-expr", "indexmap 2.14.0", "itertools 0.14.0", "log", @@ -2649,37 +2470,17 @@ dependencies = [ "regex-syntax", ] -[[package]] -name = "datafusion-physical-expr" -version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" -dependencies = [ - "arrow", - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "datafusion-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "datafusion-functions-aggregate-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "half", - "hashbrown 0.17.0", - "indexmap 2.14.0", - "itertools 0.14.0", - "parking_lot", - "petgraph", - "tokio", -] - [[package]] name = "datafusion-physical-expr" version = "53.0.0" source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" dependencies = [ "arrow", - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-functions-aggregate-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-common", + "datafusion-expr", + "datafusion-expr-common", + "datafusion-functions-aggregate-common", + "datafusion-physical-expr-common", "half", "hashbrown 0.17.0", "indexmap 2.14.0", @@ -2695,29 +2496,14 @@ version = "53.0.0" source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" dependencies = [ "arrow", - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-functions 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-physical-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-common", + "datafusion-expr", + "datafusion-functions", + "datafusion-physical-expr", + "datafusion-physical-expr-common", "itertools 0.14.0", ] -[[package]] -name = "datafusion-physical-expr-common" -version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=0198302544#01983025442464d834808a036564f709af58aaff" -dependencies = [ - "arrow", - "chrono", - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "datafusion-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=0198302544)", - "hashbrown 0.17.0", - "indexmap 2.14.0", - "itertools 0.14.0", - "parking_lot", -] - [[package]] name = "datafusion-physical-expr-common" version = "53.0.0" @@ -2725,8 +2511,8 @@ source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c9 dependencies = [ "arrow", "chrono", - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-common", + "datafusion-expr-common", "hashbrown 0.17.0", "indexmap 2.14.0", "itertools 0.14.0", @@ -2739,12 +2525,12 @@ version = "53.0.0" source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" dependencies = [ "arrow", - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-execution 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-physical-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "datafusion-expr-common", + "datafusion-physical-expr", + "datafusion-physical-expr-common", "datafusion-physical-plan", "datafusion-pruning", "itertools 0.14.0", @@ -2759,15 +2545,15 @@ dependencies = [ "arrow-ord", "arrow-schema", "async-trait", - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-common", "datafusion-common-runtime", - "datafusion-execution 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-functions 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-functions-aggregate-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-functions-window-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-physical-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-execution", + "datafusion-expr", + "datafusion-functions", + "datafusion-functions-aggregate-common", + "datafusion-functions-window-common", + "datafusion-physical-expr", + "datafusion-physical-expr-common", "futures", "half", "hashbrown 0.17.0", @@ -2786,11 +2572,11 @@ version = "53.0.0" source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" dependencies = [ "arrow", - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-common", "datafusion-datasource", - "datafusion-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-physical-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-physical-expr-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-expr-common", + "datafusion-physical-expr", + "datafusion-physical-expr-common", "datafusion-physical-plan", "log", ] @@ -2801,9 +2587,9 @@ version = "53.0.0" source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" dependencies = [ "async-trait", - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-execution 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", "datafusion-physical-plan", "parking_lot", ] @@ -2819,12 +2605,12 @@ dependencies = [ "crc32fast", "datafusion", "datafusion-catalog", - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-execution 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-functions 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-functions-aggregate 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-functions-nested 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "datafusion-functions", + "datafusion-functions-aggregate", + "datafusion-functions-nested", "log", "num-traits", "percent-encoding", @@ -2843,9 +2629,9 @@ dependencies = [ "arrow", "bigdecimal", "chrono", - "datafusion-common 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-expr 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", - "datafusion-functions-nested 53.0.0 (git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998)", + "datafusion-common", + "datafusion-expr", + "datafusion-functions-nested", "indexmap 2.14.0", "log", "regex", diff --git a/native/core/Cargo.toml b/native/core/Cargo.toml index 2bfb720379..ed4b11e8b3 100644 --- a/native/core/Cargo.toml +++ b/native/core/Cargo.toml @@ -91,7 +91,7 @@ jni = { version = "0.22.4", features = ["invocation"] } lazy_static = "1.4" assertables = "9" hex = "0.4.3" -datafusion-functions-nested = { git = "https://github.com/mbutrovich/datafusion.git", rev = "0198302544" } +datafusion-functions-nested = { git = "https://github.com/mbutrovich/datafusion.git", rev = "9598c96998" } [features] backtrace = ["datafusion/backtrace"] From 219dc9a9047e119769b29cc913bc1ee0e83fd438 Mon Sep 17 00:00:00 2001 From: Matt Butrovich Date: Thu, 16 Apr 2026 10:47:37 -0400 Subject: [PATCH 13/30] bump to latest commit on main after miri fix. --- native/Cargo.lock | 72 +++++++++++++++++++++--------------------- native/Cargo.toml | 8 ++--- native/core/Cargo.toml | 2 +- 3 files changed, 41 insertions(+), 41 deletions(-) diff --git a/native/Cargo.lock b/native/Cargo.lock index 7a75e11487..3440fbc454 100644 --- a/native/Cargo.lock +++ b/native/Cargo.lock @@ -1832,7 +1832,7 @@ dependencies = [ [[package]] name = "datafusion" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "arrow-schema", @@ -1879,7 +1879,7 @@ dependencies = [ [[package]] name = "datafusion-catalog" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "async-trait", @@ -1903,7 +1903,7 @@ dependencies = [ [[package]] name = "datafusion-catalog-listing" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "async-trait", @@ -2096,7 +2096,7 @@ dependencies = [ [[package]] name = "datafusion-common" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "arrow-ipc", @@ -2121,7 +2121,7 @@ dependencies = [ [[package]] name = "datafusion-common-runtime" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "futures", "log", @@ -2131,7 +2131,7 @@ dependencies = [ [[package]] name = "datafusion-datasource" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "async-compression", @@ -2165,7 +2165,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-arrow" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "arrow-ipc", @@ -2188,7 +2188,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-csv" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "async-trait", @@ -2210,7 +2210,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-json" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "async-trait", @@ -2232,7 +2232,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-parquet" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "async-trait", @@ -2262,12 +2262,12 @@ dependencies = [ [[package]] name = "datafusion-doc" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" [[package]] name = "datafusion-execution" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "arrow-buffer", @@ -2289,7 +2289,7 @@ dependencies = [ [[package]] name = "datafusion-expr" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "arrow-schema", @@ -2310,7 +2310,7 @@ dependencies = [ [[package]] name = "datafusion-expr-common" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "datafusion-common", @@ -2321,7 +2321,7 @@ dependencies = [ [[package]] name = "datafusion-functions" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "arrow-buffer", @@ -2351,7 +2351,7 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "datafusion-common", @@ -2371,7 +2371,7 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate-common" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "datafusion-common", @@ -2382,7 +2382,7 @@ dependencies = [ [[package]] name = "datafusion-functions-nested" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "arrow-ord", @@ -2406,7 +2406,7 @@ dependencies = [ [[package]] name = "datafusion-functions-table" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "async-trait", @@ -2420,7 +2420,7 @@ dependencies = [ [[package]] name = "datafusion-functions-window" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "datafusion-common", @@ -2436,7 +2436,7 @@ dependencies = [ [[package]] name = "datafusion-functions-window-common" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "datafusion-common", "datafusion-physical-expr-common", @@ -2445,7 +2445,7 @@ dependencies = [ [[package]] name = "datafusion-macros" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "datafusion-doc", "quote", @@ -2455,7 +2455,7 @@ dependencies = [ [[package]] name = "datafusion-optimizer" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "chrono", @@ -2473,7 +2473,7 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "datafusion-common", @@ -2493,7 +2493,7 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-adapter" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "datafusion-common", @@ -2507,7 +2507,7 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-common" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "chrono", @@ -2522,7 +2522,7 @@ dependencies = [ [[package]] name = "datafusion-physical-optimizer" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "datafusion-common", @@ -2539,7 +2539,7 @@ dependencies = [ [[package]] name = "datafusion-physical-plan" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "arrow-ord", @@ -2569,7 +2569,7 @@ dependencies = [ [[package]] name = "datafusion-pruning" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "datafusion-common", @@ -2584,7 +2584,7 @@ dependencies = [ [[package]] name = "datafusion-session" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "async-trait", "datafusion-common", @@ -2597,7 +2597,7 @@ dependencies = [ [[package]] name = "datafusion-spark" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "bigdecimal", @@ -2624,7 +2624,7 @@ dependencies = [ [[package]] name = "datafusion-sql" version = "53.0.0" -source = "git+https://github.com/mbutrovich/datafusion.git?rev=9598c96998#9598c96998eda71a3e4e0ba2e055c418ac4575f7" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "bigdecimal", @@ -6737,9 +6737,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.23.0" +version = "1.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ac8b6f42ead25368cf5b098aeb3dc8a1a2c05a3eee8a9a1a68c640edbfc79d9" +checksum = "ddd74a9687298c6858e9b88ec8935ec45d22e8fd5e6394fa1bd4e99a87789c76" dependencies = [ "getrandom 0.4.2", "js-sys", @@ -6932,9 +6932,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cfaf3c063993ff62e73cb4311efde4db1efb31ab78a3e5c457939ad5cc0bed" +checksum = "52f5ee44c96cf55f1b349600768e3ece3a8f26010c05265ab73f945bb1a2eb9d" dependencies = [ "rustls-pki-types", ] diff --git a/native/Cargo.toml b/native/Cargo.toml index 2aeacc8544..a30e87cbc1 100644 --- a/native/Cargo.toml +++ b/native/Cargo.toml @@ -38,10 +38,10 @@ arrow = { version = "58.1.0", features = ["prettyprint", "ffi", "chrono-tz"] } async-trait = { version = "0.1" } bytes = { version = "1.11.1" } parquet = { version = "58.1.0", default-features = false, features = ["experimental"] } -datafusion = { git = "https://github.com/mbutrovich/datafusion.git", rev = "9598c96998", default-features = false, features = ["unicode_expressions", "crypto_expressions", "nested_expressions", "parquet"] } -datafusion-datasource = { git = "https://github.com/mbutrovich/datafusion.git", rev = "9598c96998" } -datafusion-physical-expr-adapter = { git = "https://github.com/mbutrovich/datafusion.git", rev = "9598c96998" } -datafusion-spark = { git = "https://github.com/mbutrovich/datafusion.git", rev = "9598c96998", features = ["core"] } +datafusion = { git = "https://github.com/apache/datafusion.git", rev = "4c7bb08f93", default-features = false, features = ["unicode_expressions", "crypto_expressions", "nested_expressions", "parquet"] } +datafusion-datasource = { git = "https://github.com/apache/datafusion.git", rev = "4c7bb08f93" } +datafusion-physical-expr-adapter = { git = "https://github.com/apache/datafusion.git", rev = "4c7bb08f93" } +datafusion-spark = { git = "https://github.com/apache/datafusion.git", rev = "4c7bb08f93", features = ["core"] } datafusion-comet-spark-expr = { path = "spark-expr" } datafusion-comet-common = { path = "common" } datafusion-comet-jni-bridge = { path = "jni-bridge" } diff --git a/native/core/Cargo.toml b/native/core/Cargo.toml index ed4b11e8b3..9d40b18e27 100644 --- a/native/core/Cargo.toml +++ b/native/core/Cargo.toml @@ -91,7 +91,7 @@ jni = { version = "0.22.4", features = ["invocation"] } lazy_static = "1.4" assertables = "9" hex = "0.4.3" -datafusion-functions-nested = { git = "https://github.com/mbutrovich/datafusion.git", rev = "9598c96998" } +datafusion-functions-nested = { git = "https://github.com/apache/datafusion.git", rev = "4c7bb08f93" } [features] backtrace = ["datafusion/backtrace"] From f1a8041cc09098d0ada3f9199624b9a062d30b9e Mon Sep 17 00:00:00 2001 From: Matt Butrovich Date: Thu, 16 Apr 2026 10:49:55 -0400 Subject: [PATCH 14/30] fix after upmerge --- native/Cargo.lock | 513 +++++++++++++++++++++++++++------------------- 1 file changed, 301 insertions(+), 212 deletions(-) diff --git a/native/Cargo.lock b/native/Cargo.lock index 5fdb7968fc..7b125fccd0 100644 --- a/native/Cargo.lock +++ b/native/Cargo.lock @@ -23,7 +23,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" dependencies = [ - "crypto-common", + "crypto-common 0.1.7", "generic-array", ] @@ -184,7 +184,7 @@ checksum = "36fa98bc79671c7981272d91a8753a928ff6a1cd8e4f20a44c45bd5d313840bf" dependencies = [ "bigdecimal", "bon", - "digest", + "digest 0.10.7", "log", "miniz_oxide", "num-bigint", @@ -372,7 +372,7 @@ dependencies = [ "arrow-schema", "chrono", "half", - "indexmap 2.13.1", + "indexmap 2.14.0", "itoa", "lexical-core", "memchr", @@ -415,7 +415,7 @@ version = "58.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c30a1365d7a7dc50cc847e54154e6af49e4c4b0fddc9f607b687f29212082743" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.11.1", "serde_core", "serde_json", ] @@ -459,9 +459,9 @@ checksum = "b0f477b951e452a0b6b4a10b53ccd569042d1d01729b519e02074a9c0958a063" [[package]] name = "assertables" -version = "9.8.6" +version = "9.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "098fbfe90e8af520c4a968eaad7a4031908e473394f16c99cd9cce6369328a68" +checksum = "627b0b35c347252505ec6c078827dfcecc4e9dcfa931c54c54066f9245ac752b" dependencies = [ "regex", "walkdir", @@ -646,7 +646,7 @@ dependencies = [ "fastrand", "hex", "http 1.4.0", - "sha1", + "sha1 0.10.6", "time", "tokio", "tracing", @@ -668,9 +668,9 @@ dependencies = [ [[package]] name = "aws-lc-rs" -version = "1.16.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a054912289d18629dc78375ba2c3726a3afe3ff71b4edba9dedfca0e3446d1fc" +checksum = "0ec6fb3fe69024a75fa7e1bfb48aa6cf59706a101658ea01bfd33b2b248a038f" dependencies = [ "aws-lc-sys", "zeroize", @@ -678,9 +678,9 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.39.1" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a25cf98105baa966497416dbd42565ce3a8cf8dbfd59803ec9ad46f3126399" +checksum = "f50037ee5e1e41e7b8f9d161680a725bd1626cb6f8c7e901f91f942850852fe7" dependencies = [ "cc", "cmake", @@ -1076,7 +1076,7 @@ version = "0.72.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.11.1", "cexpr", "clang-sys", "itertools 0.13.0", @@ -1098,9 +1098,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af" +checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3" [[package]] name = "blake2" @@ -1108,7 +1108,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" dependencies = [ - "digest", + "digest 0.10.7", ] [[package]] @@ -1134,6 +1134,15 @@ dependencies = [ "generic-array", ] +[[package]] +name = "block-buffer" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdd35008169921d80bc60d3d0ab416eecb028c4cd653352907921d95084790be" +dependencies = [ + "hybrid-array", +] + [[package]] name = "block-padding" version = "0.3.3" @@ -1272,9 +1281,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.59" +version = "1.2.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7a4d3ec6524d28a329fc53654bbadc9bdd7b0431f5d65f1a56ffb28a1ee5283" +checksum = "43c5703da9466b66a946814e1adf53ea2c90f10063b86290cc9eb67ce3478a20" dependencies = [ "find-msvc-tools", "jobserver", @@ -1317,7 +1326,7 @@ checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601" dependencies = [ "cfg-if", "cpufeatures 0.3.0", - "rand_core 0.10.0", + "rand_core 0.10.1", ] [[package]] @@ -1377,7 +1386,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ - "crypto-common", + "crypto-common 0.1.7", "inout", ] @@ -1394,9 +1403,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.6.0" +version = "4.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b193af5b67834b676abd72466a96c1024e6a6ad978a1f484bd90b85c94041351" +checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51" dependencies = [ "clap_builder", "clap_derive", @@ -1416,9 +1425,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.6.0" +version = "4.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1110bd8a634a1ab8cb04345d8d878267d57c3cf1b38d91b71af6686408bbca6a" +checksum = "f2ce8604710f6733aa641a2b3731eaa1e8b3d9973d5e3565da11800813f997a9" dependencies = [ "heck", "proc-macro2", @@ -1503,6 +1512,12 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" +[[package]] +name = "const-oid" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c" + [[package]] name = "const-random" version = "0.1.18" @@ -1676,6 +1691,15 @@ dependencies = [ "typenum", ] +[[package]] +name = "crypto-common" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77727bb15fa921304124b128af125e7e3b968275d1b108b379190264f4423710" +dependencies = [ + "hybrid-array", +] + [[package]] name = "csv" version = "1.4.0" @@ -1808,13 +1832,11 @@ dependencies = [ [[package]] name = "datafusion" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de9f8117889ba9503440f1dd79ebab32ba52ccf1720bb83cd718a29d4edc0d16" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "arrow-schema", "async-trait", - "bytes", "chrono", "datafusion-catalog", "datafusion-catalog-listing", @@ -1847,8 +1869,6 @@ dependencies = [ "object_store", "parking_lot", "parquet", - "rand 0.9.4", - "regex", "sqlparser", "tempfile", "tokio", @@ -1859,8 +1879,7 @@ dependencies = [ [[package]] name = "datafusion-catalog" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be893b73a13671f310ffcc8da2c546b81efcc54c22e0382c0a28aa3537017137" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "async-trait", @@ -1884,8 +1903,7 @@ dependencies = [ [[package]] name = "datafusion-catalog-listing" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830487b51ed83807d6b32d6325f349c3144ae0c9bf772cf2a712db180c31d5e6" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "async-trait", @@ -2078,33 +2096,32 @@ dependencies = [ [[package]] name = "datafusion-common" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d7663f3af955292f8004e74bcaf8f7ea3d66cc38438749615bb84815b61a293" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ - "ahash", "arrow", "arrow-ipc", + "arrow-schema", "chrono", + "foldhash 0.2.0", "half", - "hashbrown 0.16.1", + "hashbrown 0.17.0", "hex", - "indexmap 2.13.1", + "indexmap 2.14.0", "itertools 0.14.0", "libc", "log", "object_store", "parquet", - "paste", "sqlparser", "tokio", + "uuid", "web-time", ] [[package]] name = "datafusion-common-runtime" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f590205c7e32fe1fea48dd53ffb406e56ae0e7a062213a3ac848db8771641bd" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "futures", "log", @@ -2114,8 +2131,7 @@ dependencies = [ [[package]] name = "datafusion-datasource" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fde1e030a9dc87b743c806fbd631f5ecfa2ccaa4ffb61fa19144a07fea406b79" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "async-compression", @@ -2149,8 +2165,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-arrow" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "331ebae7055dc108f9b54994b93dff91f3a17445539efe5b74e89264f7b36e15" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "arrow-ipc", @@ -2173,8 +2188,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-csv" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e0d475088325e2986876aa27bb30d0574f72a22955a527d202f454681d55c5c" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "async-trait", @@ -2196,8 +2210,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-json" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea1520d81f31770f3ad6ee98b391e75e87a68a5bb90de70064ace5e0a7182fe8" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "async-trait", @@ -2212,7 +2225,6 @@ dependencies = [ "datafusion-session", "futures", "object_store", - "serde_json", "tokio", "tokio-stream", ] @@ -2220,8 +2232,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-parquet" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95be805d0742ab129720f4c51ad9242cd872599cdb076098b03f061fcdc7f946" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "async-trait", @@ -2231,6 +2242,7 @@ dependencies = [ "datafusion-datasource", "datafusion-execution", "datafusion-expr", + "datafusion-functions", "datafusion-functions-aggregate-common", "datafusion-physical-expr", "datafusion-physical-expr-adapter", @@ -2250,19 +2262,16 @@ dependencies = [ [[package]] name = "datafusion-doc" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c93ad9e37730d2c7196e68616f3f2dd3b04c892e03acd3a8eeca6e177f3c06a" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" [[package]] name = "datafusion-execution" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9437d3cd5d363f9319f8122182d4d233427de79c7eb748f23054c9aaa0fdd8df" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "arrow-buffer", "async-trait", - "chrono", "dashmap", "datafusion-common", "datafusion-expr", @@ -2280,10 +2289,10 @@ dependencies = [ [[package]] name = "datafusion-expr" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67164333342b86521d6d93fa54081ee39839894fb10f7a700c099af96d7552cf" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", + "arrow-schema", "async-trait", "chrono", "datafusion-common", @@ -2292,9 +2301,8 @@ dependencies = [ "datafusion-functions-aggregate-common", "datafusion-functions-window-common", "datafusion-physical-expr-common", - "indexmap 2.13.1", + "indexmap 2.14.0", "itertools 0.14.0", - "paste", "serde_json", "sqlparser", ] @@ -2302,21 +2310,18 @@ dependencies = [ [[package]] name = "datafusion-expr-common" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab05fdd00e05d5a6ee362882546d29d6d3df43a6c55355164a7fbee12d163bc9" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "datafusion-common", - "indexmap 2.13.1", + "indexmap 2.14.0", "itertools 0.14.0", - "paste", ] [[package]] name = "datafusion-functions" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04fb863482d987cf938db2079e07ab0d3bb64595f28907a6c2f8671ad71cca7e" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "arrow-buffer", @@ -2340,17 +2345,14 @@ dependencies = [ "rand 0.9.4", "regex", "sha2", - "unicode-segmentation", "uuid", ] [[package]] name = "datafusion-functions-aggregate" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829856f4e14275fb376c104f27cbf3c3b57a9cfe24885d98677525f5e43ce8d6" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ - "ahash", "arrow", "datafusion-common", "datafusion-doc", @@ -2360,19 +2362,17 @@ dependencies = [ "datafusion-macros", "datafusion-physical-expr", "datafusion-physical-expr-common", + "foldhash 0.2.0", "half", "log", "num-traits", - "paste", ] [[package]] name = "datafusion-functions-aggregate-common" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08af79cc3d2aa874a362fb97decfcbd73d687190cb096f16a6c85a7780cce311" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ - "ahash", "arrow", "datafusion-common", "datafusion-expr-common", @@ -2382,8 +2382,7 @@ dependencies = [ [[package]] name = "datafusion-functions-nested" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "465ae3368146d49c2eda3e2c0ef114424c87e8a6b509ab34c1026ace6497e790" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "arrow-ord", @@ -2397,18 +2396,17 @@ dependencies = [ "datafusion-functions-aggregate-common", "datafusion-macros", "datafusion-physical-expr-common", - "hashbrown 0.16.1", + "hashbrown 0.17.0", "itertools 0.14.0", "itoa", "log", - "paste", + "memchr", ] [[package]] name = "datafusion-functions-table" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6156e6b22fcf1784112fc0173f3ae6e78c8fdb4d3ed0eace9543873b437e2af6" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "async-trait", @@ -2417,14 +2415,12 @@ dependencies = [ "datafusion-expr", "datafusion-physical-plan", "parking_lot", - "paste", ] [[package]] name = "datafusion-functions-window" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca7baec14f866729012efb89011a6973f3a346dc8090c567bfcd328deff551c1" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "datafusion-common", @@ -2435,14 +2431,12 @@ dependencies = [ "datafusion-physical-expr", "datafusion-physical-expr-common", "log", - "paste", ] [[package]] name = "datafusion-functions-window-common" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "159228c3280d342658466bb556dc24de30047fe1d7e559dc5d16ccc5324166f9" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "datafusion-common", "datafusion-physical-expr-common", @@ -2451,8 +2445,7 @@ dependencies = [ [[package]] name = "datafusion-macros" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5427e5da5edca4d21ea1c7f50e1c9421775fe33d7d5726e5641a833566e7578" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "datafusion-doc", "quote", @@ -2462,8 +2455,7 @@ dependencies = [ [[package]] name = "datafusion-optimizer" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89099eefcd5b223ec685c36a41d35c69239236310d71d339f2af0fa4383f3f46" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "chrono", @@ -2471,7 +2463,7 @@ dependencies = [ "datafusion-expr", "datafusion-expr-common", "datafusion-physical-expr", - "indexmap 2.13.1", + "indexmap 2.14.0", "itertools 0.14.0", "log", "regex", @@ -2481,10 +2473,8 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f222df5195d605d79098ef37bdd5323bff0131c9d877a24da6ec98dfca9fe36" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ - "ahash", "arrow", "datafusion-common", "datafusion-expr", @@ -2492,11 +2482,10 @@ dependencies = [ "datafusion-functions-aggregate-common", "datafusion-physical-expr-common", "half", - "hashbrown 0.16.1", - "indexmap 2.13.1", + "hashbrown 0.17.0", + "indexmap 2.14.0", "itertools 0.14.0", "parking_lot", - "paste", "petgraph", "tokio", ] @@ -2504,8 +2493,7 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-adapter" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40838625d63d9c12549d81979db3dd675d159055eb9135009ba272ab0e8d0f64" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "datafusion-common", @@ -2519,16 +2507,14 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-common" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eacbcc4cfd502558184ed58fa3c72e775ec65bf077eef5fd2b3453db676f893c" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ - "ahash", "arrow", "chrono", "datafusion-common", "datafusion-expr-common", - "hashbrown 0.16.1", - "indexmap 2.13.1", + "hashbrown 0.17.0", + "indexmap 2.14.0", "itertools 0.14.0", "parking_lot", ] @@ -2536,8 +2522,7 @@ dependencies = [ [[package]] name = "datafusion-physical-optimizer" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d501d0e1d0910f015677121601ac177ec59272ef5c9324d1147b394988f40941" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "datafusion-common", @@ -2554,10 +2539,8 @@ dependencies = [ [[package]] name = "datafusion-physical-plan" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463c88ad6f1ecab1810f4c9f046898bee035b370137eb79b2b2db925e270631d" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ - "ahash", "arrow", "arrow-ord", "arrow-schema", @@ -2573,8 +2556,8 @@ dependencies = [ "datafusion-physical-expr-common", "futures", "half", - "hashbrown 0.16.1", - "indexmap 2.13.1", + "hashbrown 0.17.0", + "indexmap 2.14.0", "itertools 0.14.0", "log", "num-traits", @@ -2586,8 +2569,7 @@ dependencies = [ [[package]] name = "datafusion-pruning" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2857618a0ecbd8cd0cf29826889edd3a25774ec26b2995fc3862095c95d88fc6" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "datafusion-common", @@ -2596,15 +2578,13 @@ dependencies = [ "datafusion-physical-expr", "datafusion-physical-expr-common", "datafusion-physical-plan", - "itertools 0.14.0", "log", ] [[package]] name = "datafusion-session" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8637e35022c5c775003b3ab1debc6b4a8f0eb41b069bdd5475dd3aa93f6eba" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "async-trait", "datafusion-common", @@ -2617,8 +2597,7 @@ dependencies = [ [[package]] name = "datafusion-spark" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "923a8b871962a9d860f036f743a20af50ff04729f1da2468ed220dab4f61c97d" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "bigdecimal", @@ -2633,10 +2612,11 @@ dependencies = [ "datafusion-functions-aggregate", "datafusion-functions-nested", "log", + "num-traits", "percent-encoding", "rand 0.9.4", "serde_json", - "sha1", + "sha1 0.11.0", "sha2", "url", ] @@ -2644,8 +2624,7 @@ dependencies = [ [[package]] name = "datafusion-sql" version = "53.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12d9e9f16a1692a11c94bcc418191fa15fd2b4d72a0c1a0c607db93c0b84dd81" +source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" dependencies = [ "arrow", "bigdecimal", @@ -2653,7 +2632,7 @@ dependencies = [ "datafusion-common", "datafusion-expr", "datafusion-functions-nested", - "indexmap 2.13.1", + "indexmap 2.14.0", "log", "regex", "sqlparser", @@ -2674,7 +2653,7 @@ version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" dependencies = [ - "const-oid", + "const-oid 0.9.6", "pem-rfc7468", "zeroize", ] @@ -2754,12 +2733,23 @@ version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer", - "const-oid", - "crypto-common", + "block-buffer 0.10.4", + "const-oid 0.9.6", + "crypto-common 0.1.7", "subtle", ] +[[package]] +name = "digest" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4850db49bf08e663084f7fb5c87d202ef91a3907271aff24a94eb97ff039153c" +dependencies = [ + "block-buffer 0.12.0", + "const-oid 0.10.2", + "crypto-common 0.2.1", +] + [[package]] name = "displaydoc" version = "0.2.5" @@ -2863,7 +2853,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]] @@ -2951,7 +2941,7 @@ version = "25.12.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35f6839d7b3b98adde531effaf34f0c2badc6f4735d26fe74709d8e513a96ef3" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.11.1", "rustc_version", ] @@ -3160,7 +3150,7 @@ dependencies = [ "cfg-if", "libc", "r-efi 6.0.0", - "rand_core 0.10.0", + "rand_core 0.10.1", "wasip2", "wasip3", ] @@ -3211,7 +3201,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.4.0", - "indexmap 2.13.1", + "indexmap 2.14.0", "slab", "tokio", "tokio-util", @@ -3256,6 +3246,12 @@ name = "hashbrown" version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" + +[[package]] +name = "hashbrown" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51" dependencies = [ "allocator-api2", "equivalent", @@ -3310,7 +3306,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest", + "digest 0.10.7", ] [[package]] @@ -3389,6 +3385,15 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424" +[[package]] +name = "hybrid-array" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3944cf8cf766b40e2a1a333ee5e9b563f854d5fa49d6a8ca2764e97c6eddb214" +dependencies = [ + "typenum", +] + [[package]] name = "hyper" version = "1.9.0" @@ -3412,16 +3417,15 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.7" +version = "0.27.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" +checksum = "33ca68d021ef39cf6463ab54c1d0f5daf03377b70561305bb89a8f83aab66e0f" dependencies = [ "http 1.4.0", "hyper", "hyper-util", "rustls", "rustls-native-certs", - "rustls-pki-types", "tokio", "tokio-rustls", "tower-service", @@ -3677,12 +3681,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.13.1" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a8a2b9cb3e0b0c1803dbb0758ffac5de2f425b23c28f518faabd9d805342ff" +checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" dependencies = [ "equivalent", - "hashbrown 0.16.1", + "hashbrown 0.17.0", "serde", "serde_core", ] @@ -3694,7 +3698,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "232929e1d75fe899576a3d5c7416ad0d88dbfbb3c3d6aa00873a7408a50ddb88" dependencies = [ "ahash", - "indexmap 2.13.1", + "indexmap 2.14.0", "is-terminal", "itoa", "log", @@ -3754,7 +3758,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -3810,7 +3814,7 @@ dependencies = [ "portable-atomic-util", "serde_core", "wasm-bindgen", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -3927,9 +3931,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.94" +version = "0.3.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e04e2ef80ce82e13552136fabeef8a5ed1f985a96805761cbb9a2c34e7664d9" +checksum = "2964e92d1d9dc3364cae4d718d93f227e3abb088e747d92e0395bfdedf1c12ca" dependencies = [ "cfg-if", "futures-util", @@ -4047,9 +4051,9 @@ checksum = "2c4a545a15244c7d945065b5d392b2d2d7f21526fba56ce51467b06ed445e8f7" [[package]] name = "libc" -version = "0.2.184" +version = "0.2.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48f5d2a454e16a5ea0f4ced81bd44e4cfc7bd3a507b61887c99fd3538b28e4af" +checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f" [[package]] name = "libloading" @@ -4191,7 +4195,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ "cfg-if", - "digest", + "digest 0.10.7", ] [[package]] @@ -4750,7 +4754,7 @@ dependencies = [ "arrow-schema", "chrono", "half", - "indexmap 2.13.1", + "indexmap 2.14.0", "simdutf8", "uuid", ] @@ -4765,7 +4769,7 @@ dependencies = [ "arrow-schema", "chrono", "half", - "indexmap 2.13.1", + "indexmap 2.14.0", "parquet-variant", "parquet-variant-json", "serde_json", @@ -4798,7 +4802,7 @@ version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ - "digest", + "digest 0.10.7", "hmac", ] @@ -4841,7 +4845,7 @@ checksum = "8701b58ea97060d5e5b155d383a69952a60943f0e6dfe30b04c287beb0b27455" dependencies = [ "fixedbitset", "hashbrown 0.15.5", - "indexmap 2.13.1", + "indexmap 2.14.0", "serde", ] @@ -4946,9 +4950,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.32" +version = "0.3.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" +checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e" [[package]] name = "plotters" @@ -5090,7 +5094,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25485360a54d6861439d60facef26de713b1e126bf015ec8f98239467a2b82f7" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.11.1", "chrono", "flate2", "procfs-core", @@ -5103,7 +5107,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6401bf7b6af22f78b563665d15a22e9aef27775b79b149a66ca022468a4e405" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.11.1", "chrono", "hex", ] @@ -5256,7 +5260,7 @@ dependencies = [ "once_cell", "socket2", "tracing", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] @@ -5309,7 +5313,7 @@ checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207" dependencies = [ "chacha20", "getrandom 0.4.2", - "rand_core 0.10.0", + "rand_core 0.10.1", ] [[package]] @@ -5352,15 +5356,15 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c8d0fd677905edcbeedbf2edb6494d676f0e98d54d5cf9bda0b061cb8fb8aba" +checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69" [[package]] name = "rayon" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" +checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d" dependencies = [ "either", "rayon-core", @@ -5382,7 +5386,7 @@ version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.11.1", ] [[package]] @@ -5467,7 +5471,7 @@ dependencies = [ "rust-ini", "serde", "serde_json", - "sha1", + "sha1 0.10.6", "sha2", "tokio", ] @@ -5489,7 +5493,7 @@ dependencies = [ "jiff", "log", "percent-encoding", - "sha1", + "sha1 0.10.6", "sha2", "windows-sys 0.61.2", ] @@ -5576,8 +5580,8 @@ version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8573f03f5883dcaebdfcf4725caa1ecb9c15b2ef50c43a07b816e06799bb12d" dependencies = [ - "const-oid", - "digest", + "const-oid 0.9.6", + "digest 0.10.7", "num-bigint-dig", "num-integer", "num-traits", @@ -5634,7 +5638,7 @@ version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.11.1", "errno", "libc", "linux-raw-sys 0.4.15", @@ -5647,18 +5651,18 @@ version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.11.1", "errno", "libc", "linux-raw-sys 0.12.1", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] name = "rustls" -version = "0.23.37" +version = "0.23.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "758025cb5fccfd3bc2fd74708fd4682be41d99e5dff73c377c0646c6012c73a4" +checksum = "69f9466fb2c14ea04357e91413efb882e2a6d4a406e625449bc0a5d360d53a21" dependencies = [ "aws-lc-rs", "once_cell", @@ -5693,9 +5697,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.10" +version = "0.103.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df33b2b81ac578cabaf06b89b0631153a3f416b0a886e8a7a1707fb51abbd1ef" +checksum = "8279bb85272c9f10811ae6a6c547ff594d6a7f3c6c6b02ee9726d1d0dcfcdd06" dependencies = [ "aws-lc-rs", "ring", @@ -5789,7 +5793,7 @@ version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.11.1", "core-foundation", "core-foundation-sys", "libc", @@ -5883,7 +5887,7 @@ version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" dependencies = [ - "indexmap 2.13.1", + "indexmap 2.14.0", "itoa", "memchr", "serde", @@ -5924,7 +5928,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.13.1", + "indexmap 2.14.0", "schemars 0.9.0", "schemars 1.2.1", "serde_core", @@ -5951,7 +5955,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.13.1", + "indexmap 2.14.0", "itoa", "ryu", "serde", @@ -5966,7 +5970,18 @@ checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures 0.2.17", - "digest", + "digest 0.10.7", +] + +[[package]] +name = "sha1" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aacc4cc499359472b4abe1bf11d0b12e688af9a805fa5e3016f9a386dc2d0214" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.0", + "digest 0.11.2", ] [[package]] @@ -5977,7 +5992,7 @@ checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", "cpufeatures 0.2.17", - "digest", + "digest 0.10.7", ] [[package]] @@ -6002,7 +6017,7 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ - "digest", + "digest 0.10.7", "rand_core 0.6.4", ] @@ -6167,9 +6182,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "symbolic-common" -version = "12.17.4" +version = "12.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "803d14d7cb9c6fa5b95a6f3de8af95b356a528d391998fa45a07d320a5573e51" +checksum = "6aba7211a1803a826f108af9f4d86d25abe880712f2a6449479279e861b293f8" dependencies = [ "debugid", "memmap2", @@ -6179,9 +6194,9 @@ dependencies = [ [[package]] name = "symbolic-demangle" -version = "12.17.4" +version = "12.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39505731ae891b2dde47b0e4ae2ec40a7ced3476ab1129f1bf829e3fba62bb83" +checksum = "595bddd9d363c2ef6fc9fb33b98416ff209c5aae8bdca89a7dbbf2ef5e0ecc45" dependencies = [ "cpp_demangle", "rustc-demangle", @@ -6246,7 +6261,7 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix 1.1.4", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -6418,9 +6433,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.51.1" +version = "1.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f66bf9585cda4b724d3e78ab34b73fb2bbaba9011b9bfdf69dc836382ea13b8c" +checksum = "a91135f59b1cbf38c91e73cf3386fca9bb77915c45ce2771460c9d92f0f3d776" dependencies = [ "bytes", "libc", @@ -6500,7 +6515,7 @@ version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.11.1", "bytes", "futures-util", "http 1.4.0", @@ -6665,7 +6680,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" dependencies = [ - "crypto-common", + "crypto-common 0.1.7", "subtle", ] @@ -6722,9 +6737,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.23.0" +version = "1.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ac8b6f42ead25368cf5b098aeb3dc8a1a2c05a3eee8a9a1a68c640edbfc79d9" +checksum = "ddd74a9687298c6858e9b88ec8935ec45d22e8fd5e6394fa1bd4e99a87789c76" dependencies = [ "getrandom 0.4.2", "js-sys", @@ -6795,9 +6810,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.117" +version = "0.2.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0551fc1bb415591e3372d0bc4780db7e587d84e2a7e79da121051c5c4b89d0b0" +checksum = "0bf938a0bacb0469e83c1e148908bd7d5a6010354cf4fb73279b7447422e3a89" dependencies = [ "cfg-if", "once_cell", @@ -6808,9 +6823,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.67" +version = "0.4.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03623de6905b7206edd0a75f69f747f134b7f0a2323392d664448bf2d3c5d87e" +checksum = "f371d383f2fb139252e0bfac3b81b265689bf45b6874af544ffa4c975ac1ebf8" dependencies = [ "js-sys", "wasm-bindgen", @@ -6818,9 +6833,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.117" +version = "0.2.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fbdf9a35adf44786aecd5ff89b4563a90325f9da0923236f6104e603c7e86be" +checksum = "eeff24f84126c0ec2db7a449f0c2ec963c6a49efe0698c4242929da037ca28ed" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6828,9 +6843,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.117" +version = "0.2.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dca9693ef2bab6d4e6707234500350d8dad079eb508dca05530c85dc3a529ff2" +checksum = "9d08065faf983b2b80a79fd87d8254c409281cf7de75fc4b773019824196c904" dependencies = [ "bumpalo", "proc-macro2", @@ -6841,9 +6856,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.117" +version = "0.2.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39129a682a6d2d841b6c429d0c51e5cb0ed1a03829d8b3d1e69a011e62cb3d3b" +checksum = "5fd04d9e306f1907bd13c6361b5c6bfc7b3b3c095ed3f8a9246390f8dbdee129" dependencies = [ "unicode-ident", ] @@ -6865,7 +6880,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" dependencies = [ "anyhow", - "indexmap 2.13.1", + "indexmap 2.14.0", "wasm-encoder", "wasmparser", ] @@ -6889,17 +6904,17 @@ version = "0.244.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.11.1", "hashbrown 0.15.5", - "indexmap 2.13.1", + "indexmap 2.14.0", "semver", ] [[package]] name = "web-sys" -version = "0.3.94" +version = "0.3.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd70027e39b12f0849461e08ffc50b9cd7688d942c1c8e3c7b22273236b4dd0a" +checksum = "4f2dfbb17949fa2088e5d39408c48368947b86f7834484e87b73de55bc14d97d" dependencies = [ "js-sys", "wasm-bindgen", @@ -6917,9 +6932,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cfaf3c063993ff62e73cb4311efde4db1efb31ab78a3e5c457939ad5cc0bed" +checksum = "52f5ee44c96cf55f1b349600768e3ece3a8f26010c05265ab73f945bb1a2eb9d" dependencies = [ "rustls-pki-types", ] @@ -6958,7 +6973,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]] @@ -7053,6 +7068,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-sys" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" +dependencies = [ + "windows-targets 0.53.5", +] + [[package]] name = "windows-sys" version = "0.61.2" @@ -7086,13 +7110,30 @@ dependencies = [ "windows_aarch64_gnullvm 0.52.6", "windows_aarch64_msvc 0.52.6", "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm", + "windows_i686_gnullvm 0.52.6", "windows_i686_msvc 0.52.6", "windows_x86_64_gnu 0.52.6", "windows_x86_64_gnullvm 0.52.6", "windows_x86_64_msvc 0.52.6", ] +[[package]] +name = "windows-targets" +version = "0.53.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" +dependencies = [ + "windows-link", + "windows_aarch64_gnullvm 0.53.1", + "windows_aarch64_msvc 0.53.1", + "windows_i686_gnu 0.53.1", + "windows_i686_gnullvm 0.53.1", + "windows_i686_msvc 0.53.1", + "windows_x86_64_gnu 0.53.1", + "windows_x86_64_gnullvm 0.53.1", + "windows_x86_64_msvc 0.53.1", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" @@ -7105,6 +7146,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" + [[package]] name = "windows_aarch64_msvc" version = "0.42.2" @@ -7117,6 +7164,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" + [[package]] name = "windows_i686_gnu" version = "0.42.2" @@ -7129,12 +7182,24 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +[[package]] +name = "windows_i686_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" + [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" + [[package]] name = "windows_i686_msvc" version = "0.42.2" @@ -7147,6 +7212,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +[[package]] +name = "windows_i686_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" + [[package]] name = "windows_x86_64_gnu" version = "0.42.2" @@ -7159,6 +7230,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" @@ -7171,6 +7248,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" + [[package]] name = "windows_x86_64_msvc" version = "0.42.2" @@ -7183,6 +7266,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "windows_x86_64_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" + [[package]] name = "wit-bindgen" version = "0.51.0" @@ -7211,7 +7300,7 @@ checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" dependencies = [ "anyhow", "heck", - "indexmap 2.13.1", + "indexmap 2.14.0", "prettyplease", "syn 2.0.117", "wasm-metadata", @@ -7241,8 +7330,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" dependencies = [ "anyhow", - "bitflags 2.11.0", - "indexmap 2.13.1", + "bitflags 2.11.1", + "indexmap 2.14.0", "log", "serde", "serde_derive", @@ -7261,7 +7350,7 @@ checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" dependencies = [ "anyhow", "id-arena", - "indexmap 2.13.1", + "indexmap 2.14.0", "log", "semver", "serde", From 2b904ffce00a724aef67bc94dccb53fc7c15b16e Mon Sep 17 00:00:00 2001 From: Matt Butrovich Date: Thu, 16 Apr 2026 11:28:28 -0400 Subject: [PATCH 15/30] bump to pick up SMJ with filter fix. --- native/Cargo.toml | 8 ++++---- native/core/Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/native/Cargo.toml b/native/Cargo.toml index ca7bcd3617..8796bcdd31 100644 --- a/native/Cargo.toml +++ b/native/Cargo.toml @@ -38,10 +38,10 @@ arrow = { version = "58.1.0", features = ["prettyprint", "ffi", "chrono-tz"] } async-trait = { version = "0.1" } bytes = { version = "1.11.1" } parquet = { version = "58.1.0", default-features = false, features = ["experimental"] } -datafusion = { git = "https://github.com/apache/datafusion.git", rev = "4c7bb08f93", default-features = false, features = ["unicode_expressions", "crypto_expressions", "nested_expressions", "parquet"] } -datafusion-datasource = { git = "https://github.com/apache/datafusion.git", rev = "4c7bb08f93" } -datafusion-physical-expr-adapter = { git = "https://github.com/apache/datafusion.git", rev = "4c7bb08f93" } -datafusion-spark = { git = "https://github.com/apache/datafusion.git", rev = "4c7bb08f93", features = ["core"] } +datafusion = { git = "https://github.com/apache/datafusion.git", rev = "2ef0217705", default-features = false, features = ["unicode_expressions", "crypto_expressions", "nested_expressions", "parquet"] } +datafusion-datasource = { git = "https://github.com/apache/datafusion.git", rev = "2ef0217705" } +datafusion-physical-expr-adapter = { git = "https://github.com/apache/datafusion.git", rev = "2ef0217705" } +datafusion-spark = { git = "https://github.com/apache/datafusion.git", rev = "2ef0217705", features = ["core"] } datafusion-comet-spark-expr = { path = "spark-expr" } datafusion-comet-common = { path = "common" } datafusion-comet-jni-bridge = { path = "jni-bridge" } diff --git a/native/core/Cargo.toml b/native/core/Cargo.toml index 9d40b18e27..53891fce5b 100644 --- a/native/core/Cargo.toml +++ b/native/core/Cargo.toml @@ -91,7 +91,7 @@ jni = { version = "0.22.4", features = ["invocation"] } lazy_static = "1.4" assertables = "9" hex = "0.4.3" -datafusion-functions-nested = { git = "https://github.com/apache/datafusion.git", rev = "4c7bb08f93" } +datafusion-functions-nested = { git = "https://github.com/apache/datafusion.git", rev = "2ef0217705" } [features] backtrace = ["datafusion/backtrace"] From ce476f723eb161921d8b1815cc8dd10cfbd2ff56 Mon Sep 17 00:00:00 2001 From: Matt Butrovich Date: Thu, 16 Apr 2026 11:28:51 -0400 Subject: [PATCH 16/30] bump to pick up SMJ with filter fix. --- native/Cargo.lock | 64 +++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/native/Cargo.lock b/native/Cargo.lock index 7b125fccd0..d180093760 100644 --- a/native/Cargo.lock +++ b/native/Cargo.lock @@ -1832,7 +1832,7 @@ dependencies = [ [[package]] name = "datafusion" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" +source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" dependencies = [ "arrow", "arrow-schema", @@ -1879,7 +1879,7 @@ dependencies = [ [[package]] name = "datafusion-catalog" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" +source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" dependencies = [ "arrow", "async-trait", @@ -1903,7 +1903,7 @@ dependencies = [ [[package]] name = "datafusion-catalog-listing" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" +source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" dependencies = [ "arrow", "async-trait", @@ -2096,7 +2096,7 @@ dependencies = [ [[package]] name = "datafusion-common" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" +source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" dependencies = [ "arrow", "arrow-ipc", @@ -2121,7 +2121,7 @@ dependencies = [ [[package]] name = "datafusion-common-runtime" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" +source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" dependencies = [ "futures", "log", @@ -2131,7 +2131,7 @@ dependencies = [ [[package]] name = "datafusion-datasource" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" +source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" dependencies = [ "arrow", "async-compression", @@ -2165,7 +2165,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-arrow" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" +source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" dependencies = [ "arrow", "arrow-ipc", @@ -2188,7 +2188,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-csv" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" +source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" dependencies = [ "arrow", "async-trait", @@ -2210,7 +2210,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-json" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" +source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" dependencies = [ "arrow", "async-trait", @@ -2232,7 +2232,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-parquet" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" +source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" dependencies = [ "arrow", "async-trait", @@ -2262,12 +2262,12 @@ dependencies = [ [[package]] name = "datafusion-doc" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" +source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" [[package]] name = "datafusion-execution" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" +source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" dependencies = [ "arrow", "arrow-buffer", @@ -2289,7 +2289,7 @@ dependencies = [ [[package]] name = "datafusion-expr" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" +source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" dependencies = [ "arrow", "arrow-schema", @@ -2310,7 +2310,7 @@ dependencies = [ [[package]] name = "datafusion-expr-common" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" +source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" dependencies = [ "arrow", "datafusion-common", @@ -2321,7 +2321,7 @@ dependencies = [ [[package]] name = "datafusion-functions" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" +source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" dependencies = [ "arrow", "arrow-buffer", @@ -2351,7 +2351,7 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" +source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" dependencies = [ "arrow", "datafusion-common", @@ -2371,7 +2371,7 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate-common" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" +source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" dependencies = [ "arrow", "datafusion-common", @@ -2382,7 +2382,7 @@ dependencies = [ [[package]] name = "datafusion-functions-nested" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" +source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" dependencies = [ "arrow", "arrow-ord", @@ -2406,7 +2406,7 @@ dependencies = [ [[package]] name = "datafusion-functions-table" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" +source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" dependencies = [ "arrow", "async-trait", @@ -2420,7 +2420,7 @@ dependencies = [ [[package]] name = "datafusion-functions-window" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" +source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" dependencies = [ "arrow", "datafusion-common", @@ -2436,7 +2436,7 @@ dependencies = [ [[package]] name = "datafusion-functions-window-common" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" +source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" dependencies = [ "datafusion-common", "datafusion-physical-expr-common", @@ -2445,7 +2445,7 @@ dependencies = [ [[package]] name = "datafusion-macros" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" +source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" dependencies = [ "datafusion-doc", "quote", @@ -2455,7 +2455,7 @@ dependencies = [ [[package]] name = "datafusion-optimizer" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" +source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" dependencies = [ "arrow", "chrono", @@ -2473,7 +2473,7 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" +source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" dependencies = [ "arrow", "datafusion-common", @@ -2493,7 +2493,7 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-adapter" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" +source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" dependencies = [ "arrow", "datafusion-common", @@ -2507,7 +2507,7 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-common" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" +source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" dependencies = [ "arrow", "chrono", @@ -2522,7 +2522,7 @@ dependencies = [ [[package]] name = "datafusion-physical-optimizer" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" +source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" dependencies = [ "arrow", "datafusion-common", @@ -2539,7 +2539,7 @@ dependencies = [ [[package]] name = "datafusion-physical-plan" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" +source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" dependencies = [ "arrow", "arrow-ord", @@ -2569,7 +2569,7 @@ dependencies = [ [[package]] name = "datafusion-pruning" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" +source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" dependencies = [ "arrow", "datafusion-common", @@ -2584,7 +2584,7 @@ dependencies = [ [[package]] name = "datafusion-session" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" +source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" dependencies = [ "async-trait", "datafusion-common", @@ -2597,7 +2597,7 @@ dependencies = [ [[package]] name = "datafusion-spark" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" +source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" dependencies = [ "arrow", "bigdecimal", @@ -2624,7 +2624,7 @@ dependencies = [ [[package]] name = "datafusion-sql" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=4c7bb08f93#4c7bb08f9339c890cca8b0ba59fff702924b4225" +source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" dependencies = [ "arrow", "bigdecimal", From 37318f3191021c779e28119d167639351b6e3f58 Mon Sep 17 00:00:00 2001 From: Matt Butrovich Date: Thu, 16 Apr 2026 14:25:01 -0400 Subject: [PATCH 17/30] Bump to latest commit to pick up Miri fix. --- native/Cargo.lock | 68 +++++++++++++++++++++--------------------- native/Cargo.toml | 8 ++--- native/core/Cargo.toml | 2 +- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/native/Cargo.lock b/native/Cargo.lock index d180093760..db409be3b9 100644 --- a/native/Cargo.lock +++ b/native/Cargo.lock @@ -1832,7 +1832,7 @@ dependencies = [ [[package]] name = "datafusion" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" +source = "git+https://github.com/apache/datafusion.git?rev=93ae1b8#93ae1b8442ba7c8162ee21242230af35de8c3056" dependencies = [ "arrow", "arrow-schema", @@ -1879,7 +1879,7 @@ dependencies = [ [[package]] name = "datafusion-catalog" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" +source = "git+https://github.com/apache/datafusion.git?rev=93ae1b8#93ae1b8442ba7c8162ee21242230af35de8c3056" dependencies = [ "arrow", "async-trait", @@ -1903,7 +1903,7 @@ dependencies = [ [[package]] name = "datafusion-catalog-listing" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" +source = "git+https://github.com/apache/datafusion.git?rev=93ae1b8#93ae1b8442ba7c8162ee21242230af35de8c3056" dependencies = [ "arrow", "async-trait", @@ -2096,7 +2096,7 @@ dependencies = [ [[package]] name = "datafusion-common" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" +source = "git+https://github.com/apache/datafusion.git?rev=93ae1b8#93ae1b8442ba7c8162ee21242230af35de8c3056" dependencies = [ "arrow", "arrow-ipc", @@ -2121,7 +2121,7 @@ dependencies = [ [[package]] name = "datafusion-common-runtime" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" +source = "git+https://github.com/apache/datafusion.git?rev=93ae1b8#93ae1b8442ba7c8162ee21242230af35de8c3056" dependencies = [ "futures", "log", @@ -2131,7 +2131,7 @@ dependencies = [ [[package]] name = "datafusion-datasource" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" +source = "git+https://github.com/apache/datafusion.git?rev=93ae1b8#93ae1b8442ba7c8162ee21242230af35de8c3056" dependencies = [ "arrow", "async-compression", @@ -2165,7 +2165,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-arrow" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" +source = "git+https://github.com/apache/datafusion.git?rev=93ae1b8#93ae1b8442ba7c8162ee21242230af35de8c3056" dependencies = [ "arrow", "arrow-ipc", @@ -2188,7 +2188,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-csv" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" +source = "git+https://github.com/apache/datafusion.git?rev=93ae1b8#93ae1b8442ba7c8162ee21242230af35de8c3056" dependencies = [ "arrow", "async-trait", @@ -2210,7 +2210,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-json" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" +source = "git+https://github.com/apache/datafusion.git?rev=93ae1b8#93ae1b8442ba7c8162ee21242230af35de8c3056" dependencies = [ "arrow", "async-trait", @@ -2232,7 +2232,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-parquet" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" +source = "git+https://github.com/apache/datafusion.git?rev=93ae1b8#93ae1b8442ba7c8162ee21242230af35de8c3056" dependencies = [ "arrow", "async-trait", @@ -2262,12 +2262,12 @@ dependencies = [ [[package]] name = "datafusion-doc" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" +source = "git+https://github.com/apache/datafusion.git?rev=93ae1b8#93ae1b8442ba7c8162ee21242230af35de8c3056" [[package]] name = "datafusion-execution" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" +source = "git+https://github.com/apache/datafusion.git?rev=93ae1b8#93ae1b8442ba7c8162ee21242230af35de8c3056" dependencies = [ "arrow", "arrow-buffer", @@ -2289,7 +2289,7 @@ dependencies = [ [[package]] name = "datafusion-expr" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" +source = "git+https://github.com/apache/datafusion.git?rev=93ae1b8#93ae1b8442ba7c8162ee21242230af35de8c3056" dependencies = [ "arrow", "arrow-schema", @@ -2310,7 +2310,7 @@ dependencies = [ [[package]] name = "datafusion-expr-common" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" +source = "git+https://github.com/apache/datafusion.git?rev=93ae1b8#93ae1b8442ba7c8162ee21242230af35de8c3056" dependencies = [ "arrow", "datafusion-common", @@ -2321,7 +2321,7 @@ dependencies = [ [[package]] name = "datafusion-functions" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" +source = "git+https://github.com/apache/datafusion.git?rev=93ae1b8#93ae1b8442ba7c8162ee21242230af35de8c3056" dependencies = [ "arrow", "arrow-buffer", @@ -2351,7 +2351,7 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" +source = "git+https://github.com/apache/datafusion.git?rev=93ae1b8#93ae1b8442ba7c8162ee21242230af35de8c3056" dependencies = [ "arrow", "datafusion-common", @@ -2371,7 +2371,7 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate-common" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" +source = "git+https://github.com/apache/datafusion.git?rev=93ae1b8#93ae1b8442ba7c8162ee21242230af35de8c3056" dependencies = [ "arrow", "datafusion-common", @@ -2382,7 +2382,7 @@ dependencies = [ [[package]] name = "datafusion-functions-nested" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" +source = "git+https://github.com/apache/datafusion.git?rev=93ae1b8#93ae1b8442ba7c8162ee21242230af35de8c3056" dependencies = [ "arrow", "arrow-ord", @@ -2406,7 +2406,7 @@ dependencies = [ [[package]] name = "datafusion-functions-table" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" +source = "git+https://github.com/apache/datafusion.git?rev=93ae1b8#93ae1b8442ba7c8162ee21242230af35de8c3056" dependencies = [ "arrow", "async-trait", @@ -2420,7 +2420,7 @@ dependencies = [ [[package]] name = "datafusion-functions-window" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" +source = "git+https://github.com/apache/datafusion.git?rev=93ae1b8#93ae1b8442ba7c8162ee21242230af35de8c3056" dependencies = [ "arrow", "datafusion-common", @@ -2436,7 +2436,7 @@ dependencies = [ [[package]] name = "datafusion-functions-window-common" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" +source = "git+https://github.com/apache/datafusion.git?rev=93ae1b8#93ae1b8442ba7c8162ee21242230af35de8c3056" dependencies = [ "datafusion-common", "datafusion-physical-expr-common", @@ -2445,7 +2445,7 @@ dependencies = [ [[package]] name = "datafusion-macros" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" +source = "git+https://github.com/apache/datafusion.git?rev=93ae1b8#93ae1b8442ba7c8162ee21242230af35de8c3056" dependencies = [ "datafusion-doc", "quote", @@ -2455,7 +2455,7 @@ dependencies = [ [[package]] name = "datafusion-optimizer" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" +source = "git+https://github.com/apache/datafusion.git?rev=93ae1b8#93ae1b8442ba7c8162ee21242230af35de8c3056" dependencies = [ "arrow", "chrono", @@ -2473,7 +2473,7 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" +source = "git+https://github.com/apache/datafusion.git?rev=93ae1b8#93ae1b8442ba7c8162ee21242230af35de8c3056" dependencies = [ "arrow", "datafusion-common", @@ -2493,7 +2493,7 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-adapter" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" +source = "git+https://github.com/apache/datafusion.git?rev=93ae1b8#93ae1b8442ba7c8162ee21242230af35de8c3056" dependencies = [ "arrow", "datafusion-common", @@ -2507,7 +2507,7 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-common" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" +source = "git+https://github.com/apache/datafusion.git?rev=93ae1b8#93ae1b8442ba7c8162ee21242230af35de8c3056" dependencies = [ "arrow", "chrono", @@ -2522,7 +2522,7 @@ dependencies = [ [[package]] name = "datafusion-physical-optimizer" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" +source = "git+https://github.com/apache/datafusion.git?rev=93ae1b8#93ae1b8442ba7c8162ee21242230af35de8c3056" dependencies = [ "arrow", "datafusion-common", @@ -2539,7 +2539,7 @@ dependencies = [ [[package]] name = "datafusion-physical-plan" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" +source = "git+https://github.com/apache/datafusion.git?rev=93ae1b8#93ae1b8442ba7c8162ee21242230af35de8c3056" dependencies = [ "arrow", "arrow-ord", @@ -2569,7 +2569,7 @@ dependencies = [ [[package]] name = "datafusion-pruning" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" +source = "git+https://github.com/apache/datafusion.git?rev=93ae1b8#93ae1b8442ba7c8162ee21242230af35de8c3056" dependencies = [ "arrow", "datafusion-common", @@ -2584,7 +2584,7 @@ dependencies = [ [[package]] name = "datafusion-session" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" +source = "git+https://github.com/apache/datafusion.git?rev=93ae1b8#93ae1b8442ba7c8162ee21242230af35de8c3056" dependencies = [ "async-trait", "datafusion-common", @@ -2597,7 +2597,7 @@ dependencies = [ [[package]] name = "datafusion-spark" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" +source = "git+https://github.com/apache/datafusion.git?rev=93ae1b8#93ae1b8442ba7c8162ee21242230af35de8c3056" dependencies = [ "arrow", "bigdecimal", @@ -2624,7 +2624,7 @@ dependencies = [ [[package]] name = "datafusion-sql" version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=2ef0217705#2ef021770598b723210f81d16c897fd98dab7771" +source = "git+https://github.com/apache/datafusion.git?rev=93ae1b8#93ae1b8442ba7c8162ee21242230af35de8c3056" dependencies = [ "arrow", "bigdecimal", @@ -5016,9 +5016,9 @@ checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" [[package]] name = "portable-atomic-util" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "091397be61a01d4be58e7841595bd4bfedb15f1cd54977d79b8271e94ed799a3" +checksum = "c2a106d1259c23fac8e543272398ae0e3c0b8d33c88ed73d0cc71b0f1d902618" dependencies = [ "portable-atomic", ] diff --git a/native/Cargo.toml b/native/Cargo.toml index 8796bcdd31..8f9e8d5fb9 100644 --- a/native/Cargo.toml +++ b/native/Cargo.toml @@ -38,10 +38,10 @@ arrow = { version = "58.1.0", features = ["prettyprint", "ffi", "chrono-tz"] } async-trait = { version = "0.1" } bytes = { version = "1.11.1" } parquet = { version = "58.1.0", default-features = false, features = ["experimental"] } -datafusion = { git = "https://github.com/apache/datafusion.git", rev = "2ef0217705", default-features = false, features = ["unicode_expressions", "crypto_expressions", "nested_expressions", "parquet"] } -datafusion-datasource = { git = "https://github.com/apache/datafusion.git", rev = "2ef0217705" } -datafusion-physical-expr-adapter = { git = "https://github.com/apache/datafusion.git", rev = "2ef0217705" } -datafusion-spark = { git = "https://github.com/apache/datafusion.git", rev = "2ef0217705", features = ["core"] } +datafusion = { git = "https://github.com/apache/datafusion.git", rev = "93ae1b8", default-features = false, features = ["unicode_expressions", "crypto_expressions", "nested_expressions", "parquet"] } +datafusion-datasource = { git = "https://github.com/apache/datafusion.git", rev = "93ae1b8" } +datafusion-physical-expr-adapter = { git = "https://github.com/apache/datafusion.git", rev = "93ae1b8" } +datafusion-spark = { git = "https://github.com/apache/datafusion.git", rev = "93ae1b8", features = ["core"] } datafusion-comet-spark-expr = { path = "spark-expr" } datafusion-comet-common = { path = "common" } datafusion-comet-jni-bridge = { path = "jni-bridge" } diff --git a/native/core/Cargo.toml b/native/core/Cargo.toml index 53891fce5b..a3784ee348 100644 --- a/native/core/Cargo.toml +++ b/native/core/Cargo.toml @@ -91,7 +91,7 @@ jni = { version = "0.22.4", features = ["invocation"] } lazy_static = "1.4" assertables = "9" hex = "0.4.3" -datafusion-functions-nested = { git = "https://github.com/apache/datafusion.git", rev = "2ef0217705" } +datafusion-functions-nested = { git = "https://github.com/apache/datafusion.git", rev = "93ae1b8" } [features] backtrace = ["datafusion/backtrace"] From 77ac0dbcf1a4cac657cf54aad15a370f14d39593 Mon Sep 17 00:00:00 2001 From: Matt Butrovich Date: Mon, 20 Apr 2026 18:04:09 -0400 Subject: [PATCH 18/30] Fix clippy about deprecated APIs. --- native/spark-expr/src/agg_funcs/correlation.rs | 6 ++++-- native/spark-expr/src/agg_funcs/covariance.rs | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/native/spark-expr/src/agg_funcs/correlation.rs b/native/spark-expr/src/agg_funcs/correlation.rs index 8478ab3482..465294f1ba 100644 --- a/native/spark-expr/src/agg_funcs/correlation.rs +++ b/native/spark-expr/src/agg_funcs/correlation.rs @@ -28,7 +28,6 @@ use arrow::{ }; use datafusion::common::{Result, ScalarValue}; use datafusion::logical_expr::function::{AccumulatorArgs, StateFieldsArgs}; -use datafusion::logical_expr::type_coercion::aggregates::NUMERICS; use datafusion::logical_expr::{Accumulator, AggregateUDFImpl, Signature, Volatility}; use datafusion::physical_expr::expressions::format_state_name; use datafusion::physical_expr::expressions::StatsType; @@ -51,7 +50,10 @@ impl Correlation { assert!(matches!(data_type, DataType::Float64)); Self { name: name.into(), - signature: Signature::uniform(2, NUMERICS.to_vec(), Volatility::Immutable), + signature: Signature::exact( + vec![DataType::Float64, DataType::Float64], + Volatility::Immutable, + ), null_on_divide_by_zero, } } diff --git a/native/spark-expr/src/agg_funcs/covariance.rs b/native/spark-expr/src/agg_funcs/covariance.rs index a2256da525..7fa81b9ffc 100644 --- a/native/spark-expr/src/agg_funcs/covariance.rs +++ b/native/spark-expr/src/agg_funcs/covariance.rs @@ -25,7 +25,6 @@ use arrow::{ }; use datafusion::common::{downcast_value, unwrap_or_internal_err, Result, ScalarValue}; use datafusion::logical_expr::function::{AccumulatorArgs, StateFieldsArgs}; -use datafusion::logical_expr::type_coercion::aggregates::NUMERICS; use datafusion::logical_expr::{Accumulator, AggregateUDFImpl, Signature, Volatility}; use datafusion::physical_expr::expressions::format_state_name; use datafusion::physical_expr::expressions::StatsType; @@ -64,7 +63,10 @@ impl Covariance { assert!(matches!(data_type, DataType::Float64)); Self { name: name.into(), - signature: Signature::uniform(2, NUMERICS.to_vec(), Volatility::Immutable), + signature: Signature::exact( + vec![DataType::Float64, DataType::Float64], + Volatility::Immutable, + ), stats_type, null_on_divide_by_zero, } From 72bce748f98b4a95ddf8b1918478385685b29060 Mon Sep 17 00:00:00 2001 From: Matt Butrovich Date: Thu, 23 Apr 2026 15:50:26 -0400 Subject: [PATCH 19/30] update to latest DF commit --- native/Cargo.lock | 248 ++++++++++-------- native/Cargo.toml | 8 +- native/core/Cargo.toml | 2 +- .../src/execution/memory_pools/fair_pool.rs | 17 +- .../execution/memory_pools/logging_pool.rs | 11 + .../execution/memory_pools/unified_pool.rs | 16 +- .../src/array_funcs/arrays_overlap.rs | 5 - .../spark-expr/src/array_funcs/arrays_zip.rs | 5 - 8 files changed, 189 insertions(+), 123 deletions(-) diff --git a/native/Cargo.lock b/native/Cargo.lock index 6c69b3e8f8..fecf189630 100644 --- a/native/Cargo.lock +++ b/native/Cargo.lock @@ -626,9 +626,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "aws-config" -version = "1.8.15" +version = "1.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11493b0bad143270fb8ad284a096dd529ba91924c5409adeac856cc1bf047dbc" +checksum = "50f156acdd2cf55f5aa53ee416c4ac851cf1222694506c0b1f78c85695e9ca9d" dependencies = [ "aws-credential-types", "aws-runtime", @@ -690,9 +690,9 @@ dependencies = [ [[package]] name = "aws-runtime" -version = "1.7.2" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc0651c57e384202e47153c1260b84a9936e19803d747615edf199dc3b98d17" +checksum = "5dcd93c82209ac7413532388067dce79be5a8780c1786e5fae3df22e4dee2864" dependencies = [ "aws-credential-types", "aws-sigv4", @@ -715,9 +715,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.97.0" +version = "1.98.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aadc669e184501caaa6beafb28c6267fc1baef0810fb58f9b205485ca3f2567" +checksum = "d69c77aafa20460c68b6b3213c84f6423b6e76dbf89accd3e1789a686ffd9489" dependencies = [ "aws-credential-types", "aws-runtime", @@ -739,9 +739,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.99.0" +version = "1.100.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1342a7db8f358d3de0aed2007a0b54e875458e39848d54cc1d46700b2bfcb0a8" +checksum = "1c7e7b09346d5ca22a2a08267555843a6a0127fb20d8964cb6ecfb8fdb190225" dependencies = [ "aws-credential-types", "aws-runtime", @@ -763,9 +763,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.102.0" +version = "1.103.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc35b7a14cabdad13795fbbbd26d5ddec0882c01492ceedf2af575aad5f37dd" +checksum = "c2249b81a2e73a8027c41c378463a81ec39b8510f184f2caab87de912af0f49b" dependencies = [ "aws-credential-types", "aws-runtime", @@ -788,9 +788,9 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "1.4.2" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0b660013a6683ab23797778e21f1f854744fdf05f68204b4cca4c8c04b5d1f4" +checksum = "68dc0b907359b120170613b5c09ccc61304eac3998ff6274b97d93ee6490115a" dependencies = [ "aws-credential-types", "aws-smithy-http", @@ -799,11 +799,11 @@ dependencies = [ "bytes", "form_urlencoded", "hex", - "hmac", + "hmac 0.13.0", "http 0.2.12", "http 1.4.0", "percent-encoding", - "sha2", + "sha2 0.11.0", "time", "tracing", ] @@ -980,9 +980,9 @@ dependencies = [ [[package]] name = "aws-types" -version = "1.3.14" +version = "1.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47c8323699dd9b3c8d5b3c13051ae9cdef58fd179957c882f8374dd8725962d9" +checksum = "2f4bbcaa9304ea40902d3d5f42a0428d1bd895a2b0f6999436fb279ffddc58ac" dependencies = [ "aws-credential-types", "aws-smithy-async", @@ -1462,6 +1462,12 @@ dependencies = [ "cc", ] +[[package]] +name = "cmov" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f88a43d011fc4a6876cb7344703e297c71dda42494fee094d5f7c76bf13f746" + [[package]] name = "colorchoice" version = "1.0.5" @@ -1758,6 +1764,15 @@ dependencies = [ "cipher", ] +[[package]] +name = "ctutils" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5515a3834141de9eafb9717ad39eea8247b5674e6066c404e8c4b365d2a29e" +dependencies = [ + "cmov", +] + [[package]] name = "darling" version = "0.20.11" @@ -1843,8 +1858,8 @@ dependencies = [ [[package]] name = "datafusion" -version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=a311d14#a311d149bf7ee345c9c9db5486b67ff98d8ce708" +version = "53.1.0" +source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" dependencies = [ "arrow", "arrow-schema", @@ -1890,8 +1905,8 @@ dependencies = [ [[package]] name = "datafusion-catalog" -version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=a311d14#a311d149bf7ee345c9c9db5486b67ff98d8ce708" +version = "53.1.0" +source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" dependencies = [ "arrow", "async-trait", @@ -1914,8 +1929,8 @@ dependencies = [ [[package]] name = "datafusion-catalog-listing" -version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=a311d14#a311d149bf7ee345c9c9db5486b67ff98d8ce708" +version = "53.1.0" +source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" dependencies = [ "arrow", "async-trait", @@ -2107,8 +2122,8 @@ dependencies = [ [[package]] name = "datafusion-common" -version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=a311d14#a311d149bf7ee345c9c9db5486b67ff98d8ce708" +version = "53.1.0" +source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" dependencies = [ "arrow", "arrow-ipc", @@ -2132,8 +2147,8 @@ dependencies = [ [[package]] name = "datafusion-common-runtime" -version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=a311d14#a311d149bf7ee345c9c9db5486b67ff98d8ce708" +version = "53.1.0" +source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" dependencies = [ "futures", "log", @@ -2142,8 +2157,8 @@ dependencies = [ [[package]] name = "datafusion-datasource" -version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=a311d14#a311d149bf7ee345c9c9db5486b67ff98d8ce708" +version = "53.1.0" +source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" dependencies = [ "arrow", "async-compression", @@ -2177,8 +2192,8 @@ dependencies = [ [[package]] name = "datafusion-datasource-arrow" -version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=a311d14#a311d149bf7ee345c9c9db5486b67ff98d8ce708" +version = "53.1.0" +source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" dependencies = [ "arrow", "arrow-ipc", @@ -2200,8 +2215,8 @@ dependencies = [ [[package]] name = "datafusion-datasource-csv" -version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=a311d14#a311d149bf7ee345c9c9db5486b67ff98d8ce708" +version = "53.1.0" +source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" dependencies = [ "arrow", "async-trait", @@ -2222,8 +2237,8 @@ dependencies = [ [[package]] name = "datafusion-datasource-json" -version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=a311d14#a311d149bf7ee345c9c9db5486b67ff98d8ce708" +version = "53.1.0" +source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" dependencies = [ "arrow", "async-trait", @@ -2244,8 +2259,8 @@ dependencies = [ [[package]] name = "datafusion-datasource-parquet" -version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=a311d14#a311d149bf7ee345c9c9db5486b67ff98d8ce708" +version = "53.1.0" +source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" dependencies = [ "arrow", "async-trait", @@ -2274,13 +2289,13 @@ dependencies = [ [[package]] name = "datafusion-doc" -version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=a311d14#a311d149bf7ee345c9c9db5486b67ff98d8ce708" +version = "53.1.0" +source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" [[package]] name = "datafusion-execution" -version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=a311d14#a311d149bf7ee345c9c9db5486b67ff98d8ce708" +version = "53.1.0" +source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" dependencies = [ "arrow", "arrow-buffer", @@ -2301,8 +2316,8 @@ dependencies = [ [[package]] name = "datafusion-expr" -version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=a311d14#a311d149bf7ee345c9c9db5486b67ff98d8ce708" +version = "53.1.0" +source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" dependencies = [ "arrow", "arrow-schema", @@ -2322,8 +2337,8 @@ dependencies = [ [[package]] name = "datafusion-expr-common" -version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=a311d14#a311d149bf7ee345c9c9db5486b67ff98d8ce708" +version = "53.1.0" +source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" dependencies = [ "arrow", "datafusion-common", @@ -2333,8 +2348,8 @@ dependencies = [ [[package]] name = "datafusion-functions" -version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=a311d14#a311d149bf7ee345c9c9db5486b67ff98d8ce708" +version = "53.1.0" +source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" dependencies = [ "arrow", "arrow-buffer", @@ -2357,14 +2372,14 @@ dependencies = [ "num-traits", "rand 0.9.4", "regex", - "sha2", + "sha2 0.10.9", "uuid", ] [[package]] name = "datafusion-functions-aggregate" -version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=a311d14#a311d149bf7ee345c9c9db5486b67ff98d8ce708" +version = "53.1.0" +source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" dependencies = [ "arrow", "datafusion-common", @@ -2383,8 +2398,8 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate-common" -version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=a311d14#a311d149bf7ee345c9c9db5486b67ff98d8ce708" +version = "53.1.0" +source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" dependencies = [ "arrow", "datafusion-common", @@ -2394,8 +2409,8 @@ dependencies = [ [[package]] name = "datafusion-functions-nested" -version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=a311d14#a311d149bf7ee345c9c9db5486b67ff98d8ce708" +version = "53.1.0" +source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" dependencies = [ "arrow", "arrow-ord", @@ -2418,8 +2433,8 @@ dependencies = [ [[package]] name = "datafusion-functions-table" -version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=a311d14#a311d149bf7ee345c9c9db5486b67ff98d8ce708" +version = "53.1.0" +source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" dependencies = [ "arrow", "async-trait", @@ -2432,8 +2447,8 @@ dependencies = [ [[package]] name = "datafusion-functions-window" -version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=a311d14#a311d149bf7ee345c9c9db5486b67ff98d8ce708" +version = "53.1.0" +source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" dependencies = [ "arrow", "datafusion-common", @@ -2448,8 +2463,8 @@ dependencies = [ [[package]] name = "datafusion-functions-window-common" -version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=a311d14#a311d149bf7ee345c9c9db5486b67ff98d8ce708" +version = "53.1.0" +source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" dependencies = [ "datafusion-common", "datafusion-physical-expr-common", @@ -2457,8 +2472,8 @@ dependencies = [ [[package]] name = "datafusion-macros" -version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=a311d14#a311d149bf7ee345c9c9db5486b67ff98d8ce708" +version = "53.1.0" +source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" dependencies = [ "datafusion-doc", "quote", @@ -2467,8 +2482,8 @@ dependencies = [ [[package]] name = "datafusion-optimizer" -version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=a311d14#a311d149bf7ee345c9c9db5486b67ff98d8ce708" +version = "53.1.0" +source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" dependencies = [ "arrow", "chrono", @@ -2485,8 +2500,8 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" -version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=a311d14#a311d149bf7ee345c9c9db5486b67ff98d8ce708" +version = "53.1.0" +source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" dependencies = [ "arrow", "datafusion-common", @@ -2505,8 +2520,8 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-adapter" -version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=a311d14#a311d149bf7ee345c9c9db5486b67ff98d8ce708" +version = "53.1.0" +source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" dependencies = [ "arrow", "datafusion-common", @@ -2519,8 +2534,8 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-common" -version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=a311d14#a311d149bf7ee345c9c9db5486b67ff98d8ce708" +version = "53.1.0" +source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" dependencies = [ "arrow", "chrono", @@ -2534,8 +2549,8 @@ dependencies = [ [[package]] name = "datafusion-physical-optimizer" -version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=a311d14#a311d149bf7ee345c9c9db5486b67ff98d8ce708" +version = "53.1.0" +source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" dependencies = [ "arrow", "datafusion-common", @@ -2551,8 +2566,8 @@ dependencies = [ [[package]] name = "datafusion-physical-plan" -version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=a311d14#a311d149bf7ee345c9c9db5486b67ff98d8ce708" +version = "53.1.0" +source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" dependencies = [ "arrow", "arrow-data", @@ -2582,8 +2597,8 @@ dependencies = [ [[package]] name = "datafusion-pruning" -version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=a311d14#a311d149bf7ee345c9c9db5486b67ff98d8ce708" +version = "53.1.0" +source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" dependencies = [ "arrow", "datafusion-common", @@ -2597,8 +2612,8 @@ dependencies = [ [[package]] name = "datafusion-session" -version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=a311d14#a311d149bf7ee345c9c9db5486b67ff98d8ce708" +version = "53.1.0" +source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" dependencies = [ "async-trait", "datafusion-common", @@ -2610,8 +2625,8 @@ dependencies = [ [[package]] name = "datafusion-spark" -version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=a311d14#a311d149bf7ee345c9c9db5486b67ff98d8ce708" +version = "53.1.0" +source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" dependencies = [ "arrow", "bigdecimal", @@ -2631,14 +2646,14 @@ dependencies = [ "rand 0.9.4", "serde_json", "sha1 0.11.0", - "sha2", + "sha2 0.10.9", "url", ] [[package]] name = "datafusion-sql" -version = "53.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=a311d14#a311d149bf7ee345c9c9db5486b67ff98d8ce708" +version = "53.1.0" +source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" dependencies = [ "arrow", "bigdecimal", @@ -2762,6 +2777,7 @@ dependencies = [ "block-buffer 0.12.0", "const-oid 0.10.2", "crypto-common 0.2.1", + "ctutils", ] [[package]] @@ -3323,6 +3339,15 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "hmac" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6303bc9732ae41b04cb554b844a762b4115a61bfaa81e3e83050991eeb56863f" +dependencies = [ + "digest 0.11.2", +] + [[package]] name = "home" version = "0.5.12" @@ -3816,9 +3841,9 @@ dependencies = [ [[package]] name = "jiff" -version = "0.2.23" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a3546dc96b6d42c5f24902af9e2538e82e39ad350b0c766eb3fbf2d8f3d8359" +checksum = "f00b5dbd620d61dfdcb6007c9c1f6054ebd75319f163d886a9055cec1155073d" dependencies = [ "jiff-static", "jiff-tzdb-platform", @@ -3833,9 +3858,9 @@ dependencies = [ [[package]] name = "jiff-static" -version = "0.2.23" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a8c8b344124222efd714b73bb41f8b5120b27a7cc1c75593a6ff768d9d05aa4" +checksum = "e000de030ff8022ea1da3f466fbb0f3a809f5e51ed31f6dd931c35181ad8e6d7" dependencies = [ "proc-macro2", "quote", @@ -4107,9 +4132,9 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" [[package]] name = "libmimalloc-sys" -version = "0.1.46" +version = "0.1.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc89deee4af0429081d2a518c0431ae068222a5a262a3bc6ff4d8535ec2e02fe" +checksum = "2d1eacfa31c33ec25e873c136ba5669f00f9866d0688bea7be4d3f7e43067df6" dependencies = [ "cc", ] @@ -4237,9 +4262,9 @@ dependencies = [ [[package]] name = "mimalloc" -version = "0.1.49" +version = "0.1.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aca3c01a711f395b4257b81674c0e90e8dd1f1e62c4b7db45f684cc7a4fcb18a" +checksum = "b3627c4272df786b9260cabaa46aec1d59c93ede723d4c3ef646c503816b0640" dependencies = [ "libmimalloc-sys", ] @@ -4816,7 +4841,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ "digest 0.10.7", - "hmac", + "hmac 0.12.1", ] [[package]] @@ -4945,7 +4970,7 @@ dependencies = [ "der", "pbkdf2", "scrypt", - "sha2", + "sha2 0.10.9", "spki", ] @@ -5471,7 +5496,7 @@ dependencies = [ "form_urlencoded", "getrandom 0.2.17", "hex", - "hmac", + "hmac 0.12.1", "home", "http 1.4.0", "jsonwebtoken", @@ -5486,7 +5511,7 @@ dependencies = [ "serde", "serde_json", "sha1 0.10.6", - "sha2", + "sha2 0.10.9", "tokio", ] @@ -5502,13 +5527,13 @@ dependencies = [ "form_urlencoded", "futures", "hex", - "hmac", + "hmac 0.12.1", "http 1.4.0", "jiff", "log", "percent-encoding", "sha1 0.10.6", - "sha2", + "sha2 0.10.9", "windows-sys 0.61.2", ] @@ -5640,7 +5665,7 @@ dependencies = [ "pkcs1", "pkcs8", "rand_core 0.6.4", - "sha2", + "sha2 0.10.9", "signature", "spki", "subtle", @@ -5712,9 +5737,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.38" +version = "0.23.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f9466fb2c14ea04357e91413efb882e2a6d4a406e625449bc0a5d360d53a21" +checksum = "7c2c118cb077cca2822033836dfb1b975355dfb784b5e8da48f7b6c5db74e60e" dependencies = [ "aws-lc-rs", "once_cell", @@ -5776,9 +5801,9 @@ checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" [[package]] name = "rustls-webpki" -version = "0.103.12" +version = "0.103.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8279bb85272c9f10811ae6a6c547ff594d6a7f3c6c6b02ee9726d1d0dcfcdd06" +checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e" dependencies = [ "aws-lc-rs", "ring", @@ -5863,7 +5888,7 @@ checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f" dependencies = [ "pbkdf2", "salsa20", - "sha2", + "sha2 0.10.9", ] [[package]] @@ -6074,6 +6099,17 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "sha2" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.0", + "digest 0.11.2", +] + [[package]] name = "shlex" version = "1.3.0" @@ -6261,9 +6297,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "symbolic-common" -version = "12.18.2" +version = "12.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bbc8b4f883265fb2207a0d6ce67095f4bd6cf13e5f9183eb8b3e73fa1b2466a" +checksum = "332615d90111d8eeaf86a84dc9bbe9f65d0d8c5cf11b4caccedc37754eb0dcfd" dependencies = [ "debugid", "memmap2", @@ -6273,9 +6309,9 @@ dependencies = [ [[package]] name = "symbolic-demangle" -version = "12.18.2" +version = "12.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eda470a26ea40eb5cafc35487718e23a2f19153d3a589affb9e8f7fa1aa73b3" +checksum = "912017718eb4d21930546245af9a3475c9dccf15675a5c215664e76621afc471" dependencies = [ "cpp_demangle", "rustc-demangle", diff --git a/native/Cargo.toml b/native/Cargo.toml index aace9f21b9..2e772160d4 100644 --- a/native/Cargo.toml +++ b/native/Cargo.toml @@ -38,10 +38,10 @@ arrow = { version = "58.1.0", features = ["prettyprint", "ffi", "chrono-tz"] } async-trait = { version = "0.1" } bytes = { version = "1.11.1" } parquet = { version = "58.1.0", default-features = false, features = ["experimental"] } -datafusion = { git = "https://github.com/apache/datafusion.git", rev = "a311d14", default-features = false, features = ["unicode_expressions", "crypto_expressions", "nested_expressions", "parquet"] } -datafusion-datasource = { git = "https://github.com/apache/datafusion.git", rev = "a311d14" } -datafusion-physical-expr-adapter = { git = "https://github.com/apache/datafusion.git", rev = "a311d14" } -datafusion-spark = { git = "https://github.com/apache/datafusion.git", rev = "a311d14", features = ["core"] } +datafusion = { git = "https://github.com/apache/datafusion.git", rev = "067ba4b", default-features = false, features = ["unicode_expressions", "crypto_expressions", "nested_expressions", "parquet"] } +datafusion-datasource = { git = "https://github.com/apache/datafusion.git", rev = "067ba4b" } +datafusion-physical-expr-adapter = { git = "https://github.com/apache/datafusion.git", rev = "067ba4b" } +datafusion-spark = { git = "https://github.com/apache/datafusion.git", rev = "067ba4b", features = ["core"] } datafusion-comet-spark-expr = { path = "spark-expr" } datafusion-comet-common = { path = "common" } datafusion-comet-jni-bridge = { path = "jni-bridge" } diff --git a/native/core/Cargo.toml b/native/core/Cargo.toml index 34d80c3a7d..4adab838ae 100644 --- a/native/core/Cargo.toml +++ b/native/core/Cargo.toml @@ -91,7 +91,7 @@ jni = { version = "0.22.4", features = ["invocation"] } lazy_static = "1.4" assertables = "9" hex = "0.4.3" -datafusion-functions-nested = { git = "https://github.com/apache/datafusion.git", rev = "a311d14" } +datafusion-functions-nested = { git = "https://github.com/apache/datafusion.git", rev = "067ba4b" } [features] backtrace = ["datafusion/backtrace"] diff --git a/native/core/src/execution/memory_pools/fair_pool.rs b/native/core/src/execution/memory_pools/fair_pool.rs index e4a7ceab54..347c3d8ef6 100644 --- a/native/core/src/execution/memory_pools/fair_pool.rs +++ b/native/core/src/execution/memory_pools/fair_pool.rs @@ -16,7 +16,7 @@ // under the License. use std::{ - fmt::{Debug, Formatter, Result as FmtResult}, + fmt::{Debug, Display, Formatter, Result as FmtResult}, sync::Arc, }; @@ -83,10 +83,25 @@ impl CometFairMemoryPool { } } +impl Display for CometFairMemoryPool { + fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult { + let state = self.state.lock(); + write!( + f, + "CometFairMemoryPool(pool_size={}, used={}, num={})", + self.pool_size, state.used, state.num + ) + } +} + unsafe impl Send for CometFairMemoryPool {} unsafe impl Sync for CometFairMemoryPool {} impl MemoryPool for CometFairMemoryPool { + fn name(&self) -> &str { + "CometFairMemoryPool" + } + fn register(&self, _: &MemoryConsumer) { let mut state = self.state.lock(); state.num = state diff --git a/native/core/src/execution/memory_pools/logging_pool.rs b/native/core/src/execution/memory_pools/logging_pool.rs index c23672d01a..4e7b68a728 100644 --- a/native/core/src/execution/memory_pools/logging_pool.rs +++ b/native/core/src/execution/memory_pools/logging_pool.rs @@ -19,6 +19,7 @@ use datafusion::execution::memory_pool::{ MemoryConsumer, MemoryLimit, MemoryPool, MemoryReservation, }; use log::{info, warn}; +use std::fmt; use std::sync::Arc; #[derive(Debug)] @@ -27,6 +28,12 @@ pub(crate) struct LoggingMemoryPool { pool: Arc, } +impl fmt::Display for LoggingMemoryPool { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + write!(f, "LoggingMemoryPool(task={})", self.task_attempt_id) + } +} + impl LoggingMemoryPool { pub fn new(task_attempt_id: u64, pool: Arc) -> Self { Self { @@ -37,6 +44,10 @@ impl LoggingMemoryPool { } impl MemoryPool for LoggingMemoryPool { + fn name(&self) -> &str { + "LoggingMemoryPool" + } + fn register(&self, consumer: &MemoryConsumer) { info!( "[Task {}] MemoryPool[{}].register()", diff --git a/native/core/src/execution/memory_pools/unified_pool.rs b/native/core/src/execution/memory_pools/unified_pool.rs index f34418ee94..e72c734d04 100644 --- a/native/core/src/execution/memory_pools/unified_pool.rs +++ b/native/core/src/execution/memory_pools/unified_pool.rs @@ -16,7 +16,7 @@ // under the License. use std::{ - fmt::{Debug, Formatter, Result as FmtResult}, + fmt::{Debug, Display, Formatter, Result as FmtResult}, sync::{ atomic::{AtomicUsize, Ordering::Relaxed}, Arc, @@ -90,10 +90,24 @@ impl Drop for CometUnifiedMemoryPool { } } +impl Display for CometUnifiedMemoryPool { + fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult { + write!( + f, + "CometUnifiedMemoryPool(used={})", + self.used.load(Relaxed) + ) + } +} + unsafe impl Send for CometUnifiedMemoryPool {} unsafe impl Sync for CometUnifiedMemoryPool {} impl MemoryPool for CometUnifiedMemoryPool { + fn name(&self) -> &str { + "CometUnifiedMemoryPool" + } + fn grow(&self, reservation: &MemoryReservation, additional: usize) { self.try_grow(reservation, additional).unwrap(); } diff --git a/native/spark-expr/src/array_funcs/arrays_overlap.rs b/native/spark-expr/src/array_funcs/arrays_overlap.rs index 662186e614..889a0314df 100644 --- a/native/spark-expr/src/array_funcs/arrays_overlap.rs +++ b/native/spark-expr/src/array_funcs/arrays_overlap.rs @@ -39,7 +39,6 @@ use datafusion::common::{exec_err, utils::take_function_args, Result, ScalarValu use datafusion::logical_expr::{ ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, TypeSignature, Volatility, }; -use std::any::Any; use std::sync::Arc; #[derive(Debug, PartialEq, Eq, Hash)] @@ -62,10 +61,6 @@ impl SparkArraysOverlap { } impl ScalarUDFImpl for SparkArraysOverlap { - fn as_any(&self) -> &dyn Any { - self - } - fn name(&self) -> &str { "spark_arrays_overlap" } diff --git a/native/spark-expr/src/array_funcs/arrays_zip.rs b/native/spark-expr/src/array_funcs/arrays_zip.rs index 2126eb732c..6f0332d3d8 100644 --- a/native/spark-expr/src/array_funcs/arrays_zip.rs +++ b/native/spark-expr/src/array_funcs/arrays_zip.rs @@ -27,7 +27,6 @@ use datafusion::common::cast::{as_fixed_size_list_array, as_large_list_array, as use datafusion::common::{exec_err, Result, ScalarValue}; use datafusion::logical_expr::ColumnarValue; use datafusion::physical_expr::PhysicalExpr; -use std::any::Any; use std::fmt::{Display, Formatter}; use std::sync::Arc; // TODO: Reuse functions from DF @@ -74,10 +73,6 @@ impl Display for SparkArraysZipFunc { } impl PhysicalExpr for SparkArraysZipFunc { - fn as_any(&self) -> &dyn Any { - self - } - fn data_type(&self, input_schema: &Schema) -> Result { let fields = self.fields(input_schema)?; Ok(List(Arc::new(Field::new_list_field( From f8cda65b090d9ab26f7f13575f99d2e0aa145085 Mon Sep 17 00:00:00 2001 From: Andy Grove Date: Fri, 24 Apr 2026 09:29:25 -0600 Subject: [PATCH 20/30] chore: [datafusion-54] bump DataFusion rev to 85e75e2 (#4063) --- native/Cargo.lock | 65 ++++++++++++++-------------- native/Cargo.toml | 8 ++-- native/core/Cargo.toml | 2 +- native/shuffle/src/shuffle_writer.rs | 1 + 4 files changed, 39 insertions(+), 37 deletions(-) diff --git a/native/Cargo.lock b/native/Cargo.lock index fecf189630..30ebf48446 100644 --- a/native/Cargo.lock +++ b/native/Cargo.lock @@ -357,6 +357,7 @@ dependencies = [ "arrow-select", "flatbuffers", "lz4_flex", + "zstd", ] [[package]] @@ -1859,7 +1860,7 @@ dependencies = [ [[package]] name = "datafusion" version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" +source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" dependencies = [ "arrow", "arrow-schema", @@ -1906,7 +1907,7 @@ dependencies = [ [[package]] name = "datafusion-catalog" version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" +source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" dependencies = [ "arrow", "async-trait", @@ -1930,7 +1931,7 @@ dependencies = [ [[package]] name = "datafusion-catalog-listing" version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" +source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" dependencies = [ "arrow", "async-trait", @@ -2123,7 +2124,7 @@ dependencies = [ [[package]] name = "datafusion-common" version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" +source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" dependencies = [ "arrow", "arrow-ipc", @@ -2148,7 +2149,7 @@ dependencies = [ [[package]] name = "datafusion-common-runtime" version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" +source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" dependencies = [ "futures", "log", @@ -2158,7 +2159,7 @@ dependencies = [ [[package]] name = "datafusion-datasource" version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" +source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" dependencies = [ "arrow", "async-compression", @@ -2193,7 +2194,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-arrow" version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" +source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" dependencies = [ "arrow", "arrow-ipc", @@ -2216,7 +2217,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-csv" version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" +source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" dependencies = [ "arrow", "async-trait", @@ -2238,7 +2239,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-json" version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" +source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" dependencies = [ "arrow", "async-trait", @@ -2260,7 +2261,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-parquet" version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" +source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" dependencies = [ "arrow", "async-trait", @@ -2290,12 +2291,12 @@ dependencies = [ [[package]] name = "datafusion-doc" version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" +source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" [[package]] name = "datafusion-execution" version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" +source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" dependencies = [ "arrow", "arrow-buffer", @@ -2317,7 +2318,7 @@ dependencies = [ [[package]] name = "datafusion-expr" version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" +source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" dependencies = [ "arrow", "arrow-schema", @@ -2338,7 +2339,7 @@ dependencies = [ [[package]] name = "datafusion-expr-common" version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" +source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" dependencies = [ "arrow", "datafusion-common", @@ -2349,7 +2350,7 @@ dependencies = [ [[package]] name = "datafusion-functions" version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" +source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" dependencies = [ "arrow", "arrow-buffer", @@ -2379,7 +2380,7 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate" version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" +source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" dependencies = [ "arrow", "datafusion-common", @@ -2399,7 +2400,7 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate-common" version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" +source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" dependencies = [ "arrow", "datafusion-common", @@ -2410,7 +2411,7 @@ dependencies = [ [[package]] name = "datafusion-functions-nested" version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" +source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" dependencies = [ "arrow", "arrow-ord", @@ -2434,7 +2435,7 @@ dependencies = [ [[package]] name = "datafusion-functions-table" version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" +source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" dependencies = [ "arrow", "async-trait", @@ -2448,7 +2449,7 @@ dependencies = [ [[package]] name = "datafusion-functions-window" version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" +source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" dependencies = [ "arrow", "datafusion-common", @@ -2464,7 +2465,7 @@ dependencies = [ [[package]] name = "datafusion-functions-window-common" version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" +source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" dependencies = [ "datafusion-common", "datafusion-physical-expr-common", @@ -2473,7 +2474,7 @@ dependencies = [ [[package]] name = "datafusion-macros" version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" +source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" dependencies = [ "datafusion-doc", "quote", @@ -2483,7 +2484,7 @@ dependencies = [ [[package]] name = "datafusion-optimizer" version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" +source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" dependencies = [ "arrow", "chrono", @@ -2501,7 +2502,7 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" +source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" dependencies = [ "arrow", "datafusion-common", @@ -2521,7 +2522,7 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-adapter" version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" +source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" dependencies = [ "arrow", "datafusion-common", @@ -2535,7 +2536,7 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-common" version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" +source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" dependencies = [ "arrow", "chrono", @@ -2550,7 +2551,7 @@ dependencies = [ [[package]] name = "datafusion-physical-optimizer" version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" +source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" dependencies = [ "arrow", "datafusion-common", @@ -2567,7 +2568,7 @@ dependencies = [ [[package]] name = "datafusion-physical-plan" version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" +source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" dependencies = [ "arrow", "arrow-data", @@ -2598,7 +2599,7 @@ dependencies = [ [[package]] name = "datafusion-pruning" version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" +source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" dependencies = [ "arrow", "datafusion-common", @@ -2613,7 +2614,7 @@ dependencies = [ [[package]] name = "datafusion-session" version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" +source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" dependencies = [ "async-trait", "datafusion-common", @@ -2626,7 +2627,7 @@ dependencies = [ [[package]] name = "datafusion-spark" version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" +source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" dependencies = [ "arrow", "bigdecimal", @@ -2653,7 +2654,7 @@ dependencies = [ [[package]] name = "datafusion-sql" version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=067ba4b#067ba4b02e180ccd3f7e43f087698463d53a566e" +source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" dependencies = [ "arrow", "bigdecimal", diff --git a/native/Cargo.toml b/native/Cargo.toml index 2e772160d4..3d9f06686e 100644 --- a/native/Cargo.toml +++ b/native/Cargo.toml @@ -38,10 +38,10 @@ arrow = { version = "58.1.0", features = ["prettyprint", "ffi", "chrono-tz"] } async-trait = { version = "0.1" } bytes = { version = "1.11.1" } parquet = { version = "58.1.0", default-features = false, features = ["experimental"] } -datafusion = { git = "https://github.com/apache/datafusion.git", rev = "067ba4b", default-features = false, features = ["unicode_expressions", "crypto_expressions", "nested_expressions", "parquet"] } -datafusion-datasource = { git = "https://github.com/apache/datafusion.git", rev = "067ba4b" } -datafusion-physical-expr-adapter = { git = "https://github.com/apache/datafusion.git", rev = "067ba4b" } -datafusion-spark = { git = "https://github.com/apache/datafusion.git", rev = "067ba4b", features = ["core"] } +datafusion = { git = "https://github.com/apache/datafusion.git", rev = "85e75e2", default-features = false, features = ["unicode_expressions", "crypto_expressions", "nested_expressions", "parquet"] } +datafusion-datasource = { git = "https://github.com/apache/datafusion.git", rev = "85e75e2" } +datafusion-physical-expr-adapter = { git = "https://github.com/apache/datafusion.git", rev = "85e75e2" } +datafusion-spark = { git = "https://github.com/apache/datafusion.git", rev = "85e75e2", features = ["core"] } datafusion-comet-spark-expr = { path = "spark-expr" } datafusion-comet-common = { path = "common" } datafusion-comet-jni-bridge = { path = "jni-bridge" } diff --git a/native/core/Cargo.toml b/native/core/Cargo.toml index 4adab838ae..26c665050c 100644 --- a/native/core/Cargo.toml +++ b/native/core/Cargo.toml @@ -91,7 +91,7 @@ jni = { version = "0.22.4", features = ["invocation"] } lazy_static = "1.4" assertables = "9" hex = "0.4.3" -datafusion-functions-nested = { git = "https://github.com/apache/datafusion.git", rev = "067ba4b" } +datafusion-functions-nested = { git = "https://github.com/apache/datafusion.git", rev = "85e75e2" } [features] backtrace = ["datafusion/backtrace"] diff --git a/native/shuffle/src/shuffle_writer.rs b/native/shuffle/src/shuffle_writer.rs index 7fed1cf9ff..a89abbb1e3 100644 --- a/native/shuffle/src/shuffle_writer.rs +++ b/native/shuffle/src/shuffle_writer.rs @@ -345,6 +345,7 @@ mod test { } #[tokio::test] + #[cfg_attr(miri, ignore)] // miri can't call foreign function `ZSTD_createCCtx` async fn shuffle_partitioner_memory() { let batch = create_batch(900); assert_eq!(8316, batch.get_array_memory_size()); // Not stable across Arrow versions From b7737fb26c6958adb31d79fc79e8d341c1d0d9c9 Mon Sep 17 00:00:00 2001 From: comphead Date: Thu, 21 May 2026 12:31:56 -0700 Subject: [PATCH 21/30] chore: DF54 upgrade --- native/Cargo.lock | 536 ++++++++++++++++++++++------------------- native/Cargo.toml | 8 +- native/core/Cargo.toml | 2 +- 3 files changed, 288 insertions(+), 258 deletions(-) diff --git a/native/Cargo.lock b/native/Cargo.lock index 30ebf48446..4968c5bbac 100644 --- a/native/Cargo.lock +++ b/native/Cargo.lock @@ -230,9 +230,9 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "arrow" -version = "58.1.0" +version = "58.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d441fdda254b65f3e9025910eb2c2066b6295d9c8ed409522b8d2ace1ff8574c" +checksum = "378530e55cd479eda3c14eb345310799717e6f76d0c332041e8487022166b471" dependencies = [ "arrow-arith", "arrow-array", @@ -251,9 +251,9 @@ dependencies = [ [[package]] name = "arrow-arith" -version = "58.1.0" +version = "58.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced5406f8b720cc0bc3aa9cf5758f93e8593cda5490677aa194e4b4b383f9a59" +checksum = "a0ab212d2c1886e802f51c5212d78ebbcbb0bec980fff9dadc1eb8d45cd0b738" dependencies = [ "arrow-array", "arrow-buffer", @@ -265,9 +265,9 @@ dependencies = [ [[package]] name = "arrow-array" -version = "58.1.0" +version = "58.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "772bd34cacdda8baec9418d80d23d0fb4d50ef0735685bd45158b83dfeb6e62d" +checksum = "cfd33d3e92f207444098c75b42de99d329562be0cf686b307b097cc52b4e999e" dependencies = [ "ahash", "arrow-buffer", @@ -276,7 +276,7 @@ dependencies = [ "chrono", "chrono-tz", "half", - "hashbrown 0.16.1", + "hashbrown 0.17.1", "num-complex", "num-integer", "num-traits", @@ -284,9 +284,9 @@ dependencies = [ [[package]] name = "arrow-buffer" -version = "58.1.0" +version = "58.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "898f4cf1e9598fdb77f356fdf2134feedfd0ee8d5a4e0a5f573e7d0aec16baa4" +checksum = "0c6cd424c2693bcdbc150d843dc9d4d137dd2de4782ce6df491ad11a3a0416c0" dependencies = [ "bytes", "half", @@ -296,9 +296,9 @@ dependencies = [ [[package]] name = "arrow-cast" -version = "58.1.0" +version = "58.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0127816c96533d20fc938729f48c52d3e48f99717e7a0b5ade77d742510736d" +checksum = "4c5aefb56a2c02e9e2b30746241058b85f8983f0fcff2ba0c6d09006e1cded7f" dependencies = [ "arrow-array", "arrow-buffer", @@ -318,9 +318,9 @@ dependencies = [ [[package]] name = "arrow-csv" -version = "58.1.0" +version = "58.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca025bd0f38eeecb57c2153c0123b960494138e6a957bbda10da2b25415209fe" +checksum = "e94e8cf7e517657a52b91ea1263acf38c4ca62a84655d72458a3359b12ab97de" dependencies = [ "arrow-array", "arrow-cast", @@ -333,9 +333,9 @@ dependencies = [ [[package]] name = "arrow-data" -version = "58.1.0" +version = "58.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42d10beeab2b1c3bb0b53a00f7c944a178b622173a5c7bcabc3cb45d90238df4" +checksum = "3c88210023a2bfee1896af366309a3028fc3bcbd6515fa29a7990ee1baa08ee0" dependencies = [ "arrow-buffer", "arrow-schema", @@ -346,9 +346,9 @@ dependencies = [ [[package]] name = "arrow-ipc" -version = "58.1.0" +version = "58.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "609a441080e338147a84e8e6904b6da482cefb957c5cdc0f3398872f69a315d0" +checksum = "238438f0834483703d88896db6fe5a7138b2230debc31b34c0336c2996e3c64f" dependencies = [ "arrow-array", "arrow-buffer", @@ -362,15 +362,16 @@ dependencies = [ [[package]] name = "arrow-json" -version = "58.1.0" +version = "58.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ead0914e4861a531be48fe05858265cf854a4880b9ed12618b1d08cba9bebc8" +checksum = "205ca2119e6d679d5c133c6f30e68f027738d95ed948cf77677ea69c7800036b" dependencies = [ "arrow-array", "arrow-buffer", "arrow-cast", - "arrow-data", + "arrow-ord", "arrow-schema", + "arrow-select", "chrono", "half", "indexmap 2.14.0", @@ -386,9 +387,9 @@ dependencies = [ [[package]] name = "arrow-ord" -version = "58.1.0" +version = "58.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763a7ba279b20b52dad300e68cfc37c17efa65e68623169076855b3a9e941ca5" +checksum = "1bffd8fd2579286a5d63bac898159873e5094a79009940bcb42bbfce4f19f1d0" dependencies = [ "arrow-array", "arrow-buffer", @@ -399,9 +400,9 @@ dependencies = [ [[package]] name = "arrow-row" -version = "58.1.0" +version = "58.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14fe367802f16d7668163ff647830258e6e0aeea9a4d79aaedf273af3bdcd3e" +checksum = "bab5994731204603c73ba69267616c50f80780774c6bb0476f1f830625115e0c" dependencies = [ "arrow-array", "arrow-buffer", @@ -412,9 +413,9 @@ dependencies = [ [[package]] name = "arrow-schema" -version = "58.1.0" +version = "58.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c30a1365d7a7dc50cc847e54154e6af49e4c4b0fddc9f607b687f29212082743" +checksum = "f633dbfdf39c039ada1bf9e34c694816eb71fbb7dc78f613993b7245e078a1ed" dependencies = [ "bitflags 2.11.1", "serde_core", @@ -423,9 +424,9 @@ dependencies = [ [[package]] name = "arrow-select" -version = "58.1.0" +version = "58.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78694888660a9e8ac949853db393af2a8b8fc82c19ce333132dfa2e72cc1a7fe" +checksum = "8cd065c54172ac787cf3f2f8d4107e0d3fdc26edba76fdf4f4cc170258942222" dependencies = [ "ahash", "arrow-array", @@ -437,9 +438,9 @@ dependencies = [ [[package]] name = "arrow-string" -version = "58.1.0" +version = "58.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e04a01f8bb73ce54437514c5fd3ee2aa3e8abe4c777ee5cc55853b1652f79e" +checksum = "29dd7cda3ab9692f43a2e4acc444d760cc17b12bb6d8232ddf64e9bab7c06b42" dependencies = [ "arrow-array", "arrow-buffer", @@ -493,9 +494,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f9ee0f6e02ffd7ad5816e9464499fba7b3effd01123b515c41d1697c43dad1" +checksum = "e79b3f8a79cccc2898f31920fc69f304859b3bd567490f75ebf51ae1c792a9ac" dependencies = [ "compression-codecs", "compression-core", @@ -627,9 +628,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "aws-config" -version = "1.8.16" +version = "1.8.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f156acdd2cf55f5aa53ee416c4ac851cf1222694506c0b1f78c85695e9ca9d" +checksum = "517aa062d8bd9015ee23d6daa5e1c1372328412fdae4e6c4c1be9b69c6ad37a2" dependencies = [ "aws-credential-types", "aws-runtime", @@ -641,6 +642,7 @@ dependencies = [ "aws-smithy-json", "aws-smithy-runtime", "aws-smithy-runtime-api", + "aws-smithy-schema", "aws-smithy-types", "aws-types", "bytes", @@ -669,9 +671,9 @@ dependencies = [ [[package]] name = "aws-lc-rs" -version = "1.16.3" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ec6fb3fe69024a75fa7e1bfb48aa6cf59706a101658ea01bfd33b2b248a038f" +checksum = "5ec2f1fc3ec205783a5da9a7e6c1509cc69dedf09a1949e412c1e18469326d00" dependencies = [ "aws-lc-sys", "zeroize", @@ -679,9 +681,9 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.40.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f50037ee5e1e41e7b8f9d161680a725bd1626cb6f8c7e901f91f942850852fe7" +checksum = "1a2f9779ce85b93ab6170dd940ad0169b5766ff848247aff13bb788b832fe3f4" dependencies = [ "cc", "cmake", @@ -691,9 +693,9 @@ dependencies = [ [[package]] name = "aws-runtime" -version = "1.7.3" +version = "1.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dcd93c82209ac7413532388067dce79be5a8780c1786e5fae3df22e4dee2864" +checksum = "77ed8e8c52d2dc2390ad9f15647fe663f71e9780b4262c190fbb823a32721566" dependencies = [ "aws-credential-types", "aws-sigv4", @@ -716,9 +718,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.98.0" +version = "1.99.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d69c77aafa20460c68b6b3213c84f6423b6e76dbf89accd3e1789a686ffd9489" +checksum = "9f4055e6099b2ec264abdc0d9bbfffce306c1601809275c861594779a0b04b45" dependencies = [ "aws-credential-types", "aws-runtime", @@ -740,9 +742,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.100.0" +version = "1.101.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c7e7b09346d5ca22a2a08267555843a6a0127fb20d8964cb6ecfb8fdb190225" +checksum = "02f009ba0284c5d696425fd7b4dcc5b189f5726f4041b7a5794daecb3a68d598" dependencies = [ "aws-credential-types", "aws-runtime", @@ -764,9 +766,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.103.0" +version = "1.104.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2249b81a2e73a8027c41c378463a81ec39b8510f184f2caab87de912af0f49b" +checksum = "6aa6622798e19e6a76b690562085dd4771c736cd48343464a53ab4ae2f2c9f84" dependencies = [ "aws-credential-types", "aws-runtime", @@ -789,9 +791,9 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "1.4.3" +version = "1.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68dc0b907359b120170613b5c09ccc61304eac3998ff6274b97d93ee6490115a" +checksum = "b7083fb918b38474ac65ffbf8a69fc8792d36879f4ac5f1667b43aec61efe9a5" dependencies = [ "aws-credential-types", "aws-smithy-http", @@ -867,10 +869,12 @@ dependencies = [ [[package]] name = "aws-smithy-json" -version = "0.62.5" +version = "0.62.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9648b0bb82a2eedd844052c6ad2a1a822d1f8e3adee5fbf668366717e428856a" +checksum = "517089205f18ab4adc5a3e02888cb139bbbbb2e168eac9f396216925d1fbeaf5" dependencies = [ + "aws-smithy-runtime-api", + "aws-smithy-schema", "aws-smithy-types", ] @@ -895,15 +899,16 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.11.1" +version = "1.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0504b1ab12debb5959e5165ee5fe97dd387e7aa7ea6a477bfd7635dfe769a4f5" +checksum = "b8e6f5caf6fea86f8c2206541ab5857cfcda9013426cdbe8fa0098b9e2d32182" dependencies = [ "aws-smithy-async", "aws-smithy-http", "aws-smithy-http-client", "aws-smithy-observability", "aws-smithy-runtime-api", + "aws-smithy-schema", "aws-smithy-types", "bytes", "fastrand", @@ -920,9 +925,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime-api" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71a13df6ada0aafbf21a73bdfcdf9324cfa9df77d96b8446045be3cde61b42e" +checksum = "dc117c179ecf39a62a0a3f49f600e9ac26a7ad7dd172177999f83933af776c32" dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api-macros", @@ -947,11 +952,22 @@ dependencies = [ "syn 2.0.117", ] +[[package]] +name = "aws-smithy-schema" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7442cb268338f0eb8278140a107c046756aa01093d8ef5e99628d34ae09c94f5" +dependencies = [ + "aws-smithy-runtime-api", + "aws-smithy-types", + "http 1.4.0", +] + [[package]] name = "aws-smithy-types" -version = "1.4.7" +version = "1.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d73dbfbaa8e4bc57b9045137680b958d274823509a360abfd8e1d514d40c95c" +checksum = "056b66dbce2f81cc0c1e2b05bb402eb58f8a3530479d650efadd5bbae9a4050b" dependencies = [ "base64-simd", "bytes", @@ -981,13 +997,14 @@ dependencies = [ [[package]] name = "aws-types" -version = "1.3.15" +version = "1.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f4bbcaa9304ea40902d3d5f42a0428d1bd895a2b0f6999436fb279ffddc58ac" +checksum = "d16bf10b03a3c01e6b3b7d47cd964e873ffe9e7d4e80fad16bd4c077cb068531" dependencies = [ "aws-credential-types", "aws-smithy-async", "aws-smithy-runtime-api", + "aws-smithy-schema", "aws-smithy-types", "rustc_version", "tracing", @@ -1126,9 +1143,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.8.4" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d2d5991425dfd0785aed03aedcf0b321d61975c9b5b3689c774a2610ae0b51e" +checksum = "0aa83c34e62843d924f905e0f5c866eb1dd6545fc4d719e803d9ba6030371fce" dependencies = [ "arrayref", "arrayvec", @@ -1234,6 +1251,15 @@ dependencies = [ "alloc-stdlib", ] +[[package]] +name = "bs58" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" +dependencies = [ + "tinyvec", +] + [[package]] name = "bumpalo" version = "3.20.2" @@ -1294,9 +1320,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.60" +version = "1.2.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43c5703da9466b66a946814e1adf53ea2c90f10063b86290cc9eb67ce3478a20" +checksum = "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98" dependencies = [ "find-msvc-tools", "jobserver", @@ -1497,9 +1523,9 @@ dependencies = [ [[package]] name = "compression-codecs" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb7b51a7d9c967fc26773061ba86150f19c50c0d65c887cb1fbe295fd16619b7" +checksum = "ce2548391e9c1929c21bf6aa2680af86fe4c1b33e6cea9ac1cfeec0bd11218cf" dependencies = [ "bzip2", "compression-core", @@ -1512,9 +1538,9 @@ dependencies = [ [[package]] name = "compression-core" -version = "0.4.31" +version = "0.4.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75984efb6ed102a0d42db99afb6c1948f0380d1d91808d5529916e6c08b49d8d" +checksum = "cc14f565cf027a105f7a44ccf9e5b424348421a1d8952a8fc9d499d313107789" [[package]] name = "concurrent-queue" @@ -1712,9 +1738,9 @@ dependencies = [ [[package]] name = "crypto-common" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77727bb15fa921304124b128af125e7e3b968275d1b108b379190264f4423710" +checksum = "ce6e4c961d6cd6c9a86db418387425e8bdeaf05b3c8bc1411e6dca4c252f1453" dependencies = [ "hybrid-array", ] @@ -1845,9 +1871,9 @@ dependencies = [ [[package]] name = "dashmap" -version = "6.1.0" +version = "6.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" +checksum = "e6361d5c062261c78a176addb82d4c821ae42bed6089de0e12603cd25de2059c" dependencies = [ "cfg-if", "crossbeam-utils", @@ -1859,8 +1885,8 @@ dependencies = [ [[package]] name = "datafusion" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "arrow-schema", @@ -1892,6 +1918,7 @@ dependencies = [ "datafusion-session", "datafusion-sql", "futures", + "indexmap 2.14.0", "itertools 0.14.0", "log", "object_store", @@ -1906,8 +1933,8 @@ dependencies = [ [[package]] name = "datafusion-catalog" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "async-trait", @@ -1930,8 +1957,8 @@ dependencies = [ [[package]] name = "datafusion-catalog-listing" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "async-trait", @@ -2123,8 +2150,8 @@ dependencies = [ [[package]] name = "datafusion-common" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "arrow-ipc", @@ -2132,7 +2159,7 @@ dependencies = [ "chrono", "foldhash 0.2.0", "half", - "hashbrown 0.17.0", + "hashbrown 0.17.1", "hex", "indexmap 2.14.0", "itertools 0.14.0", @@ -2148,8 +2175,8 @@ dependencies = [ [[package]] name = "datafusion-common-runtime" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "futures", "log", @@ -2158,8 +2185,8 @@ dependencies = [ [[package]] name = "datafusion-datasource" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "async-compression", @@ -2193,8 +2220,8 @@ dependencies = [ [[package]] name = "datafusion-datasource-arrow" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "arrow-ipc", @@ -2216,8 +2243,8 @@ dependencies = [ [[package]] name = "datafusion-datasource-csv" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "async-trait", @@ -2238,8 +2265,8 @@ dependencies = [ [[package]] name = "datafusion-datasource-json" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "async-trait", @@ -2260,8 +2287,8 @@ dependencies = [ [[package]] name = "datafusion-datasource-parquet" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "async-trait", @@ -2290,13 +2317,13 @@ dependencies = [ [[package]] name = "datafusion-doc" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" [[package]] name = "datafusion-execution" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "arrow-buffer", @@ -2317,8 +2344,8 @@ dependencies = [ [[package]] name = "datafusion-expr" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "arrow-schema", @@ -2338,8 +2365,8 @@ dependencies = [ [[package]] name = "datafusion-expr-common" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "datafusion-common", @@ -2349,8 +2376,8 @@ dependencies = [ [[package]] name = "datafusion-functions" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "arrow-buffer", @@ -2365,22 +2392,23 @@ dependencies = [ "datafusion-expr", "datafusion-expr-common", "datafusion-macros", + "datafusion-physical-expr-common", "hex", "itertools 0.14.0", "log", - "md-5", + "md-5 0.11.0", "memchr", "num-traits", "rand 0.9.4", "regex", - "sha2 0.10.9", + "sha2 0.11.0", "uuid", ] [[package]] name = "datafusion-functions-aggregate" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "datafusion-common", @@ -2399,8 +2427,8 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate-common" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "datafusion-common", @@ -2410,8 +2438,8 @@ dependencies = [ [[package]] name = "datafusion-functions-nested" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "arrow-ord", @@ -2425,7 +2453,7 @@ dependencies = [ "datafusion-functions-aggregate-common", "datafusion-macros", "datafusion-physical-expr-common", - "hashbrown 0.17.0", + "hashbrown 0.17.1", "itertools 0.14.0", "itoa", "log", @@ -2434,22 +2462,23 @@ dependencies = [ [[package]] name = "datafusion-functions-table" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "async-trait", "datafusion-catalog", "datafusion-common", "datafusion-expr", + "datafusion-physical-expr", "datafusion-physical-plan", "parking_lot", ] [[package]] name = "datafusion-functions-window" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "datafusion-common", @@ -2464,8 +2493,8 @@ dependencies = [ [[package]] name = "datafusion-functions-window-common" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "datafusion-common", "datafusion-physical-expr-common", @@ -2473,8 +2502,8 @@ dependencies = [ [[package]] name = "datafusion-macros" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "datafusion-doc", "quote", @@ -2483,8 +2512,8 @@ dependencies = [ [[package]] name = "datafusion-optimizer" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "chrono", @@ -2501,8 +2530,8 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "datafusion-common", @@ -2511,7 +2540,7 @@ dependencies = [ "datafusion-functions-aggregate-common", "datafusion-physical-expr-common", "half", - "hashbrown 0.17.0", + "hashbrown 0.17.1", "indexmap 2.14.0", "itertools 0.14.0", "parking_lot", @@ -2521,8 +2550,8 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-adapter" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "datafusion-common", @@ -2535,23 +2564,24 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-common" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "chrono", "datafusion-common", "datafusion-expr-common", - "hashbrown 0.17.0", + "hashbrown 0.17.1", "indexmap 2.14.0", "itertools 0.14.0", "parking_lot", + "pin-project", ] [[package]] name = "datafusion-physical-optimizer" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "datafusion-common", @@ -2567,11 +2597,12 @@ dependencies = [ [[package]] name = "datafusion-physical-plan" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "arrow-data", + "arrow-ipc", "arrow-ord", "arrow-schema", "async-trait", @@ -2586,7 +2617,7 @@ dependencies = [ "datafusion-physical-expr-common", "futures", "half", - "hashbrown 0.17.0", + "hashbrown 0.17.1", "indexmap 2.14.0", "itertools 0.14.0", "log", @@ -2598,8 +2629,8 @@ dependencies = [ [[package]] name = "datafusion-pruning" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "datafusion-common", @@ -2613,8 +2644,8 @@ dependencies = [ [[package]] name = "datafusion-session" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "async-trait", "datafusion-common", @@ -2626,8 +2657,8 @@ dependencies = [ [[package]] name = "datafusion-spark" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "bigdecimal", @@ -2640,6 +2671,7 @@ dependencies = [ "datafusion-expr", "datafusion-functions", "datafusion-functions-aggregate", + "datafusion-functions-aggregate-common", "datafusion-functions-nested", "log", "num-traits", @@ -2647,14 +2679,15 @@ dependencies = [ "rand 0.9.4", "serde_json", "sha1 0.11.0", - "sha2 0.10.9", + "sha2 0.11.0", + "twox-hash", "url", ] [[package]] name = "datafusion-sql" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "bigdecimal", @@ -2771,13 +2804,13 @@ dependencies = [ [[package]] name = "digest" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4850db49bf08e663084f7fb5c87d202ef91a3907271aff24a94eb97ff039153c" +checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2" dependencies = [ "block-buffer 0.12.0", "const-oid 0.10.2", - "crypto-common 0.2.1", + "crypto-common 0.2.2", "ctutils", ] @@ -2836,9 +2869,9 @@ checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" [[package]] name = "either" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" +checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e" [[package]] name = "equator" @@ -3222,9 +3255,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f44da3a8150a6703ed5d34e164b875fd14c2cdab9af1252a9a1020bde2bdc54" +checksum = "171fefbc92fe4a4de27e0698d6a5b392d6a0e333506bc49133760b3bcf948733" dependencies = [ "atomic-waker", "bytes", @@ -3274,15 +3307,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.16.1" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" - -[[package]] -name = "hashbrown" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51" +checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" dependencies = [ "allocator-api2", "equivalent", @@ -3346,7 +3373,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6303bc9732ae41b04cb554b844a762b4115a61bfaa81e3e83050991eeb56863f" dependencies = [ - "digest 0.11.2", + "digest 0.11.3", ] [[package]] @@ -3427,9 +3454,9 @@ checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424" [[package]] name = "hybrid-array" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3944cf8cf766b40e2a1a333ee5e9b563f854d5fa49d6a8ca2764e97c6eddb214" +checksum = "9155a582abd142abc056962c29e3ce5ff2ad5469f4246b537ed42c5deba857da" dependencies = [ "typenum", ] @@ -3700,9 +3727,9 @@ dependencies = [ [[package]] name = "idna_adapter" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" +checksum = "cb68373c0d6620ef8105e855e7745e18b0d00d3bdb07fb532e434244cdb9a714" dependencies = [ "icu_normalizer", "icu_properties", @@ -3726,7 +3753,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" dependencies = [ "equivalent", - "hashbrown 0.17.0", + "hashbrown 0.17.1", "serde", "serde_core", ] @@ -3780,16 +3807,6 @@ version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2" -[[package]] -name = "iri-string" -version = "0.7.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25e659a4bb38e810ebc252e53b5814ff908a8c58c2a9ce2fae1bbec24cbf4e20" -dependencies = [ - "memchr", - "serde", -] - [[package]] name = "is-terminal" version = "0.4.17" @@ -3971,9 +3988,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.95" +version = "0.3.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2964e92d1d9dc3364cae4d718d93f227e3abb088e747d92e0395bfdedf1c12ca" +checksum = "67df7112613f8bfd9150013a0314e196f4800d3201ae742489d999db2f979f08" dependencies = [ "cfg-if", "futures-util", @@ -4085,15 +4102,15 @@ dependencies = [ [[package]] name = "libbz2-rs-sys" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a6a8c165077efc8f3a971534c50ea6a1a18b329ef4a66e897a7e3a1494565f" +checksum = "34b357333733e8260735ba5894eb928c02ecc69c78715f01a8019e7fa7f2db4c" [[package]] name = "libc" -version = "0.2.185" +version = "0.2.186" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f" +checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" [[package]] name = "libloading" @@ -4133,9 +4150,9 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" [[package]] name = "libmimalloc-sys" -version = "0.1.47" +version = "0.1.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d1eacfa31c33ec25e873c136ba5669f00f9866d0688bea7be4d3f7e43067df6" +checksum = "2892ae4ea6fa2cb7acb0e236a6880d39523239cd9089de71d220910ccc806790" dependencies = [ "cc", ] @@ -4220,9 +4237,9 @@ checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" [[package]] name = "lz4_flex" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db9a0d582c2874f68138a16ce1867e0ffde6c0bb0a0df85e1f36d04146db488a" +checksum = "7ef0d4ed8669f8f8826eb00dc878084aa8f253506c4fd5e8f58f5bce72ddb97e" dependencies = [ "twox-hash", ] @@ -4237,6 +4254,16 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "md-5" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69b6441f590336821bb897fb28fc622898ccceb1d6cea3fde5ea86b090c4de98" +dependencies = [ + "cfg-if", + "digest 0.11.3", +] + [[package]] name = "mea" version = "0.6.3" @@ -4263,9 +4290,9 @@ dependencies = [ [[package]] name = "mimalloc" -version = "0.1.50" +version = "0.1.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3627c4272df786b9260cabaa46aec1d59c93ede723d4c3ef646c503816b0640" +checksum = "ebca48a43116bc25f18a61360f1be98412f50cc218f5e52c823086b999a4a21a" dependencies = [ "libmimalloc-sys", ] @@ -4408,9 +4435,9 @@ dependencies = [ [[package]] name = "num-conv" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6673768db2d862beb9b39a78fdcb1a69439615d5794a1be50caa9bc92c81967" +checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441" [[package]] name = "num-format" @@ -4492,10 +4519,10 @@ dependencies = [ "humantime", "hyper", "itertools 0.14.0", - "md-5", + "md-5 0.10.6", "parking_lot", "percent-encoding", - "quick-xml 0.39.2", + "quick-xml 0.39.4", "rand 0.10.1", "reqwest 0.12.28", "ring", @@ -4569,7 +4596,7 @@ dependencies = [ "http-body 1.0.1", "jiff", "log", - "md-5", + "md-5 0.10.6", "percent-encoding", "quick-xml 0.38.4", "reqsign", @@ -4608,12 +4635,12 @@ dependencies = [ "http-body 1.0.1", "jiff", "log", - "md-5", + "md-5 0.10.6", "mea", "percent-encoding", "quick-xml 0.38.4", "reqsign-core", - "reqwest 0.13.2", + "reqwest 0.13.3", "serde", "serde_json", "tokio", @@ -4746,9 +4773,9 @@ dependencies = [ [[package]] name = "parquet" -version = "58.1.0" +version = "58.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d3f9f2205199603564127932b89695f52b62322f541d0fc7179d57c2e1c9877" +checksum = "5dafa7d01085b62a47dd0c1829550a0a36710ea9c4fe358a05a85477cec8a908" dependencies = [ "ahash", "arrow-array", @@ -4764,7 +4791,7 @@ dependencies = [ "flate2", "futures", "half", - "hashbrown 0.16.1", + "hashbrown 0.17.1", "lz4_flex", "num-bigint", "num-integer", @@ -4786,23 +4813,25 @@ dependencies = [ [[package]] name = "parquet-variant" -version = "58.1.0" +version = "58.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf493f3c9ddd984d0efb019f67343e4aa4bab893931f6a14b82083065dc3d28" +checksum = "74c8db065291f088a2aad8ab831853eae1871c0d311c8d0b83bbc3b7e735d0fc" dependencies = [ + "arrow", "arrow-schema", "chrono", "half", "indexmap 2.14.0", + "num-traits", "simdutf8", "uuid", ] [[package]] name = "parquet-variant-compute" -version = "58.1.0" +version = "58.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac038d46a503a7d563b4f5df5802c4315d5343d009feab195d15ac512b4cb27" +checksum = "a530e8d5b5e14efcb39c9a6ec55432ad11f6afb7dc4455a79be0dc615fe3cc31" dependencies = [ "arrow", "arrow-schema", @@ -4817,9 +4846,9 @@ dependencies = [ [[package]] name = "parquet-variant-json" -version = "58.1.0" +version = "58.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "015a09c2ffe5108766c7c1235c307b8a3c2ea64eca38455ba1a7f3a7f32f16e2" +checksum = "00ed89908289f67caa2ca078f9ff9aacd6229a313ec92b12bf4f48f613dc2b97" dependencies = [ "arrow-schema", "base64", @@ -4908,18 +4937,18 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.11" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1749c7ed4bcaf4c3d0a3efc28538844fb29bcdd7d2b67b2be7e20ba861ff517" +checksum = "2466b2336ed02bcdca6b294417127b90ec92038d1d5c4fbeac971a922e0e0924" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.11" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b20ed30f105399776b9c883e68e536ef602a16ae6f596d2c473591d6ad64c6" +checksum = "c96395f0a926bc13b1c17622aaddda1ecb55d49c8f1bf9777e4d877800a43f8b" dependencies = [ "proc-macro2", "quote", @@ -5239,9 +5268,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.39.2" +version = "0.39.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958f21e8e7ceb5a1aa7fa87fab28e7c75976e0bfe7e23ff069e0a260f894067d" +checksum = "cdcc8dd4e2f670d309a5f0e83fe36dfdc05af317008fea29144da1a2ac858e5e" dependencies = [ "memchr", "serde", @@ -5583,9 +5612,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3f43e3283ab1488b624b44b0e988d0acea0b3214e694730a055cb6b2efa801" +checksum = "62e0021ea2c22aed41653bc7e1419abb2c97e038ff2c33d0e1309e49a97deec0" dependencies = [ "base64", "bytes", @@ -5644,9 +5673,9 @@ dependencies = [ [[package]] name = "roaring" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ba9ce64a8f45d7fc86358410bb1a82e8c987504c0d4900e9141d69a9f26c885" +checksum = "1dedc5658c6ecb3bdb5ef5f3295bb9253f42dcf3fd1402c03f6b1f7659c3c4a9" dependencies = [ "bytemuck", "byteorder", @@ -5738,9 +5767,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.39" +version = "0.23.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2c118cb077cca2822033836dfb1b975355dfb784b5e8da48f7b6c5db74e60e" +checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b" dependencies = [ "aws-lc-rs", "once_cell", @@ -5765,9 +5794,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.14.0" +version = "1.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd" +checksum = "30a7197ae7eb376e574fe940d068c30fe0462554a3ddbe4eca7838e049c937a9" dependencies = [ "web-time", "zeroize", @@ -5775,13 +5804,13 @@ dependencies = [ [[package]] name = "rustls-platform-verifier" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d99feebc72bae7ab76ba994bb5e121b8d83d910ca40b36e0921f53becc41784" +checksum = "26d1e2536ce4f35f4846aa13bff16bd0ff40157cdb14cc056c7b14ba41233ba0" dependencies = [ "core-foundation", "core-foundation-sys", - "jni 0.21.1", + "jni 0.22.4", "log", "once_cell", "rustls", @@ -6025,11 +6054,12 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.18.0" +version = "3.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd5414fad8e6907dbdd5bc441a50ae8d6e26151a03b1de04d89a5576de61d01f" +checksum = "e72c1c2cb7b223fafb600a619537a871c2818583d619401b785e7c0b746ccde2" dependencies = [ "base64", + "bs58", "chrono", "hex", "indexmap 1.9.3", @@ -6044,9 +6074,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.18.0" +version = "3.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3db8978e608f1fe7357e211969fd9abdcae80bac1ba7a3369bb7eb6b404eb65" +checksum = "b90c488738ecb4fb0262f41f43bc40efc5868d9fb744319ddf5f5317f417bfac" dependencies = [ "darling 0.23.0", "proc-macro2", @@ -6086,7 +6116,7 @@ checksum = "aacc4cc499359472b4abe1bf11d0b12e688af9a805fa5e3016f9a386dc2d0214" dependencies = [ "cfg-if", "cpufeatures 0.3.0", - "digest 0.11.2", + "digest 0.11.3", ] [[package]] @@ -6108,7 +6138,7 @@ checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4" dependencies = [ "cfg-if", "cpufeatures 0.3.0", - "digest 0.11.2", + "digest 0.11.3", ] [[package]] @@ -6173,9 +6203,9 @@ dependencies = [ [[package]] name = "siphasher" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e" +checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649" [[package]] name = "slab" @@ -6232,9 +6262,9 @@ dependencies = [ [[package]] name = "sqlparser" -version = "0.61.0" +version = "0.62.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf5ea8d4d7c808e1af1cbabebca9a2abe603bcefc22294c5b95018d53200cb7" +checksum = "13c6d1b651dc4edf07eead2a0c6c78016ce971bc2c10da5266861b13f25e7cec" dependencies = [ "log", "sqlparser_derive", @@ -6259,9 +6289,9 @@ checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" [[package]] name = "str_stack" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091b6114800a5f2141aee1d1b9d6ca3592ac062dc5decb3764ec5895a47b4eb" +checksum = "7f446288b699d66d0fd2e30d1cfe7869194312524b3b9252594868ed26ef056a" [[package]] name = "strsim" @@ -6549,9 +6579,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.52.1" +version = "1.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67dee974fe86fd92cc45b7a95fdd2f99a36a6d7b0d431a231178d3d670bbcc6" +checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe" dependencies = [ "bytes", "libc", @@ -6627,20 +6657,20 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.6.8" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" +checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840" dependencies = [ "bitflags 2.11.1", "bytes", "futures-util", "http 1.4.0", "http-body 1.0.1", - "iri-string", "pin-project-lite", "tower", "tower-layer", "tower-service", + "url", ] [[package]] @@ -6744,9 +6774,9 @@ checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de" [[package]] name = "typetag" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be2212c8a9b9bcfca32024de14998494cf9a5dfa59ea1b829de98bac374b86bf" +checksum = "c5a897b12c6c1151ad0b138b8db50252dc301f93bc3b027db05eec82aeed298c" dependencies = [ "erased-serde", "inventory", @@ -6757,9 +6787,9 @@ dependencies = [ [[package]] name = "typetag-impl" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27a7a9b72ba121f6f1f6c3632b85604cac41aedb5ddc70accbebb6cac83de846" +checksum = "cf808357c6ed7e13ba0f3277ec8d8f21b2d501274895104263985330c726c1c5" dependencies = [ "proc-macro2", "quote", @@ -6926,9 +6956,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.118" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf938a0bacb0469e83c1e148908bd7d5a6010354cf4fb73279b7447422e3a89" +checksum = "49ace1d07c165b0864824eee619580c4689389afa9dc9ed3a4c75040d82e6790" dependencies = [ "cfg-if", "once_cell", @@ -6939,9 +6969,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.68" +version = "0.4.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f371d383f2fb139252e0bfac3b81b265689bf45b6874af544ffa4c975ac1ebf8" +checksum = "96492d0d3ffba25305a7dc88720d250b1401d7edca02cc3bcd50633b424673b8" dependencies = [ "js-sys", "wasm-bindgen", @@ -6949,9 +6979,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.118" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeff24f84126c0ec2db7a449f0c2ec963c6a49efe0698c4242929da037ca28ed" +checksum = "8e68e6f4afd367a562002c05637acb8578ff2dea1943df76afb9e83d177c8578" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6959,9 +6989,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.118" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d08065faf983b2b80a79fd87d8254c409281cf7de75fc4b773019824196c904" +checksum = "d95a9ec35c64b2a7cb35d3fead40c4238d0940c86d107136999567a4703259f2" dependencies = [ "bumpalo", "proc-macro2", @@ -6972,9 +7002,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.118" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd04d9e306f1907bd13c6361b5c6bfc7b3b3c095ed3f8a9246390f8dbdee129" +checksum = "c4e0100b01e9f0d03189a92b96772a1fb998639d981193d7dbab487302513441" dependencies = [ "unicode-ident", ] @@ -7041,9 +7071,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.95" +version = "0.3.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f2dfbb17949fa2088e5d39408c48368947b86f7834484e87b73de55bc14d97d" +checksum = "4b572dff8bcf38bad0fa19729c89bb5748b2b9b1d8be70cf90df697e3a8f32aa" dependencies = [ "js-sys", "wasm-bindgen", @@ -7561,9 +7591,9 @@ dependencies = [ [[package]] name = "zerofrom" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69faa1f2a1ea75661980b013019ed6687ed0e83d069bc1114e2cc74c6c04c4df" +checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272" dependencies = [ "zerofrom-derive", ] diff --git a/native/Cargo.toml b/native/Cargo.toml index 3d9f06686e..68b1310416 100644 --- a/native/Cargo.toml +++ b/native/Cargo.toml @@ -38,10 +38,10 @@ arrow = { version = "58.1.0", features = ["prettyprint", "ffi", "chrono-tz"] } async-trait = { version = "0.1" } bytes = { version = "1.11.1" } parquet = { version = "58.1.0", default-features = false, features = ["experimental"] } -datafusion = { git = "https://github.com/apache/datafusion.git", rev = "85e75e2", default-features = false, features = ["unicode_expressions", "crypto_expressions", "nested_expressions", "parquet"] } -datafusion-datasource = { git = "https://github.com/apache/datafusion.git", rev = "85e75e2" } -datafusion-physical-expr-adapter = { git = "https://github.com/apache/datafusion.git", rev = "85e75e2" } -datafusion-spark = { git = "https://github.com/apache/datafusion.git", rev = "85e75e2", features = ["core"] } +datafusion = { git = "https://github.com/apache/datafusion.git", branch = "branch-54", default-features = false, features = ["unicode_expressions", "crypto_expressions", "nested_expressions", "parquet"] } +datafusion-datasource = { git = "https://github.com/apache/datafusion.git", branch = "branch-54" } +datafusion-physical-expr-adapter = { git = "https://github.com/apache/datafusion.git", branch = "branch-54" } +datafusion-spark = { git = "https://github.com/apache/datafusion.git", branch = "branch-54", features = ["core"] } datafusion-comet-spark-expr = { path = "spark-expr" } datafusion-comet-common = { path = "common" } datafusion-comet-jni-bridge = { path = "jni-bridge" } diff --git a/native/core/Cargo.toml b/native/core/Cargo.toml index 26c665050c..9385ed80e5 100644 --- a/native/core/Cargo.toml +++ b/native/core/Cargo.toml @@ -91,7 +91,7 @@ jni = { version = "0.22.4", features = ["invocation"] } lazy_static = "1.4" assertables = "9" hex = "0.4.3" -datafusion-functions-nested = { git = "https://github.com/apache/datafusion.git", rev = "85e75e2" } +datafusion-functions-nested = { git = "https://github.com/apache/datafusion.git", branch = "branch-54" } [features] backtrace = ["datafusion/backtrace"] From bc96836e9703abd674fd03e29b9f4f0f26aa2478 Mon Sep 17 00:00:00 2001 From: comphead Date: Thu, 21 May 2026 12:35:52 -0700 Subject: [PATCH 22/30] chore: DF54 upgrade --- native/Cargo.lock | 642 +++++++++++++++------------------------------- native/Cargo.toml | 8 +- 2 files changed, 214 insertions(+), 436 deletions(-) diff --git a/native/Cargo.lock b/native/Cargo.lock index e40d810f29..8315ca5c5f 100644 --- a/native/Cargo.lock +++ b/native/Cargo.lock @@ -1860,8 +1860,8 @@ dependencies = [ [[package]] name = "datafusion" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "arrow-schema", @@ -1869,25 +1869,25 @@ dependencies = [ "chrono", "datafusion-catalog", "datafusion-catalog-listing", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", "datafusion-common-runtime", "datafusion-datasource", "datafusion-datasource-arrow", "datafusion-datasource-csv", "datafusion-datasource-json", "datafusion-datasource-parquet", - "datafusion-execution 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions-aggregate 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions-nested 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-execution", + "datafusion-expr", + "datafusion-expr-common", + "datafusion-functions", + "datafusion-functions-aggregate", + "datafusion-functions-nested", "datafusion-functions-table", "datafusion-functions-window", "datafusion-optimizer", - "datafusion-physical-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-physical-expr", "datafusion-physical-expr-adapter", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-physical-expr-common", "datafusion-physical-optimizer", "datafusion-physical-plan", "datafusion-session", @@ -1899,7 +1899,7 @@ dependencies = [ "object_store", "parking_lot", "parquet", - "sqlparser 0.62.0", + "sqlparser", "tempfile", "tokio", "url", @@ -1908,18 +1908,18 @@ dependencies = [ [[package]] name = "datafusion-catalog" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "async-trait", "dashmap", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", "datafusion-common-runtime", "datafusion-datasource", - "datafusion-execution 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-expr", "datafusion-physical-plan", "datafusion-session", "futures", @@ -1932,19 +1932,19 @@ dependencies = [ [[package]] name = "datafusion-catalog-listing" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "async-trait", "datafusion-catalog", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", "datafusion-datasource", - "datafusion-execution 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-expr", "datafusion-physical-expr-adapter", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-physical-expr-common", "datafusion-physical-plan", "futures", "itertools 0.14.0", @@ -1971,7 +1971,7 @@ dependencies = [ "datafusion-comet-shuffle", "datafusion-comet-spark-expr", "datafusion-datasource", - "datafusion-functions-nested 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", + "datafusion-functions-nested", "datafusion-physical-expr-adapter", "datafusion-spark", "futures", @@ -2127,29 +2127,8 @@ dependencies = [ [[package]] name = "datafusion-common" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" -dependencies = [ - "arrow", - "arrow-ipc", - "arrow-schema", - "chrono", - "foldhash 0.2.0", - "half", - "hashbrown 0.17.1", - "indexmap 2.14.0", - "itertools 0.14.0", - "libc", - "log", - "tokio", - "uuid", - "web-time", -] - -[[package]] -name = "datafusion-common" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "arrow-ipc", @@ -2165,7 +2144,7 @@ dependencies = [ "log", "object_store", "parquet", - "sqlparser 0.62.0", + "sqlparser", "tokio", "uuid", "web-time", @@ -2173,8 +2152,8 @@ dependencies = [ [[package]] name = "datafusion-common-runtime" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "futures", "log", @@ -2183,8 +2162,8 @@ dependencies = [ [[package]] name = "datafusion-datasource" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "async-compression", @@ -2192,13 +2171,13 @@ dependencies = [ "bytes", "bzip2", "chrono", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", "datafusion-common-runtime", - "datafusion-execution 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-expr", "datafusion-physical-expr-adapter", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-physical-expr-common", "datafusion-physical-plan", "datafusion-session", "flate2", @@ -2218,19 +2197,19 @@ dependencies = [ [[package]] name = "datafusion-datasource-arrow" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "arrow-ipc", "async-trait", "bytes", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", "datafusion-common-runtime", "datafusion-datasource", - "datafusion-execution 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-expr-common", "datafusion-physical-plan", "datafusion-session", "futures", @@ -2241,18 +2220,18 @@ dependencies = [ [[package]] name = "datafusion-datasource-csv" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "async-trait", "bytes", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", "datafusion-common-runtime", "datafusion-datasource", - "datafusion-execution 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-expr-common", "datafusion-physical-plan", "datafusion-session", "futures", @@ -2263,18 +2242,18 @@ dependencies = [ [[package]] name = "datafusion-datasource-json" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "async-trait", "bytes", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", "datafusion-common-runtime", "datafusion-datasource", - "datafusion-execution 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-expr-common", "datafusion-physical-plan", "datafusion-session", "futures", @@ -2285,22 +2264,22 @@ dependencies = [ [[package]] name = "datafusion-datasource-parquet" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "async-trait", "bytes", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", "datafusion-common-runtime", "datafusion-datasource", - "datafusion-execution 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions-aggregate-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-execution", + "datafusion-expr", + "datafusion-functions", + "datafusion-functions-aggregate-common", + "datafusion-physical-expr", "datafusion-physical-expr-adapter", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-physical-expr-common", "datafusion-physical-plan", "datafusion-pruning", "datafusion-session", @@ -2315,47 +2294,21 @@ dependencies = [ [[package]] name = "datafusion-doc" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" - -[[package]] -name = "datafusion-doc" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" - -[[package]] -name = "datafusion-execution" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" -dependencies = [ - "arrow", - "arrow-buffer", - "async-trait", - "dashmap", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "futures", - "log", - "object_store", - "parking_lot", - "rand 0.9.4", - "tempfile", - "url", -] +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" [[package]] name = "datafusion-execution" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "arrow-buffer", "async-trait", "dashmap", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", + "datafusion-expr", + "datafusion-physical-expr-common", "futures", "log", "object_store", @@ -2368,98 +2321,40 @@ dependencies = [ [[package]] name = "datafusion-expr" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "arrow-schema", "async-trait", "chrono", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-doc 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-functions-aggregate-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-functions-window-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", + "datafusion-common", + "datafusion-doc", + "datafusion-expr-common", + "datafusion-functions-aggregate-common", + "datafusion-functions-window-common", + "datafusion-physical-expr-common", "indexmap 2.14.0", "itertools 0.14.0", "serde_json", - "sqlparser 0.61.0", -] - -[[package]] -name = "datafusion-expr" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" -dependencies = [ - "arrow", - "arrow-schema", - "async-trait", - "chrono", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-doc 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions-aggregate-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions-window-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "indexmap 2.14.0", - "itertools 0.14.0", - "serde_json", - "sqlparser 0.62.0", + "sqlparser", ] [[package]] name = "datafusion-expr-common" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "indexmap 2.14.0", - "itertools 0.14.0", -] - -[[package]] -name = "datafusion-expr-common" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" -dependencies = [ - "arrow", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", "indexmap 2.14.0", "itertools 0.14.0", ] [[package]] name = "datafusion-functions" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" -dependencies = [ - "arrow", - "arrow-buffer", - "base64", - "chrono", - "chrono-tz", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-doc 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-execution 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-macros 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "hex", - "itertools 0.14.0", - "log", - "memchr", - "num-traits", - "rand 0.9.4", - "regex", - "uuid", -] - -[[package]] -name = "datafusion-functions" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "arrow-buffer", @@ -2468,13 +2363,13 @@ dependencies = [ "blake3", "chrono", "chrono-tz", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-doc 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-execution 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-macros 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", + "datafusion-doc", + "datafusion-execution", + "datafusion-expr", + "datafusion-expr-common", + "datafusion-macros", + "datafusion-physical-expr-common", "hex", "itertools 0.14.0", "log", @@ -2489,38 +2384,18 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-doc 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-execution 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-functions-aggregate-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-macros 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-physical-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "foldhash 0.2.0", - "half", - "log", - "num-traits", -] - -[[package]] -name = "datafusion-functions-aggregate" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" -dependencies = [ - "arrow", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-doc 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-execution 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions-aggregate-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-macros 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", + "datafusion-doc", + "datafusion-execution", + "datafusion-expr", + "datafusion-functions-aggregate-common", + "datafusion-macros", + "datafusion-physical-expr", + "datafusion-physical-expr-common", "foldhash 0.2.0", "half", "log", @@ -2529,67 +2404,32 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate-common" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", -] - -[[package]] -name = "datafusion-functions-aggregate-common" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" -dependencies = [ - "arrow", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", + "datafusion-expr-common", + "datafusion-physical-expr-common", ] [[package]] name = "datafusion-functions-nested" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "arrow-ord", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-doc 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-execution 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-functions 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-functions-aggregate 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-functions-aggregate-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-macros 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "hashbrown 0.17.1", - "itertools 0.14.0", - "itoa", - "log", - "memchr", -] - -[[package]] -name = "datafusion-functions-nested" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" -dependencies = [ - "arrow", - "arrow-ord", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-doc 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-execution 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions-aggregate 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions-aggregate-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-macros 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", + "datafusion-doc", + "datafusion-execution", + "datafusion-expr", + "datafusion-expr-common", + "datafusion-functions", + "datafusion-functions-aggregate", + "datafusion-functions-aggregate-common", + "datafusion-macros", + "datafusion-physical-expr-common", "hashbrown 0.17.1", "itertools 0.14.0", "itoa", @@ -2599,83 +2439,65 @@ dependencies = [ [[package]] name = "datafusion-functions-table" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "async-trait", "datafusion-catalog", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", + "datafusion-expr", + "datafusion-physical-expr", "datafusion-physical-plan", "parking_lot", ] [[package]] name = "datafusion-functions-window" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-doc 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions-window-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-macros 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", + "datafusion-doc", + "datafusion-expr", + "datafusion-functions-window-common", + "datafusion-macros", + "datafusion-physical-expr", + "datafusion-physical-expr-common", "log", ] [[package]] name = "datafusion-functions-window-common" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" -dependencies = [ - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", -] - -[[package]] -name = "datafusion-functions-window-common" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" -dependencies = [ - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", -] - -[[package]] -name = "datafusion-macros" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ - "datafusion-doc 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "quote", - "syn 2.0.117", + "datafusion-common", + "datafusion-physical-expr-common", ] [[package]] name = "datafusion-macros" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ - "datafusion-doc 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-doc", "quote", "syn 2.0.117", ] [[package]] name = "datafusion-optimizer" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "chrono", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", + "datafusion-expr", + "datafusion-expr-common", + "datafusion-physical-expr", "indexmap 2.14.0", "itertools 0.14.0", "log", @@ -2685,35 +2507,15 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-functions-aggregate-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "half", - "hashbrown 0.17.1", - "indexmap 2.14.0", - "itertools 0.14.0", - "parking_lot", - "petgraph", - "tokio", -] - -[[package]] -name = "datafusion-physical-expr" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" -dependencies = [ - "arrow", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions-aggregate-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", + "datafusion-expr", + "datafusion-expr-common", + "datafusion-functions-aggregate-common", + "datafusion-physical-expr-common", "half", "hashbrown 0.17.1", "indexmap 2.14.0", @@ -2725,42 +2527,27 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-adapter" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", + "datafusion-expr", + "datafusion-functions", + "datafusion-physical-expr", + "datafusion-physical-expr-common", "itertools 0.14.0", ] [[package]] name = "datafusion-physical-expr-common" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "chrono", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "hashbrown 0.17.1", - "indexmap 2.14.0", - "itertools 0.14.0", - "parking_lot", -] - -[[package]] -name = "datafusion-physical-expr-common" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" -dependencies = [ - "arrow", - "chrono", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", + "datafusion-expr-common", "hashbrown 0.17.1", "indexmap 2.14.0", "itertools 0.14.0", @@ -2770,16 +2557,16 @@ dependencies = [ [[package]] name = "datafusion-physical-optimizer" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-execution 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "datafusion-expr-common", + "datafusion-physical-expr", + "datafusion-physical-expr-common", "datafusion-physical-plan", "datafusion-pruning", "itertools 0.14.0", @@ -2787,8 +2574,8 @@ dependencies = [ [[package]] name = "datafusion-physical-plan" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "arrow-data", @@ -2796,15 +2583,15 @@ dependencies = [ "arrow-ord", "arrow-schema", "async-trait", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", "datafusion-common-runtime", - "datafusion-execution 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions-aggregate-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions-window-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-execution", + "datafusion-expr", + "datafusion-functions", + "datafusion-functions-aggregate-common", + "datafusion-functions-window-common", + "datafusion-physical-expr", + "datafusion-physical-expr-common", "futures", "half", "hashbrown 0.17.1", @@ -2819,36 +2606,36 @@ dependencies = [ [[package]] name = "datafusion-pruning" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", "datafusion-datasource", - "datafusion-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-expr-common", + "datafusion-physical-expr", + "datafusion-physical-expr-common", "datafusion-physical-plan", "log", ] [[package]] name = "datafusion-session" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "async-trait", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-execution 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", "datafusion-physical-plan", "parking_lot", ] [[package]] name = "datafusion-spark" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "bigdecimal", @@ -2856,13 +2643,13 @@ dependencies = [ "crc32fast", "datafusion", "datafusion-catalog", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-execution 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions-aggregate 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions-aggregate-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions-nested 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "datafusion-functions", + "datafusion-functions-aggregate", + "datafusion-functions-aggregate-common", + "datafusion-functions-nested", "log", "num-traits", "percent-encoding", @@ -2870,24 +2657,25 @@ dependencies = [ "serde_json", "sha1 0.11.0", "sha2 0.11.0", + "twox-hash", "url", ] [[package]] name = "datafusion-sql" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "bigdecimal", "chrono", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions-nested 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", + "datafusion-expr", + "datafusion-functions-nested", "indexmap 2.14.0", "log", "regex", - "sqlparser 0.62.0", + "sqlparser", ] [[package]] @@ -6466,16 +6254,6 @@ dependencies = [ "der", ] -[[package]] -name = "sqlparser" -version = "0.61.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf5ea8d4d7c808e1af1cbabebca9a2abe603bcefc22294c5b95018d53200cb7" -dependencies = [ - "log", - "sqlparser_derive", -] - [[package]] name = "sqlparser" version = "0.62.0" diff --git a/native/Cargo.toml b/native/Cargo.toml index 925c0d0866..741eca9956 100644 --- a/native/Cargo.toml +++ b/native/Cargo.toml @@ -38,10 +38,10 @@ arrow = { version = "58.3.0", features = ["prettyprint", "ffi", "chrono-tz"] } async-trait = { version = "0.1" } bytes = { version = "1.11.1" } parquet = { version = "58.3.0", default-features = false, features = ["experimental"] } -datafusion = { git = "https://github.com/apache/datafusion.git", rev = "c5a8ee1", default-features = false, features = ["unicode_expressions", "crypto_expressions", "nested_expressions", "parquet"] } -datafusion-datasource = { git = "https://github.com/apache/datafusion.git", rev = "c5a8ee1" } -datafusion-physical-expr-adapter = { git = "https://github.com/apache/datafusion.git", rev = "c5a8ee1" } -datafusion-spark = { git = "https://github.com/apache/datafusion.git", rev = "c5a8ee1", features = ["core"] } +datafusion = { git = "https://github.com/apache/datafusion.git", branch = "branch-54", default-features = false, features = ["unicode_expressions", "crypto_expressions", "nested_expressions", "parquet"] } +datafusion-datasource = { git = "https://github.com/apache/datafusion.git", branch = "branch-54" } +datafusion-physical-expr-adapter = { git = "https://github.com/apache/datafusion.git", branch = "branch-54" } +datafusion-spark = { git = "https://github.com/apache/datafusion.git", branch = "branch-54", features = ["core"] } datafusion-comet-spark-expr = { path = "spark-expr" } datafusion-comet-common = { path = "common" } datafusion-comet-jni-bridge = { path = "jni-bridge" } From 95930afdeebac9580d4630c3c141764c93c90e4c Mon Sep 17 00:00:00 2001 From: Oleks V Date: Thu, 21 May 2026 12:40:12 -0700 Subject: [PATCH 23/30] chore: datafusion 54 sync (#4391) --- native/Cargo.lock | 916 ++++++++++++++++------------------------- native/Cargo.toml | 8 +- native/core/Cargo.toml | 2 +- 3 files changed, 360 insertions(+), 566 deletions(-) diff --git a/native/Cargo.lock b/native/Cargo.lock index e40d810f29..a2182cfb7f 100644 --- a/native/Cargo.lock +++ b/native/Cargo.lock @@ -494,9 +494,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f9ee0f6e02ffd7ad5816e9464499fba7b3effd01123b515c41d1697c43dad1" +checksum = "e79b3f8a79cccc2898f31920fc69f304859b3bd567490f75ebf51ae1c792a9ac" dependencies = [ "compression-codecs", "compression-core", @@ -628,9 +628,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "aws-config" -version = "1.8.16" +version = "1.8.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f156acdd2cf55f5aa53ee416c4ac851cf1222694506c0b1f78c85695e9ca9d" +checksum = "517aa062d8bd9015ee23d6daa5e1c1372328412fdae4e6c4c1be9b69c6ad37a2" dependencies = [ "aws-credential-types", "aws-runtime", @@ -642,6 +642,7 @@ dependencies = [ "aws-smithy-json", "aws-smithy-runtime", "aws-smithy-runtime-api", + "aws-smithy-schema", "aws-smithy-types", "aws-types", "bytes", @@ -670,9 +671,9 @@ dependencies = [ [[package]] name = "aws-lc-rs" -version = "1.16.3" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ec6fb3fe69024a75fa7e1bfb48aa6cf59706a101658ea01bfd33b2b248a038f" +checksum = "5ec2f1fc3ec205783a5da9a7e6c1509cc69dedf09a1949e412c1e18469326d00" dependencies = [ "aws-lc-sys", "zeroize", @@ -680,9 +681,9 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.40.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f50037ee5e1e41e7b8f9d161680a725bd1626cb6f8c7e901f91f942850852fe7" +checksum = "1a2f9779ce85b93ab6170dd940ad0169b5766ff848247aff13bb788b832fe3f4" dependencies = [ "cc", "cmake", @@ -692,9 +693,9 @@ dependencies = [ [[package]] name = "aws-runtime" -version = "1.7.3" +version = "1.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dcd93c82209ac7413532388067dce79be5a8780c1786e5fae3df22e4dee2864" +checksum = "77ed8e8c52d2dc2390ad9f15647fe663f71e9780b4262c190fbb823a32721566" dependencies = [ "aws-credential-types", "aws-sigv4", @@ -717,9 +718,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.98.0" +version = "1.99.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d69c77aafa20460c68b6b3213c84f6423b6e76dbf89accd3e1789a686ffd9489" +checksum = "9f4055e6099b2ec264abdc0d9bbfffce306c1601809275c861594779a0b04b45" dependencies = [ "aws-credential-types", "aws-runtime", @@ -741,9 +742,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.100.0" +version = "1.101.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c7e7b09346d5ca22a2a08267555843a6a0127fb20d8964cb6ecfb8fdb190225" +checksum = "02f009ba0284c5d696425fd7b4dcc5b189f5726f4041b7a5794daecb3a68d598" dependencies = [ "aws-credential-types", "aws-runtime", @@ -765,9 +766,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.103.0" +version = "1.104.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2249b81a2e73a8027c41c378463a81ec39b8510f184f2caab87de912af0f49b" +checksum = "6aa6622798e19e6a76b690562085dd4771c736cd48343464a53ab4ae2f2c9f84" dependencies = [ "aws-credential-types", "aws-runtime", @@ -790,9 +791,9 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "1.4.3" +version = "1.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68dc0b907359b120170613b5c09ccc61304eac3998ff6274b97d93ee6490115a" +checksum = "b7083fb918b38474ac65ffbf8a69fc8792d36879f4ac5f1667b43aec61efe9a5" dependencies = [ "aws-credential-types", "aws-smithy-http", @@ -868,10 +869,12 @@ dependencies = [ [[package]] name = "aws-smithy-json" -version = "0.62.5" +version = "0.62.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9648b0bb82a2eedd844052c6ad2a1a822d1f8e3adee5fbf668366717e428856a" +checksum = "517089205f18ab4adc5a3e02888cb139bbbbb2e168eac9f396216925d1fbeaf5" dependencies = [ + "aws-smithy-runtime-api", + "aws-smithy-schema", "aws-smithy-types", ] @@ -896,15 +899,16 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.11.1" +version = "1.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0504b1ab12debb5959e5165ee5fe97dd387e7aa7ea6a477bfd7635dfe769a4f5" +checksum = "b8e6f5caf6fea86f8c2206541ab5857cfcda9013426cdbe8fa0098b9e2d32182" dependencies = [ "aws-smithy-async", "aws-smithy-http", "aws-smithy-http-client", "aws-smithy-observability", "aws-smithy-runtime-api", + "aws-smithy-schema", "aws-smithy-types", "bytes", "fastrand", @@ -921,9 +925,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime-api" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71a13df6ada0aafbf21a73bdfcdf9324cfa9df77d96b8446045be3cde61b42e" +checksum = "dc117c179ecf39a62a0a3f49f600e9ac26a7ad7dd172177999f83933af776c32" dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api-macros", @@ -948,11 +952,22 @@ dependencies = [ "syn 2.0.117", ] +[[package]] +name = "aws-smithy-schema" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7442cb268338f0eb8278140a107c046756aa01093d8ef5e99628d34ae09c94f5" +dependencies = [ + "aws-smithy-runtime-api", + "aws-smithy-types", + "http 1.4.0", +] + [[package]] name = "aws-smithy-types" -version = "1.4.7" +version = "1.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d73dbfbaa8e4bc57b9045137680b958d274823509a360abfd8e1d514d40c95c" +checksum = "056b66dbce2f81cc0c1e2b05bb402eb58f8a3530479d650efadd5bbae9a4050b" dependencies = [ "base64-simd", "bytes", @@ -982,13 +997,14 @@ dependencies = [ [[package]] name = "aws-types" -version = "1.3.15" +version = "1.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f4bbcaa9304ea40902d3d5f42a0428d1bd895a2b0f6999436fb279ffddc58ac" +checksum = "d16bf10b03a3c01e6b3b7d47cd964e873ffe9e7d4e80fad16bd4c077cb068531" dependencies = [ "aws-credential-types", "aws-smithy-async", "aws-smithy-runtime-api", + "aws-smithy-schema", "aws-smithy-types", "rustc_version", "tracing", @@ -1127,9 +1143,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.8.4" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d2d5991425dfd0785aed03aedcf0b321d61975c9b5b3689c774a2610ae0b51e" +checksum = "0aa83c34e62843d924f905e0f5c866eb1dd6545fc4d719e803d9ba6030371fce" dependencies = [ "arrayref", "arrayvec", @@ -1235,6 +1251,15 @@ dependencies = [ "alloc-stdlib", ] +[[package]] +name = "bs58" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" +dependencies = [ + "tinyvec", +] + [[package]] name = "bumpalo" version = "3.20.2" @@ -1295,9 +1320,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.60" +version = "1.2.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43c5703da9466b66a946814e1adf53ea2c90f10063b86290cc9eb67ce3478a20" +checksum = "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98" dependencies = [ "find-msvc-tools", "jobserver", @@ -1498,9 +1523,9 @@ dependencies = [ [[package]] name = "compression-codecs" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb7b51a7d9c967fc26773061ba86150f19c50c0d65c887cb1fbe295fd16619b7" +checksum = "ce2548391e9c1929c21bf6aa2680af86fe4c1b33e6cea9ac1cfeec0bd11218cf" dependencies = [ "bzip2", "compression-core", @@ -1513,9 +1538,9 @@ dependencies = [ [[package]] name = "compression-core" -version = "0.4.31" +version = "0.4.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75984efb6ed102a0d42db99afb6c1948f0380d1d91808d5529916e6c08b49d8d" +checksum = "cc14f565cf027a105f7a44ccf9e5b424348421a1d8952a8fc9d499d313107789" [[package]] name = "concurrent-queue" @@ -1713,9 +1738,9 @@ dependencies = [ [[package]] name = "crypto-common" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77727bb15fa921304124b128af125e7e3b968275d1b108b379190264f4423710" +checksum = "ce6e4c961d6cd6c9a86db418387425e8bdeaf05b3c8bc1411e6dca4c252f1453" dependencies = [ "hybrid-array", ] @@ -1846,9 +1871,9 @@ dependencies = [ [[package]] name = "dashmap" -version = "6.1.0" +version = "6.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" +checksum = "e6361d5c062261c78a176addb82d4c821ae42bed6089de0e12603cd25de2059c" dependencies = [ "cfg-if", "crossbeam-utils", @@ -1860,8 +1885,8 @@ dependencies = [ [[package]] name = "datafusion" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "arrow-schema", @@ -1869,25 +1894,25 @@ dependencies = [ "chrono", "datafusion-catalog", "datafusion-catalog-listing", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", "datafusion-common-runtime", "datafusion-datasource", "datafusion-datasource-arrow", "datafusion-datasource-csv", "datafusion-datasource-json", "datafusion-datasource-parquet", - "datafusion-execution 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions-aggregate 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions-nested 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-execution", + "datafusion-expr", + "datafusion-expr-common", + "datafusion-functions", + "datafusion-functions-aggregate", + "datafusion-functions-nested", "datafusion-functions-table", "datafusion-functions-window", "datafusion-optimizer", - "datafusion-physical-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-physical-expr", "datafusion-physical-expr-adapter", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-physical-expr-common", "datafusion-physical-optimizer", "datafusion-physical-plan", "datafusion-session", @@ -1899,7 +1924,7 @@ dependencies = [ "object_store", "parking_lot", "parquet", - "sqlparser 0.62.0", + "sqlparser", "tempfile", "tokio", "url", @@ -1908,18 +1933,18 @@ dependencies = [ [[package]] name = "datafusion-catalog" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "async-trait", "dashmap", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", "datafusion-common-runtime", "datafusion-datasource", - "datafusion-execution 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-expr", "datafusion-physical-plan", "datafusion-session", "futures", @@ -1932,19 +1957,19 @@ dependencies = [ [[package]] name = "datafusion-catalog-listing" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "async-trait", "datafusion-catalog", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", "datafusion-datasource", - "datafusion-execution 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-expr", "datafusion-physical-expr-adapter", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-physical-expr-common", "datafusion-physical-plan", "futures", "itertools 0.14.0", @@ -1971,7 +1996,7 @@ dependencies = [ "datafusion-comet-shuffle", "datafusion-comet-spark-expr", "datafusion-datasource", - "datafusion-functions-nested 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", + "datafusion-functions-nested", "datafusion-physical-expr-adapter", "datafusion-spark", "futures", @@ -2127,29 +2152,8 @@ dependencies = [ [[package]] name = "datafusion-common" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" -dependencies = [ - "arrow", - "arrow-ipc", - "arrow-schema", - "chrono", - "foldhash 0.2.0", - "half", - "hashbrown 0.17.1", - "indexmap 2.14.0", - "itertools 0.14.0", - "libc", - "log", - "tokio", - "uuid", - "web-time", -] - -[[package]] -name = "datafusion-common" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "arrow-ipc", @@ -2165,7 +2169,7 @@ dependencies = [ "log", "object_store", "parquet", - "sqlparser 0.62.0", + "sqlparser", "tokio", "uuid", "web-time", @@ -2173,8 +2177,8 @@ dependencies = [ [[package]] name = "datafusion-common-runtime" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "futures", "log", @@ -2183,8 +2187,8 @@ dependencies = [ [[package]] name = "datafusion-datasource" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "async-compression", @@ -2192,13 +2196,13 @@ dependencies = [ "bytes", "bzip2", "chrono", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", "datafusion-common-runtime", - "datafusion-execution 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-expr", "datafusion-physical-expr-adapter", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-physical-expr-common", "datafusion-physical-plan", "datafusion-session", "flate2", @@ -2218,19 +2222,19 @@ dependencies = [ [[package]] name = "datafusion-datasource-arrow" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "arrow-ipc", "async-trait", "bytes", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", "datafusion-common-runtime", "datafusion-datasource", - "datafusion-execution 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-expr-common", "datafusion-physical-plan", "datafusion-session", "futures", @@ -2241,18 +2245,18 @@ dependencies = [ [[package]] name = "datafusion-datasource-csv" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "async-trait", "bytes", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", "datafusion-common-runtime", "datafusion-datasource", - "datafusion-execution 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-expr-common", "datafusion-physical-plan", "datafusion-session", "futures", @@ -2263,18 +2267,18 @@ dependencies = [ [[package]] name = "datafusion-datasource-json" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "async-trait", "bytes", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", "datafusion-common-runtime", "datafusion-datasource", - "datafusion-execution 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-expr-common", "datafusion-physical-plan", "datafusion-session", "futures", @@ -2285,22 +2289,22 @@ dependencies = [ [[package]] name = "datafusion-datasource-parquet" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "async-trait", "bytes", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", "datafusion-common-runtime", "datafusion-datasource", - "datafusion-execution 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions-aggregate-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-execution", + "datafusion-expr", + "datafusion-functions", + "datafusion-functions-aggregate-common", + "datafusion-physical-expr", "datafusion-physical-expr-adapter", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-physical-expr-common", "datafusion-physical-plan", "datafusion-pruning", "datafusion-session", @@ -2315,47 +2319,21 @@ dependencies = [ [[package]] name = "datafusion-doc" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" - -[[package]] -name = "datafusion-doc" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" - -[[package]] -name = "datafusion-execution" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" -dependencies = [ - "arrow", - "arrow-buffer", - "async-trait", - "dashmap", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "futures", - "log", - "object_store", - "parking_lot", - "rand 0.9.4", - "tempfile", - "url", -] +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" [[package]] name = "datafusion-execution" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "arrow-buffer", "async-trait", "dashmap", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", + "datafusion-expr", + "datafusion-physical-expr-common", "futures", "log", "object_store", @@ -2368,98 +2346,40 @@ dependencies = [ [[package]] name = "datafusion-expr" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" -dependencies = [ - "arrow", - "arrow-schema", - "async-trait", - "chrono", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-doc 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-functions-aggregate-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-functions-window-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "indexmap 2.14.0", - "itertools 0.14.0", - "serde_json", - "sqlparser 0.61.0", -] - -[[package]] -name = "datafusion-expr" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "arrow-schema", "async-trait", "chrono", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-doc 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions-aggregate-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions-window-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", + "datafusion-doc", + "datafusion-expr-common", + "datafusion-functions-aggregate-common", + "datafusion-functions-window-common", + "datafusion-physical-expr-common", "indexmap 2.14.0", "itertools 0.14.0", "serde_json", - "sqlparser 0.62.0", -] - -[[package]] -name = "datafusion-expr-common" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" -dependencies = [ - "arrow", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "indexmap 2.14.0", - "itertools 0.14.0", + "sqlparser", ] [[package]] name = "datafusion-expr-common" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", "indexmap 2.14.0", "itertools 0.14.0", ] [[package]] name = "datafusion-functions" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" -dependencies = [ - "arrow", - "arrow-buffer", - "base64", - "chrono", - "chrono-tz", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-doc 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-execution 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-macros 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "hex", - "itertools 0.14.0", - "log", - "memchr", - "num-traits", - "rand 0.9.4", - "regex", - "uuid", -] - -[[package]] -name = "datafusion-functions" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "arrow-buffer", @@ -2468,13 +2388,13 @@ dependencies = [ "blake3", "chrono", "chrono-tz", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-doc 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-execution 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-macros 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", + "datafusion-doc", + "datafusion-execution", + "datafusion-expr", + "datafusion-expr-common", + "datafusion-macros", + "datafusion-physical-expr-common", "hex", "itertools 0.14.0", "log", @@ -2489,38 +2409,18 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-doc 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-execution 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-functions-aggregate-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-macros 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-physical-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "foldhash 0.2.0", - "half", - "log", - "num-traits", -] - -[[package]] -name = "datafusion-functions-aggregate" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" -dependencies = [ - "arrow", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-doc 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-execution 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions-aggregate-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-macros 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", + "datafusion-doc", + "datafusion-execution", + "datafusion-expr", + "datafusion-functions-aggregate-common", + "datafusion-macros", + "datafusion-physical-expr", + "datafusion-physical-expr-common", "foldhash 0.2.0", "half", "log", @@ -2529,67 +2429,32 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate-common" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" -dependencies = [ - "arrow", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", -] - -[[package]] -name = "datafusion-functions-aggregate-common" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" -dependencies = [ - "arrow", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", -] - -[[package]] -name = "datafusion-functions-nested" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", - "arrow-ord", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-doc 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-execution 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-functions 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-functions-aggregate 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-functions-aggregate-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-macros 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "hashbrown 0.17.1", - "itertools 0.14.0", - "itoa", - "log", - "memchr", + "datafusion-common", + "datafusion-expr-common", + "datafusion-physical-expr-common", ] [[package]] name = "datafusion-functions-nested" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "arrow-ord", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-doc 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-execution 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions-aggregate 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions-aggregate-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-macros 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", + "datafusion-doc", + "datafusion-execution", + "datafusion-expr", + "datafusion-expr-common", + "datafusion-functions", + "datafusion-functions-aggregate", + "datafusion-functions-aggregate-common", + "datafusion-macros", + "datafusion-physical-expr-common", "hashbrown 0.17.1", "itertools 0.14.0", "itoa", @@ -2599,83 +2464,65 @@ dependencies = [ [[package]] name = "datafusion-functions-table" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "async-trait", "datafusion-catalog", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", + "datafusion-expr", + "datafusion-physical-expr", "datafusion-physical-plan", "parking_lot", ] [[package]] name = "datafusion-functions-window" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-doc 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions-window-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-macros 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", + "datafusion-doc", + "datafusion-expr", + "datafusion-functions-window-common", + "datafusion-macros", + "datafusion-physical-expr", + "datafusion-physical-expr-common", "log", ] [[package]] name = "datafusion-functions-window-common" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" -dependencies = [ - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", -] - -[[package]] -name = "datafusion-functions-window-common" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", + "datafusion-physical-expr-common", ] [[package]] name = "datafusion-macros" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ - "datafusion-doc 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "quote", - "syn 2.0.117", -] - -[[package]] -name = "datafusion-macros" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" -dependencies = [ - "datafusion-doc 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-doc", "quote", "syn 2.0.117", ] [[package]] name = "datafusion-optimizer" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "chrono", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", + "datafusion-expr", + "datafusion-expr-common", + "datafusion-physical-expr", "indexmap 2.14.0", "itertools 0.14.0", "log", @@ -2685,35 +2532,15 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" -dependencies = [ - "arrow", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-functions-aggregate-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "half", - "hashbrown 0.17.1", - "indexmap 2.14.0", - "itertools 0.14.0", - "parking_lot", - "petgraph", - "tokio", -] - -[[package]] -name = "datafusion-physical-expr" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions-aggregate-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", + "datafusion-expr", + "datafusion-expr-common", + "datafusion-functions-aggregate-common", + "datafusion-physical-expr-common", "half", "hashbrown 0.17.1", "indexmap 2.14.0", @@ -2725,42 +2552,27 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-adapter" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", + "datafusion-expr", + "datafusion-functions", + "datafusion-physical-expr", + "datafusion-physical-expr-common", "itertools 0.14.0", ] [[package]] name = "datafusion-physical-expr-common" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=85e75e2#85e75e2a19d2039fa4fdb72252795b447aac6300" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "chrono", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "datafusion-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=85e75e2)", - "hashbrown 0.17.1", - "indexmap 2.14.0", - "itertools 0.14.0", - "parking_lot", -] - -[[package]] -name = "datafusion-physical-expr-common" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" -dependencies = [ - "arrow", - "chrono", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", + "datafusion-expr-common", "hashbrown 0.17.1", "indexmap 2.14.0", "itertools 0.14.0", @@ -2770,16 +2582,16 @@ dependencies = [ [[package]] name = "datafusion-physical-optimizer" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-execution 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "datafusion-expr-common", + "datafusion-physical-expr", + "datafusion-physical-expr-common", "datafusion-physical-plan", "datafusion-pruning", "itertools 0.14.0", @@ -2787,8 +2599,8 @@ dependencies = [ [[package]] name = "datafusion-physical-plan" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "arrow-data", @@ -2796,15 +2608,15 @@ dependencies = [ "arrow-ord", "arrow-schema", "async-trait", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", "datafusion-common-runtime", - "datafusion-execution 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions-aggregate-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions-window-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-execution", + "datafusion-expr", + "datafusion-functions", + "datafusion-functions-aggregate-common", + "datafusion-functions-window-common", + "datafusion-physical-expr", + "datafusion-physical-expr-common", "futures", "half", "hashbrown 0.17.1", @@ -2819,36 +2631,36 @@ dependencies = [ [[package]] name = "datafusion-pruning" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", "datafusion-datasource", - "datafusion-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-physical-expr-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-expr-common", + "datafusion-physical-expr", + "datafusion-physical-expr-common", "datafusion-physical-plan", "log", ] [[package]] name = "datafusion-session" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "async-trait", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-execution 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", "datafusion-physical-plan", "parking_lot", ] [[package]] name = "datafusion-spark" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "bigdecimal", @@ -2856,13 +2668,13 @@ dependencies = [ "crc32fast", "datafusion", "datafusion-catalog", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-execution 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions-aggregate 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions-aggregate-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions-nested 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "datafusion-functions", + "datafusion-functions-aggregate", + "datafusion-functions-aggregate-common", + "datafusion-functions-nested", "log", "num-traits", "percent-encoding", @@ -2870,24 +2682,25 @@ dependencies = [ "serde_json", "sha1 0.11.0", "sha2 0.11.0", + "twox-hash", "url", ] [[package]] name = "datafusion-sql" -version = "53.1.0" -source = "git+https://github.com/apache/datafusion.git?rev=c5a8ee1#c5a8ee12d51eaeea59e95ab4ebb32270e81c88ab" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#c8dddb8a03f098b92e0295118d12390381d23fa8" dependencies = [ "arrow", "bigdecimal", "chrono", - "datafusion-common 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-expr 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", - "datafusion-functions-nested 53.1.0 (git+https://github.com/apache/datafusion.git?rev=c5a8ee1)", + "datafusion-common", + "datafusion-expr", + "datafusion-functions-nested", "indexmap 2.14.0", "log", "regex", - "sqlparser 0.62.0", + "sqlparser", ] [[package]] @@ -2993,13 +2806,13 @@ dependencies = [ [[package]] name = "digest" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4850db49bf08e663084f7fb5c87d202ef91a3907271aff24a94eb97ff039153c" +checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2" dependencies = [ "block-buffer 0.12.0", "const-oid 0.10.2", - "crypto-common 0.2.1", + "crypto-common 0.2.2", "ctutils", ] @@ -3058,9 +2871,9 @@ checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" [[package]] name = "either" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" +checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e" [[package]] name = "equator" @@ -3444,9 +3257,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f44da3a8150a6703ed5d34e164b875fd14c2cdab9af1252a9a1020bde2bdc54" +checksum = "171fefbc92fe4a4de27e0698d6a5b392d6a0e333506bc49133760b3bcf948733" dependencies = [ "atomic-waker", "bytes", @@ -3562,7 +3375,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6303bc9732ae41b04cb554b844a762b4115a61bfaa81e3e83050991eeb56863f" dependencies = [ - "digest 0.11.2", + "digest 0.11.3", ] [[package]] @@ -3643,9 +3456,9 @@ checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424" [[package]] name = "hybrid-array" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3944cf8cf766b40e2a1a333ee5e9b563f854d5fa49d6a8ca2764e97c6eddb214" +checksum = "9155a582abd142abc056962c29e3ce5ff2ad5469f4246b537ed42c5deba857da" dependencies = [ "typenum", ] @@ -3916,9 +3729,9 @@ dependencies = [ [[package]] name = "idna_adapter" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" +checksum = "cb68373c0d6620ef8105e855e7745e18b0d00d3bdb07fb532e434244cdb9a714" dependencies = [ "icu_normalizer", "icu_properties", @@ -3996,16 +3809,6 @@ version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2" -[[package]] -name = "iri-string" -version = "0.7.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25e659a4bb38e810ebc252e53b5814ff908a8c58c2a9ce2fae1bbec24cbf4e20" -dependencies = [ - "memchr", - "serde", -] - [[package]] name = "is-terminal" version = "0.4.17" @@ -4187,9 +3990,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.95" +version = "0.3.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2964e92d1d9dc3364cae4d718d93f227e3abb088e747d92e0395bfdedf1c12ca" +checksum = "67df7112613f8bfd9150013a0314e196f4800d3201ae742489d999db2f979f08" dependencies = [ "cfg-if", "futures-util", @@ -4301,15 +4104,15 @@ dependencies = [ [[package]] name = "libbz2-rs-sys" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a6a8c165077efc8f3a971534c50ea6a1a18b329ef4a66e897a7e3a1494565f" +checksum = "34b357333733e8260735ba5894eb928c02ecc69c78715f01a8019e7fa7f2db4c" [[package]] name = "libc" -version = "0.2.185" +version = "0.2.186" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f" +checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" [[package]] name = "libloading" @@ -4349,9 +4152,9 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" [[package]] name = "libmimalloc-sys" -version = "0.1.47" +version = "0.1.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d1eacfa31c33ec25e873c136ba5669f00f9866d0688bea7be4d3f7e43067df6" +checksum = "2892ae4ea6fa2cb7acb0e236a6880d39523239cd9089de71d220910ccc806790" dependencies = [ "cc", ] @@ -4436,9 +4239,9 @@ checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" [[package]] name = "lz4_flex" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db9a0d582c2874f68138a16ce1867e0ffde6c0bb0a0df85e1f36d04146db488a" +checksum = "7ef0d4ed8669f8f8826eb00dc878084aa8f253506c4fd5e8f58f5bce72ddb97e" dependencies = [ "twox-hash", ] @@ -4460,7 +4263,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69b6441f590336821bb897fb28fc622898ccceb1d6cea3fde5ea86b090c4de98" dependencies = [ "cfg-if", - "digest 0.11.2", + "digest 0.11.3", ] [[package]] @@ -4489,9 +4292,9 @@ dependencies = [ [[package]] name = "mimalloc" -version = "0.1.50" +version = "0.1.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3627c4272df786b9260cabaa46aec1d59c93ede723d4c3ef646c503816b0640" +checksum = "ebca48a43116bc25f18a61360f1be98412f50cc218f5e52c823086b999a4a21a" dependencies = [ "libmimalloc-sys", ] @@ -4634,9 +4437,9 @@ dependencies = [ [[package]] name = "num-conv" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6673768db2d862beb9b39a78fdcb1a69439615d5794a1be50caa9bc92c81967" +checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441" [[package]] name = "num-format" @@ -4721,7 +4524,7 @@ dependencies = [ "md-5 0.10.6", "parking_lot", "percent-encoding", - "quick-xml 0.39.2", + "quick-xml 0.39.4", "rand 0.10.1", "reqwest 0.12.28", "ring", @@ -4842,7 +4645,7 @@ dependencies = [ "percent-encoding", "quick-xml 0.38.4", "reqsign-core", - "reqwest 0.13.2", + "reqwest 0.13.3", "serde", "serde_json", "tokio", @@ -5144,18 +4947,18 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.11" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1749c7ed4bcaf4c3d0a3efc28538844fb29bcdd7d2b67b2be7e20ba861ff517" +checksum = "2466b2336ed02bcdca6b294417127b90ec92038d1d5c4fbeac971a922e0e0924" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.11" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b20ed30f105399776b9c883e68e536ef602a16ae6f596d2c473591d6ad64c6" +checksum = "c96395f0a926bc13b1c17622aaddda1ecb55d49c8f1bf9777e4d877800a43f8b" dependencies = [ "proc-macro2", "quote", @@ -5475,9 +5278,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.39.2" +version = "0.39.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958f21e8e7ceb5a1aa7fa87fab28e7c75976e0bfe7e23ff069e0a260f894067d" +checksum = "cdcc8dd4e2f670d309a5f0e83fe36dfdc05af317008fea29144da1a2ac858e5e" dependencies = [ "memchr", "serde", @@ -5819,9 +5622,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3f43e3283ab1488b624b44b0e988d0acea0b3214e694730a055cb6b2efa801" +checksum = "62e0021ea2c22aed41653bc7e1419abb2c97e038ff2c33d0e1309e49a97deec0" dependencies = [ "base64", "bytes", @@ -5880,9 +5683,9 @@ dependencies = [ [[package]] name = "roaring" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ba9ce64a8f45d7fc86358410bb1a82e8c987504c0d4900e9141d69a9f26c885" +checksum = "1dedc5658c6ecb3bdb5ef5f3295bb9253f42dcf3fd1402c03f6b1f7659c3c4a9" dependencies = [ "bytemuck", "byteorder", @@ -5974,9 +5777,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.39" +version = "0.23.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2c118cb077cca2822033836dfb1b975355dfb784b5e8da48f7b6c5db74e60e" +checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b" dependencies = [ "aws-lc-rs", "once_cell", @@ -6001,9 +5804,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.14.0" +version = "1.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd" +checksum = "30a7197ae7eb376e574fe940d068c30fe0462554a3ddbe4eca7838e049c937a9" dependencies = [ "web-time", "zeroize", @@ -6011,13 +5814,13 @@ dependencies = [ [[package]] name = "rustls-platform-verifier" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d99feebc72bae7ab76ba994bb5e121b8d83d910ca40b36e0921f53becc41784" +checksum = "26d1e2536ce4f35f4846aa13bff16bd0ff40157cdb14cc056c7b14ba41233ba0" dependencies = [ "core-foundation", "core-foundation-sys", - "jni 0.21.1", + "jni 0.22.4", "log", "once_cell", "rustls", @@ -6261,11 +6064,12 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.18.0" +version = "3.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd5414fad8e6907dbdd5bc441a50ae8d6e26151a03b1de04d89a5576de61d01f" +checksum = "e72c1c2cb7b223fafb600a619537a871c2818583d619401b785e7c0b746ccde2" dependencies = [ "base64", + "bs58", "chrono", "hex", "indexmap 1.9.3", @@ -6280,9 +6084,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.18.0" +version = "3.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3db8978e608f1fe7357e211969fd9abdcae80bac1ba7a3369bb7eb6b404eb65" +checksum = "b90c488738ecb4fb0262f41f43bc40efc5868d9fb744319ddf5f5317f417bfac" dependencies = [ "darling 0.23.0", "proc-macro2", @@ -6322,7 +6126,7 @@ checksum = "aacc4cc499359472b4abe1bf11d0b12e688af9a805fa5e3016f9a386dc2d0214" dependencies = [ "cfg-if", "cpufeatures 0.3.0", - "digest 0.11.2", + "digest 0.11.3", ] [[package]] @@ -6344,7 +6148,7 @@ checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4" dependencies = [ "cfg-if", "cpufeatures 0.3.0", - "digest 0.11.2", + "digest 0.11.3", ] [[package]] @@ -6409,9 +6213,9 @@ dependencies = [ [[package]] name = "siphasher" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e" +checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649" [[package]] name = "slab" @@ -6466,16 +6270,6 @@ dependencies = [ "der", ] -[[package]] -name = "sqlparser" -version = "0.61.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf5ea8d4d7c808e1af1cbabebca9a2abe603bcefc22294c5b95018d53200cb7" -dependencies = [ - "log", - "sqlparser_derive", -] - [[package]] name = "sqlparser" version = "0.62.0" @@ -6505,9 +6299,9 @@ checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" [[package]] name = "str_stack" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091b6114800a5f2141aee1d1b9d6ca3592ac062dc5decb3764ec5895a47b4eb" +checksum = "7f446288b699d66d0fd2e30d1cfe7869194312524b3b9252594868ed26ef056a" [[package]] name = "strsim" @@ -6795,9 +6589,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.52.1" +version = "1.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67dee974fe86fd92cc45b7a95fdd2f99a36a6d7b0d431a231178d3d670bbcc6" +checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe" dependencies = [ "bytes", "libc", @@ -6873,20 +6667,20 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.6.8" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" +checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840" dependencies = [ "bitflags 2.11.1", "bytes", "futures-util", "http 1.4.0", "http-body 1.0.1", - "iri-string", "pin-project-lite", "tower", "tower-layer", "tower-service", + "url", ] [[package]] @@ -6990,9 +6784,9 @@ checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de" [[package]] name = "typetag" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be2212c8a9b9bcfca32024de14998494cf9a5dfa59ea1b829de98bac374b86bf" +checksum = "c5a897b12c6c1151ad0b138b8db50252dc301f93bc3b027db05eec82aeed298c" dependencies = [ "erased-serde", "inventory", @@ -7003,9 +6797,9 @@ dependencies = [ [[package]] name = "typetag-impl" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27a7a9b72ba121f6f1f6c3632b85604cac41aedb5ddc70accbebb6cac83de846" +checksum = "cf808357c6ed7e13ba0f3277ec8d8f21b2d501274895104263985330c726c1c5" dependencies = [ "proc-macro2", "quote", @@ -7172,9 +6966,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.118" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf938a0bacb0469e83c1e148908bd7d5a6010354cf4fb73279b7447422e3a89" +checksum = "49ace1d07c165b0864824eee619580c4689389afa9dc9ed3a4c75040d82e6790" dependencies = [ "cfg-if", "once_cell", @@ -7185,9 +6979,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.68" +version = "0.4.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f371d383f2fb139252e0bfac3b81b265689bf45b6874af544ffa4c975ac1ebf8" +checksum = "96492d0d3ffba25305a7dc88720d250b1401d7edca02cc3bcd50633b424673b8" dependencies = [ "js-sys", "wasm-bindgen", @@ -7195,9 +6989,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.118" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeff24f84126c0ec2db7a449f0c2ec963c6a49efe0698c4242929da037ca28ed" +checksum = "8e68e6f4afd367a562002c05637acb8578ff2dea1943df76afb9e83d177c8578" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7205,9 +6999,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.118" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d08065faf983b2b80a79fd87d8254c409281cf7de75fc4b773019824196c904" +checksum = "d95a9ec35c64b2a7cb35d3fead40c4238d0940c86d107136999567a4703259f2" dependencies = [ "bumpalo", "proc-macro2", @@ -7218,9 +7012,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.118" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd04d9e306f1907bd13c6361b5c6bfc7b3b3c095ed3f8a9246390f8dbdee129" +checksum = "c4e0100b01e9f0d03189a92b96772a1fb998639d981193d7dbab487302513441" dependencies = [ "unicode-ident", ] @@ -7287,9 +7081,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.95" +version = "0.3.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f2dfbb17949fa2088e5d39408c48368947b86f7834484e87b73de55bc14d97d" +checksum = "4b572dff8bcf38bad0fa19729c89bb5748b2b9b1d8be70cf90df697e3a8f32aa" dependencies = [ "js-sys", "wasm-bindgen", @@ -7807,9 +7601,9 @@ dependencies = [ [[package]] name = "zerofrom" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69faa1f2a1ea75661980b013019ed6687ed0e83d069bc1114e2cc74c6c04c4df" +checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272" dependencies = [ "zerofrom-derive", ] diff --git a/native/Cargo.toml b/native/Cargo.toml index 925c0d0866..741eca9956 100644 --- a/native/Cargo.toml +++ b/native/Cargo.toml @@ -38,10 +38,10 @@ arrow = { version = "58.3.0", features = ["prettyprint", "ffi", "chrono-tz"] } async-trait = { version = "0.1" } bytes = { version = "1.11.1" } parquet = { version = "58.3.0", default-features = false, features = ["experimental"] } -datafusion = { git = "https://github.com/apache/datafusion.git", rev = "c5a8ee1", default-features = false, features = ["unicode_expressions", "crypto_expressions", "nested_expressions", "parquet"] } -datafusion-datasource = { git = "https://github.com/apache/datafusion.git", rev = "c5a8ee1" } -datafusion-physical-expr-adapter = { git = "https://github.com/apache/datafusion.git", rev = "c5a8ee1" } -datafusion-spark = { git = "https://github.com/apache/datafusion.git", rev = "c5a8ee1", features = ["core"] } +datafusion = { git = "https://github.com/apache/datafusion.git", branch = "branch-54", default-features = false, features = ["unicode_expressions", "crypto_expressions", "nested_expressions", "parquet"] } +datafusion-datasource = { git = "https://github.com/apache/datafusion.git", branch = "branch-54" } +datafusion-physical-expr-adapter = { git = "https://github.com/apache/datafusion.git", branch = "branch-54" } +datafusion-spark = { git = "https://github.com/apache/datafusion.git", branch = "branch-54", features = ["core"] } datafusion-comet-spark-expr = { path = "spark-expr" } datafusion-comet-common = { path = "common" } datafusion-comet-jni-bridge = { path = "jni-bridge" } diff --git a/native/core/Cargo.toml b/native/core/Cargo.toml index c273522974..963cad445d 100644 --- a/native/core/Cargo.toml +++ b/native/core/Cargo.toml @@ -91,7 +91,7 @@ jni = { version = "0.22.4", features = ["invocation"] } lazy_static = "1.4" assertables = "9" hex = "0.4.3" -datafusion-functions-nested = { git = "https://github.com/apache/datafusion.git", rev = "85e75e2" } +datafusion-functions-nested = { git = "https://github.com/apache/datafusion.git", branch = "branch-54" } [features] backtrace = ["datafusion/backtrace"] From 687c5a0fad769460240949feb14fd5d41a629993 Mon Sep 17 00:00:00 2001 From: Matt Butrovich Date: Thu, 28 May 2026 09:14:28 -0400 Subject: [PATCH 24/30] Re-run cargo update. --- native/Cargo.lock | 628 ++++++++++++++++++++++------------------------ 1 file changed, 307 insertions(+), 321 deletions(-) diff --git a/native/Cargo.lock b/native/Cargo.lock index a02b95819c..7d97c4ec8c 100644 --- a/native/Cargo.lock +++ b/native/Cargo.lock @@ -276,7 +276,7 @@ dependencies = [ "chrono", "chrono-tz", "half", - "hashbrown 0.17.0", + "hashbrown 0.17.1", "num-complex", "num-integer", "num-traits", @@ -357,6 +357,7 @@ dependencies = [ "arrow-select", "flatbuffers", "lz4_flex", + "zstd", ] [[package]] @@ -493,9 +494,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f9ee0f6e02ffd7ad5816e9464499fba7b3effd01123b515c41d1697c43dad1" +checksum = "e79b3f8a79cccc2898f31920fc69f304859b3bd567490f75ebf51ae1c792a9ac" dependencies = [ "compression-codecs", "compression-core", @@ -621,9 +622,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" +checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" [[package]] name = "aws-config" @@ -647,8 +648,8 @@ dependencies = [ "bytes", "fastrand", "hex", - "http 1.4.0", - "sha1", + "http 1.4.1", + "sha1 0.10.6", "time", "tokio", "tracing", @@ -670,9 +671,9 @@ dependencies = [ [[package]] name = "aws-lc-rs" -version = "1.16.3" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ec6fb3fe69024a75fa7e1bfb48aa6cf59706a101658ea01bfd33b2b248a038f" +checksum = "5ec2f1fc3ec205783a5da9a7e6c1509cc69dedf09a1949e412c1e18469326d00" dependencies = [ "aws-lc-sys", "untrusted 0.7.1", @@ -681,9 +682,9 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.40.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f50037ee5e1e41e7b8f9d161680a725bd1626cb6f8c7e901f91f942850852fe7" +checksum = "1a2f9779ce85b93ab6170dd940ad0169b5766ff848247aff13bb788b832fe3f4" dependencies = [ "cc", "cmake", @@ -708,7 +709,7 @@ dependencies = [ "bytes", "bytes-utils", "fastrand", - "http 1.4.0", + "http 1.4.1", "http-body 1.0.1", "percent-encoding", "pin-project-lite", @@ -735,7 +736,7 @@ dependencies = [ "bytes", "fastrand", "http 0.2.12", - "http 1.4.0", + "http 1.4.1", "regex-lite", "tracing", ] @@ -759,7 +760,7 @@ dependencies = [ "bytes", "fastrand", "http 0.2.12", - "http 1.4.0", + "http 1.4.1", "regex-lite", "tracing", ] @@ -784,7 +785,7 @@ dependencies = [ "aws-types", "fastrand", "http 0.2.12", - "http 1.4.0", + "http 1.4.1", "regex-lite", "tracing", ] @@ -804,7 +805,7 @@ dependencies = [ "hex", "hmac 0.13.0", "http 0.2.12", - "http 1.4.0", + "http 1.4.1", "percent-encoding", "sha2 0.11.0", "time", @@ -834,7 +835,7 @@ dependencies = [ "bytes-utils", "futures-core", "futures-util", - "http 1.4.0", + "http 1.4.1", "http-body 1.0.1", "http-body-util", "percent-encoding", @@ -853,7 +854,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "h2", - "http 1.4.0", + "http 1.4.1", "hyper", "hyper-rustls", "hyper-util", @@ -913,7 +914,7 @@ dependencies = [ "bytes", "fastrand", "http 0.2.12", - "http 1.4.0", + "http 1.4.1", "http-body 0.4.6", "http-body 1.0.1", "http-body-util", @@ -934,7 +935,7 @@ dependencies = [ "aws-smithy-types", "bytes", "http 0.2.12", - "http 1.4.0", + "http 1.4.1", "pin-project-lite", "tokio", "tracing", @@ -960,7 +961,7 @@ checksum = "7442cb268338f0eb8278140a107c046756aa01093d8ef5e99628d34ae09c94f5" dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", - "http 1.4.0", + "http 1.4.1", ] [[package]] @@ -973,7 +974,7 @@ dependencies = [ "bytes", "bytes-utils", "http 0.2.12", - "http 1.4.0", + "http 1.4.1", "http-body 0.4.6", "http-body 1.0.1", "http-body-util", @@ -1143,9 +1144,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.8.4" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d2d5991425dfd0785aed03aedcf0b321d61975c9b5b3689c774a2610ae0b51e" +checksum = "0aa83c34e62843d924f905e0f5c866eb1dd6545fc4d719e803d9ba6030371fce" dependencies = [ "arrayref", "arrayvec", @@ -1232,9 +1233,9 @@ dependencies = [ [[package]] name = "brotli" -version = "8.0.2" +version = "8.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bd8b9603c7aa97359dbd97ecf258968c95f3adddd6db2f7e7a5bef101c84560" +checksum = "8119e4516436f5708bbc474a9d395bf12f1b5395e93a92a56e647ac3388c8610" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -1243,19 +1244,28 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "5.0.0" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03" +checksum = "5962523e1b92ce1b5e793d9169b9943eece10d39f62550bc04bb605d75b94924" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", ] +[[package]] +name = "bs58" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" +dependencies = [ + "tinyvec", +] + [[package]] name = "bumpalo" -version = "3.20.2" +version = "3.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb" +checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" [[package]] name = "bytemuck" @@ -1514,9 +1524,9 @@ dependencies = [ [[package]] name = "compression-codecs" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb7b51a7d9c967fc26773061ba86150f19c50c0d65c887cb1fbe295fd16619b7" +checksum = "ce2548391e9c1929c21bf6aa2680af86fe4c1b33e6cea9ac1cfeec0bd11218cf" dependencies = [ "bzip2", "compression-core", @@ -1529,9 +1539,9 @@ dependencies = [ [[package]] name = "compression-core" -version = "0.4.31" +version = "0.4.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75984efb6ed102a0d42db99afb6c1948f0380d1d91808d5529916e6c08b49d8d" +checksum = "cc14f565cf027a105f7a44ccf9e5b424348421a1d8952a8fc9d499d313107789" [[package]] name = "concurrent-queue" @@ -1598,9 +1608,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpp_demangle" -version = "0.5.1" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0667304c32ea56cb4cd6d2d7c0cfe9a2f8041229db8c033af7f8d69492429def" +checksum = "f2bb79cb74d735044c972aae58ed0aaa9a837e85b01106a54c39e42e97f62253" dependencies = [ "cfg-if", ] @@ -1729,9 +1739,9 @@ dependencies = [ [[package]] name = "crypto-common" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77727bb15fa921304124b128af125e7e3b968275d1b108b379190264f4423710" +checksum = "ce6e4c961d6cd6c9a86db418387425e8bdeaf05b3c8bc1411e6dca4c252f1453" dependencies = [ "hybrid-array", ] @@ -1862,9 +1872,9 @@ dependencies = [ [[package]] name = "dashmap" -version = "6.1.0" +version = "6.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" +checksum = "e6361d5c062261c78a176addb82d4c821ae42bed6089de0e12603cd25de2059c" dependencies = [ "cfg-if", "crossbeam-utils", @@ -1876,14 +1886,12 @@ dependencies = [ [[package]] name = "datafusion" -version = "53.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93db0e623840612f7f2cd757f7e8a8922064192363732c88692e0870016e141b" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" dependencies = [ "arrow", "arrow-schema", "async-trait", - "bytes", "chrono", "datafusion-catalog", "datafusion-catalog-listing", @@ -1911,13 +1919,12 @@ dependencies = [ "datafusion-session", "datafusion-sql", "futures", + "indexmap 2.14.0", "itertools 0.14.0", "log", "object_store", "parking_lot", "parquet", - "rand 0.9.4", - "regex", "sqlparser", "tempfile", "tokio", @@ -1927,9 +1934,8 @@ dependencies = [ [[package]] name = "datafusion-catalog" -version = "53.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37cefde60b26a7f4ff61e9d2ff2833322f91df2b568d7238afe67bde5bdffb66" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" dependencies = [ "arrow", "async-trait", @@ -1952,9 +1958,8 @@ dependencies = [ [[package]] name = "datafusion-catalog-listing" -version = "53.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17e112307715d6a7a331111a4c2330ff54bc237183511c319e3708a4cff431fb" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" dependencies = [ "arrow", "async-trait", @@ -2149,16 +2154,16 @@ dependencies = [ [[package]] name = "datafusion-common" -version = "53.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d72a11ca44a95e1081870d3abb80c717496e8a7acb467a1d3e932bb636af5cc2" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" dependencies = [ - "ahash", "arrow", "arrow-ipc", + "arrow-schema", "chrono", + "foldhash 0.2.0", "half", - "hashbrown 0.16.1", + "hashbrown 0.17.1", "hex", "indexmap 2.14.0", "itertools 0.14.0", @@ -2166,17 +2171,16 @@ dependencies = [ "log", "object_store", "parquet", - "paste", "sqlparser", "tokio", + "uuid", "web-time", ] [[package]] name = "datafusion-common-runtime" -version = "53.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89f4afaed29670ec4fd6053643adc749fe3f4bc9d1ce1b8c5679b22c67d12def" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" dependencies = [ "futures", "log", @@ -2185,9 +2189,8 @@ dependencies = [ [[package]] name = "datafusion-datasource" -version = "53.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9fb386e1691355355a96419978a0022b7947b44d4a24a6ea99f00b6b485cbb6" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" dependencies = [ "arrow", "async-compression", @@ -2211,6 +2214,7 @@ dependencies = [ "liblzma", "log", "object_store", + "parking_lot", "rand 0.9.4", "tokio", "tokio-util", @@ -2220,9 +2224,8 @@ dependencies = [ [[package]] name = "datafusion-datasource-arrow" -version = "53.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffa6c52cfed0734c5f93754d1c0175f558175248bf686c944fb05c373e5fc096" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" dependencies = [ "arrow", "arrow-ipc", @@ -2244,9 +2247,8 @@ dependencies = [ [[package]] name = "datafusion-datasource-csv" -version = "53.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "503f29e0582c1fc189578d665ff57d9300da1f80c282777d7eb67bb79fb8cdca" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" dependencies = [ "arrow", "async-trait", @@ -2267,9 +2269,8 @@ dependencies = [ [[package]] name = "datafusion-datasource-json" -version = "53.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33804749abc8d0c8cb7473228483cb8070e524c6f6086ee1b85a64debe2b3d2" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" dependencies = [ "arrow", "async-trait", @@ -2284,16 +2285,14 @@ dependencies = [ "datafusion-session", "futures", "object_store", - "serde_json", "tokio", "tokio-stream", ] [[package]] name = "datafusion-datasource-parquet" -version = "53.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a8e0365e0e08e8ff94d912f0ababcf9065a1a304018ba90b1fc83c855b4997" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" dependencies = [ "arrow", "async-trait", @@ -2303,6 +2302,7 @@ dependencies = [ "datafusion-datasource", "datafusion-execution", "datafusion-expr", + "datafusion-functions", "datafusion-functions-aggregate-common", "datafusion-physical-expr", "datafusion-physical-expr-adapter", @@ -2321,20 +2321,17 @@ dependencies = [ [[package]] name = "datafusion-doc" -version = "53.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de6ac0df1662b9148ad3c987978b32cbec7c772f199b1d53520c8fa764a87ee" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" [[package]] name = "datafusion-execution" -version = "53.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03c7fbdaefcca4ef6ffe425a5fc2325763bfb426599bb0bf4536466efabe709" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" dependencies = [ "arrow", "arrow-buffer", "async-trait", - "chrono", "dashmap", "datafusion-common", "datafusion-expr", @@ -2351,11 +2348,11 @@ dependencies = [ [[package]] name = "datafusion-expr" -version = "53.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "574b9b6977fedbd2a611cbff12e5caf90f31640ad9dc5870f152836d94bad0dd" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" dependencies = [ "arrow", + "arrow-schema", "async-trait", "chrono", "datafusion-common", @@ -2366,29 +2363,25 @@ dependencies = [ "datafusion-physical-expr-common", "indexmap 2.14.0", "itertools 0.14.0", - "paste", "serde_json", "sqlparser", ] [[package]] name = "datafusion-expr-common" -version = "53.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d7c3adf3db8bf61e92eb90cb659c8e8b734593a8f7c8e12a843c7ddba24b87e" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" dependencies = [ "arrow", "datafusion-common", "indexmap 2.14.0", "itertools 0.14.0", - "paste", ] [[package]] name = "datafusion-functions" -version = "53.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28aa4e10384e782774b10e72aca4d93ef7b31aa653095d9d4536b0a3dbc51b6" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" dependencies = [ "arrow", "arrow-buffer", @@ -2403,26 +2396,24 @@ dependencies = [ "datafusion-expr", "datafusion-expr-common", "datafusion-macros", + "datafusion-physical-expr-common", "hex", "itertools 0.14.0", "log", - "md-5", + "md-5 0.11.0", "memchr", "num-traits", "rand 0.9.4", "regex", - "sha2 0.10.9", - "unicode-segmentation", + "sha2 0.11.0", "uuid", ] [[package]] name = "datafusion-functions-aggregate" -version = "53.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00aa6217e56098ba84e0a338176fe52f0a84cca398021512c6c8c5eff806d0ad" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" dependencies = [ - "ahash", "arrow", "datafusion-common", "datafusion-doc", @@ -2432,19 +2423,17 @@ dependencies = [ "datafusion-macros", "datafusion-physical-expr", "datafusion-physical-expr-common", + "foldhash 0.2.0", "half", "log", "num-traits", - "paste", ] [[package]] name = "datafusion-functions-aggregate-common" -version = "53.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b511250349407db7c43832ab2de63f5557b19a20dfd236b39ca2c04468b50d47" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" dependencies = [ - "ahash", "arrow", "datafusion-common", "datafusion-expr-common", @@ -2453,9 +2442,8 @@ dependencies = [ [[package]] name = "datafusion-functions-nested" -version = "53.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef13a858e20d50f0a9bb5e96e7ac82b4e7597f247515bccca4fdd2992df0212a" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" dependencies = [ "arrow", "arrow-ord", @@ -2469,34 +2457,32 @@ dependencies = [ "datafusion-functions-aggregate-common", "datafusion-macros", "datafusion-physical-expr-common", - "hashbrown 0.16.1", + "hashbrown 0.17.1", "itertools 0.14.0", "itoa", "log", - "paste", + "memchr", ] [[package]] name = "datafusion-functions-table" -version = "53.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b40d3f5bbb3905f9ccb1ce9485a9595c77b69758a7c24d3ba79e334ff51e7e" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" dependencies = [ "arrow", "async-trait", "datafusion-catalog", "datafusion-common", "datafusion-expr", + "datafusion-physical-expr", "datafusion-physical-plan", "parking_lot", - "paste", ] [[package]] name = "datafusion-functions-window" -version = "53.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4e88ec9d57c9b685d02f58bfee7be62d72610430ddcedb82a08e5d9925dbfb6" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" dependencies = [ "arrow", "datafusion-common", @@ -2507,14 +2493,12 @@ dependencies = [ "datafusion-physical-expr", "datafusion-physical-expr-common", "log", - "paste", ] [[package]] name = "datafusion-functions-window-common" -version = "53.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8307bb93519b1a91913723a1130cfafeee3f72200d870d88e91a6fc5470ede5c" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" dependencies = [ "datafusion-common", "datafusion-physical-expr-common", @@ -2522,9 +2506,8 @@ dependencies = [ [[package]] name = "datafusion-macros" -version = "53.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e367e6a71051d0ebdd29b2f85d12059b38b1d1f172c6906e80016da662226bd" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" dependencies = [ "datafusion-doc", "quote", @@ -2533,9 +2516,8 @@ dependencies = [ [[package]] name = "datafusion-optimizer" -version = "53.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e929015451a67f77d9d8b727b2bf3a40c4445fdef6cdc53281d7d97c76888ace" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" dependencies = [ "arrow", "chrono", @@ -2552,11 +2534,9 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" -version = "53.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b1e68aba7a4b350401cfdf25a3d6f989ad898a7410164afe9ca52080244cb59" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" dependencies = [ - "ahash", "arrow", "datafusion-common", "datafusion-expr", @@ -2564,20 +2544,18 @@ dependencies = [ "datafusion-functions-aggregate-common", "datafusion-physical-expr-common", "half", - "hashbrown 0.16.1", + "hashbrown 0.17.1", "indexmap 2.14.0", "itertools 0.14.0", "parking_lot", - "paste", "petgraph", "tokio", ] [[package]] name = "datafusion-physical-expr-adapter" -version = "53.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea22315f33cf2e0adc104e8ec42e285f6ed93998d565c65e82fec6a9ee9f9db4" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" dependencies = [ "arrow", "datafusion-common", @@ -2590,26 +2568,24 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-common" -version = "53.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b04b45ea8ad3ac2d78f2ea2a76053e06591c9629c7a603eda16c10649ecf4362" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" dependencies = [ - "ahash", "arrow", "chrono", "datafusion-common", "datafusion-expr-common", - "hashbrown 0.16.1", + "hashbrown 0.17.1", "indexmap 2.14.0", "itertools 0.14.0", "parking_lot", + "pin-project", ] [[package]] name = "datafusion-physical-optimizer" -version = "53.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cb13397809a425918f608dfe8653f332015a3e330004ab191b4404187238b95" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" dependencies = [ "arrow", "datafusion-common", @@ -2625,12 +2601,12 @@ dependencies = [ [[package]] name = "datafusion-physical-plan" -version = "53.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5edc023675791af9d5fb4cc4c24abf5f7bd3bd4dcf9e5bd90ea1eff6976dcc79" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" dependencies = [ - "ahash", "arrow", + "arrow-data", + "arrow-ipc", "arrow-ord", "arrow-schema", "async-trait", @@ -2645,7 +2621,7 @@ dependencies = [ "datafusion-physical-expr-common", "futures", "half", - "hashbrown 0.16.1", + "hashbrown 0.17.1", "indexmap 2.14.0", "itertools 0.14.0", "log", @@ -2657,9 +2633,8 @@ dependencies = [ [[package]] name = "datafusion-pruning" -version = "53.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac8c76860e355616555081cab5968cec1af7a80701ff374510860bcd567e365a" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" dependencies = [ "arrow", "datafusion-common", @@ -2668,15 +2643,13 @@ dependencies = [ "datafusion-physical-expr", "datafusion-physical-expr-common", "datafusion-physical-plan", - "itertools 0.14.0", "log", ] [[package]] name = "datafusion-session" -version = "53.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5412111aa48e2424ba926112e192f7a6b7e4ccb450145d25ce5ede9f19dc491e" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" dependencies = [ "async-trait", "datafusion-common", @@ -2688,9 +2661,8 @@ dependencies = [ [[package]] name = "datafusion-spark" -version = "53.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e059dcf8544da0d6598d0235be3cc29c209094a5976b2e4822e4a2cf91c2b5c5" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" dependencies = [ "arrow", "bigdecimal", @@ -2703,21 +2675,23 @@ dependencies = [ "datafusion-expr", "datafusion-functions", "datafusion-functions-aggregate", + "datafusion-functions-aggregate-common", "datafusion-functions-nested", "log", + "num-traits", "percent-encoding", "rand 0.9.4", "serde_json", - "sha1", - "sha2 0.10.9", + "sha1 0.11.0", + "sha2 0.11.0", + "twox-hash", "url", ] [[package]] name = "datafusion-sql" -version = "53.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0d133ddf8b9b3b872acac900157f783e7b879fe9a6bccf389abebbfac45ec1" +version = "54.0.0" +source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" dependencies = [ "arrow", "bigdecimal", @@ -2834,21 +2808,21 @@ dependencies = [ [[package]] name = "digest" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4850db49bf08e663084f7fb5c87d202ef91a3907271aff24a94eb97ff039153c" +checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2" dependencies = [ "block-buffer 0.12.0", "const-oid 0.10.2", - "crypto-common 0.2.1", + "crypto-common 0.2.2", "ctutils", ] [[package]] name = "displaydoc" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f" dependencies = [ "proc-macro2", "quote", @@ -2899,9 +2873,9 @@ checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" [[package]] name = "either" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" +checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e" [[package]] name = "equator" @@ -3285,16 +3259,16 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f44da3a8150a6703ed5d34e164b875fd14c2cdab9af1252a9a1020bde2bdc54" +checksum = "171fefbc92fe4a4de27e0698d6a5b392d6a0e333506bc49133760b3bcf948733" dependencies = [ "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "http 1.4.0", + "http 1.4.1", "indexmap 2.14.0", "slab", "tokio", @@ -3337,21 +3311,15 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.16.1" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" +checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" dependencies = [ "allocator-api2", "equivalent", "foldhash 0.2.0", ] -[[package]] -name = "hashbrown" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51" - [[package]] name = "hdfs-sys" version = "0.3.0" @@ -3409,7 +3377,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6303bc9732ae41b04cb554b844a762b4115a61bfaa81e3e83050991eeb56863f" dependencies = [ - "digest 0.11.2", + "digest 0.11.3", ] [[package]] @@ -3434,9 +3402,9 @@ dependencies = [ [[package]] name = "http" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" +checksum = "8be7462df143984c4598a256ef469b251d7d7f9e271135073e78fc535414f3d0" dependencies = [ "bytes", "itoa", @@ -3460,7 +3428,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.4.0", + "http 1.4.1", ] [[package]] @@ -3471,7 +3439,7 @@ checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" dependencies = [ "bytes", "futures-core", - "http 1.4.0", + "http 1.4.1", "http-body 1.0.1", "pin-project-lite", ] @@ -3490,25 +3458,25 @@ checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424" [[package]] name = "hybrid-array" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3944cf8cf766b40e2a1a333ee5e9b563f854d5fa49d6a8ca2764e97c6eddb214" +checksum = "9155a582abd142abc056962c29e3ce5ff2ad5469f4246b537ed42c5deba857da" dependencies = [ "typenum", ] [[package]] name = "hyper" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6299f016b246a94207e63da54dbe807655bf9e00044f73ded42c3ac5305fbcca" +checksum = "eb92f162bf56536459fc83c79b974bb12837acfed43d6bc370a7916d0ae15ecc" dependencies = [ "atomic-waker", "bytes", "futures-channel", "futures-core", "h2", - "http 1.4.0", + "http 1.4.1", "http-body 1.0.1", "httparse", "itoa", @@ -3524,7 +3492,7 @@ version = "0.27.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ca68d021ef39cf6463ab54c1d0f5daf03377b70561305bb89a8f83aab66e0f" dependencies = [ - "http 1.4.0", + "http 1.4.1", "hyper", "hyper-util", "rustls", @@ -3544,7 +3512,7 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "http 1.4.0", + "http 1.4.1", "http-body 1.0.1", "hyper", "ipnet", @@ -3762,9 +3730,9 @@ dependencies = [ [[package]] name = "idna_adapter" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" +checksum = "cb68373c0d6620ef8105e855e7745e18b0d00d3bdb07fb532e434244cdb9a714" dependencies = [ "icu_normalizer", "icu_properties", @@ -3788,7 +3756,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" dependencies = [ "equivalent", - "hashbrown 0.17.0", + "hashbrown 0.17.1", "serde", "serde_core", ] @@ -3842,16 +3810,6 @@ version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2" -[[package]] -name = "iri-string" -version = "0.7.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25e659a4bb38e810ebc252e53b5814ff908a8c58c2a9ce2fae1bbec24cbf4e20" -dependencies = [ - "memchr", - "serde", -] - [[package]] name = "is-terminal" version = "0.4.17" @@ -3904,9 +3862,9 @@ dependencies = [ [[package]] name = "jiff" -version = "0.2.23" +version = "0.2.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a3546dc96b6d42c5f24902af9e2538e82e39ad350b0c766eb3fbf2d8f3d8359" +checksum = "392c70591e8749fe235ddaf513e6f58b26bce3dcc16524cecc8936f75afa161e" dependencies = [ "jiff-static", "jiff-tzdb-platform", @@ -3916,14 +3874,14 @@ dependencies = [ "portable-atomic-util", "serde_core", "wasm-bindgen", - "windows-sys 0.61.2", + "windows-link", ] [[package]] name = "jiff-static" -version = "0.2.23" +version = "0.2.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a8c8b344124222efd714b73bb41f8b5120b27a7cc1c75593a6ff768d9d05aa4" +checksum = "47b605b0c050d845fc355bb11eb3f9a8deddc218ea60c76e61aa1f2adfb2c96a" dependencies = [ "proc-macro2", "quote", @@ -4033,9 +3991,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.95" +version = "0.3.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2964e92d1d9dc3364cae4d718d93f227e3abb088e747d92e0395bfdedf1c12ca" +checksum = "142bc4740e452c1e57ade0cbc129f139c9093e354346f0872ef985f4f5cf5f11" dependencies = [ "cfg-if", "futures-util", @@ -4150,9 +4108,9 @@ dependencies = [ [[package]] name = "libbz2-rs-sys" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a6a8c165077efc8f3a971534c50ea6a1a18b329ef4a66e897a7e3a1494565f" +checksum = "34b357333733e8260735ba5894eb928c02ecc69c78715f01a8019e7fa7f2db4c" [[package]] name = "libc" @@ -4198,9 +4156,9 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" [[package]] name = "libmimalloc-sys" -version = "0.1.48" +version = "0.1.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2892ae4ea6fa2cb7acb0e236a6880d39523239cd9089de71d220910ccc806790" +checksum = "6a45a52f43e1c16f667ccfe4dd8c85b7f7c204fd5e3bf46c5b0db9a5c3c0b8e9" dependencies = [ "cc", ] @@ -4234,9 +4192,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.29" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" +checksum = "616ec5685824bcc94416c6d4a7a446eea774a31efd7062c8480ba6fd06d7a6e5" dependencies = [ "serde_core", "value-bag", @@ -4302,20 +4260,30 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "md-5" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69b6441f590336821bb897fb28fc622898ccceb1d6cea3fde5ea86b090c4de98" +dependencies = [ + "cfg-if", + "digest 0.11.3", +] + [[package]] name = "mea" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6747f54621d156e1b47eb6b25f39a941b9fc347f98f67d25d8881ff99e8ed832" +checksum = "2640d335e7273dacdcf51044026139b2e269c3bb0dfc3f8cb3496b85e3f6a42c" dependencies = [ "slab", ] [[package]] name = "memchr" -version = "2.8.0" +version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" +checksum = "6b947ae49db0d222b1dbc6b113ce7248a3fc3a6ca21b696717bfc000ba4484d8" [[package]] name = "memmap2" @@ -4328,9 +4296,9 @@ dependencies = [ [[package]] name = "mimalloc" -version = "0.1.51" +version = "0.1.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebca48a43116bc25f18a61360f1be98412f50cc218f5e52c823086b999a4a21a" +checksum = "2d4139bb28d14ad1facf21d5eb8825051b326e172d216b39f6d31df53cc97862" dependencies = [ "libmimalloc-sys", ] @@ -4473,9 +4441,9 @@ dependencies = [ [[package]] name = "num-conv" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6673768db2d862beb9b39a78fdcb1a69439615d5794a1be50caa9bc92c81967" +checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441" [[package]] name = "num-format" @@ -4551,16 +4519,16 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "http 1.4.0", + "http 1.4.1", "http-body-util", "httparse", "humantime", "hyper", "itertools 0.14.0", - "md-5", + "md-5 0.10.6", "parking_lot", "percent-encoding", - "quick-xml 0.39.2", + "quick-xml 0.39.4", "rand 0.10.1", "reqwest 0.12.28", "ring", @@ -4648,16 +4616,16 @@ dependencies = [ "base64", "bytes", "futures", - "http 1.4.0", + "http 1.4.1", "http-body 1.0.1", "jiff", "log", - "md-5", + "md-5 0.10.6", "mea", "percent-encoding", "quick-xml 0.38.4", "reqsign-core", - "reqwest 0.13.2", + "reqwest 0.13.4", "serde", "serde_json", "tokio", @@ -4673,7 +4641,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "048b1b29c503263bdd80a9afe46a68cd02ea9bd361185b1feab4b151078998e9" dependencies = [ "futures", - "http 1.4.0", + "http 1.4.1", "mea", "opendal-core", ] @@ -4716,7 +4684,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f9884c2d8cf8ba2bb077d79c877dac5863ba3bab9e2c9c1e41a2e0491404772" dependencies = [ "bytes", - "http 1.4.0", + "http 1.4.1", "log", "opendal-core", "opendal-service-azure-common", @@ -4734,7 +4702,7 @@ version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffb0e45d6c8dcf66ce2da20e241bcb80e6e540e109a4ff20f318f6c9b4c54e0c" dependencies = [ - "http 1.4.0", + "http 1.4.1", "opendal-core", ] @@ -4760,7 +4728,7 @@ checksum = "70a49477a10163431896d106136117f5670717f9c9e49cf6f710528800c6633a" dependencies = [ "async-trait", "bytes", - "http 1.4.0", + "http 1.4.1", "log", "opendal-core", "percent-encoding", @@ -4795,7 +4763,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29c8a917829ad06d21b639558532cb0101fe49b040d946d673a73018683fac05" dependencies = [ "bytes", - "http 1.4.0", + "http 1.4.1", "log", "opendal-core", "quick-xml 0.38.4", @@ -4814,9 +4782,9 @@ dependencies = [ "base64", "bytes", "crc32c", - "http 1.4.0", + "http 1.4.1", "log", - "md-5", + "md-5 0.10.6", "opendal-core", "quick-xml 0.38.4", "reqsign-aws-v4", @@ -4915,7 +4883,7 @@ dependencies = [ "flate2", "futures", "half", - "hashbrown 0.17.0", + "hashbrown 0.17.1", "lz4_flex", "num-bigint", "num-integer", @@ -5061,18 +5029,18 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.11" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1749c7ed4bcaf4c3d0a3efc28538844fb29bcdd7d2b67b2be7e20ba861ff517" +checksum = "2466b2336ed02bcdca6b294417127b90ec92038d1d5c4fbeac971a922e0e0924" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.11" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b20ed30f105399776b9c883e68e536ef602a16ae6f596d2c473591d6ad64c6" +checksum = "c96395f0a926bc13b1c17622aaddda1ecb55d49c8f1bf9777e4d877800a43f8b" dependencies = [ "proc-macro2", "quote", @@ -5382,9 +5350,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.39.2" +version = "0.39.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958f21e8e7ceb5a1aa7fa87fab28e7c75976e0bfe7e23ff069e0a260f894067d" +checksum = "cdcc8dd4e2f670d309a5f0e83fe36dfdc05af317008fea29144da1a2ac858e5e" dependencies = [ "memchr", "serde", @@ -5634,7 +5602,7 @@ checksum = "57ac2757f3140aa2e213b554148ae0b52733e624fc6723f0cc6bb3d440176c95" dependencies = [ "anyhow", "form_urlencoded", - "http 1.4.0", + "http 1.4.1", "log", "percent-encoding", "reqsign-core", @@ -5652,16 +5620,16 @@ dependencies = [ "anyhow", "bytes", "form_urlencoded", - "http 1.4.0", + "http 1.4.1", "log", "percent-encoding", - "quick-xml 0.39.2", + "quick-xml 0.39.4", "reqsign-core", "rust-ini", "serde", "serde_json", "serde_urlencoded", - "sha1", + "sha1 0.10.6", ] [[package]] @@ -5674,7 +5642,7 @@ dependencies = [ "base64", "bytes", "form_urlencoded", - "http 1.4.0", + "http 1.4.1", "jsonwebtoken", "log", "pem", @@ -5683,7 +5651,7 @@ dependencies = [ "rsa", "serde", "serde_json", - "sha1", + "sha1 0.10.6", ] [[package]] @@ -5699,11 +5667,11 @@ dependencies = [ "futures", "hex", "hmac 0.12.1", - "http 1.4.0", + "http 1.4.1", "jiff", "log", "percent-encoding", - "sha1", + "sha1 0.10.6", "sha2 0.10.9", "windows-sys 0.61.2", ] @@ -5726,7 +5694,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35cc609b49c69e76ecaceb775a03f792d1ed3e7755ab3548d4534fd801e3242e" dependencies = [ "form_urlencoded", - "http 1.4.0", + "http 1.4.1", "jsonwebtoken", "log", "percent-encoding", @@ -5750,7 +5718,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http 1.4.0", + "http 1.4.1", "http-body 1.0.1", "http-body-util", "hyper", @@ -5783,15 +5751,15 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.13.2" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3f43e3283ab1488b624b44b0e988d0acea0b3214e694730a055cb6b2efa801" +checksum = "219c5811de6525e5416c7d5d53bb656d3afdbc6c5af816e0802bcfa42dbdc1c3" dependencies = [ "base64", "bytes", "futures-core", "futures-util", - "http 1.4.0", + "http 1.4.1", "http-body 1.0.1", "http-body-util", "hyper", @@ -5844,9 +5812,9 @@ dependencies = [ [[package]] name = "roaring" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ba9ce64a8f45d7fc86358410bb1a82e8c987504c0d4900e9141d69a9f26c885" +checksum = "1dedc5658c6ecb3bdb5ef5f3295bb9253f42dcf3fd1402c03f6b1f7659c3c4a9" dependencies = [ "bytemuck", "byteorder", @@ -5938,9 +5906,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.38" +version = "0.23.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f9466fb2c14ea04357e91413efb882e2a6d4a406e625449bc0a5d360d53a21" +checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b" dependencies = [ "aws-lc-rs", "once_cell", @@ -5965,9 +5933,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.14.0" +version = "1.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd" +checksum = "30a7197ae7eb376e574fe940d068c30fe0462554a3ddbe4eca7838e049c937a9" dependencies = [ "web-time", "zeroize", @@ -5975,13 +5943,13 @@ dependencies = [ [[package]] name = "rustls-platform-verifier" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d99feebc72bae7ab76ba994bb5e121b8d83d910ca40b36e0921f53becc41784" +checksum = "26d1e2536ce4f35f4846aa13bff16bd0ff40157cdb14cc056c7b14ba41233ba0" dependencies = [ "core-foundation", "core-foundation-sys", - "jni 0.21.1", + "jni 0.22.4", "log", "once_cell", "rustls", @@ -6002,9 +5970,9 @@ checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" [[package]] name = "rustls-webpki" -version = "0.103.12" +version = "0.103.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8279bb85272c9f10811ae6a6c547ff594d6a7f3c6c6b02ee9726d1d0dcfcdd06" +checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e" dependencies = [ "aws-lc-rs", "ring", @@ -6225,11 +6193,12 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.18.0" +version = "3.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd5414fad8e6907dbdd5bc441a50ae8d6e26151a03b1de04d89a5576de61d01f" +checksum = "e72c1c2cb7b223fafb600a619537a871c2818583d619401b785e7c0b746ccde2" dependencies = [ "base64", + "bs58", "chrono", "hex", "indexmap 1.9.3", @@ -6244,9 +6213,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.18.0" +version = "3.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3db8978e608f1fe7357e211969fd9abdcae80bac1ba7a3369bb7eb6b404eb65" +checksum = "b90c488738ecb4fb0262f41f43bc40efc5868d9fb744319ddf5f5317f417bfac" dependencies = [ "darling 0.23.0", "proc-macro2", @@ -6278,6 +6247,17 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "sha1" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aacc4cc499359472b4abe1bf11d0b12e688af9a805fa5e3016f9a386dc2d0214" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.0", + "digest 0.11.3", +] + [[package]] name = "sha2" version = "0.10.9" @@ -6297,7 +6277,7 @@ checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4" dependencies = [ "cfg-if", "cpufeatures 0.3.0", - "digest 0.11.2", + "digest 0.11.3", ] [[package]] @@ -6362,9 +6342,9 @@ dependencies = [ [[package]] name = "siphasher" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e" +checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649" [[package]] name = "slab" @@ -6421,9 +6401,9 @@ dependencies = [ [[package]] name = "sqlparser" -version = "0.61.0" +version = "0.62.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf5ea8d4d7c808e1af1cbabebca9a2abe603bcefc22294c5b95018d53200cb7" +checksum = "13c6d1b651dc4edf07eead2a0c6c78016ce971bc2c10da5266861b13f25e7cec" dependencies = [ "log", "sqlparser_derive", @@ -6448,9 +6428,9 @@ checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" [[package]] name = "str_stack" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091b6114800a5f2141aee1d1b9d6ca3592ac062dc5decb3764ec5895a47b4eb" +checksum = "7f446288b699d66d0fd2e30d1cfe7869194312524b3b9252594868ed26ef056a" [[package]] name = "strsim" @@ -6487,9 +6467,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "symbolic-common" -version = "12.18.1" +version = "12.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f3cdeaae6779ecba2567f20bf7716718b8c4ce6717c9def4ced18786bb11ea" +checksum = "332615d90111d8eeaf86a84dc9bbe9f65d0d8c5cf11b4caccedc37754eb0dcfd" dependencies = [ "debugid", "memmap2", @@ -6499,9 +6479,9 @@ dependencies = [ [[package]] name = "symbolic-demangle" -version = "12.18.1" +version = "12.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "672c6ad9cb8fce6a1283cc9df9070073cccad00ae241b80e3686328a64e3523b" +checksum = "912017718eb4d21930546245af9a3475c9dccf15675a5c215664e76621afc471" dependencies = [ "cpp_demangle", "rustc-demangle", @@ -6816,20 +6796,20 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.6.8" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" +checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840" dependencies = [ "bitflags 2.11.1", "bytes", "futures-util", - "http 1.4.0", + "http 1.4.1", "http-body 1.0.1", - "iri-string", "pin-project-lite", "tower", "tower-layer", "tower-service", + "url", ] [[package]] @@ -6927,15 +6907,15 @@ dependencies = [ [[package]] name = "typenum" -version = "1.19.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" +checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de" [[package]] name = "typetag" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be2212c8a9b9bcfca32024de14998494cf9a5dfa59ea1b829de98bac374b86bf" +checksum = "c5a897b12c6c1151ad0b138b8db50252dc301f93bc3b027db05eec82aeed298c" dependencies = [ "erased-serde", "inventory", @@ -6946,9 +6926,9 @@ dependencies = [ [[package]] name = "typetag-impl" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27a7a9b72ba121f6f1f6c3632b85604cac41aedb5ddc70accbebb6cac83de846" +checksum = "cf808357c6ed7e13ba0f3277ec8d8f21b2d501274895104263985330c726c1c5" dependencies = [ "proc-macro2", "quote", @@ -7103,11 +7083,11 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasip2" -version = "1.0.2+wasi-0.2.9" +version = "1.0.3+wasi-0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" +checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6" dependencies = [ - "wit-bindgen", + "wit-bindgen 0.57.1", ] [[package]] @@ -7116,14 +7096,14 @@ version = "0.4.0+wasi-0.3.0-rc-2026-01-06" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" dependencies = [ - "wit-bindgen", + "wit-bindgen 0.51.0", ] [[package]] name = "wasm-bindgen" -version = "0.2.118" +version = "0.2.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf938a0bacb0469e83c1e148908bd7d5a6010354cf4fb73279b7447422e3a89" +checksum = "3ed04576f974d2b2fba0f38c51dbc5518011e38c36bf1143164be765528fd409" dependencies = [ "cfg-if", "once_cell", @@ -7134,9 +7114,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.68" +version = "0.4.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f371d383f2fb139252e0bfac3b81b265689bf45b6874af544ffa4c975ac1ebf8" +checksum = "9473dbd2991ae90b6291c3c32c30c6187ac49aa32f9905d1cce280ec1e110b0f" dependencies = [ "js-sys", "wasm-bindgen", @@ -7144,9 +7124,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.118" +version = "0.2.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeff24f84126c0ec2db7a449f0c2ec963c6a49efe0698c4242929da037ca28ed" +checksum = "916151b09da36bd82f6615cbf3a419e2f0ba23a03c6160e8e92eb6bd4aa1dec6" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7154,9 +7134,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.118" +version = "0.2.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d08065faf983b2b80a79fd87d8254c409281cf7de75fc4b773019824196c904" +checksum = "299047362ccbfce148b67ab7e73349f77748e00c8296f9542adfad2ad82c5c5e" dependencies = [ "bumpalo", "proc-macro2", @@ -7167,9 +7147,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.118" +version = "0.2.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd04d9e306f1907bd13c6361b5c6bfc7b3b3c095ed3f8a9246390f8dbdee129" +checksum = "9a929b2c61f11ba3e9bc35b50c1f25cb38e0e892c0c231ae2b8cf78d5dad4437" dependencies = [ "unicode-ident", ] @@ -7236,9 +7216,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.95" +version = "0.3.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f2dfbb17949fa2088e5d39408c48368947b86f7834484e87b73de55bc14d97d" +checksum = "6d621441cfc37b84979402712047321980c178f299193a3589d05b99e8763436" dependencies = [ "js-sys", "wasm-bindgen", @@ -7605,6 +7585,12 @@ dependencies = [ "wit-bindgen-rust-macro", ] +[[package]] +name = "wit-bindgen" +version = "0.57.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" + [[package]] name = "wit-bindgen-core" version = "0.51.0" @@ -7731,18 +7717,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.48" +version = "0.8.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9" +checksum = "bce33a6288fa3f072a8c2c7d0f2fdbb90e28298f0135c1f99b96c3db2efcc60b" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.48" +version = "0.8.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4" +checksum = "8fd425244944f4ab65ccff928e7323354c5a018c75838362fdce749dfad2ee1e" dependencies = [ "proc-macro2", "quote", @@ -7751,9 +7737,9 @@ dependencies = [ [[package]] name = "zerofrom" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69faa1f2a1ea75661980b013019ed6687ed0e83d069bc1114e2cc74c6c04c4df" +checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272" dependencies = [ "zerofrom-derive", ] From edef4d46fdb3488fc08b03e9c9ea621b1f5b72e9 Mon Sep 17 00:00:00 2001 From: Oleks V Date: Thu, 28 May 2026 08:42:32 -0700 Subject: [PATCH 25/30] feat: [datafusion-54] fix `weekday` (#4495) --- .../org/apache/comet/serde/datetime.scala | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/spark/src/main/scala/org/apache/comet/serde/datetime.scala b/spark/src/main/scala/org/apache/comet/serde/datetime.scala index e2995274ad..a3b1f9c1df 100644 --- a/spark/src/main/scala/org/apache/comet/serde/datetime.scala +++ b/spark/src/main/scala/org/apache/comet/serde/datetime.scala @@ -44,7 +44,8 @@ private object CometGetDateField extends Enumeration { // 2 = Monday, ..., 7 = Saturday). val DayOfWeek: Value = Value("dow") val DayOfYear: Value = Value("doy") - val WeekDay: Value = Value("isodow") // day of the week where Monday is 0 + // Datafusion `isodow` is 1..=7 with Monday=1; Spark `WeekDay` is 0..=6 with Monday=0. + val WeekDay: Value = Value("isodow") val WeekOfYear: Value = Value("week") val Quarter: Value = Value("quarter") } @@ -144,7 +145,26 @@ object CometWeekDay extends CometExpressionSerde[WeekDay] with CometExprGetDateF expr: WeekDay, inputs: Seq[Attribute], binding: Boolean): Option[ExprOuterClass.Expr] = { - getDateField(expr, CometGetDateField.WeekDay, inputs, binding) + // Datafusion `isodow` is 1..=7 with Monday=1, but Spark `WeekDay` is 0..=6 with Monday=0, + // so subtract 1 from the result of datepart(isodow, ...). + // TODO: fix upstream to avoid substraction + val optExpr = getDateField(expr, CometGetDateField.WeekDay, inputs, binding) + .zip(exprToProtoInternal(Literal(1), inputs, binding)) + .map { case (left, right) => + Expr + .newBuilder() + .setSubtract( + ExprOuterClass.MathExpr + .newBuilder() + .setLeft(left) + .setRight(right) + .setEvalMode(ExprOuterClass.EvalMode.LEGACY) + .setReturnType(serializeDataType(IntegerType).get) + .build()) + .build() + } + .headOption + optExprWithInfo(optExpr, expr, expr.child) } } From 3c097f1f1ffc51128b8483ba3335c88b5ff181b2 Mon Sep 17 00:00:00 2001 From: comphead Date: Thu, 28 May 2026 09:47:15 -0700 Subject: [PATCH 26/30] fallback on pow --- .../apache/comet/serde/QueryPlanSerde.scala | 2 +- .../org/apache/comet/serde/datetime.scala | 1 + .../scala/org/apache/comet/serde/math.scala | 23 ++++++++++++++++++- .../sql-tests/expressions/math/pow.sql | 14 +++++++---- .../apache/comet/CometExpressionSuite.scala | 2 +- 5 files changed, 34 insertions(+), 8 deletions(-) diff --git a/spark/src/main/scala/org/apache/comet/serde/QueryPlanSerde.scala b/spark/src/main/scala/org/apache/comet/serde/QueryPlanSerde.scala index b818b61b1b..ead9c4cd6c 100644 --- a/spark/src/main/scala/org/apache/comet/serde/QueryPlanSerde.scala +++ b/spark/src/main/scala/org/apache/comet/serde/QueryPlanSerde.scala @@ -121,7 +121,7 @@ object QueryPlanSerde extends Logging with CometExprShim with CometTypeShim { classOf[Logarithm] -> CometLogarithm, classOf[Multiply] -> CometMultiply, classOf[Pi] -> CometScalarFunction("pi"), - classOf[Pow] -> CometScalarFunction("pow"), + classOf[Pow] -> CometPow, classOf[Rand] -> CometRand, classOf[Randn] -> CometRandn, classOf[Remainder] -> CometRemainder, diff --git a/spark/src/main/scala/org/apache/comet/serde/datetime.scala b/spark/src/main/scala/org/apache/comet/serde/datetime.scala index a3b1f9c1df..0f97f933e3 100644 --- a/spark/src/main/scala/org/apache/comet/serde/datetime.scala +++ b/spark/src/main/scala/org/apache/comet/serde/datetime.scala @@ -148,6 +148,7 @@ object CometWeekDay extends CometExpressionSerde[WeekDay] with CometExprGetDateF // Datafusion `isodow` is 1..=7 with Monday=1, but Spark `WeekDay` is 0..=6 with Monday=0, // so subtract 1 from the result of datepart(isodow, ...). // TODO: fix upstream to avoid substraction + // https://github.com/apache/datafusion/issues/22599 val optExpr = getDateField(expr, CometGetDateField.WeekDay, inputs, binding) .zip(exprToProtoInternal(Literal(1), inputs, binding)) .map { case (left, right) => diff --git a/spark/src/main/scala/org/apache/comet/serde/math.scala b/spark/src/main/scala/org/apache/comet/serde/math.scala index 401d14cc78..5dc7c33fc9 100644 --- a/spark/src/main/scala/org/apache/comet/serde/math.scala +++ b/spark/src/main/scala/org/apache/comet/serde/math.scala @@ -19,7 +19,7 @@ package org.apache.comet.serde -import org.apache.spark.sql.catalyst.expressions.{Abs, Add, Atan2, Attribute, Ceil, CheckOverflow, Expression, Floor, Hex, If, LessThanOrEqual, Literal, Log, Log10, Log2, Logarithm, Unhex} +import org.apache.spark.sql.catalyst.expressions.{Abs, Add, Atan2, Attribute, Ceil, CheckOverflow, Expression, Floor, Hex, If, LessThanOrEqual, Literal, Log, Log10, Log2, Logarithm, Pow, Unhex} import org.apache.spark.sql.types.{DecimalType, DoubleType, NumericType} import org.apache.comet.CometSparkSessionExtensions.withInfo @@ -196,6 +196,27 @@ object CometAbs extends CometExpressionSerde[Abs] with MathExprBase { } } +object CometPow extends CometExpressionSerde[Pow] { + + // https://github.com/apache/datafusion/issues/22598 + val unsupportedReason: String = "Power has correctness issues" + + override def getUnsupportedReasons(): Seq[String] = Seq(unsupportedReason) + + override def getSupportLevel(expr: Pow): SupportLevel = + Unsupported(Some(unsupportedReason)) + + override def convert( + expr: Pow, + inputs: Seq[Attribute], + binding: Boolean): Option[ExprOuterClass.Expr] = { + val leftExpr = exprToProtoInternal(expr.left, inputs, binding) + val rightExpr = exprToProtoInternal(expr.right, inputs, binding) + val optExpr = scalarFunctionExprToProto("pow", leftExpr, rightExpr) + optExprWithInfo(optExpr, expr, expr.left, expr.right) + } +} + sealed trait MathExprBase { protected def nullIfNegative(expression: Expression): Expression = { val zero = Literal.default(expression.dataType) diff --git a/spark/src/test/resources/sql-tests/expressions/math/pow.sql b/spark/src/test/resources/sql-tests/expressions/math/pow.sql index 78e4c3e6c4..f1111167ba 100644 --- a/spark/src/test/resources/sql-tests/expressions/math/pow.sql +++ b/spark/src/test/resources/sql-tests/expressions/math/pow.sql @@ -19,19 +19,23 @@ statement CREATE TABLE test_pow(base double, exp double) USING parquet statement -INSERT INTO test_pow VALUES (2.0, 3.0), (0.0, 0.0), (-1.0, 2.0), (-1.0, 0.5), (2.0, -1.0), (NULL, 2.0), (2.0, NULL), (cast('NaN' as double), 2.0), (cast('Infinity' as double), 2.0), (2.0, cast('Infinity' as double)) +INSERT INTO test_pow VALUES (0.0, -1), (2.0, 3.0), (0.0, 0.0), (-1.0, 2.0), (-1.0, 0.5), (2.0, -1.0), (NULL, 2.0), (2.0, NULL), (cast('NaN' as double), 2.0), (cast('Infinity' as double), 2.0), (2.0, cast('Infinity' as double)) -query tolerance=1e-6 +-- query tolerance=1e-6 +query expect_fallback(Power has correctness issues) SELECT pow(base, exp) FROM test_pow -- column + literal -query tolerance=1e-6 +-- query tolerance=1e-6 +query expect_fallback(Power has correctness issues) SELECT pow(base, 2.0) FROM test_pow -- literal + column -query tolerance=1e-6 +-- query tolerance=1e-6 +query expect_fallback(Power has correctness issues) SELECT pow(2.0, exp) FROM test_pow -- literal + literal -query tolerance=1e-6 +-- query tolerance=1e-6 +query expect_fallback(Power has correctness issues) SELECT pow(2.0, 3.0), pow(0.0, 0.0), pow(-1.0, 2.0), pow(NULL, 2.0) diff --git a/spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala b/spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala index a172538f45..777eb7996f 100644 --- a/spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala +++ b/spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala @@ -1403,7 +1403,7 @@ class CometExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelper { } withParquetTable(doubleValues.flatMap(m => doubleValues.map(n => (m, n))), "tbl") { // expressions with two args - for (expr <- Seq("atan2", "pow")) { + for (expr <- Seq("atan2")) { val (_, cometPlan) = checkSparkAnswerAndOperatorWithTol(sql(s"SELECT $expr(_1, _2) FROM tbl")) val cometProjectExecs = collect(cometPlan) { case op: CometProjectExec => From e2f00be10e552bebac021d1d6438476e580c6d43 Mon Sep 17 00:00:00 2001 From: comphead Date: Thu, 28 May 2026 11:30:59 -0700 Subject: [PATCH 27/30] fallback on pow --- spark/src/main/scala/org/apache/comet/serde/math.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spark/src/main/scala/org/apache/comet/serde/math.scala b/spark/src/main/scala/org/apache/comet/serde/math.scala index 5dc7c33fc9..6b2951445f 100644 --- a/spark/src/main/scala/org/apache/comet/serde/math.scala +++ b/spark/src/main/scala/org/apache/comet/serde/math.scala @@ -197,7 +197,7 @@ object CometAbs extends CometExpressionSerde[Abs] with MathExprBase { } object CometPow extends CometExpressionSerde[Pow] { - + // https://github.com/apache/datafusion/issues/22598 val unsupportedReason: String = "Power has correctness issues" From a8ec4956fe922807d1909cabbc0e8dfdb18609aa Mon Sep 17 00:00:00 2001 From: comphead Date: Tue, 2 Jun 2026 17:44:17 -0700 Subject: [PATCH 28/30] chore: DF54 upgrade --- native/spark-expr/src/array_funcs/array_slice.rs | 5 ----- native/spark-expr/src/url_funcs/parse_url.rs | 7 ------- spark/src/main/scala/org/apache/comet/serde/datetime.scala | 2 +- spark/src/main/scala/org/apache/comet/serde/math.scala | 2 +- 4 files changed, 2 insertions(+), 14 deletions(-) diff --git a/native/spark-expr/src/array_funcs/array_slice.rs b/native/spark-expr/src/array_funcs/array_slice.rs index ec6ac46b03..e9dc05330b 100644 --- a/native/spark-expr/src/array_funcs/array_slice.rs +++ b/native/spark-expr/src/array_funcs/array_slice.rs @@ -34,7 +34,6 @@ use datafusion::logical_expr::{ ColumnarValue, ReturnFieldArgs, ScalarFunctionArgs, ScalarUDFImpl, Signature, TypeSignature, Volatility, }; -use std::any::Any; use std::sync::Arc; #[derive(Debug, PartialEq, Eq, Hash)] @@ -57,10 +56,6 @@ impl SparkArraySlice { } impl ScalarUDFImpl for SparkArraySlice { - fn as_any(&self) -> &dyn Any { - self - } - fn name(&self) -> &str { "spark_array_slice" } diff --git a/native/spark-expr/src/url_funcs/parse_url.rs b/native/spark-expr/src/url_funcs/parse_url.rs index 3f78d9ce71..25d4ca94fe 100644 --- a/native/spark-expr/src/url_funcs/parse_url.rs +++ b/native/spark-expr/src/url_funcs/parse_url.rs @@ -21,7 +21,6 @@ //! which diverges from Spark's java.net.URI (RFC 3986) on several edge cases. //! This module uses RFC 3986 Appendix B regex parsing to match Spark exactly. -use std::any::Any; use std::sync::{Arc, LazyLock}; use arrow::array::{ @@ -182,9 +181,6 @@ impl Default for CometParseUrl { } impl ScalarUDFImpl for CometParseUrl { - fn as_any(&self) -> &dyn Any { - self - } fn name(&self) -> &str { "parse_url" } @@ -220,9 +216,6 @@ impl Default for CometTryParseUrl { } impl ScalarUDFImpl for CometTryParseUrl { - fn as_any(&self) -> &dyn Any { - self - } fn name(&self) -> &str { "try_parse_url" } diff --git a/spark/src/main/scala/org/apache/comet/serde/datetime.scala b/spark/src/main/scala/org/apache/comet/serde/datetime.scala index a02699ffe7..dd9a3fbc60 100644 --- a/spark/src/main/scala/org/apache/comet/serde/datetime.scala +++ b/spark/src/main/scala/org/apache/comet/serde/datetime.scala @@ -165,7 +165,7 @@ object CometWeekDay extends CometExpressionSerde[WeekDay] with CometExprGetDateF .build() } .headOption - optExprWithInfo(optExpr, expr, expr.child) + optExprWithFallbackReason(optExpr, expr, expr.child) } } diff --git a/spark/src/main/scala/org/apache/comet/serde/math.scala b/spark/src/main/scala/org/apache/comet/serde/math.scala index 52bed6c25a..780609ef04 100644 --- a/spark/src/main/scala/org/apache/comet/serde/math.scala +++ b/spark/src/main/scala/org/apache/comet/serde/math.scala @@ -213,7 +213,7 @@ object CometPow extends CometExpressionSerde[Pow] { val leftExpr = exprToProtoInternal(expr.left, inputs, binding) val rightExpr = exprToProtoInternal(expr.right, inputs, binding) val optExpr = scalarFunctionExprToProto("pow", leftExpr, rightExpr) - optExprWithInfo(optExpr, expr, expr.left, expr.right) + optExprWithFallbackReason(optExpr, expr, expr.left, expr.right) } } From 4b9a817b0dc155093bde37671e8f91ba9a0cc460 Mon Sep 17 00:00:00 2001 From: comphead Date: Tue, 2 Jun 2026 17:50:14 -0700 Subject: [PATCH 29/30] chore: DF54 upgrade --- native/Cargo.lock | 291 ++++++++++++++++++----------------------- native/Cargo.toml | 8 +- native/core/Cargo.toml | 2 +- 3 files changed, 132 insertions(+), 169 deletions(-) diff --git a/native/Cargo.lock b/native/Cargo.lock index 2bb3604b9a..6f980c885c 100644 --- a/native/Cargo.lock +++ b/native/Cargo.lock @@ -417,7 +417,7 @@ version = "58.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f633dbfdf39c039ada1bf9e34c694816eb71fbb7dc78f613993b7245e078a1ed" dependencies = [ - "bitflags 2.11.1", + "bitflags 2.12.1", "serde_core", "serde_json", ] @@ -628,9 +628,9 @@ checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" [[package]] name = "aws-config" -version = "1.8.17" +version = "1.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "517aa062d8bd9015ee23d6daa5e1c1372328412fdae4e6c4c1be9b69c6ad37a2" +checksum = "e33f815b73a3899c03b380d543532e5865f230dce9678d108dc10732a8682275" dependencies = [ "aws-credential-types", "aws-runtime", @@ -676,7 +676,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ec2f1fc3ec205783a5da9a7e6c1509cc69dedf09a1949e412c1e18469326d00" dependencies = [ "aws-lc-sys", - "untrusted 0.7.1", "zeroize", ] @@ -719,10 +718,11 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.99.0" +version = "1.101.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f4055e6099b2ec264abdc0d9bbfffce306c1601809275c861594779a0b04b45" +checksum = "b647baea49ff551960b904f905681e9b4765a6c4ea08631e89dc52d8bd3f5896" dependencies = [ + "arc-swap", "aws-credential-types", "aws-runtime", "aws-smithy-async", @@ -743,10 +743,11 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.101.0" +version = "1.103.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02f009ba0284c5d696425fd7b4dcc5b189f5726f4041b7a5794daecb3a68d598" +checksum = "7ae401c65ff288aa7873117fe535cd32b7b1bb0bc43751d28901a1d5f20636b9" dependencies = [ + "arc-swap", "aws-credential-types", "aws-runtime", "aws-smithy-async", @@ -767,10 +768,11 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.104.0" +version = "1.106.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aa6622798e19e6a76b690562085dd4771c736cd48343464a53ab4ae2f2c9f84" +checksum = "4c80de7bb7d03e9ca8c9fd7b489f20f3948d3f3be91a7953591347d238115408" dependencies = [ + "arc-swap", "aws-credential-types", "aws-runtime", "aws-smithy-async", @@ -792,9 +794,9 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "1.4.4" +version = "1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7083fb918b38474ac65ffbf8a69fc8792d36879f4ac5f1667b43aec61efe9a5" +checksum = "bae38512beae0ffee7010fc24e7a8a123c53efdfef42a61e80fda4882418dc71" dependencies = [ "aws-credential-types", "aws-smithy-http", @@ -846,9 +848,9 @@ dependencies = [ [[package]] name = "aws-smithy-http-client" -version = "1.1.12" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a2f165a7feee6f263028b899d0a181987f4fa7179a6411a32a439fba7c5f769" +checksum = "5c3ef8931ad1c98aa6a55b4256f847f3116090819844e0dd41ea682cac5dd2d3" dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", @@ -870,9 +872,9 @@ dependencies = [ [[package]] name = "aws-smithy-json" -version = "0.62.6" +version = "0.62.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "517089205f18ab4adc5a3e02888cb139bbbbb2e168eac9f396216925d1fbeaf5" +checksum = "701a947f4797e52a911e114a898667c746c39feea467bbd1abd7b3721f702ffa" dependencies = [ "aws-smithy-runtime-api", "aws-smithy-schema", @@ -926,9 +928,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime-api" -version = "1.12.1" +version = "1.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc117c179ecf39a62a0a3f49f600e9ac26a7ad7dd172177999f83933af776c32" +checksum = "9db177daa6ba8afb9ee1aefcf548c907abcf52065e394ee11a92780057fe0e8c" dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api-macros", @@ -966,9 +968,9 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.4.8" +version = "1.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "056b66dbce2f81cc0c1e2b05bb402eb58f8a3530479d650efadd5bbae9a4050b" +checksum = "53f93074121a1be41317b9aa607143ae17900631f7f59a99f2b905d519d6783b" dependencies = [ "base64-simd", "bytes", @@ -1107,7 +1109,7 @@ version = "0.72.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" dependencies = [ - "bitflags 2.11.1", + "bitflags 2.12.1", "cexpr", "clang-sys", "itertools 0.13.0", @@ -1129,9 +1131,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.11.1" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3" +checksum = "84d7ced0ae9557296835c32bf1b1e02b44c746701f898460fb000d7eaa84f00a" [[package]] name = "blake2" @@ -1492,9 +1494,9 @@ dependencies = [ [[package]] name = "cmov" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f88a43d011fc4a6876cb7344703e297c71dda42494fee094d5f7c76bf13f746" +checksum = "0c9ea0ac24bc397ab3c98583a3c9ba74fa56b09a4449bbe172b9b1ddb016027a" [[package]] name = "colorchoice" @@ -1887,7 +1889,7 @@ dependencies = [ [[package]] name = "datafusion" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" dependencies = [ "arrow", "arrow-schema", @@ -1935,7 +1937,7 @@ dependencies = [ [[package]] name = "datafusion-catalog" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" dependencies = [ "arrow", "async-trait", @@ -1959,7 +1961,7 @@ dependencies = [ [[package]] name = "datafusion-catalog-listing" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" dependencies = [ "arrow", "async-trait", @@ -2155,7 +2157,7 @@ dependencies = [ [[package]] name = "datafusion-common" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" dependencies = [ "arrow", "arrow-ipc", @@ -2180,7 +2182,7 @@ dependencies = [ [[package]] name = "datafusion-common-runtime" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" dependencies = [ "futures", "log", @@ -2190,7 +2192,7 @@ dependencies = [ [[package]] name = "datafusion-datasource" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" dependencies = [ "arrow", "async-compression", @@ -2225,7 +2227,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-arrow" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" dependencies = [ "arrow", "arrow-ipc", @@ -2248,7 +2250,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-csv" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" dependencies = [ "arrow", "async-trait", @@ -2270,7 +2272,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-json" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" dependencies = [ "arrow", "async-trait", @@ -2292,7 +2294,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-parquet" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" dependencies = [ "arrow", "async-trait", @@ -2322,12 +2324,12 @@ dependencies = [ [[package]] name = "datafusion-doc" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" [[package]] name = "datafusion-execution" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" dependencies = [ "arrow", "arrow-buffer", @@ -2349,7 +2351,7 @@ dependencies = [ [[package]] name = "datafusion-expr" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" dependencies = [ "arrow", "arrow-schema", @@ -2370,7 +2372,7 @@ dependencies = [ [[package]] name = "datafusion-expr-common" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" dependencies = [ "arrow", "datafusion-common", @@ -2381,7 +2383,7 @@ dependencies = [ [[package]] name = "datafusion-functions" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" dependencies = [ "arrow", "arrow-buffer", @@ -2412,7 +2414,7 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" dependencies = [ "arrow", "datafusion-common", @@ -2432,7 +2434,7 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate-common" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" dependencies = [ "arrow", "datafusion-common", @@ -2443,7 +2445,7 @@ dependencies = [ [[package]] name = "datafusion-functions-nested" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" dependencies = [ "arrow", "arrow-ord", @@ -2467,7 +2469,7 @@ dependencies = [ [[package]] name = "datafusion-functions-table" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" dependencies = [ "arrow", "async-trait", @@ -2482,7 +2484,7 @@ dependencies = [ [[package]] name = "datafusion-functions-window" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" dependencies = [ "arrow", "datafusion-common", @@ -2498,7 +2500,7 @@ dependencies = [ [[package]] name = "datafusion-functions-window-common" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" dependencies = [ "datafusion-common", "datafusion-physical-expr-common", @@ -2507,7 +2509,7 @@ dependencies = [ [[package]] name = "datafusion-macros" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" dependencies = [ "datafusion-doc", "quote", @@ -2517,7 +2519,7 @@ dependencies = [ [[package]] name = "datafusion-optimizer" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" dependencies = [ "arrow", "chrono", @@ -2535,7 +2537,7 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" dependencies = [ "arrow", "datafusion-common", @@ -2555,7 +2557,7 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-adapter" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" dependencies = [ "arrow", "datafusion-common", @@ -2569,7 +2571,7 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-common" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" dependencies = [ "arrow", "chrono", @@ -2585,7 +2587,7 @@ dependencies = [ [[package]] name = "datafusion-physical-optimizer" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" dependencies = [ "arrow", "datafusion-common", @@ -2602,7 +2604,7 @@ dependencies = [ [[package]] name = "datafusion-physical-plan" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" dependencies = [ "arrow", "arrow-data", @@ -2634,7 +2636,7 @@ dependencies = [ [[package]] name = "datafusion-pruning" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" dependencies = [ "arrow", "datafusion-common", @@ -2649,7 +2651,7 @@ dependencies = [ [[package]] name = "datafusion-session" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" dependencies = [ "async-trait", "datafusion-common", @@ -2662,7 +2664,7 @@ dependencies = [ [[package]] name = "datafusion-spark" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" dependencies = [ "arrow", "bigdecimal", @@ -2691,7 +2693,7 @@ dependencies = [ [[package]] name = "datafusion-sql" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=50aa138#50aa138564580ff7abaaf3d689fab831d0dd2ce2" +source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" dependencies = [ "arrow", "bigdecimal", @@ -3009,7 +3011,7 @@ version = "25.12.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35f6839d7b3b98adde531effaf34f0c2badc6f4735d26fe74709d8e513a96ef3" dependencies = [ - "bitflags 2.11.1", + "bitflags 2.12.1", "rustc_version", ] @@ -3467,9 +3469,9 @@ dependencies = [ [[package]] name = "hyper" -version = "1.10.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb92f162bf56536459fc83c79b974bb12837acfed43d6bc370a7916d0ae15ecc" +checksum = "55281c53a1894c864990125767da440a4e630446785086f52523b20033b74498" dependencies = [ "atomic-waker", "bytes", @@ -3862,9 +3864,9 @@ dependencies = [ [[package]] name = "jiff" -version = "0.2.27" +version = "0.2.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "392c70591e8749fe235ddaf513e6f58b26bce3dcc16524cecc8936f75afa161e" +checksum = "4603d3033e49e2b0e31229fcab20a5d40089c607d975cd9c80551dc69eed9102" dependencies = [ "jiff-static", "jiff-tzdb-platform", @@ -3879,9 +3881,9 @@ dependencies = [ [[package]] name = "jiff-static" -version = "0.2.27" +version = "0.2.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47b605b0c050d845fc355bb11eb3f9a8deddc218ea60c76e61aa1f2adfb2c96a" +checksum = "782d32378dddf207193ac91cefb848ad41abb58195c95168e1291227a0832b47" dependencies = [ "proc-macro2", "quote", @@ -4001,24 +4003,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "jsonwebtoken" -version = "10.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eba32bfb4ffdeaca3e34431072faf01745c9b26d25504aa7a6cf5684334fc4fc" -dependencies = [ - "aws-lc-rs", - "base64", - "getrandom 0.2.17", - "js-sys", - "pem", - "serde", - "serde_json", - "signature", - "simple_asn1", - "zeroize", -] - [[package]] name = "kv-log-macro" version = "1.0.7" @@ -4192,9 +4176,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.30" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "616ec5685824bcc94416c6d4a7a446eea774a31efd7062c8480ba6fd06d7a6e5" +checksum = "113b30b4cd05f7c06868fdb2854f66a7b9fece9a48425351cd532e810d74024f" dependencies = [ "serde_core", "value-bag", @@ -4321,9 +4305,9 @@ dependencies = [ [[package]] name = "mio" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1" +checksum = "02bd0af71c67b473010cbbc60715ee815645a4dc942899111f494b4b737d6fda" dependencies = [ "libc", "wasi", @@ -5254,7 +5238,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25485360a54d6861439d60facef26de713b1e126bf015ec8f98239467a2b82f7" dependencies = [ - "bitflags 2.11.1", + "bitflags 2.12.1", "chrono", "flate2", "procfs-core", @@ -5267,7 +5251,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6401bf7b6af22f78b563665d15a22e9aef27775b79b149a66ca022468a4e405" dependencies = [ - "bitflags 2.11.1", + "bitflags 2.12.1", "chrono", "hex", ] @@ -5358,6 +5342,16 @@ dependencies = [ "serde", ] +[[package]] +name = "quick-xml" +version = "0.40.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2474bd2e5029e7ccb6abb2ba48cf2383a333851dedf495901544281590c7da7f" +dependencies = [ + "memchr", + "serde", +] + [[package]] name = "quinn" version = "0.11.9" @@ -5536,7 +5530,7 @@ version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ - "bitflags 2.11.1", + "bitflags 2.12.1", ] [[package]] @@ -5596,9 +5590,9 @@ checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" [[package]] name = "reqsign-aliyun-oss" -version = "3.0.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ac2757f3140aa2e213b554148ae0b52733e624fc6723f0cc6bb3d440176c95" +checksum = "372266b4733756738eeb199a98188037d27a0989980e2600ae7ce1faf00a867d" dependencies = [ "anyhow", "form_urlencoded", @@ -5613,37 +5607,37 @@ dependencies = [ [[package]] name = "reqsign-aws-v4" -version = "3.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44eaca382e94505a49f1a4849658d153aebf79d9c1a58e5dd3b10361511e9f43" +checksum = "7b75624bd8a466e37ddc0a7b6c33ac859a85347c153a916e1dd9d0b68338f74a" dependencies = [ "anyhow", "bytes", "form_urlencoded", + "hex", "http 1.4.1", "log", "percent-encoding", - "quick-xml 0.39.4", + "quick-xml 0.40.1", "reqsign-core", "rust-ini", "serde", "serde_json", "serde_urlencoded", - "sha1 0.10.6", + "sha1 0.11.0", ] [[package]] name = "reqsign-azure-storage" -version = "3.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a321980405d596bd34aaf95c4722a3de4128a67fd19e74a81a83aa3fdf082e6" +checksum = "62b96928e73ad984de1d99e382749d09e5dab7dd707b767974f7e40aa926b82f" dependencies = [ "anyhow", "base64", "bytes", "form_urlencoded", "http 1.4.1", - "jsonwebtoken", "log", "pem", "percent-encoding", @@ -5651,14 +5645,14 @@ dependencies = [ "rsa", "serde", "serde_json", - "sha1 0.10.6", + "sha1 0.11.0", ] [[package]] name = "reqsign-core" -version = "3.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b10302cf0a7d7e7352ba211fc92c3c5bebf1286153e49cc5aa87348078a8e102" +checksum = "a5fa5cb48808693614d1701fcd3db0b30fa292e0f18e122ae068b6d32eaeed3f" dependencies = [ "anyhow", "base64", @@ -5666,21 +5660,24 @@ dependencies = [ "form_urlencoded", "futures", "hex", - "hmac 0.12.1", + "hmac 0.13.0", "http 1.4.1", "jiff", "log", "percent-encoding", - "sha1 0.10.6", - "sha2 0.10.9", + "rsa", + "serde", + "serde_json", + "sha1 0.11.0", + "sha2 0.11.0", "windows-sys 0.61.2", ] [[package]] name = "reqsign-file-read-tokio" -version = "3.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d89295b3d17abea31851cc8de55d843d89c52132c864963c38d41920613dc5" +checksum = "6a4b6f3a3fd29ffcc99a90aec585a65217783badfd73acddf847b63ae683bda9" dependencies = [ "anyhow", "reqsign-core", @@ -5689,13 +5686,12 @@ dependencies = [ [[package]] name = "reqsign-google" -version = "3.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35cc609b49c69e76ecaceb775a03f792d1ed3e7755ab3548d4534fd801e3242e" +checksum = "eb215d0876a18b6bd9cdd380b589e5292aaa638ca15266de794b1122d898b6b2" dependencies = [ "form_urlencoded", "http 1.4.1", - "jsonwebtoken", "log", "percent-encoding", "reqsign-aws-v4", @@ -5703,7 +5699,6 @@ dependencies = [ "rsa", "serde", "serde_json", - "sha2 0.10.9", "tokio", ] @@ -5806,7 +5801,7 @@ dependencies = [ "cfg-if", "getrandom 0.2.17", "libc", - "untrusted 0.9.0", + "untrusted", "windows-sys 0.52.0", ] @@ -5884,7 +5879,7 @@ version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ - "bitflags 2.11.1", + "bitflags 2.12.1", "errno", "libc", "linux-raw-sys 0.4.15", @@ -5897,7 +5892,7 @@ version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" dependencies = [ - "bitflags 2.11.1", + "bitflags 2.12.1", "errno", "libc", "linux-raw-sys 0.12.1", @@ -5921,9 +5916,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63" +checksum = "dab5152771c58876a2146916e53e35057e1a4dfa2b9df0f0305b07f611fdea4d" dependencies = [ "openssl-probe", "rustls-pki-types", @@ -5977,7 +5972,7 @@ dependencies = [ "aws-lc-rs", "ring", "rustls-pki-types", - "untrusted 0.9.0", + "untrusted", ] [[package]] @@ -6066,7 +6061,7 @@ version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" dependencies = [ - "bitflags 2.11.1", + "bitflags 2.12.1", "core-foundation", "core-foundation-sys", "libc", @@ -6334,18 +6329,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" -[[package]] -name = "simple_asn1" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d585997b0ac10be3c5ee635f1bab02d512760d14b7c468801ac8a01d9ae5f1d" -dependencies = [ - "num-bigint", - "num-traits", - "thiserror 2.0.18", - "time", -] - [[package]] name = "siphasher" version = "1.0.3" @@ -6372,9 +6355,9 @@ checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" [[package]] name = "socket2" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" +checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51" dependencies = [ "libc", "windows-sys 0.61.2", @@ -6806,7 +6789,7 @@ version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840" dependencies = [ - "bitflags 2.11.1", + "bitflags 2.12.1", "bytes", "futures-util", "http 1.4.1", @@ -6913,9 +6896,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.20.0" +version = "1.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de" +checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20" [[package]] name = "typetag" @@ -6949,9 +6932,9 @@ checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" [[package]] name = "unicode-segmentation" -version = "1.13.2" +version = "1.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9629274872b2bfaf8d66f5f15725007f635594914870f65218920345aa11aa8c" +checksum = "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8" [[package]] name = "unicode-width" @@ -6990,12 +6973,6 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - [[package]] name = "untrusted" version = "0.9.0" @@ -7034,9 +7011,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.23.1" +version = "1.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddd74a9687298c6858e9b88ec8935ec45d22e8fd5e6394fa1bd4e99a87789c76" +checksum = "d258b83ceec21034727ecee8c382cfa6c3e133699b0742c64571814fb420c9f7" dependencies = [ "getrandom 0.4.2", "js-sys", @@ -7214,7 +7191,7 @@ version = "0.244.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" dependencies = [ - "bitflags 2.11.1", + "bitflags 2.12.1", "hashbrown 0.15.5", "indexmap 2.14.0", "semver", @@ -7646,7 +7623,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" dependencies = [ "anyhow", - "bitflags 2.11.1", + "bitflags 2.12.1", "indexmap 2.14.0", "log", "serde", @@ -7723,18 +7700,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.49" +version = "0.8.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bce33a6288fa3f072a8c2c7d0f2fdbb90e28298f0135c1f99b96c3db2efcc60b" +checksum = "3b065d4f0e55f82fae73202e189638116a87c55ab6b8e6c2721e13dd9d854ad1" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.49" +version = "0.8.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fd425244944f4ab65ccff928e7323354c5a018c75838362fdce749dfad2ee1e" +checksum = "0b631b19d36a892ab55420c92dbc83ccd79274f25be714855d3074aa71cab639" dependencies = [ "proc-macro2", "quote", @@ -7767,20 +7744,6 @@ name = "zeroize" version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" -dependencies = [ - "zeroize_derive", -] - -[[package]] -name = "zeroize_derive" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.117", -] [[package]] name = "zerotrie" diff --git a/native/Cargo.toml b/native/Cargo.toml index 05364d1b5d..295d44c671 100644 --- a/native/Cargo.toml +++ b/native/Cargo.toml @@ -38,10 +38,10 @@ arrow = { version = "58.3.0", features = ["prettyprint", "ffi", "chrono-tz"] } async-trait = { version = "0.1" } bytes = { version = "1.11.1" } parquet = { version = "58.3.0", default-features = false, features = ["experimental"] } -datafusion = { git = "https://github.com/apache/datafusion.git", rev = "50aa138", default-features = false, features = ["unicode_expressions", "crypto_expressions", "nested_expressions", "parquet"] } -datafusion-datasource = { git = "https://github.com/apache/datafusion.git", rev = "50aa138" } -datafusion-physical-expr-adapter = { git = "https://github.com/apache/datafusion.git", rev = "50aa138" } -datafusion-spark = { git = "https://github.com/apache/datafusion.git", rev = "50aa138", features = ["core"] } +datafusion = { git = "https://github.com/apache/datafusion.git", branch = "branch-54", default-features = false, features = ["unicode_expressions", "crypto_expressions", "nested_expressions", "parquet"] } +datafusion-datasource = { git = "https://github.com/apache/datafusion.git", branch = "branch-54" } +datafusion-physical-expr-adapter = { git = "https://github.com/apache/datafusion.git", branch = "branch-54" } +datafusion-spark = { git = "https://github.com/apache/datafusion.git", branch = "branch-54", features = ["core"] } datafusion-comet-spark-expr = { path = "spark-expr" } datafusion-comet-common = { path = "common" } datafusion-comet-jni-bridge = { path = "jni-bridge" } diff --git a/native/core/Cargo.toml b/native/core/Cargo.toml index d83a70acdf..08b16592d4 100644 --- a/native/core/Cargo.toml +++ b/native/core/Cargo.toml @@ -92,7 +92,7 @@ jni = { version = "0.22.4", features = ["invocation"] } lazy_static = "1.4" assertables = "9" hex = "0.4.3" -datafusion-functions-nested = { git = "https://github.com/apache/datafusion.git", rev = "50aa138" } +datafusion-functions-nested = { git = "https://github.com/apache/datafusion.git", branch = "branch-54" } [features] backtrace = ["datafusion/backtrace"] From 7ebaa58f25e011253f984bb3fbec5898a4a7804a Mon Sep 17 00:00:00 2001 From: Matt Butrovich Date: Mon, 8 Jun 2026 13:05:31 -0400 Subject: [PATCH 30/30] bump to crates --- native/Cargo.lock | 330 ++++++++---------- native/Cargo.toml | 8 +- native/core/Cargo.toml | 2 +- .../spark-expr/src/datetime_funcs/next_day.rs | 5 - .../src/json_funcs/json_array_length.rs | 6 - 5 files changed, 149 insertions(+), 202 deletions(-) diff --git a/native/Cargo.lock b/native/Cargo.lock index c3f9c98291..58434f5970 100644 --- a/native/Cargo.lock +++ b/native/Cargo.lock @@ -417,7 +417,7 @@ version = "58.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f633dbfdf39c039ada1bf9e34c694816eb71fbb7dc78f613993b7245e078a1ed" dependencies = [ - "bitflags 2.12.1", + "bitflags 2.13.0", "serde_core", "serde_json", ] @@ -648,7 +648,7 @@ dependencies = [ "bytes", "fastrand", "hex", - "http 1.4.1", + "http 1.4.2", "sha1 0.10.6", "time", "tokio", @@ -708,7 +708,7 @@ dependencies = [ "bytes", "bytes-utils", "fastrand", - "http 1.4.1", + "http 1.4.2", "http-body 1.0.1", "percent-encoding", "pin-project-lite", @@ -736,7 +736,7 @@ dependencies = [ "bytes", "fastrand", "http 0.2.12", - "http 1.4.1", + "http 1.4.2", "regex-lite", "tracing", ] @@ -761,7 +761,7 @@ dependencies = [ "bytes", "fastrand", "http 0.2.12", - "http 1.4.1", + "http 1.4.2", "regex-lite", "tracing", ] @@ -787,7 +787,7 @@ dependencies = [ "aws-types", "fastrand", "http 0.2.12", - "http 1.4.1", + "http 1.4.2", "regex-lite", "tracing", ] @@ -807,7 +807,7 @@ dependencies = [ "hex", "hmac 0.13.0", "http 0.2.12", - "http 1.4.1", + "http 1.4.2", "percent-encoding", "sha2 0.11.0", "time", @@ -837,7 +837,7 @@ dependencies = [ "bytes-utils", "futures-core", "futures-util", - "http 1.4.1", + "http 1.4.2", "http-body 1.0.1", "http-body-util", "percent-encoding", @@ -856,7 +856,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "h2", - "http 1.4.1", + "http 1.4.2", "hyper", "hyper-rustls", "hyper-util", @@ -916,7 +916,7 @@ dependencies = [ "bytes", "fastrand", "http 0.2.12", - "http 1.4.1", + "http 1.4.2", "http-body 0.4.6", "http-body 1.0.1", "http-body-util", @@ -937,7 +937,7 @@ dependencies = [ "aws-smithy-types", "bytes", "http 0.2.12", - "http 1.4.1", + "http 1.4.2", "pin-project-lite", "tokio", "tracing", @@ -963,7 +963,7 @@ checksum = "7442cb268338f0eb8278140a107c046756aa01093d8ef5e99628d34ae09c94f5" dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", - "http 1.4.1", + "http 1.4.2", ] [[package]] @@ -976,7 +976,7 @@ dependencies = [ "bytes", "bytes-utils", "http 0.2.12", - "http 1.4.1", + "http 1.4.2", "http-body 0.4.6", "http-body 1.0.1", "http-body-util", @@ -1109,7 +1109,7 @@ version = "0.72.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" dependencies = [ - "bitflags 2.12.1", + "bitflags 2.13.0", "cexpr", "clang-sys", "itertools 0.13.0", @@ -1131,9 +1131,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.12.1" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84d7ced0ae9557296835c32bf1b1e02b44c746701f898460fb000d7eaa84f00a" +checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8" [[package]] name = "blake2" @@ -1373,9 +1373,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.44" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0" +checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327" dependencies = [ "iana-time-zone", "js-sys", @@ -1889,7 +1889,8 @@ dependencies = [ [[package]] name = "datafusion" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "997a31e15872606a49478e670c58302094c97cb96abb0a7d60720f8e92170040" dependencies = [ "arrow", "arrow-schema", @@ -1937,7 +1938,8 @@ dependencies = [ [[package]] name = "datafusion-catalog" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7dd61161508f8f5fa1107774ea687bd753c22d83a32eebf963549f89de14139" dependencies = [ "arrow", "async-trait", @@ -1961,7 +1963,8 @@ dependencies = [ [[package]] name = "datafusion-catalog-listing" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897c70f871277f9ce99aa38347be0d679bbe3e617156c4d2a8378cec8a2a0891" dependencies = [ "arrow", "async-trait", @@ -2158,7 +2161,8 @@ dependencies = [ [[package]] name = "datafusion-common" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c9ded5d87d9172319e006f2afdb9928d72dbacd6a90a458d8acb1e3b43a65" dependencies = [ "arrow", "arrow-ipc", @@ -2183,7 +2187,8 @@ dependencies = [ [[package]] name = "datafusion-common-runtime" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "981b9dae74f78ee3d9f714fb49b01919eab975461b56149510c3ba9ea11287d1" dependencies = [ "futures", "log", @@ -2193,7 +2198,8 @@ dependencies = [ [[package]] name = "datafusion-datasource" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffd7d295b2ec7c00d8a56562f41ed41062cf0af75549ed891c12a0a09eddfefe" dependencies = [ "arrow", "async-compression", @@ -2228,7 +2234,8 @@ dependencies = [ [[package]] name = "datafusion-datasource-arrow" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "552b0b3f342f7ec41b3fbd70f6339dc82a30cfd0349e7f280e7852528085349f" dependencies = [ "arrow", "arrow-ipc", @@ -2251,7 +2258,8 @@ dependencies = [ [[package]] name = "datafusion-datasource-csv" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68850aa426b897e879c8b87e512ea8124f1d0a2869a4e51808ddaaddf1bc0ada" dependencies = [ "arrow", "async-trait", @@ -2273,7 +2281,8 @@ dependencies = [ [[package]] name = "datafusion-datasource-json" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "402f93242ae08ef99139ee2c528a49d087efe88d5c7b2c3ff5480855a40ce54f" dependencies = [ "arrow", "async-trait", @@ -2295,7 +2304,8 @@ dependencies = [ [[package]] name = "datafusion-datasource-parquet" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffd2499c1bee0eeccf6a57156105700eeeb17bc701899ac719183c4e74231450" dependencies = [ "arrow", "async-trait", @@ -2325,12 +2335,14 @@ dependencies = [ [[package]] name = "datafusion-doc" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb9e7e5d11130c48c8bd4e80c79a9772dd28ce6dc330baca9246205d245b9e2e" [[package]] name = "datafusion-execution" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37a8643ab852eb68864e1b72ae789e8066282dce48eea6347ffb0aee33d1ccc0" dependencies = [ "arrow", "arrow-buffer", @@ -2352,7 +2364,8 @@ dependencies = [ [[package]] name = "datafusion-expr" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6932f4d71eed9c8d9341476a2b845aadfabde5495d08dbcd8fc23881f49fa7a0" dependencies = [ "arrow", "arrow-schema", @@ -2373,7 +2386,8 @@ dependencies = [ [[package]] name = "datafusion-expr-common" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0225491839a31b1f7d2cb8092c2d50792e2fe1c1724e4e6d08e011f5feaf4ed2" dependencies = [ "arrow", "datafusion-common", @@ -2384,7 +2398,8 @@ dependencies = [ [[package]] name = "datafusion-functions" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14872c47bfc3d21e53ec82f57074e6987a15941c1e2f43cde4ac6ae2746634e3" dependencies = [ "arrow", "arrow-buffer", @@ -2415,7 +2430,8 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75a2ca14e1b609be21e657e2d3130b2f446456b08393b377bb721a33952d2e09" dependencies = [ "arrow", "datafusion-common", @@ -2435,7 +2451,8 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate-common" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ece74ba09092d2ef9c9b54a38445450aea292a1f8b04faf531936b723a24b3c" dependencies = [ "arrow", "datafusion-common", @@ -2446,7 +2463,8 @@ dependencies = [ [[package]] name = "datafusion-functions-nested" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f3e3f9ee8ca59bf70518802107de6f1b88a9509efdc629fadc5de9d6b2d5ef5" dependencies = [ "arrow", "arrow-ord", @@ -2470,7 +2488,8 @@ dependencies = [ [[package]] name = "datafusion-functions-table" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89161dffc22cf2b50f9f4b1bee83b5221d3b4ed7c2e37fd7aa2b22a5297b3a26" dependencies = [ "arrow", "async-trait", @@ -2485,7 +2504,8 @@ dependencies = [ [[package]] name = "datafusion-functions-window" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7339345b226b3874037708bf5023ba1c2de705128f8457a095aae5ae9cb9c78" dependencies = [ "arrow", "datafusion-common", @@ -2501,7 +2521,8 @@ dependencies = [ [[package]] name = "datafusion-functions-window-common" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa84836dc2392df6f43d6a29d37fb56a8ebdc8b3f4e10ae8dc15861fd20278fb" dependencies = [ "datafusion-common", "datafusion-physical-expr-common", @@ -2510,7 +2531,8 @@ dependencies = [ [[package]] name = "datafusion-macros" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "587164e03ad68732aa9e7bfe5686e3f25970d4c64fd4bd80790749840892dae5" dependencies = [ "datafusion-doc", "quote", @@ -2520,7 +2542,8 @@ dependencies = [ [[package]] name = "datafusion-optimizer" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77f20e8cf9e8654d92f4c16b24c487353ee5bf153ffc12d5772cd399ab8cd281" dependencies = [ "arrow", "chrono", @@ -2538,7 +2561,8 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f015a4a82f6f7ff7e1d8d4bf3870a936752fa38b17705dfcc14adef95aa8922c" dependencies = [ "arrow", "datafusion-common", @@ -2558,7 +2582,8 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-adapter" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51e6ffff8acdfe54e0ea15ccf38115c4a9184433b0439f42907637928d00a235" dependencies = [ "arrow", "datafusion-common", @@ -2572,7 +2597,8 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-common" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7967a3e171c6a4bf09474b3f7a14f1a3db13ed1714ba12156f33fcce2bba54e8" dependencies = [ "arrow", "chrono", @@ -2588,7 +2614,8 @@ dependencies = [ [[package]] name = "datafusion-physical-optimizer" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ff803e2a96054cb6d83f35f9e60fd4f42eac515e1932bd1b2dbc91d5fcbf36" dependencies = [ "arrow", "datafusion-common", @@ -2605,7 +2632,8 @@ dependencies = [ [[package]] name = "datafusion-physical-plan" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "776ee54d47d15bdb126452f9ca17b03761e3b004682914beaedd3f86eb507fbc" dependencies = [ "arrow", "arrow-data", @@ -2637,7 +2665,8 @@ dependencies = [ [[package]] name = "datafusion-pruning" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5fb9e5774660aa69c3ba93c610f175f75b65cb8c3776edb3626de8f3a4f4ee3" dependencies = [ "arrow", "datafusion-common", @@ -2652,7 +2681,8 @@ dependencies = [ [[package]] name = "datafusion-session" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15ce715fa2a61f4623cc234bcc14a3ef6a91f189128d5b14b468a6a17cdfc417" dependencies = [ "async-trait", "datafusion-common", @@ -2665,7 +2695,8 @@ dependencies = [ [[package]] name = "datafusion-spark" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "390bb0bf37cb2b95ffd65eacd66f60df50793d1f94097799e416f39477a51957" dependencies = [ "arrow", "bigdecimal", @@ -2694,7 +2725,8 @@ dependencies = [ [[package]] name = "datafusion-sql" version = "54.0.0" -source = "git+https://github.com/apache/datafusion.git?branch=branch-54#b508f1f9d4ec5d65795ec58cf85100c7b0dce6d6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6094ad36a3ed6d7ac87b20b479b2d0b118250f66cf997603829fdc65b44a7099" dependencies = [ "arrow", "bigdecimal", @@ -2924,7 +2956,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -3012,7 +3044,7 @@ version = "25.12.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35f6839d7b3b98adde531effaf34f0c2badc6f4735d26fe74709d8e513a96ef3" dependencies = [ - "bitflags 2.12.1", + "bitflags 2.13.0", "rustc_version", ] @@ -3271,7 +3303,7 @@ dependencies = [ "fnv", "futures-core", "futures-sink", - "http 1.4.1", + "http 1.4.2", "indexmap 2.14.0", "slab", "tokio", @@ -3405,9 +3437,9 @@ dependencies = [ [[package]] name = "http" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8be7462df143984c4598a256ef469b251d7d7f9e271135073e78fc535414f3d0" +checksum = "6970f50e31d6fc17d3fa27329444bfa74e196cf62e95052a3f6fee181dba6425" dependencies = [ "bytes", "itoa", @@ -3431,7 +3463,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.4.1", + "http 1.4.2", ] [[package]] @@ -3442,7 +3474,7 @@ checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" dependencies = [ "bytes", "futures-core", - "http 1.4.1", + "http 1.4.2", "http-body 1.0.1", "pin-project-lite", ] @@ -3479,7 +3511,7 @@ dependencies = [ "futures-channel", "futures-core", "h2", - "http 1.4.1", + "http 1.4.2", "http-body 1.0.1", "httparse", "itoa", @@ -3495,7 +3527,7 @@ version = "0.27.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ca68d021ef39cf6463ab54c1d0f5daf03377b70561305bb89a8f83aab66e0f" dependencies = [ - "http 1.4.1", + "http 1.4.2", "hyper", "hyper-util", "rustls", @@ -3515,7 +3547,7 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "http 1.4.1", + "http 1.4.2", "http-body 1.0.1", "hyper", "ipnet", @@ -3821,7 +3853,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -4177,9 +4209,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.31" +version = "0.4.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "113b30b4cd05f7c06868fdb2854f66a7b9fece9a48425351cd532e810d74024f" +checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a" dependencies = [ "serde_core", "value-bag", @@ -4317,9 +4349,9 @@ dependencies = [ [[package]] name = "mock_instant" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dce6dd36094cac388f119d2e9dc82dc730ef91c32a6222170d630e5414b956e6" +checksum = "9bb517913cfcfb9eeda59f36020269075a152701a01606c612f547e4890be399" [[package]] name = "moka" @@ -4504,7 +4536,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "http 1.4.1", + "http 1.4.2", "http-body-util", "httparse", "humantime", @@ -4601,7 +4633,7 @@ dependencies = [ "base64", "bytes", "futures", - "http 1.4.1", + "http 1.4.2", "http-body 1.0.1", "jiff", "log", @@ -4626,7 +4658,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "048b1b29c503263bdd80a9afe46a68cd02ea9bd361185b1feab4b151078998e9" dependencies = [ "futures", - "http 1.4.1", + "http 1.4.2", "mea", "opendal-core", ] @@ -4669,7 +4701,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f9884c2d8cf8ba2bb077d79c877dac5863ba3bab9e2c9c1e41a2e0491404772" dependencies = [ "bytes", - "http 1.4.1", + "http 1.4.2", "log", "opendal-core", "opendal-service-azure-common", @@ -4687,7 +4719,7 @@ version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffb0e45d6c8dcf66ce2da20e241bcb80e6e540e109a4ff20f318f6c9b4c54e0c" dependencies = [ - "http 1.4.1", + "http 1.4.2", "opendal-core", ] @@ -4713,7 +4745,7 @@ checksum = "70a49477a10163431896d106136117f5670717f9c9e49cf6f710528800c6633a" dependencies = [ "async-trait", "bytes", - "http 1.4.1", + "http 1.4.2", "log", "opendal-core", "percent-encoding", @@ -4748,7 +4780,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29c8a917829ad06d21b639558532cb0101fe49b040d946d673a73018683fac05" dependencies = [ "bytes", - "http 1.4.1", + "http 1.4.2", "log", "opendal-core", "quick-xml 0.38.4", @@ -4767,7 +4799,7 @@ dependencies = [ "base64", "bytes", "crc32c", - "http 1.4.1", + "http 1.4.2", "log", "md-5 0.10.6", "opendal-core", @@ -5239,7 +5271,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25485360a54d6861439d60facef26de713b1e126bf015ec8f98239467a2b82f7" dependencies = [ - "bitflags 2.12.1", + "bitflags 2.13.0", "chrono", "flate2", "procfs-core", @@ -5252,16 +5284,16 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6401bf7b6af22f78b563665d15a22e9aef27775b79b149a66ca022468a4e405" dependencies = [ - "bitflags 2.12.1", + "bitflags 2.13.0", "chrono", "hex", ] [[package]] name = "prost" -version = "0.14.3" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ea70524a2f82d518bce41317d0fae74151505651af45faf1ffbd6fd33f0568" +checksum = "528ac67416ff8646872a3c02cad9cc4ee5dc9f9540c9b10771855c95cb2e5ae1" dependencies = [ "bytes", "prost-derive", @@ -5269,12 +5301,12 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.14.3" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "343d3bd7056eda839b03204e68deff7d1b13aba7af2b2fd16890697274262ee7" +checksum = "03da047801ff44bb6a4d407d4860c05fd70bb81714e6b2f3812603d5b145b042" dependencies = [ "heck", - "itertools 0.14.0", + "itertools 0.13.0", "log", "multimap", "petgraph", @@ -5288,12 +5320,12 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.14.3" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b" +checksum = "b570b25f7617e43d59005d0990ccb79e950a423952cea19671b7a876da390adf" dependencies = [ "anyhow", - "itertools 0.14.0", + "itertools 0.13.0", "proc-macro2", "quote", "syn 2.0.117", @@ -5301,9 +5333,9 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.14.3" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8991c4cbdb8bc5b11f0b074ffe286c30e523de90fee5ba8132f1399f23cb3dd7" +checksum = "f94967dc7688f3054c7fac87473ffae4cc4c3904800e2d9f5b857246d8963b0a" dependencies = [ "prost", ] @@ -5406,7 +5438,7 @@ dependencies = [ "once_cell", "socket2", "tracing", - "windows-sys 0.60.2", + "windows-sys 0.59.0", ] [[package]] @@ -5531,7 +5563,7 @@ version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ - "bitflags 2.12.1", + "bitflags 2.13.0", ] [[package]] @@ -5597,7 +5629,7 @@ checksum = "372266b4733756738eeb199a98188037d27a0989980e2600ae7ce1faf00a867d" dependencies = [ "anyhow", "form_urlencoded", - "http 1.4.1", + "http 1.4.2", "log", "percent-encoding", "reqsign-core", @@ -5616,7 +5648,7 @@ dependencies = [ "bytes", "form_urlencoded", "hex", - "http 1.4.1", + "http 1.4.2", "log", "percent-encoding", "quick-xml 0.40.1", @@ -5638,7 +5670,7 @@ dependencies = [ "base64", "bytes", "form_urlencoded", - "http 1.4.1", + "http 1.4.2", "log", "pem", "percent-encoding", @@ -5662,7 +5694,7 @@ dependencies = [ "futures", "hex", "hmac 0.13.0", - "http 1.4.1", + "http 1.4.2", "jiff", "log", "percent-encoding", @@ -5692,7 +5724,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb215d0876a18b6bd9cdd380b589e5292aaa638ca15266de794b1122d898b6b2" dependencies = [ "form_urlencoded", - "http 1.4.1", + "http 1.4.2", "log", "percent-encoding", "reqsign-aws-v4", @@ -5714,7 +5746,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http 1.4.1", + "http 1.4.2", "http-body 1.0.1", "http-body-util", "hyper", @@ -5755,7 +5787,7 @@ dependencies = [ "bytes", "futures-core", "futures-util", - "http 1.4.1", + "http 1.4.2", "http-body 1.0.1", "http-body-util", "hyper", @@ -5880,7 +5912,7 @@ version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ - "bitflags 2.12.1", + "bitflags 2.13.0", "errno", "libc", "linux-raw-sys 0.4.15", @@ -5893,11 +5925,11 @@ version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" dependencies = [ - "bitflags 2.12.1", + "bitflags 2.13.0", "errno", "libc", "linux-raw-sys 0.12.1", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -5955,7 +5987,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -6062,7 +6094,7 @@ version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" dependencies = [ - "bitflags 2.12.1", + "bitflags 2.13.0", "core-foundation", "core-foundation-sys", "libc", @@ -6189,9 +6221,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.20.0" +version = "3.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e72c1c2cb7b223fafb600a619537a871c2818583d619401b785e7c0b746ccde2" +checksum = "76a5c54c7310e7b8b9577c286d7e399ddd876c3e12b3ed917a8aabc4b96e9e8c" dependencies = [ "base64", "bs58", @@ -6209,9 +6241,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.20.0" +version = "3.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b90c488738ecb4fb0262f41f43bc40efc5868d9fb744319ddf5f5317f417bfac" +checksum = "84d57bc0c8b9a17920c178daa6bb924850d54a9c97ab45194bb8c17ad66bb660" dependencies = [ "darling 0.23.0", "proc-macro2", @@ -6536,7 +6568,7 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix 1.1.4", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -6790,10 +6822,10 @@ version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840" dependencies = [ - "bitflags 2.12.1", + "bitflags 2.13.0", "bytes", "futures-util", - "http 1.4.1", + "http 1.4.2", "http-body 1.0.1", "pin-project-lite", "tower", @@ -7192,7 +7224,7 @@ version = "0.244.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" dependencies = [ - "bitflags 2.12.1", + "bitflags 2.13.0", "hashbrown 0.15.5", "indexmap 2.14.0", "semver", @@ -7261,7 +7293,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -7356,15 +7388,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-sys" -version = "0.60.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" -dependencies = [ - "windows-targets 0.53.5", -] - [[package]] name = "windows-sys" version = "0.61.2" @@ -7398,30 +7421,13 @@ dependencies = [ "windows_aarch64_gnullvm 0.52.6", "windows_aarch64_msvc 0.52.6", "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm 0.52.6", + "windows_i686_gnullvm", "windows_i686_msvc 0.52.6", "windows_x86_64_gnu 0.52.6", "windows_x86_64_gnullvm 0.52.6", "windows_x86_64_msvc 0.52.6", ] -[[package]] -name = "windows-targets" -version = "0.53.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" -dependencies = [ - "windows-link", - "windows_aarch64_gnullvm 0.53.1", - "windows_aarch64_msvc 0.53.1", - "windows_i686_gnu 0.53.1", - "windows_i686_gnullvm 0.53.1", - "windows_i686_msvc 0.53.1", - "windows_x86_64_gnu 0.53.1", - "windows_x86_64_gnullvm 0.53.1", - "windows_x86_64_msvc 0.53.1", -] - [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" @@ -7434,12 +7440,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" - [[package]] name = "windows_aarch64_msvc" version = "0.42.2" @@ -7452,12 +7452,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" -[[package]] -name = "windows_aarch64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" - [[package]] name = "windows_i686_gnu" version = "0.42.2" @@ -7470,24 +7464,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" -[[package]] -name = "windows_i686_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" - [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" -[[package]] -name = "windows_i686_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" - [[package]] name = "windows_i686_msvc" version = "0.42.2" @@ -7500,12 +7482,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" -[[package]] -name = "windows_i686_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" - [[package]] name = "windows_x86_64_gnu" version = "0.42.2" @@ -7518,12 +7494,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" -[[package]] -name = "windows_x86_64_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" - [[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" @@ -7536,12 +7506,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" - [[package]] name = "windows_x86_64_msvc" version = "0.42.2" @@ -7554,12 +7518,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" -[[package]] -name = "windows_x86_64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" - [[package]] name = "wit-bindgen" version = "0.51.0" @@ -7624,7 +7582,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" dependencies = [ "anyhow", - "bitflags 2.12.1", + "bitflags 2.13.0", "indexmap 2.14.0", "log", "serde", @@ -7678,9 +7636,9 @@ checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" [[package]] name = "yoke" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca" +checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5" dependencies = [ "stable_deref_trait", "yoke-derive", diff --git a/native/Cargo.toml b/native/Cargo.toml index 295d44c671..b5fefa9339 100644 --- a/native/Cargo.toml +++ b/native/Cargo.toml @@ -38,10 +38,10 @@ arrow = { version = "58.3.0", features = ["prettyprint", "ffi", "chrono-tz"] } async-trait = { version = "0.1" } bytes = { version = "1.11.1" } parquet = { version = "58.3.0", default-features = false, features = ["experimental"] } -datafusion = { git = "https://github.com/apache/datafusion.git", branch = "branch-54", default-features = false, features = ["unicode_expressions", "crypto_expressions", "nested_expressions", "parquet"] } -datafusion-datasource = { git = "https://github.com/apache/datafusion.git", branch = "branch-54" } -datafusion-physical-expr-adapter = { git = "https://github.com/apache/datafusion.git", branch = "branch-54" } -datafusion-spark = { git = "https://github.com/apache/datafusion.git", branch = "branch-54", features = ["core"] } +datafusion = { version = "54.0.0", default-features = false, features = ["unicode_expressions", "crypto_expressions", "nested_expressions", "parquet"] } +datafusion-datasource = { version = "54.0.0" } +datafusion-physical-expr-adapter = { version = "54.0.0" } +datafusion-spark = { version = "54.0.0", features = ["core"] } datafusion-comet-spark-expr = { path = "spark-expr" } datafusion-comet-common = { path = "common" } datafusion-comet-jni-bridge = { path = "jni-bridge" } diff --git a/native/core/Cargo.toml b/native/core/Cargo.toml index 08b16592d4..ad4940e558 100644 --- a/native/core/Cargo.toml +++ b/native/core/Cargo.toml @@ -92,7 +92,7 @@ jni = { version = "0.22.4", features = ["invocation"] } lazy_static = "1.4" assertables = "9" hex = "0.4.3" -datafusion-functions-nested = { git = "https://github.com/apache/datafusion.git", branch = "branch-54" } +datafusion-functions-nested = { version = "54.0.0" } [features] backtrace = ["datafusion/backtrace"] diff --git a/native/spark-expr/src/datetime_funcs/next_day.rs b/native/spark-expr/src/datetime_funcs/next_day.rs index 207fc40a75..df4c2f9096 100644 --- a/native/spark-expr/src/datetime_funcs/next_day.rs +++ b/native/spark-expr/src/datetime_funcs/next_day.rs @@ -23,7 +23,6 @@ use datafusion::common::{utils::take_function_args, DataFusionError, Result}; use datafusion::logical_expr::{ ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, Volatility, }; -use std::any::Any; use std::sync::Arc; /// Spark-compatible `next_day(start_date, day_of_week)` function. @@ -80,10 +79,6 @@ fn next_date_for_day_of_week(days: i32, weekday: Weekday) -> Option { } impl ScalarUDFImpl for SparkNextDay { - fn as_any(&self) -> &dyn Any { - self - } - fn name(&self) -> &str { "next_day" } diff --git a/native/spark-expr/src/json_funcs/json_array_length.rs b/native/spark-expr/src/json_funcs/json_array_length.rs index eef879da3c..272b0b72d5 100644 --- a/native/spark-expr/src/json_funcs/json_array_length.rs +++ b/native/spark-expr/src/json_funcs/json_array_length.rs @@ -23,8 +23,6 @@ use datafusion::logical_expr::{ ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, Volatility, }; -use std::any::Any; - use serde::de::{IgnoredAny, SeqAccess, Visitor}; use serde::Deserializer; use std::fmt; @@ -53,10 +51,6 @@ impl JsonArrayLength { } impl ScalarUDFImpl for JsonArrayLength { - fn as_any(&self) -> &dyn Any { - self - } - fn name(&self) -> &str { "json_array_length" }