Skip to content

[fix](time) Fix TIMEV2 boundary validation #67500

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

Open
jacktengg wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[fix](time) Fix TIMEV2 boundary validation #67500

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
6 changes: 4 additions & 2 deletions be/src/core/value/time_value.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,11 @@ class TimeValue {
static TimeType make_time(int64_t hour, int64_t minute, int64_t second, int64_t microsecond = 0,
bool negative = false) {
if constexpr (CHECK) {
// the max time value is 838:59:59.999999
// the max time value is 838:59:59.000000
if (std::abs(hour) > 838 || std::abs(minute) >= 60 || std::abs(second) >= 60 ||
std::abs(microsecond) >= 1000000) [[unlikely]] {
std::abs(microsecond) >= 1000000 ||
(std::abs(hour) == 838 && std::abs(minute) == 59 && std::abs(second) == 59 &&
microsecond != 0)) [[unlikely]] {
throw Exception(ErrorCode::INVALID_ARGUMENT,
"Invalid time value: hour={}, minute={}, second={}, microsecond={}",
hour, minute, second, microsecond);
Expand Down
8 changes: 8 additions & 0 deletions be/test/exprs/function/cast/cast_to_time_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ TEST_F(FunctionCastTest, test_from_string_strict_mode_to_time) {
{{std::string("5656.3000000009")}, std::string("00:56:56.300000")},
{{std::string("5656.3000007001")}, std::string("00:56:56.300001")},
{{std::string("12:34:56.123")}, std::string("12:34:56.123")},
{{std::string("838:59:59.000000")}, std::string("838:59:59.000000")},
{{std::string("-838:59:59.000000")}, std::string("-838:59:59.000000")},
};
check_function_for_cast_strict_mode<DataTypeTimeV2>(input_types, data_set, "", 6);
}
Expand All @@ -54,6 +56,8 @@ TEST_F(FunctionCastTest, test_from_string_strict_mode_to_time) {
{{std::string("12:34:")}, Null()},
{{std::string("76")}, Null()},
{{std::string("200595912")}, Null()},
{{std::string("838:59:59.999999")}, Null()},
{{std::string("-838:59:59.999999")}, Null()},
{{std::string("8385959.9999999")}, Null()},
{{std::string(" 1 ")}, Null()},
};
Expand All @@ -80,6 +84,8 @@ TEST_F(FunctionCastTest, test_from_string_non_strict_mode_to_time) {
{{std::string("5656.3000000009")}, std::string("00:56:56.300000")},
{{std::string("5656.3000007001")}, std::string("00:56:56.300001")},
{{std::string("12:34:56.123")}, std::string("12:34:56.123")},
{{std::string("838:59:59.000000")}, std::string("838:59:59.000000")},
{{std::string("-838:59:59.000000")}, std::string("-838:59:59.000000")},
{{std::string(" 1 ")}, std::string("00:00:01.000000")},
{{std::string(".123")}, Null()},
{{std::string(":12:34")}, Null()},
Expand All @@ -89,6 +95,8 @@ TEST_F(FunctionCastTest, test_from_string_non_strict_mode_to_time) {
{{std::string("12:34:")}, Null()},
{{std::string("76")}, Null()},
{{std::string("200595912")}, Null()},
{{std::string("838:59:59.999999")}, Null()},
{{std::string("-838:59:59.999999")}, Null()},
{{std::string("8385959.9999999")}, Null()},
{{Null()}, Null()},
};
Expand Down
2 changes: 1 addition & 1 deletion ...che/doris/nereids/trees/expressions/functions/executable/DateTimeExtractAndTransform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@ public static Expression makeTime(BigIntLiteral hour, BigIntLiteral minute, Doub

long totalMicrosecond = Math.abs(hourValue) * 3600L * 1000000
+ minuteValue * 60L * 1000000 + Math.round(secondValue * 1000000);
long maxMicrosecond = 838L * 3600L * 1000000 + 59L * 60L * 1000000 + 59999999L;
long maxMicrosecond = 838L * 3600L * 1000000 + 59L * 60L * 1000000 + 59L * 1000000;
totalMicrosecond = Math.min(totalMicrosecond, maxMicrosecond);

int newHour = (int) (totalMicrosecond / 3600L / 1000000);
Expand Down
4 changes: 2 additions & 2 deletions ...-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/TimeV2Literal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public TimeV2Literal(int hour, int minute, int second, int microsecond, int scal
this.microsecond = (int) (microsecond / Math.pow(10, 6 - scale)) * (int) Math.pow(10, 6 - scale);
this.negative = negative;
if (checkRange(this.hour, this.minute, this.second, this.microsecond) || scale > 6 || scale < 0) {
throw new AnalysisException("time literal is out of range [-838:59:59.999999, 838:59:59.999999]");
throw new AnalysisException("time literal is out of range [-838:59:59.000000, 838:59:59.000000]");
}
}

Expand Down Expand Up @@ -263,7 +263,7 @@ protected void init(String s) throws AnalysisException {

protected static boolean checkRange(double hour, int minute, int second, int microsecond) {
return hour > 838 || minute > 59 || second > 59 || microsecond > 999999 || minute < 0 || second < 0
|| microsecond < 0;
|| microsecond < 0 || (hour == 838 && minute == 59 && second == 59 && microsecond != 0);
}

/**
Expand Down
13 changes: 13 additions & 0 deletions ...doris/nereids/trees/expressions/functions/executable/DateTimeExtractAndTransformTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@
import org.apache.doris.nereids.trees.expressions.literal.BigIntLiteral;
import org.apache.doris.nereids.trees.expressions.literal.DateTimeV2Literal;
import org.apache.doris.nereids.trees.expressions.literal.DecimalV3Literal;
import org.apache.doris.nereids.trees.expressions.literal.DoubleLiteral;
import org.apache.doris.nereids.trees.expressions.literal.SmallIntLiteral;
import org.apache.doris.nereids.trees.expressions.literal.StringLiteral;
import org.apache.doris.nereids.trees.expressions.literal.TimeV2Literal;
import org.apache.doris.nereids.trees.expressions.literal.TinyIntLiteral;
import org.apache.doris.nereids.trees.expressions.literal.VarcharLiteral;
import org.apache.doris.nereids.types.DateTimeV2Type;
Expand All @@ -34,6 +36,17 @@
import java.time.LocalDateTime;

class DateTimeExtractAndTransformTest {
@Test
void testMakeTimeSaturatesAtMySqlEndpoint() {
TimeV2Literal positive = (TimeV2Literal) DateTimeExtractAndTransform.makeTime(
new BigIntLiteral(838), new BigIntLiteral(59), new DoubleLiteral(59.999999));
TimeV2Literal negative = (TimeV2Literal) DateTimeExtractAndTransform.makeTime(
new BigIntLiteral(-838), new BigIntLiteral(59), new DoubleLiteral(59.999999));

Assertions.assertEquals("838:59:59.000000", positive.getStringValue());
Assertions.assertEquals("-838:59:59.000000", negative.getStringValue());
}

@Test
void testSpecialDateWeeks() {
// test week/yearweek for 0000-01-01/02
Expand Down
28 changes: 16 additions & 12 deletions ...e/src/test/java/org/apache/doris/nereids/trees/expressions/literal/TimeV2LiteralTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,25 +69,25 @@ public void testTimeV2LiteralCreate() {
s = literal.getStringValue();
Assertions.assertEquals(s, "12:12:12.121212");
// max val
literal = new TimeV2Literal(TimeV2Type.of(6), "838:59:59.999999");
literal = new TimeV2Literal(TimeV2Type.of(6), "838:59:59.000000");
s = literal.getStringValue();
Assertions.assertEquals(s, "838:59:59.999999");
Assertions.assertEquals(s, "838:59:59.000000");
// min val
literal = new TimeV2Literal(TimeV2Type.of(6), "-838:59:59.999999");
literal = new TimeV2Literal(TimeV2Type.of(6), "-838:59:59.000000");
s = literal.getStringValue();
Assertions.assertEquals(s, "-838:59:59.999999");
Assertions.assertEquals(s, "-838:59:59.000000");
// not string
literal = new TimeV2Literal(12, 12, 12, 121212, 6, false);
s = literal.getStringValue();
Assertions.assertEquals(s, "12:12:12.121212");
// max val
literal = new TimeV2Literal(838, 59, 59, 999999, 6, false);
literal = new TimeV2Literal(838, 59, 59, 0, 6, false);
s = literal.getStringValue();
Assertions.assertEquals(s, "838:59:59.999999");
Assertions.assertEquals(s, "838:59:59.000000");
// min val
literal = new TimeV2Literal(838, 59, 59, 999999, 6, true);
literal = new TimeV2Literal(838, 59, 59, 0, 6, true);
s = literal.getStringValue();
Assertions.assertEquals(s, "-838:59:59.999999");
Assertions.assertEquals(s, "-838:59:59.000000");
// string without ":"
literal = new TimeV2Literal(TimeV2Type.of(0), "8385959");
s = literal.getStringValue();
Expand All @@ -98,12 +98,12 @@ public void testTimeV2LiteralCreate() {
literal = new TimeV2Literal(TimeV2Type.of(0), "120000");
s = literal.getStringValue();
Assertions.assertEquals(s, "12:00:00");
literal = new TimeV2Literal(TimeV2Type.of(6), "8385959.999999");
literal = new TimeV2Literal(TimeV2Type.of(6), "8385959.000000");
s = literal.getStringValue();
Assertions.assertEquals(s, "838:59:59.999999");
literal = new TimeV2Literal(TimeV2Type.of(6), "-8385959.999999");
Assertions.assertEquals(s, "838:59:59.000000");
literal = new TimeV2Literal(TimeV2Type.of(6), "-8385959.000000");
s = literal.getStringValue();
Assertions.assertEquals(s, "-838:59:59.999999");
Assertions.assertEquals(s, "-838:59:59.000000");
// one ":"
literal = new TimeV2Literal(TimeV2Type.of(0), "12:00");
s = literal.getStringValue();
Expand All @@ -112,6 +112,10 @@ public void testTimeV2LiteralCreate() {

@Test
public void testTimeV2LiteralOutOfRange() {
Assertions.assertThrows(AnalysisException.class,
() -> new TimeV2Literal(TimeV2Type.of(6), "838:59:59.000001"));
Assertions.assertThrows(AnalysisException.class,
() -> new TimeV2Literal(TimeV2Type.of(6), "-838:59:59.000001"));
Assertions.assertThrows(AnalysisException.class, () -> {
new TimeV2Literal(838, 59, 59, 1000000, 6, false);
});
Expand Down
Loading