You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gluten.apache.org by ho...@apache.org on 2026/04/25 11:44:13 UTC
(gluten) branch main updated: [GLUTEN-6887][VL] Daily Update Velox Version (2026_04_24) (#11982)
This is an automated email from the ASF dual-hosted git repository.
zhztheplayer pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/gluten.git
The following commit(s) were added to refs/heads/main by this push:
new f0a3df8944 [GLUTEN-6887][VL] Daily Update Velox Version (2026_04_24) (#11982)
f0a3df8944 is described below
commit f0a3df894481d0db844bb7943b59b063e08b26a1
Author: Gluten Performance Bot <13...@users.noreply.github.com>
AuthorDate: Sat Apr 25 12:44:07 2026 +0100
[GLUTEN-6887][VL] Daily Update Velox Version (2026_04_24) (#11982)
---
cpp/velox/jni/VeloxJniWrapper.cc | 35 ++++++++++++++++++++++++-----------
ep/build-velox/src/get-velox.sh | 4 ++--
2 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/cpp/velox/jni/VeloxJniWrapper.cc b/cpp/velox/jni/VeloxJniWrapper.cc
index 07fcab71e1..e30413d6d3 100644
--- a/cpp/velox/jni/VeloxJniWrapper.cc
+++ b/cpp/velox/jni/VeloxJniWrapper.cc
@@ -25,6 +25,7 @@
#include <velox/exec/OperatorUtils.h>
#include <exception>
+#include <type_traits>
#include "JniUdf.h"
#include "compute/Runtime.h"
#include "compute/VeloxBackend.h"
@@ -67,6 +68,28 @@ jmethodID blockStripesConstructor;
jclass batchWriteMetricsClass;
jmethodID batchWriteMetricsConstructor;
+
+template <typename PartitionChannels>
+auto makePartitionIdGenerator(
+ const facebook::velox::RowTypePtr& inputType,
+ PartitionChannels&& partitionChannels,
+ uint32_t maxPartitions,
+ facebook::velox::memory::MemoryPool* pool) {
+ using PartitionIdGenerator = facebook::velox::connector::hive::PartitionIdGenerator;
+ using ChannelsType = std::decay_t<PartitionChannels>;
+ if constexpr (std::is_constructible_v<
+ PartitionIdGenerator,
+ const facebook::velox::RowTypePtr&,
+ ChannelsType,
+ uint32_t,
+ facebook::velox::memory::MemoryPool*,
+ bool>) {
+ return PartitionIdGenerator(
+ inputType, std::forward<PartitionChannels>(partitionChannels), maxPartitions, pool, false);
+ } else {
+ return PartitionIdGenerator(inputType, std::forward<PartitionChannels>(partitionChannels), maxPartitions, pool);
+ }
+}
} // namespace
#ifdef __cplusplus
@@ -590,17 +613,7 @@ Java_org_apache_gluten_datasource_VeloxDataSourceJniWrapper_splitBlockByPartitio
const auto inputRowVector = veloxBatch->getRowVector();
const auto numRows = inputRowVector->size();
- connector::hive::PartitionIdGenerator idGen(
- asRowType(inputRowVector->type()),
- partitionColIndicesVec,
- 65536,
- pool.get(),
-#ifdef GLUTEN_ENABLE_ENHANCED_FEATURES
- true
-#else
- false
-#endif
- );
+ auto idGen = makePartitionIdGenerator(asRowType(inputRowVector->type()), partitionColIndicesVec, 65536, pool.get());
raw_vector<uint64_t> partitionIds{};
idGen.run(inputRowVector, partitionIds);
GLUTEN_CHECK(partitionIds.size() == numRows, "Mismatched number of partition ids");
diff --git a/ep/build-velox/src/get-velox.sh b/ep/build-velox/src/get-velox.sh
index a032c5a09c..cee8ba3d14 100755
--- a/ep/build-velox/src/get-velox.sh
+++ b/ep/build-velox/src/get-velox.sh
@@ -18,8 +18,8 @@ set -exu
CURRENT_DIR=$(cd "$(dirname "$BASH_SOURCE")"; pwd)
VELOX_REPO=https://github.com/IBM/velox.git
-VELOX_BRANCH=dft-2026_04_23
-VELOX_ENHANCED_BRANCH=ibm-2026_04_23
+VELOX_BRANCH=dft-2026_04_24
+VELOX_ENHANCED_BRANCH=ibm-2026_04_24
VELOX_HOME=""
RUN_SETUP_SCRIPT=ON
ENABLE_ENHANCED_FEATURES=OFF
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org