[VL]Daily Update Velox Version (20231203) (#3913)

apache · Dec 4, 2023 · 94c91c5 · 94c91c5
1 parent 92b31d5
commit 94c91c5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -95,6 +95,7 @@ add_compile_options(-Werror)
 add_compile_options(-Wno-error=parentheses)
 add_compile_options(-Wno-error=unused-function)
 add_compile_options(-Wno-error=unused-variable)
+add_compile_options(-Wno-strict-aliasing)
 
 if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
   add_compile_options(-Wno-error=unused-but-set-variable)

diff --git a/cpp/velox/memory/VeloxMemoryManager.cc b/cpp/velox/memory/VeloxMemoryManager.cc
@@ -79,7 +79,7 @@ class ListenableArbitrator : public velox::memory::MemoryArbitrator {
     std::lock_guard<std::recursive_mutex> l(mutex_); // FIXME: Do we have recursive locking for this mutex?
     auto pool = pools.at(0);
     const uint64_t oldCapacity = pool->capacity();
-    uint64_t spilledOut = pool->reclaim(targetBytes, status); // ignore the output
+    uint64_t spilledOut = pool->reclaim(targetBytes, 0, status); // ignore the output
     uint64_t shrunken = pool->shrink(0);
     const uint64_t newCapacity = pool->capacity();
     uint64_t total = oldCapacity - newCapacity;
@@ -175,14 +175,16 @@ VeloxMemoryManager::VeloxMemoryManager(
       true, // memory usage tracking
       true, // leak check
       false, // debug
+      false, // coreOnAllocationFailureEnabled
 #ifdef GLUTEN_ENABLE_HBM
       wrappedAlloc.get(),
 #else
       veloxAlloc,
 #endif
       afr.getKind(),
       0,
-      32 << 20};
+      32 << 20,
+      0};
   veloxMemoryManager_ = std::make_unique<velox::memory::MemoryManager>(mmOptions);
 
   veloxAggregatePool_ = veloxMemoryManager_->addRootPool(