Merge remote-tracking branch 'upstream/master' into nikvas0/simple_optimizations

2024-12-01 20:12:02 +00:00 · 2021-05-10 22:08:58 +03:00 · 2021-05-10 22:08:58 +03:00 · af9f811ab5
commit af9f811ab5
parent 24499fc31a 94592f0d54
853 changed files with 43118 additions and 7926 deletions
--- a/.github/ISSUE_TEMPLATE/40_bug-report.md
+++ b/.github/ISSUE_TEMPLATE/40_bug-report.md
@ -7,7 +7,7 @@ assignees: ''

 ---

-(you don't have to strictly follow this form)
+You have to provide the following information whenever possible.

 **Describe the bug**
 A clear and concise description of what works not as it is supposed to.
--- a/.gitignore
+++ b/.gitignore
@ -27,6 +27,7 @@
 /docs/zh/single.md
 /docs/ja/single.md
 /docs/fa/single.md
+/docs/en/development/cmake-in-clickhouse.md

 # callgrind files
 callgrind.out.*
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -167,9 +167,10 @@ endif ()

 # If turned `ON`, assumes the user has either the system GTest library or the bundled one.
 option(ENABLE_TESTS "Provide unit_test_dbms target with Google.Test unit tests" ON)
+option(ENABLE_EXAMPLES "Build all example programs in 'examples' subdirectories" OFF)

-if (OS_LINUX AND NOT UNBUNDLED AND MAKE_STATIC_LIBRARIES AND NOT SPLIT_SHARED_LIBRARIES AND CMAKE_VERSION VERSION_GREATER "3.9.0")
-    # Only for Linux, x86_64.
+if (OS_LINUX AND (ARCH_AMD64 OR ARCH_AARCH64) AND NOT UNBUNDLED AND MAKE_STATIC_LIBRARIES AND NOT SPLIT_SHARED_LIBRARIES AND CMAKE_VERSION VERSION_GREATER "3.9.0")
+    # Only for Linux, x86_64 or aarch64.
    option(GLIBC_COMPATIBILITY "Enable compatibility with older glibc libraries." ON)
 elseif(GLIBC_COMPATIBILITY)
    message (${RECONFIGURE_MESSAGE_LEVEL} "Glibc compatibility cannot be enabled in current configuration")
--- a/base/bridge/IBridge.cpp
+++ b/base/bridge/IBridge.cpp
@ -159,17 +159,12 @@ void IBridge::initialize(Application & self)
    if (port > 0xFFFF)
        throw Exception("Out of range 'http-port': " + std::to_string(port), ErrorCodes::ARGUMENT_OUT_OF_BOUND);

-    http_timeout = config().getUInt("http-timeout", DEFAULT_HTTP_READ_BUFFER_TIMEOUT);
+    http_timeout = config().getUInt64("http-timeout", DEFAULT_HTTP_READ_BUFFER_TIMEOUT);
    max_server_connections = config().getUInt("max-server-connections", 1024);
-    keep_alive_timeout = config().getUInt("keep-alive-timeout", 10);
+    keep_alive_timeout = config().getUInt64("keep-alive-timeout", 10);

    initializeTerminationAndSignalProcessing();

-#if USE_ODBC
-    if (bridgeName() == "ODBCBridge")
-        Poco::Data::ODBC::Connector::registerConnector();
-#endif
-
    ServerApplication::initialize(self); // NOLINT
 }

--- a/base/common/ReplxxLineReader.cpp
+++ b/base/common/ReplxxLineReader.cpp
@ -91,6 +91,10 @@ ReplxxLineReader::ReplxxLineReader(
    /// it also binded to M-p/M-n).
    rx.bind_key(Replxx::KEY::meta('N'), [this](char32_t code) { return rx.invoke(Replxx::ACTION::COMPLETE_NEXT, code); });
    rx.bind_key(Replxx::KEY::meta('P'), [this](char32_t code) { return rx.invoke(Replxx::ACTION::COMPLETE_PREVIOUS, code); });
+    /// By default M-BACKSPACE is KILL_TO_WHITESPACE_ON_LEFT, while in readline it is backward-kill-word
+    rx.bind_key(Replxx::KEY::meta(Replxx::KEY::BACKSPACE), [this](char32_t code) { return rx.invoke(Replxx::ACTION::KILL_TO_BEGINING_OF_WORD, code); });
+    /// By default C-w is KILL_TO_BEGINING_OF_WORD, while in readline it is unix-word-rubout
+    rx.bind_key(Replxx::KEY::control('W'), [this](char32_t code) { return rx.invoke(Replxx::ACTION::KILL_TO_WHITESPACE_ON_LEFT, code); });

    rx.bind_key(Replxx::KEY::meta('E'), [this](char32_t) { openEditor(); return Replxx::ACTION_RESULT::CONTINUE; });
 }
--- a/base/common/getThreadId.cpp
+++ b/base/common/getThreadId.cpp
@ -25,6 +25,10 @@ uint64_t getThreadId()
        current_tid = syscall(SYS_gettid); /// This call is always successful. - man gettid
 #elif defined(OS_FREEBSD)
        current_tid = pthread_getthreadid_np();
+#elif defined(OS_SUNOS)
+        // On Solaris-derived systems, this returns the ID of the LWP, analogous
+        // to a thread.
+        current_tid = static_cast<uint64_t>(pthread_self());
 #else
        if (0 != pthread_threadid_np(nullptr, &current_tid))
            throw std::logic_error("pthread_threadid_np returned error");
--- a/base/common/time.h
+++ b/base/common/time.h
@ -2,7 +2,7 @@

 #include <time.h>

-#if defined (OS_DARWIN)
+#if defined (OS_DARWIN) || defined (OS_SUNOS)
 #    define CLOCK_MONOTONIC_COARSE CLOCK_MONOTONIC
 #elif defined (OS_FREEBSD)
 #    define CLOCK_MONOTONIC_COARSE CLOCK_MONOTONIC_FAST
--- a/base/common/types.h
+++ b/base/common/types.h
@ -13,7 +13,12 @@ using char8_t = unsigned char;
 #endif

 /// This is needed for more strict aliasing. https://godbolt.org/z/xpJBSb https://stackoverflow.com/a/57453713
+#if !defined(PVS_STUDIO) /// But PVS-Studio does not treat it correctly.
 using UInt8 = char8_t;
+#else
+using UInt8 = uint8_t;
+#endif
+
 using UInt16 = uint16_t;
 using UInt32 = uint32_t;
 using UInt64 = uint64_t;
