BharatDeva
diff --git a/‎Cargo.lock‎
Lines changed: 101 additions & 32 deletions b/‎Cargo.lock‎
Lines changed: 101 additions & 32 deletions
diff --git a/‎Cargo.toml‎
Lines changed: 4 additions & 3 deletions b/‎Cargo.toml‎
Lines changed: 4 additions & 3 deletions
diff --git a/‎datafusion/tests/test_catalog.py‎
Lines changed: 3 additions & 3 deletions b/‎datafusion/tests/test_catalog.py‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/dataframe.rs‎
Lines changed: 2 additions & 2 deletions b/‎src/dataframe.rs‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/dataset_exec.rs‎
Lines changed: 3 additions & 2 deletions b/‎src/dataset_exec.rs‎
Lines changed: 3 additions & 2 deletions
@@ -34,9 +34,10 @@ default = ["mimalloc"]
 tokio = { version = "1.0", features = ["macros", "rt", "rt-multi-thread", "sync"] }
 rand = "0.7"
 pyo3 = { version = "~0.17.1", features = ["extension-module", "abi3", "abi3-py37"] }
-datafusion = { version = "^13.0.0", features = ["pyarrow", "avro"] }
-datafusion-expr = { version = "^13.0.0" }
-datafusion-common = { version = "^13.0.0", features = ["pyarrow"] }
+datafusion = { version = "^14.0.0", features = ["pyarrow", "avro"] }
+datafusion-expr = { version = "^14.0.0" }
+datafusion-optimizer = { version = "^14.0.0" }
+datafusion-common = { version = "^14.0.0", features = ["pyarrow"] }
 uuid = { version = "0.8", features = ["v4"] }
 mimalloc = { version = "*", optional = true, default-features = false }
 async-trait = "0.1"
 
@@ -33,8 +33,8 @@ def test_basic(ctx, database):
     assert table.kind == "physical"
     assert table.schema == pa.schema(
         [
-            pa.field("int", pa.int64(), nullable=False),
-            pa.field("str", pa.string(), nullable=False),
-            pa.field("float", pa.float64(), nullable=False),
+            pa.field("int", pa.int64(), nullable=True),
+            pa.field("str", pa.string(), nullable=True),
+            pa.field("float", pa.float64(), nullable=True),
         ]
     )
@@ -170,8 +170,8 @@ impl PyDataFrame {
             "left" => JoinType::Left,
             "right" => JoinType::Right,
             "full" => JoinType::Full,
-            "semi" => JoinType::Semi,
-            "anti" => JoinType::Anti,
+            "semi" => JoinType::LeftSemi,
+            "anti" => JoinType::LeftAnti,
             how => {
                 return Err(DataFusionError::Common(format!(
                     "The join type {} does not exist or is not implemented",
 
@@ -37,7 +37,8 @@ use datafusion::physical_plan::stream::RecordBatchStreamAdapter;
 use datafusion::physical_plan::{
     DisplayFormatType, ExecutionPlan, Partitioning, SendableRecordBatchStream, Statistics,
 };
-use datafusion_expr::{combine_filters, Expr};
+use datafusion_expr::Expr;
+use datafusion_optimizer::utils::conjunction;
 
 use crate::errors::DataFusionError;
 use crate::pyarrow_filter_expression::PyArrowFilterExpression;
@@ -93,7 +94,7 @@ impl DatasetExec {
                 .collect()
         });
         let columns: Option<Vec<String>> = columns.transpose()?;
-        let filter_expr: Option<PyObject> = combine_filters(filters)
+        let filter_expr: Option<PyObject> = conjunction(filters.to_owned())
             .map(|filters| {
                 PyArrowFilterExpression::try_from(&filters)
                     .map(|filter_expr| filter_expr.inner().clone_ref(py))
Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,8 @@ def test_basic(ctx, database):`
`33`	`33`	`assert table.kind == "physical"`
`34`	`34`	`assert table.schema == pa.schema(`
`35`	`35`	`[`
`36`		`- pa.field("int", pa.int64(), nullable=False),`
`37`		`- pa.field("str", pa.string(), nullable=False),`
`38`		`- pa.field("float", pa.float64(), nullable=False),`
	`36`	`+ pa.field("int", pa.int64(), nullable=True),`
	`37`	`+ pa.field("str", pa.string(), nullable=True),`
	`38`	`+ pa.field("float", pa.float64(), nullable=True),`
`39`	`39`	`]`
`40`	`40`	`)`