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 a7e536ebb [VL] Daily Update Velox Version (2024_05_22) (#5834)
a7e536ebb is described below
commit a7e536ebb11a685381bf8a799f16f42789b7bc43
Author: Gluten Performance Bot
<[email protected]>
AuthorDate: Wed May 22 18:59:31 2024 +0800
[VL] Daily Update Velox Version (2024_05_22) (#5834)
---
cpp/velox/benchmarks/PlanValidatorUtil.cc | 4 ++--
cpp/velox/compute/WholeStageResultIterator.cc | 2 +-
cpp/velox/jni/VeloxJniWrapper.cc | 4 ++--
cpp/velox/tests/Substrait2VeloxPlanValidatorTest.cc | 2 +-
ep/build-velox/src/get_velox.sh | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/cpp/velox/benchmarks/PlanValidatorUtil.cc
b/cpp/velox/benchmarks/PlanValidatorUtil.cc
index e299b4620..46f2733f2 100644
--- a/cpp/velox/benchmarks/PlanValidatorUtil.cc
+++ b/cpp/velox/benchmarks/PlanValidatorUtil.cc
@@ -45,9 +45,9 @@ int main(int argc, char** argv) {
conf.insert({kDebugModeEnabled, "true"});
initVeloxBackend(conf);
std::unordered_map<std::string, std::string>
configs{{core::QueryConfig::kSparkPartitionId, "0"}};
- core::QueryCtx queryCtx(nullptr, core::QueryConfig(configs));
+ auto queryCtx = core::QueryCtx::create(nullptr, core::QueryConfig(configs));
auto pool = defaultLeafVeloxMemoryPool().get();
- core::ExecCtx execCtx(pool, &queryCtx);
+ core::ExecCtx execCtx(pool, queryCtx.get());
::substrait::Plan subPlan;
parseProtobuf(reinterpret_cast<uint8_t*>(plan.data()), plan.size(),
&subPlan);
diff --git a/cpp/velox/compute/WholeStageResultIterator.cc
b/cpp/velox/compute/WholeStageResultIterator.cc
index 852c7e3cc..f719c119c 100644
--- a/cpp/velox/compute/WholeStageResultIterator.cc
+++ b/cpp/velox/compute/WholeStageResultIterator.cc
@@ -169,7 +169,7 @@ std::shared_ptr<velox::core::QueryCtx>
WholeStageResultIterator::createNewVeloxQ
std::unordered_map<std::string, std::shared_ptr<velox::Config>>
connectorConfigs;
connectorConfigs[kHiveConnectorId] = createConnectorConfig();
- std::shared_ptr<velox::core::QueryCtx> ctx =
std::make_shared<velox::core::QueryCtx>(
+ std::shared_ptr<velox::core::QueryCtx> ctx = velox::core::QueryCtx::create(
nullptr,
facebook::velox::core::QueryConfig{getQueryContextConf()},
connectorConfigs,
diff --git a/cpp/velox/jni/VeloxJniWrapper.cc b/cpp/velox/jni/VeloxJniWrapper.cc
index 7884280c3..9da7355d1 100644
--- a/cpp/velox/jni/VeloxJniWrapper.cc
+++ b/cpp/velox/jni/VeloxJniWrapper.cc
@@ -120,10 +120,10 @@
Java_org_apache_gluten_vectorized_PlanEvaluatorJniWrapper_nativeValidateWithFail
// A query context with dummy configs. Used for function validation.
std::unordered_map<std::string, std::string> configs{
{velox::core::QueryConfig::kSparkPartitionId, "0"},
{velox::core::QueryConfig::kSessionTimezone, "GMT"}};
- velox::core::QueryCtx queryCtx(nullptr, velox::core::QueryConfig(configs));
+ auto queryCtx = velox::core::QueryCtx::create(nullptr,
velox::core::QueryConfig(configs));
auto pool = gluten::defaultLeafVeloxMemoryPool().get();
// An execution context used for function validation.
- velox::core::ExecCtx execCtx(pool, &queryCtx);
+ velox::core::ExecCtx execCtx(pool, queryCtx.get());
gluten::SubstraitToVeloxPlanValidator planValidator(pool, &execCtx);
jclass infoCls =
env->FindClass("Lorg/apache/gluten/validate/NativePlanValidationInfo;");
diff --git a/cpp/velox/tests/Substrait2VeloxPlanValidatorTest.cc
b/cpp/velox/tests/Substrait2VeloxPlanValidatorTest.cc
index d5eafa1e2..0a957f038 100644
--- a/cpp/velox/tests/Substrait2VeloxPlanValidatorTest.cc
+++ b/cpp/velox/tests/Substrait2VeloxPlanValidatorTest.cc
@@ -46,7 +46,7 @@ class Substrait2VeloxPlanValidatorTest : public
exec::test::HiveConnectorTestBas
}
bool validatePlan(::substrait::Plan& plan) {
- std::shared_ptr<core::QueryCtx> queryCtx =
std::make_shared<core::QueryCtx>();
+ auto queryCtx = core::QueryCtx::create();
// An execution context used for function validation.
std::unique_ptr<core::ExecCtx> execCtx =
std::make_unique<core::ExecCtx>(pool_.get(), queryCtx.get());
diff --git a/ep/build-velox/src/get_velox.sh b/ep/build-velox/src/get_velox.sh
index 70b3a9b09..fbb0f7067 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_21
+VELOX_BRANCH=2024_05_22
VELOX_HOME=""
#Set on run gluten on HDFS
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
