This is an automated email from the ASF dual-hosted git repository.
felixybw pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new c15f460aa [VL] Daily Update Velox Version (2024_05_02) (#5592)
c15f460aa is described below
commit c15f460aa9bb69663b9b15618ede6cdfcb2377a7
Author: Gluten Performance Bot
<[email protected]>
AuthorDate: Sat May 4 02:52:06 2024 +0800
[VL] Daily Update Velox Version (2024_05_02) (#5592)
removed spark.gluten.sql.session.timeZone.default configuration. If
spark.sql.session.timeZone is not set, ignore the config in velox config
---
cpp/velox/compute/WholeStageResultIterator.cc | 9 ++++++---
ep/build-velox/src/get_velox.sh | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/cpp/velox/compute/WholeStageResultIterator.cc
b/cpp/velox/compute/WholeStageResultIterator.cc
index b0dac1d65..83749061c 100644
--- a/cpp/velox/compute/WholeStageResultIterator.cc
+++ b/cpp/velox/compute/WholeStageResultIterator.cc
@@ -482,9 +482,12 @@ std::unordered_map<std::string, std::string>
WholeStageResultIterator::getQueryC
// Find offheap size from Spark confs. If found, set the max memory usage of
partial aggregation.
// FIXME this uses process-wise off-heap memory which is not for task
try {
- auto defaultTimezone =
veloxCfg_->get<std::string>(kDefaultSessionTimezone, "");
- configs[velox::core::QueryConfig::kSessionTimezone] =
- veloxCfg_->get<std::string>(kSessionTimezone, defaultTimezone);
+ if (veloxCfg_->isValueExists(kDefaultSessionTimezone)) {
+ configs[velox::core::QueryConfig::kSessionTimezone] =
veloxCfg_->get<std::string>(kDefaultSessionTimezone, "");
+ }
+ if (veloxCfg_->isValueExists(kSessionTimezone)) {
+ configs[velox::core::QueryConfig::kSessionTimezone] =
veloxCfg_->get<std::string>(kSessionTimezone, "");
+ }
// Adjust timestamp according to the above configured session timezone.
configs[velox::core::QueryConfig::kAdjustTimestampToTimezone] = "true";
// Align Velox size function with Spark.
diff --git a/ep/build-velox/src/get_velox.sh b/ep/build-velox/src/get_velox.sh
index 9344b6ef0..f6291d47e 100755
--- a/ep/build-velox/src/get_velox.sh
+++ b/ep/build-velox/src/get_velox.sh
@@ -17,7 +17,7 @@
set -exu
VELOX_REPO=https://github.com/oap-project/velox.git
-VELOX_BRANCH=2024_05_01
+VELOX_BRANCH=2024_05_02
VELOX_HOME=""
#Set on run gluten on HDFS
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
