Fix decode rewrite with order by bug (StarRocks#1227)

eversmily · Nov 12, 2021 · 4243609 · 4243609
1 parent 188028e
commit 4243609
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/...ore/src/main/java/com/starrocks/sql/optimizer/rewrite/AddDecodeNodeForDictStringRule.java b/...ore/src/main/java/com/starrocks/sql/optimizer/rewrite/AddDecodeNodeForDictStringRule.java
@@ -166,6 +166,8 @@ public OptExpression visit(OptExpression optExpression, DecodeContext context) {
                 OptExpression newChildExpr = childExpr.getOp().accept(this, childExpr, context);
                 if (context.hasEncoded) {
                     insertDecodeExpr(optExpression, Collections.singletonList(newChildExpr), i, context);
+                } else {
+                    optExpression.setChild(i, newChildExpr);
                 }
             }
             return visitProjectionAfter(optExpression, context);
@@ -654,7 +656,6 @@ private static OptExpression generateDecodeOExpr(DecodeContext context, List<Opt
         return result;
     }
 
-
     private static class CouldApplyDictOptimizeVisitor extends ScalarOperatorVisitor<Boolean, Void> {
 
         public CouldApplyDictOptimizeVisitor() {

diff --git a/fe/fe-core/src/test/java/com/starrocks/sql/plan/DecodeRewriteTest.java b/fe/fe-core/src/test/java/com/starrocks/sql/plan/DecodeRewriteTest.java
@@ -405,4 +405,13 @@ public void testCountDistinctMultiColumns() throws Exception {
         Assert.assertTrue(plan.contains(" 5:AGGREGATE (update serialize)\n" +
                 "  |  output: count(if(3 IS NULL, NULL, 7))"));
     }
+
+    @Test
+    public void testGroupByWithOrderBy() throws Exception {
+        connectContext.getSessionVariable().setNewPlanerAggStage(2);
+        String sql = "select max(S_NAME) as b from supplier group by S_ADDRESS order by b";
+        String plan = getFragmentPlan(sql);
+        Assert.assertTrue(plan.contains("group by: 10: S_ADDRESS"));
+        connectContext.getSessionVariable().setNewPlanerAggStage(0);
+    }
 }