diff --git a/native/Cargo.lock b/native/Cargo.lock index 75009ca68..0814bec81 100644 --- a/native/Cargo.lock +++ b/native/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -840,7 +840,7 @@ dependencies = [ [[package]] name = "datafusion" version = "43.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=242f45f#242f45f4f19c9f25f8f084e8b2c534d9f14fa2d7" +source = "git+https://github.com/apache/datafusion.git?rev=3864b113c3e3fe85e18462d6374f8244c4f77b27#3864b113c3e3fe85e18462d6374f8244c4f77b27" dependencies = [ "arrow", "arrow-array", @@ -884,7 +884,7 @@ dependencies = [ [[package]] name = "datafusion-catalog" version = "43.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=242f45f#242f45f4f19c9f25f8f084e8b2c534d9f14fa2d7" +source = "git+https://github.com/apache/datafusion.git?rev=3864b113c3e3fe85e18462d6374f8244c4f77b27#3864b113c3e3fe85e18462d6374f8244c4f77b27" dependencies = [ "arrow-schema", "async-trait", @@ -983,7 +983,7 @@ dependencies = [ [[package]] name = "datafusion-common" version = "43.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=242f45f#242f45f4f19c9f25f8f084e8b2c534d9f14fa2d7" +source = "git+https://github.com/apache/datafusion.git?rev=3864b113c3e3fe85e18462d6374f8244c4f77b27#3864b113c3e3fe85e18462d6374f8244c4f77b27" dependencies = [ "ahash", "arrow", @@ -998,7 +998,6 @@ dependencies = [ "object_store", "parquet", "paste", - "recursive", "sqlparser", "tokio", "web-time", @@ -1007,7 +1006,7 @@ dependencies = [ [[package]] name = "datafusion-common-runtime" version = "43.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=242f45f#242f45f4f19c9f25f8f084e8b2c534d9f14fa2d7" +source = "git+https://github.com/apache/datafusion.git?rev=3864b113c3e3fe85e18462d6374f8244c4f77b27#3864b113c3e3fe85e18462d6374f8244c4f77b27" dependencies = [ "log", "tokio", @@ -1016,12 +1015,12 @@ dependencies = [ [[package]] name = "datafusion-doc" version = "43.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=242f45f#242f45f4f19c9f25f8f084e8b2c534d9f14fa2d7" +source = "git+https://github.com/apache/datafusion.git?rev=3864b113c3e3fe85e18462d6374f8244c4f77b27#3864b113c3e3fe85e18462d6374f8244c4f77b27" [[package]] name = "datafusion-execution" version = "43.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=242f45f#242f45f4f19c9f25f8f084e8b2c534d9f14fa2d7" +source = "git+https://github.com/apache/datafusion.git?rev=3864b113c3e3fe85e18462d6374f8244c4f77b27#3864b113c3e3fe85e18462d6374f8244c4f77b27" dependencies = [ "arrow", "dashmap", @@ -1039,7 +1038,7 @@ dependencies = [ [[package]] name = "datafusion-expr" version = "43.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=242f45f#242f45f4f19c9f25f8f084e8b2c534d9f14fa2d7" +source = "git+https://github.com/apache/datafusion.git?rev=3864b113c3e3fe85e18462d6374f8244c4f77b27#3864b113c3e3fe85e18462d6374f8244c4f77b27" dependencies = [ "arrow", "chrono", @@ -1051,7 +1050,6 @@ dependencies = [ "datafusion-physical-expr-common", "indexmap", "paste", - "recursive", "serde_json", "sqlparser", ] @@ -1059,7 +1057,7 @@ dependencies = [ [[package]] name = "datafusion-expr-common" version = "43.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=242f45f#242f45f4f19c9f25f8f084e8b2c534d9f14fa2d7" +source = "git+https://github.com/apache/datafusion.git?rev=3864b113c3e3fe85e18462d6374f8244c4f77b27#3864b113c3e3fe85e18462d6374f8244c4f77b27" dependencies = [ "arrow", "datafusion-common", @@ -1069,7 +1067,7 @@ dependencies = [ [[package]] name = "datafusion-functions" version = "43.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=242f45f#242f45f4f19c9f25f8f084e8b2c534d9f14fa2d7" +source = "git+https://github.com/apache/datafusion.git?rev=3864b113c3e3fe85e18462d6374f8244c4f77b27#3864b113c3e3fe85e18462d6374f8244c4f77b27" dependencies = [ "arrow", "arrow-buffer", @@ -1098,7 +1096,7 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate" version = "43.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=242f45f#242f45f4f19c9f25f8f084e8b2c534d9f14fa2d7" +source = "git+https://github.com/apache/datafusion.git?rev=3864b113c3e3fe85e18462d6374f8244c4f77b27#3864b113c3e3fe85e18462d6374f8244c4f77b27" dependencies = [ "ahash", "arrow", @@ -1119,7 +1117,7 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate-common" version = "43.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=242f45f#242f45f4f19c9f25f8f084e8b2c534d9f14fa2d7" +source = "git+https://github.com/apache/datafusion.git?rev=3864b113c3e3fe85e18462d6374f8244c4f77b27#3864b113c3e3fe85e18462d6374f8244c4f77b27" dependencies = [ "ahash", "arrow", @@ -1131,7 +1129,7 @@ dependencies = [ [[package]] name = "datafusion-functions-nested" version = "43.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=242f45f#242f45f4f19c9f25f8f084e8b2c534d9f14fa2d7" +source = "git+https://github.com/apache/datafusion.git?rev=3864b113c3e3fe85e18462d6374f8244c4f77b27#3864b113c3e3fe85e18462d6374f8244c4f77b27" dependencies = [ "arrow", "arrow-array", @@ -1152,7 +1150,7 @@ dependencies = [ [[package]] name = "datafusion-functions-table" version = "43.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=242f45f#242f45f4f19c9f25f8f084e8b2c534d9f14fa2d7" +source = "git+https://github.com/apache/datafusion.git?rev=3864b113c3e3fe85e18462d6374f8244c4f77b27#3864b113c3e3fe85e18462d6374f8244c4f77b27" dependencies = [ "arrow", "async-trait", @@ -1167,7 +1165,7 @@ dependencies = [ [[package]] name = "datafusion-functions-window" version = "43.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=242f45f#242f45f4f19c9f25f8f084e8b2c534d9f14fa2d7" +source = "git+https://github.com/apache/datafusion.git?rev=3864b113c3e3fe85e18462d6374f8244c4f77b27#3864b113c3e3fe85e18462d6374f8244c4f77b27" dependencies = [ "datafusion-common", "datafusion-doc", @@ -1183,7 +1181,7 @@ dependencies = [ [[package]] name = "datafusion-functions-window-common" version = "43.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=242f45f#242f45f4f19c9f25f8f084e8b2c534d9f14fa2d7" +source = "git+https://github.com/apache/datafusion.git?rev=3864b113c3e3fe85e18462d6374f8244c4f77b27#3864b113c3e3fe85e18462d6374f8244c4f77b27" dependencies = [ "datafusion-common", "datafusion-physical-expr-common", @@ -1192,7 +1190,7 @@ dependencies = [ [[package]] name = "datafusion-macros" version = "43.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=242f45f#242f45f4f19c9f25f8f084e8b2c534d9f14fa2d7" +source = "git+https://github.com/apache/datafusion.git?rev=3864b113c3e3fe85e18462d6374f8244c4f77b27#3864b113c3e3fe85e18462d6374f8244c4f77b27" dependencies = [ "quote", "syn 2.0.90", @@ -1201,7 +1199,7 @@ dependencies = [ [[package]] name = "datafusion-optimizer" version = "43.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=242f45f#242f45f4f19c9f25f8f084e8b2c534d9f14fa2d7" +source = "git+https://github.com/apache/datafusion.git?rev=3864b113c3e3fe85e18462d6374f8244c4f77b27#3864b113c3e3fe85e18462d6374f8244c4f77b27" dependencies = [ "arrow", "chrono", @@ -1218,7 +1216,7 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" version = "43.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=242f45f#242f45f4f19c9f25f8f084e8b2c534d9f14fa2d7" +source = "git+https://github.com/apache/datafusion.git?rev=3864b113c3e3fe85e18462d6374f8244c4f77b27#3864b113c3e3fe85e18462d6374f8244c4f77b27" dependencies = [ "ahash", "arrow", @@ -1242,7 +1240,7 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-common" version = "43.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=242f45f#242f45f4f19c9f25f8f084e8b2c534d9f14fa2d7" +source = "git+https://github.com/apache/datafusion.git?rev=3864b113c3e3fe85e18462d6374f8244c4f77b27#3864b113c3e3fe85e18462d6374f8244c4f77b27" dependencies = [ "ahash", "arrow", @@ -1255,7 +1253,7 @@ dependencies = [ [[package]] name = "datafusion-physical-optimizer" version = "43.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=242f45f#242f45f4f19c9f25f8f084e8b2c534d9f14fa2d7" +source = "git+https://github.com/apache/datafusion.git?rev=3864b113c3e3fe85e18462d6374f8244c4f77b27#3864b113c3e3fe85e18462d6374f8244c4f77b27" dependencies = [ "arrow", "datafusion-common", @@ -1265,13 +1263,12 @@ dependencies = [ "datafusion-physical-plan", "itertools 0.13.0", "log", - "recursive", ] [[package]] name = "datafusion-physical-plan" version = "43.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=242f45f#242f45f4f19c9f25f8f084e8b2c534d9f14fa2d7" +source = "git+https://github.com/apache/datafusion.git?rev=3864b113c3e3fe85e18462d6374f8244c4f77b27#3864b113c3e3fe85e18462d6374f8244c4f77b27" dependencies = [ "ahash", "arrow", @@ -1302,7 +1299,7 @@ dependencies = [ [[package]] name = "datafusion-sql" version = "43.0.0" -source = "git+https://github.com/apache/datafusion.git?rev=242f45f#242f45f4f19c9f25f8f084e8b2c534d9f14fa2d7" +source = "git+https://github.com/apache/datafusion.git?rev=3864b113c3e3fe85e18462d6374f8244c4f77b27#3864b113c3e3fe85e18462d6374f8244c4f77b27" dependencies = [ "arrow", "arrow-array", @@ -1312,7 +1309,6 @@ dependencies = [ "datafusion-expr", "indexmap", "log", - "recursive", "regex", "sqlparser", ] @@ -2617,15 +2613,6 @@ dependencies = [ "prost 0.9.0", ] -[[package]] -name = "psm" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "200b9ff220857e53e184257720a14553b2f4aa02577d2ed9842d45d4b9654810" -dependencies = [ - "cc", -] - [[package]] name = "quick-xml" version = "0.26.0" @@ -2694,26 +2681,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "recursive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0786a43debb760f491b1bc0269fe5e84155353c67482b9e60d0cfb596054b43e" -dependencies = [ - "recursive-proc-macro-impl", - "stacker", -] - -[[package]] -name = "recursive-proc-macro-impl" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76009fbe0614077fc1a2ce255e3a1881a2e3a3527097d5dc6d8212c585e7e38b" -dependencies = [ - "quote", - "syn 2.0.90", -] - [[package]] name = "redox_syscall" version = "0.5.8" @@ -2981,19 +2948,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" -[[package]] -name = "stacker" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799c883d55abdb5e98af1a7b3f23b9b6de8ecada0ecac058672d7635eb48ca7b" -dependencies = [ - "cc", - "cfg-if", - "libc", - "psm", - "windows-sys 0.59.0", -] - [[package]] name = "static_assertions" version = "1.1.0" diff --git a/native/Cargo.toml b/native/Cargo.toml index da639f79a..e1b2afcca 100644 --- a/native/Cargo.toml +++ b/native/Cargo.toml @@ -39,15 +39,15 @@ arrow-buffer = { version = "53.3.0" } arrow-data = { version = "53.3.0" } arrow-schema = { version = "53.3.0" } parquet = { version = "53.3.0", default-features = false, features = ["experimental"] } -datafusion = { git = "https://github.com/apache/datafusion.git", rev = "242f45f", default-features = false, features = ["unicode_expressions", "crypto_expressions"] } -datafusion-common = { git = "https://github.com/apache/datafusion.git", rev = "242f45f", default-features = false } -datafusion-functions = { git = "https://github.com/apache/datafusion.git", rev = "242f45f", default-features = false, features = ["crypto_expressions"] } -datafusion-functions-nested = { git = "https://github.com/apache/datafusion.git", rev = "242f45f", default-features = false } -datafusion-expr = { git = "https://github.com/apache/datafusion.git", rev = "242f45f", default-features = false } -datafusion-expr-common = { git = "https://github.com/apache/datafusion.git", rev = "242f45f", default-features = false } -datafusion-execution = { git = "https://github.com/apache/datafusion.git", rev = "242f45f", default-features = false } -datafusion-physical-plan = { git = "https://github.com/apache/datafusion.git", rev = "242f45f", default-features = false } -datafusion-physical-expr = { git = "https://github.com/apache/datafusion.git", rev = "242f45f", default-features = false } +datafusion = { git = "https://github.com/apache/datafusion.git", rev = "3864b113c3e3fe85e18462d6374f8244c4f77b27", default-features = false, features = ["unicode_expressions", "crypto_expressions"] } +datafusion-common = { git = "https://github.com/apache/datafusion.git", rev = "3864b113c3e3fe85e18462d6374f8244c4f77b27", default-features = false } +datafusion-functions = { git = "https://github.com/apache/datafusion.git", rev = "3864b113c3e3fe85e18462d6374f8244c4f77b27", default-features = false, features = ["crypto_expressions"] } +datafusion-functions-nested = { git = "https://github.com/apache/datafusion.git", rev = "3864b113c3e3fe85e18462d6374f8244c4f77b27", default-features = false } +datafusion-expr = { git = "https://github.com/apache/datafusion.git", rev = "3864b113c3e3fe85e18462d6374f8244c4f77b27", default-features = false } +datafusion-expr-common = { git = "https://github.com/apache/datafusion.git", rev = "3864b113c3e3fe85e18462d6374f8244c4f77b27", default-features = false } +datafusion-execution = { git = "https://github.com/apache/datafusion.git", rev = "3864b113c3e3fe85e18462d6374f8244c4f77b27", default-features = false } +datafusion-physical-plan = { git = "https://github.com/apache/datafusion.git", rev = "3864b113c3e3fe85e18462d6374f8244c4f77b27", default-features = false } +datafusion-physical-expr = { git = "https://github.com/apache/datafusion.git", rev = "3864b113c3e3fe85e18462d6374f8244c4f77b27", default-features = false } datafusion-comet-spark-expr = { path = "spark-expr", version = "0.5.0" } datafusion-comet-proto = { path = "proto", version = "0.5.0" } chrono = { version = "0.4", default-features = false, features = ["clock"] }