This is an automated email from the ASF dual-hosted git repository.
gabriellee pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 72a05a4358 [Bug](date) remove MinuteFloor/MinuteCeil for datev2
(#16247)
72a05a4358 is described below
commit 72a05a4358552b6b0deb290120507e562730e99d
Author: Gabriel <[email protected]>
AuthorDate: Wed Feb 1 14:57:51 2023 +0800
[Bug](date) remove MinuteFloor/MinuteCeil for datev2 (#16247)
---
.../expressions/functions/scalar/MinuteCeil.java | 8 +-
.../expressions/functions/scalar/MinuteFloor.java | 8 +-
.../nereids_function_p0/scalar_function/L-Q.out | 90 ++++++++++++++++++++++
.../nereids_function_p0/scalar_function/L-Q.groovy | 12 +--
4 files changed, 98 insertions(+), 20 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/MinuteCeil.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/MinuteCeil.java
index a5349b1d64..38dac88d30 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/MinuteCeil.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/MinuteCeil.java
@@ -24,7 +24,6 @@ import
org.apache.doris.nereids.trees.expressions.functions.ExplicitlyCastableSi
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.DateV2Type;
import org.apache.doris.nereids.types.IntegerType;
import com.google.common.base.Preconditions;
@@ -41,21 +40,16 @@ public class MinuteCeil extends ScalarFunction
public static final List<FunctionSignature> SIGNATURES = ImmutableList.of(
FunctionSignature.ret(DateTimeType.INSTANCE).args(DateTimeType.INSTANCE),
FunctionSignature.ret(DateTimeV2Type.SYSTEM_DEFAULT).args(DateTimeV2Type.SYSTEM_DEFAULT),
-
FunctionSignature.ret(DateTimeV2Type.SYSTEM_DEFAULT).args(DateV2Type.INSTANCE),
FunctionSignature.ret(DateTimeType.INSTANCE).args(DateTimeType.INSTANCE,
DateTimeType.INSTANCE),
FunctionSignature.ret(DateTimeType.INSTANCE).args(DateTimeType.INSTANCE,
IntegerType.INSTANCE),
FunctionSignature.ret(DateTimeV2Type.SYSTEM_DEFAULT)
.args(DateTimeV2Type.SYSTEM_DEFAULT,
DateTimeV2Type.SYSTEM_DEFAULT),
FunctionSignature.ret(DateTimeV2Type.SYSTEM_DEFAULT)
.args(DateTimeV2Type.SYSTEM_DEFAULT, IntegerType.INSTANCE),
-
FunctionSignature.ret(DateTimeV2Type.SYSTEM_DEFAULT).args(DateV2Type.INSTANCE,
DateV2Type.INSTANCE),
-
FunctionSignature.ret(DateTimeV2Type.SYSTEM_DEFAULT).args(DateV2Type.INSTANCE,
IntegerType.INSTANCE),
FunctionSignature.ret(DateTimeType.INSTANCE)
.args(DateTimeType.INSTANCE, IntegerType.INSTANCE,
DateTimeType.INSTANCE),
FunctionSignature.ret(DateTimeV2Type.SYSTEM_DEFAULT)
- .args(DateTimeV2Type.SYSTEM_DEFAULT, IntegerType.INSTANCE,
DateTimeV2Type.SYSTEM_DEFAULT),
- FunctionSignature.ret(DateTimeV2Type.SYSTEM_DEFAULT)
- .args(DateV2Type.INSTANCE, IntegerType.INSTANCE,
DateV2Type.INSTANCE)
+ .args(DateTimeV2Type.SYSTEM_DEFAULT, IntegerType.INSTANCE,
DateTimeV2Type.SYSTEM_DEFAULT)
);
/**
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/MinuteFloor.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/MinuteFloor.java
index 008723f203..6c0e1dcb4b 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/MinuteFloor.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/MinuteFloor.java
@@ -24,7 +24,6 @@ import
org.apache.doris.nereids.trees.expressions.functions.ExplicitlyCastableSi
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.DateV2Type;
import org.apache.doris.nereids.types.IntegerType;
import com.google.common.base.Preconditions;
@@ -41,21 +40,16 @@ public class MinuteFloor extends ScalarFunction
public static final List<FunctionSignature> SIGNATURES = ImmutableList.of(
FunctionSignature.ret(DateTimeType.INSTANCE).args(DateTimeType.INSTANCE),
FunctionSignature.ret(DateTimeV2Type.SYSTEM_DEFAULT).args(DateTimeV2Type.SYSTEM_DEFAULT),
-
FunctionSignature.ret(DateTimeV2Type.SYSTEM_DEFAULT).args(DateV2Type.INSTANCE),
FunctionSignature.ret(DateTimeType.INSTANCE).args(DateTimeType.INSTANCE,
DateTimeType.INSTANCE),
FunctionSignature.ret(DateTimeType.INSTANCE).args(DateTimeType.INSTANCE,
IntegerType.INSTANCE),
FunctionSignature.ret(DateTimeV2Type.SYSTEM_DEFAULT)
.args(DateTimeV2Type.SYSTEM_DEFAULT,
DateTimeV2Type.SYSTEM_DEFAULT),
FunctionSignature.ret(DateTimeV2Type.SYSTEM_DEFAULT)
.args(DateTimeV2Type.SYSTEM_DEFAULT, IntegerType.INSTANCE),
-
FunctionSignature.ret(DateTimeV2Type.SYSTEM_DEFAULT).args(DateV2Type.INSTANCE,
DateV2Type.INSTANCE),
-
FunctionSignature.ret(DateTimeV2Type.SYSTEM_DEFAULT).args(DateV2Type.INSTANCE,
IntegerType.INSTANCE),
FunctionSignature.ret(DateTimeType.INSTANCE)
.args(DateTimeType.INSTANCE, IntegerType.INSTANCE,
DateTimeType.INSTANCE),
FunctionSignature.ret(DateTimeV2Type.SYSTEM_DEFAULT)
- .args(DateTimeV2Type.SYSTEM_DEFAULT, IntegerType.INSTANCE,
DateTimeV2Type.SYSTEM_DEFAULT),
- FunctionSignature.ret(DateTimeV2Type.SYSTEM_DEFAULT)
- .args(DateV2Type.INSTANCE, IntegerType.INSTANCE,
DateV2Type.INSTANCE)
+ .args(DateTimeV2Type.SYSTEM_DEFAULT, IntegerType.INSTANCE,
DateTimeV2Type.SYSTEM_DEFAULT)
);
/**
diff --git a/regression-test/data/nereids_function_p0/scalar_function/L-Q.out
b/regression-test/data/nereids_function_p0/scalar_function/L-Q.out
index 84f7274194..5702404b0f 100644
--- a/regression-test/data/nereids_function_p0/scalar_function/L-Q.out
+++ b/regression-test/data/nereids_function_p0/scalar_function/L-Q.out
@@ -719,6 +719,36 @@ dc5f80c371451aa4fc81c930adc64f60
2012-03-11T11:21
2012-03-12T12:12
+-- !sql --
+\N
+2012-03-01T00:00
+2012-03-02T00:00
+2012-03-03T00:00
+2012-03-04T00:00
+2012-03-05T00:00
+2012-03-06T00:00
+2012-03-07T00:00
+2012-03-08T00:00
+2012-03-09T00:00
+2012-03-10T00:00
+2012-03-11T00:00
+2012-03-12T00:00
+
+-- !sql --
+\N
+2012-03-01T00:00
+2012-03-02T00:00
+2012-03-03T00:00
+2012-03-04T00:00
+2012-03-05T00:00
+2012-03-06T00:00
+2012-03-07T00:05
+2012-03-08T00:00
+2012-03-09T00:00
+2012-03-10T00:00
+2012-03-11T00:10
+2012-03-12T00:00
+
-- !sql --
\N
2012-03-01T01:00:01
@@ -749,6 +779,21 @@ dc5f80c371451aa4fc81c930adc64f60
2012-03-11T11:10:11
2012-03-12T12:11:12
+-- !sql --
+\N
+2012-03-01T00:00
+2012-03-02T00:00
+2012-03-03T00:00
+2012-03-04T00:00
+2012-03-05T00:00
+2012-03-06T00:00
+2012-03-07T00:00
+2012-03-08T00:00
+2012-03-09T00:00
+2012-03-10T00:00
+2012-03-11T00:00
+2012-03-12T00:00
+
-- !sql --
\N
2012-03-01T01:00
@@ -839,6 +884,36 @@ dc5f80c371451aa4fc81c930adc64f60
2012-03-11T11:10
2012-03-12T12:00
+-- !sql --
+\N
+2012-03-01T00:00
+2012-03-02T00:00
+2012-03-03T00:00
+2012-03-04T00:00
+2012-03-05T00:00
+2012-03-06T00:00
+2012-03-07T00:00
+2012-03-08T00:00
+2012-03-09T00:00
+2012-03-10T00:00
+2012-03-11T00:00
+2012-03-12T00:00
+
+-- !sql --
+\N
+2012-03-01T00:00
+2012-03-02T00:00
+2012-03-03T00:00
+2012-03-04T00:00
+2012-03-05T00:00
+2012-03-06T00:00
+2012-03-06T23:58
+2012-03-08T00:00
+2012-03-09T00:00
+2012-03-10T00:00
+2012-03-10T23:59
+2012-03-12T00:00
+
-- !sql --
\N
2012-03-01T01:00:01
@@ -869,6 +944,21 @@ dc5f80c371451aa4fc81c930adc64f60
2012-03-11T11:10:11
2012-03-12T12:11:12
+-- !sql --
+\N
+2012-03-01T00:00
+2012-03-02T00:00
+2012-03-03T00:00
+2012-03-04T00:00
+2012-03-05T00:00
+2012-03-06T00:00
+2012-03-07T00:00
+2012-03-08T00:00
+2012-03-09T00:00
+2012-03-10T00:00
+2012-03-11T00:00
+2012-03-12T00:00
+
-- !sql --
\N
0
diff --git
a/regression-test/suites/nereids_function_p0/scalar_function/L-Q.groovy
b/regression-test/suites/nereids_function_p0/scalar_function/L-Q.groovy
index fbd2cddf2d..e340c4a025 100644
--- a/regression-test/suites/nereids_function_p0/scalar_function/L-Q.groovy
+++ b/regression-test/suites/nereids_function_p0/scalar_function/L-Q.groovy
@@ -90,12 +90,12 @@ suite("nereids_scalar_fn_3") {
qt_sql "select minute_ceil(kdtmv2s1, kdtmv2s1) from fn_test order by
kdtmv2s1, kdtmv2s1"
qt_sql "select minute_ceil(kdtmv2s1, kint) from fn_test order by kdtmv2s1,
kint"
// core
- // qt_sql "select minute_ceil(kdtv2, kdtv2) from fn_test order by kdtv2,
kdtv2"
- // qt_sql "select minute_ceil(kdtv2, kint) from fn_test order by kdtv2,
kint"
+ qt_sql "select minute_ceil(kdtv2, kdtv2) from fn_test order by kdtv2,
kdtv2"
+ qt_sql "select minute_ceil(kdtv2, kint) from fn_test order by kdtv2, kint"
qt_sql "select minute_ceil(kdtm, kint, kdtm) from fn_test order by kdtm,
kint, kdtm"
qt_sql "select minute_ceil(kdtmv2s1, kint, kdtmv2s1) from fn_test order by
kdtmv2s1, kint, kdtmv2s1"
// core
- // qt_sql "select minute_ceil(kdtv2, kint, kdtv2) from fn_test order by
kdtv2, kint, kdtv2"
+ qt_sql "select minute_ceil(kdtv2, kint, kdtv2) from fn_test order by
kdtv2, kint, kdtv2"
qt_sql "select minute_floor(kdtm) from fn_test order by kdtm"
qt_sql "select minute_floor(kdtmv2s1) from fn_test order by kdtmv2s1"
// core
@@ -105,12 +105,12 @@ suite("nereids_scalar_fn_3") {
qt_sql "select minute_floor(kdtmv2s1, kdtmv2s1) from fn_test order by
kdtmv2s1, kdtmv2s1"
qt_sql "select minute_floor(kdtmv2s1, kint) from fn_test order by
kdtmv2s1, kint"
// core
- // qt_sql "select minute_floor(kdtv2, kdtv2) from fn_test order by kdtv2,
kdtv2"
- // qt_sql "select minute_floor(kdtv2, kint) from fn_test order by kdtv2,
kint"
+ qt_sql "select minute_floor(kdtv2, kdtv2) from fn_test order by kdtv2,
kdtv2"
+ qt_sql "select minute_floor(kdtv2, kint) from fn_test order by kdtv2, kint"
qt_sql "select minute_floor(kdtm, kint, kdtm) from fn_test order by kdtm,
kint, kdtm"
qt_sql "select minute_floor(kdtmv2s1, kint, kdtmv2s1) from fn_test order
by kdtmv2s1, kint, kdtmv2s1"
// core
- // qt_sql "select minute_floor(kdtv2, kint, kdtv2) from fn_test order by
kdtv2, kint, kdtv2"
+ qt_sql "select minute_floor(kdtv2, kint, kdtv2) from fn_test order by
kdtv2, kint, kdtv2"
// cannot find function
// qt_sql "select minutes_add(kdtm, kint) from fn_test order by kdtm, kint"
// qt_sql "select minutes_add(kdtmv2s1, kint) from fn_test order by
kdtmv2s1, kint"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
