[enhance](nerieds) month, day, hour, minute, second, day_of_year, day…

…_of_month, week_of_year implement monotonic (#45928)
apache · Jan 3, 2025 · 9bbf679 · 9bbf679
1 parent 7380005
commit 9bbf679
Show file tree

Hide file tree

Showing 25 changed files with 736 additions and 40 deletions.
diff --git a/...main/java/org/apache/doris/nereids/rules/expression/rules/OneRangePartitionEvaluator.java b/...main/java/org/apache/doris/nereids/rules/expression/rules/OneRangePartitionEvaluator.java
@@ -832,6 +832,7 @@ private EvaluateRangeResult computeMonotonicFunctionRange(EvaluateRangeResult re
         if (!checkFoldConstantValueIsValid(lowerValue, upperValue)) {
             return result;
         }
+
         if (!func.isPositive()) {
             Expression temp = lowerValue;
             lowerValue = upperValue;
@@ -865,10 +866,7 @@ private boolean checkFoldConstantValueIsValid(Expression lowerValue, Expression
         if (lowerValue instanceof NullLiteral || upperValue instanceof NullLiteral) {
             return false;
         }
-        if (lowerValue != null && !(lowerValue instanceof Literal)
-                || upperValue != null && !(upperValue instanceof Literal)) {
-            return false;
-        }
-        return true;
+        return (lowerValue == null || lowerValue instanceof Literal)
+                && (upperValue == null || upperValue instanceof Literal);
     }
 }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/Cast.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/Cast.java
@@ -18,9 +18,12 @@
 package org.apache.doris.nereids.trees.expressions;
 
 import org.apache.doris.nereids.exceptions.UnboundException;
+import org.apache.doris.nereids.trees.expressions.functions.Monotonic;
+import org.apache.doris.nereids.trees.expressions.literal.Literal;
 import org.apache.doris.nereids.trees.expressions.shape.UnaryExpression;
 import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor;
 import org.apache.doris.nereids.types.DataType;
+import org.apache.doris.nereids.types.coercion.DateLikeType;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
@@ -31,7 +34,7 @@
 /**
  * cast function.
  */
-public class Cast extends Expression implements UnaryExpression {
+public class Cast extends Expression implements UnaryExpression, Monotonic {
 
     // CAST can be from SQL Query or Type Coercion.
     private final boolean isExplicitType;
@@ -117,4 +120,28 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hash(super.hashCode(), targetType);
     }
+
+    @Override
+    public boolean isPositive() {
+        return true;
+    }
+
+    @Override
+    public int getMonotonicFunctionChildIndex() {
+        return 0;
+    }
+
+    @Override
+    public Expression withConstantArgs(Expression literal) {
+        return new Cast(literal, targetType, isExplicitType);
+    }
+
+    @Override
+    public boolean isMonotonic(Literal lower, Literal upper) {
+        // Both upward and downward casting of date types satisfy monotonicity.
+        if (child().getDataType() instanceof DateLikeType && targetType instanceof DateLikeType) {
+            return true;
+        }
+        return false;
+    }
 }
diff --git a/...c/main/java/org/apache/doris/nereids/trees/expressions/functions/FromSecondMonotonic.java b/...c/main/java/org/apache/doris/nereids/trees/expressions/functions/FromSecondMonotonic.java
@@ -0,0 +1,42 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.doris.nereids.trees.expressions.functions;
+
+import org.apache.doris.nereids.trees.expressions.literal.BigIntLiteral;
+import org.apache.doris.nereids.trees.expressions.literal.Literal;
+
+/** monotonicity for from_{xx}second */
+public interface FromSecondMonotonic extends Monotonic {
+    @Override
+    default boolean isMonotonic(Literal lower, Literal upper) {
+        if (lower instanceof BigIntLiteral) {
+            return ((BigIntLiteral) lower).getValue() >= 0;
+        }
+        return false;
+    }
+
+    @Override
+    default boolean isPositive() {
+        return true;
+    }
+
+    @Override
+    default int getMonotonicFunctionChildIndex() {
+        return 0;
+    }
+}
diff --git a/...src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/DateFormat.java b/...src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/DateFormat.java
@@ -24,21 +24,20 @@
 import org.apache.doris.nereids.trees.expressions.functions.Monotonic;
 import org.apache.doris.nereids.trees.expressions.functions.PropagateNullLiteral;
 import org.apache.doris.nereids.trees.expressions.literal.Literal;
-import org.apache.doris.nereids.trees.expressions.literal.VarcharLiteral;
+import org.apache.doris.nereids.trees.expressions.literal.StringLikeLiteral;
 import org.apache.doris.nereids.trees.expressions.shape.BinaryExpression;
 import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor;
 import org.apache.doris.nereids.types.DateTimeType;
 import org.apache.doris.nereids.types.DateTimeV2Type;
 import org.apache.doris.nereids.types.DateType;
 import org.apache.doris.nereids.types.DateV2Type;
 import org.apache.doris.nereids.types.VarcharType;
+import org.apache.doris.nereids.util.DateUtils;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
 
 import java.util.List;
-import java.util.Set;
 
 /**
  * ScalarFunction 'date_format'. This class is generated by GenerateFunction.
@@ -54,10 +53,6 @@ public class DateFormat extends ScalarFunction
             FunctionSignature.ret(VarcharType.SYSTEM_DEFAULT).args(DateType.INSTANCE, VarcharType.SYSTEM_DEFAULT)
     );
 
-    private static final Set<String> monoFormat = ImmutableSet.of("yyyyMMdd", "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss",
-            "%Y", "%Y-%m", "%Y-%m-%d", "%Y-%m-%d %H", "%Y-%m-%d %H:%i", "%Y-%m-%d %H:%i:%s", "%Y-%m-%d %H:%i:%S",
-            "%Y-%m-%d %T", "%Y%m%d", "%Y%m");
-
     /**
      * constructor with 2 arguments.
      */
@@ -87,11 +82,11 @@ public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
     @Override
     public boolean isMonotonic(Literal lower, Literal upper) {
         Expression format = child(1);
-        if (!(format instanceof VarcharLiteral)) {
+        if (!(format instanceof StringLikeLiteral)) {
             return false;
         }
-        String str = ((VarcharLiteral) format).getValue();
-        return monoFormat.contains(str);
+        String str = ((StringLikeLiteral) format).getValue();
+        return DateUtils.monoFormat.contains(str);
     }
 
     @Override

diff --git a/...src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/DayOfMonth.java b/...src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/DayOfMonth.java
@@ -20,7 +20,10 @@
 import org.apache.doris.catalog.FunctionSignature;
 import org.apache.doris.nereids.trees.expressions.Expression;
 import org.apache.doris.nereids.trees.expressions.functions.ExplicitlyCastableSignature;
+import org.apache.doris.nereids.trees.expressions.functions.Monotonic;
 import org.apache.doris.nereids.trees.expressions.functions.PropagateNullableOnDateLikeV2Args;
+import org.apache.doris.nereids.trees.expressions.literal.DateLiteral;
+import org.apache.doris.nereids.trees.expressions.literal.Literal;
 import org.apache.doris.nereids.trees.expressions.shape.UnaryExpression;
 import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor;
 import org.apache.doris.nereids.types.DateTimeType;
@@ -37,7 +40,7 @@
  * ScalarFunction 'dayofmonth'. This class is generated by GenerateFunction.
  */
 public class DayOfMonth extends ScalarFunction
-        implements UnaryExpression, ExplicitlyCastableSignature, PropagateNullableOnDateLikeV2Args {
+        implements UnaryExpression, ExplicitlyCastableSignature, PropagateNullableOnDateLikeV2Args, Monotonic {
 
     public static final List<FunctionSignature> SIGNATURES = ImmutableList.of(
             FunctionSignature.ret(TinyIntType.INSTANCE).args(DateV2Type.INSTANCE),
@@ -70,4 +73,28 @@ public List<FunctionSignature> getSignatures() {
     public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
         return visitor.visitDayOfMonth(this, context);
     }
+
+    @Override
+    public boolean isPositive() {
+        return true;
+    }
+
+    @Override
+    public int getMonotonicFunctionChildIndex() {
+        return 0;
+    }
+
+    @Override
+    public Expression withConstantArgs(Expression literal) {
+        return new DayOfMonth(literal);
+    }
+
+    @Override
+    public boolean isMonotonic(Literal lower, Literal upper) {
+        if (lower instanceof DateLiteral && upper instanceof DateLiteral) {
+            return ((DateLiteral) lower).getYear() == ((DateLiteral) upper).getYear()
+                    && ((DateLiteral) lower).getMonth() == ((DateLiteral) upper).getMonth();
+        }
+        return false;
+    }
 }
diff --git a/.../src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/DayOfYear.java b/.../src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/DayOfYear.java
@@ -20,7 +20,10 @@
 import org.apache.doris.catalog.FunctionSignature;
 import org.apache.doris.nereids.trees.expressions.Expression;
 import org.apache.doris.nereids.trees.expressions.functions.ExplicitlyCastableSignature;
+import org.apache.doris.nereids.trees.expressions.functions.Monotonic;
 import org.apache.doris.nereids.trees.expressions.functions.PropagateNullableOnDateLikeV2Args;
+import org.apache.doris.nereids.trees.expressions.literal.DateLiteral;
+import org.apache.doris.nereids.trees.expressions.literal.Literal;
 import org.apache.doris.nereids.trees.expressions.shape.UnaryExpression;
 import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor;
 import org.apache.doris.nereids.types.DateTimeType;
@@ -37,7 +40,7 @@
  * ScalarFunction 'dayofyear'. This class is generated by GenerateFunction.
  */
 public class DayOfYear extends ScalarFunction
-        implements UnaryExpression, ExplicitlyCastableSignature, PropagateNullableOnDateLikeV2Args {
+        implements UnaryExpression, ExplicitlyCastableSignature, PropagateNullableOnDateLikeV2Args, Monotonic {
 
     public static final List<FunctionSignature> SIGNATURES = ImmutableList.of(
             FunctionSignature.ret(SmallIntType.INSTANCE).args(DateV2Type.INSTANCE),
@@ -70,4 +73,27 @@ public List<FunctionSignature> getSignatures() {
     public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
         return visitor.visitDayOfYear(this, context);
     }
+
+    @Override
+    public boolean isPositive() {
+        return true;
+    }
+
+    @Override
+    public int getMonotonicFunctionChildIndex() {
+        return 0;
+    }
+
+    @Override
+    public Expression withConstantArgs(Expression literal) {
+        return new DayOfYear(literal);
+    }
+
+    @Override
+    public boolean isMonotonic(Literal lower, Literal upper) {
+        if (lower instanceof DateLiteral && upper instanceof DateLiteral) {
+            return ((DateLiteral) lower).getYear() == ((DateLiteral) upper).getYear();
+        }
+        return false;
+    }
 }
diff --git a/...ain/java/org/apache/doris/nereids/trees/expressions/functions/scalar/FromMicrosecond.java b/...ain/java/org/apache/doris/nereids/trees/expressions/functions/scalar/FromMicrosecond.java
@@ -20,6 +20,7 @@
 import org.apache.doris.catalog.FunctionSignature;
 import org.apache.doris.nereids.trees.expressions.Expression;
 import org.apache.doris.nereids.trees.expressions.functions.ExplicitlyCastableSignature;
+import org.apache.doris.nereids.trees.expressions.functions.FromSecondMonotonic;
 import org.apache.doris.nereids.trees.expressions.functions.PropagateNullableOnDateLikeV2Args;
 import org.apache.doris.nereids.trees.expressions.shape.BinaryExpression;
 import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor;
@@ -35,7 +36,8 @@
  * ScalarFunction 'from_microsecond'.
  */
 public class FromMicrosecond extends ScalarFunction
-        implements BinaryExpression, ExplicitlyCastableSignature, PropagateNullableOnDateLikeV2Args {
+        implements BinaryExpression, ExplicitlyCastableSignature, PropagateNullableOnDateLikeV2Args,
+        FromSecondMonotonic {
 
     private static final List<FunctionSignature> SIGNATURES = ImmutableList.of(
             FunctionSignature.ret(DateTimeV2Type.MAX).args(BigIntType.INSTANCE));
@@ -59,4 +61,9 @@ public List<FunctionSignature> getSignatures() {
     public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
         return visitor.visitScalarFunction(this, context);
     }
+
+    @Override
+    public Expression withConstantArgs(Expression literal) {
+        return new FromMicrosecond(literal);
+    }
 }
diff --git a/...ain/java/org/apache/doris/nereids/trees/expressions/functions/scalar/FromMillisecond.java b/...ain/java/org/apache/doris/nereids/trees/expressions/functions/scalar/FromMillisecond.java
@@ -20,6 +20,7 @@
 import org.apache.doris.catalog.FunctionSignature;
 import org.apache.doris.nereids.trees.expressions.Expression;
 import org.apache.doris.nereids.trees.expressions.functions.ExplicitlyCastableSignature;
+import org.apache.doris.nereids.trees.expressions.functions.FromSecondMonotonic;
 import org.apache.doris.nereids.trees.expressions.functions.PropagateNullableOnDateLikeV2Args;
 import org.apache.doris.nereids.trees.expressions.shape.BinaryExpression;
 import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor;
@@ -35,7 +36,8 @@
  * ScalarFunction 'from_millisecond'.
  */
 public class FromMillisecond extends ScalarFunction
-        implements BinaryExpression, ExplicitlyCastableSignature, PropagateNullableOnDateLikeV2Args {
+        implements BinaryExpression, ExplicitlyCastableSignature, PropagateNullableOnDateLikeV2Args,
+        FromSecondMonotonic {
     public static final DateTimeV2Type MillisecondDateTimeV2 = DateTimeV2Type.of(3);
     private static final List<FunctionSignature> SIGNATURES = ImmutableList.of(
             FunctionSignature.ret(MillisecondDateTimeV2).args(BigIntType.INSTANCE));
@@ -59,4 +61,9 @@ public List<FunctionSignature> getSignatures() {
     public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
         return visitor.visitScalarFunction(this, context);
     }
+
+    @Override
+    public Expression withConstantArgs(Expression literal) {
+        return new FromMillisecond(literal);
+    }
 }
diff --git a/...src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/FromSecond.java b/...src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/FromSecond.java
@@ -20,6 +20,7 @@
 import org.apache.doris.catalog.FunctionSignature;
 import org.apache.doris.nereids.trees.expressions.Expression;
 import org.apache.doris.nereids.trees.expressions.functions.ExplicitlyCastableSignature;
+import org.apache.doris.nereids.trees.expressions.functions.FromSecondMonotonic;
 import org.apache.doris.nereids.trees.expressions.functions.PropagateNullableOnDateLikeV2Args;
 import org.apache.doris.nereids.trees.expressions.shape.BinaryExpression;
 import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor;
@@ -35,7 +36,8 @@
  * ScalarFunction 'from_second'.
  */
 public class FromSecond extends ScalarFunction
-        implements BinaryExpression, ExplicitlyCastableSignature, PropagateNullableOnDateLikeV2Args {
+        implements BinaryExpression, ExplicitlyCastableSignature, PropagateNullableOnDateLikeV2Args,
+        FromSecondMonotonic {
 
     private static final List<FunctionSignature> SIGNATURES = ImmutableList.of(
             FunctionSignature.ret(DateTimeV2Type.SYSTEM_DEFAULT).args(BigIntType.INSTANCE));
@@ -59,4 +61,9 @@ public List<FunctionSignature> getSignatures() {
     public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
         return visitor.visitScalarFunction(this, context);
     }
+
+    @Override
+    public Expression withConstantArgs(Expression literal) {
+        return new FromSecond(literal);
+    }
 }