From 7bd85b53b948f1136428f82d3070d7556d6db840 Mon Sep 17 00:00:00 2001 From: Yuan Date: Fri, 6 Mar 2026 09:36:40 +0000 Subject: [PATCH 1/4] [VL] Test rebase Signed-off-by: Yuan --- ep/build-velox/src/get-velox.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ep/build-velox/src/get-velox.sh b/ep/build-velox/src/get-velox.sh index dbfe9f2d5b12..36cc106feb03 100755 --- a/ep/build-velox/src/get-velox.sh +++ b/ep/build-velox/src/get-velox.sh @@ -18,7 +18,7 @@ set -exu CURRENT_DIR=$(cd "$(dirname "$BASH_SOURCE")"; pwd) VELOX_REPO=https://github.com/IBM/velox.git -VELOX_BRANCH=dft-2026_03_03-iceberg +VELOX_BRANCH=dft-2026_03_06-iceberg VELOX_ENHANCED_BRANCH=ibm-2026_03_03 VELOX_HOME="" RUN_SETUP_SCRIPT=ON From d77e74e6903ac5e030f50f2e0bbc7028c3ca78d3 Mon Sep 17 00:00:00 2001 From: Yuan Date: Fri, 6 Mar 2026 11:07:49 +0000 Subject: [PATCH 2/4] fix Signed-off-by: Yuan --- cpp/velox/compute/VeloxBackend.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/velox/compute/VeloxBackend.cc b/cpp/velox/compute/VeloxBackend.cc index 45a64908e199..de9e9385f8f0 100644 --- a/cpp/velox/compute/VeloxBackend.cc +++ b/cpp/velox/compute/VeloxBackend.cc @@ -201,7 +201,7 @@ void VeloxBackend::init( // serde, for spill facebook::velox::serializer::presto::PrestoVectorSerde::registerVectorSerde(); } - if (!isRegisteredNamedVectorSerde(facebook::velox::VectorSerde::Kind::kPresto)) { + if (!isRegisteredNamedVectorSerde("Presto")) { // RSS shuffle serde. facebook::velox::serializer::presto::PrestoVectorSerde::registerNamedVectorSerde(); } From d183bd02ebef8473e43f5a0699ae9ca3f2dadc11 Mon Sep 17 00:00:00 2001 From: Yuan Date: Fri, 6 Mar 2026 11:48:22 +0000 Subject: [PATCH 3/4] fix Signed-off-by: Yuan --- cpp/velox/substrait/SubstraitToVeloxPlan.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cpp/velox/substrait/SubstraitToVeloxPlan.cc b/cpp/velox/substrait/SubstraitToVeloxPlan.cc index 727f4882e174..d71ab12528dd 100644 --- a/cpp/velox/substrait/SubstraitToVeloxPlan.cc +++ b/cpp/velox/substrait/SubstraitToVeloxPlan.cc @@ -1447,8 +1447,6 @@ core::PlanNodePtr SubstraitToVeloxPlanConverter::toVeloxPlan(const ::substrait:: SubstraitParser::parseColumnTypes(baseSchema, columnTypes); } - // Velox requires Filter Pushdown must being enabled. - bool filterPushdownEnabled = true; auto names = colNameList; auto types = veloxTypeList; @@ -1468,7 +1466,7 @@ core::PlanNodePtr SubstraitToVeloxPlanConverter::toVeloxPlan(const ::substrait:: } common::SubfieldFilters subfieldFilters; tableHandle = std::make_shared( - connectorId, "hive_table", filterPushdownEnabled, std::move(subfieldFilters), remainingFilter, tableSchema); + connectorId, "hive_table", std::move(subfieldFilters), remainingFilter, tableSchema); // Get assignments and out names. std::vector outNames; From 250c375f9ae14a8f39716d111fa81732f3cdcce7 Mon Sep 17 00:00:00 2001 From: Yuan Date: Fri, 6 Mar 2026 11:59:36 +0000 Subject: [PATCH 4/4] fix Signed-off-by: Yuan --- cpp/velox/shuffle/VeloxShuffleReader.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/velox/shuffle/VeloxShuffleReader.cc b/cpp/velox/shuffle/VeloxShuffleReader.cc index bfe11ef3e9f2..bc2481c0cae7 100644 --- a/cpp/velox/shuffle/VeloxShuffleReader.cc +++ b/cpp/velox/shuffle/VeloxShuffleReader.cc @@ -732,7 +732,7 @@ VeloxRssSortShuffleReaderDeserializer::VeloxRssSortShuffleReaderDeserializer( rowType_(rowType), batchSize_(batchSize), veloxCompressionType_(veloxCompressionType), - serde_(getNamedVectorSerde(facebook::velox::VectorSerde::Kind::kPresto)), + serde_(getNamedVectorSerde("presto")), deserializeTime_(deserializeTime) { serdeOptions_ = {false, veloxCompressionType_}; }