Merge remote-tracking branch 'upstream/master' into s3-queue-fixes

2024-09-20 16:50:48 +00:00 · 2023-09-14 17:16:29 +02:00 · 2023-09-14 17:16:29 +02:00 · afcb0b2b9a
commit afcb0b2b9a
parent 220a67eca7 eeb2c5b223
943 changed files with 90869 additions and 65636 deletions
--- a/.clang-format
+++ b/.clang-format
@ -79,7 +79,7 @@ IndentWidth: 4
 IndentWrappedFunctionNames: false
 MacroBlockBegin: ''
 MacroBlockEnd: ''
-NamespaceIndentation: Inner
+NamespaceIndentation: None
 ObjCBlockIndentWidth: 4
 ObjCSpaceAfterProperty: true
 ObjCSpaceBeforeProtocolList: true
@ -89,6 +89,7 @@ PenaltyBreakFirstLessLess: 120
 PenaltyBreakString: 1000
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 60
+RemoveBracesLLVM: true
 SpaceAfterCStyleCast: false
 SpaceBeforeAssignmentOperators: true
 SpaceBeforeParens: ControlStatements
--- a/.github/workflows/backport_branches.yml
+++ b/.github/workflows/backport_branches.yml
@ -76,6 +76,7 @@ jobs:
        uses: ClickHouse/checkout@v1
        with:
          clear-repository: true
+          fetch-depth: 0  # to find ancestor merge commits necessary for finding proper docker tags
      - name: Download changed aarch64 images
        uses: actions/download-artifact@v3
        with:
--- a/.github/workflows/docs_check.yml
+++ b/.github/workflows/docs_check.yml
@ -73,6 +73,7 @@ jobs:
        uses: ClickHouse/checkout@v1
        with:
          clear-repository: true
+          fetch-depth: 0  # to find ancestor merge commits necessary for finding proper docker tags
      - name: Download changed aarch64 images
        uses: actions/download-artifact@v3
        with:
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@ -60,6 +60,7 @@ jobs:
        uses: ClickHouse/checkout@v1
        with:
          clear-repository: true
+          fetch-depth: 0  # to find ancestor merge commits necessary for finding proper docker tags
      - name: Download changed aarch64 images
        uses: actions/download-artifact@v3
        with:
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@ -53,6 +53,7 @@ jobs:
        uses: ClickHouse/checkout@v1
        with:
          clear-repository: true
+          fetch-depth: 0  # to find ancestor merge commits necessary for finding proper docker tags
      - name: Download changed aarch64 images
        uses: actions/download-artifact@v3
        with:
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@ -94,6 +94,7 @@ jobs:
        uses: ClickHouse/checkout@v1
        with:
          clear-repository: true
+          fetch-depth: 0  # to find ancestor merge commits necessary for finding proper docker tags
      - name: Download changed aarch64 images
        uses: actions/download-artifact@v3
        with:
--- a/.github/workflows/release_branches.yml
+++ b/.github/workflows/release_branches.yml
@ -52,6 +52,7 @@ jobs:
        uses: ClickHouse/checkout@v1
        with:
          clear-repository: true
+          fetch-depth: 0  # to find ancestor merge commits necessary for finding proper docker tags
      - name: Download changed aarch64 images
        uses: actions/download-artifact@v3
        with:
--- a/.gitmodules
+++ b/.gitmodules
@ -40,9 +40,6 @@
 [submodule "contrib/boost"]
 	path = contrib/boost
 	url = https://github.com/ClickHouse/boost
-[submodule "contrib/base64"]
-	path = contrib/base64
-	url = https://github.com/ClickHouse/Turbo-Base64
 [submodule "contrib/arrow"]
 	path = contrib/arrow
 	url = https://github.com/ClickHouse/arrow
@ -348,3 +345,6 @@
 [submodule "contrib/robin-map"]
 	path = contrib/robin-map
 	url = https://github.com/Tessil/robin-map.git
+[submodule "contrib/aklomp-base64"]
+	path = contrib/aklomp-base64
+	url = https://github.com/aklomp/base64.git
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -118,7 +118,11 @@ endif()
 # - sanitize.cmake
 add_library(global-libs INTERFACE)

-include (cmake/fuzzer.cmake)
+# We don't want to instrument everything with fuzzer, but only specific targets (see below),
+# also, since we build our own llvm, we specifically don't want to instrument
+# libFuzzer library itself - it would result in infinite recursion
+#include (cmake/fuzzer.cmake)
+
 include (cmake/sanitize.cmake)

 option(ENABLE_COLORED_BUILD "Enable colors in compiler output" ON)
@ -558,6 +562,46 @@ add_subdirectory (programs)
 add_subdirectory (tests)
 add_subdirectory (utils)

+# Function get_all_targets collects all targets recursively
+function(get_all_targets var)
+    macro(get_all_targets_recursive targets dir)
+        get_property(subdirectories DIRECTORY ${dir} PROPERTY SUBDIRECTORIES)
+        foreach(subdir ${subdirectories})
+            get_all_targets_recursive(${targets} ${subdir})
+        endforeach()
+        get_property(current_targets DIRECTORY ${dir} PROPERTY BUILDSYSTEM_TARGETS)
+        list(APPEND ${targets} ${current_targets})
+    endmacro()
+
+    set(targets)
+    get_all_targets_recursive(targets ${CMAKE_CURRENT_SOURCE_DIR})
+    set(${var} ${targets} PARENT_SCOPE)
+endfunction()
+
+if (FUZZER)
+    # Bundle fuzzers target
+    add_custom_target(fuzzers)
+    # Instrument all targets fuzzer and link with libfuzzer
+    get_all_targets(all_targets)
+    foreach(target ${all_targets})
+        if (NOT(target STREQUAL "_fuzzer" OR target STREQUAL "_fuzzer_no_main"))
+            get_target_property(target_type ${target} TYPE)
+            if (NOT(target_type STREQUAL "INTERFACE_LIBRARY" OR target_type STREQUAL "UTILITY"))
+                target_compile_options(${target} PRIVATE "-fsanitize=fuzzer-no-link")
+            endif()
+            # clickhouse fuzzer isn't working correctly
+            # initial PR https://github.com/ClickHouse/ClickHouse/pull/27526
+            #if (target MATCHES ".+_fuzzer" OR target STREQUAL "clickhouse")
+            if (target MATCHES ".+_fuzzer")
+                message(STATUS "${target} instrumented with fuzzer")
+                target_link_libraries(${target} PUBLIC ch_contrib::fuzzer)
+                # Add to fuzzers bundle
+                add_dependencies(fuzzers ${target})
+            endif()
+        endif()
+    endforeach()
+endif()
+
 include (cmake/sanitize_targets.cmake)

 # Build native targets if necessary
--- a/PreLoad.cmake
+++ b/PreLoad.cmake
@ -78,6 +78,14 @@ if (OS MATCHES "Linux"
    AND ("$ENV{CC}" MATCHES ".*clang.*" OR CMAKE_C_COMPILER MATCHES ".*clang.*"))

    if (ARCH MATCHES "amd64|x86_64")
+        # NOTE: right now musl is not ready, since unwind is too slow with it
+        #
+        # FWIW the following had been tried:
+        # - update musl
+        # - compile musl with debug
+        # - compile musl with debug and -fasynchronous-unwind-tables
+        #
+        # But none of this changes anything so far.
        set (CMAKE_TOOLCHAIN_FILE "cmake/linux/toolchain-x86_64.cmake" CACHE INTERNAL "")
    elseif (ARCH MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)")
        set (CMAKE_TOOLCHAIN_FILE "cmake/linux/toolchain-aarch64.cmake" CACHE INTERNAL "")
