diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 09f7a42b893d..a9adf05f8804 100644 --- 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 index 17b402f13fee..1655195201cc 100644 --- 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 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,6 +175,7 @@ VeloxMemoryManager::VeloxMemoryManager( true, // memory usage tracking true, // leak check false, // debug + false, // coreOnAllocationFailureEnabled #ifdef GLUTEN_ENABLE_HBM wrappedAlloc.get(), #else @@ -182,7 +183,8 @@ VeloxMemoryManager::VeloxMemoryManager( #endif afr.getKind(), 0, - 32 << 20}; + 32 << 20, + 0}; veloxMemoryManager_ = std::make_unique(mmOptions); veloxAggregatePool_ = veloxMemoryManager_->addRootPool(