diff --git a/cpp/velox/memory/VeloxMemoryManager.cc b/cpp/velox/memory/VeloxMemoryManager.cc index 3f6682e2cf26..0d22a9d0891f 100644 --- a/cpp/velox/memory/VeloxMemoryManager.cc +++ b/cpp/velox/memory/VeloxMemoryManager.cc @@ -63,8 +63,11 @@ class ListenableArbitrator : public velox::memory::MemoryArbitrator { return true; } - uint64_t shrinkCapacity(const std::vector>& pools, uint64_t targetBytes) - override { + uint64_t shrinkCapacity( + const std::vector>& pools, + uint64_t targetBytes, + bool allowSpill = true, + bool allowAbort = false) override { facebook::velox::exec::MemoryReclaimer::Stats status; GLUTEN_CHECK(pools.size() == 1, "Should shrink a single pool at a time"); std::lock_guard l(mutex_); // FIXME: Do we have recursive locking for this mutex? diff --git a/ep/build-velox/src/get_velox.sh b/ep/build-velox/src/get_velox.sh index e6b3a171631d..2845cfa6414d 100755 --- a/ep/build-velox/src/get_velox.sh +++ b/ep/build-velox/src/get_velox.sh @@ -17,7 +17,7 @@ set -exu VELOX_REPO=https://github.com/oap-project/velox.git -VELOX_BRANCH=2024_03_12 +VELOX_BRANCH=2024_03_13 VELOX_HOME="" #Set on run gluten on HDFS