fix rule set

StarRocks · Nov 11, 2022 · 830e6f3 · 830e6f3
1 parent 6dd6c68
commit 830e6f3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/optimizer/rule/RuleSet.java b/fe/fe-core/src/main/java/com/starrocks/sql/optimizer/rule/RuleSet.java
@@ -221,7 +221,6 @@ public class RuleSet {
                 PruneHDFSScanColumnRule.HUDI_SCAN,
                 PruneScanColumnRule.JDBC_SCAN,
                 new PruneProjectColumnsRule(),
-                new PruneProjectRule(),
                 new PruneFilterColumnsRule(),
                 new PruneAggregateColumnsRule(),
                 new PruneTopNColumnsRule(),

diff --git a/...rc/main/java/com/starrocks/sql/optimizer/rule/transformation/PruneProjectColumnsRule.java b/...rc/main/java/com/starrocks/sql/optimizer/rule/transformation/PruneProjectColumnsRule.java
@@ -17,6 +17,7 @@
 import com.starrocks.sql.optimizer.operator.scalar.ColumnRefOperator;
 import com.starrocks.sql.optimizer.operator.scalar.ScalarOperator;
 import com.starrocks.sql.optimizer.rule.RuleType;
+import org.apache.commons.collections.CollectionUtils;
 
 import java.util.List;
 import java.util.Map;
@@ -52,11 +53,17 @@ public List<OptExpression> transform(OptExpression input, OptimizerContext conte
         }));
 
         if (newMap.isEmpty()) {
-            ColumnRefOperator smallestColumn = Utils.findSmallestColumnRef(
+            List<ColumnRefOperator> outputColumns =
                     projectOperator.getOutputColumns(new ExpressionContext(input.inputAt(0))).getStream().
-                            mapToObj(context.getColumnRefFactory()::getColumnRef).collect(Collectors.toList()));
-            newMap.put(smallestColumn, smallestColumn);
-            requiredInputColumns.union(smallestColumn);
+                            mapToObj(context.getColumnRefFactory()::getColumnRef).collect(Collectors.toList());
+            if (CollectionUtils.isNotEmpty(outputColumns)) {
+                ColumnRefOperator smallestColumn = Utils.findSmallestColumnRef(outputColumns);
+                ScalarOperator expr = projectOperator.getColumnRefMap().get(smallestColumn);
+                if (!smallestColumn.equals(expr)) {
+                    newMap.put(smallestColumn, expr);
+                    requiredInputColumns.union(smallestColumn);
+                }
+            }
         }
 
         // Change the requiredOutputColumns in context