Skip to content

Commit cf97e98

Browse files
committed
1. delete invalid signature of nvl function
2. fix some test cases that failed because of malformed function name
1 parent 0148b39 commit cf97e98

File tree

6 files changed

+991
-62
lines changed

6 files changed

+991
-62
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/G-K.out

Lines changed: 136 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -730,6 +730,74 @@ C5A39BE173A03
730730
1451-12-23T13:04:45
731731
1451-12-23T13:04:45
732732

733+
-- !sql --
734+
\N
735+
0931-12-19T13:04:45
736+
0974-08-27T07:04:45
737+
\N
738+
1423-02-06T03:04:45
739+
\N
740+
\N
741+
0901-01-12T23:04:45
742+
\N
743+
0983-08-14T07:04:45
744+
1318-09-12T01:04:45
745+
7553-03-18T15:04:45
746+
\N
747+
\N
748+
\N
749+
750+
-- !sql --
751+
\N
752+
\N
753+
1143-08-16T07:04
754+
1411-12-23T13:04
755+
\N
756+
1141-01-14T23:04:45
757+
7633-03-18T15:04:45
758+
\N
759+
\N
760+
1454-08-31T07:04:45
761+
1478-09-13T01:04:45
762+
1823-02-09T03:04:45
763+
\N
764+
\N
765+
\N
766+
767+
-- !sql --
768+
\N
769+
\N
770+
0473-02-06T14:00
771+
\N
772+
1906-08-31T18:00
773+
1930-09-13T12:00
774+
\N
775+
\N
776+
2143-02-04T10:00
777+
8635-04-09T02:00
778+
\N
779+
9331-08-13T18:00
780+
\N
781+
9999-12-21T00:00
782+
\N
783+
784+
-- !sql --
785+
\N
786+
\N
787+
0473-02-06T14:00
788+
\N
789+
1906-08-31T18:00
790+
1930-09-13T12:00
791+
\N
792+
\N
793+
2143-02-04T10:00
794+
8635-04-09T02:00
795+
\N
796+
9331-08-13T18:00
797+
\N
798+
9999-12-21T00:00
799+
\N
800+
733801
-- !sql --
734802
\N
735803
0
@@ -883,6 +951,74 @@ C5A39BE173A03
883951
0
884952
0
885953

954+
-- !sql --
955+
\N
956+
0931-12-19T13:04:45
957+
0969-04-11T19:04:45
958+
\N
959+
0680-11-01T23:04:45
960+
\N
961+
\N
962+
1442-11-28T03:04:45
963+
\N
964+
1520-04-29T19:04:45
965+
1265-04-01T01:04:45
966+
\N
967+
\N
968+
\N
969+
\N
970+
971+
-- !sql --
972+
\N
973+
\N
974+
1680-04-29T19:04
975+
1411-12-23T13:04
976+
\N
977+
1682-11-29T03:04:45
978+
\N
979+
\N
980+
\N
981+
1449-04-15T19:04:45
982+
1425-04-03T01:04:45
983+
1080-11-04T23:04:45
984+
\N
985+
\N
986+
\N
987+
988+
-- !sql --
989+
\N
990+
\N
991+
\N
992+
\N
993+
1901-04-16T06:00
994+
1877-04-02T12:00
995+
\N
996+
\N
997+
2684-12-19T14:00
998+
\N
999+
\N
1000+
9868-04-28T06:00
1001+
\N
1002+
9999-12-21T00:00
1003+
\N
1004+
1005+
-- !sql --
1006+
\N
1007+
\N
1008+
\N
1009+
\N
1010+
1901-04-16T06:00
1011+
1877-04-02T12:00
1012+
\N
1013+
\N
1014+
2684-12-19T14:00
1015+
\N
1016+
\N
1017+
9868-04-28T06:00
1018+
\N
1019+
9999-12-21T00:00
1020+
\N
1021+
8861022
-- !sql --
8871023
Budg
8881024
Dfhdf

0 commit comments

Comments
 (0)