Skip to content
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

Encapsulate fields of EquivalenceGroup #14039

Merged
merged 1 commit into from
Jan 8, 2025
Merged

Encapsulate fields of EquivalenceGroup #14039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions datafusion/core/tests/fuzz_cases/equivalence/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ fn add_equal_conditions_test() -> Result<()> {
// This new entry is redundant, size shouldn't increase
eq_properties.add_equal_conditions(&col_b_expr, &col_a_expr)?;
assert_eq!(eq_properties.eq_group().len(), 1);
let eq_groups = &eq_properties.eq_group().classes[0];
let eq_groups = eq_properties.eq_group().iter().next().unwrap();
assert_eq!(eq_groups.len(), 2);
assert!(eq_groups.contains(&col_a_expr));
assert!(eq_groups.contains(&col_b_expr));
Expand All @@ -188,7 +188,7 @@ fn add_equal_conditions_test() -> Result<()> {
// however there shouldn't be any new equivalence class
eq_properties.add_equal_conditions(&col_b_expr, &col_c_expr)?;
assert_eq!(eq_properties.eq_group().len(), 1);
let eq_groups = &eq_properties.eq_group().classes[0];
let eq_groups = eq_properties.eq_group().iter().next().unwrap();
assert_eq!(eq_groups.len(), 3);
assert!(eq_groups.contains(&col_a_expr));
assert!(eq_groups.contains(&col_b_expr));
Expand All @@ -202,7 +202,7 @@ fn add_equal_conditions_test() -> Result<()> {
// Hence equivalent class count should decrease from 2 to 1.
eq_properties.add_equal_conditions(&col_x_expr, &col_a_expr)?;
assert_eq!(eq_properties.eq_group().len(), 1);
let eq_groups = &eq_properties.eq_group().classes[0];
let eq_groups = eq_properties.eq_group().iter().next().unwrap();
assert_eq!(eq_groups.len(), 5);
assert!(eq_groups.contains(&col_a_expr));
assert!(eq_groups.contains(&col_b_expr));
Expand Down
25 changes: 19 additions & 6 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 @@ -20,12 +20,12 @@ use crate::{
expressions::Column, LexOrdering, LexRequirement, PhysicalExpr, PhysicalExprRef,
PhysicalSortExpr, PhysicalSortRequirement,
};
use std::fmt::Display;
use std::sync::Arc;

use datafusion_common::tree_node::{Transformed, TransformedResult, TreeNode};
use datafusion_common::{JoinType, ScalarValue};
use datafusion_physical_expr_common::physical_expr::format_physical_expr_list;
use std::fmt::Display;
use std::sync::Arc;
use std::vec::IntoIter;

use indexmap::{IndexMap, IndexSet};

Expand Down Expand Up @@ -323,11 +323,10 @@ impl Display for EquivalenceClass {
}
}

/// An `EquivalenceGroup` is a collection of `EquivalenceClass`es where each
/// class represents a distinct equivalence class in a relation.
/// A collection of distinct `EquivalenceClass`es
#[derive(Debug, Clone)]
pub struct EquivalenceGroup {
pub classes: Vec<EquivalenceClass>,
classes: Vec<EquivalenceClass>,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the point of this PR is to remove this pub

}

impl EquivalenceGroup {
Expand Down Expand Up @@ -717,6 +716,20 @@ impl EquivalenceGroup {
.zip(right_children)
.all(|(left_child, right_child)| self.exprs_equal(left_child, right_child))
}

/// Return the inner classes of this equivalence group.
pub fn into_inner(self) -> Vec<EquivalenceClass> {
self.classes
}
}

impl IntoIterator for EquivalenceGroup {
type Item = EquivalenceClass;
type IntoIter = IntoIter<EquivalenceClass>;

fn into_iter(self) -> Self::IntoIter {
self.classes.into_iter()
}
}

impl Display for EquivalenceGroup {
Expand Down
6 changes: 3 additions & 3 deletions datafusion/physical-expr/src/equivalence/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ mod tests {
// This new entry is redundant, size shouldn't increase
eq_properties.add_equal_conditions(&col_b_expr, &col_a_expr)?;
assert_eq!(eq_properties.eq_group().len(), 1);
let eq_groups = &eq_properties.eq_group().classes[0];
let eq_groups = eq_properties.eq_group().iter().next().unwrap();
assert_eq!(eq_groups.len(), 2);
assert!(eq_groups.contains(&col_a_expr));
assert!(eq_groups.contains(&col_b_expr));
Expand All @@ -263,7 +263,7 @@ mod tests {
// however there shouldn't be any new equivalence class
eq_properties.add_equal_conditions(&col_b_expr, &col_c_expr)?;
assert_eq!(eq_properties.eq_group().len(), 1);
let eq_groups = &eq_properties.eq_group().classes[0];
let eq_groups = eq_properties.eq_group().iter().next().unwrap();
assert_eq!(eq_groups.len(), 3);
assert!(eq_groups.contains(&col_a_expr));
assert!(eq_groups.contains(&col_b_expr));
Expand All @@ -277,7 +277,7 @@ mod tests {
// Hence equivalent class count should decrease from 2 to 1.
eq_properties.add_equal_conditions(&col_x_expr, &col_a_expr)?;
assert_eq!(eq_properties.eq_group().len(), 1);
let eq_groups = &eq_properties.eq_group().classes[0];
let eq_groups = eq_properties.eq_group().iter().next().unwrap();
assert_eq!(eq_groups.len(), 5);
assert!(eq_groups.contains(&col_a_expr));
assert!(eq_groups.contains(&col_b_expr));
Expand Down
5 changes: 2 additions & 3 deletions datafusion/physical-expr/src/equivalence/properties.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,6 @@ impl EquivalenceProperties {
let normalized_expr = self.eq_group().normalize_expr(Arc::clone(expr));
let eq_class = self
.eq_group
.classes
.iter()
.find_map(|class| {
class
Expand Down Expand Up @@ -1234,7 +1233,7 @@ impl EquivalenceProperties {

// Rewrite equivalence classes according to the new schema:
let mut eq_classes = vec![];
for eq_class in self.eq_group.classes {
for eq_class in self.eq_group {
let new_eq_exprs = eq_class
.into_vec()
.into_iter()
Expand Down Expand Up @@ -2315,7 +2314,7 @@ mod tests {

// At the output a1=a2=a3=a4
assert_eq!(out_properties.eq_group().len(), 1);
let eq_class = &out_properties.eq_group().classes[0];
let eq_class = out_properties.eq_group().iter().next().unwrap();
assert_eq!(eq_class.len(), 4);
assert!(eq_class.contains(col_a1));
assert!(eq_class.contains(col_a2));
Expand Down
Loading