From b90aa8ffcf830806737a5a8d2b4e6336b91ffb32 Mon Sep 17 00:00:00 2001
From: mattharder91 <mattharder91@googlemail.com>
Date: Fri, 3 May 2024 11:37:27 +0200
Subject: [PATCH] Adapt imports for float functions

---
 core/src/execution/datafusion/expressions/cast.rs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/core/src/execution/datafusion/expressions/cast.rs b/core/src/execution/datafusion/expressions/cast.rs
index d36d004e4..76e649258 100644
--- a/core/src/execution/datafusion/expressions/cast.rs
+++ b/core/src/execution/datafusion/expressions/cast.rs
@@ -30,12 +30,9 @@ use arrow::{
     util::display::FormatOptions,
 };
 use arrow_array::{
-<<<<<<< HEAD
     types::{Int16Type, Int32Type, Int64Type, Int8Type},
-    Array, ArrayRef, BooleanArray, GenericStringArray, OffsetSizeTrait, PrimitiveArray, Float64Array,
-=======
     Array, ArrayRef, BooleanArray, Float32Array, Float64Array, GenericStringArray, OffsetSizeTrait,
->>>>>>> 334bf0c (Add macro to handle both float types)
+    PrimitiveArray,
 };
 use arrow_schema::{DataType, Schema};
 use chrono::{TimeZone, Timelike};
@@ -266,7 +263,7 @@ impl Cast {
             }
             (DataType::Float32, DataType::LargeUtf8) => {
                 Self::spark_cast_float32_to_utf8::<i64>(&array, self.eval_mode)?
-            }            
+            }
             _ => {
                 // when we have no Spark-specific casting we delegate to DataFusion
                 cast_with_options(&array, to_type, &CAST_OPTIONS)?