Exclude some nodes which expressions are not related to their schema.

apache · Nov 20, 2021 · 575801b · 575801b
1 parent eec7cbe
commit 575801b
Showing 1 changed file with 18 additions and 9 deletions.
diff --git a/datafusion/src/optimizer/constant_folding.rs b/datafusion/src/optimizer/constant_folding.rs
@@ -106,16 +106,25 @@ impl OptimizerRule for ConstantFolding {
                             .rewrite(&mut const_evaluator)?
                             .rewrite(&mut simplifier)?;
 
-                        let new_name = &new_e.name(plan.schema());
-
-                        if let (Ok(expr_name), Ok(new_expr_name)) = (name, new_name) {
-                            if expr_name != new_expr_name {
-                                Ok(new_e.alias(expr_name))
-                            } else {
-                                Ok(new_e)
+                        match &plan {
+                            LogicalPlan::Filter { .. }
+                            | LogicalPlan::Limit { .. }
+                            | LogicalPlan::Repartition { .. } => Ok(new_e),
+                            _ => {
+                                let new_name = &new_e.name(plan.schema());
+
+                                if let (Ok(expr_name), Ok(new_expr_name)) =
+                                    (name, new_name)
+                                {
+                                    if expr_name != new_expr_name {
+                                        Ok(new_e.alias(expr_name))
+                                    } else {
+                                        Ok(new_e)
+                                    }
+                                } else {
+                                    Ok(new_e)
+                                }
                             }
-                        } else {
-                            Ok(new_e)
                         }
                     })
                     .collect::<Result<Vec<_>>>()?;