From bc820c9098b3cd1ca7819814c86712daf728a0d9 Mon Sep 17 00:00:00 2001
From: glutenperfbot <glutenperfbot@glutenproject-internal.com>
Date: Mon, 6 Oct 2025 02:30:37 +0000
Subject: [PATCH 1/2] [GLUTEN-6887][VL] Daily Update Velox Version (2025_10_06)

Upstream Velox's New Commits:
6dce9b24e by Xiaoxuan Meng, refactor: Move driver creation into task init from the first next call (#14988)

Signed-off-by: glutenperfbot <glutenperfbot@glutenproject-internal.com>
---
 ep/build-velox/src/get_velox.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ep/build-velox/src/get_velox.sh b/ep/build-velox/src/get_velox.sh
index 191bc4e48545..019c38fd7697 100755
--- a/ep/build-velox/src/get_velox.sh
+++ b/ep/build-velox/src/get_velox.sh
@@ -18,11 +18,11 @@ set -exu
 
 CURRENT_DIR=$(cd "$(dirname "$BASH_SOURCE")"; pwd)
 VELOX_REPO=https://github.com/oap-project/velox.git
-VELOX_BRANCH=2025_10_02
+VELOX_BRANCH=2025_10_06
 VELOX_HOME=""
 RUN_SETUP_SCRIPT=ON
 VELOX_ENHANCED_REPO=https://github.com/IBM/velox.git
-VELOX_ENHANCED_BRANCH=ibm-2025_10_02
+VELOX_ENHANCED_BRANCH=ibm-2025_10_06
 ENABLE_ENHANCED_FEATURES=OFF
 
 # Developer use only for testing Velox PR.

From 9bc45d1196f44c77dc130f42bca948a16b3aedba Mon Sep 17 00:00:00 2001
From: Rong Ma <marong@apache.org>
Date: Mon, 6 Oct 2025 10:59:21 +0800
Subject: [PATCH 2/2] fix compile

---
 cpp/velox/compute/WholeStageResultIterator.cc | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/cpp/velox/compute/WholeStageResultIterator.cc b/cpp/velox/compute/WholeStageResultIterator.cc
index 39b34ae81d6d..fb3e1550a8f1 100644
--- a/cpp/velox/compute/WholeStageResultIterator.cc
+++ b/cpp/velox/compute/WholeStageResultIterator.cc
@@ -22,10 +22,10 @@
 #include "velox/connectors/hive/HiveConnectorSplit.h"
 #include "velox/exec/PlanNodeStats.h"
 #ifdef GLUTEN_ENABLE_GPU
-#include <mutex>
 #include <cudf/io/types.hpp>
-#include "velox/experimental/cudf/exec/ToCudf.h"
+#include <mutex>
 #include "velox/experimental/cudf/connectors/hive/CudfHiveConnectorSplit.h"
+#include "velox/experimental/cudf/exec/ToCudf.h"
 #endif
 
 using namespace facebook;
@@ -95,6 +95,12 @@ WholeStageResultIterator::WholeStageResultIterator(
   }
 #endif
 
+  auto fileSystem = velox::filesystems::getFileSystem(spillDir, nullptr);
+  GLUTEN_CHECK(fileSystem != nullptr, "File System for spilling is null!");
+  fileSystem->mkdir(spillDir);
+  velox::common::SpillDiskOptions spillOpts{
+      .spillDirPath = spillDir, .spillDirCreated = true, .spillDirCreateCb = nullptr};
+
   // Create task instance.
   std::unordered_set<velox::core::PlanNodeId> emptySet;
   velox::core::PlanFragment planFragment{planNode, velox::core::ExecutionStrategy::kUngrouped, 1, emptySet};
@@ -108,14 +114,14 @@ WholeStageResultIterator::WholeStageResultIterator(
       std::move(planFragment),
       0,
       std::move(queryCtx),
-      velox::exec::Task::ExecutionMode::kSerial);
+      velox::exec::Task::ExecutionMode::kSerial,
+      /*consumer=*/velox::exec::Consumer{},
+      /*memoryArbitrationPriority=*/0,
+      /*spillDiskOpts=*/spillOpts,
+      /*onError=*/nullptr);
   if (!task_->supportSerialExecutionMode()) {
     throw std::runtime_error("Task doesn't support single threaded execution: " + planNode->toString());
   }
-  auto fileSystem = velox::filesystems::getFileSystem(spillDir, nullptr);
-  GLUTEN_CHECK(fileSystem != nullptr, "File System for spilling is null!");
-  fileSystem->mkdir(spillDir);
-  task_->setSpillDirectory(spillDir);
 
   // Generate splits for all scan nodes.
   splits_.reserve(scanInfos.size());