diff --git a/dask_planner/Cargo.lock b/dask_planner/Cargo.lock index c48a9faf8..f5da9b78c 100644 --- a/dask_planner/Cargo.lock +++ b/dask_planner/Cargo.lock @@ -408,8 +408,7 @@ dependencies = [ [[package]] name = "datafusion-common" version = "14.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f1ffcbc1f040c9ab99f41db1c743d95aff267bb2e7286aaa010738b7402251" +source = "git+https://github.com/sarahyurick/arrow-datafusion?branch=push_down_filter#6d62ca94482f7f09861a9e2204a1c5648b72723c" dependencies = [ "arrow", "chrono", @@ -420,8 +419,7 @@ dependencies = [ [[package]] name = "datafusion-expr" version = "14.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1883d9590d303ef38fa295567e7fdb9f8f5f511fcc167412d232844678cd295c" +source = "git+https://github.com/sarahyurick/arrow-datafusion?branch=push_down_filter#6d62ca94482f7f09861a9e2204a1c5648b72723c" dependencies = [ "ahash 0.8.1", "arrow", @@ -433,8 +431,7 @@ dependencies = [ [[package]] name = "datafusion-optimizer" version = "14.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2127d46d566ab3463d70da9675fc07b9d634be8d17e80d0e1ce79600709fe651" +source = "git+https://github.com/sarahyurick/arrow-datafusion?branch=push_down_filter#6d62ca94482f7f09861a9e2204a1c5648b72723c" dependencies = [ "arrow", "async-trait", @@ -449,8 +446,7 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" version = "14.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d108b6fe8eeb317ecad1d74619e8758de49cccc8c771b56c97962fd52eaae23" +source = "git+https://github.com/sarahyurick/arrow-datafusion?branch=push_down_filter#6d62ca94482f7f09861a9e2204a1c5648b72723c" dependencies = [ "ahash 0.8.1", "arrow", @@ -480,8 +476,7 @@ dependencies = [ [[package]] name = "datafusion-row" version = "14.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43537b6377d506e4788bf21e9ed943340e076b48ca4d077e6ea4405ca5e54a1c" +source = "git+https://github.com/sarahyurick/arrow-datafusion?branch=push_down_filter#6d62ca94482f7f09861a9e2204a1c5648b72723c" dependencies = [ "arrow", "datafusion-common", @@ -492,8 +487,7 @@ dependencies = [ [[package]] name = "datafusion-sql" version = "14.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "244d08d4710e1088d9c0949c9b5b8d68d9cf2cde7203134a4cc389e870fe2354" +source = "git+https://github.com/sarahyurick/arrow-datafusion?branch=push_down_filter#6d62ca94482f7f09861a9e2204a1c5648b72723c" dependencies = [ "arrow", "datafusion-common", diff --git a/dask_planner/Cargo.toml b/dask_planner/Cargo.toml index 4562294ed..dd58635f9 100644 --- a/dask_planner/Cargo.toml +++ b/dask_planner/Cargo.toml @@ -11,10 +11,10 @@ rust-version = "1.62" [dependencies] arrow = { version = "26.0.0", features = ["prettyprint"] } async-trait = "0.1.59" -datafusion-common = "14.0.0" -datafusion-expr = "14.0.0" -datafusion-optimizer = "14.0.0" -datafusion-sql = "14.0.0" +datafusion-common = {git = "https://github.com/sarahyurick/arrow-datafusion", branch = "push_down_filter"} +datafusion-expr = {git = "https://github.com/sarahyurick/arrow-datafusion", branch = "push_down_filter"} +datafusion-optimizer = {git = "https://github.com/sarahyurick/arrow-datafusion", branch = "push_down_filter"} +datafusion-sql = {git = "https://github.com/sarahyurick/arrow-datafusion", branch = "push_down_filter"} env_logger = "0.10" log = "^0.4" mimalloc = { version = "*", default-features = false } diff --git a/dask_planner/src/sql/optimizer.rs b/dask_planner/src/sql/optimizer.rs index 2f2843763..0b7f0a61d 100644 --- a/dask_planner/src/sql/optimizer.rs +++ b/dask_planner/src/sql/optimizer.rs @@ -10,11 +10,12 @@ use datafusion_optimizer::{ // eliminate_filter::EliminateFilter, eliminate_limit::EliminateLimit, filter_null_join_keys::FilterNullJoinKeys, - filter_push_down::FilterPushDown, inline_table_scan::InlineTableScan, limit_push_down::LimitPushDown, optimizer::{Optimizer, OptimizerRule}, projection_push_down::ProjectionPushDown, + // filter_push_down::FilterPushDown, // From #924 + push_down_filter::PushDownFilter as FilterPushDown, reduce_cross_join::ReduceCrossJoin, reduce_outer_join::ReduceOuterJoin, rewrite_disjunctive_predicate::RewriteDisjunctivePredicate,