diff --git a/Cargo.lock b/Cargo.lock index e59811210..3003af364 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -680,6 +680,12 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + [[package]] name = "crunchy" version = "0.2.2" @@ -736,6 +742,20 @@ dependencies = [ "parking_lot_core", ] +[[package]] +name = "dashmap" +version = "6.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" +dependencies = [ + "cfg-if", + "crossbeam-utils", + "hashbrown", + "lock_api", + "once_cell", + "parking_lot_core", +] + [[package]] name = "datafusion" version = "40.0.0" @@ -753,17 +773,17 @@ dependencies = [ "bytes", "bzip2", "chrono", - "dashmap", - "datafusion-common", + "dashmap 5.5.3", + "datafusion-common 40.0.0", "datafusion-common-runtime", - "datafusion-execution", - "datafusion-expr", + "datafusion-execution 40.0.0", + "datafusion-expr 40.0.0", "datafusion-functions", "datafusion-functions-aggregate", "datafusion-functions-array", - "datafusion-optimizer", - "datafusion-physical-expr", - "datafusion-physical-expr-common", + "datafusion-optimizer 40.0.0", + "datafusion-physical-expr 40.0.0", + "datafusion-physical-expr-common 40.0.0", "datafusion-physical-plan", "datafusion-sql", "flate2", @@ -782,7 +802,7 @@ dependencies = [ "paste", "pin-project-lite", "rand", - "sqlparser", + "sqlparser 0.47.0", "tempfile", "tokio", "tokio-util", @@ -813,7 +833,27 @@ dependencies = [ "object_store", "parquet", "pyo3", - "sqlparser", + "sqlparser 0.47.0", +] + +[[package]] +name = "datafusion-common" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44fdbc877e3e40dcf88cc8f283d9f5c8851f0a3aa07fee657b1b75ac1ad49b9c" +dependencies = [ + "ahash", + "arrow", + "arrow-array", + "arrow-buffer", + "arrow-schema", + "chrono", + "half", + "hashbrown", + "instant", + "libc", + "num_cpus", + "sqlparser 0.49.0", ] [[package]] @@ -833,9 +873,30 @@ checksum = "2ac0fd8b5d80bbca3fc3b6f40da4e9f6907354824ec3b18bbd83fee8cf5c3c3e" dependencies = [ "arrow", "chrono", - "dashmap", - "datafusion-common", - "datafusion-expr", + "dashmap 5.5.3", + "datafusion-common 40.0.0", + "datafusion-expr 40.0.0", + "futures", + "hashbrown", + "log", + "object_store", + "parking_lot", + "rand", + "tempfile", + "url", +] + +[[package]] +name = "datafusion-execution" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "799e70968c815b611116951e3dd876aef04bf217da31b72eec01ee6a959336a1" +dependencies = [ + "arrow", + "chrono", + "dashmap 6.0.1", + "datafusion-common 41.0.0", + "datafusion-expr 41.0.0", "futures", "hashbrown", "log", @@ -857,10 +918,29 @@ dependencies = [ "arrow-array", "arrow-buffer", "chrono", - "datafusion-common", + "datafusion-common 40.0.0", "paste", "serde_json", - "sqlparser", + "sqlparser 0.47.0", + "strum 0.26.3", + "strum_macros 0.26.4", +] + +[[package]] +name = "datafusion-expr" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c1841c409d9518c17971d15c9bae62e629eb937e6fb6c68cd32e9186f8b30d2" +dependencies = [ + "ahash", + "arrow", + "arrow-array", + "arrow-buffer", + "chrono", + "datafusion-common 41.0.0", + "paste", + "serde_json", + "sqlparser 0.49.0", "strum 0.26.3", "strum_macros 0.26.4", ] @@ -876,9 +956,9 @@ dependencies = [ "blake2", "blake3", "chrono", - "datafusion-common", - "datafusion-execution", - "datafusion-expr", + "datafusion-common 40.0.0", + "datafusion-execution 40.0.0", + "datafusion-expr 40.0.0", "hashbrown", "hex", "itertools 0.12.1", @@ -900,13 +980,13 @@ dependencies = [ "ahash", "arrow", "arrow-schema", - "datafusion-common", - "datafusion-execution", - "datafusion-expr", - "datafusion-physical-expr-common", + "datafusion-common 40.0.0", + "datafusion-execution 40.0.0", + "datafusion-expr 40.0.0", + "datafusion-physical-expr-common 40.0.0", "log", "paste", - "sqlparser", + "sqlparser 0.47.0", ] [[package]] @@ -920,9 +1000,9 @@ dependencies = [ "arrow-buffer", "arrow-ord", "arrow-schema", - "datafusion-common", - "datafusion-execution", - "datafusion-expr", + "datafusion-common 40.0.0", + "datafusion-execution 40.0.0", + "datafusion-expr 40.0.0", "datafusion-functions", "datafusion-functions-aggregate", "itertools 0.12.1", @@ -939,9 +1019,29 @@ dependencies = [ "arrow", "async-trait", "chrono", - "datafusion-common", - "datafusion-expr", - "datafusion-physical-expr", + "datafusion-common 40.0.0", + "datafusion-expr 40.0.0", + "datafusion-physical-expr 40.0.0", + "hashbrown", + "indexmap", + "itertools 0.12.1", + "log", + "paste", + "regex-syntax", +] + +[[package]] +name = "datafusion-optimizer" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791ff56f55608bc542d1ea7a68a64bdc86a9413f5a381d06a39fd49c2a3ab906" +dependencies = [ + "arrow", + "async-trait", + "chrono", + "datafusion-common 41.0.0", + "datafusion-expr 41.0.0", + "datafusion-physical-expr 41.0.0", "hashbrown", "indexmap", "itertools 0.12.1", @@ -965,10 +1065,10 @@ dependencies = [ "arrow-string", "base64 0.22.1", "chrono", - "datafusion-common", - "datafusion-execution", - "datafusion-expr", - "datafusion-physical-expr-common", + "datafusion-common 40.0.0", + "datafusion-execution 40.0.0", + "datafusion-expr 40.0.0", + "datafusion-physical-expr-common 40.0.0", "half", "hashbrown", "hex", @@ -980,6 +1080,34 @@ dependencies = [ "regex", ] +[[package]] +name = "datafusion-physical-expr" +version = "41.0.0" +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", + "chrono", + "datafusion-common 41.0.0", + "datafusion-execution 41.0.0", + "datafusion-expr 41.0.0", + "datafusion-physical-expr-common 41.0.0", + "half", + "hashbrown", + "indexmap", + "itertools 0.12.1", + "log", + "paste", + "petgraph", + "regex", +] + [[package]] name = "datafusion-physical-expr-common" version = "40.0.0" @@ -988,8 +1116,22 @@ checksum = "9d8a72b0ca908e074aaeca52c14ddf5c28d22361e9cb6bc79bb733cd6661b536" dependencies = [ "ahash", "arrow", - "datafusion-common", - "datafusion-expr", + "datafusion-common 40.0.0", + "datafusion-expr 40.0.0", + "hashbrown", + "rand", +] + +[[package]] +name = "datafusion-physical-expr-common" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db5e7d8532a1601cd916881db87a70b0a599900d23f3db2897d389032da53bc6" +dependencies = [ + "ahash", + "arrow", + "datafusion-common 41.0.0", + "datafusion-expr 41.0.0", "hashbrown", "rand", ] @@ -1008,13 +1150,13 @@ dependencies = [ "arrow-schema", "async-trait", "chrono", - "datafusion-common", + "datafusion-common 40.0.0", "datafusion-common-runtime", - "datafusion-execution", - "datafusion-expr", + "datafusion-execution 40.0.0", + "datafusion-expr 40.0.0", "datafusion-functions-aggregate", - "datafusion-physical-expr", - "datafusion-physical-expr-common", + "datafusion-physical-expr 40.0.0", + "datafusion-physical-expr-common 40.0.0", "futures", "half", "hashbrown", @@ -1035,10 +1177,10 @@ dependencies = [ "arrow", "async-trait", "datafusion", - "datafusion-common", - "datafusion-expr", + "datafusion-common 40.0.0", + "datafusion-expr 40.0.0", "datafusion-functions-array", - "datafusion-optimizer", + "datafusion-optimizer 41.0.0", "datafusion-sql", "datafusion-substrait", "futures", @@ -1051,7 +1193,7 @@ dependencies = [ "pyo3-build-config", "rand", "regex-syntax", - "sqlparser", + "sqlparser 0.47.0", "syn 2.0.72", "tokio", "url", @@ -1067,11 +1209,11 @@ dependencies = [ "arrow", "arrow-array", "arrow-schema", - "datafusion-common", - "datafusion-expr", + "datafusion-common 40.0.0", + "datafusion-expr 40.0.0", "log", "regex", - "sqlparser", + "sqlparser 0.47.0", "strum 0.26.3", ] @@ -2906,6 +3048,16 @@ dependencies = [ "sqlparser_derive", ] +[[package]] +name = "sqlparser" +version = "0.49.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a404d0e14905361b918cb8afdb73605e25c1d5029312bd9785142dcb3aa49e" +dependencies = [ + "log", + "sqlparser_derive", +] + [[package]] name = "sqlparser_derive" version = "0.2.2" diff --git a/Cargo.toml b/Cargo.toml index 820118fa8..27f67da48 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,7 +42,7 @@ datafusion = { version = "40.0.0", features = ["pyarrow", "avro", "unicode_expre datafusion-common = { version = "40.0.0", features = ["pyarrow"] } datafusion-expr = "40.0.0" datafusion-functions-array = "40.0.0" -datafusion-optimizer = "40.0.0" +datafusion-optimizer = "41.0.0" datafusion-sql = "40.0.0" datafusion-substrait = { version = "40.0.0", optional = true } prost = "0.12" # keep in line with `datafusion-substrait`