fix

apache · Dec 18, 2024 · 5bd7802 · 5bd7802
1 parent b919b1a
commit 5bd7802
Showing 1 changed file with 18 additions and 10 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
@@ -152,7 +152,7 @@ public RangeSet<MultiColumnBound> visitNullSafeEqual(NullSafeEqual nullSafeEqual
         Expression right = nullSafeEqual.right();
         if (left instanceof SlotReference && right instanceof Literal) {
             if (slotIds.contains(((SlotReference) left).getExprId().asInt())) {
-                Range<ColumnBound> singleton = ColumnBound.singleton(new NullLiteral(left.getDataType()));
+                Range<ColumnBound> singleton = ColumnBound.singleton((Literal) right);
                 return toRangeSet((SlotReference) left, singleton, BoundType.CLOSED, BoundType.CLOSED);
             }
         }
@@ -187,8 +187,10 @@ public RangeSet<MultiColumnBound> visitLessThan(LessThan lessThan, Void context)
         Expression right = lessThan.right();
         if (left instanceof SlotReference && right instanceof Literal) {
             if (slotIds.contains(((SlotReference) left).getExprId().asInt())) {
-                Range<ColumnBound> singleton = ColumnBound.singleton((Literal) right);
-                return toRangeSet((SlotReference) left, singleton, BoundType.CLOSED, BoundType.OPEN);
+                Range<ColumnBound> columnRange = ColumnBound.range(
+                        new NullLiteral(right.getDataType()), BoundType.CLOSED, (Literal) right, BoundType.OPEN
+                );
+                return toRangeSet((SlotReference) left, columnRange, BoundType.CLOSED, BoundType.OPEN);
             }
         }
         return null;
@@ -200,8 +202,10 @@ public RangeSet<MultiColumnBound> visitLessThanEqual(LessThanEqual lessThanEqual
         Expression right = lessThanEqual.right();
         if (left instanceof SlotReference && right instanceof Literal) {
             if (slotIds.contains(((SlotReference) left).getExprId().asInt())) {
-                Range<ColumnBound> singleton = ColumnBound.singleton((Literal) right);
-                return toRangeSet((SlotReference) left, singleton, BoundType.CLOSED, BoundType.CLOSED);
+                Range<ColumnBound> columnRange = ColumnBound.range(
+                        new NullLiteral(right.getDataType()), BoundType.CLOSED, (Literal) right, BoundType.CLOSED
+                );
+                return toRangeSet((SlotReference) left, columnRange, BoundType.CLOSED, BoundType.CLOSED);
             }
         }
         return null;
@@ -213,8 +217,10 @@ public RangeSet<MultiColumnBound> visitGreaterThan(GreaterThan greaterThan, Void
         Expression right = greaterThan.right();
         if (left instanceof SlotReference && right instanceof Literal) {
             if (slotIds.contains(((SlotReference) left).getExprId().asInt())) {
-                Range<ColumnBound> singleton = ColumnBound.singleton((Literal) right);
-                return toRangeSet((SlotReference) left, singleton, BoundType.OPEN, BoundType.CLOSED);
+                Range<ColumnBound> columnRange = ColumnBound.range(
+                        (Literal) right, BoundType.OPEN, new MaxLiteral(right.getDataType()), BoundType.CLOSED
+                );
+                return toRangeSet((SlotReference) left, columnRange, BoundType.OPEN, BoundType.CLOSED);
             }
         }
         return null;
@@ -226,8 +232,10 @@ public RangeSet<MultiColumnBound> visitGreaterThanEqual(GreaterThanEqual greater
         Expression right = greaterThanEqual.right();
         if (left instanceof SlotReference && right instanceof Literal) {
             if (slotIds.contains(((SlotReference) left).getExprId().asInt())) {
-                Range<ColumnBound> singleton = ColumnBound.singleton((Literal) right);
-                return toRangeSet((SlotReference) left, singleton, BoundType.CLOSED, BoundType.CLOSED);
+                Range<ColumnBound> columnRange = ColumnBound.range(
+                        (Literal) right, BoundType.CLOSED, new MaxLiteral(right.getDataType()), BoundType.CLOSED
+                );
+                return toRangeSet((SlotReference) left, columnRange, BoundType.CLOSED, BoundType.CLOSED);
             }
         }
         return null;
@@ -248,7 +256,7 @@ private RangeSet<MultiColumnBound> toRangeSet(
             }
         }
         MultiColumnBound lowerBound = new MultiColumnBound(lowerBounds);
-        MultiColumnBound upperBound = new MultiColumnBound(lowerBounds);
+        MultiColumnBound upperBound = new MultiColumnBound(upperBounds);
 
         Range<MultiColumnBound> range = Range.range(lowerBound, lowerBoundType, upperBound, upperBoundType);
         return ImmutableRangeSet.of(range);