Skip to content

Commit 9665e2d

Browse files
committed
1. delete invalid signature of nvl function
2. fix some test cases that failed because of malformed function name
1 parent e9afd32 commit 9665e2d

File tree

7 files changed

+893
-77
lines changed

7 files changed

+893
-77
lines changed

fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/Nvl.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.apache.doris.nereids.types.DateTimeType;
2929
import org.apache.doris.nereids.types.DateTimeV2Type;
3030
import org.apache.doris.nereids.types.DateType;
31-
import org.apache.doris.nereids.types.DateV2Type;
3231
import org.apache.doris.nereids.types.DecimalV2Type;
3332
import org.apache.doris.nereids.types.DoubleType;
3433
import org.apache.doris.nereids.types.FloatType;
@@ -65,10 +64,6 @@ public class Nvl extends ScalarFunction
6564
FunctionSignature.ret(DateTimeType.INSTANCE).args(DateTimeType.INSTANCE, DateType.INSTANCE),
6665
FunctionSignature.ret(DateTimeV2Type.SYSTEM_DEFAULT)
6766
.args(DateTimeV2Type.SYSTEM_DEFAULT, DateTimeV2Type.SYSTEM_DEFAULT),
68-
FunctionSignature.ret(DateTimeV2Type.SYSTEM_DEFAULT)
69-
.args(DateV2Type.INSTANCE, DateTimeV2Type.SYSTEM_DEFAULT),
70-
FunctionSignature.ret(DateTimeV2Type.SYSTEM_DEFAULT)
71-
.args(DateTimeV2Type.SYSTEM_DEFAULT, DateV2Type.INSTANCE),
7267
FunctionSignature.ret(DecimalV2Type.SYSTEM_DEFAULT)
7368
.args(DecimalV2Type.SYSTEM_DEFAULT, DecimalV2Type.SYSTEM_DEFAULT),
7469
FunctionSignature.ret(BitmapType.INSTANCE).args(BitmapType.INSTANCE, BitmapType.INSTANCE),

regression-test/data/nereids_function_p0/scalar_function/A-F.out

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -376,20 +376,18 @@
376376

377377
-- !sql --
378378
\N
379-
-35245.0
380-
-5325.0
381-
64.0
382-
88.0
383-
524.0
384-
535.0
385-
4236.0
386-
5437.0
387-
7346.0
388-
7347.0
389-
7569.0
390-
23524.0
391-
77646.0
392-
534635.0
379+
1.0
380+
1.0
381+
1.0
382+
1.0
383+
1.0
384+
1.0
385+
1.0
386+
1.0
387+
1.0
388+
1.0
389+
2.0
390+
2.0
393391

394392
-- !sql --
395393
4

regression-test/data/nereids_function_p0/scalar_function/G-K.out

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -644,6 +644,66 @@ C
644644
2012-03-11T11:10:11
645645
2012-03-12T12:11:12
646646

647+
-- !sql --
648+
\N
649+
2012-03-01T02:00:01
650+
2012-03-02T04:01:02
651+
2012-03-03T06:02:03
652+
2012-03-04T08:03:04
653+
2012-03-05T10:04:05
654+
2012-03-06T12:05:06
655+
2012-03-07T14:06:07
656+
2012-03-08T16:07:08
657+
2012-03-09T18:08:09
658+
2012-03-10T20:09:10
659+
2012-03-11T22:10:11
660+
2012-03-13T00:11:12
661+
662+
-- !sql --
663+
\N
664+
2012-03-01T02:00:01
665+
2012-03-02T04:01:02
666+
2012-03-03T06:02:03
667+
2012-03-04T08:03:04
668+
2012-03-05T10:04:05
669+
2012-03-06T12:05:06
670+
2012-03-07T14:06:07
671+
2012-03-08T16:07:08
672+
2012-03-09T18:08:09
673+
2012-03-10T20:09:10
674+
2012-03-11T22:10:11
675+
2012-03-13T00:11:12
676+
677+
-- !sql --
678+
\N
679+
2012-03-01T01:00
680+
2012-03-02T02:00
681+
2012-03-03T03:00
682+
2012-03-04T04:00
683+
2012-03-05T05:00
684+
2012-03-06T06:00
685+
2012-03-07T07:00
686+
2012-03-08T08:00
687+
2012-03-09T09:00
688+
2012-03-10T10:00
689+
2012-03-11T11:00
690+
2012-03-12T12:00
691+
692+
-- !sql --
693+
\N
694+
2012-03-01T01:00
695+
2012-03-02T02:00
696+
2012-03-03T03:00
697+
2012-03-04T04:00
698+
2012-03-05T05:00
699+
2012-03-06T06:00
700+
2012-03-07T07:00
701+
2012-03-08T08:00
702+
2012-03-09T09:00
703+
2012-03-10T10:00
704+
2012-03-11T11:00
705+
2012-03-12T12:00
706+
647707
-- !sql --
648708
\N
649709
0
@@ -779,6 +839,66 @@ C
779839
0
780840
0
781841

842+
-- !sql --
843+
\N
844+
2012-03-01T00:00:01
845+
2012-03-02T00:01:02
846+
2012-03-03T00:02:03
847+
2012-03-04T00:03:04
848+
2012-03-05T00:04:05
849+
2012-03-06T00:05:06
850+
2012-03-07T00:06:07
851+
2012-03-08T00:07:08
852+
2012-03-09T00:08:09
853+
2012-03-10T00:09:10
854+
2012-03-11T00:10:11
855+
2012-03-12T00:11:12
856+
857+
-- !sql --
858+
\N
859+
2012-03-01T00:00:01
860+
2012-03-02T00:01:02
861+
2012-03-03T00:02:03
862+
2012-03-04T00:03:04
863+
2012-03-05T00:04:05
864+
2012-03-06T00:05:06
865+
2012-03-07T00:06:07
866+
2012-03-08T00:07:08
867+
2012-03-09T00:08:09
868+
2012-03-10T00:09:10
869+
2012-03-11T00:10:11
870+
2012-03-12T00:11:12
871+
872+
-- !sql --
873+
\N
874+
2012-02-29T23:00
875+
2012-03-01T22:00
876+
2012-03-02T21:00
877+
2012-03-03T20:00
878+
2012-03-04T19:00
879+
2012-03-05T18:00
880+
2012-03-06T17:00
881+
2012-03-07T16:00
882+
2012-03-08T15:00
883+
2012-03-09T14:00
884+
2012-03-10T13:00
885+
2012-03-11T12:00
886+
887+
-- !sql --
888+
\N
889+
2012-02-29T23:00
890+
2012-03-01T22:00
891+
2012-03-02T21:00
892+
2012-03-03T20:00
893+
2012-03-04T19:00
894+
2012-03-05T18:00
895+
2012-03-06T17:00
896+
2012-03-07T16:00
897+
2012-03-08T15:00
898+
2012-03-09T14:00
899+
2012-03-10T13:00
900+
2012-03-11T12:00
901+
782902
-- !sql --
783903
Null
784904
Varchar11

0 commit comments

Comments
 (0)