Apache DataFusion SQL Query Engine
fix: use datafusion_expr instead of datafusion crate in spark (#21043)
David López59e8a79ed9db
diff --git a/datafusion/spark/src/function/bitmap/bitmap_bit_position.rs b/datafusion/spark/src/function/bitmap/bitmap_bit_position.rsindex 3871d00cc9..262dc07f27 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.rsindex fe72a4fe8a..9686d1acd8 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.rsindex 5d3ed0f77a..6822025b78 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;