Skip to content

Commit

Permalink
[VL] Daily Update Velox Version (2024_05_02) (#5592)
Browse files Browse the repository at this point in the history
removed spark.gluten.sql.session.timeZone.default configuration. If spark.sql.session.timeZone is not set, ignore the config in velox config
  • Loading branch information
GlutenPerfBot authored May 3, 2024
1 parent 90f000c commit c15f460
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
9 changes: 6 additions & 3 deletions cpp/velox/compute/WholeStageResultIterator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ep/build-velox/src/get_velox.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c15f460

Please sign in to comment.