rename function

apache · Nov 28, 2024 · 67fd0d5 · 67fd0d5
1 parent f35ba0b
commit 67fd0d5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/...ain/java/org/apache/doris/nereids/rules/expression/rules/SimplifyComparisonPredicate.java b/...ain/java/org/apache/doris/nereids/rules/expression/rules/SimplifyComparisonPredicate.java
@@ -341,14 +341,14 @@ private static Expression processTypeRangeLimitComparison(ComparisonPredicate cp
             }
         } else if (cp instanceof GreaterThan) {
             if (cmpMin < 0) {
-                return ExpressionUtils.trueOfNull(left);
+                return ExpressionUtils.trueOrNull(left);
             }
             if (cmpMax >= 0) {
                 return ExpressionUtils.falseOrNull(left);
             }
         } else if (cp instanceof GreaterThanEqual) {
             if (cmpMin <= 0) {
-                return ExpressionUtils.trueOfNull(left);
+                return ExpressionUtils.trueOrNull(left);
             }
             if (cmpMax == 0) {
                 return new EqualTo(cp.left(), cp.right());
@@ -361,7 +361,7 @@ private static Expression processTypeRangeLimitComparison(ComparisonPredicate cp
                 return ExpressionUtils.falseOrNull(left);
             }
             if (cmpMax > 0) {
-                return ExpressionUtils.trueOfNull(left);
+                return ExpressionUtils.trueOrNull(left);
             }
         } else if (cp instanceof LessThanEqual) {
             if (cmpMin < 0) {
@@ -371,7 +371,7 @@ private static Expression processTypeRangeLimitComparison(ComparisonPredicate cp
                 return new EqualTo(cp.left(), cp.right());
             }
             if (cmpMax >= 0) {
-                return ExpressionUtils.trueOfNull(left);
+                return ExpressionUtils.trueOrNull(left);
             }
         }
         return cp;

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/util/ExpressionUtils.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/util/ExpressionUtils.java
@@ -215,7 +215,7 @@ public static Expression falseOrNull(Expression expression) {
         }
     }
 
-    public static Expression trueOfNull(Expression expression) {
+    public static Expression trueOrNull(Expression expression) {
         if (expression.nullable()) {
             return new Or(new Not(new IsNull(expression)), new NullLiteral(BooleanType.INSTANCE));
         } else {

diff --git a/...java/org/apache/doris/nereids/rules/expression/rules/SimplifyComparisonPredicateTest.java b/...java/org/apache/doris/nereids/rules/expression/rules/SimplifyComparisonPredicateTest.java
@@ -511,7 +511,7 @@ void checkTypeRangeLimitWithComparison(DataType dataType, ComparisonPredicate cp
             switch (result) {
                 case TRUE:
                     expectExpr = cp instanceof NullSafeEqual ? BooleanLiteral.TRUE
-                            : ExpressionUtils.trueOfNull(slot);
+                            : ExpressionUtils.trueOrNull(slot);
                     break;
                 case FALSE:
                     expectExpr = cp instanceof NullSafeEqual ? BooleanLiteral.FALSE