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

2024-11-21 23:21:59 +00:00 · 2022-07-05 07:18:13 -07:00 · 2022-07-05 07:18:13 -07:00 · 93e2921edb
commit 93e2921edb
parent 31cae5e2a6 356786f0c6
957 changed files with 11521 additions and 5113 deletions
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@ -643,7 +643,7 @@ jobs:
          # shellcheck disable=SC2046
          docker rm -f $(docker ps -a -q) ||:
          sudo rm -fr "$TEMP_PATH" "$CACHES_PATH"
-  BuilderBinTidy:
+  BuilderBinClangTidy:
    needs: [DockerHubPush]
    runs-on: [self-hosted, builder]
    steps:
@ -1011,7 +1011,7 @@ jobs:
      - BuilderBinFreeBSD
      # - BuilderBinGCC
      - BuilderBinPPC64
-      - BuilderBinTidy
+      - BuilderBinClangTidy
      - BuilderDebSplitted
    runs-on: [self-hosted, style-checker]
    steps:
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@ -707,7 +707,7 @@ jobs:
          # shellcheck disable=SC2046
          docker rm -f $(docker ps -a -q) ||:
          sudo rm -fr "$TEMP_PATH" "$CACHES_PATH"
-  BuilderBinTidy:
+  BuilderBinClangTidy:
    needs: [DockerHubPush, FastTest]
    runs-on: [self-hosted, builder]
    steps:
@ -1065,7 +1065,7 @@ jobs:
      - BuilderBinFreeBSD
      # - BuilderBinGCC
      - BuilderBinPPC64
-      - BuilderBinTidy
+      - BuilderBinClangTidy
      - BuilderDebSplitted
    runs-on: [self-hosted, style-checker]
    if: ${{ success() || failure() }}
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -21,6 +21,9 @@ jobs:
        EOF
    - name: Check out repository code
      uses: actions/checkout@v2
