From c990ad5cec9e1dbbecb3a36e6f4a20b621239d31 Mon Sep 17 00:00:00 2001 From: Jialiang Tan Date: Fri, 20 Sep 2024 10:44:20 -0700 Subject: [PATCH] [native] Remove dependencies of old arbitrator config --- presto-native-execution/presto_cpp/main/PrestoServer.cpp | 2 +- .../presto_cpp/main/tests/TaskManagerTest.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/presto-native-execution/presto_cpp/main/PrestoServer.cpp b/presto-native-execution/presto_cpp/main/PrestoServer.cpp index 6716546e8324..3c919b744892 100644 --- a/presto-native-execution/presto_cpp/main/PrestoServer.cpp +++ b/presto-native-execution/presto_cpp/main/PrestoServer.cpp @@ -739,7 +739,7 @@ void PrestoServer::initializeThreadPools() { #ifdef __linux__ threadFactory = std::make_shared("Driver"); #else - VELOX_FAIL("Batch scheduling policy can only be enabled on Linux") + VELOX_FAIL("Batch scheduling policy can only be enabled on Linux"); #endif } else { threadFactory = std::make_shared("Driver"); diff --git a/presto-native-execution/presto_cpp/main/tests/TaskManagerTest.cpp b/presto-native-execution/presto_cpp/main/tests/TaskManagerTest.cpp index 6602ad104510..928ed2d2ce9e 100644 --- a/presto-native-execution/presto_cpp/main/tests/TaskManagerTest.cpp +++ b/presto-native-execution/presto_cpp/main/tests/TaskManagerTest.cpp @@ -198,7 +198,10 @@ class TaskManagerTest : public testing::Test { velox::memory::MemoryManagerOptions options; options.allocatorCapacity = 8L << 30; options.arbitratorCapacity = 6L << 30; - options.memoryPoolInitCapacity = 512 << 20; + options.extraArbitratorConfigs = { + {std::string(velox::memory::SharedArbitrator::ExtraConfig:: + kMemoryPoolInitialCapacity), + "512MB"}}; options.arbitratorKind = "SHARED"; options.checkUsageLeak = true; options.arbitrationStateCheckCb = memoryArbitrationStateCheck;