[fix](nereids)fix rangeSet intersect in PartitionPredicateToRange (ap…

…ache#46087)
hubgeter · Jan 3, 2025 · 7b45bc3 · 7b45bc3
1 parent 6589a2e
commit 7b45bc3
Show file tree

Hide file tree

Showing 2 changed files with 73 additions and 7 deletions.
diff --git a/.../main/java/org/apache/doris/nereids/rules/expression/rules/PartitionPredicateToRange.java b/.../main/java/org/apache/doris/nereids/rules/expression/rules/PartitionPredicateToRange.java
@@ -84,13 +84,7 @@ public RangeSet<MultiColumnBound> visitAnd(And and, Void context) {
                 intersects = childRanges;
                 continue;
             }
-
-            for (Range<MultiColumnBound> childRange : childRanges.asRanges()) {
-                intersects = intersects.subRangeSet(childRange);
-                if (intersects.isEmpty()) {
-                    break;
-                }
-            }
+            intersects = intersection(childRanges, intersects);
             if (intersects.isEmpty()) {
                 break;
             }
@@ -264,4 +258,12 @@ private RangeSet<MultiColumnBound> toRangeSet(SlotReference slotReference,
         Range<MultiColumnBound> range = Range.range(lowerBound, lowerBoundType, upperBound, upperBoundType);
         return ImmutableRangeSet.of(range);
     }
+
+    public static <T extends Comparable<?>> RangeSet<T> intersection(RangeSet<T> rangeSet1, RangeSet<T> rangeSet2) {
+        RangeSet<T> result = TreeRangeSet.create();
+        for (Range<T> range : rangeSet1.asRanges()) {
+            result.addAll(rangeSet2.subRangeSet(range));
+        }
+        return result;
+    }
 }