Skip to content

Commit 4e015db

Browse files
authored
fix: import from datafusion_expr in make_valid_utf8 (#21687)
## Which issue does this PR close? - Closes #21685. ## Rationale for this change Per issue. `make_valid_utf8.rs` imports from `datafusion::logical_expr`, but `datafusion` is only a dep of `datafusion-spark` behind the `core` feature, so `cargo check -p datafusion-spark` and `cargo bench -p datafusion-spark` both fail without `--all-features`. CI doesn't catch it because `datafusion-sqllogictest` pins `datafusion-spark` with `core` on. ## What changes are included in this PR? Move the `ColumnarValue`, `Signature`, `Volatility` imports from `datafusion::logical_expr` to `datafusion_expr`, which is already imported a few lines below. ## Are these changes tested? Covered by existing tests. Verified `cargo check -p datafusion-spark`, `cargo check -p datafusion-spark --all-targets`, and `cargo bench -p datafusion-spark` all succeed after the change, and `./dev/rust_lint.sh` passes. ## Are there any user-facing changes? No.
1 parent d1800db commit 4e015db

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

datafusion/spark/src/function/string/make_valid_utf8.rs

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

1818
use arrow::array::{ArrayRef, LargeStringArray, StringArray};
1919
use arrow::datatypes::{DataType, Field, FieldRef};
20-
use datafusion::logical_expr::{ColumnarValue, Signature, Volatility};
2120
use datafusion_common::cast::{
2221
as_binary_array, as_binary_view_array, as_large_binary_array,
2322
};
2423
use datafusion_common::utils::take_function_args;
2524
use datafusion_common::{Result, internal_err};
26-
use datafusion_expr::{ReturnFieldArgs, ScalarFunctionArgs, ScalarUDFImpl};
25+
use datafusion_expr::{
26+
ColumnarValue, ReturnFieldArgs, ScalarFunctionArgs, ScalarUDFImpl, Signature,
27+
Volatility,
28+
};
2729
use datafusion_functions::utils::make_scalar_function;
2830
use std::sync::Arc;
2931

0 commit comments

Comments
 (0)