Skip to content

Commit 39fb9cc

Browse files
davidlghellindavidlghellin
committed
fix: use datafusion_expr instead of datafusion crate in spark bitmap/math modules
1 parent d138c36 commit 39fb9cc

3 files changed

Lines changed: 12 additions & 6 deletions

File tree

‎datafusion/spark/src/function/bitmap/bitmap_bit_position.rs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@
1818
use arrow::array::{ArrayRef, AsArray, Int64Array};
1919
use arrow::datatypes::Field;
2020
use arrow::datatypes::{DataType, FieldRef, Int8Type, Int16Type, Int32Type, Int64Type};
21-
use datafusion::logical_expr::{ColumnarValue, Signature, TypeSignature, Volatility};
2221
use datafusion_common::utils::take_function_args;
2322
use datafusion_common::{Result, internal_err};
24-
use datafusion_expr::{ScalarFunctionArgs, ScalarUDFImpl};
23+
use datafusion_expr::{
24+
ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, TypeSignature,
25+
Volatility,
26+
};
2527
use datafusion_functions::utils::make_scalar_function;
2628
use std::any::Any;
2729
use std::sync::Arc;

‎datafusion/spark/src/function/bitmap/bitmap_bucket_number.rs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@
1818
use arrow::array::{ArrayRef, AsArray, Int64Array};
1919
use arrow::datatypes::Field;
2020
use arrow::datatypes::{DataType, FieldRef, Int8Type, Int16Type, Int32Type, Int64Type};
21-
use datafusion::logical_expr::{ColumnarValue, Signature, TypeSignature, Volatility};
2221
use datafusion_common::utils::take_function_args;
2322
use datafusion_common::{Result, internal_err};
24-
use datafusion_expr::{ScalarFunctionArgs, ScalarUDFImpl};
23+
use datafusion_expr::{
24+
ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, TypeSignature,
25+
Volatility,
26+
};
2527
use datafusion_functions::utils::make_scalar_function;
2628
use std::any::Any;
2729
use std::sync::Arc;

‎datafusion/spark/src/function/math/bin.rs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,13 @@
1717

1818
use arrow::array::{ArrayRef, AsArray, StringArray};
1919
use arrow::datatypes::{DataType, Field, FieldRef, Int64Type};
20-
use datafusion::logical_expr::{ColumnarValue, Signature, TypeSignature, Volatility};
2120
use datafusion_common::types::{NativeType, logical_int64};
2221
use datafusion_common::utils::take_function_args;
2322
use datafusion_common::{Result, internal_err};
24-
use datafusion_expr::{Coercion, ScalarFunctionArgs, ScalarUDFImpl, TypeSignatureClass};
23+
use datafusion_expr::{
24+
Coercion, ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, TypeSignature,
25+
TypeSignatureClass, Volatility,
26+
};
2527
use datafusion_functions::utils::make_scalar_function;
2628
use std::any::Any;
2729
use std::sync::Arc;

0 commit comments

Comments
 (0)