--- a/base/common/ya.make.in
+++ b/base/common/ya.make.in
@ -35,7 +35,7 @@ PEERDIR(
 CFLAGS(-g0)

 SRCS(
-<? find . -name '*.cpp' | grep -v -F tests/ | grep -v -F Replxx | grep -v -F Readline | sed 's/^\.\//    /' | sort ?>
+<? find . -name '*.cpp' | grep -v -F tests/ | grep -v -F examples | grep -v -F Replxx | grep -v -F Readline | sed 's/^\.\//    /' | sort ?>
 )

 END()
--- a/base/daemon/SentryWriter.cpp
+++ b/base/daemon/SentryWriter.cpp
@ -102,7 +102,7 @@ void SentryWriter::initialize(Poco::Util::LayeredConfiguration & config)
    auto * logger = &Poco::Logger::get("SentryWriter");
    if (config.getBool("send_crash_reports.enabled", false))
    {
-        if (debug || (strlen(VERSION_OFFICIAL) > 0))
+        if (debug || (strlen(VERSION_OFFICIAL) > 0)) //-V560
        {
            enabled = true;
        }
--- a/base/glibc-compatibility/CMakeLists.txt
+++ b/base/glibc-compatibility/CMakeLists.txt
@ -15,7 +15,7 @@ if (GLIBC_COMPATIBILITY)

    add_headers_and_sources(glibc_compatibility .)
    add_headers_and_sources(glibc_compatibility musl)
-    if (ARCH_ARM)
+    if (ARCH_AARCH64)
        list (APPEND glibc_compatibility_sources musl/aarch64/syscall.s musl/aarch64/longjmp.s)
        set (musl_arch_include_dir musl/aarch64)
    elseif (ARCH_AMD64)
--- a/base/glibc-compatibility/musl/lgamma.c
+++ b/base/glibc-compatibility/musl/lgamma.c
@ -78,6 +78,9 @@
 *
 */

+// Disable warnings by PVS-Studio
+//-V::GA
+
 static const double
 pi  =  3.14159265358979311600e+00, /* 0x400921FB, 0x54442D18 */
 a0  =  7.72156649015328655494e-02, /* 0x3FB3C467, 0xE37DB0C8 */
--- a/base/glibc-compatibility/musl/lgammal.c
+++ b/base/glibc-compatibility/musl/lgammal.c
@ -85,6 +85,9 @@
 *
 */

+// Disable warnings by PVS-Studio
+//-V::GA
+
 #include <stdint.h>
 #include <math.h>
 #include "libm.h"
--- a/base/glibc-compatibility/musl/libm.h
+++ b/base/glibc-compatibility/musl/libm.h
@ -155,7 +155,7 @@ static inline long double fp_barrierl(long double x)
 static inline void fp_force_evalf(float x)
 {
 	volatile float y;
-	y = x;
+	y = x; //-V1001
 }
 #endif

@ -164,7 +164,7 @@ static inline void fp_force_evalf(float x)
 static inline void fp_force_eval(double x)
 {
 	volatile double y;
-	y = x;
+	y = x; //-V1001
 }
 #endif

@ -173,7 +173,7 @@ static inline void fp_force_eval(double x)
 static inline void fp_force_evall(long double x)
 {
 	volatile long double y;
-	y = x;
+	y = x; //-V1001
 }
 #endif

--- a/base/glibc-compatibility/musl/powf.c
+++ b/base/glibc-compatibility/musl/powf.c
@ -3,6 +3,9 @@
 * SPDX-License-Identifier: MIT
 */

+// Disable warnings by PVS-Studio
+//-V::GA
+
 #include <math.h>
 #include <stdint.h>
 #include "libm.h"
--- a/base/loggers/Loggers.cpp
+++ b/base/loggers/Loggers.cpp
@ -40,7 +40,7 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
            split->addTextLog(log, text_log_max_priority);

    auto current_logger = config.getString("logger", "");
-    if (config_logger == current_logger)
+    if (config_logger == current_logger) //-V1051
        return;

    config_logger = current_logger;
@ -69,7 +69,7 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
        log_file->setProperty(Poco::FileChannel::PROP_ROTATEONOPEN, config.getRawString("logger.rotateOnOpen", "false"));
        log_file->open();

-        Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter(this);
+        Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter;

        Poco::AutoPtr<DB::OwnFormattingChannel> log = new DB::OwnFormattingChannel(pf, log_file);
        split->addChannel(log);
@ -90,7 +90,7 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
        error_log_file->setProperty(Poco::FileChannel::PROP_FLUSH, config.getRawString("logger.flush", "true"));
        error_log_file->setProperty(Poco::FileChannel::PROP_ROTATEONOPEN, config.getRawString("logger.rotateOnOpen", "false"));

-        Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter(this);
+        Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter;

        Poco::AutoPtr<DB::OwnFormattingChannel> errorlog = new DB::OwnFormattingChannel(pf, error_log_file);
        errorlog->setLevel(Poco::Message::PRIO_NOTICE);
@ -98,10 +98,7 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
        split->addChannel(errorlog);
    }

-    /// "dynamic_layer_selection" is needed only for Yandex.Metrika, that share part of ClickHouse code.
-    /// We don't need this configuration parameter.
-
-    if (config.getBool("logger.use_syslog", false) || config.getBool("dynamic_layer_selection", false))
+    if (config.getBool("logger.use_syslog", false))
    {
        //const std::string & cmd_name = commandName();

@ -127,7 +124,7 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
        }
        syslog_channel->open();

-        Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter(this, OwnPatternFormatter::ADD_LAYER_TAG);
+        Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter;

        Poco::AutoPtr<DB::OwnFormattingChannel> log = new DB::OwnFormattingChannel(pf, syslog_channel);
        split->addChannel(log);
@ -141,7 +138,7 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
    {
        bool color_enabled = config.getBool("logger.color_terminal", color_logs_by_default);

-        Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter(this, OwnPatternFormatter::ADD_NOTHING, color_enabled);
+        Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter(color_enabled);
        Poco::AutoPtr<DB::OwnFormattingChannel> log = new DB::OwnFormattingChannel(pf, new Poco::ConsoleChannel);
        logger.warning("Logging " + log_level + " to console");
        split->addChannel(log);
--- a/base/loggers/Loggers.h
+++ b/base/loggers/Loggers.h
@ -8,6 +8,7 @@
 #include <Interpreters/TextLog.h>
 #include "OwnSplitChannel.h"

+
 namespace Poco::Util
 {
    class AbstractConfiguration;
@ -21,16 +22,8 @@ public:
    /// Close log files. On next log write files will be reopened.
    void closeLogs(Poco::Logger & logger);

-    std::optional<size_t> getLayer() const
-    {
-        return layer; /// layer set in inheritor class BaseDaemonApplication.
-    }
-
    void setTextLog(std::shared_ptr<DB::TextLog> log, int max_priority);

-protected:
-    std::optional<size_t> layer;
-
 private:
    Poco::AutoPtr<Poco::FileChannel> log_file;
    Poco::AutoPtr<Poco::FileChannel> error_log_file;
--- a/base/loggers/OwnPatternFormatter.cpp
+++ b/base/loggers/OwnPatternFormatter.cpp
@ -13,31 +13,18 @@
 #include "Loggers.h"


-OwnPatternFormatter::OwnPatternFormatter(const Loggers * loggers_, OwnPatternFormatter::Options options_, bool color_)
-    : Poco::PatternFormatter(""), loggers(loggers_), options(options_), color(color_)
+OwnPatternFormatter::OwnPatternFormatter(bool color_)
+    : Poco::PatternFormatter(""), color(color_)
 {
 }


-void OwnPatternFormatter::formatExtended(const DB::ExtendedLogMessage & msg_ext, std::string & text)
+void OwnPatternFormatter::formatExtended(const DB::ExtendedLogMessage & msg_ext, std::string & text) const
 {
    DB::WriteBufferFromString wb(text);

    const Poco::Message & msg = msg_ext.base;

-    /// For syslog: tag must be before message and first whitespace.
-    /// This code is only used in Yandex.Metrika and unneeded in ClickHouse.
-    if ((options & ADD_LAYER_TAG) && loggers)
-    {
-        auto layer = loggers->getLayer();
-        if (layer)
-        {
-            writeCString("layer[", wb);
-            DB::writeIntText(*layer, wb);
-            writeCString("]: ", wb);
-        }
-    }
-
    /// Change delimiters in date for compatibility with old logs.
    DB::writeDateTimeText<'.', ':'>(msg_ext.time_seconds, wb);

--- a/base/loggers/OwnPatternFormatter.h
+++ b/base/loggers/OwnPatternFormatter.h
@ -24,20 +24,11 @@ class Loggers;
 class OwnPatternFormatter : public Poco::PatternFormatter
 {
 public:
-    /// ADD_LAYER_TAG is needed only for Yandex.Metrika, that share part of ClickHouse code.
-    enum Options
-    {
-        ADD_NOTHING = 0,
-        ADD_LAYER_TAG = 1 << 0
-    };
-
-    OwnPatternFormatter(const Loggers * loggers_, Options options_ = ADD_NOTHING, bool color_ = false);
+    OwnPatternFormatter(bool color_ = false);

    void format(const Poco::Message & msg, std::string & text) override;
-    void formatExtended(const DB::ExtendedLogMessage & msg_ext, std::string & text);
+    void formatExtended(const DB::ExtendedLogMessage & msg_ext, std::string & text) const;

 private:
-    const Loggers * loggers;
-    Options options;
    bool color;
 };
--- a/base/pcg-random/pcg_extras.hpp
+++ b/base/pcg-random/pcg_extras.hpp
@ -447,69 +447,6 @@ inline SrcIter uneven_copy(SrcIter src_first,
                            std::integral_constant<bool, DEST_IS_SMALLER>{});
 }

-/* generate_to, fill in a fixed-size array of integral type using a SeedSeq
- * (actually works for any random-access iterator)
- */
-
-template <size_t size, typename SeedSeq, typename DestIter>
-inline void generate_to_impl(SeedSeq&& generator, DestIter dest,
-                             std::true_type)
-{
-    generator.generate(dest, dest+size);
-}
-
-template <size_t size, typename SeedSeq, typename DestIter>
-void generate_to_impl(SeedSeq&& generator, DestIter dest,
-                      std::false_type)
-{
-    typedef typename std::iterator_traits<DestIter>::value_type dest_t;
-    constexpr auto DEST_SIZE = sizeof(dest_t);
-    constexpr auto GEN_SIZE  = sizeof(uint32_t);
-
-    constexpr bool GEN_IS_SMALLER = GEN_SIZE < DEST_SIZE;
-    constexpr size_t FROM_ELEMS =
-        GEN_IS_SMALLER
-            ? size * ((DEST_SIZE+GEN_SIZE-1) / GEN_SIZE)
-            : (size + (GEN_SIZE / DEST_SIZE) - 1)
-                / ((GEN_SIZE / DEST_SIZE) + GEN_IS_SMALLER);
-                        //  this odd code ^^^^^^^^^^^^^^^^^ is work-around for
-                        //  a bug: http://llvm.org/bugs/show_bug.cgi?id=21287
-
-    if (FROM_ELEMS <= 1024) {
-        uint32_t buffer[FROM_ELEMS];
-        generator.generate(buffer, buffer+FROM_ELEMS);
-        uneven_copy(buffer, dest, dest+size);
-    } else {
-        uint32_t* buffer = static_cast<uint32_t*>(malloc(GEN_SIZE * FROM_ELEMS));
-        generator.generate(buffer, buffer+FROM_ELEMS);
-        uneven_copy(buffer, dest, dest+size);
-        free(static_cast<void*>(buffer));
-    }
-}
-
-template <size_t size, typename SeedSeq, typename DestIter>
-inline void generate_to(SeedSeq&& generator, DestIter dest)
-{
-    typedef typename std::iterator_traits<DestIter>::value_type dest_t;
-    constexpr bool IS_32BIT = sizeof(dest_t) == sizeof(uint32_t);
-
-    generate_to_impl<size>(std::forward<SeedSeq>(generator), dest,
-                           std::integral_constant<bool, IS_32BIT>{});
-}
-
-/* generate_one, produce a value of integral type using a SeedSeq
- * (optionally, we can have it produce more than one and pick which one
- * we want)
- */
-
-template <typename UInt, size_t i = 0UL, size_t N = i+1UL, typename SeedSeq>
-inline UInt generate_one(SeedSeq&& generator)
-{
-    UInt result[N];
-    generate_to<N>(std::forward<SeedSeq>(generator), result);
-    return result[i];
-}
-
 template <typename RngType>
 auto bounded_rand(RngType& rng, typename RngType::result_type upper_bound)
        -> typename RngType::result_type
@ -517,7 +454,7 @@ auto bounded_rand(RngType& rng, typename RngType::result_type upper_bound)
    typedef typename RngType::result_type rtype;
    rtype threshold = (RngType::max() - RngType::min() + rtype(1) - upper_bound)
                    % upper_bound;
-    for (;;) {
+    for (;;) { //-V1044
        rtype r = rng() - RngType::min();
        if (r >= threshold)
            return r % upper_bound;
--- a/base/pcg-random/pcg_random.hpp
+++ b/base/pcg-random/pcg_random.hpp
@ -928,7 +928,7 @@ struct rxs_m_xs_mixin {
        constexpr bitcount_t shift = bits - xtypebits;
        constexpr bitcount_t mask = (1 << opbits) - 1;
        bitcount_t rshift =
-            opbits ? bitcount_t(internal >> (bits - opbits)) & mask : 0;
+            opbits ? bitcount_t(internal >> (bits - opbits)) & mask : 0; //-V547
        internal ^= internal >> (opbits + rshift);
        internal *= mcg_multiplier<itype>::multiplier();
        xtype result = internal >> shift;
@ -950,7 +950,7 @@ struct rxs_m_xs_mixin {

        internal *= mcg_unmultiplier<itype>::unmultiplier();

-        bitcount_t rshift = opbits ? (internal >> (bits - opbits)) & mask : 0;
+        bitcount_t rshift = opbits ? (internal >> (bits - opbits)) & mask : 0; //-V547
        internal = unxorshift(internal, bits, opbits + rshift);

        return internal;
@ -975,7 +975,7 @@ struct rxs_m_mixin {
                                 :                    2;
        constexpr bitcount_t shift = bits - xtypebits;
        constexpr bitcount_t mask = (1 << opbits) - 1;
-        bitcount_t rshift = opbits ? (internal >> (bits - opbits)) & mask : 0;
+        bitcount_t rshift = opbits ? (internal >> (bits - opbits)) & mask : 0; //-V547
        internal ^= internal >> (opbits + rshift);
        internal *= mcg_multiplier<itype>::multiplier();
        xtype result = internal >> shift;
@ -1366,7 +1366,7 @@ void extended<table_pow2,advance_pow2,baseclass,extvalclass,kdd>::selfinit()
    //      - any strange correlations would only be apparent if we
    //        were to backstep the generator so that the base generator
    //        was generating the same values again
-    result_type xdiff = baseclass::operator()() - baseclass::operator()();
+    result_type xdiff = baseclass::operator()() - baseclass::operator()(); //-V501
    for (size_t i = 0; i < table_size; ++i) {
        data_[i] = baseclass::operator()() ^ xdiff;
    }
@ -1643,22 +1643,22 @@ typedef setseq_base<pcg128_t, pcg128_t, xsl_rr_rr_mixin>

 template <bitcount_t table_pow2, bitcount_t advance_pow2,
          typename BaseRNG, bool kdd = true>
-using ext_std8 = extended<table_pow2, advance_pow2, BaseRNG,
+using ext_std8 = pcg_detail::extended<table_pow2, advance_pow2, BaseRNG,
                          oneseq_rxs_m_xs_8_8, kdd>;

 template <bitcount_t table_pow2, bitcount_t advance_pow2,
          typename BaseRNG, bool kdd = true>
-using ext_std16 = extended<table_pow2, advance_pow2, BaseRNG,
+using ext_std16 = pcg_detail::extended<table_pow2, advance_pow2, BaseRNG,
                           oneseq_rxs_m_xs_16_16, kdd>;

 template <bitcount_t table_pow2, bitcount_t advance_pow2,
          typename BaseRNG, bool kdd = true>
-using ext_std32 = extended<table_pow2, advance_pow2, BaseRNG,
+using ext_std32 = pcg_detail::extended<table_pow2, advance_pow2, BaseRNG,
                           oneseq_rxs_m_xs_32_32, kdd>;

 template <bitcount_t table_pow2, bitcount_t advance_pow2,
          typename BaseRNG, bool kdd = true>
-using ext_std64 = extended<table_pow2, advance_pow2, BaseRNG,
+using ext_std64 = pcg_detail::extended<table_pow2, advance_pow2, BaseRNG,
                           oneseq_rxs_m_xs_64_64, kdd>;


--- a/cmake/find/llvm.cmake
+++ b/cmake/find/llvm.cmake
@ -2,7 +2,7 @@ if (APPLE OR SPLIT_SHARED_LIBRARIES OR NOT ARCH_AMD64)
    set (ENABLE_EMBEDDED_COMPILER OFF CACHE INTERNAL "")
 endif()

-option (ENABLE_EMBEDDED_COMPILER "Set to TRUE to enable support for 'compile_expressions' option for query execution" ${ENABLE_LIBRARIES})
+option (ENABLE_EMBEDDED_COMPILER "Enable support for 'compile_expressions' option for query execution" ON)
 # Broken in macos. TODO: update clang, re-test, enable on Apple
 if (ENABLE_EMBEDDED_COMPILER AND NOT SPLIT_SHARED_LIBRARIES AND ARCH_AMD64 AND NOT (SANITIZE STREQUAL "undefined"))
    option (USE_INTERNAL_LLVM_LIBRARY "Use bundled or system LLVM library." ${NOT_UNBUNDLED})
@ -24,9 +24,9 @@ if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/llvm/llvm/CMakeLists.txt")
 endif ()

 if (NOT USE_INTERNAL_LLVM_LIBRARY)
-    set (LLVM_PATHS "/usr/local/lib/llvm")
+    set (LLVM_PATHS "/usr/local/lib/llvm" "/usr/lib/llvm")

-    foreach(llvm_v 10 9 8)
+    foreach(llvm_v 11.1 11)
        if (NOT LLVM_FOUND)
            find_package (LLVM ${llvm_v} CONFIG PATHS ${LLVM_PATHS})
        endif ()
@ -102,7 +102,6 @@ LLVMRuntimeDyld
 LLVMX86CodeGen
 LLVMX86Desc
 LLVMX86Info
-LLVMX86Utils
 LLVMAsmPrinter
 LLVMDebugInfoDWARF
 LLVMGlobalISel
--- a/cmake/sanitize.cmake
+++ b/cmake/sanitize.cmake
@ -40,7 +40,7 @@ if (SANITIZE)
        # RelWithDebInfo, and downgrade optimizations to -O1 but not to -Og, to
        # keep the binary size down.
        # TODO: try compiling with -Og and with ld.gold.
-        set (MSAN_FLAGS "-fsanitize=memory -fsanitize-memory-track-origins -fno-optimize-sibling-calls -fsanitize-blacklist=${CMAKE_SOURCE_DIR}/tests/msan_suppressions.txt")
+        set (MSAN_FLAGS "-fsanitize=memory -fsanitize-memory-use-after-dtor -fsanitize-memory-track-origins -fno-optimize-sibling-calls -fsanitize-blacklist=${CMAKE_SOURCE_DIR}/tests/msan_suppressions.txt")

        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SAN_FLAGS} ${MSAN_FLAGS}")
        set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SAN_FLAGS} ${MSAN_FLAGS}")
--- a/cmake/target.cmake
+++ b/cmake/target.cmake
@ -12,6 +12,9 @@ elseif (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
 elseif (CMAKE_SYSTEM_NAME MATCHES "Darwin")
    set (OS_DARWIN 1)
    add_definitions(-D OS_DARWIN)
+elseif (CMAKE_SYSTEM_NAME MATCHES "SunOS")
+    set (OS_SUNOS 1)
+    add_definitions(-D OS_SUNOS)
 endif ()

 if (CMAKE_CROSSCOMPILING)
--- a/contrib/boost
+++ b/contrib/boost
@ -1 +1 @@
-Subproject commit a8d43d3142cc6b26fc55bec33f7f6edb1156ab7a
+Subproject commit 1ccbb5a522a571ce83b606dbc2e1011c42ecccfb
--- a/contrib/cyrus-sasl
+++ b/contrib/cyrus-sasl
@ -1 +1 @@
-Subproject commit 9995bf9d8e14f58934d9313ac64f13780d6dd3c9
+Subproject commit e6466edfd638cc5073debe941c53345b18a09512
--- a/contrib/librdkafka
+++ b/contrib/librdkafka
@ -1 +1 @@
-Subproject commit cf11d0aa36d4738f2c9bf4377807661660f1be76
+Subproject commit 43491d33ca2826531d1e3cae70d4bf1e5249e3c9
--- a/contrib/llvm
+++ b/contrib/llvm
@ -1 +1 @@
-Subproject commit 8f24d507c1cfeec66d27f48fe74518fd278e2d25
+Subproject commit cfaf365cf96918999d09d976ec736b4518cf5d02
--- a/docker/packager/README.md
+++ b/docker/packager/README.md
@ -3,10 +3,10 @@ compilers and build settings. Correctly configured Docker daemon is single depen

 Usage:

-Build deb package with `gcc-9` in `debug` mode:
+Build deb package with `clang-11` in `debug` mode:
 ```
 $ mkdir deb/test_output
-$ ./packager --output-dir deb/test_output/ --package-type deb --compiler=gcc-9 --build-type=debug
+$ ./packager --output-dir deb/test_output/ --package-type deb --compiler=clang-11 --build-type=debug
 $ ls -l deb/test_output
 -rw-r--r-- 1 root root      3730 clickhouse-client_18.14.2+debug_all.deb
 -rw-r--r-- 1 root root  84221888 clickhouse-common-static_18.14.2+debug_amd64.deb
@ -18,11 +18,11 @@ $ ls -l deb/test_output

 ```

-Build ClickHouse binary with `clang-10` and `address` sanitizer in `relwithdebuginfo`
+Build ClickHouse binary with `clang-11` and `address` sanitizer in `relwithdebuginfo`
 mode:
 ```
 $ mkdir $HOME/some_clickhouse
-$ ./packager --output-dir=$HOME/some_clickhouse --package-type binary --compiler=clang-10 --sanitizer=address
+$ ./packager --output-dir=$HOME/some_clickhouse --package-type binary --compiler=clang-11 --sanitizer=address
 $ ls -l $HOME/some_clickhouse
 -rwxr-xr-x 1 root root 787061952  clickhouse
 lrwxrwxrwx 1 root root        10  clickhouse-benchmark -> clickhouse
--- a/docker/packager/binary/Dockerfile
+++ b/docker/packager/binary/Dockerfile
@ -37,23 +37,18 @@ RUN apt-get update \
        bash \
        build-essential \
        ccache \
-        clang-10 \
        clang-11 \
-        clang-tidy-10 \
        clang-tidy-11 \
        cmake \
        curl \
-        g++-9 \
-        gcc-9 \
+        g++-10 \
+        gcc-10 \
        gdb \
        git \
        gperf \
        libicu-dev \
        libreadline-dev \
-        lld-10 \
        lld-11 \
-        llvm-10 \
-        llvm-10-dev \
        llvm-11 \
        llvm-11-dev \
        moreutils \
--- a/docker/packager/deb/Dockerfile
+++ b/docker/packager/deb/Dockerfile
@ -35,22 +35,15 @@ RUN curl -O https://clickhouse-builds.s3.yandex.net/utils/1/dpkg-deb \
 RUN apt-get update \
    && apt-get install \
        alien \
-        clang-10 \
        clang-11 \
-        clang-tidy-10 \
        clang-tidy-11 \
        cmake \
        debhelper \
        devscripts \
-        g++-9 \
-        gcc-9 \
        gdb  \
        git \
        gperf \
-        lld-10 \
        lld-11 \
-        llvm-10 \
-        llvm-10-dev \
        llvm-11 \
        llvm-11-dev \
        moreutils \
--- a/docker/packager/packager
+++ b/docker/packager/packager
@ -181,9 +181,8 @@ if __name__ == "__main__":
    parser.add_argument("--clickhouse-repo-path", default=os.path.join(os.path.dirname(os.path.abspath(__file__)), os.pardir, os.pardir))
    parser.add_argument("--output-dir", required=True)
    parser.add_argument("--build-type", choices=("debug", ""), default="")
-    parser.add_argument("--compiler", choices=("clang-10", "clang-10-darwin", "clang-10-aarch64", "clang-10-freebsd",
-                                               "clang-11", "clang-11-darwin", "clang-11-aarch64", "clang-11-freebsd",
-                                               "gcc-9", "gcc-10"), default="gcc-9")
+    parser.add_argument("--compiler", choices=("clang-11", "clang-11-darwin", "clang-11-aarch64", "clang-11-freebsd",
+                                               "gcc-10"), default="clang-11")
    parser.add_argument("--sanitizer", choices=("address", "thread", "memory", "undefined", ""), default="")
    parser.add_argument("--unbundled", action="store_true")
    parser.add_argument("--split-binary", action="store_true")
--- a/docker/server/Dockerfile
+++ b/docker/server/Dockerfile
@ -64,6 +64,8 @@ RUN groupadd -r clickhouse --gid=101 \
                clickhouse-client=$version \
                clickhouse-server=$version ; \
       fi \
+    && wget --progress=bar:force:noscroll "https://github.com/tianon/gosu/releases/download/$gosu_ver/gosu-$(dpkg --print-architecture)" -O /bin/gosu \
+    && chmod +x /bin/gosu \
    && clickhouse-local -q 'SELECT * FROM system.build_options' \
    && rm -rf \
        /var/lib/apt/lists/* \
@ -76,8 +78,6 @@ RUN groupadd -r clickhouse --gid=101 \
 # we need to allow "others" access to clickhouse folder, because docker container
 # can be started with arbitrary uid (openshift usecase)

-ADD https://github.com/tianon/gosu/releases/download/$gosu_ver/gosu-amd64 /bin/gosu
-
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
@ -88,10 +88,7 @@ RUN mkdir /docker-entrypoint-initdb.d

 COPY docker_related_config.xml /etc/clickhouse-server/config.d/
 COPY entrypoint.sh /entrypoint.sh
-
-RUN chmod +x \
-    /entrypoint.sh \
-    /bin/gosu
+RUN chmod +x /entrypoint.sh

 EXPOSE 9000 8123 9009
 VOLUME /var/lib/clickhouse
--- a/docker/test/base/Dockerfile
+++ b/docker/test/base/Dockerfile
@ -51,13 +51,13 @@ RUN apt-get update \
 # Sanitizer options for services (clickhouse-server)
 RUN echo "TSAN_OPTIONS='verbosity=1000 halt_on_error=1 history_size=7'" >> /etc/environment; \
  echo "UBSAN_OPTIONS='print_stacktrace=1'" >> /etc/environment; \
-  echo "MSAN_OPTIONS='abort_on_error=1'" >> /etc/environment; \
+  echo "MSAN_OPTIONS='abort_on_error=1 poison_in_dtor=1'" >> /etc/environment; \
  echo "LSAN_OPTIONS='suppressions=/usr/share/clickhouse-test/config/lsan_suppressions.txt'" >> /etc/environment; \
  ln -s /usr/lib/llvm-${LLVM_VERSION}/bin/llvm-symbolizer /usr/bin/llvm-symbolizer;
 # Sanitizer options for current shell (not current, but the one that will be spawned on "docker run")
 # (but w/o verbosity for TSAN, otherwise test.reference will not match)
 ENV TSAN_OPTIONS='halt_on_error=1 history_size=7'
 ENV UBSAN_OPTIONS='print_stacktrace=1'
-ENV MSAN_OPTIONS='abort_on_error=1'
+ENV MSAN_OPTIONS='abort_on_error=1 poison_in_dtor=1'

 CMD sleep 1
--- a/docker/test/fasttest/run.sh
+++ b/docker/test/fasttest/run.sh
@ -370,6 +370,10 @@ function run_tests

        # Depends on AWS
        01801_s3_cluster
+
+        # Depends on LLVM JIT
+        01852_jit_if
+        01865_jit_comparison_constant_result
    )

    (time clickhouse-test --hung-check -j 8 --order=random --use-skip-list --no-long --testname --shard --zookeeper --skip "${TESTS_TO_SKIP[@]}" -- "$FASTTEST_FOCUS" 2>&1 ||:) | ts '%Y-%m-%d %H:%M:%S' | tee "$FASTTEST_OUTPUT/test_log.txt"
--- a/docker/test/fuzzer/query-fuzzer-tweaks-users.xml
+++ b/docker/test/fuzzer/query-fuzzer-tweaks-users.xml
@ -14,11 +14,6 @@
                <max_memory_usage>
                    <max>10G</max>
                </max_memory_usage>
-
-                <!-- Not ready for production -->
-                <compile_expressions>
-                    <readonly />
-                </compile_expressions>
            </constraints>
        </default>
    </profiles>
--- a/docker/test/integration/runner/dockerd-entrypoint.sh
+++ b/docker/test/integration/runner/dockerd-entrypoint.sh
@ -1,6 +1,17 @@
 #!/bin/bash
 set -e

+mkdir -p /etc/docker/
+cat > /etc/docker/daemon.json << EOF
+{
+    "ipv6": true,
+    "fixed-cidr-v6": "fd00::/8",
+    "ip-forward": true,
+    "insecure-registries" : ["dockerhub-proxy.sas.yp-c.yandex.net:5000"],
+    "registry-mirrors" : ["http://dockerhub-proxy.sas.yp-c.yandex.net:5000"]
+}
+EOF
+
 dockerd --host=unix:///var/run/docker.sock --host=tcp://0.0.0.0:2375 &>/var/log/somefile &

 set +e
--- a/docker/test/performance-comparison/compare.sh
+++ b/docker/test/performance-comparison/compare.sh
@ -243,9 +243,12 @@ function run_tests
    profile_seconds_left=600

    # Run the tests.
+    total_tests=$(echo "$test_files" | wc -w)
+    current_test=0
    test_name="<none>"
    for test in $test_files
    do
+        echo "$current_test of $total_tests tests complete" > status.txt
        # Check that both servers are alive, and restart them if they die.
        clickhouse-client --port $LEFT_SERVER_PORT --query "select 1 format Null" \
            || { echo $test_name >> left-server-died.log ; restart ; }
@ -273,6 +276,7 @@ function run_tests
        profile_seconds_left=$(awk -F'	' \
            'BEGIN { s = '$profile_seconds_left'; } /^profile-total/ { s -= $2 } END { print s }' \
            "$test_name-raw.tsv")
+        current_test=$((current_test + 1))
    done

    unset TIMEFORMAT
@ -1015,6 +1019,7 @@ done
 wait

 # Create per-query flamegraphs
+touch report/query-files.txt
 IFS=$'\n'
 for version in {right,left}
 do
@ -1205,6 +1210,12 @@ function upload_results
            /^metric/ { print old_sha, new_sha, $2, $3 }' \
        | "${client[@]}" --query "INSERT INTO run_attributes_v1 FORMAT TSV"

+    # Grepping numactl results from log is too crazy, I'll just call it again.
+    "${client[@]}" --query "INSERT INTO run_attributes_v1 FORMAT TSV" <<EOF
+$REF_SHA	$SHA_TO_TEST	$(numactl --show | sed -n 's/^cpubind:[[:space:]]\+/numactl-cpubind	/p')
+$REF_SHA	$SHA_TO_TEST	$(numactl --hardware | sed -n 's/^available:[[:space:]]\+/numactl-available	/p')
+EOF
+
    set -x
 }

@ -1287,3 +1298,4 @@ esac
 # Print some final debug info to help debug Weirdness, of which there is plenty.
 jobs
 pstree -apgT
+
--- a/docker/test/performance-comparison/perf.py
+++ b/docker/test/performance-comparison/perf.py
@ -81,7 +81,10 @@ def substitute_parameters(query_templates, other_templates = []):
    query_results = []
    other_results = [[]] * (len(other_templates))
    for i, q in enumerate(query_templates):
-        keys = set(n for _, n, _, _ in string.Formatter().parse(q) if n)
+        # We need stable order of keys here, so that the order of substitutions
+        # is always the same, and the query indexes are consistent across test
+        # runs.
+        keys = sorted(set(n for _, n, _, _ in string.Formatter().parse(q) if n))
        values = [available_parameters[k] for k in keys]
        combos = itertools.product(*values)
        for c in combos:
--- a/docker/test/performance-comparison/report.py
+++ b/docker/test/performance-comparison/report.py
@ -520,12 +520,13 @@ if args.report == 'main':
    for t in tables:
        print(t)

-    print("""
+    print(f"""
    </div>
    <p class="links">
    <a href="all-queries.html">All queries</a>
    <a href="compare.log">Log</a>
    <a href="output.7z">Test output</a>
+    {os.getenv("CHPC_ADD_REPORT_LINKS") or ''}
    </p>
    </body>
    </html>
@ -638,12 +639,13 @@ elif args.report == 'all-queries':
    for t in tables:
        print(t)

-    print("""
+    print(f"""
    </div>
    <p class="links">
    <a href="report.html">Main report</a>
    <a href="compare.log">Log</a>
    <a href="output.7z">Test output</a>
+    {os.getenv("CHPC_ADD_REPORT_LINKS") or ''}
    </p>
    </body>
    </html>
--- a/docker/test/sqlancer/Dockerfile
+++ b/docker/test/sqlancer/Dockerfile
@ -2,6 +2,7 @@
 FROM ubuntu:20.04

 RUN apt-get update --yes && env DEBIAN_FRONTEND=noninteractive apt-get install wget unzip git openjdk-14-jdk maven python3 --yes --no-install-recommends
+
 RUN wget https://github.com/sqlancer/sqlancer/archive/master.zip -O /sqlancer.zip
 RUN mkdir /sqlancer && \
 	cd /sqlancer && \
--- a/docker/test/testflows/runner/Dockerfile
+++ b/docker/test/testflows/runner/Dockerfile
@ -35,7 +35,7 @@ RUN apt-get update \
 ENV TZ=Europe/Moscow
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

-RUN pip3 install urllib3 testflows==1.6.74 docker-compose docker dicttoxml kazoo tzlocal
+RUN pip3 install urllib3 testflows==1.6.74 docker-compose docker dicttoxml kazoo tzlocal python-dateutil numpy

 ENV DOCKER_CHANNEL stable
 ENV DOCKER_VERSION 17.09.1-ce
@ -74,4 +74,3 @@ VOLUME /var/lib/docker
 EXPOSE 2375
 ENTRYPOINT ["dockerd-entrypoint.sh"]
 CMD ["sh", "-c", "python3 regression.py --no-color -o classic --local --clickhouse-binary-path ${CLICKHOUSE_TESTS_SERVER_BIN_PATH} --log test.log ${TESTFLOWS_OPTS}; cat test.log | tfs report results --format json > results.json; /usr/local/bin/process_testflows_result.py || echo -e 'failure\tCannot parse results' > check_status.tsv"]
-
--- a/docs/en/commercial/cloud.md
+++ b/docs/en/commercial/cloud.md
@ -31,10 +31,10 @@ toc_title: Cloud

 ## Alibaba Cloud {#alibaba-cloud}

-Alibaba Cloud Managed Service for ClickHouse. [China Site](https://www.aliyun.com/product/clickhouse) (will be available at the international site in May 2021). Provides the following key features:
+[Alibaba Cloud Managed Service for ClickHouse](https://www.alibabacloud.com/product/clickhouse) provides the following key features:

 -   Highly reliable cloud disk storage engine based on [Alibaba Cloud Apsara](https://www.alibabacloud.com/product/apsara-stack) distributed system
-   Expand capacity on-demand without manual data migration
+-   Expand capacity on demand without manual data migration
 -   Support single-node, single-replica, multi-node, and multi-replica architectures, and support hot and cold data tiering
 -   Support access allow-list, one-key recovery, multi-layer network security protection, cloud disk encryption
 -   Seamless integration with cloud log systems, databases, and data application tools
--- a/docs/en/development/build-osx.md
+++ b/docs/en/development/build-osx.md
@ -124,4 +124,11 @@ Reboot.

 To check if it’s working, you can use `ulimit -n` command.

+## Run ClickHouse server:
+
+```
+cd ClickHouse
+./build/programs/clickhouse-server --config-file ./programs/server/config.xml
+```
+
 [Original article](https://clickhouse.tech/docs/en/development/build_osx/) <!--hide-->
--- a/docs/en/development/build.md
+++ b/docs/en/development/build.md
@ -73,9 +73,9 @@ The build requires the following components:

 -   Git (is used only to checkout the sources, it’s not needed for the build)
 -   CMake 3.10 or newer
-   Ninja (recommended) or Make
-   C++ compiler: gcc 10 or clang 8 or newer
-   Linker: lld or gold (the classic GNU ld won’t work)
+-   Ninja
+-   C++ compiler: clang-11 or newer
+-   Linker: lld
 -   Python (is only used inside LLVM build and it is optional)

 If all the components are installed, you may build in the same way as the steps above.
@ -83,7 +83,7 @@ If all the components are installed, you may build in the same way as the steps
 Example for Ubuntu Eoan:
 ``` bash
 sudo apt update
-sudo apt install git cmake ninja-build g++ python
+sudo apt install git cmake ninja-build clang++ python
 git clone --recursive https://github.com/ClickHouse/ClickHouse.git
 mkdir build && cd build
 cmake ../ClickHouse
@ -92,7 +92,7 @@ ninja

 Example for OpenSUSE Tumbleweed:
 ``` bash
-sudo zypper install git cmake ninja gcc-c++ python lld
+sudo zypper install git cmake ninja clang-c++ python lld
 git clone --recursive https://github.com/ClickHouse/ClickHouse.git
 mkdir build && cd build
 cmake ../ClickHouse
@ -102,7 +102,7 @@ ninja
 Example for Fedora Rawhide:
 ``` bash
 sudo yum update
-yum --nogpg install git cmake make gcc-c++ python3
+yum --nogpg install git cmake make clang-c++ python3
 git clone --recursive https://github.com/ClickHouse/ClickHouse.git
 mkdir build && cd build
 cmake ../ClickHouse
--- a/docs/en/development/cmake-in-clickhouse.md
+++ b/docs/en/development/cmake-in-clickhouse.md
@ -1,288 +0,0 @@
-# CMake in ClickHouse
-
-## TL; DR How to make ClickHouse compile and link faster?
-
-Developer only! This command will likely fulfill most of your needs. Run before calling `ninja`.
-
-```cmake
-cmake .. \
-    -DCMAKE_C_COMPILER=/bin/clang-10 \
-    -DCMAKE_CXX_COMPILER=/bin/clang++-10 \
-    -DCMAKE_BUILD_TYPE=Debug \
-    -DENABLE_CLICKHOUSE_ALL=OFF \
-    -DENABLE_CLICKHOUSE_SERVER=ON \
-    -DENABLE_CLICKHOUSE_CLIENT=ON \
-    -DUSE_STATIC_LIBRARIES=OFF \
-    -DSPLIT_SHARED_LIBRARIES=ON \
-    -DENABLE_LIBRARIES=OFF \
-    -DUSE_UNWIND=ON \
-    -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 `/cmake/find`).
-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.
-### ClickHouse modes
-
-| Name | Default value | Description | Comment |
-|------|---------------|-------------|---------|
-| <a name="enable-clickhouse-all"></a>[`ENABLE_CLICKHOUSE_ALL`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L8) | `ON` | Enable all ClickHouse modes by default | 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. If you do not know what modes you need, turn this option OFF and enable SERVER and CLIENT only.  |
-| <a name="enable-clickhouse-benchmark"></a>[`ENABLE_CLICKHOUSE_BENCHMARK`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L18) | `ENABLE_CLICKHOUSE_ALL` | Queries benchmarking mode | https://clickhouse.tech/docs/en/operations/utilities/clickhouse-benchmark/  |
-| <a name="enable-clickhouse-client"></a>[`ENABLE_CLICKHOUSE_CLIENT`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L11) | `ENABLE_CLICKHOUSE_ALL` | Client mode (interactive tui/shell that connects to the server) |  |
-| <a name="enable-clickhouse-compressor"></a>[`ENABLE_CLICKHOUSE_COMPRESSOR`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L23) | `ENABLE_CLICKHOUSE_ALL` | Data compressor and decompressor | https://clickhouse.tech/docs/en/operations/utilities/clickhouse-compressor/  |
-| <a name="enable-clickhouse-copier"></a>[`ENABLE_CLICKHOUSE_COPIER`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L26) | `ENABLE_CLICKHOUSE_ALL` | Inter-cluster data copying mode | https://clickhouse.tech/docs/en/operations/utilities/clickhouse-copier/  |
-| <a name="enable-clickhouse-extract-from-config"></a>[`ENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L20) | `ENABLE_CLICKHOUSE_ALL` | Configs processor (extract values etc.) |  |
-| <a name="enable-clickhouse-format"></a>[`ENABLE_CLICKHOUSE_FORMAT`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L28) | `ENABLE_CLICKHOUSE_ALL` | Queries pretty-printer and formatter with syntax highlighting |  |
-| <a name="enable-clickhouse-git-import"></a>[`ENABLE_CLICKHOUSE_GIT_IMPORT`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L47) | `ENABLE_CLICKHOUSE_ALL` | A tool to analyze Git repositories | https://presentations.clickhouse.tech/matemarketing_2020/  |
-| <a name="enable-clickhouse-install"></a>[`ENABLE_CLICKHOUSE_INSTALL`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L51) | `OFF` | Install ClickHouse without .deb/.rpm/.tgz packages (having the binary only) |  |
-| <a name="enable-clickhouse-library-bridge"></a>[`ENABLE_CLICKHOUSE_LIBRARY_BRIDGE`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L43) | `ENABLE_CLICKHOUSE_ALL` | HTTP-server working like a proxy to Library dictionary source |  |
-| <a name="enable-clickhouse-local"></a>[`ENABLE_CLICKHOUSE_LOCAL`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L15) | `ENABLE_CLICKHOUSE_ALL` | Local files fast processing mode | https://clickhouse.tech/docs/en/operations/utilities/clickhouse-local/  |
-| <a name="enable-clickhouse-obfuscator"></a>[`ENABLE_CLICKHOUSE_OBFUSCATOR`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L32) | `ENABLE_CLICKHOUSE_ALL` | Table data obfuscator (convert real data to benchmark-ready one) | https://clickhouse.tech/docs/en/operations/utilities/clickhouse-obfuscator/  |
-| <a name="enable-clickhouse-odbc-bridge"></a>[`ENABLE_CLICKHOUSE_ODBC_BRIDGE`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L37) | `ENABLE_CLICKHOUSE_ALL` | HTTP-server working like a proxy to ODBC driver |  |
-| <a name="enable-clickhouse-server"></a>[`ENABLE_CLICKHOUSE_SERVER`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L10) | `ENABLE_CLICKHOUSE_ALL` | Server mode (main mode) |  |
-
-### External libraries
-Note that ClickHouse uses forks of these libraries, see https://github.com/ClickHouse-Extras.
-
-| Name | Default value | Description | Comment |
-|------|---------------|-------------|---------|
-| <a name="enable-amqpcpp"></a>[`ENABLE_AMQPCPP`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/amqpcpp.cmake#L6) | `ENABLE_LIBRARIES` | Enalbe AMQP-CPP |  |
-| <a name="enable-avro"></a>[`ENABLE_AVRO`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/avro.cmake#L2) | `ENABLE_LIBRARIES` | Enable Avro | Needed when using Apache Avro serialization format  |
-| <a name="enable-base"></a>[`ENABLE_BASE64`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/base64.cmake#L2) | `ENABLE_LIBRARIES` | Enable base64 |  |
-| <a name="enable-brotli"></a>[`ENABLE_BROTLI`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/brotli.cmake#L1) | `ENABLE_LIBRARIES` | Enable brotli |  |
-| <a name="enable-capnp"></a>[`ENABLE_CAPNP`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/capnp.cmake#L1) | `ENABLE_LIBRARIES` | Enable Cap'n Proto |  |
-| <a name="enable-cassandra"></a>[`ENABLE_CASSANDRA`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/cassandra.cmake#L6) | `ENABLE_LIBRARIES` | Enable Cassandra |  |
-| <a name="enable-ccache"></a>[`ENABLE_CCACHE`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/ccache.cmake#L22) | `ENABLE_CCACHE_BY_DEFAULT` | Speedup re-compilations using ccache (external tool) | https://ccache.dev/  |
-| <a name="enable-clang-tidy"></a>[`ENABLE_CLANG_TIDY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/analysis.cmake#L2) | `OFF` | Use clang-tidy static analyzer | https://clang.llvm.org/extra/clang-tidy/  |
-| <a name="enable-curl"></a>[`ENABLE_CURL`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/curl.cmake#L1) | `ENABLE_LIBRARIES` | Enable curl |  |
-| <a name="enable-datasketches"></a>[`ENABLE_DATASKETCHES`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/datasketches.cmake#L1) | `ENABLE_LIBRARIES` | Enable DataSketches |  |
-| <a name="enable-embedded-compiler"></a>[`ENABLE_EMBEDDED_COMPILER`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/llvm.cmake#L5) | `ENABLE_LIBRARIES` | Set to TRUE to enable support for 'compile_expressions' option for query execution |  |
-| <a name="enable-fastops"></a>[`ENABLE_FASTOPS`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/fastops.cmake#L2) | `ENABLE_LIBRARIES` | Enable fast vectorized mathematical functions library by Mikhail Parakhin |  |
-| <a name="enable-gperf"></a>[`ENABLE_GPERF`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/gperf.cmake#L5) | `ENABLE_LIBRARIES` | Use gperf function hash generator tool |  |
-| <a name="enable-grpc"></a>[`ENABLE_GRPC`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/grpc.cmake#L8) | `ENABLE_GRPC_DEFAULT` | Use gRPC |  |
-| <a name="enable-gsasl-library"></a>[`ENABLE_GSASL_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/libgsasl.cmake#L1) | `ENABLE_LIBRARIES` | Enable gsasl library |  |
-| <a name="enable-h"></a>[`ENABLE_H3`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/h3.cmake#L1) | `ENABLE_LIBRARIES` | Enable H3 |  |
-| <a name="enable-hdfs"></a>[`ENABLE_HDFS`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/hdfs3.cmake#L2) | `ENABLE_LIBRARIES` | Enable HDFS |  |
-| <a name="enable-icu"></a>[`ENABLE_ICU`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/icu.cmake#L2) | `ENABLE_LIBRARIES` | Enable ICU |  |
-| <a name="enable-ldap"></a>[`ENABLE_LDAP`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/ldap.cmake#L5) | `ENABLE_LIBRARIES` | Enable LDAP |  |
-| <a name="enable-libpqxx"></a>[`ENABLE_LIBPQXX`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/libpqxx.cmake#L1) | `ENABLE_LIBRARIES` | Enalbe libpqxx |  |
-| <a name="enable-msgpack"></a>[`ENABLE_MSGPACK`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/msgpack.cmake#L1) | `ENABLE_LIBRARIES` | Enable msgpack library |  |
-| <a name="enable-mysql"></a>[`ENABLE_MYSQL`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/mysqlclient.cmake#L2) | `ENABLE_LIBRARIES` | Enable MySQL |  |
-| <a name="enable-nuraft"></a>[`ENABLE_NURAFT`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/nuraft.cmake#L1) | `ENABLE_LIBRARIES` | Enable NuRaft |  |
-| <a name="enable-odbc"></a>[`ENABLE_ODBC`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/odbc.cmake#L1) | `ENABLE_LIBRARIES` | Enable ODBC library |  |
-| <a name="enable-orc"></a>[`ENABLE_ORC`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/orc.cmake#L1) | `ENABLE_LIBRARIES` | Enable ORC |  |
-| <a name="enable-parquet"></a>[`ENABLE_PARQUET`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/parquet.cmake#L2) | `ENABLE_LIBRARIES` | Enable parquet |  |
-| <a name="enable-protobuf"></a>[`ENABLE_PROTOBUF`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/protobuf.cmake#L1) | `ENABLE_LIBRARIES` | Enable protobuf |  |
-| <a name="enable-rapidjson"></a>[`ENABLE_RAPIDJSON`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/rapidjson.cmake#L1) | `ENABLE_LIBRARIES` | Use rapidjson |  |
-| <a name="enable-rdkafka"></a>[`ENABLE_RDKAFKA`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/rdkafka.cmake#L1) | `ENABLE_LIBRARIES` | Enable kafka |  |
-| <a name="enable-rocksdb"></a>[`ENABLE_ROCKSDB`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/rocksdb.cmake#L5) | `ENABLE_LIBRARIES` | Enable ROCKSDB |  |
-| <a name="enable-s"></a>[`ENABLE_S3`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/s3.cmake#L2) | `ENABLE_LIBRARIES` | Enable S3 |  |
-| <a name="enable-ssl"></a>[`ENABLE_SSL`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/ssl.cmake#L3) | `ENABLE_LIBRARIES` | Enable ssl | Needed when securely connecting to an external server, e.g. clickhouse-client --host ... --secure  |
-| <a name="enable-stats"></a>[`ENABLE_STATS`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/stats.cmake#L1) | `ENABLE_LIBRARIES` | Enalbe StatsLib library |  |
-
-
-### External libraries system/bundled mode
-
-| Name | Default value | Description | Comment |
-|------|---------------|-------------|---------|
-| <a name="use-internal-avro-library"></a>[`USE_INTERNAL_AVRO_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/avro.cmake#L11) | `ON` | Set to FALSE to use system avro library instead of bundled |  |
-| <a name="use-internal-aws-s-library"></a>[`USE_INTERNAL_AWS_S3_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/s3.cmake#L14) | `ON` | Set to FALSE to use system S3 instead of bundled (experimental set to OFF on your own risk) |  |
-| <a name="use-internal-brotli-library"></a>[`USE_INTERNAL_BROTLI_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/brotli.cmake#L12) | `USE_STATIC_LIBRARIES` | Set to FALSE to use system libbrotli library instead of bundled | Many system ship only dynamic brotly libraries, so we back off to bundled by default  |
-| <a name="use-internal-capnp-library"></a>[`USE_INTERNAL_CAPNP_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/capnp.cmake#L10) | `NOT_UNBUNDLED` | Set to FALSE to use system capnproto library instead of bundled |  |
-| <a name="use-internal-curl"></a>[`USE_INTERNAL_CURL`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/curl.cmake#L10) | `NOT_UNBUNDLED` | Use internal curl library |  |
-| <a name="use-internal-datasketches-library"></a>[`USE_INTERNAL_DATASKETCHES_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/datasketches.cmake#L5) | `NOT_UNBUNDLED` | Set to FALSE to use system DataSketches library instead of bundled |  |
-| <a name="use-internal-grpc-library"></a>[`USE_INTERNAL_GRPC_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/grpc.cmake#L25) | `NOT_UNBUNDLED` | Set to FALSE to use system gRPC library instead of bundled. (Experimental. Set to OFF on your own risk) | Normally we use the internal gRPC framework. You can set USE_INTERNAL_GRPC_LIBRARY to OFF to force using the external gRPC framework, which should be installed in the system in this case. The external gRPC framework can be installed in the system by running sudo apt-get install libgrpc++-dev protobuf-compiler-grpc  |
-| <a name="use-internal-gtest-library"></a>[`USE_INTERNAL_GTEST_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/gtest.cmake#L3) | `NOT_UNBUNDLED` | Set to FALSE to use system Google Test instead of bundled |  |
-| <a name="use-internal-h-library"></a>[`USE_INTERNAL_H3_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/h3.cmake#L9) | `ON` | Set to FALSE to use system h3 library instead of bundled |  |
-| <a name="use-internal-hdfs-library"></a>[`USE_INTERNAL_HDFS3_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/hdfs3.cmake#L14) | `ON` | Set to FALSE to use system HDFS3 instead of bundled (experimental - set to OFF on your own risk) |  |
-| <a name="use-internal-icu-library"></a>[`USE_INTERNAL_ICU_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/icu.cmake#L15) | `NOT_UNBUNDLED` | Set to FALSE to use system ICU library instead of bundled |  |
-| <a name="use-internal-ldap-library"></a>[`USE_INTERNAL_LDAP_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/ldap.cmake#L14) | `NOT_UNBUNDLED` | Set to FALSE to use system *LDAP library instead of bundled |  |
-| <a name="use-internal-libcxx-library"></a>[`USE_INTERNAL_LIBCXX_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/cxx.cmake#L15) | `USE_INTERNAL_LIBCXX_LIBRARY_DEFAULT` | Disable to use system libcxx and libcxxabi libraries instead of bundled |  |
-| <a name="use-internal-libgsasl-library"></a>[`USE_INTERNAL_LIBGSASL_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/libgsasl.cmake#L12) | `USE_STATIC_LIBRARIES` | Set to FALSE to use system libgsasl library instead of bundled | when USE_STATIC_LIBRARIES we usually need to pick up hell a lot of dependencies for libgsasl  |
-| <a name="use-internal-libxml-library"></a>[`USE_INTERNAL_LIBXML2_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/libxml2.cmake#L1) | `NOT_UNBUNDLED` | Set to FALSE to use system libxml2 library instead of bundled |  |
-| <a name="use-internal-llvm-library"></a>[`USE_INTERNAL_LLVM_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/llvm.cmake#L8) | `NOT_UNBUNDLED` | Use bundled or system LLVM library. |  |
-| <a name="use-internal-msgpack-library"></a>[`USE_INTERNAL_MSGPACK_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/msgpack.cmake#L10) | `NOT_UNBUNDLED` | Set to FALSE to use system msgpack library instead of bundled |  |
-| <a name="use-internal-mysql-library"></a>[`USE_INTERNAL_MYSQL_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/mysqlclient.cmake#L15) | `NOT_UNBUNDLED` | Set to FALSE to use system mysqlclient library instead of bundled |  |
-| <a name="use-internal-odbc-library"></a>[`USE_INTERNAL_ODBC_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/odbc.cmake#L22) | `NOT_UNBUNDLED` | Use internal ODBC library |  |
-| <a name="use-internal-orc-library"></a>[`USE_INTERNAL_ORC_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/orc.cmake#L11) | `ON` | Set to FALSE to use system ORC instead of bundled (experimental set to OFF on your own risk) |  |
-| <a name="use-internal-parquet-library"></a>[`USE_INTERNAL_PARQUET_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/parquet.cmake#L16) | `NOT_UNBUNDLED` | Set to FALSE to use system parquet library instead of bundled |  |
-| <a name="use-internal-poco-library"></a>[`USE_INTERNAL_POCO_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/poco.cmake#L1) | `ON` | Use internal Poco library |  |
-| <a name="use-internal-protobuf-library"></a>[`USE_INTERNAL_PROTOBUF_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/protobuf.cmake#L14) | `NOT_UNBUNDLED` | Set to FALSE to use system protobuf instead of bundled. (Experimental. Set to OFF on your own risk) | Normally we use the internal protobuf library. You can set USE_INTERNAL_PROTOBUF_LIBRARY to OFF to force using the external protobuf library, which should be installed in the system in this case. The external protobuf library can be installed in the system by running sudo apt-get install libprotobuf-dev protobuf-compiler libprotoc-dev  |
-| <a name="use-internal-rapidjson-library"></a>[`USE_INTERNAL_RAPIDJSON_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/rapidjson.cmake#L9) | `NOT_UNBUNDLED` | Set to FALSE to use system rapidjson library instead of bundled |  |
-| <a name="use-internal-rdkafka-library"></a>[`USE_INTERNAL_RDKAFKA_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/rdkafka.cmake#L10) | `NOT_UNBUNDLED` | Set to FALSE to use system librdkafka instead of the bundled |  |
-| <a name="use-internal-re-library"></a>[`USE_INTERNAL_RE2_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/re2.cmake#L1) | `NOT_UNBUNDLED` | Set to FALSE to use system re2 library instead of bundled [slower] |  |
-| <a name="use-internal-rocksdb-library"></a>[`USE_INTERNAL_ROCKSDB_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/rocksdb.cmake#L14) | `NOT_UNBUNDLED` | Set to FALSE to use system ROCKSDB library instead of bundled |  |
-| <a name="use-internal-snappy-library"></a>[`USE_INTERNAL_SNAPPY_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/snappy.cmake#L10) | `NOT_UNBUNDLED` | Set to FALSE to use system snappy library instead of bundled |  |
-| <a name="use-internal-sparsehash-library"></a>[`USE_INTERNAL_SPARSEHASH_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/sparsehash.cmake#L1) | `ON` | Set to FALSE to use system sparsehash library instead of bundled |  |
-| <a name="use-internal-ssl-library"></a>[`USE_INTERNAL_SSL_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/ssl.cmake#L12) | `NOT_UNBUNDLED` | Set to FALSE to use system *ssl library instead of bundled |  |
-| <a name="use-internal-xz-library"></a>[`USE_INTERNAL_XZ_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/xz.cmake#L1) | `NOT_UNBUNDLED` | Set to OFF to use system xz (lzma) library instead of bundled |  |
-| <a name="use-internal-zlib-library"></a>[`USE_INTERNAL_ZLIB_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/zlib.cmake#L1) | `NOT_UNBUNDLED` | Set to FALSE to use system zlib library instead of bundled |  |
-| <a name="use-internal-zstd-library"></a>[`USE_INTERNAL_ZSTD_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/zstd.cmake#L1) | `NOT_UNBUNDLED` | Set to FALSE to use system zstd library instead of bundled |  |
-
-
-### Other flags
-
-| Name | Default value | Description | Comment |
-|------|---------------|-------------|---------|
-| <a name="add-gdb-index-for-gold"></a>[`ADD_GDB_INDEX_FOR_GOLD`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L209) | `OFF` | Add .gdb-index to resulting binaries for gold linker. | Ignored if `lld` is used  |
-| <a name="arch-native"></a>[`ARCH_NATIVE`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L260) | `OFF` | Add -march=native compiler flag |  |
-| <a name="clickhouse-split-binary"></a>[`CLICKHOUSE_SPLIT_BINARY`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L113) | `OFF` | Make several binaries (clickhouse-server, clickhouse-client etc.) instead of one bundled |  |
-| <a name="compiler-pipe"></a>[`COMPILER_PIPE`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L249) | `ON` | -pipe compiler option | Less `/tmp` usage, more RAM usage.  |
-| <a name="enable-check-heavy-builds"></a>[`ENABLE_CHECK_HEAVY_BUILDS`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L80) | `OFF` | Don't allow C++ translation units to compile too long or to take too much memory while compiling. | 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.  |
-| <a name="enable-fuzzing"></a>[`ENABLE_FUZZING`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L130) | `OFF` | Fuzzy testing using libfuzzer | Implies `WITH_COVERAGE`  |
-| <a name="enable-libraries"></a>[`ENABLE_LIBRARIES`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L383) | `ON` | Enable all external libraries by default | Turns on all external libs like s3, kafka, ODBC, ...  |
-| <a name="enable-multitarget-code"></a>[`ENABLE_MULTITARGET_CODE`](https://github.com/clickhouse/clickhouse/blob/master/src/Functions/CMakeLists.txt#L102) | `ON` | Enable platform-dependent code | ClickHouse developers may use platform-dependent code under some macro (e.g. `ifdef ENABLE_MULTITARGET`). If turned ON, this option defines such macro. See `src/Functions/TargetSpecific.h`  |
-| <a name="enable-tests"></a>[`ENABLE_TESTS`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L169) | `ON` | Provide unit_test_dbms target with Google.Test unit tests | If turned `ON`, assumes the user has either the system GTest library or the bundled one.  |
-| <a name="enable-thinlto"></a>[`ENABLE_THINLTO`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L339) | `ON` | Clang-specific link time optimization | https://clang.llvm.org/docs/ThinLTO.html Applies to clang only. Disabled when building with tests or sanitizers.  |
-| <a name="fail-on-unsupported-options-combination"></a>[`FAIL_ON_UNSUPPORTED_OPTIONS_COMBINATION`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L32) | `ON` | Stop/Fail CMake configuration if some ENABLE_XXX option is defined (either ON or OFF)   but is not possible to satisfy | If turned off: e.g. when ENABLE_FOO is ON, but FOO tool was not found, the CMake will continue.  |
-| <a name="glibc-compatibility"></a>[`GLIBC_COMPATIBILITY`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L173) | `ON` | Enable compatibility with older glibc libraries. | Only for Linux, x86_64.  |
-| <a name="linker-name"></a>[`LINKER_NAME`](https://github.com/clickhouse/clickhouse/blob/master/cmake/tools.cmake#L44) | `OFF` | Linker name or full path | Example values: `lld-10`, `gold`.  |
-| <a name="llvm-has-rtti"></a>[`LLVM_HAS_RTTI`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/llvm.cmake#L40) | `ON` | Enable if LLVM was build with RTTI enabled |  |
-| <a name="make-static-libraries"></a>[`MAKE_STATIC_LIBRARIES`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L106) | `USE_STATIC_LIBRARIES` | Disable to make shared libraries |  |
-| <a name="parallel-compile-jobs"></a>[`PARALLEL_COMPILE_JOBS`](https://github.com/clickhouse/clickhouse/blob/master/cmake/limit_jobs.cmake#L10) | `""` | Maximum number of concurrent compilation jobs | 1 if not set  |
-| <a name="parallel-link-jobs"></a>[`PARALLEL_LINK_JOBS`](https://github.com/clickhouse/clickhouse/blob/master/cmake/limit_jobs.cmake#L13) | `""` | Maximum number of concurrent link jobs | 1 if not set  |
-| <a name="sanitize"></a>[`SANITIZE`](https://github.com/clickhouse/clickhouse/blob/master/cmake/sanitize.cmake#L7) | `""` | Enable one of the code sanitizers | Possible values: - `address` (ASan) - `memory` (MSan) - `thread` (TSan) - `undefined` (UBSan) - "" (no sanitizing)  |
-| <a name="split-shared-libraries"></a>[`SPLIT_SHARED_LIBRARIES`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L111) | `OFF` | Keep all internal libraries as separate .so files | DEVELOPER ONLY. Faster linking if turned on.  |
-| <a name="strip-debug-symbols-functions"></a>[`STRIP_DEBUG_SYMBOLS_FUNCTIONS`](https://github.com/clickhouse/clickhouse/blob/master/src/Functions/CMakeLists.txt#L51) | `STRIP_DSF_DEFAULT` | Do not generate debugger info for ClickHouse functions | 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)."  |
-| <a name="unbundled"></a>[`UNBUNDLED`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L389) | `OFF` | Use system libraries instead of ones in contrib/ | We recommend avoiding this mode for production builds because we can't guarantee all needed libraries exist in your system. This mode exists for enthusiastic developers who are searching for trouble. Useful for maintainers of OS packages.  |
-| <a name="use-include-what-you-use"></a>[`USE_INCLUDE_WHAT_YOU_USE`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L444) | `OFF` | Automatically reduce unneeded includes in source code (external tool) | https://github.com/include-what-you-use/include-what-you-use  |
-| <a name="use-libcxx"></a>[`USE_LIBCXX`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/cxx.cmake#L1) | `NOT_UNBUNDLED` | Use libc++ and libc++abi instead of libstdc++ |  |
-| <a name="use-sentry"></a>[`USE_SENTRY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/sentry.cmake#L13) | `ENABLE_LIBRARIES` | Use Sentry |  |
-| <a name="use-simdjson"></a>[`USE_SIMDJSON`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/simdjson.cmake#L1) | `ENABLE_LIBRARIES` | Use simdjson |  |
-| <a name="use-snappy"></a>[`USE_SNAPPY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/snappy.cmake#L1) | `ENABLE_LIBRARIES` | Enable snappy library |  |
-| <a name="use-static-libraries"></a>[`USE_STATIC_LIBRARIES`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L105) | `ON` | Disable to use shared libraries |  |
-| <a name="use-unwind"></a>[`USE_UNWIND`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/unwind.cmake#L1) | `ENABLE_LIBRARIES` | Enable libunwind (better stacktraces) |  |
-| <a name="werror"></a>[`WERROR`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L399) | `OFF` | Enable -Werror compiler option | Using system libs can cause a lot of warnings in includes (on macro expansion).  |
-| <a name="weverything"></a>[`WEVERYTHING`](https://github.com/clickhouse/clickhouse/blob/master/cmake/warnings.cmake#L17) | `ON` | Enable -Weverything option with some exceptions. | Add some warnings that are not available even with -Wall -Wextra -Wpedantic. Intended for exploration of new compiler warnings that may be found useful. Applies to clang only  |
-| <a name="with-coverage"></a>[`WITH_COVERAGE`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L300) | `OFF` | Profile the resulting binary/binaries | Compiler-specific coverage flags e.g. -fcoverage-mapping for gcc  |
-
-## 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/en/engines/table-engines/integrations/s3.md
+++ b/docs/en/engines/table-engines/integrations/s3.md
@ -139,6 +139,7 @@ The following settings can be specified in configuration file for given endpoint

 -   `endpoint` — Specifies prefix of an endpoint. Mandatory.
 -   `access_key_id` and `secret_access_key` — Specifies credentials to use with given endpoint. Optional.
+-   `region` — Specifies S3 region name. Optional.
 -   `use_environment_credentials` — If set to `true`, S3 client will try to obtain credentials from environment variables and Amazon EC2 metadata for given endpoint. Optional, default value is `false`.
 -   `use_insecure_imds_request` — If set to `true`, S3 client will use insecure IMDS request while obtaining credentials from Amazon EC2 metadata. Optional, default value is `false`.
 -   `header` —  Adds specified HTTP header to a request to given endpoint. Optional, can be speficied multiple times.
@ -152,6 +153,7 @@ The following settings can be specified in configuration file for given endpoint
        <endpoint>https://storage.yandexcloud.net/my-test-bucket-768/</endpoint>
        <!-- <access_key_id>ACCESS_KEY_ID</access_key_id> -->
        <!-- <secret_access_key>SECRET_ACCESS_KEY</secret_access_key> -->
+        <!-- <region>us-west-1</region> -->
        <!-- <use_environment_credentials>false</use_environment_credentials> -->
        <!-- <use_insecure_imds_request>false</use_insecure_imds_request> -->
        <!-- <header>Authorization: Bearer SOME-TOKEN</header> -->
--- a/docs/en/engines/table-engines/mergetree-family/mergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/mergetree.md
@ -17,7 +17,7 @@ Main features:

 -   Partitions can be used if the [partitioning key](../../../engines/table-engines/mergetree-family/custom-partitioning-key.md) is specified.

-    ClickHouse supports certain operations with partitions that are more effective than general operations on the same data with the same result. ClickHouse also automatically cuts off the partition data where the partitioning key is specified in the query. This also improves query performance.
+    ClickHouse supports certain operations with partitions that are more effective than general operations on the same data with the same result. ClickHouse also automatically cuts off the partition data where the partitioning key is specified in the query.

 -   Data replication support.

@ -191,9 +191,7 @@ Sparse indexes allow you to work with a very large number of table rows, because

 ClickHouse does not require a unique primary key. You can insert multiple rows with the same primary key.

-You can use `Nullable`-typed expressions in the `PRIMARY KEY` and `ORDER BY` clauses. To allow this feature, turn on the [allow_nullable_key](../../../operations/settings/settings.md#allow-nullable-key) setting.
-
-The [NULLS_LAST](../../../sql-reference/statements/select/order-by.md#sorting-of-special-values) principle applies for `NULL` values in the `ORDER BY` clause.
+You can use `Nullable`-typed expressions in the `PRIMARY KEY` and `ORDER BY` clauses but it is strongly discouraged. To allow this feature, turn on the [allow_nullable_key](../../../operations/settings/settings.md#allow-nullable-key) setting. The [NULLS_LAST](../../../sql-reference/statements/select/order-by.md#sorting-of-special-values) principle applies for `NULL` values in the `ORDER BY` clause.

 ### Selecting the Primary Key {#selecting-the-primary-key}

@ -741,6 +739,7 @@ Configuration markup:
            <endpoint>https://storage.yandexcloud.net/my-bucket/root-path/</endpoint>
            <access_key_id>your_access_key_id</access_key_id>
            <secret_access_key>your_secret_access_key</secret_access_key>
+            <region></region>
            <server_side_encryption_customer_key_base64>your_base64_encoded_customer_key</server_side_encryption_customer_key_base64>
            <proxy>
                <uri>http://proxy1</uri>
@ -766,6 +765,7 @@ Required parameters:
 -   `secret_access_key` — S3 secret access key.

 Optional parameters:    
+-   `region` — S3 region name.
 -   `use_environment_credentials` — Reads AWS credentials from the Environment variables AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY and AWS_SESSION_TOKEN if they exist. Default value is `false`.
 -   `use_insecure_imds_request` — If set to `true`, S3 client will use insecure IMDS request while obtaining credentials from Amazon EC2 metadata. Default value is `false`.
 -   `proxy` — Proxy configuration for S3 endpoint. Each `uri` element inside `proxy` block should contain a proxy URL. 
--- a/docs/en/getting-started/example-datasets/ontime.md
+++ b/docs/en/getting-started/example-datasets/ontime.md
@ -21,120 +21,121 @@ echo https://transtats.bts.gov/PREZIP/On_Time_Reporting_Carrier_On_Time_Performa
 Creating a table:

 ``` sql
-CREATE TABLE `ontime` (
-  `Year` UInt16,
-  `Quarter` UInt8,
-  `Month` UInt8,
-  `DayofMonth` UInt8,
-  `DayOfWeek` UInt8,
-  `FlightDate` Date,
-  `UniqueCarrier` FixedString(7),
-  `AirlineID` Int32,
-  `Carrier` FixedString(2),
-  `TailNum` String,
-  `FlightNum` String,
-  `OriginAirportID` Int32,
-  `OriginAirportSeqID` Int32,
-  `OriginCityMarketID` Int32,
-  `Origin` FixedString(5),
-  `OriginCityName` String,
-  `OriginState` FixedString(2),
-  `OriginStateFips` String,
-  `OriginStateName` String,
-  `OriginWac` Int32,
-  `DestAirportID` Int32,
-  `DestAirportSeqID` Int32,
-  `DestCityMarketID` Int32,
-  `Dest` FixedString(5),
-  `DestCityName` String,
-  `DestState` FixedString(2),
-  `DestStateFips` String,
-  `DestStateName` String,
-  `DestWac` Int32,
-  `CRSDepTime` Int32,
-  `DepTime` Int32,
-  `DepDelay` Int32,
-  `DepDelayMinutes` Int32,
-  `DepDel15` Int32,
-  `DepartureDelayGroups` String,
-  `DepTimeBlk` String,
-  `TaxiOut` Int32,
-  `WheelsOff` Int32,
-  `WheelsOn` Int32,
-  `TaxiIn` Int32,
-  `CRSArrTime` Int32,
-  `ArrTime` Int32,
-  `ArrDelay` Int32,
-  `ArrDelayMinutes` Int32,
-  `ArrDel15` Int32,
-  `ArrivalDelayGroups` Int32,
-  `ArrTimeBlk` String,
-  `Cancelled` UInt8,
-  `CancellationCode` FixedString(1),
-  `Diverted` UInt8,
-  `CRSElapsedTime` Int32,
-  `ActualElapsedTime` Int32,
-  `AirTime` Int32,
-  `Flights` Int32,
-  `Distance` Int32,
-  `DistanceGroup` UInt8,
-  `CarrierDelay` Int32,
-  `WeatherDelay` Int32,
-  `NASDelay` Int32,
-  `SecurityDelay` Int32,
-  `LateAircraftDelay` Int32,
-  `FirstDepTime` String,
-  `TotalAddGTime` String,
-  `LongestAddGTime` String,
-  `DivAirportLandings` String,
-  `DivReachedDest` String,
-  `DivActualElapsedTime` String,
-  `DivArrDelay` String,
-  `DivDistance` String,
-  `Div1Airport` String,
-  `Div1AirportID` Int32,
-  `Div1AirportSeqID` Int32,
-  `Div1WheelsOn` String,
-  `Div1TotalGTime` String,
-  `Div1LongestGTime` String,
-  `Div1WheelsOff` String,
-  `Div1TailNum` String,
-  `Div2Airport` String,
-  `Div2AirportID` Int32,
-  `Div2AirportSeqID` Int32,
-  `Div2WheelsOn` String,
-  `Div2TotalGTime` String,
-  `Div2LongestGTime` String,
-  `Div2WheelsOff` String,
-  `Div2TailNum` String,
-  `Div3Airport` String,
-  `Div3AirportID` Int32,
-  `Div3AirportSeqID` Int32,
-  `Div3WheelsOn` String,
-  `Div3TotalGTime` String,
-  `Div3LongestGTime` String,
-  `Div3WheelsOff` String,
-  `Div3TailNum` String,
-  `Div4Airport` String,
-  `Div4AirportID` Int32,
-  `Div4AirportSeqID` Int32,
-  `Div4WheelsOn` String,
-  `Div4TotalGTime` String,
-  `Div4LongestGTime` String,
-  `Div4WheelsOff` String,
-  `Div4TailNum` String,
-  `Div5Airport` String,
-  `Div5AirportID` Int32,
-  `Div5AirportSeqID` Int32,
-  `Div5WheelsOn` String,
-  `Div5TotalGTime` String,
-  `Div5LongestGTime` String,
-  `Div5WheelsOff` String,
-  `Div5TailNum` String
+CREATE TABLE `ontime`
+(
+    `Year`                            UInt16,
+    `Quarter`                         UInt8,
+    `Month`                           UInt8,
+    `DayofMonth`                      UInt8,
+    `DayOfWeek`                       UInt8,
+    `FlightDate`                      Date,
+    `Reporting_Airline`               String,
+    `DOT_ID_Reporting_Airline`        Int32,
+    `IATA_CODE_Reporting_Airline`     String,
+    `Tail_Number`                     Int32,
+    `Flight_Number_Reporting_Airline` String,
+    `OriginAirportID`                 Int32,
+    `OriginAirportSeqID`              Int32,
+    `OriginCityMarketID`              Int32,
+    `Origin`                          FixedString(5),
+    `OriginCityName`                  String,
+    `OriginState`                     FixedString(2),
+    `OriginStateFips`                 String,
+    `OriginStateName`                 String,
+    `OriginWac`                       Int32,
+    `DestAirportID`                   Int32,
+    `DestAirportSeqID`                Int32,
+    `DestCityMarketID`                Int32,
+    `Dest`                            FixedString(5),
+    `DestCityName`                    String,
+    `DestState`                       FixedString(2),
+    `DestStateFips`                   String,
+    `DestStateName`                   String,
+    `DestWac`                         Int32,
+    `CRSDepTime`                      Int32,
+    `DepTime`                         Int32,
+    `DepDelay`                        Int32,
+    `DepDelayMinutes`                 Int32,
+    `DepDel15`                        Int32,
+    `DepartureDelayGroups`            String,
+    `DepTimeBlk`                      String,
+    `TaxiOut`                         Int32,
+    `WheelsOff`                       Int32,
+    `WheelsOn`                        Int32,
+    `TaxiIn`                          Int32,
+    `CRSArrTime`                      Int32,
+    `ArrTime`                         Int32,
+    `ArrDelay`                        Int32,
+    `ArrDelayMinutes`                 Int32,
+    `ArrDel15`                        Int32,
+    `ArrivalDelayGroups`              Int32,
+    `ArrTimeBlk`                      String,
+    `Cancelled`                       UInt8,
+    `CancellationCode`                FixedString(1),
+    `Diverted`                        UInt8,
+    `CRSElapsedTime`                  Int32,
+    `ActualElapsedTime`               Int32,
+    `AirTime`                         Nullable(Int32),
+    `Flights`                         Int32,
+    `Distance`                        Int32,
+    `DistanceGroup`                   UInt8,
+    `CarrierDelay`                    Int32,
+    `WeatherDelay`                    Int32,
+    `NASDelay`                        Int32,
+    `SecurityDelay`                   Int32,
+    `LateAircraftDelay`               Int32,
+    `FirstDepTime`                    String,
+    `TotalAddGTime`                   String,
+    `LongestAddGTime`                 String,
+    `DivAirportLandings`              String,
+    `DivReachedDest`                  String,
+    `DivActualElapsedTime`            String,
+    `DivArrDelay`                     String,
+    `DivDistance`                     String,
+    `Div1Airport`                     String,
+    `Div1AirportID`                   Int32,
+    `Div1AirportSeqID`                Int32,
+    `Div1WheelsOn`                    String,
+    `Div1TotalGTime`                  String,
+    `Div1LongestGTime`                String,
+    `Div1WheelsOff`                   String,
+    `Div1TailNum`                     String,
+    `Div2Airport`                     String,
+    `Div2AirportID`                   Int32,
+    `Div2AirportSeqID`                Int32,
+    `Div2WheelsOn`                    String,
+    `Div2TotalGTime`                  String,
+    `Div2LongestGTime`                String,
+    `Div2WheelsOff`                   String,
+    `Div2TailNum`                     String,
+    `Div3Airport`                     String,
+    `Div3AirportID`                   Int32,
+    `Div3AirportSeqID`                Int32,
+    `Div3WheelsOn`                    String,
+    `Div3TotalGTime`                  String,
+    `Div3LongestGTime`                String,
+    `Div3WheelsOff`                   String,
+    `Div3TailNum`                     String,
+    `Div4Airport`                     String,
+    `Div4AirportID`                   Int32,
+    `Div4AirportSeqID`                Int32,
+    `Div4WheelsOn`                    String,
+    `Div4TotalGTime`                  String,
+    `Div4LongestGTime`                String,
+    `Div4WheelsOff`                   String,
+    `Div4TailNum`                     String,
+    `Div5Airport`                     String,
+    `Div5AirportID`                   Int32,
+    `Div5AirportSeqID`                Int32,
+    `Div5WheelsOn`                    String,
+    `Div5TotalGTime`                  String,
+    `Div5LongestGTime`                String,
+    `Div5WheelsOff`                   String,
+    `Div5TailNum`                     String
 ) ENGINE = MergeTree
-PARTITION BY Year
-ORDER BY (Carrier, FlightDate)
-SETTINGS index_granularity = 8192;
+      PARTITION BY Year
+      ORDER BY (IATA_CODE_Reporting_Airline, FlightDate)
+      SETTINGS index_granularity = 8192;
 ```

 Loading data with multiple threads:
@ -206,7 +207,7 @@ LIMIT 10;
 Q4. The number of delays by carrier for 2007

 ``` sql
-SELECT Carrier, count(*)
+SELECT IATA_CODE_Reporting_Airline AS Carrier, count(*)
 FROM ontime
 WHERE DepDelay>10 AND Year=2007
 GROUP BY Carrier
@ -220,29 +221,29 @@ SELECT Carrier, c, c2, c*100/c2 as c3
 FROM
 (
    SELECT
-        Carrier,
+        IATA_CODE_Reporting_Airline AS Carrier,
        count(*) AS c
    FROM ontime
    WHERE DepDelay>10
        AND Year=2007
    GROUP BY Carrier
-)
+) q
 JOIN
 (
    SELECT
-        Carrier,
+        IATA_CODE_Reporting_Airline AS Carrier,
        count(*) AS c2
    FROM ontime
    WHERE Year=2007
    GROUP BY Carrier
-) USING Carrier
+) qq USING Carrier
 ORDER BY c3 DESC;
 ```

 Better version of the same query:

 ``` sql
-SELECT Carrier, avg(DepDelay>10)*100 AS c3
+SELECT IATA_CODE_Reporting_Airline AS Carrier, avg(DepDelay>10)*100 AS c3
 FROM ontime
 WHERE Year=2007
 GROUP BY Carrier
@ -256,29 +257,29 @@ SELECT Carrier, c, c2, c*100/c2 as c3
 FROM
 (
    SELECT
-        Carrier,
+        IATA_CODE_Reporting_Airline AS Carrier,
        count(*) AS c
    FROM ontime
    WHERE DepDelay>10
        AND Year>=2000 AND Year<=2008
    GROUP BY Carrier
-)
+) q
 JOIN
 (
    SELECT
-        Carrier,
+        IATA_CODE_Reporting_Airline AS Carrier,
        count(*) AS c2
    FROM ontime
    WHERE Year>=2000 AND Year<=2008
    GROUP BY Carrier
-) USING Carrier
+) qq USING Carrier
 ORDER BY c3 DESC;
 ```

 Better version of the same query:

 ``` sql
-SELECT Carrier, avg(DepDelay>10)*100 AS c3
+SELECT IATA_CODE_Reporting_Airline AS Carrier, avg(DepDelay>10)*100 AS c3
 FROM ontime
 WHERE Year>=2000 AND Year<=2008
 GROUP BY Carrier
@ -297,7 +298,7 @@ FROM
    from ontime
    WHERE DepDelay>10
    GROUP BY Year
-)
+) q
 JOIN
 (
    select
@ -305,7 +306,7 @@ JOIN
        count(*) as c2
    from ontime
    GROUP BY Year
-) USING (Year)
+) qq USING (Year)
 ORDER BY Year;
 ```

@ -340,7 +341,7 @@ Q10.

 ``` sql
 SELECT
-   min(Year), max(Year), Carrier, count(*) AS cnt,
+   min(Year), max(Year), IATA_CODE_Reporting_Airline AS Carrier, count(*) AS cnt,
   sum(ArrDelayMinutes>30) AS flights_delayed,
   round(sum(ArrDelayMinutes>30)/count(*),2) AS rate
 FROM ontime
--- a/docs/en/getting-started/install.md
+++ b/docs/en/getting-started/install.md
@ -102,7 +102,9 @@ For non-Linux operating systems and for AArch64 CPU arhitecture, ClickHouse buil
 -   [FreeBSD](https://builds.clickhouse.tech/master/freebsd/clickhouse) — `curl -O 'https://builds.clickhouse.tech/master/freebsd/clickhouse' && chmod a+x ./clickhouse`
 -   [AArch64](https://builds.clickhouse.tech/master/aarch64/clickhouse) — `curl -O 'https://builds.clickhouse.tech/master/aarch64/clickhouse' && chmod a+x ./clickhouse`

-After downloading, you can use the `clickhouse client` to connect to the server, or `clickhouse local` to process local data. To run `clickhouse server`, you have to additionally download [server](https://github.com/ClickHouse/ClickHouse/blob/master/programs/server/config.xml) and [users](https://github.com/ClickHouse/ClickHouse/blob/master/programs/server/users.xml) configuration files from GitHub.
+After downloading, you can use the `clickhouse client` to connect to the server, or `clickhouse local` to process local data.
+
+Run `sudo ./clickhouse install` if you want to install clickhouse system-wide (also with needed condiguration files, configuring users etc.). After that run `clickhouse start` commands to start the clickhouse-server and `clickhouse-client` to connect to it. 

 These builds are not recommended for use in production environments because they are less thoroughly tested, but you can do so on your own risk. They also have only a subset of ClickHouse features available.

--- a/docs/en/operations/access-rights.md
+++ b/docs/en/operations/access-rights.md
@ -101,6 +101,9 @@ Privileges can be granted to a role by the [GRANT](../sql-reference/statements/g

 Row policy is a filter that defines which of the rows are available to a user or a role. Row policy contains filters for one particular table, as well as a list of roles and/or users which should use this row policy.

+!!! note "Warning"
+    Row policies makes sense only for users with readonly access. If user can modify table or copy partitions between tables, it defeats the restrictions of row policies.
+
 Management queries:

 -   [CREATE ROW POLICY](../sql-reference/statements/create/row-policy.md)
--- a/docs/en/operations/server-configuration-parameters/settings.md
+++ b/docs/en/operations/server-configuration-parameters/settings.md
@ -430,7 +430,7 @@ Keys for syslog:
    Default value: `LOG_USER` if `address` is specified, `LOG_DAEMON` otherwise.
 -   format – Message format. Possible values: `bsd` and `syslog.`

-## send_crash_reports {#server_configuration_parameters-logger}
+## send_crash_reports {#server_configuration_parameters-send_crash_reports}

 Settings for opt-in sending crash reports to the ClickHouse core developers team via [Sentry](https://sentry.io).
 Enabling it, especially in pre-production environments, is highly appreciated.
--- a/docs/en/operations/settings/settings.md
+++ b/docs/en/operations/settings/settings.md
@ -143,6 +143,16 @@ Possible values:

 Default value: 0.

+## http_max_uri_size {#http-max-uri-size}
+
+Sets the maximum URI length of an HTTP request.
+
+Possible values:
+
+-   Positive integer.
+
+Default value: 1048576.
+
 ## send_progress_in_http_headers {#settings-send_progress_in_http_headers}

 Enables or disables `X-ClickHouse-Progress` HTTP response headers in `clickhouse-server` responses.
@ -2864,6 +2874,50 @@ Possible values:

 Default value: `0`.

+## prefer_column_name_to_alias {#prefer-column-name-to-alias}
+
+Enables or disables using the original column names instead of aliases in query expressions and clauses. It especially matters when alias is the same as the column name, see [Expression Aliases](../../sql-reference/syntax.md#notes-on-usage). Enable this setting to make aliases syntax rules in ClickHouse more compatible with most other database engines.
+
+Possible values:
+
+- 0 — The column name is substituted with the alias.
+- 1 — The column name is not substituted with the alias. 
+
+Default value: `0`.
+
+**Example**
+
+The difference between enabled and disabled:
+
+Query:
+
+```sql
+SET prefer_column_name_to_alias = 0;
+SELECT avg(number) AS number, max(number) FROM numbers(10);
+```
+
+Result:
+
+```text
+Received exception from server (version 21.5.1):
+Code: 184. DB::Exception: Received from localhost:9000. DB::Exception: Aggregate function avg(number) is found inside another aggregate function in query: While processing avg(number) AS number.
+```
+
+Query:
+
+```sql
+SET prefer_column_name_to_alias = 1;
+SELECT avg(number) AS number, max(number) FROM numbers(10);
+```
+
+Result:
+
+```text
+┌─number─┬─max(number)─┐
+│    4.5 │           9 │
+└────────┴─────────────┘
+```
+
 ## limit {#limit}

 Sets the maximum number of rows to get from the query result. It adjusts the value set by the [LIMIT](../../sql-reference/statements/select/limit.md#limit-clause) clause, so that the limit, specified in the query, cannot exceed the limit, set by this setting.
--- a/docs/en/operations/system-tables/dictionaries.md
+++ b/docs/en/operations/system-tables/dictionaries.md
@ -21,6 +21,7 @@ Columns:
 -   `bytes_allocated` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Amount of RAM allocated for the dictionary.
 -   `query_count` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Number of queries since the dictionary was loaded or since the last successful reboot.
 -   `hit_rate` ([Float64](../../sql-reference/data-types/float.md)) — For cache dictionaries, the percentage of uses for which the value was in the cache.
+-   `found_rate` ([Float64](../../sql-reference/data-types/float.md)) — The percentage of uses for which the value was found.
 -   `element_count` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Number of items stored in the dictionary.
 -   `load_factor` ([Float64](../../sql-reference/data-types/float.md)) — Percentage filled in the dictionary (for a hashed dictionary, the percentage filled in the hash table).
 -   `source` ([String](../../sql-reference/data-types/string.md)) — Text describing the [data source](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md) for the dictionary.
@ -60,4 +61,4 @@ SELECT * FROM system.dictionaries
 └──────────┴──────┴────────┴─────────────┴──────┴────────┴──────────────────────────────────────┴─────────────────────┴─────────────────┴─────────────┴──────────┴───────────────┴───────────────────────┴────────────────────────────┴──────────────┴──────────────┴─────────────────────┴──────────────────────────────┘───────────────────────┴────────────────┘
 ```

-[Original article](https://clickhouse.tech/docs/en/operations/system_tables/dictionaries) <!--hide-->
+[Original article](https://clickhouse.tech/docs/en/operations/system_tables/dictionaries) <!--hide-->
--- a/docs/en/operations/system-tables/distribution_queue.md
+++ b/docs/en/operations/system-tables/distribution_queue.md
@ -18,6 +18,10 @@ Columns:

 -   `data_compressed_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Size of compressed data in local files, in bytes.

+-   `broken_data_files` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Number of files that has been marked as broken (due to an error).
+
+-   `broken_data_compressed_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Size of compressed data in broken files, in bytes.
+
 -   `last_exception` ([String](../../sql-reference/data-types/string.md)) — Text message about the last error that occurred (if any).

 **Example**
--- a/docs/en/sql-reference/aggregate-functions/reference/max.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/max.md
@ -4,4 +4,21 @@ toc_priority: 3

 # max {#agg_function-max}

-Calculates the maximum.
+Aggregate function that calculates the maximum across a group of values.
+
+Example:
+
+```
+SELECT max(salary) FROM employees;
+```
+
+```
+SELECT department, max(salary) FROM employees GROUP BY department;
+```
+
+If you need non-aggregate function to choose a maximum of two values, see `greatest`:
+
+```
+SELECT greatest(a, b) FROM table;
+```
+
--- a/docs/en/sql-reference/aggregate-functions/reference/min.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/min.md
@ -4,4 +4,20 @@ toc_priority: 2

 ## min {#agg_function-min}

-Calculates the minimum.
+Aggregate function that calculates the minimum across a group of values.
+
+Example:
+
+```
+SELECT min(salary) FROM employees;
+```
+
+```
+SELECT department, min(salary) FROM employees GROUP BY department;
+```
+
+If you need non-aggregate function to choose a minimum of two values, see `least`:
+
+```
+SELECT least(a, b) FROM table;
+```
--- a/docs/en/sql-reference/aggregate-functions/reference/quantiletdigestweighted.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/quantiletdigestweighted.md
@ -12,6 +12,9 @@ The result depends on the order of running the query, and is nondeterministic.

 When using multiple `quantile*` functions with different levels in a query, the internal states are not combined (that is, the query works less efficiently than it could). In this case, use the [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles) function.

+!!! note "Note"
+    Using `quantileTDigestWeighted` [is not recommended for tiny data sets](https://github.com/tdunning/t-digest/issues/167#issuecomment-828650275) and can lead to significat error. In this case, consider possibility of using [`quantileTDigest`](../../../sql-reference/aggregate-functions/reference/quantiletdigest.md) instead.
+
 **Syntax**

 ``` sql
--- a/docs/en/sql-reference/data-types/datetime.md
+++ b/docs/en/sql-reference/data-types/datetime.md
@ -23,7 +23,7 @@ The point in time is saved as a [Unix timestamp](https://en.wikipedia.org/wiki/U

 Timezone agnostic unix timestamp is stored in tables, and the timezone is used to transform it to text format or back during data import/export or to make calendar calculations on the values (example: `toDate`, `toHour` functions et cetera). The time zone is not stored in the rows of the table (or in resultset), but is stored in the column metadata.

-A list of supported time zones can be found in the [IANA Time Zone Database](https://www.iana.org/time-zones) and also can be queried by `SELECT * FROM system.time_zones`.
+A list of supported time zones can be found in the [IANA Time Zone Database](https://www.iana.org/time-zones) and also can be queried by `SELECT * FROM system.time_zones`. [The list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones) is also available at Wikipedia.

 You can explicitly set a time zone for `DateTime`-type columns when creating a table. Example: `DateTime('UTC')`. If the time zone isn’t set, ClickHouse uses the value of the [timezone](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone) parameter in the server settings or the operating system settings at the moment of the ClickHouse server start.

--- a/docs/en/sql-reference/functions/date-time-functions.md
+++ b/docs/en/sql-reference/functions/date-time-functions.md
@ -134,6 +134,46 @@ Result:
 └───────────────────┘
 ```

+## timeZoneOffset {#timezoneoffset}
+
+Returns a timezone offset in seconds from [UTC](https://en.wikipedia.org/wiki/Coordinated_Universal_Time). The function takes into account [daylight saving time](https://en.wikipedia.org/wiki/Daylight_saving_time) and historical timezone changes at the specified date and time.
+[IANA timezone database](https://www.iana.org/time-zones) is used to calculate the offset.
+
+**Syntax**
+
+``` sql
+timeZoneOffset(value)
+```
+
+Alias: `timezoneOffset`.
+
+**Arguments**
+
+-   `value` — Date and time. [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md). 
+
+**Returned value**
+
+-   Offset from UTC in seconds. 
+
+Type: [Int32](../../sql-reference/data-types/int-uint.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT toDateTime('2021-04-21 10:20:30', 'America/New_York') AS Time, toTypeName(Time) AS Type,
+       timeZoneOffset(Time) AS Offset_in_seconds, (Offset_in_seconds / 3600) AS Offset_in_hours;
+```
+
+Result:
+
+``` text
+┌────────────────Time─┬─Type─────────────────────────┬─Offset_in_seconds─┬─Offset_in_hours─┐
+│ 2021-04-21 10:20:30 │ DateTime('America/New_York') │            -14400 │              -4 │
+└─────────────────────┴──────────────────────────────┴───────────────────┴─────────────────┘
+```
+
 ## toYear {#toyear}

 Converts a date or date with time to a UInt16 number containing the year number (AD).
--- a/docs/en/sql-reference/functions/functions-for-nulls.md
+++ b/docs/en/sql-reference/functions/functions-for-nulls.md
@ -224,7 +224,7 @@ assumeNotNull(x)
 **Returned values**

 -   The original value from the non-`Nullable` type, if it is not `NULL`.
-   The default value for the non-`Nullable` type if the original value was `NULL`.
+-   Implementation specific result if the original value was `NULL`.

 **Example**

--- a/docs/en/sql-reference/statements/create/row-policy.md
+++ b/docs/en/sql-reference/statements/create/row-policy.md
@ -7,6 +7,9 @@ toc_title: ROW POLICY

 Creates a [row policy](../../../operations/access-rights.md#row-policy-management), i.e. a filter used to determine which rows a user can read from a table.

+!!! note "Warning"
+    Row policies makes sense only for users with readonly access. If user can modify table or copy partitions between tables, it defeats the restrictions of row policies.
+
 Syntax:

 ``` sql
--- a/docs/en/sql-reference/statements/detach.md
+++ b/docs/en/sql-reference/statements/detach.md
@ -10,7 +10,7 @@ Makes the server "forget" about the existence of the table or materialized view.
 Syntax:

 ``` sql
-DETACH TABLE|VIEW [IF EXISTS] [db.]name [PERMANENTLY] [ON CLUSTER cluster]
+DETACH TABLE|VIEW [IF EXISTS] [db.]name [ON CLUSTER cluster] [PERMANENTLY]
 ```

 Detaching does not delete the data or metadata for the table or materialized view. If the table or view was not detached `PERMANENTLY`, on the next server launch the server will read the metadata and recall the table/view again. If the table or view was detached `PERMANENTLY`, there will be no automatic recall. 
--- a/docs/en/sql-reference/syntax.md
+++ b/docs/en/sql-reference/syntax.md
@ -171,7 +171,7 @@ Received exception from server (version 18.14.17):
 Code: 184. DB::Exception: Received from localhost:9000, 127.0.0.1. DB::Exception: Aggregate function sum(b) is found inside another aggregate function in query.
 ```

-In this example, we declared table `t` with column `b`. Then, when selecting data, we defined the `sum(b) AS b` alias. As aliases are global, ClickHouse substituted the literal `b` in the expression `argMax(a, b)` with the expression `sum(b)`. This substitution caused the exception.
+In this example, we declared table `t` with column `b`. Then, when selecting data, we defined the `sum(b) AS b` alias. As aliases are global, ClickHouse substituted the literal `b` in the expression `argMax(a, b)` with the expression `sum(b)`. This substitution caused the exception. You can change this default behavior by setting [prefer_column_name_to_alias](../operations/settings/settings.md#prefer_column_name_to_alias) to `1`.

 ## Asterisk {#asterisk}

--- a/docs/ja/commercial/cloud.md
+++ b/docs/ja/commercial/cloud.md
@ -22,7 +22,7 @@ toc_title: "\u30AF\u30E9\u30A6\u30C9"

 ## Alibaba Cloud {#alibaba-cloud}

-ClickHouseのためのAlibaba Cloudの管理サービス [中国サイト](https://www.aliyun.com/product/clickhouse) (2021年5月に国際サイトで利用可能になります) 次の主な機能を提供します:
+[ClickHouseのためのAlibaba Cloudの管理サービス](https://www.alibabacloud.com/product/clickhouse) 次の主な機能を提供します:

 -   Alibaba Cloud Apsara分散システムをベースにした信頼性の高いクラウドディスクストレージエンジン
 -   手動でのデータ移行を必要とせずに、オン・デマンドで容量を拡張
--- a/docs/ja/getting-started/example-datasets/ontime.md
+++ b/docs/ja/getting-started/example-datasets/ontime.md
@ -29,126 +29,127 @@ done
 テーブルの作成:

 ``` sql
-CREATE TABLE `ontime` (
-  `Year` UInt16,
-  `Quarter` UInt8,
-  `Month` UInt8,
-  `DayofMonth` UInt8,
-  `DayOfWeek` UInt8,
-  `FlightDate` Date,
-  `UniqueCarrier` FixedString(7),
-  `AirlineID` Int32,
-  `Carrier` FixedString(2),
-  `TailNum` String,
-  `FlightNum` String,
-  `OriginAirportID` Int32,
-  `OriginAirportSeqID` Int32,
-  `OriginCityMarketID` Int32,
-  `Origin` FixedString(5),
-  `OriginCityName` String,
-  `OriginState` FixedString(2),
-  `OriginStateFips` String,
-  `OriginStateName` String,
-  `OriginWac` Int32,
-  `DestAirportID` Int32,
-  `DestAirportSeqID` Int32,
-  `DestCityMarketID` Int32,
-  `Dest` FixedString(5),
-  `DestCityName` String,
-  `DestState` FixedString(2),
-  `DestStateFips` String,
-  `DestStateName` String,
-  `DestWac` Int32,
-  `CRSDepTime` Int32,
-  `DepTime` Int32,
-  `DepDelay` Int32,
-  `DepDelayMinutes` Int32,
-  `DepDel15` Int32,
-  `DepartureDelayGroups` String,
-  `DepTimeBlk` String,
-  `TaxiOut` Int32,
-  `WheelsOff` Int32,
-  `WheelsOn` Int32,
-  `TaxiIn` Int32,
-  `CRSArrTime` Int32,
-  `ArrTime` Int32,
-  `ArrDelay` Int32,
-  `ArrDelayMinutes` Int32,
-  `ArrDel15` Int32,
-  `ArrivalDelayGroups` Int32,
-  `ArrTimeBlk` String,
-  `Cancelled` UInt8,
-  `CancellationCode` FixedString(1),
-  `Diverted` UInt8,
-  `CRSElapsedTime` Int32,
-  `ActualElapsedTime` Int32,
-  `AirTime` Int32,
-  `Flights` Int32,
-  `Distance` Int32,
-  `DistanceGroup` UInt8,
-  `CarrierDelay` Int32,
-  `WeatherDelay` Int32,
-  `NASDelay` Int32,
-  `SecurityDelay` Int32,
-  `LateAircraftDelay` Int32,
-  `FirstDepTime` String,
-  `TotalAddGTime` String,
-  `LongestAddGTime` String,
-  `DivAirportLandings` String,
-  `DivReachedDest` String,
-  `DivActualElapsedTime` String,
-  `DivArrDelay` String,
-  `DivDistance` String,
-  `Div1Airport` String,
-  `Div1AirportID` Int32,
-  `Div1AirportSeqID` Int32,
-  `Div1WheelsOn` String,
-  `Div1TotalGTime` String,
-  `Div1LongestGTime` String,
-  `Div1WheelsOff` String,
-  `Div1TailNum` String,
-  `Div2Airport` String,
-  `Div2AirportID` Int32,
-  `Div2AirportSeqID` Int32,
-  `Div2WheelsOn` String,
-  `Div2TotalGTime` String,
-  `Div2LongestGTime` String,
-  `Div2WheelsOff` String,
-  `Div2TailNum` String,
-  `Div3Airport` String,
-  `Div3AirportID` Int32,
-  `Div3AirportSeqID` Int32,
-  `Div3WheelsOn` String,
-  `Div3TotalGTime` String,
-  `Div3LongestGTime` String,
-  `Div3WheelsOff` String,
-  `Div3TailNum` String,
-  `Div4Airport` String,
-  `Div4AirportID` Int32,
-  `Div4AirportSeqID` Int32,
-  `Div4WheelsOn` String,
-  `Div4TotalGTime` String,
-  `Div4LongestGTime` String,
-  `Div4WheelsOff` String,
-  `Div4TailNum` String,
-  `Div5Airport` String,
-  `Div5AirportID` Int32,
-  `Div5AirportSeqID` Int32,
-  `Div5WheelsOn` String,
-  `Div5TotalGTime` String,
-  `Div5LongestGTime` String,
-  `Div5WheelsOff` String,
-  `Div5TailNum` String
+CREATE TABLE `ontime`
+(
+    `Year`                            UInt16,
+    `Quarter`                         UInt8,
+    `Month`                           UInt8,
+    `DayofMonth`                      UInt8,
+    `DayOfWeek`                       UInt8,
+    `FlightDate`                      Date,
+    `Reporting_Airline`               String,
+    `DOT_ID_Reporting_Airline`        Int32,
+    `IATA_CODE_Reporting_Airline`     String,
+    `Tail_Number`                     Int32,
+    `Flight_Number_Reporting_Airline` String,
+    `OriginAirportID`                 Int32,
+    `OriginAirportSeqID`              Int32,
+    `OriginCityMarketID`              Int32,
+    `Origin`                          FixedString(5),
+    `OriginCityName`                  String,
+    `OriginState`                     FixedString(2),
+    `OriginStateFips`                 String,
+    `OriginStateName`                 String,
+    `OriginWac`                       Int32,
+    `DestAirportID`                   Int32,
+    `DestAirportSeqID`                Int32,
+    `DestCityMarketID`                Int32,
+    `Dest`                            FixedString(5),
+    `DestCityName`                    String,
+    `DestState`                       FixedString(2),
+    `DestStateFips`                   String,
+    `DestStateName`                   String,
+    `DestWac`                         Int32,
+    `CRSDepTime`                      Int32,
+    `DepTime`                         Int32,
+    `DepDelay`                        Int32,
+    `DepDelayMinutes`                 Int32,
+    `DepDel15`                        Int32,
+    `DepartureDelayGroups`            String,
+    `DepTimeBlk`                      String,
+    `TaxiOut`                         Int32,
+    `WheelsOff`                       Int32,
+    `WheelsOn`                        Int32,
+    `TaxiIn`                          Int32,
+    `CRSArrTime`                      Int32,
+    `ArrTime`                         Int32,
+    `ArrDelay`                        Int32,
+    `ArrDelayMinutes`                 Int32,
+    `ArrDel15`                        Int32,
+    `ArrivalDelayGroups`              Int32,
+    `ArrTimeBlk`                      String,
+    `Cancelled`                       UInt8,
+    `CancellationCode`                FixedString(1),
+    `Diverted`                        UInt8,
+    `CRSElapsedTime`                  Int32,
+    `ActualElapsedTime`               Int32,
+    `AirTime`                         Nullable(Int32),
+    `Flights`                         Int32,
+    `Distance`                        Int32,
+    `DistanceGroup`                   UInt8,
+    `CarrierDelay`                    Int32,
+    `WeatherDelay`                    Int32,
+    `NASDelay`                        Int32,
+    `SecurityDelay`                   Int32,
+    `LateAircraftDelay`               Int32,
+    `FirstDepTime`                    String,
+    `TotalAddGTime`                   String,
+    `LongestAddGTime`                 String,
+    `DivAirportLandings`              String,
+    `DivReachedDest`                  String,
+    `DivActualElapsedTime`            String,
+    `DivArrDelay`                     String,
+    `DivDistance`                     String,
+    `Div1Airport`                     String,
+    `Div1AirportID`                   Int32,
+    `Div1AirportSeqID`                Int32,
+    `Div1WheelsOn`                    String,
+    `Div1TotalGTime`                  String,
+    `Div1LongestGTime`                String,
+    `Div1WheelsOff`                   String,
+    `Div1TailNum`                     String,
+    `Div2Airport`                     String,
+    `Div2AirportID`                   Int32,
+    `Div2AirportSeqID`                Int32,
+    `Div2WheelsOn`                    String,
+    `Div2TotalGTime`                  String,
+    `Div2LongestGTime`                String,
+    `Div2WheelsOff`                   String,
+    `Div2TailNum`                     String,
+    `Div3Airport`                     String,
+    `Div3AirportID`                   Int32,
+    `Div3AirportSeqID`                Int32,
+    `Div3WheelsOn`                    String,
+    `Div3TotalGTime`                  String,
+    `Div3LongestGTime`                String,
+    `Div3WheelsOff`                   String,
+    `Div3TailNum`                     String,
+    `Div4Airport`                     String,
+    `Div4AirportID`                   Int32,
+    `Div4AirportSeqID`                Int32,
+    `Div4WheelsOn`                    String,
+    `Div4TotalGTime`                  String,
+    `Div4LongestGTime`                String,
+    `Div4WheelsOff`                   String,
+    `Div4TailNum`                     String,
+    `Div5Airport`                     String,
+    `Div5AirportID`                   Int32,
+    `Div5AirportSeqID`                Int32,
+    `Div5WheelsOn`                    String,
+    `Div5TotalGTime`                  String,
+    `Div5LongestGTime`                String,
+    `Div5WheelsOff`                   String,
+    `Div5TailNum`                     String
 ) ENGINE = MergeTree
-PARTITION BY Year
-ORDER BY (Carrier, FlightDate)
-SETTINGS index_granularity = 8192;
+      PARTITION BY Year
+      ORDER BY (IATA_CODE_Reporting_Airline, FlightDate)
+      SETTINGS index_granularity = 8192;
 ```

 データのロード:

 ``` bash
-$ for i in *.zip; do echo $i; unzip -cq $i '*.csv' | sed 's/\.00//g' | clickhouse-client --host=example-perftest01j --query="INSERT INTO ontime FORMAT CSVWithNames"; done
+ls -1 *.zip | xargs -I{} -P $(nproc) bash -c "echo {}; unzip -cq {} '*.csv' | sed 's/\.00//g' | clickhouse-client --input_format_with_names_use_header=0 --query='INSERT INTO ontime FORMAT CSVWithNames'"
 ```

 ## パーティション済みデータのダウンロード {#download-of-prepared-partitions}
@ -212,10 +213,10 @@ LIMIT 10;
 Q4. 2007年のキャリア別の遅延の数

 ``` sql
-SELECT Carrier, count(*)
+SELECT IATA_CODE_Reporting_Airline AS Carrier, count(*)
 FROM ontime
 WHERE DepDelay>10 AND Year=2007
-GROUP BY Carrier
+GROUP BY IATA_CODE_Reporting_Airline
 ORDER BY count(*) DESC;
 ```

@ -226,32 +227,32 @@ SELECT Carrier, c, c2, c*100/c2 as c3
 FROM
 (
    SELECT
-        Carrier,
+        IATA_CODE_Reporting_Airline AS Carrier,
        count(*) AS c
    FROM ontime
    WHERE DepDelay>10
        AND Year=2007
    GROUP BY Carrier
-)
+) q
 JOIN
 (
    SELECT
-        Carrier,
+        IATA_CODE_Reporting_Airline AS Carrier,
        count(*) AS c2
    FROM ontime
    WHERE Year=2007
    GROUP BY Carrier
-) USING Carrier
+) qq USING Carrier
 ORDER BY c3 DESC;
 ```

 同じクエリのより良いバージョン:

 ``` sql
-SELECT Carrier, avg(DepDelay>10)*100 AS c3
+SELECT IATA_CODE_Reporting_Airline AS Carrier, avg(DepDelay>10)*100 AS c3
 FROM ontime
 WHERE Year=2007
-GROUP BY Carrier
+GROUP BY IATA_CODE_Reporting_Airline
 ORDER BY c3 DESC
 ```

@ -262,29 +263,29 @@ SELECT Carrier, c, c2, c*100/c2 as c3
 FROM
 (
    SELECT
-        Carrier,
+        IATA_CODE_Reporting_Airline AS Carrier,
        count(*) AS c
    FROM ontime
    WHERE DepDelay>10
        AND Year>=2000 AND Year<=2008
    GROUP BY Carrier
-)
+) q
 JOIN
 (
    SELECT
-        Carrier,
+        IATA_CODE_Reporting_Airline AS Carrier,
        count(*) AS c2
    FROM ontime
    WHERE Year>=2000 AND Year<=2008
    GROUP BY Carrier
-) USING Carrier
+) qq USING Carrier
 ORDER BY c3 DESC;
 ```

 同じクエリのより良いバージョン:

 ``` sql
-SELECT Carrier, avg(DepDelay>10)*100 AS c3
+SELECT IATA_CODE_Reporting_Airline AS Carrier, avg(DepDelay>10)*100 AS c3
 FROM ontime
 WHERE Year>=2000 AND Year<=2008
 GROUP BY Carrier
@ -303,7 +304,7 @@ FROM
    from ontime
    WHERE DepDelay>10
    GROUP BY Year
-)
+) q
 JOIN
 (
    select
@ -311,7 +312,7 @@ JOIN
        count(*) as c2
    from ontime
    GROUP BY Year
-) USING (Year)
+) qq USING (Year)
 ORDER BY Year;
 ```

@ -346,7 +347,7 @@ Q10.

 ``` sql
 SELECT
-   min(Year), max(Year), Carrier, count(*) AS cnt,
+   min(Year), max(Year), IATA_CODE_Reporting_Airline AS Carrier, count(*) AS cnt,
   sum(ArrDelayMinutes>30) AS flights_delayed,
   round(sum(ArrDelayMinutes>30)/count(*),2) AS rate
 FROM ontime
--- a/docs/ru/engines/table-engines/integrations/s3.md
+++ b/docs/ru/engines/table-engines/integrations/s3.md
@ -82,6 +82,7 @@ SELECT * FROM s3_engine_table LIMIT 2;

 Необязательные настройки:
 -   `access_key_id` и `secret_access_key` — указывают учетные данные для использования с данной точкой приема запроса.
+-   `region` — название региона S3.
 -   `use_environment_credentials` — если `true`, S3-клиент будет пытаться получить учетные данные из переменных среды и метаданных Amazon EC2 для данной точки приема запроса. Значение по умолчанию - `false`.
 -   `header` — добавляет указанный HTTP-заголовок к запросу на заданную точку приема запроса. Может быть определен несколько раз.
 -   `server_side_encryption_customer_key_base64` — устанавливает необходимые заголовки для доступа к объектам S3 с шифрованием SSE-C. 
@ -94,6 +95,7 @@ SELECT * FROM s3_engine_table LIMIT 2;
        <endpoint>https://storage.yandexcloud.net/my-test-bucket-768/</endpoint>
        <!-- <access_key_id>ACCESS_KEY_ID</access_key_id> -->
        <!-- <secret_access_key>SECRET_ACCESS_KEY</secret_access_key> -->
+        <!-- <region>us-west-1</region> -->
        <!-- <use_environment_credentials>false</use_environment_credentials> -->
        <!-- <header>Authorization: Bearer SOME-TOKEN</header> -->
        <!-- <server_side_encryption_customer_key_base64>BASE64-ENCODED-KEY</server_side_encryption_customer_key_base64> -->
--- a/docs/ru/engines/table-engines/mergetree-family/mergetree.md
+++ b/docs/ru/engines/table-engines/mergetree-family/mergetree.md
@ -727,6 +727,7 @@ SETTINGS storage_policy = 'moving_from_ssd_to_hdd'
            <endpoint>https://storage.yandexcloud.net/my-bucket/root-path/</endpoint>
            <access_key_id>your_access_key_id</access_key_id>
            <secret_access_key>your_secret_access_key</secret_access_key>
+            <region></region>
            <proxy>
                <uri>http://proxy1</uri>
                <uri>http://proxy2</uri>
@ -753,6 +754,7 @@ SETTINGS storage_policy = 'moving_from_ssd_to_hdd'

 Необязательные параметры:   

+-   `region` — название региона S3.
 -   `use_environment_credentials` — признак, нужно ли считывать учетные данные AWS из сетевого окружения, а также из переменных окружения `AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY` и `AWS_SESSION_TOKEN`, если они есть. Значение по умолчанию: `false`.
 -   `use_insecure_imds_request` — признак, нужно ли использовать менее безопасное соединение при выполнении запроса к IMDS при получении учётных данных из метаданных Amazon EC2. Значение по умолчанию: `false`.
 -   `proxy` — конфигурация прокси-сервера для конечной точки S3. Каждый элемент `uri` внутри блока `proxy` должен содержать URL прокси-сервера. 
--- a/docs/ru/getting-started/example-datasets/ontime.md
+++ b/docs/ru/getting-started/example-datasets/ontime.md
@ -27,126 +27,127 @@ done
 Создание таблицы:

 ``` sql
-CREATE TABLE `ontime` (
-  `Year` UInt16,
-  `Quarter` UInt8,
-  `Month` UInt8,
-  `DayofMonth` UInt8,
-  `DayOfWeek` UInt8,
-  `FlightDate` Date,
-  `UniqueCarrier` FixedString(7),
-  `AirlineID` Int32,
-  `Carrier` FixedString(2),
-  `TailNum` String,
-  `FlightNum` String,
-  `OriginAirportID` Int32,
-  `OriginAirportSeqID` Int32,
-  `OriginCityMarketID` Int32,
-  `Origin` FixedString(5),
-  `OriginCityName` String,
-  `OriginState` FixedString(2),
-  `OriginStateFips` String,
-  `OriginStateName` String,
-  `OriginWac` Int32,
-  `DestAirportID` Int32,
-  `DestAirportSeqID` Int32,
-  `DestCityMarketID` Int32,
-  `Dest` FixedString(5),
-  `DestCityName` String,
-  `DestState` FixedString(2),
-  `DestStateFips` String,
-  `DestStateName` String,
-  `DestWac` Int32,
-  `CRSDepTime` Int32,
-  `DepTime` Int32,
-  `DepDelay` Int32,
-  `DepDelayMinutes` Int32,
-  `DepDel15` Int32,
-  `DepartureDelayGroups` String,
-  `DepTimeBlk` String,
-  `TaxiOut` Int32,
-  `WheelsOff` Int32,
-  `WheelsOn` Int32,
-  `TaxiIn` Int32,
-  `CRSArrTime` Int32,
-  `ArrTime` Int32,
-  `ArrDelay` Int32,
-  `ArrDelayMinutes` Int32,
-  `ArrDel15` Int32,
-  `ArrivalDelayGroups` Int32,
-  `ArrTimeBlk` String,
-  `Cancelled` UInt8,
-  `CancellationCode` FixedString(1),
-  `Diverted` UInt8,
-  `CRSElapsedTime` Int32,
-  `ActualElapsedTime` Int32,
-  `AirTime` Int32,
-  `Flights` Int32,
-  `Distance` Int32,
-  `DistanceGroup` UInt8,
-  `CarrierDelay` Int32,
-  `WeatherDelay` Int32,
-  `NASDelay` Int32,
-  `SecurityDelay` Int32,
-  `LateAircraftDelay` Int32,
-  `FirstDepTime` String,
-  `TotalAddGTime` String,
-  `LongestAddGTime` String,
-  `DivAirportLandings` String,
-  `DivReachedDest` String,
-  `DivActualElapsedTime` String,
-  `DivArrDelay` String,
-  `DivDistance` String,
-  `Div1Airport` String,
-  `Div1AirportID` Int32,
-  `Div1AirportSeqID` Int32,
-  `Div1WheelsOn` String,
-  `Div1TotalGTime` String,
-  `Div1LongestGTime` String,
-  `Div1WheelsOff` String,
-  `Div1TailNum` String,
-  `Div2Airport` String,
-  `Div2AirportID` Int32,
-  `Div2AirportSeqID` Int32,
-  `Div2WheelsOn` String,
-  `Div2TotalGTime` String,
-  `Div2LongestGTime` String,
-  `Div2WheelsOff` String,
-  `Div2TailNum` String,
-  `Div3Airport` String,
-  `Div3AirportID` Int32,
-  `Div3AirportSeqID` Int32,
-  `Div3WheelsOn` String,
-  `Div3TotalGTime` String,
-  `Div3LongestGTime` String,
-  `Div3WheelsOff` String,
-  `Div3TailNum` String,
-  `Div4Airport` String,
-  `Div4AirportID` Int32,
-  `Div4AirportSeqID` Int32,
-  `Div4WheelsOn` String,
-  `Div4TotalGTime` String,
-  `Div4LongestGTime` String,
-  `Div4WheelsOff` String,
-  `Div4TailNum` String,
-  `Div5Airport` String,
-  `Div5AirportID` Int32,
-  `Div5AirportSeqID` Int32,
-  `Div5WheelsOn` String,
-  `Div5TotalGTime` String,
-  `Div5LongestGTime` String,
-  `Div5WheelsOff` String,
-  `Div5TailNum` String
+CREATE TABLE `ontime`
+(
+    `Year`                            UInt16,
+    `Quarter`                         UInt8,
+    `Month`                           UInt8,
+    `DayofMonth`                      UInt8,
+    `DayOfWeek`                       UInt8,
+    `FlightDate`                      Date,
+    `Reporting_Airline`               String,
+    `DOT_ID_Reporting_Airline`        Int32,
+    `IATA_CODE_Reporting_Airline`     String,
+    `Tail_Number`                     Int32,
+    `Flight_Number_Reporting_Airline` String,
+    `OriginAirportID`                 Int32,
+    `OriginAirportSeqID`              Int32,
+    `OriginCityMarketID`              Int32,
+    `Origin`                          FixedString(5),
+    `OriginCityName`                  String,
+    `OriginState`                     FixedString(2),
+    `OriginStateFips`                 String,
+    `OriginStateName`                 String,
+    `OriginWac`                       Int32,
+    `DestAirportID`                   Int32,
+    `DestAirportSeqID`                Int32,
+    `DestCityMarketID`                Int32,
+    `Dest`                            FixedString(5),
+    `DestCityName`                    String,
+    `DestState`                       FixedString(2),
+    `DestStateFips`                   String,
+    `DestStateName`                   String,
+    `DestWac`                         Int32,
+    `CRSDepTime`                      Int32,
+    `DepTime`                         Int32,
+    `DepDelay`                        Int32,
+    `DepDelayMinutes`                 Int32,
+    `DepDel15`                        Int32,
+    `DepartureDelayGroups`            String,
+    `DepTimeBlk`                      String,
+    `TaxiOut`                         Int32,
+    `WheelsOff`                       Int32,
+    `WheelsOn`                        Int32,
+    `TaxiIn`                          Int32,
+    `CRSArrTime`                      Int32,
+    `ArrTime`                         Int32,
+    `ArrDelay`                        Int32,
+    `ArrDelayMinutes`                 Int32,
+    `ArrDel15`                        Int32,
+    `ArrivalDelayGroups`              Int32,
+    `ArrTimeBlk`                      String,
+    `Cancelled`                       UInt8,
+    `CancellationCode`                FixedString(1),
+    `Diverted`                        UInt8,
+    `CRSElapsedTime`                  Int32,
+    `ActualElapsedTime`               Int32,
+    `AirTime`                         Nullable(Int32),
+    `Flights`                         Int32,
+    `Distance`                        Int32,
+    `DistanceGroup`                   UInt8,
+    `CarrierDelay`                    Int32,
+    `WeatherDelay`                    Int32,
+    `NASDelay`                        Int32,
+    `SecurityDelay`                   Int32,
+    `LateAircraftDelay`               Int32,
+    `FirstDepTime`                    String,
+    `TotalAddGTime`                   String,
+    `LongestAddGTime`                 String,
+    `DivAirportLandings`              String,
+    `DivReachedDest`                  String,
+    `DivActualElapsedTime`            String,
+    `DivArrDelay`                     String,
+    `DivDistance`                     String,
+    `Div1Airport`                     String,
+    `Div1AirportID`                   Int32,
+    `Div1AirportSeqID`                Int32,
+    `Div1WheelsOn`                    String,
+    `Div1TotalGTime`                  String,
+    `Div1LongestGTime`                String,
+    `Div1WheelsOff`                   String,
+    `Div1TailNum`                     String,
+    `Div2Airport`                     String,
+    `Div2AirportID`                   Int32,
+    `Div2AirportSeqID`                Int32,
+    `Div2WheelsOn`                    String,
+    `Div2TotalGTime`                  String,
+    `Div2LongestGTime`                String,
+    `Div2WheelsOff`                   String,
+    `Div2TailNum`                     String,
+    `Div3Airport`                     String,
+    `Div3AirportID`                   Int32,
+    `Div3AirportSeqID`                Int32,
+    `Div3WheelsOn`                    String,
+    `Div3TotalGTime`                  String,
+    `Div3LongestGTime`                String,
+    `Div3WheelsOff`                   String,
+    `Div3TailNum`                     String,
+    `Div4Airport`                     String,
+    `Div4AirportID`                   Int32,
+    `Div4AirportSeqID`                Int32,
+    `Div4WheelsOn`                    String,
+    `Div4TotalGTime`                  String,
+    `Div4LongestGTime`                String,
+    `Div4WheelsOff`                   String,
+    `Div4TailNum`                     String,
+    `Div5Airport`                     String,
+    `Div5AirportID`                   Int32,
+    `Div5AirportSeqID`                Int32,
+    `Div5WheelsOn`                    String,
+    `Div5TotalGTime`                  String,
+    `Div5LongestGTime`                String,
+    `Div5WheelsOff`                   String,
+    `Div5TailNum`                     String
 ) ENGINE = MergeTree
-PARTITION BY Year
-ORDER BY (Carrier, FlightDate)
-SETTINGS index_granularity = 8192;
+      PARTITION BY Year
+      ORDER BY (IATA_CODE_Reporting_Airline, FlightDate)
+      SETTINGS index_granularity = 8192;
 ```

 Загрузка данных:

 ``` bash
-$ for i in *.zip; do echo $i; unzip -cq $i '*.csv' | sed 's/\.00//g' | clickhouse-client --host=example-perftest01j --query="INSERT INTO ontime FORMAT CSVWithNames"; done
+ls -1 *.zip | xargs -I{} -P $(nproc) bash -c "echo {}; unzip -cq {} '*.csv' | sed 's/\.00//g' | clickhouse-client --input_format_with_names_use_header=0 --query='INSERT INTO ontime FORMAT CSVWithNames'"
 ```

 ## Скачивание готовых партиций {#skachivanie-gotovykh-partitsii}
@ -211,7 +212,7 @@ LIMIT 10;
 Q4. Количество задержек по перевозчикам за 2007 год

 ``` sql
-SELECT Carrier, count(*)
+SELECT IATA_CODE_Reporting_Airline AS Carrier, count(*)
 FROM ontime
 WHERE DepDelay>10 AND Year=2007
 GROUP BY Carrier
@ -225,29 +226,29 @@ SELECT Carrier, c, c2, c*100/c2 as c3
 FROM
 (
    SELECT
-        Carrier,
+        IATA_CODE_Reporting_Airline AS Carrier,
        count(*) AS c
    FROM ontime
    WHERE DepDelay>10
        AND Year=2007
    GROUP BY Carrier
-)
+) q
 JOIN
 (
    SELECT
-        Carrier,
+        IATA_CODE_Reporting_Airline AS Carrier,
        count(*) AS c2
    FROM ontime
    WHERE Year=2007
    GROUP BY Carrier
-) USING Carrier
+) qq USING Carrier
 ORDER BY c3 DESC;
 ```

 Более оптимальная версия того же запроса:

 ``` sql
-SELECT Carrier, avg(DepDelay>10)*100 AS c3
+SELECT IATA_CODE_Reporting_Airline AS Carrier, avg(DepDelay>10)*100 AS c3
 FROM ontime
 WHERE Year=2007
 GROUP BY Carrier
@ -261,29 +262,29 @@ SELECT Carrier, c, c2, c*100/c2 as c3
 FROM
 (
    SELECT
-        Carrier,
+        IATA_CODE_Reporting_Airline AS Carrier,
        count(*) AS c
    FROM ontime
    WHERE DepDelay>10
        AND Year>=2000 AND Year<=2008
    GROUP BY Carrier
-)
+) q
 JOIN
 (
    SELECT
-        Carrier,
+        IATA_CODE_Reporting_Airline AS Carrier,
        count(*) AS c2
    FROM ontime
    WHERE Year>=2000 AND Year<=2008
    GROUP BY Carrier
-) USING Carrier
+) qq USING Carrier
 ORDER BY c3 DESC;
 ```

 Более оптимальная версия того же запроса:

 ``` sql
-SELECT Carrier, avg(DepDelay>10)*100 AS c3
+SELECT IATA_CODE_Reporting_Airline AS Carrier, avg(DepDelay>10)*100 AS c3
 FROM ontime
 WHERE Year>=2000 AND Year<=2008
 GROUP BY Carrier
@ -302,7 +303,7 @@ FROM
    from ontime
    WHERE DepDelay>10
    GROUP BY Year
-)
+) q
 JOIN
 (
    select
@ -310,7 +311,7 @@ JOIN
        count(*) as c2
    from ontime
    GROUP BY Year
-) USING (Year)
+) qq USING (Year)
 ORDER BY Year;
 ```

@ -346,7 +347,7 @@ Q10.

 ``` sql
 SELECT
-   min(Year), max(Year), Carrier, count(*) AS cnt,
+   min(Year), max(Year), IATA_CODE_Reporting_Airline AS Carrier, count(*) AS cnt,
   sum(ArrDelayMinutes>30) AS flights_delayed,
   round(sum(ArrDelayMinutes>30)/count(*),2) AS rate
 FROM ontime
--- a/docs/ru/operations/server-configuration-parameters/settings.md
+++ b/docs/ru/operations/server-configuration-parameters/settings.md
@ -415,7 +415,7 @@ ClickHouse проверяет условия для `min_part_size` и `min_part
    Значения по умолчанию: при указанном `address` - `LOG_USER`, иначе - `LOG_DAEMON`
 -   format - формат сообщений. Возможные значения - `bsd` и `syslog`

-## send_crash_reports {#server_configuration_parameters-logger}
+## send_crash_reports {#server_configuration_parameters-send_crash_reports}

 Настройки для отправки сообщений о сбоях в команду разработчиков ядра ClickHouse через [Sentry](https://sentry.io).
 Включение этих настроек, особенно в pre-production среде, может дать очень ценную информацию и поможет развитию ClickHouse.
--- a/docs/ru/operations/settings/settings.md
+++ b/docs/ru/operations/settings/settings.md
@ -119,6 +119,16 @@ ClickHouse применяет настройку в тех случаях, ко

 Значение по умолчанию: 0.

+## http_max_uri_size {#http-max-uri-size}
+
+Устанавливает максимальную длину URI в HTTP-запросе.
+
+Возможные значения:
+
+-   Положительное целое.
+
+Значение по умолчанию: 1048576.
+
 ## send_progress_in_http_headers {#settings-send_progress_in_http_headers}

 Включает или отключает HTTP-заголовки `X-ClickHouse-Progress` в ответах `clickhouse-server`.
@ -2755,6 +2765,50 @@ SELECT * FROM test2;

 Значение по умолчанию: `0`.

+## prefer_column_name_to_alias {#prefer-column-name-to-alias}
+
+Включает или отключает замену названий столбцов на синонимы в выражениях и секциях запросов, см. [Примечания по использованию синонимов](../../sql-reference/syntax.md#syntax-expression_aliases). Включите эту настройку, чтобы синтаксис синонимов в ClickHouse был более совместим с большинством других СУБД.
+
+Возможные значения:
+
+- 0 — синоним подставляется вместо имени столбца.
+- 1 — синоним не подставляется вместо имени столбца.
+
+Значение по умолчанию: `0`.
+
+**Пример**
+
+Какие изменения привносит включение и выключение настройки: 
+
+Запрос:
+
+```sql
+SET prefer_column_name_to_alias = 0;
+SELECT avg(number) AS number, max(number) FROM numbers(10);
+```
+
+Результат:
+
+```text
+Received exception from server (version 21.5.1):
+Code: 184. DB::Exception: Received from localhost:9000. DB::Exception: Aggregate function avg(number) is found inside another aggregate function in query: While processing avg(number) AS number.
+```
+
+Запрос:
+
+```sql
+SET prefer_column_name_to_alias = 1;
+SELECT avg(number) AS number, max(number) FROM numbers(10);
+```
+
+Результат:
+
+```text
+┌─number─┬─max(number)─┐
+│    4.5 │           9 │
+└────────┴─────────────┘
+```
+
 ## limit {#limit}

 Устанавливает максимальное количество строк, возвращаемых запросом. Ограничивает сверху значение, установленное в запросе в секции [LIMIT](../../sql-reference/statements/select/limit.md#limit-clause).
--- a/docs/ru/sql-reference/aggregate-functions/reference/max.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/max.md
@ -1,8 +0,0 @@
---
-toc_priority: 3
---
-
-# max {#agg_function-max}
-
-Вычисляет максимум.
-
--- a/docs/ru/sql-reference/aggregate-functions/reference/max.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/max.md
@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/max.md
--- a/docs/ru/sql-reference/aggregate-functions/reference/min.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/min.md
@ -1,8 +0,0 @@
---
-toc_priority: 2
---
-
-## min {#agg_function-min}
-
-Вычисляет минимум.
-
--- a/docs/ru/sql-reference/aggregate-functions/reference/min.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/min.md
@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/min.md
--- a/docs/ru/sql-reference/aggregate-functions/reference/quantiletdigestweighted.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/quantiletdigestweighted.md
@ -12,6 +12,9 @@ toc_priority: 208

 Внутренние состояния функций `quantile*` не объединяются, если они используются в одном запросе. Если вам необходимо вычислить квантили нескольких уровней, используйте функцию [quantiles](#quantiles), это повысит эффективность запроса.

+!!! note "Примечание"
+    Использование `quantileTDigestWeighted` [не рекомендуется для небольших наборов данных](https://github.com/tdunning/t-digest/issues/167#issuecomment-828650275) и может привести к значительной ошибке. Рассмотрите возможность использования [`quantileTDigest`](../../../sql-reference/aggregate-functions/reference/quantiletdigest.md) в таких случаях.
+
 **Синтаксис**

 ``` sql
--- a/docs/ru/sql-reference/data-types/datetime.md
+++ b/docs/ru/sql-reference/data-types/datetime.md
@ -20,8 +20,7 @@ DateTime([timezone])
 ## Использование {#ispolzovanie}

 Момент времени сохраняется как [Unix timestamp](https://ru.wikipedia.org/wiki/Unix-%D0%B2%D1%80%D0%B5%D0%BC%D1%8F), независимо от часового пояса и переходов на летнее/зимнее время. Дополнительно, тип `DateTime` позволяет хранить часовой пояс, единый для всей колонки, который влияет на то, как будут отображаться значения типа `DateTime` в текстовом виде и как будут парситься значения заданные в виде строк (‘2020-01-01 05:00:01’). Часовой пояс не хранится в строках таблицы (выборки), а хранится в метаданных колонки.
-Список поддерживаемых временных зон можно найти в [IANA Time Zone Database](https://www.iana.org/time-zones).
-Пакет `tzdata`, содержащий [базу данных часовых поясов IANA](https://www.iana.org/time-zones), должен быть установлен в системе. Используйте команду `timedatectl list-timezones` для получения списка часовых поясов, известных локальной системе.
+Список поддерживаемых часовых поясов можно найти в [IANA Time Zone Database](https://www.iana.org/time-zones) или получить из базы данных, выполнив запрос `SELECT * FROM system.time_zones`. Также [список](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones) есть в Википедии.

 Часовой пояс для столбца типа `DateTime` можно в явном виде установить при создании таблицы. Если часовой пояс не установлен, то ClickHouse использует значение параметра [timezone](../../sql-reference/data-types/datetime.md#server_configuration_parameters-timezone), установленное в конфигурации сервера или в настройках операционной системы на момент запуска сервера.

--- a/docs/ru/sql-reference/functions/date-time-functions.md
+++ b/docs/ru/sql-reference/functions/date-time-functions.md
@ -134,6 +134,46 @@ SELECT timezoneOf(now());
 └───────────────────┘
 ```

+## timeZoneOffset {#timezoneoffset}
+
+Возвращает смещение часового пояса в секундах от [UTC](https://ru.wikipedia.org/wiki/Всемирное_координированное_время). Функция учитывает [летнее время](https://ru.wikipedia.org/wiki/Летнее_время) и исторические изменения часовых поясов, которые действовали на указанную дату.
+Для вычисления смещения используется информация из [базы данных IANA](https://www.iana.org/time-zones).
+
+**Синтаксис**
+
+``` sql
+timeZoneOffset(value)
+```
+
+Псевдоним: `timezoneOffset`. 
+
+**Аргументы**
+
+-   `value` — Дата с временем. [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md). 
+
+**Возвращаемое значение**
+
+-   Смещение в секундах от UTC. 
+
+Тип: [Int32](../../sql-reference/data-types/int-uint.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT toDateTime('2021-04-21 10:20:30', 'Europe/Moscow') AS Time, toTypeName(Time) AS Type,
+       timeZoneOffset(Time) AS Offset_in_seconds, (Offset_in_seconds / 3600) AS Offset_in_hours;
+```
+
+Результат:
+
+``` text
+┌────────────────Time─┬─Type──────────────────────┬─Offset_in_seconds─┬─Offset_in_hours─┐
+│ 2021-04-21 10:20:30 │ DateTime('Europe/Moscow') │             10800 │               3 │
+└─────────────────────┴───────────────────────────┴───────────────────┴─────────────────┘
+```
+
 ## toYear {#toyear}

 Переводит дату или дату-с-временем в число типа UInt16, содержащее номер года (AD).
--- a/docs/ru/sql-reference/functions/functions-for-nulls.md
+++ b/docs/ru/sql-reference/functions/functions-for-nulls.md
@ -224,7 +224,7 @@ assumeNotNull(x)
 **Возвращаемые значения**

 -   Исходное значение с не `Nullable` типом, если оно — не `NULL`.
-   Значение по умолчанию для не `Nullable` типа, если исходное значение — `NULL`.
+-   Неспецифицированный результат, зависящий от реализации, если исходное значение — `NULL`.

 **Пример**

--- a/docs/ru/sql-reference/statements/alter/index/index.md
+++ b/docs/ru/sql-reference/statements/alter/index/index.md
@ -9,8 +9,9 @@ toc_title: "Манипуляции с индексами"
 Добавить или удалить индекс можно с помощью операций

 ``` sql
-ALTER TABLE [db].name ADD INDEX name expression TYPE type GRANULARITY value [AFTER name]
-ALTER TABLE [db].name DROP INDEX name
+ALTER TABLE [db.]name ADD INDEX name expression TYPE type GRANULARITY value [AFTER name]
+ALTER TABLE [db.]name DROP INDEX name
+ALTER TABLE [db.]table MATERIALIZE INDEX name IN PARTITION partition_name
 ```

 Поддерживается только таблицами семейства `*MergeTree`.
@ -18,6 +19,7 @@ ALTER TABLE [db].name DROP INDEX name
 Команда `ADD INDEX` добавляет описание индексов в метаданные, а `DROP INDEX` удаляет индекс из метаданных и стирает файлы индекса с диска, поэтому они легковесные и работают мгновенно.

 Если индекс появился в метаданных, то он начнет считаться в последующих слияниях и записях в таблицу, а не сразу после выполнения операции `ALTER`.
+`MATERIALIZE INDEX` - перестраивает индекс в указанной партиции. Реализовано как мутация.

 Запрос на изменение индексов реплицируется, сохраняя новые метаданные в ZooKeeper и применяя изменения на всех репликах.

--- a/docs/ru/sql-reference/statements/detach.md
+++ b/docs/ru/sql-reference/statements/detach.md
@ -10,7 +10,7 @@ toc_title: DETACH
 Синтаксис:

 ``` sql
-DETACH TABLE|VIEW [IF EXISTS] [db.]name [PERMANENTLY] [ON CLUSTER cluster]
+DETACH TABLE|VIEW [IF EXISTS] [db.]name [ON CLUSTER cluster] [PERMANENTLY]
 ```

 Но ни данные, ни метаданные таблицы или материализованного представления не удаляются. При следующем запуске сервера, если не было использовано `PERMANENTLY`, сервер прочитает метаданные и снова узнает о таблице/представлении. Если таблица или представление были отключены перманентно, сервер не подключит их обратно автоматически.
--- a/docs/ru/sql-reference/syntax.md
+++ b/docs/ru/sql-reference/syntax.md
@ -128,7 +128,7 @@ expr AS alias

        Например, `SELECT table_name_alias.column_name FROM table_name table_name_alias`.

-        В функции [CAST](sql_reference/syntax.md#type_conversion_function-cast), ключевое слово `AS` имеет другое значение. Смотрите описание функции.
+        В функции [CAST](../sql_reference/syntax.md#type_conversion_function-cast), ключевое слово `AS` имеет другое значение. Смотрите описание функции.

 -   `expr` — любое выражение, которое поддерживает ClickHouse.

@ -138,7 +138,7 @@ expr AS alias

        Например, `SELECT "table t".column_name FROM table_name AS "table t"`.

-### Примечания по использованию {#primechaniia-po-ispolzovaniiu}
+### Примечания по использованию {#notes-on-usage}

 Синонимы являются глобальными для запроса или подзапроса, и вы можете определить синоним в любой части запроса для любого выражения. Например, `SELECT (1 AS n) + 2, n`.

@ -169,9 +169,9 @@ Received exception from server (version 18.14.17):
 Code: 184. DB::Exception: Received from localhost:9000, 127.0.0.1. DB::Exception: Aggregate function sum(b) is found inside another aggregate function in query.
 ```

-В этом примере мы объявили таблицу `t` со столбцом `b`. Затем, при выборе данных, мы определили синоним `sum(b) AS b`. Поскольку синонимы глобальные, то ClickHouse заменил литерал `b` в выражении `argMax(a, b)` выражением `sum(b)`. Эта замена вызвала исключение.
+В этом примере мы объявили таблицу `t` со столбцом `b`. Затем, при выборе данных, мы определили синоним `sum(b) AS b`. Поскольку синонимы глобальные, то ClickHouse заменил литерал `b` в выражении `argMax(a, b)` выражением `sum(b)`. Эта замена вызвала исключение. Можно изменить это поведение, включив настройку [prefer_column_name_to_alias](../operations/settings/settings.md#prefer_column_name_to_alias), для этого нужно установить ее в значение `1`.

-## Звёздочка {#zviozdochka}
+## Звёздочка {#asterisk}

 В запросе `SELECT`, вместо выражения может стоять звёздочка. Подробнее смотрите раздел «SELECT».

@ -180,4 +180,3 @@ Code: 184. DB::Exception: Received from localhost:9000, 127.0.0.1. DB::Exception
 Выражение представляет собой функцию, идентификатор, литерал, применение оператора, выражение в скобках, подзапрос, звёздочку. А также может содержать синоним.
 Список выражений - одно выражение или несколько выражений через запятую.
 Функции и операторы, в свою очередь, в качестве аргументов, могут иметь произвольные выражения.
-
--- a/docs/zh/commercial/cloud.md
+++ b/docs/zh/commercial/cloud.md
@ -31,7 +31,7 @@ toc_title: 云

 ## 阿里云 {#alibaba-cloud}

-阿里云的 ClickHouse 托管服务 [中国站](https://www.aliyun.com/product/clickhouse) (国际站于2021年5月初开放) 提供以下主要功能：
+[阿里云的 ClickHouse 托管服务](https://www.alibabacloud.com/zh/product/clickhouse) 提供以下主要功能：

 -   基于阿里飞天分布式系统的高可靠云盘存储引擎
 -   按需扩容，无需手动进行数据搬迁
--- a/docs/zh/getting-started/example-datasets/ontime.md
+++ b/docs/zh/getting-started/example-datasets/ontime.md
@ -29,126 +29,127 @@ done
 创建表结构：

 ``` sql
-CREATE TABLE `ontime` (
-  `Year` UInt16,
-  `Quarter` UInt8,
-  `Month` UInt8,
-  `DayofMonth` UInt8,
-  `DayOfWeek` UInt8,
-  `FlightDate` Date,
-  `UniqueCarrier` FixedString(7),
-  `AirlineID` Int32,
-  `Carrier` FixedString(2),
-  `TailNum` String,
-  `FlightNum` String,
-  `OriginAirportID` Int32,
-  `OriginAirportSeqID` Int32,
-  `OriginCityMarketID` Int32,
-  `Origin` FixedString(5),
-  `OriginCityName` String,
-  `OriginState` FixedString(2),
-  `OriginStateFips` String,
-  `OriginStateName` String,
-  `OriginWac` Int32,
-  `DestAirportID` Int32,
-  `DestAirportSeqID` Int32,
-  `DestCityMarketID` Int32,
-  `Dest` FixedString(5),
-  `DestCityName` String,
-  `DestState` FixedString(2),
-  `DestStateFips` String,
-  `DestStateName` String,
-  `DestWac` Int32,
-  `CRSDepTime` Int32,
-  `DepTime` Int32,
-  `DepDelay` Int32,
-  `DepDelayMinutes` Int32,
-  `DepDel15` Int32,
-  `DepartureDelayGroups` String,
-  `DepTimeBlk` String,
-  `TaxiOut` Int32,
-  `WheelsOff` Int32,
-  `WheelsOn` Int32,
-  `TaxiIn` Int32,
-  `CRSArrTime` Int32,
-  `ArrTime` Int32,
-  `ArrDelay` Int32,
-  `ArrDelayMinutes` Int32,
-  `ArrDel15` Int32,
-  `ArrivalDelayGroups` Int32,
-  `ArrTimeBlk` String,
-  `Cancelled` UInt8,
-  `CancellationCode` FixedString(1),
-  `Diverted` UInt8,
-  `CRSElapsedTime` Int32,
-  `ActualElapsedTime` Int32,
-  `AirTime` Int32,
-  `Flights` Int32,
-  `Distance` Int32,
-  `DistanceGroup` UInt8,
-  `CarrierDelay` Int32,
-  `WeatherDelay` Int32,
-  `NASDelay` Int32,
-  `SecurityDelay` Int32,
-  `LateAircraftDelay` Int32,
-  `FirstDepTime` String,
-  `TotalAddGTime` String,
-  `LongestAddGTime` String,
-  `DivAirportLandings` String,
-  `DivReachedDest` String,
-  `DivActualElapsedTime` String,
-  `DivArrDelay` String,
-  `DivDistance` String,
-  `Div1Airport` String,
-  `Div1AirportID` Int32,
-  `Div1AirportSeqID` Int32,
-  `Div1WheelsOn` String,
-  `Div1TotalGTime` String,
-  `Div1LongestGTime` String,
-  `Div1WheelsOff` String,
-  `Div1TailNum` String,
-  `Div2Airport` String,
-  `Div2AirportID` Int32,
-  `Div2AirportSeqID` Int32,
-  `Div2WheelsOn` String,
-  `Div2TotalGTime` String,
-  `Div2LongestGTime` String,
-  `Div2WheelsOff` String,
-  `Div2TailNum` String,
-  `Div3Airport` String,
-  `Div3AirportID` Int32,
-  `Div3AirportSeqID` Int32,
-  `Div3WheelsOn` String,
-  `Div3TotalGTime` String,
-  `Div3LongestGTime` String,
-  `Div3WheelsOff` String,
-  `Div3TailNum` String,
-  `Div4Airport` String,
-  `Div4AirportID` Int32,
-  `Div4AirportSeqID` Int32,
-  `Div4WheelsOn` String,
-  `Div4TotalGTime` String,
-  `Div4LongestGTime` String,
-  `Div4WheelsOff` String,
-  `Div4TailNum` String,
-  `Div5Airport` String,
-  `Div5AirportID` Int32,
-  `Div5AirportSeqID` Int32,
-  `Div5WheelsOn` String,
-  `Div5TotalGTime` String,
-  `Div5LongestGTime` String,
-  `Div5WheelsOff` String,
-  `Div5TailNum` String
+CREATE TABLE `ontime`
+(
+    `Year`                            UInt16,
+    `Quarter`                         UInt8,
+    `Month`                           UInt8,
+    `DayofMonth`                      UInt8,
+    `DayOfWeek`                       UInt8,
+    `FlightDate`                      Date,
+    `Reporting_Airline`               String,
+    `DOT_ID_Reporting_Airline`        Int32,
+    `IATA_CODE_Reporting_Airline`     String,
+    `Tail_Number`                     Int32,
+    `Flight_Number_Reporting_Airline` String,
+    `OriginAirportID`                 Int32,
+    `OriginAirportSeqID`              Int32,
+    `OriginCityMarketID`              Int32,
+    `Origin`                          FixedString(5),
+    `OriginCityName`                  String,
+    `OriginState`                     FixedString(2),
+    `OriginStateFips`                 String,
+    `OriginStateName`                 String,
+    `OriginWac`                       Int32,
+    `DestAirportID`                   Int32,
+    `DestAirportSeqID`                Int32,
+    `DestCityMarketID`                Int32,
+    `Dest`                            FixedString(5),
+    `DestCityName`                    String,
+    `DestState`                       FixedString(2),
+    `DestStateFips`                   String,
+    `DestStateName`                   String,
+    `DestWac`                         Int32,
+    `CRSDepTime`                      Int32,
+    `DepTime`                         Int32,
+    `DepDelay`                        Int32,
+    `DepDelayMinutes`                 Int32,
+    `DepDel15`                        Int32,
+    `DepartureDelayGroups`            String,
+    `DepTimeBlk`                      String,
+    `TaxiOut`                         Int32,
+    `WheelsOff`                       Int32,
+    `WheelsOn`                        Int32,
+    `TaxiIn`                          Int32,
+    `CRSArrTime`                      Int32,
+    `ArrTime`                         Int32,
+    `ArrDelay`                        Int32,
+    `ArrDelayMinutes`                 Int32,
+    `ArrDel15`                        Int32,
+    `ArrivalDelayGroups`              Int32,
+    `ArrTimeBlk`                      String,
+    `Cancelled`                       UInt8,
+    `CancellationCode`                FixedString(1),
+    `Diverted`                        UInt8,
+    `CRSElapsedTime`                  Int32,
+    `ActualElapsedTime`               Int32,
+    `AirTime`                         Nullable(Int32),
+    `Flights`                         Int32,
+    `Distance`                        Int32,
+    `DistanceGroup`                   UInt8,
+    `CarrierDelay`                    Int32,
+    `WeatherDelay`                    Int32,
+    `NASDelay`                        Int32,
+    `SecurityDelay`                   Int32,
+    `LateAircraftDelay`               Int32,
+    `FirstDepTime`                    String,
+    `TotalAddGTime`                   String,
+    `LongestAddGTime`                 String,
+    `DivAirportLandings`              String,
+    `DivReachedDest`                  String,
+    `DivActualElapsedTime`            String,
+    `DivArrDelay`                     String,
+    `DivDistance`                     String,
+    `Div1Airport`                     String,
+    `Div1AirportID`                   Int32,
+    `Div1AirportSeqID`                Int32,
+    `Div1WheelsOn`                    String,
+    `Div1TotalGTime`                  String,
+    `Div1LongestGTime`                String,
+    `Div1WheelsOff`                   String,
+    `Div1TailNum`                     String,
+    `Div2Airport`                     String,
+    `Div2AirportID`                   Int32,
+    `Div2AirportSeqID`                Int32,
+    `Div2WheelsOn`                    String,
+    `Div2TotalGTime`                  String,
+    `Div2LongestGTime`                String,
+    `Div2WheelsOff`                   String,
+    `Div2TailNum`                     String,
+    `Div3Airport`                     String,
+    `Div3AirportID`                   Int32,
+    `Div3AirportSeqID`                Int32,
+    `Div3WheelsOn`                    String,
+    `Div3TotalGTime`                  String,
+    `Div3LongestGTime`                String,
+    `Div3WheelsOff`                   String,
+    `Div3TailNum`                     String,
+    `Div4Airport`                     String,
+    `Div4AirportID`                   Int32,
+    `Div4AirportSeqID`                Int32,
+    `Div4WheelsOn`                    String,
+    `Div4TotalGTime`                  String,
+    `Div4LongestGTime`                String,
+    `Div4WheelsOff`                   String,
+    `Div4TailNum`                     String,
+    `Div5Airport`                     String,
+    `Div5AirportID`                   Int32,
+    `Div5AirportSeqID`                Int32,
+    `Div5WheelsOn`                    String,
+    `Div5TotalGTime`                  String,
+    `Div5LongestGTime`                String,
+    `Div5WheelsOff`                   String,
+    `Div5TailNum`                     String
 ) ENGINE = MergeTree
-PARTITION BY Year
-ORDER BY (Carrier, FlightDate)
-SETTINGS index_granularity = 8192;
+      PARTITION BY Year
+      ORDER BY (IATA_CODE_Reporting_Airline, FlightDate)
+      SETTINGS index_granularity = 8192;
 ```

 加载数据：

 ``` bash
-$ for i in *.zip; do echo $i; unzip -cq $i '*.csv' | sed 's/\.00//g' | clickhouse-client --host=example-perftest01j --query="INSERT INTO ontime FORMAT CSVWithNames"; done
+ls -1 *.zip | xargs -I{} -P $(nproc) bash -c "echo {}; unzip -cq {} '*.csv' | sed 's/\.00//g' | clickhouse-client --input_format_with_names_use_header=0 --query='INSERT INTO ontime FORMAT CSVWithNames'"
 ```

 ## 下载预处理好的分区数据 {#xia-zai-yu-chu-li-hao-de-fen-qu-shu-ju}
@ -212,7 +213,7 @@ LIMIT 10;
 Q4. 查询2007年各航空公司延误超过10分钟以上的次数

 ``` sql
-SELECT Carrier, count(*)
+SELECT IATA_CODE_Reporting_Airline AS Carrier, count(*)
 FROM ontime
 WHERE DepDelay>10 AND Year=2007
 GROUP BY Carrier
@ -226,29 +227,29 @@ SELECT Carrier, c, c2, c*100/c2 as c3
 FROM
 (
    SELECT
-        Carrier,
+        IATA_CODE_Reporting_Airline AS Carrier,
        count(*) AS c
    FROM ontime
    WHERE DepDelay>10
        AND Year=2007
    GROUP BY Carrier
-)
+) q
 JOIN
 (
    SELECT
-        Carrier,
+        IATA_CODE_Reporting_Airline AS Carrier,
        count(*) AS c2
    FROM ontime
    WHERE Year=2007
    GROUP BY Carrier
-) USING Carrier
+) qq USING Carrier
 ORDER BY c3 DESC;
 ```

 更好的查询版本：

 ``` sql
-SELECT Carrier, avg(DepDelay>10)*100 AS c3
+SELECT IATA_CODE_Reporting_Airline AS Carrier, avg(DepDelay>10)*100 AS c3
 FROM ontime
 WHERE Year=2007
 GROUP BY Carrier
@ -262,29 +263,29 @@ SELECT Carrier, c, c2, c*100/c2 as c3
 FROM
 (
    SELECT
-        Carrier,
+        IATA_CODE_Reporting_Airline AS Carrier,
        count(*) AS c
    FROM ontime
    WHERE DepDelay>10
        AND Year>=2000 AND Year<=2008
    GROUP BY Carrier
-)
+) q
 JOIN
 (
    SELECT
-        Carrier,
+        IATA_CODE_Reporting_Airline AS Carrier,
        count(*) AS c2
    FROM ontime
    WHERE Year>=2000 AND Year<=2008
    GROUP BY Carrier
-) USING Carrier
+) qq USING Carrier
 ORDER BY c3 DESC;
 ```

 更好的查询版本：

 ``` sql
-SELECT Carrier, avg(DepDelay>10)*100 AS c3
+SELECT IATA_CODE_Reporting_Airline AS Carrier, avg(DepDelay>10)*100 AS c3
 FROM ontime
 WHERE Year>=2000 AND Year<=2008
 GROUP BY Carrier
@ -303,7 +304,7 @@ FROM
    from ontime
    WHERE DepDelay>10
    GROUP BY Year
-)
+) q
 JOIN
 (
    select
@ -311,7 +312,7 @@ JOIN
        count(*) as c2
    from ontime
    GROUP BY Year
-) USING (Year)
+) qq USING (Year)
 ORDER BY Year;
 ```

@ -346,7 +347,7 @@ Q10.

 ``` sql
 SELECT
-   min(Year), max(Year), Carrier, count(*) AS cnt,
+   min(Year), max(Year), IATA_CODE_Reporting_Airline AS Carrier, count(*) AS cnt,
   sum(ArrDelayMinutes>30) AS flights_delayed,
   round(sum(ArrDelayMinutes>30)/count(*),2) AS rate
 FROM ontime
--- a/docs/zh/operations/system-tables/functions.md
+++ b/docs/zh/operations/system-tables/functions.md
@ -1,13 +1,30 @@
---
-machine_translated: true
-machine_translated_rev: 5decc73b5dc60054f19087d3690c4eb99446a6c3
---
+# system.functions {#system-functions}

-# 系统。功能 {#system-functions}
-
-包含有关正常函数和聚合函数的信息。
+包含有关常规函数和聚合函数的信息。

 列:

 -   `name`(`String`) – The name of the function.
 -   `is_aggregate`(`UInt8`) — Whether the function is aggregate.
+
+**举例**
+```
+ SELECT * FROM system.functions LIMIT 10;
+```
+
+```
+┌─name─────────────────────┬─is_aggregate─┬─case_insensitive─┬─alias_to─┐
+│ sumburConsistentHash     │            0 │                0 │          │
+│ yandexConsistentHash     │            0 │                0 │          │
+│ demangle                 │            0 │                0 │          │
+│ addressToLine            │            0 │                0 │          │
+│ JSONExtractRaw           │            0 │                0 │          │
+│ JSONExtractKeysAndValues │            0 │                0 │          │
+│ JSONExtract              │            0 │                0 │          │
+│ JSONExtractString        │            0 │                0 │          │
+│ JSONExtractFloat         │            0 │                0 │          │
+│ JSONExtractInt           │            0 │                0 │          │
+└──────────────────────────┴──────────────┴──────────────────┴──────────┘
+
+10 rows in set. Elapsed: 0.002 sec. 
+```
--- a/docs/zh/sql-reference/functions/array-functions.md
+++ b/docs/zh/sql-reference/functions/array-functions.md
@ -606,7 +606,7 @@ SELECT arrayReverseSort((x, y) -> -y, [4, 3, 5], [1, 2, 3]) AS res;

 如果要获取数组中唯一项的列表，可以使用arrayReduce（‘groupUniqArray’，arr）。

-## arryjoin(arr) {#array-functions-join}
+## arrayJoin(arr) {#array-functions-join}

 一个特殊的功能。请参见[«ArrayJoin函数»](array-join.md#functions_arrayjoin)部分。

--- a/docs/zh/sql-reference/statements/select/join.md
+++ b/docs/zh/sql-reference/statements/select/join.md
@ -43,15 +43,15 @@ ClickHouse中提供的其他联接类型:

    Also the behavior of ClickHouse server for `ANY JOIN` operations depends on the [any_join_distinct_right_table_keys](../../../operations/settings/settings.md#any_join_distinct_right_table_keys) setting.

-### ASOF加入使用 {#asof-join-usage}
+### ASOF JOIN使用 {#asof-join-usage}

 `ASOF JOIN` 当您需要连接没有完全匹配的记录时非常有用。

-算法需要表中的特殊列。 本专栏:
+该算法需要表中的特殊列。 该列需要满足:

 -   必须包含有序序列。
-   可以是以下类型之一: [Int*，UInt*](../../../sql-reference/data-types/int-uint.md), [浮动\*](../../../sql-reference/data-types/float.md), [日期](../../../sql-reference/data-types/date.md), [日期时间](../../../sql-reference/data-types/datetime.md), [十进制\*](../../../sql-reference/data-types/decimal.md).
-   不能是唯一的列 `JOIN` 
+-   可以是以下类型之一: [Int*，UInt*](../../../sql-reference/data-types/int-uint.md), [Float\*](../../../sql-reference/data-types/float.md), [Date](../../../sql-reference/data-types/date.md), [DateTime](../../../sql-reference/data-types/datetime.md), [Decimal\*](../../../sql-reference/data-types/decimal.md).
+-   不能是`JOIN`子句中唯一的列  

 语法 `ASOF JOIN ... ON`:

@ -62,9 +62,9 @@ ASOF LEFT JOIN table_2
 ON equi_cond AND closest_match_cond
 ```

-您可以使用任意数量的相等条件和恰好一个最接近的匹配条件。 例如, `SELECT count() FROM table_1 ASOF LEFT JOIN table_2 ON table_1.a == table_2.b AND table_2.t <= table_1.t`.
+您可以使用任意数量的相等条件和一个且只有一个最接近的匹配条件。 例如, `SELECT count() FROM table_1 ASOF LEFT JOIN table_2 ON table_1.a == table_2.b AND table_2.t <= table_1.t`.

-支持最接近匹配的条件: `>`, `>=`, `<`, `<=`.
+支持最接近匹配的运算符: `>`, `>=`, `<`, `<=`.

 语法 `ASOF JOIN ... USING`:

@ -75,9 +75,9 @@ ASOF JOIN table_2
 USING (equi_column1, ... equi_columnN, asof_column)
 ```

-`ASOF JOIN` 用途 `equi_columnX` 对于加入平等和 `asof_column` 用于加入与最接近的比赛 `table_1.asof_column >= table_2.asof_column` 条件。 该 `asof_column` 列总是在最后一个 `USING` 条款
+`table_1.asof_column >= table_2.asof_column` 中， `ASOF JOIN` 使用 `equi_columnX` 来进行条件匹配， `asof_column` 用于JOIN最接近匹配。  `asof_column` 列总是在最后一个 `USING` 条件中。

-例如，请考虑下表:
+例如，参考下表:

         table_1                           table_2
      event   | ev_time | user_id       event   | ev_time | user_id
@ -88,10 +88,10 @@ USING (equi_column1, ... equi_columnN, asof_column)
    event_1_2 |  13:00  |  42         event_2_3 |  13:00  |   42
                  ...                               ...

-`ASOF JOIN` 可以从用户事件的时间戳 `table_1` 并找到一个事件 `table_2` 其中时间戳最接近事件的时间戳 `table_1` 对应于最接近的匹配条件。 如果可用，则相等的时间戳值是最接近的值。 在这里，该 `user_id` 列可用于连接相等和 `ev_time` 列可用于在最接近的匹配加入。 在我们的例子中, `event_1_1` 可以加入 `event_2_1` 和 `event_1_2` 可以加入 `event_2_3`，但是 `event_2_2` 不能加入。
+`ASOF JOIN`会从 `table_2` 中的用户事件时间戳找出和 `table_1` 中用户事件时间戳中最近的一个时间戳，来满足最接近匹配的条件。如果有得话，则相等的时间戳值是最接近的值。在此例中，`user_id` 列可用于条件匹配，`ev_time` 列可用于最接近匹配。在此例中，`event_1_1` 可以 JOIN `event_2_1`，`event_1_2` 可以JOIN `event_2_3`，但是 `event_2_2` 不能被JOIN。

 !!! note "注"
-    `ASOF` 加入是 **不** 支持在 [加入我们](../../../engines/table-engines/special/join.md) 表引擎。
+    `ASOF JOIN`在 [JOIN](../../../engines/table-engines/special/join.md) 表引擎中 **不受** 支持。

 ## 分布式联接 {#global-join}

--- a/programs/bash-completion/completions/clickhouse
+++ b/programs/bash-completion/completions/clickhouse
@ -23,19 +23,9 @@ function _complete_for_clickhouse_entrypoint_bin()
    fi
    util="${words[1]}"

-    case "$prev" in
-        -C|--config-file|--config)
-            return
-            ;;
-        # Argh...  This looks like a bash bug...
-        # Redirections are passed to the completion function
-        # although it is managed by the shell directly...
-        '<'|'>'|'>>'|[12]'>'|[12]'>>')
-            return
-            ;;
-    esac
-
-    COMPREPLY=( $(compgen -W "$(_clickhouse_get_options "$cmd" "$util")" -- "$cur") )
+    if _complete_for_clickhouse_generic_bin_impl "$prev"; then
+        COMPREPLY=( $(compgen -W "$(_clickhouse_get_options "$cmd" "$util")" -- "$cur") )
+    fi

    return 0
 }
--- a/programs/bash-completion/completions/clickhouse-bootstrap
+++ b/programs/bash-completion/completions/clickhouse-bootstrap
@ -15,6 +15,13 @@ shopt -s extglob

 export _CLICKHOUSE_COMPLETION_LOADED=1

+CLICKHOUSE_QueryProcessingStage=(
+    complete
+    fetch_columns
+    with_mergeable_state
+    with_mergeable_state_after_aggregation
+)
+
 function _clickhouse_bin_exist()
 { [ -x "$1" ] || command -v "$1" >& /dev/null; }

@ -30,6 +37,33 @@ function _clickhouse_get_options()
    "$@" --help 2>&1 | awk -F '[ ,=<>]' '{ for (i=1; i <= NF; ++i) { if (substr($i, 0, 1) == "-" && length($i) > 1) print $i; } }' | sort -u
 }

+function _complete_for_clickhouse_generic_bin_impl()
+{
+    local prev=$1 && shift
+
+    case "$prev" in
+        -C|--config-file|--config)
+            return 1
+            ;;
+        --stage)
+            COMPREPLY=( $(compgen -W "${CLICKHOUSE_QueryProcessingStage[*]}" -- "$cur") )
+            return 1
+            ;;
+        --host)
+            COMPREPLY=( $(compgen -A hostname -- "$cur") )
+            return 1
+            ;;
+        # Argh...  This looks like a bash bug...
+        # Redirections are passed to the completion function
+        # although it is managed by the shell directly...
+        '<'|'>'|'>>'|[12]'>'|[12]'>>')
+            return 1
+            ;;
+    esac
+
+    return 0
+}
+
 function _complete_for_clickhouse_generic_bin()
 {
    local cur prev
@ -39,19 +73,9 @@ function _complete_for_clickhouse_generic_bin()
    COMPREPLY=()
    _get_comp_words_by_ref cur prev

-    case "$prev" in
-        -C|--config-file|--config)
-            return
-            ;;
-        # Argh...  This looks like a bash bug...
-        # Redirections are passed to the completion function
-        # although it is managed by the shell directly...
-        '<'|'>'|'>>'|[12]'>'|[12]'>>')
-            return
-            ;;
-    esac
-
-    COMPREPLY=( $(compgen -W "$(_clickhouse_get_options "$cmd")" -- "$cur") )
+    if _complete_for_clickhouse_generic_bin_impl "$prev"; then
+        COMPREPLY=( $(compgen -W "$(_clickhouse_get_options "$cmd")" -- "$cur") )
+    fi

    return 0
 }
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@ -2252,30 +2252,27 @@ private:
            return;

        processed_rows += block.rows();
+
+        /// Even if all blocks are empty, we still need to initialize the output stream to write empty resultset.
        initBlockOutputStream(block);

        /// The header block containing zero rows was used to initialize
        /// block_out_stream, do not output it.
        /// Also do not output too much data if we're fuzzing.
-        if (block.rows() != 0
-            && (query_fuzzer_runs == 0 || processed_rows < 100))
-        {
-            block_out_stream->write(block);
-            written_first_block = true;
-        }
+        if (block.rows() == 0 || (query_fuzzer_runs != 0 && processed_rows >= 100))
+            return;

-        bool clear_progress = false;
        if (need_render_progress)
-            clear_progress = std_out.offset() > 0;
-
-        if (clear_progress)
            clearProgress();

+        block_out_stream->write(block);
+        written_first_block = true;
+
        /// Received data block is immediately displayed to the user.
        block_out_stream->flush();

        /// Restore progress bar after data block.
-        if (clear_progress)
+        if (need_render_progress)
            writeProgress();
    }

--- a/programs/client/QueryFuzzer.cpp
+++ b/programs/client/QueryFuzzer.cpp
@ -27,6 +27,7 @@
 #include <Parsers/formatAST.h>
 #include <Parsers/parseQuery.h>

+
 namespace DB
 {

--- a/programs/client/QueryFuzzer.h
+++ b/programs/client/QueryFuzzer.h
@ -50,7 +50,7 @@ struct QueryFuzzer
    // Some debug fields for detecting problematic ASTs with loops.
    // These are reset for each fuzzMain call.
    std::unordered_set<const IAST *> debug_visited_nodes;
-    ASTPtr * debug_top_ast;
+    ASTPtr * debug_top_ast = nullptr;


    // This is the only function you have to call -- it will modify the passed
--- a/programs/install/Install.cpp
+++ b/programs/install/Install.cpp
@ -844,8 +844,8 @@ namespace
                fmt::print("The pidof command returned unusual output.\n");
            }

-            WriteBufferFromFileDescriptor stderr(STDERR_FILENO);
-            copyData(sh->err, stderr);
+            WriteBufferFromFileDescriptor std_err(STDERR_FILENO);
+            copyData(sh->err, std_err);

            sh->tryWait();
        }
--- a/programs/library-bridge/SharedLibraryHandler.h
+++ b/programs/library-bridge/SharedLibraryHandler.h
@ -23,6 +23,8 @@ public:

    SharedLibraryHandler(const SharedLibraryHandler & other);

+    SharedLibraryHandler & operator=(const SharedLibraryHandler & other) = delete;
+
    ~SharedLibraryHandler();

    BlockInputStreamPtr loadAll();
--- a/programs/odbc-bridge/ColumnInfoHandler.cpp
+++ b/programs/odbc-bridge/ColumnInfoHandler.cpp
@ -109,7 +109,7 @@ void ODBCColumnsInfoHandler::handleRequest(HTTPServerRequest & request, HTTPServ
                validateODBCConnectionString(connection_string),
                getContext()->getSettingsRef().odbc_bridge_connection_pool_size);

-        nanodbc::catalog catalog(*connection);
+        nanodbc::catalog catalog(connection->get());
        std::string catalog_name;

        /// In XDBC tables it is allowed to pass either database_name or schema_name in table definion, but not both of them.
--- a/programs/odbc-bridge/IdentifierQuoteHandler.cpp
+++ b/programs/odbc-bridge/IdentifierQuoteHandler.cpp
@ -46,7 +46,7 @@ void IdentifierQuoteHandler::handleRequest(HTTPServerRequest & request, HTTPServ
                validateODBCConnectionString(connection_string),
                getContext()->getSettingsRef().odbc_bridge_connection_pool_size);

-        auto identifier = getIdentifierQuote(*connection);
+        auto identifier = getIdentifierQuote(connection->get());

        WriteBufferFromHTTPServerResponse out(response, request.getMethod() == Poco::Net::HTTPRequest::HTTP_HEAD, keep_alive_timeout);
        try
--- a/programs/odbc-bridge/MainHandler.cpp
+++ b/programs/odbc-bridge/MainHandler.cpp
@ -18,13 +18,10 @@
 #include <Processors/Formats/InputStreamFromInputFormat.h>
 #include <common/logger_useful.h>
 #include <Server/HTTP/HTMLForm.h>
-#include "ODBCConnectionFactory.h"

 #include <mutex>
 #include <memory>

-#include <nanodbc/nanodbc.h>
-

 namespace DB
 {
@ -133,12 +130,12 @@ void ODBCHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse

            auto quoting_style = IdentifierQuotingStyle::None;
 #if USE_ODBC
-            quoting_style = getQuotingStyle(*connection);
+            quoting_style = getQuotingStyle(connection->get());
 #endif
            auto & read_buf = request.getStream();
            auto input_format = FormatFactory::instance().getInput(format, read_buf, *sample_block, getContext(), max_block_size);
            auto input_stream = std::make_shared<InputStreamFromInputFormat>(input_format);
-            ODBCBlockOutputStream output_stream(*connection, db_name, table_name, *sample_block, getContext(), quoting_style);
+            ODBCBlockOutputStream output_stream(std::move(connection), db_name, table_name, *sample_block, getContext(), quoting_style);
            copyData(*input_stream, output_stream);
            writeStringBinary("Ok.", out);
        }
@ -148,7 +145,7 @@ void ODBCHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse
            LOG_TRACE(log, "Query: {}", query);

            BlockOutputStreamPtr writer = FormatFactory::instance().getOutputStreamParallelIfPossible(format, out, *sample_block, getContext());
-            ODBCBlockInputStream inp(*connection, query, *sample_block, max_block_size);
+            ODBCBlockInputStream inp(std::move(connection), query, *sample_block, max_block_size);
            copyData(inp, *writer);
        }
    }
--- a/programs/odbc-bridge/ODBCBlockInputStream.cpp
+++ b/programs/odbc-bridge/ODBCBlockInputStream.cpp
@ -21,14 +21,13 @@ namespace ErrorCodes


 ODBCBlockInputStream::ODBCBlockInputStream(
-    nanodbc::connection & connection_, const std::string & query_str, const Block & sample_block, const UInt64 max_block_size_)
+    nanodbc::ConnectionHolderPtr connection, const std::string & query_str, const Block & sample_block, const UInt64 max_block_size_)
    : log(&Poco::Logger::get("ODBCBlockInputStream"))
    , max_block_size{max_block_size_}
-    , connection(connection_)
    , query(query_str)
 {
    description.init(sample_block);
-    result = execute(connection, NANODBC_TEXT(query));
+    result = execute(connection->get(), NANODBC_TEXT(query));
 }


--- a/programs/odbc-bridge/ODBCBlockInputStream.h
+++ b/programs/odbc-bridge/ODBCBlockInputStream.h
@ -4,7 +4,7 @@
 #include <Core/Block.h>
 #include <DataStreams/IBlockInputStream.h>
 #include <Core/ExternalResultDescription.h>
-#include <nanodbc/nanodbc.h>
+#include "ODBCConnectionFactory.h"


 namespace DB
@ -13,7 +13,7 @@ namespace DB
 class ODBCBlockInputStream final : public IBlockInputStream
 {
 public:
-    ODBCBlockInputStream(nanodbc::connection & connection_, const std::string & query_str, const Block & sample_block, const UInt64 max_block_size_);
+    ODBCBlockInputStream(nanodbc::ConnectionHolderPtr connection, const std::string & query_str, const Block & sample_block, const UInt64 max_block_size_);

    String getName() const override { return "ODBC"; }

@ -36,7 +36,6 @@ private:
    const UInt64 max_block_size;
    ExternalResultDescription description;

-    nanodbc::connection & connection;
    nanodbc::result result;
    String query;
    bool finished = false;
--- a/programs/odbc-bridge/ODBCBlockOutputStream.cpp
+++ b/programs/odbc-bridge/ODBCBlockOutputStream.cpp
@ -40,14 +40,14 @@ namespace

 }

-ODBCBlockOutputStream::ODBCBlockOutputStream(nanodbc::connection & connection_,
+ODBCBlockOutputStream::ODBCBlockOutputStream(nanodbc::ConnectionHolderPtr connection_,
                                             const std::string & remote_database_name_,
                                             const std::string & remote_table_name_,
                                             const Block & sample_block_,
                                             ContextPtr local_context_,
                                             IdentifierQuotingStyle quoting_)
    : log(&Poco::Logger::get("ODBCBlockOutputStream"))
-    , connection(connection_)
+    , connection(std::move(connection_))
    , db_name(remote_database_name_)
    , table_name(remote_table_name_)
    , sample_block(sample_block_)
@ -69,7 +69,7 @@ void ODBCBlockOutputStream::write(const Block & block)
    writer->write(block);

    std::string query = getInsertQuery(db_name, table_name, block.getColumnsWithTypeAndName(), quoting) + values_buf.str();
-    execute(connection, query);
+    execute(connection->get(), query);
 }

 }
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`../../../../en/sql-reference/aggregate-functions/reference/max.md`