Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -346,9 +346,10 @@ private static boolean cannotAdjust(DateTimeLiteral l, ComparisonPredicate cp) {
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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,23 +104,34 @@ private static LocalDateTime getDateCeilOrFloor(DATE tag, LocalDateTime date, in
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;
}
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ protected boolean checkDate() {
}

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) {
Expand Down
Original file line number Diff line number Diff line change
@@ -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";"""
}