From bb7586f3752acfebd89a5ec0adbd5b4af77b1f60 Mon Sep 17 00:00:00 2001
From: Liang-Chi Hsieh <viirya@gmail.com>
Date: Tue, 20 Aug 2024 23:51:33 -0700
Subject: [PATCH] fix

---
 native/Cargo.lock                | 2 --
 native/Cargo.toml                | 1 -
 native/core/Cargo.toml           | 1 -
 native/spark-expr/Cargo.toml     | 1 -
 native/spark-expr/src/regexp.rs  | 2 +-
 native/spark-expr/src/structs.rs | 2 +-
 6 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/native/Cargo.lock b/native/Cargo.lock
index b8c9081e2c..5807b61b65 100644
--- a/native/Cargo.lock
+++ b/native/Cargo.lock
@@ -894,7 +894,6 @@ dependencies = [
  "datafusion-expr",
  "datafusion-functions-nested",
  "datafusion-physical-expr",
- "datafusion-physical-expr-common",
  "flate2",
  "futures",
  "half",
@@ -946,7 +945,6 @@ dependencies = [
  "datafusion-common",
  "datafusion-expr",
  "datafusion-physical-expr",
- "datafusion-physical-expr-common",
  "datafusion-physical-plan",
  "num",
  "rand",
diff --git a/native/Cargo.toml b/native/Cargo.toml
index 82598671c6..4f6a6bcfc5 100644
--- 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
index 13a6a3695f..58fe00e758 100644
--- 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
index 1a8c8aeb4b..0a371a6e61 100644
--- 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
index 2672d754f1..da39ce6862 100644
--- a/native/spark-expr/src/regexp.rs
+++ b/native/spark-expr/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/native/spark-expr/src/structs.rs b/native/spark-expr/src/structs.rs
index 3d386461a2..2f0ea7b0a7 100644
--- 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]