Skip to content

Commit 61d8483

Browse files
[branch-53] fix: use datafusion_expr instead of datafusion crate in spark bitmap/… (#21452)
…math modules (cherry picked from commit 39fb9cc) ## Which issue does this PR close? <!-- We generally require a GitHub issue to be filed for all bug fixes and enhancements and this helps us generate change logs for our releases. You can link an issue to this PR using the GitHub syntax. For example `Closes #123` indicates that this PR will close issue #123. --> - Closes #. ## Rationale for this change <!-- Why are you proposing this change? If this is already explained clearly in the issue then this section is not needed. Explaining clearly why changes are proposed helps reviewers understand your changes and offer better suggestions for fixes. --> ## What changes are included in this PR? <!-- There is no need to duplicate the description in the issue here but it is sometimes worth providing a summary of the individual changes in this PR. --> ## Are these changes tested? <!-- We typically require tests for all PRs in order to: 1. Prevent the code from being accidentally broken by subsequent changes 2. Serve as another way to document the expected behavior of the code If tests are not included in your PR, please explain why (for example, are they covered by existing tests)? --> ## Are there any user-facing changes? <!-- If there are user-facing changes then we may require documentation to be updated before approving the PR. --> <!-- If there are any breaking changes to public APIs, please add the `api change` label. --> Co-authored-by: David López <hola@devel0pez.com>
1 parent 3224e0c commit 61d8483

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)