chore(planner): fix distributed query plan (#14951)

chore: fix distributed query plan

Author: Dousir9

src/query/sql/src/planner/optimizer/optimizer.rs

@@ -283,17 +283,14 @@ pub fn optimize_query(opt_ctx: OptimizerContext, mut s_expr: SExpr) -> Result<SE
         enable_distributed_query,
     )?;
 
+    if opt_ctx.enable_join_reorder {
+        s_expr =
+            RecursiveOptimizer::new([RuleID::CommuteJoin].as_slice(), &opt_ctx).run(&s_expr)?;
+    }
+
     // Cascades optimizer may fail due to timeout, fallback to heuristic optimizer in this case.
     s_expr = match cascades.optimize(s_expr.clone()) {
         Ok(mut s_expr) => {
-            let rules = if opt_ctx.enable_join_reorder {
-                [RuleID::EliminateEvalScalar, RuleID::CommuteJoin].as_slice()
-            } else {
-                [RuleID::EliminateEvalScalar].as_slice()
-            };
-
-            s_expr = RecursiveOptimizer::new(rules, &opt_ctx).run(&s_expr)?;
-
             // Push down sort and limit
             // TODO(leiysky): do this optimization in cascades optimizer
             if enable_distributed_query {
@@ -308,10 +305,6 @@ pub fn optimize_query(opt_ctx: OptimizerContext, mut s_expr: SExpr) -> Result<SE
                 "CascadesOptimizer failed, fallback to heuristic optimizer: {}",
                 e
             );
-
-            s_expr =
-                RecursiveOptimizer::new(&[RuleID::EliminateEvalScalar], &opt_ctx).run(&s_expr)?;
-
             if enable_distributed_query {
                 s_expr = optimize_distributed_query(opt_ctx.table_ctx.clone(), &s_expr)?;
             }
@@ -320,6 +313,9 @@ pub fn optimize_query(opt_ctx: OptimizerContext, mut s_expr: SExpr) -> Result<SE
         }
     };
 
+    s_expr =
+        RecursiveOptimizer::new([RuleID::EliminateEvalScalar].as_slice(), &opt_ctx).run(&s_expr)?;
+
     Ok(s_expr)
 }