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

Jump to bottom

Fix timezone issue in date_diff #8540

Closed
wants to merge 1 commit into from
Closed

Fix timezone issue in date_diff #8540

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 10 additions & 5 deletions velox/functions/prestosql/DateTimeFunctions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,18 @@ struct TimestampWithTimezoneSupport {
VELOX_DEFINE_FUNCTION_TYPES(T);

// Convert timestampWithTimezone to a timestamp representing the moment at the
// zone in timestampWithTimezone.
// zone in timestampWithTimezone. If `asGMT` is set to true, return the GMT
// time at the same moment.
FOLLY_ALWAYS_INLINE
Timestamp toTimestamp(
const arg_type<TimestampWithTimezone>& timestampWithTimezone) {
const arg_type<TimestampWithTimezone>& timestampWithTimezone,
bool asGMT = false) {
const auto milliseconds = *timestampWithTimezone.template at<0>();
auto tz = *timestampWithTimezone.template at<1>();
Timestamp timestamp = Timestamp::fromMillis(milliseconds);
timestamp.toTimezone(*timestampWithTimezone.template at<1>());
if (!asGMT) {
timestamp.toTimezone(*timestampWithTimezone.template at<1>());
}

return timestamp;
}
Expand Down Expand Up @@ -1119,8 +1124,8 @@ struct DateDiffFunction : public TimestampWithTimezoneSupport<T> {
call(
result,
unitString,
this->toTimestamp(timestamp1),
this->toTimestamp(timestamp2));
this->toTimestamp(timestamp1, true),
this->toTimestamp(timestamp2, true));
}
};

Expand Down
8 changes: 4 additions & 4 deletions velox/functions/prestosql/tests/DateTimeFunctionsTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2502,23 +2502,23 @@ TEST_F(DateTimeFunctionsTest, dateDiffTimestampWithTimezone) {
// timestamp1: 1970-01-01 00:00:00.000 +00:00 (0)
// timestamp2: 2020-08-25 16:30:10.123 -08:00 (1'598'373'010'123)
EXPECT_EQ(
1598347810123,
1598373010123,
dateDiff(
"millisecond",
0,
"+00:00",
1'598'373'010'123,
"America/Los_Angeles"));
EXPECT_EQ(
1598347810,
1598373010,
dateDiff(
"second", 0, "+00:00", 1'598'373'010'123, "America/Los_Angeles"));
EXPECT_EQ(
26639130,
26639550,
dateDiff(
"minute", 0, "+00:00", 1'598'373'010'123, "America/Los_Angeles"));
EXPECT_EQ(
443985,
443992,
dateDiff("hour", 0, "+00:00", 1'598'373'010'123, "America/Los_Angeles"));
EXPECT_EQ(
18499,
Expand Down