Skip to content

Commit c26e07f

Browse files
committed
Move DynTreeNode::transform and `DynTreeNode::visit to iterative move
1 parent 223bb02 commit c26e07f

File tree

4 files changed

+1528
-982
lines changed

4 files changed

+1528
-982
lines changed

datafusion/common/src/cse.rs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,8 @@ impl<N: TreeNode + HashNode + Clone + Eq, C: CSEController<Node = N>> CSE<N, C>
597597
mod test {
598598
use crate::alias::AliasGenerator;
599599
use crate::cse::{CSEController, HashNode, IdArray, Identifier, NodeStats, CSE};
600-
use crate::tree_node::tests::TestTreeNode;
600+
use crate::tree_node::tests::test_tree_node::TestTreeNode;
601+
use crate::tree_node::tests::TestTree;
601602
use crate::Result;
602603
use std::collections::HashSet;
603604
use std::hash::{Hash, Hasher};
@@ -670,21 +671,22 @@ mod test {
670671
TestTreeNodeMask::Normal,
671672
));
672673

673-
let a_plus_1 = TestTreeNode::new(
674+
let a_plus_1 = TestTreeNode::new_with_children(
674675
vec![
675676
TestTreeNode::new_leaf("a".to_string()),
676677
TestTreeNode::new_leaf("1".to_string()),
677678
],
678679
"+".to_string(),
679680
);
680-
let avg_c = TestTreeNode::new(
681+
let avg_c = TestTreeNode::new_with_children(
681682
vec![TestTreeNode::new_leaf("c".to_string())],
682683
"avg".to_string(),
683684
);
684-
let sum_a_plus_1 = TestTreeNode::new(vec![a_plus_1], "sum".to_string());
685+
let sum_a_plus_1 =
686+
TestTreeNode::new_with_children(vec![a_plus_1], "sum".to_string());
685687
let sum_a_plus_1_minus_avg_c =
686-
TestTreeNode::new(vec![sum_a_plus_1, avg_c], "-".to_string());
687-
let root = TestTreeNode::new(
688+
TestTreeNode::new_with_children(vec![sum_a_plus_1, avg_c], "-".to_string());
689+
let root = TestTreeNode::new_with_children(
688690
vec![
689691
sum_a_plus_1_minus_avg_c,
690692
TestTreeNode::new_leaf("2".to_string()),

0 commit comments

Comments
 (0)