Merge branch 'master' of github.com:ClickHouse/ClickHouse into fix-pretty-glue

Author: nikitamikhaylov

docs/en/sql-reference/formats.mdx

@@ -4,6 +4,7 @@ sidebar_position: 50
 sidebar_label: 'Input and Output Formats'
 title: 'Formats for Input and Output Data'
 description: 'Supported input and output formats'
+hide_title: true
 ---
 
 import Content from '../interfaces/formats.md';

docs/en/sql-reference/functions/geo/s2.md

@@ -9,7 +9,7 @@ description: 'Documentation for functions for working with S2 indexes'
 
 ## S2Index {#s2index}
 
-[S2](https://s2geometry.io/) is a geographical indexing system where all geographical data is represented on a three-dimensional sphere (similar to a globe).
+[S2](https://s2geometry.io/) is a geographical indexing system where all geographical data is represented on a sphere (similar to a globe).
 
 In the S2 library points are represented as the S2 Index - a specific number which encodes internally a point on the surface of a unit sphere, unlike traditional (latitude, longitude) pairs. To get the S2 point index for a given point specified in the format (latitude, longitude) use the [geoToS2](#geotos2) function. Also, you can use the [s2ToGeo](#s2togeo) function for getting geographical coordinates corresponding to the specified S2 point index.
 

src/Client/LocalConnection.cpp

@@ -466,23 +466,6 @@ bool LocalConnection::poll(size_t)
         return true;
     }
 
-    // pushing executors have to be finished before the final stats are sent
-    if (state->is_finished)
-    {
-        if (state->executor)
-        {
-            // no op
-        }
-        else if (state->pushing_async_executor)
-        {
-            state->pushing_async_executor->finish();
-        }
-        else if (state->pushing_executor)
-        {
-            state->pushing_executor->finish();
-        }
-    }
-
     if (state->is_finished && !state->sent_totals)
     {
         state->sent_totals = true;
@@ -531,7 +514,7 @@ bool LocalConnection::poll(size_t)
     {
         state->sent_profile_events = true;
 
-        if (send_profile_events && (state->executor || state->pushing_async_executor || state->pushing_executor))
+        if (send_profile_events && state->executor)
         {
             sendProfileEvents();
             return true;

src/Common/ErrorCodes.cpp

@@ -625,7 +625,6 @@
     M(743, ICEBERG_SPECIFICATION_VIOLATION) \
     M(744, SESSION_ID_EMPTY) \
     M(745, SERVER_OVERLOADED) \
-    M(746, DEPENDENCIES_NOT_FOUND) \
 \
     M(900, DISTRIBUTED_CACHE_ERROR) \
     M(901, CANNOT_USE_DISTRIBUTED_CACHE) \

src/Common/Exception.cpp

@@ -593,15 +593,15 @@ void tryLogException(std::exception_ptr e, const char * log_name, const std::str
     }
 }
 
-void tryLogException(std::exception_ptr e, LoggerPtr logger, const std::string & start_of_message, LogsLevel level)
+void tryLogException(std::exception_ptr e, LoggerPtr logger, const std::string & start_of_message)
 {
     try
     {
         std::rethrow_exception(std::move(e)); // NOLINT
     }
     catch (...)
     {
-        tryLogCurrentException(logger, start_of_message, level);
+        tryLogCurrentException(logger, start_of_message);
     }
 }
 

src/Common/Exception.h

@@ -326,7 +326,7 @@ struct ExecutionStatus
 
 /// TODO: Logger leak constexpr overload
 void tryLogException(std::exception_ptr e, const char * log_name, const std::string & start_of_message = "");
-void tryLogException(std::exception_ptr e, LoggerPtr logger, const std::string & start_of_message = "", LogsLevel level = LogsLevel::error);
+void tryLogException(std::exception_ptr e, LoggerPtr logger, const std::string & start_of_message = "");
 void tryLogException(std::exception_ptr e, const AtomicLogger & logger, const std::string & start_of_message = "");
 
 std::string getExceptionMessage(const Exception & e, bool with_stacktrace, bool check_embedded_stacktrace = false);

src/Common/Logger.h

@@ -14,7 +14,7 @@ class Logger;
 using LoggerPtr = std::shared_ptr<Logger>;
 }
 
-using LoggerPtr = Poco::LoggerPtr;
+using LoggerPtr = std::shared_ptr<Poco::Logger>;
 using LoggerRawPtr = Poco::Logger *;
 
 /** RAII wrappers around Poco/Logger.h.

src/Common/LoggingFormatStringHelpers.cpp

@@ -90,20 +90,18 @@ LogSeriesLimiter::LogSeriesLimiter(LoggerPtr logger_, size_t allowed_count_, tim
     }
 
     time_t now = time(nullptr);
+    static const time_t cleanup_delay_s = 600;
+    time_t cutoff_time = now - cleanup_delay_s; // entries older than this are stale
+
     UInt128 name_hash = sipHash128(logger->name().c_str(), logger->name().size());
 
     std::lock_guard lock(mutex);
 
-    if (last_cleanup == 0)
-        last_cleanup = now;
-
     auto & series_records = getSeriesRecords();
 
-    static const time_t cleanup_delay_s = 600;
-    if (last_cleanup + cleanup_delay_s >= now)
+    if (last_cleanup < cutoff_time) // will also be triggered when last_cleanup is zero
     {
-        time_t old = now - cleanup_delay_s;
-        std::erase_if(series_records, [old](const auto & elem) { return get<0>(elem.second) < old; });
+        std::erase_if(series_records, [cutoff_time](const auto & elem) { return get<0>(elem.second) < cutoff_time; });
         last_cleanup = now;
     }
 

src/Common/MemorySpillScheduler.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <atomic>
-#include <memory>
 #include <mutex>
 #include <unordered_map>
 #include <base/types.h>
@@ -22,8 +21,6 @@ struct ProcessorMemoryStats
 class MemorySpillScheduler
 {
 public:
-    using Ptr = std::shared_ptr<MemorySpillScheduler>;
-
     explicit MemorySpillScheduler(bool enable_ = false) : enable(enable_) {}
     ~MemorySpillScheduler() = default;
 

src/Common/ThreadStatus.cpp

@@ -107,7 +107,7 @@ static thread_local bool has_alt_stack = false;
 
 ThreadGroup::ThreadGroup()
     : master_thread_id(CurrentThread::get().thread_id)
-    , memory_spill_scheduler(std::make_shared<MemorySpillScheduler>(false))
+    , memory_spill_scheduler(false)
 {}
 
 ThreadStatus::ThreadStatus(bool check_current_thread_on_destruction_)