Merge pull request #41060 from ClickHouse/fix-odr-vialation

Try to fix ODR for Loggers class

programs/keeper/CMakeLists.txt

@@ -103,6 +103,7 @@ if (BUILD_STANDALONE_KEEPER)
 
     # Remove some redundant dependencies
     target_compile_definitions (clickhouse-keeper PRIVATE -DKEEPER_STANDALONE_BUILD)
+    target_compile_definitions (clickhouse-keeper PUBLIC -DWITHOUT_TEXT_LOG)
 
     target_include_directories(clickhouse-keeper PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../../src") # uses includes from src directory
     target_include_directories(clickhouse-keeper PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/../../src/Core/include") # uses some includes from core

src/Loggers/CMakeLists.txt

@@ -2,9 +2,9 @@ add_headers_and_sources(loggers .)
 
 # Standard version depends on DBMS and works with text log
 add_library(loggers ${loggers_sources} ${loggers_headers})
-target_compile_definitions(loggers PUBLIC WITH_TEXT_LOG=1)
 target_link_libraries(loggers PRIVATE dbms clickhouse_common_io)
 
 # Lightweight version doesn't work with textlog and also doesn't depend on DBMS
 add_library(loggers_no_text_log ${loggers_sources} ${loggers_headers})
+target_compile_definitions(loggers_no_text_log PUBLIC WITHOUT_TEXT_LOG=1)
 target_link_libraries(loggers_no_text_log PRIVATE clickhouse_common_io)

src/Loggers/Loggers.cpp

@@ -10,7 +10,7 @@
 #include <Poco/Logger.h>
 #include <Poco/Net/RemoteSyslogChannel.h>
 
-#ifdef WITH_TEXT_LOG
+#ifndef WITHOUT_TEXT_LOG
     #include <Interpreters/TextLog.h>
 #endif
 
@@ -34,7 +34,7 @@ static std::string createDirectory(const std::string & file)
     return path;
 }
 
-#ifdef WITH_TEXT_LOG
+#ifndef WITHOUT_TEXT_LOG
 void Loggers::setTextLog(std::shared_ptr<DB::TextLog> log, int max_priority)
 {
     text_log = log;
@@ -44,7 +44,7 @@ void Loggers::setTextLog(std::shared_ptr<DB::TextLog> log, int max_priority)
 
 void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Logger & logger /*_root*/, const std::string & cmd_name)
 {
-#ifdef WITH_TEXT_LOG
+#ifndef WITHOUT_TEXT_LOG
     if (split)
         if (auto log = text_log.lock())
             split->addTextLog(log, text_log_max_priority);

src/Loggers/Loggers.h

@@ -7,7 +7,7 @@
 #include <Poco/Util/Application.h>
 #include "OwnSplitChannel.h"
 
-#ifdef WITH_TEXT_LOG
+#ifndef WITHOUT_TEXT_LOG
 namespace DB
 {
     class TextLog;
@@ -29,7 +29,7 @@ public:
     /// Close log files. On next log write files will be reopened.
     void closeLogs(Poco::Logger & logger);
 
-#ifdef WITH_TEXT_LOG
+#ifndef WITHOUT_TEXT_LOG
     void setTextLog(std::shared_ptr<DB::TextLog> log, int max_priority);
 #endif
 
@@ -41,7 +41,7 @@ private:
     /// Previous value of logger element in config. It is used to reinitialize loggers whenever the value changed.
     std::string config_logger;
 
-#ifdef WITH_TEXT_LOG
+#ifndef WITHOUT_TEXT_LOG
     std::weak_ptr<DB::TextLog> text_log;
     int text_log_max_priority = -1;
 #endif

src/Loggers/OwnSplitChannel.cpp

@@ -21,7 +21,7 @@ namespace DB
 void OwnSplitChannel::log(const Poco::Message & msg)
 {
 
-#ifdef WITH_TEXT_LOG
+#ifndef WITHOUT_TEXT_LOG
     auto logs_queue = CurrentThread::getInternalTextLogsQueue();
 
     if (channels.empty() && (logs_queue == nullptr || !logs_queue->isNeeded(msg.getPriority(), msg.getSource())))
@@ -89,7 +89,7 @@ void OwnSplitChannel::logSplit(const Poco::Message & msg)
             channel.first->log(msg); // ordinary child
     }
 
-#ifdef WITH_TEXT_LOG
+#ifndef WITHOUT_TEXT_LOG
     auto logs_queue = CurrentThread::getInternalTextLogsQueue();
 
     /// Log to "TCP queue" if message is not too noisy
@@ -150,7 +150,7 @@ void OwnSplitChannel::addChannel(Poco::AutoPtr<Poco::Channel> channel, const std
     channels.emplace(name, ExtendedChannelPtrPair(std::move(channel), dynamic_cast<ExtendedLogChannel *>(channel.get())));
 }
 
-#ifdef WITH_TEXT_LOG
+#ifndef WITHOUT_TEXT_LOG
 void OwnSplitChannel::addTextLog(std::shared_ptr<DB::TextLog> log, int max_priority)
 {
     std::lock_guard<std::mutex> lock(text_log_mutex);

src/Loggers/OwnSplitChannel.h

@@ -7,7 +7,7 @@
 #include <Poco/Channel.h>
 #include "ExtendedLogChannel.h"
 
-#ifdef WITH_TEXT_LOG
+#ifndef WITHOUT_TEXT_LOG
 namespace DB
 {
     class TextLog;
@@ -30,7 +30,7 @@ public:
     /// Adds a child channel
     void addChannel(Poco::AutoPtr<Poco::Channel> channel, const std::string & name);
 
-#ifdef WITH_TEXT_LOG
+#ifndef WITHOUT_TEXT_LOG
     void addTextLog(std::shared_ptr<DB::TextLog> log, int max_priority);
 #endif
 
@@ -47,7 +47,7 @@ private:
 
     std::mutex text_log_mutex;
 
-#ifdef WITH_TEXT_LOG
+#ifndef WITHOUT_TEXT_LOG
     std::weak_ptr<DB::TextLog> text_log;
     std::atomic<int> text_log_max_priority = -1;
 #endif