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

2024-11-22 15:42:02 +00:00 · 2021-01-27 19:48:55 +03:00 · 2021-01-27 19:48:55 +03:00 · a8f3078ce9
commit a8f3078ce9
parent 0e903552a0 331e8211db
1088 changed files with 44302 additions and 22937 deletions
--- a/.github/ISSUE_TEMPLATE/40_bug-report.md
+++ b/.github/ISSUE_TEMPLATE/40_bug-report.md
@ -12,6 +12,9 @@ assignees: ''
 **Describe the bug**
 A clear and concise description of what works not as it is supposed to.

+**Does it reproduce on recent release?**
+[The list of releases](https://github.com/ClickHouse/ClickHouse/blob/master/utils/list-versions/version_date.tsv)
+
 **How to reproduce**
 * Which ClickHouse server version to use
 * Which interface to use, if matters
--- a/.github/ISSUE_TEMPLATE/95_sanitizer-report.md
+++ b/.github/ISSUE_TEMPLATE/95_sanitizer-report.md
@ -0,0 +1,19 @@
+---
+name: Sanitizer alert
+about: Potential issue has been found by special code instrumentation
+title: ''
+labels: testing
+assignees: ''
+
+---
+
+(you don't have to strictly follow this form)
+
+**Describe the bug**
+A link to the report
+
+**How to reproduce**
+Try to reproduce the report and copy the tables and queries involved.
+
+**Error message and/or stacktrace**
+You can find additional information in server logs.
--- a/.gitmodules
+++ b/.gitmodules
@ -84,7 +84,7 @@
 	url = https://github.com/google/brotli.git
 [submodule "contrib/h3"]
 	path = contrib/h3
-	url = https://github.com/uber/h3
+	url = https://github.com/ClickHouse-Extras/h3
 [submodule "contrib/hyperscan"]
 	path = contrib/hyperscan
 	url = https://github.com/ClickHouse-Extras/hyperscan.git
@ -209,6 +209,12 @@
 [submodule "contrib/fast_float"]
 	path = contrib/fast_float
 	url = https://github.com/fastfloat/fast_float
+[submodule "contrib/libpqxx"]
+	path = contrib/libpqxx
+	url = https://github.com/jtv/libpqxx
+[submodule "contrib/libpq"]
+	path = contrib/libpq
+	url = https://github.com/ClickHouse-Extras/libpq
 [submodule "contrib/boringssl"]
 	path = contrib/boringssl
 	url = https://github.com/ClickHouse-Extras/boringssl.git
--- a/.pylintrc
+++ b/.pylintrc
@ -0,0 +1,45 @@
+# vim: ft=config
+
+[BASIC]
+max-module-lines=2000
+# due to SQL
+max-line-length=200
+# Drop/decrease them one day:
+max-branches=50
+max-nested-blocks=10
+max-statements=200
+
+[FORMAT]
+ignore-long-lines = (# )?<?https?://\S+>?$
+
+[MESSAGES CONTROL]
+disable = bad-continuation,
+          missing-docstring,
+          bad-whitespace,
+          too-few-public-methods,
+          invalid-name,
+          too-many-arguments,
+          keyword-arg-before-vararg,
+          too-many-locals,
+          too-many-instance-attributes,
+          cell-var-from-loop,
+          fixme,
+          too-many-public-methods,
+          wildcard-import,
+          unused-wildcard-import,
+          singleton-comparison,
+          # pytest.mark.parametrize is not callable (not-callable)
+          not-callable,
+          # https://github.com/PyCQA/pylint/issues/3882
+          # [Python 3.9] Value 'Optional' is unsubscriptable (unsubscriptable-object) (also Union)
+          unsubscriptable-object,
+          # Drop them one day:
+          redefined-outer-name,
+          broad-except,
+          bare-except,
+          no-else-return,
+          global-statement
+
+[SIMILARITIES]
+# due to SQL
+min-similarity-lines=1000
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -490,6 +490,7 @@ include (cmake/find/rapidjson.cmake)
 include (cmake/find/fastops.cmake)
 include (cmake/find/odbc.cmake)
 include (cmake/find/rocksdb.cmake)
+include (cmake/find/libpqxx.cmake)
 include (cmake/find/nuraft.cmake)


--- a/4
+++ b/4
@ -1,4 +1,4 @@
-Copyright 2016-2020 Yandex LLC
+Copyright 2016-2021 Yandex LLC

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

-   Copyright 2016-2020 Yandex LLC
+   Copyright 2016-2021 Yandex LLC

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
--- a/README.md
+++ b/README.md
@ -16,4 +16,4 @@ ClickHouse® is an open-source column-oriented database management system that a
 * You can also [fill this form](https://clickhouse.tech/#meet) to meet Yandex ClickHouse team in person.

 ## Upcoming Events
-* [SF Bay Area ClickHouse Virtual Office Hours (online)](https://www.meetup.com/San-Francisco-Bay-Area-ClickHouse-Meetup/events/274273549/) on 20 January 2020.
+* [Chinese ClickHouse Meetup (online)](http://hdxu.cn/8KxZE) on 6 February 2021.
--- a/SECURITY.md
+++ b/SECURITY.md
@ -15,9 +15,13 @@ currently being supported with security updates:
 | 20.4   | :x: |
 | 20.5   | :x: |
 | 20.6   | :x: |
-| 20.7   | :white_check_mark: |
+| 20.7   | :x: |
 | 20.8   | :white_check_mark: |
-| 20.9   | :white_check_mark: |
+| 20.9   | :x: |
+| 20.10  | :x: |
+| 20.11  | :white_check_mark: |
+| 20.12  | :white_check_mark: |
+| 21.1   | :white_check_mark: |

 ## Reporting a Vulnerability

--- a/base/common/DateLUTImpl.h
+++ b/base/common/DateLUTImpl.h
@ -229,8 +229,12 @@ public:

    inline UInt8 daysInMonth(UInt16 year, UInt8 month) const
    {
+        UInt16 idx = year - DATE_LUT_MIN_YEAR;
+        if (unlikely(idx >= DATE_LUT_YEARS))
+            return 31;  /// Implementation specific behaviour on overflow.
+
        /// 32 makes arithmetic more simple.
-        DayNum any_day_of_month = DayNum(years_lut[year - DATE_LUT_MIN_YEAR] + 32 * (month - 1));
+        DayNum any_day_of_month = DayNum(years_lut[idx] + 32 * (month - 1));
        return lut[any_day_of_month].days_in_month;
    }

@ -767,7 +771,7 @@ public:
    /// Adding calendar intervals.
    /// Implementation specific behaviour when delta is too big.

-    inline time_t addDays(time_t t, Int64 delta) const
+    inline NO_SANITIZE_UNDEFINED time_t addDays(time_t t, Int64 delta) const
    {
        DayNum index = findIndex(t);
        time_t time_offset = toHour(t) * 3600 + toMinute(t) * 60 + toSecond(t);
@ -780,7 +784,7 @@ public:
        return lut[index].date + time_offset;
    }

-    inline time_t addWeeks(time_t t, Int64 delta) const
+    inline NO_SANITIZE_UNDEFINED time_t addWeeks(time_t t, Int64 delta) const
    {
        return addDays(t, delta * 7);
    }
@ -812,7 +816,7 @@ public:
        return lut[result_day].date + time_offset;
    }

-    inline DayNum addMonths(DayNum d, Int64 delta) const
+    inline NO_SANITIZE_UNDEFINED DayNum addMonths(DayNum d, Int64 delta) const
    {
        const Values & values = lut[d];

@ -836,18 +840,18 @@ public:
        }
    }

-    inline time_t addQuarters(time_t t, Int64 delta) const
+    inline NO_SANITIZE_UNDEFINED time_t addQuarters(time_t t, Int64 delta) const
    {
        return addMonths(t, delta * 3);
    }

-    inline DayNum addQuarters(DayNum d, Int64 delta) const
+    inline NO_SANITIZE_UNDEFINED DayNum addQuarters(DayNum d, Int64 delta) const
    {
        return addMonths(d, delta * 3);
    }

    /// Saturation can occur if 29 Feb is mapped to non-leap year.
-    inline time_t addYears(time_t t, Int64 delta) const
+    inline NO_SANITIZE_UNDEFINED time_t addYears(time_t t, Int64 delta) const
    {
        DayNum result_day = addYears(toDayNum(t), delta);

@ -859,7 +863,7 @@ public:
        return lut[result_day].date + time_offset;
    }

-    inline DayNum addYears(DayNum d, Int64 delta) const
+    inline NO_SANITIZE_UNDEFINED DayNum addYears(DayNum d, Int64 delta) const
    {
        const Values & values = lut[d];

--- a/base/common/extended_types.h
+++ b/base/common/extended_types.h
@ -104,8 +104,3 @@ template <> struct is_big_int<wUInt256> { static constexpr bool value = true; };
 template <typename T>
 inline constexpr bool is_big_int_v = is_big_int<T>::value;

-template <typename To, typename From>
-inline To bigint_cast(const From & x [[maybe_unused]])
-{
-    return static_cast<To>(x);
-}
--- a/base/daemon/BaseDaemon.cpp
+++ b/base/daemon/BaseDaemon.cpp
@ -112,11 +112,13 @@ static void writeSignalIDtoSignalPipe(int sig)
 /** Signal handler for HUP / USR1 */
 static void closeLogsSignalHandler(int sig, siginfo_t *, void *)
 {
+    DENY_ALLOCATIONS_IN_SCOPE;
    writeSignalIDtoSignalPipe(sig);
 }

 static void terminateRequestedSignalHandler(int sig, siginfo_t *, void *)
 {
+    DENY_ALLOCATIONS_IN_SCOPE;
    writeSignalIDtoSignalPipe(sig);
 }

@ -125,6 +127,7 @@ static void terminateRequestedSignalHandler(int sig, siginfo_t *, void *)
  */
 static void signalHandler(int sig, siginfo_t * info, void * context)
 {
+    DENY_ALLOCATIONS_IN_SCOPE;
    auto saved_errno = errno;   /// We must restore previous value of errno in signal handler.

    char buf[signal_pipe_buf_size];
--- a/base/glibc-compatibility/CMakeLists.txt
+++ b/base/glibc-compatibility/CMakeLists.txt
@ -27,9 +27,12 @@ if (GLIBC_COMPATIBILITY)
        list(APPEND glibc_compatibility_sources musl/getentropy.c)
    endif()

-    add_library (clickhouse_memcpy OBJECT
-        ${ClickHouse_SOURCE_DIR}/contrib/FastMemcpy/memcpy_wrapper.c
-    )
+    if (NOT ARCH_ARM)
+        # clickhouse_memcpy don't support ARCH_ARM, see https://github.com/ClickHouse/ClickHouse/issues/18951
+        add_library (clickhouse_memcpy OBJECT
+            ${ClickHouse_SOURCE_DIR}/contrib/FastMemcpy/memcpy_wrapper.c
+        )
+    endif()

    # Need to omit frame pointers to match the performance of glibc
    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fomit-frame-pointer")
--- a/base/glibc-compatibility/musl/sched_getcpu.c
+++ b/base/glibc-compatibility/musl/sched_getcpu.c
@ -4,6 +4,12 @@
 #include "syscall.h"
 #include "atomic.h"

+#if defined(__has_feature)
+#if __has_feature(memory_sanitizer)
+#include <sanitizer/msan_interface.h>
+#endif
+#endif
+
 #ifdef VDSO_GETCPU_SYM

 static void *volatile vdso_func;
@ -37,6 +43,13 @@ int sched_getcpu(void)
 #endif

 	r = __syscall(SYS_getcpu, &cpu, 0, 0);
-	if (!r) return cpu;
+	if (!r) {
+#if defined(__has_feature)
+#if __has_feature(memory_sanitizer)
+        __msan_unpoison(&cpu, sizeof(cpu));
+#endif
+#endif
+        return cpu;
+    }
 	return __syscall_ret(r);
 }
--- a/base/harmful/harmful.c
+++ b/base/harmful/harmful.c
@ -118,7 +118,9 @@ TRAP(logout)
 TRAP(logwtmp)
 TRAP(lrand48)
 TRAP(mallinfo)
-TRAP(mallopt)
+#if !defined(SANITIZER)
+TRAP(mallopt) // Used by tsan
+#endif
 TRAP(mblen)
 TRAP(mbrlen)
 TRAP(mbrtowc)
@ -193,7 +195,9 @@ TRAP(dbm_nextkey)
 TRAP(dbm_open)
 TRAP(dbm_store)
 TRAP(dirname)
-TRAP(dlerror)
+#if !defined(SANITIZER)
+TRAP(dlerror) // Used by tsan
+#endif
 TRAP(ftw)
 TRAP(getc_unlocked)
 //TRAP(getenv) // Ok at program startup
--- a/cmake/autogenerated_versions.txt
+++ b/cmake/autogenerated_versions.txt
@ -1,9 +1,9 @@
 # This strings autochanged from release_lib.sh:
-SET(VERSION_REVISION 54445)
+SET(VERSION_REVISION 54447)
 SET(VERSION_MAJOR 21)
-SET(VERSION_MINOR 1)
+SET(VERSION_MINOR 2)
 SET(VERSION_PATCH 1)
-SET(VERSION_GITHASH 667dd0cf0ccecdaa6f334177b7ece2f53bd196a1)
-SET(VERSION_DESCRIBE v21.1.1.5646-prestable)
-SET(VERSION_STRING 21.1.1.5646)
+SET(VERSION_GITHASH 53d0c9fa7255aa1dc48991d19f4246ff71cc2fd7)
+SET(VERSION_DESCRIBE v21.2.1.1-prestable)
+SET(VERSION_STRING 21.2.1.1)
 # end of autochange
--- a/cmake/find/libpqxx.cmake
+++ b/cmake/find/libpqxx.cmake
@ -0,0 +1,31 @@
+option(ENABLE_LIBPQXX "Enalbe libpqxx" ${ENABLE_LIBRARIES})
+
+if (NOT ENABLE_LIBPQXX)
+    return()
+endif()
+
+if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/libpqxx/CMakeLists.txt")
+    message (WARNING "submodule contrib/libpqxx is missing. to fix try run: \n git submodule update --init --recursive")
+    message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal libpqxx library")
+    set (USE_LIBPQXX 0)
+    return()
+endif()
+
+if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/libpq/include")
+    message (ERROR "submodule contrib/libpq is missing. to fix try run: \n git submodule update --init --recursive")
+    message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal libpq needed for libpqxx")
+    set (USE_LIBPQXX 0)
+    return()
+endif()
+
+if (NOT USE_INTERNAL_SSL_LIBRARY)
+    set (USE_LIBPQXX 0)
+else ()
+set (USE_LIBPQXX 1)
+set (LIBPQXX_LIBRARY libpqxx)
+set (LIBPQ_LIBRARY libpq)
+set (LIBPQXX_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/libpqxx/include")
+set (LIBPQ_ROOT_DIR "${ClickHouse_SOURCE_DIR}/contrib/libpq")
+message (STATUS "Using libpqxx=${USE_LIBPQXX}: ${LIBPQXX_INCLUDE_DIR} : ${LIBPQXX_LIBRARY}")
+message (STATUS "Using libpq: ${LIBPQ_ROOT_DIR} : ${LIBPQ_INCLUDE_DIR} : ${LIBPQ_LIBRARY}")
+endif()
--- a/cmake/find/rdkafka.cmake
+++ b/cmake/find/rdkafka.cmake
@ -1,10 +1,4 @@
-if (NOT ARCH_ARM AND OPENSSL_FOUND)
-    option (ENABLE_RDKAFKA "Enable kafka" ${ENABLE_LIBRARIES})
-elseif(ENABLE_RDKAFKA AND NOT OPENSSL_FOUND)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use librdkafka without SSL")
-elseif(ENABLE_RDKAFKA)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "librdafka is not supported on ARM and on FreeBSD")
-endif ()
+option (ENABLE_RDKAFKA "Enable kafka" ${ENABLE_LIBRARIES})

 if (NOT ENABLE_RDKAFKA)
    if (USE_INTERNAL_RDKAFKA_LIBRARY)
@ -13,11 +7,7 @@ if (NOT ENABLE_RDKAFKA)
    return()
 endif()

-if (NOT ARCH_ARM)
-    option (USE_INTERNAL_RDKAFKA_LIBRARY "Set to FALSE to use system librdkafka instead of the bundled" ${NOT_UNBUNDLED})
-elseif(USE_INTERNAL_RDKAFKA_LIBRARY)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use internal librdkafka with ARCH_ARM=${ARCH_ARM}")
-endif ()
+option (USE_INTERNAL_RDKAFKA_LIBRARY "Set to FALSE to use system librdkafka instead of the bundled" ${NOT_UNBUNDLED})

 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/cppkafka/CMakeLists.txt")
    if(USE_INTERNAL_RDKAFKA_LIBRARY)
@ -67,14 +57,12 @@ if (RDKAFKA_LIB AND RDKAFKA_INCLUDE_DIR)
    if (LZ4_LIBRARY)
       list (APPEND RDKAFKA_LIBRARY ${LZ4_LIBRARY})
    endif ()
-elseif (NOT MISSING_INTERNAL_RDKAFKA_LIBRARY AND NOT MISSING_INTERNAL_CPPKAFKA_LIBRARY AND NOT ARCH_ARM)
+elseif (NOT MISSING_INTERNAL_RDKAFKA_LIBRARY AND NOT MISSING_INTERNAL_CPPKAFKA_LIBRARY)
    set (USE_INTERNAL_RDKAFKA_LIBRARY 1)
    set (RDKAFKA_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/librdkafka/src")
    set (RDKAFKA_LIBRARY rdkafka)
    set (CPPKAFKA_LIBRARY cppkafka)
    set (USE_RDKAFKA 1)
-elseif(ARCH_ARM)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Using internal rdkafka on ARM is not supported")
 endif ()

 message (STATUS "Using librdkafka=${USE_RDKAFKA}: ${RDKAFKA_INCLUDE_DIR} : ${RDKAFKA_LIBRARY} ${CPPKAFKA_LIBRARY}")
--- a/cmake/find/zlib.cmake
+++ b/cmake/find/zlib.cmake
@ -35,6 +35,7 @@ if (NOT ZLIB_FOUND AND NOT MISSING_INTERNAL_ZLIB_LIBRARY)
    set (ZLIB_INCLUDE_DIRECTORIES ${ZLIB_INCLUDE_DIR}) # for protobuf
    set (ZLIB_FOUND 1) # for poco
    set (ZLIB_LIBRARIES zlib CACHE INTERNAL "")
+    set (ZLIB_LIBRARY_NAME ${ZLIB_LIBRARIES}) # for cassandra
    set (ZLIB_NAME "${INTERNAL_ZLIB_NAME}")
 endif ()

--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@ -119,12 +119,6 @@ if (USE_INTERNAL_LDAP_LIBRARY)
    add_subdirectory (openldap-cmake)
 endif ()

-# Should go before:
-# - mariadb-connector-c
-# - aws-s3-cmake
-# - sentry-native
-add_subdirectory (curl-cmake)
-
 function(mysql_support)
    set(CLIENT_PLUGIN_CACHING_SHA2_PASSWORD STATIC)
    set(CLIENT_PLUGIN_SHA256_PASSWORD STATIC)
@ -142,6 +136,7 @@ function(mysql_support)
        set(ZLIB_LIBRARY ${ZLIB_LIBRARIES})
        set(WITH_EXTERNAL_ZLIB ON)
    endif()
+    set(WITH_CURL OFF)
    add_subdirectory (mariadb-connector-c)
 endfunction()
 if (ENABLE_MYSQL AND USE_INTERNAL_MYSQL_LIBRARY)
@ -288,6 +283,10 @@ if (USE_CASSANDRA)
    add_subdirectory (cassandra)
 endif()

+# Should go before:
+# - sentry-native
+add_subdirectory (curl-cmake)
+
 if (USE_SENTRY)
    add_subdirectory (sentry-native)
 endif()
@ -310,6 +309,11 @@ if (USE_INTERNAL_ROCKSDB_LIBRARY)
    add_subdirectory(rocksdb-cmake)
 endif()

+if (USE_LIBPQXX)
+    add_subdirectory (libpq-cmake)
+    add_subdirectory (libpqxx-cmake)
+endif()
+
 if (USE_NURAFT)
  add_subdirectory(nuraft-cmake)
 endif()
--- a/contrib/cassandra
+++ b/contrib/cassandra
@ -1 +1 @@
-Subproject commit d10187efb25b26da391def077edf3c6f2f3a23dd
+Subproject commit b446d7eb68e6962f431e2b3771313bfe9a2bbd93
--- a/contrib/dragonbox
+++ b/contrib/dragonbox
@ -1 +1 @@
-Subproject commit b2751c65c0592c0239aec3becd53d0ea2fde9329
+Subproject commit 923705af6fd953aa948fc175f6020b15f7359838
--- a/contrib/h3
+++ b/contrib/h3
@ -1 +1 @@
-Subproject commit 6cfd649e8c0d3ed913e8aae928a669fc3b8a2365
+Subproject commit e209086ae1b5477307f545a0f6111780edc59940
--- a/contrib/h3-cmake/CMakeLists.txt
+++ b/contrib/h3-cmake/CMakeLists.txt
@ -16,6 +16,7 @@ ${H3_SOURCE_DIR}/lib/mathExtensions.c
 ${H3_SOURCE_DIR}/lib/polygon.c
 ${H3_SOURCE_DIR}/lib/vec2d.c
 ${H3_SOURCE_DIR}/lib/vec3d.c
+${H3_SOURCE_DIR}/lib/vertex.c
 ${H3_SOURCE_DIR}/lib/vertexGraph.c
 )

--- a/contrib/krb5
+++ b/contrib/krb5
@ -1 +1 @@
-Subproject commit 90ff6f4f8c695d6bf1aaba78a9b8942be92141c2
+Subproject commit 5149dea4e2be0f67707383d2682b897c14631374
--- a/contrib/libpq
+++ b/contrib/libpq
@ -0,0 +1 @@
+Subproject commit 1f9c286dba60809edb64e384d6727d80d269b6cf
--- a/contrib/libpq-cmake/CMakeLists.txt
+++ b/contrib/libpq-cmake/CMakeLists.txt
@ -0,0 +1,58 @@
+set(LIBPQ_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/libpq)
+
+set(SRCS
+        ${LIBPQ_SOURCE_DIR}/fe-auth.c
+        ${LIBPQ_SOURCE_DIR}/fe-auth-scram.c
+        ${LIBPQ_SOURCE_DIR}/fe-connect.c
+        ${LIBPQ_SOURCE_DIR}/fe-exec.c
+        ${LIBPQ_SOURCE_DIR}/fe-lobj.c
+        ${LIBPQ_SOURCE_DIR}/fe-misc.c
+        ${LIBPQ_SOURCE_DIR}/fe-print.c
+        ${LIBPQ_SOURCE_DIR}/fe-protocol2.c
+        ${LIBPQ_SOURCE_DIR}/fe-protocol3.c
+        ${LIBPQ_SOURCE_DIR}/fe-secure.c
+        ${LIBPQ_SOURCE_DIR}/fe-secure-common.c
+        ${LIBPQ_SOURCE_DIR}/fe-secure-openssl.c
+        ${LIBPQ_SOURCE_DIR}/legacy-pqsignal.c
+        ${LIBPQ_SOURCE_DIR}/libpq-events.c
+        ${LIBPQ_SOURCE_DIR}/pqexpbuffer.c
+
+        ${LIBPQ_SOURCE_DIR}/common/scram-common.c
+        ${LIBPQ_SOURCE_DIR}/common/sha2_openssl.c
+        ${LIBPQ_SOURCE_DIR}/common/md5.c
+        ${LIBPQ_SOURCE_DIR}/common/saslprep.c
+        ${LIBPQ_SOURCE_DIR}/common/unicode_norm.c
+        ${LIBPQ_SOURCE_DIR}/common/ip.c
+        ${LIBPQ_SOURCE_DIR}/common/jsonapi.c
+        ${LIBPQ_SOURCE_DIR}/common/wchar.c
+        ${LIBPQ_SOURCE_DIR}/common/base64.c
+        ${LIBPQ_SOURCE_DIR}/common/link-canary.c
+        ${LIBPQ_SOURCE_DIR}/common/fe_memutils.c
+        ${LIBPQ_SOURCE_DIR}/common/string.c
+        ${LIBPQ_SOURCE_DIR}/common/pg_get_line.c
+        ${LIBPQ_SOURCE_DIR}/common/stringinfo.c
+        ${LIBPQ_SOURCE_DIR}/common/psprintf.c
+        ${LIBPQ_SOURCE_DIR}/common/encnames.c
+        ${LIBPQ_SOURCE_DIR}/common/logging.c
+
+        ${LIBPQ_SOURCE_DIR}/port/snprintf.c
+        ${LIBPQ_SOURCE_DIR}/port/strlcpy.c
+        ${LIBPQ_SOURCE_DIR}/port/strerror.c
+        ${LIBPQ_SOURCE_DIR}/port/inet_net_ntop.c
+        ${LIBPQ_SOURCE_DIR}/port/getpeereid.c
+        ${LIBPQ_SOURCE_DIR}/port/chklocale.c
+        ${LIBPQ_SOURCE_DIR}/port/noblock.c
+        ${LIBPQ_SOURCE_DIR}/port/pg_strong_random.c
+        ${LIBPQ_SOURCE_DIR}/port/pgstrcasecmp.c
+        ${LIBPQ_SOURCE_DIR}/port/thread.c
+        ${LIBPQ_SOURCE_DIR}/port/path.c
+        ${LIBPQ_SOURCE_DIR}/port/explicit_bzero.c
+        )
+
+add_library(libpq ${SRCS})
+
+target_include_directories (libpq PUBLIC ${LIBPQ_SOURCE_DIR})
+target_include_directories (libpq PUBLIC ${LIBPQ_SOURCE_DIR}/include)
+target_include_directories (libpq PRIVATE ${LIBPQ_SOURCE_DIR}/configs)
+
+target_link_libraries (libpq PRIVATE ssl)
--- a/contrib/libpqxx
+++ b/contrib/libpqxx
@ -0,0 +1 @@
+Subproject commit 58d2a028d1600225ac3a478d6b3a06ba2f0c01f6
--- a/contrib/libpqxx-cmake/CMakeLists.txt
+++ b/contrib/libpqxx-cmake/CMakeLists.txt
@ -0,0 +1,78 @@
+set (LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/libpqxx)
+
+set (SRCS
+    ${LIBRARY_DIR}/src/strconv.cxx
+    ${LIBRARY_DIR}/src/array.cxx
+    ${LIBRARY_DIR}/src/binarystring.cxx
+    ${LIBRARY_DIR}/src/connection.cxx
+    ${LIBRARY_DIR}/src/cursor.cxx
+    ${LIBRARY_DIR}/src/encodings.cxx
+    ${LIBRARY_DIR}/src/errorhandler.cxx
+    ${LIBRARY_DIR}/src/except.cxx
+    ${LIBRARY_DIR}/src/field.cxx
+    ${LIBRARY_DIR}/src/largeobject.cxx
+    ${LIBRARY_DIR}/src/notification.cxx
+    ${LIBRARY_DIR}/src/pipeline.cxx
+    ${LIBRARY_DIR}/src/result.cxx
+    ${LIBRARY_DIR}/src/robusttransaction.cxx
+    ${LIBRARY_DIR}/src/sql_cursor.cxx
+    ${LIBRARY_DIR}/src/stream_from.cxx
+    ${LIBRARY_DIR}/src/stream_to.cxx
+    ${LIBRARY_DIR}/src/subtransaction.cxx
+    ${LIBRARY_DIR}/src/transaction.cxx
+    ${LIBRARY_DIR}/src/transaction_base.cxx
+    ${LIBRARY_DIR}/src/row.cxx
+    ${LIBRARY_DIR}/src/util.cxx
+    ${LIBRARY_DIR}/src/version.cxx
+)
+
+# Need to explicitly include each header file, because in the directory include/pqxx there are also files
+# like just 'array'. So if including the whole directory with `target_include_directories`, it will make
+# conflicts with all includes of <array>.
+set (HDRS
+    ${LIBRARY_DIR}/include/pqxx/array.hxx
+    ${LIBRARY_DIR}/include/pqxx/binarystring.hxx
+    ${LIBRARY_DIR}/include/pqxx/composite.hxx
+    ${LIBRARY_DIR}/include/pqxx/connection.hxx
+    ${LIBRARY_DIR}/include/pqxx/cursor.hxx
+    ${LIBRARY_DIR}/include/pqxx/dbtransaction.hxx
+    ${LIBRARY_DIR}/include/pqxx/errorhandler.hxx
+    ${LIBRARY_DIR}/include/pqxx/except.hxx
+    ${LIBRARY_DIR}/include/pqxx/field.hxx
+    ${LIBRARY_DIR}/include/pqxx/isolation.hxx
+    ${LIBRARY_DIR}/include/pqxx/largeobject.hxx
+    ${LIBRARY_DIR}/include/pqxx/nontransaction.hxx
+    ${LIBRARY_DIR}/include/pqxx/notification.hxx
+    ${LIBRARY_DIR}/include/pqxx/pipeline.hxx
+    ${LIBRARY_DIR}/include/pqxx/prepared_statement.hxx
+    ${LIBRARY_DIR}/include/pqxx/result.hxx
+    ${LIBRARY_DIR}/include/pqxx/robusttransaction.hxx
+    ${LIBRARY_DIR}/include/pqxx/row.hxx
+    ${LIBRARY_DIR}/include/pqxx/separated_list.hxx
+    ${LIBRARY_DIR}/include/pqxx/strconv.hxx
+    ${LIBRARY_DIR}/include/pqxx/stream_from.hxx
+    ${LIBRARY_DIR}/include/pqxx/stream_to.hxx
+    ${LIBRARY_DIR}/include/pqxx/subtransaction.hxx
+    ${LIBRARY_DIR}/include/pqxx/transaction.hxx
+    ${LIBRARY_DIR}/include/pqxx/transaction_base.hxx
+    ${LIBRARY_DIR}/include/pqxx/types.hxx
+    ${LIBRARY_DIR}/include/pqxx/util.hxx
+    ${LIBRARY_DIR}/include/pqxx/version.hxx
+    ${LIBRARY_DIR}/include/pqxx/zview.hxx
+)
+
+add_library(libpqxx ${SRCS} ${HDRS})
+
+target_link_libraries(libpqxx PUBLIC ${LIBPQ_LIBRARY})
+target_include_directories (libpqxx PRIVATE ${LIBRARY_DIR}/include)
+
+# crutch
+set(CM_CONFIG_H_IN "${LIBRARY_DIR}/include/pqxx/config.h.in")
+set(CM_CONFIG_PUB "${LIBRARY_DIR}/include/pqxx/config-public-compiler.h")
+set(CM_CONFIG_INT "${LIBRARY_DIR}/include/pqxx/config-internal-compiler.h")
+set(CM_CONFIG_PQ "${LIBRARY_DIR}/include/pqxx/config-internal-libpq.h")
+
+configure_file("${CM_CONFIG_H_IN}" "${CM_CONFIG_INT}" @ONLY)
+configure_file("${CM_CONFIG_H_IN}" "${CM_CONFIG_PUB}" @ONLY)
+configure_file("${CM_CONFIG_H_IN}" "${CM_CONFIG_PQ}" @ONLY)
+
--- a/contrib/librdkafka
+++ b/contrib/librdkafka
@ -1 +1 @@
-Subproject commit f2f6616419d567c9198aef0d1133a2e9b4f02276
+Subproject commit cf11d0aa36d4738f2c9bf4377807661660f1be76
--- a/contrib/librdkafka-cmake/CMakeLists.txt
+++ b/contrib/librdkafka-cmake/CMakeLists.txt
@ -2,26 +2,25 @@ set(RDKAFKA_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/librdkafka/src)

 set(SRCS
  ${RDKAFKA_SOURCE_DIR}/crc32c.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_zstd.c
 #  ${RDKAFKA_SOURCE_DIR}/lz4.c
 #  ${RDKAFKA_SOURCE_DIR}/lz4frame.c
 #  ${RDKAFKA_SOURCE_DIR}/lz4hc.c
-  ${RDKAFKA_SOURCE_DIR}/rdxxhash.c
-#  ${RDKAFKA_SOURCE_DIR}/regexp.c
  ${RDKAFKA_SOURCE_DIR}/rdaddr.c
  ${RDKAFKA_SOURCE_DIR}/rdavl.c
  ${RDKAFKA_SOURCE_DIR}/rdbuf.c
  ${RDKAFKA_SOURCE_DIR}/rdcrc32.c
  ${RDKAFKA_SOURCE_DIR}/rddl.c
  ${RDKAFKA_SOURCE_DIR}/rdfnv1a.c
+  ${RDKAFKA_SOURCE_DIR}/rdgz.c
  ${RDKAFKA_SOURCE_DIR}/rdhdrhistogram.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka.c
  ${RDKAFKA_SOURCE_DIR}/rdkafka_admin.c # looks optional
+  ${RDKAFKA_SOURCE_DIR}/rdkafka_assignment.c
  ${RDKAFKA_SOURCE_DIR}/rdkafka_assignor.c
  ${RDKAFKA_SOURCE_DIR}/rdkafka_aux.c # looks optional
  ${RDKAFKA_SOURCE_DIR}/rdkafka_background.c
  ${RDKAFKA_SOURCE_DIR}/rdkafka_broker.c
  ${RDKAFKA_SOURCE_DIR}/rdkafka_buf.c
+  ${RDKAFKA_SOURCE_DIR}/rdkafka.c
  ${RDKAFKA_SOURCE_DIR}/rdkafka_cert.c
  ${RDKAFKA_SOURCE_DIR}/rdkafka_cgrp.c
  ${RDKAFKA_SOURCE_DIR}/rdkafka_conf.c
@ -29,7 +28,9 @@ set(SRCS
  ${RDKAFKA_SOURCE_DIR}/rdkafka_error.c
  ${RDKAFKA_SOURCE_DIR}/rdkafka_event.c
  ${RDKAFKA_SOURCE_DIR}/rdkafka_feature.c
+  ${RDKAFKA_SOURCE_DIR}/rdkafka_header.c
  ${RDKAFKA_SOURCE_DIR}/rdkafka_idempotence.c
+  ${RDKAFKA_SOURCE_DIR}/rdkafka_interceptor.c
  ${RDKAFKA_SOURCE_DIR}/rdkafka_lz4.c
  ${RDKAFKA_SOURCE_DIR}/rdkafka_metadata.c
  ${RDKAFKA_SOURCE_DIR}/rdkafka_metadata_cache.c
@ -49,20 +50,22 @@ set(SRCS
  ${RDKAFKA_SOURCE_DIR}/rdkafka_request.c
  ${RDKAFKA_SOURCE_DIR}/rdkafka_roundrobin_assignor.c
  ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_oauthbearer.c
+#  ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_cyrus.c        # optionally included below
+#  ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_oauthbearer.c  # optionally included below
  ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_plain.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_scram.c
+#  ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_scram.c        # optionally included below
 #  ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_win32.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_ssl.c
+#  ${RDKAFKA_SOURCE_DIR}/rdkafka_ssl.c               # optionally included below
+  ${RDKAFKA_SOURCE_DIR}/rdkafka_sticky_assignor.c
  ${RDKAFKA_SOURCE_DIR}/rdkafka_subscription.c
  ${RDKAFKA_SOURCE_DIR}/rdkafka_timer.c
  ${RDKAFKA_SOURCE_DIR}/rdkafka_topic.c
  ${RDKAFKA_SOURCE_DIR}/rdkafka_transport.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_interceptor.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_header.c
  ${RDKAFKA_SOURCE_DIR}/rdkafka_txnmgr.c
+  ${RDKAFKA_SOURCE_DIR}/rdkafka_zstd.c
  ${RDKAFKA_SOURCE_DIR}/rdlist.c
  ${RDKAFKA_SOURCE_DIR}/rdlog.c
+  ${RDKAFKA_SOURCE_DIR}/rdmap.c
  ${RDKAFKA_SOURCE_DIR}/rdmurmur2.c
  ${RDKAFKA_SOURCE_DIR}/rdports.c
  ${RDKAFKA_SOURCE_DIR}/rdrand.c
@ -70,18 +73,42 @@ set(SRCS
  ${RDKAFKA_SOURCE_DIR}/rdstring.c
  ${RDKAFKA_SOURCE_DIR}/rdunittest.c
  ${RDKAFKA_SOURCE_DIR}/rdvarint.c
+  ${RDKAFKA_SOURCE_DIR}/rdxxhash.c
+  # ${RDKAFKA_SOURCE_DIR}/regexp.c
  ${RDKAFKA_SOURCE_DIR}/snappy.c
  ${RDKAFKA_SOURCE_DIR}/tinycthread.c
  ${RDKAFKA_SOURCE_DIR}/tinycthread_extra.c
-  ${RDKAFKA_SOURCE_DIR}/rdgz.c
 )

 if(${ENABLE_CYRUS_SASL})
    message (STATUS "librdkafka with SASL support")
-    set(SRCS
-        ${SRCS}
-        ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_cyrus.c # needed to support Kerberos, requires cyrus-sasl
-    )
+    set(WITH_SASL_CYRUS 1)
+endif()
+
+if(OPENSSL_FOUND)
+    message (STATUS "librdkafka with SSL support")
+    set(WITH_SSL 1)
+
+    if(${ENABLE_CYRUS_SASL})
+       set(WITH_SASL_SCRAM 1)
+       set(WITH_SASL_OAUTHBEARER 1)
+    endif()
+endif()
+
+if(WITH_SSL)
+  list(APPEND SRCS ${RDKAFKA_SOURCE_DIR}/rdkafka_ssl.c)
+endif()
+
+if(WITH_SASL_CYRUS)
+  list(APPEND SRCS ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_cyrus.c) # needed to support Kerberos, requires cyrus-sasl
+endif()
+
+if(WITH_SASL_SCRAM)
+  list(APPEND SRCS ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_scram.c)
+endif()
+
+if(WITH_SASL_OAUTHBEARER)
+  list(APPEND SRCS ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_oauthbearer.c)
 endif()

 add_library(rdkafka ${SRCS})
@ -97,7 +124,6 @@ if(OPENSSL_SSL_LIBRARY AND OPENSSL_CRYPTO_LIBRARY)
 endif()
 if(${ENABLE_CYRUS_SASL})
    target_link_libraries(rdkafka PRIVATE ${CYRUS_SASL_LIBRARY})
-    set(WITH_SASL_CYRUS 1)
 endif()

 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/auxdir)
--- a/contrib/librdkafka-cmake/config.h.in
+++ b/contrib/librdkafka-cmake/config.h.in
@ -1,7 +1,6 @@
 // Originally generated by ./configure
 #ifndef _CONFIG_H_
 #define _CONFIG_H_
-#define ARCH "x86_64"
 #define BUILT_WITH "GCC GXX PKGCONFIG OSXLD LIBDL PLUGINS ZLIB SSL SASL_CYRUS ZSTD HDRHISTOGRAM LZ4_EXT SNAPPY SOCKEM SASL_SCRAM CRC32C_HW"

 #define CPU "generic"
@ -44,9 +43,9 @@
 // atomic_64
 #define ATOMIC_OP(OP1,OP2,PTR,VAL) __atomic_ ## OP1 ## _ ## OP2(PTR, VAL, __ATOMIC_SEQ_CST)
 // parseversion
-#define RDKAFKA_VERSION_STR "0.11.4"
+#define RDKAFKA_VERSION_STR "1.6.0"
 // parseversion
-#define MKL_APP_VERSION "0.11.4"
+#define MKL_APP_VERSION "1.6.0"
 // libdl
 #define WITH_LIBDL 1
 // WITH_PLUGINS
@ -60,14 +59,14 @@
 // WITH_SOCKEM
 #define WITH_SOCKEM 1
 // libssl
-#define WITH_SSL 1
+#cmakedefine WITH_SSL 1
 // WITH_SASL_SCRAM
-#define WITH_SASL_SCRAM 1
+#cmakedefine WITH_SASL_SCRAM 1
 // WITH_SASL_OAUTHBEARER
-#define WITH_SASL_OAUTHBEARER 1
+#cmakedefine WITH_SASL_OAUTHBEARER 1
 #cmakedefine WITH_SASL_CYRUS 1
 // crc32chw
-#if !defined(__PPC__)
+#if !defined(__PPC__) && (!defined(__aarch64__) || defined(__ARM_FEATURE_CRC32))
 #define WITH_CRC32C_HW 1
 #endif
 // regex
--- a/contrib/libuv
+++ b/contrib/libuv
@ -1 +1 @@
-Subproject commit 84438304f41d8ea6670ee5409f4d6c63ca784f28
+Subproject commit e2e9b7e9f978ce8a1367b5fe781d97d1ce9f94ab
--- a/debian/changelog
+++ b/debian/changelog
@ -1,5 +1,5 @@
-clickhouse (21.1.0) unstable; urgency=low
+clickhouse (21.2.1.1) unstable; urgency=low

  * Modified source code

- -- Alexey Milovidov <milovidov@yandex-team.ru>  Mon, 11 Jan 2021 03:51:08 +0300
+ -- clickhouse-release <clickhouse-release@yandex-team.ru>  Mon, 11 Jan 2021 11:12:08 +0300
--- a/docker/client/Dockerfile
+++ b/docker/client/Dockerfile
@ -1,7 +1,7 @@
 FROM ubuntu:18.04

 ARG repository="deb https://repo.clickhouse.tech/deb/stable/ main/"
-ARG version=21.1.0
+ARG version=21.2.1.*

 RUN apt-get update \
    && apt-get install --yes --no-install-recommends \
--- a/docker/images.json
+++ b/docker/images.json
@ -45,7 +45,8 @@
        "name": "yandex/clickhouse-stateless-test",
        "dependent": [
            "docker/test/stateful",
-            "docker/test/coverage"
+            "docker/test/coverage",
+            "docker/test/unit"
        ]
    },
    "docker/test/stateless_pytest": {
@ -134,7 +135,10 @@
         "name": "yandex/clickhouse-test-base",
         "dependent": [
            "docker/test/stateless",
-            "docker/test/stateless_pytest"
+            "docker/test/stateless_unbundled",
+            "docker/test/stateless_pytest",
+            "docker/test/integration/base",
+            "docker/test/fuzzer"
         ]
    },
    "docker/packager/unbundled": {
@ -151,5 +155,9 @@
    "docker/test/integration/kerberized_hadoop": {
        "name": "yandex/clickhouse-kerberized-hadoop",
        "dependent": []
+    },
+    "docker/test/sqlancer": {
+        "name": "yandex/clickhouse-sqlancer-test",
+        "dependent": []
    }
 }
--- a/docker/server/.dockerignore
+++ b/docker/server/.dockerignore
@ -4,5 +4,5 @@ alpine-root/install/*
 # docs (looks useless)
 alpine-root/usr/share/doc/*

-# packages, etc. (used by prepare.sh)
-alpine-root/tgz-packages/*
+# packages, etc. (used by alpine-build.sh)
+tgz-packages/*
--- a/docker/server/.gitignore
+++ b/docker/server/.gitignore
@ -1 +1,2 @@
-alpine-root/*
+alpine-root/*
+tgz-packages/*
--- a/docker/server/Dockerfile
+++ b/docker/server/Dockerfile
@ -1,10 +1,19 @@
 FROM ubuntu:20.04

 ARG repository="deb https://repo.clickhouse.tech/deb/stable/ main/"
-ARG version=21.1.0
+ARG version=21.2.1.*
 ARG gosu_ver=1.10

-RUN apt-get update \
+# user/group precreated explicitly with fixed uid/gid on purpose.
+# It is especially important for rootless containers: in that case entrypoint
+# can't do chown and owners of mounted volumes should be configured externally.
+# We do that in advance at the begining of Dockerfile before any packages will be
+# installed to prevent picking those uid / gid by some unrelated software.
+# The same uid / gid (101) is used both for alpine and ubuntu.
+
+RUN groupadd -r clickhouse --gid=101 \
+    && useradd -r -g clickhouse --uid=101 --home-dir=/var/lib/clickhouse --shell=/bin/bash clickhouse \
+    && apt-get update \
    && apt-get install --yes --no-install-recommends \
        apt-transport-https \
        ca-certificates \
@ -27,7 +36,12 @@ RUN apt-get update \
        /var/lib/apt/lists/* \
        /var/cache/debconf \
        /tmp/* \
-    && apt-get clean
+    && apt-get clean \
+    && mkdir -p /var/lib/clickhouse /var/log/clickhouse-server /etc/clickhouse-server /etc/clickhouse-client \
+    && chmod ugo+Xrw -R /var/lib/clickhouse /var/log/clickhouse-server /etc/clickhouse-server /etc/clickhouse-client
+
+# 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

--- a/docker/server/Dockerfile.alpine
+++ b/docker/server/Dockerfile.alpine
@ -8,15 +8,24 @@ ENV LANG=en_US.UTF-8 \

 COPY alpine-root/ /

-# from https://github.com/ClickHouse/ClickHouse/blob/master/debian/clickhouse-server.postinst
-RUN addgroup clickhouse \
-    && adduser -S -H -h /nonexistent -s /bin/false -G clickhouse -g "ClickHouse server" clickhouse \
+# user/group precreated explicitly with fixed uid/gid on purpose.
+# It is especially important for rootless containers: in that case entrypoint
+# can't do chown and owners of mounted volumes should be configured externally.
+# We do that in advance at the begining of Dockerfile before any packages will be
+# installed to prevent picking those uid / gid by some unrelated software.
+# The same uid / gid (101) is used both for alpine and ubuntu.
+
+RUN addgroup -S -g 101 clickhouse \
+    && adduser -S -h /var/lib/clickhouse -s /bin/bash -G clickhouse -g "ClickHouse server" -u 101 clickhouse \
+    && mkdir -p /var/lib/clickhouse /var/log/clickhouse-server /etc/clickhouse-server /etc/clickhouse-client \
    && chown clickhouse:clickhouse /var/lib/clickhouse \
-    && chmod 700 /var/lib/clickhouse \
    && chown root:clickhouse /var/log/clickhouse-server \
-    && chmod 775 /var/log/clickhouse-server \
    && chmod +x /entrypoint.sh \
-    && apk add --no-cache su-exec
+    && apk add --no-cache su-exec bash \
+    && chmod ugo+Xrw -R /var/lib/clickhouse /var/log/clickhouse-server /etc/clickhouse-server /etc/clickhouse-client
+
+# we need to allow "others" access to clickhouse folder, because docker container
+# can be started with arbitrary uid (openshift usecase)

 EXPOSE 9000 8123 9009

--- a/docker/server/alpine-build.sh
+++ b/docker/server/alpine-build.sh
@ -4,6 +4,7 @@ set -x
 REPO_CHANNEL="${REPO_CHANNEL:-stable}" # lts / testing / prestable / etc
 REPO_URL="${REPO_URL:-"https://repo.yandex.ru/clickhouse/tgz/${REPO_CHANNEL}"}"
 VERSION="${VERSION:-20.9.3.45}"
+DOCKER_IMAGE="${DOCKER_IMAGE:-yandex/clickhouse-server}"

 # where original files live
 DOCKER_BUILD_FOLDER="${BASH_SOURCE%/*}"
@ -11,12 +12,12 @@ DOCKER_BUILD_FOLDER="${BASH_SOURCE%/*}"
 # we will create root for our image here
 CONTAINER_ROOT_FOLDER="${DOCKER_BUILD_FOLDER}/alpine-root"

-# where to put downloaded tgz
-TGZ_PACKAGES_FOLDER="${CONTAINER_ROOT_FOLDER}/tgz-packages"
-
-# clean up the root from old runs
+# clean up the root from old runs, it's reconstructed each time
 rm -rf "$CONTAINER_ROOT_FOLDER"
+mkdir -p "$CONTAINER_ROOT_FOLDER"

+# where to put downloaded tgz
+TGZ_PACKAGES_FOLDER="${DOCKER_BUILD_FOLDER}/tgz-packages"
 mkdir -p "$TGZ_PACKAGES_FOLDER"

 PACKAGES=( "clickhouse-client" "clickhouse-server" "clickhouse-common-static" )
@ -24,7 +25,7 @@ PACKAGES=( "clickhouse-client" "clickhouse-server" "clickhouse-common-static" )
 # download tars from the repo
 for package in "${PACKAGES[@]}"
 do
-    wget -q --show-progress "${REPO_URL}/${package}-${VERSION}.tgz" -O "${TGZ_PACKAGES_FOLDER}/${package}-${VERSION}.tgz"
+    wget -c -q --show-progress "${REPO_URL}/${package}-${VERSION}.tgz" -O "${TGZ_PACKAGES_FOLDER}/${package}-${VERSION}.tgz"
 done

 # unpack tars
@ -42,7 +43,7 @@ mkdir -p "${CONTAINER_ROOT_FOLDER}/etc/clickhouse-server/users.d" \
         "${CONTAINER_ROOT_FOLDER}/lib64"

 cp "${DOCKER_BUILD_FOLDER}/docker_related_config.xml" "${CONTAINER_ROOT_FOLDER}/etc/clickhouse-server/config.d/"
-cp "${DOCKER_BUILD_FOLDER}/entrypoint.alpine.sh"      "${CONTAINER_ROOT_FOLDER}/entrypoint.sh"
+cp "${DOCKER_BUILD_FOLDER}/entrypoint.sh"             "${CONTAINER_ROOT_FOLDER}/entrypoint.sh"

 ## get glibc components from ubuntu 20.04 and put them to expected place
 docker pull ubuntu:20.04
@ -56,4 +57,5 @@ docker cp -L "${ubuntu20image}":/lib/x86_64-linux-gnu/libnss_dns.so.2 "${CONTAIN
 docker cp -L "${ubuntu20image}":/lib/x86_64-linux-gnu/libresolv.so.2  "${CONTAINER_ROOT_FOLDER}/lib"
 docker cp -L "${ubuntu20image}":/lib64/ld-linux-x86-64.so.2           "${CONTAINER_ROOT_FOLDER}/lib64"

-docker build "$DOCKER_BUILD_FOLDER" -f Dockerfile.alpine -t "yandex/clickhouse-server:${VERSION}-alpine" --pull
+docker build "$DOCKER_BUILD_FOLDER" -f Dockerfile.alpine -t "${DOCKER_IMAGE}:${VERSION}-alpine" --pull
+rm -rf "$CONTAINER_ROOT_FOLDER"
--- a/docker/server/entrypoint.alpine.sh
+++ b/docker/server/entrypoint.alpine.sh
@ -1,152 +0,0 @@
-#!/bin/sh
-#set -x
-
-DO_CHOWN=1
-if [ "$CLICKHOUSE_DO_NOT_CHOWN" = 1 ]; then
-    DO_CHOWN=0
-fi
-
-CLICKHOUSE_UID="${CLICKHOUSE_UID:-"$(id -u clickhouse)"}"
-CLICKHOUSE_GID="${CLICKHOUSE_GID:-"$(id -g clickhouse)"}"
-
-# support --user
-if [ "$(id -u)" = "0" ]; then
-    USER=$CLICKHOUSE_UID
-    GROUP=$CLICKHOUSE_GID
-    # busybox has setuidgid & chpst buildin
-    gosu="su-exec $USER:$GROUP"
-else
-    USER="$(id -u)"
-    GROUP="$(id -g)"
-    gosu=""
-    DO_CHOWN=0
-fi
-
-# set some vars
-CLICKHOUSE_CONFIG="${CLICKHOUSE_CONFIG:-/etc/clickhouse-server/config.xml}"
-
-# port is needed to check if clickhouse-server is ready for connections
-HTTP_PORT="$(clickhouse extract-from-config --config-file "${CLICKHOUSE_CONFIG}" --key=http_port)"
-
-# get CH directories locations
-DATA_DIR="$(clickhouse extract-from-config --config-file "${CLICKHOUSE_CONFIG}" --key=path || true)"
-TMP_DIR="$(clickhouse extract-from-config --config-file "${CLICKHOUSE_CONFIG}" --key=tmp_path || true)"
-USER_PATH="$(clickhouse extract-from-config --config-file "${CLICKHOUSE_CONFIG}" --key=user_files_path || true)"
-LOG_PATH="$(clickhouse extract-from-config --config-file "${CLICKHOUSE_CONFIG}" --key=logger.log || true)"
-LOG_DIR="$(dirname "${LOG_PATH}" || true)"
-ERROR_LOG_PATH="$(clickhouse extract-from-config --config-file "${CLICKHOUSE_CONFIG}" --key=logger.errorlog || true)"
-ERROR_LOG_DIR="$(dirname "${ERROR_LOG_PATH}" || true)"
-FORMAT_SCHEMA_PATH="$(clickhouse extract-from-config --config-file "${CLICKHOUSE_CONFIG}" --key=format_schema_path || true)"
-
-CLICKHOUSE_USER="${CLICKHOUSE_USER:-default}"
-CLICKHOUSE_PASSWORD="${CLICKHOUSE_PASSWORD:-}"
-CLICKHOUSE_DB="${CLICKHOUSE_DB:-}"
-
-for dir in "$DATA_DIR" \
-  "$ERROR_LOG_DIR" \
-  "$LOG_DIR" \
-  "$TMP_DIR" \
-  "$USER_PATH" \
-  "$FORMAT_SCHEMA_PATH"
-do
-    # check if variable not empty
-    [ -z "$dir" ] && continue
-    # ensure directories exist
-    if ! mkdir -p "$dir"; then
-        echo "Couldn't create necessary directory: $dir"
-        exit 1
-    fi
-
-    if [ "$DO_CHOWN" = "1" ]; then
-        # ensure proper directories permissions
-        chown -R "$USER:$GROUP" "$dir"
-    elif [ "$(stat -c %u "$dir")" != "$USER" ]; then
-        echo "Necessary directory '$dir' isn't owned by user with id '$USER'"
-        exit 1
-    fi
-done
-
-# if clickhouse user is defined - create it (user "default" already exists out of box)
-if [ -n "$CLICKHOUSE_USER" ] && [ "$CLICKHOUSE_USER" != "default" ] || [ -n "$CLICKHOUSE_PASSWORD" ]; then
-    echo "$0: create new user '$CLICKHOUSE_USER' instead 'default'"
-    cat <<EOT > /etc/clickhouse-server/users.d/default-user.xml
-    <yandex>
-      <!-- Docs: <https://clickhouse.tech/docs/en/operations/settings/settings_users/> -->
-      <users>
-        <!-- Remove default user -->
-        <default remove="remove">
-        </default>
-
-        <${CLICKHOUSE_USER}>
-          <profile>default</profile>
-          <networks>
-            <ip>::/0</ip>
-          </networks>
-          <password>${CLICKHOUSE_PASSWORD}</password>
-          <quota>default</quota>
-        </${CLICKHOUSE_USER}>
-      </users>
-    </yandex>
-EOT
-fi
-
-if [ -n "$(ls /docker-entrypoint-initdb.d/)" ] || [ -n "$CLICKHOUSE_DB" ]; then
-    # Listen only on localhost until the initialization is done
-    $gosu /usr/bin/clickhouse-server --config-file="${CLICKHOUSE_CONFIG}" -- --listen_host=127.0.0.1 &
-    pid="$!"
-
-    # check if clickhouse is ready to accept connections
-    # will try to send ping clickhouse via http_port (max 6 retries, with 1 sec timeout and 1 sec delay between retries)
-    tries=6
-    while ! wget --spider -T 1 -q "http://localhost:$HTTP_PORT/ping" 2>/dev/null; do
-        if [ "$tries" -le "0" ]; then
-            echo >&2 'ClickHouse init process failed.'
-            exit 1
-        fi
-        tries=$(( tries-1 ))
-        sleep 1
-    done
-
-    if [ -n "$CLICKHOUSE_PASSWORD" ]; then
-        printf -v WITH_PASSWORD '%s %q' "--password" "$CLICKHOUSE_PASSWORD"
-    fi
-
-    clickhouseclient="clickhouse-client --multiquery -u $CLICKHOUSE_USER $WITH_PASSWORD "
-
-    # create default database, if defined
-    if [ -n "$CLICKHOUSE_DB" ]; then
-        echo "$0: create database '$CLICKHOUSE_DB'"
-        "$clickhouseclient" -q "CREATE DATABASE IF NOT EXISTS $CLICKHOUSE_DB";
-    fi
-
-    for f in /docker-entrypoint-initdb.d/*; do
-        case "$f" in
-            *.sh)
-                if [ -x "$f" ]; then
-                    echo "$0: running $f"
-                    "$f"
-                else
-                    echo "$0: sourcing $f"
-                    . "$f"
-                fi
-                ;;
-            *.sql)    echo "$0: running $f"; "$clickhouseclient" < "$f" ; echo ;;
-            *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | "$clickhouseclient"; echo ;;
-            *)        echo "$0: ignoring $f" ;;
-        esac
-        echo
-    done
-
-    if ! kill -s TERM "$pid" || ! wait "$pid"; then
-        echo >&2 'Finishing of ClickHouse init process failed.'
-        exit 1
-    fi
-fi
-
-# if no args passed to `docker run` or first argument start with `--`, then the user is passing clickhouse-server arguments
-if [[ $# -lt 1 ]] || [[ "$1" == "--"* ]]; then
-    exec $gosu /usr/bin/clickhouse-server --config-file="${CLICKHOUSE_CONFIG}" "$@"
-fi
-
-# Otherwise, we assume the user want to run his own process, for example a `bash` shell to explore this image
-exec "$@"
--- a/docker/server/entrypoint.sh
+++ b/docker/server/entrypoint.sh
@ -1,7 +1,10 @@
 #!/bin/bash

+set -eo pipefail
+shopt -s nullglob
+
 DO_CHOWN=1
-if [ "$CLICKHOUSE_DO_NOT_CHOWN" = 1 ]; then
+if [ "${CLICKHOUSE_DO_NOT_CHOWN:-0}" = "1" ]; then
    DO_CHOWN=0
 fi

@ -9,10 +12,17 @@ CLICKHOUSE_UID="${CLICKHOUSE_UID:-"$(id -u clickhouse)"}"
 CLICKHOUSE_GID="${CLICKHOUSE_GID:-"$(id -g clickhouse)"}"

 # support --user
-if [ x"$UID" == x0 ]; then
+if [ "$(id -u)" = "0" ]; then
    USER=$CLICKHOUSE_UID
    GROUP=$CLICKHOUSE_GID
-    gosu="gosu $USER:$GROUP"
+    if command -v gosu &> /dev/null; then
+        gosu="gosu $USER:$GROUP"
+    elif command -v su-exec &> /dev/null; then
+        gosu="su-exec $USER:$GROUP"
+    else
+        echo "No gosu/su-exec detected!"
+        exit 1
+    fi
 else
    USER="$(id -u)"
    GROUP="$(id -g)"
@ -23,18 +33,23 @@ fi
 # set some vars
 CLICKHOUSE_CONFIG="${CLICKHOUSE_CONFIG:-/etc/clickhouse-server/config.xml}"

+if ! $gosu test -f "$CLICKHOUSE_CONFIG" -a -r "$CLICKHOUSE_CONFIG"; then
+    echo "Configuration file '$dir' isn't readable by user with id '$USER'"
+    exit 1
+fi
+
 # port is needed to check if clickhouse-server is ready for connections
-HTTP_PORT="$(clickhouse extract-from-config --config-file $CLICKHOUSE_CONFIG --key=http_port)"
+HTTP_PORT="$(clickhouse extract-from-config --config-file "$CLICKHOUSE_CONFIG" --key=http_port)"

 # get CH directories locations
-DATA_DIR="$(clickhouse extract-from-config --config-file $CLICKHOUSE_CONFIG --key=path || true)"
-TMP_DIR="$(clickhouse extract-from-config --config-file $CLICKHOUSE_CONFIG --key=tmp_path || true)"
-USER_PATH="$(clickhouse extract-from-config --config-file $CLICKHOUSE_CONFIG --key=user_files_path || true)"
-LOG_PATH="$(clickhouse extract-from-config --config-file $CLICKHOUSE_CONFIG --key=logger.log || true)"
-LOG_DIR="$(dirname $LOG_PATH || true)"
-ERROR_LOG_PATH="$(clickhouse extract-from-config --config-file $CLICKHOUSE_CONFIG --key=logger.errorlog || true)"
-ERROR_LOG_DIR="$(dirname $ERROR_LOG_PATH || true)"
-FORMAT_SCHEMA_PATH="$(clickhouse extract-from-config --config-file $CLICKHOUSE_CONFIG --key=format_schema_path || true)"
+DATA_DIR="$(clickhouse extract-from-config --config-file "$CLICKHOUSE_CONFIG" --key=path || true)"
+TMP_DIR="$(clickhouse extract-from-config --config-file "$CLICKHOUSE_CONFIG" --key=tmp_path || true)"
+USER_PATH="$(clickhouse extract-from-config --config-file "$CLICKHOUSE_CONFIG" --key=user_files_path || true)"
+LOG_PATH="$(clickhouse extract-from-config --config-file "$CLICKHOUSE_CONFIG" --key=logger.log || true)"
+LOG_DIR="$(dirname "$LOG_PATH" || true)"
+ERROR_LOG_PATH="$(clickhouse extract-from-config --config-file "$CLICKHOUSE_CONFIG" --key=logger.errorlog || true)"
+ERROR_LOG_DIR="$(dirname "$ERROR_LOG_PATH" || true)"
+FORMAT_SCHEMA_PATH="$(clickhouse extract-from-config --config-file "$CLICKHOUSE_CONFIG" --key=format_schema_path || true)"

 CLICKHOUSE_USER="${CLICKHOUSE_USER:-default}"
 CLICKHOUSE_PASSWORD="${CLICKHOUSE_PASSWORD:-}"
@ -58,8 +73,8 @@ do
    if [ "$DO_CHOWN" = "1" ]; then
        # ensure proper directories permissions
        chown -R "$USER:$GROUP" "$dir"
-    elif [ "$(stat -c %u "$dir")" != "$USER" ]; then
-        echo "Necessary directory '$dir' isn't owned by user with id '$USER'"
+    elif ! $gosu test -d "$dir" -a -w "$dir" -a -r "$dir"; then
+        echo "Necessary directory '$dir' isn't accessible by user with id '$USER'"
        exit 1
    fi
 done
@ -90,21 +105,22 @@ fi

 if [ -n "$(ls /docker-entrypoint-initdb.d/)" ] || [ -n "$CLICKHOUSE_DB" ]; then
    # Listen only on localhost until the initialization is done
-    $gosu /usr/bin/clickhouse-server --config-file=$CLICKHOUSE_CONFIG -- --listen_host=127.0.0.1 &
+    $gosu /usr/bin/clickhouse-server --config-file="$CLICKHOUSE_CONFIG" -- --listen_host=127.0.0.1 &
    pid="$!"

    # check if clickhouse is ready to accept connections
-    # will try to send ping clickhouse via http_port (max 12 retries by default, with 1 sec delay)
-    if ! wget --spider --quiet --prefer-family=IPv6 --tries="${CLICKHOUSE_INIT_TIMEOUT:-12}" --waitretry=1 --retry-connrefused "http://localhost:$HTTP_PORT/ping" ; then
-        echo >&2 'ClickHouse init process failed.'
-        exit 1
-    fi
+    # will try to send ping clickhouse via http_port (max 12 retries by default, with 1 sec timeout and 1 sec delay between retries)
+    tries=${CLICKHOUSE_INIT_TIMEOUT:-12}
+    while ! wget --spider -T 1 -q "http://127.0.0.1:$HTTP_PORT/ping" 2>/dev/null; do
+        if [ "$tries" -le "0" ]; then
+            echo >&2 'ClickHouse init process failed.'
+            exit 1
+        fi
+        tries=$(( tries-1 ))
+        sleep 1
+    done

-    if [ ! -z "$CLICKHOUSE_PASSWORD" ]; then
-        printf -v WITH_PASSWORD '%s %q' "--password" "$CLICKHOUSE_PASSWORD"
-    fi
-
-    clickhouseclient=( clickhouse-client --multiquery -u $CLICKHOUSE_USER $WITH_PASSWORD )
+    clickhouseclient=( clickhouse-client --multiquery -u "$CLICKHOUSE_USER" --password "$CLICKHOUSE_PASSWORD" )

    echo

@ -122,10 +138,11 @@ if [ -n "$(ls /docker-entrypoint-initdb.d/)" ] || [ -n "$CLICKHOUSE_DB" ]; then
                    "$f"
                else
                    echo "$0: sourcing $f"
+                    # shellcheck source=/dev/null
                    . "$f"
                fi
                ;;
-            *.sql)    echo "$0: running $f"; cat "$f" | "${clickhouseclient[@]}" ; echo ;;
+            *.sql)    echo "$0: running $f"; "${clickhouseclient[@]}" < "$f" ; echo ;;
            *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | "${clickhouseclient[@]}"; echo ;;
            *)        echo "$0: ignoring $f" ;;
        esac
@ -140,7 +157,7 @@ fi

 # if no args passed to `docker run` or first argument start with `--`, then the user is passing clickhouse-server arguments
 if [[ $# -lt 1 ]] || [[ "$1" == "--"* ]]; then
-    exec $gosu /usr/bin/clickhouse-server --config-file=$CLICKHOUSE_CONFIG "$@"
+    exec $gosu /usr/bin/clickhouse-server --config-file="$CLICKHOUSE_CONFIG" "$@"
 fi

 # Otherwise, we assume the user want to run his own process, for example a `bash` shell to explore this image
--- a/docker/test/Dockerfile
+++ b/docker/test/Dockerfile
@ -1,7 +1,7 @@
 FROM ubuntu:18.04

 ARG repository="deb https://repo.clickhouse.tech/deb/stable/ main/"
-ARG version=21.1.0
+ARG version=21.2.1.*

 RUN apt-get update && \
    apt-get install -y apt-transport-https dirmngr && \
--- a/docker/test/fasttest/run.sh
+++ b/docker/test/fasttest/run.sh
@ -269,6 +269,8 @@ function run_tests
        01281_group_by_limit_memory_tracking    # max_memory_usage_for_user can interfere another queries running concurrently
        01318_encrypt                           # Depends on OpenSSL
        01318_decrypt                           # Depends on OpenSSL
+        01663_aes_msan                          # Depends on OpenSSL
+        01667_aes_args_check                    # Depends on OpenSSL
        01281_unsucceeded_insert_select_queries_counter
        01292_create_user
        01294_lazy_database_concurrent
@ -329,12 +331,16 @@ function run_tests

        # nc - command not found
        01601_proxy_protocol
+        01622_defaults_for_url_engine
+
+        # JSON functions
+        01666_blns
    )

-    time clickhouse-test -j 8 --order=random --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"
+    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"

    # substr is to remove semicolon after test name
-    readarray -t FAILED_TESTS < <(awk '/FAIL|TIMEOUT|ERROR/ { print substr($3, 1, length($3)-1) }' "$FASTTEST_OUTPUT/test_log.txt" | tee "$FASTTEST_OUTPUT/failed-parallel-tests.txt")
+    readarray -t FAILED_TESTS < <(awk '/\[ FAIL|TIMEOUT|ERROR \]/ { print substr($3, 1, length($3)-1) }' "$FASTTEST_OUTPUT/test_log.txt" | tee "$FASTTEST_OUTPUT/failed-parallel-tests.txt")

    # We will rerun sequentially any tests that have failed during parallel run.
    # They might have failed because there was some interference from other tests
@ -354,7 +360,7 @@ function run_tests

        echo "Going to run again: ${FAILED_TESTS[*]}"

-        clickhouse-test --order=random --no-long --testname --shard --zookeeper "${FAILED_TESTS[@]}" 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee -a "$FASTTEST_OUTPUT/test_log.txt"
+        clickhouse-test --hung-check --order=random --no-long --testname --shard --zookeeper "${FAILED_TESTS[@]}" 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee -a "$FASTTEST_OUTPUT/test_log.txt"
    else
        echo "No failed tests"
    fi
--- a/docker/test/fuzzer/Dockerfile
+++ b/docker/test/fuzzer/Dockerfile
@ -1,5 +1,5 @@
 # docker build -t yandex/clickhouse-fuzzer .
-FROM ubuntu:18.04
+FROM yandex/clickhouse-test-base

 ENV LANG=C.UTF-8
 ENV TZ=Europe/Moscow
@ -7,11 +7,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

 RUN apt-get update \
    && DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \
-            bash \
            ca-certificates \
-            curl \
-            gdb \
-            git \
            libc6-dbg \
            moreutils \
            ncdu \
--- a/docker/test/fuzzer/query-fuzzer-tweaks-users.xml
+++ b/docker/test/fuzzer/query-fuzzer-tweaks-users.xml
@ -11,6 +11,10 @@
                    <max>10</max>
                </max_execution_time>

+                <max_memory_usage>
+                    <max>10G</max>
+                </max_memory_usage>
+
                <!-- Not ready for production -->
                <compile_expressions>
                    <readonly />
--- a/docker/test/fuzzer/run-fuzzer.sh
+++ b/docker/test/fuzzer/run-fuzzer.sh
@ -1,4 +1,6 @@
 #!/bin/bash
+# shellcheck disable=SC2086
+
 set -eux
 set -o pipefail
 trap "exit" INT TERM
@ -8,6 +10,7 @@ stage=${stage:-}
 script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 echo "$script_dir"
 repo_dir=ch
+BINARY_TO_DOWNLOAD=${BINARY_TO_DOWNLOAD:="clang-11_debug_none_bundled_unsplitted_disable_False_binary"}

 function clone
 {
@ -18,12 +21,13 @@ function clone

    git init
    git remote add origin https://github.com/ClickHouse/ClickHouse
-    git fetch --depth=1 origin "$SHA_TO_TEST"
+    git fetch --depth=100 origin "$SHA_TO_TEST"
+    git fetch --depth=100 origin master # Used to obtain the list of modified or added tests

    # If not master, try to fetch pull/.../{head,merge}
    if [ "$PR_TO_TEST" != "0" ]
    then
-        git fetch --depth=1 origin "refs/pull/$PR_TO_TEST/*:refs/heads/pull/$PR_TO_TEST/*"
+        git fetch --depth=100 origin "refs/pull/$PR_TO_TEST/*:refs/heads/pull/$PR_TO_TEST/*"
    fi

    git checkout "$SHA_TO_TEST"
@ -32,10 +36,7 @@ function clone

 function download
 {
-#    wget -O- -nv -nd -c "https://clickhouse-builds.s3.yandex.net/$PR_TO_TEST/$SHA_TO_TEST/clickhouse_build_check/performance/performance.tgz" \
-#        | tar --strip-components=1 -zxv
-
-    wget -nv -nd -c "https://clickhouse-builds.s3.yandex.net/$PR_TO_TEST/$SHA_TO_TEST/clickhouse_build_check/clang-11_debug_none_bundled_unsplitted_disable_False_binary/clickhouse"
+    wget -nv -nd -c "https://clickhouse-builds.s3.yandex.net/$PR_TO_TEST/$SHA_TO_TEST/clickhouse_build_check/$BINARY_TO_DOWNLOAD/clickhouse"
    chmod +x clickhouse
    ln -s ./clickhouse ./clickhouse-server
    ln -s ./clickhouse ./clickhouse-client
@ -72,7 +73,19 @@ function watchdog

 function fuzz
 {
-    ./clickhouse-server --config-file db/config.xml -- --path db 2>&1 | tail -10000 > server.log &
+    # Obtain the list of newly added tests. They will be fuzzed in more extreme way than other tests.
+    cd ch
+    NEW_TESTS=$(git diff --name-only "$(git merge-base origin/master "$SHA_TO_TEST"~)" "$SHA_TO_TEST" | grep -P 'tests/queries/0_stateless/.*\.sql' | sed -r -e 's!^!ch/!' | sort -R)
+    cd ..
+    if [[ -n "$NEW_TESTS" ]]
+    then
+        NEW_TESTS_OPT="--interleave-queries-file ${NEW_TESTS}"
+    else
+        NEW_TESTS_OPT=""
+    fi
+
+    ./clickhouse-server --config-file db/config.xml -- --path db 2>&1 | tail -100000 > server.log &
+
    server_pid=$!
    kill -0 $server_pid
    while ! ./clickhouse-client --query "select 1" && kill -0 $server_pid ; do echo . ; sleep 1 ; done
@ -80,12 +93,23 @@ function fuzz
    kill -0 $server_pid
    echo Server started

+    echo "
+handle all noprint
+handle SIGSEGV stop print
+handle SIGBUS stop print
+continue
+thread apply all backtrace
+continue
+" > script.gdb
+
+    gdb -batch -command script.gdb -p "$(pidof clickhouse-server)" &
+
    fuzzer_exit_code=0
    # SC2012: Use find instead of ls to better handle non-alphanumeric filenames. They are all alphanumeric.
    # SC2046: Quote this to prevent word splitting. Actually I need word splitting.
    # shellcheck disable=SC2012,SC2046
-    ./clickhouse-client --query-fuzzer-runs=1000 --queries-file $(ls -1 ch/tests/queries/0_stateless/*.sql | sort -R) \
-        > >(tail -n 10000 > fuzzer.log) \
+    ./clickhouse-client --query-fuzzer-runs=1000 --queries-file $(ls -1 ch/tests/queries/0_stateless/*.sql | sort -R) $NEW_TESTS_OPT \
+        > >(tail -n 100000 > fuzzer.log) \
        2>&1 \
        || fuzzer_exit_code=$?

@ -106,7 +130,7 @@ function fuzz

 case "$stage" in
 "")
-    ;&
+    ;&  # Did you know? This is "fallthrough" in bash. https://stackoverflow.com/questions/12010686/case-statement-fallthrough
 "clone")
    time clone
    if [ -v FUZZ_LOCAL_SCRIPT ]
@ -163,7 +187,7 @@ case "$stage" in
        # Lost connection to the server. This probably means that the server died
        # with abort.
        echo "failure" > status.txt
-        if ! grep -ao "Received signal.*\|Logical error.*\|Assertion.*failed\|Failed assertion.*" server.log > description.txt
+        if ! grep -ao "Received signal.*\|Logical error.*\|Assertion.*failed\|Failed assertion.*\|.*runtime error: .*\|.*is located.*\|SUMMARY: MemorySanitizer:.*\|SUMMARY: ThreadSanitizer:.*" server.log > description.txt
        then
            echo "Lost connection to server. See the logs" > description.txt
        fi
--- a/docker/test/integration/base/Dockerfile
+++ b/docker/test/integration/base/Dockerfile
@ -30,3 +30,4 @@ RUN curl 'https://cdn.mysql.com//Downloads/Connector-ODBC/8.0/mysql-connector-od

 ENV TZ=Europe/Moscow
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
--- a/docker/test/performance-comparison/perf.py
+++ b/docker/test/performance-comparison/perf.py
@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3

 import argparse
 import clickhouse_driver
--- a/docker/test/sqlancer/Dockerfile
+++ b/docker/test/sqlancer/Dockerfile
@ -0,0 +1,13 @@
+# docker build -t yandex/clickhouse-sqlancer-test .
+FROM ubuntu:20.04
+
+RUN apt-get update --yes && env DEBIAN_FRONTEND=noninteractive apt-get install wget unzip git openjdk-14-jdk maven --yes --no-install-recommends
+
+RUN wget https://github.com/sqlancer/sqlancer/archive/master.zip -O /sqlancer.zip
+RUN mkdir /sqlancer && \
+	cd /sqlancer && \
+	unzip /sqlancer.zip
+RUN cd /sqlancer/sqlancer-master && mvn package -DskipTests
+
+COPY run.sh /
+CMD ["/bin/bash", "/run.sh"]
--- a/docker/test/sqlancer/run.sh
+++ b/docker/test/sqlancer/run.sh
@ -0,0 +1,32 @@
+#!/bin/bash
+
+set -e -x
+
+dpkg -i package_folder/clickhouse-common-static_*.deb
+dpkg -i package_folder/clickhouse-common-static-dbg_*.deb
+dpkg -i package_folder/clickhouse-server_*.deb
+dpkg -i package_folder/clickhouse-client_*.deb
+
+service clickhouse-server start && sleep 5
+
+cd /sqlancer/sqlancer-master
+
+export TIMEOUT=60
+export NUM_QUERIES=1000
+
+( java -jar target/sqlancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPWhere | tee /test_output/TLPWhere.out )  3>&1 1>&2 2>&3 | tee /test_output/TLPWhere.err
+( java -jar target/sqlancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPGroupBy | tee /test_output/TLPGroupBy.out )  3>&1 1>&2 2>&3 | tee /test_output/TLPGroupBy.err
+( java -jar target/sqlancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPHaving | tee /test_output/TLPHaving.out )  3>&1 1>&2 2>&3 | tee /test_output/TLPHaving.err
+( java -jar target/sqlancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPWhere --oracle TLPGroupBy | tee /test_output/TLPWhereGroupBy.out )  3>&1 1>&2 2>&3 | tee /test_output/TLPWhereGroupBy.err
+( java -jar target/sqlancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPDistinct | tee /test_output/TLPDistinct.out )  3>&1 1>&2 2>&3 | tee /test_output/TLPDistinct.err
+( java -jar target/sqlancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPAggregate | tee /test_output/TLPAggregate.out )  3>&1 1>&2 2>&3 | tee /test_output/TLPAggregate.err
+
+service clickhouse-server stop && sleep 10
+
+ls /var/log/clickhouse-server/
+tar czf /test_output/logs.tar.gz -C /var/log/clickhouse-server/ .
+tail -n 1000 /var/log/clickhouse-server/stderr.log > /test_output/stderr.log
+tail -n 1000 /var/log/clickhouse-server/stdout.log > /test_output/stdout.log
+tail -n 1000 /var/log/clickhouse-server/clickhouse-server.log > /test_output/clickhouse-server.log
+
+ls /test_output
--- a/docker/test/stateless/run.sh
+++ b/docker/test/stateless/run.sh
@ -66,3 +66,6 @@ function run_tests()
 export -f run_tests

 timeout "$MAX_RUN_TIME" bash -c run_tests ||:
+
+tar -chf /test_output/text_log_dump.tar /var/lib/clickhouse/data/system/text_log ||:
+tar -chf /test_output/query_log_dump.tar /var/lib/clickhouse/data/system/query_log ||:
--- a/docker/test/stateless_unbundled/Dockerfile
+++ b/docker/test/stateless_unbundled/Dockerfile
@ -86,3 +86,4 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

 COPY run.sh /
 CMD ["/bin/bash", "/run.sh"]
+
--- a/docker/test/style/Dockerfile
+++ b/docker/test/style/Dockerfile
@ -1,7 +1,7 @@
 # docker build -t yandex/clickhouse-style-test .
 FROM ubuntu:20.04

-RUN apt-get update && env DEBIAN_FRONTEND=noninteractive apt-get install --yes shellcheck libxml2-utils git python3-pip && pip3 install codespell
+RUN apt-get update && env DEBIAN_FRONTEND=noninteractive apt-get install --yes shellcheck libxml2-utils git python3-pip python3-pytest && pip3 install codespell


 CMD cd /ClickHouse/utils/check-style && \
--- a/docker/test/unit/Dockerfile
+++ b/docker/test/unit/Dockerfile
@ -7,3 +7,4 @@ RUN apt-get install gdb

 CMD service zookeeper start && sleep 7 && /usr/share/zookeeper/bin/zkCli.sh -server localhost:2181 -create create /clickhouse_test ''; \
    gdb -q  -ex 'set print inferior-events off' -ex 'set confirm off' -ex 'set print thread-events off' -ex run -ex bt -ex quit --args ./unit_tests_dbms | tee test_output/test_result.txt
+
--- a/docs/en/commercial/cloud.md
+++ b/docs/en/commercial/cloud.md
@ -29,4 +29,14 @@ toc_title: Cloud
 -   Cross-AZ scaling for performance and high availability
 -   Built-in monitoring and SQL query editor

+## Tencent Cloud {#tencent-cloud}
+
+[Tencent Managed Service for ClickHouse](https://cloud.tencent.com/product/cdwch) provides the following key features:
+
+-   Easy to deploy and manage on Tencent Cloud
+-   Highly scalable and available
+-   Integrated monitor and alert service
+-   High security with isolated per cluster VPCs
+-   On-demand pricing with no upfront costs or long-term commitments
+
 {## [Original article](https://clickhouse.tech/docs/en/commercial/cloud/) ##}
--- a/docs/en/development/build-osx.md
+++ b/docs/en/development/build-osx.md
@ -16,7 +16,7 @@ $ /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/inst
 ## Install Required Compilers, Tools, and Libraries {#install-required-compilers-tools-and-libraries}

 ``` bash
-$ brew install cmake ninja libtool gettext
+$ brew install cmake ninja libtool gettext llvm
 ```

 ## Checkout ClickHouse Sources {#checkout-clickhouse-sources}
--- a/docs/en/engines/database-engines/atomic.md
+++ b/docs/en/engines/database-engines/atomic.md
@ -0,0 +1,17 @@
+---
+toc_priority: 32
+toc_title: Atomic
+---
+
+
+# Atomic {#atomic}
+
+It is supports non-blocking `DROP` and `RENAME TABLE` queries and atomic `EXCHANGE TABLES t1 AND t2` queries. Atomic database engine is used by default.
+
+## Creating a Database {#creating-a-database}
+
+```sql
+CREATE DATABASE test ENGINE = Atomic;
+```
+
+[Original article](https://clickhouse.tech/docs/en/engines/database_engines/atomic/) <!--hide-->
--- a/docs/en/engines/database-engines/index.md
+++ b/docs/en/engines/database-engines/index.md
@ -8,14 +8,14 @@ toc_title: Introduction

 Database engines allow you to work with tables.

-By default, ClickHouse uses its native database engine, which provides configurable [table engines](../../engines/table-engines/index.md) and an [SQL dialect](../../sql-reference/syntax.md).
+By default, ClickHouse uses database engine [Atomic](../../engines/database-engines/atomic.md). It is provides configurable [table engines](../../engines/table-engines/index.md) and an [SQL dialect](../../sql-reference/syntax.md).

 You can also use the following database engines:

 -   [MySQL](../../engines/database-engines/mysql.md)

-   [Lazy](../../engines/database-engines/lazy.md)
-
 -   [MaterializeMySQL](../../engines/database-engines/materialize-mysql.md)

+-   [Lazy](../../engines/database-engines/lazy.md)
+
 [Original article](https://clickhouse.tech/docs/en/database_engines/) <!--hide-->
--- a/docs/en/engines/database-engines/materialize-mysql.md
+++ b/docs/en/engines/database-engines/materialize-mysql.md
@ -5,9 +5,11 @@ toc_title: MaterializeMySQL

 # MaterializeMySQL {#materialize-mysql}

- Creates ClickHouse database with all the tables existing in MySQL, and all the data in those tables. 
+Creates ClickHouse database with all the tables existing in MySQL, and all the data in those tables.

- ClickHouse server works as MySQL replica. It reads binlog and performs DDL and DML queries.   
+ClickHouse server works as MySQL replica. It reads binlog and performs DDL and DML queries.
+
+This feature is experimental.

 ## Creating a Database {#creating-a-database}

@ -25,12 +27,12 @@ ENGINE = MaterializeMySQL('host:port', ['database' | database], 'user', 'passwor

 ## Virtual columns {#virtual-columns}

- When working with the `MaterializeMySQL` database engine, [ReplacingMergeTree](../../engines/table-engines/mergetree-family/replacingmergetree.md) tables are used with virtual `_sign` and `_version` columns.
+When working with the `MaterializeMySQL` database engine, [ReplacingMergeTree](../../engines/table-engines/mergetree-family/replacingmergetree.md) tables are used with virtual `_sign` and `_version` columns.
 
- - `_version` — Transaction counter. Type [UInt64](../../sql-reference/data-types/int-uint.md). 
- - `_sign` — Deletion mark. Type [Int8](../../sql-reference/data-types/int-uint.md). Possible values: 
-     - `1` — Row is not deleted, 
-     - `-1` — Row is deleted.
+- `_version` — Transaction counter. Type [UInt64](../../sql-reference/data-types/int-uint.md).
+- `_sign` — Deletion mark. Type [Int8](../../sql-reference/data-types/int-uint.md). Possible values:
+    - `1` — Row is not deleted, 
+    - `-1` — Row is deleted.

 ## Data Types Support {#data_types-support}

@ -61,9 +63,9 @@ Other types are not supported. If MySQL table contains a column of such type, Cl

 MySQL DDL queries are converted into the corresponding ClickHouse DDL queries ([ALTER](../../sql-reference/statements/alter/index.md), [CREATE](../../sql-reference/statements/create/index.md), [DROP](../../sql-reference/statements/drop.md), [RENAME](../../sql-reference/statements/rename.md)). If ClickHouse cannot parse some DDL query, the query is ignored.

-###  Data Replication {#data-replication}
+### Data Replication {#data-replication}

-MaterializeMySQL does not support direct `INSERT`, `DELETE` and `UPDATE` queries. However, they are supported in terms of data replication:
+`MaterializeMySQL` does not support direct `INSERT`, `DELETE` and `UPDATE` queries. However, they are supported in terms of data replication:

 - MySQL `INSERT` query is converted into `INSERT` with `_sign=1`.

@ -73,11 +75,11 @@ MaterializeMySQL does not support direct `INSERT`, `DELETE` and `UPDATE` queries

 ### Selecting from MaterializeMySQL Tables {#select}

-`SELECT` query form MaterializeMySQL tables has some specifics:
+`SELECT` query from `MaterializeMySQL` tables has some specifics:

 - If `_version` is not specified in the `SELECT` query, [FINAL](../../sql-reference/statements/select/from.md#select-from-final) modifier is used. So only rows with `MAX(_version)` are selected.

- If `_sign` is not specified in the `SELECT` query, `WHERE _sign=1` is used by default, so the deleted rows are not included into the result set. 
+- If `_sign` is not specified in the `SELECT` query, `WHERE _sign=1` is used by default. So the deleted rows are not included into the result set.

 ### Index Conversion {#index-conversion}

@ -85,12 +87,12 @@ MySQL `PRIMARY KEY` and `INDEX` clauses are converted into `ORDER BY` tuples in

 ClickHouse has only one physical order, which is determined by `ORDER BY` clause. To create a new physical order, use [materialized views](../../sql-reference/statements/create/view.md#materialized).

- **Notes**
+**Notes**

- - Rows with `_sign=-1` are not deleted physically from the tables. 
- - Cascade `UPDATE/DELETE` queries are not supported by the `MaterializeMySQL` engine.
- - Replication can be easily broken.
- - Manual operations on database and tables are forbidden.
+- Rows with `_sign=-1` are not deleted physically from the tables.
+- Cascade `UPDATE/DELETE` queries are not supported by the `MaterializeMySQL` engine.
+- Replication can be easily broken.
+- Manual operations on database and tables are forbidden.

 ## Examples of Use {#examples-of-use}

@ -105,6 +107,7 @@ mysql> ALTER TABLE db.test ADD COLUMN c VARCHAR(16);
 mysql> UPDATE db.test SET c='Wow!', b=222;
 mysql> SELECT * FROM test;
 ```
+
 ```text
 +---+------+------+ 
 | a |    b |    c |
--- a/docs/en/engines/database-engines/mysql.md
+++ b/docs/en/engines/database-engines/mysql.md
@ -51,6 +51,23 @@ All other MySQL data types are converted into [String](../../sql-reference/data-

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

+## Global Variables Support {#global-variables-support}
+
+For better compatibility you may address global variables in MySQL style, as `@@identifier`. 
+
+These variables are supported:
+- `version`
+- `max_allowed_packet`
+
+!!! warning "Warning"
+    By now these variables are stubs and don't correspond to anything.
+
+Example:
+
+``` sql
+SELECT @@version;
+```
+
 ## Examples of Use {#examples-of-use}

 Table in MySQL:
--- a/docs/en/engines/table-engines/integrations/s3.md
+++ b/docs/en/engines/table-engines/integrations/s3.md
@ -114,6 +114,10 @@ CREATE TABLE big_table (name String, value UInt32) ENGINE = S3('https://storage.
 -   `_path` — Path to the file.
 -   `_file` — Name of the file.

+**See Also**
+
+-   [Virtual columns](../../../engines/table-engines/index.md#table_engines-virtual_columns)
+
 ## S3-related settings {#settings}

 The following settings can be set before query execution or placed into configuration file.
@ -124,8 +128,29 @@ The following settings can be set before query execution or placed into configur

 Security consideration: if malicious user can specify arbitrary S3 URLs, `s3_max_redirects` must be set to zero to avoid [SSRF](https://en.wikipedia.org/wiki/Server-side_request_forgery) attacks; or alternatively, `remote_host_filter` must be specified in server configuration.

-**See Also**
+### Endpoint-based settings {#endpointsettings}

-   [Virtual columns](../../../engines/table-engines/index.md#table_engines-virtual_columns)
+The following settings can be specified in configuration file for given endpoint (which will be matched by exact prefix of a URL):
+
+-   `endpoint` — Mandatory. Specifies prefix of an endpoint.
+-   `access_key_id` and `secret_access_key` — Optional. Specifies credentials to use with given endpoint.
+-   `use_environment_credentials` — Optional, default value is `false`. If set to `true`, S3 client will try to obtain credentials from environment variables and Amazon EC2 metadata for given endpoint.
+-   `header` — Optional, can be speficied multiple times. Adds specified HTTP header to a request to given endpoint.
+
+This configuration also applies to S3 disks in `MergeTree` table engine family.
+
+Example:
+
+```
+<s3>
+    <endpoint-name>
+        <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> -->
+        <!-- <use_environment_credentials>false</use_environment_credentials> -->
+        <!-- <header>Authorization: Bearer SOME-TOKEN</header> -->
+    </endpoint-name>
+</s3>
+```

 [Original article](https://clickhouse.tech/docs/en/operations/table_engines/s3/) <!--hide-->
--- a/docs/en/engines/table-engines/mergetree-family/mergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/mergetree.md
@ -657,6 +657,96 @@ The `default` storage policy implies using only one volume, which consists of on

 The number of threads performing background moves of data parts can be changed by [background_move_pool_size](../../../operations/settings/settings.md#background_move_pool_size) setting.

+## Using S3 for Data Storage {#table_engine-mergetree-s3}
+
+`MergeTree` family table engines is able to store data to [S3](https://aws.amazon.com/s3/) using a disk with type `s3`.
+
+Configuration markup:
+``` xml
+<storage_configuration>
+    ...
+    <disks>
+        <s3>
+            <type>s3</type>
+            <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>
+            <proxy>
+                <uri>http://proxy1</uri>
+                <uri>http://proxy2</uri>
+            </proxy>
+            <connect_timeout_ms>10000</connect_timeout_ms>
+            <request_timeout_ms>5000</request_timeout_ms>
+            <max_connections>100</max_connections>
+            <retry_attempts>10</retry_attempts>
+            <min_bytes_for_seek>1000</min_bytes_for_seek>
+            <metadata_path>/var/lib/clickhouse/disks/s3/</metadata_path>
+            <cache_enabled>true</cache_enabled>
+            <cache_path>/var/lib/clickhouse/disks/s3/cache/</cache_path>
+            <skip_access_check>false</skip_access_check>
+        </s3>
+    </disks>
+    ...
+</storage_configuration>
+```
+
+Required parameters:
+-   `endpoint` — S3 endpoint url in `path` or `virtual hosted` [styles](https://docs.aws.amazon.com/AmazonS3/latest/dev/VirtualHosting.html). Endpoint url should contain bucket and root path to store data.
+-   `access_key_id` — S3 access key id. 
+-   `secret_access_key` — S3 secret access key.
+
+Optional parameters:    
+-   `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`.
+-   `proxy` — Proxy configuration for S3 endpoint. Each `uri` element inside `proxy` block should contain a proxy URL. 
+-   `connect_timeout_ms` — Socket connect timeout in milliseconds. Default value is `10 seconds`. 
+-   `request_timeout_ms` — Request timeout in milliseconds. Default value is `5 seconds`. 
+-   `max_connections` — S3 connections pool size. Default value is `100`. 
+-   `retry_attempts` — Number of retry attempts in case of failed request. Default value is `10`. 
+-   `min_bytes_for_seek` — Minimal number of bytes to use seek operation instead of sequential read. Default value is `1 Mb`. 
+-   `metadata_path` — Path on local FS to store metadata files for S3. Default value is `/var/lib/clickhouse/disks/<disk_name>/`. 
+-   `cache_enabled` — Allows to cache mark and index files on local FS. Default value is `true`. 
+-   `cache_path` — Path on local FS where to store cached mark and index files. Default value is `/var/lib/clickhouse/disks/<disk_name>/cache/`. 
+-   `skip_access_check` — If true disk access checks will not be performed on disk start-up. Default value is `false`.
+
+
+S3 disk can be configured as `main` or `cold` storage:
+``` xml
+<storage_configuration>
+    ...
+    <disks>
+        <s3>
+            <type>s3</type>
+            <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>
+        </s3>
+    </disks>
+    <policies>
+        <s3_main>
+            <volumes>
+                <main>
+                    <disk>s3</disk>
+                </main>
+            </volumes>
+        </s3_main>
+        <s3_cold>
+            <volumes>
+                <main>
+                    <disk>default</disk>
+                </main>
+                <external>
+                    <disk>s3</disk>
+                </external>
+            </volumes>
+            <move_factor>0.2</move_factor>
+        </s3_cold>
+    </policies>
+    ...
+</storage_configuration>
+```
+
+In case of `cold` option a data can be moved to S3 if local disk free size will be smaller than `move_factor * disk_size` or by TTL move rule. 
+
 ### Details {#details}

 In the case of `MergeTree` tables, data is getting to disk in different ways:
--- a/docs/en/getting-started/tutorial.md
+++ b/docs/en/getting-started/tutorial.md
@ -254,7 +254,6 @@ ENGINE = MergeTree()
 PARTITION BY toYYYYMM(EventDate)
 ORDER BY (CounterID, EventDate, intHash32(UserID))
 SAMPLE BY intHash32(UserID)
-SETTINGS index_granularity = 8192
 ```

 ``` sql
@ -450,7 +449,6 @@ ENGINE = CollapsingMergeTree(Sign)
 PARTITION BY toYYYYMM(StartDate)
 ORDER BY (CounterID, StartDate, intHash32(UserID), VisitID)
 SAMPLE BY intHash32(UserID)
-SETTINGS index_granularity = 8192
 ```

 You can execute those queries using the interactive mode of `clickhouse-client` (just launch it in a terminal without specifying a query in advance) or try some [alternative interface](../interfaces/index.md) if you want.
--- a/docs/en/interfaces/cli.md
+++ b/docs/en/interfaces/cli.md
@ -110,17 +110,17 @@ You can pass parameters to `clickhouse-client` (all parameters have a default va

 ### Command Line Options {#command-line-options}

-   `--host, -h` -– The server name, ‘localhost’ by default. You can use either the name or the IPv4 or IPv6 address.
+-   `--host, -h` – The server name, ‘localhost’ by default. You can use either the name or the IPv4 or IPv6 address.
 -   `--port` – The port to connect to. Default value: 9000. Note that the HTTP interface and the native interface use different ports.
 -   `--user, -u` – The username. Default value: default.
 -   `--password` – The password. Default value: empty string.
 -   `--query, -q` – The query to process when using non-interactive mode. You must specify either `query` or `queries-file` option.
-   `--queries-file, -qf` - file path with queries to execute. You must specify either `query` or `queries-file` option.
+-   `--queries-file, -qf` – file path with queries to execute. You must specify either `query` or `queries-file` option.
 -   `--database, -d` – Select the current default database. Default value: the current database from the server settings (‘default’ by default).
 -   `--multiline, -m` – If specified, allow multiline queries (do not send the query on Enter).
 -   `--multiquery, -n` – If specified, allow processing multiple queries separated by semicolons.
 -   `--format, -f` – Use the specified default format to output the result.
-   `--vertical, -E` – If specified, use the Vertical format by default to output the result. This is the same as ‘–format=Vertical’. In this format, each value is printed on a separate line, which is helpful when displaying wide tables.
+-   `--vertical, -E` – If specified, use the [Vertical format](../interfaces/formats.md#vertical) by default to output the result. This is the same as `–format=Vertical`. In this format, each value is printed on a separate line, which is helpful when displaying wide tables.
 -   `--time, -t` – If specified, print the query execution time to ‘stderr’ in non-interactive mode.
 -   `--stacktrace` – If specified, also print the stack trace if an exception occurs.
 -   `--config-file` – The name of the configuration file.
--- a/docs/en/interfaces/formats.md
+++ b/docs/en/interfaces/formats.md
@ -515,9 +515,9 @@ Example:

 ## JSONAsString {#jsonasstring}

-In this format, a single JSON object is interpreted as a single value. If input has several JSON objects (comma separated) they will be interpreted as a sepatate rows.
+In this format, a single JSON object is interpreted as a single value. If the input has several JSON objects (comma separated) they will be interpreted as separate rows.

-This format can only be parsed for table with a single field of type [String](../sql-reference/data-types/string.md). The remaining columns must be set to  [DEFAULT](../sql-reference/statements/create/table.md#default) or [MATERIALIZED](../sql-reference/statements/create/table.md#materialized), or omitted. Once you collect whole JSON object to string you can use [JSON functions](../sql-reference/functions/json-functions.md) to process it.
+This format can only be parsed for table with a single field of type [String](../sql-reference/data-types/string.md). The remaining columns must be set to [DEFAULT](../sql-reference/statements/create/table.md#default) or [MATERIALIZED](../sql-reference/statements/create/table.md#materialized), or omitted. Once you collect whole JSON object to string you can use [JSON functions](../sql-reference/functions/json-functions.md) to process it.

 **Example**

@ -526,7 +526,7 @@ Query:
 ``` sql
 DROP TABLE IF EXISTS json_as_string;
 CREATE TABLE json_as_string (json String) ENGINE = Memory;
-INSERT INTO json_as_string FORMAT JSONAsString {"foo":{"bar":{"x":"y"},"baz":1}},{},{"any json stucture":1}
+INSERT INTO json_as_string (json) FORMAT JSONAsString {"foo":{"bar":{"x":"y"},"baz":1}},{},{"any json stucture":1}
 SELECT * FROM json_as_string;
 ```

@ -540,7 +540,6 @@ Result:
 └───────────────────────────────────┘
 ```

-
 ## JSONCompact {#jsoncompact}
 ## JSONCompactString {#jsoncompactstring}

--- a/docs/en/interfaces/third-party/gui.md
+++ b/docs/en/interfaces/third-party/gui.md
@ -107,6 +107,10 @@ Features:

 [xeus-clickhouse](https://github.com/wangfenjin/xeus-clickhouse) is a Jupyter kernal for ClickHouse, which supports query CH data using SQL in Jupyter.

+### MindsDB Studio {#mindsdb}
+
+[MindsDB](https://mindsdb.com/) is an open-source AI layer for databases including ClickHouse that allows you to effortlessly develop, train and deploy state-of-the-art machine learning models. MindsDB Studio(GUI) allows you to train new models from database, interpret predictions made by the model, identify potential data biases, and evaluate and visualize model accuracy using the Explainable AI function to adapt and tune your Machine Learning models faster.
+
 ## Commercial {#commercial}

 ### DataGrip {#datagrip}
--- a/docs/en/interfaces/third-party/integrations.md
+++ b/docs/en/interfaces/third-party/integrations.md
@ -69,6 +69,9 @@ toc_title: Integrations
 -   Geo
    -   [MaxMind](https://dev.maxmind.com/geoip/)
        -   [clickhouse-maxmind-geoip](https://github.com/AlexeyKupershtokh/clickhouse-maxmind-geoip)
+-   AutoML
+    -   [MindsDB](https://mindsdb.com/)
+        -   [MindsDB](https://github.com/mindsdb/mindsdb) - Predictive AI layer for ClickHouse database.

 ## Programming Language Ecosystems {#programming-language-ecosystems}

--- a/docs/en/introduction/adopters.md
+++ b/docs/en/introduction/adopters.md
@ -120,5 +120,6 @@ toc_title: Adopters
 | <a href="https://htc-cs.ru/" class="favicon">ЦВТ</a>                                           | Software Development            | Metrics, Logging      | —                                                          | —                                                                            | [Blog Post, March 2019, in Russian](https://vc.ru/dev/62715-kak-my-stroili-monitoring-na-prometheus-clickhouse-i-elk)                                                                                                   |
 | <a href="https://mkb.ru/" class="favicon">МКБ</a>                                              | Bank                            | Web-system monitoring | —                                                          | —                                                                            | [Slides in Russian, September 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup28/mkb.pdf)                                                                                                |
 | <a href="https://cft.ru/" class="favicon">ЦФТ</a>                                              | Banking, Financial products, Payments                            |  — | —                                                          | —                                                                            | [Meetup in Russian, April 2020](https://team.cft.ru/events/162)                                                                                                |
+| <a href="https://www.kakaocorp.com/" class="favicon">kakaocorp</a>                                              | Internet company         |  — | —                                                          | —                                                                            | [if(kakao)2020 conference](https://if.kakao.com/session/117)                                                                                                |

 [Original article](https://clickhouse.tech/docs/en/introduction/adopters/) <!--hide-->
--- a/docs/en/operations/access-rights.md
+++ b/docs/en/operations/access-rights.md
@ -27,6 +27,8 @@ We recommend using SQL-driven workflow. Both of the configuration methods work s
 !!! note "Warning"
    You can’t manage the same access entity by both configuration methods simultaneously.

+To see all users, roles, profiles, etc. and all their grants use [SHOW ACCESS](../sql-reference/statements/show.md#show-access-statement) statement.
+
 ## Usage {#access-control-usage}

 By default, the ClickHouse server provides the `default` user account which is not allowed using SQL-driven access control and account management but has all the rights and permissions. The `default` user account is used in any cases when the username is not defined, for example, at login from client or in distributed queries. In distributed query processing a default user account is used, if the configuration of the server or cluster doesn’t specify the [user and password](../engines/table-engines/special/distributed.md) properties.
--- a/docs/en/operations/caches.md
+++ b/docs/en/operations/caches.md
@ -0,0 +1,26 @@
+---
+toc_priority: 65
+toc_title: Caches
+---
+
+# Cache Types {#cache-types}
+
+When performing queries, ClichHouse uses different caches.
+
+Main cache types:
+- `mark_cache` — Cache of marks used by table engines of the [MergeTree](../engines/table-engines/mergetree-family/mergetree.md) family.
+- `uncompressed_cache` — Cache of uncompressed data used by table engines of the [MergeTree](../engines/table-engines/mergetree-family/mergetree.md) family.
+
+Additional cache types:
+- DNS cache
+- [regexp](../interfaces/formats.md#data-format-regexp) cache
+- compiled expressions cache
+- [Avro format](../interfaces/formats.md#data-format-avro) schemas cache
+- [dictionaries data cache](../sql-reference/dictionaries/index.md)
+
+Indirectly used:
+- OS page cache
+
+To drop cache, use [SYSTEM DROP ... CACHE](../sql-reference/statements/system.md) statements.
+
+[Original article](https://clickhouse.tech/docs/en/operations/caches/) <!--hide-->
--- a/docs/en/operations/settings/index.md
+++ b/docs/en/operations/settings/index.md
@ -25,6 +25,7 @@ Ways to configure settings, in order of priority:

    -   When starting the ClickHouse console client in non-interactive mode, set the startup parameter `--setting=value`.
    -   When using the HTTP API, pass CGI parameters (`URL?setting_1=value&setting_2=value...`).
+    -   Make settings in the [SETTINGS](../../sql-reference/statements/select/index.md#settings-in-select) clause of the SELECT query. The setting value is applied only to that query and is reset to default or previous value after the query is executed.

 Settings that can only be made in the server config file are not covered in this section.

--- a/docs/en/operations/settings/merge-tree-settings.md
+++ b/docs/en/operations/settings/merge-tree-settings.md
@ -0,0 +1,190 @@
+# MergeTree tables settings {#merge-tree-settings}
+
+The values of `merge_tree` settings (for all MergeTree tables) can be viewed in the table `system.merge_tree_settings`, they can be overridden in `config.xml` in the `merge_tree` section, or set in the `SETTINGS` section of each table.
+
+Override example in `config.xml`:
+
+``` text
+<merge_tree>
+    <max_suspicious_broken_parts>5</max_suspicious_broken_parts>
+</merge_tree>
+```
+
+An example to set in `SETTINGS` for a particular table:
+
+``` sql
+CREATE TABLE foo
+(
+    `A` Int64
+)
+ENGINE = MergeTree
+ORDER BY tuple()
+SETTINGS max_suspicious_broken_parts = 500;
+```
+
+An example of changing the settings for a specific table with the `ALTER TABLE ... MODIFY SETTING` command:
+
+``` sql
+ALTER TABLE foo
+    MODIFY SETTING max_suspicious_broken_parts = 100;
+```
+
+## parts_to_throw_insert {#parts-to-throw-insert}
+
+If the number of active parts in a single partition exceeds the `parts_to_throw_insert` value, `INSERT` is interrupted with the `Too many parts (N). Merges are processing significantly slower than inserts` exception.
+
+Possible values:
+
+-   Any positive integer.
+
+Default value: 300.
+
+To achieve maximum performance of `SELECT` queries, it is necessary to minimize the number of parts processed, see [Merge Tree](../../development/architecture.md#merge-tree).
+
+You can set a larger value to 600 (1200), this will reduce the probability of the `Too many parts` error, but at the same time `SELECT` performance might degrade. Also in case of a merge issue (for example, due to insufficient disk space) you will notice it later than it could be with the original 300.
+
+
+## parts_to_delay_insert {#parts-to-delay-insert}
+
+If the number of active parts in a single partition exceeds the `parts_to_delay_insert` value, an `INSERT` artificially slows down.
+
+Possible values:
+
+-   Any positive integer.
+
+Default value: 150.
+
+ClickHouse artificially executes `INSERT` longer (adds ‘sleep’) so that the background merge process can merge parts faster than they are added.
+
+## max_delay_to_insert {#max-delay-to-insert}
+
+The value in seconds, which is used to calculate the `INSERT` delay, if the number of active parts in a single partition exceeds the [parts_to_delay_insert](#parts-to-delay-insert) value.
+
+Possible values:
+
+-   Any positive integer.
+
+Default value: 1.
+
+The delay (in milliseconds) for `INSERT` is calculated by the formula:
+
+```code
+max_k = parts_to_throw_insert - parts_to_delay_insert
+k = 1 + parts_count_in_partition - parts_to_delay_insert
+delay_milliseconds = pow(max_delay_to_insert * 1000, k / max_k)
+```
+
+For example if a partition has 299 active parts and parts_to_throw_insert = 300, parts_to_delay_insert = 150, max_delay_to_insert = 1, `INSERT` is delayed for `pow( 1 * 1000, (1 + 299 - 150) / (300 - 150) ) = 1000` milliseconds.
+
+## max_parts_in_total {#max-parts-in-total}
+
+If the total number of active parts in all partitions of a table exceeds the `max_parts_in_total` value `INSERT` is interrupted with the `Too many parts (N)` exception.
+
+Possible values:
+
+-   Any positive integer.
+
+Default value: 100000.
+
+A large number of parts in a table reduces performance of ClickHouse queries and increases ClickHouse boot time. Most often this is a consequence of an incorrect design (mistakes when choosing a partitioning strategy - too small partitions).
+
+## replicated_deduplication_window {#replicated-deduplication-window}
+
+The number of most recently inserted blocks for which Zookeeper stores hash sums to check for duplicates.
+
+Possible values:
+
+-   Any positive integer.
+-   0 (disable deduplication)
+
+Default value: 100.
+
+The `Insert` command creates one or more blocks (parts). When inserting into Replicated tables, ClickHouse for [insert deduplication](../../engines/table-engines/mergetree-family/replication/) writes the hash sums of the created parts into Zookeeper. Hash sums are stored only for the most recent `replicated_deduplication_window` blocks. The oldest hash sums are removed from Zookeeper.
+A large number of `replicated_deduplication_window` slows down `Inserts` because it needs to compare more entries.
+The hash sum is calculated from the composition of the field names and types and the data of the inserted part (stream of bytes).
+
+## replicated_deduplication_window_seconds {#replicated-deduplication-window-seconds}
+
+The number of seconds after which the hash sums of the inserted blocks are removed from Zookeeper.
+
+Possible values:
+
+-   Any positive integer.
+
+Default value: 604800 (1 week).
+
+Similar to [replicated_deduplication_window](#replicated-deduplication-window), `replicated_deduplication_window_seconds` specifies how long to store hash sums of blocks for insert deduplication. Hash sums older than `replicated_deduplication_window_seconds` are removed from Zookeeper, even if they are less than ` replicated_deduplication_window`.
+
+## old_parts_lifetime {#old-parts-lifetime}
+
+The time (in seconds) of storing inactive parts to protect against data loss during spontaneous server reboots.
+
+Possible values:
+
+-   Any positive integer.
+
+Default value: 480.
+
+`fsync` is not called for new parts, so for some time new parts exist only in the server's RAM (OS cache). If the server is rebooted spontaneously, new parts can be lost or damaged.
+To protect data parts created by merges source parts are not deleted immediately. After merging several parts into a new part, ClickHouse marks the original parts as inactive and deletes them only after `old_parts_lifetime` seconds.
+Inactive parts are removed if they are not used by current queries, i.e. if the `refcount` of the part is zero.
+
+During startup ClickHouse checks the integrity of the parts.
+If the merged part is damaged ClickHouse returns the inactive parts to the active list, and later merges them again. Then the damaged part is renamed (the `broken_` prefix is added) and moved to the `detached` folder.
+If the merged part is not damaged, then the original inactive parts are renamed (the `ignored_` prefix is added) and moved to the `detached` folder.
+
+The default `dirty_expire_centisecs` value (a Linux kernel setting) is 30 seconds (the maximum time that written data is stored only in RAM), but under heavy loads on the disk system data can be written much later. Experimentally, a value of 480 seconds was chosen for `old_parts_lifetime`, during which a new part is guaranteed to be written to disk.
+
+## max_bytes_to_merge_at_max_space_in_pool {#max-bytes-to-merge-at-max-space-in-pool}
+
+The maximum total parts size (in bytes) to be merged into one part, if there are enough resources available.
+`max_bytes_to_merge_at_max_space_in_pool` -- roughly corresponds to the maximum possible part size created by an automatic background merge.
+
+Possible values:
+
+-   Any positive integer.
+
+Default value: 161061273600 (150 GB).
+
+The merge scheduler periodically analyzes the sizes and number of parts in partitions, and if there is enough free resources in the pool, it starts background merges. Merges occur until the total size of the source parts is less than `max_bytes_to_merge_at_max_space_in_pool`.
+
+Merges initiated by `optimize final` ignore `max_bytes_to_merge_at_max_space_in_pool` and merge parts only taking into account available resources (free disk's space) until one part remains in the partition.
+
+## max_bytes_to_merge_at_min_space_in_pool {#max-bytes-to-merge-at-min-space-in-pool}
+
+The maximum total part size (in bytes) to be merged into one part, with the minimum available resources in the background pool.
+
+Possible values:
+
+-   Any positive integer.
+
+Default value: 1048576 (1 MB)
+
+`max_bytes_to_merge_at_min_space_in_pool` defines the maximum total size of parts which can be merged despite the lack of available disk space (in pool). This is necessary to reduce the number of small parts and the chance of `Too many parts` errors.
+Merges book disk space by doubling the total merged parts sizes. Thus, with a small amount of free disk space, a situation may happen that there is free space, but this space is already booked by ongoing large merges, so other merges unable to start, and the number of small parts grows with every insert.
+
+## merge_max_block_size {#merge-max-block-size}
+
+The number of rows that are read from the merged parts into memory.
+
+Possible values:
+
+-   Any positive integer.
+
+Default value: 8192
+
+Merge reads rows from parts in blocks of `merge_max_block_size` rows, then merges and writes the result into a new part. The read block is placed in RAM, so `merge_max_block_size` affects the size of the RAM required for the merge. Thus, merges can consume a large amount of RAM for tables with very wide rows (if the average row size is 100kb, then when merging 10 parts, (100kb * 10 * 8192) = ~ 8GB of RAM). By decreasing `merge_max_block_size`, you can reduce the amount of RAM required for a merge but slow down a merge.
+
+## max_part_loading_threads {#max-part-loading-threads}
+
+The maximum number of threads that read parts when ClickHouse starts.
+
+Possible values:
+
+-   Any positive integer.
+
+Default value: auto (number of CPU cores).
+
+During startup ClickHouse reads all parts of all tables (reads files with metadata of parts) to build a list of all parts in memory. In some systems with a large number of parts this process can take a long time, and this time might be shortened by increasing `max_part_loading_threads` (if this process is not CPU and disk I/O bound).
+
+[Original article](https://clickhouse.tech/docs/en/operations/settings/merge_tree_settings/) <!--hide-->
--- a/docs/en/operations/settings/settings.md
+++ b/docs/en/operations/settings/settings.md
@ -2134,6 +2134,21 @@ Default value: `1`.

 -   [ORDER BY Clause](../../sql-reference/statements/select/order-by.md#optimize_read_in_order)

+## optimize_aggregation_in_order {#optimize_aggregation_in_order}
+
+Enables [GROUP BY](../../sql-reference/statements/select/group-by.md) optimization in [SELECT](../../sql-reference/statements/select/index.md) queries for aggregating data in corresponding order in [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md) tables.
+
+Possible values:
+
+-   0 — `GROUP BY` optimization is disabled.
+-   1 — `GROUP BY` optimization is enabled.
+
+Default value: `0`.
+
+**See Also**
+
+-   [GROUP BY optimization](../../sql-reference/statements/select/group-by.md#aggregation-in-order)
+
 ## mutations_sync {#mutations_sync}

 Allows to execute `ALTER TABLE ... UPDATE|DELETE` queries ([mutations](../../sql-reference/statements/alter/index.md#mutations)) synchronously.
@ -2474,7 +2489,6 @@ Possible values:

 Default value: `0`.

-
 ## aggregate_functions_null_for_empty {#aggregate_functions_null_for_empty}

 Enables or disables rewriting all aggregate functions in a query, adding [-OrNull](../../sql-reference/aggregate-functions/combinators.md#agg-functions-combinator-ornull) suffix to them. Enable it for SQL standard compatibility.
@ -2491,11 +2505,7 @@ Default value: 0.

 Consider the following query with aggregate functions:
 ```sql
-SELECT
-    SUM(-1),
-    MAX(0)
-FROM system.one
-WHERE 0
+SELECT SUM(-1), MAX(0) FROM system.one WHERE 0;
 ```

 With `aggregate_functions_null_for_empty = 0` it would produce:
@ -2512,7 +2522,6 @@ With `aggregate_functions_null_for_empty = 1` the result would be:
 └───────────────┴──────────────┘
 ```

-
 ## union_default_mode {#union-default-mode}

 Sets a mode for combining `SELECT` query results. The setting is only used when shared with [UNION](../../sql-reference/statements/select/union.md) without explicitly specifying the `UNION ALL` or `UNION DISTINCT`.
@ -2527,7 +2536,6 @@ Default value: `''`.

 See examples in [UNION](../../sql-reference/statements/select/union.md).

-
 ## data_type_default_nullable {#data_type_default_nullable}

 Allows data types without explicit modifiers [NULL or NOT NULL](../../sql-reference/statements/create/table.md#null-modifiers) in column definition will be [Nullable](../../sql-reference/data-types/nullable.md#data_type-nullable).
@ -2539,7 +2547,6 @@ Possible values:

 Default value: `0`.

-
 ## execute_merges_on_single_replica_time_threshold {#execute-merges-on-single-replica-time-threshold}

 Enables special logic to perform merges on replicas.
@ -2559,4 +2566,15 @@ High values for that threshold may lead to replication delays.

 It can be useful when merges are CPU bounded not IO bounded (performing heavy data compression, calculating aggregate functions or default expressions that require a large amount of calculations, or just very high number of tiny merges).

+## max_final_threads {#max-final-threads}
+
+Sets the maximum number of parallel threads for the `SELECT` query data read phase with the [FINAL](../../sql-reference/statements/select/from.md#select-from-final) modifier.
+
+Possible values:
+
+-   Positive integer.
+-   0 or 1 — Disabled. `SELECT` queries are executed in a single thread.
+
+Default value: `16`.
+
 [Original article](https://clickhouse.tech/docs/en/operations/settings/settings/) <!-- hide -->
--- a/docs/en/operations/utilities/clickhouse-benchmark.md
+++ b/docs/en/operations/utilities/clickhouse-benchmark.md
@ -7,7 +7,7 @@ toc_title: clickhouse-benchmark

 Connects to a ClickHouse server and repeatedly sends specified queries.

-Syntax:
+**Syntax**

 ``` bash
 $ clickhouse-benchmark --query ["single query"] [keys]
@ -28,35 +28,35 @@ $ clickhouse-benchmark [keys] <<< "single query"
 If you want to send a set of queries, create a text file and place each query on the individual string in this file. For example:

 ``` sql
-SELECT * FROM system.numbers LIMIT 10000000
-SELECT 1
+SELECT * FROM system.numbers LIMIT 10000000;
+SELECT 1;
 ```

-Then pass this file to a standard input of `clickhouse-benchmark`.
+Then pass this file to a standard input of `clickhouse-benchmark`:

 ``` bash
-clickhouse-benchmark [keys] < queries_file
+clickhouse-benchmark [keys] < queries_file;
 ```

 ## Keys {#clickhouse-benchmark-keys}

-   `--query=WORD` - Query to execute. If this parameter is not passed clickhouse-benchmark will read queries from standard input. 
+-   `--query=QUERY` — Query to execute. If this parameter is not passed, `clickhouse-benchmark` will read queries from standard input. 
 -   `-c N`, `--concurrency=N` — Number of queries that `clickhouse-benchmark` sends simultaneously. Default value: 1.
-   `-d N`, `--delay=N` — Interval in seconds between intermediate reports (set 0 to disable reports). Default value: 1.
-   `-h WORD`, `--host=WORD` — Server host. Default value: `localhost`. For the [comparison mode](#clickhouse-benchmark-comparison-mode) you can use multiple `-h` keys.
+-   `-d N`, `--delay=N` — Interval in seconds between intermediate reports (to disable reports set 0). Default value: 1.
+-   `-h HOST`, `--host=HOST` — Server host. Default value: `localhost`. For the [comparison mode](#clickhouse-benchmark-comparison-mode) you can use multiple `-h` keys.
 -   `-p N`, `--port=N` — Server port. Default value: 9000. For the [comparison mode](#clickhouse-benchmark-comparison-mode) you can use multiple `-p` keys.
 -   `-i N`, `--iterations=N` — Total number of queries. Default value: 0 (repeat forever).
-   `-r`, `--randomize` — Random order of queries execution if there is more then one input query.
-   `-s`, `--secure` — Using TLS connection.
+-   `-r`, `--randomize` — Random order of queries execution if there is more than one input query.
+-   `-s`, `--secure` — Using `TLS` connection.
 -   `-t N`, `--timelimit=N` — Time limit in seconds. `clickhouse-benchmark` stops sending queries when the specified time limit is reached. Default value: 0 (time limit disabled).
-   `--confidence=N` — Level of confidence for T-test. Possible values: 0 (80%), 1 (90%), 2 (95%), 3 (98%), 4 (99%), 5 (99.5%). Default value: 5. In the [comparison mode](#clickhouse-benchmark-comparison-mode) `clickhouse-benchmark` performs the [Independent two-sample Student’s t-test](https://en.wikipedia.org/wiki/Student%27s_t-test#Independent_two-sample_t-test) test to determine whether the two distributions aren’t different with the selected level of confidence.
+-   `--confidence=N` — Level of confidence for T-test. Possible values: 0 (80%), 1 (90%), 2 (95%), 3 (98%), 4 (99%), 5 (99.5%). Default value: 5. In the [comparison mode](#clickhouse-benchmark-comparison-mode) `clickhouse-benchmark` performs the [Independent two-sample Student’s t-test](https://en.wikipedia.org/wiki/Student%27s_t-test#Independent_two-sample_t-test) to determine whether the two distributions aren’t different with the selected level of confidence.
 -   `--cumulative` — Printing cumulative data instead of data per interval.
 -   `--database=DATABASE_NAME` — ClickHouse database name. Default value: `default`.
-   `--json=FILEPATH` — JSON output. When the key is set, `clickhouse-benchmark` outputs a report to the specified JSON-file.
+-   `--json=FILEPATH` — `JSON` output. When the key is set, `clickhouse-benchmark` outputs a report to the specified JSON-file.
 -   `--user=USERNAME` — ClickHouse user name. Default value: `default`.
 -   `--password=PSWD` — ClickHouse user password. Default value: empty string.
 -   `--stacktrace` — Stack traces output. When the key is set, `clickhouse-bencmark` outputs stack traces of exceptions.
-   `--stage=WORD` — Query processing stage at server. ClickHouse stops query processing and returns answer to `clickhouse-benchmark` at the specified stage. Possible values: `complete`, `fetch_columns`, `with_mergeable_state`. Default value: `complete`.
+-   `--stage=WORD` — Query processing stage at server. ClickHouse stops query processing and returns an answer to `clickhouse-benchmark` at the specified stage. Possible values: `complete`, `fetch_columns`, `with_mergeable_state`. Default value: `complete`.
 -   `--help` — Shows the help message.

 If you want to apply some [settings](../../operations/settings/index.md) for queries, pass them as a key `--<session setting name>= SETTING_VALUE`. For example, `--max_memory_usage=1048576`.
@ -96,11 +96,11 @@ In the report you can find:

    -   Endpoint of ClickHouse server.
    -   Number of processed queries.
-    -   QPS: QPS: How many queries server performed per second during a period specified in the `--delay` argument.
-    -   RPS: How many rows server read per second during a period specified in the `--delay` argument.
-    -   MiB/s: How many mebibytes server read per second during a period specified in the `--delay` argument.
-    -   result RPS: How many rows placed by server to the result of a query per second during a period specified in the `--delay` argument.
-    -   result MiB/s. How many mebibytes placed by server to the result of a query per second during a period specified in the `--delay` argument.
+    -   QPS: How many queries the server performed per second during a period specified in the `--delay` argument.
+    -   RPS: How many rows the server reads per second during a period specified in the `--delay` argument.
+    -   MiB/s: How many mebibytes the server reads per second during a period specified in the `--delay` argument.
+    -   result RPS: How many rows placed by the server to the result of a query per second during a period specified in the `--delay` argument.
+    -   result MiB/s. How many mebibytes placed by the server to the result of a query per second during a period specified in the `--delay` argument.

 -   Percentiles of queries execution time.

@ -159,3 +159,5 @@ localhost:9000, queries 10, QPS: 6.082, RPS: 121959604.568, MiB/s: 930.478, resu
 99.900%     0.172 sec.
 99.990%     0.172 sec.
 ```
+
+[Original article](https://clickhouse.tech/docs/en/operations/utilities/clickhouse-benchmark.md) <!--hide-->
--- a/docs/en/operations/utilities/clickhouse-copier.md
+++ b/docs/en/operations/utilities/clickhouse-copier.md
@ -71,8 +71,8 @@ Parameters:
    <remote_servers>
        <source_cluster>
            <!--
-                source cluster & destination clusters accepts exactly the same
-                parameters as parameters for usual Distributed table
+                source cluster & destination clusters accept exactly the same
+                parameters as parameters for the usual Distributed table
                see https://clickhouse.tech/docs/en/engines/table-engines/special/distributed/
            --> 
            <shard>
--- a/docs/en/operations/utilities/clickhouse-local.md
+++ b/docs/en/operations/utilities/clickhouse-local.md
@ -16,7 +16,7 @@ By default `clickhouse-local` does not have access to data on the same host, but
 !!! warning "Warning"
    It is not recommended to load production server configuration into `clickhouse-local` because data can be damaged in case of human error.

-For temporary data, a unique temporary data directory is created by default. If you want to override this behavior, the data directory can be explicitly specified with the `-- --path` option.
+For temporary data, a unique temporary data directory is created by default.

 ## Usage {#usage}

@ -32,15 +32,22 @@ Arguments:
 -   `-S`, `--structure` — table structure for input data.
 -   `-if`, `--input-format` — input format, `TSV` by default.
 -   `-f`, `--file` — path to data, `stdin` by default.
-   `-q` `--query` — queries to execute with `;` as delimeter. You must specify either `query` or `queries-file` option.
-   `-qf` `--queries-file` - file path with queries to execute. You must specify either `query` or `queries-file` option.
+-   `-q`, `--query` — queries to execute with `;` as delimeter. You must specify either `query` or `queries-file` option.
+-   `-qf`, `--queries-file` - file path with queries to execute. You must specify either `query` or `queries-file` option.
 -   `-N`, `--table` — table name where to put output data, `table` by default.
 -   `-of`, `--format`, `--output-format` — output format, `TSV` by default.
+-   `-d`, `--database` — default database, `_local` by default.
 -   `--stacktrace` — whether to dump debug output in case of exception.
+-   `--echo` — print query before execution. 
 -   `--verbose` — more details on query execution.
-   `-s` — disables `stderr` logging.
-   `--config-file` — path to configuration file in same format as for ClickHouse server, by default the configuration empty.
+-   `--logger.console` — Log to console.
+-   `--logger.log` — Log file name.
+-   `--logger.level` — Log level.
+-   `--ignore-error` — do not stop processing if a query failed.
+-   `-c`, `--config-file` — path to configuration file in same format as for ClickHouse server, by default the configuration empty.
+-   `--no-system-tables` — do not attach system tables.
 -   `--help` — arguments references for `clickhouse-local`.
+-   `-V`, `--version` — print version information and exit.

 Also there are arguments for each ClickHouse configuration variable which are more commonly used instead of `--config-file`.

--- a/docs/en/sql-reference/aggregate-functions/reference/argmax.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/argmax.md
@ -4,6 +4,28 @@ toc_priority: 106

 # argMax {#agg-function-argmax}

-Syntax: `argMax(arg, val)`
+Syntax: `argMax(arg, val)` or `argMax(tuple(arg, val))`

 Calculates the `arg` value for a maximum `val` value. If there are several different values of `arg` for maximum values of `val`, the first of these values encountered is output.
+
+Tuple version of this function will return the tuple with the maximum `val` value. It is convinient for use with `SimpleAggregateFunction`.
+
+**Example:**
+
+``` text
+┌─user─────┬─salary─┐
+│ director │   5000 │
+│ manager  │   3000 │
+│ worker   │   1000 │
+└──────────┴────────┘
+```
+
+``` sql
+SELECT argMax(user, salary), argMax(tuple(user, salary)) FROM salary
+```
+
+``` text
+┌─argMax(user, salary)─┬─argMax(tuple(user, salary))─┐
+│ director             │ ('director',5000)           │
+└──────────────────────┴─────────────────────────────┘
+```
--- a/docs/en/sql-reference/aggregate-functions/reference/argmin.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/argmin.md
@ -4,10 +4,12 @@ toc_priority: 105

 # argMin {#agg-function-argmin}

-Syntax: `argMin(arg, val)`
+Syntax: `argMin(arg, val)` or `argMin(tuple(arg, val))`

 Calculates the `arg` value for a minimal `val` value. If there are several different values of `arg` for minimal values of `val`, the first of these values encountered is output.

+Tuple version of this function will return the tuple with the minimal `val` value. It is convinient for use with `SimpleAggregateFunction`.
+
 **Example:**

 ``` text
@ -19,11 +21,11 @@ Calculates the `arg` value for a minimal `val` value. If there are several diffe
 ```

 ``` sql
-SELECT argMin(user, salary) FROM salary
+SELECT argMin(user, salary), argMin(tuple(user, salary)) FROM salary
 ```

 ``` text
-┌─argMin(user, salary)─┐
-│ worker               │
-└──────────────────────┘
+┌─argMin(user, salary)─┬─argMin(tuple(user, salary))─┐
+│ worker               │ ('worker',1000)             │
+└──────────────────────┴─────────────────────────────┘
 ```
--- a/docs/en/sql-reference/ansi.md
+++ b/docs/en/sql-reference/ansi.md
@ -25,22 +25,22 @@ The following table lists cases when query feature works in ClickHouse, but beha
 |------------|--------------------------------------------------------------------------------------------------------------------------|----------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | **E011**   | **Numeric data types**                                                                                                   | **Partial**{.text-warning} |                                                                                                                                                                                           |
 | E011-01    | INTEGER and SMALLINT data types                                                                                          | Yes {.text-success}         |                                                                                                                                                                                           |
-| E011-02    | REAL, DOUBLE PRECISION and FLOAT data types data types                                                                   | Partial {.text-warning}     | `FLOAT(<binary_precision>)`, `REAL` and `DOUBLE PRECISION` are not supported                                                                                                              |
-| E011-03    | DECIMAL and NUMERIC data types                                                                                           | Partial {.text-warning}     | Only `DECIMAL(p,s)` is supported, not `NUMERIC`                                                                                                                                           |
+| E011-02    | REAL, DOUBLE PRECISION and FLOAT data types data types                                                                   | Yes {.text-success}     |                                                                                                               |
+| E011-03    | DECIMAL and NUMERIC data types                                                                                           | Yes {.text-success}     |                                                                                                                                          |
 | E011-04    | Arithmetic operators                                                                                                     | Yes {.text-success}         |                                                                                                                                                                                           |
 | E011-05    | Numeric comparison                                                                                                       | Yes {.text-success}         |                                                                                                                                                                                           |
 | E011-06    | Implicit casting among the numeric data types                                                                            | No {.text-danger}           | ANSI SQL allows arbitrary implicit cast between numeric types, while ClickHouse relies on functions having multiple overloads instead of implicit cast                                    |
 | **E021**   | **Character string types**                                                                                               | **Partial**{.text-warning} |                                                                                                                                                                                           |
-| E021-01    | CHARACTER data type                                                                                                      | No {.text-danger}           |                                                                                                                                                                                           |
-| E021-02    | CHARACTER VARYING data type                                                                                              | No {.text-danger}           | `String` behaves similarly, but without length limit in parentheses                                                                                                                       |
-| E021-03    | Character literals                                                                                                       | Partial {.text-warning}     | No automatic concatenation of consecutive literals and character set support                                                                                                              |
+| E021-01    | CHARACTER data type                                                                                                      | Yes {.text-success}           |                                                                                                                                                                                           |
+| E021-02    | CHARACTER VARYING data type                                                                                              | Yes {.text-success}           |                                                                                                                       |
+| E021-03    | Character literals                                                                                                       | Yes {.text-success}     |                                                                                                               |
 | E021-04    | CHARACTER_LENGTH function                                                                                               | Partial {.text-warning}     | No `USING` clause                                                                                                                                                                         |
 | E021-05    | OCTET_LENGTH function                                                                                                   | No {.text-danger}           | `LENGTH` behaves similarly                                                                                                                                                                |
 | E021-06    | SUBSTRING                                                                                                                | Partial {.text-warning}     | No support for `SIMILAR` and `ESCAPE` clauses, no `SUBSTRING_REGEX` variant                                                                                                               |
 | E021-07    | Character concatenation                                                                                                  | Partial {.text-warning}     | No `COLLATE` clause                                                                                                                                                                       |
 | E021-08    | UPPER and LOWER functions                                                                                                | Yes {.text-success}         |                                                                                                                                                                                           |
 | E021-09    | TRIM function                                                                                                            | Yes {.text-success}         |                                                                                                                                                                                           |
-| E021-10    | Implicit casting among the fixed-length and variable-length character string types                                       | No {.text-danger}           | ANSI SQL allows arbitrary implicit cast between string types, while ClickHouse relies on functions having multiple overloads instead of implicit cast                                     |
+| E021-10    | Implicit casting among the fixed-length and variable-length character string types                                       | Partial           | ANSI SQL allows arbitrary implicit cast between string types, while ClickHouse relies on functions having multiple overloads instead of implicit cast                                     |
 | E021-11    | POSITION function                                                                                                        | Partial {.text-warning}     | No support for `IN` and `USING` clauses, no `POSITION_REGEX` variant                                                                                                                      |
 | E021-12    | Character comparison                                                                                                     | Yes {.text-success}         |                                                                                                                                                                                           |
 | **E031**   | **Identifiers**                                                                                                          | **Partial**{.text-warning} |                                                                                                                                                                                           |
@ -71,20 +71,20 @@ The following table lists cases when query feature works in ClickHouse, but beha
 | E061-13    | Correlated subqueries                                                                                                    | No {.text-danger}           |                                                                                                                                                                                           |
 | E061-14    | Search condition                                                                                                         | Yes {.text-success}         |                                                                                                                                                                                           |
 | **E071**   | **Basic query expressions**                                                                                              | **Partial**{.text-warning} |                                                                                                                                                                                           |
-| E071-01    | UNION DISTINCT table operator                                                                                            | No {.text-danger}           |                                                                                                                                                                                           |
+| E071-01    | UNION DISTINCT table operator                                                                                            | Yes {.text-success}           |                                                                                                                                                                                           |
 | E071-02    | UNION ALL table operator                                                                                                 | Yes {.text-success}         |                                                                                                                                                                                           |
 | E071-03    | EXCEPT DISTINCT table operator                                                                                           | No {.text-danger}           |                                                                                                                                                                                           |
 | E071-05    | Columns combined via table operators need not have exactly the same data type                                            | Yes {.text-success}         |                                                                                                                                                                                           |
 | E071-06    | Table operators in subqueries                                                                                            | Yes {.text-success}         |                                                                                                                                                                                           |
-| **E081**   | **Basic privileges**                                                                                                     | **Partial**{.text-warning} | Work in progress                                                                                                                                                                          |
-| E081-01    | SELECT privilege at the table level | | |
+| **E081**   | **Basic privileges**                                                                                                     | **Yes**{.text-success} |                        |
+| E081-01    | SELECT privilege at the table level | Yes {.text-success} | |
 | E081-02    | DELETE privilege | | |
-| E081-03    | INSERT privilege at the table level | | |
-| E081-04    | UPDATE privilege at the table level | | |
+| E081-03    | INSERT privilege at the table level | Yes {.text-success} | |
+| E081-04    | UPDATE privilege at the table level | Yes {.text-success} | |
 | E081-05    | UPDATE privilege at the column level | | |
 | E081-06    | REFERENCES privilege at the table level | | |
 | E081-07    | REFERENCES privilege at the column level | | |
-| E081-08    | WITH GRANT OPTION | | |
+| E081-08    | WITH GRANT OPTION | Yes {.text-success} | |
 | E081-09    | USAGE privilege | | |
 | E081-10    | EXECUTE privilege | | |
 | **E091**   | **Set functions**                                                                                                        | **Yes**{.text-success}     |                                                                                                                                                                                           |
@ -93,28 +93,28 @@ The following table lists cases when query feature works in ClickHouse, but beha
 | E091-03    | MAX                                                                                                                      | Yes {.text-success}         |                                                                                                                                                                                           |
 | E091-04    | MIN                                                                                                                      | Yes {.text-success}         |                                                                                                                                                                                           |
 | E091-05    | SUM                                                                                                                      | Yes {.text-success}         |                                                                                                                                                                                           |
-| E091-06    | ALL quantifier                                                                                                           | No {.text-danger}           |                                                                                                                                                                                           |
-| E091-07    | DISTINCT quantifier                                                                                                      | Partial {.text-warning}     | Not all aggregate functions supported                                                                                                                                                     |
+| E091-06    | ALL quantifier                                                                                                           | Yes {.text-success}           |                                                                                                                                                                                           |
+| E091-07    | DISTINCT quantifier                                                                                                      | Yes {.text-success}     | Not all aggregate functions supported                                                                                                                                                     |
 | **E101**   | **Basic data manipulation**                                                                                              | **Partial**{.text-warning} |                                                                                                                                                                                           |
 | E101-01    | INSERT statement                                                                                                         | Yes {.text-success}         | Note: primary key in ClickHouse does not imply the `UNIQUE` constraint                                                                                                                    |
-| E101-03    | Searched UPDATE statement                                                                                                | No {.text-danger}           | There’s an `ALTER UPDATE` statement for batch data modification                                                                                                                           |
-| E101-04    | Searched DELETE statement                                                                                                | No {.text-danger}           | There’s an `ALTER DELETE` statement for batch data removal                                                                                                                                |
+| E101-03    | Searched UPDATE statement                                                                                                | Partial           | There’s an `ALTER UPDATE` statement for batch data modification                                                                                                                           |
+| E101-04    | Searched DELETE statement                                                                                                | Partial           | There’s an `ALTER DELETE` statement for batch data removal                                                                                                                                |
 | **E111**   | **Single row SELECT statement**                                                                                          | **No**{.text-danger}       |                                                                                                                                                                                           |
 | **E121**   | **Basic cursor support**                                                                                                 | **No**{.text-danger}       |                                                                                                                                                                                           |
 | E121-01    | DECLARE CURSOR                                                                                                           | No {.text-danger}           |                                                                                                                                                                                           |
-| E121-02    | ORDER BY columns need not be in select list                                                                              | No {.text-danger}           |                                                                                                                                                                                           |
-| E121-03    | Value expressions in ORDER BY clause                                                                                     | No {.text-danger}           |                                                                                                                                                                                           |
+| E121-02    | ORDER BY columns need not be in select list                                                                              | Yes {.text-success}           |                                                                                                                                                                                           |
+| E121-03    | Value expressions in ORDER BY clause                                                                                     | Yes {.text-success}           |                                                                                                                                                                                           |
 | E121-04    | OPEN statement                                                                                                           | No {.text-danger}           |                                                                                                                                                                                           |
 | E121-06    | Positioned UPDATE statement                                                                                              | No {.text-danger}           |                                                                                                                                                                                           |
 | E121-07    | Positioned DELETE statement                                                                                              | No {.text-danger}           |                                                                                                                                                                                           |
 | E121-08    | CLOSE statement                                                                                                          | No {.text-danger}           |                                                                                                                                                                                           |
 | E121-10    | FETCH statement: implicit NEXT                                                                                           | No {.text-danger}           |                                                                                                                                                                                           |
 | E121-17    | WITH HOLD cursors                                                                                                        | No {.text-danger}           |                                                                                                                                                                                           |
-| **E131**   | **Null value support (nulls in lieu of values)**                                                                         | **Partial**{.text-warning} | Some restrictions apply                                                                                                                                                                   |
+| **E131**   | **Null value support (nulls in lieu of values)**                                                                         | **Yes**{.text-success} | Some restrictions apply                                                                                                                                                                   |
 | **E141**   | **Basic integrity constraints**                                                                                          | **Partial**{.text-warning} |                                                                                                                                                                                           |
 | E141-01    | NOT NULL constraints                                                                                                     | Yes {.text-success}         | Note: `NOT NULL` is implied for table columns by default                                                                                                                                  |
 | E141-02    | UNIQUE constraint of NOT NULL columns                                                                                    | No {.text-danger}           |                                                                                                                                                                                           |
-| E141-03    | PRIMARY KEY constraints                                                                                                  | No {.text-danger}           |                                                                                                                                                                                           |
+| E141-03    | PRIMARY KEY constraints                                                                                                  | Partial           |                                                                                                                                                                                           |
 | E141-04    | Basic FOREIGN KEY constraint with the NO ACTION default for both referential delete action and referential update action | No {.text-danger}           |                                                                                                                                                                                           |
 | E141-06    | CHECK constraint                                                                                                         | Yes {.text-success}         |                                                                                                                                                                                           |
 | E141-07    | Column defaults                                                                                                          | Yes {.text-success}         |                                                                                                                                                                                           |
@ -126,7 +126,7 @@ The following table lists cases when query feature works in ClickHouse, but beha
 | **E152**   | **Basic SET TRANSACTION statement**                                                                                      | **No**{.text-danger}       |                                                                                                                                                                                           |
 | E152-01    | SET TRANSACTION statement: ISOLATION LEVEL SERIALIZABLE clause                                                           | No {.text-danger}           |                                                                                                                                                                                           |
 | E152-02    | SET TRANSACTION statement: READ ONLY and READ WRITE clauses                                                              | No {.text-danger}           |                                                                                                                                                                                           |
-| **E153**   | **Updatable queries with subqueries**                                                                                    | **No**{.text-danger}       |                                                                                                                                                                                           |
+| **E153**   | **Updatable queries with subqueries**                                                                                    | **Yes**{.text-success}       |                                                                                                                                                                                           |
 | **E161**   | **SQL comments using leading double minus**                                                                              | **Yes**{.text-success}     |                                                                                                                                                                                           |
 | **E171**   | **SQLSTATE support**                                                                                                     | **No**{.text-danger}       |                                                                                                                                                                                           |
 | **E182**   | **Host language binding**                                                                                                | **No**{.text-danger}       |                                                                                                                                                                                           |
@ -134,7 +134,7 @@ The following table lists cases when query feature works in ClickHouse, but beha
 | F031-01    | CREATE TABLE statement to create persistent base tables                                                                  | Partial {.text-warning}     | No `SYSTEM VERSIONING`, `ON COMMIT`, `GLOBAL`, `LOCAL`, `PRESERVE`, `DELETE`, `REF IS`, `WITH OPTIONS`, `UNDER`, `LIKE`, `PERIOD FOR` clauses and no support for user resolved data types |
 | F031-02    | CREATE VIEW statement                                                                                                    | Partial {.text-warning}     | No `RECURSIVE`, `CHECK`, `UNDER`, `WITH OPTIONS` clauses and no support for user resolved data types                                                                                      |
 | F031-03    | GRANT statement                                                                                                          | Yes {.text-success}         |                                                                                                                                                                                           |
-| F031-04    | ALTER TABLE statement: ADD COLUMN clause                                                                                 | Partial {.text-warning}     | No support for `GENERATED` clause and system time period                                                                                                                                  |
+| F031-04    | ALTER TABLE statement: ADD COLUMN clause                                                                                 | Yes {.text-success}     | No support for `GENERATED` clause and system time period                                                                                                                                  |
 | F031-13    | DROP TABLE statement: RESTRICT clause                                                                                    | No {.text-danger}           |                                                                                                                                                                                           |
 | F031-16    | DROP VIEW statement: RESTRICT clause                                                                                     | No {.text-danger}           |                                                                                                                                                                                           |
 | F031-19    | REVOKE statement: RESTRICT clause                                                                                        | No {.text-danger}           |                                                                                                                                                                                           |
@ -147,11 +147,11 @@ The following table lists cases when query feature works in ClickHouse, but beha
 | F041-07    | The inner table in a left or right outer join can also be used in an inner join                                          | Yes {.text-success}         |                                                                                                                                                                                           |
 | F041-08    | All comparison operators are supported (rather than just =)                                                              | No {.text-danger}           |                                                                                                                                                                                           |
 | **F051**   | **Basic date and time**                                                                                                  | **Partial**{.text-warning} |                                                                                                                                                                                           |
-| F051-01    | DATE data type (including support of DATE literal)                                                                       | Partial {.text-warning}     | No literal                                                                                                                                                                                |
+| F051-01    | DATE data type (including support of DATE literal)                                                                       | Yes {.text-success}     |                       |
 | F051-02    | TIME data type (including support of TIME literal) with fractional seconds precision of at least 0                       | No {.text-danger}           |                                                                                                                                                                                           |
-| F051-03    | TIMESTAMP data type (including support of TIMESTAMP literal) with fractional seconds precision of at least 0 and 6       | No {.text-danger}           | `DateTime64` time provides similar functionality                                                                                                                                          |
-| F051-04    | Comparison predicate on DATE, TIME, and TIMESTAMP data types                                                             | Partial {.text-warning}     | Only one data type available                                                                                                                                                              |
-| F051-05    | Explicit CAST between datetime types and character string types                                                          | Yes {.text-success}         |                                                                                                                                                                                           |
+| F051-03    | TIMESTAMP data type (including support of TIMESTAMP literal) with fractional seconds precision of at least 0 and 6 | Yes {.text-success} | |
+| F051-04    | Comparison predicate on DATE, TIME, and TIMESTAMP data types | Yes {.text-success} | |
+| F051-05    | Explicit CAST between datetime types and character string types | Yes {.text-success} | |
 | F051-06    | CURRENT_DATE                                                                                                            | No {.text-danger}           | `today()` is similar                                                                                                                                                                      |
 | F051-07    | LOCALTIME                                                                                                                | No {.text-danger}           | `now()` is similar                                                                                                                                                                        |
 | F051-08    | LOCALTIMESTAMP                                                                                                           | No {.text-danger}           |                                                                                                                                                                                           |
@ -171,7 +171,7 @@ The following table lists cases when query feature works in ClickHouse, but beha
 | F261-03    | NULLIF                                                                                                                   | Yes {.text-success}         |                                                                                                                                                                                           |
 | F261-04    | COALESCE                                                                                                                 | Yes {.text-success}         |                                                                                                                                                                                           |
 | **F311**   | **Schema definition statement**                                                                                          | **Partial**{.text-warning} |                                                                                                                                                                                           |
-| F311-01    | CREATE SCHEMA                                                                                                            | No {.text-danger}           |                                                                                                                                                                                           |
+| F311-01    | CREATE SCHEMA                                                                                                            | Partial {.text-danger}           | See CREATE DATABASE |
 | F311-02    | CREATE TABLE for persistent base tables                                                                                  | Yes {.text-success}         |                                                                                                                                                                                           |
 | F311-03    | CREATE VIEW                                                                                                              | Yes {.text-success}         |                                                                                                                                                                                           |
 | F311-04    | CREATE VIEW: WITH CHECK OPTION                                                                                           | No {.text-danger}           |                                                                                                                                                                                           |
--- a/docs/en/sql-reference/data-types/float.md
+++ b/docs/en/sql-reference/data-types/float.md
@ -9,11 +9,18 @@ toc_title: Float32, Float64

 Types are equivalent to types of C:

-   `Float32` - `float`
-   `Float64` - `double`
+-   `Float32` — `float`.
+-   `Float64` — `double`.

 We recommend that you store data in integer form whenever possible. For example, convert fixed precision numbers to integer values, such as monetary amounts or page load times in milliseconds.

+Aliases:
+
+-   `Float32` — `FLOAT`.
+-   `Float64` — `DOUBLE`.
+
+When creating tables, numeric parameters for floating point numbers can be set (e.g. `FLOAT(12)`, `FLOAT(15, 22)`, `DOUBLE(12)`, `DOUBLE(4, 18)`), but ClickHouse ignores them.
+
 ## Using Floating-point Numbers {#using-floating-point-numbers}

 -   Computations with floating-point numbers might produce a rounding error.
@ -52,7 +59,7 @@ SELECT 0.5 / 0
 └────────────────┘
 ```

-   `-Inf` – Negative infinity.
+-   `-Inf` — Negative infinity.

 <!-- -->

@ -66,7 +73,7 @@ SELECT -0.5 / 0
 └─────────────────┘
 ```

-   `NaN` – Not a number.
+-   `NaN` — Not a number.

 <!-- -->

@ -80,6 +87,6 @@ SELECT 0 / 0
 └──────────────┘
 ```

-    See the rules for `NaN` sorting in the section [ORDER BY clause](../sql_reference/statements/select/order-by.md).
+See the rules for `NaN` sorting in the section [ORDER BY clause](../../sql-reference/statements/select/order-by.md).

 [Original article](https://clickhouse.tech/docs/en/data_types/float/) <!--hide-->
--- a/docs/en/sql-reference/data-types/int-uint.md
+++ b/docs/en/sql-reference/data-types/int-uint.md
@ -7,23 +7,32 @@ toc_title: UInt8, UInt16, UInt32, UInt64, UInt256, Int8, Int16, Int32, Int64, In

 Fixed-length integers, with or without a sign.

+When creating tables, numeric parameters for integer numbers can be set (e.g. `TINYINT(8)`, `SMALLINT(16)`, `INT(32)`, `BIGINT(64)`), but ClickHouse ignores them. 
+
 ## Int Ranges {#int-ranges}

-   Int8 - \[-128 : 127\]
-   Int16 - \[-32768 : 32767\]
-   Int32 - \[-2147483648 : 2147483647\]
-   Int64 - \[-9223372036854775808 : 9223372036854775807\]
-   Int128 - \[-170141183460469231731687303715884105728 : 170141183460469231731687303715884105727\]
-   Int256 - \[-57896044618658097711785492504343953926634992332820282019728792003956564819968 : 57896044618658097711785492504343953926634992332820282019728792003956564819967\]
+-   `Int8` — \[-128 : 127\]
+-   `Int16` — \[-32768 : 32767\]
+-   `Int32` — \[-2147483648 : 2147483647\]
+-   `Int64` — \[-9223372036854775808 : 9223372036854775807\]
+-   `Int128` — \[-170141183460469231731687303715884105728 : 170141183460469231731687303715884105727\]
+-   `Int256` — \[-57896044618658097711785492504343953926634992332820282019728792003956564819968 : 57896044618658097711785492504343953926634992332820282019728792003956564819967\]
+
+Aliases:
+
+-   `Int8` — `TINYINT`, `BOOL`, `BOOLEAN`, `INT1`.
+-   `Int16` — `SMALLINT`, `INT2`.
+-   `Int32` — `INT`, `INT4`, `INTEGER`.
+-   `Int64` — `BIGINT`.

 ## Uint Ranges {#uint-ranges}

-   UInt8 - \[0 : 255\]
-   UInt16 - \[0 : 65535\]
-   UInt32 - \[0 : 4294967295\]
-   UInt64 - \[0 : 18446744073709551615\]
-   UInt256 - \[0 : 115792089237316195423570985008687907853269984665640564039457584007913129639935\]
+-   `UInt8` — \[0 : 255\]
+-   `UInt16` — \[0 : 65535\]
+-   `UInt32` — \[0 : 4294967295\]
+-   `UInt64` — \[0 : 18446744073709551615\]
+-   `UInt256` — \[0 : 115792089237316195423570985008687907853269984665640564039457584007913129639935\]

-UInt128 is not supported yet.
+`UInt128` is not supported yet.

 [Original article](https://clickhouse.tech/docs/en/data_types/int_uint/) <!--hide-->
--- a/docs/en/sql-reference/data-types/multiword-types.md
+++ b/docs/en/sql-reference/data-types/multiword-types.md
@ -0,0 +1,29 @@
+---
+toc_priority: 61
+toc_title: Multiword Type Names
+---
+
+# Multiword Types {#multiword-types}
+
+When creating tables, you can use data types with a name consisting of several words. This is implemented for better SQL compatibility.
+
+## Multiword Types Support {#multiword-types-support}
+
+| Multiword types                  | Simple types                                                 |
+|----------------------------------|--------------------------------------------------------------|
+| DOUBLE PRECISION                 | [Float64](../../sql-reference/data-types/float.md)           |
+| CHAR LARGE OBJECT                | [String](../../sql-reference/data-types/string.md)           |
+| CHAR VARYING                     | [String](../../sql-reference/data-types/string.md)           |
+| CHARACTER LARGE OBJECT           | [String](../../sql-reference/data-types/string.md)           |
+| CHARACTER VARYING                | [String](../../sql-reference/data-types/string.md)           |
+| NCHAR LARGE OBJECT               | [String](../../sql-reference/data-types/string.md)           |
+| NCHAR VARYING                    | [String](../../sql-reference/data-types/string.md)           |
+| NATIONAL CHARACTER LARGE OBJECT  | [String](../../sql-reference/data-types/string.md)           |
+| NATIONAL CHARACTER VARYING       | [String](../../sql-reference/data-types/string.md)           |
+| NATIONAL CHAR VARYING            | [String](../../sql-reference/data-types/string.md)           |
+| NATIONAL CHARACTER               | [String](../../sql-reference/data-types/string.md)           |
+| NATIONAL CHAR                    | [String](../../sql-reference/data-types/string.md)           |
+| BINARY LARGE OBJECT              | [String](../../sql-reference/data-types/string.md)           |
+| BINARY VARYING                   | [String](../../sql-reference/data-types/string.md)           |
+
+[Original article](https://clickhouse.tech/docs/en/sql-reference/data-types/multiword-types/) <!--hide-->
--- a/docs/en/sql-reference/data-types/simpleaggregatefunction.md
+++ b/docs/en/sql-reference/data-types/simpleaggregatefunction.md
@ -18,6 +18,8 @@ The following aggregate functions are supported:
 -   [`sumMap`](../../sql-reference/aggregate-functions/reference/summap.md#agg_functions-summap)
 -   [`minMap`](../../sql-reference/aggregate-functions/reference/minmap.md#agg_functions-minmap)
 -   [`maxMap`](../../sql-reference/aggregate-functions/reference/maxmap.md#agg_functions-maxmap)
+-   [`argMin`](../../sql-reference/aggregate-functions/reference/argmin.md)
+-   [`argMax`](../../sql-reference/aggregate-functions/reference/argmax.md)

 Values of the `SimpleAggregateFunction(func, Type)` look and stored the same way as `Type`, so you do not need to apply functions with `-Merge`/`-State` suffixes. `SimpleAggregateFunction` has better performance than `AggregateFunction` with same aggregation function.

--- a/docs/en/sql-reference/data-types/string.md
+++ b/docs/en/sql-reference/data-types/string.md
@ -8,6 +8,8 @@ toc_title: String
 Strings of an arbitrary length. The length is not limited. The value can contain an arbitrary set of bytes, including null bytes.
 The String type replaces the types VARCHAR, BLOB, CLOB, and others from other DBMSs.

+When creating tables, numeric parameters for string fields can be set (e.g. `VARCHAR(255)`), but ClickHouse ignores them. 
+
 ## Encodings {#encodings}

 ClickHouse doesn’t have the concept of encodings. Strings can contain an arbitrary set of bytes, which are stored and output as-is.
--- a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md
+++ b/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md
@ -55,10 +55,10 @@ In this case, ClickHouse can reload the dictionary earlier if the dictionary con
 When upgrading the dictionaries, the ClickHouse server applies different logic depending on the type of [source](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md):

 -   For a text file, it checks the time of modification. If the time differs from the previously recorded time, the dictionary is updated.
-   For MyISAM tables, the time of modification is checked using a `SHOW TABLE STATUS` query.
+-   For MySQL source, the time of modification is checked using a `SHOW TABLE STATUS` query (in case of MySQL 8 you need to disable meta-information caching in MySQL by `set global information_schema_stats_expiry=0`. 
 -   Dictionaries from other sources are updated every time by default.

-For MySQL (InnoDB), ODBC and ClickHouse sources, you can set up a query that will update the dictionaries only if they really changed, rather than each time. To do this, follow these steps:
+For other sources (ODBC, ClickHouse, etc), you can set up a query that will update the dictionaries only if they really changed, rather than each time. To do this, follow these steps:

 -   The dictionary table must have a field that always changes when the source data is updated.
 -   The settings of the source must specify a query that retrieves the changing field. The ClickHouse server interprets the query result as a row, and if this row has changed relative to its previous state, the dictionary is updated. Specify the query in the `<invalidate_query>` field in the settings for the [source](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md).
--- a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
+++ b/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
@ -93,7 +93,7 @@ Setting fields:
 -   `path` – The absolute path to the file.
 -   `format` – The file format. All the formats described in “[Formats](../../../interfaces/formats.md#formats)” are supported.

-When dictionary with FILE source is created via DDL command (`CREATE DICTIONARY ...`), source of the dictionary have to be located in `user_files` directory, to prevent DB users accessing arbitrary file on clickhouse node.
+When dictionary with source `FILE` is created via DDL command (`CREATE DICTIONARY ...`), the source file needs to be located in `user_files` directory, to prevent DB users accessing arbitrary file on ClickHouse node.

 ## Executable File {#dicts-external_dicts_dict_sources-executable}

@ -115,7 +115,7 @@ Setting fields:
 -   `command` – The absolute path to the executable file, or the file name (if the program directory is written to `PATH`).
 -   `format` – The file format. All the formats described in “[Formats](../../../interfaces/formats.md#formats)” are supported.

-That dictionary source can be configured only via XML configuration. Creating dictionaries with executable source via DDL is disabled, otherwise, the DB user would be able to execute arbitrary binary on clickhouse node.
+That dictionary source can be configured only via XML configuration. Creating dictionaries with executable source via DDL is disabled, otherwise, the DB user would be able to execute arbitrary binary on ClickHouse node.

 ## Http(s) {#dicts-external_dicts_dict_sources-http}

@ -160,14 +160,14 @@ Setting fields:
 -   `url` – The source URL.
 -   `format` – The file format. All the formats described in “[Formats](../../../interfaces/formats.md#formats)” are supported.
 -   `credentials` – Basic HTTP authentication. Optional parameter.
-    -   `user` – Username required for the authentication.
-    -   `password` – Password required for the authentication.
+-   `user` – Username required for the authentication.
+-   `password` – Password required for the authentication.
 -   `headers` – All custom HTTP headers entries used for the HTTP request. Optional parameter.
-    -   `header` – Single HTTP header entry.
-    -   `name` – Identifiant name used for the header send on the request.
-    -   `value` – Value set for a specific identifiant name.
+-   `header` – Single HTTP header entry.
+-   `name` – Identifiant name used for the header send on the request.
+-   `value` – Value set for a specific identifiant name.

-When creating a dictionary using the DDL command (`CREATE DICTIONARY ...`) remote hosts for HTTP dictionaries checked with the `remote_url_allow_hosts` section from config to prevent database users to access arbitrary HTTP server. 
+When creating a dictionary using the DDL command (`CREATE DICTIONARY ...`) remote hosts for HTTP dictionaries are checked against the contents of `remote_url_allow_hosts` section from config to prevent database users to access arbitrary HTTP server.

 ## ODBC {#dicts-external_dicts_dict_sources-odbc}

--- a/docs/en/sql-reference/functions/date-time-functions.md
+++ b/docs/en/sql-reference/functions/date-time-functions.md
@ -622,7 +622,7 @@ Using replacement fields, you can define a pattern for the resulting string. “
 | %C       | year divided by 100 and truncated to integer (00-99)    | 20         |
 | %d       | day of the month, zero-padded (01-31)                   | 02         |
 | %D       | Short MM/DD/YY date, equivalent to %m/%d/%y             | 01/02/18   |
-| %e       | day of the month, space-padded ( 1-31)                  | 2          |
+| %e       | day of the month, space-padded ( 1-31)                  |  2         |
 | %F       | short YYYY-MM-DD date, equivalent to %Y-%m-%d           | 2018-01-02 |
 | %G       | four-digit year format for ISO week number, calculated from the week-based year [defined by the ISO 8601](https://en.wikipedia.org/wiki/ISO_8601#Week_dates) standard, normally useful only with %V  | 2018         |
 | %g       | two-digit year format, aligned to ISO 8601, abbreviated from four-digit notation                                | 18       |
@ -633,6 +633,7 @@ Using replacement fields, you can define a pattern for the resulting string. “
 | %M       | minute (00-59)                                          | 33         |
 | %n       | new-line character (‘’)                                 |            |
 | %p       | AM or PM designation                                    | PM         |
+| %Q       | Quarter (1-4)                                           | 1          |
 | %R       | 24-hour HH:MM time, equivalent to %H:%M                 | 22:33      |
 | %S       | second (00-59)                                          | 44         |
 | %t       | horizontal-tab character (’)                            |            |
--- a/docs/en/sql-reference/functions/ip-address-functions.md
+++ b/docs/en/sql-reference/functions/ip-address-functions.md
@ -243,4 +243,33 @@ SELECT
 └───────────────────────────────────┴──────────────────────────────────┘
 ```

+
+## isIPv4String
+
+Determines if the input string is an IPv4 address or not. Returns `1` if true `0` otherwise.
+
+``` sql
+SELECT isIPv4String('127.0.0.1')
+```
+
+``` text
+┌─isIPv4String('127.0.0.1')─┐
+│                         1 │
+└───────────────────────────┘
+```
+
+## isIPv6String
+
+Determines if the input string is an IPv6 address or not. Returns `1` if true `0` otherwise.
+
+``` sql
+SELECT isIPv6String('2001:438:ffff::407d:1bc1')
+```
+
+``` text
+┌─isIPv6String('2001:438:ffff::407d:1bc1')─┐
+│                                        1 │
+└──────────────────────────────────────────┘
+```
+
 [Original article](https://clickhouse.tech/docs/en/query_language/functions/ip_address_functions/) <!--hide-->
--- a/docs/en/sql-reference/functions/math-functions.md
+++ b/docs/en/sql-reference/functions/math-functions.md
@ -413,4 +413,68 @@ Result:

 -   [log(x)](../../sql-reference/functions/math-functions.md#logx-lnx)

+## sign(x) {#signx}
+
+The `sign` function can extract the sign of a real number.
+
+**Syntax**
+
+``` sql
+sign(x)
+```
+
+**Parameters**
+
+-   `x` — Values from  `-∞` to `+∞`. Support all numeric types in ClickHouse.
+
+**Returned value**
+
+- -1 for `x < 0`
+-  0 for `x = 0`
+-  1 for `x > 0`
+
+**Example**
+
+Query:
+
+``` sql
+SELECT sign(0);
+```
+
+Result:
+
+``` text
+┌─sign(0)─┐
+│       0 │
+└─────────┘
+```
+
+Query:
+
+``` sql
+SELECT sign(1);
+```
+
+Result:
+
+``` text
+┌─sign(1)─┐
+│       1 │
+└─────────┘
+```
+
+Query:
+
+``` sql
+SELECT sign(-1);
+```
+
+Result:
+
+``` text
+┌─sign(-1)─┐
+│       -1 │
+└──────────┘
+```
+
 [Original article](https://clickhouse.tech/docs/en/query_language/functions/math_functions/) <!--hide-->
--- a/docs/en/sql-reference/functions/other-functions.md
+++ b/docs/en/sql-reference/functions/other-functions.md
@ -1468,7 +1468,7 @@ Code: 395. DB::Exception: Received from localhost:9000. DB::Exception: Too many.

 ## identity {#identity}

-Returns the same value that was used as its argument. Used for debugging and testing, allows to cancel using index, and get the query performance of a full scan. When query is analyzed for possible use of index, the analyzer doesn’t look inside `identity` functions.
+Returns the same value that was used as its argument. Used for debugging and testing, allows to cancel using index, and get the query performance of a full scan. When query is analyzed for possible use of index, the analyzer doesn’t look inside `identity` functions. Also constant folding is not applied too.

 **Syntax**

--- a/docs/en/sql-reference/functions/string-functions.md
+++ b/docs/en/sql-reference/functions/string-functions.md
@ -574,7 +574,7 @@ encodeXMLComponent(x)

 -   `x` — The sequence of characters. [String](../../sql-reference/data-types/string.md).

-**Returned value(s)**
+**Returned value**

 -   The sequence of characters with escape characters.

--- a/docs/en/sql-reference/functions/string-search-functions.md
+++ b/docs/en/sql-reference/functions/string-search-functions.md
@ -538,11 +538,11 @@ For case-insensitive search or/and in UTF-8 format use functions `ngramSearchCas
 !!! note "Note"
    For UTF-8 case we use 3-gram distance. All these are not perfectly fair n-gram distances. We use 2-byte hashes to hash n-grams and then calculate the (non-)symmetric difference between these hash tables – collisions may occur. With UTF-8 case-insensitive format we do not use fair `tolower` function – we zero the 5-th bit (starting from zero) of each codepoint byte and first bit of zeroth byte if bytes more than one – this works for Latin and mostly for all Cyrillic letters.

-## countSubstrings(haystack, needle) {#countSubstrings}
+## countSubstrings {#countSubstrings}

-Count the number of substring occurrences
+Returns the number of substring occurrences.

-For a case-insensitive search, use the function `countSubstringsCaseInsensitive` (or `countSubstringsCaseInsensitiveUTF8`).
+For a case-insensitive search, use [countSubstringsCaseInsensitive](../../sql-reference/functions/string-search-functions.md#countSubstringsCaseInsensitive) or [countSubstringsCaseInsensitiveUTF8](../../sql-reference/functions/string-search-functions.md#countSubstringsCaseInsensitiveUTF8) functions.

 **Syntax**

@ -554,20 +554,20 @@ countSubstrings(haystack, needle[, start_pos])

 -   `haystack` — The string to search in. [String](../../sql-reference/syntax.md#syntax-string-literal).
 -   `needle` — The substring to search for. [String](../../sql-reference/syntax.md#syntax-string-literal).
-   `start_pos` – Optional parameter, position of the first character in the string to start search. [UInt](../../sql-reference/data-types/int-uint.md)
+-   `start_pos` – Position of the first character in the string to start search. Optional. [UInt](../../sql-reference/data-types/int-uint.md).

 **Returned values**

 -   Number of occurrences.

-Type: `Integer`.
+Type: [UInt64](../../sql-reference/data-types/int-uint.md).

 **Examples**

 Query:

 ``` sql
-SELECT countSubstrings('foobar.com', '.')
+SELECT countSubstrings('foobar.com', '.');
 ```

 Result:
@ -581,7 +581,7 @@ Result:
 Query:

 ``` sql
-SELECT countSubstrings('aaaa', 'aa')
+SELECT countSubstrings('aaaa', 'aa');
 ```

 Result:
@ -592,6 +592,138 @@ Result:
 └───────────────────────────────┘
 ```

+Query:
+
+```sql
+SELECT countSubstrings('abc___abc', 'abc', 4);
+```
+
+Result:
+
+``` text
+┌─countSubstrings('abc___abc', 'abc', 4)─┐
+│                                      1 │
+└────────────────────────────────────────┘
+```
+
+## countSubstringsCaseInsensitive {#countSubstringsCaseInsensitive}
+
+Returns the number of substring occurrences case-insensitive.
+
+**Syntax**
+
+``` sql
+countSubstringsCaseInsensitive(haystack, needle[, start_pos])
+```
+
+**Parameters**
+
+-   `haystack` — The string to search in. [String](../../sql-reference/syntax.md#syntax-string-literal).
+-   `needle` — The substring to search for. [String](../../sql-reference/syntax.md#syntax-string-literal).
+-   `start_pos` – Position of the first character in the string to start search. Optional. [UInt](../../sql-reference/data-types/int-uint.md).
+
+**Returned values**
+
+-   Number of occurrences.
+
+Type: [UInt64](../../sql-reference/data-types/int-uint.md).
+
+**Examples**
+
+Query:
+
+``` sql
+select countSubstringsCaseInsensitive('aba', 'B');
+```
+
+Result:
+
+``` text
+┌─countSubstringsCaseInsensitive('aba', 'B')─┐
+│                                          1 │
+└────────────────────────────────────────────┘
+```
+
+Query:
+
+``` sql
+SELECT countSubstringsCaseInsensitive('foobar.com', 'CoM');
+```
+
+Result:
+
+``` text
+┌─countSubstringsCaseInsensitive('foobar.com', 'CoM')─┐
+│                                                   1 │
+└─────────────────────────────────────────────────────┘
+```
+
+Query:
+
+``` sql
+SELECT countSubstringsCaseInsensitive('abC___abC', 'aBc', 2);
+```
+
+Result:
+
+``` text
+┌─countSubstringsCaseInsensitive('abC___abC', 'aBc', 2)─┐
+│                                                     1 │
+└───────────────────────────────────────────────────────┘
+```
+
+## countSubstringsCaseInsensitiveUTF8 {#countSubstringsCaseInsensitiveUTF8}
+
+Returns the number of substring occurrences in `UTF-8` case-insensitive.
+
+**Syntax**
+
+``` sql
+SELECT countSubstringsCaseInsensitiveUTF8(haystack, needle[, start_pos])
+```
+
+**Parameters**
+
+-   `haystack` — The string to search in. [String](../../sql-reference/syntax.md#syntax-string-literal).
+-   `needle` — The substring to search for. [String](../../sql-reference/syntax.md#syntax-string-literal).
+-   `start_pos` – Position of the first character in the string to start search. Optional. [UInt](../../sql-reference/data-types/int-uint.md).
+
+**Returned values**
+
+-   Number of occurrences.
+
+Type: [UInt64](../../sql-reference/data-types/int-uint.md).
+
+**Examples** 
+
+Query:
+
+``` sql
+SELECT countSubstringsCaseInsensitiveUTF8('абв', 'A');
+```
+
+Result:
+
+``` text
+┌─countSubstringsCaseInsensitiveUTF8('абв', 'A')─┐
+│                                              1 │
+└────────────────────────────────────────────────┘
+```
+
+Query:
+
+```sql
+SELECT countSubstringsCaseInsensitiveUTF8('аБв__АбВ__абв', 'Абв');
+```
+
+Result:
+
+``` text
+┌─countSubstringsCaseInsensitiveUTF8('аБв__АбВ__абв', 'Абв')─┐
+│                                                          3 │
+└────────────────────────────────────────────────────────────┘
+```
+
 ## countMatches(haystack, pattern) {#countmatcheshaystack-pattern}

 Returns the number of regular expression matches for a `pattern` in a `haystack`.
--- a/docs/en/sql-reference/statements/alter/partition.md
+++ b/docs/en/sql-reference/statements/alter/partition.md
@ -286,7 +286,7 @@ ALTER TABLE mt DELETE IN PARTITION 2 WHERE p = 2;
 You can specify the partition expression in `ALTER ... PARTITION` queries in different ways:

 -   As a value from the `partition` column of the `system.parts` table. For example, `ALTER TABLE visits DETACH PARTITION 201901`.
-   As the expression from the table column. Constants and constant expressions are supported. For example, `ALTER TABLE visits DETACH PARTITION toYYYYMM(toDate('2019-01-25'))`.
+-   As a tuple of expressions or constants that matches (in types) the table partitioning keys tuple. In the case of a single element partitioning key, the expression should be wrapped in the `tuple (...)` function. For example, `ALTER TABLE visits DETACH PARTITION tuple(toYYYYMM(toDate('2019-01-25')))`.
 -   Using the partition ID. Partition ID is a string identifier of the partition (human-readable, if possible) that is used as the names of partitions in the file system and in ZooKeeper. The partition ID must be specified in the `PARTITION ID` clause, in a single quotes. For example, `ALTER TABLE visits DETACH PARTITION ID '201901'`.
 -   In the [ALTER ATTACH PART](#alter_attach-partition) and [DROP DETACHED PART](#alter_drop-detached) query, to specify the name of a part, use string literal with a value from the `name` column of the [system.detached_parts](../../../operations/system-tables/detached_parts.md#system_tables-detached_parts) table. For example, `ALTER TABLE visits ATTACH PART '201901_1_1_0'`.

--- a/docs/en/sql-reference/statements/alter/role.md
+++ b/docs/en/sql-reference/statements/alter/role.md
@ -10,7 +10,7 @@ Changes roles.
 Syntax:

 ``` sql
-ALTER ROLE [IF EXISTS] name [ON CLUSTER cluster_name]
-    [RENAME TO new_name]
+ALTER ROLE [IF EXISTS] name1 [ON CLUSTER cluster_name1] [RENAME TO new_name1] 
+        [, name2 [ON CLUSTER cluster_name2] [RENAME TO new_name2] ...]
    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
 ```
--- a/docs/en/sql-reference/statements/alter/row-policy.md
+++ b/docs/en/sql-reference/statements/alter/row-policy.md
@ -10,8 +10,8 @@ Changes row policy.
 Syntax:

 ``` sql
-ALTER [ROW] POLICY [IF EXISTS] name [ON CLUSTER cluster_name] ON [database.]table
-    [RENAME TO new_name]
+ALTER [ROW] POLICY [IF EXISTS] name1 [ON CLUSTER cluster_name1] ON [database1.]table1 [RENAME TO new_name1] 
+        [, name2 [ON CLUSTER cluster_name2] ON [database2.]table2 [RENAME TO new_name2] ...]
    [AS {PERMISSIVE | RESTRICTIVE}]
    [FOR SELECT]
    [USING {condition | NONE}][,...]
--- a/docs/en/sql-reference/statements/alter/settings-profile.md
+++ b/docs/en/sql-reference/statements/alter/settings-profile.md
@ -10,7 +10,7 @@ Changes settings profiles.
 Syntax:

 ``` sql
-ALTER SETTINGS PROFILE [IF EXISTS] TO name [ON CLUSTER cluster_name]
-    [RENAME TO new_name]
+ALTER SETTINGS PROFILE [IF EXISTS] TO name1 [ON CLUSTER cluster_name1] [RENAME TO new_name1]
+        [, name2 [ON CLUSTER cluster_name2] [RENAME TO new_name2] ...]
    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | INHERIT 'profile_name'] [,...]
 ```
--- a/docs/en/sql-reference/statements/alter/user.md
+++ b/docs/en/sql-reference/statements/alter/user.md
@ -10,8 +10,8 @@ Changes ClickHouse user accounts.
 Syntax:

 ``` sql
-ALTER USER [IF EXISTS] name [ON CLUSTER cluster_name]
-    [RENAME TO new_name]
+ALTER USER [IF EXISTS] name1 [ON CLUSTER cluster_name1] [RENAME TO new_name1] 
+        [, name2 [ON CLUSTER cluster_name2] [RENAME TO new_name2] ...]
    [IDENTIFIED [WITH {PLAINTEXT_PASSWORD|SHA256_PASSWORD|DOUBLE_SHA1_PASSWORD}] BY {'password'|'hash'}]
    [[ADD|DROP] HOST {LOCAL | NAME 'name' | REGEXP 'name_regexp' | IP 'address' | LIKE 'pattern'} [,...] | ANY | NONE]
    [DEFAULT ROLE role [,...] | ALL | ALL EXCEPT role [,...] ]
--- a/docs/en/sql-reference/statements/create/role.md
+++ b/docs/en/sql-reference/statements/create/role.md
@ -5,12 +5,12 @@ toc_title: ROLE

 # CREATE ROLE {#create-role-statement}

-Creates a new [role](../../../operations/access-rights.md#role-management). Role is a set of [privileges](../../../sql-reference/statements/grant.md#grant-privileges). A [user](../../../sql-reference/statements/create/user.md) assigned a role gets all the privileges of this role.
+Creates new [roles](../../../operations/access-rights.md#role-management). Role is a set of [privileges](../../../sql-reference/statements/grant.md#grant-privileges). A [user](../../../sql-reference/statements/create/user.md) assigned a role gets all the privileges of this role.

 Syntax:

 ``` sql
-CREATE ROLE [IF NOT EXISTS | OR REPLACE] name
+CREATE ROLE [IF NOT EXISTS | OR REPLACE] name1 [, name2 ...]
    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
 ```

--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`Subproject commit 1f9c286dba60809edb64e384d6727d80d269b6cf`
				`@ -0,0 +1 @@`
				`Subproject commit 58d2a028d1600225ac3a478d6b3a06ba2f0c01f6`