update

apache · Dec 29, 2023 · 0a98764 · 0a98764
1 parent c88a81b
commit 0a98764
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/...core/src/main/java/org/apache/doris/nereids/rules/implementation/AggregateStrategies.java b/...core/src/main/java/org/apache/doris/nereids/rules/implementation/AggregateStrategies.java
@@ -153,14 +153,13 @@ public List<Rule> buildRules() {
                                     }
                                     Expression childExpr = filter.getConjuncts().iterator().next().children().get(0);
                                     if (childExpr instanceof SlotReference) {
-                                        String exprName = ((SlotReference) childExpr).getName();
-                                        return "__DORIS_DELETE_SIGN__".equalsIgnoreCase(exprName);
+                                        return ((SlotReference) childExpr).getColumn().get().isDeleteSignColumn();
                                     }
                                     return false;
                                 })
                         )
                         .when(agg -> enablePushDownMinMaxOnUnique())
-                        .when(agg -> agg.getGroupByExpressions().size() == 0)
+                        .when(agg -> agg.getGroupByExpressions().isEmpty())
                         .when(agg -> {
                             Set<AggregateFunction> funcs = agg.getAggregateFunctions();
                             return !funcs.isEmpty() && funcs.stream()
@@ -185,15 +184,15 @@ public List<Rule> buildRules() {
                                                 }
                                                 Expression childExpr = filter.getConjuncts().iterator().next()
                                                         .children().get(0);
-                                                if (childExpr instanceof SlotReference) {
-                                                    String exprName = ((SlotReference) childExpr).getName();
-                                                    return "__DORIS_DELETE_SIGN__".equalsIgnoreCase(exprName);
-                                                }
-                                                return false;
+                                                    if (childExpr instanceof SlotReference) {
+                                                        return ((SlotReference) childExpr).getColumn().get()
+                                                                .isDeleteSignColumn();
+                                                    }
+                                                    return false;
                                             }))
                         )
                         .when(agg -> enablePushDownMinMaxOnUnique())
-                        .when(agg -> agg.getGroupByExpressions().size() == 0)
+                        .when(agg -> agg.getGroupByExpressions().isEmpty())
                         .when(agg -> {
                             Set<AggregateFunction> funcs = agg.getAggregateFunctions();
                             return !funcs.isEmpty()