This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion.git
The following commit(s) were added to refs/heads/main by this push:
new a216d4aeed chore: Enforce lint rule `clippy::needless_pass_by_value`
to `datafusion-physical-expr` (#18557)
a216d4aeed is described below
commit a216d4aeedbe7522e2e31fa273c5546a0a23ea71
Author: Cora Sutton <[email protected]>
AuthorDate: Sun Nov 9 00:12:42 2025 -0600
chore: Enforce lint rule `clippy::needless_pass_by_value` to
`datafusion-physical-expr` (#18557)
## 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 #18544.
## 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.
-->
See https://github.com/apache/datafusion/issues/18503 for details.
## 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.
-->
I enabled the clippy lint rule and then fixed nearly all instances.
## 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)?
-->
As part of the normal test suite, yes.
## 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.
-->
The following `pub (crate)` APIs were changed:
- `regex_match_dyn` in
`datafusion/physical-expr/src/expressions/binary/kernels.rs`
- `regex_match_dyn_scalar` in
`datafusion/physical-expr/src/expressions/binary/kernels.rs`
But no fully `pub` functions were changed.
---
datafusion/physical-expr/src/analysis.rs | 6 +++---
.../physical-expr/src/equivalence/properties/mod.rs | 2 +-
datafusion/physical-expr/src/expressions/binary.rs | 20 ++++++++++----------
.../physical-expr/src/expressions/binary/kernels.rs | 6 +++---
datafusion/physical-expr/src/expressions/in_list.rs | 14 +++++++-------
datafusion/physical-expr/src/expressions/literal.rs | 1 +
datafusion/physical-expr/src/lib.rs | 3 +++
datafusion/physical-expr/src/utils/guarantee.rs | 4 ++--
8 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/datafusion/physical-expr/src/analysis.rs
b/datafusion/physical-expr/src/analysis.rs
index 1d59dab8fd..f34dfb4ae1 100644
--- a/datafusion/physical-expr/src/analysis.rs
+++ b/datafusion/physical-expr/src/analysis.rs
@@ -218,7 +218,7 @@ pub fn analyze(
.update_ranges(&mut target_indices_and_boundaries,
Interval::CERTAINLY_TRUE)?
{
PropagationResult::Success => {
- shrink_boundaries(graph, target_boundaries,
target_expr_and_indices)
+ shrink_boundaries(&graph, target_boundaries,
&target_expr_and_indices)
}
PropagationResult::Infeasible => {
// If the propagation result is infeasible, set intervals to
None
@@ -239,9 +239,9 @@ pub fn analyze(
/// Following this, it constructs and returns a new `AnalysisContext` with the
/// updated parameters.
fn shrink_boundaries(
- graph: ExprIntervalGraph,
+ graph: &ExprIntervalGraph,
mut target_boundaries: Vec<ExprBoundaries>,
- target_expr_and_indices: Vec<(Arc<dyn PhysicalExpr>, usize)>,
+ target_expr_and_indices: &[(Arc<dyn PhysicalExpr>, usize)],
) -> Result<AnalysisContext> {
let initial_boundaries = target_boundaries.clone();
target_expr_and_indices.iter().for_each(|(expr, i)| {
diff --git a/datafusion/physical-expr/src/equivalence/properties/mod.rs
b/datafusion/physical-expr/src/equivalence/properties/mod.rs
index 4d919d623b..c13618feb8 100644
--- a/datafusion/physical-expr/src/equivalence/properties/mod.rs
+++ b/datafusion/physical-expr/src/equivalence/properties/mod.rs
@@ -380,7 +380,7 @@ impl EquivalenceProperties {
right: Arc<dyn PhysicalExpr>,
) -> Result<()> {
// Add equal expressions to the state:
- if self.eq_group.add_equal_conditions(Arc::clone(&left), right) {
+ if self.eq_group.add_equal_conditions(left, right) {
self.update_oeq_cache()?;
}
self.update_oeq_cache()?;
diff --git a/datafusion/physical-expr/src/expressions/binary.rs
b/datafusion/physical-expr/src/expressions/binary.rs
index b09d57f02d..f3a71cbea4 100644
--- a/datafusion/physical-expr/src/expressions/binary.rs
+++ b/datafusion/physical-expr/src/expressions/binary.rs
@@ -573,10 +573,10 @@ impl BinaryExpr {
) -> Result<Option<Result<ArrayRef>>> {
use Operator::*;
let scalar_result = match &self.op {
- RegexMatch => regex_match_dyn_scalar(array, scalar, false, false),
- RegexIMatch => regex_match_dyn_scalar(array, scalar, false, true),
- RegexNotMatch => regex_match_dyn_scalar(array, scalar, true,
false),
- RegexNotIMatch => regex_match_dyn_scalar(array, scalar, true,
true),
+ RegexMatch => regex_match_dyn_scalar(array, &scalar, false, false),
+ RegexIMatch => regex_match_dyn_scalar(array, &scalar, false, true),
+ RegexNotMatch => regex_match_dyn_scalar(array, &scalar, true,
false),
+ RegexNotIMatch => regex_match_dyn_scalar(array, &scalar, true,
true),
BitwiseAnd => bitwise_and_dyn_scalar(array, scalar),
BitwiseOr => bitwise_or_dyn_scalar(array, scalar),
BitwiseXor => bitwise_xor_dyn_scalar(array, scalar),
@@ -625,16 +625,16 @@ impl BinaryExpr {
)
}
}
- RegexMatch => regex_match_dyn(left, right, false, false),
- RegexIMatch => regex_match_dyn(left, right, false, true),
- RegexNotMatch => regex_match_dyn(left, right, true, false),
- RegexNotIMatch => regex_match_dyn(left, right, true, true),
+ RegexMatch => regex_match_dyn(&left, &right, false, false),
+ RegexIMatch => regex_match_dyn(&left, &right, false, true),
+ RegexNotMatch => regex_match_dyn(&left, &right, true, false),
+ RegexNotIMatch => regex_match_dyn(&left, &right, true, true),
BitwiseAnd => bitwise_and_dyn(left, right),
BitwiseOr => bitwise_or_dyn(left, right),
BitwiseXor => bitwise_xor_dyn(left, right),
BitwiseShiftRight => bitwise_shift_right_dyn(left, right),
BitwiseShiftLeft => bitwise_shift_left_dyn(left, right),
- StringConcat => concat_elements(left, right),
+ StringConcat => concat_elements(&left, &right),
AtArrow | ArrowAt | Arrow | LongArrow | HashArrow | HashLongArrow
| AtAt
| HashMinus | AtQuestion | Question | QuestionAnd | QuestionPipe
| IntegerDivide => {
@@ -854,7 +854,7 @@ fn pre_selection_scatter(
Ok(ColumnarValue::Array(Arc::new(boolean_result)))
}
-fn concat_elements(left: Arc<dyn Array>, right: Arc<dyn Array>) ->
Result<ArrayRef> {
+fn concat_elements(left: &ArrayRef, right: &ArrayRef) -> Result<ArrayRef> {
Ok(match left.data_type() {
DataType::Utf8 => Arc::new(concat_elements_utf8(
left.as_string::<i32>(),
diff --git a/datafusion/physical-expr/src/expressions/binary/kernels.rs
b/datafusion/physical-expr/src/expressions/binary/kernels.rs
index 6c96975ed6..ad44b00212 100644
--- a/datafusion/physical-expr/src/expressions/binary/kernels.rs
+++ b/datafusion/physical-expr/src/expressions/binary/kernels.rs
@@ -207,8 +207,8 @@ macro_rules! regexp_is_match_flag {
}
pub(crate) fn regex_match_dyn(
- left: ArrayRef,
- right: ArrayRef,
+ left: &ArrayRef,
+ right: &ArrayRef,
not_match: bool,
flag: bool,
) -> Result<ArrayRef> {
@@ -259,7 +259,7 @@ macro_rules! regexp_is_match_flag_scalar {
pub(crate) fn regex_match_dyn_scalar(
left: &dyn Array,
- right: ScalarValue,
+ right: &ScalarValue,
not_match: bool,
flag: bool,
) -> Option<Result<ArrayRef>> {
diff --git a/datafusion/physical-expr/src/expressions/in_list.rs
b/datafusion/physical-expr/src/expressions/in_list.rs
index fa91635d9b..eeac986bee 100644
--- a/datafusion/physical-expr/src/expressions/in_list.rs
+++ b/datafusion/physical-expr/src/expressions/in_list.rs
@@ -149,7 +149,7 @@ where
///
/// Note: This is split into a separate function as higher-rank trait bounds
currently
/// cause type inference to misbehave
-fn make_hash_set<T>(array: T) -> ArrayHashSet
+fn make_hash_set<T>(array: &T) -> ArrayHashSet
where
T: ArrayAccessor,
T::Item: IsEqual,
@@ -183,26 +183,26 @@ where
/// Creates a `Box<dyn Set>` for the given list of `IN` expressions and `batch`
fn make_set(array: &dyn Array) -> Result<Arc<dyn Set>> {
Ok(downcast_primitive_array! {
- array => Arc::new(ArraySet::new(array, make_hash_set(array))),
+ array => Arc::new(ArraySet::new(array, make_hash_set(&array))),
DataType::Boolean => {
let array = as_boolean_array(array)?;
- Arc::new(ArraySet::new(array, make_hash_set(array)))
+ Arc::new(ArraySet::new(array, make_hash_set(&array)))
},
DataType::Utf8 => {
let array = as_string_array(array)?;
- Arc::new(ArraySet::new(array, make_hash_set(array)))
+ Arc::new(ArraySet::new(array, make_hash_set(&array)))
}
DataType::LargeUtf8 => {
let array = as_largestring_array(array);
- Arc::new(ArraySet::new(array, make_hash_set(array)))
+ Arc::new(ArraySet::new(array, make_hash_set(&array)))
}
DataType::Binary => {
let array = as_generic_binary_array::<i32>(array)?;
- Arc::new(ArraySet::new(array, make_hash_set(array)))
+ Arc::new(ArraySet::new(array, make_hash_set(&array)))
}
DataType::LargeBinary => {
let array = as_generic_binary_array::<i64>(array)?;
- Arc::new(ArraySet::new(array, make_hash_set(array)))
+ Arc::new(ArraySet::new(array, make_hash_set(&array)))
}
DataType::Dictionary(_, _) => unreachable!("dictionary should have
been flattened"),
d => return not_impl_err!("DataType::{d} not supported in InList")
diff --git a/datafusion/physical-expr/src/expressions/literal.rs
b/datafusion/physical-expr/src/expressions/literal.rs
index 94e91d43a1..359bfcefdb 100644
--- a/datafusion/physical-expr/src/expressions/literal.rs
+++ b/datafusion/physical-expr/src/expressions/literal.rs
@@ -137,6 +137,7 @@ impl PhysicalExpr for Literal {
}
/// Create a literal expression
+#[allow(clippy::needless_pass_by_value)]
pub fn lit<T: datafusion_expr::Literal>(value: T) -> Arc<dyn PhysicalExpr> {
match value.lit() {
Expr::Literal(v, _) => Arc::new(Literal::new(v)),
diff --git a/datafusion/physical-expr/src/lib.rs
b/datafusion/physical-expr/src/lib.rs
index aa8c9e50fd..f59582f405 100644
--- a/datafusion/physical-expr/src/lib.rs
+++ b/datafusion/physical-expr/src/lib.rs
@@ -23,6 +23,9 @@
// Make sure fast / cheap clones on Arc are explicit:
// https://github.com/apache/datafusion/issues/11143
#![deny(clippy::clone_on_ref_ptr)]
+// https://github.com/apache/datafusion/issues/18503
+#![deny(clippy::needless_pass_by_value)]
+#![cfg_attr(test, allow(clippy::needless_pass_by_value))]
// Backward compatibility
pub mod aggregate;
diff --git a/datafusion/physical-expr/src/utils/guarantee.rs
b/datafusion/physical-expr/src/utils/guarantee.rs
index 8a57cc7b7c..d63a9590c3 100644
--- a/datafusion/physical-expr/src/utils/guarantee.rs
+++ b/datafusion/physical-expr/src/utils/guarantee.rs
@@ -124,7 +124,7 @@ impl LiteralGuarantee {
// for an `AND` conjunction to be true, all terms individually
must be true
.fold(GuaranteeBuilder::new(), |builder, expr| {
if let Some(cel) = ColOpLit::try_new(expr) {
- builder.aggregate_conjunct(cel)
+ builder.aggregate_conjunct(&cel)
} else if let Some(inlist) = expr
.as_any()
.downcast_ref::<crate::expressions::InListExpr>()
@@ -292,7 +292,7 @@ impl<'a> GuaranteeBuilder<'a> {
/// # Examples
/// * `AND (a = 1)`: `a` is guaranteed to be 1
/// * `AND (a != 1)`: a is guaranteed to not be 1
- fn aggregate_conjunct(self, col_op_lit: ColOpLit<'a>) -> Self {
+ fn aggregate_conjunct(self, col_op_lit: &ColOpLit<'a>) -> Self {
self.aggregate_multi_conjunct(
col_op_lit.col,
col_op_lit.guarantee,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
