Merge branch 'master' into jemalloc

.clang-tidy

@@ -1,2 +1,164 @@
-Checks: '-*,google-readability-avoid-underscore-in-googletest-name,misc-throw-by-value-catch-by-reference,misc-misplaced-const,misc-unconventional-assign-operator,modernize-avoid-bind,modernize-loop-convert,modernize-make-shared,modernize-make-unique,modernize-raw-string-literal,modernize-redundant-void-arg,modernize-replace-auto-ptr,modernize-replace-random-shuffle,modernize-use-bool-literals,modernize-use-nullptr,modernize-use-using,performance-faster-string-find,performance-for-range-copy,readability-avoid-const-params-in-decls,readability-const-return-type,readability-container-size-empty,readability-convert-member-functions-to-static,readability-delete-null-pointer,readability-deleted-default,readability-make-member-function-const,readability-misplaced-array-index,readability-non-const-parameter,readability-qualified-auto,readability-redundant-access-specifiers,readability-redundant-control-flow,readability-redundant-function-ptr-dereference,readability-redundant-smartptr-get,readability-redundant-string-cstr,readability-redundant-string-init,readability-static-definition-in-anonymous-namespace,readability-string-compare,readability-uniqueptr-delete-release,modernize-use-equals-default,modernize-use-equals-delete,bugprone-undelegated-constructor,readability-redundant-member-init,readability-simplify-subscript-expr,readability-simplify-boolean-expr,readability-inconsistent-declaration-parameter-name'
+Checks: '-*,
+    misc-throw-by-value-catch-by-reference,
+    misc-misplaced-const,
+    misc-unconventional-assign-operator,
+    misc-redundant-expression,
+    misc-static-assert,
+    misc-unconventional-assign-operator,
+    misc-uniqueptr-reset-release,
+    misc-unused-alias-decls,
+    misc-unused-parameters,
+    misc-unused-using-decls,
+    
+    modernize-avoid-bind,
+    modernize-loop-convert,
+    modernize-make-shared,
+    modernize-make-unique,
+    modernize-raw-string-literal,
+    modernize-redundant-void-arg,
+    modernize-replace-auto-ptr,
+    modernize-replace-random-shuffle,
+    modernize-use-bool-literals,
+    modernize-use-nullptr,
+    modernize-use-using,
+    modernize-use-equals-default,
+    modernize-use-equals-delete,
+
+    performance-faster-string-find,
+    performance-for-range-copy,
+    performance-implicit-conversion-in-loop,
+    performance-inefficient-algorithm,
+    performance-inefficient-vector-operation,
+    performance-move-constructor-init,
+    performance-no-automatic-move,
+    performance-trivially-destructible,
+    performance-unnecessary-copy-initialization,
+    
+    readability-avoid-const-params-in-decls,
+    readability-const-return-type,
+    readability-container-size-empty,
+    readability-convert-member-functions-to-static,
+    readability-delete-null-pointer,
+    readability-deleted-default,
+    readability-make-member-function-const,
+    readability-misplaced-array-index,
+    readability-non-const-parameter,
+    readability-qualified-auto,
+    readability-redundant-access-specifiers,
+    readability-redundant-control-flow,
+    readability-redundant-function-ptr-dereference,
+    readability-redundant-smartptr-get,
+    readability-redundant-string-cstr,
+    readability-redundant-string-init,
+    readability-static-definition-in-anonymous-namespace,
+    readability-string-compare,
+    readability-uniqueptr-delete-release,
+    readability-redundant-member-init,
+    readability-simplify-subscript-expr,
+    readability-simplify-boolean-expr,
+    readability-inconsistent-declaration-parameter-name,
+    
+    bugprone-undelegated-constructor,
+    bugprone-argument-comment,
+    bugprone-bad-signal-to-kill-thread,
+    bugprone-bool-pointer-implicit-conversion,
+    bugprone-copy-constructor-init,
+    bugprone-dangling-handle,
+    bugprone-forward-declaration-namespace,
+    bugprone-fold-init-type,
+    bugprone-inaccurate-erase,
+    bugprone-incorrect-roundings,
+    bugprone-infinite-loop,
+    bugprone-integer-division,
+    bugprone-macro-parentheses,
+    bugprone-macro-repeated-side-effects,
+    bugprone-misplaced-operator-in-strlen-in-alloc,
+    bugprone-misplaced-pointer-artithmetic-in-alloc,
+    bugprone-misplaced-widening-cast,
+    bugprone-move-forwarding-reference,
+    bugprone-multiple-statement-macro,
+    bugprone-parent-virtual-call,
+    bugprone-posix-return,
+    bugprone-reserved-identifier,
+    bugprone-signed-char-misuse,
+    bugprone-sizeof-container,
+    bugprone-sizeof-expression,
+    bugprone-string-constructor,
+    bugprone-string-integer-assignment,
+    bugprone-string-literal-with-embedded-nul,
+    bugprone-suspicious-enum-usage,
+    bugprone-suspicious-include,
+    bugprone-suspicious-memset-usage,
+    bugprone-suspicious-missing-comma,
+    bugprone-suspicious-string-compare,
+    bugprone-swapped-arguments,
+    bugprone-terminating-continue,
+    bugprone-throw-keyword-missing,
+    bugprone-too-small-loop-variable,
+    bugprone-undefined-memory-manipulation,
+    bugprone-unhandled-self-assignment,
+    bugprone-unused-raii,
+    bugprone-unused-return-value,
+    bugprone-use-after-move,
+    bugprone-virtual-near-miss,
+    
+    cert-dcl21-cpp,
+    cert-dcl50-cpp,
+    cert-env33-c,
+    cert-err34-c,
+    cert-err52-cpp,
+    cert-flp30-c,
+    cert-mem57-cpp,
+    cert-msc50-cpp,
+    cert-oop58-cpp,
+    
+    google-build-explicit-make-pair,
+    google-build-namespaces,
+    google-default-arguments,
+    google-explicit-constructor,
+    google-readability-casting,
+    google-readability-avoid-underscore-in-googletest-name,
+    google-runtime-int,
+    google-runtime-operator,
+    
+    hicpp-exception-baseclass,
+    
+    clang-analyzer-core.CallAndMessage,
+    clang-analyzer-core.DivideZero,
+    clang-analyzer-core.NonNullParamChecker,
+    clang-analyzer-core.NullDereference,
+    clang-analyzer-core.StackAddressEscape,
+    clang-analyzer-core.UndefinedBinaryOperatorResult,
+    clang-analyzer-core.VLASize,
+    clang-analyzer-core.uninitialized.ArraySubscript,
+    clang-analyzer-core.uninitialized.Assign,
+    clang-analyzer-core.uninitialized.Branch,
+    clang-analyzer-core.uninitialized.CapturedBlockVariable,
+    clang-analyzer-core.uninitialized.UndefReturn,
+    clang-analyzer-cplusplus.InnerPointer,
+    clang-analyzer-cplusplus.NewDelete,
+    clang-analyzer-cplusplus.NewDeleteLeaks,
+    clang-analyzer-cplusplus.PlacementNewChecker,
+    clang-analyzer-cplusplus.SelfAssignment,
+    clang-analyzer-deadcode.DeadStores,
+    clang-analyzer-optin.cplusplus.VirtualCall,
+    clang-analyzer-security.insecureAPI.UncheckedReturn,
+    clang-analyzer-security.insecureAPI.bcmp,
+    clang-analyzer-security.insecureAPI.bcopy,
+    clang-analyzer-security.insecureAPI.bzero,
+    clang-analyzer-security.insecureAPI.getpw,
+    clang-analyzer-security.insecureAPI.gets,
+    clang-analyzer-security.insecureAPI.mkstemp,
+    clang-analyzer-security.insecureAPI.mktemp,
+    clang-analyzer-security.insecureAPI.rand,
+    clang-analyzer-security.insecureAPI.strcpy,
+    clang-analyzer-unix.Malloc,
+    clang-analyzer-unix.MallocSizeof,
+    clang-analyzer-unix.MismatchedDeallocator,
+    clang-analyzer-unix.Vfork,
+    clang-analyzer-unix.cstring.BadSizeArg,
+    clang-analyzer-unix.cstring.NullArg,
+
+    boost-use-to-string,
+'
 WarningsAsErrors: '*'

.gitignore

@@ -16,7 +16,10 @@
 /docs/publish
 /docs/edit
 /docs/website
+/docs/venv/
 /docs/tools/venv/
+/docs/tools/translate/venv/
+/docs/tools/translate/output.md
 /docs/en/single.md
 /docs/ru/single.md
 /docs/zh/single.md

CMakeLists.txt

@@ -186,11 +186,13 @@ if (COMPILER_GCC OR COMPILER_CLANG)
 endif ()
 
 option(WITH_COVERAGE "Build with coverage." 0)
+
 if(WITH_COVERAGE AND COMPILER_CLANG)
    set(COMPILER_FLAGS "${COMPILER_FLAGS} -fprofile-instr-generate -fcoverage-mapping")
    # If we want to disable coverage for specific translation units
    set(WITHOUT_COVERAGE "-fno-profile-instr-generate -fno-coverage-mapping")
 endif()
+
 if(WITH_COVERAGE AND COMPILER_GCC)
    set(COMPILER_FLAGS "${COMPILER_FLAGS} -fprofile-arcs -ftest-coverage")
    set(COVERAGE_OPTION "-lgcov")
@@ -351,7 +353,6 @@ if (ENABLE_TESTS)
 endif ()
 
 # Need to process before "contrib" dir:
-include (cmake/find/cctz.cmake)
 include (cmake/find/mysqlclient.cmake)
 
 # When testing for memory leaks with Valgrind, don't link tcmalloc or jemalloc.

README.md

