@@ -783,20 +783,14 @@ mod tests {
783
783
#[ test]
784
784
fn group_merge_2 ( ) {
785
785
let mut memo = NaiveMemo :: new ( Arc :: new ( [ ] ) ) ;
786
- let ( group_id_1, _) = memo. add_new_expr (
787
- project (
788
- join ( scan ( "t1" ) , scan ( "t2" ) , expr ( Value :: Bool ( true ) ) ) ,
789
- list ( vec ! [ expr( Value :: Int64 ( 1 ) ) ] ) ,
790
- )
791
- . into ( ) ,
792
- ) ;
793
- let ( group_id_2, _) = memo. add_new_expr (
794
- project (
795
- join ( scan ( "t1" ) , scan ( "t2" ) , expr ( Value :: Bool ( true ) ) ) ,
796
- list ( vec ! [ expr( Value :: Int64 ( 1 ) ) ] ) ,
797
- )
798
- . into ( ) ,
799
- ) ;
786
+ let ( group_id_1, _) = memo. add_new_expr ( project (
787
+ join ( scan ( "t1" ) , scan ( "t2" ) , expr ( Value :: Bool ( true ) ) ) ,
788
+ list ( vec ! [ expr( Value :: Int64 ( 1 ) ) ] ) ,
789
+ ) ) ;
790
+ let ( group_id_2, _) = memo. add_new_expr ( project (
791
+ join ( scan ( "t1" ) , scan ( "t2" ) , expr ( Value :: Bool ( true ) ) ) ,
792
+ list ( vec ! [ expr( Value :: Int64 ( 1 ) ) ] ) ,
793
+ ) ) ;
800
794
assert_eq ! ( group_id_1, group_id_2) ;
801
795
}
802
796
@@ -808,7 +802,7 @@ mod tests {
808
802
memo. add_new_expr ( expr1. clone ( ) ) ;
809
803
memo. add_new_expr ( expr2. clone ( ) ) ;
810
804
// merging two child groups causes parent to merge
811
- let ( group_id_expr, _) = memo. get_expr_info ( scan ( "t1" ) . into ( ) ) ;
805
+ let ( group_id_expr, _) = memo. get_expr_info ( scan ( "t1" ) ) ;
812
806
memo. add_expr_to_group ( scan ( "t1-alias" ) . into ( ) , group_id_expr) ;
813
807
let ( group_1, _) = memo. get_expr_info ( expr1) ;
814
808
let ( group_2, _) = memo. get_expr_info ( expr2) ;
@@ -829,7 +823,7 @@ mod tests {
829
823
memo. add_new_expr ( expr1. clone ( ) ) ;
830
824
memo. add_new_expr ( expr2. clone ( ) ) ;
831
825
// merge two child groups, cascading merge
832
- let ( group_id_expr, _) = memo. get_expr_info ( scan ( "t1" ) . into ( ) ) ;
826
+ let ( group_id_expr, _) = memo. get_expr_info ( scan ( "t1" ) ) ;
833
827
memo. add_expr_to_group ( scan ( "t1-alias" ) . into ( ) , group_id_expr) ;
834
828
let ( group_1, _) = memo. get_expr_info ( expr1. clone ( ) ) ;
835
829
let ( group_2, _) = memo. get_expr_info ( expr2. clone ( ) ) ;
@@ -854,7 +848,7 @@ mod tests {
854
848
let ( _, expr2_id) = memo. add_new_expr ( expr2. clone ( ) ) ;
855
849
856
850
// experimenting with group id in expr (i.e., when apply rules)
857
- let ( scan_t1, _) = memo. get_expr_info ( scan ( "t1" ) . into ( ) ) ;
851
+ let ( scan_t1, _) = memo. get_expr_info ( scan ( "t1" ) ) ;
858
852
let pred = list ( vec ! [ expr( Value :: Int64 ( 1 ) ) ] ) ;
859
853
let proj_binding = project ( group ( scan_t1) , pred) ;
860
854
let middle_proj_2 = memo. get_expr_memoed ( expr2_id) . children [ 0 ] ;
0 commit comments