Merge remote-tracking branch 'upstream/master' into HEAD

2024-09-22 17:50:47 +00:00 · 2022-01-30 03:24:37 +03:00 · 2022-01-30 03:24:37 +03:00 · 78b9f15abb
commit 78b9f15abb
parent 26257bbde6 44ebcb9f07
522 changed files with 11235 additions and 3254 deletions
--- a/.github/actionlint.yml
+++ b/.github/actionlint.yml
@ -1,8 +1,9 @@
 self-hosted-runner:
  labels:
    - builder
+    - func-tester
+    - func-tester-aarch64
    - fuzzer-unit-tester
    - stress-tester
    - style-checker
-    - func-tester-aarch64
-    - func-tester
+    - style-checker-aarch64
--- a/.github/workflows/backport_branches.yml
+++ b/.github/workflows/backport_branches.yml
@ -10,7 +10,7 @@ on: # yamllint disable-line rule:truthy
      - 'backport/**'
 jobs:
  DockerHubPushAarch64:
-    runs-on: [self-hosted, func-tester-aarch64]
+    runs-on: [self-hosted, style-checker-aarch64]
    steps:
      - name: Clear repository
        run: |
--- a/.github/workflows/docs_check.yml
+++ b/.github/workflows/docs_check.yml
@ -30,7 +30,7 @@ jobs:
          python3 run_check.py
  DockerHubPushAarch64:
    needs: CheckLabels
-    runs-on: [self-hosted, func-tester-aarch64]
+    runs-on: [self-hosted, style-checker-aarch64]
    steps:
      - name: Clear repository
        run: |
--- a/.github/workflows/docs_release.yml
+++ b/.github/workflows/docs_release.yml
@ -20,7 +20,7 @@ on: # yamllint disable-line rule:truthy
  workflow_dispatch:
 jobs:
  DockerHubPushAarch64:
-    runs-on: [self-hosted, func-tester-aarch64]
+    runs-on: [self-hosted, style-checker-aarch64]
    steps:
      - name: Clear repository
        run: |
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@ -9,8 +9,20 @@ on: # yamllint disable-line rule:truthy
    branches:
      - 'master'
 jobs:
+  PythonUnitTests:
+    runs-on: [self-hosted, style-checker]
+    steps:
+      - name: Clear repository
+        run: |
+          sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
+      - name: Check out repository code
+        uses: actions/checkout@v2
+      - name: Python unit tests
+        run: |
+          cd "$GITHUB_WORKSPACE/tests/ci"
+          python3 -m unittest discover -s . -p '*_test.py'
  DockerHubPushAarch64:
-    runs-on: [self-hosted, func-tester-aarch64]
+    runs-on: [self-hosted, style-checker-aarch64]
    steps:
      - name: Clear repository
        run: |
@ -44,7 +56,7 @@ jobs:
          name: changed_images_amd64
          path: ${{ runner.temp }}/docker_images_check/changed_images_amd64.json
  DockerHubPush:
-    needs: [DockerHubPushAmd64, DockerHubPushAarch64]
+    needs: [DockerHubPushAmd64, DockerHubPushAarch64, PythonUnitTests]
    runs-on: [self-hosted, style-checker]
    steps:
      - name: Clear repository
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@ -31,9 +31,22 @@ jobs:
        run: |
          cd "$GITHUB_WORKSPACE/tests/ci"
          python3 run_check.py
+  PythonUnitTests:
+    needs: CheckLabels
+    runs-on: [self-hosted, style-checker]
+    steps:
+      - name: Clear repository
+        run: |
+          sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
+      - name: Check out repository code
+        uses: actions/checkout@v2
+      - name: Python unit tests
+        run: |
+          cd "$GITHUB_WORKSPACE/tests/ci"
+          python3 -m unittest discover -s . -p '*_test.py'
  DockerHubPushAarch64:
    needs: CheckLabels
-    runs-on: [self-hosted, func-tester-aarch64]
+    runs-on: [self-hosted, style-checker-aarch64]
    steps:
      - name: Clear repository
        run: |
@ -68,7 +81,7 @@ jobs:
          name: changed_images_amd64
          path: ${{ runner.temp }}/docker_images_check/changed_images_amd64.json
  DockerHubPush:
-    needs: [DockerHubPushAmd64, DockerHubPushAarch64]
+    needs: [DockerHubPushAmd64, DockerHubPushAarch64, PythonUnitTests]
    runs-on: [self-hosted, style-checker]
    steps:
      - name: Clear repository
--- a/.github/workflows/release_branches.yml
+++ b/.github/workflows/release_branches.yml
@ -13,7 +13,7 @@ on: # yamllint disable-line rule:truthy

 jobs:
  DockerHubPushAarch64:
-    runs-on: [self-hosted, func-tester-aarch64]
+    runs-on: [self-hosted, style-checker-aarch64]
    steps:
      - name: Clear repository
        run: |
--- a/.gitmodules
+++ b/.gitmodules
@ -217,6 +217,9 @@
 [submodule "contrib/yaml-cpp"]
 	path = contrib/yaml-cpp
 	url = https://github.com/ClickHouse-Extras/yaml-cpp.git
+[submodule "contrib/cld2"]
+	path = contrib/cld2
+	url = https://github.com/ClickHouse-Extras/cld2.git
 [submodule "contrib/libstemmer_c"]
 	path = contrib/libstemmer_c
 	url = https://github.com/ClickHouse-Extras/libstemmer_c.git
@ -247,6 +250,9 @@
 [submodule "contrib/sysroot"]
 	path = contrib/sysroot
 	url = https://github.com/ClickHouse-Extras/sysroot.git
+[submodule "contrib/nlp-data"]
+	path = contrib/nlp-data
+	url = https://github.com/ClickHouse-Extras/nlp-data.git
 [submodule "contrib/hive-metastore"]
 	path = contrib/hive-metastore
 	url = https://github.com/ClickHouse-Extras/hive-metastore
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -104,9 +104,8 @@ message (STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
 string (TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_UC)

 option(USE_STATIC_LIBRARIES "Disable to use shared libraries" ON)
-option(MAKE_STATIC_LIBRARIES "Disable to make shared libraries" ${USE_STATIC_LIBRARIES})

-if (NOT MAKE_STATIC_LIBRARIES)
+if (NOT USE_STATIC_LIBRARIES)
    # DEVELOPER ONLY.
    # Faster linking if turned on.
    option(SPLIT_SHARED_LIBRARIES "Keep all internal libraries as separate .so files")
@ -115,11 +114,11 @@ if (NOT MAKE_STATIC_LIBRARIES)
        "Make several binaries (clickhouse-server, clickhouse-client etc.) instead of one bundled")
 endif ()

-if (MAKE_STATIC_LIBRARIES AND SPLIT_SHARED_LIBRARIES)
-    message(FATAL_ERROR "Defining SPLIT_SHARED_LIBRARIES=1 without MAKE_STATIC_LIBRARIES=0 has no effect.")
+if (USE_STATIC_LIBRARIES AND SPLIT_SHARED_LIBRARIES)
+    message(FATAL_ERROR "Defining SPLIT_SHARED_LIBRARIES=1 without USE_STATIC_LIBRARIES=0 has no effect.")
 endif()

-if (NOT MAKE_STATIC_LIBRARIES AND SPLIT_SHARED_LIBRARIES)
+if (NOT USE_STATIC_LIBRARIES AND SPLIT_SHARED_LIBRARIES)
    set(BUILD_SHARED_LIBS 1 CACHE INTERNAL "")
 endif ()

@ -201,21 +200,13 @@ endif ()
 option(ENABLE_TESTS "Provide unit_test_dbms target with Google.Test unit tests" ON)
 option(ENABLE_EXAMPLES "Build all example programs in 'examples' subdirectories" OFF)

-if (OS_LINUX AND (ARCH_AMD64 OR ARCH_AARCH64) AND MAKE_STATIC_LIBRARIES AND NOT SPLIT_SHARED_LIBRARIES AND NOT USE_MUSL)
+if (OS_LINUX AND (ARCH_AMD64 OR ARCH_AARCH64) AND USE_STATIC_LIBRARIES AND NOT SPLIT_SHARED_LIBRARIES AND NOT USE_MUSL)
    # Only for Linux, x86_64 or aarch64.
    option(GLIBC_COMPATIBILITY "Enable compatibility with older glibc libraries." ON)
 elseif(GLIBC_COMPATIBILITY)
    message (${RECONFIGURE_MESSAGE_LEVEL} "Glibc compatibility cannot be enabled in current configuration")
 endif ()

-if (GLIBC_COMPATIBILITY)
-    # NOTE: we may also want to check glibc version and add -include only for 2.32+
-    # however this is extra complexity, especially for cross compiling.
-    # And anyway it should not break anything for <2.32.
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -include ${CMAKE_CURRENT_SOURCE_DIR}/base/glibc-compatibility/glibc-compat-2.32.h")
-    set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -include ${CMAKE_CURRENT_SOURCE_DIR}/base/glibc-compatibility/glibc-compat-2.32.h")
-endif()
-
 # Make sure the final executable has symbols exported
 set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -rdynamic")

