remove utils crate and move utils into spark-expr crate (apache#658)

native/Cargo.toml

@@ -16,7 +16,7 @@
 # under the License.
 
 [workspace]
-members = ["core", "spark-expr", "utils"]
+members = ["core", "spark-expr"]
 resolver = "2"
 
 [workspace.package]
@@ -47,7 +47,6 @@ datafusion-physical-plan = { git = "https://github.com/apache/datafusion.git", r
 datafusion-physical-expr-common = { git = "https://github.com/apache/datafusion.git", rev = "40.0.0", default-features = false }
 datafusion-physical-expr = { git = "https://github.com/apache/datafusion.git", rev = "40.0.0", default-features = false }
 datafusion-comet-spark-expr = { path = "spark-expr", version = "0.1.0" }
-datafusion-comet-utils = { path = "utils", version = "0.1.0" }
 chrono = { version = "0.4", default-features = false, features = ["clock"] }
 chrono-tz = { version = "0.8" }
 num = "0.4"

native/core/Cargo.toml

@@ -77,7 +77,6 @@ regex = { workspace = true }
 crc32fast = "1.3.2"
 simd-adler32 = "0.3.7"
 datafusion-comet-spark-expr = { workspace = true }
-datafusion-comet-utils = { workspace = true }
 
 [build-dependencies]
 prost-build = "0.9.0"

native/core/src/execution/datafusion/expressions/utils.rs

@@ -16,4 +16,4 @@
 // under the License.
 
 // re-export for legacy reasons
-pub use datafusion_comet_utils::{array_with_timezone, down_cast_any_ref};
+pub use datafusion_comet_spark_expr::utils::{array_with_timezone, down_cast_any_ref};

native/core/src/execution/mod.rs

@@ -26,7 +26,7 @@ pub mod operators;
 pub mod serde;
 pub mod shuffle;
 pub(crate) mod sort;
-pub use datafusion_comet_utils::timezone;
+pub use datafusion_comet_spark_expr::timezone;
 pub(crate) mod utils;
 
 mod memory_pool;

native/spark-expr/Cargo.toml

@@ -36,7 +36,8 @@ datafusion-common = { workspace = true }
 datafusion-functions = { workspace = true }
 datafusion-expr = { workspace = true }
 datafusion-physical-expr = { workspace = true }
-datafusion-comet-utils = { workspace = true }
+datafusion-physical-plan = { workspace = true }
+chrono-tz = { workspace = true }
 num = { workspace = true }
 regex = { workspace = true }
 thiserror = { workspace = true }

native/spark-expr/src/cast.rs

@@ -55,7 +55,7 @@ use num::{
 };
 use regex::Regex;
 
-use datafusion_comet_utils::{array_with_timezone, down_cast_any_ref};
+use crate::utils::{array_with_timezone, down_cast_any_ref};
 
 use crate::{EvalMode, SparkError, SparkResult};
 

native/spark-expr/src/if_expr.rs

@@ -31,7 +31,7 @@ use datafusion::logical_expr::ColumnarValue;
 use datafusion_common::{cast::as_boolean_array, Result};
 use datafusion_physical_expr::PhysicalExpr;
 
-use datafusion_comet_utils::down_cast_any_ref;
+use crate::utils::down_cast_any_ref;
 
 #[derive(Debug, Hash)]
 pub struct IfExpr {

native/spark-expr/src/lib.rs

@@ -20,6 +20,9 @@ pub mod cast;
 mod error;
 mod if_expr;
 
+pub mod timezone;
+pub mod utils;
+
 pub use abs::Abs;
 pub use error::{SparkError, SparkResult};
 pub use if_expr::IfExpr;

native/utils/src/lib.rs → native/spark-expr/src/utils.rs

@@ -23,14 +23,12 @@ use arrow_schema::{ArrowError, DataType};
 use std::any::Any;
 use std::sync::Arc;
 
+use crate::timezone::Tz;
 use arrow::{
     array::{as_dictionary_array, Array, ArrayRef, PrimitiveArray},
     temporal_conversions::as_datetime,
 };
 use chrono::{DateTime, Offset, TimeZone};
-use timezone::Tz;
-
-pub mod timezone;
 
 use datafusion_physical_plan::PhysicalExpr;