@@ -8,6 +8,7 @@ ClickHouse is an open-source column-oriented database management system that all
 * [Tutorial](https://clickhouse.tech/docs/en/getting_started/tutorial/) shows how to set up and query small ClickHouse cluster.
 * [Documentation](https://clickhouse.tech/docs/en/) provides more in-depth information.
 * [YouTube channel](https://www.youtube.com/c/ClickHouseDB) has a lot of content about ClickHouse in video format.
+* [Slack](https://join.slack.com/t/clickhousedb/shared_invite/enQtOTUzMjM4ODQwNTc5LWJmMjE3Yjc2YmI1ZDBlZmI4ZTc3OWY3ZTIwYTljYzY4MzBlODM3YzBjZTc1YmYyODRlZTJkYTgzYzBiNTA2Yjk) and [Telegram](https://telegram.me/clickhouse_en) allow to chat with ClickHouse users in real-time.
 * [Blog](https://clickhouse.yandex/blog/en/) contains various ClickHouse-related articles, as well as announces and reports about events.
 * [Contacts](https://clickhouse.tech/#contacts) can help to get your questions answered if there are any.
 * You can also [fill this form](https://forms.yandex.com/surveys/meet-yandex-clickhouse-team/) to meet Yandex ClickHouse team in person.

base/common/CMakeLists.txt

@@ -6,6 +6,7 @@ set (SRCS
     DateLUT.cpp
     DateLUTImpl.cpp
     demangle.cpp
+    getFQDNOrHostName.cpp
     getMemoryAmount.cpp
     getThreadId.cpp
     JSON.cpp
@@ -20,15 +21,9 @@ set (SRCS
 )
 
 if (ENABLE_REPLXX)
-    set (SRCS ${SRCS}
-        ReplxxLineReader.cpp
-        ReplxxLineReader.h
-    )
+    list (APPEND SRCS ReplxxLineReader.cpp)
 elseif (ENABLE_READLINE)
-    set (SRCS ${SRCS}
-        ReadlineLineReader.cpp
-        ReadlineLineReader.h
-    )
+    list (APPEND SRCS ReadlineLineReader.cpp)
 endif ()
 
 if (USE_DEBUG_HELPERS)
@@ -38,11 +33,13 @@ endif ()
 
 add_library (common ${SRCS})
 
-target_include_directories(common PUBLIC .. ${CMAKE_CURRENT_BINARY_DIR}/..)
+if (WITH_COVERAGE)
+    target_compile_definitions(common PUBLIC WITH_COVERAGE=1)
+else ()
+    target_compile_definitions(common PUBLIC WITH_COVERAGE=0)
+endif ()
 
-if(CCTZ_INCLUDE_DIR)
-    target_include_directories(common BEFORE PRIVATE ${CCTZ_INCLUDE_DIR})
-endif()
+target_include_directories(common PUBLIC .. ${CMAKE_CURRENT_BINARY_DIR}/..)
 
 if (NOT USE_INTERNAL_BOOST_LIBRARY)
     target_include_directories (common SYSTEM BEFORE PUBLIC ${Boost_INCLUDE_DIRS})
@@ -52,12 +49,6 @@ if(NOT USE_INTERNAL_POCO_LIBRARY)
     target_include_directories (common SYSTEM BEFORE PUBLIC ${Poco_Foundation_INCLUDE_DIR})
 endif()
 
-if(CCTZ_LIBRARY)
-    target_link_libraries(common PRIVATE ${CCTZ_LIBRARY})
-endif()
-
-target_link_libraries(common PUBLIC replxx)
-
 # allow explicitly fallback to readline
 if (NOT ENABLE_REPLXX AND ENABLE_READLINE)
     message (STATUS "Attempt to fallback to readline explicitly")
@@ -82,11 +73,16 @@ endif ()
 
 target_link_libraries (common
     PUBLIC
+        ${Poco_Net_LIBRARY}
         ${Poco_Util_LIBRARY}
         ${Poco_Foundation_LIBRARY}
         ${CITYHASH_LIBRARIES}
         ${Boost_SYSTEM_LIBRARY}
         FastMemcpy
+        replxx
+
+    PRIVATE
+        cctz
 )
 
 if (ENABLE_TESTS)

base/common/DateLUT.cpp

@@ -1,9 +1,10 @@
-#include <common/DateLUT.h>
+#include "DateLUT.h"
 
-#include <filesystem>
+#include <Poco/DigestStream.h>
 #include <Poco/Exception.h>
 #include <Poco/SHA1Engine.h>
-#include <Poco/DigestStream.h>
+
+#include <filesystem>
 #include <fstream>
 
 

base/common/DateLUT.h

@@ -1,20 +1,15 @@
 #pragma once
 
 #include "DateLUTImpl.h"
-#include <unordered_map>
-#include <atomic>
-#include <mutex>
-#include <memory>
+
+#include "defines.h"
+
 #include <boost/noncopyable.hpp>
 
-// Also defined in Core/Defines.h
-#if !defined(ALWAYS_INLINE)
-#if defined(_MSC_VER)
-    #define ALWAYS_INLINE __forceinline
-#else
-    #define ALWAYS_INLINE __attribute__((__always_inline__))
-#endif
-#endif
+#include <atomic>
+#include <memory>
+#include <mutex>
+#include <unordered_map>
 
 
 /// This class provides lazy initialization and lookup of singleton DateLUTImpl objects for a given timezone.

base/common/DateLUTImpl.cpp

@@ -1,23 +1,14 @@
-#if __has_include(<cctz/civil_time.h>)
-#include <cctz/civil_time.h> // bundled, debian
-#else
-#include <civil_time.h> // freebsd
-#endif
+#include "DateLUTImpl.h"
 
-#if __has_include(<cctz/time_zone.h>)
+#include <cctz/civil_time.h>
 #include <cctz/time_zone.h>
-#else
-#include <time_zone.h>
-#endif
-
-#include <common/DateLUTImpl.h>
 #include <Poco/Exception.h>
 
-#include <memory>
+#include <cassert>
 #include <chrono>
 #include <cstring>
-#include <cassert>
 #include <iostream>
+#include <memory>
 
 #define DATE_LUT_MIN 0
 

base/common/DateLUTImpl.h

@@ -1,8 +1,9 @@
 #pragma once
 
-#include "Types.h"
 #include "DayNum.h"
-#include "likely.h"
+#include "defines.h"
+#include "types.h"
+
 #include <ctime>
 #include <string>
 

base/common/DayNum.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/Types.h>
+#include <common/types.h>
 #include <common/strong_typedef.h>
 
 /** Represents number of days since 1970-01-01.

base/common/JSON.cpp

@@ -215,7 +215,7 @@ JSON::ElementType JSON::getType() const
 
 void JSON::checkPos(Pos pos) const
 {
-    if (pos >= ptr_end)
+    if (pos >= ptr_end || ptr_begin == nullptr)
         throw JSONException("JSON: unexpected end of data.");
 }
 
@@ -776,7 +776,7 @@ JSON::iterator & JSON::iterator::operator++()
     return *this;
 }
 
-JSON::iterator JSON::iterator::operator++(int)
+JSON::iterator JSON::iterator::operator++(int) // NOLINT
 {
     iterator copy(*this);
     ++*this;

base/common/JSON.h

@@ -3,7 +3,7 @@
 #include <typeinfo>
 #include <Poco/Exception.h>
 #include <common/StringRef.h>
-#include <common/Types.h>
+#include <common/types.h>
 
 
 /** Очень простой класс для чтения JSON (или его кусочков).

base/common/LineReader.cpp

@@ -30,7 +30,7 @@ void trim(String & s)
 bool hasInputData()
 {
     timeval timeout = {0, 0};
-    fd_set fds;
+    fd_set fds{};
     FD_ZERO(&fds);
     FD_SET(STDIN_FILENO, &fds);
     return select(1, &fds, nullptr, nullptr, &timeout) == 1;
@@ -53,18 +53,18 @@ LineReader::Suggest::WordsRange LineReader::Suggest::getCompletions(const String
 
     /// last_word can be empty.
 
-    if (case_insensitive)
+    /// Only perform case sensitive completion when the prefix string contains any uppercase characters
+    if (std::none_of(prefix.begin(), prefix.end(), [&](auto c) { return c >= 'A' && c <= 'Z'; }))
         return std::equal_range(
-                words.begin(), words.end(), last_word, [prefix_length](std::string_view s, std::string_view prefix_searched)
-                {
-                    return strncasecmp(s.data(), prefix_searched.data(), prefix_length) < 0;
-                });
+            words_no_case.begin(), words_no_case.end(), last_word, [prefix_length](std::string_view s, std::string_view prefix_searched)
+            {
+                return strncasecmp(s.data(), prefix_searched.data(), prefix_length) < 0;
+            });
     else
-        return std::equal_range(
-                words.begin(), words.end(), last_word, [prefix_length](std::string_view s, std::string_view prefix_searched)
-                {
-                    return strncmp(s.data(), prefix_searched.data(), prefix_length) < 0;
-                });
+        return std::equal_range(words.begin(), words.end(), last_word, [prefix_length](std::string_view s, std::string_view prefix_searched)
+        {
+            return strncmp(s.data(), prefix_searched.data(), prefix_length) < 0;
+        });
 }
 
 LineReader::LineReader(const String & history_file_path_, char extender_, char delimiter_)

base/common/LineReader.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/Types.h>
+#include <common/types.h>
 
 #include <atomic>
 #include <vector>
@@ -14,13 +14,11 @@ public:
         using WordsRange = std::pair<Words::const_iterator, Words::const_iterator>;
 
         Words words;
+        Words words_no_case;
         std::atomic<bool> ready{false};
 
         /// Get iterators for the matched range of words if any.
         WordsRange getCompletions(const String & prefix, size_t prefix_length) const;
-
-        /// case sensitive suggestion
-        bool case_insensitive = false;
     };
 
     LineReader(const String & history_file_path, char extender, char delimiter = 0);  /// if delimiter != 0, then it's multiline mode

base/common/ReadlineLineReader.cpp

@@ -104,6 +104,8 @@ ReadlineLineReader::ReadlineLineReader(const Suggest & suggest_, const String &
 
     if (signal(SIGINT, clear_prompt_or_exit) == SIG_ERR)
         throw std::runtime_error(std::string("Cannot set signal handler for readline: ") + strerror(errno));
+
+    rl_variable_bind("completion-ignore-case", "on");
 }
 
 ReadlineLineReader::~ReadlineLineReader()

base/common/StringRef.h

@@ -5,7 +5,7 @@
 #include <functional>
 #include <ostream>
 
-#include <common/Types.h>
+#include <common/types.h>
 #include <common/unaligned.h>
 
 #include <city.h>

base/common/config_common.h.in

@@ -3,4 +3,3 @@
 // .h autogenerated by cmake !
 
 #cmakedefine01 UNBUNDLED
-#cmakedefine01 WITH_COVERAGE

base/common/defines.h

@@ -0,0 +1,87 @@
+#pragma once
+
+#if defined(_MSC_VER)
+#   if !defined(likely)
+#      define likely(x)   (x)
+#   endif
+#   if !defined(unlikely)
+#      define unlikely(x) (x)
+#   endif
+#else
+#   if !defined(likely)
+#       define likely(x)   (__builtin_expect(!!(x), 1))
+#   endif
+#   if !defined(unlikely)
+#       define unlikely(x) (__builtin_expect(!!(x), 0))
+#   endif
+#endif
+
+#if defined(_MSC_VER)
+#    define ALWAYS_INLINE __forceinline
+#    define NO_INLINE static __declspec(noinline)
+#    define MAY_ALIAS
+#else
+#    define ALWAYS_INLINE __attribute__((__always_inline__))
+#    define NO_INLINE __attribute__((__noinline__))
+#    define MAY_ALIAS __attribute__((__may_alias__))
+#endif
+
+#if !defined(__x86_64__) && !defined(__aarch64__) && !defined(__PPC__)
+#    error "The only supported platforms are x86_64 and AArch64, PowerPC (work in progress)"
+#endif
+
+/// Check for presence of address sanitizer
+#if !defined(ADDRESS_SANITIZER)
+#    if defined(__has_feature)
+#        if __has_feature(address_sanitizer)
+#            define ADDRESS_SANITIZER 1
+#        endif
+#    elif defined(__SANITIZE_ADDRESS__)
+#        define ADDRESS_SANITIZER 1
+#    endif
+#endif
+
+#if !defined(THREAD_SANITIZER)
+#    if defined(__has_feature)
+#        if __has_feature(thread_sanitizer)
+#            define THREAD_SANITIZER 1
+#        endif
+#    elif defined(__SANITIZE_THREAD__)
+#        define THREAD_SANITIZER 1
+#    endif
+#endif
+
+#if !defined(MEMORY_SANITIZER)
+#    if defined(__has_feature)
+#        if __has_feature(memory_sanitizer)
+#            define MEMORY_SANITIZER 1
+#        endif
+#    elif defined(__MEMORY_SANITIZER__)
+#        define MEMORY_SANITIZER 1
+#    endif
+#endif
+
+/// TODO: Strange enough, there is no way to detect UB sanitizer.
+
+/// Explicitly allow undefined behaviour for certain functions. Use it as a function attribute.
+/// It is useful in case when compiler cannot see (and exploit) it, but UBSan can.
+/// Example: multiplication of signed integers with possibility of overflow when both sides are from user input.
+#if defined(__clang__)
+#    define NO_SANITIZE_UNDEFINED __attribute__((__no_sanitize__("undefined")))
+#    define NO_SANITIZE_ADDRESS __attribute__((__no_sanitize__("address")))
+#    define NO_SANITIZE_THREAD __attribute__((__no_sanitize__("thread")))
+#else  /// It does not work in GCC. GCC 7 cannot recognize this attribute and GCC 8 simply ignores it.
+#    define NO_SANITIZE_UNDEFINED
+#    define NO_SANITIZE_ADDRESS
+#    define NO_SANITIZE_THREAD
+#endif
+
+#if defined __GNUC__ && !defined __clang__
+#    define OPTIMIZE(x) __attribute__((__optimize__(x)))
+#else
+#    define OPTIMIZE(x)
+#endif
+
+/// A macro for suppressing warnings about unused variables or function results.
+/// Useful for structured bindings which have no standard way to declare this.
+#define UNUSED(...) (void)(__VA_ARGS__)

base/common/find_symbols.h

@@ -292,3 +292,26 @@ inline char * find_last_not_symbols_or_null(char * begin, char * end)
 {
     return const_cast<char *>(detail::find_last_symbols_sse2<false, detail::ReturnMode::Nullptr, symbols...>(begin, end));
 }
+
+
+/// Slightly resembles boost::split. The drawback of boost::split is that it fires a false positive in clang static analyzer.
+/// See https://github.com/boostorg/algorithm/issues/63
+/// And https://bugs.llvm.org/show_bug.cgi?id=41141
+template <char... symbols, typename To>
+inline void splitInto(To & to, const std::string & what, bool token_compress = false)
+{
+    const char * pos = what.data();
+    const char * end = pos + what.size();
+    while (pos < end)
+    {
+        const char * delimiter_or_end = find_first_symbols<symbols...>(pos, end);
+
+        if (!token_compress || pos < delimiter_or_end)
+            to.emplace_back(pos, delimiter_or_end);
+
+        if (delimiter_or_end < end)
+            pos = delimiter_or_end + 1;
+        else
+            pos = delimiter_or_end;
+    }
+}

base/common/getFQDNOrHostName.cpp

@@ -1,5 +1,5 @@
 #include <Poco/Net/DNS.h>
-#include <Common/getFQDNOrHostName.h>
+#include <common/getFQDNOrHostName.h>
 
 
 namespace

base/common/getMemoryAmount.cpp

@@ -69,13 +69,13 @@ uint64_t getMemoryAmountOrZero()
 
 #elif defined(_SC_PHYS_PAGES) && defined(_SC_PAGESIZE)
     /* FreeBSD, Linux, OpenBSD, and Solaris. -------------------- */
-    return (uint64_t)sysconf(_SC_PHYS_PAGES)
-           * (uint64_t)sysconf(_SC_PAGESIZE);
+    return uint64_t(sysconf(_SC_PHYS_PAGES))
+           *uint64_t(sysconf(_SC_PAGESIZE));
 
 #elif defined(_SC_PHYS_PAGES) && defined(_SC_PAGE_SIZE)
     /* Legacy. -------------------------------------------------- */
-    return (uint64_t)sysconf(_SC_PHYS_PAGES)
-           * (uint64_t)sysconf(_SC_PAGE_SIZE);
+    return uint64_t(sysconf(_SC_PHYS_PAGES))
+           * uint64_t(sysconf(_SC_PAGE_SIZE));
 
 #elif defined(CTL_HW) && (defined(HW_PHYSMEM) || defined(HW_REALMEM))
     /* DragonFly BSD, FreeBSD, NetBSD, OpenBSD, and OSX. -------- */

base/common/itoa.h

@@ -30,7 +30,6 @@
 #include <cstddef>
 #include <cstring>
 #include <type_traits>
-#include "likely.h"
 
 using int128_t = __int128;
 using uint128_t = unsigned __int128;

base/common/likely.h

@@ -1,15 +0,0 @@
-#if defined(_MSC_VER)
-#   if !defined(likely)
-#      define likely(x)   (x)
-#   endif
-#   if !defined(unlikely)
-#      define unlikely(x) (x)
-#   endif
-#else
-#   if !defined(likely)
-#       define likely(x)   (__builtin_expect(!!(x), 1))
-#   endif
-#   if !defined(unlikely)
-#       define unlikely(x) (__builtin_expect(!!(x), 0))
-#   endif
-#endif

base/common/memory.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <new>
-#include "likely.h"
+#include "defines.h"
 
 #if __has_include(<common/config_common.h>)
 #include <common/config_common.h>
@@ -19,27 +19,11 @@
 #include <cstdlib>
 #endif
 
-// Also defined in Core/Defines.h
-#if !defined(ALWAYS_INLINE)
-#if defined(_MSC_VER)
-    #define ALWAYS_INLINE inline __forceinline
-#else
-    #define ALWAYS_INLINE inline __attribute__((__always_inline__))
-#endif
-#endif
-
-#if !defined(NO_INLINE)
-#if defined(_MSC_VER)
-    #define NO_INLINE static __declspec(noinline)
-#else
-    #define NO_INLINE __attribute__((__noinline__))
-#endif
-#endif
 
 namespace Memory
 {
 
-ALWAYS_INLINE void * newImpl(std::size_t size)
+inline ALWAYS_INLINE void * newImpl(std::size_t size)
 {
     auto * ptr = malloc(size);
     if (likely(ptr != nullptr))
@@ -49,19 +33,19 @@ ALWAYS_INLINE void * newImpl(std::size_t size)
     throw std::bad_alloc{};
 }
 
-ALWAYS_INLINE void * newNoExept(std::size_t size) noexcept
+inline ALWAYS_INLINE void * newNoExept(std::size_t size) noexcept
 {
     return malloc(size);
 }
 
-ALWAYS_INLINE void deleteImpl(void * ptr) noexcept
+inline ALWAYS_INLINE void deleteImpl(void * ptr) noexcept
 {
     free(ptr);
 }
 
 #if USE_JEMALLOC
 
-ALWAYS_INLINE void deleteSized(void * ptr, std::size_t size) noexcept
+inline ALWAYS_INLINE void deleteSized(void * ptr, std::size_t size) noexcept
 {
     if (unlikely(ptr == nullptr))
         return;
@@ -71,7 +55,7 @@ ALWAYS_INLINE void deleteSized(void * ptr, std::size_t size) noexcept
 
 #else
 
-ALWAYS_INLINE void deleteSized(void * ptr, std::size_t size [[maybe_unused]]) noexcept
+inline ALWAYS_INLINE void deleteSized(void * ptr, std::size_t size [[maybe_unused]]) noexcept
 {
     free(ptr);
 }

base/common/shift10.cpp

@@ -1,6 +1,6 @@
 #include <common/shift10.h>
 
-#include <common/likely.h>
+#include "defines.h"
 
 #include <limits>
 

base/common/shift10.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/Types.h>
+#include <common/types.h>
 
 /** Almost the same as x = x * exp10(exponent), but gives more accurate result.
   * Example:

base/common/terminalColors.h

@@ -1,5 +1,5 @@
 #include <string>
-#include <common/Types.h>
+#include <common/types.h>
 
 
 /** Set color in terminal based on 64-bit hash value.

base/common/tests/date_lut2.cpp

@@ -43,7 +43,7 @@ void loop(time_t begin, time_t end, int step)
 }
 
 
-int main(int argc, char ** argv)
+int main(int, char **)
 {
     loop(orderedIdentifierToDate(20101031), orderedIdentifierToDate(20101101), 15 * 60);
     loop(orderedIdentifierToDate(20100328), orderedIdentifierToDate(20100330), 15 * 60);

base/common/tests/date_lut3.cpp

@@ -53,7 +53,7 @@ void loop(time_t begin, time_t end, int step)
 }
 
 
-int main(int argc, char ** argv)
+int main(int, char **)
 {
     loop(orderedIdentifierToDate(20101031), orderedIdentifierToDate(20101101), 15 * 60);
     loop(orderedIdentifierToDate(20100328), orderedIdentifierToDate(20100330), 15 * 60);

base/common/tests/date_lut4.cpp

@@ -2,7 +2,7 @@
 #include <common/DateLUT.h>
 
 
-int main(int argc, char ** argv)
+int main(int, char **)
 {
     /** В DateLUT был глюк - для времён из дня 1970-01-01, возвращался номер часа больше 23. */
     static const time_t TIME = 66130;

base/common/tests/date_lut_default_timezone.cpp

@@ -2,7 +2,7 @@
 #include <common/DateLUT.h>
 #include <Poco/Exception.h>
 
-int main(int argc, char ** argv)
+int main(int, char **)
 {
     try
     {

base/common/tests/date_lut_init.cpp

@@ -1,7 +1,7 @@
 #include <common/DateLUT.h>
 
 /// Позволяет проверить время инициализации DateLUT.
-int main(int argc, char ** argv)
+int main(int, char **)
 {
     DateLUT::instance();
     return 0;

base/common/tests/gtest_find_symbols.cpp

@@ -1,4 +1,5 @@
 #include <string>
+#include <vector>
 #include <common/find_symbols.h>
 #include <gtest/gtest.h>
 
@@ -22,4 +23,16 @@ TEST(FindSymbols, SimpleTest)
     ASSERT_EQ(find_last_symbols_or_null<' '>(begin, end), end - 11);
     ASSERT_EQ(find_last_symbols_or_null<'H'>(begin, end), begin);
     ASSERT_EQ((find_last_symbols_or_null<'a', 'e'>(begin, end)), end - 4);
+
+    {
+        std::vector<std::string> vals;
+        splitInto<' ', ','>(vals, "hello, world", true);
+        ASSERT_EQ(vals, (std::vector<std::string>{"hello", "world"}));
+    }
+
+    {
+        std::vector<std::string> vals;
+        splitInto<' ', ','>(vals, "s String", true);
+        ASSERT_EQ(vals, (std::vector<std::string>{"s", "String"}));
+    }
 }

base/common/tests/gtest_strong_typedef.cpp

@@ -54,7 +54,7 @@ TEST(StrongTypedefSuite, NoDefaultCtor)
 {
     struct NoDefaultCtor
     {
-        NoDefaultCtor(int i) {}
+        NoDefaultCtor(int) {} // NOLINT
     };
 
     STRONG_TYPEDEF(NoDefaultCtor, MyStruct);

base/common/ya.make

@@ -0,0 +1,12 @@
+LIBRARY()
+
+PEERDIR(
+    contrib/libs/poco/Util
+)
+
+SRCS(
+    argsToConfig.cpp
+    coverage.cpp
+)
+
+END()

base/daemon/BaseDaemon.cpp

@@ -99,12 +99,12 @@ static void writeSignalIDtoSignalPipe(int sig)
 }
 
 /** Signal handler for HUP / USR1 */
-static void closeLogsSignalHandler(int sig, siginfo_t * info, void * context)
+static void closeLogsSignalHandler(int sig, siginfo_t *, void *)
 {
     writeSignalIDtoSignalPipe(sig);
 }
 
-static void terminateRequestedSignalHandler(int sig, siginfo_t * info, void * context)
+static void terminateRequestedSignalHandler(int sig, siginfo_t *, void *)
 {
     writeSignalIDtoSignalPipe(sig);
 }
@@ -174,6 +174,10 @@ public:
         {
             int sig = 0;
             DB::readBinary(sig, in);
+            // We may log some specific signals afterwards, with different log
+            // levels and more info, but for completeness we log all signals
+            // here at trace level.
+            LOG_TRACE(log, "Received signal " << strsignal(sig) << " (" << sig << ")");
 
             if (sig == Signals::StopThread)
             {
@@ -362,19 +366,8 @@ void BaseDaemon::reloadConfiguration()
 }
 
 
-BaseDaemon::BaseDaemon()
+namespace
 {
-    checkRequiredInstructions();
-}
-
-
-BaseDaemon::~BaseDaemon()
-{
-    writeSignalIDtoSignalPipe(SignalListener::StopThread);
-    signal_listener_thread.join();
-    signal_pipe.close();
-}
-
 
 enum class InstructionFail
 {
@@ -388,7 +381,7 @@ enum class InstructionFail
     AVX512 = 7
 };
 
-static std::string instructionFailToString(InstructionFail fail)
+std::string instructionFailToString(InstructionFail fail)
 {
     switch (fail)
     {
@@ -413,16 +406,16 @@ static std::string instructionFailToString(InstructionFail fail)
 }
 
 
-static sigjmp_buf jmpbuf;
+sigjmp_buf jmpbuf;
 
-static void sigIllCheckHandler(int sig, siginfo_t * info, void * context)
+void sigIllCheckHandler(int, siginfo_t *, void *)
 {
     siglongjmp(jmpbuf, 1);
 }
 
 /// Check if necessary sse extensions are available by trying to execute some sse instructions.
 /// If instruction is unavailable, SIGILL will be sent by kernel.
-static void checkRequiredInstructions(volatile InstructionFail & fail)
+void checkRequiredInstructionsImpl(volatile InstructionFail & fail)
 {
 #if __SSE3__
     fail = InstructionFail::SSE3;
@@ -463,8 +456,9 @@ static void checkRequiredInstructions(volatile InstructionFail & fail)
     fail = InstructionFail::NONE;
 }
 
-
-void BaseDaemon::checkRequiredInstructions()
+/// Check SSE and others instructions availability
+/// Calls exit on fail
+void checkRequiredInstructions()
 {
     struct sigaction sa{};
     struct sigaction sa_old{};
@@ -487,7 +481,7 @@ void BaseDaemon::checkRequiredInstructions()
         exit(1);
     }
 
-    ::checkRequiredInstructions(fail);
+    checkRequiredInstructionsImpl(fail);
 
     if (sigaction(signal, &sa_old, nullptr))
     {
@@ -496,6 +490,22 @@ void BaseDaemon::checkRequiredInstructions()
     }
 }
 
+}
+
+
+BaseDaemon::BaseDaemon()
+{
+    checkRequiredInstructions();
+}
+
+
+BaseDaemon::~BaseDaemon()
+{
+    writeSignalIDtoSignalPipe(SignalListener::StopThread);
+    signal_listener_thread.join();
+    signal_pipe.close();
+}
+
 
 void BaseDaemon::terminate()
 {
@@ -784,7 +794,9 @@ void BaseDaemon::initializeTerminationAndSignalProcessing()
 
 void BaseDaemon::logRevision() const
 {
-    Logger::root().information("Starting " + std::string{VERSION_FULL} + " with revision " + std::to_string(ClickHouseRevision::get()));
+    Logger::root().information("Starting " + std::string{VERSION_FULL}
+        + " with revision " + std::to_string(ClickHouseRevision::get())
+        + ", PID " + std::to_string(getpid()));
 }
 
 /// Makes server shutdown if at least one Poco::Task have failed.

base/daemon/BaseDaemon.h

@@ -17,7 +17,7 @@
 #include <Poco/Util/ServerApplication.h>
 #include <Poco/Net/SocketAddress.h>
 #include <Poco/Version.h>
-#include <common/Types.h>
+#include <common/types.h>
 #include <common/logger_useful.h>
 #include <common/getThreadId.h>
 #include <daemon/GraphiteWriter.h>
@@ -128,7 +128,7 @@ public:
     /// close all process FDs except
     /// 0-2 -- stdin, stdout, stderr
     /// also doesn't close global internal pipes for signal handling
-    void closeFDs();
+    static void closeFDs();
 
 protected:
     /// Возвращает TaskManager приложения
@@ -198,12 +198,6 @@ protected:
     std::string config_path;
     DB::ConfigProcessor::LoadedConfig loaded_config;
     Poco::Util::AbstractConfiguration * last_configuration = nullptr;
-
-private:
-
-    /// Check SSE and others instructions availability
-    /// Calls exit on fail
-    void checkRequiredInstructions();
 };
 
 

base/daemon/GraphiteWriter.cpp

@@ -2,7 +2,7 @@
 #include <daemon/BaseDaemon.h>
 #include <Poco/Util/LayeredConfiguration.h>
 #include <Poco/Util/Application.h>
-#include <Common/getFQDNOrHostName.h>
+#include <common/getFQDNOrHostName.h>
 
 #include <mutex>
 #include <iomanip>

base/ext/chrono_io.h

@@ -1,16 +1,30 @@
 #pragma once
 
 #include <chrono>
+#include <ctime>
 #include <string>
-#include <common/DateLUT.h>
+#include <iomanip>
 
 
 namespace ext
 {
+    inline std::string to_string(const std::time_t & time)
+    {
+        std::stringstream ss;
+        ss << std::put_time(std::localtime(&time), "%Y-%m-%d %X");
+        return ss.str();
+    }
+
     template <typename Clock, typename Duration = typename Clock::duration>
     std::string to_string(const std::chrono::time_point<Clock, Duration> & tp)
     {
-        return DateLUT::instance().timeToString(std::chrono::system_clock::to_time_t(tp));
+        // Don't use DateLUT because it shows weird characters for
+        // TimePoint::max(). I wish we could use C++20 format, but it's not
+        // there yet.
+        // return DateLUT::instance().timeToString(std::chrono::system_clock::to_time_t(tp));
+
+        auto in_time_t = std::chrono::system_clock::to_time_t(tp);
+        return to_string(in_time_t);
     }
 
     template <typename Rep, typename Period = std::ratio<1>>

base/loggers/OwnSplitChannel.cpp

@@ -71,7 +71,8 @@ void OwnSplitChannel::logSplit(const Poco::Message & msg)
 
 
     /// Also log to system.text_log table, if message is not too noisy
-    if (text_log_max_priority && msg.getPriority() <= text_log_max_priority)
+    auto text_log_max_priority_loaded = text_log_max_priority.load(std::memory_order_relaxed);
+    if (text_log_max_priority_loaded && msg.getPriority() <= text_log_max_priority_loaded)
     {
         TextLogElement elem;
 
@@ -108,7 +109,7 @@ void OwnSplitChannel::addTextLog(std::shared_ptr<DB::TextLog> log, int max_prior
 {
     std::lock_guard<std::mutex> lock(text_log_mutex);
     text_log = log;
-    text_log_max_priority = max_priority;
+    text_log_max_priority.store(max_priority, std::memory_order_relaxed);
 }
 
 }

base/loggers/OwnSplitChannel.h

@@ -33,7 +33,7 @@ private:
     std::mutex text_log_mutex;
 
     std::weak_ptr<DB::TextLog> text_log;
-    int text_log_max_priority = -1;
+    std::atomic<int> text_log_max_priority = -1;
 };
 
 }

base/mysqlxx/Value.h

@@ -9,7 +9,7 @@
 #include <limits>
 
 #include <common/preciseExp10.h>
-#include <common/Types.h>
+#include <common/types.h>
 #include <common/DateLUT.h>
 
 #include <mysqlxx/Types.h>

base/ya.make

@@ -1 +1,3 @@
-
+RECURSE(
+    common
+)

cmake/find/cctz.cmake

@@ -1,23 +0,0 @@
-option (USE_INTERNAL_CCTZ_LIBRARY "Set to FALSE to use system cctz library instead of bundled" ${NOT_UNBUNDLED})
-
-if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/cctz/include/cctz/time_zone.h")
-    if(USE_INTERNAL_CCTZ_LIBRARY)
-       message(WARNING "submodule contrib/cctz is missing. to fix try run: \n git submodule update --init --recursive")
-    endif()
-    set(USE_INTERNAL_CCTZ_LIBRARY 0)
-    set(MISSING_INTERNAL_CCTZ_LIBRARY 1)
-endif()
-
-if (NOT USE_INTERNAL_CCTZ_LIBRARY)
-    find_library (CCTZ_LIBRARY cctz)
-    find_path (CCTZ_INCLUDE_DIR NAMES cctz/civil_time.h civil_time.h PATHS ${CCTZ_INCLUDE_PATHS})
-endif ()
-
-if (CCTZ_LIBRARY AND CCTZ_INCLUDE_DIR)
-elseif (NOT MISSING_INTERNAL_CCTZ_LIBRARY)
-    set (USE_INTERNAL_CCTZ_LIBRARY 1)
-    set (CCTZ_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/cctz/include")
-    set (CCTZ_LIBRARY cctz)
-endif ()
-
-message (STATUS "Using cctz: ${CCTZ_INCLUDE_DIR} : ${CCTZ_LIBRARY}")

contrib/CMakeLists.txt

@@ -75,9 +75,7 @@ if (USE_INTERNAL_ZLIB_LIBRARY)
     endif ()
 endif ()
 
-if (USE_INTERNAL_CCTZ_LIBRARY)
-    add_subdirectory (cctz-cmake)
-endif ()
+add_subdirectory (cctz-cmake)
 
 add_subdirectory (jemalloc-cmake)
 

contrib/cctz-cmake/CMakeLists.txt

@@ -1,31 +1,50 @@
-SET(LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/cctz)
+option (USE_INTERNAL_CCTZ "Use internal cctz library" ${NOT_UNBUNDLED})
 
-add_library(cctz
-    ${LIBRARY_DIR}/src/civil_time_detail.cc
-    ${LIBRARY_DIR}/src/time_zone_fixed.cc
-    ${LIBRARY_DIR}/src/time_zone_format.cc
-    ${LIBRARY_DIR}/src/time_zone_if.cc
-    ${LIBRARY_DIR}/src/time_zone_impl.cc
-    ${LIBRARY_DIR}/src/time_zone_info.cc
-    ${LIBRARY_DIR}/src/time_zone_libc.cc
-    ${LIBRARY_DIR}/src/time_zone_lookup.cc
-    ${LIBRARY_DIR}/src/time_zone_posix.cc
-    ${LIBRARY_DIR}/src/zone_info_source.cc
+if (USE_INTERNAL_CCTZ)
+    SET(LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/cctz)
 
-    ${LIBRARY_DIR}/src/time_zone_libc.h
-    ${LIBRARY_DIR}/src/time_zone_if.h
-    ${LIBRARY_DIR}/src/tzfile.h
-    ${LIBRARY_DIR}/src/time_zone_impl.h
-    ${LIBRARY_DIR}/src/time_zone_posix.h
-    ${LIBRARY_DIR}/src/time_zone_info.h
+    SET (SRCS
+        ${LIBRARY_DIR}/src/civil_time_detail.cc
+        ${LIBRARY_DIR}/src/time_zone_fixed.cc
+        ${LIBRARY_DIR}/src/time_zone_format.cc
+        ${LIBRARY_DIR}/src/time_zone_if.cc
+        ${LIBRARY_DIR}/src/time_zone_impl.cc
+        ${LIBRARY_DIR}/src/time_zone_info.cc
+        ${LIBRARY_DIR}/src/time_zone_libc.cc
+        ${LIBRARY_DIR}/src/time_zone_lookup.cc
+        ${LIBRARY_DIR}/src/time_zone_posix.cc
+        ${LIBRARY_DIR}/src/zone_info_source.cc
+    )
 
-    ${LIBRARY_DIR}/include/cctz/time_zone.h
-    ${LIBRARY_DIR}/include/cctz/civil_time_detail.h
-    ${LIBRARY_DIR}/include/cctz/civil_time.h)
+    add_library (cctz ${SRCS})
+    target_include_directories (cctz PUBLIC ${LIBRARY_DIR}/include)
 
-if (CMAKE_SYSTEM MATCHES "FreeBSD")
-    # yes, need linux, because bsd check inside linux in time_zone_libc.cc:24
-    target_compile_definitions (cctz PRIVATE __USE_BSD linux _XOPEN_SOURCE=600)
+    if (OS_FREEBSD)
+        # yes, need linux, because bsd check inside linux in time_zone_libc.cc:24
+        target_compile_definitions (cctz PRIVATE __USE_BSD linux _XOPEN_SOURCE=600)
+    endif ()
+else ()
+    find_library (LIBRARY_CCTZ cctz)
+    find_path (INCLUDE_CCTZ NAMES cctz/civil_time.h)
+
+    add_library (cctz UNKNOWN IMPORTED)
+    set_property (TARGET cctz PROPERTY IMPORTED_LOCATION ${LIBRARY_CCTZ})
+    set_property (TARGET cctz PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INCLUDE_CCTZ})
+
+    set(CMAKE_REQUIRED_LIBRARIES cctz)
+    check_cxx_source_compiles(
+        "
+        #include <cctz/civil_time.h>
+        int main() {
+            cctz::civil_day date;
+        }
+        "
+        EXTERNAL_CCTZ_WORKS
+    )
+
+    if (NOT EXTERNAL_CCTZ_WORKS)
+        message (FATAL_ERROR "cctz is unusable: ${LIBRARY_CCTZ} ${INCLUDE_CCTZ}")
+    endif ()
 endif ()
 
-target_include_directories (cctz PUBLIC ${LIBRARY_DIR}/include)
+message (STATUS "Using cctz")

contrib/poco

@@ -1 +1 @@
-Subproject commit 5da7ce676c20e36ee9a2547eb48a50083b3d5237
+Subproject commit ddca76ba4956cb57150082394536cc43ff28f6fa

contrib/replxx

@@ -1 +1 @@
-Subproject commit 07cbfbec550133b88c91c4073fa5af2ae2ae6a9a
+Subproject commit f1332626639d6492eaf170758642da14fbbda7bf

dbms/programs/client/Client.cpp

@@ -281,7 +281,7 @@ private:
     }
 
     /// Should we celebrate a bit?
-    bool isNewYearMode()
+    static bool isNewYearMode()
     {
         time_t current_time = time(nullptr);
 
@@ -294,7 +294,7 @@ private:
             || (now.month() == 1 && now.day() <= 5);
     }
 
-    bool isChineseNewYearMode(const String & local_tz)
+    static bool isChineseNewYearMode(const String & local_tz)
     {
         /// Days of Dec. 20 in Chinese calendar starting from year 2019 to year 2105
         static constexpr UInt16 chineseNewYearIndicators[]
@@ -481,8 +481,6 @@ private:
 
             if (server_revision >= Suggest::MIN_SERVER_REVISION && !config().getBool("disable_suggestion", false))
             {
-                if (config().has("case_insensitive_suggestion"))
-                    Suggest::instance().setCaseInsensitive();
                 /// Load suggestion data from the server.
                 Suggest::instance().load(connection_parameters, config().getInt("suggestion_limit"));
             }
@@ -1594,7 +1592,7 @@ private:
             std::cout << "Ok." << std::endl;
     }
 
-    void showClientVersion()
+    static void showClientVersion()
     {
         std::cout << DBMS_NAME << " client version " << VERSION_STRING << VERSION_OFFICIAL << "." << std::endl;
     }
@@ -1720,7 +1718,6 @@ public:
             ("always_load_suggestion_data", "Load suggestion data even if clickhouse-client is run in non-interactive mode. Used for testing.")
             ("suggestion_limit", po::value<int>()->default_value(10000),
                 "Suggestion limit for how many databases, tables and columns to fetch.")
-            ("case_insensitive_suggestion", "Case sensitive suggestions.")
             ("multiline,m", "multiline")
             ("multiquery,n", "multiquery")
             ("format,f", po::value<std::string>(), "default output format")

dbms/programs/client/Suggest.cpp

@@ -50,16 +50,15 @@ void Suggest::load(const ConnectionParameters & connection_parameters, size_t su
 
         /// Note that keyword suggestions are available even if we cannot load data from server.
 
-        if (case_insensitive)
-            std::sort(words.begin(), words.end(), [](const std::string & str1, const std::string & str2)
+        std::sort(words.begin(), words.end());
+        words_no_case = words;
+        std::sort(words_no_case.begin(), words_no_case.end(), [](const std::string & str1, const std::string & str2)
+        {
+            return std::lexicographical_compare(begin(str1), end(str1), begin(str2), end(str2), [](const char char1, const char char2)
             {
-                return std::lexicographical_compare(begin(str1), end(str1), begin(str2), end(str2), [](const char char1, const char char2)
-                {
-                    return std::tolower(char1) < std::tolower(char2);
-                });
+                return std::tolower(char1) < std::tolower(char2);
             });
-        else
-            std::sort(words.begin(), words.end());
+        });
 
         ready = true;
     });

dbms/programs/client/Suggest.h

@@ -23,9 +23,6 @@ public:
         return instance;
     }
 
-    /// Need to set before load
-    void setCaseInsensitive() { case_insensitive = true; }
-
     void load(const ConnectionParameters & connection_parameters, size_t suggestion_limit);
 
     /// Older server versions cannot execute the query above.

dbms/programs/copier/ClusterCopier.cpp

@@ -499,7 +499,10 @@ ASTPtr ClusterCopier::removeAliasColumnsFromCreateQuery(const ASTPtr & query_ast
     return new_query_ast;
 }
 
-std::shared_ptr<ASTCreateQuery> ClusterCopier::rewriteCreateQueryStorage(const ASTPtr & create_query_ast, const DatabaseAndTableName & new_table, const ASTPtr & new_storage_ast)
+
+/// Replaces ENGINE and table name in a create query
+static std::shared_ptr<ASTCreateQuery> rewriteCreateQueryStorage(
+    const ASTPtr & create_query_ast, const DatabaseAndTableName & new_table, const ASTPtr & new_storage_ast)
 {
     const auto & create = create_query_ast->as<ASTCreateQuery &>();
     auto res = std::make_shared<ASTCreateQuery>(create);
@@ -1178,7 +1181,7 @@ String ClusterCopier::getRemoteCreateTable(const DatabaseAndTableName & table, C
 ASTPtr ClusterCopier::getCreateTableForPullShard(const ConnectionTimeouts & timeouts, TaskShard & task_shard)
 {
     /// Fetch and parse (possibly) new definition
-    auto connection_entry = task_shard.info.pool->get(timeouts, &task_cluster->settings_pull);
+    auto connection_entry = task_shard.info.pool->get(timeouts, &task_cluster->settings_pull, true);
     String create_query_pull_str = getRemoteCreateTable(
         task_shard.task_table.table_pull,
         *connection_entry,

dbms/programs/copier/ClusterCopier.h

@@ -88,11 +88,6 @@ protected:
     /// Removes MATERIALIZED and ALIAS columns from create table query
     static ASTPtr removeAliasColumnsFromCreateQuery(const ASTPtr &query_ast);
 
-    /// Replaces ENGINE and table name in a create query
-    std::shared_ptr<ASTCreateQuery>
-    rewriteCreateQueryStorage(const ASTPtr & create_query_ast, const DatabaseAndTableName & new_table,
-                              const ASTPtr & new_storage_ast);
-
     bool tryDropPartition(ShardPartition & task_partition,
                           const zkutil::ZooKeeperPtr & zookeeper,
                           const CleanStateClock & clean_state_clock);
@@ -119,8 +114,7 @@ protected:
                                 Connection & connection,
                                 const Settings * settings = nullptr);
 
-    ASTPtr getCreateTableForPullShard(const ConnectionTimeouts & timeouts,
-                                      TaskShard & task_shard);
+    ASTPtr getCreateTableForPullShard(const ConnectionTimeouts & timeouts, TaskShard & task_shard);
 
     void createShardInternalTables(const ConnectionTimeouts & timeouts,
                                    TaskShard & task_shard,

dbms/programs/copier/Internals.h

@@ -19,7 +19,7 @@
 #include <Common/Exception.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Common/ZooKeeper/KeeperException.h>
-#include <Common/getFQDNOrHostName.h>
+#include <common/getFQDNOrHostName.h>
 #include <Common/isLocalAddress.h>
 #include <Common/typeid_cast.h>
 #include <Common/ClickHouseRevision.h>

dbms/programs/local/LocalServer.cpp

@@ -118,6 +118,20 @@ void LocalServer::tryInitPath()
 }
 
 
+static void attachSystemTables()
+{
+    DatabasePtr system_database = DatabaseCatalog::instance().tryGetDatabase(DatabaseCatalog::SYSTEM_DATABASE);
+    if (!system_database)
+    {
+        /// TODO: add attachTableDelayed into DatabaseMemory to speedup loading
+        system_database = std::make_shared<DatabaseMemory>(DatabaseCatalog::SYSTEM_DATABASE);
+        DatabaseCatalog::instance().attachDatabase(DatabaseCatalog::SYSTEM_DATABASE, system_database);
+    }
+
+    attachSystemTablesLocal(*system_database);
+}
+
+
 int LocalServer::main(const std::vector<std::string> & /*args*/)
 try
 {
@@ -248,20 +262,6 @@ std::string LocalServer::getInitialCreateTableQuery()
 }
 
 
-void LocalServer::attachSystemTables()
-{
-    DatabasePtr system_database = DatabaseCatalog::instance().tryGetDatabase(DatabaseCatalog::SYSTEM_DATABASE);
-    if (!system_database)
-    {
-        /// TODO: add attachTableDelayed into DatabaseMemory to speedup loading
-        system_database = std::make_shared<DatabaseMemory>(DatabaseCatalog::SYSTEM_DATABASE);
-        DatabaseCatalog::instance().attachDatabase(DatabaseCatalog::SYSTEM_DATABASE, system_database);
-    }
-
-    attachSystemTablesLocal(*system_database);
-}
-
-
 void LocalServer::processQueries()
 {
     String initial_create_query = getInitialCreateTableQuery();
@@ -375,7 +375,7 @@ static void showClientVersion()
     std::cout << DBMS_NAME << " client version " << VERSION_STRING << VERSION_OFFICIAL << "." << '\n';
 }
 
-std::string LocalServer::getHelpHeader() const
+static std::string getHelpHeader()
 {
     return
         "usage: clickhouse-local [initial table definition] [--query <query>]\n"
@@ -390,7 +390,7 @@ std::string LocalServer::getHelpHeader() const
         "Either through corresponding command line parameters --table --structure --input-format and --file.";
 }
 
-std::string LocalServer::getHelpFooter() const
+static std::string getHelpFooter()
 {
     return
         "Example printing memory used by each Unix user:\n"

dbms/programs/local/LocalServer.h

@@ -37,13 +37,9 @@ private:
     void tryInitPath();
     void applyCmdOptions();
     void applyCmdSettings();
-    void attachSystemTables();
     void processQueries();
     void setupUsers();
 
-    std::string getHelpHeader() const;
-    std::string getHelpFooter() const;
-
 protected:
     std::unique_ptr<Context> context;
 

dbms/programs/obfuscator/Obfuscator.cpp

@@ -181,7 +181,7 @@ private:
     UInt64 seed;
 
 public:
-    UnsignedIntegerModel(UInt64 seed_) : seed(seed_) {}
+    explicit UnsignedIntegerModel(UInt64 seed_) : seed(seed_) {}
 
     void train(const IColumn &) override {}
     void finalize() override {}
@@ -222,7 +222,7 @@ private:
     UInt64 seed;
 
 public:
-    SignedIntegerModel(UInt64 seed_) : seed(seed_) {}
+    explicit SignedIntegerModel(UInt64 seed_) : seed(seed_) {}
 
     void train(const IColumn &) override {}
     void finalize() override {}
@@ -271,7 +271,7 @@ private:
     Float res_prev_value = 0;
 
 public:
-    FloatModel(UInt64 seed_) : seed(seed_) {}
+    explicit FloatModel(UInt64 seed_) : seed(seed_) {}
 
     void train(const IColumn &) override {}
     void finalize() override {}
@@ -372,7 +372,7 @@ private:
     UInt64 seed;
 
 public:
-    FixedStringModel(UInt64 seed_) : seed(seed_) {}
+    explicit FixedStringModel(UInt64 seed_) : seed(seed_) {}
 
     void train(const IColumn &) override {}
     void finalize() override {}
@@ -414,7 +414,7 @@ private:
     const DateLUTImpl & date_lut;
 
 public:
-    DateTimeModel(UInt64 seed_) : seed(seed_), date_lut(DateLUT::instance()) {}
+    explicit DateTimeModel(UInt64 seed_) : seed(seed_), date_lut(DateLUT::instance()) {}
 
     void train(const IColumn &) override {}
     void finalize() override {}
@@ -529,13 +529,13 @@ private:
     static constexpr CodePoint END = -2;
 
 
-    NGramHash hashContext(const CodePoint * begin, const CodePoint * end) const
+    static NGramHash hashContext(const CodePoint * begin, const CodePoint * end)
     {
         return CRC32Hash()(StringRef(reinterpret_cast<const char *>(begin), (end - begin) * sizeof(CodePoint)));
     }
 
     /// By the way, we don't have to use actual Unicode numbers. We use just arbitrary bijective mapping.
-    CodePoint readCodePoint(const char *& pos, const char * end)
+    static CodePoint readCodePoint(const char *& pos, const char * end)
     {
         size_t length = UTF8::seqLength(*pos);
 
@@ -550,7 +550,7 @@ private:
         return res;
     }
 
-    bool writeCodePoint(CodePoint code, char *& pos, const char * end)
+    static bool writeCodePoint(CodePoint code, char *& pos, const char * end)
     {
         size_t length
             = (code & 0xFF000000) ? 4
@@ -567,7 +567,7 @@ private:
     }
 
 public:
-    MarkovModel(MarkovModelParameters params_)
+    explicit MarkovModel(MarkovModelParameters params_)
         : params(std::move(params_)), code_points(params.order, BEGIN) {}
 
     void consume(const char * data, size_t size)
@@ -677,7 +677,7 @@ public:
                 if (!histogram.total)
                     continue;
 
-                double average = histogram.total / histogram.buckets.size();
+                double average = double(histogram.total) / histogram.buckets.size();
 
                 UInt64 new_total = 0;
                 for (auto & bucket : histogram.buckets)
@@ -836,7 +836,7 @@ private:
     ModelPtr nested_model;
 
 public:
-    ArrayModel(ModelPtr nested_model_) : nested_model(std::move(nested_model_)) {}
+    explicit ArrayModel(ModelPtr nested_model_) : nested_model(std::move(nested_model_)) {}
 
     void train(const IColumn & column) override
     {
@@ -874,7 +874,7 @@ private:
     ModelPtr nested_model;
 
 public:
-    NullableModel(ModelPtr nested_model_) : nested_model(std::move(nested_model_)) {}
+    explicit NullableModel(ModelPtr nested_model_) : nested_model(std::move(nested_model_)) {}
 
     void train(const IColumn & column) override
     {

dbms/programs/odbc-bridge/ODBCBridge.cpp

@@ -5,6 +5,13 @@
 #include <errno.h>
 #include <IO/ReadHelpers.h>
 #include <boost/program_options.hpp>
+
+#if USE_POCO_SQLODBC || USE_POCO_DATAODBC
+// It doesn't make much sense to build this bridge without ODBC, but we
+// still do this.
+#include <Poco/Data/ODBC/Connector.h>
+#endif
+
 #include <Poco/Net/HTTPServer.h>
 #include <Poco/Net/NetException.h>
 #include <Poco/String.h>
@@ -111,7 +118,7 @@ void ODBCBridge::defineOptions(Poco::Util::OptionSet & options)
                           .binding("help")
                           .callback(Poco::Util::OptionCallback<Me>(this, &Me::handleHelp)));
 
-    ServerApplication::defineOptions(options); /// Don't need complex BaseDaemon's .xml config
+    ServerApplication::defineOptions(options); // NOLINT Don't need complex BaseDaemon's .xml config
 }
 
 void ODBCBridge::initialize(Application & self)
@@ -126,6 +133,8 @@ void ODBCBridge::initialize(Application & self)
 
     buildLoggers(config(), logger(), self.commandName());
 
+    BaseDaemon::logRevision();
+
     log = &logger();
     hostname = config().getString("listen-host", "localhost");
     port = config().getUInt("http-port");
@@ -138,7 +147,13 @@ void ODBCBridge::initialize(Application & self)
 
     initializeTerminationAndSignalProcessing();
 
-    ServerApplication::initialize(self);
+#if USE_POCO_SQLODBC || USE_POCO_DATAODBC
+    // It doesn't make much sense to build this bridge without ODBC, but we
+    // still do this.
+    Poco::Data::ODBC::Connector::registerConnector();
+#endif
+
+    ServerApplication::initialize(self); // NOLINT
 }
 
 void ODBCBridge::uninitialize()

dbms/programs/performance-test/ConfigPreprocessor.cpp

@@ -41,7 +41,7 @@ void ConfigPreprocessor::removeConfigurationsIf(
     std::vector<XMLConfigurationPtr> & configs,
     ConfigPreprocessor::FilterType filter_type,
     const Strings & values,
-    bool leave) const
+    bool leave)
 {
     auto checker = [&filter_type, &values, &leave] (XMLConfigurationPtr & config)
     {

dbms/programs/performance-test/ConfigPreprocessor.h

@@ -39,11 +39,11 @@ private:
 
     /// Removes configurations that has a given value.
     /// If leave is true, the logic is reversed.
-    void removeConfigurationsIf(
+    static void removeConfigurationsIf(
         std::vector<XMLConfigurationPtr> & configs,
         FilterType filter_type,
         const Strings & values,
-        bool leave = false) const;
+        bool leave = false);
 
     const Strings paths;
 };

dbms/programs/performance-test/PerformanceTest.cpp

@@ -52,8 +52,6 @@ void waitQuery(Connection & connection)
 }
 }
 
-namespace fs = std::filesystem;
-
 PerformanceTest::PerformanceTest(
     const XMLConfigurationPtr & config_,
     Connection & connection_,

dbms/programs/performance-test/ReportBuilder.cpp

@@ -6,7 +6,7 @@
 #include <thread>
 
 #include <Common/getNumberOfPhysicalCPUCores.h>
-#include <Common/getFQDNOrHostName.h>
+#include <common/getFQDNOrHostName.h>
 #include <common/getMemoryAmount.h>
 #include <Common/StringUtils/StringUtils.h>
 
@@ -40,7 +40,7 @@ ReportBuilder::ReportBuilder(const std::string & server_version_)
 {
 }
 
-std::string ReportBuilder::getCurrentTime() const
+static std::string getCurrentTime()
 {
     return DateLUT::instance().timeToString(time(nullptr));
 }
@@ -119,7 +119,7 @@ std::string ReportBuilder::buildFullReport(
             if (statistics.sampler.size() != 0)
             {
                 JSONString quantiles(4); /// here, 4 is the size of \t padding
-                for (double percent = 10; percent <= 90; percent += 10)
+                for (int percent = 10; percent <= 90; percent += 10)
                 {
                     std::string quantile_key = std::to_string(percent / 100.0);
                     while (quantile_key.back() == '0')
@@ -163,7 +163,7 @@ std::string ReportBuilder::buildFullReport(
 std::string ReportBuilder::buildCompactReport(
     const PerformanceTestInfo & test_info,
     std::vector<TestStats> & stats,
-    const std::vector<std::size_t> & queries_to_run) const
+    const std::vector<std::size_t> & queries_to_run)
 {
     FormatSettings settings;
     std::ostringstream output;

dbms/programs/performance-test/ReportBuilder.h

@@ -10,16 +10,16 @@ class ReportBuilder
 {
 public:
     ReportBuilder(const std::string & server_version_);
+
     std::string buildFullReport(
         const PerformanceTestInfo & test_info,
         std::vector<TestStats> & stats,
         const std::vector<std::size_t> & queries_to_run) const;
 
-
-    std::string buildCompactReport(
+    static std::string buildCompactReport(
         const PerformanceTestInfo & test_info,
         std::vector<TestStats> & stats,
-        const std::vector<std::size_t> & queries_to_run) const;
+        const std::vector<std::size_t> & queries_to_run);
 
 private:
     std::string server_version;
@@ -27,10 +27,6 @@ private:
     size_t num_cores;
     size_t num_threads;
     size_t ram;
-
-private:
-    std::string getCurrentTime() const;
-
 };
 
 }

dbms/programs/performance-test/TestStats.cpp

@@ -17,9 +17,9 @@ std::string TestStats::getStatisticByName(const std::string & statistic_name)
     {
         std::string result = "\n";
 
-        for (double percent = 10; percent <= 90; percent += 10)
+        for (int percent = 10; percent <= 90; percent += 10)
         {
-            result += FOUR_SPACES + std::to_string((percent / 100));
+            result += FOUR_SPACES + std::to_string((percent / 100.0));
             result += ": " + std::to_string(sampler.quantileInterpolated(percent / 100.0));
             result += "\n";
         }

dbms/programs/server/HTTPHandler.cpp

@@ -12,7 +12,7 @@
 #include <Core/ExternalTable.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/escapeForFileName.h>
-#include <Common/getFQDNOrHostName.h>
+#include <common/getFQDNOrHostName.h>
 #include <Common/CurrentThread.h>
 #include <Common/setThreadName.h>
 #include <Common/config.h>

dbms/programs/server/HTTPHandler.h

@@ -77,7 +77,7 @@ private:
         Poco::Net::HTTPServerResponse & response,
         Output & used_output);
 
-    void pushDelayedResults(Output & used_output);
+    static void pushDelayedResults(Output & used_output);
 };
 
 }

dbms/programs/server/MySQLHandler.h

@@ -1,7 +1,7 @@
 #pragma once
 #include <Common/config.h>
 #include <Poco/Net/TCPServerConnection.h>
-#include <Common/getFQDNOrHostName.h>
+#include <common/getFQDNOrHostName.h>
 #include <Common/CurrentMetrics.h>
 #include <Core/MySQLProtocol.h>
 #include "IServer.h"

dbms/programs/server/Server.cpp

@@ -27,7 +27,7 @@
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Common/ZooKeeper/ZooKeeperNodeCache.h>
 #include "config_core.h"
-#include <Common/getFQDNOrHostName.h>
+#include <common/getFQDNOrHostName.h>
 #include <Common/getMultipleKeysFromConfig.h>
 #include <Common/getNumberOfPhysicalCPUCores.h>
 #include <Common/getExecutablePath.h>
@@ -175,7 +175,7 @@ int Server::run()
         std::cout << DBMS_NAME << " server version " << VERSION_STRING << VERSION_OFFICIAL << "." << std::endl;
         return 0;
     }
-    return Application::run();
+    return Application::run(); // NOLINT
 }
 
 void Server::initialize(Poco::Util::Application & self)

dbms/programs/server/TCPHandler.cpp

@@ -162,7 +162,7 @@ void TCPHandler::runImpl()
         std::optional<DB::Exception> exception;
         bool network_error = false;
 
-        bool send_exception_with_stack_trace = connection_context.getSettingsRef().calculate_text_stack_trace;
+        bool send_exception_with_stack_trace = true;
 
         try
         {
@@ -647,8 +647,6 @@ void TCPHandler::processOrdinaryQueryWithProcessors(size_t num_threads)
           */
         if (!isQueryCancelled())
         {
-            pipeline.finalize();
-
             sendTotals(lazy_format->getTotals());
             sendExtremes(lazy_format->getExtremes());
             sendProfileInfo(lazy_format->getProfileInfo());
@@ -1032,7 +1030,7 @@ void TCPHandler::receiveUnexpectedData()
             last_block_in.header,
             client_revision);
 
-    Block skip_block = skip_block_in->read();
+    skip_block_in->read();
     throw NetException("Unexpected packet Data received from client", ErrorCodes::UNEXPECTED_PACKET_FROM_CLIENT);
 }
 

dbms/programs/server/TCPHandler.h

@@ -2,7 +2,7 @@
 
 #include <Poco/Net/TCPServerConnection.h>
 
-#include <Common/getFQDNOrHostName.h>
+#include <common/getFQDNOrHostName.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/Stopwatch.h>
 #include <Core/Protocol.h>

dbms/src/Access/AccessRights.cpp

@@ -75,6 +75,9 @@ public:
 
     Node & operator =(const Node & src)
     {
+        if (this == &src)
+            return *this;
+
         node_name = src.node_name;
         level = src.level;
         inherited_access = src.inherited_access;
@@ -158,7 +161,7 @@ public:
     void revoke(const AccessFlags & access_to_revoke, const Helper & helper)
     {
         if constexpr (mode == NORMAL_REVOKE_MODE)
-        {
+        { // NOLINT
             if (level == TABLE_LEVEL)
                 removeExplicitGrantsRec(access_to_revoke);
             else
@@ -166,11 +169,12 @@ public:
         }
         else if constexpr (mode == PARTIAL_REVOKE_MODE)
         {
-            AccessFlags new_partial_revokes = access_to_revoke - explicit_grants;
             if (level == TABLE_LEVEL)
                 removeExplicitGrantsRec(access_to_revoke);
             else
                 removeExplicitGrants(access_to_revoke);
+
+            AccessFlags new_partial_revokes = access_to_revoke - explicit_grants;
             removePartialRevokesRec(new_partial_revokes);
             partial_revokes |= new_partial_revokes;
         }

dbms/src/Access/IAccessStorage.cpp

@@ -379,7 +379,7 @@ void IAccessStorage::throwNotFound(std::type_index type, const String & name) co
 }
 
 
-void IAccessStorage::throwBadCast(const UUID & id, std::type_index type, const String & name, std::type_index required_type) const
+void IAccessStorage::throwBadCast(const UUID & id, std::type_index type, const String & name, std::type_index required_type)
 {
     throw Exception(
         "ID {" + toString(id) + "}: " + getTypeName(type) + backQuote(name) + " expected to be of type " + getTypeName(required_type),

dbms/src/Access/IAccessStorage.h

@@ -151,8 +151,9 @@ protected:
     static String getTypeName(std::type_index type) { return IAccessEntity::getTypeName(type); }
     [[noreturn]] void throwNotFound(const UUID & id) const;
     [[noreturn]] void throwNotFound(std::type_index type, const String & name) const;
-    [[noreturn]] void throwBadCast(const UUID & id, std::type_index type, const String & name, std::type_index required_type) const;
-    [[noreturn]] void throwIDCollisionCannotInsert(const UUID & id, std::type_index type, const String & name, std::type_index existing_type, const String & existing_name) const;
+    [[noreturn]] static void throwBadCast(const UUID & id, std::type_index type, const String & name, std::type_index required_type);
+    [[noreturn]] void throwIDCollisionCannotInsert(
+        const UUID & id, std::type_index type, const String & name, std::type_index existing_type, const String & existing_name) const;
     [[noreturn]] void throwNameCollisionCannotInsert(std::type_index type, const String & name) const;
     [[noreturn]] void throwNameCollisionCannotRename(std::type_index type, const String & old_name, const String & new_name) const;
     [[noreturn]] void throwReadonlyCannotInsert(std::type_index type, const String & name) const;

dbms/src/Access/QuotaContext.cpp

@@ -135,6 +135,9 @@ struct QuotaContext::Impl
 
 QuotaContext::Interval & QuotaContext::Interval::operator =(const Interval & src)
 {
+    if (this == &src)
+        return *this;
+
     randomize_interval = src.randomize_interval;
     duration = src.duration;
     end_of_interval.store(src.end_of_interval.load());

dbms/src/AggregateFunctions/AggregateFunctionGroupArray.cpp

@@ -87,15 +87,11 @@ AggregateFunctionPtr createAggregateFunctionGroupArraySample(const std::string &
 {
     assertUnary(name, argument_types);
 
-    UInt64 max_elems = std::numeric_limits<UInt64>::max();
-    UInt64 seed = 123456;
-
-    UInt64 * params[2] = {&max_elems, &seed};
     if (parameters.size() != 1 && parameters.size() != 2)
         throw Exception("Incorrect number of parameters for aggregate function " + name + ", should be 1 or 2",
             ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
-    for (auto i = 0ul; i < parameters.size(); ++i)
+    auto get_parameter = [&](size_t i)
     {
         auto type = parameters[i].getType();
         if (type != Field::Types::Int64 && type != Field::Types::UInt64)
@@ -105,8 +101,16 @@ AggregateFunctionPtr createAggregateFunctionGroupArraySample(const std::string &
                 (type == Field::Types::UInt64 && parameters[i].get<UInt64>() == 0))
             throw Exception("Parameter for aggregate function " + name + " should be positive number", ErrorCodes::BAD_ARGUMENTS);
 
-        *params[i] = parameters[i].get<UInt64>();
-    }
+        return parameters[i].get<UInt64>();
+    };
+
+    UInt64 max_elems = get_parameter(0);
+
+    UInt64 seed;
+    if (parameters.size() >= 2)
+        seed = get_parameter(1);
+    else
+        seed = thread_local_rng();
 
     return createAggregateFunctionGroupArrayImpl<GroupArrayTrait<true, Sampler::RNG>>(argument_types[0], max_elems, seed);
 }

dbms/src/AggregateFunctions/AggregateFunctionGroupArray.h

@@ -17,7 +17,6 @@
 #include <AggregateFunctions/IAggregateFunction.h>
 
 #include <type_traits>
-#include <common/likely.h>
 
 #define AGGREGATE_FUNCTION_GROUP_ARRAY_MAX_ARRAY_SIZE 0xFFFFFF
 

dbms/src/AggregateFunctions/AggregateFunctionGroupUniqArray.cpp

@@ -25,7 +25,8 @@ template <typename has_limit>
 class AggregateFunctionGroupUniqArrayDate : public AggregateFunctionGroupUniqArray<DataTypeDate::FieldType, has_limit>
 {
 public:
-    AggregateFunctionGroupUniqArrayDate(const DataTypePtr & argument_type, UInt64 max_elems_ = std::numeric_limits<UInt64>::max()) : AggregateFunctionGroupUniqArray<DataTypeDate::FieldType, has_limit>(argument_type, max_elems_) {}
+    explicit AggregateFunctionGroupUniqArrayDate(const DataTypePtr & argument_type, UInt64 max_elems_ = std::numeric_limits<UInt64>::max())
+        : AggregateFunctionGroupUniqArray<DataTypeDate::FieldType, has_limit>(argument_type, max_elems_) {}
     DataTypePtr getReturnType() const override { return std::make_shared<DataTypeArray>(std::make_shared<DataTypeDate>()); }
 };
 
@@ -33,7 +34,8 @@ template <typename has_limit>
 class AggregateFunctionGroupUniqArrayDateTime : public AggregateFunctionGroupUniqArray<DataTypeDateTime::FieldType, has_limit>
 {
 public:
-    AggregateFunctionGroupUniqArrayDateTime(const DataTypePtr & argument_type, UInt64 max_elems_ = std::numeric_limits<UInt64>::max()) : AggregateFunctionGroupUniqArray<DataTypeDateTime::FieldType, has_limit>(argument_type, max_elems_) {}
+    explicit AggregateFunctionGroupUniqArrayDateTime(const DataTypePtr & argument_type, UInt64 max_elems_ = std::numeric_limits<UInt64>::max())
+        : AggregateFunctionGroupUniqArray<DataTypeDateTime::FieldType, has_limit>(argument_type, max_elems_) {}
     DataTypePtr getReturnType() const override { return std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>()); }
 };
 

dbms/src/AggregateFunctions/AggregateFunctionSimpleLinearRegression.cpp

@@ -56,7 +56,7 @@ AggregateFunctionPtr createAggregateFunctionSimpleLinearRegression(
         FOR_LEASTSQR_TYPES_2(M, Float64)
     #define DISPATCH(T1, T2) \
         if (which_x.idx == TypeIndex::T1 && which_y.idx == TypeIndex::T2) \
-            return std::make_shared<AggregateFunctionSimpleLinearRegression<T1, T2>>( \
+            return std::make_shared<AggregateFunctionSimpleLinearRegression<T1, T2>>(/* NOLINT */ \
                 arguments, \
                 params \
             );

dbms/src/AggregateFunctions/QuantileTiming.h

@@ -6,7 +6,6 @@
 #include <IO/WriteBuffer.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
-#include <common/likely.h>
 
 
 namespace DB

dbms/src/AggregateFunctions/ReservoirSampler.h

@@ -4,7 +4,7 @@
 #include <algorithm>
 #include <climits>
 #include <sstream>
-#include <common/Types.h>
+#include <common/types.h>
 #include <IO/ReadBuffer.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>

dbms/src/AggregateFunctions/ReservoirSamplerDeterministic.h

@@ -5,7 +5,7 @@
 #include <climits>
 #include <sstream>
 #include <AggregateFunctions/ReservoirSampler.h>
-#include <common/Types.h>
+#include <common/types.h>
 #include <Common/HashTable/Hash.h>
 #include <IO/ReadBuffer.h>
 #include <IO/ReadHelpers.h>

dbms/src/AggregateFunctions/UniquesHashSet.h

@@ -2,7 +2,7 @@
 
 #include <math.h>
 
-#include <common/Types.h>
+#include <common/types.h>
 
 #include <IO/WriteBuffer.h>
 #include <IO/WriteHelpers.h>

dbms/src/Client/ConnectionPoolWithFailover.cpp

@@ -4,7 +4,7 @@
 #include <Poco/Net/DNS.h>
 
 #include <Common/BitHelpers.h>
-#include <Common/getFQDNOrHostName.h>
+#include <common/getFQDNOrHostName.h>
 #include <Common/isLocalAddress.h>
 #include <Common/ProfileEvents.h>
 #include <Core/Settings.h>

dbms/src/Client/ConnectionPoolWithFailover.h

@@ -44,8 +44,8 @@ public:
 
     /** Allocates connection to work. */
     Entry get(const ConnectionTimeouts & timeouts,
-              const Settings * settings = nullptr,
-              bool force_connected = true) override; /// From IConnectionPool
+              const Settings * settings,
+              bool force_connected) override; /// From IConnectionPool
 
     /** Allocates up to the specified number of connections to work.
       * Connections provide access to different replicas of one shard.

dbms/src/Client/MultiplexedConnections.cpp

@@ -1,5 +1,7 @@
 #include <Client/MultiplexedConnections.h>
 #include <IO/ConnectionTimeouts.h>
+#include <Common/thread_local_rng.h>
+
 
 namespace DB
 {
@@ -308,10 +310,10 @@ MultiplexedConnections::ReplicaState & MultiplexedConnections::getReplicaForRead
             throw Exception("Timeout exceeded while reading from " + dumpAddressesUnlocked(), ErrorCodes::TIMEOUT_EXCEEDED);
     }
 
-    /// TODO Absolutely wrong code: read_list could be empty; rand() is not thread safe and has low quality; motivation of rand is unclear.
+    /// TODO Absolutely wrong code: read_list could be empty; motivation of rand is unclear.
     /// This code path is disabled by default.
 
-    auto & socket = read_list[rand() % read_list.size()];
+    auto & socket = read_list[thread_local_rng() % read_list.size()];
     if (fd_to_replica_state_idx.empty())
     {
         fd_to_replica_state_idx.reserve(replica_states.size());

dbms/src/Columns/ColumnAggregateFunction.cpp

@@ -501,7 +501,7 @@ MutableColumns ColumnAggregateFunction::scatter(IColumn::ColumnIndex num_columns
     size_t num_rows = size();
 
     {
-        size_t reserve_size = num_rows / num_columns * 1.1; /// 1.1 is just a guess. Better to use n-sigma rule.
+        size_t reserve_size = double(num_rows) / num_columns * 1.1; /// 1.1 is just a guess. Better to use n-sigma rule.
 
         if (reserve_size > 1)
             for (auto & column : columns)
@@ -576,8 +576,9 @@ ColumnAggregateFunction::MutablePtr ColumnAggregateFunction::createView() const
 }
 
 ColumnAggregateFunction::ColumnAggregateFunction(const ColumnAggregateFunction & src_)
-    : foreign_arenas(concatArenas(src_.foreign_arenas, src_.my_arena)),
-      func(src_.func), src(src_.getPtr()), data(src_.data.begin(), src_.data.end())
+    : COWHelper<IColumn, ColumnAggregateFunction>(src_),
+    foreign_arenas(concatArenas(src_.foreign_arenas, src_.my_arena)),
+    func(src_.func), src(src_.getPtr()), data(src_.data.begin(), src_.data.end())
 {
 }
 

dbms/src/Columns/ColumnLowCardinality.cpp

@@ -16,6 +16,12 @@ namespace ErrorCodes
 
 namespace
 {
+    void checkColumn(const IColumn & column)
+    {
+        if (!dynamic_cast<const IColumnUnique *>(&column))
+            throw Exception("ColumnUnique expected as an argument of ColumnLowCardinality.", ErrorCodes::ILLEGAL_COLUMN);
+    }
+
     template <typename T>
     PaddedPODArray<T> * getIndexesData(IColumn & indexes)
     {
@@ -651,13 +657,6 @@ ColumnLowCardinality::Dictionary::Dictionary(ColumnPtr column_unique_, bool is_s
     checkColumn(*column_unique);
 }
 
-void ColumnLowCardinality::Dictionary::checkColumn(const IColumn & column)
-{
-
-    if (!dynamic_cast<const IColumnUnique *>(&column))
-        throw Exception("ColumnUnique expected as an argument of ColumnLowCardinality.", ErrorCodes::ILLEGAL_COLUMN);
-}
-
 void ColumnLowCardinality::Dictionary::setShared(const ColumnPtr & column_unique_)
 {
     checkColumn(*column_unique_);

dbms/src/Columns/ColumnLowCardinality.h

@@ -275,8 +275,6 @@ private:
     private:
         WrappedPtr column_unique;
         bool shared = false;
-
-        void checkColumn(const IColumn & column);
     };
 
     Dictionary dictionary;

dbms/src/Columns/ColumnVector.cpp

@@ -118,7 +118,7 @@ void ColumnVector<T>::getPermutation(bool reverse, size_t limit, int nan_directi
             if (s >= 256 && s <= std::numeric_limits<UInt32>::max())
             {
                 PaddedPODArray<ValueWithIndex<T>> pairs(s);
-                for (UInt32 i = 0; i < s; ++i)
+                for (UInt32 i = 0; i < UInt32(s); ++i)
                     pairs[i] = {data[i], i};
 
                 RadixSort<RadixSortTraits<T>>::executeLSD(pairs.data(), s);

dbms/src/Common/Arena.h

@@ -4,7 +4,6 @@
 #include <memory>
 #include <vector>
 #include <boost/noncopyable.hpp>
-#include <common/likely.h>
 #if __has_include(<sanitizer/asan_interface.h>)
 #   include <sanitizer/asan_interface.h>
 #endif

dbms/src/Common/ColumnsHashing.h

@@ -228,13 +228,13 @@ struct HashMethodSingleLowCardinalityColumn : public SingleColumnMethod
     /// If initialized column is nullable.
     bool is_nullable = false;
 
-    static const ColumnLowCardinality & getLowCardinalityColumn(const IColumn * low_cardinality_column)
+    static const ColumnLowCardinality & getLowCardinalityColumn(const IColumn * column)
     {
-        auto column = typeid_cast<const ColumnLowCardinality *>(low_cardinality_column);
-        if (!column)
+        auto low_cardinality_column = typeid_cast<const ColumnLowCardinality *>(column);
+        if (!low_cardinality_column)
             throw Exception("Invalid aggregation key type for HashMethodSingleLowCardinalityColumn method. "
                             "Excepted LowCardinality, got " + column->getName(), ErrorCodes::LOGICAL_ERROR);
-        return *column;
+        return *low_cardinality_column;
     }
 
     HashMethodSingleLowCardinalityColumn(

dbms/src/Common/ConcurrentBoundedQueue.h

@@ -6,7 +6,7 @@
 #include <Poco/Mutex.h>
 #include <Poco/Semaphore.h>
 
-#include <common/Types.h>
+#include <common/types.h>
 
 
 namespace detail

dbms/src/Common/Config/ConfigProcessor.cpp

@@ -219,7 +219,7 @@ void ConfigProcessor::merge(XMLDocumentPtr config, XMLDocumentPtr with)
     mergeRecursive(config, config_root, with_root);
 }
 
-std::string ConfigProcessor::layerFromHost()
+static std::string layerFromHost()
 {
     utsname buf;
     if (uname(&buf))
@@ -294,7 +294,7 @@ void ConfigProcessor::doIncludesRecursive(
 
     auto process_include = [&](const Node * include_attr, const std::function<const Node * (const std::string &)> & get_node, const char * error_msg)
     {
-        std::string name = include_attr->getNodeValue();
+        const std::string & name = include_attr->getNodeValue();
         const Node * node_to_include = get_node(name);
         if (!node_to_include)
         {

dbms/src/Common/Config/ConfigProcessor.h

@@ -97,8 +97,8 @@ public:
     /// If preprocessed_dir is empty - calculate from loaded_config.path + /preprocessed_configs/
     void savePreprocessedConfig(const LoadedConfig & loaded_config, std::string preprocessed_dir);
 
-    /// Set path of main config.xml . It will be cutted from all configs placed to preprocessed_configs/
-    void setConfigPath(const std::string & config_path);
+    /// Set path of main config.xml. It will be cutted from all configs placed to preprocessed_configs/
+    static void setConfigPath(const std::string & config_path);
 
 public:
     using Files = std::vector<std::string>;
@@ -131,8 +131,6 @@ private:
 
     void merge(XMLDocumentPtr config, XMLDocumentPtr with);
 
-    std::string layerFromHost();
-
     void doIncludesRecursive(
             XMLDocumentPtr config,
             XMLDocumentPtr include_from,

dbms/src/Common/CounterInFile.h

@@ -16,7 +16,7 @@
 #include <IO/WriteHelpers.h>
 
 #include <Common/Exception.h>
-#include <common/Types.h>
+#include <common/types.h>
 
 
 namespace DB

dbms/src/Common/CurrentThread.cpp

@@ -2,7 +2,6 @@
 
 #include "CurrentThread.h"
 #include <common/logger_useful.h>
-#include <common/likely.h>
 #include <Common/ThreadStatus.h>
 #include <Common/TaskStatsInfoGetter.h>
 #include <Interpreters/ProcessList.h>

dbms/src/Common/CurrentThread.h

@@ -3,7 +3,6 @@
 #include <memory>
 #include <string>
 
-#include <common/likely.h>
 #include <common/StringRef.h>
 #include <Common/ThreadStatus.h>
 
@@ -107,4 +106,3 @@ private:
 };
 
 }
-

dbms/src/Common/DNSResolver.cpp

@@ -170,8 +170,8 @@ bool DNSResolver::updateCache()
 {
     {
         std::lock_guard lock(impl->drop_mutex);
-        for (auto & host : impl->new_hosts)
-            impl->known_hosts.insert(std::move(host));
+        for (const auto & host : impl->new_hosts)
+            impl->known_hosts.insert(host);
         impl->new_hosts.clear();
 
         impl->host_name.emplace(Poco::Net::DNS::hostName());