This is an automated email from the ASF dual-hosted git repository.
starocean999 pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new ba3b56d269c [fix](nereids)prevent null pointer exception if datetime
value overflows (#39675)
ba3b56d269c is described below
commit ba3b56d269cd777de6df49a85ea2498465239d0f
Author: starocean999 <40539150+starocean...@users.noreply.github.com>
AuthorDate: Wed Aug 21 14:17:34 2024 +0800
[fix](nereids)prevent null pointer exception if datetime value overflows
(#39675)
pick from master https://github.com/apache/doris/pull/39482
---
.../rules/SimplifyComparisonPredicate.java | 5 +--
.../functions/executable/TimeRoundSeries.java | 25 ++++++++++-----
.../trees/expressions/literal/DateLiteral.java | 2 +-
.../datatype/test_datetime_overflow.groovy | 36 ++++++++++++++++++++++
4 files changed, 58 insertions(+), 10 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/rules/SimplifyComparisonPredicate.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/rules/SimplifyComparisonPredicate.java
index d26b5a53036..522a539e4a7 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/rules/SimplifyComparisonPredicate.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/rules/SimplifyComparisonPredicate.java
@@ -346,9 +346,10 @@ public class SimplifyComparisonPredicate extends
AbstractExpressionRewriteRule i
private static Expression migrateToDateV2(DateTimeLiteral l, AdjustType
type) {
DateV2Literal d = new DateV2Literal(l.getYear(), l.getMonth(),
l.getDay());
if (type == AdjustType.UPPER && (l.getHour() != 0 || l.getMinute() !=
0 || l.getSecond() != 0)) {
- d = ((DateV2Literal) d.plusDays(1));
+ return d.plusDays(1);
+ } else {
+ return d;
}
- return d;
}
private static Expression migrateToDate(DateV2Literal l) {
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/executable/TimeRoundSeries.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/executable/TimeRoundSeries.java
index a9337f05370..3a98ee62527 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/executable/TimeRoundSeries.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/executable/TimeRoundSeries.java
@@ -104,23 +104,34 @@ public class TimeRoundSeries {
if (getCeil) {
step = step + (deltaInsidePeriod == 0 ? 0 : period);
}
+ Expression result = null;
switch (tag) {
case YEAR:
- return ((DateTimeLiteral)
start.plusYears(step)).toJavaDateType();
+ result = start.plusYears(step);
+ break;
case MONTH:
- return ((DateTimeLiteral)
start.plusMonths(step)).toJavaDateType();
+ result = start.plusMonths(step);
+ break;
case DAY:
- return ((DateTimeLiteral)
start.plusDays(step)).toJavaDateType();
+ result = start.plusDays(step);
+ break;
case HOUR:
- return ((DateTimeLiteral)
start.plusHours(step)).toJavaDateType();
+ result = start.plusHours(step);
+ break;
case MINUTE:
- return ((DateTimeLiteral)
start.plusMinutes(step)).toJavaDateType();
+ result = start.plusMinutes(step);
+ break;
case SECOND:
- return ((DateTimeLiteral)
start.plusSeconds(step)).toJavaDateType();
+ result = start.plusSeconds(step);
+ break;
default:
break;
}
- return null;
+ if (result != null && result instanceof DateTimeLiteral) {
+ return ((DateTimeLiteral) result).toJavaDateType();
+ } else {
+ return null;
+ }
}
/**
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/DateLiteral.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/DateLiteral.java
index b4ea42d4277..4b990ff09b3 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/DateLiteral.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/DateLiteral.java
@@ -336,7 +336,7 @@ public class DateLiteral extends Literal {
}
protected static boolean isDateOutOfRange(LocalDateTime dateTime) {
- return dateTime.isBefore(START_OF_A_DAY) ||
dateTime.isAfter(END_OF_A_DAY);
+ return dateTime == null || dateTime.isBefore(START_OF_A_DAY) ||
dateTime.isAfter(END_OF_A_DAY);
}
private boolean checkDatetime(TemporalAccessor dateTime) {
diff --git
a/regression-test/suites/nereids_p0/datatype/test_datetime_overflow.groovy
b/regression-test/suites/nereids_p0/datatype/test_datetime_overflow.groovy
new file mode 100644
index 00000000000..27f7addbd26
--- /dev/null
+++ b/regression-test/suites/nereids_p0/datatype/test_datetime_overflow.groovy
@@ -0,0 +1,36 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+suite("test_datetime_overflow") {
+ sql 'set enable_nereids_planner=true'
+ sql 'set enable_fallback_to_original_planner=false'
+ sql """drop table if exists datetime_overflow_t"""
+ sql """CREATE TABLE datetime_overflow_t (
+ `id` bigint NULL,
+ `c` datetime NULL,
+ `d` date NULL,
+ INDEX idx_c (`c`) USING INVERTED
+ ) ENGINE=OLAP
+ DUPLICATE KEY(`id`)
+ DISTRIBUTED BY RANDOM BUCKETS AUTO
+ PROPERTIES (
+ "replication_num" = "1"
+ );"""
+
+ sql """select * from datetime_overflow_t where d between "9999-12-31
00:00:01" and "9999-12-31 10:00:01";"""
+ sql """select * from datetime_overflow_t where d > "9999-12-31
00:00:01";"""
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
