Skip to content

Switch to iterative DynNode and ConcreteTreeNode processing #13177

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

Closed
wants to merge 17 commits into from
Closed

Switch to iterative DynNode and ConcreteTreeNode processing #13177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c26e07f
Move `DynTreeNode::transform` and ``DynTreeNode::visit` to iterative …
blaginin Oct 29, 2024
6a4dd2c
Rewrite all other methods in DynTreeNode to be iterative
blaginin Oct 29, 2024
83d194e
Remove macros in favour of `LegacyRewriter`
blaginin Oct 29, 2024
482546b
Remove unused method
blaginin Oct 30, 2024
f682be3
Remove `TreeNodeVisitor` / `TestRewriter` repetition
blaginin Oct 30, 2024
4e1b81e
Rename mods and test
blaginin Oct 30, 2024
e475464
Improve readability
blaginin Oct 30, 2024
b70a0f6
Small performance optimisations for visit
blaginin Oct 31, 2024
a91a506
Merge branch 'main' into blaginin/switch-to-iterative-tree-iteration
blaginin Nov 1, 2024
6a988df
Merge branch 'main' into blaginin/switch-to-iterative-tree-iteration
blaginin Nov 1, 2024
7eb7174
Do not take parent from the stack
blaginin Nov 1, 2024
0fa4c98
Merge branch 'main' into blaginin/switch-to-iterative-tree-iteration
blaginin Nov 1, 2024
810c899
Remove extra Vec collect and update transformed in-place
blaginin Nov 1, 2024
0587e18
Implement iterations for `ConcreteTreeNode`
blaginin Nov 1, 2024
ee4f663
More verbose notes
blaginin Nov 1, 2024
44ec414
Merge branch 'main' into blaginin/switch-to-iterative-tree-iteration
blaginin Nov 8, 2024
403230a
Remove `RecursiveNode`
blaginin Nov 8, 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
14 changes: 8 additions & 6 deletions datafusion/common/src/cse.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,8 @@ impl<N: TreeNode + HashNode + Clone + Eq, C: CSEController<Node = N>> CSE<N, C>
mod test {
use crate::alias::AliasGenerator;
use crate::cse::{CSEController, HashNode, IdArray, Identifier, NodeStats, CSE};
use crate::tree_node::tests::TestTreeNode;
use crate::tree_node::tests::test_tree_node::TestTreeNode;
use crate::tree_node::tests::TestTree;
use crate::Result;
use std::collections::HashSet;
use std::hash::{Hash, Hasher};
Expand Down Expand Up @@ -670,21 +671,22 @@ mod test {
TestTreeNodeMask::Normal,
));

let a_plus_1 = TestTreeNode::new(
let a_plus_1 = TestTreeNode::new_with_children(
vec![
TestTreeNode::new_leaf("a".to_string()),
TestTreeNode::new_leaf("1".to_string()),
],
"+".to_string(),
);
let avg_c = TestTreeNode::new(
let avg_c = TestTreeNode::new_with_children(
vec![TestTreeNode::new_leaf("c".to_string())],
"avg".to_string(),
);
let sum_a_plus_1 = TestTreeNode::new(vec![a_plus_1], "sum".to_string());
let sum_a_plus_1 =
TestTreeNode::new_with_children(vec![a_plus_1], "sum".to_string());
let sum_a_plus_1_minus_avg_c =
TestTreeNode::new(vec![sum_a_plus_1, avg_c], "-".to_string());
let root = TestTreeNode::new(
TestTreeNode::new_with_children(vec![sum_a_plus_1, avg_c], "-".to_string());
let root = TestTreeNode::new_with_children(
vec![
sum_a_plus_1_minus_avg_c,
TestTreeNode::new_leaf("2".to_string()),
Expand Down
Loading