Fix empty time zone

facebookincubator · Dec 25, 2024 · 35a6511 · 35a6511
1 parent 9e5d869
commit 35a6511
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/velox/functions/sparksql/specialforms/SparkCastHooks.cpp b/velox/functions/sparksql/specialforms/SparkCastHooks.cpp
@@ -22,7 +22,19 @@
 namespace facebook::velox::functions::sparksql {
 
 SparkCastHooks::SparkCastHooks(const velox::core::QueryConfig& config)
-    : config_(config) {}
+    : config_(config) {
+  timestampToStringOptions_ = {
+    .precision = TimestampToStringOptions::Precision::kMicroseconds,
+    .leadingPositiveSign = true,
+    .skipTrailingZeros = true,
+    .zeroPaddingYear = true,
+    .dateTimeSeparator = ' ',
+  };
+  const auto sessionTzName = config.sessionTimezone();
+  if (!sessionTzName.empty()) {
+    timestampToStringOptions_.timeZone = tz::locateZone(sessionTzName);
+  }
+}
 
 Expected<Timestamp> SparkCastHooks::castStringToTimestamp(
     const StringView& view) const {
@@ -80,15 +92,7 @@ StringView SparkCastHooks::removeWhiteSpaces(const StringView& view) const {
 
 const TimestampToStringOptions& SparkCastHooks::timestampToStringOptions()
     const {
-  static TimestampToStringOptions options = {
-      .precision = TimestampToStringOptions::Precision::kMicroseconds,
-      .leadingPositiveSign = true,
-      .skipTrailingZeros = true,
-      .zeroPaddingYear = true,
-      .dateTimeSeparator = ' ',
-      .timeZone = tz::locateZone(config_.sessionTimezone()),
-  };
-  return options;
+  return timestampToStringOptions_;
 }
 
 exec::PolicyType SparkCastHooks::getPolicy() const {

diff --git a/velox/functions/sparksql/specialforms/SparkCastHooks.h b/velox/functions/sparksql/specialforms/SparkCastHooks.h
@@ -65,5 +65,6 @@ class SparkCastHooks : public exec::CastHooks {
 
  private:
   const core::QueryConfig& config_;
+  TimestampToStringOptions& timestampToStringOptions_;
 };
 } // namespace facebook::velox::functions::sparksql