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

Support offset-based timezone #9591

Closed
wants to merge 1 commit into from
Closed

Support offset-based timezone #9591

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
1 change: 1 addition & 0 deletions velox/expression/CastExpr-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include "velox/core/CoreTypeSystem.h"
#include "velox/expression/StringWriter.h"
#include "velox/external/date/tz.h"
#include "velox/functions/lib/TimeUtils.h"
#include "velox/type/Type.h"
#include "velox/vector/SelectivityVector.h"

Expand Down
12 changes: 4 additions & 8 deletions velox/expression/CastExpr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include "velox/expression/ScopedVarSetter.h"
#include "velox/external/date/tz.h"
#include "velox/functions/lib/RowsTranslationUtil.h"
#include "velox/functions/lib/TimeUtils.h"
#include "velox/type/Type.h"
#include "velox/vector/ComplexVector.h"
#include "velox/vector/FunctionVector.h"
Expand Down Expand Up @@ -181,11 +182,7 @@ VectorPtr CastExpr::castFromDate(
case TypeKind::TIMESTAMP: {
static const int64_t kMillisPerDay{86'400'000};
const auto& queryConfig = context.execCtx()->queryCtx()->queryConfig();
const auto sessionTzName = queryConfig.sessionTimezone();
const auto* timeZone =
(queryConfig.adjustTimestampToTimezone() && !sessionTzName.empty())
? date::locate_zone(sessionTzName)
: nullptr;
const auto* timeZone = functions::getTimeZoneFromConfig(queryConfig);
auto* resultFlatVector = castResult->as<FlatVector<Timestamp>>();
applyToSelectedNoThrowLocal(context, rows, castResult, [&](int row) {
auto timestamp = Timestamp::fromMillis(
Expand Down Expand Up @@ -233,9 +230,8 @@ VectorPtr CastExpr::castToDate(
}
case TypeKind::TIMESTAMP: {
const auto& queryConfig = context.execCtx()->queryCtx()->queryConfig();
auto sessionTzName = queryConfig.sessionTimezone();
if (queryConfig.adjustTimestampToTimezone() && !sessionTzName.empty()) {
auto* timeZone = date::locate_zone(sessionTzName);
const auto* timeZone = functions::getTimeZoneFromConfig(queryConfig);
if (timeZone) {
castTimestampToDate<true>(rows, input, context, castResult, timeZone);
} else {
castTimestampToDate<false>(rows, input, context, castResult);
Expand Down
6 changes: 2 additions & 4 deletions velox/expression/PrestoCastHooks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

#include "velox/expression/PrestoCastHooks.h"
#include "velox/external/date/tz.h"
#include "velox/functions/lib/TimeUtils.h"
#include "velox/type/TimestampConversion.h"

namespace facebook::velox::exec {
Expand All @@ -25,10 +26,7 @@ PrestoCastHooks::PrestoCastHooks(const core::QueryConfig& config)
if (!legacyCast_) {
options_.zeroPaddingYear = true;
options_.dateTimeSeparator = ' ';
const auto sessionTzName = config.sessionTimezone();
if (config.adjustTimestampToTimezone() && !sessionTzName.empty()) {
options_.timeZone = date::locate_zone(sessionTzName);
}
options_.timeZone = functions::getTimeZoneFromConfig(config);
}
}

Expand Down
24 changes: 22 additions & 2 deletions velox/expression/tests/CastExprTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,6 +609,26 @@ TEST_F(CastExprTest, stringToTimestamp) {
Timestamp(946729316, 0),
};
testCast<std::string, Timestamp>("timestamp", input, expected);

setTimezone("GMT+8");
testCast<std::string, Timestamp>(
"timestamp",
{
"1970-01-01",
"1970-01-01 08:00:00",
"1970-01-01 00:00:00",
"1970-01-01 08:00:11",
"1970-01-01 09:00:00",
std::nullopt,
},
{
Timestamp(-28800, 0),
Timestamp(0, 0),
Timestamp(-28800, 0),
Timestamp(11, 0),
Timestamp(3600, 0),
std::nullopt,
});
}

TEST_F(CastExprTest, timestampToString) {
Expand Down Expand Up @@ -2397,8 +2417,8 @@ class TestingDictionaryToFewerRowsFunction : public exec::VectorFunction {
exec::EvalCtx& context,
VectorPtr& result) const override {
const auto size = rows.size();
auto indices =
makeIndices(size, [](auto /*row*/) { return 0; }, context.pool());
auto indices = makeIndices(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

irrelevant change?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is produced by code format tool. Thanks!

size, [](auto /*row*/) { return 0; }, context.pool());

result = BaseVector::wrapInDictionary(nullptr, indices, size, args[0]);
}
Expand Down
19 changes: 18 additions & 1 deletion velox/functions/lib/TimeUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,29 @@ inline constexpr int64_t kSecondsInDay = 86'400;
inline constexpr int64_t kDaysInWeek = 7;
extern const folly::F14FastMap<std::string, int8_t> kDayOfWeekNames;

/// Format timezone to make it compatible with date::locate_zone.
/// For example, converts "GMT+8" to "Etc/GMT-8".
/// Here is the list of IANA timezone names:
/// https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
FOLLY_ALWAYS_INLINE std::string formatTimezone(const std::string& timezone) {
if (timezone.find("GMT") == 0 && timezone.size() > 4) {
if (timezone[3] == '+') {
return "Etc/GMT-" + timezone.substr(4);
}
if (timezone[3] == '-') {
return "Etc/GMT+" + timezone.substr(4);
}
}
return timezone;
}

FOLLY_ALWAYS_INLINE const date::time_zone* getTimeZoneFromConfig(
const core::QueryConfig& config) {
if (config.adjustTimestampToTimezone()) {
auto sessionTzName = config.sessionTimezone();
if (!sessionTzName.empty()) {
return date::locate_zone(sessionTzName);
// locate_zone throws runtime_error if the timezone couldn't be found.
return date::locate_zone(formatTimezone(sessionTzName));
}
}
return nullptr;
Expand Down
19 changes: 19 additions & 0 deletions velox/functions/prestosql/tests/DateTimeFunctionsTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3341,6 +3341,25 @@ TEST_F(DateTimeFunctionsTest, dateFormat) {
fromTimestampString("-2000-02-29 00:00:00.987"),
"%Y-%m-%d %H:%i:%s.%f"));

setQueryTimeZone("GMT-8");

EXPECT_EQ(
"1969-12-31", dateFormat(fromTimestampString("1970-01-01"), "%Y-%m-%d"));
EXPECT_EQ(
"2000-02-28 04:00:00 PM",
dateFormat(
fromTimestampString("2000-02-29 00:00:00.987"), "%Y-%m-%d %r"));
EXPECT_EQ(
"2000-02-28 16:00:00.987000",
dateFormat(
fromTimestampString("2000-02-29 00:00:00.987"),
"%Y-%m-%d %H:%i:%s.%f"));
EXPECT_EQ(
"-2000-02-28 16:00:00.987000",
dateFormat(
fromTimestampString("-2000-02-29 00:00:00.987"),
"%Y-%m-%d %H:%i:%s.%f"));

// User format errors or unsupported errors.
const auto timestamp = fromTimestampString("-2000-02-29 00:00:00.987");
VELOX_ASSERT_THROW(
Expand Down
Loading