This is an automated email from the ASF dual-hosted git repository.
berkay 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 642a81209e Minor: avoid clone while calculating union equivalence
properties (#12722)
642a81209e is described below
commit 642a81209e27bf13a150f124012e45fb055ab013
Author: Andrew Lamb <and...@nerdnetworks.org>
AuthorDate: Fri Oct 4 02:52:04 2024 -0400
Minor: avoid clone while calculating union equivalence properties (#12722)
* Minor: avoid clone while calculating union equivalence properties
* Update datafusion/physical-expr/src/equivalence/properties.rs
* fmt
---
.../physical-expr/src/equivalence/properties.rs | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/datafusion/physical-expr/src/equivalence/properties.rs
b/datafusion/physical-expr/src/equivalence/properties.rs
index 8137b4f9da..51e85e25e0 100644
--- a/datafusion/physical-expr/src/equivalence/properties.rs
+++ b/datafusion/physical-expr/src/equivalence/properties.rs
@@ -34,7 +34,7 @@ use crate::{
use arrow_schema::{SchemaRef, SortOptions};
use datafusion_common::tree_node::{Transformed, TransformedResult, TreeNode};
-use datafusion_common::{plan_err, JoinSide, JoinType, Result};
+use datafusion_common::{internal_err, plan_err, JoinSide, JoinType, Result};
use datafusion_expr::interval_arithmetic::Interval;
use datafusion_expr::sort_properties::{ExprProperties, SortProperties};
use datafusion_physical_expr_common::utils::ExprPropertiesNode;
@@ -1677,14 +1677,22 @@ pub fn calculate_union(
) -> Result<EquivalenceProperties> {
// TODO: In some cases, we should be able to preserve some equivalence
// classes. Add support for such cases.
- let mut init = eqps[0].clone();
+ let mut iter = eqps.into_iter();
+ let Some(mut acc) = iter.next() else {
+ return internal_err!(
+ "Cannot calculate EquivalenceProperties for a union with no inputs"
+ );
+ };
+
// Harmonize the schema of the init with the schema of the union:
- if !init.schema.eq(&schema) {
- init = init.with_new_schema(schema)?;
+ if !acc.schema.eq(&schema) {
+ acc = acc.with_new_schema(schema)?;
+ }
+ // Fold in the rest of the EquivalenceProperties:
+ for props in iter {
+ acc = calculate_union_binary(acc, props)?;
}
- eqps.into_iter()
- .skip(1)
- .try_fold(init, calculate_union_binary)
+ Ok(acc)
}
#[cfg(test)]
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@datafusion.apache.org
For additional commands, e-mail: commits-h...@datafusion.apache.org