@ -256,8 +247,6 @@ endif()

 if (CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG")
    set(USE_DEBUG_HELPERS ON)
-else ()
-    set(USE_DEBUG_HELPERS ON)
 endif()
 option(USE_DEBUG_HELPERS "Enable debug helpers" ${USE_DEBUG_HELPERS})

@ -412,17 +401,6 @@ else ()
    option(WERROR "Enable -Werror compiler option" ON)
 endif ()

-if (WERROR)
-    # Don't pollute CMAKE_CXX_FLAGS with -Werror as it will break some CMake checks.
-    # Instead, adopt modern cmake usage requirement.
-    target_compile_options(global-libs INTERFACE "-Werror")
-endif ()
-
-# Make this extra-checks for correct library dependencies.
-if (OS_LINUX AND NOT SANITIZE)
-    target_link_options(global-libs INTERFACE "-Wl,--no-undefined")
-endif ()
-
 # Increase stack size on Musl. We need big stack for our recursive-descend parser.
 if (USE_MUSL)
    set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,stack-size=2097152")
@ -430,6 +408,7 @@ endif ()

 include(cmake/dbms_glob_sources.cmake)

+add_library(global-group INTERFACE)
 if (OS_LINUX OR OS_ANDROID)
    include(cmake/linux/default_libs.cmake)
 elseif (OS_DARWIN)
@ -437,6 +416,18 @@ elseif (OS_DARWIN)
 elseif (OS_FREEBSD)
    include(cmake/freebsd/default_libs.cmake)
 endif ()
+link_libraries(global-group)
+
+if (WERROR)
+    # Don't pollute CMAKE_CXX_FLAGS with -Werror as it will break some CMake checks.
+    # Instead, adopt modern cmake usage requirement.
+    target_compile_options(global-group INTERFACE "-Werror")
+endif ()
+
+# Make this extra-checks for correct library dependencies.
+if (OS_LINUX AND NOT SANITIZE)
+    target_link_options(global-group INTERFACE "-Wl,--no-undefined")
+endif ()

 ######################################
 ### Add targets below this comment ###
@ -444,7 +435,7 @@ endif ()

 set (CMAKE_POSTFIX_VARIABLE "CMAKE_${CMAKE_BUILD_TYPE_UC}_POSTFIX")

-if (MAKE_STATIC_LIBRARIES)
+if (USE_STATIC_LIBRARIES)
    set (CMAKE_POSITION_INDEPENDENT_CODE OFF)
    if (OS_LINUX AND NOT ARCH_ARM)
        # Slightly more efficient code can be generated
@ -480,7 +471,6 @@ endif ()
 message (STATUS
    "Building for: ${CMAKE_SYSTEM} ${CMAKE_SYSTEM_PROCESSOR} ${CMAKE_LIBRARY_ARCHITECTURE} ;
    USE_STATIC_LIBRARIES=${USE_STATIC_LIBRARIES}
-    MAKE_STATIC_LIBRARIES=${MAKE_STATIC_LIBRARIES}
    SPLIT_SHARED=${SPLIT_SHARED_LIBRARIES}
    CCACHE=${CCACHE_FOUND} ${CCACHE_VERSION}")

@ -528,7 +518,7 @@ macro (add_executable target)
        # - _je_zone_register due to JEMALLOC_PRIVATE_NAMESPACE=je_ under OS X.
        # - but jemalloc-cmake does not run private_namespace.sh
        #   so symbol name should be _zone_register
-        if (ENABLE_JEMALLOC AND MAKE_STATIC_LIBRARIES AND OS_DARWIN)
+        if (ENABLE_JEMALLOC AND USE_STATIC_LIBRARIES AND OS_DARWIN)
            set_property(TARGET ${target} APPEND PROPERTY LINK_OPTIONS -u_zone_register)
        endif()
    endif()
@ -547,6 +537,4 @@ add_subdirectory (programs)
 add_subdirectory (tests)
 add_subdirectory (utils)

-include (cmake/print_include_directories.cmake)
-
 include (cmake/sanitize_target_link_libraries.cmake)
--- a/4
+++ b/4
@ -1,4 +1,4 @@
-Copyright 2016-2021 ClickHouse, Inc.
+Copyright 2016-2022 ClickHouse, Inc.

                                 Apache License
                           Version 2.0, January 2004
@ -188,7 +188,7 @@ Copyright 2016-2021 ClickHouse, Inc.
      same "printed page" as the copyright notice for easier
      identification within third-party archives.

-   Copyright 2016-2021 ClickHouse, Inc.
+   Copyright 2016-2022 ClickHouse, Inc.

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
--- a/base/base/CMakeLists.txt
+++ b/base/base/CMakeLists.txt
@ -42,7 +42,7 @@ endif ()

 target_include_directories(common PUBLIC .. "${CMAKE_CURRENT_BINARY_DIR}/..")

-if (OS_DARWIN AND NOT MAKE_STATIC_LIBRARIES)
+if (OS_DARWIN AND NOT USE_STATIC_LIBRARIES)
    target_link_libraries(common PUBLIC -Wl,-U,_inside_main)
 endif()

--- a/base/base/LineReader.cpp
+++ b/base/base/LineReader.cpp
@ -2,7 +2,9 @@

 #include <iostream>
 #include <string_view>
+#include <algorithm>

+#include <cassert>
 #include <string.h>
 #include <unistd.h>
 #include <sys/select.h>
@ -34,13 +36,37 @@ bool hasInputData()
    return select(1, &fds, nullptr, nullptr, &timeout) == 1;
 }

+struct NoCaseCompare
+{
+    bool operator()(const std::string & str1, const std::string & str2)
+    {
+        return std::lexicographical_compare(begin(str1), end(str1), begin(str2), end(str2), [](const char c1, const char c2)
+        {
+            return std::tolower(c1) < std::tolower(c2);
+        });
+    }
+};
+
+using Words = std::vector<std::string>;
+template <class Compare>
+void addNewWords(Words & to, const Words & from, Compare comp)
+{
+    size_t old_size = to.size();
+    size_t new_size = old_size + from.size();
+
+    to.reserve(new_size);
+    to.insert(to.end(), from.begin(), from.end());
+    auto middle = to.begin() + old_size;
+    std::inplace_merge(to.begin(), middle, to.end(), comp);
+
+    auto last_unique = std::unique(to.begin(), to.end());
+    to.erase(last_unique, to.end());
 }

-std::optional<LineReader::Suggest::WordsRange> LineReader::Suggest::getCompletions(const String & prefix, size_t prefix_length) const
-{
-    if (!ready)
-        return std::nullopt;
+}

+replxx::Replxx::completions_t LineReader::Suggest::getCompletions(const String & prefix, size_t prefix_length)
+{
    std::string_view last_word;

    auto last_word_pos = prefix.find_last_of(word_break_characters);
@ -48,21 +74,45 @@ std::optional<LineReader::Suggest::WordsRange> LineReader::Suggest::getCompletio
        last_word = prefix;
    else
        last_word = std::string_view(prefix).substr(last_word_pos + 1, std::string::npos);
-
    /// last_word can be empty.

+    std::pair<Words::const_iterator, Words::const_iterator> range;
+
+    std::lock_guard lock(mutex);
+
    /// 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(
+        range = std::equal_range(
            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)
+        range = 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 replxx::Replxx::completions_t(range.first, range.second);
+}
+
+void LineReader::Suggest::addWords(Words && new_words)
+{
+    Words new_words_no_case = new_words;
+    if (!new_words.empty())
+    {
+        std::sort(new_words.begin(), new_words.end());
+        std::sort(new_words_no_case.begin(), new_words_no_case.end(), NoCaseCompare{});
+    }
+
+    {
+        std::lock_guard lock(mutex);
+        addNewWords(words, new_words, std::less<std::string>{});
+        addNewWords(words_no_case, new_words_no_case, NoCaseCompare{});
+    }
+
+    assert(std::is_sorted(words.begin(), words.end()));
+    assert(std::is_sorted(words_no_case.begin(), words_no_case.end(), NoCaseCompare{}));
 }

 LineReader::LineReader(const String & history_file_path_, bool multiline_, Patterns extenders_, Patterns delimiters_)
--- a/base/base/LineReader.h
+++ b/base/base/LineReader.h
@ -1,10 +1,12 @@
 #pragma once

-#include <base/types.h>
-
+#include <mutex>
 #include <atomic>
 #include <vector>
 #include <optional>
+#include <replxx.hxx>
+
+#include <base/types.h>

 class LineReader
 {
@ -12,14 +14,16 @@ public:
    struct Suggest
    {
        using Words = std::vector<std::string>;
-        using WordsRange = std::pair<Words::const_iterator, Words::const_iterator>;

+        /// Get vector for the matched range of words if any.
+        replxx::Replxx::completions_t getCompletions(const String & prefix, size_t prefix_length);
+        void addWords(Words && new_words);
+
+    private:
        Words words;
        Words words_no_case;
-        std::atomic<bool> ready{false};

-        /// Get iterators for the matched range of words if any.
-        std::optional<WordsRange> getCompletions(const String & prefix, size_t prefix_length) const;
+        std::mutex mutex;
    };

    using Patterns = std::vector<const char *>;
--- a/base/base/ReplxxLineReader.cpp
+++ b/base/base/ReplxxLineReader.cpp
@ -133,7 +133,7 @@ void convertHistoryFile(const std::string & path, replxx::Replxx & rx)
 }

 ReplxxLineReader::ReplxxLineReader(
-    const Suggest & suggest,
+    Suggest & suggest,
    const String & history_file_path_,
    bool multiline_,
    Patterns extenders_,
@ -179,9 +179,7 @@ ReplxxLineReader::ReplxxLineReader(

    auto callback = [&suggest] (const String & context, size_t context_size)
    {
-        if (auto range = suggest.getCompletions(context, context_size))
-            return Replxx::completions_t(range->first, range->second);
-        return Replxx::completions_t();
+        return suggest.getCompletions(context, context_size);
    };

    rx.set_completion_callback(callback);
--- a/base/base/ReplxxLineReader.h
+++ b/base/base/ReplxxLineReader.h
@ -9,7 +9,7 @@ class ReplxxLineReader : public LineReader
 {
 public:
    ReplxxLineReader(
-        const Suggest & suggest,
+        Suggest & suggest,
        const String & history_file_path,
        bool multiline,
        Patterns extenders_,
--- a/base/daemon/CMakeLists.txt
+++ b/base/daemon/CMakeLists.txt
@ -6,7 +6,7 @@ add_library (daemon

 target_include_directories (daemon PUBLIC ..)

-if (OS_DARWIN AND NOT MAKE_STATIC_LIBRARIES)
+if (OS_DARWIN AND NOT USE_STATIC_LIBRARIES)
    target_link_libraries (daemon PUBLIC -Wl,-undefined,dynamic_lookup)
 endif()

--- a/base/glibc-compatibility/CMakeLists.txt
+++ b/base/glibc-compatibility/CMakeLists.txt
@ -37,7 +37,7 @@ if (GLIBC_COMPATIBILITY)

    target_include_directories(glibc-compatibility PRIVATE libcxxabi ${musl_arch_include_dir})

-    if (NOT USE_STATIC_LIBRARIES AND NOT MAKE_STATIC_LIBRARIES)
+    if (NOT USE_STATIC_LIBRARIES AND NOT USE_STATIC_LIBRARIES)
        target_compile_options(glibc-compatibility PRIVATE -fPIC)
    endif ()

--- a/base/glibc-compatibility/glibc-compat-2.32.h
+++ b/base/glibc-compatibility/glibc-compat-2.32.h
@ -1,50 +0,0 @@
-/// In glibc 2.32 new version of some symbols had been added [1]:
-///
-///     $ nm -D clickhouse | fgrep -e @GLIBC_2.32
-///                      U pthread_getattr_np@GLIBC_2.32
-///                      U pthread_sigmask@GLIBC_2.32
-///
-///   [1]: https://www.spinics.net/lists/fedora-devel/msg273044.html
-///
-/// Right now ubuntu 20.04 is used as official image for building
-/// ClickHouse, however once it will be switched someone may not be happy
-/// with that fact that he/she cannot use official binaries anymore because
-/// they have glibc < 2.32.
-///
-/// To avoid this dependency, let's force previous version of those
-/// symbols from glibc.
-///
-/// Also note, that the following approach had been tested:
-/// a) -Wl,--wrap -- but it goes into endless recursion whey you try to do
-///    something like this:
-///
-///     int __pthread_getattr_np_compact(pthread_t thread, pthread_attr_t *attr);
-///     GLIBC_COMPAT_SYMBOL(__pthread_getattr_np_compact, pthread_getattr_np)
-///     int __pthread_getattr_np_compact(pthread_t thread, pthread_attr_t *attr);
-///     int __wrap_pthread_getattr_np(pthread_t thread, pthread_attr_t *attr)
-///     {
-///         return __pthread_getattr_np_compact(thread, attr);
-///     }
-///
-///     int __pthread_sigmask_compact(int how, const sigset_t *set, sigset_t *oldset);
-///     GLIBC_COMPAT_SYMBOL(__pthread_sigmask_compact, pthread_sigmask)
-///     int __pthread_sigmask_compact(int how, const sigset_t *set, sigset_t *oldset);
-///     int __wrap_pthread_sigmask(int how, const sigset_t *set, sigset_t *oldset)
-///     {
-///         return __pthread_sigmask_compact(how, set, oldset);
-///     }
-///
-/// b) -Wl,--defsym -- same problems (and you cannot use version of symbol with
-///    version in the expression)
-/// c) this approach -- simply add this file with -include directive.
-
-#if defined(__amd64__)
-#define GLIBC_COMPAT_SYMBOL(func) __asm__(".symver " #func "," #func "@GLIBC_2.2.5");
-#elif defined(__aarch64__)
-#define GLIBC_COMPAT_SYMBOL(func) __asm__(".symver " #func "," #func "@GLIBC_2.17");
-#else
-#error Your platform is not supported.
-#endif
-
-GLIBC_COMPAT_SYMBOL(pthread_sigmask)
-GLIBC_COMPAT_SYMBOL(pthread_getattr_np)
--- a/cmake/cpu_features.cmake
+++ b/cmake/cpu_features.cmake
@ -134,7 +134,7 @@ else ()
        set (COMPILER_FLAGS "${COMPILER_FLAGS} ${TEST_FLAG}")
    endif ()

-    set (TEST_FLAG "-mavx512f -mavx512bw")
+    set (TEST_FLAG "-mavx512f -mavx512bw -mavx512vl")
    set (CMAKE_REQUIRED_FLAGS "${TEST_FLAG} -O0")
    check_cxx_source_compiles("
        #include <immintrin.h>
@ -143,6 +143,8 @@ else ()
            (void)a;
            auto b = _mm512_add_epi16(__m512i(), __m512i());
            (void)b;
+            auto c = _mm_cmp_epi8_mask(__m128i(), __m128i(), 0);
+            (void)c;
            return 0;
        }
    " HAVE_AVX512)
@ -181,7 +183,7 @@ else ()
            set (X86_INTRINSICS_FLAGS "${X86_INTRINSICS_FLAGS} -mbmi")
        endif ()
        if (HAVE_AVX512)
-            set (X86_INTRINSICS_FLAGS "${X86_INTRINSICS_FLAGS} -mavx512f -mavx512bw -mprefer-vector-width=256")
+            set (X86_INTRINSICS_FLAGS "${X86_INTRINSICS_FLAGS} -mavx512f -mavx512bw -mavx512vl -mprefer-vector-width=256")
        endif ()
    endif ()
 endif ()
--- a/cmake/darwin/default_libs.cmake
+++ b/cmake/darwin/default_libs.cmake
@ -24,14 +24,10 @@ find_package(Threads REQUIRED)

 include (cmake/find/cxx.cmake)

-add_library(global-group INTERFACE)
-
 target_link_libraries(global-group INTERFACE
    $<TARGET_PROPERTY:global-libs,INTERFACE_LINK_LIBRARIES>
 )

-link_libraries(global-group)
-
 # FIXME: remove when all contribs will get custom cmake lists
 install(
    TARGETS global-group global-libs
--- a/cmake/find/cxx.cmake
+++ b/cmake/find/cxx.cmake
@ -1,31 +1,8 @@
-option (USE_LIBCXX "Use libc++ and libc++abi instead of libstdc++" ON)
-
-if (NOT USE_LIBCXX)
-    target_link_libraries(global-libs INTERFACE -l:libstdc++.a -l:libstdc++fs.a) # Always link these libraries as static
-    target_link_libraries(global-libs INTERFACE ${EXCEPTION_HANDLING_LIBRARY})
-    return()
-endif()
-
 set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_LIBCPP_DEBUG=0") # More checks in debug build.

-if (NOT HAVE_LIBCXX AND NOT MISSING_INTERNAL_LIBCXX_LIBRARY)
-    set (LIBCXX_LIBRARY cxx)
-    set (LIBCXXABI_LIBRARY cxxabi)
-    add_subdirectory(contrib/libcxxabi-cmake)
-    add_subdirectory(contrib/libcxx-cmake)
+add_subdirectory(contrib/libcxxabi-cmake)
+add_subdirectory(contrib/libcxx-cmake)

-    # Exception handling library is embedded into libcxxabi.
+# Exception handling library is embedded into libcxxabi.

-    set (HAVE_LIBCXX 1)
-endif ()
-
-if (HAVE_LIBCXX)
-    target_link_libraries(global-libs INTERFACE ${LIBCXX_LIBRARY} ${LIBCXXABI_LIBRARY} ${LIBCXXFS_LIBRARY})
-
-    message (STATUS "Using libcxx: ${LIBCXX_LIBRARY}")
-    message (STATUS "Using libcxxfs: ${LIBCXXFS_LIBRARY}")
-    message (STATUS "Using libcxxabi: ${LIBCXXABI_LIBRARY}")
-else()
-    target_link_libraries(global-libs INTERFACE -l:libstdc++.a -l:libstdc++fs.a) # Always link these libraries as static
-    target_link_libraries(global-libs INTERFACE ${EXCEPTION_HANDLING_LIBRARY})
-endif()
+target_link_libraries(global-libs INTERFACE cxx cxxabi)
--- a/cmake/freebsd/default_libs.cmake
+++ b/cmake/freebsd/default_libs.cmake
@ -25,14 +25,10 @@ find_package(Threads REQUIRED)
 include (cmake/find/unwind.cmake)
 include (cmake/find/cxx.cmake)

-add_library(global-group INTERFACE)
-
 target_link_libraries(global-group INTERFACE
    $<TARGET_PROPERTY:global-libs,INTERFACE_LINK_LIBRARIES>
 )

-link_libraries(global-group)
-
 # FIXME: remove when all contribs will get custom cmake lists
 install(
    TARGETS global-group global-libs
--- a/cmake/linux/default_libs.cmake
+++ b/cmake/linux/default_libs.cmake
@ -45,15 +45,12 @@ endif ()
 include (cmake/find/unwind.cmake)
 include (cmake/find/cxx.cmake)

-add_library(global-group INTERFACE)
 target_link_libraries(global-group INTERFACE
    -Wl,--start-group
    $<TARGET_PROPERTY:global-libs,INTERFACE_LINK_LIBRARIES>
    -Wl,--end-group
 )

-link_libraries(global-group)
-
 # FIXME: remove when all contribs will get custom cmake lists
 install(
    TARGETS global-group global-libs
--- a/cmake/print_include_directories.cmake
+++ b/cmake/print_include_directories.cmake
@ -1,29 +0,0 @@
-
-# TODO? Maybe recursive collect on all deps
-
-get_property (dirs1 TARGET dbms PROPERTY INCLUDE_DIRECTORIES)
-list(APPEND dirs ${dirs1})
-
-get_property (dirs1 TARGET clickhouse_common_io PROPERTY INCLUDE_DIRECTORIES)
-list(APPEND dirs ${dirs1})
-
-get_property (dirs1 TARGET common PROPERTY INCLUDE_DIRECTORIES)
-list(APPEND dirs ${dirs1})
-
-get_property (dirs1 TARGET ch_contrib::cityhash PROPERTY INCLUDE_DIRECTORIES)
-list(APPEND dirs ${dirs1})
-
-get_property (dirs1 TARGET roaring PROPERTY INCLUDE_DIRECTORIES)
-list(APPEND dirs ${dirs1})
-
-if (TARGET ch_contrib::double_conversion)
-    get_property (dirs1 TARGET ch_contrib::double_conversion PROPERTY INCLUDE_DIRECTORIES)
-    list(APPEND dirs ${dirs1})
-endif ()
-
-list(REMOVE_DUPLICATES dirs)
-file (WRITE ${CMAKE_CURRENT_BINARY_DIR}/include_directories.txt "")
-foreach (dir ${dirs})
-    string (REPLACE "${ClickHouse_SOURCE_DIR}" "." dir "${dir}")
-    file (APPEND ${CMAKE_CURRENT_BINARY_DIR}/include_directories.txt "-I ${dir} ")
-endforeach ()
--- a/cmake/sanitize.cmake
+++ b/cmake/sanitize.cmake
@ -23,7 +23,7 @@ if (SANITIZE)
        if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
            set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${ASAN_FLAGS}")
        endif()
-        if (MAKE_STATIC_LIBRARIES AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+        if (USE_STATIC_LIBRARIES AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
            set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libasan")
        endif ()
        if (COMPILER_GCC)
@ -48,7 +48,7 @@ if (SANITIZE)
        if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
            set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=memory")
        endif()
-        if (MAKE_STATIC_LIBRARIES AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+        if (USE_STATIC_LIBRARIES AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
            set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libmsan")
        endif ()

@ -69,7 +69,7 @@ if (SANITIZE)
        if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
            set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=thread")
        endif()
-        if (MAKE_STATIC_LIBRARIES AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+        if (USE_STATIC_LIBRARIES AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
            set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libtsan")
        endif ()
        if (COMPILER_GCC)
@ -101,7 +101,7 @@ if (SANITIZE)
        if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
            set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=undefined")
        endif()
-        if (MAKE_STATIC_LIBRARIES AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+        if (USE_STATIC_LIBRARIES AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
            set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libubsan")
        endif ()
        if (COMPILER_GCC)
--- a/cmake/warnings.cmake
+++ b/cmake/warnings.cmake
@ -55,11 +55,6 @@ if (COMPILER_CLANG)
        no_warning(weak-template-vtables)
        no_warning(weak-vtables)

-        # XXX: libstdc++ has some of these for 3way compare
-        if (NOT USE_LIBCXX)
-            no_warning(zero-as-null-pointer-constant)
-        endif()
-
        # TODO Enable conversion, sign-conversion, double-promotion warnings.
    else ()
        add_warning(comma)
@ -98,10 +93,7 @@ if (COMPILER_CLANG)
        add_warning(tautological-bitwise-compare)

        # XXX: libstdc++ has some of these for 3way compare
-        if (USE_LIBCXX)
-            add_warning(zero-as-null-pointer-constant)
-        endif()
-
+        add_warning(zero-as-null-pointer-constant)
    endif ()
 elseif (COMPILER_GCC)
    # Add compiler options only to c++ compiler
@ -183,11 +175,8 @@ elseif (COMPILER_GCC)
    add_cxx_compile_options(-Wundef)
    # Warn if vector operation is not implemented via SIMD capabilities of the architecture
    add_cxx_compile_options(-Wvector-operation-performance)
-    # XXX: libstdc++ has some of these for 3way compare
-    if (USE_LIBCXX)
-        # Warn when a literal 0 is used as null pointer constant.
-        add_cxx_compile_options(-Wzero-as-null-pointer-constant)
-    endif()
+    # Warn when a literal 0 is used as null pointer constant.
+    add_cxx_compile_options(-Wzero-as-null-pointer-constant)

    if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 10)
        # XXX: gcc10 stuck with this option while compiling GatherUtils code
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@ -140,6 +140,8 @@ if (ENABLE_NLP)
    add_contrib (libstemmer-c-cmake libstemmer_c)
    add_contrib (wordnet-blast-cmake wordnet-blast)
    add_contrib (lemmagen-c-cmake lemmagen-c)
+    add_contrib (nlp-data-cmake nlp-data)
+    add_contrib (cld2-cmake cld2)
 endif()

 add_contrib (sqlite-cmake sqlite-amalgamation)
--- a/contrib/NuRaft
+++ b/contrib/NuRaft
@ -1 +1 @@
-Subproject commit c2043aa250e53ad5cf75e596e319d587af4dcb3c
+Subproject commit 1707a7572aa66ec5d0a2dbe2bf5effa3352e6b2d
--- a/contrib/abseil-cpp-cmake/CMakeLists.txt
+++ b/contrib/abseil-cpp-cmake/CMakeLists.txt
@ -6,15 +6,17 @@ set(BUILD_TESTING OFF)
 set(ABSL_PROPAGATE_CXX_STD ON)
 add_subdirectory("${ABSL_ROOT_DIR}" "${ClickHouse_BINARY_DIR}/contrib/abseil-cpp")

-add_library(abseil_swiss_tables INTERFACE)
+add_library(_abseil_swiss_tables INTERFACE)

-target_link_libraries(abseil_swiss_tables INTERFACE
+target_link_libraries(_abseil_swiss_tables INTERFACE
  absl::flat_hash_map
  absl::flat_hash_set
 )

 get_target_property(FLAT_HASH_MAP_INCLUDE_DIR absl::flat_hash_map INTERFACE_INCLUDE_DIRECTORIES)
-target_include_directories (abseil_swiss_tables SYSTEM BEFORE INTERFACE ${FLAT_HASH_MAP_INCLUDE_DIR})
+target_include_directories (_abseil_swiss_tables SYSTEM BEFORE INTERFACE ${FLAT_HASH_MAP_INCLUDE_DIR})

 get_target_property(FLAT_HASH_SET_INCLUDE_DIR absl::flat_hash_set INTERFACE_INCLUDE_DIRECTORIES)
-target_include_directories (abseil_swiss_tables SYSTEM BEFORE INTERFACE ${FLAT_HASH_SET_INCLUDE_DIR})
+target_include_directories (_abseil_swiss_tables SYSTEM BEFORE INTERFACE ${FLAT_HASH_SET_INCLUDE_DIR})
+
+add_library(ch_contrib::abseil_swiss_tables ALIAS _abseil_swiss_tables)
--- a/contrib/arrow-cmake/CMakeLists.txt
+++ b/contrib/arrow-cmake/CMakeLists.txt
@ -29,7 +29,7 @@ if (OS_FREEBSD)
    message (FATAL_ERROR "Using internal parquet library on FreeBSD is not supported")
 endif()

-if(MAKE_STATIC_LIBRARIES)
+if(USE_STATIC_LIBRARIES)
    set(FLATBUFFERS_LIBRARY flatbuffers)
 else()
    set(FLATBUFFERS_LIBRARY flatbuffers_shared)
@ -84,7 +84,7 @@ set(FLATBUFFERS_BINARY_DIR "${ClickHouse_BINARY_DIR}/contrib/flatbuffers")
 set(FLATBUFFERS_INCLUDE_DIR "${FLATBUFFERS_SRC_DIR}/include")

 # set flatbuffers CMake options
-if (MAKE_STATIC_LIBRARIES)
+if (USE_STATIC_LIBRARIES)
    set(FLATBUFFERS_BUILD_FLATLIB ON CACHE BOOL "Enable the build of the flatbuffers library")
    set(FLATBUFFERS_BUILD_SHAREDLIB OFF CACHE BOOL "Disable the build of the flatbuffers shared library")
 else ()
--- a/contrib/aws-s3-cmake/CMakeLists.txt
+++ b/contrib/aws-s3-cmake/CMakeLists.txt
@ -91,30 +91,30 @@ set(S3_INCLUDES
    "${CMAKE_CURRENT_BINARY_DIR}/include/"
 )

-add_library(aws_s3_checksums ${AWS_CHECKSUMS_SOURCES})
-target_include_directories(aws_s3_checksums SYSTEM PUBLIC "${AWS_CHECKSUMS_LIBRARY_DIR}/include/")
+add_library(_aws_s3_checksums ${AWS_CHECKSUMS_SOURCES})
+target_include_directories(_aws_s3_checksums SYSTEM PUBLIC "${AWS_CHECKSUMS_LIBRARY_DIR}/include/")
 if(CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG")
-    target_compile_definitions(aws_s3_checksums PRIVATE "-DDEBUG_BUILD")
+    target_compile_definitions(_aws_s3_checksums PRIVATE "-DDEBUG_BUILD")
 endif()
-set_target_properties(aws_s3_checksums PROPERTIES LINKER_LANGUAGE C)
-set_property(TARGET aws_s3_checksums PROPERTY C_STANDARD 99)
+set_target_properties(_aws_s3_checksums PROPERTIES LINKER_LANGUAGE C)
+set_property(TARGET _aws_s3_checksums PROPERTY C_STANDARD 99)

-add_library(aws_s3 ${S3_UNIFIED_SRC})
+add_library(_aws_s3 ${S3_UNIFIED_SRC})

-target_compile_definitions(aws_s3 PUBLIC "AWS_SDK_VERSION_MAJOR=1")
-target_compile_definitions(aws_s3 PUBLIC "AWS_SDK_VERSION_MINOR=7")
-target_compile_definitions(aws_s3 PUBLIC "AWS_SDK_VERSION_PATCH=231")
-target_include_directories(aws_s3 SYSTEM BEFORE PUBLIC ${S3_INCLUDES})
+target_compile_definitions(_aws_s3 PUBLIC "AWS_SDK_VERSION_MAJOR=1")
+target_compile_definitions(_aws_s3 PUBLIC "AWS_SDK_VERSION_MINOR=7")
+target_compile_definitions(_aws_s3 PUBLIC "AWS_SDK_VERSION_PATCH=231")
+target_include_directories(_aws_s3 SYSTEM BEFORE PUBLIC ${S3_INCLUDES})

 if (TARGET OpenSSL::SSL)
-    target_compile_definitions(aws_s3 PUBLIC -DENABLE_OPENSSL_ENCRYPTION)
-    target_link_libraries(aws_s3 PRIVATE OpenSSL::Crypto OpenSSL::SSL)
+    target_compile_definitions(_aws_s3 PUBLIC -DENABLE_OPENSSL_ENCRYPTION)
+    target_link_libraries(_aws_s3 PRIVATE OpenSSL::Crypto OpenSSL::SSL)
 endif()

-target_link_libraries(aws_s3 PRIVATE aws_s3_checksums)
+target_link_libraries(_aws_s3 PRIVATE _aws_s3_checksums)

 # The library is large - avoid bloat.
-target_compile_options (aws_s3 PRIVATE -g0)
-target_compile_options (aws_s3_checksums PRIVATE -g0)
+target_compile_options (_aws_s3 PRIVATE -g0)
+target_compile_options (_aws_s3_checksums PRIVATE -g0)

-add_library(ch_contrib::aws_s3 ALIAS aws_s3)
+add_library(ch_contrib::aws_s3 ALIAS _aws_s3)
--- a/contrib/base64-cmake/CMakeLists.txt
+++ b/contrib/base64-cmake/CMakeLists.txt
@ -11,37 +11,37 @@ endif()

 SET(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/base64")

-add_library(base64_scalar OBJECT "${LIBRARY_DIR}/turbob64c.c" "${LIBRARY_DIR}/turbob64d.c")
-add_library(base64_ssse3 OBJECT "${LIBRARY_DIR}/turbob64sse.c") # This file also contains code for ARM NEON
+add_library(_base64_scalar OBJECT "${LIBRARY_DIR}/turbob64c.c" "${LIBRARY_DIR}/turbob64d.c")
+add_library(_base64_ssse3 OBJECT "${LIBRARY_DIR}/turbob64sse.c") # This file also contains code for ARM NEON

 if (ARCH_AMD64)
-    add_library(base64_avx OBJECT "${LIBRARY_DIR}/turbob64sse.c") # This is not a mistake. One file is compiled twice.
-    add_library(base64_avx2 OBJECT "${LIBRARY_DIR}/turbob64avx2.c")
+    add_library(_base64_avx OBJECT "${LIBRARY_DIR}/turbob64sse.c") # This is not a mistake. One file is compiled twice.
+    add_library(_base64_avx2 OBJECT "${LIBRARY_DIR}/turbob64avx2.c")
 endif ()

-target_compile_options(base64_scalar PRIVATE -falign-loops)
+target_compile_options(_base64_scalar PRIVATE -falign-loops)

 if (ARCH_AMD64)
-    target_compile_options(base64_ssse3 PRIVATE -mno-avx -mno-avx2 -mssse3 -falign-loops)
-    target_compile_options(base64_avx PRIVATE -falign-loops -mavx)
-    target_compile_options(base64_avx2 PRIVATE -falign-loops -mavx2)
+    target_compile_options(_base64_ssse3 PRIVATE -mno-avx -mno-avx2 -mssse3 -falign-loops)
+    target_compile_options(_base64_avx PRIVATE -falign-loops -mavx)
+    target_compile_options(_base64_avx2 PRIVATE -falign-loops -mavx2)
 else ()
-    target_compile_options(base64_ssse3 PRIVATE -falign-loops)
+    target_compile_options(_base64_ssse3 PRIVATE -falign-loops)
 endif ()

 if (ARCH_AMD64)
-    add_library(base64
-        $<TARGET_OBJECTS:base64_scalar>
-        $<TARGET_OBJECTS:base64_ssse3>
-        $<TARGET_OBJECTS:base64_avx>
-        $<TARGET_OBJECTS:base64_avx2>)
+    add_library(_base64
+        $<TARGET_OBJECTS:_base64_scalar>
+        $<TARGET_OBJECTS:_base64_ssse3>
+        $<TARGET_OBJECTS:_base64_avx>
+        $<TARGET_OBJECTS:_base64_avx2>)
 else ()
-    add_library(base64
-        $<TARGET_OBJECTS:base64_scalar>
-        $<TARGET_OBJECTS:base64_ssse3>)
+    add_library(_base64
+        $<TARGET_OBJECTS:_base64_scalar>
+        $<TARGET_OBJECTS:_base64_ssse3>)
 endif ()

-target_include_directories(base64 SYSTEM PUBLIC ${LIBRARY_DIR})
+target_include_directories(_base64 SYSTEM PUBLIC ${LIBRARY_DIR})

 if (XCODE OR XCODE_VERSION)
    # https://gitlab.kitware.com/cmake/cmake/issues/17457
@ -50,7 +50,7 @@ if (XCODE OR XCODE_VERSION)
    if (NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/dummy.c")
        file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/dummy.c" "")
    endif ()
-    target_sources(base64 PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/dummy.c")
+    target_sources(_base64 PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/dummy.c")
 endif ()

-add_library(ch_contrib::base64 ALIAS base64)
+add_library(ch_contrib::base64 ALIAS _base64)
--- a/contrib/boringssl-cmake/CMakeLists.txt
+++ b/contrib/boringssl-cmake/CMakeLists.txt
@ -368,7 +368,7 @@ elseif(WIN32)
 endif()

 add_library(
-  crypto
+  _crypto

  ${CRYPTO_ARCH_SOURCES}
  err_data.c
@ -605,7 +605,7 @@ add_library(
 )

 add_library(
-  ssl
+  _ssl

  "${BORINGSSL_SOURCE_DIR}/ssl/bio_ssl.cc"
  "${BORINGSSL_SOURCE_DIR}/ssl/d1_both.cc"
@ -672,21 +672,22 @@ add_executable(
  "${BORINGSSL_SOURCE_DIR}/tool/transport_common.cc"
 )

-target_link_libraries(ssl crypto)
-target_link_libraries(bssl ssl)
+target_link_libraries(_ssl _crypto)
+target_link_libraries(bssl _ssl)

 if(NOT WIN32 AND NOT ANDROID)
-  target_link_libraries(crypto pthread)
+  target_link_libraries(_crypto pthread)
 endif()

+# NOTE: that ClickHouse does not support WIN32 anyway.
 if(WIN32)
  target_link_libraries(bssl ws2_32)
 endif()

-target_include_directories(crypto SYSTEM PUBLIC "${BORINGSSL_SOURCE_DIR}/include")
-target_include_directories(ssl SYSTEM PUBLIC "${BORINGSSL_SOURCE_DIR}/include")
+target_include_directories(_crypto SYSTEM PUBLIC "${BORINGSSL_SOURCE_DIR}/include")
+target_include_directories(_ssl SYSTEM PUBLIC "${BORINGSSL_SOURCE_DIR}/include")

-target_compile_options(crypto PRIVATE -Wno-gnu-anonymous-struct)
+target_compile_options(_crypto PRIVATE -Wno-gnu-anonymous-struct)

-add_library(OpenSSL::Crypto ALIAS crypto)
-add_library(OpenSSL::SSL ALIAS ssl)
+add_library(OpenSSL::Crypto ALIAS _crypto)
+add_library(OpenSSL::SSL ALIAS _ssl)
--- a/contrib/capnproto-cmake/CMakeLists.txt
+++ b/contrib/capnproto-cmake/CMakeLists.txt
@ -36,8 +36,8 @@ set (KJ_SRCS
    "${CAPNPROTO_SOURCE_DIR}/kj/parse/char.c++"
 )

-add_library(kj ${KJ_SRCS})
-target_include_directories(kj SYSTEM PUBLIC ${CAPNPROTO_SOURCE_DIR})
+add_library(_kj ${KJ_SRCS})
+target_include_directories(_kj SYSTEM PUBLIC ${CAPNPROTO_SOURCE_DIR})

 set (CAPNP_SRCS
    "${CAPNPROTO_SOURCE_DIR}/capnp/c++.capnp.c++"
@ -58,11 +58,11 @@ set (CAPNP_SRCS
    "${CAPNPROTO_SOURCE_DIR}/capnp/stringify.c++"
 )

-add_library(capnp ${CAPNP_SRCS})
-set_target_properties(capnp
+add_library(_capnp ${CAPNP_SRCS})
+set_target_properties(_capnp
                      PROPERTIES LINKER_LANGUAGE CXX
                      )
-target_link_libraries(capnp PUBLIC kj)
+target_link_libraries(_capnp PUBLIC _kj)

 set (CAPNPC_SRCS
    "${CAPNPROTO_SOURCE_DIR}/capnp/compiler/type-id.c++"
@ -78,8 +78,8 @@ set (CAPNPC_SRCS
    "${CAPNPROTO_SOURCE_DIR}/capnp/serialize-text.c++"
 )

-add_library(capnpc ${CAPNPC_SRCS})
-target_link_libraries(capnpc PUBLIC capnp)
+add_library(_capnpc ${CAPNPC_SRCS})
+target_link_libraries(_capnpc PUBLIC _capnp)

 # The library has substandard code
 if (COMPILER_GCC)
@ -89,8 +89,8 @@ elseif (COMPILER_CLANG)
    set (CAPNP_PRIVATE_CXX_FLAGS -fno-char8_t)
 endif ()

-target_compile_options(kj PRIVATE ${SUPPRESS_WARNINGS} ${CAPNP_PRIVATE_CXX_FLAGS})
-target_compile_options(capnp PRIVATE ${SUPPRESS_WARNINGS} ${CAPNP_PRIVATE_CXX_FLAGS})
-target_compile_options(capnpc PRIVATE ${SUPPRESS_WARNINGS} ${CAPNP_PRIVATE_CXX_FLAGS})
+target_compile_options(_kj PRIVATE ${SUPPRESS_WARNINGS} ${CAPNP_PRIVATE_CXX_FLAGS})
+target_compile_options(_capnp PRIVATE ${SUPPRESS_WARNINGS} ${CAPNP_PRIVATE_CXX_FLAGS})
+target_compile_options(_capnpc PRIVATE ${SUPPRESS_WARNINGS} ${CAPNP_PRIVATE_CXX_FLAGS})

-add_library(ch_contrib::capnp ALIAS capnpc)
+add_library(ch_contrib::capnp ALIAS _capnpc)
--- a/contrib/cassandra-cmake/CMakeLists.txt
+++ b/contrib/cassandra-cmake/CMakeLists.txt
@ -53,16 +53,16 @@ endif()
 list(APPEND SOURCES ${CASS_SRC_DIR}/atomic/atomic_std.hpp)


-add_library(curl_hostcheck OBJECT ${CASS_SRC_DIR}/third_party/curl/hostcheck.cpp)
-add_library(hdr_histogram OBJECT ${CASS_SRC_DIR}/third_party/hdr_histogram/hdr_histogram.cpp)
-add_library(http-parser OBJECT ${CASS_SRC_DIR}/third_party/http-parser/http_parser.c)
-add_library(minizip OBJECT
+add_library(_curl_hostcheck OBJECT ${CASS_SRC_DIR}/third_party/curl/hostcheck.cpp)
+add_library(_hdr_histogram OBJECT ${CASS_SRC_DIR}/third_party/hdr_histogram/hdr_histogram.cpp)
+add_library(_http-parser OBJECT ${CASS_SRC_DIR}/third_party/http-parser/http_parser.c)
+add_library(_minizip OBJECT
    ${CASS_SRC_DIR}/third_party/minizip/ioapi.c
    ${CASS_SRC_DIR}/third_party/minizip/zip.c
    ${CASS_SRC_DIR}/third_party/minizip/unzip.c)

-target_link_libraries(minizip ch_contrib::zlib)
-target_compile_definitions(minizip PRIVATE "-Dz_crc_t=unsigned long")
+target_link_libraries(_minizip ch_contrib::zlib)
+target_compile_definitions(_minizip PRIVATE "-Dz_crc_t=unsigned long")

 list(APPEND INCLUDE_DIRS
  ${CASS_SRC_DIR}/third_party/curl
@ -121,10 +121,10 @@ configure_file(

 add_library(_cassandra
    ${SOURCES}
-    $<TARGET_OBJECTS:curl_hostcheck>
-    $<TARGET_OBJECTS:hdr_histogram>
-    $<TARGET_OBJECTS:http-parser>
-    $<TARGET_OBJECTS:minizip>)
+    $<TARGET_OBJECTS:_curl_hostcheck>
+    $<TARGET_OBJECTS:_hdr_histogram>
+    $<TARGET_OBJECTS:_http-parser>
+    $<TARGET_OBJECTS:_minizip>)

 target_link_libraries(_cassandra ch_contrib::zlib)
 target_include_directories(_cassandra PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${INCLUDE_DIRS})
--- a/contrib/cctz-cmake/CMakeLists.txt
+++ b/contrib/cctz-cmake/CMakeLists.txt
@ -14,12 +14,12 @@ set (SRCS
    "${LIBRARY_DIR}/src/zone_info_source.cc"
 )

-add_library (cctz ${SRCS})
-target_include_directories (cctz PUBLIC "${LIBRARY_DIR}/include")
+add_library (_cctz ${SRCS})
+target_include_directories (_cctz PUBLIC "${LIBRARY_DIR}/include")

 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)
+    target_compile_definitions (_cctz PRIVATE __USE_BSD linux _XOPEN_SOURCE=600)
 endif ()

 # Related to time_zones table:
@ -57,7 +57,7 @@ clickhouse_embed_binaries(
    RESOURCE_DIR "${TZDIR}"
    RESOURCES ${TIMEZONE_RESOURCE_FILES}
 )
-add_dependencies(cctz tzdata)
-target_link_libraries(cctz INTERFACE "-Wl,${WHOLE_ARCHIVE} $<TARGET_FILE:tzdata> -Wl,${NO_WHOLE_ARCHIVE}")
+add_dependencies(_cctz tzdata)
+target_link_libraries(_cctz INTERFACE "-Wl,${WHOLE_ARCHIVE} $<TARGET_FILE:tzdata> -Wl,${NO_WHOLE_ARCHIVE}")

-add_library(ch_contrib::cctz ALIAS cctz)
+add_library(ch_contrib::cctz ALIAS _cctz)
--- a/contrib/cld2
+++ b/contrib/cld2
@ -0,0 +1 @@
+Subproject commit bc6d493a2f64ed1fc1c4c4b4294a542a04e04217
--- a/contrib/cld2-cmake/CMakeLists.txt
+++ b/contrib/cld2-cmake/CMakeLists.txt
@ -0,0 +1,33 @@
+set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/cld2")
+
+set (SRCS
+    "${LIBRARY_DIR}/internal/cldutil.cc"
+    "${LIBRARY_DIR}/internal/compact_lang_det.cc"
+    "${LIBRARY_DIR}/internal/cldutil_shared.cc"
+    "${LIBRARY_DIR}/internal/compact_lang_det_hint_code.cc"
+    "${LIBRARY_DIR}/internal/compact_lang_det_impl.cc"
+    "${LIBRARY_DIR}/internal/debug.cc"
+    "${LIBRARY_DIR}/internal/fixunicodevalue.cc"
+    "${LIBRARY_DIR}/internal/generated_entities.cc"
+    "${LIBRARY_DIR}/internal/generated_language.cc"
+    "${LIBRARY_DIR}/internal/generated_ulscript.cc"
+    "${LIBRARY_DIR}/internal/getonescriptspan.cc"
+    "${LIBRARY_DIR}/internal/lang_script.cc"
+    "${LIBRARY_DIR}/internal/offsetmap.cc"
+    "${LIBRARY_DIR}/internal/scoreonescriptspan.cc"
+    "${LIBRARY_DIR}/internal/tote.cc"
+    "${LIBRARY_DIR}/internal/utf8statetable.cc"
+    "${LIBRARY_DIR}/internal/cld_generated_cjk_uni_prop_80.cc"
+    "${LIBRARY_DIR}/internal/cld2_generated_cjk_compatible.cc"
+    "${LIBRARY_DIR}/internal/cld_generated_cjk_delta_bi_4.cc"
+    "${LIBRARY_DIR}/internal/generated_distinct_bi_0.cc"
+    "${LIBRARY_DIR}/internal/cld2_generated_quadchrome_2.cc"
+    "${LIBRARY_DIR}/internal/cld2_generated_deltaoctachrome.cc"
+    "${LIBRARY_DIR}/internal/cld2_generated_distinctoctachrome.cc"
+    "${LIBRARY_DIR}/internal/cld_generated_score_quad_octa_2.cc"
+)
+add_library(_cld2 ${SRCS})
+set_property(TARGET _cld2 PROPERTY POSITION_INDEPENDENT_CODE ON)
+target_compile_options (_cld2 PRIVATE -Wno-reserved-id-macro -Wno-c++11-narrowing)
+target_include_directories(_cld2 SYSTEM BEFORE PUBLIC "${LIBRARY_DIR}/public")
+add_library(ch_contrib::cld2 ALIAS _cld2)
--- a/contrib/consistent-hashing/CMakeLists.txt
+++ b/contrib/consistent-hashing/CMakeLists.txt
@ -1,2 +1,3 @@
-add_library(consistent-hashing consistent_hashing.cpp popcount.cpp)
-target_include_directories(consistent-hashing SYSTEM PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+add_library(_consistent_hashing consistent_hashing.cpp popcount.cpp)
+target_include_directories(_consistent_hashing SYSTEM PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+add_library(ch_contrib::consistent_hashing ALIAS _consistent_hashing)
--- a/contrib/croaring-cmake/CMakeLists.txt
+++ b/contrib/croaring-cmake/CMakeLists.txt
@ -19,15 +19,15 @@ set(SRCS
    "${LIBRARY_DIR}/src/roaring_priority_queue.c"
    "${LIBRARY_DIR}/src/roaring_array.c")

-add_library(roaring ${SRCS})
+add_library(_roaring ${SRCS})

-target_include_directories(roaring PRIVATE "${LIBRARY_DIR}/include/roaring")
-target_include_directories(roaring SYSTEM BEFORE PUBLIC "${LIBRARY_DIR}/include")
-target_include_directories(roaring SYSTEM BEFORE PUBLIC "${LIBRARY_DIR}/cpp")
+target_include_directories(_roaring PRIVATE "${LIBRARY_DIR}/include/roaring")
+target_include_directories(_roaring SYSTEM BEFORE PUBLIC "${LIBRARY_DIR}/include")
+target_include_directories(_roaring SYSTEM BEFORE PUBLIC "${LIBRARY_DIR}/cpp")

 # We redirect malloc/free family of functions to different functions that will track memory in ClickHouse.
 # Also note that we exploit implicit function declarations.
-target_compile_definitions(roaring PRIVATE
+target_compile_definitions(_roaring PRIVATE
    -Dmalloc=clickhouse_malloc
    -Dcalloc=clickhouse_calloc
    -Drealloc=clickhouse_realloc
@ -35,4 +35,6 @@ target_compile_definitions(roaring PRIVATE
    -Dfree=clickhouse_free
    -Dposix_memalign=clickhouse_posix_memalign)

-target_link_libraries(roaring PUBLIC clickhouse_common_io)
+target_link_libraries(_roaring PUBLIC clickhouse_common_io)
+
+add_library(ch_contrib::roaring ALIAS _roaring)
--- a/contrib/curl-cmake/CMakeLists.txt
+++ b/contrib/curl-cmake/CMakeLists.txt
@ -147,35 +147,24 @@ set (SRCS
    "${LIBRARY_DIR}/lib/vssh/libssh.c"
 )

-add_library (curl ${SRCS})
+add_library (_curl ${SRCS})

-target_compile_definitions (curl PRIVATE
+target_compile_definitions (_curl PRIVATE
    HAVE_CONFIG_H
    BUILDING_LIBCURL
    CURL_HIDDEN_SYMBOLS
    libcurl_EXPORTS
    OS="${CMAKE_SYSTEM_NAME}"
 )
-target_include_directories (curl SYSTEM PUBLIC
+target_include_directories (_curl SYSTEM PUBLIC
    "${LIBRARY_DIR}/include"
    "${LIBRARY_DIR}/lib"
    . # curl_config.h
 )

-target_link_libraries (curl PRIVATE ssl)
+target_link_libraries (_curl PRIVATE OpenSSL::SSL)

 # The library is large - avoid bloat (XXX: is it?)
-target_compile_options (curl PRIVATE -g0)
+target_compile_options (_curl PRIVATE -g0)

-# find_package(CURL) compatibility for the following packages that uses
-# find_package(CURL)/include(FindCURL):
-# - sentry-native
-set (CURL_FOUND ON CACHE BOOL "")
-set (CURL_ROOT_DIR ${LIBRARY_DIR} CACHE PATH "")
-set (CURL_INCLUDE_DIR "${LIBRARY_DIR}/include" CACHE PATH "")
-set (CURL_INCLUDE_DIRS "${LIBRARY_DIR}/include" CACHE PATH "")
-set (CURL_LIBRARY curl CACHE STRING "")
-set (CURL_LIBRARIES ${CURL_LIBRARY} CACHE STRING "")
-set (CURL_VERSION_STRING 7.67.0 CACHE STRING "")
-# add_library (CURL::libcurl ALIAS ${CURL_LIBRARY})
-add_library (ch_contrib::curl ALIAS ${CURL_LIBRARY})
+add_library (ch_contrib::curl ALIAS _curl)
--- a/contrib/cyrus-sasl-cmake/CMakeLists.txt
+++ b/contrib/cyrus-sasl-cmake/CMakeLists.txt
@ -12,9 +12,9 @@ endif()

 set(CYRUS_SASL_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/cyrus-sasl")

-add_library(sasl2)
+add_library(_sasl2)

-target_sources(sasl2 PRIVATE
+target_sources(_sasl2 PRIVATE
    "${CYRUS_SASL_SOURCE_DIR}/plugins/gssapi.c"
    # "${CYRUS_SASL_SOURCE_DIR}/plugins/gssapiv2_init.c"
    "${CYRUS_SASL_SOURCE_DIR}/common/plugin_common.c"
@ -32,11 +32,11 @@ target_sources(sasl2 PRIVATE
    "${CYRUS_SASL_SOURCE_DIR}/lib/checkpw.c"
 )

-target_include_directories(sasl2 PUBLIC
+target_include_directories(_sasl2 PUBLIC
    ${CMAKE_CURRENT_BINARY_DIR}
 )

-target_include_directories(sasl2 PRIVATE
+target_include_directories(_sasl2 PRIVATE
    ${CMAKE_CURRENT_SOURCE_DIR}  # for config.h
    "${CYRUS_SASL_SOURCE_DIR}/plugins"
    ${CYRUS_SASL_SOURCE_DIR}
@ -50,7 +50,7 @@ target_include_directories(sasl2 PRIVATE
    "${CYRUS_SASL_SOURCE_DIR}/tests"
 )

-target_compile_definitions(sasl2 PUBLIC
+target_compile_definitions(_sasl2 PUBLIC
    HAVE_CONFIG_H
    # PLUGINDIR="/usr/local/lib/sasl2"
    PLUGINDIR=""
@ -76,6 +76,6 @@ file(COPY
    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
 )

-target_link_libraries(sasl2 PUBLIC ch_contrib::krb5)
+target_link_libraries(_sasl2 PUBLIC ch_contrib::krb5)

-add_library(ch_contrib::sasl2 ALIAS sasl2)
+add_library(ch_contrib::sasl2 ALIAS _sasl2)
--- a/contrib/dragonbox-cmake/CMakeLists.txt
+++ b/contrib/dragonbox-cmake/CMakeLists.txt
@ -1,5 +1,5 @@
 set(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/dragonbox")

-add_library(dragonbox_to_chars "${LIBRARY_DIR}/source/dragonbox_to_chars.cpp")
-
-target_include_directories(dragonbox_to_chars SYSTEM BEFORE PUBLIC "${LIBRARY_DIR}/include/")
+add_library(_dragonbox_to_chars "${LIBRARY_DIR}/source/dragonbox_to_chars.cpp")
+target_include_directories(_dragonbox_to_chars SYSTEM BEFORE PUBLIC "${LIBRARY_DIR}/include/")
+add_library(ch_contrib::dragonbox_to_chars ALIAS _dragonbox_to_chars)
--- a/contrib/fast_float-cmake/CMakeLists.txt
+++ b/contrib/fast_float-cmake/CMakeLists.txt
@ -1,3 +1,3 @@
-add_library(fast_float INTERFACE)
-target_include_directories(fast_float SYSTEM BEFORE INTERFACE "${ClickHouse_SOURCE_DIR}/contrib/fast_float/include/")
-add_library(ch_contrib::fast_float ALIAS fast_float)
+add_library(_fast_float INTERFACE)
+target_include_directories(_fast_float SYSTEM BEFORE INTERFACE "${ClickHouse_SOURCE_DIR}/contrib/fast_float/include/")
+add_library(ch_contrib::fast_float ALIAS _fast_float)
--- a/contrib/fastops-cmake/CMakeLists.txt
+++ b/contrib/fastops-cmake/CMakeLists.txt
@ -25,8 +25,8 @@ endif()

 set (SRCS ${SRCS} "${LIBRARY_DIR}/fastops/plain/ops_plain.cpp" "${LIBRARY_DIR}/fastops/core/avx_id.cpp" "${LIBRARY_DIR}/fastops/fastops.cpp")

-add_library(fastops ${SRCS})
+add_library(_fastops ${SRCS})

-target_include_directories(fastops SYSTEM PUBLIC "${LIBRARY_DIR}")
+target_include_directories(_fastops SYSTEM PUBLIC "${LIBRARY_DIR}")

-add_library(ch_contrib::fastops ALIAS fastops)
+add_library(ch_contrib::fastops ALIAS _fastops)
--- a/contrib/fmtlib-cmake/CMakeLists.txt
+++ b/contrib/fmtlib-cmake/CMakeLists.txt
@ -16,6 +16,6 @@ set (SRCS
    ../fmtlib/include/fmt/ranges.h
 )

-add_library(fmt ${SRCS})
-target_include_directories(fmt SYSTEM PUBLIC ../fmtlib/include)
-add_library(ch_contrib::fmt ALIAS fmt)
+add_library(_fmt ${SRCS})
+target_include_directories(_fmt SYSTEM PUBLIC ../fmtlib/include)
+add_library(ch_contrib::fmt ALIAS _fmt)
--- a/contrib/grpc-cmake/CMakeLists.txt
+++ b/contrib/grpc-cmake/CMakeLists.txt
@ -46,7 +46,7 @@ set(_gRPC_SSL_LIBRARIES OpenSSL::Crypto OpenSSL::SSL)
 set(gRPC_ABSL_PROVIDER "clickhouse" CACHE STRING "" FORCE)

 # Choose to build static or shared library for c-ares.
-if (MAKE_STATIC_LIBRARIES)
+if (USE_STATIC_LIBRARIES)
  set(CARES_STATIC ON CACHE BOOL "" FORCE)
  set(CARES_SHARED OFF CACHE BOOL "" FORCE)
 else ()
--- a/contrib/h3-cmake/CMakeLists.txt
+++ b/contrib/h3-cmake/CMakeLists.txt
@ -30,12 +30,12 @@ set(SRCS

 configure_file("${H3_SOURCE_DIR}/include/h3api.h.in" "${H3_BINARY_DIR}/include/h3api.h")

-add_library(h3 ${SRCS})
-target_include_directories(h3 SYSTEM PUBLIC "${H3_SOURCE_DIR}/include")
-target_include_directories(h3 SYSTEM PUBLIC "${H3_BINARY_DIR}/include")
-target_compile_definitions(h3 PRIVATE H3_HAVE_VLA)
+add_library(_h3 ${SRCS})
+target_include_directories(_h3 SYSTEM PUBLIC "${H3_SOURCE_DIR}/include")
+target_include_directories(_h3 SYSTEM PUBLIC "${H3_BINARY_DIR}/include")
+target_compile_definitions(_h3 PRIVATE H3_HAVE_VLA)
 if(M_LIBRARY)
-    target_link_libraries(h3 PRIVATE ${M_LIBRARY})
+    target_link_libraries(_h3 PRIVATE ${M_LIBRARY})
 endif()

-add_library(ch_contrib::h3 ALIAS h3)
+add_library(ch_contrib::h3 ALIAS _h3)
--- a/contrib/hyperscan-cmake/CMakeLists.txt
+++ b/contrib/hyperscan-cmake/CMakeLists.txt
@ -217,23 +217,23 @@ set (SRCS
    "${LIBRARY_DIR}/src/util/ue2string.cpp"
 )

-add_library (hyperscan ${SRCS})
+add_library (_hyperscan ${SRCS})

-target_compile_options (hyperscan
+target_compile_options (_hyperscan
    PRIVATE -g0 # Library has too much debug information
    -mno-avx -mno-avx2 # The library is using dynamic dispatch and is confused if AVX is enabled globally
    -march=corei7 -O2 -fno-strict-aliasing -fno-omit-frame-pointer -fvisibility=hidden # The options from original build system
    -fno-sanitize=undefined # Assume the library takes care of itself
 )
-target_include_directories (hyperscan
+target_include_directories (_hyperscan
    PRIVATE
        common
        "${LIBRARY_DIR}/include"
 )
-target_include_directories (hyperscan SYSTEM PUBLIC "${LIBRARY_DIR}/src")
+target_include_directories (_hyperscan SYSTEM PUBLIC "${LIBRARY_DIR}/src")
 if (ARCH_AMD64)
-    target_include_directories (hyperscan PRIVATE x86_64)
+    target_include_directories (_hyperscan PRIVATE x86_64)
 endif ()
-target_link_libraries (hyperscan PRIVATE boost::headers_only)
+target_link_libraries (_hyperscan PRIVATE boost::headers_only)

-add_library (ch_contrib::hyperscan ALIAS hyperscan)
+add_library (ch_contrib::hyperscan ALIAS _hyperscan)
--- a/contrib/jemalloc-cmake/CMakeLists.txt
+++ b/contrib/jemalloc-cmake/CMakeLists.txt
@ -87,9 +87,9 @@ if (OS_DARWIN)
    list(APPEND SRCS "${LIBRARY_DIR}/src/zone.c")
 endif ()

-add_library(jemalloc ${SRCS})
-target_include_directories(jemalloc PRIVATE "${LIBRARY_DIR}/include")
-target_include_directories(jemalloc SYSTEM PUBLIC include)
+add_library(_jemalloc ${SRCS})
+target_include_directories(_jemalloc PRIVATE "${LIBRARY_DIR}/include")
+target_include_directories(_jemalloc SYSTEM PUBLIC include)

 set (JEMALLOC_INCLUDE_PREFIX)
 # OS_
@ -117,24 +117,24 @@ endif ()

 configure_file(${JEMALLOC_INCLUDE_PREFIX}/jemalloc/internal/jemalloc_internal_defs.h.in
    ${JEMALLOC_INCLUDE_PREFIX}/jemalloc/internal/jemalloc_internal_defs.h)
-target_include_directories(jemalloc SYSTEM PRIVATE
+target_include_directories(_jemalloc SYSTEM PRIVATE
    "${CMAKE_CURRENT_BINARY_DIR}/${JEMALLOC_INCLUDE_PREFIX}/jemalloc/internal")

-target_compile_definitions(jemalloc PRIVATE -DJEMALLOC_NO_PRIVATE_NAMESPACE)
+target_compile_definitions(_jemalloc PRIVATE -DJEMALLOC_NO_PRIVATE_NAMESPACE)

 if (CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG")
-    target_compile_definitions(jemalloc PRIVATE -DJEMALLOC_DEBUG=1)
+    target_compile_definitions(_jemalloc PRIVATE -DJEMALLOC_DEBUG=1)
 endif ()

-target_compile_definitions(jemalloc PRIVATE -DJEMALLOC_PROF=1)
+target_compile_definitions(_jemalloc PRIVATE -DJEMALLOC_PROF=1)

 if (USE_UNWIND)
-    target_compile_definitions (jemalloc PRIVATE -DJEMALLOC_PROF_LIBUNWIND=1)
-    target_link_libraries (jemalloc PRIVATE unwind)
+    target_compile_definitions (_jemalloc PRIVATE -DJEMALLOC_PROF_LIBUNWIND=1)
+    target_link_libraries (_jemalloc PRIVATE unwind)
 endif ()

-target_compile_options(jemalloc PRIVATE -Wno-redundant-decls)
+target_compile_options(_jemalloc PRIVATE -Wno-redundant-decls)
 # for RTLD_NEXT
-target_compile_options(jemalloc PRIVATE -D_GNU_SOURCE)
+target_compile_options(_jemalloc PRIVATE -D_GNU_SOURCE)

-add_library(ch_contrib::jemalloc ALIAS jemalloc)
+add_library(ch_contrib::jemalloc ALIAS _jemalloc)
--- a/contrib/krb5-cmake/CMakeLists.txt
+++ b/contrib/krb5-cmake/CMakeLists.txt
@ -558,10 +558,10 @@ add_custom_target(
    VERBATIM
 )

-add_library(krb5)
+add_library(_krb5)

 add_dependencies(
-    krb5
+    _krb5
    ERRMAP_H
    ERROR_MAP_H
    KRB_5_H
@ -579,7 +579,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
    list(APPEND ALL_SRCS "${CMAKE_CURRENT_BINARY_DIR}/include_private/kcmrpc.c")
 endif()

-target_sources(krb5 PRIVATE
+target_sources(_krb5 PRIVATE
    ${ALL_SRCS}
 )

@ -651,12 +651,12 @@ add_custom_command(



-target_include_directories(krb5 SYSTEM BEFORE PUBLIC
+target_include_directories(_krb5 SYSTEM BEFORE PUBLIC
    "${KRB5_SOURCE_DIR}/include"
    "${CMAKE_CURRENT_BINARY_DIR}/include"
 )

-target_include_directories(krb5 PRIVATE
+target_include_directories(_krb5 PRIVATE
    "${CMAKE_CURRENT_BINARY_DIR}/include_private" # For autoconf.h and other generated headers.
    ${KRB5_SOURCE_DIR}
    "${KRB5_SOURCE_DIR}/include"
@ -678,7 +678,7 @@ target_include_directories(krb5 PRIVATE
    "${KRB5_SOURCE_DIR}/lib/krb5/os"
 )

-target_compile_definitions(krb5 PRIVATE
+target_compile_definitions(_krb5 PRIVATE
    KRB5_PRIVATE
    _GSS_STATIC_LINK=1
    KRB5_DEPRECATED=1
@ -688,6 +688,6 @@ target_compile_definitions(krb5 PRIVATE
    LIBDIR="/usr/local/lib"
 )

-target_link_libraries(krb5 PRIVATE OpenSSL::Crypto OpenSSL::SSL)
+target_link_libraries(_krb5 PRIVATE OpenSSL::Crypto OpenSSL::SSL)

-add_library(ch_contrib::krb5 ALIAS krb5)
+add_library(ch_contrib::krb5 ALIAS _krb5)
--- a/contrib/lemmagen-c-cmake/CMakeLists.txt
+++ b/contrib/lemmagen-c-cmake/CMakeLists.txt
@ -5,6 +5,6 @@ set(SRCS
    "${LIBRARY_DIR}/src/RdrLemmatizer.cpp"
 )

-add_library(lemmagen STATIC ${SRCS})
-target_include_directories(lemmagen SYSTEM PUBLIC "${LEMMAGEN_INCLUDE_DIR}")
-add_library(ch_contrib::lemmagen ALIAS lemmagen)
+add_library(_lemmagen STATIC ${SRCS})
+target_include_directories(_lemmagen SYSTEM PUBLIC "${LEMMAGEN_INCLUDE_DIR}")
+add_library(ch_contrib::lemmagen ALIAS _lemmagen)
--- a/contrib/libcpuid-cmake/CMakeLists.txt
+++ b/contrib/libcpuid-cmake/CMakeLists.txt
@ -23,12 +23,12 @@ set (SRCS
    "${LIBRARY_DIR}/libcpuid/recog_intel.c"
 )

-add_library (cpuid ${SRCS})
+add_library (_cpuid ${SRCS})

-target_include_directories (cpuid SYSTEM PUBLIC "${LIBRARY_DIR}")
-target_compile_definitions (cpuid PRIVATE VERSION="v0.4.1")
+target_include_directories (_cpuid SYSTEM PUBLIC "${LIBRARY_DIR}")
+target_compile_definitions (_cpuid PRIVATE VERSION="v0.4.1")
 if (COMPILER_CLANG)
-    target_compile_options (cpuid PRIVATE -Wno-reserved-id-macro)
+    target_compile_options (_cpuid PRIVATE -Wno-reserved-id-macro)
 endif ()

-add_library(ch_contrib::cpuid ALIAS cpuid)
+add_library(ch_contrib::cpuid ALIAS _cpuid)
--- a/contrib/libdivide/CMakeLists.txt
+++ b/contrib/libdivide/CMakeLists.txt
@ -1,2 +1,3 @@
-add_library (libdivide INTERFACE)
-target_include_directories (libdivide SYSTEM BEFORE INTERFACE .)
+add_library (_libdivide INTERFACE)
+target_include_directories (_libdivide SYSTEM BEFORE INTERFACE .)
+add_library (ch_contrib::libdivide ALIAS _libdivide)
--- a/contrib/libgsasl-cmake/CMakeLists.txt
+++ b/contrib/libgsasl-cmake/CMakeLists.txt
@ -98,19 +98,19 @@ if (TARGET ch_contrib::krb5)
        ${SRC_DIR}/gssapi/server.c)
 endif()

-add_library(gsasl ${SRCS})
+add_library(_gsasl ${SRCS})

-target_include_directories(gsasl PUBLIC ${SRC_DIR})
-target_include_directories(gsasl PUBLIC ${SRC_DIR}/gl)
-target_include_directories(gsasl PUBLIC ${SRC_DIR}/src)
-target_include_directories(gsasl PUBLIC ${SRC_DIR}/digest-md5)
-target_include_directories(gsasl PUBLIC "${ClickHouse_SOURCE_DIR}/contrib/libgsasl-cmake/linux_x86_64/include")
+target_include_directories(_gsasl PUBLIC ${SRC_DIR})
+target_include_directories(_gsasl PUBLIC ${SRC_DIR}/gl)
+target_include_directories(_gsasl PUBLIC ${SRC_DIR}/src)
+target_include_directories(_gsasl PUBLIC ${SRC_DIR}/digest-md5)
+target_include_directories(_gsasl PUBLIC "${ClickHouse_SOURCE_DIR}/contrib/libgsasl-cmake/linux_x86_64/include")

-target_compile_definitions (gsasl PRIVATE HAVE_CONFIG_H=1)
+target_compile_definitions(_gsasl PRIVATE HAVE_CONFIG_H=1)

 if (TARGET ch_contrib::krb5)
-    target_link_libraries(gsasl PUBLIC ch_contrib::krb5)
-    target_compile_definitions (gsasl PRIVATE HAVE_GSSAPI_H=1 USE_GSSAPI=1)
+    target_link_libraries(_gsasl PUBLIC ch_contrib::krb5)
+    target_compile_definitions(_gsasl PRIVATE HAVE_GSSAPI_H=1 USE_GSSAPI=1)
 endif()

-add_library(ch_contrib::gsasl ALIAS gsasl)
+add_library(ch_contrib::gsasl ALIAS _gsasl)
--- a/contrib/libmetrohash/CMakeLists.txt
+++ b/contrib/libmetrohash/CMakeLists.txt
@ -2,5 +2,6 @@ set (SRCS
    src/metrohash64.cpp
    src/metrohash128.cpp
 )
-add_library(metrohash ${SRCS})
-target_include_directories(metrohash PUBLIC src)
+add_library(_metrohash ${SRCS})
+target_include_directories(_metrohash PUBLIC src)
+add_library(ch_contrib::metrohash ALIAS _metrohash)
--- a/contrib/libpq-cmake/CMakeLists.txt
+++ b/contrib/libpq-cmake/CMakeLists.txt
@ -57,12 +57,12 @@ set(SRCS
        "${LIBPQ_SOURCE_DIR}/port/explicit_bzero.c"
        )

-add_library(libpq ${SRCS})
+add_library(_libpq ${SRCS})

-target_include_directories (libpq SYSTEM PUBLIC ${LIBPQ_SOURCE_DIR})
-target_include_directories (libpq SYSTEM PUBLIC "${LIBPQ_SOURCE_DIR}/include")
-target_include_directories (libpq SYSTEM PRIVATE "${LIBPQ_SOURCE_DIR}/configs")
+target_include_directories (_libpq SYSTEM PUBLIC ${LIBPQ_SOURCE_DIR})
+target_include_directories (_libpq SYSTEM PUBLIC "${LIBPQ_SOURCE_DIR}/include")
+target_include_directories (_libpq SYSTEM PRIVATE "${LIBPQ_SOURCE_DIR}/configs")

-target_link_libraries (libpq PRIVATE ssl)
+target_link_libraries (_libpq PRIVATE OpenSSL::SSL)

-add_library(ch_contrib::libpq ALIAS libpq)
+add_library(ch_contrib::libpq ALIAS _libpq)
--- a/contrib/libpqxx-cmake/CMakeLists.txt
+++ b/contrib/libpqxx-cmake/CMakeLists.txt
@ -70,9 +70,9 @@ set (HDRS
    "${LIBRARY_DIR}/include/pqxx/zview.hxx"
 )

-add_library(libpqxx ${SRCS} ${HDRS})
+add_library(_libpqxx ${SRCS} ${HDRS})

-target_link_libraries(libpqxx PUBLIC ch_contrib::libpq)
-target_include_directories (libpqxx SYSTEM BEFORE PUBLIC "${LIBRARY_DIR}/include")
+target_link_libraries(_libpqxx PUBLIC ch_contrib::libpq)
+target_include_directories (_libpqxx SYSTEM BEFORE PUBLIC "${LIBRARY_DIR}/include")

-add_library(ch_contrib::libpqxx ALIAS libpqxx)
+add_library(ch_contrib::libpqxx ALIAS _libpqxx)
--- a/contrib/libstemmer-c-cmake/CMakeLists.txt
+++ b/contrib/libstemmer-c-cmake/CMakeLists.txt
@ -27,6 +27,6 @@ FOREACH ( LINE ${_CONTENT} )
 endforeach ()

 # all the sources parsed. Now just add the lib
-add_library ( stemmer STATIC ${_SOURCES} ${_HEADERS} )
-target_include_directories (stemmer SYSTEM PUBLIC "${STEMMER_INCLUDE_DIR}")
-add_library(ch_contrib::stemmer ALIAS stemmer)
+add_library(_stemmer STATIC ${_SOURCES} ${_HEADERS} )
+target_include_directories(_stemmer SYSTEM PUBLIC "${STEMMER_INCLUDE_DIR}")
+add_library(ch_contrib::stemmer ALIAS _stemmer)
--- a/contrib/libuv-cmake/CMakeLists.txt
+++ b/contrib/libuv-cmake/CMakeLists.txt
@ -133,7 +133,7 @@ add_library(ch_contrib::uv ALIAS _uv)
 target_compile_definitions(_uv PRIVATE ${uv_defines})
 target_include_directories(_uv SYSTEM PUBLIC ${SOURCE_DIR}/include PRIVATE ${SOURCE_DIR}/src)
 target_link_libraries(_uv ${uv_libraries})
-if (NOT MAKE_STATIC_LIBRARIES)
+if (NOT USE_STATIC_LIBRARIES)
  target_compile_definitions(_uv
                             INTERFACE USING_UV_SHARED=1
                             PRIVATE BUILDING_UV_SHARED=1)
--- a/contrib/libxml2-cmake/CMakeLists.txt
+++ b/contrib/libxml2-cmake/CMakeLists.txt
@ -50,14 +50,14 @@ set(SRCS
    "${LIBXML2_SOURCE_DIR}/schematron.c"
    "${LIBXML2_SOURCE_DIR}/xzlib.c"
 )
-add_library(libxml2 ${SRCS})
+add_library(_libxml2 ${SRCS})

-target_link_libraries(libxml2 PRIVATE ch_contrib::zlib)
+target_link_libraries(_libxml2 PRIVATE ch_contrib::zlib)
 if(M_LIBRARY)
-    target_link_libraries(libxml2 PRIVATE ${M_LIBRARY})
+    target_link_libraries(_libxml2 PRIVATE ${M_LIBRARY})
 endif()

-target_include_directories(libxml2 BEFORE PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/linux_x86_64/include")
-target_include_directories(libxml2 BEFORE PUBLIC "${LIBXML2_SOURCE_DIR}/include")
+target_include_directories(_libxml2 BEFORE PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/linux_x86_64/include")
+target_include_directories(_libxml2 BEFORE PUBLIC "${LIBXML2_SOURCE_DIR}/include")

-add_library(ch_contrib::libxml2 ALIAS libxml2)
+add_library(ch_contrib::libxml2 ALIAS _libxml2)
--- a/contrib/lz4
+++ b/contrib/lz4
@ -1 +1 @@
-Subproject commit f39b79fb02962a1cd880bbdecb6dffba4f754a11
+Subproject commit 4c9431e9af596af0556e5da0ae99305bafb2b10b
--- a/contrib/magic-enum-cmake/CMakeLists.txt
+++ b/contrib/magic-enum-cmake/CMakeLists.txt
@ -1,4 +1,4 @@
-set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/magic_enum")
-add_library (magic_enum INTERFACE)
-target_include_directories(magic_enum SYSTEM INTERFACE ${LIBRARY_DIR}/include)
-add_library(ch_contrib::magic_enum ALIAS magic_enum)
+set(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/magic_enum")
+add_library(_magic_enum INTERFACE)
+target_include_directories(_magic_enum SYSTEM INTERFACE ${LIBRARY_DIR}/include)
+add_library(ch_contrib::magic_enum ALIAS _magic_enum)
--- a/contrib/mariadb-connector-c-cmake/CMakeLists.txt
+++ b/contrib/mariadb-connector-c-cmake/CMakeLists.txt
@ -239,12 +239,12 @@ endif()
 set(LIBMARIADB_SOURCES ${LIBMARIADB_SOURCES} ${CC_SOURCE_DIR}/libmariadb/mariadb_async.c ${CC_SOURCE_DIR}/libmariadb/ma_context.c)


-add_library(mariadbclient STATIC ${LIBMARIADB_SOURCES})
-target_link_libraries(mariadbclient ${SYSTEM_LIBS})
+add_library(_mariadbclient STATIC ${LIBMARIADB_SOURCES})
+target_link_libraries(_mariadbclient ${SYSTEM_LIBS})

-target_include_directories(mariadbclient PRIVATE ${CC_BINARY_DIR}/include-private)
-target_include_directories(mariadbclient SYSTEM PUBLIC ${CC_BINARY_DIR}/include-public ${CC_SOURCE_DIR}/include ${CC_SOURCE_DIR}/libmariadb)
+target_include_directories(_mariadbclient PRIVATE ${CC_BINARY_DIR}/include-private)
+target_include_directories(_mariadbclient SYSTEM PUBLIC ${CC_BINARY_DIR}/include-public ${CC_SOURCE_DIR}/include ${CC_SOURCE_DIR}/libmariadb)

-set_target_properties(mariadbclient PROPERTIES IMPORTED_INTERFACE_LINK_LIBRARIES "${SYSTEM_LIBS}")
+set_target_properties(_mariadbclient PROPERTIES IMPORTED_INTERFACE_LINK_LIBRARIES "${SYSTEM_LIBS}")

-add_library(ch_contrib::mariadbclient ALIAS mariadbclient)
+add_library(ch_contrib::mariadbclient ALIAS _mariadbclient)
--- a/contrib/murmurhash/CMakeLists.txt
+++ b/contrib/murmurhash/CMakeLists.txt
@ -1,7 +1,8 @@
-add_library(murmurhash
+add_library(_murmurhash
    src/MurmurHash2.cpp
    src/MurmurHash3.cpp
    include/MurmurHash2.h
    include/MurmurHash3.h)

-target_include_directories (murmurhash PUBLIC include)
+target_include_directories(_murmurhash PUBLIC include)
+add_library(ch_contrib::murmurhash ALIAS _murmurhash)
--- a/contrib/nanodbc-cmake/CMakeLists.txt
+++ b/contrib/nanodbc-cmake/CMakeLists.txt
@ -12,8 +12,7 @@ set (SRCS
    "${LIBRARY_DIR}/nanodbc/nanodbc.cpp"
 )

-add_library(nanodbc ${SRCS})
-
-target_link_libraries (nanodbc PUBLIC ch_contrib::unixodbc)
-target_include_directories (nanodbc SYSTEM PUBLIC "${LIBRARY_DIR}/")
-add_library(ch_contrib::nanodbc ALIAS nanodbc)
+add_library(_nanodbc ${SRCS})
+target_link_libraries(_nanodbc PUBLIC ch_contrib::unixodbc)
+target_include_directories(_nanodbc SYSTEM PUBLIC "${LIBRARY_DIR}/")
+add_library(ch_contrib::nanodbc ALIAS _nanodbc)
--- a/contrib/nlp-data
+++ b/contrib/nlp-data
@ -0,0 +1 @@
+Subproject commit 5591f91f5e748cba8fb9ef81564176feae774853
--- a/contrib/nlp-data-cmake/CMakeLists.txt
+++ b/contrib/nlp-data-cmake/CMakeLists.txt
@ -0,0 +1,15 @@
+include(${ClickHouse_SOURCE_DIR}/cmake/embed_binary.cmake)
+
+set(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/nlp-data")
+
+add_library (_nlp_data INTERFACE)
+
+clickhouse_embed_binaries(
+    TARGET nlp_dictionaries
+    RESOURCE_DIR "${LIBRARY_DIR}"
+    RESOURCES charset.zst tonality_ru.zst programming.zst
+)
+
+add_dependencies(_nlp_data nlp_dictionaries)
+target_link_libraries(_nlp_data INTERFACE "-Wl,${WHOLE_ARCHIVE} $<TARGET_FILE:nlp_dictionaries> -Wl,${NO_WHOLE_ARCHIVE}")
+add_library(ch_contrib::nlp_data ALIAS _nlp_data)
--- a/contrib/orc
+++ b/contrib/orc
@ -1 +1 @@
-Subproject commit 0a936f6bbdb9303308973073f8623b5a8d82eae1
+Subproject commit f9a393ed2433a60034795284f82d093b348f2102
--- a/contrib/poco-cmake/Crypto/CMakeLists.txt
+++ b/contrib/poco-cmake/Crypto/CMakeLists.txt
@ -29,7 +29,7 @@ if (ENABLE_SSL)

    target_compile_options (_poco_crypto PRIVATE -Wno-newline-eof)
    target_include_directories (_poco_crypto SYSTEM PUBLIC "${LIBRARY_DIR}/Crypto/include")
-    target_link_libraries (_poco_crypto PUBLIC Poco::Foundation ssl crypto)
+    target_link_libraries (_poco_crypto PUBLIC Poco::Foundation OpenSSL::SSL OpenSSL::Crypto)

    message (STATUS "Using Poco::Crypto")
 else ()
--- a/contrib/protobuf-cmake/CMakeLists.txt
+++ b/contrib/protobuf-cmake/CMakeLists.txt
@ -63,13 +63,13 @@ set(libprotobuf_lite_files
  ${protobuf_source_dir}/src/google/protobuf/wire_format_lite.cc
 )

-add_library(libprotobuf-lite ${libprotobuf_lite_files})
-target_link_libraries(libprotobuf-lite pthread)
+add_library(_libprotobuf-lite ${libprotobuf_lite_files})
+target_link_libraries(_libprotobuf-lite pthread)
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Android")
-    target_link_libraries(libprotobuf-lite log)
+    target_link_libraries(_libprotobuf-lite log)
 endif()
-target_include_directories(libprotobuf-lite SYSTEM PUBLIC ${protobuf_source_dir}/src)
-add_library(protobuf::libprotobuf-lite ALIAS libprotobuf-lite)
+target_include_directories(_libprotobuf-lite SYSTEM PUBLIC ${protobuf_source_dir}/src)
+add_library(protobuf::libprotobuf-lite ALIAS _libprotobuf-lite)


 set(libprotobuf_files
@ -127,17 +127,17 @@ set(libprotobuf_files
  ${protobuf_source_dir}/src/google/protobuf/wrappers.pb.cc
 )

-add_library(libprotobuf ${libprotobuf_lite_files} ${libprotobuf_files})
+add_library(_libprotobuf ${libprotobuf_lite_files} ${libprotobuf_files})
 if (ENABLE_FUZZING)
-    target_compile_options(libprotobuf PRIVATE "-fsanitize-recover=all")
+    target_compile_options(_libprotobuf PRIVATE "-fsanitize-recover=all")
 endif()
-target_link_libraries(libprotobuf pthread)
-target_link_libraries(libprotobuf ch_contrib::zlib)
+target_link_libraries(_libprotobuf pthread)
+target_link_libraries(_libprotobuf ch_contrib::zlib)
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Android")
-    target_link_libraries(libprotobuf log)
+    target_link_libraries(_libprotobuf log)
 endif()
-target_include_directories(libprotobuf SYSTEM PUBLIC ${protobuf_source_dir}/src)
-add_library(protobuf::libprotobuf ALIAS libprotobuf)
+target_include_directories(_libprotobuf SYSTEM PUBLIC ${protobuf_source_dir}/src)
+add_library(protobuf::libprotobuf ALIAS _libprotobuf)


 set(libprotoc_files
@ -226,9 +226,9 @@ set(libprotoc_files
  ${protobuf_source_dir}/src/google/protobuf/compiler/zip_writer.cc
 )

-add_library(libprotoc ${libprotoc_files})
-target_link_libraries(libprotoc libprotobuf)
-add_library(protobuf::libprotoc ALIAS libprotoc)
+add_library(_libprotoc ${libprotoc_files})
+target_link_libraries(_libprotoc _libprotobuf)
+add_library(protobuf::libprotoc ALIAS _libprotoc)

 set(protoc_files ${protobuf_source_dir}/src/google/protobuf/compiler/main.cc)

@ -236,7 +236,7 @@ if (CMAKE_HOST_SYSTEM_NAME STREQUAL CMAKE_SYSTEM_NAME
    AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL CMAKE_SYSTEM_PROCESSOR)

    add_executable(protoc ${protoc_files})
-    target_link_libraries(protoc libprotoc libprotobuf pthread)
+    target_link_libraries(protoc _libprotoc _libprotobuf pthread)
    add_executable(protobuf::protoc ALIAS protoc)

    if (ENABLE_FUZZING)
@ -319,11 +319,11 @@ endif ()
 include("${ClickHouse_SOURCE_DIR}/contrib/protobuf-cmake/protobuf_generate.cmake")

 add_library(_protobuf INTERFACE)
-target_link_libraries(_protobuf INTERFACE libprotobuf)
+target_link_libraries(_protobuf INTERFACE _libprotobuf)
 target_include_directories(_protobuf INTERFACE "${Protobuf_INCLUDE_DIR}")
 add_library(ch_contrib::protobuf ALIAS _protobuf)

 add_library(_protoc INTERFACE)
-target_link_libraries(_protoc INTERFACE libprotoc libprotobuf)
+target_link_libraries(_protoc INTERFACE _libprotoc _libprotobuf)
 target_include_directories(_protoc INTERFACE "${Protobuf_INCLUDE_DIR}")
 add_library(ch_contrib::protoc ALIAS _protoc)
--- a/contrib/re2-cmake/CMakeLists.txt
+++ b/contrib/re2-cmake/CMakeLists.txt
@ -71,5 +71,7 @@ foreach (FILENAME mutex.h)
    add_dependencies (re2_st transform_${FILENAME})
 endforeach ()

+# NOTE: you should not change name of library here, since it is used for PVS
+# (see docker/test/pvs/Dockerfile), to generate required header (see above)
 add_library(ch_contrib::re2 ALIAS re2)
 add_library(ch_contrib::re2_st ALIAS re2_st)
--- a/contrib/replxx-cmake/CMakeLists.txt
+++ b/contrib/replxx-cmake/CMakeLists.txt
@ -20,11 +20,11 @@ set(SRCS
    "${LIBRARY_DIR}/src/wcwidth.cpp"
 )

-add_library (replxx ${SRCS})
-target_include_directories(replxx SYSTEM PUBLIC "${LIBRARY_DIR}/include")
+add_library (_replxx ${SRCS})
+target_include_directories(_replxx SYSTEM PUBLIC "${LIBRARY_DIR}/include")

 if (COMPILER_CLANG)
-    target_compile_options(replxx PRIVATE -Wno-documentation)
+    target_compile_options(_replxx PRIVATE -Wno-documentation)
 endif ()

-add_library(ch_contrib::replxx ALIAS replxx)
+add_library(ch_contrib::replxx ALIAS _replxx)
--- a/contrib/sentry-native-cmake/CMakeLists.txt
+++ b/contrib/sentry-native-cmake/CMakeLists.txt
@ -49,17 +49,16 @@ else()
    list(APPEND SRCS ${SRC_DIR}/src/modulefinder/sentry_modulefinder_linux.c)
 endif()

-add_library(sentry ${SRCS})
-add_library(sentry::sentry ALIAS sentry)
+add_library(_sentry ${SRCS})

 if(BUILD_SHARED_LIBS)
-    target_compile_definitions(sentry PRIVATE SENTRY_BUILD_SHARED)
+    target_compile_definitions(_sentry PRIVATE SENTRY_BUILD_SHARED)
 else()
-    target_compile_definitions(sentry PUBLIC SENTRY_BUILD_STATIC)
+    target_compile_definitions(_sentry PUBLIC SENTRY_BUILD_STATIC)
 endif()

-target_link_libraries(sentry PRIVATE ch_contrib::curl pthread)
-target_include_directories(sentry PUBLIC "${SRC_DIR}/include" PRIVATE "${SRC_DIR}/src")
-target_compile_definitions(sentry PRIVATE SENTRY_WITH_INPROC_BACKEND SIZEOF_LONG=8)
+target_link_libraries(_sentry PRIVATE ch_contrib::curl pthread)
+target_include_directories(_sentry PUBLIC "${SRC_DIR}/include" PRIVATE "${SRC_DIR}/src")
+target_compile_definitions(_sentry PRIVATE SENTRY_WITH_INPROC_BACKEND SIZEOF_LONG=8)

-add_library(ch_contrib::sentry ALIAS sentry)
+add_library(ch_contrib::sentry ALIAS _sentry)
--- a/contrib/sqlite-cmake/CMakeLists.txt
+++ b/contrib/sqlite-cmake/CMakeLists.txt
@ -9,6 +9,6 @@ set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/sqlite-amalgamation")

 set(SRCS ${LIBRARY_DIR}/sqlite3.c)

-add_library(sqlite ${SRCS})
-target_include_directories(sqlite SYSTEM PUBLIC "${LIBRARY_DIR}")
-add_library(ch_contrib::sqlite ALIAS sqlite)
+add_library(_sqlite ${SRCS})
+target_include_directories(_sqlite SYSTEM PUBLIC "${LIBRARY_DIR}")
+add_library(ch_contrib::sqlite ALIAS _sqlite)
--- a/contrib/stats-cmake/CMakeLists.txt
+++ b/contrib/stats-cmake/CMakeLists.txt
@ -1,9 +0,0 @@
-# The stats is a header-only library of probability density functions,
-# cumulative distribution functions, quantile functions, and random sampling methods.
-set(STATS_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/stats/include")
-set(GCEM_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/gcem/include")
-
-add_library(stats INTERFACE)
-
-target_include_directories(stats SYSTEM INTERFACE ${STATS_INCLUDE_DIR})
-target_include_directories(stats SYSTEM INTERFACE ${GCEM_INCLUDE_DIR})
--- a/contrib/unixodbc-cmake/CMakeLists.txt
+++ b/contrib/unixodbc-cmake/CMakeLists.txt
@ -29,9 +29,9 @@ set (SRCS_LTDL
    "${LIBRARY_DIR}/libltdl/loaders/preopen.c"
 )

-add_library (ltdl ${SRCS_LTDL})
+add_library (_ltdl ${SRCS_LTDL})

-target_include_directories(ltdl
+target_include_directories(_ltdl
    SYSTEM
    PRIVATE
        linux_x86_64/libltdl
@ -39,8 +39,8 @@ target_include_directories(ltdl
        "${LIBRARY_DIR}/libltdl"
        "${LIBRARY_DIR}/libltdl/libltdl"
 )
-target_compile_definitions(ltdl PRIVATE -DHAVE_CONFIG_H -DLTDL -DLTDLOPEN=libltdlc)
-target_compile_options(ltdl PRIVATE -Wno-constant-logical-operand -Wno-unknown-warning-option -O2)
+target_compile_definitions(_ltdl PRIVATE -DHAVE_CONFIG_H -DLTDL -DLTDLOPEN=libltdlc)
+target_compile_options(_ltdl PRIVATE -Wno-constant-logical-operand -Wno-unknown-warning-option -O2)

 # odbc

@ -279,13 +279,13 @@ set (SRCS
    "${LIBRARY_DIR}/odbcinst/SQLWritePrivateProfileString.c"
 )

-add_library (unixodbc ${SRCS})
+add_library (_unixodbc ${SRCS})

-target_link_libraries (unixodbc PRIVATE ltdl)
+target_link_libraries (_unixodbc PRIVATE _ltdl)

 # SYSTEM_FILE_PATH was changed to /etc

-target_include_directories (unixodbc
+target_include_directories (_unixodbc
    SYSTEM
    PRIVATE
        linux_x86_64/private
@ -293,8 +293,8 @@ target_include_directories (unixodbc
        linux_x86_64
        "${LIBRARY_DIR}/include"
 )
-target_compile_definitions (unixodbc PRIVATE -DHAVE_CONFIG_H)
-target_compile_options (unixodbc
+target_compile_definitions (_unixodbc PRIVATE -DHAVE_CONFIG_H)
+target_compile_options (_unixodbc
    PRIVATE
        -Wno-dangling-else
        -Wno-parentheses
@ -304,4 +304,4 @@ target_compile_options (unixodbc
        -O2
 )

-add_library (ch_contrib::unixodbc ALIAS unixodbc)
+add_library (ch_contrib::unixodbc ALIAS _unixodbc)
--- a/contrib/wordnet-blast-cmake/CMakeLists.txt
+++ b/contrib/wordnet-blast-cmake/CMakeLists.txt
@ -6,7 +6,7 @@ set(SRCS
    "${LIBRARY_DIR}/wnb/core/wordnet.cc"
 )

-add_library(wnb ${SRCS})
-target_link_libraries(wnb PRIVATE boost::headers_only boost::graph)
-target_include_directories(wnb SYSTEM PUBLIC "${LIBRARY_DIR}")
-add_library(ch_contrib::wnb ALIAS wnb)
+add_library(_wnb ${SRCS})
+target_link_libraries(_wnb PRIVATE boost::headers_only boost::graph)
+target_include_directories(_wnb SYSTEM PUBLIC "${LIBRARY_DIR}")
+add_library(ch_contrib::wnb ALIAS _wnb)
--- a/contrib/yaml-cpp-cmake/CMakeLists.txt
+++ b/contrib/yaml-cpp-cmake/CMakeLists.txt
@ -39,9 +39,9 @@ set (SRCS
    ${LIBRARY_DIR}/src/scantag.cpp
 )

-add_library (yaml-cpp ${SRCS})
+add_library (_yaml_cpp ${SRCS})

-target_include_directories(yaml-cpp PRIVATE ${LIBRARY_DIR}/include/yaml-cpp)
-target_include_directories(yaml-cpp SYSTEM BEFORE PUBLIC ${LIBRARY_DIR}/include)
+target_include_directories(_yaml_cpp PRIVATE ${LIBRARY_DIR}/include/yaml-cpp)
+target_include_directories(_yaml_cpp SYSTEM BEFORE PUBLIC ${LIBRARY_DIR}/include)

-add_library (ch_contrib::yaml_cpp ALIAS yaml-cpp)
+add_library (ch_contrib::yaml_cpp ALIAS _yaml_cpp)
--- a/contrib/zlib-ng-cmake/CMakeLists.txt
+++ b/contrib/zlib-ng-cmake/CMakeLists.txt
@ -131,7 +131,6 @@ set(ZLIB_SRCS
 set(ZLIB_ALL_SRCS ${ZLIB_SRCS} ${ZLIB_ARCH_SRCS})

 add_library(_zlib ${ZLIB_ALL_SRCS})
-add_library(zlibstatic ALIAS _zlib)
 add_library(ch_contrib::zlib ALIAS _zlib)

 # https://github.com/zlib-ng/zlib-ng/pull/733
--- a/docker/server/entrypoint.sh
+++ b/docker/server/entrypoint.sh
@ -65,7 +65,12 @@ do
    # check if variable not empty
    [ -z "$dir" ] && continue
    # ensure directories exist
-    if ! mkdir -p "$dir"; then
+    if [ "$DO_CHOWN" = "1" ]; then
+      mkdir="mkdir"
+    else
+      mkdir="$gosu mkdir"
+    fi
+    if ! $mkdir -p "$dir"; then
        echo "Couldn't create necessary directory: $dir"
        exit 1
    fi
--- a/docs/en/engines/database-engines/materialized-mysql.md
+++ b/docs/en/engines/database-engines/materialized-mysql.md
@ -78,15 +78,21 @@ When working with the `MaterializedMySQL` database engine, [ReplacingMergeTree](
 | DATE, NEWDATE           | [Date](../../sql-reference/data-types/date.md)               |
 | DATETIME, TIMESTAMP     | [DateTime](../../sql-reference/data-types/datetime.md)       |
 | DATETIME2, TIMESTAMP2   | [DateTime64](../../sql-reference/data-types/datetime64.md)   |
+| YEAR                    | [UInt16](../../sql-reference/data-types/int-uint.md)         |
+| TIME                    | [Int64](../../sql-reference/data-types/int-uint.md)          |
 | ENUM                    | [Enum](../../sql-reference/data-types/enum.md)               |
 | STRING                  | [String](../../sql-reference/data-types/string.md)           |
 | VARCHAR, VAR_STRING     | [String](../../sql-reference/data-types/string.md)           |
 | BLOB                    | [String](../../sql-reference/data-types/string.md)           |
+| GEOMETRY                | [String](../../sql-reference/data-types/string.md)           |
 | BINARY                  | [FixedString](../../sql-reference/data-types/fixedstring.md) |
 | BIT                     | [UInt64](../../sql-reference/data-types/int-uint.md)         |
+| SET                     | [UInt64](../../sql-reference/data-types/int-uint.md)         |

 [Nullable](../../sql-reference/data-types/nullable.md) is supported.

+The data of TIME type in MySQL is converted to microseconds in ClickHouse.
+
 Other types are not supported. If MySQL table contains a column of such type, ClickHouse throws exception "Unhandled data type" and stops replication.

 ## Specifics and Recommendations {#specifics-and-recommendations}
--- a/docs/en/interfaces/third-party/client-libraries.md
+++ b/docs/en/interfaces/third-party/client-libraries.md
@ -27,6 +27,7 @@ toc_title: Client Libraries
 -   Go
    -   [clickhouse](https://github.com/kshvakov/clickhouse/)
    -   [go-clickhouse](https://github.com/roistat/go-clickhouse)
+    -   [chconn](https://github.com/vahid-sohrabloo/chconn)
    -   [mailrugo-clickhouse](https://github.com/mailru/go-clickhouse)
    -   [golang-clickhouse](https://github.com/leprosus/golang-clickhouse)
 -   Swift
--- a/docs/en/introduction/adopters.md
+++ b/docs/en/introduction/adopters.md
@ -105,10 +105,13 @@ toc_title: Adopters
 | <a href="https://www.mindsdb.com/" class="favicon">MindsDB</a> | Machine Learning | Main Product | — | — | [Official Website](https://www.mindsdb.com/blog/machine-learning-models-as-tables-in-ch) |
 | <a href="https://mux.com/" class="favicon">MUX</a> | Online Video | Video Analytics | — | — | [Talk in English, August 2019](https://altinity.com/presentations/2019/8/13/how-clickhouse-became-the-default-analytics-database-for-mux/) |
 | <a href="https://www.mgid.com/" class="favicon">MGID</a> | Ad network | Web-analytics | — | — | [Blog post in Russian, April 2020](http://gs-studio.com/news-about-it/32777----clickhouse---c) |
+| <a href="https://mu.se/" class="favicon">Muse Group</a> | Music Software | Performance Monitoring | — | — | [Blog post in Russian, January 2021](https://habr.com/en/post/647079/) |
 | <a href="https://www.netskope.com/" class="favicon">Netskope</a> | Network Security | — | — | — | [Job advertisement, March 2021](https://www.mendeley.com/careers/job/senior-software-developer-backend-developer-1346348) |
 | <a href="https://niclabs.cl/" class="favicon">NIC Labs</a> | Network Monitoring | RaTA-DNS | — | — | [Blog post, March 2021](https://niclabs.cl/ratadns/2021/03/Clickhouse) |
+| <a href="https://nlmk.com/en/" class="favicon">NLMK</a> | Steel | Monitoring | — | — | [Article in Russian, Jan 2022](https://habr.com/en/company/nlmk/blog/645943/) |
 | <a href="https://getnoc.com/" class="favicon">NOC Project</a> | Network Monitoring | Analytics | Main Product | — | [Official Website](https://getnoc.com/features/big-data/) |
 | <a href="https://www.noction.com" class="favicon">Noction</a> | Network Technology | Main Product | — | — | [Official Website](https://www.noction.com/news/irp-3-11-remote-triggered-blackholing-capability)
+| <a href="https://www.ntop.org/" class="favicon">ntop</a> | Network Monitoning | Monitoring | — | — | [Official website, Jan 2022](https://www.ntop.org/ntop/historical-traffic-analysis-at-scale-using-clickhouse-with-ntopng/) |
 | <a href="https://www.nuna.com/" class="favicon">Nuna Inc.</a> | Health Data Analytics | — | — | — | [Talk in English, July 2020](https://youtu.be/GMiXCMFDMow?t=170) |
 | <a href="https://ok.ru" class="favicon">Ok.ru</a> | Social Network | — | 72 servers | 810 TB compressed, 50bn rows/day, 1.5 TB/day | [SmartData conference, October 2021](https://assets.ctfassets.net/oxjq45e8ilak/4JPHkbJenLgZhBGGyyonFP/57472ec6987003ec4078d0941740703b/____________________ClickHouse_______________________.pdf) |
 | <a href="https://omnicomm.ru/" class="favicon">Omnicomm</a> | Transportation Monitoring | — | — | — | [Facebook post, October 2021](https://www.facebook.com/OmnicommTeam/posts/2824479777774500) |
@ -190,5 +193,6 @@ toc_title: Adopters
 | <a href="https://promo.croc.ru/digitalworker" class="favicon">Цифровой Рабочий</a> | Industrial IoT, Analytics | — | — | — | [Blog post in Russian, March 2021](https://habr.com/en/company/croc/blog/548018/) |
 | <a href="https://shop.okraina.ru/" class="favicon">ООО «МПЗ Богородский»</a> | Agriculture | — | — | — | [Article in Russian, November 2020](https://cloud.yandex.ru/cases/okraina) |
 | <a href="https://domclick.ru/" class="favicon">ДомКлик</a> | Real Estate | — | — | — | [Article in Russian, October 2021](https://habr.com/ru/company/domclick/blog/585936/) |
+| <a href="https://magenta-technology.ru/sistema-upravleniya-marshrutami-inkassacii-as-strela/" class="favicon">АС "Стрела"</a> | Transportation | — | — | — | [Job posting, Jan 2022](https://vk.com/topic-111905078_35689124?post=3553) |

 [Original article](https://clickhouse.com/docs/en/introduction/adopters/) <!--hide-->
--- a/docs/en/operations/tips.md
+++ b/docs/en/operations/tips.md
@ -129,6 +129,10 @@ If you want to divide an existing ZooKeeper cluster into two, the correct way is

 Do not run ZooKeeper on the same servers as ClickHouse. Because ZooKeeper is very sensitive for latency and ClickHouse may utilize all available system resources.

+You can have ZooKeeper observers in an ensemble but ClickHouse servers should not interact with observers.
+
+Do not change `minSessionTimeout` setting, large values may affect ClickHouse restart stability.
+
 With the default settings, ZooKeeper is a time bomb:

 > The ZooKeeper server won’t delete files from old snapshots and logs when using the default configuration (see autopurge), and this is the responsibility of the operator.
--- a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md
+++ b/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md
@ -159,7 +159,7 @@ Configuration fields:
 | Tag                                                  | Description                                                                                                                                                                                                                                                                                                                                     | Required |
 |------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|
 | `name`                                               | Column name.                                                                                                                                                                                                                                                                                                                                    | Yes      |
-| `type`                                               | ClickHouse data type: [UInt8](../../../sql-reference/data-types/int-uint.md), [UInt16](../../../sql-reference/data-types/int-uint.md), [UInt32](../../../sql-reference/data-types/int-uint.md), [UInt64](../../../sql-reference/data-types/int-uint.md), [Int8](../../../sql-reference/data-types/int-uint.md), [Int16](../../../sql-reference/data-types/int-uint.md), [Int32](../../../sql-reference/data-types/int-uint.md), [Int64](../../../sql-reference/data-types/int-uint.md), [Float32](../../../sql-reference/data-types/float.md), [Float64](../../../sql-reference/data-types/float.md), [UUID](../../../sql-reference/data-types/uuid.md), [Decimal32](../../../sql-reference/data-types/decimal.md), [Decimal64](../../../sql-reference/data-types/decimal.md), [Decimal128](../../../sql-reference/data-types/decimal.md), [Decimal256](../../../sql-reference/data-types/decimal.md), [String](../../../sql-reference/data-types/string.md), [Array](../../../sql-reference/data-types/array.md).<br/>ClickHouse tries to cast value from dictionary to the specified data type. For example, for MySQL, the field might be `TEXT`, `VARCHAR`, or `BLOB` in the MySQL source table, but it can be uploaded as `String` in ClickHouse.<br/>[Nullable](../../../sql-reference/data-types/nullable.md) is currently supported for [Flat](external-dicts-dict-layout.md#flat), [Hashed](external-dicts-dict-layout.md#dicts-external_dicts_dict_layout-hashed), [ComplexKeyHashed](external-dicts-dict-layout.md#complex-key-hashed), [Direct](external-dicts-dict-layout.md#direct), [ComplexKeyDirect](external-dicts-dict-layout.md#complex-key-direct), [RangeHashed](external-dicts-dict-layout.md#range-hashed), [Polygon](external-dicts-dict-polygon.md), [Cache](external-dicts-dict-layout.md#cache), [ComplexKeyCache](external-dicts-dict-layout.md#complex-key-cache), [SSDCache](external-dicts-dict-layout.md#ssd-cache), [SSDComplexKeyCache](external-dicts-dict-layout.md#complex-key-ssd-cache) dictionaries. In [IPTrie](external-dicts-dict-layout.md#ip-trie) dictionaries `Nullable` types are not supported.       | Yes      |
+| `type`                                               | ClickHouse data type: [UInt8](../../../sql-reference/data-types/int-uint.md), [UInt16](../../../sql-reference/data-types/int-uint.md), [UInt32](../../../sql-reference/data-types/int-uint.md), [UInt64](../../../sql-reference/data-types/int-uint.md), [Int8](../../../sql-reference/data-types/int-uint.md), [Int16](../../../sql-reference/data-types/int-uint.md), [Int32](../../../sql-reference/data-types/int-uint.md), [Int64](../../../sql-reference/data-types/int-uint.md), [Float32](../../../sql-reference/data-types/float.md), [Float64](../../../sql-reference/data-types/float.md), [UUID](../../../sql-reference/data-types/uuid.md), [Decimal32](../../../sql-reference/data-types/decimal.md), [Decimal64](../../../sql-reference/data-types/decimal.md), [Decimal128](../../../sql-reference/data-types/decimal.md), [Decimal256](../../../sql-reference/data-types/decimal.md),[Date](../../../sql-reference/data-types/date.md), [Date32](../../../sql-reference/data-types/date32.md), [DateTime](../../../sql-reference/data-types/datetime.md), [DateTime64](../../../sql-reference/data-types/datetime64.md), [String](../../../sql-reference/data-types/string.md), [Array](../../../sql-reference/data-types/array.md).<br/>ClickHouse tries to cast value from dictionary to the specified data type. For example, for MySQL, the field might be `TEXT`, `VARCHAR`, or `BLOB` in the MySQL source table, but it can be uploaded as `String` in ClickHouse.<br/>[Nullable](../../../sql-reference/data-types/nullable.md) is currently supported for [Flat](external-dicts-dict-layout.md#flat), [Hashed](external-dicts-dict-layout.md#dicts-external_dicts_dict_layout-hashed), [ComplexKeyHashed](external-dicts-dict-layout.md#complex-key-hashed), [Direct](external-dicts-dict-layout.md#direct), [ComplexKeyDirect](external-dicts-dict-layout.md#complex-key-direct), [RangeHashed](external-dicts-dict-layout.md#range-hashed), [Polygon](external-dicts-dict-polygon.md), [Cache](external-dicts-dict-layout.md#cache), [ComplexKeyCache](external-dicts-dict-layout.md#complex-key-cache), [SSDCache](external-dicts-dict-layout.md#ssd-cache), [SSDComplexKeyCache](external-dicts-dict-layout.md#complex-key-ssd-cache) dictionaries. In [IPTrie](external-dicts-dict-layout.md#ip-trie) dictionaries `Nullable` types are not supported.       | Yes      |
 | `null_value`                                         | Default value for a non-existing element.<br/>In the example, it is an empty string. [NULL](../../syntax.md#null-literal) value can be used only for the `Nullable` types (see the previous line with types description).                                                                                                                                                                                                                       | Yes      |
 | `expression`                                         | [Expression](../../../sql-reference/syntax.md#syntax-expressions) that ClickHouse executes on the value.<br/>The expression can be a column name in the remote SQL database. Thus, you can use it to create an alias for the remote column.<br/><br/>Default value: no expression.                                                              | No       |
 | <a name="hierarchical-dict-attr"></a> `hierarchical` | If `true`, the attribute contains the value of a parent key for the current key. See [Hierarchical Dictionaries](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md).<br/><br/>Default value: `false`.                                                                                               | No       |
--- a/docs/en/sql-reference/functions/encoding-functions.md
+++ b/docs/en/sql-reference/functions/encoding-functions.md
@ -93,6 +93,8 @@ For [String](../../sql-reference/data-types/string.md) and [FixedString](../../s

 Values of [Float](../../sql-reference/data-types/float.md) and [Decimal](../../sql-reference/data-types/decimal.md) types are encoded as their representation in memory. As we support little-endian architecture, they are encoded in little-endian. Zero leading/trailing bytes are not omitted.

+Values of [UUID](../data-types/uuid.md) type are encoded as big-endian order string.
+
 **Arguments**

 -   `arg` — A value to convert to hexadecimal. Types: [String](../../sql-reference/data-types/string.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md), [Decimal](../../sql-reference/data-types/decimal.md), [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
@ -147,6 +149,21 @@ Result:
 └──────────────────┘
 ```

+Query:
+
+``` sql
+SELECT lower(hex(toUUID('61f0c404-5cb3-11e7-907b-a6006ad3dba0'))) as uuid_hex
+```
+
+Result:
+
+``` text
+┌─uuid_hex─────────────────────────┐
+│ 61f0c4045cb311e7907ba6006ad3dba0 │
+└──────────────────────────────────┘
+```
+
+
 ## unhex {#unhexstr}

 Performs the opposite operation of [hex](#hex). It interprets each pair of hexadecimal digits (in the argument) as a number and converts it to the byte represented by the number. The return value is a binary string (BLOB).
@ -224,6 +241,8 @@ For [String](../../sql-reference/data-types/string.md) and [FixedString](../../s

 Values of [Float](../../sql-reference/data-types/float.md) and [Decimal](../../sql-reference/data-types/decimal.md) types are encoded as their representation in memory. As we support little-endian architecture, they are encoded in little-endian. Zero leading/trailing bytes are not omitted.

+Values of [UUID](../data-types/uuid.md) type are encoded as big-endian order string.
+
 **Arguments**

 -   `arg` — A value to convert to binary. [String](../../sql-reference/data-types/string.md), [FixedString](../../sql-reference/data-types/fixedstring.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md), [Decimal](../../sql-reference/data-types/decimal.md), [Date](../../sql-reference/data-types/date.md), or [DateTime](../../sql-reference/data-types/datetime.md).
@ -280,6 +299,21 @@ Result:
 └──────────────────────────────────────────────────────────────────┘
 ```

+Query:
+
+``` sql
+SELECT bin(toUUID('61f0c404-5cb3-11e7-907b-a6006ad3dba0')) as bin_uuid
+```
+
+Result:
+
+``` text
+┌─bin_uuid─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+│ 01100001111100001100010000000100010111001011001100010001111001111001000001111011101001100000000001101010110100111101101110100000 │
+└──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+```
+
+
 ## unbin {#unbinstr}

 Interprets each pair of binary digits (in the argument) as a number and converts it to the byte represented by the number. The functions performs the opposite operation to [bin](#bin).
--- a/docs/en/sql-reference/functions/geo/h3.md
+++ b/docs/en/sql-reference/functions/geo/h3.md
@ -156,6 +156,40 @@ Result:
 └─────────────┘
 ```

+## h3EdgeLengthKm {#h3edgelengthkm}
+
+Calculates the average length of the [H3](#h3index) hexagon edge in kilometers.
+
+**Syntax**
+
+``` sql
+h3EdgeLengthKm(resolution)
+```
+
+**Parameter**
+
+-   `resolution` — Index resolution. Type: [UInt8](../../../sql-reference/data-types/int-uint.md). Range: `[0, 15]`.
+
+**Returned values**
+
+-   The average length of the [H3](#h3index) hexagon edge in kilometers. Type: [Float64](../../../sql-reference/data-types/float.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT h3EdgeLengthKm(15) AS edgeLengthKm;
+```
+
+Result:
+
+``` text
+┌─edgeLengthKm─┐
+│  0.000509713 │
+└──────────────┘
+```
+
 ## geoToH3 {#geotoh3}

 Returns [H3](#h3index) point index `(lon, lat)` with specified resolution.
@ -849,4 +883,147 @@ Result:
 └────────────────────┘
 ```

+## h3ExactEdgeLengthM {#h3exactedgelengthm}
+
+Returns the exact edge length of the unidirectional edge represented by the input h3 index in meters.
+
+**Syntax**
+
+``` sql
+h3ExactEdgeLengthM(index)
+```
+
+**Parameter**
+
+-   `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-  Exact edge length in meters.
+
+Type: [Float64](../../../sql-reference/data-types/float.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT h3ExactEdgeLengthM(1310277011704381439) AS exactEdgeLengthM;;
+```
+
+Result:
+
+``` text
+┌───exactEdgeLengthM─┐
+│ 195449.63163407316 │
+└────────────────────┘
+```
+
+## h3ExactEdgeLengthKm {#h3exactedgelengthkm}
+
+Returns the exact edge length of the unidirectional edge represented by the input h3 index in kilometers.
+
+**Syntax**
+
+``` sql
+h3ExactEdgeLengthKm(index)
+```
+
+**Parameter**
+
+-   `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-  Exact edge length in kilometers.
+
+Type: [Float64](../../../sql-reference/data-types/float.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT h3ExactEdgeLengthKm(1310277011704381439) AS exactEdgeLengthKm;;
+```
+
+Result:
+
+``` text
+┌──exactEdgeLengthKm─┐
+│ 195.44963163407317 │
+└────────────────────┘
+```
+
+## h3ExactEdgeLengthRads {#h3exactedgelengthrads}
+
+Returns the exact edge length of the unidirectional edge represented by the input h3 index in radians.
+
+**Syntax**
+
+``` sql
+h3ExactEdgeLengthRads(index)
+```
+
+**Parameter**
+
+-   `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-  Exact edge length in radians.
+
+Type: [Float64](../../../sql-reference/data-types/float.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT h3ExactEdgeLengthRads(1310277011704381439) AS exactEdgeLengthRads;;
+```
+
+Result:
+
+``` text
+┌──exactEdgeLengthRads─┐
+│ 0.030677980118976447 │
+└──────────────────────┘
+```
+
+## h3NumHexagons {#h3numhexagons}
+
+Returns the number of unique H3 indices at the given resolution.
+
+**Syntax**
+
+``` sql
+h3NumHexagons(resolution)
+```
+
+**Parameter**
+
+-   `resolution` — Index resolution. Range: `[0, 15]`. Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-  Number of H3 indices.
+
+Type: [Int64](../../../sql-reference/data-types/int-uint.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT h3NumHexagons(3) AS numHexagons;
+```
+
+Result:
+
+``` text
+┌─numHexagons─┐
+│       41162 │
+└─────────────┘
+```
 [Original article](https://clickhouse.com/docs/en/sql-reference/functions/geo/h3) <!--hide-->
--- a/docs/en/sql-reference/statements/check-table.md
+++ b/docs/en/sql-reference/statements/check-table.md
@ -46,7 +46,7 @@ CHECK TABLE test_table;
 └───────────┴───────────┴─────────┘
 ```

-If `check_query_single_value_result` = 0, the `CHECK TABLE` query shows the general table check status.
+If `check_query_single_value_result` = 1, the `CHECK TABLE` query shows the general table check status.

 ```sql
 SET check_query_single_value_result = 1;
--- a/docs/en/sql-reference/statements/create/table.md
+++ b/docs/en/sql-reference/statements/create/table.md
@ -252,7 +252,6 @@ CREATE TABLE codec_example
 ENGINE = MergeTree()
 ```

-
 ### Encryption Codecs {#create-query-encryption-codecs}

 These codecs don't actually compress data, but instead encrypt data on disk. These are only available when an encryption key is specified by [encryption](../../../operations/server-configuration-parameters/settings.md#server-settings-encryption) settings. Note that encryption only makes sense at the end of codec pipelines, because encrypted data usually can't be compressed in any meaningful way.
@ -260,6 +259,7 @@ These codecs don't actually compress data, but instead encrypt data on disk. The
 Encryption codecs:

 -   `CODEC('AES-128-GCM-SIV')` — Encrypts data with AES-128 in [RFC 8452](https://tools.ietf.org/html/rfc8452) GCM-SIV mode. 
+
 -   `CODEC('AES-256-GCM-SIV')` — Encrypts data with AES-256 in GCM-SIV mode. 

 These codecs use a fixed nonce and encryption is therefore deterministic. This makes it compatible with deduplicating engines such as [ReplicatedMergeTree](../../../engines/table-engines/mergetree-family/replication.md) but has a weakness: when the same data block is encrypted twice, the resulting ciphertext will be exactly the same so an adversary who can read the disk can see this equivalence (although only the equivalence, without getting its content).
@ -269,7 +269,7 @@ These codecs use a fixed nonce and encryption is therefore deterministic. This m

 !!! attention "Attention"
    If you perform a SELECT query mentioning a specific value in an encrypted column (such as in its WHERE clause), the value may appear in [system.query_log](../../../operations/system-tables/query_log.md). You may want to disable the logging.
-    
+
 **Example**

 ```sql
--- a/docs/en/sql-reference/statements/create/user.md
+++ b/docs/en/sql-reference/statements/create/user.md
@ -43,7 +43,7 @@ User host is a host from which a connection to ClickHouse server could be establ
 -   `HOST ANY` — User can connect from any location. This is a default option.
 -   `HOST LOCAL` — User can connect only locally.
 -   `HOST NAME 'fqdn'` — User host can be specified as FQDN. For example, `HOST NAME 'mysite.com'`.
-   `HOST NAME REGEXP 'regexp'` — You can use [pcre](http://www.pcre.org/) regular expressions when specifying user hosts. For example, `HOST NAME REGEXP '.*\.mysite\.com'`.
+-   `HOST REGEXP 'regexp'` — You can use [pcre](http://www.pcre.org/) regular expressions when specifying user hosts. For example, `HOST REGEXP '.*\.mysite\.com'`.
 -   `HOST LIKE 'template'` — Allows you to use the [LIKE](../../../sql-reference/functions/string-search-functions.md#function-like) operator to filter the user hosts. For example, `HOST LIKE '%'` is equivalent to `HOST ANY`, `HOST LIKE '%.mysite.com'` filters all the hosts in the `mysite.com` domain.

 Another way of specifying host is to use `@` syntax following the username. Examples:
--- a/docs/en/sql-reference/statements/use.md
+++ b/docs/en/sql-reference/statements/use.md
@ -3,14 +3,14 @@ toc_priority: 53
 toc_title: USE
 ---

-# USE 语句 {#use}
+# USE Statement {#use}

 ``` sql
 USE db
 ```

-用于设置会话的当前数据库。
+Lets you set the current database for the session.

-如果查询语句中没有在表名前面以加点的方式指明数据库名， 则用当前数据库进行搜索。
+The current database is used for searching for tables if the database is not explicitly defined in the query with a dot before the table name.

-使用 HTTP 协议时无法进行此查询，因为没有会话的概念。
+This query can’t be made when using the HTTP protocol, since there is no concept of a session.
--- a/docs/ko/images/column-oriented.gif
+++ b/docs/ko/images/column-oriented.gif
--- a/docs/ko/images/logo.svg
+++ b/docs/ko/images/logo.svg
@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="54" height="48" markdown="1" viewBox="0 0 9 8"><style>.o{fill:#fc0}.r{fill:red}</style><path d="M0,7 h1 v1 h-1 z" class="r"/><path d="M0,0 h1 v7 h-1 z" class="o"/><path d="M2,0 h1 v8 h-1 z" class="o"/><path d="M4,0 h1 v8 h-1 z" class="o"/><path d="M6,0 h1 v8 h-1 z" class="o"/><path d="M8,3.25 h1 v1.5 h-1 z" class="o"/></svg>
--- a/docs/ko/images/play.png
+++ b/docs/ko/images/play.png
--- a/docs/ko/images/row-oriented.gif
+++ b/docs/ko/images/row-oriented.gif
--- a/docs/ko/index.md
+++ b/docs/ko/index.md
@ -0,0 +1,94 @@
+---
+toc_priority: 0
+toc_title: 목차
+---
+
+# ClickHouse란? {#what-is-clickhouse}
+
+ClickHouse® 는 query의 온라인 분석 처리(OLAP)를 위한 열 지향(column-oriented) 데이터베이스 관리 시스템(DBMS)입니다. 
+
+"보통의" 행 지향(row-oriented) DMBS에서는 데이터가 다음과 같은 순서로 저장됩니다.
+
+| row | WatchID     | JavaEnable | Title              | GoodEvent | EventTime           |
+|-----|-------------|------------|--------------------|-----------|---------------------|
+| #0 | 89354350662 | 1          | Investor Relations | 1         | 2016-05-18 05:19:20 |
+| #1 | 90329509958 | 0          | Contact us         | 1         | 2016-05-18 08:10:20 |
+| #2 | 89953706054 | 1          | Mission            | 1         | 2016-05-18 07:38:00 |
+| #N | …           | …          | …                  | …         | …                   |
+
+즉, 행과 관련된 모든 값들은 물리적으로 나란히 저장됩니다.
+
+행 지향(row-oriented) DMBS의 예시로는 MySQL, Postgres, 그리고 MS SQL 서버 등이 있습니다.
+
+열 지향 (column-oriented) DBMS에서는 데이터가 아래와 같은 방식으로 저장됩니다:
+
+| Row:        | #0                 | #1                 | #2                 | #N |
+|-------------|---------------------|---------------------|---------------------|-----|
+| WatchID:    | 89354350662         | 90329509958         | 89953706054         | …   |
+| JavaEnable: | 1                   | 0                   | 1                   | …   |
+| Title:      | Investor Relations  | Contact us          | Mission             | …   |
+| GoodEvent:  | 1                   | 1                   | 1                   | …   |
+| EventTime:  | 2016-05-18 05:19:20 | 2016-05-18 08:10:20 | 2016-05-18 07:38:00 | …   |
+
+이 예에서는 데이터가 정렬된 순서만을 보여줍니다. 다른 열의 값들은 서로 분리되어 저장되고, 같은 열의 정보들은 함께 저장됩니다.
+
+열 지향(column-oriented) DBMS 의 종류는 Vertica, Paraccel (Actian Matrix and Amazon Redshift), Sybase IQ, Exasol, Infobright, InfiniDB, MonetDB (VectorWise and Actian Vector), LucidDB, SAP HANA, Google Dremel, Google PowerDrill, Druid, 그리고 kdb+ 등이 있습니다.
+
+데이터를 저장하기 위한 서로 다른 순서는 다른 시나리오에 더 적합합니다. 데이터 접근 시나리오는 쿼리가 수행되는 빈도, 비율 및 비율을 나타내거나, 각 쿼리 유형(행, 열 및 바이트)에 대해 읽은 데이터의 양 데이터 읽기와 업데이트 사이의 관계, 데이터의 작업 크기 및 로컬에서 사용되는 방법 트랜잭션이 사용되는지 여부, 트랜잭션이 얼마나 격리되어 있는지, 데이터 복제 및 논리적 무결성에 대한 요구 사항, 각 쿼리 유형에 대한 대기 시간 및 처리량 요구 사항 등이 있습니다.
+
+시스템의 부하가 높을수록 사용 시나리오의 요구 사항에 맞게 시스템 설정을 사용자 지정하는 것이 더 중요하며 이 사용자 지정은 더욱 세분화됩니다. 상당히 다른 시나리오에 똑같이 적합한 시스템은 없습니다. 만약 높은 부하에서 시스템이 넓은 시나리오 집합에 대해 적응한다면 시스템은 모든 시나리오를 모두 제대로 처리하지 못하거나 가능한 시나리오 중 하나 또는 몇 개에 대해서만 잘 작동할 것입니다.
+
+## OLAP 시나리오의 중요 속성들 {#key-properties-of-olap-scenario}
+
+-   요청(request)의 대부분은 읽기 접근에 관한 것입니다.
+-   데이터는 단일 행이 아니라 상당히 큰 일괄 처리(\> 1000개 행)로 업데이트됩니다. 또는 전혀 업데이트되지 않습니다.
+-   데이터는 DB에 추가되지만 수정되지는 않습니다.
+-   읽기의 경우 DB에서 상당히 많은 수의 행이 추출되지만 열은 일부만 추출됩니다.
+-   테이블은 "넓습니다". 이는 열의 수가 많다는 것을 의미합니다.
+-   쿼리는 상대적으로 드뭅니다(일반적으로 서버당 수백 또는 초당 쿼리 미만).
+-   간단한 쿼리의 경우 약 50ms의 대기 시간이 허용됩니다.
+-   열 값은 숫자와 짧은 문자열(예: URL당 60바이트)과 같이 상당히 작습니다
+-   단일 쿼리를 처리할 때 높은 처리량이 필요합니다(서버당 초당 최대 수십억 행).
+-   트랜잭션이 필요하지 않습니다.
+-   데이터 일관성에 대한 요구 사항이 낮습니다.
+-   쿼리당 하나의 큰 테이블이 존재하고 하나를 제외한 모든 테이블은 작습니다.
+-   쿼리 결과가 원본 데이터보다 훨씬 작습니다. 즉, 데이터가 필터링되거나 집계되므로 결과가 단일 서버의 RAM에 꼭 들어맞습니다.
+
+OLAP 시나리오가 다른 일반적인 시나리오(OLTP 또는 키-값 액세스와 같은)와 매우 다르다는 것을 쉽게 알 수 있습니다. 따라서 적절한 성능을 얻으려면 분석 쿼리를 처리하기 위해 OLTP 또는 키-값 DB를 사용하는 것은 의미가 없습니다. 예를 들어 분석에 MongoDB나 Redis를 사용하려고 하면 OLAP 데이터베이스에 비해 성능이 매우 저하됩니다.
+
+## 왜 열 지향 데이터베이스가 OLAP 시나리오에 적합한가{#why-column-oriented-databases-work-better-in-the-olap-scenario}
+
+열 지향(column-oriented) 데이터베이스는 OLAP 시나리오에 더 적합합니다. 대부분의 쿼리를 처리하는 데 있어서 행 지향(row-oriented) 데이터베이스보다 100배 이상 빠릅니다. 그 이유는 아래에 자세히 설명되어 있지만 사실은 시각적으로 더 쉽게 설명할 수 있습니다.
+
+**행 지향 DBMS**
+
+![Row-oriented](images/row-oriented.gif#)
+
+**열 지향 DBMS**
+
+![Column-oriented](images/column-oriented.gif#)
+
+차이가 보이시나요?
+
+### 입출력 {#inputoutput}
+
+1.  분석 쿼리의 경우 적은 수의 테이블 열만 읽어야 합니다. 열 지향 데이터베이스에서는 필요한 데이터만 읽을 수 있습니다. 예를 들어 100개 중 5개의 열이 필요한 경우 I/O가 20배 감소할 것으로 예상할 수 있습니다. 
+2.  데이터는 패킷으로 읽히므로 압축하기가 더 쉽습니다. 열의 데이터도 압축하기 쉽습니다. 이것은 I/O의 볼륨을 더욱 감소시킵니다.
+3.  감소된 I/O로 인해 시스템 캐시에 더 많은 데이터가 들어갑니다.
+
+예를 들어, "각 광고 플랫폼에 대한 레코드 수 계산" 쿼리는 압축되지 않은 1바이트를 차지하는 하나의 "광고 플랫폼 ID" 열을 읽어야 합니다. 트래픽의 대부분이 광고 플랫폼에서 발생하지 않은 경우 이 열의 최소 10배 압축을 기대할 수 있습니다. 빠른 압축 알고리즘을 사용하면 초당 최소 몇 기가바이트의 압축되지 않은 데이터의 속도로 데이터 압축 해제가 가능합니다. 즉, 이 쿼리는 단일 서버에서 초당 약 수십억 행의 속도로 처리될 수 있습니다. 이 속도는 정말 실제로 달성됩니다.
+
+### CPU {#cpu}
+
+쿼리를 수행하려면 많은 행을 처리해야 하므로 별도의 행이 아닌 전체 벡터에 대한 모든 연산을 디스패치하거나 쿼리 엔진을 구현하여 디스패치 비용이 거의 들지 않습니다. 반쯤 괜찮은 디스크 하위 시스템에서 이렇게 하지 않으면 쿼리 인터프리터가 불가피하게 CPU를 정지시킵니다. 데이터를 열에 저장하고 가능한 경우 열별로 처리하는 것이 좋습니다.
+
+이를 수행하기위한 두가지 방법이 있습니다.
+
+1.  벡터 엔진. 모든 연산은 별도의 값 대신 벡터에 대해 작성됩니다. 즉, 작업을 자주 호출할 필요가 없으며 파견 비용도 무시할 수 있습니다. 작업 코드에는 최적화된 내부 주기가 포함되어 있습니다.
+2.  코드 생성. 쿼리에 대해 생성된 코드에는 모든 간접 호출이 있습니다.
+
+이것은 단순한 쿼리를 실행할 때 의미가 없기 때문에 "일반" 데이터베이스에서는 수행되지 않습니다. 그러나 예외가 있습니다. 예를 들어 MemSQL은 코드 생성을 사용하여 SQL 쿼리를 처리할 때 대기 시간을 줄입니다. (비교되게, 분석 DBMS는 대기 시간이 아닌 처리량 최적화가 필요합니다.)
+
+CPU 효율성을 위해 쿼리 언어는 선언적(SQL 또는 MDX)이거나 최소한 벡터(J, K)여야 합니다. 쿼리는 최적화를 허용하는 암시적 루프만 포함해야 합니다.
+
+{## [원문](https://clickhouse.com/docs/en/) ##}
--- a/docs/ru/operations/server-configuration-parameters/settings.md
+++ b/docs/ru/operations/server-configuration-parameters/settings.md
@ -105,7 +105,7 @@ ClickHouse проверяет условия для `min_part_size` и `min_part
 ```xml
 <encryption_codecs>
    <aes_128_gcm_siv>
-        <key_hex from_env="KEY"></key_hex>
+        <key_hex from_env="ENVVAR"></key_hex>
    </aes_128_gcm_siv>
 </encryption_codecs>
 ```
@ -118,7 +118,7 @@ ClickHouse проверяет условия для `min_part_size` и `min_part
 <encryption_codecs>
    <aes_128_gcm_siv>
        <key_hex id="0">00112233445566778899aabbccddeeff</key_hex>
-        <key_hex id="1" from_env=".."></key_hex>
+        <key_hex id="1" from_env="ENVVAR"></key_hex>
        <current_key_id>1</current_key_id>
    </aes_128_gcm_siv>
 </encryption_codecs>
--- a/docs/ru/sql-reference/functions/geo/h3.md
+++ b/docs/ru/sql-reference/functions/geo/h3.md
@ -4,11 +4,11 @@ toc_title: "Функции для работы с индексами H3"

 # Функции для работы с индексами H3 {#h3index}

-[H3](https://eng.uber.com/h3/) — это система геокодирования, которая делит поверхность Земли на равные шестигранные ячейки. Система поддерживает иерархию (вложенность) ячеек, т.е. каждый "родительский" шестигранник может быть поделен на семь одинаковых вложенных "дочерних" шестигранников, и так далее.
+[H3](https://eng.uber.com/h3/) — это система геокодирования, которая делит поверхность Земли на равные шестиугольные ячейки. Система поддерживает иерархию (вложенность) ячеек, т.е. каждый "родительский" шестиугольник может быть поделен на семь одинаковых вложенных "дочерних" шестиугольников, и так далее.

 Уровень вложенности называется "разрешением" и может принимать значение от `0` до `15`, где `0` соответствует "базовым" ячейкам самого верхнего уровня (наиболее крупным).

-Для каждой точки, имеющей широту и долготу, можно получить 64-битный индекс H3, соответствующий номеру шестигранной ячейки, где эта точка находится.
+Для каждой точки, имеющей широту и долготу, можно получить 64-битный индекс H3, соответствующий номеру шестриугольной ячейки, где эта точка находится.

 Индексы H3 используются, в основном, для геопозиционирования и расчета расстояний.

@ -24,7 +24,7 @@ h3IsValid(h3index)

 **Параметр**

-   `h3index` — идентификатор шестигранника. Тип данных: [UInt64](../../../sql-reference/data-types/int-uint.md).
+-   `h3index` — идентификатор шестриугольника. Тип данных: [UInt64](../../../sql-reference/data-types/int-uint.md).

 **Возвращаемые значения**

@ -61,7 +61,7 @@ h3GetResolution(h3index)

 **Параметр**

-   `h3index` — идентификатор шестигранника. Тип данных: [UInt64](../../../sql-reference/data-types/int-uint.md).
+-   `h3index` — идентификатор шестиугольника. Тип данных: [UInt64](../../../sql-reference/data-types/int-uint.md).

 **Возвращаемые значения**

@ -88,7 +88,7 @@ SELECT h3GetResolution(639821929606596015) AS resolution;

 ## h3EdgeAngle {#h3edgeangle}

-Рассчитывает средний размер стороны шестигранника [H3](#h3index) в градусах.
+Рассчитывает средний размер стороны шестиугольника [H3](#h3index) в градусах.

 **Синтаксис**

@ -102,7 +102,7 @@ h3EdgeAngle(resolution)

 **Возвращаемое значение**

-   Средняя длина стороны шестигранника [H3](#h3index) в градусах. Тип данных: [Float64](../../../sql-reference/data-types/float.md).
+-   Средняя длина стороны шестиугольника [H3](#h3index) в градусах. Тип данных: [Float64](../../../sql-reference/data-types/float.md).

 **Пример**

@ -122,7 +122,7 @@ SELECT h3EdgeAngle(10) AS edgeAngle;

 ## h3EdgeLengthM {#h3edgelengthm}

-Рассчитывает средний размер стороны шестигранника [H3](#h3index) в метрах.
+Рассчитывает средний размер стороны шестиугольника [H3](#h3index) в метрах.

 **Синтаксис**

@ -136,7 +136,7 @@ h3EdgeLengthM(resolution)

 **Возвращаемое значение**

-   Средняя длина стороны шестигранника H3 в метрах, тип — [Float64](../../../sql-reference/data-types/float.md).
+-   Средняя длина стороны шестиугольника H3 в метрах, тип — [Float64](../../../sql-reference/data-types/float.md).

 **Пример**

@ -172,7 +172,7 @@ geoToH3(lon, lat, resolution)

 **Возвращаемые значения**

-   Порядковый номер шестигранника.
+-   Порядковый номер шестиугольника.
 -   0 в случае ошибки.

 Тип данных: [UInt64](../../../sql-reference/data-types/int-uint.md).
@ -195,7 +195,7 @@ SELECT geoToH3(37.79506683, 55.71290588, 15) AS h3Index;

 ## h3ToGeo {#h3togeo}

-Возвращает географические координаты долготы и широты, соответствующие указанному [H3](#h3index)-индексу.
+Возвращает географические координаты долготы и широты центра шестиугольника, соответствующие указанному [H3](#h3index)-индексу.

 **Синтаксис**

@ -265,7 +265,7 @@ SELECT h3ToGeoBoundary(644325524701193974) AS coordinates;

 ## h3kRing {#h3kring}

-Возвращает [H3](#h3index)-индексы шестигранников в радиусе `k` от данного в произвольном порядке.
+Возвращает [H3](#h3index)-индексы шестиугольника в радиусе `k` от данного в произвольном порядке.

 **Синтаксис**

@ -275,7 +275,7 @@ h3kRing(h3index, k)

 **Аргументы**

-   `h3index` — идентификатор шестигранника. Тип данных: [UInt64](../../../sql-reference/data-types/int-uint.md).
+-   `h3index` — идентификатор шестиугольника. Тип данных: [UInt64](../../../sql-reference/data-types/int-uint.md).
 -   `k` — радиус. Тип данных: [целое число](../../../sql-reference/data-types/int-uint.md)

 **Возвращаемые значения**
@ -607,7 +607,7 @@ h3IsResClassIII(index)

 **Параметр**

-   `index` — порядковый номер шестигранника. Тип: [UInt64](../../../sql-reference/data-types/int-uint.md).
+-   `index` — порядковый номер шестиугольника. Тип: [UInt64](../../../sql-reference/data-types/int-uint.md).

 **Возвращаемые значения**

@ -644,7 +644,7 @@ h3IsPentagon(index)

 **Параметр**

-   `index` — порядковый номер шестигранника. Тип: [UInt64](../../../sql-reference/data-types/int-uint.md).
+-   `index` — порядковый номер шестиугольника. Тип: [UInt64](../../../sql-reference/data-types/int-uint.md).

 **Возвращаемые значения**

--- a/docs/ru/sql-reference/functions/logical-functions.md
+++ b/docs/ru/sql-reference/functions/logical-functions.md
@ -70,7 +70,7 @@ SELECT and(NULL, 1, 10, -2);
 **Синтаксис**

 ``` sql
-and(val1, val2...)
+or(val1, val2...)
 ```

 Чтобы вычислять функцию `or` по короткой схеме, используйте настройку [short_circuit_function_evaluation](../../operations/settings/settings.md#short-circuit-function-evaluation). Если настройка включена, то выражение `vali` вычисляется только для строк, где условие `((NOT val1) AND (NOT val2) AND ... AND (NOT val{i-1}))` верно. Например, при выполнении запроса `SELECT or(number = 0, intDiv(1, number) != 0) FROM numbers(10)` не будет сгенерировано исключение из-за деления на ноль.
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`Subproject commit bc6d493a2f64ed1fc1c4c4b4294a542a04e04217`
				`@ -0,0 +1 @@`
				`Subproject commit 5591f91f5e748cba8fb9ef81564176feae774853`
				`@ -0,0 +1 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" width="54" height="48" markdown="1" viewBox="0 0 9 8"><style>.o{fill:#fc0}.r{fill:red}</style><path d="M0,7 h1 v1 h-1 z" class="r"/><path d="M0,0 h1 v7 h-1 z" class="o"/><path d="M2,0 h1 v8 h-1 z" class="o"/><path d="M4,0 h1 v8 h-1 z" class="o"/><path d="M6,0 h1 v8 h-1 z" class="o"/><path d="M8,3.25 h1 v1.5 h-1 z" class="o"/></svg>`