--- a/cmake/limit_jobs.cmake
+++ b/cmake/limit_jobs.cmake
@ -47,7 +47,7 @@ if (CMAKE_BUILD_TYPE_UC STREQUAL "RELWITHDEBINFO" AND ENABLE_THINLTO AND PARALLE
    set (PARALLEL_LINK_JOBS 2)
 endif()

-message(STATUS "Building sub-tree with ${PARALLEL_COMPILE_JOBS} compile jobs and ${PARALLEL_LINK_JOBS} linker jobs (system: ${NUMBER_OF_LOGICAL_CORES} cores, ${TOTAL_PHYSICAL_MEMORY} MB DRAM, 'OFF' means the native core count).")
+message(STATUS "Building sub-tree with ${PARALLEL_COMPILE_JOBS} compile jobs and ${PARALLEL_LINK_JOBS} linker jobs (system: ${NUMBER_OF_LOGICAL_CORES} cores, ${TOTAL_PHYSICAL_MEMORY} MB RAM, 'OFF' means the native core count).")

 if (PARALLEL_COMPILE_JOBS LESS NUMBER_OF_LOGICAL_CORES)
    set(CMAKE_JOB_POOL_COMPILE compile_job_pool${CMAKE_CURRENT_SOURCE_DIR})
--- a/cmake/linux/toolchain-ppc64le.cmake
+++ b/cmake/linux/toolchain-ppc64le.cmake
@ -5,9 +5,9 @@ set (CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)

 set (CMAKE_SYSTEM_NAME "Linux")
 set (CMAKE_SYSTEM_PROCESSOR "ppc64le")
-set (CMAKE_C_COMPILER_TARGET "ppc64le-linux-gnu")
-set (CMAKE_CXX_COMPILER_TARGET "ppc64le-linux-gnu")
-set (CMAKE_ASM_COMPILER_TARGET "ppc64le-linux-gnu")
+set (CMAKE_C_COMPILER_TARGET "powerpc64le-linux-gnu")
+set (CMAKE_CXX_COMPILER_TARGET "powerpc64le-linux-gnu")
+set (CMAKE_ASM_COMPILER_TARGET "powerpc64le-linux-gnu")

 # Will be changed later, but somehow needed to be set here.
 set (CMAKE_AR "ar")
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@ -135,7 +135,7 @@ add_contrib (aws-cmake
    aws-cmake
 )

-add_contrib (base64-cmake base64)
+add_contrib (aklomp-base64-cmake aklomp-base64)
 add_contrib (simdjson-cmake simdjson)
 add_contrib (rapidjson-cmake rapidjson)
 add_contrib (fastops-cmake fastops)
--- a/contrib/aklomp-base64
+++ b/contrib/aklomp-base64
@ -0,0 +1 @@
+Subproject commit e77bd70bdd860c52c561568cffb251d88bba064c
--- a/contrib/aklomp-base64-cmake/.gitignore
+++ b/contrib/aklomp-base64-cmake/.gitignore
@ -0,0 +1 @@
+config.h
--- a/contrib/aklomp-base64-cmake/CMakeLists.txt
+++ b/contrib/aklomp-base64-cmake/CMakeLists.txt
@ -0,0 +1,68 @@
+option (ENABLE_BASE64 "Enable base64" ${ENABLE_LIBRARIES})
+
+if (NOT ENABLE_BASE64)
+    message(STATUS "Not using base64")
+    return()
+endif()
+
+SET(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/aklomp-base64")
+
+if (ARCH_AMD64)
+    # These defines enable/disable SIMD codecs in base64's runtime codec dispatch.
+    # We don't want to limit ourselves --> enable all.
+    set(HAVE_SSSE3 1)
+    set(HAVE_SSE41 1)
+    set(HAVE_SSE42 1)
+    set(HAVE_AVX 1)
+    set(HAVE_AVX2 1)
+    set(HAVE_AVX512 1)
+endif ()
+
+if (ARCH_AARCH64)
+    # The choice of HAVE_NEON* depends on the target machine because base64 provides
+    # no runtime dispatch on ARM. NEON is only mandatory with the normal build profile.
+    if(NOT NO_ARMV81_OR_HIGHER)
+        set(HAVE_NEON64 1)
+        set(HAVE_NEON32 0)
+    endif ()
+endif ()
+
+configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+
+add_library(_base64
+    "${LIBRARY_DIR}/lib/lib.c"
+    "${LIBRARY_DIR}/lib/codec_choose.c"
+
+    "${LIBRARY_DIR}/lib/tables/tables.c"
+    "${LIBRARY_DIR}/lib/tables/table_dec_32bit.h"
+    "${LIBRARY_DIR}/lib/tables/table_enc_12bit.h"
+
+    "${LIBRARY_DIR}/lib/codecs.h"
+
+    "${CMAKE_CURRENT_BINARY_DIR}/config.h"
+
+    "${LIBRARY_DIR}/lib/arch/generic/codec.c"
+    "${LIBRARY_DIR}/lib/arch/ssse3/codec.c"
+    "${LIBRARY_DIR}/lib/arch/sse41/codec.c"
+    "${LIBRARY_DIR}/lib/arch/sse42/codec.c"
+    "${LIBRARY_DIR}/lib/arch/avx/codec.c"
+    "${LIBRARY_DIR}/lib/arch/avx2/codec.c"
+    "${LIBRARY_DIR}/lib/arch/avx512/codec.c"
+
+    "${LIBRARY_DIR}/lib/arch/neon32/codec.c"
+    "${LIBRARY_DIR}/lib/arch/neon64/codec.c"
+)
+
+if (ARCH_AMD64)
+    set_source_files_properties(${LIBRARY_DIR}/lib/arch/ssse3/codec.c PROPERTIES COMPILE_FLAGS "-mssse3")
+    set_source_files_properties(${LIBRARY_DIR}/lib/arch/sse41/codec.c PROPERTIES COMPILE_FLAGS "-msse4.1")
+    set_source_files_properties(${LIBRARY_DIR}/lib/arch/sse42/codec.c PROPERTIES COMPILE_FLAGS "-msse4.2")
+    set_source_files_properties(${LIBRARY_DIR}/lib/arch/avx/codec.c PROPERTIES COMPILE_FLAGS "-mavx")
+    set_source_files_properties(${LIBRARY_DIR}/lib/arch/avx2/codec.c PROPERTIES COMPILE_FLAGS "-mavx2")
+    set_source_files_properties(${LIBRARY_DIR}/lib/arch/avx512/codec.c PROPERTIES COMPILE_FLAGS "-mavx512vl -mavx512vbmi")
+endif()
+
+target_include_directories(_base64 SYSTEM PUBLIC ${LIBRARY_DIR}/include)
+target_include_directories(_base64 PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+
+add_library(ch_contrib::base64 ALIAS _base64)
--- a/contrib/aklomp-base64-cmake/config.h.in
+++ b/contrib/aklomp-base64-cmake/config.h.in
@ -0,0 +1,9 @@
+#cmakedefine01 HAVE_SSSE3
+#cmakedefine01 HAVE_SSE41
+#cmakedefine01 HAVE_SSE42
+#cmakedefine01 HAVE_AVX
+#cmakedefine01 HAVE_AVX2
+#cmakedefine01 HAVE_AVX512
+
+#cmakedefine01 HAVE_NEON32
+#cmakedefine01 HAVE_NEON64
--- a/contrib/base64
+++ b/contrib/base64
@ -1 +0,0 @@
-Subproject commit 8628e258090f9eb76d90ac3c91e1ab4690e9aa11
--- a/contrib/base64-cmake/CMakeLists.txt
+++ b/contrib/base64-cmake/CMakeLists.txt
@ -1,60 +0,0 @@
-if(ARCH_AMD64 OR ARCH_AARCH64 OR ARCH_PPC64LE OR ARCH_S390X)
-    option (ENABLE_BASE64 "Enable base64" ${ENABLE_LIBRARIES})
-elseif(ENABLE_BASE64)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "base64 library is only supported on x86_64 and aarch64")
-endif()
-
-if (NOT ENABLE_BASE64)
-    message(STATUS "Not using base64")
-    return()
-endif()
-
-SET(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/base64")
-
-add_library(_base64_scalar OBJECT "${LIBRARY_DIR}/turbob64c.c" "${LIBRARY_DIR}/turbob64d.c")
-add_library(_base64_ssse3 OBJECT "${LIBRARY_DIR}/turbob64sse.c") # This file also contains code for ARM NEON
-
-if (ARCH_AMD64)
-    add_library(_base64_avx OBJECT "${LIBRARY_DIR}/turbob64sse.c") # This is not a mistake. One file is compiled twice.
-    add_library(_base64_avx2 OBJECT "${LIBRARY_DIR}/turbob64avx2.c")
-endif ()
-
-target_compile_options(_base64_scalar PRIVATE -falign-loops)
-
-if (ARCH_AMD64)
-    target_compile_options(_base64_ssse3 PRIVATE -mno-avx -mno-avx2 -mssse3 -falign-loops)
-    target_compile_options(_base64_avx PRIVATE -falign-loops -mavx)
-    target_compile_options(_base64_avx2 PRIVATE -falign-loops -mavx2)
-else ()
-    if (ARCH_PPC64LE)
-        target_compile_options(_base64_ssse3 PRIVATE -D__SSSE3__ -falign-loops)
-    else()
-        target_compile_options(_base64_ssse3 PRIVATE -falign-loops)
-    endif()
-endif ()
-
-if (ARCH_AMD64)
-    add_library(_base64
-        $<TARGET_OBJECTS:_base64_scalar>
-        $<TARGET_OBJECTS:_base64_ssse3>
-        $<TARGET_OBJECTS:_base64_avx>
-        $<TARGET_OBJECTS:_base64_avx2>)
-else ()
-    add_library(_base64
-        $<TARGET_OBJECTS:_base64_scalar>
-        $<TARGET_OBJECTS:_base64_ssse3>)
-endif ()
-
-target_include_directories(_base64 SYSTEM PUBLIC ${LIBRARY_DIR})
-
-if (XCODE OR XCODE_VERSION)
-    # https://gitlab.kitware.com/cmake/cmake/issues/17457
-    #     Some native build systems may not like targets that have only object files, so consider adding at least one real source file
-    # This applies to Xcode.
-    if (NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/dummy.c")
-        file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/dummy.c" "")
-    endif ()
-    target_sources(_base64 PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/dummy.c")
-endif ()
-
-add_library(ch_contrib::base64 ALIAS _base64)
--- a/contrib/corrosion-cmake/CMakeLists.txt
+++ b/contrib/corrosion-cmake/CMakeLists.txt
@ -17,20 +17,22 @@ endif()

 message(STATUS "Checking Rust toolchain for current target")

-if(CMAKE_TOOLCHAIN_FILE MATCHES "linux/toolchain-x86_64")
+# See https://doc.rust-lang.org/nightly/rustc/platform-support.html
+
+if((CMAKE_TOOLCHAIN_FILE MATCHES "linux/toolchain-x86_64") AND (CMAKE_TOOLCHAIN_FILE MATCHES "musl"))
+    set(Rust_CARGO_TARGET "x86_64-unknown-linux-musl")
+elseif(CMAKE_TOOLCHAIN_FILE MATCHES "linux/toolchain-x86_64")
    set(Rust_CARGO_TARGET "x86_64-unknown-linux-gnu")
-endif()
-
-if(CMAKE_TOOLCHAIN_FILE MATCHES "linux/toolchain-aarch64")
+elseif((CMAKE_TOOLCHAIN_FILE MATCHES "linux/toolchain-aarch64") AND (CMAKE_TOOLCHAIN_FILE MATCHES "musl"))
+    set(Rust_CARGO_TARGET "aarch64-unknown-linux-musl")
+elseif(CMAKE_TOOLCHAIN_FILE MATCHES "linux/toolchain-aarch64")
    set(Rust_CARGO_TARGET "aarch64-unknown-linux-gnu")
-endif()
-
-if((CMAKE_TOOLCHAIN_FILE MATCHES "darwin") AND (CMAKE_TOOLCHAIN_FILE MATCHES "x86_64"))
+elseif((CMAKE_TOOLCHAIN_FILE MATCHES "darwin") AND (CMAKE_TOOLCHAIN_FILE MATCHES "x86_64"))
    set(Rust_CARGO_TARGET "x86_64-apple-darwin")
-endif()
-
-if((CMAKE_TOOLCHAIN_FILE MATCHES "freebsd") AND (CMAKE_TOOLCHAIN_FILE MATCHES "x86_64"))
+elseif((CMAKE_TOOLCHAIN_FILE MATCHES "freebsd") AND (CMAKE_TOOLCHAIN_FILE MATCHES "x86_64"))
    set(Rust_CARGO_TARGET "x86_64-unknown-freebsd")
+elseif(CMAKE_TOOLCHAIN_FILE MATCHES "linux/toolchain-riscv64")
+    set(Rust_CARGO_TARGET "riscv64gc-unknown-linux-gnu")
 endif()

 if(CMAKE_TOOLCHAIN_FILE MATCHES "ppc64le")
--- a/contrib/libunwind
+++ b/contrib/libunwind
@ -1 +1 @@
-Subproject commit e48aa13f67dc722511b5af33a32ba9b7748176b5
+Subproject commit 30cc1d3fd3655a5cfa0ab112fe320fb9fc0a8344
--- a/contrib/openssl-cmake/CMakeLists.txt
+++ b/contrib/openssl-cmake/CMakeLists.txt
@ -126,7 +126,7 @@ if(ENABLE_OPENSSL_DYNAMIC OR ENABLE_OPENSSL)
    elseif(ARCH_PPC64LE)
        macro(perl_generate_asm FILE_IN FILE_OUT)
            add_custom_command(OUTPUT ${FILE_OUT}
-                COMMAND /usr/bin/env perl ${FILE_IN} "linux64" ${FILE_OUT})
+                COMMAND /usr/bin/env perl ${FILE_IN} "linux64v2" ${FILE_OUT})
        endmacro()

        perl_generate_asm(${OPENSSL_SOURCE_DIR}/crypto/aes/asm/aes-ppc.pl ${OPENSSL_BINARY_DIR}/crypto/aes/aes-ppc.s)
--- a/contrib/re2
+++ b/contrib/re2
@ -1 +1 @@
-Subproject commit 03da4fc0857c285e3a26782f6bc8931c4c950df4
+Subproject commit a807e8a3aac2cc33c77b7071efea54fcabe38e0c
--- a/contrib/sysroot
+++ b/contrib/sysroot
@ -1 +1 @@
-Subproject commit e0d1b64da666afbfaa6f1ee0487c33f3fd2cd5cb
+Subproject commit b5fcabb24d28fc33024291b2c6c1abd807c7dba8
--- a/docker/keeper/Dockerfile
+++ b/docker/keeper/Dockerfile
@ -32,7 +32,7 @@ RUN arch=${TARGETARCH:-amd64} \
    esac

 ARG REPOSITORY="https://s3.amazonaws.com/clickhouse-builds/22.4/31c367d3cd3aefd316778601ff6565119fe36682/package_release"
-ARG VERSION="23.8.1.2992"
+ARG VERSION="23.8.2.7"
 ARG PACKAGES="clickhouse-keeper"

 # user/group precreated explicitly with fixed uid/gid on purpose.
--- a/docker/packager/binary/Dockerfile
+++ b/docker/packager/binary/Dockerfile
@ -52,11 +52,15 @@ RUN curl https://sh.rustup.rs -sSf | bash -s -- -y && \
    rustup toolchain install nightly-2023-07-04 && \
    rustup default nightly-2023-07-04 && \
    rustup component add rust-src && \
+    rustup target add x86_64-unknown-linux-gnu && \
    rustup target add aarch64-unknown-linux-gnu && \
    rustup target add x86_64-apple-darwin && \
    rustup target add x86_64-unknown-freebsd && \
    rustup target add aarch64-apple-darwin && \
-    rustup target add powerpc64le-unknown-linux-gnu
+    rustup target add powerpc64le-unknown-linux-gnu && \
+    rustup target add x86_64-unknown-linux-musl && \
+    rustup target add aarch64-unknown-linux-musl && \
+    rustup target add riscv64gc-unknown-linux-gnu

 # NOTE: Seems like gcc-11 is too new for ubuntu20 repository
 # A cross-linker for RISC-V 64 (we need it, because LLVM's LLD does not work):
--- a/docker/packager/binary/build.sh
+++ b/docker/packager/binary/build.sh
@ -97,9 +97,11 @@ if [ -n "$MAKE_DEB" ]; then
  bash -x /build/packages/build
 fi

-mv ./programs/clickhouse* /output
-[ -x ./programs/self-extracting/clickhouse ] && mv ./programs/self-extracting/clickhouse /output
-mv ./src/unit_tests_dbms /output ||: # may not exist for some binary builds
+if [ "$BUILD_TARGET" != "fuzzers" ]; then
+  mv ./programs/clickhouse* /output
+  [ -x ./programs/self-extracting/clickhouse ] && mv ./programs/self-extracting/clickhouse /output
+  mv ./src/unit_tests_dbms /output ||: # may not exist for some binary builds
+fi

 prepare_combined_output () {
    local OUTPUT
--- a/docker/packager/packager
+++ b/docker/packager/packager
@ -149,7 +149,10 @@ def parse_env_variables(
    result = []
    result.append("OUTPUT_DIR=/output")
    cmake_flags = ["$CMAKE_FLAGS"]
-    build_target = "clickhouse-bundle"
+    if package_type == "fuzzers":
+        build_target = "fuzzers"
+    else:
+        build_target = "clickhouse-bundle"

    is_cross_darwin = compiler.endswith(DARWIN_SUFFIX)
    is_cross_darwin_arm = compiler.endswith(DARWIN_ARM_SUFFIX)
@ -258,6 +261,17 @@ def parse_env_variables(
                cmake_flags.append("-DBUILD_STANDALONE_KEEPER=1")
            else:
                result.append("BUILD_MUSL_KEEPER=1")
+    elif package_type == "fuzzers":
+        cmake_flags.append("-DENABLE_FUZZING=1")
+        cmake_flags.append("-DENABLE_PROTOBUF=1")
+        cmake_flags.append("-DUSE_INTERNAL_PROTOBUF_LIBRARY=1")
+        cmake_flags.append("-DWITH_COVERAGE=1")
+        cmake_flags.append("-DCMAKE_AUTOGEN_VERBOSE=ON")
+        # cmake_flags.append("-DCMAKE_INSTALL_PREFIX=/usr")
+        # cmake_flags.append("-DCMAKE_INSTALL_SYSCONFDIR=/etc")
+        # cmake_flags.append("-DCMAKE_INSTALL_LOCALSTATEDIR=/var")
+        # Reduce linking and building time by avoid *install/all dependencies
+        cmake_flags.append("-DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=ON")

    result.append(f"CC={cc}")
    result.append(f"CXX={cxx}")
@ -365,7 +379,7 @@ def parse_args() -> argparse.Namespace:
    )
    parser.add_argument(
        "--package-type",
-        choices=["deb", "binary"],
+        choices=["deb", "binary", "fuzzers"],
        required=True,
    )
    parser.add_argument(
--- a/docker/server/Dockerfile.alpine
+++ b/docker/server/Dockerfile.alpine
@ -33,7 +33,7 @@ RUN arch=${TARGETARCH:-amd64} \
 # lts / testing / prestable / etc
 ARG REPO_CHANNEL="stable"
 ARG REPOSITORY="https://packages.clickhouse.com/tgz/${REPO_CHANNEL}"
-ARG VERSION="23.8.1.2992"
+ARG VERSION="23.8.2.7"
 ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"

 # user/group precreated explicitly with fixed uid/gid on purpose.
--- a/docker/server/Dockerfile.ubuntu
+++ b/docker/server/Dockerfile.ubuntu
@ -23,7 +23,7 @@ RUN sed -i "s|http://archive.ubuntu.com|${apt_archive}|g" /etc/apt/sources.list

 ARG REPO_CHANNEL="stable"
 ARG REPOSITORY="deb [signed-by=/usr/share/keyrings/clickhouse-keyring.gpg] https://packages.clickhouse.com/deb ${REPO_CHANNEL} main"
-ARG VERSION="23.8.1.2992"
+ARG VERSION="23.8.2.7"
 ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"

 # set non-empty deb_location_url url to create a docker image
--- a/docker/test/base/setup_export_logs.sh
+++ b/docker/test/base/setup_export_logs.sh
@ -15,8 +15,8 @@ CLICKHOUSE_CI_LOGS_USER=${CLICKHOUSE_CI_LOGS_USER:-ci}
 # Pre-configured destination cluster, where to export the data
 CLICKHOUSE_CI_LOGS_CLUSTER=${CLICKHOUSE_CI_LOGS_CLUSTER:-system_logs_export}

-EXTRA_COLUMNS=${EXTRA_COLUMNS:-"pull_request_number UInt32, commit_sha String, check_start_time DateTime, check_name LowCardinality(String), instance_type LowCardinality(String), "}
-EXTRA_COLUMNS_EXPRESSION=${EXTRA_COLUMNS_EXPRESSION:-"0 AS pull_request_number, '' AS commit_sha, now() AS check_start_time, '' AS check_name, '' AS instance_type"}
+EXTRA_COLUMNS=${EXTRA_COLUMNS:-"pull_request_number UInt32, commit_sha String, check_start_time DateTime, check_name LowCardinality(String), instance_type LowCardinality(String), instance_id String, "}
+EXTRA_COLUMNS_EXPRESSION=${EXTRA_COLUMNS_EXPRESSION:-"0 AS pull_request_number, '' AS commit_sha, now() AS check_start_time, '' AS check_name, '' AS instance_type, '' AS instance_id"}
 EXTRA_ORDER_BY_COLUMNS=${EXTRA_ORDER_BY_COLUMNS:-"check_name, "}

 function __set_connection_args
@ -125,9 +125,9 @@ function setup_logs_replication
    echo 'Create %_log tables'
    clickhouse-client --query "SHOW TABLES FROM system LIKE '%\\_log'" | while read -r table
    do
-        # Calculate hash of its structure:
+        # Calculate hash of its structure. Note: 1 is the version of extra columns - increment it if extra columns are changed:
        hash=$(clickhouse-client --query "
-            SELECT sipHash64(groupArray((name, type)))
+            SELECT sipHash64(1, groupArray((name, type)))
            FROM (SELECT name, type FROM system.columns
                WHERE database = 'system' AND table = '$table'
                ORDER BY position)
--- a/docker/test/fasttest/Dockerfile
+++ b/docker/test/fasttest/Dockerfile
@ -18,6 +18,7 @@ RUN apt-get update \
        python3-termcolor \
        unixodbc \
        pv \
+        jq \
        zstd \
    --yes --no-install-recommends

--- a/docker/test/fasttest/run.sh
+++ b/docker/test/fasttest/run.sh
@ -120,7 +120,7 @@ function clone_submodules
            contrib/libxml2
            contrib/libunwind
            contrib/fmtlib
-            contrib/base64
+            contrib/aklomp-base64
            contrib/cctz
            contrib/libcpuid
            contrib/libdivide
--- a/docker/test/integration/mysql_java_client/Dockerfile
+++ b/docker/test/integration/mysql_java_client/Dockerfile
@ -1,21 +1,15 @@
 # docker build -t clickhouse/mysql-java-client .
 # MySQL Java client docker container

-FROM ubuntu:18.04
+FROM openjdk:8-jdk-alpine

-RUN apt-get update && \
-    apt-get install -y software-properties-common build-essential openjdk-8-jdk libmysql-java curl
+RUN apk --no-cache add curl

-RUN rm -rf \
-        /var/lib/apt/lists/* \
-        /var/cache/debconf \
-        /tmp/* \
-RUN apt-get clean
-
-ARG ver=5.1.46
-RUN curl -L -o /mysql-connector-java-${ver}.jar https://repo1.maven.org/maven2/mysql/mysql-connector-java/${ver}/mysql-connector-java-${ver}.jar
-ENV CLASSPATH=$CLASSPATH:/mysql-connector-java-${ver}.jar
+ARG ver=8.1.0
+RUN curl -L -o /mysql-connector-j-${ver}.jar https://repo1.maven.org/maven2/com/mysql/mysql-connector-j/${ver}/mysql-connector-j-${ver}.jar
+ENV CLASSPATH=$CLASSPATH:/mysql-connector-j-${ver}.jar

 WORKDIR /jdbc
 COPY Test.java Test.java
-RUN javac Test.java
+COPY PreparedStatementsTest.java PreparedStatementsTest.java
+RUN javac Test.java PreparedStatementsTest.java
--- a/docker/test/integration/mysql_java_client/PreparedStatementsTest.java
+++ b/docker/test/integration/mysql_java_client/PreparedStatementsTest.java
@ -0,0 +1,193 @@
+import com.mysql.cj.MysqlType;
+
+import java.sql.*;
+
+public class PreparedStatementsTest {
+    public static void main(String[] args) {
+        int i = 0;
+        String host = "127.0.0.1";
+        String port = "9004";
+        String user = "default";
+        String password = "";
+        String database = "default";
+        while (i < args.length) {
+            switch (args[i]) {
+                case "--host":
+                    host = args[++i];
+                    break;
+                case "--port":
+                    port = args[++i];
+                    break;
+                case "--user":
+                    user = args[++i];
+                    break;
+                case "--password":
+                    password = args[++i];
+                    break;
+                case "--database":
+                    database = args[++i];
+                    break;
+                default:
+                    i++;
+                    break;
+            }
+        }
+
+        // useServerPrepStmts uses COM_STMT_PREPARE and COM_STMT_EXECUTE
+        // instead of COM_QUERY which allows us to test the binary protocol
+        String jdbcUrl = String.format("jdbc:mysql://%s:%s/%s?useSSL=false&useServerPrepStmts=true",
+                host, port, database);
+
+        try {
+            Class.forName("com.mysql.cj.jdbc.Driver");
+            Connection conn = DriverManager.getConnection(jdbcUrl, user, password);
+            testSimpleDataTypes(conn);
+            testStringTypes(conn);
+            testLowCardinalityAndNullableTypes(conn);
+            testDecimalTypes(conn);
+            testMiscTypes(conn);
+            testDateTypes(conn);
+            testUnusualDateTime64Scales(conn);
+            testDateTimeTimezones(conn);
+            conn.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    private static void testSimpleDataTypes(Connection conn) throws SQLException {
+        System.out.println("### testSimpleDataTypes");
+        ResultSet rs = conn.prepareStatement("SELECT * FROM ps_simple_data_types").executeQuery();
+        int rowNum = 1;
+        while (rs.next()) {
+            System.out.printf("Row #%d\n", rowNum++);
+            System.out.printf("%s, value: %d\n", getMysqlType(rs, "i8"), rs.getInt("i8"));
+            System.out.printf("%s, value: %d\n", getMysqlType(rs, "i16"), rs.getInt("i16"));
+            System.out.printf("%s, value: %d\n", getMysqlType(rs, "i32"), rs.getInt("i32"));
+            System.out.printf("%s, value: %d\n", getMysqlType(rs, "i64"), rs.getLong("i64"));
+            System.out.printf("%s, value: %s\n", getMysqlType(rs, "i128"), rs.getString("i128"));
+            System.out.printf("%s, value: %s\n", getMysqlType(rs, "i256"), rs.getString("i256"));
+            System.out.printf("%s, value: %d\n", getMysqlType(rs, "ui8"), rs.getInt("ui8"));
+            System.out.printf("%s, value: %d\n", getMysqlType(rs, "ui16"), rs.getInt("ui16"));
+            System.out.printf("%s, value: %d\n", getMysqlType(rs, "ui32"), rs.getLong("ui32"));
+            System.out.printf("%s, value: %s\n", getMysqlType(rs, "ui64"), rs.getString("ui64"));
+            System.out.printf("%s, value: %s\n", getMysqlType(rs, "ui128"), rs.getString("ui128"));
+            System.out.printf("%s, value: %s\n", getMysqlType(rs, "ui256"), rs.getString("ui256"));
+            System.out.printf("%s, value: %f\n", getMysqlType(rs, "f32"), rs.getFloat("f32"));
+            System.out.printf("%s, value: %f\n", getMysqlType(rs, "f64"), rs.getFloat("f64"));
+            System.out.printf("%s, value: %b\n", getMysqlType(rs, "b"), rs.getBoolean("b"));
+        }
+        System.out.println();
+    }
+
+    private static void testStringTypes(Connection conn) throws SQLException {
+        System.out.println("### testStringTypes");
+        ResultSet rs = conn.prepareStatement("SELECT * FROM ps_string_types").executeQuery();
+        int rowNum = 1;
+        while (rs.next()) {
+            System.out.printf("Row #%d\n", rowNum++);
+            System.out.printf("%s, value: %s\n", getMysqlType(rs, "s"), rs.getString("s"));
+            System.out.printf("%s, value: %s\n", getMysqlType(rs, "sn"), rs.getString("sn"));
+            System.out.printf("%s, value: %s\n", getMysqlType(rs, "lc"), rs.getString("lc"));
+            System.out.printf("%s, value: %s\n", getMysqlType(rs, "nlc"), rs.getString("nlc"));
+        }
+        System.out.println();
+    }
+
+    private static void testLowCardinalityAndNullableTypes(Connection conn) throws SQLException {
+        System.out.println("### testLowCardinalityAndNullableTypes");
+        ResultSet rs = conn.prepareStatement("SELECT * FROM ps_low_cardinality_and_nullable_types").executeQuery();
+        int rowNum = 1;
+        while (rs.next()) {
+            System.out.printf("Row #%d\n", rowNum++);
+            System.out.printf("%s, value: %s\n", getMysqlType(rs, "ilc"), rs.getInt("ilc"));
+            System.out.printf("%s, value: %s\n", getMysqlType(rs, "dlc"), rs.getDate("dlc"));
+            // NULL int is represented as zero
+            System.out.printf("%s, value: %s\n", getMysqlType(rs, "ni"), rs.getInt("ni"));
+        }
+        System.out.println();
+    }
+
+    private static void testDecimalTypes(Connection conn) throws SQLException {
+        System.out.println("### testDecimalTypes");
+        ResultSet rs = conn.prepareStatement("SELECT * FROM ps_decimal_types").executeQuery();
+        int rowNum = 1;
+        while (rs.next()) {
+            System.out.printf("Row #%d\n", rowNum++);
+            System.out.printf("%s, value: %s\n", getMysqlType(rs, "d32"), rs.getBigDecimal("d32").toPlainString());
+            System.out.printf("%s, value: %s\n", getMysqlType(rs, "d64"), rs.getBigDecimal("d64").toPlainString());
+            System.out.printf("%s, value: %s\n", getMysqlType(rs, "d128_native"),
+                    rs.getBigDecimal("d128_native").toPlainString());
+            System.out.printf("%s, value: %s\n", getMysqlType(rs, "d128_text"), rs.getString("d128_text"));
+            System.out.printf("%s, value: %s\n", getMysqlType(rs, "d256"), rs.getString("d256"));
+        }
+        System.out.println();
+    }
+
+    private static void testDateTypes(Connection conn) throws SQLException {
+        System.out.println("### testDateTypes");
+        ResultSet rs = conn.prepareStatement("SELECT * FROM ps_date_types").executeQuery();
+        int rowNum = 1;
+        while (rs.next()) {
+            System.out.printf("Row #%d\n", rowNum++);
+            System.out.printf("%s, value: %s\n", getMysqlType(rs, "d"), rs.getDate("d"));
+            System.out.printf("%s, value: %s\n", getMysqlType(rs, "d32"), rs.getDate("d32"));
+            System.out.printf("%s, value: %s\n", getMysqlType(rs, "dt"), rs.getTimestamp("dt"));
+            System.out.printf("%s, value: %s\n", getMysqlType(rs, "dt64_3"), rs.getTimestamp("dt64_3"));
+            System.out.printf("%s, value: %s\n", getMysqlType(rs, "dt64_6"), rs.getTimestamp("dt64_6"));
+            System.out.printf("%s, value: %s\n", getMysqlType(rs, "dt64_9"), rs.getTimestamp("dt64_9"));
+        }
+        System.out.println();
+    }
+
+    private static void testUnusualDateTime64Scales(Connection conn) throws SQLException {
+        System.out.println("### testUnusualDateTime64Scales");
+        ResultSet rs = conn.prepareStatement("SELECT * FROM ps_unusual_datetime64_scales").executeQuery();
+        int rowNum = 1;
+        while (rs.next()) {
+            System.out.printf("Row #%d\n", rowNum++);
+            System.out.printf("%s, value: %s\n", getMysqlType(rs, "dt64_0"), rs.getTimestamp("dt64_0"));
+            System.out.printf("%s, value: %s\n", getMysqlType(rs, "dt64_1"), rs.getTimestamp("dt64_1"));
+            System.out.printf("%s, value: %s\n", getMysqlType(rs, "dt64_2"), rs.getTimestamp("dt64_2"));
+            System.out.printf("%s, value: %s\n", getMysqlType(rs, "dt64_4"), rs.getTimestamp("dt64_4"));
+            System.out.printf("%s, value: %s\n", getMysqlType(rs, "dt64_5"), rs.getTimestamp("dt64_5"));
+            System.out.printf("%s, value: %s\n", getMysqlType(rs, "dt64_7"), rs.getTimestamp("dt64_7"));
+            System.out.printf("%s, value: %s\n", getMysqlType(rs, "dt64_8"), rs.getTimestamp("dt64_8"));
+        }
+        System.out.println();
+    }
+
+    private static void testDateTimeTimezones(Connection conn) throws SQLException {
+        System.out.println("### testDateTimeTimezones");
+        ResultSet rs = conn.prepareStatement("SELECT * FROM ps_datetime_timezones").executeQuery();
+        int rowNum = 1;
+        while (rs.next()) {
+            System.out.printf("Row #%d\n", rowNum++);
+            System.out.printf("%s, value: %s\n", getMysqlType(rs, "dt"), rs.getTimestamp("dt"));
+            System.out.printf("%s, value: %s\n", getMysqlType(rs, "dt64_3"), rs.getTimestamp("dt64_3"));
+        }
+        System.out.println();
+    }
+
+    private static void testMiscTypes(Connection conn) throws SQLException {
+        System.out.println("### testMiscTypes");
+        ResultSet rs = conn.prepareStatement("SELECT * FROM ps_misc_types").executeQuery();
+        int rowNum = 1;
+        while (rs.next()) {
+            System.out.printf("Row #%d\n", rowNum++);
+            System.out.printf("%s, value: %s\n", getMysqlType(rs, "a"), rs.getString("a"));
+            System.out.printf("%s, value: %s\n", getMysqlType(rs, "u"), rs.getString("u"));
+            System.out.printf("%s, value: %s\n", getMysqlType(rs, "t"), rs.getString("t"));
+            System.out.printf("%s, value: %s\n", getMysqlType(rs, "m"), rs.getString("m"));
+        }
+        System.out.println();
+    }
+
+    private static String getMysqlType(ResultSet rs, String columnLabel) throws SQLException {
+        ResultSetMetaData meta = rs.getMetaData();
+        return String.format("%s type is %s", columnLabel,
+                MysqlType.getByJdbcType(meta.getColumnType(rs.findColumn(columnLabel))));
+    }
+
+}
--- a/docker/test/integration/mysql_java_client/Test.java
+++ b/docker/test/integration/mysql_java_client/Test.java
@ -46,6 +46,7 @@ class JavaConnectorTest {
        Connection conn = null;
        Statement stmt = null;
        try {
+            Class.forName("com.mysql.cj.jdbc.Driver");
            conn = DriverManager.getConnection(jdbcUrl, user, password);
            stmt = conn.createStatement();
            stmt.executeUpdate(CREATE_TABLE_SQL);
@ -69,7 +70,7 @@ class JavaConnectorTest {

            stmt.close();
            conn.close();
-        } catch (SQLException e) {
+        } catch (Exception e) {
            e.printStackTrace();
            System.exit(1);
        }
--- a/docker/test/integration/runner/compose/docker_compose_mysql_java_client.yml
+++ b/docker/test/integration/runner/compose/docker_compose_mysql_java_client.yml
@ -3,4 +3,4 @@ services:
  java1:
    image: clickhouse/mysql-java-client:${DOCKER_MYSQL_JAVA_CLIENT_TAG:-latest}
    # to keep container running
-    command: sleep infinity
+    command: sleep 1d
--- a/docker/test/stateless/Dockerfile
+++ b/docker/test/stateless/Dockerfile
@ -40,6 +40,7 @@ RUN apt-get update -y \
            cargo \
            zstd \
            file \
+            jq \
            pv \
            zip \
            p7zip-full \
--- a/docker/test/stateless/run.sh
+++ b/docker/test/stateless/run.sh
@ -1,7 +1,6 @@
 #!/bin/bash

 # shellcheck disable=SC1091
-# shellcheck disable=SC2034
 source /setup_export_logs.sh

 # fail on errors, verbose and export all env variables
@ -216,6 +215,12 @@ rg -Fa "<Fatal>" /var/log/clickhouse-server/clickhouse-server.log ||:
 rg -A50 -Fa "============" /var/log/clickhouse-server/stderr.log ||:
 zstd --threads=0 < /var/log/clickhouse-server/clickhouse-server.log > /test_output/clickhouse-server.log.zst &

+data_path_config="--path=/var/lib/clickhouse/"
+if [[ -n "$USE_S3_STORAGE_FOR_MERGE_TREE" ]] && [[ "$USE_S3_STORAGE_FOR_MERGE_TREE" -eq 1 ]]; then
+    # We need s3 storage configuration (but it's more likely that clickhouse-local will fail for some reason)
+    data_path_config="--config-file=/etc/clickhouse-server/config.xml"
+fi
+
 # Compress tables.
 #
 # NOTE:
@ -225,23 +230,17 @@ zstd --threads=0 < /var/log/clickhouse-server/clickhouse-server.log > /test_outp
 #   for files >64MB, we want this files to be compressed explicitly
 for table in query_log zookeeper_log trace_log transactions_info_log
 do
-    clickhouse-local --path /var/lib/clickhouse/ --only-system-tables -q "select * from system.$table format TSVWithNamesAndTypes" | zstd --threads=0 > /test_output/$table.tsv.zst ||:
+    clickhouse-local "$data_path_config" --only-system-tables -q "select * from system.$table format TSVWithNamesAndTypes" | zstd --threads=0 > /test_output/$table.tsv.zst ||:
    if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]; then
        clickhouse-local --path /var/lib/clickhouse1/ --only-system-tables -q "select * from system.$table format TSVWithNamesAndTypes" | zstd --threads=0 > /test_output/$table.1.tsv.zst ||:
        clickhouse-local --path /var/lib/clickhouse2/ --only-system-tables -q "select * from system.$table format TSVWithNamesAndTypes" | zstd --threads=0 > /test_output/$table.2.tsv.zst ||:
    fi
 done

-data_path_config="--path=/var/lib/clickhouse/"
-if [[ -n "$USE_S3_STORAGE_FOR_MERGE_TREE" ]] && [[ "$USE_S3_STORAGE_FOR_MERGE_TREE" -eq 1 ]]; then
-    # We need s3 storage configuration (but it's more likely that clickhouse-local will fail for some reason)
-    data_path_config="--config-file=/etc/clickhouse-server/config.xml"
-fi
-
 # Also export trace log in flamegraph-friendly format.
 for trace_type in CPU Memory Real
 do
-    clickhouse-local "data_path_config" --only-system-tables -q "
+    clickhouse-local "$data_path_config" --only-system-tables -q "
            select
                arrayStringConcat((arrayMap(x -> concat(splitByChar('/', addressToLine(x))[-1], '#', demangle(addressToSymbol(x)) ), trace)), ';') AS stack,
                count(*) AS samples
--- a/docker/test/upgrade/run.sh
+++ b/docker/test/upgrade/run.sh
@ -60,6 +60,12 @@ install_packages previous_release_package_folder
 # available for dump via clickhouse-local
 configure

+# async_replication setting doesn't exist on some older versions
+sudo cat /etc/clickhouse-server/config.d/keeper_port.xml \
+  | sed "/<async_replication>1<\/async_replication>/d" \
+  > /etc/clickhouse-server/config.d/keeper_port.xml.tmp
+sudo mv /etc/clickhouse-server/config.d/keeper_port.xml.tmp /etc/clickhouse-server/config.d/keeper_port.xml
+
 # it contains some new settings, but we can safely remove it
 rm /etc/clickhouse-server/config.d/merge_tree.xml
 rm /etc/clickhouse-server/config.d/enable_wait_for_shutdown_replicated_tables.xml
@ -82,6 +88,12 @@ sudo cat /etc/clickhouse-server/config.d/keeper_port.xml \
  > /etc/clickhouse-server/config.d/keeper_port.xml.tmp
 sudo mv /etc/clickhouse-server/config.d/keeper_port.xml.tmp /etc/clickhouse-server/config.d/keeper_port.xml

+# async_replication setting doesn't exist on some older versions
+sudo cat /etc/clickhouse-server/config.d/keeper_port.xml \
+  | sed "/<async_replication>1<\/async_replication>/d" \
+  > /etc/clickhouse-server/config.d/keeper_port.xml.tmp
+sudo mv /etc/clickhouse-server/config.d/keeper_port.xml.tmp /etc/clickhouse-server/config.d/keeper_port.xml
+
 # But we still need default disk because some tables loaded only into it
 sudo cat /etc/clickhouse-server/config.d/s3_storage_policy_by_default.xml \
  | sed "s|<main><disk>s3</disk></main>|<main><disk>s3</disk></main><default><disk>default</disk></default>|" \
--- a/docs/changelogs/v23.3.12.11-lts.md
+++ b/docs/changelogs/v23.3.12.11-lts.md
@ -0,0 +1,20 @@
+---
+sidebar_position: 1
+sidebar_label: 2023
+---
+
+# 2023 Changelog
+
+### ClickHouse release v23.3.12.11-lts (414317bed21) FIXME as compared to v23.3.11.5-lts (5762a23a76d)
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* Fix async insert with deduplication for ReplicatedMergeTree using merging algorithms [#51676](https://github.com/ClickHouse/ClickHouse/pull/51676) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix deadlock on DatabaseCatalog shutdown [#51908](https://github.com/ClickHouse/ClickHouse/pull/51908) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix crash in join on sparse column [#53548](https://github.com/ClickHouse/ClickHouse/pull/53548) ([vdimir](https://github.com/vdimir)).
+* Fix rows_before_limit_at_least for DelayedSource. [#54122](https://github.com/ClickHouse/ClickHouse/pull/54122) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Fix broken `02862_sorted_distinct_sparse_fix` [#53738](https://github.com/ClickHouse/ClickHouse/pull/53738) ([Antonio Andelic](https://github.com/antonio2368)).
+
--- a/docs/changelogs/v23.3.13.6-lts.md
+++ b/docs/changelogs/v23.3.13.6-lts.md
@ -0,0 +1,13 @@
+---
+sidebar_position: 1
+sidebar_label: 2023
+---
+
+# 2023 Changelog
+
+### ClickHouse release v23.3.13.6-lts (25635e27551) FIXME as compared to v23.3.12.11-lts (414317bed21)
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* Backport moving/ part checking code from master [#54157](https://github.com/ClickHouse/ClickHouse/pull/54157) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
--- a/docs/changelogs/v23.8.2.7-lts.md
+++ b/docs/changelogs/v23.8.2.7-lts.md
@ -0,0 +1,18 @@
+---
+sidebar_position: 1
+sidebar_label: 2023
+---
+
+# 2023 Changelog
+
+### ClickHouse release v23.8.2.7-lts (f73c8f37874) FIXME as compared to v23.8.1.2992-lts (ebc7d9a9f3b)
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* Fix: parallel replicas over distributed don't read from all replicas [#54199](https://github.com/ClickHouse/ClickHouse/pull/54199) ([Igor Nikonov](https://github.com/devcrafter)).
+* Fix: allow IPv6 for bloom filter [#54200](https://github.com/ClickHouse/ClickHouse/pull/54200) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* S3Queue is experimental [#54214](https://github.com/ClickHouse/ClickHouse/pull/54214) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+
--- a/docs/en/engines/table-engines/mergetree-family/mergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/mergetree.md
@ -1139,6 +1139,8 @@ Optional parameters:
 - `s3_max_put_burst` — Max number of requests that can be issued simultaneously before hitting request per second limit. By default (`0` value) equals to `s3_max_put_rps`.
 - `s3_max_get_rps` — Maximum GET requests per second rate before throttling. Default value is `0` (unlimited).
 - `s3_max_get_burst` — Max number of requests that can be issued simultaneously before hitting request per second limit. By default (`0` value) equals to `s3_max_get_rps`.
+- `read_resource` — Resource name to be used for [scheduling](/docs/en/operations/workload-scheduling.md) of read requests to this disk. Default value is empty string (IO scheduling is not enabled for this disk).
+- `write_resource` — Resource name to be used for [scheduling](/docs/en/operations/workload-scheduling.md) of write requests to this disk. Default value is empty string (IO scheduling is not enabled for this disk).

 ### Configuring the cache

@ -1251,12 +1253,14 @@ Other parameters:
 * `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`.
+* `read_resource` — Resource name to be used for [scheduling](/docs/en/operations/workload-scheduling.md) of read requests to this disk. Default value is empty string (IO scheduling is not enabled for this disk).
+* `write_resource` — Resource name to be used for [scheduling](/docs/en/operations/workload-scheduling.md) of write requests to this disk. Default value is empty string (IO scheduling is not enabled for this disk).

 Examples of working configurations can be found in integration tests directory (see e.g. [test_merge_tree_azure_blob_storage](https://github.com/ClickHouse/ClickHouse/blob/master/tests/integration/test_merge_tree_azure_blob_storage/configs/config.d/storage_conf.xml) or [test_azure_blob_storage_zero_copy_replication](https://github.com/ClickHouse/ClickHouse/blob/master/tests/integration/test_azure_blob_storage_zero_copy_replication/configs/config.d/storage_conf.xml)).

-  :::note Zero-copy replication is not ready for production
-  Zero-copy replication is disabled by default in ClickHouse version 22.8 and higher.  This feature is not recommended for production use.
-  :::
+:::note Zero-copy replication is not ready for production
+Zero-copy replication is disabled by default in ClickHouse version 22.8 and higher.  This feature is not recommended for production use.
+:::

 ## HDFS storage {#hdfs-storage}

--- a/docs/en/engines/table-engines/special/generate.md
+++ b/docs/en/engines/table-engines/special/generate.md
@ -23,7 +23,7 @@ array or map columns and strings correspondingly in generated data.

 Generate table engine supports only `SELECT` queries.

-It supports all [DataTypes](../../../sql-reference/data-types/index.md) that can be stored in a table except `LowCardinality` and `AggregateFunction`.
+It supports all [DataTypes](../../../sql-reference/data-types/index.md) that can be stored in a table except `AggregateFunction`.

 ## Example {#example}

--- a/docs/en/interfaces/cli.md
+++ b/docs/en/interfaces/cli.md
@ -30,7 +30,7 @@ It may lack support for new features.

 ## Usage {#cli_usage}

-The client can be used in interactive and non-interactive (batch) mode. 
+The client can be used in interactive and non-interactive (batch) mode.

 ### Gather your connection details
 <ConnectionDetails />
@ -177,8 +177,8 @@ You can pass parameters to `clickhouse-client` (all parameters have a default va
 - `--user, -u` – The username. Default value: default.
 - `--password` – The password. Default value: empty string.
 - `--ask-password` - Prompt the user to enter a password.
- `--query, -q` – The query to process when using non-interactive mode. Cannot be used simultaneously with `--queries-file`.
- `--queries-file` – file path with queries to execute. Cannot be used simultaneously with `--query`.
+- `--query, -q` – The query to process when using non-interactive mode. `--query` can be specified multiple times, e.g. `--query "SELECT 1" --query "SELECT 2"`. Cannot be used simultaneously with `--queries-file`.
+- `--queries-file` – file path with queries to execute. `--queries-file` can be specified multiple times, e.g. `--query queries1.sql --query queries2.sql`. Cannot be used simultaneously with `--query`.
 - `--multiquery, -n` – If specified, multiple queries separated by semicolons can be listed after the `--query` option. For convenience, it is also possible to omit `--query` and pass the queries directly after `--multiquery`.
 - `--multiline, -m` – If specified, allow multiline queries (do not send the query on Enter).
 - `--database, -d` – Select the current default database. Default value: the current database from the server settings (‘default’ by default).
--- a/docs/en/interfaces/http.md
+++ b/docs/en/interfaces/http.md
@ -18,6 +18,8 @@ $ curl 'http://localhost:8123/'
 Ok.
 ```

+Also see: [HTTP response codes caveats](#http_response_codes_caveats).
+
 Sometimes, `curl` command is not available on user operating systems. On Ubuntu or Debian, run `sudo apt install curl`. Please refer this [documentation](https://curl.se/download.html) to install it before running the examples.

 Web UI can be accessed here: `http://localhost:8123/play`.
@ -56,7 +58,7 @@ Connection: Close
 Content-Type: text/tab-separated-values; charset=UTF-8
 X-ClickHouse-Server-Display-Name: clickhouse.ru-central1.internal
 X-ClickHouse-Query-Id: 5abe861c-239c-467f-b955-8a201abb8b7f
-X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","peak_memory_usage":"0"}
+X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334,"peak_memory_usage":"0"}

 1
 ```
@ -286,9 +288,9 @@ Similarly, you can use ClickHouse sessions in the HTTP protocol. To do this, you
 You can receive information about the progress of a query in `X-ClickHouse-Progress` response headers. To do this, enable [send_progress_in_http_headers](../operations/settings/settings.md#settings-send_progress_in_http_headers). Example of the header sequence:

 ``` text
-X-ClickHouse-Progress: {"read_rows":"2752512","read_bytes":"240570816","total_rows_to_read":"8880128","peak_memory_usage":"4371480"}
-X-ClickHouse-Progress: {"read_rows":"5439488","read_bytes":"482285394","total_rows_to_read":"8880128","peak_memory_usage":"13621616"}
-X-ClickHouse-Progress: {"read_rows":"8783786","read_bytes":"819092887","total_rows_to_read":"8880128","peak_memory_usage":"23155600"}
+X-ClickHouse-Progress: {"read_rows":"2752512","read_bytes":"240570816","total_rows_to_read":"8880128","elapsed_ns":"662334","peak_memory_usage":"4371480"}
+X-ClickHouse-Progress: {"read_rows":"5439488","read_bytes":"482285394","total_rows_to_read":"8880128","elapsed_ns":"992334","peak_memory_usage":"13621616"}
+X-ClickHouse-Progress: {"read_rows":"8783786","read_bytes":"819092887","total_rows_to_read":"8880128","elapsed_ns":"1232334","peak_memory_usage":"23155600"}
 ```

 Possible header fields:
@ -323,6 +325,27 @@ $ curl -sS 'http://localhost:8123/?max_result_bytes=4000000&buffer_size=3000000&

 Use buffering to avoid situations where a query processing error occurred after the response code and HTTP headers were sent to the client. In this situation, an error message is written at the end of the response body, and on the client-side, the error can only be detected at the parsing stage.

+## HTTP response codes caveats {#http_response_codes_caveats}
+
+Because of limitation of HTTP protocol, HTTP 200 response code does not guarantee that a query was successful.
+
+Here is an example:
+
+```
+curl -v -Ss "http://localhost:8123/?max_block_size=1&query=select+sleepEachRow(0.001),throwIf(number=2)from+numbers(5)"
+*   Trying 127.0.0.1:8123...
+...
+< HTTP/1.1 200 OK
+...
+Code: 395. DB::Exception: Value passed to 'throwIf' function is non-zero: while executing 'FUNCTION throwIf(equals(number, 2) :: 1) -> throwIf(equals(number, 2))
+```
+
+The reason for this behavior is the nature of the HTTP protocol. The HTTP header is sent first with an HTTP code of 200, followed by the HTTP body, and then the error is injected into the body as plain text.
+This behavior is independent of the format used, whether it's `Native`, `TSV`, or `JSON`; the error message will always be in the middle of the response stream.
+You can mitigate this problem by enabling `wait_end_of_query=1` ([Response Buffering](#response-buffering)). In this case, the sending of the HTTP header is delayed until the entire query is resolved.
+However, this does not completely solve the problem because the result must still fit within the `http_response_buffer_size`, and other settings like `send_progress_in_http_headers` can interfere with the delay of the header.
+The only way to catch all errors is to analyze the HTTP body before parsing it using the required format.
+
 ### Queries with Parameters {#cli-queries-with-parameters}

 You can create a query with parameters and pass values for them from the corresponding HTTP request parameters. For more information, see [Queries with Parameters for CLI](../interfaces/cli.md#cli-queries-with-parameters).
@ -416,7 +439,7 @@ $ curl -v 'http://localhost:8123/predefined_query'
 < X-ClickHouse-Format: Template
 < X-ClickHouse-Timezone: Asia/Shanghai
 < Keep-Alive: timeout=3
-< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","peak_memory_usage":"0"}
+< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334","peak_memory_usage":"0"}
 <
 # HELP "Query" "Number of executing queries"
 # TYPE "Query" counter
@ -581,7 +604,7 @@ $ curl -vv  -H 'XXX:xxx' 'http://localhost:8123/hi'
 < Content-Type: text/html; charset=UTF-8
 < Transfer-Encoding: chunked
 < Keep-Alive: timeout=3
-< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","peak_memory_usage":"0"}
+< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334","peak_memory_usage":"0"}
 <
 * Connection #0 to host localhost left intact
 Say Hi!%
@ -621,7 +644,7 @@ $ curl -v  -H 'XXX:xxx' 'http://localhost:8123/get_config_static_handler'
 < Content-Type: text/plain; charset=UTF-8
 < Transfer-Encoding: chunked
 < Keep-Alive: timeout=3
-< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","peak_memory_usage":"0"}
+< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334","peak_memory_usage":"0"}
 <
 * Connection #0 to host localhost left intact
 <html ng-app="SMI2"><head><base href="http://ui.tabix.io/"></head><body><div ui-view="" class="content-ui"></div><script src="http://loader.tabix.io/master.js"></script></body></html>%
@ -673,7 +696,7 @@ $ curl -vv -H 'XXX:xxx' 'http://localhost:8123/get_absolute_path_static_handler'
 < Content-Type: text/html; charset=UTF-8
 < Transfer-Encoding: chunked
 < Keep-Alive: timeout=3
-< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","peak_memory_usage":"0"}
+< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334","peak_memory_usage":"0"}
 <
 <html><body>Absolute Path File</body></html>
 * Connection #0 to host localhost left intact
@ -692,7 +715,7 @@ $ curl -vv -H 'XXX:xxx' 'http://localhost:8123/get_relative_path_static_handler'
 < Content-Type: text/html; charset=UTF-8
 < Transfer-Encoding: chunked
 < Keep-Alive: timeout=3
-< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","peak_memory_usage":"0"}
+< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334","peak_memory_usage":"0"}
 <
 <html><body>Relative Path File</body></html>
 * Connection #0 to host localhost left intact
--- a/docs/en/operations/backup.md
+++ b/docs/en/operations/backup.md
@ -206,6 +206,55 @@ end_time:          2022-08-30 09:21:46
 1 row in set. Elapsed: 0.002 sec.
 ```

+Along with `system.backups` table, all backup and restore operations are also tracked in the system log table [backup_log](../operations/system-tables/backup_log.md): 
+```
+SELECT *
+FROM system.backup_log
+WHERE id = '7678b0b3-f519-4e6e-811f-5a0781a4eb52'
+ORDER BY event_time_microseconds ASC
+FORMAT Vertical
+```
+```response
+Row 1:
+──────
+event_date:              2023-08-18
+event_time_microseconds: 2023-08-18 11:13:43.097414
+id:                      7678b0b3-f519-4e6e-811f-5a0781a4eb52
+name:                    Disk('backups', '1.zip')
+status:                  CREATING_BACKUP
+error:                   
+start_time:              2023-08-18 11:13:43
+end_time:                1970-01-01 03:00:00
+num_files:               0
+total_size:              0
+num_entries:             0
+uncompressed_size:       0
+compressed_size:         0
+files_read:              0
+bytes_read:              0
+
+Row 2:
+──────
+event_date:              2023-08-18
+event_time_microseconds: 2023-08-18 11:13:43.174782
+id:                      7678b0b3-f519-4e6e-811f-5a0781a4eb52
+name:                    Disk('backups', '1.zip')
+status:                  BACKUP_FAILED
+#highlight-next-line
+error:                   Code: 598. DB::Exception: Backup Disk('backups', '1.zip') already exists. (BACKUP_ALREADY_EXISTS) (version 23.8.1.1)
+start_time:              2023-08-18 11:13:43
+end_time:                2023-08-18 11:13:43
+num_files:               0
+total_size:              0
+num_entries:             0
+uncompressed_size:       0
+compressed_size:         0
+files_read:              0
+bytes_read:              0
+
+2 rows in set. Elapsed: 0.075 sec. 
+```
+
 ## Configuring BACKUP/RESTORE to use an S3 Endpoint

 To write backups to an S3 bucket you need three pieces of information:
--- a/docs/en/operations/optimizing-performance/sampling-query-profiler.md
+++ b/docs/en/operations/optimizing-performance/sampling-query-profiler.md
@ -11,6 +11,8 @@ ClickHouse runs sampling profiler that allows analyzing query execution. Using p

 Query profiler is automatically enabled in ClickHouse Cloud and you can run a sample query as follows

+:::note If you are running the following query in ClickHouse Cloud, make sure to change `FROM system.trace_log` to `FROM clusterAllReplicas(default, system.trace_log)` to select from all nodes of the cluster :::
+
 ``` sql
 SELECT
    count(),
--- a/docs/en/operations/server-configuration-parameters/settings.md
+++ b/docs/en/operations/server-configuration-parameters/settings.md
@ -2150,6 +2150,47 @@ The default server configuration file `config.xml` contains the following settin
 </crash_log>
 ```

+## backup_log {#server_configuration_parameters-backup_log}
+
+Settings for the [backup_log](../../operations/system-tables/backup_log.md) system table for logging `BACKUP` and `RESTORE` operations.
+
+Parameters:
+
+- `database` — Database name.
+- `table` — Table name.
+- `partition_by` — [Custom partitioning key](../../engines/table-engines/mergetree-family/custom-partitioning-key.md) for a system table. Can't be used if `engine` is defined.
+- `order_by` - [Custom sorting key](../../engines/table-engines/mergetree-family/mergetree.md#order_by) for a system table. Can't be used if `engine` is defined.
+- `engine` - [MergeTree Engine Definition](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-creating-a-table) for a system table. Can't be used if `partition_by` or `order_by` is defined.
+- `flush_interval_milliseconds` — Interval for flushing data from the buffer in memory to the table.
+- `max_size_rows` – Maximal size in lines for the logs. When non-flushed logs amount reaches max_size, logs dumped to the disk.
+Default: 1048576.
+- `reserved_size_rows` –  Pre-allocated memory size in lines for the logs.
+Default: 8192.
+- `buffer_size_rows_flush_threshold` – Lines amount threshold, reaching it launches flushing logs to the disk in background.
+Default: `max_size_rows / 2`.
+- `flush_on_crash` - Indication whether logs should be dumped to the disk in case of a crash.
+Default: false.
+- `storage_policy` – Name of storage policy to use for the table (optional).
+- `settings` - [Additional parameters](../../engines/table-engines/mergetree-family/mergetree.md#settings) that control the behavior of the MergeTree (optional).
+
+**Example**
+
+```xml
+<clickhouse>
+    <backup_log>
+        <database>system</database>
+        <table>backup_log</table>
+        <flush_interval_milliseconds>1000</flush_interval_milliseconds>
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <max_size_rows>1048576</max_size_rows>
+        <reserved_size_rows>8192</reserved_size_rows>
+        <buffer_size_rows_flush_threshold>524288</buffer_size_rows_flush_threshold>
+        <flush_on_crash>false</flush_on_crash>
+        <!-- <engine>Engine = MergeTree PARTITION BY event_date ORDER BY event_time TTL event_date + INTERVAL 30 day</engine> -->
+    </backup_log>
+</clickhouse>
+```
+
 ## query_masking_rules {#query-masking-rules}

 Regexp-based rules, which will be applied to queries as well as all log messages before storing them in server logs,
--- a/docs/en/operations/settings/merge-tree-settings.md
+++ b/docs/en/operations/settings/merge-tree-settings.md
@ -71,7 +71,7 @@ Possible values:

 - Any positive integer.

-Default value: 150.
+Default value: 1000.

 ClickHouse artificially executes `INSERT` longer (adds ‘sleep’) so that the background merge process can merge parts faster than they are added.

--- a/docs/en/operations/settings/settings-formats.md
+++ b/docs/en/operations/settings/settings-formats.md
@ -634,6 +634,23 @@ Ignore extra columns in rows with more columns than expected and treat missing c

 Disabled by default.

+### output_format_markdown_escape_special_characters {#output_format_markdown_escape_special_characters}
+
+When enabled, escape special characters in Markdown.
+
+[Common Mark](https://spec.commonmark.org/0.30/#example-12) defines the following special characters that can be escaped by \:
+
+```
+! " # $ % & ' ( ) * + , - . / : ; < = > ? @ [ \ ] ^ _ ` { | } ~
+```
+
+Possible values:
+
+ 0 — Disable.
+ 1 — Enable.
+
+Default value: 0.
+
 ## TSV format settings {#tsv-format-settings}

 ### input_format_tsv_empty_as_default {#input_format_tsv_empty_as_default}
--- a/docs/en/operations/settings/settings.md
+++ b/docs/en/operations/settings/settings.md
@ -4644,6 +4644,14 @@ SELECT toFloat64('1.7091'), toFloat64('1.5008753E7') SETTINGS precise_float_pars
 └─────────────────────┴──────────────────────────┘
 ```

+## partial_result_update_duration_ms
+
+Interval (in milliseconds) for sending updates with partial data about the result table to the client (in interactive mode) during query execution. Setting to 0 disables partial results. Only supported for single-threaded GROUP BY without key, ORDER BY, LIMIT and OFFSET.
+
+## max_rows_in_partial_result
+
+Maximum rows to show in the partial result after every real-time update while the query runs (use partial result limit + OFFSET as a value in case of OFFSET in the query).
+
 ## validate_tcp_client_information {#validate-tcp-client-information}

 Determines whether validation of client information enabled when query packet is received from a client using a TCP connection.
--- a/docs/en/operations/system-tables/backup_log.md
+++ b/docs/en/operations/system-tables/backup_log.md
@ -0,0 +1,145 @@
+---
+slug: /en/operations/system-tables/backup_log
+---
+# backup_log
+
+Contains logging entries with the information about `BACKUP` and `RESTORE` operations.
+
+Columns:
+
+- `event_date` ([Date](../../sql-reference/data-types/date.md)) — Date of the entry.
+- `event_time_microseconds` ([DateTime64](../../sql-reference/data-types/datetime64.md)) — Time of the entry with microseconds precision.
+- `id` ([String](../../sql-reference/data-types/string.md)) — Identifier of the backup or restore operation.
+- `name` ([String](../../sql-reference/data-types/string.md)) — Name of the backup storage (the contents of the `FROM` or `TO` clause).
+- `status` ([Enum8](../../sql-reference/data-types/enum.md)) — Operation status. Possible values:
+    - `'CREATING_BACKUP'`
+    - `'BACKUP_CREATED'`
+    - `'BACKUP_FAILED'`
+    - `'RESTORING'`
+    - `'RESTORED'`
+    - `'RESTORE_FAILED'`
+- `error` ([String](../../sql-reference/data-types/string.md)) — Error message of the failed operation (empty string for successful operations).
+- `start_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Start time of the operation.
+- `end_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — End time of the operation.
+- `num_files` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Number of files stored in the backup.
+- `total_size` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Total size of files stored in the backup.
+- `num_entries` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Number of entries in the backup, i.e. the number of files inside the folder if the backup is stored as a folder, or the number of files inside the archive if the backup is stored as an archive. It is not the same as `num_files` if it's an incremental backup or if it contains empty files or duplicates. The following is always true: `num_entries <= num_files`.
+- `uncompressed_size` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Uncompressed size of the backup.
+- `compressed_size` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Compressed size of the backup. If the backup is not stored as an archive it equals to `uncompressed_size`.
+- `files_read` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Number of files read during the restore operation.
+- `bytes_read` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Total size of files read during the restore operation.
+
+**Example**
+
+```sql
+BACKUP TABLE test_db.my_table TO Disk('backups_disk', '1.zip')
+```
+```response
+┌─id───────────────────────────────────┬─status─────────┐
+│ e5b74ecb-f6f1-426a-80be-872f90043885 │ BACKUP_CREATED │
+└──────────────────────────────────────┴────────────────┘
+```
+```sql
+SELECT * FROM system.backup_log WHERE id = 'e5b74ecb-f6f1-426a-80be-872f90043885' ORDER BY event_date, event_time_microseconds \G
+```
+```response
+Row 1:
+──────
+event_date:              2023-08-19
+event_time_microseconds: 2023-08-19 11:05:21.998566
+id:                      e5b74ecb-f6f1-426a-80be-872f90043885
+name:                    Disk('backups_disk', '1.zip')
+status:                  CREATING_BACKUP
+error:                   
+start_time:              2023-08-19 11:05:21
+end_time:                1970-01-01 03:00:00
+num_files:               0
+total_size:              0
+num_entries:             0
+uncompressed_size:       0
+compressed_size:         0
+files_read:              0
+bytes_read:              0
+
+Row 2:
+──────
+event_date:              2023-08-19
+event_time_microseconds: 2023-08-19 11:08:56.916192
+id:                      e5b74ecb-f6f1-426a-80be-872f90043885
+name:                    Disk('backups_disk', '1.zip')
+status:                  BACKUP_CREATED
+error:                   
+start_time:              2023-08-19 11:05:21
+end_time:                2023-08-19 11:08:56
+num_files:               57
+total_size:              4290364870
+num_entries:             46
+uncompressed_size:       4290362365
+compressed_size:         3525068304
+files_read:              0
+bytes_read:              0
+```
+```sql
+RESTORE TABLE test_db.my_table FROM Disk('backups_disk', '1.zip')
+```
+```response
+┌─id───────────────────────────────────┬─status───┐
+│ cdf1f731-52ef-42da-bc65-2e1bfcd4ce90 │ RESTORED │
+└──────────────────────────────────────┴──────────┘
+```
+```sql
+SELECT * FROM system.backup_log WHERE id = 'cdf1f731-52ef-42da-bc65-2e1bfcd4ce90' ORDER BY event_date, event_time_microseconds \G
+```
+```response
+Row 1:
+──────
+event_date:              2023-08-19
+event_time_microseconds: 2023-08-19 11:09:19.718077
+id:                      cdf1f731-52ef-42da-bc65-2e1bfcd4ce90
+name:                    Disk('backups_disk', '1.zip')
+status:                  RESTORING
+error:                   
+start_time:              2023-08-19 11:09:19
+end_time:                1970-01-01 03:00:00
+num_files:               0
+total_size:              0
+num_entries:             0
+uncompressed_size:       0
+compressed_size:         0
+files_read:              0
+bytes_read:              0
+
+Row 2:
+──────
+event_date:              2023-08-19
+event_time_microseconds: 2023-08-19 11:09:29.334234
+id:                      cdf1f731-52ef-42da-bc65-2e1bfcd4ce90
+name:                    Disk('backups_disk', '1.zip')
+status:                  RESTORED
+error:                   
+start_time:              2023-08-19 11:09:19
+end_time:                2023-08-19 11:09:29
+num_files:               57
+total_size:              4290364870
+num_entries:             46
+uncompressed_size:       4290362365
+compressed_size:         4290362365
+files_read:              57
+bytes_read:              4290364870
+```
+
+This is essentially the same information that is written in the system table `system.backups`:
+
+```sql
+SELECT * FROM system.backups ORDER BY start_time
+```
+```response
+┌─id───────────────────────────────────┬─name──────────────────────────┬─status─────────┬─error─┬──────────start_time─┬────────────end_time─┬─num_files─┬─total_size─┬─num_entries─┬─uncompressed_size─┬─compressed_size─┬─files_read─┬─bytes_read─┐
+│ e5b74ecb-f6f1-426a-80be-872f90043885 │ Disk('backups_disk', '1.zip') │ BACKUP_CREATED │       │ 2023-08-19 11:05:21 │ 2023-08-19 11:08:56 │        57 │ 4290364870 │          46 │        4290362365 │      3525068304 │          0 │          0 │
+│ cdf1f731-52ef-42da-bc65-2e1bfcd4ce90 │ Disk('backups_disk', '1.zip') │ RESTORED       │       │ 2023-08-19 11:09:19 │ 2023-08-19 11:09:29 │        57 │ 4290364870 │          46 │        4290362365 │      4290362365 │         57 │ 4290364870 │
+└──────────────────────────────────────┴───────────────────────────────┴────────────────┴───────┴─────────────────────┴─────────────────────┴───────────┴────────────┴─────────────┴───────────────────┴─────────────────┴────────────┴────────────┘
+```
+
+**See Also**
+
+- [Backup and Restore](../../operations/backup.md)
--- a/docs/en/operations/system-tables/distributed_ddl_queue.md
+++ b/docs/en/operations/system-tables/distributed_ddl_queue.md
@ -8,17 +8,21 @@ Contains information about [distributed ddl queries (ON CLUSTER clause)](../../s
 Columns:

 - `entry` ([String](../../sql-reference/data-types/string.md)) — Query id.
- `host_name` ([String](../../sql-reference/data-types/string.md)) — Hostname.
- `host_address` ([String](../../sql-reference/data-types/string.md)) — IP address that the Hostname resolves to.
- `port` ([UInt16](../../sql-reference/data-types/int-uint.md)) — Host Port.
- `status` ([Enum8](../../sql-reference/data-types/enum.md)) — Status of the query.
+- `entry_version` ([Nullable(UInt8)](../../sql-reference/data-types/int-uint.md)) - Version of the entry
+- `initiator_host` ([Nullable(String)](../../sql-reference/data-types/string.md)) - Host that initiated the DDL operation
+- `initiator_port` ([Nullable(UInt16)](../../sql-reference/data-types/int-uint.md)) - Port used by the initiator
 - `cluster` ([String](../../sql-reference/data-types/string.md)) — Cluster name.
 - `query` ([String](../../sql-reference/data-types/string.md)) — Query executed.
- `initiator` ([String](../../sql-reference/data-types/string.md)) — Node that executed the query.
- `query_start_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Query start time.
+- `settings` ([Map(String, String)](../../sql-reference/data-types/map.md)) - Settings used in the DDL operation
+- `query_create_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Query created time.
+- `host` ([String](../../sql-reference/data-types/string.md)) — Hostname
+- `port` ([UInt16](../../sql-reference/data-types/int-uint.md)) — Host Port.
+- `status` ([Enum8](../../sql-reference/data-types/enum.md)) — Status of the query.
+- `exception_code` ([Enum8](../../sql-reference/data-types/enum.md)) — Exception code.
+- `exception_text` ([Nullable(String)](../../sql-reference/data-types/string.md)) - Exception message
 - `query_finish_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Query finish time.
 - `query_duration_ms` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Duration of query execution (in milliseconds).
- `exception_code` ([Enum8](../../sql-reference/data-types/enum.md)) — Exception code from [ClickHouse Keeper](../../operations/tips.md#zookeeper).
+

 **Example**

@ -34,32 +38,38 @@ Query id: f544e72a-6641-43f1-836b-24baa1c9632a
 Row 1:
 ──────
 entry:             query-0000000000
-host_name:         clickhouse01
-host_address:      172.23.0.11
-port:              9000
-status:            Finished
+entry_version:     5
+initiator_host:    clickhouse01
+initiator_port:    9000
 cluster:           test_cluster
 query:             CREATE DATABASE test_db UUID '4a82697e-c85e-4e5b-a01e-a36f2a758456' ON CLUSTER test_cluster
-initiator:         clickhouse01:9000
-query_start_time:  2020-12-30 13:07:51
-query_finish_time: 2020-12-30 13:07:51
-query_duration_ms: 6
-exception_code:    ZOK
+settings:          {'max_threads':'16','use_uncompressed_cache':'0'}
+query_create_time: 2023-09-01 16:15:14
+host:              clickhouse-01
+port:              9000
+status:            Finished
+exception_code:    0
+exception_text:    
+query_finish_time: 2023-09-01 16:15:14
+query_duration_ms: 154

 Row 2:
 ──────
-entry:             query-0000000000
-host_name:         clickhouse02
-host_address:      172.23.0.12
-port:              9000
-status:            Finished
+entry:             query-0000000001
+entry_version:     5
+initiator_host:    clickhouse01
+initiator_port:    9000
 cluster:           test_cluster
 query:             CREATE DATABASE test_db UUID '4a82697e-c85e-4e5b-a01e-a36f2a758456' ON CLUSTER test_cluster
-initiator:         clickhouse01:9000
-query_start_time:  2020-12-30 13:07:51
-query_finish_time: 2020-12-30 13:07:51
-query_duration_ms: 6
-exception_code:    ZOK
+settings:          {'max_threads':'16','use_uncompressed_cache':'0'}
+query_create_time: 2023-09-01 16:15:14
+host:              clickhouse-01
+port:              9000
+status:            Finished
+exception_code:    630
+exception_text:    Code: 630. DB::Exception: Cannot drop or rename test_db, because some tables depend on it:
+query_finish_time: 2023-09-01 16:15:14
+query_duration_ms: 154

 2 rows in set. Elapsed: 0.025 sec.
 ```
--- a/docs/en/operations/system-tables/index.md
+++ b/docs/en/operations/system-tables/index.md
@ -23,7 +23,7 @@ System tables:

 Most of system tables store their data in RAM. A ClickHouse server creates such system tables at the start.

-Unlike other system tables, the system log tables [metric_log](../../operations/system-tables/metric_log.md), [query_log](../../operations/system-tables/query_log.md), [query_thread_log](../../operations/system-tables/query_thread_log.md), [trace_log](../../operations/system-tables/trace_log.md), [part_log](../../operations/system-tables/part_log.md), [crash_log](../../operations/system-tables/crash-log.md) and [text_log](../../operations/system-tables/text_log.md) are served by [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md) table engine and store their data in a filesystem by default. If you remove a table from a filesystem, the ClickHouse server creates the empty one again at the time of the next data writing. If system table schema changed in a new release, then ClickHouse renames the current table and creates a new one.
+Unlike other system tables, the system log tables [metric_log](../../operations/system-tables/metric_log.md), [query_log](../../operations/system-tables/query_log.md), [query_thread_log](../../operations/system-tables/query_thread_log.md), [trace_log](../../operations/system-tables/trace_log.md), [part_log](../../operations/system-tables/part_log.md), [crash_log](../../operations/system-tables/crash-log.md), [text_log](../../operations/system-tables/text_log.md) and [backup_log](../../operations/system-tables/backup_log.md) are served by [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md) table engine and store their data in a filesystem by default. If you remove a table from a filesystem, the ClickHouse server creates the empty one again at the time of the next data writing. If system table schema changed in a new release, then ClickHouse renames the current table and creates a new one.

 System log tables can be customized by creating a config file with the same name as the table under `/etc/clickhouse-server/config.d/`, or setting corresponding elements in `/etc/clickhouse-server/config.xml`. Elements can be customized are:

@ -32,7 +32,7 @@ System log tables can be customized by creating a config file with the same name
 - `partition_by`: specify [PARTITION BY](../../engines/table-engines/mergetree-family/custom-partitioning-key.md) expression.
 - `ttl`: specify table [TTL](../../sql-reference/statements/alter/ttl.md) expression.
 - `flush_interval_milliseconds`: interval of flushing data to disk.
- `engine`: provide full engine expression (starting with `ENGINE =` ) with parameters. This option is contradict with `partition_by` and `ttl`. If set together, the server would raise an exception and exit.
+- `engine`: provide full engine expression (starting with `ENGINE =` ) with parameters. This option conflicts with `partition_by` and `ttl`. If set together, the server will raise an exception and exit.

 An example:

--- a/docs/en/operations/system-tables/information_schema.md
+++ b/docs/en/operations/system-tables/information_schema.md
@ -3,12 +3,13 @@ slug: /en/operations/system-tables/information_schema
 ---
 # INFORMATION_SCHEMA

-`INFORMATION_SCHEMA` (`information_schema`) is a system database that contains views. Using these views, you can get information about the metadata of database objects. These views read data from the columns of the [system.columns](../../operations/system-tables/columns.md), [system.databases](../../operations/system-tables/databases.md) and [system.tables](../../operations/system-tables/tables.md) system tables.
-
-The structure and composition of system tables may change in different versions of the product, but the support of the `information_schema` makes it possible to change the structure of system tables without changing the method of access to metadata. Metadata requests do not depend on the DBMS used.
+`INFORMATION_SCHEMA` (or: `information_schema`) is a system database which provides a (somewhat) standardized, [DBMS-agnostic view](https://en.wikipedia.org/wiki/Information_schema) on metadata of database objects. The views in `INFORMATION_SCHEMA` are generally inferior to normal system tables but tools can use them to obtain basic information in a cross-DBMS manner. The structure and content of views in `INFORMATION_SCHEMA` is supposed to evolves in a backwards-compatible way, i.e. only new functionality is added but existing functionality is not changed or removed. In terms of internal implementation, views in `INFORMATION_SCHEMA` usually map to to normal system tables like [system.columns](../../operations/system-tables/columns.md), [system.databases](../../operations/system-tables/databases.md) and [system.tables](../../operations/system-tables/tables.md).

 ``` sql
 SHOW TABLES FROM INFORMATION_SCHEMA;
+
+-- or:
+SHOW TABLES FROM information_schema;
 ```

 ``` text
@ -17,6 +18,10 @@ SHOW TABLES FROM INFORMATION_SCHEMA;
 │ SCHEMATA │
 │ TABLES   │
 │ VIEWS    │
+│ columns  │
+│ schemata │
+│ tables   │
+│ views    │
 └──────────┘
 ```

@ -27,6 +32,8 @@ SHOW TABLES FROM INFORMATION_SCHEMA;
 - [TABLES](#tables)
 - [VIEWS](#views)

+Case-insensitive equivalent views, e.g. `INFORMATION_SCHEMA.columns` are provided for reasons of compatibility with other databases.
+
 ## COLUMNS {#columns}

 Contains columns read from the [system.columns](../../operations/system-tables/columns.md) system table and columns that are not supported in ClickHouse or do not make sense (always `NULL`), but must be by the standard.
--- a/docs/en/operations/system-tables/licenses.md
+++ b/docs/en/operations/system-tables/licenses.md
@ -1,7 +1,7 @@
 ---
 slug: /en/operations/system-tables/licenses
 ---
-# licenses 
+# licenses

 Contains licenses of third-party libraries that are located in the [contrib](https://github.com/ClickHouse/ClickHouse/tree/master/contrib) directory of ClickHouse sources.

@ -20,21 +20,10 @@ SELECT library_name, license_type, license_path FROM system.licenses LIMIT 15

 ``` text
 ┌─library_name───────┬─license_type─┬─license_path────────────────────────┐
-│ FastMemcpy         │ MIT          │ /contrib/FastMemcpy/LICENSE         │
-│ arrow              │ Apache       │ /contrib/arrow/LICENSE.txt          │
-│ avro               │ Apache       │ /contrib/avro/LICENSE.txt           │
 │ aws-c-common       │ Apache       │ /contrib/aws-c-common/LICENSE       │
-│ aws-c-event-stream │ Apache       │ /contrib/aws-c-event-stream/LICENSE │
-│ aws-checksums      │ Apache       │ /contrib/aws-checksums/LICENSE      │
-│ aws                │ Apache       │ /contrib/aws/LICENSE.txt            │
-│ base64             │ BSD 2-clause │ /contrib/base64/LICENSE             │
-│ boost              │ Boost        │ /contrib/boost/LICENSE_1_0.txt      │
+│ base64             │ BSD 2-clause │ /contrib/aklomp-base64/LICENSE      │
 │ brotli             │ MIT          │ /contrib/brotli/LICENSE             │
-│ capnproto          │ MIT          │ /contrib/capnproto/LICENSE          │
-│ cassandra          │ Apache       │ /contrib/cassandra/LICENSE.txt      │
-│ cctz               │ Apache       │ /contrib/cctz/LICENSE.txt           │
-│ cityhash102        │ MIT          │ /contrib/cityhash102/COPYING        │
-│ cppkafka           │ BSD 2-clause │ /contrib/cppkafka/LICENSE           │
+│ [...]              │ [...]        │ [...]                               │
 └────────────────────┴──────────────┴─────────────────────────────────────┘

 ```
--- a/docs/en/operations/system-tables/query_log.md
+++ b/docs/en/operations/system-tables/query_log.md
@ -101,7 +101,8 @@ Columns:
 - `ProfileEvents` ([Map(String, UInt64)](../../sql-reference/data-types/map.md)) — ProfileEvents that measure different metrics. The description of them could be found in the table [system.events](../../operations/system-tables/events.md#system_tables-events)
 - `Settings` ([Map(String, String)](../../sql-reference/data-types/map.md)) — Settings that were changed when the client ran the query. To enable logging changes to settings, set the `log_query_settings` parameter to 1.
 - `log_comment` ([String](../../sql-reference/data-types/string.md)) — Log comment. It can be set to arbitrary string no longer than [max_query_size](../../operations/settings/settings.md#settings-max_query_size). An empty string if it is not defined.
- `thread_ids` ([Array(UInt64)](../../sql-reference/data-types/array.md)) — Thread ids that are participating in query execution.
+- `thread_ids` ([Array(UInt64)](../../sql-reference/data-types/array.md)) — Thread ids that are participating in query execution. These threads may not have run simultaneously.
+- `peak_threads_usage` ([UInt64)](../../sql-reference/data-types/int-uint.md)) — Maximum count of simultaneous threads executing the query.
 - `used_aggregate_functions` ([Array(String)](../../sql-reference/data-types/array.md)) — Canonical names of `aggregate functions`, which were used during query execution.
 - `used_aggregate_function_combinators` ([Array(String)](../../sql-reference/data-types/array.md)) — Canonical names of `aggregate functions combinators`, which were used during query execution.
 - `used_database_engines` ([Array(String)](../../sql-reference/data-types/array.md)) — Canonical names of `database engines`, which were used during query execution.
--- a/docs/en/operations/system-tables/scheduler.md
+++ b/docs/en/operations/system-tables/scheduler.md
@ -0,0 +1,64 @@
+---
+slug: /en/operations/system-tables/scheduler
+---
+# scheduler
+
+Contains information and status for [scheduling nodes](/docs/en/operations/workload-scheduling.md/#hierarchy) residing on the local server.
+This table can be used for monitoring. The table contains a row for every scheduling node.
+
+Example:
+
+``` sql
+SELECT *
+FROM system.scheduler
+WHERE resource = 'network_read' AND path = '/prio/fair/prod'
+FORMAT Vertical
+```
+
+``` text
+Row 1:
+──────
+resource:          network_read
+path:              /prio/fair/prod
+type:              fifo
+weight:            5
+priority:          0
+is_active:         0
+active_children:   0
+dequeued_requests: 67
+dequeued_cost:     4692272
+busy_periods:      63
+vruntime:          938454.1999999989
+system_vruntime:   ᴺᵁᴸᴸ
+queue_length:      0
+queue_cost:        0
+budget:            -60524
+is_satisfied:      ᴺᵁᴸᴸ
+inflight_requests: ᴺᵁᴸᴸ
+inflight_cost:     ᴺᵁᴸᴸ
+max_requests:      ᴺᵁᴸᴸ
+max_cost:          ᴺᵁᴸᴸ
+```
+
+Columns:
+
+- `resource` (`String`) - Resource name
+- `path` (`String`) - Path to a scheduling node within this resource scheduling hierarchy
+- `type` (`String`) - Type of a scheduling node.
+- `weight` (`Float64`) - Weight of a node, used by a parent node of `fair`` type.
+- `priority` (`Int64`) - Priority of a node, used by a parent node of 'priority' type (Lower value means higher priority).
+- `is_active` (`UInt8`) - Whether this node is currently active - has resource requests to be dequeued and constraints satisfied.
+- `active_children` (`UInt64`) - The number of children in active state.
+- `dequeued_requests` (`UInt64`) - The total number of resource requests dequeued from this node.
+- `dequeued_cost` (`UInt64`) - The sum of costs (e.g. size in bytes) of all requests dequeued from this node.
+- `busy_periods` (`UInt64`) - The total number of deactivations of this node.
+- `vruntime` (`Nullable(Float64)`) - For children of `fair` nodes only. Virtual runtime of a node used by SFQ algorithm to select the next child to process in a max-min fair manner.
+- `system_vruntime` (`Nullable(Float64)`) - For `fair` nodes only. Virtual runtime showing `vruntime` of the last processed resource request. Used during child activation as the new value of `vruntime`.
+- `queue_length` (`Nullable(UInt64)`) - For `fifo` nodes only. Current number of resource requests residing in the queue.
+- `queue_cost` (`Nullable(UInt64)`) - For `fifo` nodes only. Sum of costs (e.g. size in bytes) of all requests residing in the queue.
+- `budget` (`Nullable(Int64)`) - For `fifo` nodes only. The number of available "cost units" for new resource requests. Can appear in case of discrepancy of estimated and real costs of resource requests (e.g. after read/write failure)
+- `is_satisfied` (`Nullable(UInt8)`) - For constraint nodes only (e.g. `inflight_limit`). Equals `1` if all the constraint of this node are satisfied.
+- `inflight_requests` (`Nullable(Int64)`) - For `inflight_limit` nodes only. The number of resource requests dequeued from this node, that are currently in consumption state.
+- `inflight_cost` (`Nullable(Int64)`) - For `inflight_limit` nodes only. The sum of costs (e.g. bytes) of all resource requests dequeued from this node, that are currently in consumption state.
+- `max_requests` (`Nullable(Int64)`) - For `inflight_limit` nodes only. Upper limit for `inflight_requests` leading to constraint violation.
+- `max_cost` (`Nullable(Int64)`) - For `inflight_limit` nodes only. Upper limit for `inflight_cost` leading to constraint violation.
--- a/docs/en/operations/utilities/clickhouse-copier.md
+++ b/docs/en/operations/utilities/clickhouse-copier.md
@ -43,7 +43,7 @@ Parameters:
 - `config` — The path to the `keeper.xml` file with the parameters for the connection to ClickHouse Keeper.
 - `task-path` — The path to the ClickHouse Keeper node. This node is used for syncing `clickhouse-copier` processes and storing tasks. Tasks are stored in `$task-path/description`.
 - `task-file` — Optional path to file with task configuration for initial upload to ClickHouse Keeper.
- `task-upload-force` — Force upload `task-file` even if node already exists.
+- `task-upload-force` — Force upload `task-file` even if node already exists. Default is false.
 - `base-dir` — The path to logs and auxiliary files. When it starts, `clickhouse-copier` creates `clickhouse-copier_YYYYMMHHSS_<PID>` subdirectories in `$base-dir`. If this parameter is omitted, the directories are created in the directory where `clickhouse-copier` was launched.

 ## Format of keeper.xml {#format-of-zookeeper-xml}
--- a/docs/en/operations/utilities/clickhouse-disks.md
+++ b/docs/en/operations/utilities/clickhouse-disks.md
@ -0,0 +1,38 @@
+---
+slug: /en/operations/utilities/clickhouse-disks
+sidebar_position: 59
+sidebar_label: clickhouse-disks
+---
+
+# clickhouse-disks
+
+A utility providing filesystem-like operations for ClickHouse disks.
+
+Program-wide options:
+
+* `--config-file, -C` -- path to ClickHouse config, defaults to `/etc/clickhouse-server/config.xml`.
+* `--save-logs` -- Log progress of invoked commands to `/var/log/clickhouse-server/clickhouse-disks.log`.
+* `--log-level` -- What [type](../server-configuration-parameters/settings#server_configuration_parameters-logger) of events to log, defaults to `none`.
+* `--disk` -- what disk to use for `mkdir, move, read, write, remove` commands. Defaults to `default`.
+
+## Commands
+
+* `copy [--disk-from d1] [--disk-to d2] <FROM_PATH> <TO_PATH>`.
+  Recursively copy data from `FROM_PATH` at disk `d1` (defaults to `disk` value if not provided)
+  to `TO_PATH` at disk `d2` (defaults to `disk` value if not provided).
+* `move <FROM_PATH> <TO_PATH>`.
+  Move file or directory from `FROM_PATH` to `TO_PATH`.
+* `remove <PATH>`.
+  Remove `PATH` recursively.
+* `link <FROM_PATH> <TO_PATH>`.
+  Create a hardlink from `FROM_PATH` to `TO_PATH`.
+* `list [--recursive] <PATH>...`
+  List files at `PATH`s. Non-recursive by default.
+* `list-disks`.
+  List disks names.
+* `mkdir [--recursive] <PATH>`.
+  Create a directory. Non-recursive by default.
+* `read: <FROM_PATH> [<TO_PATH>]`
+  Read a file from `FROM_PATH` to `TO_PATH` (`stdout` if not supplied).
+* `write [FROM_PATH] <TO_PATH>`.
+  Write a file from `FROM_PATH` (`stdin` if not supplied) to `TO_PATH`.
--- a/docs/en/operations/utilities/clickhouse-keeper-client.md
+++ b/docs/en/operations/utilities/clickhouse-keeper-client.md
@ -16,6 +16,8 @@ A client application to interact with clickhouse-keeper by its native protocol.
 -   `--session-timeout=TIMEOUT` — Set session timeout in seconds. Default value: 10s.
 -   `--operation-timeout=TIMEOUT` — Set operation timeout in seconds. Default value: 10s.
 -   `--history-file=FILE_PATH` — Set path of history file. Default value: `~/.keeper-client-history`.
+-   `--log-level=LEVEL` — Set log level. Default value: `information`.
+-   `--no-confirmation` — If set, will not require a confirmation on several commands. Default value `false` for interactive and `true` for query
 -   `--help` — Shows the help message.

 ## Example {#clickhouse-keeper-client-example}
@ -44,6 +46,7 @@ keeper foo bar

 -   `ls [path]` -- Lists the nodes for the given path (default: cwd)
 -   `cd [path]` -- Change the working path (default `.`)
+-   `exists <path>` -- Returns `1` if node exists, `0` otherwise
 -   `set <path> <value> [version]` -- Updates the node's value. Only update if version matches (default: -1)
 -   `create <path> <value> [mode]` -- Creates new node with the set value
 -   `touch <path>` -- Creates new node with an empty string as value. Doesn't throw an exception if the node already exists
@ -56,3 +59,5 @@ keeper foo bar
 -   `find_super_nodes <threshold> [path]` -- Finds nodes with number of children larger than some threshold for the given path (default `.`)
 -   `delete_stale_backups` -- Deletes ClickHouse nodes used for backups that are now inactive
 -   `find_big_family [path] [n]` -- Returns the top n nodes with the biggest family in the subtree (default path = `.` and n = 10)
+-   `sync <path>` -- Synchronizes node between processes and leader
+-   `reconfig <add|remove|set> "<arg>" [version]` -- Reconfigure Keeper cluster. See https://clickhouse.com/docs/en/guides/sre/keeper/clickhouse-keeper#reconfiguration
--- a/docs/en/operations/utilities/clickhouse-local.md
+++ b/docs/en/operations/utilities/clickhouse-local.md
@ -202,8 +202,8 @@ Arguments:
 - `-S`, `--structure` — table structure for input data.
 - `--input-format` — input format, `TSV` by default.
 - `-f`, `--file` — path to data, `stdin` by default.
- `-q`, `--query` — queries to execute with `;` as delimiter. Cannot be used simultaneously with `--queries-file`.
- `--queries-file` - file path with queries to execute. Cannot be used simultaneously with `--query`.
+- `-q`, `--query` — queries to execute with `;` as delimiter. `--query` can be specified multiple times, e.g. `--query "SELECT 1" --query "SELECT 2"`. Cannot be used simultaneously with `--queries-file`.
+- `--queries-file` - file path with queries to execute. `--queries-file` can be specified multiple times, e.g. `--query queries1.sql --query queries2.sql`. Cannot be used simultaneously with `--query`.
 - `--multiquery, -n` – If specified, multiple queries separated by semicolons can be listed after the `--query` option. For convenience, it is also possible to omit `--query` and pass the queries directly after `--multiquery`.
 - `-N`, `--table` — table name where to put output data, `table` by default.
 - `--format`, `--output-format` — output format, `TSV` by default.
--- a/docs/en/operations/utilities/index.md
+++ b/docs/en/operations/utilities/index.md
@ -13,4 +13,6 @@ pagination_next: 'en/operations/utilities/clickhouse-copier'
 - [clickhouse-format](../../operations/utilities/clickhouse-format.md) — Enables formatting input queries.
 - [ClickHouse obfuscator](../../operations/utilities/clickhouse-obfuscator.md) — Obfuscates data.
 - [ClickHouse compressor](../../operations/utilities/clickhouse-compressor.md) — Compresses and decompresses data.
+- [clickhouse-disks](../../operations/utilities/clickhouse-disks.md) -- Provides filesystem-like operations
+ on files among different ClickHouse disks.
 - [clickhouse-odbc-bridge](../../operations/utilities/odbc-bridge.md) — A proxy server for ODBC driver.
--- a/docs/en/operations/workload-scheduling.md
+++ b/docs/en/operations/workload-scheduling.md
@ -0,0 +1,153 @@
+---
+slug: /en/operations/workload-scheduling
+sidebar_position: 69
+sidebar_label: "Workload scheduling"
+title: "Workload scheduling"
+---
+
+When ClickHouse execute multiple queries simultaneously, they may be using shared resources (e.g. disks). Scheduling constraints and policies can be applied to regulate how resources are utilized and shared between different workloads. For every resource a scheduling hierarchy can be configured. Hierarchy root represents a resource, while leafs are queues, holding requests that exceed resource capacity.
+
+:::note
+Currently only remote disk IO can be scheduled using described method. For CPU scheduling see settings about thread pools and [`concurrent_threads_soft_limit_num`](server-configuration-parameters/settings.md#concurrent_threads_soft_limit_num). For flexible memory limits see [Memory overcommit](settings/memory-overcommit.md)
+:::
+
+## Disk configuration {#disk-config}
+
+To enable IO scheduling for a specific disk, you have to specify `read_resource` and/or `write_resource` in storage configuration. It says ClickHouse what resource should be used for every read and write requests with given disk. Read and write resource can refer to the same resource name, which is useful for local SSDs or HDDs. Multiple different disks also can refer to the same resource, which is useful for remote disks: if you want to be able to allow fair division of network bandwidth between e.g. "production" and "development" workloads.
+
+Example:
+```xml
+<clickhouse>
+    <storage_configuration>
+        ...
+        <disks>
+            <s3>
+                <type>s3</type>
+                <endpoint>https://clickhouse-public-datasets.s3.amazonaws.com/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>
+                <read_resource>network_read</read_resource>
+                <write_resource>network_write</write_resource>
+            </s3>
+        </disks>
+        <policies>
+            <s3_main>
+                <volumes>
+                    <main>
+                        <disk>s3</disk>
+                    </main>
+                </volumes>
+            </s3_main>
+        </policies>
+    </storage_configuration>
+</clickhouse>
+```
+
+## Workload markup {#workload_markup}
+
+Queries can be marked with setting `workload` to distinguish different workloads. If `workload` is not set, than value "default" is used. Note that you are able to specify the other value using settings profiles. Setting constraints can be used to make `workload` constant if you want all queries from the user to be marked with fixed value of `workload` setting.
+
+Let's consider an example of a system with two different workloads: "production" and "development".
+
+```sql
+SELECT count() FROM my_table WHERE value = 42 SETTINGS workload = 'production'
+SELECT count() FROM my_table WHERE value = 13 SETTINGS workload = 'development'
+```
+
+## Resource scheduling hierarchy {#hierarchy}
+
+From the standpoint of scheduling subsystem a resource represents a hierarchy of scheduling nodes.
+
+```mermaid
+graph TD
+    subgraph network_read
+    nr_root(("/"))
+    -->|100 concurrent requests| nr_fair("fair")
+    -->|75% bandwidth| nr_prod["prod"]
+    nr_fair
+    -->|25% bandwidth| nr_dev["dev"]
+    end
+
+    subgraph network_write
+    nw_root(("/"))
+    -->|100 concurrent requests| nw_fair("fair")
+    -->|75% bandwidth| nw_prod["prod"]
+    nw_fair
+    -->|25% bandwidth| nw_dev["dev"]
+    end
+```
+
+**Possible node types:**
+* `inflight_limit` (constraint) - blocks if either number of concurrent in-flight requests exceeds `max_requests`, or their total cost exceeds `max_cost`; must have a single child.
+* `fair` (policy) - selects the next request to serve from one of its children nodes according to max-min fairness; children nodes can specify `weight` (default is 1).
+* `priority` (policy) - selects the next request to serve from one of its children nodes according to static priorities (lower value means higher priority); children nodes can specify `priority` (default is 0).
+* `fifo` (queue) - leaf of the hierarchy capable of holding requests that exceed resource capacity.
+
+The following example shows how to define IO scheduling hierarchies shown in the picture:
+
+```xml
+<clickhouse>
+    <resources>
+        <network_read>
+            <node path="/">
+                <type>inflight_limit</type>
+                <max_requests>100</max_requests>
+            </node>
+            <node path="/fair">
+                <type>fair</type>
+            </node>
+            <node path="/fair/prod">
+                <type>fifo</type>
+                <weight>3</weight>
+            </node>
+            <node path="/fair/dev">
+                <type>fifo</type>
+            </node>
+        </network_read>
+        <network_write>
+            <node path="/">
+                <type>inflight_limit</type>
+                <max_requests>100</max_requests>
+            </node>
+            <node path="/fair">
+                <type>fair</type>
+            </node>
+            <node path="/fair/prod">
+                <type>fifo</type>
+                <weight>3</weight>
+            </node>
+            <node path="/fair/dev">
+                <type>fifo</type>
+            </node>
+        </network_write>
+    </resources>
+</clickhouse>
+```
+
+## Workload classifiers {#workload_classifiers}
+
+Workload classifiers are used to define mapping from `workload` specified by a query into leaf-queues that should be used for specific resources. At the moment, workload classification is simple: only static mapping is available.
+
+Example:
+```xml
+<clickhouse>
+    <workload_classifiers>
+        <production>
+            <network_read>/fair/prod</network_read>
+            <network_write>/fair/prod</network_write>
+        </production>
+        <development>
+            <network_read>/fair/dev</network_read>
+            <network_write>/fair/dev</network_write>
+        </development>
+        <default>
+            <network_read>/fair/dev</network_read>
+            <network_write>/fair/dev</network_write>
+        </default>
+    </workload_classifiers>
+</clickhouse>
+```
+
+
+## See also
+ - [system.scheduler](/docs/en/operations/system-tables/scheduler.md)
--- a/docs/en/sql-reference/aggregate-functions/reference/stddevpop.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/stddevpop.md
@ -7,6 +7,10 @@ sidebar_position: 30

 The result is equal to the square root of [varPop](../../../sql-reference/aggregate-functions/reference/varpop.md).

-:::note    
+Alias:
+- `STD`
+- `STDDEV_POP`
+
+:::note
 This function uses a numerically unstable algorithm. If you need [numerical stability](https://en.wikipedia.org/wiki/Numerical_stability) in calculations, use the `stddevPopStable` function. It works slower but provides a lower computational error.
 :::
--- a/docs/en/sql-reference/aggregate-functions/reference/stddevsamp.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/stddevsamp.md
@ -7,6 +7,8 @@ sidebar_position: 31

 The result is equal to the square root of [varSamp](../../../sql-reference/aggregate-functions/reference/varsamp.md).

-:::note    
+Alias: `STDDEV_SAMP`.
+
+:::note
 This function uses a numerically unstable algorithm. If you need [numerical stability](https://en.wikipedia.org/wiki/Numerical_stability) in calculations, use the `stddevSampStable` function. It works slower but provides a lower computational error.
 :::
--- a/docs/en/sql-reference/aggregate-functions/reference/varpop.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/varpop.md
@ -9,6 +9,8 @@ Calculates the amount `Σ((x - x̅)^2) / n`, where `n` is the sample size and `x

 In other words, dispersion for a set of values. Returns `Float64`.

-:::note    
+Alias: `VAR_POP`.
+
+:::note
 This function uses a numerically unstable algorithm. If you need [numerical stability](https://en.wikipedia.org/wiki/Numerical_stability) in calculations, use the `varPopStable` function. It works slower but provides a lower computational error.
 :::
--- a/docs/en/sql-reference/aggregate-functions/reference/varsamp.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/varsamp.md
@ -11,6 +11,8 @@ It represents an unbiased estimate of the variance of a random variable if passe

 Returns `Float64`. When `n <= 1`, returns `+∞`.

-:::note    
+Alias: `VAR_SAMP`.
+
+:::note
 This function uses a numerically unstable algorithm. If you need [numerical stability](https://en.wikipedia.org/wiki/Numerical_stability) in calculations, use the `varSampStable` function. It works slower but provides a lower computational error.
 :::
--- a/docs/en/sql-reference/data-types/decimal.md
+++ b/docs/en/sql-reference/data-types/decimal.md
@ -4,15 +4,17 @@ sidebar_position: 42
 sidebar_label: Decimal
 ---

-# Decimal(P, S), Decimal32(S), Decimal64(S), Decimal128(S), Decimal256(S)
+# Decimal, Decimal(P), Decimal(P, S), Decimal32(S), Decimal64(S), Decimal128(S), Decimal256(S)

 Signed fixed-point numbers that keep precision during add, subtract and multiply operations. For division least significant digits are discarded (not rounded).

 ## Parameters

- P - precision. Valid range: \[ 1 : 76 \]. Determines how many decimal digits number can have (including fraction).
+- P - precision. Valid range: \[ 1 : 76 \]. Determines how many decimal digits number can have (including fraction). By default the precision is 10.
 - S - scale. Valid range: \[ 0 : P \]. Determines how many decimal digits fraction can have.

+Decimal(P) is equivalent to Decimal(P, 0). Similarly, the syntax Decimal is equivalent to Decimal(10, 0).
+
 Depending on P parameter value Decimal(P, S) is a synonym for:
 - P from \[ 1 : 9 \] - for Decimal32(S)
 - P from \[ 10 : 18 \] - for Decimal64(S)
--- a/docs/en/sql-reference/dictionaries/index.md
+++ b/docs/en/sql-reference/dictionaries/index.md
@ -2361,6 +2361,12 @@ Result:
 └────────────────────────────────────────┴───────────────────────────────────────────────────────────────────────────────────────┘
 ```

+#### Matching Modes
+
+Pattern matching behavior can be modified with certain dictionary settings:
+- `regexp_dict_flag_case_insensitive`: Use case-insensitive matching (defaults to `false`). Can be overridden in individual expressions with `(?i)` and `(?-i)`.
+- `regexp_dict_flag_dotall`: Allow '.' to match newline characters (defaults to `false`).
+
 ### Use Regular Expression Tree Dictionary in ClickHouse Cloud

 Above used `YAMLRegExpTree` source works in ClickHouse Open Source but not in ClickHouse Cloud. To use regexp tree dictionaries in ClickHouse could, first create a regexp tree dictionary from a YAML file locally in ClickHouse Open Source, then dump this dictionary into a CSV file using the `dictionary` table function and the [INTO OUTFILE](../statements/select/into-outfile.md) clause.
--- a/docs/en/sql-reference/functions/date-time-functions.md
+++ b/docs/en/sql-reference/functions/date-time-functions.md
@ -237,6 +237,11 @@ type_samoa: DateTime('US/Samoa')
 int32samoa: 1546300800
 ```

+**See Also**
+
+- [formatDateTime](#date_time_functions-formatDateTime) - supports non-constant timezone.
+- [toString](type-conversion-functions.md#tostring) - supports non-constant timezone.
+
 ## timeZoneOf

 Returns the timezone name of [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md) data types.
@ -720,6 +725,42 @@ SELECT toDate('2016-12-27') AS date, toYearWeek(date) AS yearWeek0, toYearWeek(d
 └────────────┴───────────┴───────────┴───────────┴───────────────┘
 ```

+## toDaysSinceYearZero
+
+Returns for a given date, the number of days passed since [1 January 0000](https://en.wikipedia.org/wiki/Year_zero) in the [proleptic Gregorian calendar defined by ISO 8601](https://en.wikipedia.org/wiki/Gregorian_calendar#Proleptic_Gregorian_calendar). The calculation is the same as in MySQL's [`TO_DAYS()`](https://dev.mysql.com/doc/refman/8.0/en/date-and-time-functions.html#function_to-days) function.
+
+**Syntax**
+
+``` sql
+toDaysSinceYearZero(date)
+```
+
+Aliases: `TO_DAYS`
+
+**Arguments**
+
+- `date` — The date to calculate the number of days passed since year zero from. [Date](../../sql-reference/data-types/date.md) or [Date32](../../sql-reference/data-types/date32.md).
+
+**Returned value**
+
+The number of days passed since date 0000-01-01.
+
+Type: [UInt32](../../sql-reference/data-types/int-uint.md).
+
+**Example**
+
+``` sql
+SELECT toDaysSinceYearZero(toDate('2023-09-08'));
+```
+
+Result:
+
+``` text
+┌─toDaysSinceYearZero(toDate('2023-09-08')))─┐
+│                                     713569 │
+└────────────────────────────────────────────┘
+```
+
 ## age

 Returns the `unit` component of the difference between `startdate` and `enddate`. The difference is calculated using a precision of 1 microsecond.
@ -942,6 +983,8 @@ Result:

 Adds the time interval or date interval to the provided date or date with time.

+If the addition results in a value outside the bounds of the data type, the result is undefined.
+
 **Syntax**

 ``` sql
@ -965,13 +1008,13 @@ Aliases: `dateAdd`, `DATE_ADD`.
    - `year`

 - `value` — Value of interval to add. [Int](../../sql-reference/data-types/int-uint.md).
- `date` — The date or date with time to which `value` is added. [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
+- `date` — The date or date with time to which `value` is added. [Date](../../sql-reference/data-types/date.md), [Date32](../../sql-reference/data-types/date32.md), [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md).

 **Returned value**

 Date or date with time obtained by adding `value`, expressed in `unit`, to `date`.

-Type: [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
+Type: [Date](../../sql-reference/data-types/date.md), [Date32](../../sql-reference/data-types/date32.md), [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md).

 **Example**

@ -987,10 +1030,16 @@ Result:
 └───────────────────────────────────────────────┘
 ```

+**See Also**
+
+- [addDate](#addDate)
+
 ## date\_sub

 Subtracts the time interval or date interval from the provided date or date with time.

+If the subtraction results in a value outside the bounds of the data type, the result is undefined.
+
 **Syntax**

 ``` sql
@ -1015,13 +1064,13 @@ Aliases: `dateSub`, `DATE_SUB`.
    - `year`

 - `value` — Value of interval to subtract. [Int](../../sql-reference/data-types/int-uint.md).
- `date` — The date or date with time from which `value` is subtracted. [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
+- `date` — The date or date with time from which `value` is subtracted. [Date](../../sql-reference/data-types/date.md), [Date32](../../sql-reference/data-types/date32.md), [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md).

 **Returned value**

 Date or date with time obtained by subtracting `value`, expressed in `unit`, from `date`.

-Type: [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
+Type: [Date](../../sql-reference/data-types/date.md), [Date32](../../sql-reference/data-types/date32.md), [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md).

 **Example**

@ -1037,10 +1086,15 @@ Result:
 └────────────────────────────────────────────────┘
 ```

+**See Also**
+- [subDate](#subDate)
+
 ## timestamp\_add

 Adds the specified time value with the provided date or date time value.

+If the addition results in a value outside the bounds of the data type, the result is undefined.
+
 **Syntax**

 ``` sql
@ -1051,7 +1105,7 @@ Aliases: `timeStampAdd`, `TIMESTAMP_ADD`.

 **Arguments**

- `date` — Date or date with time. [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
+- `date` — Date or date with time. [Date](../../sql-reference/data-types/date.md), [Date32](../../sql-reference/data-types/date32.md), [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md).
 - `value` — Value of interval to add. [Int](../../sql-reference/data-types/int-uint.md).
 - `unit` — The type of interval to add. [String](../../sql-reference/data-types/string.md).
    Possible values:
@ -1069,7 +1123,7 @@ Aliases: `timeStampAdd`, `TIMESTAMP_ADD`.

 Date or date with time with the specified `value` expressed in `unit` added to `date`.

-Type: [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
+Type: [Date](../../sql-reference/data-types/date.md), [Date32](../../sql-reference/data-types/date32.md), [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md).

 **Example**

@ -1089,6 +1143,8 @@ Result:

 Subtracts the time interval from the provided date or date with time.

+If the subtraction results in a value outside the bounds of the data type, the result is undefined.
+
 **Syntax**

 ``` sql
@ -1112,13 +1168,13 @@ Aliases: `timeStampSub`, `TIMESTAMP_SUB`.
    - `year`

 - `value` — Value of interval to subtract. [Int](../../sql-reference/data-types/int-uint.md).
- `date` — Date or date with time. [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
+- `date` — Date or date with time. [Date](../../sql-reference/data-types/date.md), [Date32](../../sql-reference/data-types/date32.md), [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md).

 **Returned value**

 Date or date with time obtained by subtracting `value`, expressed in `unit`, from `date`.

-Type: [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
+Type: [Date](../../sql-reference/data-types/date.md), [Date32](../../sql-reference/data-types/date32.md), [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md).

 **Example**

@ -1134,6 +1190,90 @@ Result:
 └──────────────────────────────────────────────────────────────┘
 ```

+## addDate
+
+Adds the time interval or date interval to the provided date or date with time.
+
+If the addition results in a value outside the bounds of the data type, the result is undefined.
+
+**Syntax**
+
+``` sql
+addDate(date, interval)
+```
+
+**Arguments**
+
+- `date` — The date or date with time to which `interval` is added. [Date](../../sql-reference/data-types/date.md), [Date32](../../sql-reference/data-types/date32.md), [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md).
+- `interval` — Interval to add. [Interval](../../sql-reference/data-types/special-data-types/interval.md).
+
+**Returned value**
+
+Date or date with time obtained by adding `interval` to `date`.
+
+Type: [Date](../../sql-reference/data-types/date.md), [Date32](../../sql-reference/data-types/date32.md), [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md).
+
+**Example**
+
+```sql
+SELECT addDate(toDate('2018-01-01'), INTERVAL 3 YEAR);
+```
+
+Result:
+
+```text
+┌─addDate(toDate('2018-01-01'), toIntervalYear(3))─┐
+│                                       2021-01-01 │
+└──────────────────────────────────────────────────┘
+```
+
+Alias: `ADDDATE`
+
+**See Also**
+- [date_add](#date_add)
+
+## subDate
+
+Subtracts the time interval or date interval from the provided date or date with time.
+
+If the subtraction results in a value outside the bounds of the data type, the result is undefined.
+
+**Syntax**
+
+``` sql
+subDate(date, interval)
+```
+
+**Arguments**
+
+- `date` — The date or date with time from which `interval` is subtracted. [Date](../../sql-reference/data-types/date.md), [Date32](../../sql-reference/data-types/date32.md), [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md).
+- `interval` — Interval to subtract. [Interval](../../sql-reference/data-types/special-data-types/interval.md).
+
+**Returned value**
+
+Date or date with time obtained by subtracting `interval` from `date`.
+
+Type: [Date](../../sql-reference/data-types/date.md), [Date32](../../sql-reference/data-types/date32.md), [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md).
+
+**Example**
+
+```sql
+SELECT subDate(toDate('2018-01-01'), INTERVAL 3 YEAR);
+```
+
+Result:
+
+```text
+┌─subDate(toDate('2018-01-01'), toIntervalYear(3))─┐
+│                                       2015-01-01 │
+└──────────────────────────────────────────────────┘
+```
+
+Alias: `SUBDATE`
+
+**See Also**
+- [date_sub](#date_sub)
+
 ## now

 Returns the current date and time at the moment of query analysis. The function is a constant expression.
@ -1494,6 +1634,33 @@ Result:
 └─────────────────────────────────────────────────────────────────────┘
 ```

+Additionally, the `formatDateTime` function can take a third String argument containing the name of the time zone. Example: `Asia/Istanbul`. In this case, the time is formatted according to the specified time zone.
+
+**Example**
+
+```sql
+SELECT
+    now() AS ts,
+    time_zone,
+    formatDateTime(ts, '%T', time_zone) AS str_tz_time
+FROM system.time_zones
+WHERE time_zone LIKE 'Europe%'
+LIMIT 10
+
+┌──────────────────ts─┬─time_zone─────────┬─str_tz_time─┐
+│ 2023-09-08 19:13:40 │ Europe/Amsterdam  │ 21:13:40    │
+│ 2023-09-08 19:13:40 │ Europe/Andorra    │ 21:13:40    │
+│ 2023-09-08 19:13:40 │ Europe/Astrakhan  │ 23:13:40    │
+│ 2023-09-08 19:13:40 │ Europe/Athens     │ 22:13:40    │
+│ 2023-09-08 19:13:40 │ Europe/Belfast    │ 20:13:40    │
+│ 2023-09-08 19:13:40 │ Europe/Belgrade   │ 21:13:40    │
+│ 2023-09-08 19:13:40 │ Europe/Berlin     │ 21:13:40    │
+│ 2023-09-08 19:13:40 │ Europe/Bratislava │ 21:13:40    │
+│ 2023-09-08 19:13:40 │ Europe/Brussels   │ 21:13:40    │
+│ 2023-09-08 19:13:40 │ Europe/Bucharest  │ 22:13:40    │
+└─────────────────────┴───────────────────┴─────────────┘
+```
+
 **See Also**

 - [formatDateTimeInJodaSyntax](##formatDateTimeInJodaSyntax)
@ -1603,7 +1770,7 @@ monthName(date)

 **Arguments**

- `date` — Date or date with time. [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
+- `date` — Date or date with time. [Date](../../sql-reference/data-types/date.md), [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md).

 **Returned value**

--- a/docs/en/sql-reference/functions/functions-for-nulls.md
+++ b/docs/en/sql-reference/functions/functions-for-nulls.md
@ -92,6 +92,50 @@ Result:
 └───┘
 ```

+## isZeroOrNull
+
+Returns whether the argument is 0 (zero) or [NULL](../../sql-reference/syntax.md#null-literal).
+
+``` sql
+isZeroOrNull(x)
+```
+
+**Arguments:**
+
+- `x` — A value of non-compound data type.
+
+**Returned value**
+
+- `1` if `x` is 0 (zero) or `NULL`.
+- `0` else.
+
+**Example**
+
+Table:
+
+``` text
+┌─x─┬────y─┐
+│ 1 │ ᴺᵁᴸᴸ │
+│ 2 │    0 │
+│ 3 │    3 │
+└───┴──────┘
+```
+
+Query:
+
+``` sql
+SELECT x FROM t_null WHERE isZeroOrNull(y);
+```
+
+Result:
+
+``` text
+┌─x─┐
+│ 1 │
+│ 2 │
+└───┘
+```
+
 ## coalesce

 Returns the leftmost non-`NULL` argument.
--- a/docs/en/sql-reference/functions/nlp-functions.md
+++ b/docs/en/sql-reference/functions/nlp-functions.md
@ -204,7 +204,7 @@ Other possible results:
 Query:

 ```sql
-SELECT detectLanguageMixed('Je pense que je ne parviendrai jamais à parler français comme un natif. Where there’s a will, there’s a way.');
+SELECT detectLanguage('Je pense que je ne parviendrai jamais à parler français comme un natif. Where there’s a will, there’s a way.');
 ```

 Result:
--- a/docs/en/sql-reference/functions/splitting-merging-functions.md
+++ b/docs/en/sql-reference/functions/splitting-merging-functions.md
@ -33,6 +33,13 @@ Returns an array of selected substrings. Empty substrings may be selected when:

 Type: [Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md)).

+:::note
+The behavior of parameter `max_substrings` changed starting with ClickHouse v22.11. In versions older than that, `max_substrings` > 0 meant that `max_substring`-many splits were performed and that the remainder of the string was returned as the final element of the list.
+For example,
+- in v22.10: `SELECT splitByChar('=', 'a=b=c=d', 2); -- ['a','b','c=d']`
+- in v22.11: `SELECT splitByChar('=', 'a=b=c=d', 2); -- ['a','b']`
+:::
+
 **Example**

 ``` sql
@ -63,7 +70,6 @@ splitByString(separator, s[, max_substrings]))
 - `s` — The string to split. [String](../../sql-reference/data-types/string.md).
 - `max_substrings` — An optional `Int64` defaulting to 0. When `max_substrings` > 0, the returned substrings will be no more than `max_substrings`, otherwise the function will return as many substrings as possible.

-
 **Returned value(s)**

 Returns an array of selected substrings. Empty substrings may be selected when:
--- a/docs/en/sql-reference/functions/type-conversion-functions.md
+++ b/docs/en/sql-reference/functions/type-conversion-functions.md
@ -892,16 +892,29 @@ Query:

 ``` sql
 SELECT
-    now() AS now_local,
-    toString(now(), 'Asia/Yekaterinburg') AS now_yekat;
+    now() AS ts,
+    time_zone,
+    toString(ts, time_zone) AS str_tz_datetime
+FROM system.time_zones
+WHERE time_zone LIKE 'Europe%'
+LIMIT 10
 ```

 Result:

 ```response
-┌───────────now_local─┬─now_yekat───────────┐
-│ 2016-06-15 00:11:21 │ 2016-06-15 02:11:21 │
-└─────────────────────┴─────────────────────┘
+┌──────────────────ts─┬─time_zone─────────┬─str_tz_datetime─────┐
+│ 2023-09-08 19:14:59 │ Europe/Amsterdam  │ 2023-09-08 21:14:59 │
+│ 2023-09-08 19:14:59 │ Europe/Andorra    │ 2023-09-08 21:14:59 │
+│ 2023-09-08 19:14:59 │ Europe/Astrakhan  │ 2023-09-08 23:14:59 │
+│ 2023-09-08 19:14:59 │ Europe/Athens     │ 2023-09-08 22:14:59 │
+│ 2023-09-08 19:14:59 │ Europe/Belfast    │ 2023-09-08 20:14:59 │
+│ 2023-09-08 19:14:59 │ Europe/Belgrade   │ 2023-09-08 21:14:59 │
+│ 2023-09-08 19:14:59 │ Europe/Berlin     │ 2023-09-08 21:14:59 │
+│ 2023-09-08 19:14:59 │ Europe/Bratislava │ 2023-09-08 21:14:59 │
+│ 2023-09-08 19:14:59 │ Europe/Brussels   │ 2023-09-08 21:14:59 │
+│ 2023-09-08 19:14:59 │ Europe/Bucharest  │ 2023-09-08 22:14:59 │
+└─────────────────────┴───────────────────┴─────────────────────┘
 ```

 Also see the `toUnixTimestamp` function.
--- a/docs/en/sql-reference/statements/alter/comment.md
+++ b/docs/en/sql-reference/statements/alter/comment.md
@ -57,3 +57,9 @@ Output of a removed comment:
 │         │
 └─────────┘
 ```
+
+**Caveats**
+
+For Replicated tables, the comment can be different on different replicas. Modifying the comment applies to a single replica.
+
+The feature is available since version 23.9. It does not work in previous ClickHouse versions.
--- a/docs/en/sql-reference/statements/alter/projection.md
+++ b/docs/en/sql-reference/statements/alter/projection.md
@ -22,7 +22,7 @@ You can see more technical details about how projections work internally on this
 ## Example filtering without using primary keys

 Creating the table:
-```
+```sql
 CREATE TABLE visits_order
 (
   `user_id` UInt64,
@ -34,7 +34,7 @@ ENGINE = MergeTree()
 PRIMARY KEY user_agent
 ```
 Using `ALTER TABLE`, we could add the Projection to an existing table:
-```
+```sql
 ALTER TABLE visits_order ADD PROJECTION user_name_projection (
 SELECT
 *
@ -44,7 +44,7 @@ ORDER BY user_name
 ALTER TABLE visits_order MATERIALIZE PROJECTION user_name_projection
 ```
 Inserting the data:
-```
+```sql
 INSERT INTO visits_order SELECT
    number,
    'test',
@ -55,7 +55,7 @@ FROM numbers(1, 100);

 The Projection will allow us to filter by `user_name` fast even if in the original Table `user_name` was not defined as a `PRIMARY_KEY`.
 At query time ClickHouse determined that less data will be processed if the projection is used, as the data is ordered by `user_name`.
-```
+```sql
 SELECT
    *
 FROM visits_order
@ -64,14 +64,14 @@ LIMIT 2
 ```

 To verify that a query is using the projection, we could review the `system.query_log` table. On the `projections` field we have the name of the projection used or empty if none has been used:
-```
+```sql
 SELECT query, projections FROM system.query_log WHERE query_id='<query_id>'
 ```

 ## Example pre-aggregation query

 Creating the table with the Projection:
-```
+```sql
 CREATE TABLE visits
 (
   `user_id` UInt64,
@ -90,7 +90,7 @@ ENGINE = MergeTree()
 ORDER BY user_agent
 ```
 Inserting the data:
-```
+```sql
 INSERT INTO visits SELECT
    number,
    'test',
@ -98,7 +98,7 @@ INSERT INTO visits SELECT
    'Android'
 FROM numbers(1, 100);
 ```
-```
+```sql
 INSERT INTO visits SELECT
    number,
    'test',
@ -107,7 +107,7 @@ INSERT INTO visits SELECT
 FROM numbers(100, 500);
 ```
 We will execute a first query using `GROUP BY` using the field `user_agent`, this query will not use the projection defined as the pre-aggregation does not match.
-```
+```sql
 SELECT
    user_agent,
    count(DISTINCT user_id)
@ -116,7 +116,7 @@ GROUP BY user_agent
 ```

 To use the projection we could execute queries that select part of, or all of the pre-aggregation and `GROUP BY` fields.
-```
+```sql
 SELECT
    user_agent
 FROM visits
@ -132,7 +132,7 @@ GROUP BY user_agent
 ```

 As mentioned before, we could review the `system.query_log` table. On the `projections` field we have the name of the projection used or empty if none has been used:
-```
+```sql
 SELECT query, projections FROM system.query_log WHERE query_id='<query_id>'
 ```

--- a/docs/en/sql-reference/statements/create/table.md
+++ b/docs/en/sql-reference/statements/create/table.md
@ -391,15 +391,19 @@ DEFLATE_QPL is not available in ClickHouse Cloud.

 ### Specialized Codecs

-These codecs are designed to make compression more effective by using specific features of data. Some of these codecs do not compress data themself. Instead, they prepare the data for a common purpose codec, which compresses it better than without this preparation.
+These codecs are designed to make compression more effective by exploiting specific features of the data. Some of these codecs do not compress data themself, they instead preprocess the data such that a second compression stage using a general-purpose codec can achieve a higher data compression rate.

 #### Delta

-`Delta(delta_bytes)` — Compression approach in which raw values are replaced by the difference of two neighboring values, except for the first value that stays unchanged. Up to `delta_bytes` are used for storing delta values, so `delta_bytes` is the maximum size of raw values. Possible `delta_bytes` values: 1, 2, 4, 8. The default value for `delta_bytes` is `sizeof(type)` if equal to 1, 2, 4, or 8. In all other cases, it’s 1.
+`Delta(delta_bytes)` — Compression approach in which raw values are replaced by the difference of two neighboring values, except for the first value that stays unchanged. Up to `delta_bytes` are used for storing delta values, so `delta_bytes` is the maximum size of raw values. Possible `delta_bytes` values: 1, 2, 4, 8. The default value for `delta_bytes` is `sizeof(type)` if equal to 1, 2, 4, or 8. In all other cases, it’s 1. Delta is a data preparation codec, i.e. it cannot be used stand-alone.

 #### DoubleDelta

-`DoubleDelta(bytes_size)` — Calculates delta of deltas and writes it in compact binary form. Possible `bytes_size` values: 1, 2, 4, 8, the default value is `sizeof(type)` if equal to 1, 2, 4, or 8. In all other cases, it’s 1. Optimal compression rates are achieved for monotonic sequences with a constant stride, such as time series data. Can be used with any fixed-width type. Implements the algorithm used in Gorilla TSDB, extending it to support 64-bit types. Uses 1 extra bit for 32-bit deltas: 5-bit prefixes instead of 4-bit prefixes. For additional information, see Compressing Time Stamps in [Gorilla: A Fast, Scalable, In-Memory Time Series Database](http://www.vldb.org/pvldb/vol8/p1816-teller.pdf).
+`DoubleDelta(bytes_size)` — Calculates delta of deltas and writes it in compact binary form. Possible `bytes_size` values: 1, 2, 4, 8, the default value is `sizeof(type)` if equal to 1, 2, 4, or 8. In all other cases, it’s 1. Optimal compression rates are achieved for monotonic sequences with a constant stride, such as time series data. Can be used with any fixed-width type. Implements the algorithm used in Gorilla TSDB, extending it to support 64-bit types. Uses 1 extra bit for 32-bit deltas: 5-bit prefixes instead of 4-bit prefixes. For additional information, see Compressing Time Stamps in [Gorilla: A Fast, Scalable, In-Memory Time Series Database](http://www.vldb.org/pvldb/vol8/p1816-teller.pdf). DoubleDelta is a data preparation codec, i.e. it cannot be used stand-alone.
+
+#### GCD
+
+`GCD()` - - Calculates the greatest common denominator (GCD) of the values in the column, then divides each value by the GCD. Can be used with integer, decimal and date/time columns. The codec is well suited for columns with values that change (increase or decrease) in multiples of the GCD, e.g. 24, 28, 16, 24, 8, 24 (GCD = 4). GCD is a data preparation codec, i.e. it cannot be used stand-alone.

 #### Gorilla

--- a/docs/en/sql-reference/statements/optimize.md
+++ b/docs/en/sql-reference/statements/optimize.md
@ -94,8 +94,10 @@ Result:
 │           1 │             1 │     3 │             3 │
 └─────────────┴───────────────┴───────┴───────────────┘
 ```
+All following examples are executed against this state with 5 rows.

-When columns for deduplication are not specified, all of them are taken into account. Row is removed only if all values in all columns are equal to corresponding values in previous row:
+#### `DEDUPLICATE`
+When columns for deduplication are not specified, all of them are taken into account. The row is removed only if all values in all columns are equal to corresponding values in the previous row:

 ``` sql
 OPTIMIZE TABLE example FINAL DEDUPLICATE;
@ -116,7 +118,7 @@ Result:
 │           1 │             1 │     3 │             3 │
 └─────────────┴───────────────┴───────┴───────────────┘
 ```
-
+#### `DEDUPLICATE BY *`
 When columns are specified implicitly, the table is deduplicated by all columns that are not `ALIAS` or `MATERIALIZED`. Considering the table above, these are `primary_key`, `secondary_key`, `value`, and `partition_key` columns:
 ```sql
 OPTIMIZE TABLE example FINAL DEDUPLICATE BY *;
@ -137,7 +139,7 @@ Result:
 │           1 │             1 │     3 │             3 │
 └─────────────┴───────────────┴───────┴───────────────┘
 ```
-
+#### `DEDUPLICATE BY * EXCEPT`
 Deduplicate by all columns that are not `ALIAS` or `MATERIALIZED` and explicitly not `value`: `primary_key`, `secondary_key`, and `partition_key` columns.

 ``` sql
@ -158,7 +160,7 @@ Result:
 │           1 │             1 │     2 │             3 │
 └─────────────┴───────────────┴───────┴───────────────┘
 ```
-
+#### `DEDUPLICATE BY <list of columns>`
 Deduplicate explicitly by `primary_key`, `secondary_key`, and `partition_key` columns:
 ```sql
 OPTIMIZE TABLE example FINAL DEDUPLICATE BY primary_key, secondary_key, partition_key;
@ -178,8 +180,8 @@ Result:
 │           1 │             1 │     2 │             3 │
 └─────────────┴───────────────┴───────┴───────────────┘
 ```
-
-Deduplicate by any column matching a regex: `primary_key`, `secondary_key`, and `partition_key` columns:
+#### `DEDUPLICATE BY COLUMNS(<regex>)`
+Deduplicate by all columns matching a regex: `primary_key`, `secondary_key`, and `partition_key` columns:
 ```sql
 OPTIMIZE TABLE example FINAL DEDUPLICATE BY COLUMNS('.*_key');
 ```
--- a/docs/en/sql-reference/statements/show.md
+++ b/docs/en/sql-reference/statements/show.md
@ -208,7 +208,7 @@ The optional keyword `FULL` causes the output to include the collation, comment
 The statement produces a result table with the following structure:
 - field - The name of the column (String)
 - type - The column data type (String)
- null - If the column data type is Nullable (UInt8)
+- null - `YES` if the column data type is Nullable, `NO` otherwise (String)
 - key - `PRI` if the column is part of the primary key, `SOR` if the column is part of the sorting key, empty otherwise (String)
 - default - Default expression of the column if it is of type `ALIAS`, `DEFAULT`, or `MATERIALIZED`, otherwise `NULL`. (Nullable(String))
 - extra - Additional information, currently unused (String)
@ -638,3 +638,16 @@ Outputs the content of the [system.table_engines](../../operations/system-tables
 **See Also**

 - [system.table_engines](../../operations/system-tables/table_engines.md) table
+
+## SHOW FUNCTIONS
+
+``` sql
+SHOW FUNCTIONS [LIKE | ILIKE '<pattern>']
+```
+
+Outputs the content of the [system.functions](../../operations/system-tables/functions.md) table.
+
+If either `LIKE` or `ILIKE` clause is specified, the query returns a list of system functions whose names match the provided `<pattern>`.
+
+**See Also**
+- [system.functions](../../operations/system-tables/functions.md) table
--- a/docs/ru/development/architecture.md
+++ b/docs/ru/development/architecture.md
@ -156,9 +156,9 @@ ClickHouse имеет сильную типизацию, поэтому нет

 Мы поддерживаем полную обратную и прямую совместимость для TCP интерфейса: старые клиенты могут общаться с новыми серверами, а новые клиенты могут общаться со старыми серверами. Но мы не хотим поддерживать его вечно и прекращаем поддержку старых версий примерно через год.

-    :::note "Note"
-    Для всех сторонних приложений мы рекомендуем использовать HTTP интерфейс, потому что он прост и удобен в использовании. TCP интерфейс тесно связан с внутренними структурами данных: он использует внутренний формат для передачи блоков данных и использует специальное кадрирование для сжатых данных. Мы не выпустили библиотеку C для этого протокола, потому что потребовала бы линковки большей части кодовой базы ClickHouse, что непрактично.
-    :::
+:::note Примечание
+Для всех сторонних приложений мы рекомендуем использовать HTTP интерфейс, потому что он прост и удобен в использовании. TCP интерфейс тесно связан с внутренними структурами данных: он использует внутренний формат для передачи блоков данных и использует специальное кадрирование для сжатых данных. Мы не выпустили библиотеку C для этого протокола, потому что потребовала бы линковки большей части кодовой базы ClickHouse, что непрактично.
+:::
 ## Выполнение распределенных запросов (Distributed Query Execution) {#distributed-query-execution}

 Сервера в кластере в основном независимы. Вы можете создать `Распределенную` (`Distributed`) таблицу на одном или всех серверах в кластере. Такая таблица сама по себе не хранит данные - она только предоставляет возможность "просмотра" всех локальных таблиц на нескольких узлах кластера. При выполнении `SELECT` распределенная таблица переписывает запрос, выбирает удаленные узлы в соответствии с настройками балансировки нагрузки и отправляет им запрос. Распределенная таблица просит удаленные сервера обработать запрос до той стадии, когда промежуточные результаты с разных серверов могут быть объединены. Затем он получает промежуточные результаты и объединяет их. Распределенная таблица пытается возложить как можно больше работы на удаленные серверы и сократить объем промежуточных данных, передаваемых по сети.
@ -197,7 +197,8 @@ ClickHouse имеет сильную типизацию, поэтому нет

 Кроме того, каждая реплика сохраняет свое состояние в `ZooKeeper` в виде набора частей и его контрольных сумм. Когда состояние в локальной файловой системе расходится с эталонным состоянием в `ZooKeeper`, реплика восстанавливает свою согласованность путем загрузки отсутствующих и поврежденных частей из других реплик. Когда в локальной файловой системе есть неожиданные или испорченные данные, ClickHouse не удаляет их, а перемещает в отдельный каталог и забывает об этом.

-    :::note "Note"
-    Кластер ClickHouse состоит из независимых шардов, а каждый шард состоит из реплик. Кластер **не является эластичным** (not elastic), поэтому после добавления нового шарда данные не будут автоматически распределены между ними. Вместо этого нужно изменить настройки, чтобы выровнять нагрузку на кластер. Эта реализация дает вам больший контроль, и вполне приемлема для относительно небольших кластеров, таких как десятки узлов. Но для кластеров с сотнями узлов, которые мы используем в эксплуатации, такой подход становится существенным недостатком. Движки таблиц, которые охватывают весь кластер с динамически реплицируемыми областями, которые могут быть автоматически разделены и сбалансированы между кластерами, еще предстоит реализовать.
-    :::
+:::note Примечание
+Кластер ClickHouse состоит из независимых шардов, а каждый шард состоит из реплик. Кластер **не является эластичным** (not elastic), поэтому после добавления нового шарда данные не будут автоматически распределены между ними. Вместо этого нужно изменить настройки, чтобы выровнять нагрузку на кластер. Эта реализация дает вам больший контроль, и вполне приемлема для относительно небольших кластеров, таких как десятки узлов. Но для кластеров с сотнями узлов, которые мы используем в эксплуатации, такой подход становится существенным недостатком. Движки таблиц, которые охватывают весь кластер с динамически реплицируемыми областями, которые могут быть автоматически разделены и сбалансированы между кластерами, еще предстоит реализовать.
+:::
+
 {## [Original article](https://clickhouse.com/docs/ru/development/architecture/) ##}
--- a/docs/ru/development/build-osx.md
+++ b/docs/ru/development/build-osx.md
@ -6,9 +6,9 @@ sidebar_label: Сборка на Mac OS X

 # Как собрать ClickHouse на Mac OS X {#how-to-build-clickhouse-on-mac-os-x}

-:::info "Вам не нужно собирать ClickHouse самостоятельно"
-     Вы можете установить предварительно собранный ClickHouse, как описано в [Быстром старте](https://clickhouse.com/#quick-start).
-     Следуйте инструкциям по установке для `macOS (Intel)` или `macOS (Apple Silicon)`.
+:::info Вам не нужно собирать ClickHouse самостоятельно
+Вы можете установить предварительно собранный ClickHouse, как описано в [Быстром старте](https://clickhouse.com/#quick-start).
+Следуйте инструкциям по установке для `macOS (Intel)` или `macOS (Apple Silicon)`.
 :::

 Сборка должна запускаться с x86_64 (Intel) на macOS версии 10.15 (Catalina) и выше в последней версии компилятора Xcode's native AppleClang, Homebrew's vanilla Clang или в GCC-компиляторах.
@ -90,8 +90,8 @@ $ /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/

 Если будете запускать `clickhouse-server`, убедитесь, что увеличили системную переменную `maxfiles`.

-:::info "Note"
-    Вам понадобится команда `sudo`.
+:::info Примечание
+Вам понадобится команда `sudo`.
 :::

 1. Создайте файл `/Library/LaunchDaemons/limit.maxfiles.plist` и поместите в него следующее:
--- a/docs/ru/engines/database-engines/materialized-mysql.md
+++ b/docs/ru/engines/database-engines/materialized-mysql.md
@ -49,9 +49,9 @@ CREATE DATABASE mysql ENGINE = MaterializedMySQL('localhost:3306', 'db', 'user',
 - `default_authentication_plugin = mysql_native_password` — `MaterializedMySQL` может авторизоваться только с помощью этого метода.
 - `gtid_mode = on` — ведение журнала на основе GTID является обязательным для обеспечения правильной репликации.

-    :::note "Внимание"
-    При включении `gtid_mode` вы также должны указать `enforce_gtid_consistency = on`.
-    :::
+:::note Внимание
+При включении `gtid_mode` вы также должны указать `enforce_gtid_consistency = on`.
+:::
 ## Виртуальные столбцы {#virtual-columns}

 При работе с движком баз данных `MaterializedMySQL` используются таблицы семейства [ReplacingMergeTree](../../engines/table-engines/mergetree-family/replacingmergetree.md) с виртуальными столбцами `_sign` и `_version`.
--- a/docs/ru/engines/database-engines/materialized-postgresql.md
+++ b/docs/ru/engines/database-engines/materialized-postgresql.md
@ -96,9 +96,10 @@ FROM pg_class
 WHERE oid = 'postgres_table'::regclass;
 ```

-:::danger "Предупреждение"
-    Репликация **TOAST**-значений не поддерживается. Для типа данных будет использоваться значение по умолчанию.
-	
+:::danger Предупреждение
+Репликация **TOAST**-значений не поддерживается. Для типа данных будет использоваться значение по умолчанию.
+:::
+
 ## Пример использования {#example-of-use}

 ``` sql
--- a/docs/ru/engines/database-engines/mysql.md
+++ b/docs/ru/engines/database-engines/mysql.md
@ -60,8 +60,9 @@ ENGINE = MySQL('host:port', ['database' | database], 'user', 'password')
 - `version`
 - `max_allowed_packet`

-:::danger "Предупреждение"
-    В настоящее время эти переменные реализованы только как "заглушки" и не содержат актуальных данных.
+:::danger Предупреждение
+В настоящее время эти переменные реализованы только как "заглушки" и не содержат актуальных данных.
+:::

 Пример:

--- a/docs/ru/engines/database-engines/replicated.md
+++ b/docs/ru/engines/database-engines/replicated.md
@ -12,7 +12,7 @@ sidebar_label: Replicated

 ## Создание базы данных {#creating-a-database}
 ``` sql
-    CREATE DATABASE testdb ENGINE = Replicated('zoo_path', 'shard_name', 'replica_name') [SETTINGS ...]
+CREATE DATABASE testdb ENGINE = Replicated('zoo_path', 'shard_name', 'replica_name') [SETTINGS ...]
 ```

 **Параметры движка**
@ -21,9 +21,9 @@ sidebar_label: Replicated
 -   `shard_name` — Имя шарда. Реплики базы данных группируются в шарды по имени.
 -   `replica_name` — Имя реплики. Имена реплик должны быть разными для всех реплик одного и того же шарда.

-    :::note "Предупреждение"
-    Для таблиц [ReplicatedMergeTree](../table-engines/mergetree-family/replication.md#table_engines-replication) если аргументы не заданы, то используются аргументы по умолчанию: `/clickhouse/tables/{uuid}/{shard}` и `{replica}`. Они могут быть изменены в серверных настройках: [default_replica_path](../../operations/server-configuration-parameters/settings.md#default_replica_path) и [default_replica_name](../../operations/server-configuration-parameters/settings.md#default_replica_name). Макрос `{uuid}` раскрывается в `UUID` таблицы, `{shard}` и `{replica}` — в значения из конфига сервера. В будущем появится возможность использовать значения `shard_name` и `replica_name` аргументов движка базы данных `Replicated`.
-    :::
+:::note Предупреждение
+Для таблиц [ReplicatedMergeTree](../table-engines/mergetree-family/replication.md#table_engines-replication) если аргументы не заданы, то используются аргументы по умолчанию: `/clickhouse/tables/{uuid}/{shard}` и `{replica}`. Они могут быть изменены в серверных настройках: [default_replica_path](../../operations/server-configuration-parameters/settings.md#default_replica_path) и [default_replica_name](../../operations/server-configuration-parameters/settings.md#default_replica_name). Макрос `{uuid}` раскрывается в `UUID` таблицы, `{shard}` и `{replica}` — в значения из конфига сервера. В будущем появится возможность использовать значения `shard_name` и `replica_name` аргументов движка базы данных `Replicated`.
+:::
 ## Особенности и рекомендации {#specifics-and-recommendations}

 DDL-запросы с базой данных `Replicated` работают похожим образом на [ON CLUSTER](../../sql-reference/distributed-ddl.md) запросы, но с небольшими отличиями.
--- a/docs/ru/engines/table-engines/integrations/hdfs.md
+++ b/docs/ru/engines/table-engines/integrations/hdfs.md
@ -97,8 +97,9 @@ CREATE TABLE table_with_question_mark (name String, value UInt32) ENGINE = HDFS(
 CREATE TABLE table_with_asterisk (name String, value UInt32) ENGINE = HDFS('hdfs://hdfs1:9000/{some,another}_dir/*', 'TSV')
 ```

-:::danger "Warning"
-    Если список файлов содержит числовые интервалы с ведущими нулями, используйте конструкцию с фигурными скобочками для каждой цифры или используйте `?`.
+:::danger Предупреждение
+Если список файлов содержит числовые интервалы с ведущими нулями, используйте конструкцию с фигурными скобочками для каждой цифры или используйте `?`.
+:::

 **Example**

--- a/docs/ru/engines/table-engines/integrations/kafka.md
+++ b/docs/ru/engines/table-engines/integrations/kafka.md
@ -102,7 +102,7 @@ SETTINGS

 <summary>Устаревший способ создания таблицы</summary>

-:::note "Attention"
+:::note Важно
 Не используйте этот метод в новых проектах. По возможности переключите старые проекты на метод, описанный выше.
 :::

--- a/docs/ru/engines/table-engines/integrations/materialized-postgresql.md
+++ b/docs/ru/engines/table-engines/integrations/materialized-postgresql.md
@ -52,5 +52,6 @@ PRIMARY KEY key;
 SELECT key, value, _version FROM postgresql_db.postgresql_replica;
 ```

-:::danger "Предупреждение"
-    Репликация **TOAST**-значений не поддерживается. Для типа данных будет использоваться значение по умолчанию.
+:::danger Предупреждение
+Репликация **TOAST**-значений не поддерживается. Для типа данных будет использоваться значение по умолчанию.
+:::
--- a/docs/ru/engines/table-engines/integrations/postgresql.md
+++ b/docs/ru/engines/table-engines/integrations/postgresql.md
@ -48,8 +48,8 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]

 PostgreSQL массивы конвертируются в массивы ClickHouse.

-:::info "Внимание"
-    Будьте внимательны, в PostgreSQL массивы, созданные как `type_name[]`, являются многомерными и могут содержать в себе разное количество измерений в разных строках одной таблицы. Внутри ClickHouse допустимы только многомерные массивы с одинаковым кол-вом измерений во всех строках таблицы.
+:::info Внимание
+Будьте внимательны, в PostgreSQL массивы, созданные как `type_name[]`, являются многомерными и могут содержать в себе разное количество измерений в разных строках одной таблицы. Внутри ClickHouse допустимы только многомерные массивы с одинаковым кол-вом измерений во всех строках таблицы.
 :::

 Поддерживает несколько реплик, которые должны быть перечислены через `|`. Например:
--- a/docs/ru/engines/table-engines/integrations/s3.md
+++ b/docs/ru/engines/table-engines/integrations/s3.md
@ -68,8 +68,8 @@ SELECT * FROM s3_engine_table LIMIT 2;

 Конструкции с `{}` аналогичны функции [remote](../../../sql-reference/table-functions/remote.md).

-:::danger "Примечание"
-    Если список файлов содержит диапазоны чисел с ведущими нулями, используйте конструкцию с фигурными скобками для каждой цифры отдельно или используйте `?`.
+:::danger Примечание
+Если список файлов содержит диапазоны чисел с ведущими нулями, используйте конструкцию с фигурными скобками для каждой цифры отдельно или используйте `?`.

 **Пример подстановки 1**

--- a/docs/ru/engines/table-engines/mergetree-family/aggregatingmergetree.md
+++ b/docs/ru/engines/table-engines/mergetree-family/aggregatingmergetree.md
@ -39,7 +39,7 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]

 <summary>Устаревший способ создания таблицы</summary>

-:::note "Attention"
+:::note Важно
 Не используйте этот способ в новых проектах и по возможности переведите старые проекты на способ описанный выше.
 :::

--- a/docs/ru/engines/table-engines/mergetree-family/collapsingmergetree.md
+++ b/docs/ru/engines/table-engines/mergetree-family/collapsingmergetree.md
@ -43,7 +43,7 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]

 <summary>Устаревший способ создания таблицы</summary>

-:::note "Attention"
+:::note Важно
 Не используйте этот способ в новых проектах и по возможности переведите старые проекты на способ описанный выше.
 :::

--- a/docs/ru/engines/table-engines/mergetree-family/custom-partitioning-key.md
+++ b/docs/ru/engines/table-engines/mergetree-family/custom-partitioning-key.md
@ -39,8 +39,8 @@ ORDER BY (CounterID, StartDate, intHash32(UserID));

 Каждая партиция состоит из отдельных фрагментов или так называемых *кусков данных*. Каждый кусок отсортирован по первичному ключу. При вставке данных в таблицу каждая отдельная запись сохраняется в виде отдельного куска. Через некоторое время после вставки (обычно до 10 минут), ClickHouse выполняет в фоновом режиме слияние данных — в результате куски для одной и той же партиции будут объединены в более крупный кусок.

-:::info "Info"
-    Не рекомендуется делать слишком гранулированное партиционирование – то есть задавать партиции по столбцу, в котором будет слишком большой разброс значений (речь идет о порядке более тысячи партиций). Это приведет к скоплению большого числа файлов и файловых дескрипторов в системе, что может значительно снизить производительность запросов `SELECT`.
+:::info Примечание
+Не рекомендуется делать слишком гранулированное партиционирование – то есть задавать партиции по столбцу, в котором будет слишком большой разброс значений (речь идет о порядке более тысячи партиций). Это приведет к скоплению большого числа файлов и файловых дескрипторов в системе, что может значительно снизить производительность запросов `SELECT`.
 :::

 Чтобы получить набор кусков и партиций таблицы, можно воспользоваться системной таблицей [system.parts](../../../engines/table-engines/mergetree-family/custom-partitioning-key.md#system_tables-parts). В качестве примера рассмотрим таблицу `visits`, в которой задано партиционирование по месяцам. Выполним `SELECT` для таблицы `system.parts`:
@ -80,8 +80,8 @@ WHERE table = 'visits'
 -   `2` – уровень куска (глубина дерева слияний, которыми этот кусок образован).
 -   `11` - версия мутации (если парт мутировал)

-:::info "Info"
-    Названия кусков для таблиц старого типа образуются следующим образом: `20190117_20190123_2_2_0` (минимальная дата _ максимальная дата _ номер минимального блока _ номер максимального блока _ уровень).
+:::info Примечание
+Названия кусков для таблиц старого типа образуются следующим образом: `20190117_20190123_2_2_0` (минимальная дата _ максимальная дата _ номер минимального блока _ номер максимального блока _ уровень).
 :::

 Как видно из примера выше, таблица содержит несколько отдельных кусков для одной и той же партиции (например, куски `201901_1_3_1` и `201901_1_9_2` принадлежат партиции `201901`). Это означает, что эти куски еще не были объединены – в файловой системе они хранятся отдельно. После того как будет выполнено автоматическое слияние данных (выполняется примерно спустя 10 минут после вставки данных), исходные куски будут объединены в один более крупный кусок и помечены как неактивные.
--- a/docs/ru/engines/table-engines/mergetree-family/graphitemergetree.md
+++ b/docs/ru/engines/table-engines/mergetree-family/graphitemergetree.md
@ -55,7 +55,7 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]

 <summary>Устаревший способ создания таблицы</summary>

-:::note "Attention"
+:::note Важно
 Не используйте этот способ в новых проектах и по возможности переведите старые проекты на способ описанный выше.
 :::

@ -123,12 +123,13 @@ default
    ...
 ```

-:::danger "Внимание"
-    Правила должны быть строго упорядочены:
+:::danger Внимание
+Правила должны быть строго упорядочены:

-      1. Правила без `function` или `retention`.
-      1. Правила одновремено содержащие `function` и `retention`.
-      1. Правило `default`.
+1. Правила без `function` или `retention`.
+1. Правила одновремено содержащие `function` и `retention`.
+1. Правило `default`.
+:::

 При обработке строки ClickHouse проверяет правила в разделе `pattern`. Каждый `pattern` (включая `default`) может содержать параметр агрегации `function`, параметр `retention`, или оба параметра одновременно. Если имя метрики соответствует шаблону `regexp`, то применяются правила `pattern`, в противном случае правило `default`.

@ -257,5 +258,6 @@ default
 ```


-:::danger "Внимание"
-    Прореживание данных производится во время слияний. Обычно для старых партиций слияния не запускаются, поэтому для прореживания надо инициировать незапланированное слияние используя [optimize](../../../sql-reference/statements/optimize.md). Или использовать дополнительные инструменты, например [graphite-ch-optimizer](https://github.com/innogames/graphite-ch-optimizer).
+:::danger Внимание
+Прореживание данных производится во время слияний. Обычно для старых партиций слияния не запускаются, поэтому для прореживания надо инициировать незапланированное слияние используя [optimize](../../../sql-reference/statements/optimize.md). Или использовать дополнительные инструменты, например [graphite-ch-optimizer](https://github.com/innogames/graphite-ch-optimizer).
+:::
--- a/docs/ru/engines/table-engines/mergetree-family/mergetree.md
+++ b/docs/ru/engines/table-engines/mergetree-family/mergetree.md
@ -20,9 +20,9 @@ sidebar_label: MergeTree

 -   **Поддерживает сэмплирование данных.** При необходимости можно задать способ сэмплирования данных в таблице.

-    :::info
-    Движок [Merge](../special/merge.md#merge) не относится к семейству `*MergeTree`.
-    :::
+:::info Примечание
+Движок [Merge](../special/merge.md#merge) не относится к семейству `*MergeTree`.
+:::
 ## Создание таблицы {#table_engine-mergetree-creating-a-table}

 ``` sql
@ -115,7 +115,7 @@ ENGINE MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDa

 <summary>Устаревший способ создания таблицы</summary>

-:::note "Attention"
+:::note Важно
 Не используйте этот способ в новых проектах и по возможности переведите старые проекты на способ, описанный выше.
 :::

--- a/docs/ru/engines/table-engines/mergetree-family/replacingmergetree.md
+++ b/docs/ru/engines/table-engines/mergetree-family/replacingmergetree.md
@ -29,7 +29,7 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]

 Описание параметров запроса смотрите в [описании запроса](../../../engines/table-engines/mergetree-family/replacingmergetree.md).

-:::warning "Внимание"
+:::warning Внимание
 Уникальность строк определяется `ORDER BY` секцией таблицы, а не `PRIMARY KEY`.
 :::

@ -95,7 +95,7 @@ SELECT * FROM mySecondReplacingMT FINAL;

 <summary>Устаревший способ создания таблицы</summary>

-:::warning "Внимание"
+:::warning Внимание
 Не используйте этот способ в новых проектах и по возможности переведите старые проекты на способ, описанный выше.
 :::

--- a/docs/ru/engines/table-engines/mergetree-family/replication.md
+++ b/docs/ru/engines/table-engines/mergetree-family/replication.md
@ -32,9 +32,9 @@ ClickHouse хранит метаинформацию о репликах в [Apa

 Для использовании репликации, установите параметры в секции [zookeeper](../../../operations/server-configuration-parameters/settings.md#server-settings_zookeeper) конфигурации сервера.

-    :::note "Внимание"
-    Не пренебрегайте настройками безопасности. ClickHouse поддерживает [ACL схему](https://zookeeper.apache.org/doc/current/zookeeperProgrammers.html#sc_ZooKeeperAccessControl) `digest` подсистемы безопасности ZooKeeper.
-    :::
+:::note Внимание
+Не пренебрегайте настройками безопасности. ClickHouse поддерживает [ACL схему](https://zookeeper.apache.org/doc/current/zookeeperProgrammers.html#sc_ZooKeeperAccessControl) `digest` подсистемы безопасности ZooKeeper.
+:::
 Пример указания адресов кластера ZooKeeper:

 ``` xml
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`Subproject commit e77bd70bdd860c52c561568cffb251d88bba064c`
				`@ -1 +0,0 @@`
				`Subproject commit 8628e258090f9eb76d90ac3c91e1ab4690e9aa11`