Rename filename to UniThreadPool to fix build on mac (#6960)

ref #6827
pingcap · Mar 6, 2023 · 9ba4947 · 9ba4947
1 parent e511752
commit 9ba4947
Show file tree

Hide file tree

Showing 17 changed files with 8 additions and 1,554 deletions.
diff --git a/dbms/src/Common/ThreadFactory.h b/dbms/src/Common/ThreadFactory.h
@@ -17,7 +17,6 @@
 #include <Common/MemoryTrackerSetter.h>
 #include <Common/TiFlashMetrics.h>
 #include <Common/setThreadName.h>
-#include <common/ThreadPool.h>
 
 #include <thread>
 

diff --git a/dbms/src/Common/ThreadManager.cpp b/dbms/src/Common/ThreadManager.cpp
@@ -16,6 +16,7 @@
 #include <Common/ThreadFactory.h>
 #include <Common/ThreadManager.h>
 #include <Common/wrapInvocable.h>
+#include <common/ThreadPool.h>
 
 namespace DB
 {

diff --git a/dbms/src/Common/ThreadPool.cpp → dbms/src/Common/UniThreadPool.cpp b/dbms/src/Common/ThreadPool.cpp → dbms/src/Common/UniThreadPool.cpp
@@ -14,7 +14,7 @@
 
 #include <Common/CurrentMetrics.h>
 #include <Common/Exception.h>
-#include <Common/ThreadPool.h>
+#include <Common/UniThreadPool.h>
 #include <Common/setThreadName.h>
 #include <Poco/Util/Application.h>
 #include <Poco/Util/LayeredConfiguration.h>
@@ -365,4 +365,4 @@ GlobalThreadPool & GlobalThreadPool::instance()
 
     return *the_instance;
 }
-} // namespace DB
+} // namespace DB
diff --git a/dbms/src/Common/ThreadPool.h → dbms/src/Common/UniThreadPool.h b/dbms/src/Common/ThreadPool.h → dbms/src/Common/UniThreadPool.h
diff --git a/dbms/src/Common/tests/CMakeLists.txt b/dbms/src/Common/tests/CMakeLists.txt
@@ -30,12 +30,6 @@ target_link_libraries (hash_table tiflash_common_io)
 add_executable (small_table small_table.cpp)
 target_link_libraries (small_table tiflash_common_io)
 
-add_executable (parallel_aggregation parallel_aggregation.cpp)
-target_link_libraries (parallel_aggregation tiflash_common_io)
-
-add_executable (parallel_aggregation2 parallel_aggregation2.cpp)
-target_link_libraries (parallel_aggregation2 tiflash_common_io)
-
 add_executable (int_hashes_perf int_hashes_perf.cpp AvalancheTest.cpp Random.cpp)
 target_link_libraries (int_hashes_perf tiflash_common_io)
 
@@ -58,12 +52,6 @@ target_link_libraries (arena_with_free_lists tiflash_common_io)
 add_executable (pod_array pod_array.cpp)
 target_link_libraries (pod_array tiflash_common_io)
 
-add_executable (thread_creation_latency thread_creation_latency.cpp)
-target_link_libraries (thread_creation_latency tiflash_common_io)
-
-add_executable (thread_pool thread_pool.cpp)
-target_link_libraries (thread_pool tiflash_common_io)
-
 add_executable (array_cache array_cache.cpp)
 target_link_libraries (array_cache tiflash_common_io)
 

diff --git a/dbms/src/Common/tests/gtest_rw_lock.cpp b/dbms/src/Common/tests/gtest_rw_lock.cpp
@@ -17,7 +17,6 @@
 #include <Common/Stopwatch.h>
 #include <Core/Types.h>
 #include <IO/WriteHelpers.h>
-#include <common/ThreadPool.h>
 #include <gtest/gtest.h>
 
 #include <atomic>