fix

apache · Aug 21, 2024 · c27f1f6 · c27f1f6
1 parent 58cd915
commit c27f1f6
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 7 deletions.
diff --git a/native/Cargo.lock b/native/Cargo.lock
diff --git a/native/Cargo.toml b/native/Cargo.toml
@@ -46,7 +46,6 @@ datafusion-functions-nested = { git = "https://github.com/viirya/arrow-datafusio
 datafusion-expr = { git = "https://github.com/viirya/arrow-datafusion.git", rev = "f98693e", default-features = false }
 datafusion-execution = { git = "https://github.com/viirya/arrow-datafusion.git", rev = "f98693e", default-features = false }
 datafusion-physical-plan = { git = "https://github.com/viirya/arrow-datafusion.git", rev = "f98693e", default-features = false }
-datafusion-physical-expr-common = { git = "https://github.com/viirya/arrow-datafusion.git", rev = "f98693e", default-features = false }
 datafusion-physical-expr = { git = "https://github.com/viirya/arrow-datafusion.git", rev = "f98693e", default-features = false }
 datafusion-comet-spark-expr = { path = "spark-expr", version = "0.2.0" }
 datafusion-comet-proto = { path = "proto", version = "0.2.0" }

diff --git a/native/core/Cargo.toml b/native/core/Cargo.toml
@@ -70,7 +70,6 @@ datafusion = {  workspace = true }
 datafusion-functions-nested = { workspace = true }
 datafusion-expr = {  workspace = true }
 datafusion-execution = {  workspace = true }
-datafusion-physical-expr-common = {  workspace = true }
 datafusion-physical-expr = {  workspace = true }
 once_cell = "1.18.0"
 regex = { workspace = true }

diff --git a/native/spark-expr/Cargo.toml b/native/spark-expr/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/native/spark-expr/src/regexp.rs b/native/spark-expr/src/regexp.rs
@@ -24,12 +24,12 @@ 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 regex::Regex;
 use std::any::Any;
 use std::fmt::{Display, Formatter};
 use std::hash::{Hash, Hasher};
 use std::sync::Arc;
+use datafusion_physical_expr::PhysicalExpr;
 
 /// Implementation of RLIKE operator.
 ///

diff --git a/native/spark-expr/src/structs.rs b/native/spark-expr/src/structs.rs
@@ -240,7 +240,7 @@ mod test {
     use datafusion_common::Result;
     use datafusion_expr::ColumnarValue;
     use datafusion_physical_expr::expressions::Column;
-    use datafusion_physical_expr_common::physical_expr::PhysicalExpr;
+    use datafusion_physical_expr::PhysicalExpr;
     use std::sync::Arc;
 
     #[test]