Skip to content

Commit 3b52cf5

Browse files
morrySnowyujun777
andauthored
[fix](nereids) fix cast literal to date like throw exception (apache#306)
when nereids cast invalid date literal to date like type, it will throws exceptions: ``` select '' = cast('2020-10-20' as date); (1105, 'errCode = 2, detailMessage = date/datetime literal [] is invalid') ``` But old planner will not throw exceptions, so let neredis don't throw exceptions too. This PR is pick code from: apache#40202 Co-Authored-By: yujun <[email protected]>
1 parent 8f7e0c6 commit 3b52cf5

7 files changed

Lines changed: 67 additions & 16 deletions

File tree

‎fe/fe-core/src/main/java/org/apache/doris/nereids/stats/ExpressionEstimation.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@
100100
import com.google.common.base.Preconditions;
101101
import org.apache.commons.collections.CollectionUtils;
102102

103+
import java.time.DateTimeException;
103104
import java.time.Instant;
104105
import java.time.LocalDate;
105106
import java.time.LocalDateTime;
@@ -222,7 +223,7 @@ private ColumnStatistic castMinMax(ColumnStatistic colStats, DataType targetType
222223
long max = dateMaxLiteral.getValue();
223224
builder.setMaxValue(max);
224225
builder.setMaxExpr(dateMaxLiteral.toLegacyLiteral());
225-
} catch (AnalysisException e) {
226+
} catch (DateTimeException | AnalysisException e) {
226227
convertSuccess = false;
227228
}
228229
}

‎fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/DateLiteral.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
import com.google.common.collect.ImmutableSet;
3232

33+
import java.time.DateTimeException;
3334
import java.time.LocalDate;
3435
import java.time.LocalDateTime;
3536
import java.time.Year;
@@ -273,8 +274,8 @@ static Result<String, AnalysisException> normalize(String s) {
273274
}
274275

