Merge pull request ClickHouse#78651 from ClickHouse/optimize_log_series_limiter

Optimize LogSeriesLimiter

Author: Michicosun

src/Common/LoggingFormatStringHelpers.cpp

@@ -16,13 +16,6 @@ std::mutex LogFrequencyLimiterImpl::mutex;
 void LogFrequencyLimiterImpl::log(Poco::Message & message)
 {
     std::string_view pattern = message.getFormatString();
-    if (pattern.empty())
-    {
-        /// Do not filter messages without a format string
-        if (auto * channel = logger->getChannel())
-            channel->log(message);
-        return;
-    }
 
     SipHash hash;
     hash.update(logger->name());
@@ -150,17 +143,16 @@ LogSeriesLimiter::LogSeriesLimiter(LoggerPtr logger_, size_t allowed_count_, tim
     ++total_count;
 }
 
-void LogSeriesLimiter::log(Poco::Message & message)
+LogSeriesLimiter * LogSeriesLimiter::getChannel()
 {
-    std::string_view pattern = message.getFormatString();
-    if (pattern.empty())
-    {
-        /// Do not filter messages without a format string
-        if (auto * channel = logger->getChannel())
-            channel->log(message);
-        return;
-    }
+    if (!accepted)
+        return nullptr;
+
+    return this;
+}
 
+void LogSeriesLimiter::log(Poco::Message & message)
+{
     if (!accepted)
         return;
 

src/Common/LoggingFormatStringHelpers.h

@@ -281,9 +281,9 @@ class LogSeriesLimiter
 
     LogSeriesLimiter * operator->() { return this; }
     bool is(Poco::Message::Priority priority) { return logger->is(priority); }
-    LogSeriesLimiter * getChannel() {return this; }
     const String & name() const { return logger->name(); }
 
+    LogSeriesLimiter * getChannel();
     void log(Poco::Message & message);
 
     LoggerPtr getLogger() { return logger; }