You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datafusion.apache.org by gi...@apache.org on 2026/04/27 07:35:31 UTC
(datafusion) 01/01: chore: use Arc::unwrap_or_clone in more places (#21823)
This is an automated email from the ASF dual-hosted git repository.
github-merge-queue[bot] pushed a commit to branch gh-readonly-queue/main/pr-21823-7fa6e2118b5567ccadf75623f11a65aa5ecfa57e
in repository https://gitbox.apache.org/repos/asf/datafusion.git
commit 1897c281139b7b33875f36e18bd2dd5565dcaee1
Author: Daniël Heres <da...@gmail.com>
AuthorDate: Mon Apr 27 09:35:07 2026 +0200
chore: use Arc::unwrap_or_clone in more places (#21823)
## Which issue does this PR close?
- Closes #.
## Rationale for this change
Avoid deep-copying values behind Arc when the Arc is uniquely owned by
using Arc::unwrap_or_clone.
## What changes are included in this PR?
Replaces several owned Arc<T> pointee clones with Arc::unwrap_or_clone,
including logical plans, schemas, fields, expressions, and statistics.
## Are these changes tested?
## Are there any user-facing changes?
No.
---
datafusion/core/src/execution/context/mod.rs | 4 ++--
datafusion/datasource-arrow/src/file_format.rs | 2 +-
datafusion/expr/src/logical_plan/plan.rs | 3 +--
datafusion/ffi/src/udf/mod.rs | 2 +-
datafusion/optimizer/src/extract_leaf_expressions.rs | 4 +---
datafusion/optimizer/src/replace_distinct_aggregate.rs | 2 +-
datafusion/physical-plan/src/joins/hash_join/exec.rs | 12 ++++++------
datafusion/sql/src/relation/mod.rs | 2 +-
.../substrait/src/logical_plan/consumer/rel/aggregate_rel.rs | 2 +-
9 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/datafusion/core/src/execution/context/mod.rs b/datafusion/core/src/execution/context/mod.rs
index b879973e7d..95403dddac 100644
--- a/datafusion/core/src/execution/context/mod.rs
+++ b/datafusion/core/src/execution/context/mod.rs
@@ -950,13 +950,13 @@ impl SessionContext {
match (or_replace, view) {
(true, Ok(_)) => {
self.deregister_table(name.clone())?;
- let input = Self::apply_type_coercion(input.as_ref().clone())?;
+ let input = Self::apply_type_coercion(Arc::unwrap_or_clone(input))?;
let table = Arc::new(ViewTable::new(input, definition));
self.register_table(name, table)?;
self.return_empty_dataframe()
}
(_, Err(_)) => {
- let input = Self::apply_type_coercion(input.as_ref().clone())?;
+ let input = Self::apply_type_coercion(Arc::unwrap_or_clone(input))?;
let table = Arc::new(ViewTable::new(input, definition));
self.register_table(name, table)?;
self.return_empty_dataframe()
diff --git a/datafusion/datasource-arrow/src/file_format.rs b/datafusion/datasource-arrow/src/file_format.rs
index fe5bba98ca..f66275728c 100644
--- a/datafusion/datasource-arrow/src/file_format.rs
+++ b/datafusion/datasource-arrow/src/file_format.rs
@@ -165,7 +165,7 @@ impl FileFormat for ArrowFormat {
}
GetResultPayload::Stream(stream) => infer_stream_schema(stream).await?,
};
- schemas.push(schema.as_ref().clone());
+ schemas.push(Arc::unwrap_or_clone(schema));
}
let merged_schema = Schema::try_merge(schemas)?;
Ok(Arc::new(merged_schema))
diff --git a/datafusion/expr/src/logical_plan/plan.rs b/datafusion/expr/src/logical_plan/plan.rs
index d86024295a..9cc9843f35 100644
--- a/datafusion/expr/src/logical_plan/plan.rs
+++ b/datafusion/expr/src/logical_plan/plan.rs
@@ -3625,7 +3625,6 @@ 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.
- #[expect(clippy::needless_pass_by_value)]
pub fn try_new_with_schema(
input: Arc<LogicalPlan>,
group_expr: Vec<Expr>,
@@ -3651,7 +3650,7 @@ impl Aggregate {
let aggregate_func_dependencies =
calc_func_dependencies_for_aggregate(&group_expr, &input, &schema)?;
- let new_schema = schema.as_ref().clone();
+ let new_schema = Arc::unwrap_or_clone(schema);
let schema = Arc::new(
new_schema.with_functional_dependencies(aggregate_func_dependencies)?,
);
diff --git a/datafusion/ffi/src/udf/mod.rs b/datafusion/ffi/src/udf/mod.rs
index fc26b2b098..845a624487 100644
--- a/datafusion/ffi/src/udf/mod.rs
+++ b/datafusion/ffi/src/udf/mod.rs
@@ -391,7 +391,7 @@ impl ScalarUDFImpl for ForeignScalarUDF {
.map(WrappedSchema)
.collect::<RVec<_>>();
- let return_field = return_field.as_ref().clone();
+ let return_field = Arc::unwrap_or_clone(return_field);
let return_field = WrappedSchema(FFI_ArrowSchema::try_from(return_field)?);
let config_options = config_options.as_ref().into();
diff --git a/datafusion/optimizer/src/extract_leaf_expressions.rs b/datafusion/optimizer/src/extract_leaf_expressions.rs
index d3a84c0172..c5c5610aea 100644
--- a/datafusion/optimizer/src/extract_leaf_expressions.rs
+++ b/datafusion/optimizer/src/extract_leaf_expressions.rs
@@ -247,9 +247,7 @@ fn extract_from_plan(
Some(plan) => Ok(plan),
// No extractions for this input — recover the LogicalPlan
// without cloning (refcount is 1 since build returned None).
- None => {
- Ok(Arc::try_unwrap(input_arc).unwrap_or_else(|arc| (*arc).clone()))
- }
+ None => Ok(Arc::unwrap_or_clone(input_arc)),
}
})
.collect::<Result<Vec<_>>>()?;
diff --git a/datafusion/optimizer/src/replace_distinct_aggregate.rs b/datafusion/optimizer/src/replace_distinct_aggregate.rs
index f24ca1f119..06df61e766 100644
--- a/datafusion/optimizer/src/replace_distinct_aggregate.rs
+++ b/datafusion/optimizer/src/replace_distinct_aggregate.rs
@@ -109,7 +109,7 @@ impl OptimizerRule for ReplaceDistinctWithAggregate {
.enumerate()
.all(|(idx, f_idx)| idx == *f_idx)
{
- return Ok(Transformed::yes(input.as_ref().clone()));
+ return Ok(Transformed::yes(Arc::unwrap_or_clone(input)));
}
}
diff --git a/datafusion/physical-plan/src/joins/hash_join/exec.rs b/datafusion/physical-plan/src/joins/hash_join/exec.rs
index 0eca270ebb..4ebbf7cb31 100644
--- a/datafusion/physical-plan/src/joins/hash_join/exec.rs
+++ b/datafusion/physical-plan/src/joins/hash_join/exec.rs
@@ -1450,8 +1450,8 @@ impl ExecutionPlan for HashJoinExec {
let right_stats = self.right.partition_statistics(Some(partition))?;
estimate_join_statistics(
- (*left_stats).clone(),
- (*right_stats).clone(),
+ Arc::unwrap_or_clone(left_stats),
+ Arc::unwrap_or_clone(right_stats),
&self.on,
&self.join_type,
&self.join_schema,
@@ -1465,8 +1465,8 @@ impl ExecutionPlan for HashJoinExec {
let right_stats = self.right.partition_statistics(Some(partition))?;
estimate_join_statistics(
- (*left_stats).clone(),
- (*right_stats).clone(),
+ Arc::unwrap_or_clone(left_stats),
+ Arc::unwrap_or_clone(right_stats),
&self.on,
&self.join_type,
&self.join_schema,
@@ -1482,8 +1482,8 @@ impl ExecutionPlan for HashJoinExec {
let left_stats = self.left.partition_statistics(None)?;
let right_stats = self.right.partition_statistics(None)?;
estimate_join_statistics(
- (*left_stats).clone(),
- (*right_stats).clone(),
+ Arc::unwrap_or_clone(left_stats),
+ Arc::unwrap_or_clone(right_stats),
&self.on,
&self.join_type,
&self.join_schema,
diff --git a/datafusion/sql/src/relation/mod.rs b/datafusion/sql/src/relation/mod.rs
index 1665f096ba..08a292475f 100644
--- a/datafusion/sql/src/relation/mod.rs
+++ b/datafusion/sql/src/relation/mod.rs
@@ -389,7 +389,7 @@ fn optimize_subquery_sort(
LogicalPlan::Sort(s) => {
if !has_limit {
has_limit = false;
- return Ok(Transformed::yes(s.input.as_ref().clone()));
+ return Ok(Transformed::yes(Arc::unwrap_or_clone(s.input)));
}
Ok(Transformed::no(LogicalPlan::Sort(s)))
}
diff --git a/datafusion/substrait/src/logical_plan/consumer/rel/aggregate_rel.rs b/datafusion/substrait/src/logical_plan/consumer/rel/aggregate_rel.rs
index da57751f6a..ac7d2479c3 100644
--- a/datafusion/substrait/src/logical_plan/consumer/rel/aggregate_rel.rs
+++ b/datafusion/substrait/src/logical_plan/consumer/rel/aggregate_rel.rs
@@ -106,7 +106,7 @@ pub async fn from_aggregate_rel(
not_impl_err!("Aggregate without aggregate function is not supported")
}
};
- aggr_exprs.push(agg_func?.as_ref().clone());
+ aggr_exprs.push(std::sync::Arc::unwrap_or_clone(agg_func?));
}
// Ensure that all expressions have a unique name
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datafusion.apache.org
For additional commands, e-mail: commits-help@datafusion.apache.org