From 39fb9cca79db1a79e6f8ee01af79df9b59a8ec00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20L=C3=B3pez?= <hola@devel0pez.com>
Date: Wed, 18 Mar 2026 21:24:15 +0100
Subject: [PATCH] fix: use datafusion_expr instead of datafusion crate in spark
 bitmap/math modules

---
 datafusion/spark/src/function/bitmap/bitmap_bit_position.rs | 6 ++++--
 .../spark/src/function/bitmap/bitmap_bucket_number.rs       | 6 ++++--
 datafusion/spark/src/function/math/bin.rs                   | 6 ++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/datafusion/spark/src/function/bitmap/bitmap_bit_position.rs b/datafusion/spark/src/function/bitmap/bitmap_bit_position.rs
index 3871d00cc91d8..262dc07f27048 100644
--- a/datafusion/spark/src/function/bitmap/bitmap_bit_position.rs
+++ b/datafusion/spark/src/function/bitmap/bitmap_bit_position.rs
@@ -18,10 +18,12 @@
 use arrow::array::{ArrayRef, AsArray, Int64Array};
 use arrow::datatypes::Field;
 use arrow::datatypes::{DataType, FieldRef, Int8Type, Int16Type, Int32Type, Int64Type};
-use datafusion::logical_expr::{ColumnarValue, Signature, TypeSignature, Volatility};
 use datafusion_common::utils::take_function_args;
 use datafusion_common::{Result, internal_err};
-use datafusion_expr::{ScalarFunctionArgs, ScalarUDFImpl};
+use datafusion_expr::{
+    ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, TypeSignature,
+    Volatility,
+};
 use datafusion_functions::utils::make_scalar_function;
 use std::any::Any;
 use std::sync::Arc;
diff --git a/datafusion/spark/src/function/bitmap/bitmap_bucket_number.rs b/datafusion/spark/src/function/bitmap/bitmap_bucket_number.rs
index fe72a4fe8ac3e..9686d1acd8832 100644
--- a/datafusion/spark/src/function/bitmap/bitmap_bucket_number.rs
+++ b/datafusion/spark/src/function/bitmap/bitmap_bucket_number.rs
@@ -18,10 +18,12 @@
 use arrow::array::{ArrayRef, AsArray, Int64Array};
 use arrow::datatypes::Field;
 use arrow::datatypes::{DataType, FieldRef, Int8Type, Int16Type, Int32Type, Int64Type};
-use datafusion::logical_expr::{ColumnarValue, Signature, TypeSignature, Volatility};
 use datafusion_common::utils::take_function_args;
 use datafusion_common::{Result, internal_err};
-use datafusion_expr::{ScalarFunctionArgs, ScalarUDFImpl};
+use datafusion_expr::{
+    ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, TypeSignature,
+    Volatility,
+};
 use datafusion_functions::utils::make_scalar_function;
 use std::any::Any;
 use std::sync::Arc;
diff --git a/datafusion/spark/src/function/math/bin.rs b/datafusion/spark/src/function/math/bin.rs
index 5d3ed0f77a4e1..6822025b782d5 100644
--- a/datafusion/spark/src/function/math/bin.rs
+++ b/datafusion/spark/src/function/math/bin.rs
@@ -17,11 +17,13 @@
 
 use arrow::array::{ArrayRef, AsArray, StringArray};
 use arrow::datatypes::{DataType, Field, FieldRef, Int64Type};
-use datafusion::logical_expr::{ColumnarValue, Signature, TypeSignature, Volatility};
 use datafusion_common::types::{NativeType, logical_int64};
 use datafusion_common::utils::take_function_args;
 use datafusion_common::{Result, internal_err};
-use datafusion_expr::{Coercion, ScalarFunctionArgs, ScalarUDFImpl, TypeSignatureClass};
+use datafusion_expr::{
+    Coercion, ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, TypeSignature,
+    TypeSignatureClass, Volatility,
+};
 use datafusion_functions::utils::make_scalar_function;
 use std::any::Any;
 use std::sync::Arc;