Skip to content
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

[Backport 2.x] Function str_to_date should work with two-digits year #3227

Open
wants to merge 3 commits into
base: 2.x
Choose a base branch
from
Open

[Backport 2.x] Function str_to_date should work with two-digits year #3227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae3cfc9
Function str_to_date should work with two-digits year (#2841)
LantaoJin Dec 30, 2024
5938e77
Merge remote-tracking branch 'upstream/2.x' into backport-2841-to-2.x
LantaoJin Jan 10, 2025
9497644
address datetype diff between 2.x and main
LantaoJin Jan 10, 2025
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
2 changes: 1 addition & 1 deletion core/src/main/java/org/opensearch/sql/expression/datetime/DateTimeFormatterUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ interface DateTimeFormatHandler {
.put("%T", "HH:mm:ss") // %T => HH:mm:ss
.put("%W", "EEEE") // %W => EEEE - Weekday name (Sunday..Saturday)
.put("%Y", "u") // %Y => yyyy - Year, numeric, 4 digits
.put("%y", "u") // %y => yy - Year, numeric, 2 digits
.put("%y", "uu") // %y => yy - Year, numeric, 2 digits
.put("%f", "n") // %f => n - Nanoseconds
// The following have been implemented but cannot be aligned with
// MySQL due to the limitations of the DatetimeFormatter
Expand Down
7 changes: 7 additions & 0 deletions core/src/test/java/org/opensearch/sql/expression/datetime/StrToDateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,13 @@ private static Stream<Arguments> getTestDataForStrToDate() {
"%Y,%m,%d,%h,%i",
new ExprDatetimeValue("2000-01-01 10:11:00"),
DATETIME),
Arguments.of(
"01-May-13", "%d-%b-%y", new ExprDatetimeValue("2013-05-01 00:00:00"), DATETIME),
Arguments.of(
"01-Jan-00", "%d-%b-%y", new ExprDatetimeValue("2000-01-01 00:00:00"), DATETIME),
// Behavior consistent with OpenSearch Core
Arguments.of(
"31-Jul-99", "%d-%b-%y", new ExprDatetimeValue("2099-07-31 00:00:00"), DATETIME),

// Invalid Arguments (should return null)
Arguments.of("a09:30:17", "a%h:%i:%s", ExprNullValue.of(), UNDEFINED),
Expand Down
8 changes: 8 additions & 0 deletions integ-test/src/test/java/org/opensearch/sql/ppl/DateTimeFunctionIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1535,6 +1535,14 @@ public void testStrToDate() throws IOException {
TEST_INDEX_DATE, "%d,%m,%Y"));
verifySchema(result, schema("f", null, "datetime"));
verifySome(result.getJSONArray("datarows"), rows("2013-05-01 00:00:00"));
// two digits year case
result =
executeQuery(
String.format(
"source=%s | eval f = str_to_date('1-May-13', '%s') | fields f",
TEST_INDEX_DATE, "%d-%b-%y"));
verifySchema(result, schema("f", null, "datetime"));
verifySome(result.getJSONArray("datarows"), rows("2013-05-01 00:00:00"));
}

@Test
Expand Down
4 changes: 4 additions & 0 deletions integ-test/src/test/java/org/opensearch/sql/sql/DateTimeFunctionIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -925,6 +925,10 @@ public void testStrToDate() throws IOException {
"SELECT str_to_date(firstname," + " '%%Y-%%m-%%d %%h:%%i:%%s') FROM %s LIMIT 2",
TEST_INDEX_BANK));
verifyDataRows(result, rows((Object) null), rows((Object) null));

// two digits year case
result = executeQuery("SELECT str_to_date('23-Oct-17 00:00:00', '%d-%b-%y %h:%i:%s')");
verifyDataRows(result, rows("2017-10-23 00:00:00"));
}

@Test
Expand Down
Loading