Skip to content

Revert "[fix](jdbc_catalog) fix error datetime literal caused be core (#34977) #35341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
morrySnow merged 1 commit into from
May 24, 2024
Merged

Revert "[fix](jdbc_catalog) fix error datetime literal caused be core (#34977) #35341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion fe/fe-core/src/main/java/org/apache/doris/analysis/StringLiteral.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,10 +257,13 @@ protected Expr uncheckedCastTo(Type targetType) throws AnalysisException {
break;
}
} else if (targetType.isDateType()) {
// FE only support 'yyyy-MM-dd hh:mm:ss' && 'yyyy-MM-dd' format
// so if FE unchecked cast fail, we also build CastExpr for BE
// BE support other format such as 'yyyyMMdd'...
try {
return convertToDate(targetType);
} catch (AnalysisException e) {
throw new AnalysisException(e.getMessage());
// pass;
}
} else if (targetType.equals(type)) {
return this;
Expand Down
2 changes: 1 addition & 1 deletion regression-test/data/datatype_p0/datetimev2/test_invalid_hour.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
\N

-- !sql --
1 2023-12-12 12:00:00 2023-12-12T11:00 2023-12-12T12:00
1 2023-12-12 24:00:00 \N \N
2 2023-12-12 23:00:00 2023-12-12T23:00 2023-12-12T23:00

-- !sql --
Expand Down
4 changes: 4 additions & 0 deletions regression-test/data/datatype_p0/datetimev2/test_timezone.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,19 @@
2022-01-01T01:02:55 2022-01-01
2022-02-01T03:02:55 2022-02-01
2022-02-28T19:02:55 2022-03-01
2022-04-01T09:02:55 2022-03-31
2022-05-01T00:32:55 2022-05-01
2022-05-31T22:32:55 2022-06-01
2022-06-30T20:02:55 2022-07-01
2022-07-31T21:00 2022-08-01

-- !nereids --
2022-01-01T01:02:55 2022-01-01
2022-02-01T03:02:55 2022-02-01
2022-02-28T19:02:55 2022-03-01
2022-04-01T09:02:55 2022-03-31
2022-05-01T00:32:55 2022-05-01
2022-05-31T22:32:55 2022-06-01
2022-06-30T20:02:55 2022-07-01
2022-07-31T21:00 2022-08-01

2 changes: 1 addition & 1 deletion regression-test/data/query_p0/sql_functions/datetime_functions/test_date_function.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@
16

-- !sql --
-368879
\N

-- !sql --
31
Expand Down
8 changes: 4 additions & 4 deletions regression-test/suites/correctness_p0/test_inlineview_with_window_function.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,10 @@ suite("test_inlineview_with_window_function") {
group by ordernum
ORDER BY ordernum;"""

sql """insert into test_table_aaa values('cib2205045_1_1s','2023-06-10 03:55:33','{"DB1":168939,"DNT":"2023-06-10 03:55:33"}');"""
sql """insert into test_table_aaa values('cib2205045_1_1s','2023-06-10 03:56:33','{"DB1":168939,"DNT":"2023-06-10 03:56:33"}');"""
sql """insert into test_table_aaa values('cib2205045_1_1s','2023-06-10 03:57:33','{"DB1":168939,"DNT":"2023-06-10 03:57:33"}');"""
sql """insert into test_table_aaa values('cib2205045_1_1s','2023-06-10 03:58:33','{"DB1":168939,"DNT":"2023-06-10 03:58:33"}');"""
sql """insert into test_table_aaa values('cib2205045_1_1s','2023/6/10 3:55:33','{"DB1":168939,"DNT":"2023-06-10 03:55:33"}');"""
sql """insert into test_table_aaa values('cib2205045_1_1s','2023/6/10 3:56:33','{"DB1":168939,"DNT":"2023-06-10 03:56:33"}');"""
sql """insert into test_table_aaa values('cib2205045_1_1s','2023/6/10 3:57:33','{"DB1":168939,"DNT":"2023-06-10 03:57:33"}');"""
sql """insert into test_table_aaa values('cib2205045_1_1s','2023/6/10 3:58:33','{"DB1":168939,"DNT":"2023-06-10 03:58:33"}');"""

qt_order """select
'2023-06-10',
Expand Down
4 changes: 2 additions & 2 deletions regression-test/suites/datatype_p0/datetimev2/test_invalid_hour.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ suite("test_invalid_hour") {

sql """
insert into test_invalid_hour_null values
(1, "2023-12-12 12:00:00", "2023-12-12 11:00:00"),
(1, "2023-12-12 24:00:00", "2023-12-12 24:00:00"),
(2, "2023-12-12 23:00:00", "2023-12-12 23:00:00")
"""

Expand All @@ -76,7 +76,7 @@ suite("test_invalid_hour") {
"""
} catch (Exception e) {
logger.info("exception: " + e)
assertTrue(e.toString().contains("Invalid date value"))
assertTrue(e.toString().contains("Insert has filtered data in strict mode"))
}

qt_sql """
Expand Down
28 changes: 16 additions & 12 deletions regression-test/suites/datatype_p0/datetimev2/test_timezone.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,26 @@ suite("test_timezone") {
sql """ set time_zone = '+02:00' """

sql """ set enable_nereids_planner = false """
sql """insert into ${table} values('2022-01-01 01:02:55', '2022-01-01')"""
sql """insert into ${table} values('2022-02-01 01:02:55Z', '2022-02-01')"""
sql """insert into ${table} values('2022-03-01 01:02:55UTC+8', '2022-03-01')"""
sql """insert into ${table} values('2022-05-01 01:02:55+02:30', '2022-05-01')"""
sql """insert into ${table} values('20220701010255+07:00', '20220701')"""
sql """insert into ${table} values('20220801GMT+5', '20220801')"""
sql """insert into ${table} values('2022-01-01 01:02:55', '2022-01-01 01:02:55.123')"""
sql """insert into ${table} values('2022-02-01 01:02:55Z', '2022-02-01 01:02:55.123Z')"""
sql """insert into ${table} values('2022-03-01 01:02:55UTC+8', '2022-03-01 01:02:55.123UTC')"""
sql """insert into ${table} values('2022-04-01T01:02:55UTC-6', '2022-04-01T01:02:55.123UTC+6')"""
sql """insert into ${table} values('2022-05-01 01:02:55+02:30', '2022-05-01 01:02:55.123-02:30')"""
sql """insert into ${table} values('2022-06-01T01:02:55+04:30', '2022-06-01 01:02:55.123-07:30')"""
sql """insert into ${table} values('20220701010255+07:00', '20220701010255-05:00')"""
sql """insert into ${table} values('20220801GMT+5', '20220801GMT-3')"""
qt_analysis "select * from ${table} order by k1"

sql """ truncate table ${table} """

sql """ set enable_nereids_planner = true """
sql """insert into ${table} values('2022-01-01 01:02:55', '2022-01-01')"""
sql """insert into ${table} values('2022-02-01 01:02:55Z', '2022-02-01')"""
sql """insert into ${table} values('2022-03-01 01:02:55UTC+8', '2022-03-01')"""
sql """insert into ${table} values('2022-05-01 01:02:55+02:30', '2022-05-01')"""
sql """insert into ${table} values('20220701010255+07:00', '20220701')"""
sql """insert into ${table} values('20220801GMT+5', '20220801')"""
sql """insert into ${table} values('2022-01-01 01:02:55', '2022-01-01 01:02:55.123')"""
sql """insert into ${table} values('2022-02-01 01:02:55Z', '2022-02-01 01:02:55.123Z')"""
sql """insert into ${table} values('2022-03-01 01:02:55UTC+8', '2022-03-01 01:02:55.123UTC')"""
sql """insert into ${table} values('2022-04-01T01:02:55UTC-6', '2022-04-01T01:02:55.123UTC+6')"""
sql """insert into ${table} values('2022-05-01 01:02:55+02:30', '2022-05-01 01:02:55.123-02:30')"""
sql """insert into ${table} values('2022-06-01T01:02:55+04:30', '2022-06-01 01:02:55.123-07:30')"""
sql """insert into ${table} values('20220701010255+07:00', '20220701010255-05:00')"""
sql """insert into ${table} values('20220801GMT+5', '20220801GMT-3')"""
qt_nereids "select * from ${table} order by k1"
}
4 changes: 2 additions & 2 deletions regression-test/suites/mv_p0/test_o2/test_o2.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ suite ("test_o2") {
);
"""

sql """insert into o2_order_events values ("2023-08-16 22:27:00","ax",1,"asd",2,1,1,1,1,1,1,1);"""
sql """insert into o2_order_events values ("2023-08-16 22:27:00 ","ax",1,"asd",2,1,1,1,1,1,1,1);"""

createMV ("""
create materialized view o2_order_events_mv as select ts,metric_name,platform,sum(count_value) from o2_order_events group by ts,metric_name,platform;;""")

sql """insert into o2_order_events values ("2023-08-16 22:27:00","ax",1,"asd",2,1,1,1,1,1,1,1);"""
sql """insert into o2_order_events values ("2023-08-16 22:27:00 ","ax",1,"asd",2,1,1,1,1,1,1,1);"""

explain {
sql("select ts,metric_name,platform,sum(count_value) from o2_order_events group by ts,metric_name,platform;")
Expand Down
10 changes: 5 additions & 5 deletions regression-test/suites/nereids_p0/join/test_runtimefilter_on_datev2.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,12 +251,12 @@ suite("test_runtimefilter_on_datev2", "nereids_p0") {
"""
sql """
insert into dt_rftest_l values
("2001-11-11"),
("2011-11-11"),
("9999-11-11");
("2001-11-11 11:11:11.123455"),
("2011-11-11 11:11:11.123455"),
("9999-11-11 11:11:11.123456");
"""
sql """
insert into dt_rftest_r values("2011-11-11");
insert into dt_rftest_r values("2011-11-11 11:11:11.123456");
"""
qt_datetime_rf_1_p1 """
select /*+SET_VAR(parallel_pipeline_task_num=1)*/ * from dt_rftest_l join dt_rftest_r on k1_date_l = k1_date_r order by 1, 2;
Expand Down Expand Up @@ -325,7 +325,7 @@ suite("test_runtimefilter_on_datev2", "nereids_p0") {
"""

sql """ insert into dt_rftest_l values
("9999-12-31");
("9999-12-31 23:59:59");
"""
sql """ insert into dt_rftest_r values
("9999-12-31 23:59:59.999999");
Expand Down
2 changes: 1 addition & 1 deletion regression-test/suites/nereids_p0/sql_functions/datetime_functions/test_date_function.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ suite("test_date_function") {
('2022-01-01', '2022-01-01', '2022-01-01 00:00:00', '2022-01-01 00:00:00'),
('2000-02-01', '2000-02-01', '2000-02-01 00:00:00', '2000-02-01 00:00:00.123'),
('2022-02-27', '2022-02-27', '2022-02-27 00:00:00', '2022-02-27 00:00:00'),
('2022-02-28', '2022-02-28', '2022-02-28 23:59:59', '2022-02-28 23:59:59');"""
('2022-02-28', '2022-02-28', '2022-02-28T23:59:59', '2022-02-28T23:59:59');"""
qt_sql """
select last_day(birth), last_day(birth1),
last_day(birth2), last_day(birth3)
Expand Down
2 changes: 1 addition & 1 deletion regression-test/suites/nereids_syntax_p0/test_cast_datetime.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ suite("test_cast_datetime") {
);
"""

sql "insert into casttbl values ('2000-01-01', '2000-01-01', '2000-01-01', '2000-01-01 12:12:12');"
sql "insert into casttbl values ('2000-01-01', '2000-01-01 12:12:12', '2000-01-01', '2000-01-01 12:12:12');"

sql "set enable_nereids_planner=true;"

Expand Down
2 changes: 1 addition & 1 deletion regression-test/suites/nereids_syntax_p0/test_timestamp_arithmetic.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ suite("nereids_timestamp_arithmetic") {
"""

sql """
INSERT INTO nereids_test_ta VALUES (1, '0001-01-01', '0001-01-01', '0001-01-01 00:01:01', '0001-01-01 00:01:01.001', '0001-01-01 00:01:01.00305');
INSERT INTO nereids_test_ta VALUES (1, '0001-01-01', '0001-01-01', '0001-01-01 00:01:01', '0001-01-01: 00:01:01.001', '0001-01-01 00:01:01.00305');
"""

qt_test_add """
Expand Down
24 changes: 12 additions & 12 deletions regression-test/suites/point_query_p0/test_point_query.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,16 +128,16 @@ suite("test_point_query") {
def sql2 = create_table_sql("\"function_column.sequence_col\" = 'k6',")
sql """ ${sql2} """
}
sql """ INSERT INTO ${tableName} VALUES(1231, 119291.11, "ddd", "laooq", null, "2020-01-01 12:36:38", null, "1022-01-01", null, 1.111112, [119181.1111, 819019.1191, null], null) """
sql """ INSERT INTO ${tableName} VALUES(1232, 12222.99121135, "xxx", "laooq", "2023-01-02", "2020-01-01 12:36:38", 522.762, "2022-01-01", 1, 212.111, null, null) """
sql """ INSERT INTO ${tableName} VALUES(1233, 1.392932911, "yyy", "laooq", "2024-01-02", "2020-01-01 12:36:38", 52.862, "3022-01-01", 0, 5973903488739435.668, [119181.1111, null, 819019.1191], ["dijiiixxx"]) """
sql """ INSERT INTO ${tableName} VALUES(1234, 12919291.129191137, "xxddd", "laooq", "2025-01-02", "2020-01-01 12:36:38", 552.872, "4022-01-01", 1, 5973903488739435.668, [1888109181.192111, 192129019.1191], ["1", "2", "3"]) """
sql """ INSERT INTO ${tableName} VALUES(1235, 991129292901.11138, "dd", null, "2120-01-02", "2020-01-01 12:36:38", 652.692, "5022-01-01", 0, 90696620686827832.374, [119181.1111], ["${generateString(251)}"]) """
sql """ INSERT INTO ${tableName} VALUES(1236, 100320.11139, "laa ddd", "laooq", "2220-01-02", "2020-01-01 12:36:38", 2.7692, "6022-01-01", 1, 23698.299, [], ["${generateString(251)}"]) """
sql """ INSERT INTO ${tableName} VALUES(1237, 120939.11130, "a ddd", "laooq", "2030-01-02", "2020-01-01 12:36:38", 22.822, "7022-01-01", 0, 90696620686827832.374, [1.1, 2.2, 3.3, 4.4, 5.5], []) """
sql """ INSERT INTO ${tableName} VALUES(251, 120939.11130, "${generateString(251)}", "laooq", "2030-01-02", "2020-01-01 12:36:38", 251, "7022-01-01", 1, 90696620686827832.374, [11111], []) """
sql """ INSERT INTO ${tableName} VALUES(252, 120939.11130, "${generateString(252)}", "laooq", "2030-01-02", "2020-01-01 12:36:38", 252, "7022-01-01", 0, 90696620686827832.374, [0], null) """
sql """ INSERT INTO ${tableName} VALUES(298, 120939.11130, "${generateString(298)}", "laooq", "2030-01-02", "2020-01-01 12:36:38", 298, "7022-01-01", 1, 90696620686827832.374, [], []) """
sql """ INSERT INTO ${tableName} VALUES(1231, 119291.11, "ddd", "laooq", null, "2020-01-01 12:36:38", null, "1022-01-01 11:30:38", null, 1.111112, [119181.1111, 819019.1191, null], null) """
sql """ INSERT INTO ${tableName} VALUES(1232, 12222.99121135, "xxx", "laooq", "2023-01-02", "2020-01-01 12:36:38", 522.762, "2022-01-01 11:30:38", 1, 212.111, null, null) """
sql """ INSERT INTO ${tableName} VALUES(1233, 1.392932911, "yyy", "laooq", "2024-01-02", "2020-01-01 12:36:38", 52.862, "3022-01-01 11:30:38", 0, 5973903488739435.668, [119181.1111, null, 819019.1191], ["dijiiixxx"]) """
sql """ INSERT INTO ${tableName} VALUES(1234, 12919291.129191137, "xxddd", "laooq", "2025-01-02", "2020-01-01 12:36:38", 552.872, "4022-01-01 11:30:38", 1, 5973903488739435.668, [1888109181.192111, 192129019.1191], ["1", "2", "3"]) """
sql """ INSERT INTO ${tableName} VALUES(1235, 991129292901.11138, "dd", null, "2120-01-02", "2020-01-01 12:36:38", 652.692, "5022-01-01 11:30:38", 0, 90696620686827832.374, [119181.1111], ["${generateString(251)}"]) """
sql """ INSERT INTO ${tableName} VALUES(1236, 100320.11139, "laa ddd", "laooq", "2220-01-02", "2020-01-01 12:36:38", 2.7692, "6022-01-01 11:30:38", 1, 23698.299, [], ["${generateString(251)}"]) """
sql """ INSERT INTO ${tableName} VALUES(1237, 120939.11130, "a ddd", "laooq", "2030-01-02", "2020-01-01 12:36:38", 22.822, "7022-01-01 11:30:38", 0, 90696620686827832.374, [1.1, 2.2, 3.3, 4.4, 5.5], []) """
sql """ INSERT INTO ${tableName} VALUES(251, 120939.11130, "${generateString(251)}", "laooq", "2030-01-02", "2020-01-01 12:36:38", 251, "7022-01-01 11:30:38", 1, 90696620686827832.374, [11111], []) """
sql """ INSERT INTO ${tableName} VALUES(252, 120939.11130, "${generateString(252)}", "laooq", "2030-01-02", "2020-01-01 12:36:38", 252, "7022-01-01 11:30:38", 0, 90696620686827832.374, [0], null) """
sql """ INSERT INTO ${tableName} VALUES(298, 120939.11130, "${generateString(298)}", "laooq", "2030-01-02", "2020-01-01 12:36:38", 298, "7022-01-01 11:30:38", 1, 90696620686827832.374, [], []) """

def result1 = connect(user=user, password=password, url=prepare_url) {
def stmt = prepareStatement "select /*+ SET_VAR(enable_nereids_planner=false) */ * from ${tableName} where k1 = ? and k2 = ? and k3 = ?"
Expand Down Expand Up @@ -195,13 +195,13 @@ suite("test_point_query") {
ALTER table ${tableName} ADD COLUMN new_column0 INT default "0";
"""
sleep(1);
nprep_sql """ INSERT INTO ${tableName} VALUES(1235, 120939.11130, "a ddd", "laooq", "2030-01-02", "2020-01-01 12:36:38", 22.822, "7022-01-01", 1, 1.1111299, [119291.19291], ["111", "222", "333"], 1) """
nprep_sql """ INSERT INTO ${tableName} VALUES(1235, 120939.11130, "a ddd", "laooq", "2030-01-02", "2020-01-01 12:36:38", 22.822, "7022-01-01 11:30:38", 1, 1.1111299, [119291.19291], ["111", "222", "333"], 1) """
stmt.setBigDecimal(1, new BigDecimal("120939.11130"))
stmt.setString(2, "a ddd")
qe_point_select stmt
qe_point_select stmt
// invalidate cache
nprep_sql """ INSERT INTO ${tableName} VALUES(1235, 120939.11130, "a ddd", "xxxxxx", "2030-01-02", "2020-01-01 12:36:38", 22.822, "7022-01-01", 0, 1929111.1111,[119291.19291], ["111", "222", "333"], 2) """
nprep_sql """ INSERT INTO ${tableName} VALUES(1235, 120939.11130, "a ddd", "xxxxxx", "2030-01-02", "2020-01-01 12:36:38", 22.822, "7022-01-01 11:30:38", 0, 1929111.1111,[119291.19291], ["111", "222", "333"], 2) """
qe_point_select stmt
qe_point_select stmt
qe_point_select stmt
Expand Down
4 changes: 2 additions & 2 deletions regression-test/suites/query_p0/sql_functions/datetime_functions/test_date_function.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ suite("test_date_function") {
qt_sql """ select datediff(CAST('2007-12-31 23:59:59' AS DATETIME), CAST('2007-12-30' AS DATETIME)) """
qt_sql """ select datediff(CAST('2010-11-30 23:59:59' AS DATETIME), CAST('2010-12-31' AS DATETIME)) """
qt_sql """ select datediff('2010-10-31', '2010-10-15') """
qt_sql """ select datediff('1000-10-31', '2010-10-15') from ${tableName}; """
qt_sql """ select datediff('10000-10-31', '2010-10-15') from ${tableName}; """

// DAY
qt_sql """ select day('1987-01-31') """
Expand Down Expand Up @@ -678,7 +678,7 @@ suite("test_date_function") {
('2022-01-01', '2022-01-01', '2022-01-01 00:00:00', '2022-01-01 00:00:00'),
('2000-02-01', '2000-02-01', '2000-02-01 00:00:00', '2000-02-01 00:00:00.123'),
('2022-02-27', '2022-02-27', '2022-02-27 00:00:00', '2022-02-27 00:00:00'),
('2022-02-28', '2022-02-28', '2022-02-28 23:59:59', '2022-02-28 23:59:59');"""
('2022-02-28', '2022-02-28', '2022-02-28T23:59:59', '2022-02-28T23:59:59');"""
qt_sql """
select last_day(birth), last_day(birth1),
last_day(birth2), last_day(birth3)
Expand Down