Remove useless IDAsPathUpgrader (pingcap#6782)

ref pingcap#6233
guo-shaoge · Feb 10, 2023 · c6493d4 · c6493d4
1 parent 8981dfa
commit c6493d4
Show file tree

Hide file tree

Showing 115 changed files with 96 additions and 5,266 deletions.
diff --git a/dbms/src/CMakeLists.txt b/dbms/src/CMakeLists.txt
@@ -23,7 +23,6 @@ add_subdirectory (Storages)
 add_subdirectory (Parsers)
 add_subdirectory (IO)
 add_subdirectory (Functions)
-add_subdirectory (Interpreters)
 add_subdirectory (AggregateFunctions)
 add_subdirectory (Server)
 add_subdirectory (Client)

diff --git a/dbms/src/Common/CPUAffinityManager.cpp b/dbms/src/Common/CPUAffinityManager.cpp
@@ -24,9 +24,9 @@
 
 #include <Common/CPUAffinityManager.h>
 #include <Common/Exception.h>
+#include <Common/Logger.h>
 #include <Common/setThreadName.h>
 #include <Poco/DirectoryIterator.h>
-#include <Poco/Logger.h>
 #include <Poco/Util/LayeredConfiguration.h>
 #include <boost_wrapper/string.h>
 #include <common/logger_useful.h>
@@ -75,7 +75,7 @@ CPUAffinityManager & CPUAffinityManager::getInstance()
 CPUAffinityManager::CPUAffinityManager()
     : query_cpu_percent(0)
     , cpu_cores(0)
-    , log(&Poco::Logger::get("CPUAffinityManager"))
+    , log(Logger::get())
 {}
 
 #ifdef __linux__

diff --git a/dbms/src/Common/CPUAffinityManager.h b/dbms/src/Common/CPUAffinityManager.h
@@ -24,7 +24,6 @@
 
 namespace Poco
 {
-class Logger;
 namespace Util
 {
 class LayeredConfiguration;
@@ -33,10 +32,13 @@ class LayeredConfiguration;
 
 namespace DB
 {
+class Logger;
+using LoggerPtr = std::shared_ptr<Logger>;
 namespace tests
 {
 class CPUAffinityManagerTest_CPUAffinityManager_Test;
-}
+} // namespace tests
+
 struct CPUAffinityConfig
 {
     CPUAffinityConfig()
@@ -132,7 +134,7 @@ class CPUAffinityManager
     MAYBE_UNUSED_MEMBER int cpu_cores;
 
     std::vector<std::string> query_threads;
-    Poco::Logger * log;
+    LoggerPtr log;
 
     CPUAffinityManager();
     // Disable copy and move

diff --git a/dbms/src/Common/Config/ConfigProcessor.h b/dbms/src/Common/Config/ConfigProcessor.h
@@ -18,6 +18,7 @@
 #include <Poco/ConsoleChannel.h>
 #include <Poco/DirectoryIterator.h>
 #include <Poco/File.h>
+#include <Poco/Logger.h>
 #include <Poco/Path.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <common/logger_useful.h>

diff --git a/dbms/src/Common/FileChecker.h b/dbms/src/Common/FileChecker.h
@@ -15,8 +15,10 @@
 #pragma once
 
 #include <Poco/File.h>
+#include <Poco/Logger.h>
 #include <common/logger_useful.h>
 
+#include <map>
 #include <string>
 
 

diff --git a/dbms/src/Common/LRUCache.h b/dbms/src/Common/LRUCache.h
@@ -315,7 +315,7 @@ class LRUCache
             {
                 // If queue.insert() throws exception, cells and queue will be in inconsistent.
                 cells.erase(it);
-                tryLogCurrentException(Logger::get("LRUCache"), "queue.insert throw exception");
+                tryLogCurrentException(Logger::get(), "queue.insert throw exception");
                 throw;
             }
         }

diff --git a/dbms/src/Common/MyTime.cpp b/dbms/src/Common/MyTime.cpp
@@ -2647,7 +2647,7 @@ std::optional<UInt64> MyDateTimeParser::parseAsPackedUInt(const StringRef & str_
         if (!f(ctx, my_time))
         {
 #ifndef NDEBUG
-            LOG_TRACE(&Poco::Logger::get("MyDateTimeParser"),
+            LOG_TRACE(Logger::get(),
                       "parse error, [str={}] [format={}] [parse_pos={}]",
                       ctx.view.toString(),
                       format,

diff --git a/dbms/src/Common/getNumberOfCPUCores.cpp b/dbms/src/Common/getNumberOfCPUCores.cpp
@@ -62,9 +62,8 @@ void computeAndSetNumberOfPhysicalCPUCores(UInt16 number_of_logical_cpu_cores_,
     auto hardware_logical_cpu_cores = std::thread::hardware_concurrency();
     UInt16 physical_cpu_cores = number_of_logical_cpu_cores_ / (hardware_logical_cpu_cores / number_of_hardware_physical_cores);
     CPUCores::number_of_physical_cpu_cores = physical_cpu_cores > 0 ? physical_cpu_cores : 1;
-    auto log = DB::Logger::get("CPUCores");
     LOG_INFO(
-        log,
+        DB::Logger::get(),
         "logical cpu cores: {}, hardware logical cpu cores: {}, hardware physical cpu cores: {}, physical cpu cores: {}, number_of_physical_cpu_cores: {}",
         number_of_logical_cpu_cores_,
         hardware_logical_cpu_cores,

diff --git a/dbms/src/Flash/Mpp/MPPHandler.h b/dbms/src/Flash/Mpp/MPPHandler.h
@@ -24,12 +24,12 @@ class MPPHandler
 {
     const mpp::DispatchTaskRequest & task_request;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
 public:
-    MPPHandler(const mpp::DispatchTaskRequest & task_request_)
+    explicit MPPHandler(const mpp::DispatchTaskRequest & task_request_)
         : task_request(task_request_)
-        , log(&Poco::Logger::get("MPPHandler"))
+        , log(Logger::get())
     {}
     grpc::Status execute(const ContextPtr & context, mpp::DispatchTaskResponse * response);
     void handleError(const MPPTaskPtr & task, String error);

diff --git a/dbms/src/Interpreters/CMakeLists.txt b/dbms/src/Interpreters/CMakeLists.txt