275276
/** parseDateLiteral */
276-
public static Result<DateLiteral, AnalysisException> parseDateLiteral(String s) {
277-
Result<TemporalAccessor, AnalysisException> parseResult = parseDateTime(s);
277+
public static Result<DateLiteral, ? extends Exception> parseDateLiteral(String s) {
278+
Result<TemporalAccessor, ? extends Exception> parseResult = parseDateTime(s);
278279
if (parseResult.isError()) {
279280
return parseResult.cast();
280281
}
@@ -290,7 +291,7 @@ public static Result<DateLiteral, AnalysisException> parseDateLiteral(String s)
290291
}
291292

292293
/** parseDateTime */
293-
public static Result<TemporalAccessor, AnalysisException> parseDateTime(String s) {
294+
public static Result<TemporalAccessor, ? extends Exception> parseDateTime(String s) {
294295
// fast parse '2022-01-01'
295296
if (s.length() == 10 && s.charAt(4) == '-' && s.charAt(7) == '-') {
296297
TemporalAccessor date = fastParseDate(s);
@@ -341,11 +342,14 @@ public static Result<TemporalAccessor, AnalysisException> parseDateTime(String s
341342
// if Year is not present, throw exception
342343
if (!dateTime.isSupported(ChronoField.YEAR)) {
343344
return Result.err(
344-
() -> new AnalysisException("date/datetime literal [" + originalString + "] is invalid")
345+
() -> new DateTimeException("date/datetime literal [" + originalString + "] is invalid")
345346
);
346347
}
347348

348349
return Result.ok(dateTime);
350+
} catch (DateTimeException e) {
351+
return Result.err(() ->
352+
new DateTimeException("date/datetime literal [" + originalString + "] is invalid", e));
349353
} catch (Exception ex) {
350354
return Result.err(() -> new AnalysisException("date/datetime literal [" + originalString + "] is invalid"));
351355
}

‎fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/DateTimeLiteral.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ public static int determineScale(String s) {
132132
}
133133

134134
/** parseDateTimeLiteral */
135-
public static Result<DateTimeLiteral, AnalysisException> parseDateTimeLiteral(String s, boolean isV2) {
136-
Result<TemporalAccessor, AnalysisException> parseResult = parseDateTime(s);
135+
public static Result<DateTimeLiteral, ? extends Exception> parseDateTimeLiteral(String s, boolean isV2) {
136+
Result<TemporalAccessor, ? extends Exception> parseResult = parseDateTime(s);
137137
if (parseResult.isError()) {
138138
return parseResult.cast();
139139
}

‎fe/fe-core/src/main/java/org/apache/doris/nereids/util/TypeCoercionUtils.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -600,12 +600,12 @@ public static Optional<Expression> characterLiteralTypeCoercion(String value, Da
600600
} else if (dataType.isDateTimeType() && DateTimeChecker.isValidDateTime(value)) {
601601
ret = DateTimeLiteral.parseDateTimeLiteral(value, false).orElse(null);
602602
} else if (dataType.isDateV2Type() && DateTimeChecker.isValidDateTime(value)) {
603-
Result<DateLiteral, AnalysisException> parseResult
603+
Result<DateLiteral, ? extends Exception> parseResult
604604
= DateV2Literal.parseDateLiteral(value);
605605
if (parseResult.isOk()) {
606606
ret = parseResult.get();
607607
} else {
608-
Result<DateTimeLiteral, AnalysisException> parseResult2
608+
Result<DateTimeLiteral, ? extends Exception> parseResult2
609609
= DateTimeV2Literal.parseDateTimeLiteral(value, true);
610610
if (parseResult2.isOk()) {
611611
ret = parseResult2.get();

‎fe/fe-core/src/test/java/org/apache/doris/nereids/trees/expressions/literal/DateLiteralTest.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.junit.jupiter.api.Disabled;
2424
import org.junit.jupiter.api.Test;
2525

26+
import java.time.DateTimeException;
2627
import java.util.function.Consumer;
2728

2829
class DateLiteralTest {
@@ -67,7 +68,8 @@ void testDate() {
6768
new DateLiteral("2022-1-1");
6869
new DateLiteral("20220101");
6970

70-
Assertions.assertThrows(AnalysisException.class, () -> new DateLiteral("-01-01"));
71+
Assertions.assertThrows(DateTimeException.class, () -> new DateLiteral("-01-01"));
72+
Assertions.assertThrows(DateTimeException.class, () -> new DateLiteral("01-01"));
7173
}
7274

7375
@Test
@@ -128,8 +130,8 @@ void testIrregularDate() {
128130

129131
@Test
130132
void testWrongPunctuationDate() {
131-
Assertions.assertThrows(AnalysisException.class, () -> new DateTimeV2Literal("2020€02€01"));
132-
Assertions.assertThrows(AnalysisException.class, () -> new DateTimeV2Literal("2020【02】01"));
133+
Assertions.assertThrows(DateTimeException.class, () -> new DateTimeV2Literal("2020€02€01"));
134+
Assertions.assertThrows(DateTimeException.class, () -> new DateTimeV2Literal("2020【02】01"));
133135
}
134136

135137
@Test

‎regression-test/data/nereids_syntax_p0/test_cast_datetime.out‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,34 @@
22
-- !1 --
33
1
44

5+
-- !2 --
6+
1 2000-01-01 2000-01-01 2000-01-01T00:00 2000-01-01T12:12:12
7+
2 \N \N \N \N
8+
3 \N \N \N \N
9+
10+
-- !3 --
11+
1 \N \N \N \N
12+
2 \N \N \N \N
13+
3 \N \N \N \N
14+
15+
-- !4 --
16+
\N
17+
18+
-- !5 --
19+
\N
20+
21+
-- !7 --
22+
\N
23+
24+
-- !8 --
25+
\N
26+
27+
-- !9 --
28+
\N
29+
30+
-- !10 --
31+
\N
32+
33+
-- !12 --
34+
\N
35+

‎regression-test/suites/nereids_syntax_p0/test_cast_datetime.groovy‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ suite("test_cast_datetime") {
1919

2020
sql "drop table if exists casttbl"
2121
sql """CREATE TABLE casttbl (
22+
a int null,
2223
mydate date NULL,
2324
mydatev2 DATEV2 null,
2425
mydatetime datetime null,
2526
mydatetimev2 datetimev2 null
2627
) ENGINE=OLAP
27-
DUPLICATE KEY(`mydate`)
2828
COMMENT 'OLAP'
29-
DISTRIBUTED BY HASH(`mydate`) BUCKETS 1
29+
DISTRIBUTED BY HASH(`a`) BUCKETS 1
3030
PROPERTIES (
3131
"replication_allocation" = "tag.location.default: 1",
3232
"in_memory" = "false",
@@ -36,11 +36,24 @@ suite("test_cast_datetime") {
3636
);
3737
"""
3838

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

4141
sql "set enable_nereids_planner=true;"
42+
sql "set enable_fallback_to_original_planner=false"
4243

4344
//when BE storage support 'Date < Date', we should remove this case
4445
//currently, if we rewrite expr to CAST(mydatetime AS DATE) < date '2019-06-01', BE returns 0 tuple.
4546
qt_1 "select count(1) from casttbl where CAST(CAST(mydatetime AS DATE) AS DATETIME) < date '2019-06-01';"
46-
}
47+
48+
sql "insert into casttbl values(2, '', '', '', ''), (3, '2020', '2020', '2020', '2020')"
49+
qt_2 "select * from casttbl"
50+
qt_3 "select a, '' = mydate, '' = mydatev2, '' = mydatetime, '' = mydatetimev2 from casttbl"
51+
52+
qt_4 "select '' > date '2019-06-01'"
53+
qt_5 "select '' > date_sub('2019-06-01', -10)"
54+
qt_7 "select '' > cast('2019-06-01 00:00:00' as datetime)"
55+
qt_8 "select date_add('', 10)"
56+
qt_9 "select date_add('2020', 10)"
57+
qt_10 "select date_add('08-09', 10)"
58+
qt_12 "select date_add('abcd', 10)"
59+
}

0 commit comments

Comments
 (0)