Skip to content

Apache DataFusion SQL Query Engine

feat: added clippy::needless_pass_by_value lint rule to datafusion/expr (#18532)

Gohlub1586cabebb35
diff --git a/datafusion/expr/src/execution_props.rs b/datafusion/expr/src/execution_props.rs
index d8a8c6bb49..fe20ed9331 100644
--- a/datafusion/expr/src/execution_props.rs
+++ b/datafusion/expr/src/execution_props.rs
@@ -102,6 +102,7 @@ impl ExecutionProps {
}
/// Returns the provider for the `var_type`, if any
+ #[allow(clippy::needless_pass_by_value)]
pub fn get_var_provider(
&self,
var_type: VarType,
diff --git a/datafusion/expr/src/expr_rewriter/order_by.rs b/datafusion/expr/src/expr_rewriter/order_by.rs
index 6db9555550..c21c6e6222 100644
--- a/datafusion/expr/src/expr_rewriter/order_by.rs
+++ b/datafusion/expr/src/expr_rewriter/order_by.rs
@@ -52,7 +52,7 @@ fn rewrite_sort_col_by_aggs(expr: Expr, plan: &LogicalPlan) -> Result<Expr> {
// on top of them)
if plan_inputs.len() == 1 {
let proj_exprs = plan.expressions();
- rewrite_in_terms_of_projection(expr, proj_exprs, plan_inputs[0])
+ rewrite_in_terms_of_projection(expr, &proj_exprs, plan_inputs[0])
} else {
Ok(expr)
}
@@ -71,7 +71,7 @@ fn rewrite_sort_col_by_aggs(expr: Expr, plan: &LogicalPlan) -> Result<Expr> {
/// 2. t produces an output schema with two columns "a", "b + c"
fn rewrite_in_terms_of_projection(
expr: Expr,
- proj_exprs: Vec<Expr>,
+ proj_exprs: &[Expr],
input: &LogicalPlan,
) -> Result<Expr> {
// assumption is that each item in exprs, such as "b + c" is
@@ -104,7 +104,7 @@ fn rewrite_in_terms_of_projection(
// look for the column named the same as this expr
let mut found = None;
- for proj_expr in &proj_exprs {
+ for proj_expr in proj_exprs {
proj_expr.apply(|e| {
if expr_match(&search_col, e) {
found = Some(e.clone());
diff --git a/datafusion/expr/src/lib.rs b/datafusion/expr/src/lib.rs
index 2b7cc9d46a..885e582ea6 100644
--- a/datafusion/expr/src/lib.rs
+++ b/datafusion/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))]
//! [DataFusion](https://github.com/apache/datafusion)
//! is an extensible query execution framework that uses
diff --git a/datafusion/expr/src/literal.rs b/datafusion/expr/src/literal.rs
index 335d7b471f..c7345a455a 100644
--- a/datafusion/expr/src/literal.rs
+++ b/datafusion/expr/src/literal.rs
@@ -21,10 +21,12 @@ use crate::Expr;
use datafusion_common::{metadata::FieldMetadata, ScalarValue};
/// Create a literal expression
+#[allow(clippy::needless_pass_by_value)]
pub fn lit<T: Literal>(n: T) -> Expr {
n.lit()
}
+#[allow(clippy::needless_pass_by_value)]
pub fn lit_with_metadata<T: Literal>(n: T, metadata: Option<FieldMetadata>) -> Expr {
let Some(metadata) = metadata else {
return n.lit();
@@ -45,6 +47,7 @@ pub fn lit_with_metadata<T: Literal>(n: T, metadata: Option<FieldMetadata>) -> E
}
/// Create a literal timestamp expression
+#[allow(clippy::needless_pass_by_value)]
pub fn lit_timestamp_nano<T: TimestampLiteral>(n: T) -> Expr {
n.lit_timestamp_nano()
}
diff --git a/datafusion/expr/src/logical_plan/plan.rs b/datafusion/expr/src/logical_plan/plan.rs
index 0b89a52509..892ab135d6 100644
--- a/datafusion/expr/src/logical_plan/plan.rs
+++ b/datafusion/expr/src/logical_plan/plan.rs
@@ -3481,6 +3481,7 @@ impl Aggregate {
///
/// This method should only be called when you are absolutely sure that the schema being
/// provided is correct for the aggregate. If in doubt, call [try_new](Self::try_new) instead.
+ #[allow(clippy::needless_pass_by_value)]
pub fn try_new_with_schema(
input: Arc<LogicalPlan>,
group_expr: Vec<Expr>,
diff --git a/datafusion/expr/src/utils.rs b/datafusion/expr/src/utils.rs
index cd733e0a13..b4e763cdf4 100644
--- a/datafusion/expr/src/utils.rs
+++ b/datafusion/expr/src/utils.rs
@@ -354,7 +354,7 @@ fn get_excluded_columns(
/// Returns all `Expr`s in the schema, except the `Column`s in the `columns_to_skip`
fn get_exprs_except_skipped(
schema: &DFSchema,
- columns_to_skip: HashSet<Column>,
+ columns_to_skip: &HashSet<Column>,
) -> Vec<Expr> {
if columns_to_skip.is_empty() {
schema.iter().map(Expr::from).collect::<Vec<Expr>>()
@@ -419,7 +419,7 @@ pub fn expand_wildcard(
};
// Add each excluded `Column` to columns_to_skip
columns_to_skip.extend(excluded_columns);
- Ok(get_exprs_except_skipped(schema, columns_to_skip))
+ Ok(get_exprs_except_skipped(schema, &columns_to_skip))
}
/// Resolves an `Expr::Wildcard` to a collection of qualified `Expr::Column`'s.
@@ -464,7 +464,7 @@ pub fn expand_qualified_wildcard(
columns_to_skip.extend(excluded_columns);
Ok(get_exprs_except_skipped(
&qualified_dfschema,
- columns_to_skip,
+ &columns_to_skip,
))
}
@@ -928,6 +928,7 @@ pub fn find_valid_equijoin_key_pair(
/// round(Float64)
/// round(Float32)
/// ```
+#[allow(clippy::needless_pass_by_value)]
pub fn generate_signature_error_msg(
func_name: &str,
func_signature: Signature,