rebase

datafusion/optimizer/src/common_subexpr_eliminate.rs

@@ -645,7 +645,7 @@ impl TreeNodeVisitor for ExprIdentifierVisitor<'_> {
         let alias_symbol = format!("#{{{curr_expr_identifier}}}");
 
         self.expr_set
-            .entry(curr_expr_identifier)
+            .entry(curr_expr_identifier.clone())
             .or_insert_with(|| (expr.clone(), 0, data_type, alias_symbol))
             .1 += 1;
 
@@ -1147,8 +1147,13 @@ mod test {
             .build()?;
 
         let expected = "Projection: test.a, test.b, test.c\
+<<<<<<< HEAD
         \n  Filter: #{Int32(1) + test.a} - Int32(10) > #{Int32(1) + test.a}\
         \n    Projection: Int32(1) + test.a AS #{Int32(1) + test.a}, test.a, test.b, test.c\
+=======
+        \n  Filter: Int32(1) + test.a - Int32(10) > Int32(1) + test.a\
+        \n    Projection: Int32(1) + test.a AS Int32(1) + test.a, test.a, test.b, test.c\
+>>>>>>> 2a1f02109 (remove expr node accumulation)
         \n      TableScan: test";
 
         assert_optimized_plan_eq(expected, &plan);