From 611ae7a16ef26e8a6998049320a034ae98feffdd Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Fri, 20 Sep 2024 06:35:04 -0400 Subject: [PATCH] Update to datafusion 42.0.0 --- Cargo.lock | 1384 ++++++++++++++++++++++-------- Cargo.toml | 19 +- src/execution/stats.rs | 3 +- src/extensions/builder.rs | 3 +- src/extensions/functions_json.rs | 4 +- tests/extensions.rs | 2 +- 6 files changed, 1027 insertions(+), 388 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7971f2c..abbbe73 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -155,19 +155,40 @@ version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05048a8932648b63f21c37d88b552ccc8a65afb6dfe9fc9f30ce79174c2e7a85" 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 52.2.0", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-cast 52.2.0", + "arrow-csv 52.2.0", + "arrow-data 52.2.0", + "arrow-ipc 52.2.0", + "arrow-json 52.2.0", + "arrow-ord 52.2.0", + "arrow-row 52.2.0", + "arrow-schema 52.2.0", + "arrow-select 52.2.0", + "arrow-string 52.2.0", +] + +[[package]] +name = "arrow" +version = "53.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45aef0d9cf9a039bf6cd1acc451b137aca819977b0928dece52bd92811b640ba" +dependencies = [ + "arrow-arith 53.0.0", + "arrow-array 53.0.0", + "arrow-buffer 53.0.0", + "arrow-cast 53.0.0", + "arrow-csv 53.0.0", + "arrow-data 53.0.0", + "arrow-ipc 53.0.0", + "arrow-json 53.0.0", + "arrow-ord 53.0.0", + "arrow-row 53.0.0", + "arrow-schema 53.0.0", + "arrow-select 53.0.0", + "arrow-string 53.0.0", ] [[package]] @@ -176,10 +197,25 @@ version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d8a57966e43bfe9a3277984a14c24ec617ad874e4c0e1d2a1b083a39cfbf22c" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "chrono", + "half", + "num", +] + +[[package]] +name = "arrow-arith" +version = "53.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03675e42d1560790f3524800e41403b40d0da1c793fe9528929fde06d8c7649a" +dependencies = [ + "arrow-array 53.0.0", + "arrow-buffer 53.0.0", + "arrow-data 53.0.0", + "arrow-schema 53.0.0", "chrono", "half", "num", @@ -192,9 +228,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16f4a9468c882dc66862cef4e1fd8423d47e67972377d85d80e022786427768c" dependencies = [ "ahash", - "arrow-buffer", - "arrow-data", - "arrow-schema", + "arrow-buffer 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "chrono", + "chrono-tz", + "half", + "hashbrown 0.14.5", + "num", +] + +[[package]] +name = "arrow-array" +version = "53.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd2bf348cf9f02a5975c5962c7fa6dee107a2009a7b41ac5fb1a027e12dc033f" +dependencies = [ + "ahash", + "arrow-buffer 53.0.0", + "arrow-data 53.0.0", + "arrow-schema 53.0.0", "chrono", "chrono-tz", "half", @@ -213,19 +266,51 @@ dependencies = [ "num", ] +[[package]] +name = "arrow-buffer" +version = "53.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3092e37715f168976012ce52273c3989b5793b0db5f06cbaa246be25e5f0924d" +dependencies = [ + "bytes", + "half", + "num", +] + [[package]] name = "arrow-cast" version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da26719e76b81d8bc3faad1d4dbdc1bcc10d14704e63dc17fc9f3e7e1e567c8e" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", - "arrow-select", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "arrow-select 52.2.0", + "atoi", + "base64", + "chrono", + "comfy-table", + "half", + "lexical-core", + "num", + "ryu", +] + +[[package]] +name = "arrow-cast" +version = "53.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ce1018bb710d502f9db06af026ed3561552e493e989a79d0d0f5d9cf267a785" +dependencies = [ + "arrow-array 53.0.0", + "arrow-buffer 53.0.0", + "arrow-data 53.0.0", + "arrow-schema 53.0.0", + "arrow-select 53.0.0", "atoi", - "base64 0.22.1", + "base64", "chrono", "comfy-table", "half", @@ -240,11 +325,30 @@ version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c13c36dc5ddf8c128df19bab27898eea64bf9da2b555ec1cd17a8ff57fba9ec2" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-cast", - "arrow-data", - "arrow-schema", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-cast 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "chrono", + "csv", + "csv-core", + "lazy_static", + "lexical-core", + "regex", +] + +[[package]] +name = "arrow-csv" +version = "53.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd178575f45624d045e4ebee714e246a05d9652e41363ee3f57ec18cca97f740" +dependencies = [ + "arrow-array 53.0.0", + "arrow-buffer 53.0.0", + "arrow-cast 53.0.0", + "arrow-data 53.0.0", + "arrow-schema 53.0.0", "chrono", "csv", "csv-core", @@ -259,35 +363,47 @@ version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd9d6f18c65ef7a2573ab498c374d8ae364b4a4edf67105357491c031f716ca5" dependencies = [ - "arrow-buffer", - "arrow-schema", + "arrow-buffer 52.2.0", + "arrow-schema 52.2.0", "half", "num", ] [[package]] -name = "arrow-flight" -version = "52.2.0" +name = "arrow-data" +version = "53.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e7ffbc96072e466ae5188974725bb46757587eafe427f77a25b828c375ae882" -dependencies = [ - "arrow-arith", - "arrow-array", - "arrow-buffer", - "arrow-cast", - "arrow-data", - "arrow-ipc", - "arrow-ord", - "arrow-row", - "arrow-schema", - "arrow-select", - "arrow-string", - "base64 0.22.1", +checksum = "4e4ac0c4ee79150afe067dc4857154b3ee9c1cd52b5f40d59a77306d0ed18d65" +dependencies = [ + "arrow-buffer 53.0.0", + "arrow-schema 53.0.0", + "half", + "num", +] + +[[package]] +name = "arrow-flight" +version = "53.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b915fb36d935b969894d7909ad417c67ddeadebbbd57c3c168edf64721a37d31" +dependencies = [ + "arrow-arith 53.0.0", + "arrow-array 53.0.0", + "arrow-buffer 53.0.0", + "arrow-cast 53.0.0", + "arrow-data 53.0.0", + "arrow-ipc 53.0.0", + "arrow-ord 53.0.0", + "arrow-row 53.0.0", + "arrow-schema 53.0.0", + "arrow-select 53.0.0", + "arrow-string 53.0.0", + "base64", "bytes", "futures", "once_cell", "paste", - "prost", + "prost 0.13.2", "prost-types", "tokio", "tonic", @@ -299,11 +415,26 @@ version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e786e1cdd952205d9a8afc69397b317cfbb6e0095e445c69cda7e8da5c1eeb0f" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-cast", - "arrow-data", - "arrow-schema", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-cast 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "flatbuffers", + "lz4_flex", +] + +[[package]] +name = "arrow-ipc" +version = "53.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb307482348a1267f91b0912e962cd53440e5de0f7fb24c5f7b10da70b38c94a" +dependencies = [ + "arrow-array 53.0.0", + "arrow-buffer 53.0.0", + "arrow-cast 53.0.0", + "arrow-data 53.0.0", + "arrow-schema 53.0.0", "flatbuffers", "lz4_flex", ] @@ -314,11 +445,31 @@ version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb22284c5a2a01d73cebfd88a33511a3234ab45d66086b2ca2d1228c3498e445" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-cast", - "arrow-data", - "arrow-schema", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-cast 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "chrono", + "half", + "indexmap 2.5.0", + "lexical-core", + "num", + "serde", + "serde_json", +] + +[[package]] +name = "arrow-json" +version = "53.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24805ba326758effdd6f2cbdd482fcfab749544f21b134701add25b33f474e6" +dependencies = [ + "arrow-array 53.0.0", + "arrow-buffer 53.0.0", + "arrow-cast 53.0.0", + "arrow-data 53.0.0", + "arrow-schema 53.0.0", "chrono", "half", "indexmap 2.5.0", @@ -334,11 +485,26 @@ version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42745f86b1ab99ef96d1c0bcf49180848a64fe2c7a7a0d945bc64fa2b21ba9bc" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", - "arrow-select", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "arrow-select 52.2.0", + "half", + "num", +] + +[[package]] +name = "arrow-ord" +version = "53.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "644046c479d80ae8ed02a7f1e1399072ea344ca6a7b0e293ab2d5d9ed924aa3b" +dependencies = [ + "arrow-array 53.0.0", + "arrow-buffer 53.0.0", + "arrow-data 53.0.0", + "arrow-schema 53.0.0", + "arrow-select 53.0.0", "half", "num", ] @@ -350,10 +516,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cd09a518c602a55bd406bcc291a967b284cfa7a63edfbf8b897ea4748aad23c" dependencies = [ "ahash", - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "half", +] + +[[package]] +name = "arrow-row" +version = "53.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a29791f8eb13b340ce35525b723f5f0df17ecb955599e11f65c2a94ab34e2efb" +dependencies = [ + "ahash", + "arrow-array 53.0.0", + "arrow-buffer 53.0.0", + "arrow-data 53.0.0", + "arrow-schema 53.0.0", "half", ] @@ -366,6 +546,12 @@ dependencies = [ "serde", ] +[[package]] +name = "arrow-schema" +version = "53.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c85320a3a2facf2b2822b57aa9d6d9d55edb8aee0b6b5d3b8df158e503d10858" + [[package]] name = "arrow-select" version = "52.2.0" @@ -373,10 +559,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "600bae05d43483d216fb3494f8c32fdbefd8aa4e1de237e790dbb3d9f44690a3" dependencies = [ "ahash", - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "num", +] + +[[package]] +name = "arrow-select" +version = "53.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cc7e6b582e23855fd1625ce46e51647aa440c20ea2e71b1d748e0839dd73cba" +dependencies = [ + "ahash", + "arrow-array 53.0.0", + "arrow-buffer 53.0.0", + "arrow-data 53.0.0", + "arrow-schema 53.0.0", "num", ] @@ -386,11 +586,28 @@ version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0dc1985b67cb45f6606a248ac2b4a288849f196bab8c657ea5589f47cdd55e6" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", - "arrow-select", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "arrow-select 52.2.0", + "memchr", + "num", + "regex", + "regex-syntax", +] + +[[package]] +name = "arrow-string" +version = "53.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0775b6567c66e56ded19b87a954b6b1beffbdd784ef95a3a2b03f59570c1d230" +dependencies = [ + "arrow-array 53.0.0", + "arrow-buffer 53.0.0", + "arrow-data 53.0.0", + "arrow-schema 53.0.0", + "arrow-select 53.0.0", "memchr", "num", "regex", @@ -487,18 +704,17 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "axum" -version = "0.6.20" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" dependencies = [ "async-trait", "axum-core", - "bitflags 1.3.2", "bytes", "futures-util", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.30", + "http", + "http-body", + "http-body-util", "itoa", "matchit", "memchr", @@ -507,7 +723,7 @@ dependencies = [ "pin-project-lite", "rustversion", "serde", - "sync_wrapper 0.1.2", + "sync_wrapper 1.0.1", "tower", "tower-layer", "tower-service", @@ -515,17 +731,20 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.3.4" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" dependencies = [ "async-trait", "bytes", "futures-util", - "http 0.2.12", - "http-body 0.4.6", + "http", + "http-body", + "http-body-util", "mime", + "pin-project-lite", "rustversion", + "sync_wrapper 0.1.2", "tower-layer", "tower-service", ] @@ -545,12 +764,6 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - [[package]] name = "base64" version = "0.22.1" @@ -1018,30 +1231,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4fd4a99fc70d40ef7e52b243b4a399c3f8d353a40d5ecb200deee05e49c61bb" dependencies = [ "ahash", - "arrow", - "arrow-array", - "arrow-ipc", - "arrow-schema", + "arrow 52.2.0", + "arrow-array 52.2.0", + "arrow-ipc 52.2.0", + "arrow-schema 52.2.0", "async-compression", "async-trait", "bytes", "bzip2", "chrono", "dashmap", - "datafusion-catalog", - "datafusion-common", - "datafusion-common-runtime", - "datafusion-execution", - "datafusion-expr", - "datafusion-functions", - "datafusion-functions-aggregate", - "datafusion-functions-nested", - "datafusion-optimizer", - "datafusion-physical-expr", - "datafusion-physical-expr-common", - "datafusion-physical-optimizer", - "datafusion-physical-plan", - "datafusion-sql", + "datafusion-catalog 41.0.0", + "datafusion-common 41.0.0", + "datafusion-common-runtime 41.0.0", + "datafusion-execution 41.0.0", + "datafusion-expr 41.0.0", + "datafusion-functions 41.0.0", + "datafusion-functions-aggregate 41.0.0", + "datafusion-functions-nested 41.0.0", + "datafusion-optimizer 41.0.0", + "datafusion-physical-expr 41.0.0", + "datafusion-physical-expr-common 41.0.0", + "datafusion-physical-optimizer 41.0.0", + "datafusion-physical-plan 41.0.0", + "datafusion-sql 41.0.0", "flate2", "futures", "glob", @@ -1051,9 +1264,9 @@ dependencies = [ "itertools 0.12.1", "log", "num_cpus", - "object_store", + "object_store 0.10.2", "parking_lot", - "parquet", + "parquet 52.2.0", "paste", "pin-project-lite", "rand", @@ -1067,18 +1280,90 @@ dependencies = [ "zstd", ] +[[package]] +name = "datafusion" +version = "42.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee907b081e45e1d14e1f327e89ef134f91fcebad0bfc2dc229fa9f6044379682" +dependencies = [ + "ahash", + "arrow 53.0.0", + "arrow-array 53.0.0", + "arrow-ipc 53.0.0", + "arrow-schema 53.0.0", + "async-compression", + "async-trait", + "bytes", + "bzip2", + "chrono", + "dashmap", + "datafusion-catalog 42.0.0", + "datafusion-common 42.0.0", + "datafusion-common-runtime 42.0.0", + "datafusion-execution 42.0.0", + "datafusion-expr 42.0.0", + "datafusion-functions 42.0.0", + "datafusion-functions-aggregate 42.0.0", + "datafusion-functions-nested 42.0.0", + "datafusion-functions-window", + "datafusion-optimizer 42.0.0", + "datafusion-physical-expr 42.0.0", + "datafusion-physical-expr-common 42.0.0", + "datafusion-physical-optimizer 42.0.0", + "datafusion-physical-plan 42.0.0", + "datafusion-sql 42.0.0", + "flate2", + "futures", + "glob", + "half", + "hashbrown 0.14.5", + "indexmap 2.5.0", + "itertools 0.13.0", + "log", + "num_cpus", + "object_store 0.11.0", + "parking_lot", + "parquet 53.0.0", + "paste", + "pin-project-lite", + "rand", + "sqlparser 0.50.0", + "tempfile", + "tokio", + "tokio-util", + "url", + "uuid", + "xz2", + "zstd", +] + [[package]] name = "datafusion-catalog" version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e13b3cfbd84c6003594ae1972314e3df303a27ce8ce755fcea3240c90f4c0529" dependencies = [ - "arrow-schema", + "arrow-schema 52.2.0", + "async-trait", + "datafusion-common 41.0.0", + "datafusion-execution 41.0.0", + "datafusion-expr 41.0.0", + "datafusion-physical-plan 41.0.0", +] + +[[package]] +name = "datafusion-catalog" +version = "42.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c2b914f6e33c429af7d8696c72a47ed9225d7e2b82c747ebdfa2408ed53579f" +dependencies = [ + "arrow-schema 53.0.0", "async-trait", - "datafusion-common", - "datafusion-execution", - "datafusion-expr", - "datafusion-physical-plan", + "datafusion-common 42.0.0", + "datafusion-execution 42.0.0", + "datafusion-expr 42.0.0", + "datafusion-physical-plan 42.0.0", + "parking_lot", ] [[package]] @@ -1088,21 +1373,45 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44fdbc877e3e40dcf88cc8f283d9f5c8851f0a3aa07fee657b1b75ac1ad49b9c" dependencies = [ "ahash", - "arrow", - "arrow-array", - "arrow-buffer", - "arrow-schema", + "arrow 52.2.0", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-schema 52.2.0", "chrono", "half", "hashbrown 0.14.5", "instant", "libc", "num_cpus", - "object_store", - "parquet", + "object_store 0.10.2", + "parquet 52.2.0", "sqlparser 0.49.0", ] +[[package]] +name = "datafusion-common" +version = "42.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a84f8e76330c582a6b8ada0b2c599ca46cfe46b7585e458fc3f4092bc722a18" +dependencies = [ + "ahash", + "arrow 53.0.0", + "arrow-array 53.0.0", + "arrow-buffer 53.0.0", + "arrow-schema 53.0.0", + "chrono", + "half", + "hashbrown 0.14.5", + "instant", + "libc", + "num_cpus", + "object_store 0.11.0", + "parquet 53.0.0", + "paste", + "sqlparser 0.50.0", + "tokio", +] + [[package]] name = "datafusion-common-runtime" version = "41.0.0" @@ -1112,21 +1421,52 @@ dependencies = [ "tokio", ] +[[package]] +name = "datafusion-common-runtime" +version = "42.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf08cc30d92720d557df13bd5a5696213bd5ea0f38a866d8d85055d866fba774" +dependencies = [ + "log", + "tokio", +] + [[package]] name = "datafusion-execution" version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "799e70968c815b611116951e3dd876aef04bf217da31b72eec01ee6a959336a1" dependencies = [ - "arrow", + "arrow 52.2.0", "chrono", "dashmap", - "datafusion-common", - "datafusion-expr", + "datafusion-common 41.0.0", + "datafusion-expr 41.0.0", "futures", "hashbrown 0.14.5", "log", - "object_store", + "object_store 0.10.2", + "parking_lot", + "rand", + "tempfile", + "url", +] + +[[package]] +name = "datafusion-execution" +version = "42.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86bc4183d5c45b9f068a6f351678a0d1eb1225181424542bb75db18ec280b822" +dependencies = [ + "arrow 53.0.0", + "chrono", + "dashmap", + "datafusion-common 42.0.0", + "datafusion-expr 42.0.0", + "futures", + "hashbrown 0.14.5", + "log", + "object_store 0.11.0", "parking_lot", "rand", "tempfile", @@ -1140,11 +1480,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c1841c409d9518c17971d15c9bae62e629eb937e6fb6c68cd32e9186f8b30d2" dependencies = [ "ahash", - "arrow", - "arrow-array", - "arrow-buffer", + "arrow 52.2.0", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", "chrono", - "datafusion-common", + "datafusion-common 41.0.0", "paste", "serde_json", "sqlparser 0.49.0", @@ -1152,21 +1492,54 @@ dependencies = [ "strum_macros", ] +[[package]] +name = "datafusion-expr" +version = "42.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "202119ce58e4d103e37ae64aab40d4e574c97bdd2bea994bf307b175fcbfa74d" +dependencies = [ + "ahash", + "arrow 53.0.0", + "arrow-array 53.0.0", + "arrow-buffer 53.0.0", + "chrono", + "datafusion-common 42.0.0", + "datafusion-expr-common", + "datafusion-functions-aggregate-common", + "datafusion-physical-expr-common 42.0.0", + "paste", + "serde_json", + "sqlparser 0.50.0", + "strum", + "strum_macros", +] + +[[package]] +name = "datafusion-expr-common" +version = "42.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8b181ce8569216abb01ef3294aa16c0a40d7d39350c2ff01ede00f167a535f2" +dependencies = [ + "arrow 53.0.0", + "datafusion-common 42.0.0", + "paste", +] + [[package]] name = "datafusion-functions" version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8e481cf34d2a444bd8fa09b65945f0ce83dc92df8665b761505b3d9f351bebb" dependencies = [ - "arrow", - "arrow-buffer", - "base64 0.22.1", + "arrow 52.2.0", + "arrow-buffer 52.2.0", + "base64", "blake2", "blake3", "chrono", - "datafusion-common", - "datafusion-execution", - "datafusion-expr", + "datafusion-common 41.0.0", + "datafusion-execution 41.0.0", + "datafusion-expr 41.0.0", "hashbrown 0.14.5", "hex", "itertools 0.12.1", @@ -1179,6 +1552,33 @@ dependencies = [ "uuid", ] +[[package]] +name = "datafusion-functions" +version = "42.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e4124b8066444e05a24472f852e94cf56546c0f4d92d00f018f207216902712" +dependencies = [ + "arrow 53.0.0", + "arrow-buffer 53.0.0", + "base64", + "blake2", + "blake3", + "chrono", + "datafusion-common 42.0.0", + "datafusion-execution 42.0.0", + "datafusion-expr 42.0.0", + "hashbrown 0.14.5", + "hex", + "itertools 0.13.0", + "log", + "md-5", + "rand", + "regex", + "sha2", + "unicode-segmentation", + "uuid", +] + [[package]] name = "datafusion-functions-aggregate" version = "41.0.0" @@ -1186,28 +1586,59 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b4ece19f73c02727e5e8654d79cd5652de371352c1df3c4ac3e419ecd6943fb" dependencies = [ "ahash", - "arrow", - "arrow-schema", - "datafusion-common", - "datafusion-execution", - "datafusion-expr", - "datafusion-physical-expr-common", + "arrow 52.2.0", + "arrow-schema 52.2.0", + "datafusion-common 41.0.0", + "datafusion-execution 41.0.0", + "datafusion-expr 41.0.0", + "datafusion-physical-expr-common 41.0.0", "log", "paste", "sqlparser 0.49.0", ] +[[package]] +name = "datafusion-functions-aggregate" +version = "42.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b94acdac235ea21810150a89751617ef2db7e32eba27f54be48a81bde2bfe119" +dependencies = [ + "ahash", + "arrow 53.0.0", + "arrow-schema 53.0.0", + "datafusion-common 42.0.0", + "datafusion-execution 42.0.0", + "datafusion-expr 42.0.0", + "datafusion-functions-aggregate-common", + "datafusion-physical-expr 42.0.0", + "datafusion-physical-expr-common 42.0.0", + "half", + "log", + "paste", + "sqlparser 0.50.0", +] + +[[package]] +name = "datafusion-functions-aggregate-common" +version = "42.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c9ea085bbf900bf16e2ca0f56fc56236b2e4f2e1a2cccb67bcd83c5ab4ad0ef" +dependencies = [ + "ahash", + "arrow 53.0.0", + "datafusion-common 42.0.0", + "datafusion-expr-common", + "datafusion-physical-expr-common 42.0.0", + "rand", +] + [[package]] name = "datafusion-functions-json" -version = "0.41.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00900606bdd73248f0a0bea254379ef06832f4958510581e752fedd17b33b8b4" +checksum = "532feb5c208fd1708f4d93b1984fb7a7ed678a9f0e6f799af97118d7c4e863a1" dependencies = [ - "arrow", - "arrow-schema", - "datafusion-common", - "datafusion-execution", - "datafusion-expr", + "datafusion 42.0.0", "jiter", "log", "paste", @@ -1219,34 +1650,69 @@ version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1474552cc824e8c9c88177d454db5781d4b66757d4aca75719306b8343a5e8d" dependencies = [ - "arrow", - "arrow-array", - "arrow-buffer", - "arrow-ord", - "arrow-schema", - "datafusion-common", - "datafusion-execution", - "datafusion-expr", - "datafusion-functions", - "datafusion-functions-aggregate", + "arrow 52.2.0", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-ord 52.2.0", + "arrow-schema 52.2.0", + "datafusion-common 41.0.0", + "datafusion-execution 41.0.0", + "datafusion-expr 41.0.0", + "datafusion-functions 41.0.0", + "datafusion-functions-aggregate 41.0.0", "itertools 0.12.1", "log", "paste", "rand", ] +[[package]] +name = "datafusion-functions-nested" +version = "42.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c882e61665ed60c5ce9b061c1e587aeb8ae5ae4bcb5e5f2465139ab25328e0f" +dependencies = [ + "arrow 53.0.0", + "arrow-array 53.0.0", + "arrow-buffer 53.0.0", + "arrow-ord 53.0.0", + "arrow-schema 53.0.0", + "datafusion-common 42.0.0", + "datafusion-execution 42.0.0", + "datafusion-expr 42.0.0", + "datafusion-functions 42.0.0", + "datafusion-functions-aggregate 42.0.0", + "datafusion-physical-expr-common 42.0.0", + "itertools 0.13.0", + "log", + "paste", + "rand", +] + +[[package]] +name = "datafusion-functions-window" +version = "42.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98a354ce96df3ca6d025093adac9fd55ca09931c9b6f2630140721a95873fde4" +dependencies = [ + "datafusion-common 42.0.0", + "datafusion-expr 42.0.0", + "datafusion-physical-expr-common 42.0.0", + "log", +] + [[package]] name = "datafusion-optimizer" version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "791ff56f55608bc542d1ea7a68a64bdc86a9413f5a381d06a39fd49c2a3ab906" dependencies = [ - "arrow", + "arrow 52.2.0", "async-trait", "chrono", - "datafusion-common", - "datafusion-expr", - "datafusion-physical-expr", + "datafusion-common 41.0.0", + "datafusion-expr 41.0.0", + "datafusion-physical-expr 41.0.0", "hashbrown 0.14.5", "indexmap 2.5.0", "itertools 0.12.1", @@ -1255,6 +1721,26 @@ dependencies = [ "regex-syntax", ] +[[package]] +name = "datafusion-optimizer" +version = "42.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf677c74fb7b5a1899ef52709e4a70fff3ed80bdfb4bbe495909810e83d5f39" +dependencies = [ + "arrow 53.0.0", + "async-trait", + "chrono", + "datafusion-common 42.0.0", + "datafusion-expr 42.0.0", + "datafusion-physical-expr 42.0.0", + "hashbrown 0.14.5", + "indexmap 2.5.0", + "itertools 0.13.0", + "log", + "paste", + "regex-syntax", +] + [[package]] name = "datafusion-physical-expr" version = "41.0.0" @@ -1262,18 +1748,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a223962b3041304a3e20ed07a21d5de3d88d7e4e71ca192135db6d24e3365a4" dependencies = [ "ahash", - "arrow", - "arrow-array", - "arrow-buffer", - "arrow-ord", - "arrow-schema", - "arrow-string", - "base64 0.22.1", + "arrow 52.2.0", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-ord 52.2.0", + "arrow-schema 52.2.0", + "arrow-string 52.2.0", + "base64", "chrono", - "datafusion-common", - "datafusion-execution", - "datafusion-expr", - "datafusion-physical-expr-common", + "datafusion-common 41.0.0", + "datafusion-execution 41.0.0", + "datafusion-expr 41.0.0", + "datafusion-physical-expr-common 41.0.0", "half", "hashbrown 0.14.5", "hex", @@ -1285,6 +1771,38 @@ dependencies = [ "regex", ] +[[package]] +name = "datafusion-physical-expr" +version = "42.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b077999f6eb6c43d6b25bc66332a3be2f693c382840f008dd763b8540f9530" +dependencies = [ + "ahash", + "arrow 53.0.0", + "arrow-array 53.0.0", + "arrow-buffer 53.0.0", + "arrow-ord 53.0.0", + "arrow-schema 53.0.0", + "arrow-string 53.0.0", + "base64", + "chrono", + "datafusion-common 42.0.0", + "datafusion-execution 42.0.0", + "datafusion-expr 42.0.0", + "datafusion-expr-common", + "datafusion-functions-aggregate-common", + "datafusion-physical-expr-common 42.0.0", + "half", + "hashbrown 0.14.5", + "hex", + "indexmap 2.5.0", + "itertools 0.13.0", + "log", + "paste", + "petgraph", + "regex", +] + [[package]] name = "datafusion-physical-expr-common" version = "41.0.0" @@ -1292,9 +1810,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db5e7d8532a1601cd916881db87a70b0a599900d23f3db2897d389032da53bc6" dependencies = [ "ahash", - "arrow", - "datafusion-common", - "datafusion-expr", + "arrow 52.2.0", + "datafusion-common 41.0.0", + "datafusion-expr 41.0.0", + "hashbrown 0.14.5", + "rand", +] + +[[package]] +name = "datafusion-physical-expr-common" +version = "42.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dce847f885c2b13bbe29f5c8b7948797131aa470af6e16d2a94f4428b4f4f1bd" +dependencies = [ + "ahash", + "arrow 53.0.0", + "datafusion-common 42.0.0", + "datafusion-expr-common", "hashbrown 0.14.5", "rand", ] @@ -1305,10 +1837,24 @@ version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdb9c78f308e050f5004671039786a925c3fee83b90004e9fcfd328d7febdcc0" dependencies = [ - "datafusion-common", - "datafusion-execution", - "datafusion-physical-expr", - "datafusion-physical-plan", + "datafusion-common 41.0.0", + "datafusion-execution 41.0.0", + "datafusion-physical-expr 41.0.0", + "datafusion-physical-plan 41.0.0", +] + +[[package]] +name = "datafusion-physical-optimizer" +version = "42.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d13238e3b9fdd62a4c18760bfef714bb990d1e1d3430e9f416aae4b3cfaa71af" +dependencies = [ + "arrow-schema 53.0.0", + "datafusion-common 42.0.0", + "datafusion-execution 42.0.0", + "datafusion-physical-expr 42.0.0", + "datafusion-physical-plan 42.0.0", + "itertools 0.13.0", ] [[package]] @@ -1318,20 +1864,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d1116949432eb2d30f6362707e2846d942e491052a206f2ddcb42d08aea1ffe" dependencies = [ "ahash", - "arrow", - "arrow-array", - "arrow-buffer", - "arrow-ord", - "arrow-schema", + "arrow 52.2.0", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-ord 52.2.0", + "arrow-schema 52.2.0", "async-trait", "chrono", - "datafusion-common", - "datafusion-common-runtime", - "datafusion-execution", - "datafusion-expr", - "datafusion-functions-aggregate", - "datafusion-physical-expr", - "datafusion-physical-expr-common", + "datafusion-common 41.0.0", + "datafusion-common-runtime 41.0.0", + "datafusion-execution 41.0.0", + "datafusion-expr 41.0.0", + "datafusion-functions-aggregate 41.0.0", + "datafusion-physical-expr 41.0.0", + "datafusion-physical-expr-common 41.0.0", "futures", "half", "hashbrown 0.14.5", @@ -1345,20 +1891,55 @@ dependencies = [ "tokio", ] +[[package]] +name = "datafusion-physical-plan" +version = "42.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faba6f55a7eaf0241d07d12c2640de52742646b10f754485d5192bdfe2c9ceae" +dependencies = [ + "ahash", + "arrow 53.0.0", + "arrow-array 53.0.0", + "arrow-buffer 53.0.0", + "arrow-ord 53.0.0", + "arrow-schema 53.0.0", + "async-trait", + "chrono", + "datafusion-common 42.0.0", + "datafusion-common-runtime 42.0.0", + "datafusion-execution 42.0.0", + "datafusion-expr 42.0.0", + "datafusion-functions-aggregate 42.0.0", + "datafusion-functions-aggregate-common", + "datafusion-physical-expr 42.0.0", + "datafusion-physical-expr-common 42.0.0", + "futures", + "half", + "hashbrown 0.14.5", + "indexmap 2.5.0", + "itertools 0.13.0", + "log", + "once_cell", + "parking_lot", + "pin-project-lite", + "rand", + "tokio", +] + [[package]] name = "datafusion-proto" version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf1d25864c18178d0e51438648f5e0fa08417dbbc39b642c1752cbbb1013abf0" dependencies = [ - "arrow", + "arrow 52.2.0", "chrono", - "datafusion", - "datafusion-common", - "datafusion-expr", + "datafusion 41.0.0", + "datafusion-common 41.0.0", + "datafusion-expr 41.0.0", "datafusion-proto-common", - "object_store", - "prost", + "object_store 0.10.2", + "prost 0.12.6", ] [[package]] @@ -1367,11 +1948,11 @@ version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96a683253732334526b1cc5314a73a0f786803831f7e189ed3fe387ac50d7222" dependencies = [ - "arrow", + "arrow 52.2.0", "chrono", - "datafusion-common", - "object_store", - "prost", + "datafusion-common 41.0.0", + "object_store 0.10.2", + "prost 0.12.6", ] [[package]] @@ -1380,30 +1961,47 @@ version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b45d0180711165fe94015d7c4123eb3e1cf5fb60b1506453200b8d1ce666bef0" dependencies = [ - "arrow", - "arrow-array", - "arrow-schema", - "datafusion-common", - "datafusion-expr", + "arrow 52.2.0", + "arrow-array 52.2.0", + "arrow-schema 52.2.0", + "datafusion-common 41.0.0", + "datafusion-expr 41.0.0", "log", "regex", "sqlparser 0.49.0", "strum", ] +[[package]] +name = "datafusion-sql" +version = "42.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dad8d96a9b52e1aa24f9373696a815be828193efce7cb0bbd2140b6bb67d1819" +dependencies = [ + "arrow 53.0.0", + "arrow-array 53.0.0", + "arrow-schema 53.0.0", + "datafusion-common 42.0.0", + "datafusion-expr 42.0.0", + "log", + "regex", + "sqlparser 0.50.0", + "strum", +] + [[package]] name = "delta_kernel" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa08a82239f51e6d3d249c38f0f5bf7c8a78b28587e1b466893c9eac84d252d8" dependencies = [ - "arrow-arith", - "arrow-array", - "arrow-cast", - "arrow-json", - "arrow-ord", - "arrow-schema", - "arrow-select", + "arrow-arith 52.2.0", + "arrow-array 52.2.0", + "arrow-cast 52.2.0", + "arrow-json 52.2.0", + "arrow-ord 52.2.0", + "arrow-schema 52.2.0", + "arrow-select 52.2.0", "bytes", "chrono", "delta_kernel_derive", @@ -1412,7 +2010,7 @@ dependencies = [ "indexmap 2.5.0", "itertools 0.13.0", "lazy_static", - "parquet", + "parquet 52.2.0", "roaring", "rustc_version", "serde", @@ -1439,44 +2037,44 @@ dependencies = [ [[package]] name = "deltalake" -version = "0.19.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f0e1329698c7e585ee838d62ff12d43ab8c373f298561e99f1c106458f2ba9e" +checksum = "bb19a9a5ef642da82a32eed2c85a3b1c66dd3ecdc7cc0d986ed5e484d9d17396" dependencies = [ "deltalake-core", ] [[package]] name = "deltalake-core" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "120658be361276db2135b8838b1968c9196a1d88c93584c6a294e13c1a234f89" -dependencies = [ - "arrow", - "arrow-arith", - "arrow-array", - "arrow-buffer", - "arrow-cast", - "arrow-ipc", - "arrow-json", - "arrow-ord", - "arrow-row", - "arrow-schema", - "arrow-select", +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "052397afa413dfcf60b040c715a955caf25d69555c7566cc447665590f73eda7" +dependencies = [ + "arrow 52.2.0", + "arrow-arith 52.2.0", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-cast 52.2.0", + "arrow-ipc 52.2.0", + "arrow-json 52.2.0", + "arrow-ord 52.2.0", + "arrow-row 52.2.0", + "arrow-schema 52.2.0", + "arrow-select 52.2.0", "async-trait", "bytes", "cfg-if", "chrono", "dashmap", - "datafusion", - "datafusion-common", - "datafusion-expr", - "datafusion-functions", - "datafusion-functions-aggregate", - "datafusion-physical-expr", - "datafusion-physical-plan", + "datafusion 41.0.0", + "datafusion-common 41.0.0", + "datafusion-expr 41.0.0", + "datafusion-functions 41.0.0", + "datafusion-functions-aggregate 41.0.0", + "datafusion-physical-expr 41.0.0", + "datafusion-physical-plan 41.0.0", "datafusion-proto", - "datafusion-sql", + "datafusion-sql 41.0.0", "delta_kernel", "either", "errno", @@ -1491,10 +2089,10 @@ dependencies = [ "num-bigint", "num-traits", "num_cpus", - "object_store", + "object_store 0.10.2", "once_cell", "parking_lot", - "parquet", + "parquet 52.2.0", "percent-encoding", "pin-project-lite", "rand", @@ -1502,7 +2100,7 @@ dependencies = [ "roaring", "serde", "serde_json", - "sqlparser 0.50.0", + "sqlparser 0.51.0", "thiserror", "tokio", "tracing", @@ -1522,8 +2120,7 @@ dependencies = [ "clap", "color-eyre", "crossterm", - "datafusion", - "datafusion-common", + "datafusion 42.0.0", "datafusion-functions-json", "deltalake", "directories", @@ -1533,7 +2130,7 @@ dependencies = [ "itertools 0.13.0", "lazy_static", "log", - "object_store", + "object_store 0.11.0", "predicates", "ratatui", "serde", @@ -1867,25 +2464,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" -[[package]] -name = "h2" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.12", - "indexmap 2.5.0", - "slab", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "h2" version = "0.4.6" @@ -1897,7 +2475,7 @@ dependencies = [ "fnv", "futures-core", "futures-sink", - "http 1.1.0", + "http", "indexmap 2.5.0", "slab", "tokio", @@ -1956,17 +2534,6 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "http" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - [[package]] name = "http" version = "1.1.0" @@ -1978,17 +2545,6 @@ dependencies = [ "itoa", ] -[[package]] -name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" -dependencies = [ - "bytes", - "http 0.2.12", - "pin-project-lite", -] - [[package]] name = "http-body" version = "1.0.1" @@ -1996,7 +2552,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.1.0", + "http", ] [[package]] @@ -2007,8 +2563,8 @@ checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", "futures-util", - "http 1.1.0", - "http-body 1.0.1", + "http", + "http-body", "pin-project-lite", ] @@ -2030,30 +2586,6 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" -[[package]] -name = "hyper" -version = "0.14.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - [[package]] name = "hyper" version = "1.4.1" @@ -2063,10 +2595,11 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.6", - "http 1.1.0", - "http-body 1.0.1", + "h2", + "http", + "http-body", "httparse", + "httpdate", "itoa", "pin-project-lite", "smallvec", @@ -2081,8 +2614,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", - "http 1.1.0", - "hyper 1.4.1", + "http", + "hyper", "hyper-util", "rustls", "rustls-native-certs 0.8.0", @@ -2094,14 +2627,15 @@ dependencies = [ [[package]] name = "hyper-timeout" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793" dependencies = [ - "hyper 0.14.30", + "hyper", + "hyper-util", "pin-project-lite", "tokio", - "tokio-io-timeout", + "tower-service", ] [[package]] @@ -2113,9 +2647,9 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "http 1.1.0", - "http-body 1.0.1", - "hyper 1.4.1", + "http", + "http-body", + "hyper", "pin-project-lite", "socket2", "tokio", @@ -2622,12 +3156,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6da452820c715ce78221e8202ccc599b4a52f3e1eb3eedb487b680c81a8e3f3" dependencies = [ "async-trait", - "base64 0.22.1", "bytes", "chrono", "futures", "humantime", - "hyper 1.4.1", + "itertools 0.13.0", + "parking_lot", + "percent-encoding", + "snafu 0.7.5", + "tokio", + "tracing", + "url", + "walkdir", +] + +[[package]] +name = "object_store" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25a0c4b3a0e31f8b66f71ad8064521efa773910196e2cde791436f13409f3b45" +dependencies = [ + "async-trait", + "base64", + "bytes", + "chrono", + "futures", + "humantime", + "hyper", "itertools 0.13.0", "md-5", "parking_lot", @@ -2638,7 +3193,7 @@ dependencies = [ "ring", "serde", "serde_json", - "snafu", + "snafu 0.8.4", "tokio", "tracing", "url", @@ -2714,14 +3269,50 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e977b9066b4d3b03555c22bdc442f3fadebd96a39111249113087d0edb2691cd" dependencies = [ "ahash", - "arrow-array", - "arrow-buffer", - "arrow-cast", - "arrow-data", - "arrow-ipc", - "arrow-schema", - "arrow-select", - "base64 0.22.1", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-cast 52.2.0", + "arrow-data 52.2.0", + "arrow-ipc 52.2.0", + "arrow-schema 52.2.0", + "arrow-select 52.2.0", + "base64", + "brotli", + "bytes", + "chrono", + "flate2", + "futures", + "half", + "hashbrown 0.14.5", + "lz4_flex", + "num", + "num-bigint", + "object_store 0.10.2", + "paste", + "seq-macro", + "snap", + "thrift", + "tokio", + "twox-hash", + "zstd", + "zstd-sys", +] + +[[package]] +name = "parquet" +version = "53.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0fbf928021131daaa57d334ca8e3904fe9ae22f73c56244fc7db9b04eedc3d8" +dependencies = [ + "ahash", + "arrow-array 53.0.0", + "arrow-buffer 53.0.0", + "arrow-cast 53.0.0", + "arrow-data 53.0.0", + "arrow-ipc 53.0.0", + "arrow-schema 53.0.0", + "arrow-select 53.0.0", + "base64", "brotli", "bytes", "chrono", @@ -2732,7 +3323,7 @@ dependencies = [ "lz4_flex", "num", "num-bigint", - "object_store", + "object_store 0.11.0", "paste", "seq-macro", "snap", @@ -2905,7 +3496,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", - "prost-derive", + "prost-derive 0.12.6", +] + +[[package]] +name = "prost" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b2ecbe40f08db5c006b5764a2645f7f3f141ce756412ac9e1dd6087e6d32995" +dependencies = [ + "bytes", + "prost-derive 0.13.2", ] [[package]] @@ -2921,13 +3522,26 @@ dependencies = [ "syn 2.0.77", ] +[[package]] +name = "prost-derive" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acf0c195eebb4af52c752bec4f52f645da98b6e92077a04110c7f349477ae5ac" +dependencies = [ + "anyhow", + "itertools 0.13.0", + "proc-macro2", + "quote", + "syn 2.0.77", +] + [[package]] name = "prost-types" -version = "0.12.6" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" +checksum = "60caa6738c7369b940c3d49246a8d1749323674c65cb13010134f5c9bad5b519" dependencies = [ - "prost", + "prost 0.13.2", ] [[package]] @@ -3109,15 +3723,15 @@ version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" dependencies = [ - "base64 0.22.1", + "base64", "bytes", "futures-core", "futures-util", - "h2 0.4.6", - "http 1.1.0", - "http-body 1.0.1", + "h2", + "http", + "http-body", "http-body-util", - "hyper 1.4.1", + "hyper", "hyper-rustls", "hyper-util", "ipnet", @@ -3253,7 +3867,7 @@ version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" dependencies = [ - "base64 0.22.1", + "base64", "rustls-pki-types", ] @@ -3488,7 +4102,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6" dependencies = [ "doc-comment", - "snafu-derive", + "snafu-derive 0.7.5", +] + +[[package]] +name = "snafu" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b835cb902660db3415a672d862905e791e54d306c6e8189168c7f3d9ae1c79d" +dependencies = [ + "snafu-derive 0.8.4", ] [[package]] @@ -3503,6 +4126,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "snafu-derive" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d1e02fca405f6280643174a50c942219f0bbf4dbf7d480f1dd864d6f211ae5" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.77", +] + [[package]] name = "snap" version = "1.1.1" @@ -3540,6 +4175,16 @@ name = "sqlparser" version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2e5b515a2bd5168426033e9efbfd05500114833916f1d5c268f938b4ee130ac" +dependencies = [ + "log", + "sqlparser_derive", +] + +[[package]] +name = "sqlparser" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fe11944a61da0da3f592e19a45ebe5ab92dc14a779907ff1f08fbb797bfefc7" dependencies = [ "log", ] @@ -3740,16 +4385,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", -] - [[package]] name = "tokio-macros" version = "2.4.0" @@ -3832,23 +4467,26 @@ dependencies = [ [[package]] name = "tonic" -version = "0.11.0" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" +checksum = "c6f6ba989e4b2c58ae83d862d3a3e27690b6e3ae630d0deb59f3697f32aa88ad" dependencies = [ "async-stream", "async-trait", "axum", - "base64 0.21.7", + "base64", "bytes", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.30", + "h2", + "http", + "http-body", + "http-body-util", + "hyper", "hyper-timeout", + "hyper-util", "percent-encoding", "pin-project", - "prost", + "prost 0.13.2", + "socket2", "tokio", "tokio-stream", "tower", diff --git a/Cargo.toml b/Cargo.toml index 542523f..f6a3b48 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,30 +14,29 @@ default-run = "dft" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -arrow-flight = { version = "52.2.0", features = ["flight-sql-experimental"] , optional = true } +arrow-flight = { version = "53.0.0", features = ["flight-sql-experimental"] , optional = true } async-trait = "0.1.80" clap = { version = "4.5.1", features = ["derive"] } color-eyre = "0.6.3" crossterm = { version = "0.28.1", features = ["event-stream"] } -datafusion = "41.0.0" -datafusion-common = "41.0.0" -datafusion-functions-json = { version = "0.41.0", optional = true } -deltalake = { version = "0.19.0", features = ["datafusion"], optional = true } +datafusion = "42.0.0" +datafusion-functions-json = { version = "0.42.0", optional = true } +deltalake = { version = "0.20.0", features = ["datafusion"], optional = true } directories = "5.0.1" env_logger = "0.11.5" futures = "0.3.30" itertools = "0.13.0" lazy_static = "1.4.0" log = "0.4.22" -object_store = { version = "0.10.2", features = ["aws"], optional = true } +object_store = { version = "0.11.0", features = ["aws"], optional = true } ratatui = "0.28.0" serde = { version = "1.0.197", features = ["derive"] } strum = "0.26.2" -tokio = { version = "1.36.0", features = ["rt-multi-thread", "macros"] } -tokio-stream = "0.1.15" +tokio = { version = "1.40.0", features = ["rt-multi-thread", "macros"] } +tokio-stream = "0.1.16" tokio-util = "0.7.10" -toml = "0.8.12" -tonic = { version = "0.11.0", optional = true } +toml = "0.8.19" +tonic = { version = "0.12.2", optional = true } tui-logger = {version = "0.12", features = ["tracing-support"]} tui-textarea = { version = "0.6.1", features = ["search"] } url = { version = "2.5.2", optional = true } diff --git a/src/execution/stats.rs b/src/execution/stats.rs index bff4f29..cee7006 100644 --- a/src/execution/stats.rs +++ b/src/execution/stats.rs @@ -15,6 +15,7 @@ // specific language governing permissions and limitations // under the License. +use datafusion::error::DataFusionError; use datafusion::physical_plan::{visit_execution_plan, ExecutionPlan, ExecutionPlanVisitor}; use log::info; use std::sync::Arc; @@ -46,7 +47,7 @@ impl From for ExecutionStats { } impl ExecutionPlanVisitor for PlanVisitor { - type Error = datafusion_common::DataFusionError; + type Error = DataFusionError; fn pre_visit(&mut self, plan: &dyn ExecutionPlan) -> color_eyre::Result { match plan.metrics() { diff --git a/src/extensions/builder.rs b/src/extensions/builder.rs index ccad3c6..532dd91 100644 --- a/src/extensions/builder.rs +++ b/src/extensions/builder.rs @@ -18,6 +18,7 @@ //! [`DftSessionStateBuilder`] for configuring DataFusion [`SessionState`] use datafusion::catalog::TableProviderFactory; +use datafusion::error::Result; use datafusion::execution::context::SessionState; use datafusion::execution::runtime_env::RuntimeEnv; use datafusion::execution::session_state::SessionStateBuilder; @@ -107,7 +108,7 @@ impl DftSessionStateBuilder { } /// Build the [`SessionState`] from the specified configuration - pub fn build(self) -> datafusion_common::Result { + pub fn build(self) -> Result { let Self { session_config, table_factories, diff --git a/src/extensions/functions_json.rs b/src/extensions/functions_json.rs index 7925fb7..01b3f9f 100644 --- a/src/extensions/functions_json.rs +++ b/src/extensions/functions_json.rs @@ -21,8 +21,8 @@ use crate::config::ExecutionConfig; use crate::extensions::{DftSessionStateBuilder, Extension}; +use datafusion::error::Result; use datafusion::prelude::SessionContext; -use datafusion_common::Result; #[derive(Debug, Default)] pub struct JsonFunctionsExtension {} @@ -38,7 +38,7 @@ impl Extension for JsonFunctionsExtension { &self, _config: &ExecutionConfig, builder: DftSessionStateBuilder, - ) -> datafusion_common::Result { + ) -> Result { // Ok(builder) } diff --git a/tests/extensions.rs b/tests/extensions.rs index 79750b7..50e5159 100644 --- a/tests/extensions.rs +++ b/tests/extensions.rs @@ -19,8 +19,8 @@ use datafusion::arrow::array::RecordBatch; use datafusion::arrow::util::pretty::pretty_format_batches; +use datafusion::error::Result; use datafusion::sql::parser::DFParser; -use datafusion_common::Result; use dft::config::AppConfig; use dft::execution::ExecutionContext; use futures::{StreamExt, TryStreamExt};