This is an automated email from the ASF dual-hosted git repository.
rui 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 be760ee6e [VL] Daily Update Velox Version (2024_05_17) (#5781)
be760ee6e is described below
commit be760ee6e2f8346f679af1f43dc94e029c5579a3
Author: Rui Mo <[email protected]>
AuthorDate: Sat May 18 16:05:49 2024 +0800
[VL] Daily Update Velox Version (2024_05_17) (#5781)
---
cpp/velox/compute/WholeStageResultIterator.cc | 12 ++++++------
cpp/velox/compute/WholeStageResultIterator.h | 1 +
ep/build-velox/src/get_velox.sh | 2 +-
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/cpp/velox/compute/WholeStageResultIterator.cc
b/cpp/velox/compute/WholeStageResultIterator.cc
index 06a7a7c39..852c7e3cc 100644
--- a/cpp/velox/compute/WholeStageResultIterator.cc
+++ b/cpp/velox/compute/WholeStageResultIterator.cc
@@ -72,6 +72,11 @@ WholeStageResultIterator::WholeStageResultIterator(
gluten::updateHdfsTokens(veloxCfg_.get());
#endif
spillStrategy_ = veloxCfg_->get<std::string>(kSpillStrategy,
kSpillStrategyDefaultValue);
+ auto spillThreadNum = veloxCfg_->get<uint32_t>(kSpillThreadNum,
kSpillThreadNumDefaultValue);
+ if (spillThreadNum > 0) {
+ spillExecutor_ =
std::make_shared<folly::CPUThreadPoolExecutor>(spillThreadNum);
+ }
+
getOrderedNodeIds(veloxPlan_, orderedNodeIds_);
// Create task instance.
@@ -164,18 +169,13 @@ std::shared_ptr<velox::core::QueryCtx>
WholeStageResultIterator::createNewVeloxQ
std::unordered_map<std::string, std::shared_ptr<velox::Config>>
connectorConfigs;
connectorConfigs[kHiveConnectorId] = createConnectorConfig();
- auto spillThreadNum = veloxCfg_->get<uint32_t>(kSpillThreadNum,
kSpillThreadNumDefaultValue);
- std::shared_ptr<folly::Executor> spillExecutor = nullptr;
- if (spillThreadNum > 0) {
- spillExecutor =
std::make_shared<folly::CPUThreadPoolExecutor>(spillThreadNum);
- }
std::shared_ptr<velox::core::QueryCtx> ctx =
std::make_shared<velox::core::QueryCtx>(
nullptr,
facebook::velox::core::QueryConfig{getQueryContextConf()},
connectorConfigs,
gluten::VeloxBackend::get()->getAsyncDataCache(),
memoryManager_->getAggregateMemoryPool(),
- std::move(spillExecutor),
+ spillExecutor_.get(),
"");
return ctx;
}
diff --git a/cpp/velox/compute/WholeStageResultIterator.h
b/cpp/velox/compute/WholeStageResultIterator.h
index 0ad3877ff..5e661f404 100644
--- a/cpp/velox/compute/WholeStageResultIterator.h
+++ b/cpp/velox/compute/WholeStageResultIterator.h
@@ -110,6 +110,7 @@ class WholeStageResultIterator : public
ColumnarBatchIterator {
/// Spill.
std::string spillStrategy_;
+ std::shared_ptr<folly::Executor> spillExecutor_ = nullptr;
/// Metrics
std::unique_ptr<Metrics> metrics_{};
diff --git a/ep/build-velox/src/get_velox.sh b/ep/build-velox/src/get_velox.sh
index 17a0b3796..33a82ca57 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_16
+VELOX_BRANCH=2024_05_17
VELOX_HOME=""
#Set on run gluten on HDFS
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
