Apache DataFusion SQL Query Engine
refactor: avoid redundant clones in planning and simplification (#27029)
Omkar Wagholikar8b88a86a7475
diff --git a/datafusion/expr/src/utils.rs b/datafusion/expr/src/utils.rsindex da7b14138c..2998c89f98 100644--- a/datafusion/expr/src/utils.rs+++ b/datafusion/expr/src/utils.rs@@ -396,7 +396,7 @@ fn get_exprs_except_skipped(/// joins). An unqualified wildcard should include each USING column only once./// This function returns the duplicate columns that should be excluded.fn exclude_using_columns(plan: &LogicalPlan) -> Result<HashSet<Column>> {- let output_columns: HashSet<_> = plan.schema().columns().iter().cloned().collect();+ let output_columns: HashSet<_> = plan.schema().columns().into_iter().collect();let mut excluded = HashSet::new();for cols in plan.using_columns()? {// `using_columns()` returns join columns from both sides regardless ofdiff --git a/datafusion/optimizer/src/analyzer/type_coercion.rs b/datafusion/optimizer/src/analyzer/type_coercion.rsindex 296fccec4f..fc798449b0 100644--- a/datafusion/optimizer/src/analyzer/type_coercion.rs+++ b/datafusion/optimizer/src/analyzer/type_coercion.rs@@ -315,7 +315,7 @@ impl<'a> TypeCoercionRewriter<'a> {}fn coerce_dml(&self, mut dml: DmlStatement) -> Result<LogicalPlan> {- let WriteOp::MergeInto(merge_op) = &dml.op else {+ let WriteOp::MergeInto(merge_op) = &mut dml.op else {return Ok(LogicalPlan::Dml(dml));};@@ -323,8 +323,8 @@ impl<'a> TypeCoercionRewriter<'a> {dml.table_name.clone(),&dml.target.schema(),)?;- let mut merge_op = (**merge_op).clone();- merge_op.on = self.coerce_predicate(merge_op.on, "MERGE ON condition")?;+ merge_op.on = self+ .coerce_predicate(std::mem::take(&mut merge_op.on), "MERGE ON condition")?;for clause in &mut merge_op.clauses {clause.predicate = clause.predicate@@ -336,7 +336,8 @@ impl<'a> TypeCoercionRewriter<'a> {datafusion_expr::dml::MergeIntoAction::Update(assignments) => {for (column, value) in assignments {let field = target_schema.field_with_unqualified_name(column)?;- *value = value.clone().cast_to(field.data_type(), self.schema)?;+ *value = std::mem::take(value)+ .cast_to(field.data_type(), self.schema)?;}}datafusion_expr::dml::MergeIntoAction::Insert { columns, values } => {@@ -344,22 +345,21 @@ impl<'a> TypeCoercionRewriter<'a> {for (value, field) invalues.iter_mut().zip(target_schema.fields()){- *value =- value.clone().cast_to(field.data_type(), self.schema)?;+ *value = std::mem::take(value)+ .cast_to(field.data_type(), self.schema)?;}} else {for (column, value) in columns.iter().zip(values) {let field =target_schema.field_with_unqualified_name(column)?;- *value =- value.clone().cast_to(field.data_type(), self.schema)?;+ *value = std::mem::take(value)+ .cast_to(field.data_type(), self.schema)?;}}}datafusion_expr::dml::MergeIntoAction::Delete => {}}}- dml.op = WriteOp::MergeInto(Box::new(merge_op));Ok(LogicalPlan::Dml(dml))}diff --git a/datafusion/optimizer/src/simplify_expressions/expr_simplifier.rs b/datafusion/optimizer/src/simplify_expressions/expr_simplifier.rsindex a7f384b8ad..af5ad6d43b 100644--- a/datafusion/optimizer/src/simplify_expressions/expr_simplifier.rs+++ b/datafusion/optimizer/src/simplify_expressions/expr_simplifier.rs@@ -1650,12 +1650,12 @@ impl TreeNodeRewriter for Simplifier<'_> {// a between 3 and 5 --> a >= 3 AND a <=5// a not between 3 and 5 --> a < 3 OR a > 5Expr::Between(between) => Transformed::yes(if between.negated {- let l = *between.expr.clone();+ let l = between.expr.as_ref().clone();let r = *between.expr;or(l.lt(*between.low), r.gt(*between.high))} else {and(- between.expr.clone().gt_eq(*between.low),+ between.expr.as_ref().clone().gt_eq(*between.low),between.expr.lt_eq(*between.high),)}),@@ -2265,12 +2265,12 @@ fn as_inlist(expr: &'_ Expr) -> Option<Cow<'_, InList>> {match (left.as_ref(), right.as_ref()) {(Expr::Column(_), Expr::Literal(_, _)) => Some(Cow::Owned(InList {expr: left.clone(),- list: vec![*right.clone()],+ list: vec![right.as_ref().clone()],negated: false,})),(Expr::Literal(_, _), Expr::Column(_)) => Some(Cow::Owned(InList {expr: right.clone(),- list: vec![*left.clone()],+ list: vec![left.as_ref().clone()],negated: false,})),_ => None,