Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions cpp/velox/compute/WholeStageResultIterator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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};
Expand All @@ -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());
Expand Down
4 changes: 2 additions & 2 deletions ep/build-velox/src/get_velox.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down