diff --git a/Cargo.lock b/Cargo.lock index 51c29cb12e..98aafb3b7d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1129,7 +1129,7 @@ dependencies = [ [[package]] name = "datafusion" version = "13.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=48f73c6af3b0cc747c38b4a9c7a610f4630e8736#48f73c6af3b0cc747c38b4a9c7a610f4630e8736" +source = "git+https://github.com/apache/arrow-datafusion.git?rev=ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7#ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7" dependencies = [ "ahash 0.8.0", "arrow", @@ -1161,7 +1161,7 @@ dependencies = [ "pin-project-lite", "rand", "smallvec", - "sqlparser 0.25.0", + "sqlparser", "tempfile", "tokio", "tokio-stream", @@ -1173,31 +1173,32 @@ dependencies = [ [[package]] name = "datafusion-common" version = "13.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=48f73c6af3b0cc747c38b4a9c7a610f4630e8736#48f73c6af3b0cc747c38b4a9c7a610f4630e8736" +source = "git+https://github.com/apache/arrow-datafusion.git?rev=ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7#ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7" dependencies = [ "arrow", + "chrono", "object_store", "ordered-float 3.3.0", "parquet", - "sqlparser 0.25.0", + "sqlparser", ] [[package]] name = "datafusion-expr" version = "13.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=48f73c6af3b0cc747c38b4a9c7a610f4630e8736#48f73c6af3b0cc747c38b4a9c7a610f4630e8736" +source = "git+https://github.com/apache/arrow-datafusion.git?rev=ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7#ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7" dependencies = [ "ahash 0.8.0", "arrow", "datafusion-common", "log", - "sqlparser 0.25.0", + "sqlparser", ] [[package]] name = "datafusion-optimizer" version = "13.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=48f73c6af3b0cc747c38b4a9c7a610f4630e8736#48f73c6af3b0cc747c38b4a9c7a610f4630e8736" +source = "git+https://github.com/apache/arrow-datafusion.git?rev=ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7#ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7" dependencies = [ "arrow", "async-trait", @@ -1212,7 +1213,7 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" version = "13.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=48f73c6af3b0cc747c38b4a9c7a610f4630e8736#48f73c6af3b0cc747c38b4a9c7a610f4630e8736" +source = "git+https://github.com/apache/arrow-datafusion.git?rev=ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7#ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7" dependencies = [ "ahash 0.8.0", "arrow", @@ -1236,13 +1237,13 @@ dependencies = [ [[package]] name = "datafusion-proto" version = "13.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=48f73c6af3b0cc747c38b4a9c7a610f4630e8736#48f73c6af3b0cc747c38b4a9c7a610f4630e8736" +source = "git+https://github.com/apache/arrow-datafusion.git?rev=ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7#ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7" dependencies = [ "arrow", - "async-trait", "datafusion", "datafusion-common", "datafusion-expr", + "pbjson-build", "prost 0.11.0", "prost-build 0.11.1", ] @@ -1250,7 +1251,7 @@ dependencies = [ [[package]] name = "datafusion-row" version = "13.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=48f73c6af3b0cc747c38b4a9c7a610f4630e8736#48f73c6af3b0cc747c38b4a9c7a610f4630e8736" +source = "git+https://github.com/apache/arrow-datafusion.git?rev=ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7#ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7" dependencies = [ "arrow", "datafusion-common", @@ -1261,12 +1262,12 @@ dependencies = [ [[package]] name = "datafusion-sql" version = "13.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=48f73c6af3b0cc747c38b4a9c7a610f4630e8736#48f73c6af3b0cc747c38b4a9c7a610f4630e8736" +source = "git+https://github.com/apache/arrow-datafusion.git?rev=ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7#ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7" dependencies = [ "arrow", "datafusion-common", "datafusion-expr", - "sqlparser 0.25.0", + "sqlparser", ] [[package]] @@ -2266,7 +2267,7 @@ version = "0.1.0" dependencies = [ "generated_types", "snafu", - "sqlparser 0.26.0", + "sqlparser", "workspace-hack", ] @@ -3655,7 +3656,7 @@ dependencies = [ "query_functions", "schema", "snafu", - "sqlparser 0.26.0", + "sqlparser", "test_helpers", "workspace-hack", ] @@ -4764,15 +4765,6 @@ dependencies = [ "unicode_categories", ] -[[package]] -name = "sqlparser" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0781f2b6bd03e5adf065c8e772b49eaea9f640d06a1b9130330fe8bd2563f4fd" -dependencies = [ - "log", -] - [[package]] name = "sqlparser" version = "0.26.0" diff --git a/Cargo.toml b/Cargo.toml index c00a56fae6..b0e1f71fe6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -110,8 +110,8 @@ license = "MIT OR Apache-2.0" [workspace.dependencies] arrow = { version = "25.0.0" } arrow-flight = { version = "25.0.0" } -datafusion = { git = "https://github.com/apache/arrow-datafusion.git", rev="48f73c6af3b0cc747c38b4a9c7a610f4630e8736", default-features = false } -datafusion-proto = { git = "https://github.com/apache/arrow-datafusion.git", rev="48f73c6af3b0cc747c38b4a9c7a610f4630e8736" } +datafusion = { git = "https://github.com/apache/arrow-datafusion.git", rev="ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7", default-features = false } +datafusion-proto = { git = "https://github.com/apache/arrow-datafusion.git", rev="ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7" } parquet = { version = "25.0.0" } # This profile optimizes for runtime performance and small binary size at the expense of longer diff --git a/iox_query/src/util.rs b/iox_query/src/util.rs index 809c062cca..f026b047bf 100644 --- a/iox_query/src/util.rs +++ b/iox_query/src/util.rs @@ -25,7 +25,7 @@ use datafusion::{ logical_expr::{ expr_rewriter::ExprRewriter, BinaryExpr, ExprSchemable, LogicalPlan, LogicalPlanBuilder, }, - optimizer::expr_simplifier::{ExprSimplifier, SimplifyContext}, + optimizer::simplify_expressions::{ExprSimplifier, SimplifyContext}, physical_expr::create_physical_expr, physical_plan::{ expressions::{col as physical_col, PhysicalSortExpr}, diff --git a/predicate/src/rpc_predicate.rs b/predicate/src/rpc_predicate.rs index 4b4257e799..126227f8af 100644 --- a/predicate/src/rpc_predicate.rs +++ b/predicate/src/rpc_predicate.rs @@ -11,7 +11,7 @@ use datafusion::error::{DataFusionError, Result as DataFusionResult}; use datafusion::execution::context::ExecutionProps; use datafusion::logical_expr::expr_rewriter::ExprRewritable; use datafusion::logical_expr::ExprSchemable; -use datafusion::optimizer::expr_simplifier::{ExprSimplifier, SimplifyInfo}; +use datafusion::optimizer::simplify_expressions::{ExprSimplifier, SimplifyInfo}; use datafusion::prelude::{lit, Column, Expr}; use observability_deps::tracing::{debug, trace}; use schema::Schema; diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index 2cebef3e57..623b1f8cd5 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -25,7 +25,7 @@ bytes = { version = "1", features = ["std"] } chrono = { version = "0.4", default-features = false, features = ["alloc", "clock", "iana-time-zone", "serde", "std", "winapi"] } crossbeam-utils = { version = "0.8", features = ["std"] } crypto-common = { version = "0.1", default-features = false, features = ["std"] } -datafusion = { git = "https://github.com/apache/arrow-datafusion.git", rev = "48f73c6af3b0cc747c38b4a9c7a610f4630e8736", features = ["crypto_expressions", "regex_expressions", "unicode_expressions"] } +datafusion = { git = "https://github.com/apache/arrow-datafusion.git", rev = "ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7", features = ["crypto_expressions", "regex_expressions", "unicode_expressions"] } digest = { version = "0.10", features = ["alloc", "block-buffer", "core-api", "mac", "std", "subtle"] } either = { version = "1", features = ["use_std"] } fixedbitset = { version = "0.4", features = ["std"] }