From 40e44df7632459d2f2e135b5c7c753cfc11e5387 Mon Sep 17 00:00:00 2001 From: Adam Gutglick Date: Mon, 2 Mar 2026 12:44:03 +0000 Subject: [PATCH 1/4] Update to DataFusion 53 Signed-off-by: Adam Gutglick --- Cargo.lock | 1110 +++++++++++++------- Cargo.toml | 42 +- vortex-bench/src/random_access/take.rs | 3 +- vortex-datafusion/src/persistent/format.rs | 54 +- vortex-datafusion/src/persistent/opener.rs | 8 +- vortex-io/src/object_store/read_at.rs | 1 + vortex-io/src/object_store/write.rs | 1 + 7 files changed, 779 insertions(+), 440 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4bd2006c54e..039e9ebdb36 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -234,19 +234,40 @@ version = "57.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4754a624e5ae42081f464514be454b39711daae0458906dacde5f4c632f33a8" dependencies = [ - "arrow-arith", - "arrow-array", - "arrow-buffer", - "arrow-cast", - "arrow-csv", - "arrow-data", - "arrow-ipc", - "arrow-json", - "arrow-ord", - "arrow-row", - "arrow-schema", - "arrow-select", - "arrow-string", + "arrow-arith 57.3.0", + "arrow-array 57.3.0", + "arrow-buffer 57.3.0", + "arrow-cast 57.3.0", + "arrow-csv 57.3.0", + "arrow-data 57.3.0", + "arrow-ipc 57.3.0", + "arrow-json 57.3.0", + "arrow-ord 57.3.0", + "arrow-row 57.3.0", + "arrow-schema 57.3.0", + "arrow-select 57.3.0", + "arrow-string 57.3.0", +] + +[[package]] +name = "arrow" +version = "58.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "602268ce9f569f282cedb9a9f6bac569b680af47b9b077d515900c03c5d190da" +dependencies = [ + "arrow-arith 58.0.0", + "arrow-array 58.0.0", + "arrow-buffer 58.0.0", + "arrow-cast 58.0.0", + "arrow-csv 58.0.0", + "arrow-data 58.0.0", + "arrow-ipc 58.0.0", + "arrow-json 58.0.0", + "arrow-ord 58.0.0", + "arrow-row 58.0.0", + "arrow-schema 58.0.0", + "arrow-select 58.0.0", + "arrow-string 58.0.0", ] [[package]] @@ -255,10 +276,24 @@ version = "57.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7b3141e0ec5145a22d8694ea8b6d6f69305971c4fa1c1a13ef0195aef2d678b" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", + "arrow-array 57.3.0", + "arrow-buffer 57.3.0", + "arrow-data 57.3.0", + "arrow-schema 57.3.0", + "chrono", + "num-traits", +] + +[[package]] +name = "arrow-arith" +version = "58.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd53c6bf277dea91f136ae8e3a5d7041b44b5e489e244e637d00ae302051f56f" +dependencies = [ + "arrow-array 58.0.0", + "arrow-buffer 58.0.0", + "arrow-data 58.0.0", + "arrow-schema 58.0.0", "chrono", "num-traits", ] @@ -270,9 +305,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c8955af33b25f3b175ee10af580577280b4bd01f7e823d94c7cdef7cf8c9aef" dependencies = [ "ahash 0.8.12", - "arrow-buffer", - "arrow-data", - "arrow-schema", + "arrow-buffer 57.3.0", + "arrow-data 57.3.0", + "arrow-schema 57.3.0", + "chrono", + "chrono-tz", + "half", + "hashbrown 0.16.1", + "num-complex", + "num-integer", + "num-traits", +] + +[[package]] +name = "arrow-array" +version = "58.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e53796e07a6525edaf7dc28b540d477a934aff14af97967ad1d5550878969b9e" +dependencies = [ + "ahash 0.8.12", + "arrow-buffer 58.0.0", + "arrow-data 58.0.0", + "arrow-schema 58.0.0", "chrono", "chrono-tz", "half", @@ -294,18 +348,52 @@ dependencies = [ "num-traits", ] +[[package]] +name = "arrow-buffer" +version = "58.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2c1a85bb2e94ee10b76531d8bc3ce9b7b4c0d508cabfb17d477f63f2617bd20" +dependencies = [ + "bytes", + "half", + "num-bigint", + "num-traits", +] + [[package]] name = "arrow-cast" version = "57.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "646bbb821e86fd57189c10b4fcdaa941deaf4181924917b0daa92735baa6ada5" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-ord", - "arrow-schema", - "arrow-select", + "arrow-array 57.3.0", + "arrow-buffer 57.3.0", + "arrow-data 57.3.0", + "arrow-ord 57.3.0", + "arrow-schema 57.3.0", + "arrow-select 57.3.0", + "atoi", + "base64", + "chrono", + "comfy-table", + "half", + "lexical-core", + "num-traits", + "ryu", +] + +[[package]] +name = "arrow-cast" +version = "58.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89fb245db6b0e234ed8e15b644edb8664673fefe630575e94e62cd9d489a8a26" +dependencies = [ + "arrow-array 58.0.0", + "arrow-buffer 58.0.0", + "arrow-data 58.0.0", + "arrow-ord 58.0.0", + "arrow-schema 58.0.0", + "arrow-select 58.0.0", "atoi", "base64", "chrono", @@ -322,9 +410,24 @@ version = "57.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da746f4180004e3ce7b83c977daf6394d768332349d3d913998b10a120b790a" dependencies = [ - "arrow-array", - "arrow-cast", - "arrow-schema", + "arrow-array 57.3.0", + "arrow-cast 57.3.0", + "arrow-schema 57.3.0", + "chrono", + "csv", + "csv-core", + "regex", +] + +[[package]] +name = "arrow-csv" +version = "58.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d374882fb465a194462527c0c15a93aa19a554cf690a6b77a26b2a02539937a7" +dependencies = [ + "arrow-array 58.0.0", + "arrow-cast 58.0.0", + "arrow-schema 58.0.0", "chrono", "csv", "csv-core", @@ -337,8 +440,21 @@ version = "57.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fdd994a9d28e6365aa78e15da3f3950c0fdcea6b963a12fa1c391afb637b304" dependencies = [ - "arrow-buffer", - "arrow-schema", + "arrow-buffer 57.3.0", + "arrow-schema 57.3.0", + "half", + "num-integer", + "num-traits", +] + +[[package]] +name = "arrow-data" +version = "58.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "189d210bc4244c715fa3ed9e6e22864673cccb73d5da28c2723fb2e527329b33" +dependencies = [ + "arrow-buffer 58.0.0", + "arrow-schema 58.0.0", "half", "num-integer", "num-traits", @@ -350,11 +466,27 @@ version = "57.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abf7df950701ab528bf7c0cf7eeadc0445d03ef5d6ffc151eaae6b38a58feff1" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", - "arrow-select", + "arrow-array 57.3.0", + "arrow-buffer 57.3.0", + "arrow-data 57.3.0", + "arrow-schema 57.3.0", + "arrow-select 57.3.0", + "flatbuffers", + "lz4_flex 0.12.0", + "zstd", +] + +[[package]] +name = "arrow-ipc" +version = "58.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7968c2e5210c41f4909b2ef76f6e05e172b99021c2def5edf3cc48fdd39d1d6c" +dependencies = [ + "arrow-array 58.0.0", + "arrow-buffer 58.0.0", + "arrow-data 58.0.0", + "arrow-schema 58.0.0", + "arrow-select 58.0.0", "flatbuffers", "lz4_flex 0.12.0", "zstd", @@ -366,11 +498,35 @@ version = "57.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ff8357658bedc49792b13e2e862b80df908171275f8e6e075c460da5ee4bf86" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-cast", - "arrow-data", - "arrow-schema", + "arrow-array 57.3.0", + "arrow-buffer 57.3.0", + "arrow-cast 57.3.0", + "arrow-data 57.3.0", + "arrow-schema 57.3.0", + "chrono", + "half", + "indexmap", + "itoa", + "lexical-core", + "memchr", + "num-traits", + "ryu", + "serde_core", + "serde_json", + "simdutf8", +] + +[[package]] +name = "arrow-json" +version = "58.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92111dba5bf900f443488e01f00d8c4ddc2f47f5c50039d18120287b580baa22" +dependencies = [ + "arrow-array 58.0.0", + "arrow-buffer 58.0.0", + "arrow-cast 58.0.0", + "arrow-data 58.0.0", + "arrow-schema 58.0.0", "chrono", "half", "indexmap", @@ -390,11 +546,24 @@ version = "57.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7d8f1870e03d4cbed632959498bcc84083b5a24bded52905ae1695bd29da45b" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", - "arrow-select", + "arrow-array 57.3.0", + "arrow-buffer 57.3.0", + "arrow-data 57.3.0", + "arrow-schema 57.3.0", + "arrow-select 57.3.0", +] + +[[package]] +name = "arrow-ord" +version = "58.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "211136cb253577ee1a6665f741a13136d4e563f64f5093ffd6fb837af90b9495" +dependencies = [ + "arrow-array 58.0.0", + "arrow-buffer 58.0.0", + "arrow-data 58.0.0", + "arrow-schema 58.0.0", + "arrow-select 58.0.0", ] [[package]] @@ -403,10 +572,23 @@ version = "57.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18228633bad92bff92a95746bbeb16e5fc318e8382b75619dec26db79e4de4c0" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", + "arrow-array 57.3.0", + "arrow-buffer 57.3.0", + "arrow-data 57.3.0", + "arrow-schema 57.3.0", + "half", +] + +[[package]] +name = "arrow-row" +version = "58.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e0f20145f9f5ea3fe383e2ba7a7487bf19be36aa9dbf5dd6a1f92f657179663" +dependencies = [ + "arrow-array 58.0.0", + "arrow-buffer 58.0.0", + "arrow-data 58.0.0", + "arrow-schema 58.0.0", "half", ] @@ -421,6 +603,17 @@ dependencies = [ "serde_json", ] +[[package]] +name = "arrow-schema" +version = "58.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b47e0ca91cc438d2c7879fe95e0bca5329fff28649e30a88c6f760b1faeddcb" +dependencies = [ + "bitflags", + "serde_core", + "serde_json", +] + [[package]] name = "arrow-select" version = "57.3.0" @@ -428,10 +621,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68bf3e3efbd1278f770d67e5dc410257300b161b93baedb3aae836144edcaf4b" dependencies = [ "ahash 0.8.12", - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", + "arrow-array 57.3.0", + "arrow-buffer 57.3.0", + "arrow-data 57.3.0", + "arrow-schema 57.3.0", + "num-traits", +] + +[[package]] +name = "arrow-select" +version = "58.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "750a7d1dda177735f5e82a314485b6915c7cccdbb278262ac44090f4aba4a325" +dependencies = [ + "ahash 0.8.12", + "arrow-array 58.0.0", + "arrow-buffer 58.0.0", + "arrow-data 58.0.0", + "arrow-schema 58.0.0", "num-traits", ] @@ -441,11 +648,28 @@ version = "57.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85e968097061b3c0e9fe3079cf2e703e487890700546b5b0647f60fca1b5a8d8" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", - "arrow-select", + "arrow-array 57.3.0", + "arrow-buffer 57.3.0", + "arrow-data 57.3.0", + "arrow-schema 57.3.0", + "arrow-select 57.3.0", + "memchr", + "num-traits", + "regex", + "regex-syntax", +] + +[[package]] +name = "arrow-string" +version = "58.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1eab1208bc4fe55d768cdc9b9f3d9df5a794cdb3ee2586bf89f9b30dc31ad8c" +dependencies = [ + "arrow-array 58.0.0", + "arrow-buffer 58.0.0", + "arrow-data 58.0.0", + "arrow-schema 58.0.0", + "arrow-select 58.0.0", "memchr", "num-traits", "regex", @@ -718,7 +942,7 @@ dependencies = [ "bitflags", "cexpr", "clang-sys", - "itertools 0.13.0", + "itertools 0.10.5", "log", "prettyplease", "proc-macro2", @@ -1344,8 +1568,8 @@ name = "compress-bench" version = "0.1.0" dependencies = [ "anyhow", - "arrow-array", - "arrow-schema", + "arrow-array 58.0.0", + "arrow-schema 58.0.0", "async-trait", "bytes", "clap", @@ -1353,7 +1577,7 @@ dependencies = [ "indicatif", "itertools 0.14.0", "lance-bench", - "parquet", + "parquet 58.0.0", "regex", "tokio", "tracing", @@ -1814,8 +2038,8 @@ version = "51.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ba7cb113e9c0bedf9e9765926031e132fa05a1b09ba6e93a6d1a4d7044457b8" dependencies = [ - "arrow", - "arrow-schema", + "arrow 57.3.0", + "arrow-schema 57.3.0", "async-trait", "bytes", "chrono", @@ -1846,12 +2070,12 @@ dependencies = [ "futures", "itertools 0.14.0", "log", - "object_store", + "object_store 0.12.5", "parking_lot", "rand 0.9.2", "regex", "rstest", - "sqlparser", + "sqlparser 0.59.0", "tempfile", "tokio", "url", @@ -1861,11 +2085,10 @@ dependencies = [ [[package]] name = "datafusion" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d12ee9fdc6cdb5898c7691bb994f0ba606c4acc93a2258d78bb9f26ff8158bb3" +source = "git+https://github.com/apache/datafusion?branch=branch-53#85c675d197da52462a74c213a19a18fce87ff717" dependencies = [ - "arrow", - "arrow-schema", + "arrow 58.0.0", + "arrow-schema 58.0.0", "async-trait", "bytes", "bzip2", @@ -1901,12 +2124,12 @@ dependencies = [ "itertools 0.14.0", "liblzma", "log", - "object_store", + "object_store 0.13.1", "parking_lot", - "parquet", + "parquet 58.0.0", "rand 0.9.2", "regex", - "sqlparser", + "sqlparser 0.61.0", "tempfile", "tokio", "url", @@ -1926,7 +2149,7 @@ dependencies = [ "datafusion-physical-plan 52.1.0", "futures", "itertools 0.14.0", - "object_store", + "object_store 0.13.1", "opentelemetry", "opentelemetry-otlp", "opentelemetry_sdk", @@ -1946,7 +2169,7 @@ version = "51.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66a3a799f914a59b1ea343906a0486f17061f39509af74e874a866428951130d" dependencies = [ - "arrow", + "arrow 57.3.0", "async-trait", "dashmap", "datafusion-common 51.0.0", @@ -1960,7 +2183,7 @@ dependencies = [ "futures", "itertools 0.14.0", "log", - "object_store", + "object_store 0.12.5", "parking_lot", "tokio", ] @@ -1968,10 +2191,9 @@ dependencies = [ [[package]] name = "datafusion-catalog" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "462dc9ef45e5d688aeaae49a7e310587e81b6016b9d03bace5626ad0043e5a9e" +source = "git+https://github.com/apache/datafusion?branch=branch-53#85c675d197da52462a74c213a19a18fce87ff717" dependencies = [ - "arrow", + "arrow 58.0.0", "async-trait", "dashmap", "datafusion-common 52.1.0", @@ -1985,7 +2207,7 @@ dependencies = [ "futures", "itertools 0.14.0", "log", - "object_store", + "object_store 0.13.1", "parking_lot", "tokio", ] @@ -1996,7 +2218,7 @@ version = "51.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6db1b113c80d7a0febcd901476a57aef378e717c54517a163ed51417d87621b0" dependencies = [ - "arrow", + "arrow 57.3.0", "async-trait", "datafusion-catalog 51.0.0", "datafusion-common 51.0.0", @@ -2010,17 +2232,16 @@ dependencies = [ "futures", "itertools 0.14.0", "log", - "object_store", + "object_store 0.12.5", "tokio", ] [[package]] name = "datafusion-catalog-listing" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b96dbf1d728fc321817b744eb5080cdd75312faa6980b338817f68f3caa4208" +source = "git+https://github.com/apache/datafusion?branch=branch-53#85c675d197da52462a74c213a19a18fce87ff717" dependencies = [ - "arrow", + "arrow 58.0.0", "async-trait", "datafusion-catalog 52.1.0", "datafusion-common 52.1.0", @@ -2034,7 +2255,7 @@ dependencies = [ "futures", "itertools 0.14.0", "log", - "object_store", + "object_store 0.13.1", ] [[package]] @@ -2044,17 +2265,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c10f7659e96127d25e8366be7c8be4109595d6a2c3eac70421f380a7006a1b0" dependencies = [ "ahash 0.8.12", - "arrow", - "arrow-ipc", + "arrow 57.3.0", + "arrow-ipc 57.3.0", "chrono", "half", "hashbrown 0.14.5", "indexmap", "libc", "log", - "object_store", + "object_store 0.12.5", "paste", - "sqlparser", + "sqlparser 0.59.0", "tokio", "web-time", ] @@ -2062,24 +2283,24 @@ dependencies = [ [[package]] name = "datafusion-common" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3237a6ff0d2149af4631290074289cae548c9863c885d821315d54c6673a074a" +source = "git+https://github.com/apache/datafusion?branch=branch-53#85c675d197da52462a74c213a19a18fce87ff717" dependencies = [ "ahash 0.8.12", "apache-avro", - "arrow", - "arrow-ipc", + "arrow 58.0.0", + "arrow-ipc 58.0.0", "chrono", "half", "hashbrown 0.16.1", "indexmap", + "itertools 0.14.0", "libc", "log", - "object_store", - "parquet", + "object_store 0.13.1", + "parquet 58.0.0", "paste", "recursive", - "sqlparser", + "sqlparser 0.61.0", "tokio", "web-time", ] @@ -2098,8 +2319,7 @@ dependencies = [ [[package]] name = "datafusion-common-runtime" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70b5e34026af55a1bfccb1ef0a763cf1f64e77c696ffcf5a128a278c31236528" +source = "git+https://github.com/apache/datafusion?branch=branch-53#85c675d197da52462a74c213a19a18fce87ff717" dependencies = [ "futures", "log", @@ -2112,7 +2332,7 @@ version = "51.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fde13794244bc7581cd82f6fff217068ed79cdc344cafe4ab2c3a1c3510b38d6" dependencies = [ - "arrow", + "arrow 57.3.0", "async-trait", "bytes", "chrono", @@ -2129,7 +2349,7 @@ dependencies = [ "glob", "itertools 0.14.0", "log", - "object_store", + "object_store 0.12.5", "rand 0.9.2", "tokio", "url", @@ -2138,10 +2358,9 @@ dependencies = [ [[package]] name = "datafusion-datasource" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b2a6be734cc3785e18bbf2a7f2b22537f6b9fb960d79617775a51568c281842" +source = "git+https://github.com/apache/datafusion?branch=branch-53#85c675d197da52462a74c213a19a18fce87ff717" dependencies = [ - "arrow", + "arrow 58.0.0", "async-compression", "async-trait", "bytes", @@ -2162,7 +2381,7 @@ dependencies = [ "itertools 0.14.0", "liblzma", "log", - "object_store", + "object_store 0.13.1", "rand 0.9.2", "tokio", "tokio-util", @@ -2176,8 +2395,8 @@ version = "51.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "804fa9b4ecf3157982021770617200ef7c1b2979d57bec9044748314775a9aea" dependencies = [ - "arrow", - "arrow-ipc", + "arrow 57.3.0", + "arrow-ipc 57.3.0", "async-trait", "bytes", "datafusion-common 51.0.0", @@ -2190,18 +2409,17 @@ dependencies = [ "datafusion-session 51.0.0", "futures", "itertools 0.14.0", - "object_store", + "object_store 0.12.5", "tokio", ] [[package]] name = "datafusion-datasource-arrow" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1739b9b07c9236389e09c74f770e88aff7055250774e9def7d3f4f56b3dcc7be" +source = "git+https://github.com/apache/datafusion?branch=branch-53#85c675d197da52462a74c213a19a18fce87ff717" dependencies = [ - "arrow", - "arrow-ipc", + "arrow 58.0.0", + "arrow-ipc 58.0.0", "async-trait", "bytes", "datafusion-common 52.1.0", @@ -2214,18 +2432,17 @@ dependencies = [ "datafusion-session 52.1.0", "futures", "itertools 0.14.0", - "object_store", + "object_store 0.13.1", "tokio", ] [[package]] name = "datafusion-datasource-avro" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "828088c2fb681cc0e06fb42f541f76c82a0c10278f9fd6334e22c8d1e3574ee7" +source = "git+https://github.com/apache/datafusion?branch=branch-53#85c675d197da52462a74c213a19a18fce87ff717" dependencies = [ "apache-avro", - "arrow", + "arrow 58.0.0", "async-trait", "bytes", "datafusion-common 52.1.0", @@ -2235,7 +2452,7 @@ dependencies = [ "datafusion-session 52.1.0", "futures", "num-traits", - "object_store", + "object_store 0.13.1", ] [[package]] @@ -2244,7 +2461,7 @@ version = "51.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61a1641a40b259bab38131c5e6f48fac0717bedb7dc93690e604142a849e0568" dependencies = [ - "arrow", + "arrow 57.3.0", "async-trait", "bytes", "datafusion-common 51.0.0", @@ -2256,7 +2473,7 @@ dependencies = [ "datafusion-physical-plan 51.0.0", "datafusion-session 51.0.0", "futures", - "object_store", + "object_store 0.12.5", "regex", "tokio", ] @@ -2264,10 +2481,9 @@ dependencies = [ [[package]] name = "datafusion-datasource-csv" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c73bc54b518bbba7c7650299d07d58730293cfba4356f6f428cc94c20b7600" +source = "git+https://github.com/apache/datafusion?branch=branch-53#85c675d197da52462a74c213a19a18fce87ff717" dependencies = [ - "arrow", + "arrow 58.0.0", "async-trait", "bytes", "datafusion-common 52.1.0", @@ -2279,7 +2495,7 @@ dependencies = [ "datafusion-physical-plan 52.1.0", "datafusion-session 52.1.0", "futures", - "object_store", + "object_store 0.13.1", "regex", "tokio", ] @@ -2290,7 +2506,7 @@ version = "51.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adeacdb00c1d37271176f8fb6a1d8ce096baba16ea7a4b2671840c5c9c64fe85" dependencies = [ - "arrow", + "arrow 57.3.0", "async-trait", "bytes", "datafusion-common 51.0.0", @@ -2302,17 +2518,16 @@ dependencies = [ "datafusion-physical-plan 51.0.0", "datafusion-session 51.0.0", "futures", - "object_store", + "object_store 0.12.5", "tokio", ] [[package]] name = "datafusion-datasource-json" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37812c8494c698c4d889374ecfabbff780f1f26d9ec095dd1bddfc2a8ca12559" +source = "git+https://github.com/apache/datafusion?branch=branch-53#85c675d197da52462a74c213a19a18fce87ff717" dependencies = [ - "arrow", + "arrow 58.0.0", "async-trait", "bytes", "datafusion-common 52.1.0", @@ -2324,17 +2539,18 @@ dependencies = [ "datafusion-physical-plan 52.1.0", "datafusion-session 52.1.0", "futures", - "object_store", + "object_store 0.13.1", + "serde_json", "tokio", + "tokio-stream", ] [[package]] name = "datafusion-datasource-parquet" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2210937ecd9f0e824c397e73f4b5385c97cd1aff43ab2b5836fcfd2d321523fb" +source = "git+https://github.com/apache/datafusion?branch=branch-53#85c675d197da52462a74c213a19a18fce87ff717" dependencies = [ - "arrow", + "arrow 58.0.0", "async-trait", "bytes", "datafusion-common 52.1.0", @@ -2352,9 +2568,9 @@ dependencies = [ "futures", "itertools 0.14.0", "log", - "object_store", + "object_store 0.13.1", "parking_lot", - "parquet", + "parquet 58.0.0", "tokio", ] @@ -2367,8 +2583,7 @@ checksum = "2b99e13947667b36ad713549237362afb054b2d8f8cc447751e23ec61202db07" [[package]] name = "datafusion-doc" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c825f969126bc2ef6a6a02d94b3c07abff871acf4d6dd759ce1255edb7923ce" +source = "git+https://github.com/apache/datafusion?branch=branch-53#85c675d197da52462a74c213a19a18fce87ff717" [[package]] name = "datafusion-execution" @@ -2376,14 +2591,14 @@ version = "51.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "63695643190679037bc946ad46a263b62016931547bf119859c511f7ff2f5178" dependencies = [ - "arrow", + "arrow 57.3.0", "async-trait", "dashmap", "datafusion-common 51.0.0", "datafusion-expr 51.0.0", "futures", "log", - "object_store", + "object_store 0.12.5", "parking_lot", "rand 0.9.2", "tempfile", @@ -2393,18 +2608,19 @@ dependencies = [ [[package]] name = "datafusion-execution" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa03ef05a2c2f90dd6c743e3e111078e322f4b395d20d4b4d431a245d79521ae" +source = "git+https://github.com/apache/datafusion?branch=branch-53#85c675d197da52462a74c213a19a18fce87ff717" dependencies = [ - "arrow", + "arrow 58.0.0", + "arrow-buffer 58.0.0", "async-trait", "chrono", "dashmap", "datafusion-common 52.1.0", "datafusion-expr 52.1.0", + "datafusion-physical-expr-common 52.1.0", "futures", "log", - "object_store", + "object_store 0.13.1", "parking_lot", "rand 0.9.2", "tempfile", @@ -2417,7 +2633,7 @@ version = "51.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9a4787cbf5feb1ab351f789063398f67654a6df75c4d37d7f637dc96f951a91" dependencies = [ - "arrow", + "arrow 57.3.0", "async-trait", "chrono", "datafusion-common 51.0.0", @@ -2430,16 +2646,15 @@ dependencies = [ "itertools 0.14.0", "paste", "serde_json", - "sqlparser", + "sqlparser 0.59.0", ] [[package]] name = "datafusion-expr" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef33934c1f98ee695cc51192cc5f9ed3a8febee84fdbcd9131bf9d3a9a78276f" +source = "git+https://github.com/apache/datafusion?branch=branch-53#85c675d197da52462a74c213a19a18fce87ff717" dependencies = [ - "arrow", + "arrow 58.0.0", "async-trait", "chrono", "datafusion-common 52.1.0", @@ -2453,7 +2668,7 @@ dependencies = [ "paste", "recursive", "serde_json", - "sqlparser", + "sqlparser 0.61.0", ] [[package]] @@ -2462,7 +2677,7 @@ version = "51.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ce2fb1b8c15c9ac45b0863c30b268c69dc9ee7a1ee13ecf5d067738338173dc" dependencies = [ - "arrow", + "arrow 57.3.0", "datafusion-common 51.0.0", "indexmap", "itertools 0.14.0", @@ -2472,10 +2687,9 @@ dependencies = [ [[package]] name = "datafusion-expr-common" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "000c98206e3dd47d2939a94b6c67af4bfa6732dd668ac4fafdbde408fd9134ea" +source = "git+https://github.com/apache/datafusion?branch=branch-53#85c675d197da52462a74c213a19a18fce87ff717" dependencies = [ - "arrow", + "arrow 58.0.0", "datafusion-common 52.1.0", "indexmap", "itertools 0.14.0", @@ -2488,8 +2702,8 @@ version = "51.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "794a9db7f7b96b3346fc007ff25e994f09b8f0511b4cf7dff651fadfe3ebb28f" dependencies = [ - "arrow", - "arrow-buffer", + "arrow 57.3.0", + "arrow-buffer 57.3.0", "base64", "blake2", "blake3", @@ -2515,11 +2729,10 @@ dependencies = [ [[package]] name = "datafusion-functions" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "379b01418ab95ca947014066248c22139fe9af9289354de10b445bd000d5d276" +source = "git+https://github.com/apache/datafusion?branch=branch-53#85c675d197da52462a74c213a19a18fce87ff717" dependencies = [ - "arrow", - "arrow-buffer", + "arrow 58.0.0", + "arrow-buffer 58.0.0", "base64", "blake2", "blake3", @@ -2535,6 +2748,7 @@ dependencies = [ "itertools 0.14.0", "log", "md-5", + "memchr", "num-traits", "rand 0.9.2", "regex", @@ -2550,7 +2764,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c25210520a9dcf9c2b2cbbce31ebd4131ef5af7fc60ee92b266dc7d159cb305" dependencies = [ "ahash 0.8.12", - "arrow", + "arrow 57.3.0", "datafusion-common 51.0.0", "datafusion-doc 51.0.0", "datafusion-execution 51.0.0", @@ -2567,11 +2781,10 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd00d5454ba4c3f8ebbd04bd6a6a9dc7ced7c56d883f70f2076c188be8459e4c" +source = "git+https://github.com/apache/datafusion?branch=branch-53#85c675d197da52462a74c213a19a18fce87ff717" dependencies = [ "ahash 0.8.12", - "arrow", + "arrow 58.0.0", "datafusion-common 52.1.0", "datafusion-doc 52.1.0", "datafusion-execution 52.1.0", @@ -2582,6 +2795,7 @@ dependencies = [ "datafusion-physical-expr-common 52.1.0", "half", "log", + "num-traits", "paste", ] @@ -2592,7 +2806,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62f4a66f3b87300bb70f4124b55434d2ae3fe80455f3574701d0348da040b55d" dependencies = [ "ahash 0.8.12", - "arrow", + "arrow 57.3.0", "datafusion-common 51.0.0", "datafusion-expr-common 51.0.0", "datafusion-physical-expr-common 51.0.0", @@ -2601,11 +2815,10 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate-common" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aec06b380729a87210a4e11f555ec2d729a328142253f8d557b87593622ecc9f" +source = "git+https://github.com/apache/datafusion?branch=branch-53#85c675d197da52462a74c213a19a18fce87ff717" dependencies = [ "ahash 0.8.12", - "arrow", + "arrow 58.0.0", "datafusion-common 52.1.0", "datafusion-expr-common 52.1.0", "datafusion-physical-expr-common 52.1.0", @@ -2617,8 +2830,8 @@ version = "51.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae5c06eed03918dc7fe7a9f082a284050f0e9ecf95d72f57712d1496da03b8c4" dependencies = [ - "arrow", - "arrow-ord", + "arrow 57.3.0", + "arrow-ord 57.3.0", "datafusion-common 51.0.0", "datafusion-doc 51.0.0", "datafusion-execution 51.0.0", @@ -2637,11 +2850,10 @@ dependencies = [ [[package]] name = "datafusion-functions-nested" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904f48d45e0f1eb7d0eb5c0f80f2b5c6046a85454364a6b16a2e0b46f62e7dff" +source = "git+https://github.com/apache/datafusion?branch=branch-53#85c675d197da52462a74c213a19a18fce87ff717" dependencies = [ - "arrow", - "arrow-ord", + "arrow 58.0.0", + "arrow-ord 58.0.0", "datafusion-common 52.1.0", "datafusion-doc 52.1.0", "datafusion-execution 52.1.0", @@ -2652,7 +2864,9 @@ dependencies = [ "datafusion-functions-aggregate-common 52.1.0", "datafusion-macros 52.1.0", "datafusion-physical-expr-common 52.1.0", + "hashbrown 0.16.1", "itertools 0.14.0", + "itoa", "log", "paste", ] @@ -2663,7 +2877,7 @@ version = "51.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db4fed1d71738fbe22e2712d71396db04c25de4111f1ec252b8f4c6d3b25d7f5" dependencies = [ - "arrow", + "arrow 57.3.0", "async-trait", "datafusion-catalog 51.0.0", "datafusion-common 51.0.0", @@ -2676,10 +2890,9 @@ dependencies = [ [[package]] name = "datafusion-functions-table" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9a0d20e2b887e11bee24f7734d780a2588b925796ac741c3118dd06d5aa77f0" +source = "git+https://github.com/apache/datafusion?branch=branch-53#85c675d197da52462a74c213a19a18fce87ff717" dependencies = [ - "arrow", + "arrow 58.0.0", "async-trait", "datafusion-catalog 52.1.0", "datafusion-common 52.1.0", @@ -2695,7 +2908,7 @@ version = "51.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d92206aa5ae21892f1552b4d61758a862a70956e6fd7a95cb85db1de74bc6d1" dependencies = [ - "arrow", + "arrow 57.3.0", "datafusion-common 51.0.0", "datafusion-doc 51.0.0", "datafusion-expr 51.0.0", @@ -2710,10 +2923,9 @@ dependencies = [ [[package]] name = "datafusion-functions-window" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3414b0a07e39b6979fe3a69c7aa79a9f1369f1d5c8e52146e66058be1b285ee" +source = "git+https://github.com/apache/datafusion?branch=branch-53#85c675d197da52462a74c213a19a18fce87ff717" dependencies = [ - "arrow", + "arrow 58.0.0", "datafusion-common 52.1.0", "datafusion-doc 52.1.0", "datafusion-expr 52.1.0", @@ -2738,8 +2950,7 @@ dependencies = [ [[package]] name = "datafusion-functions-window-common" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf2feae63cd4754e31add64ce75cae07d015bce4bb41cd09872f93add32523a" +source = "git+https://github.com/apache/datafusion?branch=branch-53#85c675d197da52462a74c213a19a18fce87ff717" dependencies = [ "datafusion-common 52.1.0", "datafusion-physical-expr-common 52.1.0", @@ -2759,8 +2970,7 @@ dependencies = [ [[package]] name = "datafusion-macros" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4fe888aeb6a095c4bcbe8ac1874c4b9a4c7ffa2ba849db7922683ba20875aaf" +source = "git+https://github.com/apache/datafusion?branch=branch-53#85c675d197da52462a74c213a19a18fce87ff717" dependencies = [ "datafusion-doc 52.1.0", "quote", @@ -2773,7 +2983,7 @@ version = "51.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f35f9ec5d08b87fd1893a30c2929f2559c2f9806ca072d8fefca5009dc0f06a" dependencies = [ - "arrow", + "arrow 57.3.0", "chrono", "datafusion-common 51.0.0", "datafusion-expr 51.0.0", @@ -2789,10 +2999,9 @@ dependencies = [ [[package]] name = "datafusion-optimizer" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a6527c063ae305c11be397a86d8193936f4b84d137fe40bd706dfc178cf733c" +source = "git+https://github.com/apache/datafusion?branch=branch-53#85c675d197da52462a74c213a19a18fce87ff717" dependencies = [ - "arrow", + "arrow 58.0.0", "chrono", "datafusion-common 52.1.0", "datafusion-expr 52.1.0", @@ -2813,7 +3022,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c30cc8012e9eedcb48bbe112c6eff4ae5ed19cf3003cb0f505662e88b7014c5d" dependencies = [ "ahash 0.8.12", - "arrow", + "arrow 57.3.0", "datafusion-common 51.0.0", "datafusion-expr 51.0.0", "datafusion-expr-common 51.0.0", @@ -2831,11 +3040,10 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb028323dd4efd049dd8a78d78fe81b2b969447b39c51424167f973ac5811d9" +source = "git+https://github.com/apache/datafusion?branch=branch-53#85c675d197da52462a74c213a19a18fce87ff717" dependencies = [ "ahash 0.8.12", - "arrow", + "arrow 58.0.0", "datafusion-common 52.1.0", "datafusion-expr 52.1.0", "datafusion-expr-common 52.1.0", @@ -2858,7 +3066,7 @@ version = "51.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f9ff2dbd476221b1f67337699eff432781c4e6e1713d2aefdaa517dfbf79768" dependencies = [ - "arrow", + "arrow 57.3.0", "datafusion-common 51.0.0", "datafusion-expr 51.0.0", "datafusion-functions 51.0.0", @@ -2870,10 +3078,9 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-adapter" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78fe0826aef7eab6b4b61533d811234a7a9e5e458331ebbf94152a51fc8ab433" +source = "git+https://github.com/apache/datafusion?branch=branch-53#85c675d197da52462a74c213a19a18fce87ff717" dependencies = [ - "arrow", + "arrow 58.0.0", "datafusion-common 52.1.0", "datafusion-expr 52.1.0", "datafusion-functions 52.1.0", @@ -2889,7 +3096,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90da43e1ec550b172f34c87ec68161986ced70fd05c8d2a2add66eef9c276f03" dependencies = [ "ahash 0.8.12", - "arrow", + "arrow 57.3.0", "datafusion-common 51.0.0", "datafusion-expr-common 51.0.0", "hashbrown 0.14.5", @@ -2899,11 +3106,10 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-common" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfccd388620734c661bd8b7ca93c44cdd59fecc9b550eea416a78ffcbb29475f" +source = "git+https://github.com/apache/datafusion?branch=branch-53#85c675d197da52462a74c213a19a18fce87ff717" dependencies = [ "ahash 0.8.12", - "arrow", + "arrow 58.0.0", "chrono", "datafusion-common 52.1.0", "datafusion-expr-common 52.1.0", @@ -2919,7 +3125,7 @@ version = "51.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce9804f799acd7daef3be7aaffe77c0033768ed8fdbf5fb82fc4c5f2e6bc14e6" dependencies = [ - "arrow", + "arrow 57.3.0", "datafusion-common 51.0.0", "datafusion-execution 51.0.0", "datafusion-expr 51.0.0", @@ -2934,10 +3140,9 @@ dependencies = [ [[package]] name = "datafusion-physical-optimizer" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bde5fa10e73259a03b705d5fddc136516814ab5f441b939525618a4070f5a059" +source = "git+https://github.com/apache/datafusion?branch=branch-53#85c675d197da52462a74c213a19a18fce87ff717" dependencies = [ - "arrow", + "arrow 58.0.0", "datafusion-common 52.1.0", "datafusion-execution 52.1.0", "datafusion-expr 52.1.0", @@ -2957,9 +3162,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0acf0ad6b6924c6b1aa7d213b181e012e2d3ec0a64ff5b10ee6282ab0f8532ac" dependencies = [ "ahash 0.8.12", - "arrow", - "arrow-ord", - "arrow-schema", + "arrow 57.3.0", + "arrow-ord 57.3.0", + "arrow-schema 57.3.0", "async-trait", "chrono", "datafusion-common 51.0.0", @@ -2984,13 +3189,12 @@ dependencies = [ [[package]] name = "datafusion-physical-plan" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e1098760fb29127c24cc9ade3277051dc73c9ed0ac0131bd7bcd742e0ad7470" +source = "git+https://github.com/apache/datafusion?branch=branch-53#85c675d197da52462a74c213a19a18fce87ff717" dependencies = [ "ahash 0.8.12", - "arrow", - "arrow-ord", - "arrow-schema", + "arrow 58.0.0", + "arrow-ord 58.0.0", + "arrow-schema 58.0.0", "async-trait", "datafusion-common 52.1.0", "datafusion-common-runtime 52.1.0", @@ -3007,6 +3211,7 @@ dependencies = [ "indexmap", "itertools 0.14.0", "log", + "num-traits", "parking_lot", "pin-project-lite", "tokio", @@ -3018,7 +3223,7 @@ version = "51.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac2c2498a1f134a9e11a9f5ed202a2a7d7e9774bd9249295593053ea3be999db" dependencies = [ - "arrow", + "arrow 57.3.0", "datafusion-common 51.0.0", "datafusion-datasource 51.0.0", "datafusion-expr-common 51.0.0", @@ -3032,10 +3237,9 @@ dependencies = [ [[package]] name = "datafusion-pruning" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64d0fef4201777b52951edec086c21a5b246f3c82621569ddb4a26f488bc38a9" +source = "git+https://github.com/apache/datafusion?branch=branch-53#85c675d197da52462a74c213a19a18fce87ff717" dependencies = [ - "arrow", + "arrow 58.0.0", "datafusion-common 52.1.0", "datafusion-datasource 52.1.0", "datafusion-expr-common 52.1.0", @@ -3063,8 +3267,7 @@ dependencies = [ [[package]] name = "datafusion-session" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f71f1e39e8f2acbf1c63b0e93756c2e970a64729dab70ac789587d6237c4fde0" +source = "git+https://github.com/apache/datafusion?branch=branch-53#85c675d197da52462a74c213a19a18fce87ff717" dependencies = [ "async-trait", "datafusion-common 52.1.0", @@ -3077,23 +3280,26 @@ dependencies = [ [[package]] name = "datafusion-spark" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556c431f5f2259620c8223254c0ef57aa9a85c576d4da0166157260f71eb0e25" +source = "git+https://github.com/apache/datafusion?branch=branch-53#85c675d197da52462a74c213a19a18fce87ff717" dependencies = [ - "arrow", + "arrow 58.0.0", "bigdecimal", "chrono", "crc32fast", + "datafusion 52.1.0", "datafusion-catalog 52.1.0", "datafusion-common 52.1.0", "datafusion-execution 52.1.0", "datafusion-expr 52.1.0", "datafusion-functions 52.1.0", + "datafusion-functions-aggregate 52.1.0", "datafusion-functions-nested 52.1.0", "log", "percent-encoding", "rand 0.9.2", + "serde_json", "sha1", + "sha2", "url", ] @@ -3103,7 +3309,7 @@ version = "51.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fc195fe60634b2c6ccfd131b487de46dc30eccae8a3c35a13f136e7f440414f" dependencies = [ - "arrow", + "arrow 57.3.0", "bigdecimal", "chrono", "datafusion-common 51.0.0", @@ -3111,34 +3317,33 @@ dependencies = [ "indexmap", "log", "regex", - "sqlparser", + "sqlparser 0.59.0", ] [[package]] name = "datafusion-sql" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f44693cfcaeb7a9f12d71d1c576c3a6dc025a12cef209375fa2d16fb3b5670ee" +source = "git+https://github.com/apache/datafusion?branch=branch-53#85c675d197da52462a74c213a19a18fce87ff717" dependencies = [ - "arrow", + "arrow 58.0.0", "bigdecimal", "chrono", "datafusion-common 52.1.0", "datafusion-expr 52.1.0", + "datafusion-functions-nested 52.1.0", "indexmap", "log", "recursive", "regex", - "sqlparser", + "sqlparser 0.61.0", ] [[package]] name = "datafusion-sqllogictest" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d388fec80647198ae041d314dd7d9e2305207836ecec3ad48908eac6844cdef" +source = "git+https://github.com/apache/datafusion?branch=branch-53#85c675d197da52462a74c213a19a18fce87ff717" dependencies = [ - "arrow", + "arrow 58.0.0", "async-trait", "bigdecimal", "clap", @@ -3150,9 +3355,9 @@ dependencies = [ "indicatif", "itertools 0.14.0", "log", - "object_store", - "sqllogictest", - "sqlparser", + "object_store 0.13.1", + "sqllogictest 0.29.1", + "sqlparser 0.61.0", "tempfile", "thiserror 2.0.18", "tokio", @@ -3161,8 +3366,7 @@ dependencies = [ [[package]] name = "datafusion-substrait" version = "52.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6042adacd0bd64e56c22f6a7f9ce0ce1793dd367c899d868179d029f110d9215" +source = "git+https://github.com/apache/datafusion?branch=branch-53#85c675d197da52462a74c213a19a18fce87ff717" dependencies = [ "async-recursion", "async-trait", @@ -3170,13 +3374,12 @@ dependencies = [ "datafusion 52.1.0", "half", "itertools 0.14.0", - "object_store", + "object_store 0.13.1", "pbjson-types", "prost 0.14.3", "substrait", "tokio", "url", - "uuid", ] [[package]] @@ -3695,7 +3898,7 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f9e5c0b1c67a38cb92b41535d44623483beb9511592ae23a3bf42ddec758690" dependencies = [ - "arrow-array", + "arrow-array 57.3.0", "rand 0.9.2", ] @@ -3907,9 +4110,9 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc1cc4106ac0a0a512c398961ce95d8150475c84a84e17c4511c3643fa120a17" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-schema", + "arrow-array 57.3.0", + "arrow-buffer 57.3.0", + "arrow-schema 57.3.0", "geo-traits", "geoarrow-schema", "num-traits", @@ -3923,8 +4126,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa84300361ce57fb875bcaa6e32b95b0aff5c6b1af692b936bdd58ff343f4394" dependencies = [ - "arrow-array", - "arrow-buffer", + "arrow-array 57.3.0", + "arrow-buffer 57.3.0", "geo", "geo-traits", "geoarrow-array", @@ -3937,7 +4140,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e97be4e9f523f92bd6a0e0458323f4b783d073d011664decd8dbf05651704f34" dependencies = [ - "arrow-schema", + "arrow-schema 57.3.0", "geo-traits", "serde", "serde_json", @@ -3950,9 +4153,9 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773cfa1fb0d7f7661b76b3fde00f3ffd8e0ff7b3635096f0ff6294fe5ca62a2b" dependencies = [ - "arrow-arith", - "arrow-array", - "arrow-schema", + "arrow-arith 57.3.0", + "arrow-array 57.3.0", + "arrow-schema 57.3.0", "datafusion 51.0.0", "geo", "geo-traits", @@ -4406,7 +4609,7 @@ dependencies = [ "js-sys", "log", "wasm-bindgen", - "windows-core 0.62.2", + "windows-core", ] [[package]] @@ -4861,15 +5064,15 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b7f07b905df393a5554eba19055c620f9ea25a3e40a013bda4bd8dc4ca66f01" dependencies = [ - "arrow", - "arrow-arith", - "arrow-array", - "arrow-buffer", - "arrow-ipc", - "arrow-ord", - "arrow-row", - "arrow-schema", - "arrow-select", + "arrow 57.3.0", + "arrow-arith 57.3.0", + "arrow-array 57.3.0", + "arrow-buffer 57.3.0", + "arrow-ipc 57.3.0", + "arrow-ord 57.3.0", + "arrow-row 57.3.0", + "arrow-schema 57.3.0", + "arrow-select 57.3.0", "async-recursion", "async-trait", "async_cell", @@ -4901,7 +5104,7 @@ dependencies = [ "lance-table", "log", "moka", - "object_store", + "object_store 0.12.5", "permutation", "pin-project", "prost 0.14.3", @@ -4926,13 +5129,13 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "100e076cb81c8f0c24cd2881c706fc53e037c7d6e81eb320e929e265d157effb" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-cast", - "arrow-data", - "arrow-ord", - "arrow-schema", - "arrow-select", + "arrow-array 57.3.0", + "arrow-buffer 57.3.0", + "arrow-cast 57.3.0", + "arrow-data 57.3.0", + "arrow-ord 57.3.0", + "arrow-schema 57.3.0", + "arrow-select 57.3.0", "bytes", "getrandom 0.2.17", "half", @@ -4946,13 +5149,13 @@ name = "lance-bench" version = "0.1.0" dependencies = [ "anyhow", - "arrow-cast", + "arrow-cast 57.3.0", "async-trait", "clap", "futures", "lance", "lance-encoding", - "parquet", + "parquet 57.3.0", "tempfile", "tokio", "tracing", @@ -4976,9 +5179,9 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fa01d1cf490ccfd3b8eaeee2781415d0419e6be8366040e57e43677abf2644e" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-schema", + "arrow-array 57.3.0", + "arrow-buffer 57.3.0", + "arrow-schema 57.3.0", "async-trait", "byteorder", "bytes", @@ -4994,7 +5197,7 @@ dependencies = [ "mock_instant", "moka", "num_cpus", - "object_store", + "object_store 0.12.5", "pin-project", "prost 0.14.3", "rand 0.9.2", @@ -5015,12 +5218,12 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef89a39e3284eef76f79e63f23de8881a0583ad6feb20ed39f47eadd847a2b88" dependencies = [ - "arrow", - "arrow-array", - "arrow-buffer", - "arrow-ord", - "arrow-schema", - "arrow-select", + "arrow 57.3.0", + "arrow-array 57.3.0", + "arrow-buffer 57.3.0", + "arrow-ord 57.3.0", + "arrow-schema 57.3.0", + "arrow-select 57.3.0", "async-trait", "chrono", "datafusion 51.0.0", @@ -5047,10 +5250,10 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc2a60eef5c47e65d91e2ffa8e7e1629c52e7190c8b88a371a1a60601dc49371" dependencies = [ - "arrow", - "arrow-array", - "arrow-cast", - "arrow-schema", + "arrow 57.3.0", + "arrow-array 57.3.0", + "arrow-cast 57.3.0", + "arrow-schema 57.3.0", "chrono", "futures", "half", @@ -5067,13 +5270,13 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95ce4a6631308aa681b2671af8f2a845ff781f8d4e755a2a7ccd012379467094" dependencies = [ - "arrow-arith", - "arrow-array", - "arrow-buffer", - "arrow-cast", - "arrow-data", - "arrow-schema", - "arrow-select", + "arrow-arith 57.3.0", + "arrow-array 57.3.0", + "arrow-buffer 57.3.0", + "arrow-cast 57.3.0", + "arrow-data 57.3.0", + "arrow-schema 57.3.0", + "arrow-select 57.3.0", "bytemuck", "byteorder", "bytes", @@ -5106,12 +5309,12 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2d4d82357cbfaa1a18494226c15b1cb3c8ed0b6c84b91146323c82047ede419" dependencies = [ - "arrow-arith", - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", - "arrow-select", + "arrow-arith 57.3.0", + "arrow-array 57.3.0", + "arrow-buffer 57.3.0", + "arrow-data 57.3.0", + "arrow-schema 57.3.0", + "arrow-select 57.3.0", "async-recursion", "async-trait", "byteorder", @@ -5125,7 +5328,7 @@ dependencies = [ "lance-io", "log", "num-traits", - "object_store", + "object_store 0.12.5", "prost 0.14.3", "prost-build", "prost-types", @@ -5156,12 +5359,12 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20e9c5aa7024a63af9ae89ee8c0f23c8421b7896742e5cd4a271a60f9956cb80" dependencies = [ - "arrow", - "arrow-arith", - "arrow-array", - "arrow-ord", - "arrow-schema", - "arrow-select", + "arrow 57.3.0", + "arrow-arith 57.3.0", + "arrow-array 57.3.0", + "arrow-ord 57.3.0", + "arrow-schema 57.3.0", + "arrow-select 57.3.0", "async-channel", "async-recursion", "async-trait", @@ -5198,7 +5401,7 @@ dependencies = [ "log", "ndarray", "num-traits", - "object_store", + "object_store 0.12.5", "prost 0.14.3", "prost-build", "prost-types", @@ -5225,14 +5428,14 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7d2af0b17fb374a8181bcf1a10bce5703ae3ee4373c1587ce4bba23e15e45c8" dependencies = [ - "arrow", - "arrow-arith", - "arrow-array", - "arrow-buffer", - "arrow-cast", - "arrow-data", - "arrow-schema", - "arrow-select", + "arrow 57.3.0", + "arrow-arith 57.3.0", + "arrow-array 57.3.0", + "arrow-buffer 57.3.0", + "arrow-cast 57.3.0", + "arrow-data 57.3.0", + "arrow-schema 57.3.0", + "arrow-select 57.3.0", "async-recursion", "async-trait", "byteorder", @@ -5244,7 +5447,7 @@ dependencies = [ "lance-core", "lance-namespace", "log", - "object_store", + "object_store 0.12.5", "path_abs", "pin-project", "prost 0.14.3", @@ -5263,9 +5466,9 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5125aa62696e75a7475807564b4921f252d8815be606b84bc00e6def0f5c24bb" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-schema", + "arrow-array 57.3.0", + "arrow-buffer 57.3.0", + "arrow-schema 57.3.0", "cc", "deepsize", "half", @@ -5281,7 +5484,7 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70545c2676ce954dfd801da5c6a631a70bba967826cd3a8f31b47d1f04bbfed3" dependencies = [ - "arrow", + "arrow 57.3.0", "async-trait", "bytes", "lance-core", @@ -5308,11 +5511,11 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b06ad37bd90045de8ef533df170c6098e6ff6ecb427aade47d7db8e2c86f2678" dependencies = [ - "arrow", - "arrow-array", - "arrow-buffer", - "arrow-ipc", - "arrow-schema", + "arrow 57.3.0", + "arrow-array 57.3.0", + "arrow-buffer 57.3.0", + "arrow-ipc 57.3.0", + "arrow-schema 57.3.0", "async-trait", "byteorder", "bytes", @@ -5324,7 +5527,7 @@ dependencies = [ "lance-file", "lance-io", "log", - "object_store", + "object_store 0.12.5", "prost 0.14.3", "prost-build", "prost-types", @@ -6203,6 +6406,44 @@ dependencies = [ "web-time", ] +[[package]] +name = "object_store" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2858065e55c148d294a9f3aae3b0fa9458edadb41a108397094566f4e3c0dfb" +dependencies = [ + "async-trait", + "base64", + "bytes", + "chrono", + "form_urlencoded", + "futures", + "http", + "http-body-util", + "httparse", + "humantime", + "hyper", + "itertools 0.14.0", + "md-5", + "parking_lot", + "percent-encoding", + "quick-xml", + "rand 0.9.2", + "reqwest", + "ring", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "thiserror 2.0.18", + "tokio", + "tracing", + "url", + "walkdir", + "wasm-bindgen-futures", + "web-time", +] + [[package]] name = "once_cell" version = "1.21.3" @@ -6460,13 +6701,46 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ee96b29972a257b855ff2341b37e61af5f12d6af1158b6dcdb5b31ea07bb3cb" dependencies = [ "ahash 0.8.12", - "arrow-array", - "arrow-buffer", - "arrow-cast", - "arrow-data", - "arrow-ipc", - "arrow-schema", - "arrow-select", + "arrow-array 57.3.0", + "arrow-buffer 57.3.0", + "arrow-cast 57.3.0", + "arrow-data 57.3.0", + "arrow-ipc 57.3.0", + "arrow-schema 57.3.0", + "arrow-select 57.3.0", + "base64", + "brotli", + "bytes", + "chrono", + "flate2", + "half", + "hashbrown 0.16.1", + "lz4_flex 0.12.0", + "num-bigint", + "num-integer", + "num-traits", + "paste", + "seq-macro", + "simdutf8", + "snap", + "thrift", + "twox-hash", + "zstd", +] + +[[package]] +name = "parquet" +version = "58.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f491d0ef1b510194426ee67ddc18a9b747ef3c42050c19322a2cd2e1666c29b" +dependencies = [ + "ahash 0.8.12", + "arrow-array 58.0.0", + "arrow-buffer 58.0.0", + "arrow-data 58.0.0", + "arrow-ipc 58.0.0", + "arrow-schema 58.0.0", + "arrow-select 58.0.0", "base64", "brotli", "bytes", @@ -6479,7 +6753,7 @@ dependencies = [ "num-bigint", "num-integer", "num-traits", - "object_store", + "object_store 0.13.1", "paste", "seq-macro", "simdutf8", @@ -6850,7 +7124,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "343d3bd7056eda839b03204e68deff7d1b13aba7af2b2fd16890697274262ee7" dependencies = [ "heck", - "itertools 0.14.0", + "itertools 0.10.5", "log", "multimap", "petgraph", @@ -6882,7 +7156,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b" dependencies = [ "anyhow", - "itertools 0.14.0", + "itertools 0.10.5", "proc-macro2", "quote", "syn 2.0.117", @@ -7051,7 +7325,7 @@ dependencies = [ "http", "humantime", "itertools 0.14.0", - "object_store", + "object_store 0.12.5", "percent-encoding", "pyo3", "pyo3-async-runtimes", @@ -8382,15 +8656,50 @@ dependencies = [ "tracing", ] +[[package]] +name = "sqllogictest" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d03b2262a244037b0b510edbd25a8e6c9fb8d73ee0237fc6cc95a54c16f94a82" +dependencies = [ + "async-trait", + "educe", + "fs-err", + "futures", + "glob", + "humantime", + "itertools 0.13.0", + "libtest-mimic", + "md-5", + "owo-colors", + "rand 0.8.5", + "regex", + "similar", + "subst", + "tempfile", + "thiserror 2.0.18", + "tracing", +] + [[package]] name = "sqlparser" version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4591acadbcf52f0af60eafbb2c003232b2b4cd8de5f0e9437cb8b1b59046cc0f" +dependencies = [ + "log", + "sqlparser_derive 0.3.0", +] + +[[package]] +name = "sqlparser" +version = "0.61.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbf5ea8d4d7c808e1af1cbabebca9a2abe603bcefc22294c5b95018d53200cb7" dependencies = [ "log", "recursive", - "sqlparser_derive", + "sqlparser_derive 0.5.0", ] [[package]] @@ -8404,6 +8713,17 @@ dependencies = [ "syn 2.0.117", ] +[[package]] +name = "sqlparser_derive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6dd45d8fc1c79299bfbb7190e42ccbbdf6a5f52e4a6ad98d92357ea965bd289" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "stable_deref_trait" version = "1.2.1" @@ -9131,6 +9451,7 @@ dependencies = [ "futures-core", "pin-project-lite", "tokio", + "tokio-util", ] [[package]] @@ -9282,16 +9603,14 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tpchgen" version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d651db770ccf53b89dd769ed47899c0c089452e3b725c3c48fbc6a2be579638" +source = "git+https://github.com/AdamGS/tpchgen-rs.git?branch=adamg%2Fbump-arrow-match-df#803355855df0ed62fc30ee2c125fe46fe1dbab47" [[package]] name = "tpchgen-arrow" version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180f3759dffbf26d47021d2a84245a00f20945384bcf22e63c32652b04916e5a" +source = "git+https://github.com/AdamGS/tpchgen-rs.git?branch=adamg%2Fbump-arrow-match-df#803355855df0ed62fc30ee2c125fe46fe1dbab47" dependencies = [ - "arrow", + "arrow 58.0.0", "tpchgen", ] @@ -9619,11 +9938,11 @@ name = "vortex" version = "0.1.0" dependencies = [ "anyhow", - "arrow-array", + "arrow-array 58.0.0", "codspeed-divan-compat", "fastlanes", "mimalloc", - "parquet", + "parquet 58.0.0", "rand 0.9.2", "serde_json", "tokio", @@ -9685,15 +10004,15 @@ version = "0.1.0" dependencies = [ "arbitrary", "arcref", - "arrow-arith", - "arrow-array", - "arrow-buffer", - "arrow-cast", - "arrow-data", - "arrow-ord", - "arrow-schema", - "arrow-select", - "arrow-string", + "arrow-arith 58.0.0", + "arrow-array 58.0.0", + "arrow-buffer 58.0.0", + "arrow-cast 58.0.0", + "arrow-data 58.0.0", + "arrow-ord 58.0.0", + "arrow-schema 58.0.0", + "arrow-select 58.0.0", + "arrow-string 58.0.0", "async-lock", "bytes", "cfg-if", @@ -9746,9 +10065,9 @@ name = "vortex-bench" version = "0.1.0" dependencies = [ "anyhow", - "arrow-array", - "arrow-schema", - "arrow-select", + "arrow-array 58.0.0", + "arrow-schema 58.0.0", + "arrow-select 58.0.0", "async-trait", "bytes", "bzip2", @@ -9763,7 +10082,7 @@ dependencies = [ "noodles-bgzf", "noodles-vcf", "parking_lot", - "parquet", + "parquet 58.0.0", "rand 0.9.2", "regex", "reqwest", @@ -9822,7 +10141,7 @@ dependencies = [ name = "vortex-buffer" version = "0.1.0" dependencies = [ - "arrow-buffer", + "arrow-buffer 58.0.0", "bitvec", "bytes", "codspeed-divan-compat", @@ -9872,7 +10191,7 @@ dependencies = [ "fastlanes", "futures", "kanal", - "object_store", + "object_store 0.13.1", "parking_lot", "prost 0.14.3", "rstest", @@ -9900,8 +10219,8 @@ name = "vortex-cxx" version = "0.1.0" dependencies = [ "anyhow", - "arrow-array", - "arrow-schema", + "arrow-array 58.0.0", + "arrow-schema 58.0.0", "async-fs", "cxx", "futures", @@ -9915,7 +10234,7 @@ name = "vortex-datafusion" version = "0.1.0" dependencies = [ "anyhow", - "arrow-schema", + "arrow-schema 58.0.0", "async-trait", "datafusion 52.1.0", "datafusion-catalog 52.1.0", @@ -9933,7 +10252,7 @@ dependencies = [ "futures", "insta", "itertools 0.14.0", - "object_store", + "object_store 0.13.1", "rstest", "tempfile", "tokio", @@ -9989,7 +10308,7 @@ dependencies = [ "jiff", "kanal", "num-traits", - "object_store", + "object_store 0.13.1", "once_cell", "parking_lot", "paste", @@ -10011,10 +10330,10 @@ dependencies = [ name = "vortex-error" version = "0.1.0" dependencies = [ - "arrow-schema", + "arrow-schema 58.0.0", "flatbuffers", "jiff", - "object_store", + "object_store 0.13.1", "prost 0.14.3", "serial_test", "temp-env", @@ -10052,7 +10371,7 @@ dependencies = [ "futures", "itertools 0.14.0", "mimalloc", - "object_store", + "object_store 0.13.1", "paste", "prost 0.14.3", "tempfile", @@ -10074,7 +10393,7 @@ dependencies = [ "itertools 0.14.0", "kanal", "moka", - "object_store", + "object_store 0.13.1", "oneshot", "parking_lot", "pin-project-lite", @@ -10171,7 +10490,7 @@ dependencies = [ "handle", "itertools 0.14.0", "kanal", - "object_store", + "object_store 0.13.1", "oneshot", "parking_lot", "pin-project-lite", @@ -10209,12 +10528,12 @@ dependencies = [ name = "vortex-jni" version = "0.1.0" dependencies = [ - "arrow-array", - "arrow-ipc", - "arrow-schema", + "arrow-array 58.0.0", + "arrow-ipc 58.0.0", + "arrow-schema 58.0.0", "futures", "jni", - "object_store", + "object_store 0.13.1", "parking_lot", "prost 0.14.3", "thiserror 2.0.18", @@ -10266,7 +10585,7 @@ dependencies = [ name = "vortex-mask" version = "0.1.0" dependencies = [ - "arrow-buffer", + "arrow-buffer 58.0.0", "itertools 0.14.0", "rstest", "serde", @@ -10321,13 +10640,13 @@ dependencies = [ name = "vortex-python" version = "0.1.0" dependencies = [ - "arrow-array", - "arrow-data", - "arrow-schema", + "arrow-array 58.0.0", + "arrow-data 58.0.0", + "arrow-schema 58.0.0", "bytes", "itertools 0.14.0", "log", - "object_store", + "object_store 0.13.1", "parking_lot", "pyo3", "pyo3-bytes", @@ -10344,8 +10663,8 @@ name = "vortex-runend" version = "0.1.0" dependencies = [ "arbitrary", - "arrow-array", - "arrow-schema", + "arrow-array 58.0.0", + "arrow-schema 58.0.0", "codspeed-divan-compat", "itertools 0.14.0", "num-traits", @@ -10363,8 +10682,8 @@ dependencies = [ name = "vortex-scan" version = "0.1.0" dependencies = [ - "arrow-array", - "arrow-schema", + "arrow-array 58.0.0", + "arrow-schema 58.0.0", "async-trait", "bit-vec", "futures", @@ -10436,7 +10755,7 @@ dependencies = [ "datafusion-sqllogictest", "futures", "indicatif", - "sqllogictest", + "sqllogictest 0.28.4", "thiserror 2.0.18", "tokio", "vortex", @@ -10468,8 +10787,8 @@ dependencies = [ name = "vortex-test-e2e-cuda" version = "0.1.0" dependencies = [ - "arrow-array", - "arrow-schema", + "arrow-array 58.0.0", + "arrow-schema 58.0.0", "futures", "vortex", "vortex-cuda", @@ -10480,8 +10799,8 @@ name = "vortex-tui" version = "0.1.0" dependencies = [ "anyhow", - "arrow-array", - "arrow-schema", + "arrow-array 58.0.0", + "arrow-schema 58.0.0", "clap", "console_error_panic_hook", "crossterm", @@ -10494,7 +10813,7 @@ dependencies = [ "indicatif", "itertools 0.14.0", "js-sys", - "parquet", + "parquet 58.0.0", "ratatui", "ratzilla", "serde", @@ -10774,7 +11093,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893" dependencies = [ "windows-collections", - "windows-core 0.61.2", + "windows-core", "windows-future", "windows-link 0.1.3", "windows-numerics", @@ -10786,7 +11105,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8" dependencies = [ - "windows-core 0.61.2", + "windows-core", ] [[package]] @@ -10802,26 +11121,13 @@ dependencies = [ "windows-strings 0.4.2", ] -[[package]] -name = "windows-core" -version = "0.62.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" -dependencies = [ - "windows-implement", - "windows-interface", - "windows-link 0.2.1", - "windows-result 0.4.1", - "windows-strings 0.5.1", -] - [[package]] name = "windows-future" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e" dependencies = [ - "windows-core 0.61.2", + "windows-core", "windows-link 0.1.3", "windows-threading", ] @@ -10866,7 +11172,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1" dependencies = [ - "windows-core 0.61.2", + "windows-core", "windows-link 0.1.3", ] diff --git a/Cargo.toml b/Cargo.toml index f5c28544599..e66af83ade1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -86,16 +86,16 @@ arbitrary = "1.3.2" arc-swap = "1.8" arcref = "0.2.0" arrayref = "0.3.7" -arrow-arith = "57.1" -arrow-array = "57.1" -arrow-buffer = "57.1" -arrow-cast = "57.1" -arrow-data = "57.1" -arrow-ipc = "57.1" -arrow-ord = "57.1" -arrow-schema = "57.1" -arrow-select = "57.1" -arrow-string = "57.1" +arrow-arith = "58" +arrow-array = "58" +arrow-buffer = "58" +arrow-cast = "58" +arrow-data = "58" +arrow-ipc = "58" +arrow-ord = "58" +arrow-schema = "58" +arrow-select = "58" +arrow-string = "58" async-fs = "2.2.0" async-lock = "3.4" async-stream = "0.3.6" @@ -170,14 +170,14 @@ noodles-bgzf = "0.44.0" noodles-vcf = "0.82.0" num-traits = "0.2.19" num_enum = { version = "0.7.3", default-features = false } -object_store = { version = "0.12.4", default-features = false } +object_store = { version = "0.13.1", default-features = false } once_cell = "1.21" oneshot = "0.1.13" opentelemetry = "0.31.0" opentelemetry-otlp = "0.31.0" opentelemetry_sdk = "0.31.0" parking_lot = { version = "0.12.3", features = ["nightly"] } -parquet = "57.1" +parquet = "58" paste = "1.0.15" pco = "1.0.1" pin-project-lite = "0.2.15" @@ -367,3 +367,21 @@ lto = false [profile.bench_assert] debug-assertions = true inherits = "bench" + +[patch.crates-io] +datafusion = { git = "https://github.com/apache/datafusion", branch = "branch-53" } +datafusion-catalog = { git = "https://github.com/apache/datafusion", branch = "branch-53" } +datafusion-common = { git = "https://github.com/apache/datafusion", branch = "branch-53" } +datafusion-common-runtime = { git = "https://github.com/apache/datafusion", branch = "branch-53" } +datafusion-datasource = { git = "https://github.com/apache/datafusion", branch = "branch-53" } +datafusion-execution = { git = "https://github.com/apache/datafusion", branch = "branch-53" } +datafusion-expr = { git = "https://github.com/apache/datafusion", branch = "branch-53" } +datafusion-functions = { git = "https://github.com/apache/datafusion", branch = "branch-53" } +datafusion-physical-expr = { git = "https://github.com/apache/datafusion", branch = "branch-53" } +datafusion-physical-expr-adapter = { git = "https://github.com/apache/datafusion", branch = "branch-53" } +datafusion-physical-expr-common = { git = "https://github.com/apache/datafusion", branch = "branch-53" } +datafusion-physical-plan = { git = "https://github.com/apache/datafusion", branch = "branch-53" } +datafusion-pruning = { git = "https://github.com/apache/datafusion", branch = "branch-53" } +datafusion-sqllogictest = { git = "https://github.com/apache/datafusion", branch = "branch-53" } +tpchgen = { git = "https://github.com/AdamGS/tpchgen-rs.git", branch = "adamg/bump-arrow-match-df" } +tpchgen-arrow = { git = "https://github.com/AdamGS/tpchgen-rs.git", branch = "adamg/bump-arrow-match-df" } diff --git a/vortex-bench/src/random_access/take.rs b/vortex-bench/src/random_access/take.rs index 674aa6349aa..b23d6622876 100644 --- a/vortex-bench/src/random_access/take.rs +++ b/vortex-bench/src/random_access/take.rs @@ -14,6 +14,7 @@ use itertools::Itertools; use parquet::arrow::ParquetRecordBatchStreamBuilder; use parquet::arrow::arrow_reader::ArrowReaderMetadata; use parquet::arrow::arrow_reader::ArrowReaderOptions; +use parquet::file::metadata::PageIndexPolicy; use stream::StreamExt; use tokio::fs::File; use vortex::array::Canonical; @@ -100,7 +101,7 @@ impl ParquetRandomAccessor { /// Open a Parquet file, parse the footer, and return a ready-to-use accessor. pub async fn open(path: PathBuf, name: impl Into) -> anyhow::Result { let mut file = File::open(&path).await?; - let options = ArrowReaderOptions::new().with_page_index(true); + let options = ArrowReaderOptions::new().with_page_index_policy(PageIndexPolicy::Required); let arrow_metadata = ArrowReaderMetadata::load_async(&mut file, options).await?; let row_group_offsets = once(0) diff --git a/vortex-datafusion/src/persistent/format.rs b/vortex-datafusion/src/persistent/format.rs index fb3d5f9db11..0be2086c885 100644 --- a/vortex-datafusion/src/persistent/format.rs +++ b/vortex-datafusion/src/persistent/format.rs @@ -32,6 +32,7 @@ use datafusion_datasource::file_scan_config::FileScanConfigBuilder; use datafusion_datasource::file_sink_config::FileSinkConfig; use datafusion_datasource::sink::DataSinkExec; use datafusion_datasource::source::DataSourceExec; +use datafusion_execution::cache::cache_manager::CachedFileMetadataEntry; use datafusion_expr::dml::InsertOp; use datafusion_physical_expr::LexRequirement; use datafusion_physical_plan::ExecutionPlan; @@ -251,16 +252,19 @@ impl FileFormat for VortexFormat { let cache = file_metadata_cache.clone(); SpawnedTask::spawn(async move { - // Check if we have cached metadata for this file - if let Some(cached) = cache.get(&object) - && let Some(cached_vortex) = - cached.as_any().downcast_ref::() + // Check if we have entry metadata for this file + if let Some(entry) = cache.get(&object.location) + && entry.is_valid_for(&object) + && let Some(cached_vortex) = entry + .file_metadata + .as_any() + .downcast_ref::() { let inferred_schema = cached_vortex.footer().dtype().to_arrow_schema()?; return VortexResult::Ok((object.location, inferred_schema)); } - // Not cached or invalid - open the file + // Not entry or invalid - open the file let reader = Arc::new(ObjectStoreReadAt::new( store, object.location.clone(), @@ -276,7 +280,8 @@ impl FileFormat for VortexFormat { // Cache the metadata let cached_metadata = Arc::new(CachedVortexMetadata::new(&vxf)); - cache.put(&object, cached_metadata); + let entry = CachedFileMetadataEntry::new(object.clone(), cached_metadata); + cache.put(&object.location, entry); let inferred_schema = vxf.dtype().to_arrow_schema()?; VortexResult::Ok((object.location, inferred_schema)) @@ -310,24 +315,28 @@ impl FileFormat for VortexFormat { let file_metadata_cache = state.runtime_env().cache_manager.get_file_metadata_cache(); SpawnedTask::spawn(async move { - // Try to get cached metadata first - let cached_metadata = file_metadata_cache.get(&object).and_then(|cached| { - cached - .as_any() - .downcast_ref::() - .map(|m| { - ( - m.footer().dtype().clone(), - m.footer().statistics().cloned(), - m.footer().row_count(), - ) - }) - }); + // Try to get entry metadata first + let cached_metadata = file_metadata_cache + .get(&object.location) + .filter(|entry| entry.is_valid_for(&object)) + .and_then(|entry| { + entry + .file_metadata + .as_any() + .downcast_ref::() + .map(|m| { + ( + m.footer().dtype().clone(), + m.footer().statistics().cloned(), + m.footer().row_count(), + ) + }) + }); let (dtype, file_stats, row_count) = match cached_metadata { Some(metadata) => metadata, None => { - // Not cached - open the file + // Not entry - open the file let reader = Arc::new(ObjectStoreReadAt::new( store, object.location.clone(), @@ -348,8 +357,9 @@ impl FileFormat for VortexFormat { })?; // Cache the metadata - let cached = Arc::new(CachedVortexMetadata::new(&vxf)); - file_metadata_cache.put(&object, cached); + let file_metadata = Arc::new(CachedVortexMetadata::new(&vxf)); + let entry = CachedFileMetadataEntry::new(object.clone(), file_metadata); + file_metadata_cache.put(&object.location, entry); ( vxf.dtype().clone(), diff --git a/vortex-datafusion/src/persistent/opener.rs b/vortex-datafusion/src/persistent/opener.rs index 5986a06da49..3dee97e9d59 100644 --- a/vortex-datafusion/src/persistent/opener.rs +++ b/vortex-datafusion/src/persistent/opener.rs @@ -187,8 +187,10 @@ impl FileOpener for VortexOpener { .with_labels(labels); if let Some(file_metadata_cache) = file_metadata_cache - && let Some(file_metadata) = file_metadata_cache.get(&file.object_meta) - && let Some(vortex_metadata) = file_metadata + && let Some(entry) = file_metadata_cache.get(&file.path()) + && entry.is_valid_for(&file.object_meta) + && let Some(vortex_metadata) = entry + .file_metadata .as_any() .downcast_ref::() { @@ -212,7 +214,7 @@ impl FileOpener for VortexOpener { let expr_adapter = expr_adapter_factory.create( Arc::clone(&unified_file_schema), Arc::clone(&this_file_schema), - ); + )?; let simplifier = PhysicalExprSimplifier::new(&this_file_schema); diff --git a/vortex-io/src/object_store/read_at.rs b/vortex-io/src/object_store/read_at.rs index 82ef57ca6f6..a4957199565 100644 --- a/vortex-io/src/object_store/read_at.rs +++ b/vortex-io/src/object_store/read_at.rs @@ -11,6 +11,7 @@ use object_store::GetOptions; use object_store::GetRange; use object_store::GetResultPayload; use object_store::ObjectStore; +use object_store::ObjectStoreExt; use object_store::path::Path as ObjectPath; use vortex_array::buffer::BufferHandle; use vortex_buffer::Alignment; diff --git a/vortex-io/src/object_store/write.rs b/vortex-io/src/object_store/write.rs index 20bfb7815c4..988fd1473ac 100644 --- a/vortex-io/src/object_store/write.rs +++ b/vortex-io/src/object_store/write.rs @@ -9,6 +9,7 @@ use futures::TryStreamExt; use futures::stream::FuturesUnordered; use object_store::MultipartUpload; use object_store::ObjectStore; +use object_store::ObjectStoreExt; use object_store::PutPayload; use object_store::PutResult; use object_store::path::Path; From eba560b0a4a6f95168ff59e70b5a2eb05b7071ff Mon Sep 17 00:00:00 2001 From: Adam Gutglick Date: Mon, 2 Mar 2026 13:49:39 +0000 Subject: [PATCH 2/4] some fixes Signed-off-by: Adam Gutglick --- Cargo.lock | 35 ++++++----------------------------- vortex-jni/src/file.rs | 1 + vortex-python/Cargo.toml | 2 +- 3 files changed, 8 insertions(+), 30 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 039e9ebdb36..f4018fded7f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -942,7 +942,7 @@ dependencies = [ "bitflags", "cexpr", "clang-sys", - "itertools 0.10.5", + "itertools 0.13.0", "log", "prettyplease", "proc-macro2", @@ -6375,28 +6375,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbfbfff40aeccab00ec8a910b57ca8ecf4319b335c542f2edcd19dd25a1e2a00" dependencies = [ "async-trait", - "base64", "bytes", "chrono", - "form_urlencoded", "futures", "http", - "http-body-util", - "httparse", "humantime", - "hyper", "itertools 0.14.0", - "md-5", "parking_lot", "percent-encoding", - "quick-xml", - "rand 0.9.2", - "reqwest", - "ring", - "rustls-pemfile", - "serde", - "serde_json", - "serde_urlencoded", "thiserror 2.0.18", "tokio", "tracing", @@ -7124,7 +7110,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "343d3bd7056eda839b03204e68deff7d1b13aba7af2b2fd16890697274262ee7" dependencies = [ "heck", - "itertools 0.10.5", + "itertools 0.14.0", "log", "multimap", "petgraph", @@ -7156,7 +7142,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b" dependencies = [ "anyhow", - "itertools 0.10.5", + "itertools 0.14.0", "proc-macro2", "quote", "syn 2.0.117", @@ -7314,9 +7300,9 @@ dependencies = [ [[package]] name = "pyo3-object_store" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef5552f108a4d65b78c924b27513471a9ba425341ada4be5ea0ca53806ae316" +checksum = "a8b80a3a9af26abe307d2c01c13da487166c5c8ac5ac301a4d8e3c270e58ab50" dependencies = [ "async-trait", "bytes", @@ -7325,7 +7311,7 @@ dependencies = [ "http", "humantime", "itertools 0.14.0", - "object_store 0.12.5", + "object_store 0.13.1", "percent-encoding", "pyo3", "pyo3-async-runtimes", @@ -8070,15 +8056,6 @@ dependencies = [ "security-framework", ] -[[package]] -name = "rustls-pemfile" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" -dependencies = [ - "rustls-pki-types", -] - [[package]] name = "rustls-pki-types" version = "1.14.0" diff --git a/vortex-jni/src/file.rs b/vortex-jni/src/file.rs index 2ab70aa5e85..a492a25a6a0 100644 --- a/vortex-jni/src/file.rs +++ b/vortex-jni/src/file.rs @@ -15,6 +15,7 @@ use jni::objects::ReleaseMode; use jni::sys::jlong; use jni::sys::jobject; use object_store::ObjectStore; +use object_store::ObjectStoreExt; use object_store::path::Path; use prost::Message; use url::Url; diff --git a/vortex-python/Cargo.toml b/vortex-python/Cargo.toml index 391dc9b4b47..0dd36e2703c 100644 --- a/vortex-python/Cargo.toml +++ b/vortex-python/Cargo.toml @@ -47,7 +47,7 @@ parking_lot = { workspace = true } pyo3 = { workspace = true, features = ["abi3", "abi3-py311"] } pyo3-bytes = { workspace = true } pyo3-log = { workspace = true } -pyo3-object_store = { version = "0.7" } +pyo3-object_store = { version = "0.8" } tokio = { workspace = true, features = ["fs", "rt-multi-thread"] } url = { workspace = true } vortex = { workspace = true, features = ["object_store", "tokio"] } From 5851f6d20aec41f4d48d591af10927961cd6b572 Mon Sep 17 00:00:00 2001 From: Adam Gutglick Date: Mon, 2 Mar 2026 14:15:03 +0000 Subject: [PATCH 3/4] more fix Signed-off-by: Adam Gutglick --- Cargo.lock | 29 ++--------------------------- vortex-cuda/src/pooled_read_at.rs | 1 + vortex-sqllogictest/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f4018fded7f..5995415696d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3356,7 +3356,7 @@ dependencies = [ "itertools 0.14.0", "log", "object_store 0.13.1", - "sqllogictest 0.29.1", + "sqllogictest", "sqlparser 0.61.0", "tempfile", "thiserror 2.0.18", @@ -8608,31 +8608,6 @@ dependencies = [ "smallvec", ] -[[package]] -name = "sqllogictest" -version = "0.28.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3566426f72a13e393aa34ca3d542c5b0eb86da4c0db137ee9b5cfccc6179e52d" -dependencies = [ - "async-trait", - "educe", - "fs-err", - "futures", - "glob", - "humantime", - "itertools 0.13.0", - "libtest-mimic", - "md-5", - "owo-colors", - "rand 0.8.5", - "regex", - "similar", - "subst", - "tempfile", - "thiserror 2.0.18", - "tracing", -] - [[package]] name = "sqllogictest" version = "0.29.1" @@ -10732,7 +10707,7 @@ dependencies = [ "datafusion-sqllogictest", "futures", "indicatif", - "sqllogictest 0.28.4", + "sqllogictest", "thiserror 2.0.18", "tokio", "vortex", diff --git a/vortex-cuda/src/pooled_read_at.rs b/vortex-cuda/src/pooled_read_at.rs index cb051728cca..1b5ec4fb31a 100644 --- a/vortex-cuda/src/pooled_read_at.rs +++ b/vortex-cuda/src/pooled_read_at.rs @@ -13,6 +13,7 @@ use object_store::GetOptions; use object_store::GetRange; use object_store::GetResultPayload; use object_store::ObjectStore; +use object_store::ObjectStoreExt; use object_store::path::Path as ObjectPath; use vortex::array::buffer::BufferHandle; use vortex::buffer::Alignment; diff --git a/vortex-sqllogictest/Cargo.toml b/vortex-sqllogictest/Cargo.toml index 04492cb55cf..291a3fb52ed 100644 --- a/vortex-sqllogictest/Cargo.toml +++ b/vortex-sqllogictest/Cargo.toml @@ -21,7 +21,7 @@ datafusion = { workspace = true } datafusion-sqllogictest = { workspace = true } futures.workspace = true indicatif.workspace = true -sqllogictest = "0.28" +sqllogictest = "0.29.1" thiserror = { workspace = true } tokio = { workspace = true, features = ["full"] } vortex = { workspace = true, features = ["tokio"] } From 08f933e2734b9196c980540daf472853dd282e05 Mon Sep 17 00:00:00 2001 From: Adam Gutglick Date: Fri, 6 Mar 2026 19:51:40 +0000 Subject: [PATCH 4/4] fix clippy --- vortex-datafusion/src/persistent/opener.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vortex-datafusion/src/persistent/opener.rs b/vortex-datafusion/src/persistent/opener.rs index 3dee97e9d59..1643bf28a43 100644 --- a/vortex-datafusion/src/persistent/opener.rs +++ b/vortex-datafusion/src/persistent/opener.rs @@ -187,7 +187,7 @@ impl FileOpener for VortexOpener { .with_labels(labels); if let Some(file_metadata_cache) = file_metadata_cache - && let Some(entry) = file_metadata_cache.get(&file.path()) + && let Some(entry) = file_metadata_cache.get(file.path()) && entry.is_valid_for(&file.object_meta) && let Some(vortex_metadata) = entry .file_metadata