Skip to content

refactor: replace Vec with IndexMap for expression mappings in ProjectionMapping and EquivalenceGroup #13675

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alamb merged 5 commits into from
Dec 11, 2024
Merged

refactor: replace Vec with IndexMap for expression mappings in ProjectionMapping and EquivalenceGroup #13675

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b2e02f1
refactor: replace Vec with IndexMap for expression mappings in Projec…
Weijun-H Dec 6, 2024
762c2a9
chore
Weijun-H Dec 6, 2024
297e1cd
chore: Fix CI
Weijun-H Dec 6, 2024
072e7d0
chore: comment
Weijun-H Dec 7, 2024
85fd386
chore: simplify
Weijun-H Dec 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions datafusion/physical-expr/src/equivalence/class.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ use datafusion_common::tree_node::{Transformed, TransformedResult, TreeNode};
use datafusion_common::JoinType;
use datafusion_physical_expr_common::physical_expr::format_physical_expr_list;

use indexmap::IndexSet;
use indexmap::{IndexMap, IndexSet};

/// A structure representing a expression known to be constant in a physical execution plan.
///
Expand Down Expand Up @@ -546,20 +546,15 @@ impl EquivalenceGroup {
.collect::<Vec<_>>();
(new_class.len() > 1).then_some(EquivalenceClass::new(new_class))
});
// TODO: Convert the algorithm below to a version that uses `HashMap`.
// once `Arc<dyn PhysicalExpr>` can be stored in `HashMap`.
// See issue: https://github.com/apache/datafusion/issues/8027
let mut new_classes = vec![];
let mut new_classes: IndexMap<Arc<dyn PhysicalExpr>, Vec<Arc<dyn PhysicalExpr>>> =
Comment thread
Weijun-H marked this conversation as resolved.
Outdated
IndexMap::new();
for (source, target) in mapping.iter() {
if new_classes.is_empty() {
new_classes.push((source, vec![Arc::clone(target)]));
}
if let Some((_, values)) =
new_classes.iter_mut().find(|(key, _)| *key == source)
{
if let Some(values) = new_classes.get_mut(source) {
if !physical_exprs_contains(values, target) {
values.push(Arc::clone(target));
}
} else {
new_classes.insert(Arc::clone(source), vec![Arc::clone(target)]);
}
}
// Only add equivalence classes with at least two members as singleton
Expand Down