Skip to content

[enhance](Nereids): support DateLiteral with suffix space #30583

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
yiguolei merged 1 commit into from
Jan 30, 2024
Merged

[enhance](Nereids): support DateLiteral with suffix space #30583

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/nereids/trees/expressions/literal/DateLiteral.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import java.time.temporal.ChronoField;
import java.time.temporal.TemporalAccessor;
import java.util.Set;
import java.util.function.UnaryOperator;

/**
* Date literal in Nereids.
Expand Down Expand Up @@ -100,7 +101,7 @@ public DateLiteral(DateLiteral other, DataType type) {

// normalize yymmdd -> yyyymmdd
static String normalizeBasic(String s) {
java.util.function.UnaryOperator<String> normalizeTwoDigit = (input) -> {
UnaryOperator<String> normalizeTwoDigit = (input) -> {
String yy = input.substring(0, 2);
int year = Integer.parseInt(yy);
if (year >= 0 && year <= 69) {
Expand Down Expand Up @@ -265,6 +266,8 @@ protected static TemporalAccessor parse(String s) {
try {
TemporalAccessor dateTime;

// remove suffix ' '
s = s.trim();
// parse condition without '-' and ':'
boolean containsPunctuation = false;
for (int i = 0; i < s.length(); i++) {
Expand Down
6 changes: 6 additions & 0 deletions ...ore/src/test/java/org/apache/doris/nereids/trees/expressions/literal/DateLiteralTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,4 +214,10 @@ void testPoint() {
new DateTimeV2Literal("2020.02.01 00.00.00.000001");
Assertions.assertThrows(AnalysisException.class, () -> new DateTimeV2Literal("2020.02.01 00.00.00.0000001"));
}

@Test
void testSuffixSpace() {
new DateLiteral("2016-07-02 ");
new DateLiteral("2016-07-02 00:00:00 ");
}
}