diff --git a/cpp/velox/compute/VeloxBackend.cc b/cpp/velox/compute/VeloxBackend.cc index d8089d865369..04faab8f3ac5 100644 --- a/cpp/velox/compute/VeloxBackend.cc +++ b/cpp/velox/compute/VeloxBackend.cc @@ -210,7 +210,9 @@ void VeloxBackend::init( memoryManagerCapacity = facebook::velox::memory::kMaxMemory; } LOG(INFO) << "Setting global Velox memory manager with capacity: " << memoryManagerCapacity; - facebook::velox::memory::initializeMemoryManager({.allocatorCapacity = memoryManagerCapacity}); + facebook::velox::memory::MemoryManager::Options options; + options.allocatorCapacity = memoryManagerCapacity; + facebook::velox::memory::initializeMemoryManager(options); // local cache persistent relies on the cache pool from root memory pool so we need to init this // after the memory manager instanced diff --git a/cpp/velox/memory/VeloxMemoryManager.cc b/cpp/velox/memory/VeloxMemoryManager.cc index 840f4ca7952b..ec568fa6a6dd 100644 --- a/cpp/velox/memory/VeloxMemoryManager.cc +++ b/cpp/velox/memory/VeloxMemoryManager.cc @@ -234,14 +234,14 @@ VeloxMemoryManager::VeloxMemoryManager( auto checkUsageLeak = backendConf.get(kCheckUsageLeak, kCheckUsageLeakDefault); ArbitratorFactoryRegister afr(listener_.get()); - velox::memory::MemoryManagerOptions mmOptions{ - .alignment = velox::memory::MemoryAllocator::kMaxAlignment, - .trackDefaultUsage = true, // memory usage tracking - .checkUsageLeak = checkUsageLeak, // leak check - .coreOnAllocationFailureEnabled = false, - .allocatorCapacity = velox::memory::kMaxMemory, - .arbitratorKind = afr.getKind(), - .extraArbitratorConfigs = getExtraArbitratorConfigs(backendConf)}; + velox::memory::MemoryManager::Options mmOptions; + mmOptions.alignment = velox::memory::MemoryAllocator::kMaxAlignment; + mmOptions.trackDefaultUsage = true; // memory usage tracking + mmOptions.checkUsageLeak = checkUsageLeak; // leak check + mmOptions.coreOnAllocationFailureEnabled = false; + mmOptions.allocatorCapacity = velox::memory::kMaxMemory; + mmOptions.arbitratorKind = afr.getKind(); + mmOptions.extraArbitratorConfigs = getExtraArbitratorConfigs(backendConf); veloxMemoryManager_ = std::make_unique(mmOptions); veloxAggregatePool_ = veloxMemoryManager_->addRootPool( diff --git a/ep/build-velox/src/get_velox.sh b/ep/build-velox/src/get_velox.sh index 2cd318001862..76696022ea83 100755 --- a/ep/build-velox/src/get_velox.sh +++ b/ep/build-velox/src/get_velox.sh @@ -17,11 +17,11 @@ set -exu VELOX_REPO=https://github.com/oap-project/velox.git -VELOX_BRANCH=2025_09_04 +VELOX_BRANCH=2025_09_06 VELOX_HOME="" RUN_SETUP_SCRIPT=ON VELOX_ENHANCED_REPO=https://github.com/IBM/velox.git -VELOX_ENHANCED_BRANCH=ibm-2025_09_04 +VELOX_ENHANCED_BRANCH=ibm-2025_09_06 ENABLE_ENHANCED_FEATURES=OFF # Developer use only for testing Velox PR.