[BugFix] Fix short circuit not work when table has global dict columns (backport #59844) (#60697)

Signed-off-by: stdpain <[email protected]>
Co-authored-by: stdpain <[email protected]>

Author: mergify[bot]

fe/fe-core/src/main/java/com/starrocks/sql/ShortCircuitPlannerHybrid.java

@@ -25,7 +25,6 @@
 import com.starrocks.sql.optimizer.Utils;
 import com.starrocks.sql.optimizer.operator.logical.LogicalScanOperator;
 import com.starrocks.sql.optimizer.operator.scalar.ScalarOperator;
-import com.starrocks.sql.optimizer.statistics.IDictManager;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -47,12 +46,6 @@ public Boolean visitLogicalTableScan(OptExpression optExpression, Void context)
                 return false;
             }
 
-            for (Column column : table.getFullSchema()) {
-                if (IDictManager.getInstance().hasGlobalDict(table.getId(), column.getColumnId())) {
-                    return false;
-                }
-            }
-
             List<String> keyColumns = ((OlapTable) table).getKeyColumns().stream().map(Column::getName).collect(
                     Collectors.toList());
             List<ScalarOperator> conjuncts = Utils.extractConjuncts(predicate);

fe/fe-core/src/test/java/com/starrocks/sql/plan/LowCardinalityTest2.java

@@ -2192,4 +2192,12 @@ public void testExistRequiredDistribution() throws Exception {
         Assert.assertFalse("table doesn't contain global dict, we can change its distribution",
                 execPlan.getOptExpression(1).isExistRequiredDistribution());
     }
+
+    @Test
+    public void testShortCircuitQuery() throws Exception {
+        connectContext.getSessionVariable().setEnableShortCircuit(true);
+        String sql = "select * from low_card_t2 where d_date='20160404' and c_mr = '12'";
+        final String plan = getFragmentPlan(sql);
+        assertContains(plan, "Short Circuit Scan: true");
+    }
 }