diff --git a/Cargo.lock b/Cargo.lock index 5eb791b46..9927f7aef 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -749,16 +749,16 @@ dependencies = [ "bzip2", "chrono", "dashmap", - "datafusion-common", - "datafusion-common-runtime", - "datafusion-execution", - "datafusion-expr", - "datafusion-functions", - "datafusion-functions-array", - "datafusion-optimizer", - "datafusion-physical-expr", - "datafusion-physical-plan", - "datafusion-sql", + "datafusion-common 37.1.0", + "datafusion-common-runtime 37.1.0", + "datafusion-execution 37.1.0", + "datafusion-expr 37.1.0", + "datafusion-functions 37.1.0", + "datafusion-functions-array 37.1.0", + "datafusion-optimizer 37.1.0", + "datafusion-physical-expr 37.1.0", + "datafusion-physical-plan 37.1.0", + "datafusion-sql 37.1.0", "flate2", "futures", "glob", @@ -774,7 +774,59 @@ dependencies = [ "parquet", "pin-project-lite", "rand", - "sqlparser", + "sqlparser 0.44.0", + "tempfile", + "tokio", + "tokio-util", + "url", + "uuid", + "xz2", + "zstd 0.13.0", +] + +[[package]] +name = "datafusion" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05fb4eeeb7109393a0739ac5b8fd892f95ccef691421491c85544f7997366f68" +dependencies = [ + "ahash", + "arrow", + "arrow-array", + "arrow-ipc", + "arrow-schema", + "async-compression", + "async-trait", + "bytes", + "bzip2", + "chrono", + "dashmap", + "datafusion-common 38.0.0", + "datafusion-common-runtime 38.0.0", + "datafusion-execution 38.0.0", + "datafusion-expr 38.0.0", + "datafusion-functions 38.0.0", + "datafusion-functions-aggregate", + "datafusion-functions-array 38.0.0", + "datafusion-optimizer 38.0.0", + "datafusion-physical-expr 38.0.0", + "datafusion-physical-plan 38.0.0", + "datafusion-sql 38.0.0", + "flate2", + "futures", + "glob", + "half", + "hashbrown 0.14.3", + "indexmap", + "itertools 0.12.0", + "log", + "num_cpus", + "object_store", + "parking_lot", + "parquet", + "pin-project-lite", + "rand", + "sqlparser 0.45.0", "tempfile", "tokio", "tokio-util", @@ -804,7 +856,28 @@ dependencies = [ "object_store", "parquet", "pyo3", - "sqlparser", + "sqlparser 0.44.0", +] + +[[package]] +name = "datafusion-common" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "741aeac15c82f239f2fc17deccaab19873abbd62987be20023689b15fa72fa09" +dependencies = [ + "ahash", + "arrow", + "arrow-array", + "arrow-buffer", + "arrow-schema", + "chrono", + "half", + "instant", + "libc", + "num_cpus", + "object_store", + "parquet", + "sqlparser 0.45.0", ] [[package]] @@ -816,6 +889,15 @@ dependencies = [ "tokio", ] +[[package]] +name = "datafusion-common-runtime" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e8ddfb8d8cb51646a30da0122ecfffb81ca16919ae9a3495a9e7468bdcd52b8" +dependencies = [ + "tokio", +] + [[package]] name = "datafusion-execution" version = "37.1.0" @@ -825,8 +907,29 @@ dependencies = [ "arrow", "chrono", "dashmap", - "datafusion-common", - "datafusion-expr", + "datafusion-common 37.1.0", + "datafusion-expr 37.1.0", + "futures", + "hashbrown 0.14.3", + "log", + "object_store", + "parking_lot", + "rand", + "tempfile", + "url", +] + +[[package]] +name = "datafusion-execution" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282122f90b20e8f98ebfa101e4bf20e718fd2684cf81bef4e8c6366571c64404" +dependencies = [ + "arrow", + "chrono", + "dashmap", + "datafusion-common 38.0.0", + "datafusion-expr 38.0.0", "futures", "hashbrown 0.14.3", "log", @@ -847,9 +950,27 @@ dependencies = [ "arrow", "arrow-array", "chrono", - "datafusion-common", + "datafusion-common 37.1.0", "paste", - "sqlparser", + "sqlparser 0.44.0", + "strum 0.26.1", + "strum_macros 0.26.1", +] + +[[package]] +name = "datafusion-expr" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5478588f733df0dfd87a62671c7478f590952c95fa2fa5c137e3ff2929491e22" +dependencies = [ + "ahash", + "arrow", + "arrow-array", + "chrono", + "datafusion-common 38.0.0", + "paste", + "serde_json", + "sqlparser 0.45.0", "strum 0.26.1", "strum_macros 0.26.1", ] @@ -865,20 +986,63 @@ dependencies = [ "blake2", "blake3", "chrono", - "datafusion-common", - "datafusion-execution", - "datafusion-expr", - "datafusion-physical-expr", + "datafusion-common 37.1.0", + "datafusion-execution 37.1.0", + "datafusion-expr 37.1.0", + "datafusion-physical-expr 37.1.0", + "hex", + "itertools 0.12.0", + "log", + "md-5", + "regex", + "sha2", + "unicode-segmentation", + "uuid", +] + +[[package]] +name = "datafusion-functions" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4afd261cea6ac9c3ca1192fd5e9f940596d8e9208c5b1333f4961405db53185" +dependencies = [ + "arrow", + "base64 0.22.1", + "blake2", + "blake3", + "chrono", + "datafusion-common 38.0.0", + "datafusion-execution 38.0.0", + "datafusion-expr 38.0.0", + "datafusion-physical-expr 38.0.0", + "hashbrown 0.14.3", "hex", "itertools 0.12.0", "log", "md-5", + "rand", "regex", "sha2", "unicode-segmentation", "uuid", ] +[[package]] +name = "datafusion-functions-aggregate" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b36a6c4838ab94b5bf8f7a96ce6ce059d805c5d1dcaa6ace49e034eb65cd999" +dependencies = [ + "arrow", + "datafusion-common 38.0.0", + "datafusion-execution 38.0.0", + "datafusion-expr 38.0.0", + "datafusion-physical-expr-common", + "log", + "paste", + "sqlparser 0.45.0", +] + [[package]] name = "datafusion-functions-array" version = "37.1.0" @@ -890,10 +1054,30 @@ dependencies = [ "arrow-buffer", "arrow-ord", "arrow-schema", - "datafusion-common", - "datafusion-execution", - "datafusion-expr", - "datafusion-functions", + "datafusion-common 37.1.0", + "datafusion-execution 37.1.0", + "datafusion-expr 37.1.0", + "datafusion-functions 37.1.0", + "itertools 0.12.0", + "log", + "paste", +] + +[[package]] +name = "datafusion-functions-array" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5fdd200a6233f48d3362e7ccb784f926f759100e44ae2137a5e2dcb986a59c4" +dependencies = [ + "arrow", + "arrow-array", + "arrow-buffer", + "arrow-ord", + "arrow-schema", + "datafusion-common 38.0.0", + "datafusion-execution 38.0.0", + "datafusion-expr 38.0.0", + "datafusion-functions 38.0.0", "itertools 0.12.0", "log", "paste", @@ -908,10 +1092,29 @@ dependencies = [ "arrow", "async-trait", "chrono", - "datafusion-common", - "datafusion-expr", - "datafusion-physical-expr", + "datafusion-common 37.1.0", + "datafusion-expr 37.1.0", + "datafusion-physical-expr 37.1.0", + "hashbrown 0.14.3", + "itertools 0.12.0", + "log", + "regex-syntax", +] + +[[package]] +name = "datafusion-optimizer" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54f2820938810e8a2d71228fd6f59f33396aebc5f5f687fcbf14de5aab6a7e1a" +dependencies = [ + "arrow", + "async-trait", + "chrono", + "datafusion-common 38.0.0", + "datafusion-expr 38.0.0", + "datafusion-physical-expr 38.0.0", "hashbrown 0.14.3", + "indexmap", "itertools 0.12.0", "log", "regex-syntax", @@ -934,9 +1137,9 @@ dependencies = [ "blake2", "blake3", "chrono", - "datafusion-common", - "datafusion-execution", - "datafusion-expr", + "datafusion-common 37.1.0", + "datafusion-execution 37.1.0", + "datafusion-expr 37.1.0", "half", "hashbrown 0.14.3", "hex", @@ -952,6 +1155,48 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "datafusion-physical-expr" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9adf8eb12716f52ddf01e09eb6c94d3c9b291e062c05c91b839a448bddba2ff8" +dependencies = [ + "ahash", + "arrow", + "arrow-array", + "arrow-buffer", + "arrow-ord", + "arrow-schema", + "arrow-string", + "base64 0.22.1", + "chrono", + "datafusion-common 38.0.0", + "datafusion-execution 38.0.0", + "datafusion-expr 38.0.0", + "datafusion-functions-aggregate", + "datafusion-physical-expr-common", + "half", + "hashbrown 0.14.3", + "hex", + "indexmap", + "itertools 0.12.0", + "log", + "paste", + "petgraph", + "regex", +] + +[[package]] +name = "datafusion-physical-expr-common" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d5472c3230584c150197b3f2c23f2392b9dc54dbfb62ad41e7e36447cfce4be" +dependencies = [ + "arrow", + "datafusion-common 38.0.0", + "datafusion-expr 38.0.0", +] + [[package]] name = "datafusion-physical-plan" version = "37.1.0" @@ -965,11 +1210,45 @@ dependencies = [ "arrow-schema", "async-trait", "chrono", - "datafusion-common", - "datafusion-common-runtime", - "datafusion-execution", - "datafusion-expr", - "datafusion-physical-expr", + "datafusion-common 37.1.0", + "datafusion-common-runtime 37.1.0", + "datafusion-execution 37.1.0", + "datafusion-expr 37.1.0", + "datafusion-physical-expr 37.1.0", + "futures", + "half", + "hashbrown 0.14.3", + "indexmap", + "itertools 0.12.0", + "log", + "once_cell", + "parking_lot", + "pin-project-lite", + "rand", + "tokio", +] + +[[package]] +name = "datafusion-physical-plan" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18ae750c38389685a8b62e5b899bbbec488950755ad6d218f3662d35b800c4fe" +dependencies = [ + "ahash", + "arrow", + "arrow-array", + "arrow-buffer", + "arrow-ord", + "arrow-schema", + "async-trait", + "chrono", + "datafusion-common 38.0.0", + "datafusion-common-runtime 38.0.0", + "datafusion-execution 38.0.0", + "datafusion-expr 38.0.0", + "datafusion-functions-aggregate", + "datafusion-physical-expr 38.0.0", + "datafusion-physical-expr-common", "futures", "half", "hashbrown 0.14.3", @@ -988,12 +1267,12 @@ name = "datafusion-python" version = "37.1.0" dependencies = [ "async-trait", - "datafusion", - "datafusion-common", - "datafusion-expr", - "datafusion-functions-array", - "datafusion-optimizer", - "datafusion-sql", + "datafusion 37.1.0", + "datafusion-common 37.1.0", + "datafusion-expr 37.1.0", + "datafusion-functions-array 37.1.0", + "datafusion-optimizer 37.1.0", + "datafusion-sql 37.1.0", "datafusion-substrait", "futures", "mimalloc", @@ -1020,22 +1299,38 @@ dependencies = [ "arrow", "arrow-array", "arrow-schema", - "datafusion-common", - "datafusion-expr", + "datafusion-common 37.1.0", + "datafusion-expr 37.1.0", + "log", + "sqlparser 0.44.0", + "strum 0.26.1", +] + +[[package]] +name = "datafusion-sql" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "befc67a3cdfbfa76853f43b10ac27337821bb98e519ab6baf431fcc0bcfcafdb" +dependencies = [ + "arrow", + "arrow-array", + "arrow-schema", + "datafusion-common 38.0.0", + "datafusion-expr 38.0.0", "log", - "sqlparser", + "sqlparser 0.45.0", "strum 0.26.1", ] [[package]] name = "datafusion-substrait" -version = "37.1.0" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3b496697ac22a857c7d497b9d6b40edec19ed2e3e86e2b77051541fefb4c6d" +checksum = "1f62542caa77df003e23a8bc2f1b8a1ffc682fe447c7fcb4905d109e3d7a5b9d" dependencies = [ "async-recursion", "chrono", - "datafusion", + "datafusion 38.0.0", "itertools 0.12.0", "object_store", "prost", @@ -1260,19 +1555,6 @@ version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" -[[package]] -name = "git2" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b3ba52851e73b46a4c3df1d89343741112003f0f6f13beb0dfac9e457c3fdcd" -dependencies = [ - "bitflags 2.4.2", - "libc", - "libgit2-sys", - "log", - "url", -] - [[package]] name = "glob" version = "0.3.1" @@ -1654,18 +1936,6 @@ dependencies = [ "rle-decode-fast", ] -[[package]] -name = "libgit2-sys" -version = "0.16.2+1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" -dependencies = [ - "cc", - "libc", - "libz-sys", - "pkg-config", -] - [[package]] name = "libm" version = "0.2.8" @@ -1682,18 +1952,6 @@ dependencies = [ "libc", ] -[[package]] -name = "libz-sys" -version = "1.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "295c17e837573c8c821dbaeb3cceb3d745ad082f7572191409e69cbc1b3fd050" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "linux-raw-sys" version = "0.4.13" @@ -2770,6 +3028,16 @@ dependencies = [ "sqlparser_derive", ] +[[package]] +name = "sqlparser" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7bbffee862a796d67959a89859d6b1046bb5016d63e23835ad0da182777bbe0" +dependencies = [ + "log", + "sqlparser_derive", +] + [[package]] name = "sqlparser_derive" version = "0.2.2" @@ -2830,11 +3098,10 @@ dependencies = [ [[package]] name = "substrait" -version = "0.28.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df9531ae6784dee4c018ebdb0226872b63cc28765bfa65c1e53b6c58584232af" +checksum = "f01344023c2614171a9ffd6e387eea14e12f7387c5b6adb33f1563187d65e376" dependencies = [ - "git2", "heck 0.5.0", "prettyplease", "prost", @@ -3221,12 +3488,6 @@ dependencies = [ "serde", ] -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - [[package]] name = "version_check" version = "0.9.4" diff --git a/Cargo.toml b/Cargo.toml index 9da36d710..7b150dde7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,7 +43,7 @@ datafusion-expr = "37.1.0" datafusion-functions-array = "37.1.0" datafusion-optimizer = "37.1.0" datafusion-sql = "37.1.0" -datafusion-substrait = { version = "37.1.0", optional = true } +datafusion-substrait = { version = "38.0.0", optional = true } prost = "0.12" prost-types = "0.12" uuid = { version = "1.8", features = ["v4"] }