From 6d1e69781fc9dc54a5b68147169a32a31d467baa Mon Sep 17 00:00:00 2001
From: Andy Grove <agrove@apache.org>
Date: Fri, 12 Jul 2024 06:54:50 -0600
Subject: [PATCH] clean up imports

---
 native/Cargo.lock             |  1 +
 native/spark-expr/Cargo.toml  |  1 +
 native/spark-expr/src/cast.rs | 26 +++++++++++++++-----------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/native/Cargo.lock b/native/Cargo.lock
index 132c0ee85..b6e6b08e0 100644
--- a/native/Cargo.lock
+++ b/native/Cargo.lock
@@ -913,6 +913,7 @@ dependencies = [
  "datafusion",
  "datafusion-comet-utils",
  "datafusion-common",
+ "datafusion-expr",
  "datafusion-functions",
  "datafusion-physical-expr",
  "num",
diff --git a/native/spark-expr/Cargo.toml b/native/spark-expr/Cargo.toml
index 58310798a..220417fe8 100644
--- a/native/spark-expr/Cargo.toml
+++ b/native/spark-expr/Cargo.toml
@@ -34,6 +34,7 @@ chrono = { workspace = true }
 datafusion = { workspace = true }
 datafusion-common = { workspace = true }
 datafusion-functions = { workspace = true }
+datafusion-expr = { workspace = true }
 datafusion-physical-expr = { workspace = true }
 datafusion-comet-utils = { workspace = true }
 num = { workspace = true }
diff --git a/native/spark-expr/src/cast.rs b/native/spark-expr/src/cast.rs
index 8fa073249..b9cf2790b 100644
--- a/native/spark-expr/src/cast.rs
+++ b/native/spark-expr/src/cast.rs
@@ -23,9 +23,14 @@ use std::{
     sync::Arc,
 };
 
-use super::EvalMode;
-use crate::{SparkError, SparkResult};
 use arrow::{
+    array::{
+        cast::AsArray,
+        types::{Date32Type, Int16Type, Int32Type, Int8Type},
+        Array, ArrayRef, BooleanArray, Decimal128Array, Float32Array, Float64Array,
+        GenericStringArray, Int16Array, Int32Array, Int64Array, Int8Array, OffsetSizeTrait,
+        PrimitiveArray,
+    },
     compute::{cast_with_options, unary, CastOptions},
     datatypes::{
         ArrowPrimitiveType, Decimal128Type, DecimalType, Float32Type, Float64Type, Int64Type,
@@ -35,26 +40,25 @@ use arrow::{
     record_batch::RecordBatch,
     util::display::FormatOptions,
 };
-use arrow_array::{
-    cast::AsArray,
-    types::{Date32Type, Int16Type, Int32Type, Int8Type},
-    Array, ArrayRef, BooleanArray, Decimal128Array, Float32Array, Float64Array, GenericStringArray,
-    Int16Array, Int32Array, Int64Array, Int8Array, OffsetSizeTrait, PrimitiveArray,
-};
 use arrow_schema::{DataType, Schema};
-use chrono::{NaiveDate, NaiveDateTime, TimeZone, Timelike};
-use datafusion::logical_expr::ColumnarValue;
-use datafusion_comet_utils::{array_with_timezone, down_cast_any_ref};
+
 use datafusion_common::{
     cast::as_generic_string_array, internal_err, Result as DataFusionResult, ScalarValue,
 };
+use datafusion_expr::ColumnarValue;
 use datafusion_physical_expr::PhysicalExpr;
+
+use chrono::{NaiveDate, NaiveDateTime, TimeZone, Timelike};
 use num::{
     cast::AsPrimitive, integer::div_floor, traits::CheckedNeg, CheckedSub, Integer, Num,
     ToPrimitive,
 };
 use regex::Regex;
 
+use datafusion_comet_utils::{array_with_timezone, down_cast_any_ref};
+
+use crate::{EvalMode, SparkError, SparkResult};
+
 static TIMESTAMP_FORMAT: Option<&str> = Some("%Y-%m-%d %H:%M:%S%.f");
 
 const MICROS_PER_SECOND: i64 = 1000000;