[fix](inverted index) Fix errors caused by enable_need_read_data_opt (#…

…42064) (#42362) ## Proposed changes pick from master #42064
apache · Oct 24, 2024 · ea07a39 · ea07a39
1 parent bf0a1fb
commit ea07a39
Show file tree

Hide file tree

Showing 3 changed files with 160 additions and 2 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
@@ -130,7 +130,8 @@ public List<Rule> buildRules() {
                     Set<Slot> aggSlots = funcs.stream()
                             .flatMap(f -> f.getInputSlots().stream())
                             .collect(Collectors.toSet());
-                    return conjuncts.stream().allMatch(expr -> checkSlotInOrExpression(expr, aggSlots));
+                    return conjuncts.stream().allMatch(expr -> checkSlotInOrExpression(expr, aggSlots)
+                                                                && checkIsNullExpr(expr, aggSlots));
                 })
                 .thenApply(ctx -> {
                     LogicalAggregate<LogicalFilter<LogicalOlapScan>> agg = ctx.root;
@@ -166,7 +167,8 @@ public List<Rule> buildRules() {
                     Set<Slot> aggSlots = funcs.stream()
                             .flatMap(f -> f.getInputSlots().stream())
                             .collect(Collectors.toSet());
-                    return conjuncts.stream().allMatch(expr -> checkSlotInOrExpression(expr, aggSlots));
+                    return conjuncts.stream().allMatch(expr -> checkSlotInOrExpression(expr, aggSlots)
+                                                                && checkIsNullExpr(expr, aggSlots));
                 })
                 .thenApply(ctx -> {
                     LogicalAggregate<LogicalProject<LogicalFilter<LogicalOlapScan>>> agg = ctx.root;
@@ -373,6 +375,22 @@ private boolean checkSlotInOrExpression(Expression expr, Set<Slot> aggSlots) {
         return true;
     }
 
+    private boolean checkIsNullExpr(Expression expr, Set<Slot> aggSlots) {
+        if (expr instanceof IsNull) {
+            Set<Slot> slots = expr.getInputSlots();
+            if (slots.stream().anyMatch(aggSlots::contains)) {
+                return false;
+            }
+        } else {
+            for (Expression child : expr.children()) {
+                if (!checkIsNullExpr(child, aggSlots)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
     private boolean isDupOrMowKeyTable(LogicalOlapScan logicalScan) {
         if (logicalScan != null) {
             KeysType keysType = logicalScan.getTable().getKeysType();

diff --git a/regression-test/data/inverted_index_p0/test_index_rqg_bug8.out b/regression-test/data/inverted_index_p0/test_index_rqg_bug8.out
@@ -0,0 +1,4 @@
+-- This file is automatically generated. You should know what you did if you want to edit this
+-- !sql --
+0
+
diff --git a/regression-test/suites/inverted_index_p0/test_index_rqg_bug8.groovy b/regression-test/suites/inverted_index_p0/test_index_rqg_bug8.groovy
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@
		-- This file is automatically generated. You should know what you did if you want to edit this
		-- !sql --
		0