Skip to content

fix: Correct dayOfWeek letter for SimpleDateTimeFormatter #15517

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

Closed
wForget wants to merge 2 commits into from
Closed

fix: Correct dayOfWeek letter for SimpleDateTimeFormatter #15517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1da8a9e
fix: Correct dayOfWeek letter for SimpleDateTimeFormatter
wForget Nov 17, 2025
8d8edf9
fix test
wForget Nov 19, 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 velox/functions/lib/DateTimeFormatter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2020,7 +2020,7 @@ Expected<std::shared_ptr<DateTimeFormatter>> buildSimpleDateTimeFormatter(
case 'D':
builder.appendDayOfYear(count);
break;
case 'e':
case 'u':
builder.appendDayOfWeek1Based(count);
break;
case 'E':
Expand Down
20 changes: 10 additions & 10 deletions velox/functions/lib/tests/DateTimeFormatterTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2368,16 +2368,16 @@ TEST_F(SimpleDateTimeFormatterTest, parseSimpleWeekOfMonth) {
// Format contains year, month, weekOfMonth and dayOfWeek.
EXPECT_EQ(
fromTimestampString("2024-08-02"),
parseSimple("2024 08 01 5", "yyyy MM WW e", lenient).timestamp);
parseSimple("2024 08 01 5", "yyyy MM WW u", lenient).timestamp);
EXPECT_EQ(
fromTimestampString("2024-08-03"),
parseSimple("2024 08 01 6", "yyyy MM WW e", lenient).timestamp);
parseSimple("2024 08 01 6", "yyyy MM WW u", lenient).timestamp);
EXPECT_EQ(
fromTimestampString("2024-08-09"),
parseSimple("2024 08 02 5", "yyyy MM WW e", lenient).timestamp);
parseSimple("2024 08 02 5", "yyyy MM WW u", lenient).timestamp);
EXPECT_EQ(
fromTimestampString("2024-08-12"),
parseSimple("2024 08 03 1", "yyyy MM WW e", lenient).timestamp);
parseSimple("2024 08 03 1", "yyyy MM WW u", lenient).timestamp);

// Format contains year, month and weekOfMonth.
EXPECT_EQ(
Expand All @@ -2398,25 +2398,25 @@ TEST_F(SimpleDateTimeFormatterTest, parseSimpleWeekOfMonth) {
// Field out of range for lenient mode.
EXPECT_EQ(
fromTimestampString("2024-09-30"),
parseSimple("2024 08 10 1", "yyyy MM WW e", true).timestamp);
parseSimple("2024 08 10 1", "yyyy MM WW u", true).timestamp);
EXPECT_EQ(
fromTimestampString("2024-07-28"),
parseSimple("2024 08 01", "yyyy MM WW", true).timestamp);
EXPECT_EQ(
fromTimestampString("2025-02-24"),
parseSimple("2024 15 01 1", "yyyy MM WW e", true).timestamp);
parseSimple("2024 15 01 1", "yyyy MM WW u", true).timestamp);
EXPECT_EQ(
fromTimestampString("2024-07-29"),
parseSimple("2024 08 01 9", "yyyy MM WW e", true).timestamp);
parseSimple("2024 08 01 9", "yyyy MM WW u", true).timestamp);

// Field out of range for strict mode.
EXPECT_THROW(
parseSimple("2024 08 10 1", "yyyy MM WW e", false), VeloxUserError);
parseSimple("2024 08 10 1", "yyyy MM WW u", false), VeloxUserError);
EXPECT_THROW(parseSimple("2024 08 10", "yyyy MM WW", false), VeloxUserError);
EXPECT_THROW(
parseSimple("2024 15 01 1", "yyyy MM WW e", false), VeloxUserError);
parseSimple("2024 15 01 1", "yyyy MM WW u", false), VeloxUserError);
EXPECT_THROW(
parseSimple("2024 08 01 9", "yyyy MM WW e", false), VeloxUserError);
parseSimple("2024 08 01 9", "yyyy MM WW u", false), VeloxUserError);
}

TEST_F(SimpleDateTimeFormatterTest, formatResultSize) {
Expand Down
Loading