Revert "Move SharedArbitrator back to memory namespace for Alpha depe…

…ndency (facebookincubator#8954)" This reverts commit 07a1518.
PHILO-HE · Mar 7, 2024 · a3cfe7c · a3cfe7c
1 parent d40b4b5
commit a3cfe7c
Show file tree

Hide file tree

Showing 13 changed files with 214 additions and 249 deletions.
diff --git a/velox/common/memory/CMakeLists.txt b/velox/common/memory/CMakeLists.txt
@@ -28,7 +28,6 @@ add_library(
   MemoryPool.cpp
   MmapAllocator.cpp
   MmapArena.cpp
-  SharedArbitrator.cpp
   StreamArena.cpp)
 
 target_link_libraries(

diff --git a/velox/common/memory/SharedArbitrator.h b/velox/common/memory/SharedArbitrator.h
diff --git a/velox/common/memory/tests/CMakeLists.txt b/velox/common/memory/tests/CMakeLists.txt
@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 include(GoogleTest)
-
 add_executable(
   velox_memory_test
   AllocationTest.cpp
@@ -26,7 +25,6 @@ add_executable(
   MemoryManagerTest.cpp
   MemoryPoolTest.cpp
   MockSharedArbitratorTest.cpp
-  SharedArbitratorTest.cpp
   StreamArenaTest.cpp)
 
 target_link_libraries(

diff --git a/velox/common/memory/tests/MemoryArbitratorTest.cpp b/velox/common/memory/tests/MemoryArbitratorTest.cpp
@@ -22,7 +22,7 @@
 #include "velox/common/memory/MallocAllocator.h"
 #include "velox/common/memory/Memory.h"
 #include "velox/common/memory/MemoryArbitrator.h"
-#include "velox/common/memory/SharedArbitrator.h"
+#include "velox/exec/SharedArbitrator.h"
 
 using namespace ::testing;
 
@@ -112,8 +112,8 @@ TEST_F(MemoryArbitrationTest, queryMemoryCapacity) {
     });
   }
   {
-    // Reserved memory is e`nforced when SharedMemoryArbitrator is used.
-    SharedArbitrator::registerFactory();
+    // Reserved memory is enforced when SharedMemoryArbitrator is used.
+    exec::SharedArbitrator::registerFactory();
     MemoryManagerOptions options;
     options.allocatorCapacity = 8L << 20;
     options.arbitratorCapacity = 4L << 20;
@@ -147,7 +147,7 @@ TEST_F(MemoryArbitrationTest, queryMemoryCapacity) {
     ASSERT_EQ(manager.arbitrator()->shrinkCapacity(leafPool.get(), 0), 2 << 20);
     ASSERT_EQ(rootPool->capacity(), 0);
     ASSERT_EQ(leafPool->capacity(), 0);
-    memory::SharedArbitrator::unregisterFactory();
+    exec::SharedArbitrator::unregisterFactory();
   }
 }
 

diff --git a/velox/common/memory/tests/MemoryManagerTest.cpp b/velox/common/memory/tests/MemoryManagerTest.cpp
@@ -23,7 +23,7 @@
 #include "velox/common/base/tests/GTestUtils.h"
 #include "velox/common/memory/MallocAllocator.h"
 #include "velox/common/memory/Memory.h"
-#include "velox/common/memory/SharedArbitrator.h"
+#include "velox/exec/SharedArbitrator.h"
 
 DECLARE_int32(velox_memory_num_shared_leaf_pools);
 DECLARE_bool(velox_enable_memory_usage_track_in_default_memory_pool);
@@ -43,7 +43,7 @@ MemoryManager& toMemoryManager(MemoryManager& manager) {
 class MemoryManagerTest : public testing::Test {
  protected:
   static void SetUpTestCase() {
-    SharedArbitrator::registerFactory();
+    exec::SharedArbitrator::registerFactory();
   }
 
   inline static const std::string arbitratorKind_{"SHARED"};

diff --git a/velox/common/memory/tests/MemoryPoolTest.cpp b/velox/common/memory/tests/MemoryPoolTest.cpp
@@ -25,8 +25,8 @@
 #include "velox/common/memory/Memory.h"
 #include "velox/common/memory/MemoryPool.h"
 #include "velox/common/memory/MmapAllocator.h"
-#include "velox/common/memory/SharedArbitrator.h"
 #include "velox/common/testutil/TestValue.h"
+#include "velox/exec/SharedArbitrator.h"
 
 DECLARE_bool(velox_memory_leak_check_enabled);
 DECLARE_bool(velox_memory_pool_debug_enabled);
@@ -76,7 +76,7 @@ class MemoryPoolTest : public testing::TestWithParam<TestParam> {
  protected:
   static constexpr uint64_t kDefaultCapacity = 8 * GB; // 8GB
   static void SetUpTestCase() {
-    SharedArbitrator::registerFactory();
+    exec::SharedArbitrator::registerFactory();
     FLAGS_velox_memory_leak_check_enabled = true;
     TestValue::enable();
   }

diff --git a/velox/common/memory/tests/MockSharedArbitratorTest.cpp b/velox/common/memory/tests/MockSharedArbitratorTest.cpp
@@ -26,8 +26,8 @@
 #include "velox/common/memory/MallocAllocator.h"
 #include "velox/common/memory/Memory.h"
 #include "velox/common/memory/MemoryArbitrator.h"
-#include "velox/common/memory/SharedArbitrator.h"
 #include "velox/common/testutil/TestValue.h"
+#include "velox/exec/SharedArbitrator.h"
 #include "velox/exec/tests/utils/PlanBuilder.h"
 #include "velox/exec/tests/utils/TempDirectoryPath.h"
 
@@ -390,7 +390,7 @@ MockTask::~MockTask() {
 class MockSharedArbitrationTest : public testing::Test {
  protected:
   static void SetUpTestCase() {
-    SharedArbitrator::registerFactory();
+    exec::SharedArbitrator::registerFactory();
     FLAGS_velox_memory_leak_check_enabled = true;
     TestValue::enable();
   }

diff --git a/velox/exec/CMakeLists.txt b/velox/exec/CMakeLists.txt
@@ -61,6 +61,7 @@ add_library(
   ProbeOperatorState.cpp
   RowContainer.cpp
   RowNumber.cpp
+  SharedArbitrator.cpp
   SortBuffer.cpp
   SortedAggregations.cpp
   SortWindowBuild.cpp

diff --git a/velox/common/memory/SharedArbitrator.cpp → velox/exec/SharedArbitrator.cpp b/velox/common/memory/SharedArbitrator.cpp → velox/exec/SharedArbitrator.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "velox/common/memory/SharedArbitrator.h"
+#include "velox/exec/SharedArbitrator.h"
 
 #include "velox/common/base/Counters.h"
 #include "velox/common/base/Exceptions.h"
@@ -26,7 +26,7 @@
 
 using facebook::velox::common::testutil::TestValue;
 
-namespace facebook::velox::memory {
+namespace facebook::velox::exec {
 
 namespace {
 
@@ -708,4 +708,4 @@ void SharedArbitrator::registerFactory() {
 void SharedArbitrator::unregisterFactory() {
   MemoryArbitrator::unregisterFactory(kind_);
 }
-} // namespace facebook::velox::memory
+} // namespace facebook::velox::exec