[GLUTEN-2306][VL] Pass spark session timezone to velox's config (apac…

…he#2307)
baibaichen · Jul 14, 2023 · f51c6a1 · f51c6a1
1 parent b3b80d5
commit f51c6a1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/cpp/core/config/GlutenConfig.h b/cpp/core/config/GlutenConfig.h
@@ -29,6 +29,8 @@ const std::string kGlutenSaveDir = "spark.gluten.saveDir";
 
 const std::string kCaseSensitive = "spark.sql.caseSensitive";
 
+const std::string kSessionTimezone = "spark.sql.session.timeZone";
+
 const std::string kSparkOffHeapMemory = "spark.gluten.memory.offHeap.size.in.bytes";
 
 const std::string kSparkTaskOffHeapMemory = "spark.gluten.memory.task.offHeap.size.in.bytes";

diff --git a/cpp/velox/compute/WholeStageResultIterator.cc b/cpp/velox/compute/WholeStageResultIterator.cc
@@ -248,6 +248,7 @@ std::unordered_map<std::string, std::string> WholeStageResultIterator::getQueryC
     configs[velox::core::QueryConfig::kCastToIntByTruncate] = std::to_string(true);
     // To align with Spark's behavior, allow decimal in casting string to int.
     configs[velox::core::QueryConfig::kCastIntAllowDecimal] = std::to_string(true);
+    configs[velox::core::QueryConfig::kSessionTimezone] = getConfigValue(kSessionTimezone, "");
 
     // Set the max memory of partial aggregation as 3/4 of offheap size.
     auto maxMemory =

diff --git a/shims/common/src/main/scala/io/glutenproject/GlutenConfig.scala b/shims/common/src/main/scala/io/glutenproject/GlutenConfig.scala
@@ -323,7 +323,7 @@ object GlutenConfig {
   // unit: SECONDS, default 1 day
   val GLUTEN_RESOURCE_RELATION_EXPIRED_TIME_DEFAULT: Int = 86400
 
-  // Supported hive/pthon/scala udf names
+  // Supported hive/python/scala udf names
   val GLUTEN_SUPPORTED_HIVE_UDFS = "spark.gluten.supported.hive.udfs"
   val GLUTEN_SUPPORTED_PYTHON_UDFS = "spark.gluten.supported.python.udfs"
   val GLUTEN_SUPPORTED_SCALA_UDFS = "spark.gluten.supported.scala.udfs"
@@ -359,7 +359,8 @@ object GlutenConfig {
     val keys = ImmutableList.of(
       GLUTEN_SAVE_DIR,
       GLUTEN_TASK_OFFHEAP_SIZE_IN_BYTES_KEY,
-      GLUTEN_MAX_BATCH_SIZE_KEY
+      GLUTEN_MAX_BATCH_SIZE_KEY,
+      SQLConf.SESSION_LOCAL_TIMEZONE.key
     )
     keys.forEach(
       k => {