+      with:
+        # Always use the most recent script version
+        ref: master
    - name: Download packages and push to Artifactory
      run: |
        rm -rf "$TEMP_PATH" && mkdir -p "$TEMP_PATH"
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -34,7 +34,6 @@
 * Add two new settings `input_format_csv_skip_first_lines/input_format_tsv_skip_first_lines` to allow skipping specified number of lines in the beginning of the file in CSV/TSV formats. [#37537](https://github.com/ClickHouse/ClickHouse/pull/37537) ([Kruglov Pavel](https://github.com/Avogar)).
 * `showCertificate` function shows current server's SSL certificate. [#37540](https://github.com/ClickHouse/ClickHouse/pull/37540) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
 * HTTP source for Data Dictionaries in Named Collections is supported. [#37581](https://github.com/ClickHouse/ClickHouse/pull/37581) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* Added a new window function `nonNegativeDerivative(metric_column, timestamp_column[, INTERVAL x SECOND])`. [#37628](https://github.com/ClickHouse/ClickHouse/pull/37628) ([Andrey Zvonov](https://github.com/zvonand)).
 * Implemented changing the comment for `ReplicatedMergeTree` tables. [#37416](https://github.com/ClickHouse/ClickHouse/pull/37416) ([Vasily Nemkov](https://github.com/Enmk)).
 * Added `SYSTEM UNFREEZE` query that deletes the whole backup regardless if the corresponding table is deleted or not. [#36424](https://github.com/ClickHouse/ClickHouse/pull/36424) ([Vadim Volodin](https://github.com/PolyProgrammist)).

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -252,10 +252,10 @@ else ()
 endif ()

 # Optionally split binaries and debug symbols.
-option(INSTALL_STRIPPED_BINARIES "Split binaries and debug symbols" OFF)
-if (INSTALL_STRIPPED_BINARIES)
+option(SPLIT_DEBUG_SYMBOLS "Split binaries and debug symbols" OFF)
+if (SPLIT_DEBUG_SYMBOLS)
    message(STATUS "Will split binaries and debug symbols")
-    set(STRIPPED_BINARIES_OUTPUT "stripped" CACHE STRING "A separate directory for stripped information")
+    set(SPLITTED_DEBUG_SYMBOLS_DIR "stripped" CACHE STRING "A separate directory for stripped information")
 endif()

 cmake_host_system_information(RESULT AVAILABLE_PHYSICAL_MEMORY QUERY AVAILABLE_PHYSICAL_MEMORY) # Not available under freebsd
--- a/README.md
+++ b/README.md
@ -15,5 +15,8 @@ ClickHouse® is an open-source column-oriented database management system that a
 * [Contacts](https://clickhouse.com/company/#contact) can help to get your questions answered if there are any.

 ## Upcoming events
-* [Paris Meetup](https://www.meetup.com/clickhouse-france-user-group/events/286304312/) Please join us for an evening of talks (in English), food and discussion. Featuring talks of ClickHouse in production and at least one on the deep internals of ClickHouse itself.
 * [v22.7 Release Webinar](https://clickhouse.com/company/events/v22-7-release-webinar/) Original creator, co-founder, and CTO of ClickHouse Alexey Milovidov will walk us through the highlights of the release, provide live demos, and share vision into what is coming in the roadmap.
+* [ClickHouse Meetup at the Cloudflare office in London](https://www.meetup.com/clickhouse-london-user-group/events/286891586/) ClickHouse meetup at the Cloudflare office space in central London
+* [ClickHouse Meetup at the Metoda office in Munich](https://www.meetup.com/clickhouse-meetup-munich/events/286891667/) ClickHouse meetup at the Metoda office in Munich
+
+
--- a/base/base/BorrowedObjectPool.h
+++ b/base/base/BorrowedObjectPool.h
@ -89,7 +89,7 @@ public:
    inline void returnObject(T && object_to_return)
    {
        {
-            std::lock_guard<std::mutex> lock(objects_mutex);
+            std::lock_guard lock(objects_mutex);

            objects.emplace_back(std::move(object_to_return));
            --borrowed_objects_size;
@ -107,14 +107,14 @@ public:
    /// Allocated objects size by the pool. If allocatedObjectsSize == maxSize then pool is full.
    inline size_t allocatedObjectsSize() const
    {
-        std::unique_lock<std::mutex> lock(objects_mutex);
+        std::lock_guard lock(objects_mutex);
        return allocated_objects_size;
    }

    /// Returns allocatedObjectsSize == maxSize
    inline bool isFull() const
    {
-        std::unique_lock<std::mutex> lock(objects_mutex);
+        std::lock_guard lock(objects_mutex);
        return allocated_objects_size == max_size;
    }

@ -122,7 +122,7 @@ public:
    /// Then client will wait during borrowObject function call.
    inline size_t borrowedObjectsSize() const
    {
-        std::unique_lock<std::mutex> lock(objects_mutex);
+        std::lock_guard lock(objects_mutex);
        return borrowed_objects_size;
    }

--- a/base/base/argsToConfig.h
+++ b/base/base/argsToConfig.h
@ -4,7 +4,7 @@

 namespace Poco::Util
 {
-class LayeredConfiguration;
+class LayeredConfiguration; // NOLINT(cppcoreguidelines-virtual-class-destructor)
 }

 /// Import extra command line arguments to configuration. These are command line arguments after --.
--- a/base/base/defines.h
+++ b/base/base/defines.h
@ -124,21 +124,37 @@
    #endif
 #endif

-// Macros for Clang Thread Safety Analysis (TSA). They can be safely ignored by other compilers.
-// Feel free to extend, but please stay close to https://clang.llvm.org/docs/ThreadSafetyAnalysis.html#mutexheader
+/// Macros for Clang Thread Safety Analysis (TSA). They can be safely ignored by other compilers.
+/// Feel free to extend, but please stay close to https://clang.llvm.org/docs/ThreadSafetyAnalysis.html#mutexheader
 #if defined(__clang__)
-#    define TSA_GUARDED_BY(...) __attribute__((guarded_by(__VA_ARGS__)))                       // data is protected by given capability
-#    define TSA_PT_GUARDED_BY(...) __attribute__((pt_guarded_by(__VA_ARGS__)))                 // pointed-to data is protected by the given capability
-#    define TSA_REQUIRES(...) __attribute__((requires_capability(__VA_ARGS__)))                // thread needs exclusive possession of given capability
-#    define TSA_REQUIRES_SHARED(...) __attribute__((requires_shared_capability(__VA_ARGS__)))  // thread needs shared possession of given capability
-#    define TSA_ACQUIRED_AFTER(...) __attribute__((acquired_after(__VA_ARGS__)))               // annotated lock must be locked after given lock
-#    define TSA_NO_THREAD_SAFETY_ANALYSIS __attribute__((no_thread_safety_analysis))           // disable TSA for a function
+#    define TSA_GUARDED_BY(...) __attribute__((guarded_by(__VA_ARGS__)))                       /// data is protected by given capability
+#    define TSA_PT_GUARDED_BY(...) __attribute__((pt_guarded_by(__VA_ARGS__)))                 /// pointed-to data is protected by the given capability
+#    define TSA_REQUIRES(...) __attribute__((requires_capability(__VA_ARGS__)))                /// thread needs exclusive possession of given capability
+#    define TSA_REQUIRES_SHARED(...) __attribute__((requires_shared_capability(__VA_ARGS__)))  /// thread needs shared possession of given capability
+#    define TSA_ACQUIRED_AFTER(...) __attribute__((acquired_after(__VA_ARGS__)))               /// annotated lock must be locked after given lock
+#    define TSA_NO_THREAD_SAFETY_ANALYSIS __attribute__((no_thread_safety_analysis))           /// disable TSA for a function
+
+/// Macros for suppressing TSA warnings for specific reads/writes (instead of suppressing it for the whole function)
+/// Consider adding a comment before using these macros.
+#   define TSA_SUPPRESS_WARNING_FOR_READ(x) [&]() TSA_NO_THREAD_SAFETY_ANALYSIS -> const auto & { return (x); }()
+#   define TSA_SUPPRESS_WARNING_FOR_WRITE(x) [&]() TSA_NO_THREAD_SAFETY_ANALYSIS -> auto & { return (x); }()
+
+/// This macro is useful when only one thread writes to a member
+/// and you want to read this member from the same thread without locking a mutex.
+/// It's safe (because no concurrent writes are possible), but TSA generates a warning.
+/// (Seems like there's no way to verify it, but it makes sense to distinguish it from TSA_SUPPRESS_WARNING_FOR_READ for readability)
+#   define TSA_READ_ONE_THREAD(x) TSA_SUPPRESS_WARNING_FOR_READ(x)
+
 #else
 #    define TSA_GUARDED_BY(...)
 #    define TSA_PT_GUARDED_BY(...)
 #    define TSA_REQUIRES(...)
 #    define TSA_REQUIRES_SHARED(...)
 #    define TSA_NO_THREAD_SAFETY_ANALYSIS
+
+#    define TSA_SUPPRESS_WARNING_FOR_READ(x)
+#    define TSA_SUPPRESS_WARNING_FOR_WRITE(x)
+#    define TSA_READ_ONE_THREAD(x)
 #endif

 /// A template function for suppressing warnings about unused variables or function results.
--- a/base/base/demangle.h
+++ b/base/base/demangle.h
@ -27,6 +27,6 @@ struct FreeingDeleter
    }
 };

-typedef std::unique_ptr<char, FreeingDeleter> DemangleResult;
+using DemangleResult = std::unique_ptr<char, FreeingDeleter>;

 DemangleResult tryDemangle(const char * name);
--- a/base/base/strong_typedef.h
+++ b/base/base/strong_typedef.h
@ -23,10 +23,10 @@ public:
    constexpr StrongTypedef(): t() {}

    constexpr StrongTypedef(const Self &) = default;
-    constexpr StrongTypedef(Self &&) = default;
+    constexpr StrongTypedef(Self &&) noexcept(std::is_nothrow_move_constructible_v<T>) = default;

    Self & operator=(const Self &) = default;
-    Self & operator=(Self &&) = default;
+    Self & operator=(Self &&) noexcept(std::is_nothrow_move_assignable_v<T>)= default;

    template <class Enable = typename std::is_copy_assignable<T>::type>
    Self & operator=(const T & rhs) { t = rhs; return *this;}
--- a/base/base/time.h
+++ b/base/base/time.h
@ -1,6 +1,6 @@
 #pragma once

-#include <time.h>
+#include <ctime>

 #if defined (OS_DARWIN) || defined (OS_SUNOS)
 #    define CLOCK_MONOTONIC_COARSE CLOCK_MONOTONIC
--- a/base/base/unaligned.h
+++ b/base/base/unaligned.h
@ -1,6 +1,6 @@
 #pragma once

-#include <string.h>
+#include <cstring>
 #include <type_traits>


--- a/base/base/wide_integer.h
+++ b/base/base/wide_integer.h
@ -27,6 +27,8 @@
 #include <type_traits>
 #include <initializer_list>

+// NOLINTBEGIN(*)
+
 namespace wide
 {
 template <size_t Bits, typename Signed>
@ -257,4 +259,7 @@ struct hash<wide::integer<Bits, Signed>>;

 }

+// NOLINTEND(*)
+
 #include "wide_integer_impl.h"
+
--- a/base/base/wide_integer_impl.h
+++ b/base/base/wide_integer_impl.h
@ -15,6 +15,8 @@
 #include <boost/multiprecision/cpp_bin_float.hpp>
 #include <boost/math/special_functions/fpclassify.hpp>

+// NOLINTBEGIN(*)
+
 /// Use same extended double for all platforms
 #if (LDBL_MANT_DIG == 64)
 #define CONSTEXPR_FROM_DOUBLE constexpr
@ -1478,3 +1480,5 @@ struct hash<wide::integer<Bits, Signed>>
 };

 }
+
+// NOLINTEND(*)
--- a/base/pcg-random/pcg_extras.hpp
+++ b/base/pcg-random/pcg_extras.hpp
@ -90,6 +90,7 @@
    #define PCG_EMULATED_128BIT_MATH 1
 #endif

+// NOLINTBEGIN(*)

 namespace pcg_extras {

@ -552,4 +553,6 @@ std::ostream& operator<<(std::ostream& out, printable_typename<T>) {

 } // namespace pcg_extras

+// NOLINTEND(*)
+
 #endif // PCG_EXTRAS_HPP_INCLUDED
--- a/base/pcg-random/pcg_random.hpp
+++ b/base/pcg-random/pcg_random.hpp
@ -113,6 +113,8 @@

 #include "pcg_extras.hpp"

+// NOLINTBEGIN(*)
+
 namespace DB
 {
    struct PcgSerializer;
@ -1777,4 +1779,6 @@ typedef pcg_engines::ext_oneseq_xsh_rs_64_32<14,32,true>    pcg32_k16384_fast;
    #pragma warning(default:4146)
 #endif

+// NOLINTEND(*)
+
 #endif // PCG_RAND_HPP_INCLUDED
--- a/base/widechar_width/widechar_width.h
+++ b/base/widechar_width/widechar_width.h
@ -16,6 +16,8 @@
 #include <cstddef>
 #include <cstdint>

+// NOLINTBEGIN(*)
+
 /* Special width values */
 enum {
  widechar_nonprint = -1,     // The character is not printable.
@ -518,4 +520,6 @@ inline int widechar_wcwidth(wchar_t c) {
    return 1;
 }

+// NOLINTEND(*)
+
 #endif // WIDECHAR_WIDTH_H
--- a/benchmark/hardware.sh
+++ b/benchmark/hardware.sh
@ -40,10 +40,16 @@ if [[ $(./clickhouse client --query "EXISTS hits") == '1' && $(./clickhouse clie
    echo "Dataset already downloaded"
 else
    echo "Will download the dataset"
+    if [ "`uname`" = "Darwin" ]
+    then
+    ./clickhouse client --receive_timeout 1000 --max_insert_threads $(sysctl -n hw.ncpu) --progress --query "
+        CREATE OR REPLACE TABLE hits ENGINE = MergeTree PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate, intHash32(UserID), EventTime)
+        AS SELECT * FROM url('https://datasets.clickhouse.com/hits/native/hits_100m_obfuscated_{0..255}.native.zst')"
+    else
    ./clickhouse client --receive_timeout 1000 --max_insert_threads $(nproc || 4) --progress --query "
        CREATE OR REPLACE TABLE hits ENGINE = MergeTree PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate, intHash32(UserID), EventTime)
        AS SELECT * FROM url('https://datasets.clickhouse.com/hits/native/hits_100m_obfuscated_{0..255}.native.zst')"
-
+    fi
    ./clickhouse client --query "SELECT 'The dataset size is: ', count() FROM hits"
 fi

@ -63,8 +69,8 @@ QUERY_NUM=1

 cat "$QUERIES_FILE" | sed "s/{table}/hits/g" | while read query; do
    sync
-    if [ "${OS}" = "Darwin" ] 
-    then 
+    if [ "`uname`" = "Darwin" ]
+    then
        sudo purge > /dev/null
    else
        echo 3 | sudo tee /proc/sys/vm/drop_caches >/dev/null
@ -90,8 +96,8 @@ echo

 touch {cpu_model,cpu,df,memory,memory_total,blk,mdstat,instance}.txt

-if [ "${OS}" = "Darwin" ] 
-then 
+if [ "`uname`" = "Darwin" ]
+then
    echo '----Version, build id-----------'
    ./clickhouse local --query "SELECT format('Version: {}', version())"
    ./clickhouse local --query "SELECT format('The number of threads is: {}', value) FROM system.settings WHERE name = 'max_threads'" --output-format TSVRaw
@ -211,4 +217,31 @@ TO benchmark;
 GRANT INSERT ON benchmark_runs TO benchmark;
 GRANT INSERT ON benchmark_results TO benchmark;

+Example query:
+
+SELECT
+    cpu_model,
+    threads,
+    instance,
+    k
+FROM
+(
+    SELECT
+        run_id,
+        exp(avg(log(adjusted_time / best_time))) AS k
+    FROM
+    (
+        WITH greatest(time, 0.01) AS adjusted_time
+        SELECT
+            run_id,
+            adjusted_time,
+            min(adjusted_time) OVER (PARTITION BY query_num, try_num) AS best_time
+        FROM benchmark_results
+        WHERE try_num > 1
+    )
+    GROUP BY run_id
+    ORDER BY k ASC
+) AS t
+INNER JOIN benchmark_runs USING (run_id)
+
 ////
--- a/cmake/split_debug_symbols.cmake
+++ b/cmake/split_debug_symbols.cmake
@ -1,4 +1,4 @@
-macro(clickhouse_strip_binary)
+macro(clickhouse_split_debug_symbols)
   set(oneValueArgs TARGET DESTINATION_DIR BINARY_PATH)

   cmake_parse_arguments(STRIP "" "${oneValueArgs}" "" ${ARGN})
--- a/contrib/libgsasl-cmake/CMakeLists.txt
+++ b/contrib/libgsasl-cmake/CMakeLists.txt
@ -113,4 +113,8 @@ if (TARGET ch_contrib::krb5)
    target_compile_definitions(_gsasl PRIVATE HAVE_GSSAPI_H=1 USE_GSSAPI=1)
 endif()

+if (TARGET OpenSSL::SSL)
+    target_link_libraries(_gsasl PRIVATE OpenSSL::Crypto OpenSSL::SSL)
+endif()
+
 add_library(ch_contrib::gsasl ALIAS _gsasl)
--- a/contrib/libprotobuf-mutator
+++ b/contrib/libprotobuf-mutator
@ -1 +1 @@
-Subproject commit ffd86a32874e5c08a143019aad1aaf0907294c9f
+Subproject commit a304ec48dcf15d942607032151f7e9ee504b5dcf
--- a/contrib/libprotobuf-mutator-cmake/CMakeLists.txt
+++ b/contrib/libprotobuf-mutator-cmake/CMakeLists.txt
@ -14,8 +14,11 @@ add_library(_protobuf-mutator
    ${LIBRARY_DIR}/src/text_format.cc
    ${LIBRARY_DIR}/src/utf8_fix.cc)

-target_include_directories(_protobuf-mutator BEFORE INTERFACE "${LIBRARY_DIR}")
-target_include_directories(_protobuf-mutator BEFORE INTERFACE "${ClickHouse_SOURCE_DIR}/contrib/protobuf/src")
+# codegen_select_fuzzer includes <libfuzzer/libfuzzer_macro.h>...
+target_include_directories(_protobuf-mutator BEFORE PUBLIC "${LIBRARY_DIR}/src")
+# ... which includes <port/protobuf.h>
+target_include_directories(_protobuf-mutator BEFORE PUBLIC "${LIBRARY_DIR}")
+target_include_directories(_protobuf-mutator BEFORE PUBLIC "${ClickHouse_SOURCE_DIR}/contrib/protobuf/src")

 target_link_libraries(_protobuf-mutator ch_contrib::protobuf)

--- a/contrib/mariadb-connector-c
+++ b/contrib/mariadb-connector-c
@ -1 +1 @@
-Subproject commit 5f4034a3a6376416504f17186c55fe401c6d8e5e
+Subproject commit e39608998f5f6944ece9ec61f48e9172ec1de660
--- a/contrib/poco
+++ b/contrib/poco
@ -1 +1 @@
-Subproject commit de35b9fd72b57127abdc3a5beaf0e320d767e356
+Subproject commit 9fec8e11dbb6a352e1cfba8cc9e23ebd7fb77310
--- a/contrib/poco-cmake/XML/CMakeLists.txt
+++ b/contrib/poco-cmake/XML/CMakeLists.txt
@ -11,6 +11,7 @@ add_library (_poco_xml_expat ${SRCS_EXPAT})
 add_library (Poco::XML::Expat ALIAS _poco_xml_expat)

 target_include_directories (_poco_xml_expat PUBLIC "${LIBRARY_DIR}/XML/include")
+target_include_directories (_poco_xml_expat PRIVATE "${LIBRARY_DIR}/Foundation/include")

 # Poco::XML

--- a/contrib/simdjson
+++ b/contrib/simdjson
@ -1 +1 @@
-Subproject commit de196dd7a3a16e4056b0551ffa3b85c2f52581e1
+Subproject commit 1075e8609c4afa253162d441437af929c29e31bb
--- a/docker/keeper/Dockerfile
+++ b/docker/keeper/Dockerfile
@ -67,7 +67,7 @@ RUN arch=${TARGETARCH:-amd64} \
    && chmod ugo+Xrw -R /var/lib/clickhouse /var/log/clickhouse-keeper /etc/clickhouse-keeper


-EXPOSE 2181 10181 44444
+EXPOSE 2181 10181 44444 9181

 VOLUME /var/lib/clickhouse /var/log/clickhouse-keeper /etc/clickhouse-keeper

--- a/docker/keeper/entrypoint.sh
+++ b/docker/keeper/entrypoint.sh
@ -31,7 +31,7 @@ else
    DO_CHOWN=0
 fi

-KEEPER_CONFIG="${KEEPER_CONFIG:-/etc/clickhouse-keeper/config.yaml}"
+KEEPER_CONFIG="${KEEPER_CONFIG:-/etc/clickhouse-keeper/keeper_config.xml}"

 if [ -f "$KEEPER_CONFIG" ] && ! $gosu test -f "$KEEPER_CONFIG" -a -r "$KEEPER_CONFIG"; then
    echo "Configuration file '$KEEPER_CONFIG' isn't readable by user with id '$USER'"
--- a/docker/packager/binary/Dockerfile
+++ b/docker/packager/binary/Dockerfile
@ -97,13 +97,24 @@ RUN add-apt-repository ppa:ubuntu-toolchain-r/test --yes \

 # Architecture of the image when BuildKit/buildx is used
 ARG TARGETARCH
-ARG NFPM_VERSION=2.15.1
+ARG NFPM_VERSION=2.16.0

 RUN arch=${TARGETARCH:-amd64} \
  && curl -Lo /tmp/nfpm.deb "https://github.com/goreleaser/nfpm/releases/download/v${NFPM_VERSION}/nfpm_${arch}.deb" \
  && dpkg -i /tmp/nfpm.deb \
  && rm /tmp/nfpm.deb

+ARG GO_VERSION=1.18.3
+# We need go for clickhouse-diagnostics
+RUN arch=${TARGETARCH:-amd64} \
+  && curl -Lo /tmp/go.tgz "https://go.dev/dl/go${GO_VERSION}.linux-${arch}.tar.gz" \
+  && tar -xzf /tmp/go.tgz -C /usr/local/ \
+  && rm /tmp/go.tgz
+
+ENV PATH="$PATH:/usr/local/go/bin"
+ENV GOPATH=/workdir/go
+ENV GOCACHE=/workdir/
+
 RUN mkdir /workdir && chmod 777 /workdir
 WORKDIR /workdir

--- a/docker/packager/binary/build.sh
+++ b/docker/packager/binary/build.sh
@ -29,8 +29,21 @@ env

 if [ -n "$MAKE_DEB" ]; then
  rm -rf /build/packages/root
+  if [ -z "$SANITIZER" ]; then
+    # We need to check if clickhouse-diagnostics is fine and build it
+    (
+      cd /build/programs/diagnostics
+      make test-no-docker
+      GOARCH="${DEB_ARCH}" CGO_ENABLED=0 make VERSION="$VERSION_STRING" build
+      mv clickhouse-diagnostics ..
+    )
+  else
+    echo -e "#!/bin/sh\necho 'Not implemented for this type of package'" > /build/programs/clickhouse-diagnostics
+    chmod +x /build/programs/clickhouse-diagnostics
+  fi
 fi

+
 cache_status
 # clear cache stats
 ccache --zero-stats ||:
@ -81,6 +94,8 @@ if [ -n "$MAKE_DEB" ]; then
  # No quotes because I want it to expand to nothing if empty.
  # shellcheck disable=SC2086
  DESTDIR=/build/packages/root ninja $NINJA_FLAGS install
+  cp /build/programs/clickhouse-diagnostics /build/packages/root/usr/bin
+  cp /build/programs/clickhouse-diagnostics /output
  bash -x /build/packages/build
 fi

--- a/docker/packager/packager
+++ b/docker/packager/packager
@ -202,7 +202,7 @@ def parse_env_variables(
        cmake_flags.append("-DCMAKE_INSTALL_SYSCONFDIR=/etc")
        cmake_flags.append("-DCMAKE_INSTALL_LOCALSTATEDIR=/var")
        if is_release_build(build_type, package_type, sanitizer, split_binary):
-            cmake_flags.append("-DINSTALL_STRIPPED_BINARIES=ON")
+            cmake_flags.append("-DSPLIT_DEBUG_SYMBOLS=ON")
            result.append("WITH_PERFORMANCE=1")
            if is_cross_arm:
                cmake_flags.append("-DBUILD_STANDALONE_KEEPER=1")
--- a/docker/test/integration/runner/Dockerfile
+++ b/docker/test/integration/runner/Dockerfile
@ -3,6 +3,7 @@ FROM ubuntu:20.04

 # ARG for quick switch to a given ubuntu mirror
 ARG apt_archive="http://archive.ubuntu.com"
+
 RUN sed -i "s|http://archive.ubuntu.com|$apt_archive|g" /etc/apt/sources.list

 RUN apt-get update \
--- a/docker/test/performance-comparison/download.sh
+++ b/docker/test/performance-comparison/download.sh
@ -73,6 +73,9 @@ function download
    ) &

    wait
+    echo "ATTACH DATABASE default ENGINE=Ordinary" > db0/metadata/default.sql
+    echo "ATTACH DATABASE datasets ENGINE=Ordinary" > db0/metadata/datasets.sql
+    ls db0/metadata
 }

 download
--- a/docker/test/stateful/run.sh
+++ b/docker/test/stateful/run.sh
@ -120,6 +120,10 @@ function run_tests()
        ADDITIONAL_OPTIONS+=('--replicated-database')
    fi

+    if [[ -n "$USE_DATABASE_ORDINARY" ]] && [[ "$USE_DATABASE_ORDINARY" -eq 1 ]]; then
+        ADDITIONAL_OPTIONS+=('--db-engine=Ordinary')
+    fi
+
    set +e
    clickhouse-test -j 2 --testname --shard --zookeeper --check-zookeeper-session --no-stateless --hung-check --print-time \
        --skip 00168_parallel_processing_on_replicas "${ADDITIONAL_OPTIONS[@]}" \
--- a/docker/test/stateless/run.sh
+++ b/docker/test/stateless/run.sh
@ -115,6 +115,10 @@ function run_tests()
        ADDITIONAL_OPTIONS+=("$RUN_BY_HASH_TOTAL")
    fi

+    if [[ -n "$USE_DATABASE_ORDINARY" ]] && [[ "$USE_DATABASE_ORDINARY" -eq 1 ]]; then
+        ADDITIONAL_OPTIONS+=('--db-engine=Ordinary')
+    fi
+
    set +e
    clickhouse-test --testname --shard --zookeeper --check-zookeeper-session --hung-check --print-time \
            --test-runs "$NUM_TRIES" "${ADDITIONAL_OPTIONS[@]}" 2>&1 \
--- a/docker/test/stress/run.sh
+++ b/docker/test/stress/run.sh
@ -42,6 +42,7 @@ function install_packages()
 function configure()
 {
    # install test configs
+    export USE_DATABASE_ORDINARY=1
    /usr/share/clickhouse-test/config/install.sh

    # we mount tests folder from repo to /usr/share
@ -109,7 +110,8 @@ function stop()
    # We failed to stop the server with SIGTERM. Maybe it hang, let's collect stacktraces.
    kill -TERM "$(pidof gdb)" ||:
    sleep 5
-    gdb -batch -ex 'thread apply all backtrace' -p "$(cat /var/run/clickhouse-server/clickhouse-server.pid)" ||:
+    echo "thread apply all backtrace (on stop)" >> /test_output/gdb.log
+    gdb -batch -ex 'thread apply all backtrace' -p "$(cat /var/run/clickhouse-server/clickhouse-server.pid)" | ts '%Y-%m-%d %H:%M:%S' >> /test_output/gdb.log
    clickhouse stop --force
 }

@ -118,9 +120,10 @@ function start()
    counter=0
    until clickhouse-client --query "SELECT 1"
    do
-        if [ "$counter" -gt ${1:-240} ]
+        if [ "$counter" -gt ${1:-120} ]
        then
            echo "Cannot start clickhouse-server"
+            echo -e "Cannot start clickhouse-server\tFAIL" >> /test_output/test_results.tsv
            cat /var/log/clickhouse-server/stdout.log
            tail -n1000 /var/log/clickhouse-server/stderr.log
            tail -n100000 /var/log/clickhouse-server/clickhouse-server.log | grep -F -v -e '<Warning> RaftInstance:' -e '<Information> RaftInstance' | tail -n1000
@ -284,11 +287,20 @@ then

    rm -rf /var/lib/clickhouse/*

+    # Make BC check more funny by forcing Ordinary engine for system database
+    # New version will try to convert it to Atomic on startup
+    mkdir /var/lib/clickhouse/metadata
+    echo "ATTACH DATABASE system ENGINE=Ordinary" > /var/lib/clickhouse/metadata/system.sql
+
    # Install previous release packages
    install_packages previous_release_package_folder

    # Start server from previous release
    configure
+
+    # Avoid "Setting allow_deprecated_database_ordinary is neither a builtin setting..."
+    rm -f /etc/clickhouse-server/users.d/database_ordinary.xml ||:
+
    start

    clickhouse-client --query="SELECT 'Server version: ', version()"
--- a/docker/test/util/process_functional_tests_result.py
+++ b/docker/test/util/process_functional_tests_result.py
@ -86,7 +86,7 @@ def process_test_log(log_path):
                test_end = True

    test_results = [
-        (test[0], test[1], test[2], "".join(test[3])) for test in test_results
+        (test[0], test[1], test[2], "".join(test[3]))[:4096] for test in test_results
    ]

    return (
--- a/docs/_includes/cmake_in_clickhouse_footer.md
+++ b/docs/_includes/cmake_in_clickhouse_footer.md
@ -1,121 +0,0 @@
-
-## Developer's guide for adding new CMake options
-
-### Don't be obvious. Be informative.
-
-Bad:
-```cmake
-option (ENABLE_TESTS "Enables testing" OFF)
-```
-
-This description is quite useless as is neither gives the viewer any additional information nor explains the option purpose.
-
-Better:
-
-```cmake
-option(ENABLE_TESTS "Provide unit_test_dbms target with Google.test unit tests" OFF)
-```
-
-If the option's purpose can't be guessed by its name, or the purpose guess may be misleading, or option has some
-pre-conditions, leave a comment above the `option()` line and explain what it does.
-The best way would be linking the docs page (if it exists).
-The comment is parsed into a separate column (see below).
-
-Even better:
-
-```cmake
-# implies ${TESTS_ARE_ENABLED}
-# see tests/CMakeLists.txt for implementation detail.
-option(ENABLE_TESTS "Provide unit_test_dbms target with Google.test unit tests" OFF)
-```
-
-### If the option's state could produce unwanted (or unusual) result, explicitly warn the user.
-
-Suppose you have an option that may strip debug symbols from the ClickHouse's part.
-This can speed up the linking process, but produces a binary that cannot be debugged.
-In that case, prefer explicitly raising a warning telling the developer that he may be doing something wrong.
-Also, such options should be disabled if applies.
-
-Bad:
-```cmake
-option(STRIP_DEBUG_SYMBOLS_FUNCTIONS
-    "Do not generate debugger info for ClickHouse functions.
-    ${STRIP_DSF_DEFAULT})
-
-if (STRIP_DEBUG_SYMBOLS_FUNCTIONS)
-    target_compile_options(clickhouse_functions PRIVATE "-g0")
-endif()
-
-```
-Better:
-
-```cmake
-# Provides faster linking and lower binary size.
-# Tradeoff is the inability to debug some source files with e.g. gdb
-# (empty stack frames and no local variables)."
-option(STRIP_DEBUG_SYMBOLS_FUNCTIONS
-    "Do not generate debugger info for ClickHouse functions."
-    ${STRIP_DSF_DEFAULT})
-
-if (STRIP_DEBUG_SYMBOLS_FUNCTIONS)
-    message(WARNING "Not generating debugger info for ClickHouse functions")
-    target_compile_options(clickhouse_functions PRIVATE "-g0")
-endif()
-```
-
-### In the option's description, explain WHAT the option does rather than WHY it does something.
-
-The WHY explanation should be placed in the comment.
-You may find that the option's name is self-descriptive.
-
-Bad:
-
-```cmake
-option(ENABLE_THINLTO "Enable Thin LTO. Only applicable for clang. It's also suppressed when building with tests or sanitizers." ON)
-```
-
-Better:
-
-```cmake
-# Only applicable for clang.
-# Turned off when building with tests or sanitizers.
-option(ENABLE_THINLTO "Clang-specific link time optimisation" ON).
-```
-
-### Don't assume other developers know as much as you do.
-
-In ClickHouse, there are many tools used that an ordinary developer may not know. If you are in doubt, give a link to
-the tool's docs. It won't take much of your time.
-
-Bad:
-
-```cmake
-option(ENABLE_THINLTO "Enable Thin LTO. Only applicable for clang. It's also suppressed when building with tests or sanitizers." ON)
-```
-
-Better (combined with the above hint):
-
-```cmake
-# https://clang.llvm.org/docs/ThinLTO.html
-# Only applicable for clang.
-# Turned off when building with tests or sanitizers.
-option(ENABLE_THINLTO "Clang-specific link time optimisation" ON).
-```
-
-Other example, bad:
-
-```cmake
-option (USE_INCLUDE_WHAT_YOU_USE "Use 'include-what-you-use' tool" OFF)
-```
-
-Better:
-
-```cmake
-# https://github.com/include-what-you-use/include-what-you-use
-option (USE_INCLUDE_WHAT_YOU_USE "Reduce unneeded #include s (external tool)" OFF)
-```
-
-### Prefer consistent default values.
-
-CMake allows you to pass a plethora of values representing boolean `true/false`, e.g. `1, ON, YES, ...`.
-Prefer the `ON/OFF` values, if possible.
--- a/docs/_includes/cmake_in_clickhouse_header.md
+++ b/docs/_includes/cmake_in_clickhouse_header.md
@ -1,27 +0,0 @@
-# CMake in ClickHouse
-
-## TL; DR How to make ClickHouse compile and link faster?
-
-Minimal ClickHouse build example:
-
-```bash
-cmake .. \
-    -DCMAKE_C_COMPILER=$(which clang-14) \
-    -DCMAKE_CXX_COMPILER=$(which clang++-14) \
-    -DCMAKE_BUILD_TYPE=Debug \
-    -DENABLE_UTILS=OFF \
-    -DENABLE_TESTS=OFF
-```
-
-## CMake files types
-
-1. ClickHouse's source CMake files (located in the root directory and in `/src`).
-2. Arch-dependent CMake files (located in `/cmake/*os_name*`).
-3. Libraries finders (search for contrib libraries, located in `/contrib/*/CMakeLists.txt`).
-3. Contrib build CMake files (used instead of libraries' own CMake files, located in `/cmake/modules`)
-
-## List of CMake flags
-
-* This list is auto-generated by [this Python script](https://github.com/clickhouse/clickhouse/blob/master/docs/tools/cmake_in_clickhouse_generator.py).
-* The flag name is a link to its position in the code.
-* If an option's default value is itself an option, it's also a link to its position in this list.
--- a/docs/_includes/install/tgz.sh
+++ b/docs/_includes/install/tgz.sh
@ -1,20 +1,34 @@
 LATEST_VERSION=$(curl -s https://packages.clickhouse.com/tgz/stable/ | \
    grep -Eo '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | sort -V -r | head -n 1)
 export LATEST_VERSION
-curl -O "https://packages.clickhouse.com/tgz/stable/clickhouse-common-static-$LATEST_VERSION.tgz"
-curl -O "https://packages.clickhouse.com/tgz/stable/clickhouse-common-static-dbg-$LATEST_VERSION.tgz"
-curl -O "https://packages.clickhouse.com/tgz/stable/clickhouse-server-$LATEST_VERSION.tgz"
-curl -O "https://packages.clickhouse.com/tgz/stable/clickhouse-client-$LATEST_VERSION.tgz"

-tar -xzvf "clickhouse-common-static-$LATEST_VERSION.tgz"
+case $(uname -m) in
+  x86_64) ARCH=amd64 ;;
+  aarch64) ARCH=arm64 ;;
+  *) echo "Unknown architecture $(uname -m)"; exit 1 ;;
+esac
+
+for PKG in clickhouse-common-static clickhouse-common-static-dbg clickhouse-server clickhouse-client
+do
+  curl -fO "https://packages.clickhouse.com/tgz/stable/$PKG-$LATEST_VERSION-${ARCH}.tgz" \
+    || curl -fO "https://packages.clickhouse.com/tgz/stable/$PKG-$LATEST_VERSION.tgz"
+done
+
+exit 0
+
+tar -xzvf "clickhouse-common-static-$LATEST_VERSION-${ARCH}.tgz" \
+  || tar -xzvf "clickhouse-common-static-$LATEST_VERSION.tgz"
 sudo "clickhouse-common-static-$LATEST_VERSION/install/doinst.sh"

-tar -xzvf "clickhouse-common-static-dbg-$LATEST_VERSION.tgz"
+tar -xzvf "clickhouse-common-static-dbg-$LATEST_VERSION-${ARCH}.tgz" \
+  || tar -xzvf "clickhouse-common-static-dbg-$LATEST_VERSION.tgz"
 sudo "clickhouse-common-static-dbg-$LATEST_VERSION/install/doinst.sh"

-tar -xzvf "clickhouse-server-$LATEST_VERSION.tgz"
+tar -xzvf "clickhouse-server-$LATEST_VERSION-${ARCH}.tgz" \
+  || tar -xzvf "clickhouse-server-$LATEST_VERSION.tgz"
 sudo "clickhouse-server-$LATEST_VERSION/install/doinst.sh"
 sudo /etc/init.d/clickhouse-server start

-tar -xzvf "clickhouse-client-$LATEST_VERSION.tgz"
+tar -xzvf "clickhouse-client-$LATEST_VERSION-${ARCH}.tgz" \
+  || tar -xzvf "clickhouse-client-$LATEST_VERSION.tgz"
 sudo "clickhouse-client-$LATEST_VERSION/install/doinst.sh"
--- a/docs/changelogs/v22.6.2.12-stable.md
+++ b/docs/changelogs/v22.6.2.12-stable.md
@ -0,0 +1,22 @@
+---
+sidebar_position: 1
+sidebar_label: 2022
+---
+
+# 2022 Changelog
+
+### ClickHouse release v22.6.2.12-stable FIXME as compared to v22.6.1.1985-stable
+
+#### Improvement
+* Backported in [#38484](https://github.com/ClickHouse/ClickHouse/issues/38484): Improve the stability for hive storage integration test. Move the data prepare step into test.py. [#38260](https://github.com/ClickHouse/ClickHouse/pull/38260) ([lgbo](https://github.com/lgbo-ustc)).
+
+#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+
+* Backported in [#38404](https://github.com/ClickHouse/ClickHouse/issues/38404): Fix bug with nested short-circuit functions that led to execution of arguments even if condition is false. Closes [#38040](https://github.com/ClickHouse/ClickHouse/issues/38040). [#38173](https://github.com/ClickHouse/ClickHouse/pull/38173) ([Kruglov Pavel](https://github.com/Avogar)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Remove processor description from span attributes - it is not working [#38157](https://github.com/ClickHouse/ClickHouse/pull/38157) ([Ilya Yatsishin](https://github.com/qoega)).
+* Checkout full repositories for performance tests [#38327](https://github.com/ClickHouse/ClickHouse/pull/38327) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Try to fix 02305_schema_inference_with_globs [#38337](https://github.com/ClickHouse/ClickHouse/pull/38337) ([Kruglov Pavel](https://github.com/Avogar)).
+
--- a/docs/en/development/architecture.md
+++ b/docs/en/development/architecture.md
@ -223,7 +223,7 @@ Replication in ClickHouse can be configured on a per-table basis. You could have

 Replication is implemented in the `ReplicatedMergeTree` storage engine. The path in `ZooKeeper` is specified as a parameter for the storage engine. All tables with the same path in `ZooKeeper` become replicas of each other: they synchronize their data and maintain consistency. Replicas can be added and removed dynamically simply by creating or dropping a table.

-Replication uses an asynchronous multi-master scheme. You can insert data into any replica that has a session with `ZooKeeper`, and data is replicated to all other replicas asynchronously. Because ClickHouse does not support UPDATEs, replication is conflict-free. As there is no quorum acknowledgment of inserts, just-inserted data might be lost if one node fails.
+Replication uses an asynchronous multi-master scheme. You can insert data into any replica that has a session with `ZooKeeper`, and data is replicated to all other replicas asynchronously. Because ClickHouse does not support UPDATEs, replication is conflict-free. As there is no quorum acknowledgment of inserts by default, just-inserted data might be lost if one node fails. The insert quorum can be enabled using `insert_quorum` setting.

 Metadata for replication is stored in ZooKeeper. There is a replication log that lists what actions to do. Actions are: get part; merge parts; drop a partition, and so on. Each replica copies the replication log to its queue and then executes the actions from the queue. For example, on insertion, the “get the part” action is created in the log, and every replica downloads that part. Merges are coordinated between replicas to get byte-identical results. All parts are merged in the same way on all replicas. One of the leaders initiates a new merge first and writes “merge parts” actions to the log. Multiple replicas (or all) can be leaders at the same time. A replica can be prevented from becoming a leader using the `merge_tree` setting `replicated_can_become_leader`. The leaders are responsible for scheduling background merges.

--- a/docs/en/development/cmake-in-clickhouse.md
+++ b/docs/en/development/cmake-in-clickhouse.md
@ -1,545 +0,0 @@
---
-sidebar_position: 69
-sidebar_label: CMake in ClickHouse
-description: How to make ClickHouse compile and link faster
---
-
-# CMake in ClickHouse
-
-How to make ClickHouse compile and link faster. Minimal ClickHouse build example:
-
-```bash
-cmake .. \
-    -DCMAKE_C_COMPILER=$(which clang-13) \
-    -DCMAKE_CXX_COMPILER=$(which clang++-13) \
-    -DCMAKE_BUILD_TYPE=Debug \
-    -DENABLE_UTILS=OFF \
-    -DENABLE_TESTS=OFF
-```
-
-## CMake files types
-
-1. ClickHouse source CMake files (located in the root directory and in /src).
-2. Arch-dependent CMake files (located in /cmake/*os_name*).
-3. Libraries finders (search for contrib libraries, located in /contrib/*/CMakeLists.txt).
-4. Contrib build CMake files (used instead of libraries' own CMake files, located in /cmake/modules)
-
-## List of CMake flags
- The flag name is a link to its position in the code.
- If an option's default value is itself an option, it's also a link to its position in this list.
-
-## ClickHouse modes
-
-<table>
-<thead>
-<tr>
-<th>Name</th>
-<th>Default value</th>
-<th>Description</th>
-<th>Comment</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td><a name="enable-clickhouse-all"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L10" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_CLICKHOUSE_ALL</code></a></td>
-<td><code class="syntax">ON</code></td>
-<td>Enable all ClickHouse modes by default</td>
-<td>The <code class="syntax">clickhouse</code> binary is a multi purpose tool that contains multiple execution modes (client, server, etc.), each of them may be built and linked as a separate library. If you do not know what modes you need, turn this option OFF and enable SERVER and CLIENT only.</td>
-</tr>
-<tr>
-<td><a name="enable-clickhouse-benchmark"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L20" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_CLICKHOUSE_BENCHMARK</code></a></td>
-<td><code class="syntax">ENABLE_CLICKHOUSE_ALL</code></td>
-<td>Queries benchmarking mode</td>
-<td><a href="https://clickhouse.com/docs/en/operations/utilities/clickhouse-benchmark/" target="_blank">https://clickhouse.com/docs/en/operations/utilities/clickhouse-benchmark/</a></td>
-</tr>
-<tr>
-<td><a name="enable-clickhouse-client"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L13" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_CLICKHOUSE_CLIENT</code></a></td>
-<td><code class="syntax">ENABLE_CLICKHOUSE_ALL</code></td>
-<td>Client mode (interactive tui/shell that connects to the server)</td>
-<td></td>
-</tr>
-<tr>
-<td><a name="enable-clickhouse-compressor"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L25" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_CLICKHOUSE_COMPRESSOR</code></a></td>
-<td><code class="syntax">ENABLE_CLICKHOUSE_ALL</code></td>
-<td>Data compressor and decompressor</td>
-<td><a href="https://clickhouse.com/docs/en/operations/utilities/clickhouse-compressor/" target="_blank">https://clickhouse.com/docs/en/operations/utilities/clickhouse-compressor/</a></td>
-</tr>
-<tr>
-<td><a name="enable-clickhouse-copier"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L28" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_CLICKHOUSE_COPIER</code></a></td>
-<td><code class="syntax">ENABLE_CLICKHOUSE_ALL</code></td>
-<td>Inter-cluster data copying mode</td>
-<td><a href="https://clickhouse.com/docs/en/operations/utilities/clickhouse-copier/" target="_blank">https://clickhouse.com/docs/en/operations/utilities/clickhouse-copier/</a></td>
-</tr>
-<tr>
-<td><a name="enable-clickhouse-extract-from-config"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L22" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG</code></a></td>
-<td><code class="syntax">ENABLE_CLICKHOUSE_ALL</code></td>
-<td>Configs processor (extract values etc.)</td>
-<td></td>
-</tr>
-<tr>
-<td><a name="enable-clickhouse-format"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L30" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_CLICKHOUSE_FORMAT</code></a></td>
-<td><code class="syntax">ENABLE_CLICKHOUSE_ALL</code></td>
-<td>Queries pretty-printer and formatter with syntax highlighting</td>
-<td></td>
-</tr>
-<tr>
-<td><a name="enable-clickhouse-git-import"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L50" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_CLICKHOUSE_GIT_IMPORT</code></a></td>
-<td><code class="syntax">ENABLE_CLICKHOUSE_ALL</code></td>
-<td>A tool to analyze Git repositories</td>
-<td><a href="https://presentations.clickhouse.com/matemarketing_2020/" target="_blank">https://presentations.clickhouse.com/matemarketing_2020/</a></td>
-</tr>
-<tr>
-<td><a name="enable-clickhouse-install"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L67" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_CLICKHOUSE_INSTALL</code></a></td>
-<td><code class="syntax">OFF</code></td>
-<td>Install ClickHouse without .deb/.rpm/.tgz packages (having the binary only)</td>
-<td></td>
-</tr>
-<tr>
-<td><a name="enable-clickhouse-keeper"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L54" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_CLICKHOUSE_KEEPER</code></a></td>
-<td><code class="syntax">ENABLE_CLICKHOUSE_ALL</code></td>
-<td>ClickHouse alternative to ZooKeeper</td>
-<td></td>
-</tr>
-<tr>
-<td><a name="enable-clickhouse-keeper-converter"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L56" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_CLICKHOUSE_KEEPER_CONVERTER</code></a></td>
-<td><code class="syntax">ENABLE_CLICKHOUSE_ALL</code></td>
-<td>Util allows to convert ZooKeeper logs and snapshots into clickhouse-keeper snapshot</td>
-<td></td>
-</tr>
-<tr>
-<td><a name="enable-clickhouse-library-bridge"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L46" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_CLICKHOUSE_LIBRARY_BRIDGE</code></a></td>
-<td><code class="syntax">ENABLE_CLICKHOUSE_ALL</code></td>
-<td>HTTP-server working like a proxy to Library dictionary source</td>
-<td></td>
-</tr>
-<tr>
-<td><a name="enable-clickhouse-local"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L17" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_CLICKHOUSE_LOCAL</code></a></td>
-<td><code class="syntax">ENABLE_CLICKHOUSE_ALL</code></td>
-<td>Local files fast processing mode</td>
-<td><a href="https://clickhouse.com/docs/en/operations/utilities/clickhouse-local/" target="_blank">https://clickhouse.com/docs/en/operations/utilities/clickhouse-local/</a></td>
-</tr>
-<tr>
-<td><a name="enable-clickhouse-obfuscator"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L34" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_CLICKHOUSE_OBFUSCATOR</code></a></td>
-<td><code class="syntax">ENABLE_CLICKHOUSE_ALL</code></td>
-<td>Table data obfuscator (convert real data to benchmark-ready one)</td>
-<td><a href="https://clickhouse.com/docs/en/operations/utilities/clickhouse-obfuscator/" target="_blank">https://clickhouse.com/docs/en/operations/utilities/clickhouse-obfuscator/</a></td>
-</tr>
-<tr>
-<td><a name="enable-clickhouse-odbc-bridge"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L40" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_CLICKHOUSE_ODBC_BRIDGE</code></a></td>
-<td><code class="syntax">ENABLE_CLICKHOUSE_ALL</code></td>
-<td>HTTP-server working like a proxy to ODBC driver</td>
-<td></td>
-</tr>
-<tr>
-<td><a name="enable-clickhouse-server"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L12" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_CLICKHOUSE_SERVER</code></a></td>
-<td><code class="syntax">ENABLE_CLICKHOUSE_ALL</code></td>
-<td>Server mode (main mode)</td>
-<td></td>
-</tr>
-<tr>
-<td><a name="enable-clickhouse-static-files-disk-uploader"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L52" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_CLICKHOUSE_STATIC_FILES_DISK_UPLOADER</code></a></td>
-<td><code class="syntax">ENABLE_CLICKHOUSE_ALL</code></td>
-<td>A tool to export table data files to be later put to a static files web server</td>
-<td></td>
-</tr>
-</tbody>
-</table>
-
-
-## External libraries
-Note that ClickHouse uses forks of these libraries, see https://github.com/ClickHouse-Extras.
-<table>
-<thead>
-<tr>
-<th>Name</th>
-<th>Default value</th>
-<th>Description</th>
-<th>Comment</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td><a name="enable-avx"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/cmake/cpu_features.cmake#L19" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_AVX</code></a></td>
-<td><code class="syntax">0</code></td>
-<td>Use AVX instructions on x86_64</td>
-<td></td>
-</tr>
-<tr>
-<td><a name="enable-avx"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/cmake/cpu_features.cmake#L20" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_AVX2</code></a></td>
-<td><code class="syntax">0</code></td>
-<td>Use AVX2 instructions on x86_64</td>
-<td></td>
-</tr>
-<tr>
-<td><a name="enable-avx-for-spec-op"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/cmake/cpu_features.cmake#L23" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_AVX2_FOR_SPEC_OP</code></a></td>
-<td><code class="syntax">0</code></td>
-<td>Use avx2 instructions for specific operations on x86_64</td>
-<td></td>
-</tr>
-<tr>
-<td><a name="enable-avx"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/cmake/cpu_features.cmake#L21" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_AVX512</code></a></td>
-<td><code class="syntax">0</code></td>
-<td>Use AVX512 instructions on x86_64</td>
-<td></td>
-</tr>
-<tr>
-<td><a name="enable-avx-for-spec-op"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/cmake/cpu_features.cmake#L24" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_AVX512_FOR_SPEC_OP</code></a></td>
-<td><code class="syntax">0</code></td>
-<td>Use avx512 instructions for specific operations on x86_64</td>
-<td></td>
-</tr>
-<tr>
-<td><a name="enable-bmi"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/cmake/cpu_features.cmake#L22" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_BMI</code></a></td>
-<td><code class="syntax">0</code></td>
-<td>Use BMI instructions on x86_64</td>
-<td></td>
-</tr>
-<tr>
-<td><a name="enable-ccache"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/cmake/ccache.cmake#L22" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_CCACHE</code></a></td>
-<td><code class="syntax">ENABLE_CCACHE_BY_DEFAULT</code></td>
-<td>Speedup re-compilations using ccache (external tool)</td>
-<td><a href="https://ccache.dev/" target="_blank">https://ccache.dev/</a></td>
-</tr>
-<tr>
-<td><a name="enable-clang-tidy"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/cmake/clang_tidy.cmake#L2" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_CLANG_TIDY</code></a></td>
-<td><code class="syntax">OFF</code></td>
-<td>Use clang-tidy static analyzer</td>
-<td><a href="https://clang.llvm.org/extra/clang-tidy/" target="_blank">https://clang.llvm.org/extra/clang-tidy/</a></td>
-</tr>
-<tr>
-<td><a name="enable-pclmulqdq"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/cmake/cpu_features.cmake#L17" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_PCLMULQDQ</code></a></td>
-<td><code class="syntax">1</code></td>
-<td>Use pclmulqdq instructions on x86_64</td>
-<td></td>
-</tr>
-<tr>
-<td><a name="enable-popcnt"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/cmake/cpu_features.cmake#L18" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_POPCNT</code></a></td>
-<td><code class="syntax">1</code></td>
-<td>Use popcnt instructions on x86_64</td>
-<td></td>
-</tr>
-<tr>
-<td><a name="enable-sse"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/cmake/cpu_features.cmake#L15" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_SSE41</code></a></td>
-<td><code class="syntax">1</code></td>
-<td>Use SSE4.1 instructions on x86_64</td>
-<td></td>
-</tr>
-<tr>
-<td><a name="enable-sse"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/cmake/cpu_features.cmake#L16" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_SSE42</code></a></td>
-<td><code class="syntax">1</code></td>
-<td>Use SSE4.2 instructions on x86_64</td>
-<td></td>
-</tr>
-<tr>
-<td><a name="enable-ssse"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/cmake/cpu_features.cmake#L14" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_SSSE3</code></a></td>
-<td><code class="syntax">1</code></td>
-<td>Use SSSE3 instructions on x86_64</td>
-<td></td>
-</tr>
-</tbody>
-</table>
-
-
-## Other flags
-
-<table>
-<thead>
-<tr>
-<th>Name</th>
-<th>Default value</th>
-<th>Description</th>
-<th>Comment</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td><a name="add-gdb-index-for-gold"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L226" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ADD_GDB_INDEX_FOR_GOLD</code></a></td>
-<td><code class="syntax">OFF</code></td>
-<td>Add .gdb-index to resulting binaries for gold linker.</td>
-<td>Ignored if <code class="syntax">lld</code> is used</td>
-</tr>
-<tr>
-<td><a name="arch-native"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/cmake/cpu_features.cmake#L26" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ARCH_NATIVE</code></a></td>
-<td><code class="syntax">0</code></td>
-<td>Add -march=native compiler flag. This makes your binaries non-portable but more performant code may be generated. This option overrides ENABLE_* options for specific instruction set. Highly not recommended to use.</td>
-<td></td>
-</tr>
-<tr>
-<td><a name="build-standalone-keeper"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L253" rel="external nofollow noreferrer" target="_blank"><code class="syntax">BUILD_STANDALONE_KEEPER</code></a></td>
-<td><code class="syntax">OFF</code></td>
-<td>Build keeper as small standalone binary</td>
-<td></td>
-</tr>
-<tr>
-<td><a name="clickhouse-split-binary"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L113" rel="external nofollow noreferrer" target="_blank"><code class="syntax">CLICKHOUSE_SPLIT_BINARY</code></a></td>
-<td><code class="syntax">OFF</code></td>
-<td>Make several binaries (clickhouse-server, clickhouse-client etc.) instead of one bundled</td>
-<td></td>
-</tr>
-<tr>
-<td><a name="compiler-pipe"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L281" rel="external nofollow noreferrer" target="_blank"><code class="syntax">COMPILER_PIPE</code></a></td>
-<td><code class="syntax">ON</code></td>
-<td>-pipe compiler option</td>
-<td>Less <code class="syntax">/tmp</code> usage, more RAM usage.</td>
-</tr>
-<tr>
-<td><a name="enable-build-path-mapping"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L299" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_BUILD_PATH_MAPPING</code></a></td>
-<td><code class="syntax">ON</code></td>
-<td>Enable remap file source paths in debug info, predefined preprocessor macros and __builtin_FILE(). It's to generate reproducible builds. See <a href="https://reproducible-builds.org/docs/build-path" target="_blank">https://reproducible-builds.org/docs/build-path</a></td>
-<td>Reproducible builds If turned <code class="syntax">ON</code>, remap file source paths in debug info, predefined preprocessor macros and __builtin_FILE().</td>
-</tr>
-<tr>
-<td><a name="enable-check-heavy-builds"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L81" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_CHECK_HEAVY_BUILDS</code></a></td>
-<td><code class="syntax">OFF</code></td>
-<td>Don't allow C++ translation units to compile too long or to take too much memory while compiling.</td>
-<td>Take care to add prlimit in command line before ccache, or else ccache thinks that prlimit is compiler, and clang++ is its input file, and refuses to work  with multiple inputs, e.g in ccache log: [2021-03-31T18:06:32.655327 36900] Command line: /usr/bin/ccache prlimit --as=10000000000 --data=5000000000 --cpu=600 /usr/bin/clang++-11 - ...... std=gnu++2a -MD -MT src/CMakeFiles/dbms.dir/Storages/MergeTree/IMergeTreeDataPart.cpp.o -MF src/CMakeFiles/dbms.dir/Storages/MergeTree/IMergeTreeDataPart.cpp.o.d -o src/CMakeFiles/dbms.dir/Storages/MergeTree/IMergeTreeDataPart.cpp.o -c ../src/Storages/MergeTree/IMergeTreeDataPart.cpp  [2021-03-31T18:06:32.656704 36900] Multiple input files: /usr/bin/clang++-11 and ../src/Storages/MergeTree/IMergeTreeDataPart.cpp  Another way would be to use --ccache-skip option before clang++-11 to make ccache ignore it.</td>
-</tr>
-<tr>
-<td><a name="enable-colored-build"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L160" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_COLORED_BUILD</code></a></td>
-<td><code class="syntax">ON</code></td>
-<td>Enable colored diagnostics in build log.</td>
-<td></td>
-</tr>
-<tr>
-<td><a name="enable-examples"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L201" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_EXAMPLES</code></a></td>
-<td><code class="syntax">OFF</code></td>
-<td>Build all example programs in 'examples' subdirectories</td>
-<td></td>
-</tr>
-<tr>
-<td><a name="enable-fuzzing"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L129" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_FUZZING</code></a></td>
-<td><code class="syntax">OFF</code></td>
-<td>Fuzzy testing using libfuzzer</td>
-<td></td>
-</tr>
-<tr>
-<td><a name="enable-libraries"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L413" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_LIBRARIES</code></a></td>
-<td><code class="syntax">ON</code></td>
-<td>Enable all external libraries by default</td>
-<td>Turns on all external libs like s3, kafka, ODBC, ...</td>
-</tr>
-<tr>
-<td><a name="enable-multitarget-code"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/src/Functions/CMakeLists.txt#L102" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_MULTITARGET_CODE</code></a></td>
-<td><code class="syntax">ON</code></td>
-<td>Enable platform-dependent code</td>
-<td>ClickHouse developers may use platform-dependent code under some macro (e.g. <code class="syntax">ifdef ENABLE_MULTITARGET</code>). If turned ON, this option defines such macro. See <code class="syntax">src/Functions/TargetSpecific.h</code></td>
-</tr>
-<tr>
-<td><a name="enable-tests"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L200" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_TESTS</code></a></td>
-<td><code class="syntax">ON</code></td>
-<td>Provide unit_test_dbms target with Google.Test unit tests</td>
-<td>If turned <code class="syntax">ON</code>, assumes the user has either the system GTest library or the bundled one.</td>
-</tr>
-<tr>
-<td><a name="enable-thinlto"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L386" rel="external nofollow noreferrer" target="_blank"><code class="syntax">ENABLE_THINLTO</code></a></td>
-<td><code class="syntax">ON</code></td>
-<td>Clang-specific link time optimization</td>
-<td><a href="https://clang.llvm.org/docs/ThinLTO.html" target="_blank">https://clang.llvm.org/docs/ThinLTO.html</a> Applies to clang only. Disabled when building with tests or sanitizers.</td>
-</tr>
-<tr>
-<td><a name="fail-on-unsupported-options-combination"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L32" rel="external nofollow noreferrer" target="_blank"><code class="syntax">FAIL_ON_UNSUPPORTED_OPTIONS_COMBINATION</code></a></td>
-<td><code class="syntax">ON</code></td>
-<td>Stop/Fail CMake configuration if some ENABLE_XXX option is defined (either ON or OFF)   but is not possible to satisfy</td>
-<td>If turned off: e.g. when ENABLE_FOO is ON, but FOO tool was not found, the CMake will continue.</td>
-</tr>
-<tr>
-<td><a name="glibc-compatibility"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L205" rel="external nofollow noreferrer" target="_blank"><code class="syntax">GLIBC_COMPATIBILITY</code></a></td>
-<td><code class="syntax">ON</code></td>
-<td>Enable compatibility with older glibc libraries.</td>
-<td>Only for Linux, x86_64 or aarch64.</td>
-</tr>
-<tr>
-<td><a name="install-stripped-binaries"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L270" rel="external nofollow noreferrer" target="_blank"><code class="syntax">INSTALL_STRIPPED_BINARIES</code></a></td>
-<td><code class="syntax">OFF</code></td>
-<td>Build stripped binaries with debug info in separate directory</td>
-<td></td>
-</tr>
-<tr>
-<td><a name="linker-name"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/cmake/tools.cmake#L58" rel="external nofollow noreferrer" target="_blank"><code class="syntax">LINKER_NAME</code></a></td>
-<td><code class="syntax">OFF</code></td>
-<td>Linker name or full path</td>
-<td>Example values: <code class="syntax">lld-10</code>, <code class="syntax">gold</code>.</td>
-</tr>
-<tr>
-<td><a name="parallel-compile-jobs"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/cmake/limit_jobs.cmake#L10" rel="external nofollow noreferrer" target="_blank"><code class="syntax">PARALLEL_COMPILE_JOBS</code></a></td>
-<td><code class="syntax">""</code></td>
-<td>Maximum number of concurrent compilation jobs</td>
-<td>1 if not set</td>
-</tr>
-<tr>
-<td><a name="parallel-link-jobs"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/cmake/limit_jobs.cmake#L13" rel="external nofollow noreferrer" target="_blank"><code class="syntax">PARALLEL_LINK_JOBS</code></a></td>
-<td><code class="syntax">""</code></td>
-<td>Maximum number of concurrent link jobs</td>
-<td>1 if not set</td>
-</tr>
-<tr>
-<td><a name="sanitize"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/cmake/sanitize.cmake#L7" rel="external nofollow noreferrer" target="_blank"><code class="syntax">SANITIZE</code></a></td>
-<td><code class="syntax">""</code></td>
-<td>Enable one of the code sanitizers</td>
-<td>Possible values: - <code class="syntax">address</code> (ASan) - <code class="syntax">memory</code> (MSan) - <code class="syntax">thread</code> (TSan) - <code class="syntax">undefined</code> (UBSan) - "" (no sanitizing)</td>
-</tr>
-<tr>
-<td><a name="split-shared-libraries"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L111" rel="external nofollow noreferrer" target="_blank"><code class="syntax">SPLIT_SHARED_LIBRARIES</code></a></td>
-<td><code class="syntax">OFF</code></td>
-<td>Keep all internal libraries as separate .so files</td>
-<td>DEVELOPER ONLY. Faster linking if turned on.</td>
-</tr>
-<tr>
-<td><a name="strip-debug-symbols-functions"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/src/Functions/CMakeLists.txt#L48" rel="external nofollow noreferrer" target="_blank"><code class="syntax">STRIP_DEBUG_SYMBOLS_FUNCTIONS</code></a></td>
-<td><code class="syntax">STRIP_DSF_DEFAULT</code></td>
-<td>Do not generate debugger info for ClickHouse functions</td>
-<td>Provides faster linking and lower binary size. Tradeoff is the inability to debug some source files with e.g. gdb (empty stack frames and no local variables)."</td>
-</tr>
-<tr>
-<td><a name="use-debug-helpers"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L252" rel="external nofollow noreferrer" target="_blank"><code class="syntax">USE_DEBUG_HELPERS</code></a></td>
-<td><code class="syntax">USE_DEBUG_HELPERS</code></td>
-<td>Enable debug helpers</td>
-<td></td>
-</tr>
-<tr>
-<td><a name="use-static-libraries"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L106" rel="external nofollow noreferrer" target="_blank"><code class="syntax">USE_STATIC_LIBRARIES</code></a></td>
-<td><code class="syntax">ON</code></td>
-<td>Disable to use shared libraries</td>
-<td></td>
-</tr>
-<tr>
-<td><a name="use-unwind"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/cmake/unwind.cmake#L1" rel="external nofollow noreferrer" target="_blank"><code class="syntax">USE_UNWIND</code></a></td>
-<td><code class="syntax">ENABLE_LIBRARIES</code></td>
-<td>Enable libunwind (better stacktraces)</td>
-<td></td>
-</tr>
-<tr>
-<td><a name="werror"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L417" rel="external nofollow noreferrer" target="_blank"><code class="syntax">WERROR</code></a></td>
-<td><code class="syntax">OFF</code></td>
-<td>Enable -Werror compiler option</td>
-<td>Using system libs can cause a lot of warnings in includes (on macro expansion).</td>
-</tr>
-<tr>
-<td><a name="with-coverage"></a><a href="https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L344" rel="external nofollow noreferrer" target="_blank"><code class="syntax">WITH_COVERAGE</code></a></td>
-<td><code class="syntax">OFF</code></td>
-<td>Profile the resulting binary/binaries</td>
-<td>Compiler-specific coverage flags e.g. -fcoverage-mapping for gcc</td>
-</tr>
-</tbody>
-</table>
-
-## Developer's guide for adding new CMake options
-
-#### Don't be obvious. Be informative.
-
-Bad:
-
-```
-option (ENABLE_TESTS "Enables testing" OFF)
-```
-
-This description is quite useless as it neither gives the viewer any additional information nor explains the option purpose.
-
-Better:
-
-```
-option(ENABLE_TESTS "Provide unit_test_dbms target with Google.test unit tests" OFF)
-```
-
-If the option's purpose can't be guessed by its name, or the purpose guess may be misleading, or option has some
-pre-conditions, leave a comment above the option() line and explain what it does.
-The best way would be linking the docs page (if it exists).
-The comment is parsed into a separate column (see below).
-
-Even better:
-
-```
-# implies ${TESTS_ARE_ENABLED}
-# see tests/CMakeLists.txt for implementation detail.
-option(ENABLE_TESTS "Provide unit_test_dbms target with Google.test unit tests" OFF)
-```
-
-#### If the option's state could produce unwanted (or unusual) result, explicitly warn the user.
-
-Suppose you have an option that may strip debug symbols from the ClickHouse part.
-This can speed up the linking process, but produces a binary that cannot be debugged.
-In that case, prefer explicitly raising a warning telling the developer that he may be doing something wrong.
-Also, such options should be disabled if applies.
-
-Bad:
-
-```
-option(STRIP_DEBUG_SYMBOLS_FUNCTIONS
-    "Do not generate debugger info for ClickHouse functions.
-    ${STRIP_DSF_DEFAULT})
-
-if (STRIP_DEBUG_SYMBOLS_FUNCTIONS)
-    target_compile_options(clickhouse_functions PRIVATE "-g0")
-endif()
-```
-
-Better:
-
-```
-# Provides faster linking and lower binary size.
-# Tradeoff is the inability to debug some source files with e.g. gdb
-# (empty stack frames and no local variables)."
-option(STRIP_DEBUG_SYMBOLS_FUNCTIONS
-    "Do not generate debugger info for ClickHouse functions."
-    ${STRIP_DSF_DEFAULT})
-
-if (STRIP_DEBUG_SYMBOLS_FUNCTIONS)
-    message(WARNING "Not generating debugger info for ClickHouse functions")
-    target_compile_options(clickhouse_functions PRIVATE "-g0")
-endif()
-```
-
-#### In the option's description, explain WHAT the option does rather than WHY it does something.
-The WHY explanation should be placed in the comment. You may find that the option's name is self-descriptive.
-
-Bad:
-
-```
-option(ENABLE_THINLTO "Enable Thin LTO. Only applicable for clang. It's also suppressed when building with tests or sanitizers." ON)
-```
-
-Better:
-
-```
-# Only applicable for clang.
-# Turned off when building with tests or sanitizers.
-option(ENABLE_THINLTO "Clang-specific link time optimisation" ON).
-```
-
-#### Don't assume other developers know as much as you do.
-In ClickHouse, there are many tools used that an ordinary developer may not know. If you are in doubt, give a link to
-the tool's docs. It won't take much of your time.
-
-Bad:
-
-```
-option(ENABLE_THINLTO "Enable Thin LTO. Only applicable for clang. It's also suppressed when building with tests or sanitizers." ON)
-```
-
-Better (combined with the above hint):
-
-```
-# https://clang.llvm.org/docs/ThinLTO.html
-# Only applicable for clang.
-# Turned off when building with tests or sanitizers.
-option(ENABLE_THINLTO "Clang-specific link time optimisation" ON).
-```
-
-Other example, bad:
-
-```
-option (USE_INCLUDE_WHAT_YOU_USE "Use 'include-what-you-use' tool" OFF)
-```
-
-Better:
-
-```
-# https://github.com/include-what-you-use/include-what-you-use
-option (USE_INCLUDE_WHAT_YOU_USE "Reduce unneeded #include s (external tool)" OFF)
-```
-
-#### Prefer consistent default values.
-CMake allows you to pass a plethora of values representing boolean true/false, e.g. 1, ON, YES, ....
-
-Prefer the ON/OFF values, if possible.
-
--- a/docs/en/development/continuous-integration.md
+++ b/docs/en/development/continuous-integration.md
@ -123,12 +123,10 @@ Builds ClickHouse in various configurations for use in further steps. You have t
 - **Build log**: link to the building and files copying log, useful when build failed.
 - **Build time**.
 - **Artifacts**: build result files (with `XXX` being the server version e.g. `20.8.1.4344`).
-  - `clickhouse-client_XXX_all.deb`
+  - `clickhouse-client_XXX_amd64.deb`
  - `clickhouse-common-static-dbg_XXX[+asan, +msan, +ubsan, +tsan]_amd64.deb`
  - `clickhouse-common-staticXXX_amd64.deb`
-  - `clickhouse-server_XXX_all.deb`
-  - `clickhouse_XXX_amd64.buildinfo`
-  - `clickhouse_XXX_amd64.changes`
+  - `clickhouse-server_XXX_amd64.deb`
  - `clickhouse`: Main built binary.
  - `clickhouse-odbc-bridge`
  - `unit_tests_dbms`: GoogleTest binary with ClickHouse unit tests.
--- a/docs/en/engines/database-engines/postgresql.md
+++ b/docs/en/engines/database-engines/postgresql.md
@ -136,4 +136,3 @@ DESCRIBE TABLE test_database.test_table;
 └────────┴───────────────────┘
 ```

-[Original article](https://clickhouse.com/docs/en/database-engines/postgresql/) <!--hide-->
--- a/docs/en/engines/table-engines/log-family/index.md
+++ b/docs/en/engines/table-engines/log-family/index.md
@ -43,4 +43,3 @@ The `TinyLog` engine is the simplest in the family and provides the poorest func

 The `Log` and `StripeLog` engines support parallel data reading. When reading data, ClickHouse uses multiple threads. Each thread processes a separate data block. The `Log` engine uses a separate file for each column of the table. `StripeLog` stores all the data in one file. As a result, the `StripeLog` engine uses fewer file descriptors, but the `Log` engine provides higher efficiency when reading data.

-[Original article](https://clickhouse.com/docs/en/operations/table_engines/log_family/) <!--hide-->
--- a/docs/en/engines/table-engines/mergetree-family/mergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/mergetree.md
@ -68,40 +68,42 @@ For a description of parameters, see the [CREATE query description](../../../sql

 `ORDER BY` — The sorting key.

-    A tuple of column names or arbitrary expressions. Example: `ORDER BY (CounterID, EventDate)`.
+A tuple of column names or arbitrary expressions. Example: `ORDER BY (CounterID, EventDate)`.

-    ClickHouse uses the sorting key as a primary key if the primary key is not defined explicitly by the `PRIMARY KEY` clause.
+ClickHouse uses the sorting key as a primary key if the primary key is not defined explicitly by the `PRIMARY KEY` clause.

-    Use the `ORDER BY tuple()` syntax, if you do not need sorting. See [Selecting the Primary Key](#selecting-the-primary-key).
+Use the `ORDER BY tuple()` syntax, if you do not need sorting. See [Selecting the Primary Key](#selecting-the-primary-key).

 #### PARTITION BY

 `PARTITION BY` — The [partitioning key](../../../engines/table-engines/mergetree-family/custom-partitioning-key.md). Optional. In most cases you don't need partition key, and in most other cases you don't need partition key more granular than by months. Partitioning does not speed up queries (in contrast to the ORDER BY expression). You should never use too granular partitioning. Don't partition your data by client identifiers or names (instead make client identifier or name the first column in the ORDER BY expression).

-    For partitioning by month, use the `toYYYYMM(date_column)` expression, where `date_column` is a column with a date of the type [Date](../../../sql-reference/data-types/date.md). The partition names here have the `"YYYYMM"` format.
+For partitioning by month, use the `toYYYYMM(date_column)` expression, where `date_column` is a column with a date of the type [Date](../../../sql-reference/data-types/date.md). The partition names here have the `"YYYYMM"` format.

 #### PRIMARY KEY

 `PRIMARY KEY` — The primary key if it [differs from the sorting key](#choosing-a-primary-key-that-differs-from-the-sorting-key). Optional.

-    By default the primary key is the same as the sorting key (which is specified by the `ORDER BY` clause). Thus in most cases it is unnecessary to specify a separate `PRIMARY KEY` clause.
+By default the primary key is the same as the sorting key (which is specified by the `ORDER BY` clause). Thus in most cases it is unnecessary to specify a separate `PRIMARY KEY` clause.

 #### SAMPLE BY

 `SAMPLE BY` — An expression for sampling. Optional.

-    If a sampling expression is used, the primary key must contain it. The result of a sampling expression must be an unsigned integer. Example: `SAMPLE BY intHash32(UserID) ORDER BY (CounterID, EventDate, intHash32(UserID))`.
+If a sampling expression is used, the primary key must contain it. The result of a sampling expression must be an unsigned integer. Example: `SAMPLE BY intHash32(UserID) ORDER BY (CounterID, EventDate, intHash32(UserID))`.

 ####  TTL

 `TTL` — A list of rules specifying storage duration of rows and defining logic of automatic parts movement [between disks and volumes](#table_engine-mergetree-multiple-volumes). Optional.

-    Expression must have one `Date` or `DateTime` column as a result. Example:
-    `TTL date + INTERVAL 1 DAY`
+Expression must have one `Date` or `DateTime` column as a result. Example:
+```
+TTL date + INTERVAL 1 DAY
+```

-    Type of the rule `DELETE|TO DISK 'xxx'|TO VOLUME 'xxx'|GROUP BY` specifies an action to be done with the part if the expression is satisfied (reaches current time): removal of expired rows, moving a part (if expression is satisfied for all rows in a part) to specified disk (`TO DISK 'xxx'`) or to volume (`TO VOLUME 'xxx'`), or aggregating values in expired rows. Default type of the rule is removal (`DELETE`). List of multiple rules can be specified, but there should be no more than one `DELETE` rule.
+Type of the rule `DELETE|TO DISK 'xxx'|TO VOLUME 'xxx'|GROUP BY` specifies an action to be done with the part if the expression is satisfied (reaches current time): removal of expired rows, moving a part (if expression is satisfied for all rows in a part) to specified disk (`TO DISK 'xxx'`) or to volume (`TO VOLUME 'xxx'`), or aggregating values in expired rows. Default type of the rule is removal (`DELETE`). List of multiple rules can be specified, but there should be no more than one `DELETE` rule.

-    For more details, see [TTL for columns and tables](#table_engine-mergetree-ttl)
+For more details, see [TTL for columns and tables](#table_engine-mergetree-ttl)

 ### SETTINGS
 Additional parameters that control the behavior of the `MergeTree` (optional):
@ -129,7 +131,6 @@ Additional parameters that control the behavior of the `MergeTree` (optional):
 #### min_merge_bytes_to_use_direct_io

 `min_merge_bytes_to_use_direct_io` — The minimum data volume for merge operation that is required for using direct I/O access to the storage disk. When merging data parts, ClickHouse calculates the total storage volume of all the data to be merged. If the volume exceeds `min_merge_bytes_to_use_direct_io` bytes, ClickHouse reads and writes the data to the storage disk using the direct I/O interface (`O_DIRECT` option). If `min_merge_bytes_to_use_direct_io = 0`, then direct I/O is disabled. Default value: `10 * 1024 * 1024 * 1024` bytes.
-        <a name="mergetree_setting-merge_with_ttl_timeout"></a>

 #### merge_with_ttl_timeout

@ -305,15 +306,29 @@ For `SELECT` queries, ClickHouse analyzes whether an index can be used. An index
 Thus, it is possible to quickly run queries on one or many ranges of the primary key. In this example, queries will be fast when run for a specific tracking tag, for a specific tag and date range, for a specific tag and date, for multiple tags with a date range, and so on.

 Let’s look at the engine configured as follows:
-
-      ENGINE MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate) SETTINGS index_granularity=8192
+```sql
+ENGINE MergeTree()
+PARTITION BY toYYYYMM(EventDate)
+ORDER BY (CounterID, EventDate)
+SETTINGS index_granularity=8192
+```

 In this case, in queries:

 ``` sql
-SELECT count() FROM table WHERE EventDate = toDate(now()) AND CounterID = 34
-SELECT count() FROM table WHERE EventDate = toDate(now()) AND (CounterID = 34 OR CounterID = 42)
-SELECT count() FROM table WHERE ((EventDate >= toDate('2014-01-01') AND EventDate <= toDate('2014-01-31')) OR EventDate = toDate('2014-05-01')) AND CounterID IN (101500, 731962, 160656) AND (CounterID = 101500 OR EventDate != toDate('2014-05-01'))
+SELECT count() FROM table
+WHERE EventDate = toDate(now())
+AND CounterID = 34
+
+SELECT count() FROM table
+WHERE EventDate = toDate(now())
+AND (CounterID = 34 OR CounterID = 42)
+
+SELECT count() FROM table
+WHERE ((EventDate >= toDate('2014-01-01')
+AND EventDate <= toDate('2014-01-31')) OR EventDate = toDate('2014-05-01'))
+AND CounterID IN (101500, 731962, 160656)
+AND (CounterID = 101500 OR EventDate != toDate('2014-05-01'))
 ```

 ClickHouse will use the primary key index to trim improper data and the monthly partitioning key to trim partitions that are in improper date ranges.
@ -376,36 +391,36 @@ SELECT count() FROM table WHERE u64 * i32 == 10 AND u64 * length(s) >= 1234

 ####   `minmax`

-    Stores extremes of the specified expression (if the expression is `tuple`, then it stores extremes for each element of `tuple`), uses stored info for skipping blocks of data like the primary key.
+Stores extremes of the specified expression (if the expression is `tuple`, then it stores extremes for each element of `tuple`), uses stored info for skipping blocks of data like the primary key.

 ####   `set(max_rows)`

-    Stores unique values of the specified expression (no more than `max_rows` rows, `max_rows=0` means “no limits”). Uses the values to check if the `WHERE` expression is not satisfiable on a block of data.
+Stores unique values of the specified expression (no more than `max_rows` rows, `max_rows=0` means “no limits”). Uses the values to check if the `WHERE` expression is not satisfiable on a block of data.

 ####   `ngrambf_v1(n, size_of_bloom_filter_in_bytes, number_of_hash_functions, random_seed)`

-    Stores a [Bloom filter](https://en.wikipedia.org/wiki/Bloom_filter) that contains all ngrams from a block of data. Works only with datatypes: [String](../../../sql-reference/data-types/string.md), [FixedString](../../../sql-reference/data-types/fixedstring.md) and [Map](../../../sql-reference/data-types/map.md). Can be used for optimization of `EQUALS`, `LIKE` and `IN` expressions.
+Stores a [Bloom filter](https://en.wikipedia.org/wiki/Bloom_filter) that contains all ngrams from a block of data. Works only with datatypes: [String](../../../sql-reference/data-types/string.md), [FixedString](../../../sql-reference/data-types/fixedstring.md) and [Map](../../../sql-reference/data-types/map.md). Can be used for optimization of `EQUALS`, `LIKE` and `IN` expressions.

-    -   `n` — ngram size,
-    -   `size_of_bloom_filter_in_bytes` — Bloom filter size in bytes (you can use large values here, for example, 256 or 512, because it can be compressed well).
-    -   `number_of_hash_functions` — The number of hash functions used in the Bloom filter.
-    -   `random_seed` — The seed for Bloom filter hash functions.
+- `n` — ngram size,
+- `size_of_bloom_filter_in_bytes` — Bloom filter size in bytes (you can use large values here, for example, 256 or 512, because it can be compressed well).
+- `number_of_hash_functions` — The number of hash functions used in the Bloom filter.
+- `random_seed` — The seed for Bloom filter hash functions.

 ####   `tokenbf_v1(size_of_bloom_filter_in_bytes, number_of_hash_functions, random_seed)`

-    The same as `ngrambf_v1`, but stores tokens instead of ngrams. Tokens are sequences separated by non-alphanumeric characters.
+The same as `ngrambf_v1`, but stores tokens instead of ngrams. Tokens are sequences separated by non-alphanumeric characters.

 ####   `bloom_filter([false_positive])` — Stores a [Bloom filter](https://en.wikipedia.org/wiki/Bloom_filter) for the specified columns.

-    The optional `false_positive` parameter is the probability of receiving a false positive response from the filter. Possible values: (0, 1). Default value: 0.025.
+The optional `false_positive` parameter is the probability of receiving a false positive response from the filter. Possible values: (0, 1). Default value: 0.025.

-    Supported data types: `Int*`, `UInt*`, `Float*`, `Enum`, `Date`, `DateTime`, `String`, `FixedString`, `Array`, `LowCardinality`, `Nullable`, `UUID`, `Map`.
+Supported data types: `Int*`, `UInt*`, `Float*`, `Enum`, `Date`, `DateTime`, `String`, `FixedString`, `Array`, `LowCardinality`, `Nullable`, `UUID`, `Map`.

-    For `Map` data type client can specify if index should be created for keys or values using [mapKeys](../../../sql-reference/functions/tuple-map-functions.md#mapkeys) or [mapValues](../../../sql-reference/functions/tuple-map-functions.md#mapvalues) function.
+For `Map` data type client can specify if index should be created for keys or values using [mapKeys](../../../sql-reference/functions/tuple-map-functions.md#mapkeys) or [mapValues](../../../sql-reference/functions/tuple-map-functions.md#mapvalues) function.

-    The following functions can use the filter: [equals](../../../sql-reference/functions/comparison-functions.md), [notEquals](../../../sql-reference/functions/comparison-functions.md), [in](../../../sql-reference/functions/in-functions), [notIn](../../../sql-reference/functions/in-functions), [has](../../../sql-reference/functions/array-functions#hasarr-elem), [hasAny](../../../sql-reference/functions/array-functions#hasany), [hasAll](../../../sql-reference/functions/array-functions#hasall).
+The following functions can use the filter: [equals](../../../sql-reference/functions/comparison-functions.md), [notEquals](../../../sql-reference/functions/comparison-functions.md), [in](../../../sql-reference/functions/in-functions), [notIn](../../../sql-reference/functions/in-functions), [has](../../../sql-reference/functions/array-functions#hasarr-elem), [hasAny](../../../sql-reference/functions/array-functions#hasany), [hasAll](../../../sql-reference/functions/array-functions#hasall).

-    Example of index creation for `Map` data type
+Example of index creation for `Map` data type

 ```
 INDEX map_key_index mapKeys(map_column) TYPE bloom_filter GRANULARITY 1
--- a/docs/en/engines/table-engines/special/file.md
+++ b/docs/en/engines/table-engines/special/file.md
@ -86,4 +86,3 @@ $ echo -e "1,2\n3,4" | clickhouse-local -q "CREATE TABLE table (a Int64, b Int64
    -   Indices
    -   Replication

-[Original article](https://clickhouse.com/docs/en/operations/table_engines/special/file/) <!--hide-->
--- a/docs/en/engines/table-engines/special/join.md
+++ b/docs/en/engines/table-engines/special/join.md
@ -151,4 +151,3 @@ ALTER TABLE id_val_join DELETE WHERE id = 3;
 └────┴─────┘
 ```

-[Original article](https://clickhouse.com/docs/en/operations/table_engines/special/join/) <!--hide-->
--- a/docs/en/engines/table-engines/special/merge.md
+++ b/docs/en/engines/table-engines/special/merge.md
@ -86,4 +86,3 @@ SELECT * FROM WatchLog;
 -   [Virtual columns](../../../engines/table-engines/special/index.md#table_engines-virtual_columns)
 -   [merge](../../../sql-reference/table-functions/merge.md) table function

-[Original article](https://clickhouse.com/docs/en/operations/table_engines/special/merge/) <!--hide-->
--- a/docs/en/engines/table-engines/special/null.md
+++ b/docs/en/engines/table-engines/special/null.md
@ -10,6 +10,3 @@ When writing to a `Null` table, data is ignored. When reading from a `Null` tabl
 :::note
 If you are wondering why this is useful, note that you can create a materialized view on a `Null` table. So the data written to the table will end up affecting the view, but original raw data will still be discarded.
 :::
-
-
-[Original article](https://clickhouse.com/docs/en/operations/table_engines/special/null/) <!--hide-->
--- a/docs/en/engines/table-engines/special/set.md
+++ b/docs/en/engines/table-engines/special/set.md
@ -20,4 +20,3 @@ When creating a table, the following settings are applied:

 -   [persistent](../../../operations/settings/settings.md#persistent)

-[Original article](https://clickhouse.com/docs/en/operations/table_engines/special/set/) <!--hide-->
--- a/docs/en/engines/table-engines/special/url.md
+++ b/docs/en/engines/table-engines/special/url.md
@ -89,4 +89,3 @@ SELECT * FROM url_engine_table
    -   Indexes.
    -   Replication.

-[Original article](https://clickhouse.com/docs/en/operations/table_engines/special/url/) <!--hide-->
--- a/docs/en/getting-started/example-datasets/metrica.md
+++ b/docs/en/getting-started/example-datasets/metrica.md
@ -87,7 +87,7 @@ clickhouse-client --query "SELECT COUNT(*) FROM datasets.visits_v1"

 The hits and visits dataset is used in the ClickHouse test
 routines, this is one of the queries from the test suite. The rest
-of the tests are refernced in the *Next Steps* section at the
+of the tests are referenced in the *Next Steps* section at the
 end of this page.

 ```sql
--- a/docs/en/getting-started/install.md
+++ b/docs/en/getting-started/install.md
@ -127,22 +127,36 @@ After that downloaded archives should be unpacked and installed with installatio
 LATEST_VERSION=$(curl -s https://packages.clickhouse.com/tgz/stable/ | \
    grep -Eo '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | sort -V -r | head -n 1)
 export LATEST_VERSION
-curl -O "https://packages.clickhouse.com/tgz/stable/clickhouse-common-static-$LATEST_VERSION-amd64.tgz"
-curl -O "https://packages.clickhouse.com/tgz/stable/clickhouse-common-static-dbg-$LATEST_VERSION-amd64.tgz"
-curl -O "https://packages.clickhouse.com/tgz/stable/clickhouse-server-$LATEST_VERSION-amd64.tgz"
-curl -O "https://packages.clickhouse.com/tgz/stable/clickhouse-client-$LATEST_VERSION-amd64.tgz"

-tar -xzvf "clickhouse-common-static-$LATEST_VERSION-amd64.tgz"
+case $(uname -m) in
+  x86_64) ARCH=amd64 ;;
+  aarch64) ARCH=arm64 ;;
+  *) echo "Unknown architecture $(uname -m)"; exit 1 ;;
+esac
+
+for PKG in clickhouse-common-static clickhouse-common-static-dbg clickhouse-server clickhouse-client
+do
+  curl -fO "https://packages.clickhouse.com/tgz/stable/$PKG-$LATEST_VERSION-${ARCH}.tgz" \
+    || curl -fO "https://packages.clickhouse.com/tgz/stable/$PKG-$LATEST_VERSION.tgz"
+done
+
+exit 0
+
+tar -xzvf "clickhouse-common-static-$LATEST_VERSION-${ARCH}.tgz" \
+  || tar -xzvf "clickhouse-common-static-$LATEST_VERSION.tgz"
 sudo "clickhouse-common-static-$LATEST_VERSION/install/doinst.sh"

-tar -xzvf "clickhouse-common-static-dbg-$LATEST_VERSION-amd64.tgz"
+tar -xzvf "clickhouse-common-static-dbg-$LATEST_VERSION-${ARCH}.tgz" \
+  || tar -xzvf "clickhouse-common-static-dbg-$LATEST_VERSION.tgz"
 sudo "clickhouse-common-static-dbg-$LATEST_VERSION/install/doinst.sh"

-tar -xzvf "clickhouse-server-$LATEST_VERSION-amd64.tgz"
+tar -xzvf "clickhouse-server-$LATEST_VERSION-${ARCH}.tgz" \
+  || tar -xzvf "clickhouse-server-$LATEST_VERSION.tgz"
 sudo "clickhouse-server-$LATEST_VERSION/install/doinst.sh"
 sudo /etc/init.d/clickhouse-server start

-tar -xzvf "clickhouse-client-$LATEST_VERSION-amd64.tgz"
+tar -xzvf "clickhouse-client-$LATEST_VERSION-${ARCH}.tgz" \
+  || tar -xzvf "clickhouse-client-$LATEST_VERSION.tgz"
 sudo "clickhouse-client-$LATEST_VERSION/install/doinst.sh"
 ```

--- a/docs/en/interfaces/formats.md
+++ b/docs/en/interfaces/formats.md
@ -11,68 +11,69 @@ results of a `SELECT`, and to perform `INSERT`s into a file-backed table.
 The supported formats are:

 | Format                                                                                    | Input | Output |
-|-------------------------------------------------------------------------------------------|-------|--------|
-| [TabSeparated](#tabseparated)                                                             | ✔     | ✔      |
-| [TabSeparatedRaw](#tabseparatedraw)                                                       | ✔     | ✔      |
-| [TabSeparatedWithNames](#tabseparatedwithnames)                                           | ✔     | ✔      |
-| [TabSeparatedWithNamesAndTypes](#tabseparatedwithnamesandtypes)                           | ✔     | ✔      |
-| [TabSeparatedRawWithNames](#tabseparatedrawwithnames)                                     | ✔     | ✔      |
-| [TabSeparatedRawWithNamesAndTypes](#tabseparatedrawwithnamesandtypes)                     | ✔     | ✔      |
-| [Template](#format-template)                                                              | ✔     | ✔      |
-| [TemplateIgnoreSpaces](#templateignorespaces)                                             | ✔     | ✗      |
-| [CSV](#csv)                                                                               | ✔     | ✔      |
-| [CSVWithNames](#csvwithnames)                                                             | ✔     | ✔      |
-| [CSVWithNamesAndTypes](#csvwithnamesandtypes)                                             | ✔     | ✔      |
-| [CustomSeparated](#format-customseparated)                                                | ✔     | ✔      |
-| [CustomSeparatedWithNames](#customseparatedwithnames)                                     | ✔     | ✔      |
-| [CustomSeparatedWithNamesAndTypes](#customseparatedwithnamesandtypes)                     | ✔     | ✔      |
-| [Values](#data-format-values)                                                             | ✔     | ✔      |
-| [Vertical](#vertical)                                                                     | ✗     | ✔      |
-| [JSON](#json)                                                                             | ✗     | ✔      |
-| [JSONAsString](#jsonasstring)                                                             | ✔     | ✗      |
-| [JSONStrings](#jsonstrings)                                                               | ✗     | ✔      |
-| [JSONColumns](#jsoncolumns)                                                               | ✔     | ✔      |
-| [JSONColumnsWithMetadata](#jsoncolumnswithmetadata)                                       | ✗     | ✔      |
-| [JSONCompact](#jsoncompact)                                                               | ✗     | ✔      |
-| [JSONCompactStrings](#jsoncompactstrings)                                                 | ✗     | ✔      |
-| [JSONCompactColumns](#jsoncompactcolumns)                                                 | ✔     | ✔      |
-| [JSONEachRow](#jsoneachrow)                                                               | ✔     | ✔      |
-| [JSONEachRowWithProgress](#jsoneachrowwithprogress)                                       | ✗     | ✔      |
-| [JSONStringsEachRow](#jsonstringseachrow)                                                 | ✔     | ✔      |
-| [JSONStringsEachRowWithProgress](#jsonstringseachrowwithprogress)                         | ✗     | ✔      |
-| [JSONCompactEachRow](#jsoncompacteachrow)                                                 | ✔     | ✔      |
-| [JSONCompactEachRowWithNames](#jsoncompacteachrowwithnames)                               | ✔     | ✔      |
-| [JSONCompactEachRowWithNamesAndTypes](#jsoncompacteachrowwithnamesandtypes)               | ✔     | ✔      |
-| [JSONCompactStringsEachRow](#jsoncompactstringseachrow)                                   | ✔     | ✔      |
-| [JSONCompactStringsEachRowWithNames](#jsoncompactstringseachrowwithnames)                 | ✔     | ✔      |
-| [JSONCompactStringsEachRowWithNamesAndTypes](#jsoncompactstringseachrowwithnamesandtypes) | ✔     | ✔      |
-| [TSKV](#tskv)                                                                             | ✔     | ✔      |
-| [Pretty](#pretty)                                                                         | ✗     | ✔      |
-| [PrettyCompact](#prettycompact)                                                           | ✗     | ✔      |
-| [PrettyCompactMonoBlock](#prettycompactmonoblock)                                         | ✗     | ✔      |
-| [PrettyNoEscapes](#prettynoescapes)                                                       | ✗     | ✔      |
-| [PrettySpace](#prettyspace)                                                               | ✗     | ✔      |
-| [Prometheus](#prometheus)                                                                 | ✗     | ✔      |
-| [Protobuf](#protobuf)                                                                     | ✔     | ✔      |
-| [ProtobufSingle](#protobufsingle)                                                         | ✔     | ✔      |
-| [Avro](#data-format-avro)                                                                 | ✔     | ✔      |
-| [AvroConfluent](#data-format-avro-confluent)                                              | ✔     | ✗      |
-| [Parquet](#data-format-parquet)                                                           | ✔     | ✔      |
-| [Arrow](#data-format-arrow)                                                               | ✔     | ✔      |
-| [ArrowStream](#data-format-arrow-stream)                                                  | ✔     | ✔      |
-| [ORC](#data-format-orc)                                                                   | ✔     | ✔      |
-| [RowBinary](#rowbinary)                                                                   | ✔     | ✔      |
-| [RowBinaryWithNames](#rowbinarywithnamesandtypes)                                         | ✔     | ✔      |
-| [RowBinaryWithNamesAndTypes](#rowbinarywithnamesandtypes)                                 | ✔     | ✔      |
-| [Native](#native)                                                                         | ✔     | ✔      |
-| [Null](#null)                                                                             | ✗     | ✔      |
-| [XML](#xml)                                                                               | ✗     | ✔      |
-| [CapnProto](#capnproto)                                                                   | ✔     | ✔      |
-| [LineAsString](#lineasstring)                                                             | ✔     | ✗      |
-| [Regexp](#data-format-regexp)                                                             | ✔     | ✗      |
-| [RawBLOB](#rawblob)                                                                       | ✔     | ✔      |
-| [MsgPack](#msgpack)                                                                       | ✔     | ✔      |
-| [MySQLDump](#mysqldump)                                                                   | ✔     | ✗      |
+|-------------------------------------------------------------------------------------------|------|--------|
+| [TabSeparated](#tabseparated)                                                             | ✔    | ✔      |
+| [TabSeparatedRaw](#tabseparatedraw)                                                       | ✔    | ✔      |
+| [TabSeparatedWithNames](#tabseparatedwithnames)                                           | ✔    | ✔      |
+| [TabSeparatedWithNamesAndTypes](#tabseparatedwithnamesandtypes)                           | ✔    | ✔      |
+| [TabSeparatedRawWithNames](#tabseparatedrawwithnames)                                     | ✔    | ✔      |
+| [TabSeparatedRawWithNamesAndTypes](#tabseparatedrawwithnamesandtypes)                     | ✔    | ✔      |
+| [Template](#format-template)                                                              | ✔    | ✔      |
+| [TemplateIgnoreSpaces](#templateignorespaces)                                             | ✔    | ✗      |
+| [CSV](#csv)                                                                               | ✔    | ✔      |
+| [CSVWithNames](#csvwithnames)                                                             | ✔    | ✔      |
+| [CSVWithNamesAndTypes](#csvwithnamesandtypes)                                             | ✔    | ✔      |
+| [CustomSeparated](#format-customseparated)                                                | ✔    | ✔      |
+| [CustomSeparatedWithNames](#customseparatedwithnames)                                     | ✔    | ✔      |
+| [CustomSeparatedWithNamesAndTypes](#customseparatedwithnamesandtypes)                     | ✔    | ✔      |
+| [SQLInsert](#sqlinsert)                                                                   | ✗    | ✔      |
+| [Values](#data-format-values)                                                             | ✔    | ✔      |
+| [Vertical](#vertical)                                                                     | ✗    | ✔      |
+| [JSON](#json)                                                                             | ✗    | ✔      |
+| [JSONAsString](#jsonasstring)                                                             | ✔    | ✗      |
+| [JSONStrings](#jsonstrings)                                                               | ✗    | ✔      |
+| [JSONColumns](#jsoncolumns)                                                               | ✔    | ✔      |
+| [JSONColumnsWithMetadata](#jsoncolumnswithmetadata)                                       | ✗    | ✔      |
+| [JSONCompact](#jsoncompact)                                                               | ✗    | ✔      |
+| [JSONCompactStrings](#jsoncompactstrings)                                                 | ✗    | ✔      |
+| [JSONCompactColumns](#jsoncompactcolumns)                                                 | ✔    | ✔      |
+| [JSONEachRow](#jsoneachrow)                                                               | ✔    | ✔      |
+| [JSONEachRowWithProgress](#jsoneachrowwithprogress)                                       | ✗    | ✔      |
+| [JSONStringsEachRow](#jsonstringseachrow)                                                 | ✔    | ✔      |
+| [JSONStringsEachRowWithProgress](#jsonstringseachrowwithprogress)                         | ✗    | ✔      |
+| [JSONCompactEachRow](#jsoncompacteachrow)                                                 | ✔    | ✔      |
+| [JSONCompactEachRowWithNames](#jsoncompacteachrowwithnames)                               | ✔    | ✔      |
+| [JSONCompactEachRowWithNamesAndTypes](#jsoncompacteachrowwithnamesandtypes)               | ✔    | ✔      |
+| [JSONCompactStringsEachRow](#jsoncompactstringseachrow)                                   | ✔    | ✔      |
+| [JSONCompactStringsEachRowWithNames](#jsoncompactstringseachrowwithnames)                 | ✔    | ✔      |
+| [JSONCompactStringsEachRowWithNamesAndTypes](#jsoncompactstringseachrowwithnamesandtypes) | ✔    | ✔      |
+| [TSKV](#tskv)                                                                             | ✔    | ✔      |
+| [Pretty](#pretty)                                                                         | ✗    | ✔      |
+| [PrettyCompact](#prettycompact)                                                           | ✗    | ✔      |
+| [PrettyCompactMonoBlock](#prettycompactmonoblock)                                         | ✗    | ✔      |
+| [PrettyNoEscapes](#prettynoescapes)                                                       | ✗    | ✔      |
+| [PrettySpace](#prettyspace)                                                               | ✗    | ✔      |
+| [Prometheus](#prometheus)                                                                 | ✗    | ✔      |
+| [Protobuf](#protobuf)                                                                     | ✔    | ✔      |
+| [ProtobufSingle](#protobufsingle)                                                         | ✔    | ✔      |
+| [Avro](#data-format-avro)                                                                 | ✔    | ✔      |
+| [AvroConfluent](#data-format-avro-confluent)                                              | ✔    | ✗      |
+| [Parquet](#data-format-parquet)                                                           | ✔    | ✔      |
+| [Arrow](#data-format-arrow)                                                               | ✔    | ✔      |
+| [ArrowStream](#data-format-arrow-stream)                                                  | ✔    | ✔      |
+| [ORC](#data-format-orc)                                                                   | ✔    | ✔      |
+| [RowBinary](#rowbinary)                                                                   | ✔    | ✔      |
+| [RowBinaryWithNames](#rowbinarywithnamesandtypes)                                         | ✔    | ✔      |
+| [RowBinaryWithNamesAndTypes](#rowbinarywithnamesandtypes)                                 | ✔    | ✔      |
+| [Native](#native)                                                                         | ✔    | ✔      |
+| [Null](#null)                                                                             | ✗    | ✔      |
+| [XML](#xml)                                                                               | ✗    | ✔      |
+| [CapnProto](#capnproto)                                                                   | ✔    | ✔      |
+| [LineAsString](#lineasstring)                                                             | ✔    | ✗      |
+| [Regexp](#data-format-regexp)                                                             | ✔    | ✗      |
+| [RawBLOB](#rawblob)                                                                       | ✔    | ✔      |
+| [MsgPack](#msgpack)                                                                       | ✔    | ✔      |
+| [MySQLDump](#mysqldump)                                                                   | ✔    | ✗      |


 You can control some format processing parameters with the ClickHouse settings. For more information read the [Settings](../operations/settings/settings.md) section.
@ -468,6 +469,34 @@ Also prints the header row with column names, similar to [TabSeparatedWithNames]

 Also prints two header rows with column names and types, similar to [TabSeparatedWithNamesAndTypes](#tabseparatedwithnamesandtypes).

+## SQLInsert {#sqlinsert}
+
+Outputs data as a sequence of `INSERT INTO table (columns...) VALUES (...), (...) ...;` statements.
+
+Example:
+
+```sql
+SELECT number AS x, number + 1 AS y, 'Hello' AS z FROM numbers(10) FORMAT SQLInsert SETTINGS output_format_sql_insert_max_batch_size = 2
+```
+
+```sql
+INSERT INTO table (x, y, z) VALUES (0, 1, 'Hello'), (1, 2, 'Hello');
+INSERT INTO table (x, y, z) VALUES (2, 3, 'Hello'), (3, 4, 'Hello');
+INSERT INTO table (x, y, z) VALUES (4, 5, 'Hello'), (5, 6, 'Hello');
+INSERT INTO table (x, y, z) VALUES (6, 7, 'Hello'), (7, 8, 'Hello');
+INSERT INTO table (x, y, z) VALUES (8, 9, 'Hello'), (9, 10, 'Hello');
+```
+
+To read data output by this format ypu can use [MySQLDump](#mysqldump) input format.
+
+### SQLInsert format settings {#sqlinsert-format-settings}
+
+- [output_format_sql_insert_max_batch_size](../operations/settings/settings.md#output_format_sql_insert_max_batch_size) - The maximum number of rows in one INSERT statement. Default value - `65505`.
+- [output_format_sql_insert_table_name](../operations/settings/settings.md#output_format_sql_insert_table_name) - The name of table in the output INSERT query. Default value - `'table'`.
+- [output_format_sql_insert_include_column_names](../operations/settings/settings.md#output_format_sql_insert_include_column_names) - Include column names in INSERT query. Default value - `true`.
+- [output_format_sql_insert_use_replace](../operations/settings/settings.md#output_format_sql_insert_use_replace) - Use REPLACE statement instead of INSERT. Default value - `false`.
+- [output_format_sql_insert_quote_names](../operations/settings/settings.md#output_format_sql_insert_quote_names) - Quote column names with "\`" characters . Default value - `true`.
+
 ## JSON {#json}

 Outputs data in JSON format. Besides data tables, it also outputs column names and types, along with some additional information: the total number of output rows, and the number of rows that could have been output if there weren’t a LIMIT. Example:
--- a/docs/en/interfaces/third-party/client-libraries.md
+++ b/docs/en/interfaces/third-party/client-libraries.md
@ -51,7 +51,6 @@ ClickHouse Inc does **not** maintain the libraries listed below and hasn’t don
    -   [clickhouse-rs](https://github.com/suharev7/clickhouse-rs)
    -   [Klickhouse](https://github.com/Protryon/klickhouse)
 -   R
-    -   [clickhouse-r](https://github.com/hannesmuehleisen/clickhouse-r)
    -   [RClickHouse](https://github.com/IMSMWU/RClickHouse)
 -   Java
    -   [clickhouse-client-java](https://github.com/VirtusAI/clickhouse-client-java)
--- a/docs/en/operations/external-authenticators/index.md
+++ b/docs/en/operations/external-authenticators/index.md
@ -13,4 +13,3 @@ The following external authenticators and directories are supported:
 - Kerberos [Authenticator](./kerberos.md#external-authenticators-kerberos)
 - [SSL X.509 authentication](./ssl-x509.md#ssl-external-authentication)

-[Original article](https://clickhouse.com/docs/en/operations/external-authenticators/index/) <!--hide-->
--- a/docs/en/operations/settings/settings.md
+++ b/docs/en/operations/settings/settings.md
@ -4637,3 +4637,35 @@ Possible values:
 - 1 — Enabled.

 Default value: 1.
+
+## SQLInsert format settings {$sqlinsert-format-settings}
+
+### output_format_sql_insert_max_batch_size {#output_format_sql_insert_max_batch_size}
+
+The maximum number of rows in one INSERT statement.
+
+Default value: `65505`.
+
+### output_format_sql_insert_table_name {#output_format_sql_insert_table_name}
+
+The name of table that will be used in the output INSERT statement.
+
+Default value: `'table''`.
+
+### output_format_sql_insert_include_column_names {#output_format_sql_insert_include_column_names}
+
+Include column names in INSERT statement.
+
+Default value: `true`.
+
+### output_format_sql_insert_use_replace {#output_format_sql_insert_use_replace}
+
+Use REPLACE keyword instead of INSERT.
+
+Default value: `false`.
+
+### output_format_sql_insert_quote_names {#output_format_sql_insert_quote_names}
+
+Quote column names with "`" characters
+
+Default value: `true`.
--- a/docs/en/operations/system-tables/distributed_ddl_queue.md
+++ b/docs/en/operations/system-tables/distributed_ddl_queue.md
@ -61,4 +61,3 @@ exception_code:    ZOK
 2 rows in set. Elapsed: 0.025 sec.
 ```

-[Original article](https://clickhouse.com/docs/en/operations/system_tables/distributed_ddl_queuedistributed_ddl_queue.md) <!--hide-->
--- a/docs/en/operations/system-tables/distribution_queue.md
+++ b/docs/en/operations/system-tables/distribution_queue.md
@ -47,4 +47,3 @@ last_exception:

 -   [Distributed table engine](../../engines/table-engines/special/distributed.md)

-[Original article](https://clickhouse.com/docs/en/operations/system_tables/distribution_queue) <!--hide-->
--- a/docs/en/operations/system-tables/opentelemetry_span_log.md
+++ b/docs/en/operations/system-tables/opentelemetry_span_log.md
@ -50,4 +50,3 @@ attribute.values: []

 -   [OpenTelemetry](../../operations/opentelemetry.md)

-[Original article](https://clickhouse.com/docs/en/operations/system_tables/opentelemetry_span_log) <!--hide-->
--- a/docs/en/operations/system-tables/parts_columns.md
+++ b/docs/en/operations/system-tables/parts_columns.md
@ -145,4 +145,3 @@ column_marks_bytes:                    48

 -   [MergeTree family](../../engines/table-engines/mergetree-family/mergetree.md)

-[Original article](https://clickhouse.com/docs/en/operations/system_tables/parts_columns) <!--hide-->
--- a/docs/en/operations/system-tables/replication_queue.md
+++ b/docs/en/operations/system-tables/replication_queue.md
@ -88,4 +88,3 @@ last_postpone_time:     1970-01-01 03:00:00

 -   [Managing ReplicatedMergeTree Tables](../../sql-reference/statements/system.md#query-language-system-replicated)

-[Original article](https://clickhouse.com/docs/en/operations/system_tables/replication_queue) <!--hide-->
--- a/docs/en/operations/tips.md
+++ b/docs/en/operations/tips.md
@ -128,7 +128,8 @@ You should never use manually written scripts to transfer data between different

 If you want to divide an existing ZooKeeper cluster into two, the correct way is to increase the number of its replicas and then reconfigure it as two independent clusters.

-You can run ClickHouse Keeper on the same server as ClickHouse, but 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 run ClickHouse Keeper on the same server as ClickHouse in test environments, or in environments with low ingestion rate. 
+For production environments we suggest to use separate servers for ClickHouse and ZooKeeper/Keeper, or place ClickHouse files and Keeper files on to separate disks. Because ZooKeeper/Keeper are very sensitive for disk 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.

--- a/docs/en/sql-reference/aggregate-functions/reference/meanztest.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/meanztest.md
@ -66,5 +66,3 @@ Result:
 └──────────────────────────────────────────────────────────────────────────────────┘
 ```

-
-[Original article](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/meanZTest/) <!--hide-->
--- a/docs/en/sql-reference/aggregate-functions/reference/welchttest.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/welchttest.md
@ -69,4 +69,3 @@ Result:
 -   [Welch's t-test](https://en.wikipedia.org/wiki/Welch%27s_t-test)
 -   [studentTTest function](studentttest.md#studentttest)

-[Original article](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/welchTTest/) <!--hide-->
--- a/docs/en/sql-reference/data-types/domains/index.md
+++ b/docs/en/sql-reference/data-types/domains/index.md
@ -27,4 +27,3 @@ You can use domains anywhere corresponding base type can be used, for example:
 -   Can’t implicitly convert string values into domain values when inserting data from another column or table.
 -   Domain adds no constrains on stored values.

-[Original article](https://clickhouse.com/docs/en/data_types/domains/) <!--hide-->
--- a/docs/en/sql-reference/data-types/geo.md
+++ b/docs/en/sql-reference/data-types/geo.md
@ -104,4 +104,3 @@ Result:
 └─────────────────────────────────────────────────────────────────────────────────────────────────┴─────────────────┘
 ```

-[Original article](https://clickhouse.com/docs/en/data-types/geo/) <!--hide-->
--- a/docs/en/sql-reference/data-types/map.md
+++ b/docs/en/sql-reference/data-types/map.md
@ -108,4 +108,3 @@ Result:
 -   [map()](../../sql-reference/functions/tuple-map-functions.md#function-map) function
 -   [CAST()](../../sql-reference/functions/type-conversion-functions.md#type_conversion_function-cast) function

-[Original article](https://clickhouse.com/docs/en/data-types/map/) <!--hide-->
--- a/docs/en/sql-reference/data-types/simpleaggregatefunction.md
+++ b/docs/en/sql-reference/data-types/simpleaggregatefunction.md
@ -39,4 +39,3 @@ Values of the `SimpleAggregateFunction(func, Type)` look and stored the same way
 CREATE TABLE simple (id UInt64, val SimpleAggregateFunction(sum, Double)) ENGINE=AggregatingMergeTree ORDER BY id;
 ```

-[Original article](https://clickhouse.com/docs/en/data_types/simpleaggregatefunction/) <!--hide-->
--- a/docs/en/sql-reference/functions/encryption-functions.md
+++ b/docs/en/sql-reference/functions/encryption-functions.md
@ -355,4 +355,3 @@ Result:
 └───────────┘
 ```

-[Original article](https://clickhouse.com/docs/en/sql-reference/functions/encryption_functions/) <!--hide-->
--- a/docs/en/sql-reference/functions/geo/index.md
+++ b/docs/en/sql-reference/functions/geo/index.md
@ -3,6 +3,74 @@ sidebar_label: Geo
 sidebar_position: 62
 ---

-# Geo Functions
+# Geo Functions 
+
+## Geographical Coordinates Functions
+
+-   [greatCircleDistance](./coordinates.md#greatCircleDistance)
+-   [geoDistance](./coordinates.md#geoDistance)
+-   [greatCircleAngle](./coordinates.md#greatCircleAngle)
+-   [pointInEllipses](./coordinates.md#pointInEllipses)
+-   [pointInPolygon](./coordinates.md#pointInPolygon)
+
+## Geohash Functions
+-   [geohashEncode](./geohash.md#geohashEncode)
+-   [geohashDecode](./geohash.md#geohashDecode)
+-   [geohashesInBox](./geohash.md#geohashesInBox)
+
+## H3 Indexes Functions
+
+-   [h3IsValid](./h3.md#h3IsValid)
+-   [h3GetResolution](./h3.md#h3GetResolution)
+-   [h3EdgeAngle](./h3.md#h3EdgeAngle)
+-   [h3EdgeLengthM](./h3.md#h3EdgeLengthM)
+-   [h3EdgeLengthKm](./h3.md#h3EdgeLengthKm)
+-   [geoToH3](./h3.md#geoToH3)
+-   [h3ToGeo](./h3.md#h3ToGeo)
+-   [h3ToGeoBoundary](./h3.md#h3ToGeoBoundary)
+-   [h3kRing](./h3.md#h3kRing)
+-   [h3GetBaseCell](./h3.md#h3GetBaseCell)
+-   [h3HexAreaM2](./h3.md#h3HexAreaM2)
+-   [h3HexAreaKm2](./h3.md#h3HexAreaKm2)
+-   [h3IndexesAreNeighbors](./h3.md#h3IndexesAreNeighbors)
+-   [h3ToChildren](./h3.md#h3ToChildren)
+-   [h3ToParent](./h3.md#h3ToParent)
+-   [h3ToString](./h3.md#h3ToString)
+-   [stringToH3](./h3.md#stringToH3)
+-   [h3GetResolution](./h3.md#h3GetResolution)
+-   [h3IsResClassIII](./h3.md#h3IsResClassIII)
+-   [h3IsPentagon](./h3.md#h3IsPentagon)
+-   [h3GetFaces](./h3.md#h3GetFaces)
+-   [h3CellAreaM2](./h3.md#h3CellAreaM2)
+-   [h3CellAreaRads2](./h3.md#h3CellAreaRads2)
+-   [h3ToCenterChild](./h3.md#h3ToCenterChild)
+-   [h3ExactEdgeLengthM](./h3.md#h3ExactEdgeLengthM)
+-   [h3ExactEdgeLengthKm](./h3.md#h3ExactEdgeLengthKm)
+-   [h3ExactEdgeLengthRads](./h3.md#h3ExactEdgeLengthRads)
+-   [h3NumHexagons](./h3.md#h3NumHexagons)
+-   [h3Line](./h3.md#h3Line)
+-   [h3Distance](./h3.md#h3Distance)
+-   [h3HexRing](./h3.md#h3HexRing)
+-   [h3GetUnidirectionalEdge](./h3.md#h3GetUnidirectionalEdge)
+-   [h3UnidirectionalEdgeIsValid](./h3.md#h3UnidirectionalEdgeIsValid)
+-   [h3GetOriginIndexFromUnidirectionalEdge](./h3.md#h3GetOriginIndexFromUnidirectionalEdge)
+-   [h3GetDestinationIndexFromUnidirectionalEdge](./h3.md#h3GetDestinationIndexFromUnidirectionalEdge)
+-   [h3GetIndexesFromUnidirectionalEdge](./h3.md#h3GetIndexesFromUnidirectionalEdge)
+-   [h3GetUnidirectionalEdgesFromHexagon](./h3.md#h3GetUnidirectionalEdgesFromHexagon)
+-   [h3GetUnidirectionalEdgeBoundary](./h3.md#h3GetUnidirectionalEdgeBoundary)
+
+## S2 Index Functions
+
+-   [geoToS2](./s2.md#geoToS2)
+-   [s2ToGeo](./s2.md#s2ToGeo)
+-   [s2GetNeighbors](./s2.md#s2GetNeighbors)
+-   [s2CellsIntersect](./s2.md#s2CellsIntersect)
+-   [s2CapContains](./s2.md#s2CapContains)
+-   [s2CapUnion](./s2.md#s2CapUnion)
+-   [s2RectAdd](./s2.md#s2RectAdd)
+-   [s2RectContains](./s2.md#s2RectContains)
+-   [s2RectUinion](./s2.md#s2RectUinion)
+-   [s2RectIntersection](./s2.md#s2RectIntersection)
+

 [Original article](https://clickhouse.com/docs/en/sql-reference/functions/geo/) <!--hide-->
--- a/docs/en/sql-reference/statements/create/function.md
+++ b/docs/en/sql-reference/statements/create/function.md
@ -10,7 +10,7 @@ Creates a user defined function from a lambda expression. The expression must co
 **Syntax**

 ```sql
-CREATE FUNCTION name AS (parameter0, ...) -> expression
+CREATE FUNCTION name [ON CLUSTER cluster] AS (parameter0, ...) -> expression
 ```
 A function can have an arbitrary number of parameters.

--- a/docs/en/sql-reference/statements/drop.md
+++ b/docs/en/sql-reference/statements/drop.md
@ -105,7 +105,7 @@ System functions can not be dropped.
 **Syntax**

 ``` sql
-DROP FUNCTION [IF EXISTS] function_name
+DROP FUNCTION [IF EXISTS] function_name [on CLUSTER cluster]
 ```

 **Example**
--- a/docs/en/sql-reference/statements/select/group-by.md
+++ b/docs/en/sql-reference/statements/select/group-by.md
@ -312,11 +312,11 @@ The aggregation can be performed more effectively, if a table is sorted by some
 ### GROUP BY in External Memory

 You can enable dumping temporary data to the disk to restrict memory usage during `GROUP BY`.
-The [max_bytes_before_external_group_by](../../../operations/settings/settings.md#settings-max_bytes_before_external_group_by) setting determines the threshold RAM consumption for dumping `GROUP BY` temporary data to the file system. If set to 0 (the default), it is disabled.
+The [max_bytes_before_external_group_by](../../../operations/settings/query-complexity.md#settings-max_bytes_before_external_group_by) setting determines the threshold RAM consumption for dumping `GROUP BY` temporary data to the file system. If set to 0 (the default), it is disabled.

 When using `max_bytes_before_external_group_by`, we recommend that you set `max_memory_usage` about twice as high. This is necessary because there are two stages to aggregation: reading the data and forming intermediate data (1) and merging the intermediate data (2). Dumping data to the file system can only occur during stage 1. If the temporary data wasn’t dumped, then stage 2 might require up to the same amount of memory as in stage 1.

-For example, if [max_memory_usage](../../../operations/settings/settings.md#settings_max_memory_usage) was set to 10000000000 and you want to use external aggregation, it makes sense to set `max_bytes_before_external_group_by` to 10000000000, and `max_memory_usage` to 20000000000. When external aggregation is triggered (if there was at least one dump of temporary data), maximum consumption of RAM is only slightly more than `max_bytes_before_external_group_by`.
+For example, if [max_memory_usage](../../../operations/settings/query-complexity.md#settings_max_memory_usage) was set to 10000000000 and you want to use external aggregation, it makes sense to set `max_bytes_before_external_group_by` to 10000000000, and `max_memory_usage` to 20000000000. When external aggregation is triggered (if there was at least one dump of temporary data), maximum consumption of RAM is only slightly more than `max_bytes_before_external_group_by`.

 With distributed query processing, external aggregation is performed on remote servers. In order for the requester server to use only a small amount of RAM, set `distributed_aggregation_memory_efficient` to 1.

--- a/docs/en/sql-reference/table-functions/mysql.md
+++ b/docs/en/sql-reference/table-functions/mysql.md
@ -111,4 +111,3 @@ SELECT * FROM mysql('localhost:3306', 'test', 'test', 'bayonet', '123');
 -   [The ‘MySQL’ table engine](../../engines/table-engines/integrations/mysql.md)
 -   [Using MySQL as a source of external dictionary](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-mysql)

-[Original article](https://clickhouse.com/docs/en/sql-reference/table_functions/mysql/) <!--hide-->
--- a/docs/ru/getting-started/install.md
+++ b/docs/ru/getting-started/install.md
@ -124,22 +124,36 @@ sudo yum install clickhouse-server clickhouse-client
 LATEST_VERSION=$(curl -s https://packages.clickhouse.com/tgz/stable/ | \
    grep -Eo '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | sort -V -r | head -n 1)
 export LATEST_VERSION
-curl -O "https://packages.clickhouse.com/tgz/stable/clickhouse-common-static-$LATEST_VERSION.tgz"
-curl -O "https://packages.clickhouse.com/tgz/stable/clickhouse-common-static-dbg-$LATEST_VERSION.tgz"
-curl -O "https://packages.clickhouse.com/tgz/stable/clickhouse-server-$LATEST_VERSION.tgz"
-curl -O "https://packages.clickhouse.com/tgz/stable/clickhouse-client-$LATEST_VERSION.tgz"

-tar -xzvf "clickhouse-common-static-$LATEST_VERSION.tgz"
+case $(uname -m) in
+  x86_64) ARCH=amd64 ;;
+  aarch64) ARCH=arm64 ;;
+  *) echo "Unknown architecture $(uname -m)"; exit 1 ;;
+esac
+
+for PKG in clickhouse-common-static clickhouse-common-static-dbg clickhouse-server clickhouse-client
+do
+  curl -fO "https://packages.clickhouse.com/tgz/stable/$PKG-$LATEST_VERSION-${ARCH}.tgz" \
+    || curl -fO "https://packages.clickhouse.com/tgz/stable/$PKG-$LATEST_VERSION.tgz"
+done
+
+exit 0
+
+tar -xzvf "clickhouse-common-static-$LATEST_VERSION-${ARCH}.tgz" \
+  || tar -xzvf "clickhouse-common-static-$LATEST_VERSION.tgz"
 sudo "clickhouse-common-static-$LATEST_VERSION/install/doinst.sh"

-tar -xzvf "clickhouse-common-static-dbg-$LATEST_VERSION.tgz"
+tar -xzvf "clickhouse-common-static-dbg-$LATEST_VERSION-${ARCH}.tgz" \
+  || tar -xzvf "clickhouse-common-static-dbg-$LATEST_VERSION.tgz"
 sudo "clickhouse-common-static-dbg-$LATEST_VERSION/install/doinst.sh"

-tar -xzvf "clickhouse-server-$LATEST_VERSION.tgz"
+tar -xzvf "clickhouse-server-$LATEST_VERSION-${ARCH}.tgz" \
+  || tar -xzvf "clickhouse-server-$LATEST_VERSION.tgz"
 sudo "clickhouse-server-$LATEST_VERSION/install/doinst.sh"
 sudo /etc/init.d/clickhouse-server start

-tar -xzvf "clickhouse-client-$LATEST_VERSION.tgz"
+tar -xzvf "clickhouse-client-$LATEST_VERSION-${ARCH}.tgz" \
+  || tar -xzvf "clickhouse-client-$LATEST_VERSION.tgz"
 sudo "clickhouse-client-$LATEST_VERSION/install/doinst.sh"
 ```

--- a/docs/ru/interfaces/third-party/client-libraries.md
+++ b/docs/ru/interfaces/third-party/client-libraries.md
@ -45,7 +45,6 @@ sidebar_label: "Клиентские библиотеки от сторонни
    -   [clickhouse-rs](https://github.com/suharev7/clickhouse-rs)
    -   [Klickhouse](https://github.com/Protryon/klickhouse)
 -   R
-    -   [clickhouse-r](https://github.com/hannesmuehleisen/clickhouse-r)
    -   [RClickhouse](https://github.com/IMSMWU/RClickhouse)
 -   Java
    -   [clickhouse-client-java](https://github.com/VirtusAI/clickhouse-client-java)
--- a/docs/ru/sql-reference/statements/select/group-by.md
+++ b/docs/ru/sql-reference/statements/select/group-by.md
@ -264,10 +264,10 @@ GROUP BY вычисляет для каждого встретившегося
 ### Группировка во внешней памяти {#select-group-by-in-external-memory}

 Можно включить сброс временных данных на диск, чтобы ограничить потребление оперативной памяти при выполнении `GROUP BY`.
-Настройка [max_bytes_before_external_group_by](../../../operations/settings/settings.md#settings-max_bytes_before_external_group_by) определяет пороговое значение потребления RAM, по достижении которого временные данные `GROUP BY` сбрасываются в файловую систему. Если равно 0 (по умолчанию) - значит выключено.
+Настройка [max_bytes_before_external_group_by](../../../operations/settings/query-complexity.md#settings-max_bytes_before_external_group_by) определяет пороговое значение потребления RAM, по достижении которого временные данные `GROUP BY` сбрасываются в файловую систему. Если равно 0 (по умолчанию) - значит выключено.

 При использовании `max_bytes_before_external_group_by`, рекомендуем выставить `max_memory_usage` приблизительно в два раза больше. Это следует сделать, потому что агрегация выполняется в две стадии: чтение и формирование промежуточных данных (1) и слияние промежуточных данных (2). Сброс данных на файловую систему может производиться только на стадии 1. Если сброса временных данных не было, то на стадии 2 может потребляться до такого же объёма памяти, как на стадии 1.

-Например, если [max_memory_usage](../../../operations/settings/settings.md#settings_max_memory_usage) было выставлено в 10000000000, и вы хотите использовать внешнюю агрегацию, то имеет смысл выставить `max_bytes_before_external_group_by` в 10000000000, а `max_memory_usage` в 20000000000. При срабатывании внешней агрегации (если был хотя бы один сброс временных данных в файловую систему) максимальное потребление оперативки будет лишь чуть-чуть больше `max_bytes_before_external_group_by`.
+Например, если [max_memory_usage](../../../operations/settings/query-complexity.md#settings_max_memory_usage) было выставлено в 10000000000, и вы хотите использовать внешнюю агрегацию, то имеет смысл выставить `max_bytes_before_external_group_by` в 10000000000, а `max_memory_usage` в 20000000000. При срабатывании внешней агрегации (если был хотя бы один сброс временных данных в файловую систему) максимальное потребление оперативки будет лишь чуть-чуть больше `max_bytes_before_external_group_by`.

 При распределённой обработке запроса внешняя агрегация производится на удалённых серверах. Для того чтобы на сервере-инициаторе запроса использовалось немного оперативки, нужно выставить настройку `distributed_aggregation_memory_efficient` в 1.
--- a/docs/zh/development/continuous-integration.md
+++ b/docs/zh/development/continuous-integration.md
@ -86,13 +86,10 @@ git push
 - **Build log**: 链接到构建和文件复制日志, 当构建失败时很有用.
 - **Build time**.
 - **Artifacts**: 构建结果文件 (`XXX`是服务器版本, 比如`20.8.1.4344`).
-    - `clickhouse-client_XXX_all.deb`
+    - `clickhouse-client_XXX_amd64.deb`
    -` clickhouse-common-static-dbg_XXX[+asan, +msan, +ubsan, +tsan]_amd64.deb`
    - `clickhouse-common-staticXXX_amd64.deb`
-    - `clickhouse-server_XXX_all.deb`
-    - `clickhouse-test_XXX_all.deb`
-    - `clickhouse_XXX_amd64.buildinfo`
-    - `clickhouse_XXX_amd64.changes`
+    - `clickhouse-server_XXX_amd64.deb`
    - `clickhouse`: Main built binary.
    - `clickhouse-odbc-bridge`
    - `unit_tests_dbms`: 带有 ClickHouse 单元测试的 GoogleTest 二进制文件.
--- a/docs/zh/getting-started/install.md
+++ b/docs/zh/getting-started/install.md
@ -121,22 +121,36 @@ sudo yum install clickhouse-server clickhouse-client
 LATEST_VERSION=$(curl -s https://packages.clickhouse.com/tgz/stable/ | \
    grep -Eo '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | sort -V -r | head -n 1)
 export LATEST_VERSION
-curl -O "https://packages.clickhouse.com/tgz/stable/clickhouse-common-static-$LATEST_VERSION.tgz"
-curl -O "https://packages.clickhouse.com/tgz/stable/clickhouse-common-static-dbg-$LATEST_VERSION.tgz"
-curl -O "https://packages.clickhouse.com/tgz/stable/clickhouse-server-$LATEST_VERSION.tgz"
-curl -O "https://packages.clickhouse.com/tgz/stable/clickhouse-client-$LATEST_VERSION.tgz"

-tar -xzvf "clickhouse-common-static-$LATEST_VERSION.tgz"
+case $(uname -m) in
+  x86_64) ARCH=amd64 ;;
+  aarch64) ARCH=arm64 ;;
+  *) echo "Unknown architecture $(uname -m)"; exit 1 ;;
+esac
+
+for PKG in clickhouse-common-static clickhouse-common-static-dbg clickhouse-server clickhouse-client
+do
+  curl -fO "https://packages.clickhouse.com/tgz/stable/$PKG-$LATEST_VERSION-${ARCH}.tgz" \
+    || curl -fO "https://packages.clickhouse.com/tgz/stable/$PKG-$LATEST_VERSION.tgz"
+done
+
+exit 0
+
+tar -xzvf "clickhouse-common-static-$LATEST_VERSION-${ARCH}.tgz" \
+  || tar -xzvf "clickhouse-common-static-$LATEST_VERSION.tgz"
 sudo "clickhouse-common-static-$LATEST_VERSION/install/doinst.sh"

-tar -xzvf "clickhouse-common-static-dbg-$LATEST_VERSION.tgz"
+tar -xzvf "clickhouse-common-static-dbg-$LATEST_VERSION-${ARCH}.tgz" \
+  || tar -xzvf "clickhouse-common-static-dbg-$LATEST_VERSION.tgz"
 sudo "clickhouse-common-static-dbg-$LATEST_VERSION/install/doinst.sh"

-tar -xzvf "clickhouse-server-$LATEST_VERSION.tgz"
+tar -xzvf "clickhouse-server-$LATEST_VERSION-${ARCH}.tgz" \
+  || tar -xzvf "clickhouse-server-$LATEST_VERSION.tgz"
 sudo "clickhouse-server-$LATEST_VERSION/install/doinst.sh"
 sudo /etc/init.d/clickhouse-server start

-tar -xzvf "clickhouse-client-$LATEST_VERSION.tgz"
+tar -xzvf "clickhouse-client-$LATEST_VERSION-${ARCH}.tgz" \
+  || tar -xzvf "clickhouse-client-$LATEST_VERSION.tgz"
 sudo "clickhouse-client-$LATEST_VERSION/install/doinst.sh"
 ```

--- a/docs/zh/getting-started/tutorial.md
+++ b/docs/zh/getting-started/tutorial.md
@ -16,7 +16,14 @@ sidebar_label: 使用教程
 例如，您选择`deb`安装包，执行:

 ``` bash
-{% include 'install/deb.sh' %}
+sudo apt-get install -y apt-transport-https ca-certificates dirmngr
+sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 8919F6BD2B48D754
+
+echo "deb https://packages.clickhouse.com/deb stable main" | sudo tee \
+    /etc/apt/sources.list.d/clickhouse.list
+sudo apt-get update
+
+sudo apt-get install -y clickhouse-server clickhouse-client
 ```

 在我们安装的软件中包含这些包:
--- a/docs/zh/interfaces/third-party/client-libraries.md
+++ b/docs/zh/interfaces/third-party/client-libraries.md
@ -46,7 +46,6 @@ Yandex**没有**维护下面列出的库，也没有做过任何广泛的测试
    -   [clickhouse-rs](https://github.com/suharev7/clickhouse-rs)
    -   [Klickhouse](https://github.com/Protryon/klickhouse)
 -   R
-    -   [clickhouse-r](https://github.com/hannesmuehleisen/clickhouse-r)
    -   [RClickHouse](https://github.com/IMSMWU/RClickHouse)
 -   Java
    -   [clickhouse-client-java](https://github.com/VirtusAI/clickhouse-client-java)
--- a/docs/zh/sql-reference/statements/select/group-by.md
+++ b/docs/zh/sql-reference/statements/select/group-by.md
@ -116,11 +116,11 @@ GROUP BY domain
 ### 在外部存储器中分组 {#select-group-by-in-external-memory}

 您可以启用将临时数据转储到磁盘以限制内存使用期间 `GROUP BY`.
-该 [max_bytes_before_external_group_by](../../../operations/settings/settings.md#settings-max_bytes_before_external_group_by) 设置确定倾销的阈值RAM消耗 `GROUP BY` 临时数据到文件系统。 如果设置为0（默认值），它将被禁用。
+该 [max_bytes_before_external_group_by](../../../operations/settings/query-complexity.md#settings-max_bytes_before_external_group_by) 设置确定倾销的阈值RAM消耗 `GROUP BY` 临时数据到文件系统。 如果设置为0（默认值），它将被禁用。

 使用时 `max_bytes_before_external_group_by`，我们建议您设置 `max_memory_usage` 大约两倍高。 这是必要的，因为聚合有两个阶段：读取数据和形成中间数据（1）和合并中间数据（2）。 将数据转储到文件系统只能在阶段1中发生。 如果未转储临时数据，则阶段2可能需要与阶段1相同的内存量。

-例如，如果 [max_memory_usage](../../../operations/settings/settings.md#settings_max_memory_usage) 设置为10000000000，你想使用外部聚合，这是有意义的设置 `max_bytes_before_external_group_by` 到10000000000，和 `max_memory_usage` 到20000000000。 当触发外部聚合（如果至少有一个临时数据转储）时，RAM的最大消耗仅略高于 `max_bytes_before_external_group_by`.
+例如，如果 [max_memory_usage](../../../operations/settings/query-complexity.md#settings_max_memory_usage) 设置为10000000000，你想使用外部聚合，这是有意义的设置 `max_bytes_before_external_group_by` 到10000000000，和 `max_memory_usage` 到20000000000。 当触发外部聚合（如果至少有一个临时数据转储）时，RAM的最大消耗仅略高于 `max_bytes_before_external_group_by`.

 通过分布式查询处理，在远程服务器上执行外部聚合。 为了使请求者服务器只使用少量的RAM，设置 `distributed_aggregation_memory_efficient` 到1。

--- a/packages/clickhouse-client.yaml
+++ b/packages/clickhouse-client.yaml
@ -1,7 +1,7 @@
 # package sources should be placed in ${PWD}/root
 # nfpm should run from the same directory with a config
 name: "clickhouse-client"
-arch: "all"
+arch: "${DEB_ARCH}" # amd64, arm64
 platform: "linux"
 version: "${CLICKHOUSE_VERSION_STRING}"
 vendor: "ClickHouse Inc."
--- a/packages/clickhouse-common-static.yaml
+++ b/packages/clickhouse-common-static.yaml
@ -29,12 +29,14 @@ description: |
 contents:
 - src: root/usr/bin/clickhouse
  dst: /usr/bin/clickhouse
- src: root/usr/bin/clickhouse-odbc-bridge
-  dst: /usr/bin/clickhouse-odbc-bridge
- src: root/usr/bin/clickhouse-library-bridge
-  dst: /usr/bin/clickhouse-library-bridge
+- src: root/usr/bin/clickhouse-diagnostics
+  dst: /usr/bin/clickhouse-diagnostics
 - src: root/usr/bin/clickhouse-extract-from-config
  dst: /usr/bin/clickhouse-extract-from-config
+- src: root/usr/bin/clickhouse-library-bridge
+  dst: /usr/bin/clickhouse-library-bridge
+- src: root/usr/bin/clickhouse-odbc-bridge
+  dst: /usr/bin/clickhouse-odbc-bridge
 - src: root/usr/share/bash-completion/completions
  dst: /usr/share/bash-completion/completions
 # docs
--- a/packages/clickhouse-server.yaml
+++ b/packages/clickhouse-server.yaml
@ -1,7 +1,7 @@
 # package sources should be placed in ${PWD}/root
 # nfpm should run from the same directory with a config
 name: "clickhouse-server"
-arch: "all"
+arch: "${DEB_ARCH}" # amd64, arm64
 platform: "linux"
 version: "${CLICKHOUSE_VERSION_STRING}"
 vendor: "ClickHouse Inc."
--- a/programs/CMakeLists.txt
+++ b/programs/CMakeLists.txt
@ -2,7 +2,7 @@ if (USE_CLANG_TIDY)
    set (CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY_PATH}")
 endif ()

-include(${ClickHouse_SOURCE_DIR}/cmake/strip_binary.cmake)
+include(${ClickHouse_SOURCE_DIR}/cmake/split_debug_symbols.cmake)

 # The `clickhouse` binary is a multi purpose tool that contains multiple execution modes (client, server, etc.),
 # each of them may be built and linked as a separate library.
@ -18,6 +18,12 @@ option (ENABLE_CLICKHOUSE_SERVER "Server mode (main mode)" ${ENABLE_CLICKHOUSE_A
 option (ENABLE_CLICKHOUSE_CLIENT "Client mode (interactive tui/shell that connects to the server)"
    ${ENABLE_CLICKHOUSE_ALL})

+if (CLICKHOUSE_SPLIT_BINARY OR NOT ENABLE_UTILS)
+    option (ENABLE_CLICKHOUSE_SELF_EXTRACTING "Self-extracting executable" OFF)
+else ()
+    option (ENABLE_CLICKHOUSE_SELF_EXTRACTING "Self-extracting executable" ON)
+endif ()
+
 # https://clickhouse.com/docs/en/operations/utilities/clickhouse-local/
 option (ENABLE_CLICKHOUSE_LOCAL "Local files fast processing mode" ${ENABLE_CLICKHOUSE_ALL})

@ -101,6 +107,12 @@ else()
    message(STATUS "Local mode: OFF")
 endif()

+if (ENABLE_CLICKHOUSE_SELF_EXTRACTING)
+    message(STATUS "Self-extracting executable: ON")
+else()
+    message(STATUS "Self-extracting executable: OFF")
+endif()
+
 if (ENABLE_CLICKHOUSE_BENCHMARK)
    message(STATUS "Benchmark mode: ON")
 else()
@ -266,6 +278,10 @@ if (ENABLE_CLICKHOUSE_LIBRARY_BRIDGE)
    add_subdirectory (library-bridge)
 endif ()

+if (ENABLE_CLICKHOUSE_SELF_EXTRACTING)
+    add_subdirectory (self-extracting)
+endif ()
+
 if (CLICKHOUSE_ONE_SHARED)
  add_library(clickhouse-lib SHARED
    ${CLICKHOUSE_SERVER_SOURCES}
@ -511,10 +527,10 @@ else ()
        add_custom_command(TARGET clickhouse POST_BUILD COMMAND ./clickhouse hash-binary > hash && ${OBJCOPY_PATH} --add-section .clickhouse.hash=hash clickhouse COMMENT "Adding section '.clickhouse.hash' to clickhouse binary" VERBATIM)
    endif()

-    if (INSTALL_STRIPPED_BINARIES)
-        clickhouse_strip_binary(TARGET clickhouse DESTINATION_DIR ${CMAKE_CURRENT_BINARY_DIR}/${STRIPPED_BINARIES_OUTPUT} BINARY_PATH clickhouse)
+    if (SPLIT_DEBUG_SYMBOLS)
+        clickhouse_split_debug_symbols(TARGET clickhouse DESTINATION_DIR ${CMAKE_CURRENT_BINARY_DIR}/${SPLITTED_DEBUG_SYMBOLS_DIR} BINARY_PATH clickhouse)
    else()
-        clickhouse_make_empty_debug_info_for_nfpm(TARGET clickhouse DESTINATION_DIR ${CMAKE_CURRENT_BINARY_DIR}/${STRIPPED_BINARIES_OUTPUT})
+        clickhouse_make_empty_debug_info_for_nfpm(TARGET clickhouse DESTINATION_DIR ${CMAKE_CURRENT_BINARY_DIR}/${SPLITTED_DEBUG_SYMBOLS_DIR})
        install (TARGETS clickhouse RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
    endif()
 endif()
--- a/tools/clickhouse-diagnostics/.gitignore
+++ b/tools/clickhouse-diagnostics/.gitignore
--- a/tools/clickhouse-diagnostics/CONTRIBUTION.md
+++ b/tools/clickhouse-diagnostics/CONTRIBUTION.md
--- a/tools/clickhouse-diagnostics/Makefile
+++ b/tools/clickhouse-diagnostics/Makefile
@ -5,7 +5,9 @@ BUILD_DIR=dist

 TIMESTAMP := $(shell date +%Y%m%d-%H%M)
 COMMIT := $(shell git rev-parse --short HEAD)
-DEVLDFLAGS = -ldflags "-X github.com/ClickHouse/clickhouse-diagnostics/cmd.Version=v.dev-${TIMESTAMP} -X github.com/ClickHouse/clickhouse-diagnostics/cmd.Commit=${COMMIT}"
+MODULE := github.com/ClickHouse/ClickHouse/programs/diagnostics
+VERSION := v.dev-${TIMESTAMP}
+DEVLDFLAGS = -ldflags "-X ${MODULE}/cmd.Version=${VERSION} -X ${MODULE}/cmd.Commit=${COMMIT}"

 # override with env variable to test other versions e.g. 21.11.10.1
 CLICKHOUSE_VERSION ?= latest
@ -26,7 +28,7 @@ release: ## Release is delegated to goreleaser
 ## Build:
 build: ## Build a binary for local use
 	# timestamped version
-	$(GOCMD) build ${DEVLDFLAGS} -o $(BINARY_NAME) .
+	$(GOCMD) build ${DEVLDFLAGS} -o $(BINARY_NAME) ./cmd/clickhouse-diagnostics

 clean: ## Remove build related file
 	rm ${BINARY_NAME}
@ -38,6 +40,9 @@ vendor: ## Copy of all packages needed to support builds and tests in the vendor
 test: ## Run the tests of the project
 	CLICKHOUSE_VERSION=$(CLICKHOUSE_VERSION) $(GOTEST) -v -race `go list ./... | grep -v ./internal/platform/test`

+test-no-docker: ## Don't run tests depending on dockerd
+	CLICKHOUSE_VERSION=$(CLICKHOUSE_VERSION) $(GOTEST) -v -race -tags no_docker `go list ./... | grep -v ./internal/platform/test`
+
 lint-go: ## Use golintci-lint
 	docker run --rm -v $(shell pwd):/app -w /app golangci/golangci-lint:latest-alpine golangci-lint run

--- a/tools/clickhouse-diagnostics/README.md
+++ b/tools/clickhouse-diagnostics/README.md
@ -9,7 +9,7 @@ This tool provides a means of obtaining a diagnostic bundle from a ClickHouse in
 - **No local dependencies** to run. We compile to a platform-independent binary, hence Go.
 - **Minimize resource overhead**. Improvements always welcome.
 - **Extendable framework**. At its core, the tool provides collectors and outputs. Collectors are independent and are responsible for collecting a specific dataset e.g. system configuration. Outputs produce the diagnostic bundle in a specific format. It should be trivial to add both for contributors. See [Collectors](#collectors) and [Outputs](#outputs) for more details.
- **Convertable output formats**. Outputs produce diagnostic bundles in different formats e.g. archive, simple report etc. Where possible, it should be possible to convert between these formats. For example, an administrator may provide a bundle as an archive to their support provider who in turn wishes to visualise this as a report or even in ClickHouse itself...
+- **Convertible output formats**. Outputs produce diagnostic bundles in different formats e.g. archive, simple report etc. Where possible, it should be possible to convert between these formats. For example, an administrator may provide a bundle as an archive to their support provider who in turn wishes to visualise this as a report or even in ClickHouse itself...
 - **Something is better than nothing**. Collectors execute independently. We never fail a collection because one fails - preferring to warn the user only. There are good reasons for a collector failure e.g. insufficient permissions or missing data.
 - **Execute anywhere** - Ideally, this tool is executed on a ClickHouse host. Some collectors e.g. configuration file collection or system information, rely on this. However, collectors will obtain as much information remotely from the database as possible if executed remotely from the cluster - warning where collection fails. **We do currently require ClickHouse to be running, connecting over the native port**.

@ -25,7 +25,7 @@ The `collect` command allows the collection of a diagnostic bundle. In its simpl
 clickhouse-diagnostics collect
 ```

-This will use the default collectors and the simple output. This output produces a timestamped archive bundle in `gz` format in a sub folder named after the host. This folder name can be controlled via the parameter `--id` or configured directly for the simple output parameter `output.simple.folder` (this allows a specific diretory to be specified).
+This will use the default collectors and the simple output. This output produces a timestamped archive bundle in `gz` format in a sub folder named after the host. This folder name can be controlled via the parameter `--id` or configured directly for the simple output parameter `output.simple.folder` (this allows a specific directory to be specified).

 Collectors, Outputs and ClickHouse connection credentials can be specified as shown below:

@ -71,7 +71,7 @@ We currently support the following collectors. A `*` indicates this collector is
 - `config*` - Collects the ClickHouse configuration from the local filesystem. A best effort is made using process information if ClickHouse is not installed locally. `include_path` are also considered. 
 - `db_logs*` - Collects the ClickHouse logs directly from the database.
 - `logs*` - Collects the ClickHouse logs directly from the database.
- `summary*` - Collects summary statistics on the database based on a set of known useful queries. This represents the easiest collector to extend - contributions are welcome to this set which can be found [here](https://github.com/ClickHouse/clickhouse-diagnostics/blob/main/internal/collectors/clickhouse/queries.json).
+- `summary*` - Collects summary statistics on the database based on a set of known useful queries. This represents the easiest collector to extend - contributions are welcome to this set which can be found [here](https://github.com/ClickHouse/ClickHouse/blob/master/programs/diagnostics/internal/collectors/clickhouse/queries.json).
 - `file` - Collects files based on glob patterns. Does not collect directories. To preview files which will be collected try, `clickhouse-diagnostics collect --collectors=file --collector.file.file_pattern=<glob path> --output report`
 - `command` - Collects the output of a user specified command. To preview output, `clickhouse-diagnostics collect --collectors=command --collector.command.command="<command>" --output report`
 - `zookeeper_db` - Collects information about zookeeper using the `system.zookeeper` table, recursively iterating the zookeeper tree/table. Note: changing the default parameter values can cause extremely high load to be placed on the database. Use with caution. By default, uses the glob `/clickhouse/{task_queue}/**` to match zookeeper paths and iterates to a max depth of 8.
--- a/programs/diagnostics/cmd/clickhouse-diagnostics/main.go
+++ b/programs/diagnostics/cmd/clickhouse-diagnostics/main.go
@ -0,0 +1,9 @@
+package main
+
+import (
+	"github.com/ClickHouse/ClickHouse/programs/diagnostics/cmd"
+)
+
+func main() {
+	cmd.Execute()
+}
--- a/tools/clickhouse-diagnostics/cmd/collect.go
+++ b/tools/clickhouse-diagnostics/cmd/collect.go
@ -2,21 +2,22 @@ package cmd

 import (
 	"fmt"
-	"github.com/ClickHouse/clickhouse-diagnostics/cmd/params"
-	"github.com/ClickHouse/clickhouse-diagnostics/internal"
-	"github.com/ClickHouse/clickhouse-diagnostics/internal/collectors"
-	_ "github.com/ClickHouse/clickhouse-diagnostics/internal/collectors/clickhouse"
-	_ "github.com/ClickHouse/clickhouse-diagnostics/internal/collectors/system"
-	"github.com/ClickHouse/clickhouse-diagnostics/internal/outputs"
-	_ "github.com/ClickHouse/clickhouse-diagnostics/internal/outputs/file"
-	_ "github.com/ClickHouse/clickhouse-diagnostics/internal/outputs/terminal"
-	"github.com/ClickHouse/clickhouse-diagnostics/internal/platform/utils"
+	"os"
+	"strings"
+
+	"github.com/ClickHouse/ClickHouse/programs/diagnostics/cmd/params"
+	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal"
+	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/collectors"
+	_ "github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/collectors/clickhouse"
+	_ "github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/collectors/system"
+	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/outputs"
+	_ "github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/outputs/file"
+	_ "github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/outputs/terminal"
+	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/utils"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
-	"os"
-	"strings"
 )

 var id string
--- a/tools/clickhouse-diagnostics/cmd/convert.go
+++ b/tools/clickhouse-diagnostics/cmd/convert.go
--- a/tools/clickhouse-diagnostics/cmd/help.go
+++ b/tools/clickhouse-diagnostics/cmd/help.go
@ -2,13 +2,14 @@ package cmd

 import (
 	"fmt"
-	"github.com/ClickHouse/clickhouse-diagnostics/cmd/params"
-	"github.com/ClickHouse/clickhouse-diagnostics/internal/collectors"
-	"github.com/ClickHouse/clickhouse-diagnostics/internal/outputs"
-	"github.com/ClickHouse/clickhouse-diagnostics/internal/platform/config"
+	"os"
+
+	"github.com/ClickHouse/ClickHouse/programs/diagnostics/cmd/params"
+	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/collectors"
+	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/outputs"
+	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/config"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
-	"os"
 )

 var cHelp = params.StringOptionsVar{
--- a/tools/clickhouse-diagnostics/cmd/params/params.go
+++ b/tools/clickhouse-diagnostics/cmd/params/params.go
@ -4,10 +4,11 @@ import (
 	"bytes"
 	"encoding/csv"
 	"fmt"
-	"github.com/ClickHouse/clickhouse-diagnostics/internal/platform/config"
-	"github.com/ClickHouse/clickhouse-diagnostics/internal/platform/utils"
-	"github.com/spf13/cobra"
 	"strings"
+
+	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/config"
+	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/utils"
+	"github.com/spf13/cobra"
 )

 type cliParamType uint8
--- a/tools/clickhouse-diagnostics/cmd/params/params_test.go
+++ b/tools/clickhouse-diagnostics/cmd/params/params_test.go
@ -1,13 +1,14 @@
 package params_test

 import (
-	"github.com/ClickHouse/clickhouse-diagnostics/cmd/params"
-	"github.com/ClickHouse/clickhouse-diagnostics/internal/platform/config"
-	"github.com/spf13/cobra"
-	"github.com/stretchr/testify/require"
 	"os"
 	"sort"
 	"testing"
+
+	"github.com/ClickHouse/ClickHouse/programs/diagnostics/cmd/params"
+	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/config"
+	"github.com/spf13/cobra"
+	"github.com/stretchr/testify/require"
 )

 var conf = map[string]config.Configuration{
--- a/Show More
+++ b/Show More