[VL] Daily Update Velox Version (2024_03_13)

Signed-off-by: glutenperfbot <glutenperfbot@intel-internal.com>
apache · Mar 13, 2024 · d9d8e4d · d9d8e4d
1 parent fd8ff2d
commit d9d8e4d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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<std::shared_ptr<velox::memory::MemoryPool>>& pools, uint64_t targetBytes)
-      override {
+  uint64_t shrinkCapacity(
+      const std::vector<std::shared_ptr<velox::memory::MemoryPool>>& 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<std::recursive_mutex> 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
@@ -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