feat: Support sort merge join with a join condition (apache#553)

* Init * test * test * test * Use specified commit to test * Fix format * fix clippy * fix * fix * Fix * Change to SQL syntax * Disable SMJ LeftAnti with join filter * Fix * Add test * Add test * Update to last DataFusion commit * fix format * fix * Update diffs
andygrove · Aug 30, 2024 · d9eecde · d9eecde
1 parent 9d86fa9
commit d9eecde
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -34,7 +34,6 @@ chrono = { workspace = true }
 datafusion = { workspace = true }
 datafusion-common = { workspace = true }
 datafusion-expr = { workspace = true }
-datafusion-physical-expr-common = { workspace = true }
 datafusion-physical-expr = { workspace = true }
 datafusion-physical-plan = { workspace = true }
 chrono-tz = { workspace = true }

diff --git a/benches/conditional.rs b/benches/conditional.rs
@@ -23,10 +23,10 @@ use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use datafusion_comet_spark_expr::IfExpr;
 use datafusion_common::ScalarValue;
 use datafusion_expr::Operator;
+use datafusion_physical_expr::expressions::Column;
+use datafusion_physical_expr::expressions::Literal;
 use datafusion_physical_expr::expressions::{BinaryExpr, CaseExpr};
-use datafusion_physical_expr_common::expressions::column::Column;
-use datafusion_physical_expr_common::expressions::Literal;
-use datafusion_physical_expr_common::physical_expr::PhysicalExpr;
+use datafusion_physical_expr::PhysicalExpr;
 use std::sync::Arc;
 
 fn make_col(name: &str, index: usize) -> Arc<dyn PhysicalExpr> {

diff --git a/src/regexp.rs b/src/regexp.rs
@@ -24,7 +24,7 @@ use arrow_array::{Array, BooleanArray, DictionaryArray, RecordBatch, StringArray
 use arrow_schema::{DataType, Schema};
 use datafusion_common::{internal_err, Result};
 use datafusion_expr::ColumnarValue;
-use datafusion_physical_expr_common::physical_expr::PhysicalExpr;
+use datafusion_physical_expr::PhysicalExpr;
 use regex::Regex;
 use std::any::Any;
 use std::fmt::{Display, Formatter};

diff --git a/src/structs.rs b/src/structs.rs
@@ -239,8 +239,8 @@ mod test {
     use arrow_schema::{DataType, Field, Schema};
     use datafusion_common::Result;
     use datafusion_expr::ColumnarValue;
-    use datafusion_physical_expr_common::expressions::column::Column;
-    use datafusion_physical_expr_common::physical_expr::PhysicalExpr;
+    use datafusion_physical_expr::expressions::Column;
+    use datafusion_physical_expr::PhysicalExpr;
     use std::sync::Arc;
 
     #[test]

diff --git a/src/to_json.rs b/src/to_json.rs
@@ -25,7 +25,7 @@ use arrow_array::{Array, ArrayRef, RecordBatch, StringArray, StructArray};
 use arrow_schema::{DataType, Schema};
 use datafusion_common::Result;
 use datafusion_expr::ColumnarValue;
-use datafusion_physical_expr_common::physical_expr::PhysicalExpr;
+use datafusion_physical_expr::PhysicalExpr;
 use std::any::Any;
 use std::fmt::{Debug, Display, Formatter};
 use std::hash::{Hash, Hasher};