From 5d16ba57aa84ef82ccf7e34a4635ad1d14e7859d Mon Sep 17 00:00:00 2001
From: robot-clickhouse <robot-clickhouse@users.noreply.github.com>
Date: Wed, 3 Jul 2024 14:46:49 +0000
Subject: [PATCH 001/139] Update version_date.tsv and changelogs after
 v24.3.5.46-lts

---
 docs/changelogs/v24.3.5.46-lts.md    | 40 ++++++++++++++++++++++++++++
 utils/list-versions/version_date.tsv |  1 +
 2 files changed, 41 insertions(+)
 create mode 100644 docs/changelogs/v24.3.5.46-lts.md

diff --git a/docs/changelogs/v24.3.5.46-lts.md b/docs/changelogs/v24.3.5.46-lts.md
new file mode 100644
index 00000000000..1f2b7c8b0b7
--- /dev/null
+++ b/docs/changelogs/v24.3.5.46-lts.md
@@ -0,0 +1,40 @@
+---
+sidebar_position: 1
+sidebar_label: 2024
+---
+
+# 2024 Changelog
+
+### ClickHouse release v24.3.5.46-lts (fe54cead6b6) FIXME as compared to v24.3.4.147-lts (31a7bdc346d)
+
+#### Improvement
+* Backported in [#65463](https://github.com/ClickHouse/ClickHouse/issues/65463): Reload certificate chain during certificate reload. [#61671](https://github.com/ClickHouse/ClickHouse/pull/61671) ([Pervakov Grigorii](https://github.com/GrigoryPervakov)).
+* Backported in [#65882](https://github.com/ClickHouse/ClickHouse/issues/65882): Always start Keeper with sufficient amount of threads in global thread pool. [#64444](https://github.com/ClickHouse/ClickHouse/pull/64444) ([Duc Canh Le](https://github.com/canhld94)).
+* Backported in [#65302](https://github.com/ClickHouse/ClickHouse/issues/65302): Returned back the behaviour of how ClickHouse works and interprets Tuples in CSV format. This change effectively reverts https://github.com/ClickHouse/ClickHouse/pull/60994 and makes it available only under a few settings: `output_format_csv_serialize_tuple_into_separate_columns`, `input_format_csv_deserialize_separate_columns_into_tuple` and `input_format_csv_try_infer_strings_from_quoted_tuples`. [#65170](https://github.com/ClickHouse/ClickHouse/pull/65170) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Backported in [#65892](https://github.com/ClickHouse/ClickHouse/issues/65892): Respect cgroup CPU limit in Keeper. [#65819](https://github.com/ClickHouse/ClickHouse/pull/65819) ([Antonio Andelic](https://github.com/antonio2368)).
+
+#### Critical Bug Fix (crash, LOGICAL_ERROR, data loss, RBAC)
+* Backported in [#65283](https://github.com/ClickHouse/ClickHouse/issues/65283): Fix crash with UniqInjectiveFunctionsEliminationPass and uniqCombined. [#65188](https://github.com/ClickHouse/ClickHouse/pull/65188) ([Raúl Marín](https://github.com/Algunenano)).
+* Backported in [#65370](https://github.com/ClickHouse/ClickHouse/issues/65370): Fix a bug in ClickHouse Keeper that causes digest mismatch during closing session. [#65198](https://github.com/ClickHouse/ClickHouse/pull/65198) ([Aleksei Filatov](https://github.com/aalexfvk)).
+* Backported in [#65446](https://github.com/ClickHouse/ClickHouse/issues/65446): Use correct memory alignment for Distinct combinator. Previously, crash could happen because of invalid memory allocation when the combinator was used. [#65379](https://github.com/ClickHouse/ClickHouse/pull/65379) ([Antonio Andelic](https://github.com/antonio2368)).
+* Backported in [#65708](https://github.com/ClickHouse/ClickHouse/issues/65708): Fix crash in maxIntersections. [#65689](https://github.com/ClickHouse/ClickHouse/pull/65689) ([Raúl Marín](https://github.com/Algunenano)).
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+* Backported in [#65352](https://github.com/ClickHouse/ClickHouse/issues/65352): Fix possible abort on uncaught exception in ~WriteBufferFromFileDescriptor in StatusFile. [#64206](https://github.com/ClickHouse/ClickHouse/pull/64206) ([Kruglov Pavel](https://github.com/Avogar)).
+* Backported in [#65327](https://github.com/ClickHouse/ClickHouse/issues/65327): Fix the crash loop when restoring from backup is blocked by creating an MV with a definer that hasn't been restored yet. [#64595](https://github.com/ClickHouse/ClickHouse/pull/64595) ([pufit](https://github.com/pufit)).
+* Backported in [#65538](https://github.com/ClickHouse/ClickHouse/issues/65538): Fix crash for `ALTER TABLE ... ON CLUSTER ... MODIFY SQL SECURITY`. [#64957](https://github.com/ClickHouse/ClickHouse/pull/64957) ([pufit](https://github.com/pufit)).
+* Backported in [#65576](https://github.com/ClickHouse/ClickHouse/issues/65576): Fix crash on destroying AccessControl: add explicit shutdown. [#64993](https://github.com/ClickHouse/ClickHouse/pull/64993) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Backported in [#65159](https://github.com/ClickHouse/ClickHouse/issues/65159): Fix pushing arithmetic operations out of aggregation. In the new analyzer, optimization was applied only once. [#65104](https://github.com/ClickHouse/ClickHouse/pull/65104) ([Dmitry Novik](https://github.com/novikd)).
+* Backported in [#65615](https://github.com/ClickHouse/ClickHouse/issues/65615): Fix aggregate function name rewriting in the new analyzer. [#65110](https://github.com/ClickHouse/ClickHouse/pull/65110) ([Dmitry Novik](https://github.com/novikd)).
+* Backported in [#65728](https://github.com/ClickHouse/ClickHouse/issues/65728): Eliminate injective function in argument of functions `uniq*` recursively. This used to work correctly but was broken in the new analyzer. [#65140](https://github.com/ClickHouse/ClickHouse/pull/65140) ([Duc Canh Le](https://github.com/canhld94)).
+* Backported in [#65261](https://github.com/ClickHouse/ClickHouse/issues/65261): Fix the bug in Hashed and Hashed_Array dictionary short circuit evaluation, which may read uninitialized number, leading to various errors. [#65256](https://github.com/ClickHouse/ClickHouse/pull/65256) ([jsc0218](https://github.com/jsc0218)).
+* Backported in [#65667](https://github.com/ClickHouse/ClickHouse/issues/65667): Disable `non-intersecting-parts` optimization for queries with `FINAL` in case of `read-in-order` optimization was enabled. This could lead to an incorrect query result. As a workaround, disable `do_not_merge_across_partitions_select_final` and `split_parts_ranges_into_intersecting_and_non_intersecting_final` before this fix is merged. [#65505](https://github.com/ClickHouse/ClickHouse/pull/65505) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Backported in [#65784](https://github.com/ClickHouse/ClickHouse/issues/65784): Fixed bug in MergeJoin. Column in sparse serialisation might be treated as a column of its nested type though the required conversion wasn't performed. [#65632](https://github.com/ClickHouse/ClickHouse/pull/65632) ([Nikita Taranov](https://github.com/nickitat)).
+* Backported in [#65929](https://github.com/ClickHouse/ClickHouse/issues/65929): For queries that read from `PostgreSQL`, cancel the internal `PostgreSQL` query if the ClickHouse query is finished. Otherwise, `ClickHouse` query cannot be canceled until the internal `PostgreSQL` query is finished. [#65771](https://github.com/ClickHouse/ClickHouse/pull/65771) ([Maksim Kita](https://github.com/kitaisreal)).
+* Backported in [#65824](https://github.com/ClickHouse/ClickHouse/issues/65824): Fix a bug in short circuit logic when old analyzer and dictGetOrDefault is used. [#65802](https://github.com/ClickHouse/ClickHouse/pull/65802) ([jsc0218](https://github.com/jsc0218)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Backported in [#65223](https://github.com/ClickHouse/ClickHouse/issues/65223): Capture weak_ptr of ContextAccess for safety. [#65051](https://github.com/ClickHouse/ClickHouse/pull/65051) ([Alexander Gololobov](https://github.com/davenger)).
+* Backported in [#65901](https://github.com/ClickHouse/ClickHouse/issues/65901): Fix bug with session closing in Keeper. [#65735](https://github.com/ClickHouse/ClickHouse/pull/65735) ([Antonio Andelic](https://github.com/antonio2368)).
+
diff --git a/utils/list-versions/version_date.tsv b/utils/list-versions/version_date.tsv
index 8112ed9083b..8e748a2c2ca 100644
--- a/utils/list-versions/version_date.tsv
+++ b/utils/list-versions/version_date.tsv
@@ -6,6 +6,7 @@ v24.5.1.1763-stable	2024-06-01
 v24.4.3.25-stable	2024-06-14
 v24.4.2.141-stable	2024-06-07
 v24.4.1.2088-stable	2024-05-01
+v24.3.5.46-lts	2024-07-03
 v24.3.4.147-lts	2024-06-13
 v24.3.3.102-lts	2024-05-01
 v24.3.2.23-lts	2024-04-03

From c6b558c7915b070167649d4e88eafb2613570bd3 Mon Sep 17 00:00:00 2001
From: Nikita Mikhaylov <nikitamikhaylov@clickhouse.com>
Date: Thu, 4 Jul 2024 22:30:18 +0200
Subject: [PATCH 002/139] Done

---
 .../02814_currentDatabase_for_table_functions.sql         | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/queries/0_stateless/02814_currentDatabase_for_table_functions.sql b/tests/queries/0_stateless/02814_currentDatabase_for_table_functions.sql
index 74b5cf5f432..8b1e3ba1e10 100644
--- a/tests/queries/0_stateless/02814_currentDatabase_for_table_functions.sql
+++ b/tests/queries/0_stateless/02814_currentDatabase_for_table_functions.sql
@@ -13,7 +13,13 @@ CREATE MATERIALIZED VIEW null_mv Engine = Log AS SELECT * FROM null_table LEFT J
 
 CREATE TABLE null_table_buffer (number UInt64) ENGINE = Buffer(currentDatabase(), null_table, 1, 1, 1, 100, 200, 10000, 20000);
 INSERT INTO null_table_buffer VALUES (1);
-SELECT sleep(3) FORMAT Null;
+
+-- OPTIMIZE query should flush Buffer table, but still it is not guaranteed
+-- (see the comment StorageBuffer::optimize)
+-- But the combination of OPTIMIZE + sleep + OPTIMIZE should be enough.
+OPTIMIZE TABLE null_table_buffer;
+SELECT sleep(1) FORMAT Null;
+OPTIMIZE TABLE null_table_buffer;
 
 -- Insert about should've landed into `null_mv`
 SELECT count() FROM null_mv;

From ca7e003c6d7af6bf0676bba7cb61ab560c202bf3 Mon Sep 17 00:00:00 2001
From: Nikita Mikhaylov <nikitamikhaylov@clickhouse.com>
Date: Fri, 12 Jul 2024 15:27:03 +0000
Subject: [PATCH 003/139] Fixed test

---
 .../02814_currentDatabase_for_table_functions.reference    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/queries/0_stateless/02814_currentDatabase_for_table_functions.reference b/tests/queries/0_stateless/02814_currentDatabase_for_table_functions.reference
index 7ff95106d3d..20b14d9a67b 100644
--- a/tests/queries/0_stateless/02814_currentDatabase_for_table_functions.reference
+++ b/tests/queries/0_stateless/02814_currentDatabase_for_table_functions.reference
@@ -11,7 +11,12 @@ CREATE VIEW number_view as SELECT * FROM numbers(10) as tb;
 CREATE MATERIALIZED VIEW null_mv Engine = Log AS SELECT * FROM null_table LEFT JOIN number_view as tb USING number;
 CREATE TABLE null_table_buffer (number UInt64) ENGINE = Buffer(currentDatabase(), null_table, 1, 1, 1, 100, 200, 10000, 20000);
 INSERT INTO null_table_buffer VALUES (1);
-SELECT sleep(3) FORMAT Null;
+-- OPTIMIZE query should flush Buffer table, but still it is not guaranteed
+-- (see the comment StorageBuffer::optimize)
+-- But the combination of OPTIMIZE + sleep + OPTIMIZE should be enough.
+OPTIMIZE TABLE null_table_buffer;
+SELECT sleep(1) FORMAT Null;
+OPTIMIZE TABLE null_table_buffer;
 -- Insert about should've landed into `null_mv`
 SELECT count() FROM null_mv;
 1

From 264d7d760fedd3fc3c900d13ee1f7976887efaa7 Mon Sep 17 00:00:00 2001
From: Robert Schulze <robert@clickhouse.com>
Date: Sat, 13 Jul 2024 15:52:23 +0000
Subject: [PATCH 004/139] Bump rocksdb to 7.0.4

---
 contrib/rocksdb                      | 2 +-
 contrib/rocksdb-cmake/CMakeLists.txt | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/contrib/rocksdb b/contrib/rocksdb
index be366233921..4fc59e24001 160000
--- a/contrib/rocksdb
+++ b/contrib/rocksdb
@@ -1 +1 @@
-Subproject commit be366233921293bd07a84dc4ea6991858665f202
+Subproject commit 4fc59e240016a62180b09703e2938c3d7e928de0
diff --git a/contrib/rocksdb-cmake/CMakeLists.txt b/contrib/rocksdb-cmake/CMakeLists.txt
index 3a14407166c..f6479346063 100644
--- a/contrib/rocksdb-cmake/CMakeLists.txt
+++ b/contrib/rocksdb-cmake/CMakeLists.txt
@@ -59,10 +59,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64|aarch64|AARCH64")
   # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv8-a+crc+crypto -Wno-unused-function")
 endif()
 
-set (HAVE_THREAD_LOCAL 1)
-if(HAVE_THREAD_LOCAL)
-  add_definitions(-DROCKSDB_SUPPORT_THREAD_LOCAL)
-endif()
+# thread_local is part of C++11 and later (TODO: clean up this define)
+add_definitions(-DROCKSDB_SUPPORT_THREAD_LOCAL)
 
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
   add_definitions(-DOS_MACOSX)
@@ -182,7 +180,6 @@ set(SOURCES
     ${ROCKSDB_SOURCE_DIR}/env/env.cc
     ${ROCKSDB_SOURCE_DIR}/env/env_chroot.cc
     ${ROCKSDB_SOURCE_DIR}/env/env_encryption.cc
-    ${ROCKSDB_SOURCE_DIR}/env/env_hdfs.cc
     ${ROCKSDB_SOURCE_DIR}/env/file_system.cc
     ${ROCKSDB_SOURCE_DIR}/env/file_system_tracer.cc
     ${ROCKSDB_SOURCE_DIR}/env/fs_remap.cc
@@ -311,7 +308,6 @@ set(SOURCES
     ${ROCKSDB_SOURCE_DIR}/util/murmurhash.cc
     ${ROCKSDB_SOURCE_DIR}/util/random.cc
     ${ROCKSDB_SOURCE_DIR}/util/rate_limiter.cc
-    ${ROCKSDB_SOURCE_DIR}/util/regex.cc
     ${ROCKSDB_SOURCE_DIR}/util/ribbon_config.cc
     ${ROCKSDB_SOURCE_DIR}/util/slice.cc
     ${ROCKSDB_SOURCE_DIR}/util/file_checksum_helper.cc
@@ -335,6 +331,7 @@ set(SOURCES
     ${ROCKSDB_SOURCE_DIR}/utilities/checkpoint/checkpoint_impl.cc
     ${ROCKSDB_SOURCE_DIR}/utilities/compaction_filters.cc
     ${ROCKSDB_SOURCE_DIR}/utilities/compaction_filters/remove_emptyvalue_compactionfilter.cc
+    ${ROCKSDB_SOURCE_DIR}/utilities/counted_fs.cc
     ${ROCKSDB_SOURCE_DIR}/utilities/debug.cc
     ${ROCKSDB_SOURCE_DIR}/utilities/env_mirror.cc
     ${ROCKSDB_SOURCE_DIR}/utilities/env_timed.cc

From 5b6956ea234962cca5414a3fb0a6191407b4305a Mon Sep 17 00:00:00 2001
From: Robert Schulze <robert@clickhouse.com>
Date: Sat, 13 Jul 2024 16:48:09 +0000
Subject: [PATCH 005/139] Bump rocksdb to v7.10.2

---
 contrib/rocksdb                        |  2 +-
 contrib/rocksdb-cmake/CMakeLists.txt   | 53 +++++++++++++-------------
 contrib/rocksdb-cmake/build_version.cc | 31 +++++++++++----
 3 files changed, 51 insertions(+), 35 deletions(-)

diff --git a/contrib/rocksdb b/contrib/rocksdb
index 4fc59e24001..01e43568fa9 160000
--- a/contrib/rocksdb
+++ b/contrib/rocksdb
@@ -1 +1 @@
-Subproject commit 4fc59e240016a62180b09703e2938c3d7e928de0
+Subproject commit 01e43568fa9f3f7bf107b2b66c00b286b456f33e
diff --git a/contrib/rocksdb-cmake/CMakeLists.txt b/contrib/rocksdb-cmake/CMakeLists.txt
index f6479346063..98790158baa 100644
--- a/contrib/rocksdb-cmake/CMakeLists.txt
+++ b/contrib/rocksdb-cmake/CMakeLists.txt
@@ -5,6 +5,9 @@ if (NOT ENABLE_ROCKSDB)
   return()
 endif()
 
+# not in original build system, otherwise xxHash.cc fails to compile with ClickHouse C++23 default
+set (CMAKE_CXX_STANDARD 20)
+
 # Always disable jemalloc for rocksdb by default because it introduces non-standard jemalloc APIs
 option(WITH_JEMALLOC "build with JeMalloc" OFF)
 
@@ -16,14 +19,6 @@ option(WITH_LZ4 "build with lz4" ON)
 option(WITH_ZLIB "build with zlib" ON)
 option(WITH_ZSTD "build with zstd" ON)
 
-# third-party/folly is only validated to work on Linux and Windows for now.
-# So only turn it on there by default.
-if(CMAKE_SYSTEM_NAME MATCHES "Linux|Windows")
-  option(WITH_FOLLY_DISTRIBUTED_MUTEX "build with folly::DistributedMutex" ON)
-else()
-  option(WITH_FOLLY_DISTRIBUTED_MUTEX "build with folly::DistributedMutex" OFF)
-endif()
-
 if(WITH_SNAPPY)
   add_definitions(-DSNAPPY)
   list(APPEND THIRDPARTY_LIBS ch_contrib::snappy)
@@ -44,7 +39,7 @@ if(WITH_ZSTD)
   list(APPEND THIRDPARTY_LIBS ch_contrib::zstd)
 endif()
 
-option(PORTABLE "build a portable binary" ON)
+add_definitions(-DROCKSDB_PORTABLE)
 
 if(ENABLE_SSE42 AND ENABLE_PCLMULQDQ)
   add_definitions(-DHAVE_SSE42)
@@ -59,9 +54,6 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64|aarch64|AARCH64")
   # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv8-a+crc+crypto -Wno-unused-function")
 endif()
 
-# thread_local is part of C++11 and later (TODO: clean up this define)
-add_definitions(-DROCKSDB_SUPPORT_THREAD_LOCAL)
-
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
   add_definitions(-DOS_MACOSX)
 elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -87,19 +79,21 @@ set(ROCKSDB_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/rocksdb")
 
 include_directories(${ROCKSDB_SOURCE_DIR})
 include_directories("${ROCKSDB_SOURCE_DIR}/include")
-if(WITH_FOLLY_DISTRIBUTED_MUTEX)
-  include_directories("${ROCKSDB_SOURCE_DIR}/third-party/folly")
-endif()
 
 set(SOURCES
     ${ROCKSDB_SOURCE_DIR}/cache/cache.cc
     ${ROCKSDB_SOURCE_DIR}/cache/cache_entry_roles.cc
     ${ROCKSDB_SOURCE_DIR}/cache/cache_key.cc
+    ${ROCKSDB_SOURCE_DIR}/cache/cache_helpers.cc
     ${ROCKSDB_SOURCE_DIR}/cache/cache_reservation_manager.cc
+    ${ROCKSDB_SOURCE_DIR}/cache/charged_cache.cc
     ${ROCKSDB_SOURCE_DIR}/cache/clock_cache.cc
+    ${ROCKSDB_SOURCE_DIR}/cache/compressed_secondary_cache.cc
     ${ROCKSDB_SOURCE_DIR}/cache/lru_cache.cc
+    ${ROCKSDB_SOURCE_DIR}/cache/secondary_cache.cc
     ${ROCKSDB_SOURCE_DIR}/cache/sharded_cache.cc
     ${ROCKSDB_SOURCE_DIR}/db/arena_wrapped_db_iter.cc
+    ${ROCKSDB_SOURCE_DIR}/db/blob/blob_contents.cc
     ${ROCKSDB_SOURCE_DIR}/db/blob/blob_fetcher.cc
     ${ROCKSDB_SOURCE_DIR}/db/blob/blob_file_addition.cc
     ${ROCKSDB_SOURCE_DIR}/db/blob/blob_file_builder.cc
@@ -111,6 +105,7 @@ set(SOURCES
     ${ROCKSDB_SOURCE_DIR}/db/blob/blob_log_format.cc
     ${ROCKSDB_SOURCE_DIR}/db/blob/blob_log_sequential_reader.cc
     ${ROCKSDB_SOURCE_DIR}/db/blob/blob_log_writer.cc
+    ${ROCKSDB_SOURCE_DIR}/db/blob/blob_source.cc
     ${ROCKSDB_SOURCE_DIR}/db/blob/prefetch_buffer_collection.cc
     ${ROCKSDB_SOURCE_DIR}/db/builder.cc
     ${ROCKSDB_SOURCE_DIR}/db/c.cc
@@ -122,7 +117,11 @@ set(SOURCES
     ${ROCKSDB_SOURCE_DIR}/db/compaction/compaction_picker_fifo.cc
     ${ROCKSDB_SOURCE_DIR}/db/compaction/compaction_picker_level.cc
     ${ROCKSDB_SOURCE_DIR}/db/compaction/compaction_picker_universal.cc
+    ${ROCKSDB_SOURCE_DIR}/db/compaction/compaction_service_job.cc
+    ${ROCKSDB_SOURCE_DIR}/db/compaction/compaction_state.cc
+    ${ROCKSDB_SOURCE_DIR}/db/compaction/compaction_outputs.cc
     ${ROCKSDB_SOURCE_DIR}/db/compaction/sst_partitioner.cc
+    ${ROCKSDB_SOURCE_DIR}/db/compaction/subcompaction_state.cc
     ${ROCKSDB_SOURCE_DIR}/db/convenience.cc
     ${ROCKSDB_SOURCE_DIR}/db/db_filesnapshot.cc
     ${ROCKSDB_SOURCE_DIR}/db/db_impl/compacted_db_impl.cc
@@ -157,10 +156,11 @@ set(SOURCES
     ${ROCKSDB_SOURCE_DIR}/db/merge_helper.cc
     ${ROCKSDB_SOURCE_DIR}/db/merge_operator.cc
     ${ROCKSDB_SOURCE_DIR}/db/output_validator.cc
-    ${ROCKSDB_SOURCE_DIR}/db/periodic_work_scheduler.cc
+    ${ROCKSDB_SOURCE_DIR}/db/periodic_task_scheduler.cc
     ${ROCKSDB_SOURCE_DIR}/db/range_del_aggregator.cc
     ${ROCKSDB_SOURCE_DIR}/db/range_tombstone_fragmenter.cc
     ${ROCKSDB_SOURCE_DIR}/db/repair.cc
+    ${ROCKSDB_SOURCE_DIR}/db/seqno_to_time_mapping.cc
     ${ROCKSDB_SOURCE_DIR}/db/snapshot_impl.cc
     ${ROCKSDB_SOURCE_DIR}/db/table_cache.cc
     ${ROCKSDB_SOURCE_DIR}/db/table_properties_collector.cc
@@ -172,6 +172,8 @@ set(SOURCES
     ${ROCKSDB_SOURCE_DIR}/db/version_set.cc
     ${ROCKSDB_SOURCE_DIR}/db/wal_edit.cc
     ${ROCKSDB_SOURCE_DIR}/db/wal_manager.cc
+    ${ROCKSDB_SOURCE_DIR}/db/wide/wide_column_serialization.cc
+    ${ROCKSDB_SOURCE_DIR}/db/wide/wide_columns.cc
     ${ROCKSDB_SOURCE_DIR}/db/write_batch.cc
     ${ROCKSDB_SOURCE_DIR}/db/write_batch_base.cc
     ${ROCKSDB_SOURCE_DIR}/db/write_controller.cc
@@ -230,16 +232,17 @@ set(SOURCES
     ${ROCKSDB_SOURCE_DIR}/options/options.cc
     ${ROCKSDB_SOURCE_DIR}/options/options_helper.cc
     ${ROCKSDB_SOURCE_DIR}/options/options_parser.cc
+    ${ROCKSDB_SOURCE_DIR}/port/mmap.cc
     ${ROCKSDB_SOURCE_DIR}/port/stack_trace.cc
     ${ROCKSDB_SOURCE_DIR}/table/adaptive/adaptive_table_factory.cc
     ${ROCKSDB_SOURCE_DIR}/table/block_based/binary_search_index_reader.cc
     ${ROCKSDB_SOURCE_DIR}/table/block_based/block.cc
-    ${ROCKSDB_SOURCE_DIR}/table/block_based/block_based_filter_block.cc
     ${ROCKSDB_SOURCE_DIR}/table/block_based/block_based_table_builder.cc
     ${ROCKSDB_SOURCE_DIR}/table/block_based/block_based_table_factory.cc
     ${ROCKSDB_SOURCE_DIR}/table/block_based/block_based_table_iterator.cc
     ${ROCKSDB_SOURCE_DIR}/table/block_based/block_based_table_reader.cc
     ${ROCKSDB_SOURCE_DIR}/table/block_based/block_builder.cc
+    ${ROCKSDB_SOURCE_DIR}/table/block_based/block_cache.cc
     ${ROCKSDB_SOURCE_DIR}/table/block_based/block_prefetcher.cc
     ${ROCKSDB_SOURCE_DIR}/table/block_based/block_prefix_index.cc
     ${ROCKSDB_SOURCE_DIR}/table/block_based/data_block_hash_index.cc
@@ -297,9 +300,12 @@ set(SOURCES
     ${ROCKSDB_SOURCE_DIR}/trace_replay/trace_record_result.cc
     ${ROCKSDB_SOURCE_DIR}/trace_replay/trace_record.cc
     ${ROCKSDB_SOURCE_DIR}/trace_replay/trace_replay.cc
+    ${ROCKSDB_SOURCE_DIR}/util/async_file_reader.cc
+    ${ROCKSDB_SOURCE_DIR}/util/cleanable.cc
     ${ROCKSDB_SOURCE_DIR}/util/coding.cc
     ${ROCKSDB_SOURCE_DIR}/util/compaction_job_stats_impl.cc
     ${ROCKSDB_SOURCE_DIR}/util/comparator.cc
+    ${ROCKSDB_SOURCE_DIR}/util/compression.cc
     ${ROCKSDB_SOURCE_DIR}/util/compression_context_cache.cc
     ${ROCKSDB_SOURCE_DIR}/util/concurrent_task_limiter_impl.cc
     ${ROCKSDB_SOURCE_DIR}/util/crc32c.cc
@@ -312,11 +318,13 @@ set(SOURCES
     ${ROCKSDB_SOURCE_DIR}/util/slice.cc
     ${ROCKSDB_SOURCE_DIR}/util/file_checksum_helper.cc
     ${ROCKSDB_SOURCE_DIR}/util/status.cc
+    ${ROCKSDB_SOURCE_DIR}/util/stderr_logger.cc
     ${ROCKSDB_SOURCE_DIR}/util/string_util.cc
     ${ROCKSDB_SOURCE_DIR}/util/thread_local.cc
     ${ROCKSDB_SOURCE_DIR}/util/threadpool_imp.cc
     ${ROCKSDB_SOURCE_DIR}/util/xxhash.cc
-    ${ROCKSDB_SOURCE_DIR}/utilities/backupable/backupable_db.cc
+    ${ROCKSDB_SOURCE_DIR}/utilities/agg_merge/agg_merge.cc
+    ${ROCKSDB_SOURCE_DIR}/utilities/backup/backup_engine.cc
     ${ROCKSDB_SOURCE_DIR}/utilities/blob_db/blob_compaction_filter.cc
     ${ROCKSDB_SOURCE_DIR}/utilities/blob_db/blob_db.cc
     ${ROCKSDB_SOURCE_DIR}/utilities/blob_db/blob_db_impl.cc
@@ -419,15 +427,6 @@ list(APPEND SOURCES
     "${ROCKSDB_SOURCE_DIR}/env/fs_posix.cc"
     "${ROCKSDB_SOURCE_DIR}/env/io_posix.cc")
 
-if(WITH_FOLLY_DISTRIBUTED_MUTEX)
-  list(APPEND SOURCES
-    "${ROCKSDB_SOURCE_DIR}/third-party/folly/folly/detail/Futex.cpp"
-    "${ROCKSDB_SOURCE_DIR}/third-party/folly/folly/synchronization/AtomicNotification.cpp"
-    "${ROCKSDB_SOURCE_DIR}/third-party/folly/folly/synchronization/DistributedMutex.cpp"
-    "${ROCKSDB_SOURCE_DIR}/third-party/folly/folly/synchronization/ParkingLot.cpp"
-    "${ROCKSDB_SOURCE_DIR}/third-party/folly/folly/synchronization/WaitOptions.cpp")
-endif()
-
 add_library(_rocksdb ${SOURCES})
 add_library(ch_contrib::rocksdb ALIAS _rocksdb)
 target_link_libraries(_rocksdb PRIVATE ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
diff --git a/contrib/rocksdb-cmake/build_version.cc b/contrib/rocksdb-cmake/build_version.cc
index f9639da516f..d5ea56673e0 100644
--- a/contrib/rocksdb-cmake/build_version.cc
+++ b/contrib/rocksdb-cmake/build_version.cc
@@ -1,16 +1,33 @@
 // Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
-/// This file was edited for ClickHouse.
 
 #include <memory>
 
 #include "rocksdb/version.h"
+#include "rocksdb/utilities/object_registry.h"
 #include "util/string_util.h"
 
 // The build script may replace these values with real values based
 // on whether or not GIT is available and the platform settings
-static const std::string rocksdb_build_git_sha  = "rocksdb_build_git_sha:0";
-static const std::string rocksdb_build_git_tag = "rocksdb_build_git_tag:master";
-static const std::string rocksdb_build_date = "rocksdb_build_date:2000-01-01";
+static const std::string rocksdb_build_git_sha  = "rocksdb_build_git_sha:72438a678872544809393b831c7273794c074215";
+static const std::string rocksdb_build_git_tag = "rocksdb_build_git_tag:main";
+#define HAS_GIT_CHANGES 0
+#if HAS_GIT_CHANGES == 0
+// If HAS_GIT_CHANGES is 0, the GIT date is used.
+// Use the time the branch/tag was last modified
+static const std::string rocksdb_build_date = "rocksdb_build_date:2024-07-12 16:01:57";
+#else
+// If HAS_GIT_CHANGES is > 0, the branch/tag has modifications.
+// Use the time the build was created.
+static const std::string rocksdb_build_date = "rocksdb_build_date:2024-07-13 17:15:50";
+#endif
+
+extern "C" {
+
+} // extern "C"
+
+std::unordered_map<std::string, ROCKSDB_NAMESPACE::RegistrarFunc> ROCKSDB_NAMESPACE::ObjectRegistry::builtins_ = {
+  
+};
 
 namespace ROCKSDB_NAMESPACE {
 static void AddProperty(std::unordered_map<std::string, std::string> *props, const std::string& name) {
@@ -39,12 +56,12 @@ const std::unordered_map<std::string, std::string>& GetRocksBuildProperties() {
 }
 
 std::string GetRocksVersionAsString(bool with_patch) {
-  std::string version = ToString(ROCKSDB_MAJOR) + "." + ToString(ROCKSDB_MINOR);
+  std::string version = std::to_string(ROCKSDB_MAJOR) + "." + std::to_string(ROCKSDB_MINOR);
   if (with_patch) {
-    return version + "." + ToString(ROCKSDB_PATCH);
+    return version + "." + std::to_string(ROCKSDB_PATCH);
   } else {
     return version;
-  }
+ }
 }
 
 std::string GetRocksBuildInfoAsString(const std::string& program, bool verbose) {

From 77272c925dc15acc5fdd0260a1c0aab35b1df3c3 Mon Sep 17 00:00:00 2001
From: Xu Jia <jia.xu@clickhouse.com>
Date: Mon, 15 Jul 2024 15:10:39 +0800
Subject: [PATCH 006/139] disable insertion and mutation

---
 docs/en/operations/settings/settings.md       |  6 ++
 src/Core/ServerSettings.h                     |  1 +
 src/Interpreters/InterpreterAlterQuery.cpp    |  7 ++
 src/Interpreters/InterpreterDeleteQuery.cpp   |  4 +
 src/Interpreters/InterpreterInsertQuery.cpp   |  5 ++
 .../__init__.py                               |  0
 .../config/cluster.xml                        | 16 ++++
 .../config/reading_node.xml                   |  3 +
 .../config/storage_policy.xml                 | 21 +++++
 .../config/writing_node.xml                   |  3 +
 .../test.py                                   | 84 +++++++++++++++++++
 11 files changed, 150 insertions(+)
 create mode 100644 tests/integration/test_disable_insertion_and_mutation/__init__.py
 create mode 100644 tests/integration/test_disable_insertion_and_mutation/config/cluster.xml
 create mode 100644 tests/integration/test_disable_insertion_and_mutation/config/reading_node.xml
 create mode 100644 tests/integration/test_disable_insertion_and_mutation/config/storage_policy.xml
 create mode 100644 tests/integration/test_disable_insertion_and_mutation/config/writing_node.xml
 create mode 100644 tests/integration/test_disable_insertion_and_mutation/test.py

diff --git a/docs/en/operations/settings/settings.md b/docs/en/operations/settings/settings.md
index c3f697c3bdc..143ce836beb 100644
--- a/docs/en/operations/settings/settings.md
+++ b/docs/en/operations/settings/settings.md
@@ -5608,3 +5608,9 @@ Default value: `10000000`.
 Minimal size of block to compress in CROSS JOIN. Zero value means - disable this threshold. This block is compressed when any of the two thresholds (by rows or by bytes) are reached.
 
 Default value: `1GiB`.
+
+## disable_insertion_and_mutation
+
+Disable all insert and mutations (alter table update / alter table delete / alter table drop partition). Set to true, can make this node focus on reading queries.
+
+Default value: `false`.
diff --git a/src/Core/ServerSettings.h b/src/Core/ServerSettings.h
index 28b32a6e6a5..cf09874125d 100644
--- a/src/Core/ServerSettings.h
+++ b/src/Core/ServerSettings.h
@@ -157,6 +157,7 @@ namespace DB
     M(Bool, prepare_system_log_tables_on_startup, false, "If true, ClickHouse creates all configured `system.*_log` tables before the startup. It can be helpful if some startup scripts depend on these tables.", 0) \
     M(Double, gwp_asan_force_sample_probability, 0.0003, "Probability that an allocation from specific places will be sampled by GWP Asan (i.e. PODArray allocations)", 0) \
     M(UInt64, config_reload_interval_ms, 2000, "How often clickhouse will reload config and check for new changes", 0) \
+    M(Bool, disable_insertion_and_mutation, false, "Disable all insert/alter/delete queries. This setting will be enabled if someone needs read-only nodes to prevent insertion and mutation affect reading performance.", 0)
 
 /// If you add a setting which can be updated at runtime, please update 'changeable_settings' map in StorageSystemServerSettings.cpp
 
diff --git a/src/Interpreters/InterpreterAlterQuery.cpp b/src/Interpreters/InterpreterAlterQuery.cpp
index c70a3397f4e..b9dd59909e6 100644
--- a/src/Interpreters/InterpreterAlterQuery.cpp
+++ b/src/Interpreters/InterpreterAlterQuery.cpp
@@ -46,6 +46,7 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
     extern const int UNKNOWN_TABLE;
     extern const int UNKNOWN_DATABASE;
+    extern const int QUERY_IS_PROHIBITED;
 }
 
 
@@ -191,6 +192,12 @@ BlockIO InterpreterAlterQuery::executeToTable(const ASTAlterQuery & alter)
                                                          "to execute ALTERs of different types (replicated and non replicated) in single query");
     }
 
+    if (mutation_commands.hasNonEmptyMutationCommands() || !partition_commands.empty())
+    {
+        if (getContext()->getServerSettings().disable_insertion_and_mutation)
+            throw Exception(ErrorCodes::QUERY_IS_PROHIBITED, "Mutations are prohibited");
+    }
+
     if (!alter_commands.empty())
     {
         auto alter_lock = table->lockForAlter(getContext()->getSettingsRef().lock_acquire_timeout);
diff --git a/src/Interpreters/InterpreterDeleteQuery.cpp b/src/Interpreters/InterpreterDeleteQuery.cpp
index 39d5d9e9cef..5f3e3385148 100644
--- a/src/Interpreters/InterpreterDeleteQuery.cpp
+++ b/src/Interpreters/InterpreterDeleteQuery.cpp
@@ -26,6 +26,7 @@ namespace ErrorCodes
     extern const int SUPPORT_IS_DISABLED;
     extern const int BAD_ARGUMENTS;
     extern const int NOT_IMPLEMENTED;
+    extern const int QUERY_IS_PROHIBITED;
 }
 
 
@@ -50,6 +51,9 @@ BlockIO InterpreterDeleteQuery::execute()
     if (table->isStaticStorage())
         throw Exception(ErrorCodes::TABLE_IS_READ_ONLY, "Table is read-only");
 
+    if (getContext()->getGlobalContext()->getServerSettings().disable_insertion_and_mutation)
+        throw Exception(ErrorCodes::QUERY_IS_PROHIBITED, "Delete queries are prohibited");
+
     DatabasePtr database = DatabaseCatalog::instance().getDatabase(table_id.database_name);
     if (database->shouldReplicateQuery(getContext(), query_ptr))
     {
diff --git a/src/Interpreters/InterpreterInsertQuery.cpp b/src/Interpreters/InterpreterInsertQuery.cpp
index f396db70d21..b62a71de884 100644
--- a/src/Interpreters/InterpreterInsertQuery.cpp
+++ b/src/Interpreters/InterpreterInsertQuery.cpp
@@ -44,6 +44,7 @@ namespace ProfileEvents
 {
     extern const Event InsertQueriesWithSubqueries;
     extern const Event QueriesWithSubqueries;
+    extern const int QUERY_IS_PROHIBITED;
 }
 
 namespace DB
@@ -406,6 +407,10 @@ BlockIO InterpreterInsertQuery::execute()
     StoragePtr table = getTable(query);
     checkStorageSupportsTransactionsIfNeeded(table, getContext());
 
+    if (getContext()->getServerSettings().disable_insertion_and_mutation
+        && query.table_id.database_name != DatabaseCatalog::SYSTEM_DATABASE)
+        throw Exception(ErrorCodes::QUERY_IS_PROHIBITED, "Insert queries are prohibited");
+
     StoragePtr inner_table;
     if (const auto * mv = dynamic_cast<const StorageMaterializedView *>(table.get()))
         inner_table = mv->getTargetTable();
diff --git a/tests/integration/test_disable_insertion_and_mutation/__init__.py b/tests/integration/test_disable_insertion_and_mutation/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_disable_insertion_and_mutation/config/cluster.xml b/tests/integration/test_disable_insertion_and_mutation/config/cluster.xml
new file mode 100644
index 00000000000..17782a77679
--- /dev/null
+++ b/tests/integration/test_disable_insertion_and_mutation/config/cluster.xml
@@ -0,0 +1,16 @@
+<clickhouse>
+	<remote_servers>
+		<default>
+			<shard>
+				<replica>
+					<host>writing_node</host>
+					<port>9000</port>
+				</replica>
+				<replica>
+					<host>reading_node</host>
+					<port>9000</port>
+				</replica>
+			</shard>
+        </default>
+	</remote_servers>
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_disable_insertion_and_mutation/config/reading_node.xml b/tests/integration/test_disable_insertion_and_mutation/config/reading_node.xml
new file mode 100644
index 00000000000..becabce8a44
--- /dev/null
+++ b/tests/integration/test_disable_insertion_and_mutation/config/reading_node.xml
@@ -0,0 +1,3 @@
+<clickhouse>
+	<disable_insertion_and_mutation>true</disable_insertion_and_mutation>
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_disable_insertion_and_mutation/config/storage_policy.xml b/tests/integration/test_disable_insertion_and_mutation/config/storage_policy.xml
new file mode 100644
index 00000000000..cec96cfcc1a
--- /dev/null
+++ b/tests/integration/test_disable_insertion_and_mutation/config/storage_policy.xml
@@ -0,0 +1,21 @@
+<clickhouse>
+    <storage_configuration>
+        <disks>
+            <s3_with_keeper>
+                <type>s3_with_keeper</type>
+                <endpoint>http://minio1:9001/root/data/</endpoint>
+                <access_key_id>minio</access_key_id>
+                <secret_access_key>minio123</secret_access_key>
+            </s3_with_keeper>
+        </disks>
+        <policies>
+            <s3_with_keeper>
+                <volumes>
+                    <main>
+                        <disk>s3_with_keeper</disk>
+                    </main>
+                </volumes>
+            </s3_with_keeper>
+        </policies>
+    </storage_configuration>
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_disable_insertion_and_mutation/config/writing_node.xml b/tests/integration/test_disable_insertion_and_mutation/config/writing_node.xml
new file mode 100644
index 00000000000..0737af7afc7
--- /dev/null
+++ b/tests/integration/test_disable_insertion_and_mutation/config/writing_node.xml
@@ -0,0 +1,3 @@
+<clickhouse>
+	<disable_insertion_and_mutation>false</disable_insertion_and_mutation>
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_disable_insertion_and_mutation/test.py b/tests/integration/test_disable_insertion_and_mutation/test.py
new file mode 100644
index 00000000000..5234ae9c57c
--- /dev/null
+++ b/tests/integration/test_disable_insertion_and_mutation/test.py
@@ -0,0 +1,84 @@
+import pytest
+from helpers.client import QueryRuntimeException
+from helpers.cluster import ClickHouseCluster
+import time
+
+cluster = ClickHouseCluster(__file__)
+
+writing_node = cluster.add_instance(
+    "writing_node",
+    main_configs=["config/writing_node.xml", "config/storage_policy.xml", "config/cluster.xml"],
+    with_zookeeper=True,
+    with_minio=True,
+    stay_alive=True,
+    macros={"shard": 1, "replica": 1},
+)
+reading_node = cluster.add_instance(
+    "reading_node",
+    main_configs=["config/reading_node.xml", "config/storage_policy.xml", "config/cluster.xml"],
+    with_zookeeper=True,
+    with_minio=True,
+    stay_alive=True,
+    macros={"shard": 1, "replica": 2},
+)
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def test_disable_insertion_and_mutation(started_cluster):
+    writing_node.query("""CREATE TABLE my_table on cluster default (key UInt64, value String) ENGINE=ReplicatedMergeTree('/clickhouse/tables/{shard}/default.my_table', '{replica}') ORDER BY key partition by (key % 5) SETTINGS storage_policy='s3_with_keeper' """)
+
+    assert (
+        "QUERY_IS_PROHIBITED"
+        in reading_node.query_and_get_error("INSERT INTO my_table VALUES (1, 'hello')")
+    )
+
+    assert (
+        "QUERY_IS_PROHIBITED"
+        in reading_node.query_and_get_error("INSERT INTO my_table SETTINGS async_insert = 1 VALUES (1, 'hello')")
+    )
+
+    assert (
+        "QUERY_IS_PROHIBITED"
+        in reading_node.query_and_get_error("ALTER TABLE my_table delete where 1")
+    )
+
+    assert (
+        "QUERY_IS_PROHIBITED"
+        in reading_node.query_and_get_error("ALTER table my_table update key = 1 where 1")
+    )
+
+    assert (
+        "QUERY_IS_PROHIBITED"
+        in reading_node.query_and_get_error("ALTER TABLE my_table drop partition 0")
+    )
+
+    reading_node.query("SELECT * from my_table");
+    writing_node.query("INSERT INTO my_table VALUES (1, 'hello')")
+    writing_node.query("ALTER TABLE my_table delete where 1")
+    writing_node.query("ALTER table my_table update value = 'no hello' where 1")
+
+    reading_node.query("ALTER TABLE my_table ADD COLUMN new_column UInt64")
+    writing_node.query("SELECT new_column from my_table")
+    reading_node.query("SELECT new_column from my_table")
+
+    reading_node.query("ALter Table my_table MODIFY COLUMN new_column String")
+
+    assert(
+        "new_column\tString"
+        in reading_node.query("DESC my_table")
+    )
+
+    assert(
+        "new_column\tString"
+        in writing_node.query("DESC my_table")
+    )

From fc29ac7891eddd3a714f5af574c71040f91f451d Mon Sep 17 00:00:00 2001
From: Xu Jia <jia.xu@clickhouse.com>
Date: Mon, 15 Jul 2024 17:06:37 +0800
Subject: [PATCH 007/139] add error extern to fix compile error

---
 src/Interpreters/InterpreterInsertQuery.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Interpreters/InterpreterInsertQuery.cpp b/src/Interpreters/InterpreterInsertQuery.cpp
index b62a71de884..c01b2196ac9 100644
--- a/src/Interpreters/InterpreterInsertQuery.cpp
+++ b/src/Interpreters/InterpreterInsertQuery.cpp
@@ -56,6 +56,7 @@ namespace ErrorCodes
     extern const int NO_SUCH_COLUMN_IN_TABLE;
     extern const int ILLEGAL_COLUMN;
     extern const int DUPLICATE_COLUMN;
+    extern const int QUERY_IS_PROHIBITED;
 }
 
 InterpreterInsertQuery::InterpreterInsertQuery(

From ccba078da10bed8d42e821f8bcdd47f448d198a0 Mon Sep 17 00:00:00 2001
From: Xu Jia <jia.xu@clickhouse.com>
Date: Mon, 15 Jul 2024 09:46:31 +0000
Subject: [PATCH 008/139] change storage policy to default

---
 .../config/storage_policy.xml                 | 21 -------------------
 .../test.py                                   |  6 +++---
 2 files changed, 3 insertions(+), 24 deletions(-)
 delete mode 100644 tests/integration/test_disable_insertion_and_mutation/config/storage_policy.xml

diff --git a/tests/integration/test_disable_insertion_and_mutation/config/storage_policy.xml b/tests/integration/test_disable_insertion_and_mutation/config/storage_policy.xml
deleted file mode 100644
index cec96cfcc1a..00000000000
--- a/tests/integration/test_disable_insertion_and_mutation/config/storage_policy.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<clickhouse>
-    <storage_configuration>
-        <disks>
-            <s3_with_keeper>
-                <type>s3_with_keeper</type>
-                <endpoint>http://minio1:9001/root/data/</endpoint>
-                <access_key_id>minio</access_key_id>
-                <secret_access_key>minio123</secret_access_key>
-            </s3_with_keeper>
-        </disks>
-        <policies>
-            <s3_with_keeper>
-                <volumes>
-                    <main>
-                        <disk>s3_with_keeper</disk>
-                    </main>
-                </volumes>
-            </s3_with_keeper>
-        </policies>
-    </storage_configuration>
-</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_disable_insertion_and_mutation/test.py b/tests/integration/test_disable_insertion_and_mutation/test.py
index 5234ae9c57c..f098f130d2b 100644
--- a/tests/integration/test_disable_insertion_and_mutation/test.py
+++ b/tests/integration/test_disable_insertion_and_mutation/test.py
@@ -7,7 +7,7 @@ cluster = ClickHouseCluster(__file__)
 
 writing_node = cluster.add_instance(
     "writing_node",
-    main_configs=["config/writing_node.xml", "config/storage_policy.xml", "config/cluster.xml"],
+    main_configs=["config/writing_node.xml", "config/cluster.xml"],
     with_zookeeper=True,
     with_minio=True,
     stay_alive=True,
@@ -15,7 +15,7 @@ writing_node = cluster.add_instance(
 )
 reading_node = cluster.add_instance(
     "reading_node",
-    main_configs=["config/reading_node.xml", "config/storage_policy.xml", "config/cluster.xml"],
+    main_configs=["config/reading_node.xml", "config/cluster.xml"],
     with_zookeeper=True,
     with_minio=True,
     stay_alive=True,
@@ -35,7 +35,7 @@ def started_cluster():
 
 
 def test_disable_insertion_and_mutation(started_cluster):
-    writing_node.query("""CREATE TABLE my_table on cluster default (key UInt64, value String) ENGINE=ReplicatedMergeTree('/clickhouse/tables/{shard}/default.my_table', '{replica}') ORDER BY key partition by (key % 5) SETTINGS storage_policy='s3_with_keeper' """)
+    writing_node.query("""CREATE TABLE my_table on cluster default (key UInt64, value String) ENGINE=ReplicatedMergeTree('/clickhouse/tables/{shard}/default.my_table', '{replica}') ORDER BY key partition by (key % 5) """)
 
     assert (
         "QUERY_IS_PROHIBITED"

From b2466466d46ab1828b67693edf520d52ff45bc65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= <git@rmr.ninja>
Date: Mon, 15 Jul 2024 14:28:12 +0200
Subject: [PATCH 009/139] Rename Context::getSettings()

---
 programs/local/LocalServer.cpp                              | 2 +-
 src/Analyzer/QueryTreeBuilder.cpp                           | 2 +-
 src/Analyzer/Resolve/QueryAnalyzer.cpp                      | 2 +-
 src/Analyzer/Utils.cpp                                      | 2 +-
 src/Bridge/IBridge.cpp                                      | 2 +-
 src/Client/ClientBase.cpp                                   | 6 +++---
 src/Databases/DatabaseDictionary.cpp                        | 4 ++--
 src/Databases/DatabaseOnDisk.cpp                            | 4 ++--
 src/Databases/MySQL/MaterializedMySQLSyncThread.cpp         | 2 +-
 src/Functions/formatQuery.cpp                               | 2 +-
 src/Functions/hasColumnInTable.cpp                          | 2 +-
 src/Interpreters/Context.cpp                                | 2 +-
 src/Interpreters/Context.h                                  | 5 ++---
 src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp         | 2 +-
 src/Interpreters/ExpressionAnalyzer.cpp                     | 4 ++--
 src/Interpreters/InterpreterInsertQuery.cpp                 | 2 +-
 src/Interpreters/InterpreterSelectQuery.cpp                 | 2 +-
 src/Interpreters/JoinedTables.cpp                           | 2 +-
 src/Interpreters/ProcessList.cpp                            | 2 +-
 src/Interpreters/interpretSubquery.cpp                      | 2 +-
 src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp      | 2 +-
 .../QueryPlan/Optimizations/optimizeReadInOrder.cpp         | 2 +-
 src/Server/MySQLHandler.cpp                                 | 2 +-
 .../Distributed/DistributedAsyncInsertDirectoryQueue.cpp    | 2 +-
 src/Storages/MergeTree/MergedBlockOutputStream.cpp          | 2 +-
 src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp     | 2 +-
 src/Storages/StorageURL.cpp                                 | 4 ++--
 src/Storages/StorageView.cpp                                | 2 +-
 src/Storages/getStructureOfRemoteTable.cpp                  | 2 +-
 src/TableFunctions/Hive/TableFunctionHive.cpp               | 2 +-
 30 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/programs/local/LocalServer.cpp b/programs/local/LocalServer.cpp
index 46b543e49e9..a7265ef0de4 100644
--- a/programs/local/LocalServer.cpp
+++ b/programs/local/LocalServer.cpp
@@ -80,7 +80,7 @@ namespace ErrorCodes
 
 void applySettingsOverridesForLocal(ContextMutablePtr context)
 {
-    Settings settings = context->getSettings();
+    Settings settings = context->getSettingsCopy();
 
     settings.allow_introspection_functions = true;
     settings.storage_file_read_method = LocalFSReadMethod::mmap;
diff --git a/src/Analyzer/QueryTreeBuilder.cpp b/src/Analyzer/QueryTreeBuilder.cpp
index a62b6e56ac5..0a732a3b3b3 100644
--- a/src/Analyzer/QueryTreeBuilder.cpp
+++ b/src/Analyzer/QueryTreeBuilder.cpp
@@ -237,7 +237,7 @@ QueryTreeNodePtr QueryTreeBuilder::buildSelectExpression(const ASTPtr & select_q
     /// Remove global settings limit and offset
     if (const auto & settings_ref = updated_context->getSettingsRef(); settings_ref.limit || settings_ref.offset)
     {
-        Settings settings = updated_context->getSettings();
+        Settings settings = updated_context->getSettingsCopy();
         limit = settings.limit;
         offset = settings.offset;
         settings.limit = 0;
diff --git a/src/Analyzer/Resolve/QueryAnalyzer.cpp b/src/Analyzer/Resolve/QueryAnalyzer.cpp
index 5f7b06231d9..92618dfe346 100644
--- a/src/Analyzer/Resolve/QueryAnalyzer.cpp
+++ b/src/Analyzer/Resolve/QueryAnalyzer.cpp
@@ -503,7 +503,7 @@ void QueryAnalyzer::evaluateScalarSubqueryIfNeeded(QueryTreeNodePtr & node, Iden
         ProfileEvents::increment(ProfileEvents::ScalarSubqueriesCacheMiss);
         auto subquery_context = Context::createCopy(context);
 
-        Settings subquery_settings = context->getSettings();
+        Settings subquery_settings = context->getSettingsCopy();
         subquery_settings.max_result_rows = 1;
         subquery_settings.extremes = false;
         subquery_context->setSettings(subquery_settings);
diff --git a/src/Analyzer/Utils.cpp b/src/Analyzer/Utils.cpp
index d10bbd9bd23..e5f372b7368 100644
--- a/src/Analyzer/Utils.cpp
+++ b/src/Analyzer/Utils.cpp
@@ -867,7 +867,7 @@ void updateContextForSubqueryExecution(ContextMutablePtr & mutable_context)
       *  max_rows_in_join, max_bytes_in_join, join_overflow_mode,
       *  which are checked separately (in the Set, Join objects).
       */
-    Settings subquery_settings = mutable_context->getSettings();
+    Settings subquery_settings = mutable_context->getSettingsCopy();
     subquery_settings.max_result_rows = 0;
     subquery_settings.max_result_bytes = 0;
     /// The calculation of extremes does not make sense and is not necessary (if you do it, then the extremes of the subquery can be taken for whole query).
diff --git a/src/Bridge/IBridge.cpp b/src/Bridge/IBridge.cpp
index de48a4f2b84..5682a28f899 100644
--- a/src/Bridge/IBridge.cpp
+++ b/src/Bridge/IBridge.cpp
@@ -232,7 +232,7 @@ int IBridge::main(const std::vector<std::string> & /*args*/)
     auto context = Context::createGlobal(shared_context.get());
     context->makeGlobalContext();
 
-    auto settings = context->getSettings();
+    auto settings = context->getSettingsCopy();
     settings.set("http_max_field_value_size", http_max_field_value_size);
     context->setSettings(settings);
 
diff --git a/src/Client/ClientBase.cpp b/src/Client/ClientBase.cpp
index 5d472ba99b9..2dc603a307f 100644
--- a/src/Client/ClientBase.cpp
+++ b/src/Client/ClientBase.cpp
@@ -723,7 +723,7 @@ void ClientBase::initLogsOutputStream()
 
 void ClientBase::adjustSettings()
 {
-    Settings settings = global_context->getSettings();
+    Settings settings = global_context->getSettingsCopy();
 
     /// NOTE: Do not forget to set changed=false to avoid sending it to the server (to avoid breakage read only profiles)
 
@@ -931,7 +931,7 @@ bool ClientBase::isSyncInsertWithData(const ASTInsertQuery & insert_query, const
     if (!insert_query.data)
         return false;
 
-    auto settings = context->getSettings();
+    auto settings = context->getSettingsCopy();
     if (insert_query.settings_ast)
         settings.applyChanges(insert_query.settings_ast->as<ASTSetQuery>()->changes);
 
@@ -2696,7 +2696,7 @@ bool ClientBase::processMultiQueryFromFile(const String & file_name)
 
     if (!getClientConfiguration().has("log_comment"))
     {
-        Settings settings = global_context->getSettings();
+        Settings settings = global_context->getSettingsCopy();
         /// NOTE: cannot use even weakly_canonical() since it fails for /dev/stdin due to resolving of "pipe:[X]"
         settings.log_comment = fs::absolute(fs::path(file_name));
         global_context->setSettings(settings);
diff --git a/src/Databases/DatabaseDictionary.cpp b/src/Databases/DatabaseDictionary.cpp
index 52196e75c4a..a9569408814 100644
--- a/src/Databases/DatabaseDictionary.cpp
+++ b/src/Databases/DatabaseDictionary.cpp
@@ -111,7 +111,7 @@ ASTPtr DatabaseDictionary::getCreateTableQueryImpl(const String & table_name, Co
         buffer << ") Engine = Dictionary(" << backQuoteIfNeed(table_name) << ")";
     }
 
-    auto settings = getContext()->getSettingsRef();
+    const auto & settings = getContext()->getSettingsRef();
     ParserCreateQuery parser;
     const char * pos = query.data();
     std::string error_message;
@@ -133,7 +133,7 @@ ASTPtr DatabaseDictionary::getCreateDatabaseQuery() const
         if (const auto comment_value = getDatabaseComment(); !comment_value.empty())
             buffer << " COMMENT " << backQuote(comment_value);
     }
-    auto settings = getContext()->getSettingsRef();
+    const auto & settings = getContext()->getSettingsRef();
     ParserCreateQuery parser;
     return parseQuery(parser, query.data(), query.data() + query.size(), "", 0, settings.max_parser_depth, settings.max_parser_backtracks);
 }
diff --git a/src/Databases/DatabaseOnDisk.cpp b/src/Databases/DatabaseOnDisk.cpp
index 07a250e72c7..261a917c595 100644
--- a/src/Databases/DatabaseOnDisk.cpp
+++ b/src/Databases/DatabaseOnDisk.cpp
@@ -523,7 +523,7 @@ ASTPtr DatabaseOnDisk::getCreateDatabaseQuery() const
 {
     ASTPtr ast;
 
-    auto settings = getContext()->getSettingsRef();
+    const auto & settings = getContext()->getSettingsRef();
     {
         std::lock_guard lock(mutex);
         auto database_metadata_path = getContext()->getPath() + "metadata/" + escapeForFileName(database_name) + ".sql";
@@ -722,7 +722,7 @@ ASTPtr DatabaseOnDisk::parseQueryFromMetadata(
         return nullptr;
     }
 
-    auto settings = local_context->getSettingsRef();
+    const auto & settings = local_context->getSettingsRef();
     ParserCreateQuery parser;
     const char * pos = query.data();
     std::string error_message;
diff --git a/src/Databases/MySQL/MaterializedMySQLSyncThread.cpp b/src/Databases/MySQL/MaterializedMySQLSyncThread.cpp
index 2c342755337..04b4070d5af 100644
--- a/src/Databases/MySQL/MaterializedMySQLSyncThread.cpp
+++ b/src/Databases/MySQL/MaterializedMySQLSyncThread.cpp
@@ -89,7 +89,7 @@ static constexpr auto MYSQL_BACKGROUND_THREAD_NAME = "MySQLDBSync";
 
 static ContextMutablePtr createQueryContext(ContextPtr context)
 {
-    Settings new_query_settings = context->getSettings();
+    Settings new_query_settings = context->getSettingsCopy();
     new_query_settings.insert_allow_materialized_columns = true;
 
     /// To avoid call AST::format
diff --git a/src/Functions/formatQuery.cpp b/src/Functions/formatQuery.cpp
index d10b3f9a5b7..f7f7e4b5bcb 100644
--- a/src/Functions/formatQuery.cpp
+++ b/src/Functions/formatQuery.cpp
@@ -39,7 +39,7 @@ public:
     FunctionFormatQuery(ContextPtr context, String name_, OutputFormatting output_formatting_, ErrorHandling error_handling_)
         : name(name_), output_formatting(output_formatting_), error_handling(error_handling_)
     {
-        const Settings & settings = context->getSettings();
+        const Settings & settings = context->getSettingsRef();
         max_query_size = settings.max_query_size;
         max_parser_depth = settings.max_parser_depth;
         max_parser_backtracks = settings.max_parser_backtracks;
diff --git a/src/Functions/hasColumnInTable.cpp b/src/Functions/hasColumnInTable.cpp
index 00714997b4a..cc496270b01 100644
--- a/src/Functions/hasColumnInTable.cpp
+++ b/src/Functions/hasColumnInTable.cpp
@@ -143,7 +143,7 @@ ColumnPtr FunctionHasColumnInTable::executeImpl(const ColumnsWithTypeAndName & a
             /* cluster_name= */ "",
             /* password= */ ""
         };
-        auto cluster = std::make_shared<Cluster>(getContext()->getSettings(), host_names, params);
+        auto cluster = std::make_shared<Cluster>(getContext()->getSettingsRef(), host_names, params);
 
         // FIXME this (probably) needs a non-constant access to query context,
         // because it might initialized a storage. Ideally, the tables required
diff --git a/src/Interpreters/Context.cpp b/src/Interpreters/Context.cpp
index fc1e87e7b7e..3a88e0ccfe1 100644
--- a/src/Interpreters/Context.cpp
+++ b/src/Interpreters/Context.cpp
@@ -2267,7 +2267,7 @@ bool Context::displaySecretsInShowAndSelect() const
     return shared->server_settings.display_secrets_in_show_and_select;
 }
 
-Settings Context::getSettings() const
+Settings Context::getSettingsCopy() const
 {
     SharedLockGuard lock(mutex);
     return *settings;
diff --git a/src/Interpreters/Context.h b/src/Interpreters/Context.h
index 284cac50769..61095e53a17 100644
--- a/src/Interpreters/Context.h
+++ b/src/Interpreters/Context.h
@@ -830,7 +830,8 @@ public:
     void setMacros(std::unique_ptr<Macros> && macros);
 
     bool displaySecretsInShowAndSelect() const;
-    Settings getSettings() const;
+    Settings getSettingsCopy() const;
+    const Settings & getSettingsRef() const { return *settings; }
     void setSettings(const Settings & settings_);
 
     /// Set settings by name.
@@ -955,8 +956,6 @@ public:
     void makeSessionContext();
     void makeGlobalContext();
 
-    const Settings & getSettingsRef() const { return *settings; }
-
     void setProgressCallback(ProgressCallback callback);
     /// Used in executeQuery() to pass it to the QueryPipeline.
     ProgressCallback getProgressCallback() const;
diff --git a/src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp b/src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp
index 4bd1c47d5a0..1ca8c40460c 100644
--- a/src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp
+++ b/src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp
@@ -74,7 +74,7 @@ void ExecuteScalarSubqueriesMatcher::visit(ASTPtr & ast, Data & data)
 static auto getQueryInterpreter(const ASTSubquery & subquery, ExecuteScalarSubqueriesMatcher::Data & data)
 {
     auto subquery_context = Context::createCopy(data.getContext());
-    Settings subquery_settings = data.getContext()->getSettings();
+    Settings subquery_settings = data.getContext()->getSettingsCopy();
     subquery_settings.max_result_rows = 1;
     subquery_settings.extremes = false;
     subquery_context->setSettings(subquery_settings);
diff --git a/src/Interpreters/ExpressionAnalyzer.cpp b/src/Interpreters/ExpressionAnalyzer.cpp
index 16d0eb71278..1a4c02bdebb 100644
--- a/src/Interpreters/ExpressionAnalyzer.cpp
+++ b/src/Interpreters/ExpressionAnalyzer.cpp
@@ -171,7 +171,7 @@ ExpressionAnalyzer::ExpressionAnalyzer(
     PreparedSetsPtr prepared_sets_,
     bool is_create_parameterized_view_)
     : WithContext(context_)
-    , query(query_), settings(getContext()->getSettings())
+    , query(query_), settings(getContext()->getSettingsRef())
     , subquery_depth(subquery_depth_)
     , syntax(syntax_analyzer_result_)
     , is_create_parameterized_view(is_create_parameterized_view_)
@@ -983,7 +983,7 @@ static std::shared_ptr<IJoin> tryCreateJoin(
         algorithm == JoinAlgorithm::PARALLEL_HASH ||
         algorithm == JoinAlgorithm::DEFAULT)
     {
-        const auto & settings = context->getSettings();
+        const auto & settings = context->getSettingsRef();
 
         if (analyzed_join->allowParallelHashJoin())
             return std::make_shared<ConcurrentHashJoin>(
diff --git a/src/Interpreters/InterpreterInsertQuery.cpp b/src/Interpreters/InterpreterInsertQuery.cpp
index ef298d4d45a..dffa0cbaa5b 100644
--- a/src/Interpreters/InterpreterInsertQuery.cpp
+++ b/src/Interpreters/InterpreterInsertQuery.cpp
@@ -469,7 +469,7 @@ BlockIO InterpreterInsertQuery::execute()
                   * to avoid unnecessary squashing.
                   */
 
-                Settings new_settings = getContext()->getSettings();
+                Settings new_settings = getContext()->getSettingsCopy();
 
                 new_settings.max_threads = std::max<UInt64>(1, settings.max_insert_threads);
 
diff --git a/src/Interpreters/InterpreterSelectQuery.cpp b/src/Interpreters/InterpreterSelectQuery.cpp
index cd91f9532b9..cb3c478dbb1 100644
--- a/src/Interpreters/InterpreterSelectQuery.cpp
+++ b/src/Interpreters/InterpreterSelectQuery.cpp
@@ -253,7 +253,7 @@ namespace
 ContextPtr getSubqueryContext(const ContextPtr & context)
 {
     auto subquery_context = Context::createCopy(context);
-    Settings subquery_settings = context->getSettings();
+    Settings subquery_settings = context->getSettingsCopy();
     subquery_settings.max_result_rows = 0;
     subquery_settings.max_result_bytes = 0;
     /// The calculation of extremes does not make sense and is not necessary (if you do it, then the extremes of the subquery can be taken for whole query).
diff --git a/src/Interpreters/JoinedTables.cpp b/src/Interpreters/JoinedTables.cpp
index 0de2bf9cb1f..c5226107f8d 100644
--- a/src/Interpreters/JoinedTables.cpp
+++ b/src/Interpreters/JoinedTables.cpp
@@ -308,7 +308,7 @@ std::shared_ptr<TableJoin> JoinedTables::makeTableJoin(const ASTSelectQuery & se
     if (tables_with_columns.size() < 2)
         return {};
 
-    auto settings = context->getSettingsRef();
+    const auto & settings = context->getSettingsRef();
     MultiEnum<JoinAlgorithm> join_algorithm = settings.join_algorithm;
     bool try_use_direct_join = join_algorithm.isSet(JoinAlgorithm::DIRECT) || join_algorithm.isSet(JoinAlgorithm::DEFAULT);
     auto table_join = std::make_shared<TableJoin>(settings, context->getGlobalTemporaryVolume(), context->getTempDataOnDisk());
diff --git a/src/Interpreters/ProcessList.cpp b/src/Interpreters/ProcessList.cpp
index 5b07852d9e3..271e23a7288 100644
--- a/src/Interpreters/ProcessList.cpp
+++ b/src/Interpreters/ProcessList.cpp
@@ -657,7 +657,7 @@ QueryStatusInfo QueryStatus::getInfo(bool get_thread_list, bool get_profile_even
     {
         if (auto ctx = context.lock())
         {
-            res.query_settings = std::make_shared<Settings>(ctx->getSettings());
+            res.query_settings = std::make_shared<Settings>(ctx->getSettingsRef());
             res.current_database = ctx->getCurrentDatabase();
         }
     }
diff --git a/src/Interpreters/interpretSubquery.cpp b/src/Interpreters/interpretSubquery.cpp
index 340f6d1d805..909875b99a0 100644
--- a/src/Interpreters/interpretSubquery.cpp
+++ b/src/Interpreters/interpretSubquery.cpp
@@ -62,7 +62,7 @@ std::shared_ptr<InterpreterSelectWithUnionQuery> interpretSubquery(
       *  which are checked separately (in the Set, Join objects).
       */
     auto subquery_context = Context::createCopy(context);
-    Settings subquery_settings = context->getSettings();
+    Settings subquery_settings = context->getSettingsCopy();
     subquery_settings.max_result_rows = 0;
     subquery_settings.max_result_bytes = 0;
     /// The calculation of `extremes` does not make sense and is not necessary (if you do it, then the `extremes` of the subquery can be taken instead of the whole query).
diff --git a/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp b/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
index c23d717d52f..e467c358d1d 100644
--- a/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
@@ -406,7 +406,7 @@ bool ValuesBlockInputFormat::parseExpression(IColumn & column, size_t column_idx
 {
     const Block & header = getPort().getHeader();
     const IDataType & type = *header.getByPosition(column_idx).type;
-    auto settings = context->getSettingsRef();
+    const auto & settings = context->getSettingsRef();
 
     /// Advance the token iterator until the start of the column expression
     readUntilTheEndOfRowAndReTokenize(column_idx);
diff --git a/src/Processors/QueryPlan/Optimizations/optimizeReadInOrder.cpp b/src/Processors/QueryPlan/Optimizations/optimizeReadInOrder.cpp
index 28eb4da2e17..415a6a11999 100644
--- a/src/Processors/QueryPlan/Optimizations/optimizeReadInOrder.cpp
+++ b/src/Processors/QueryPlan/Optimizations/optimizeReadInOrder.cpp
@@ -1057,7 +1057,7 @@ size_t tryReuseStorageOrderingForWindowFunctions(QueryPlan::Node * parent_node,
     }
 
     auto context = read_from_merge_tree->getContext();
-    const auto & settings = context->getSettings();
+    const auto & settings = context->getSettingsRef();
     if (!settings.optimize_read_in_window_order || (settings.optimize_read_in_order && settings.query_plan_read_in_order) || context->getSettingsRef().allow_experimental_analyzer)
     {
         return 0;
diff --git a/src/Server/MySQLHandler.cpp b/src/Server/MySQLHandler.cpp
index b6d795b1e69..3deb09bae88 100644
--- a/src/Server/MySQLHandler.cpp
+++ b/src/Server/MySQLHandler.cpp
@@ -473,7 +473,7 @@ void MySQLHandler::comQuery(ReadBuffer & payload, bool binary_protocol)
         query_context->setCurrentQueryId(fmt::format("mysql:{}:{}", connection_id, toString(UUIDHelpers::generateV4())));
 
         /// --- Workaround for Bug 56173. Can be removed when the analyzer is on by default.
-        auto settings = query_context->getSettings();
+        auto settings = query_context->getSettingsCopy();
         settings.prefer_column_name_to_alias = true;
         query_context->setSettings(settings);
 
diff --git a/src/Storages/Distributed/DistributedAsyncInsertDirectoryQueue.cpp b/src/Storages/Distributed/DistributedAsyncInsertDirectoryQueue.cpp
index d471c67553d..c287fc817eb 100644
--- a/src/Storages/Distributed/DistributedAsyncInsertDirectoryQueue.cpp
+++ b/src/Storages/Distributed/DistributedAsyncInsertDirectoryQueue.cpp
@@ -283,7 +283,7 @@ ConnectionPoolWithFailoverPtr DistributedAsyncInsertDirectoryQueue::createPool(c
 
     auto pools = createPoolsForAddresses(addresses, pool_factory, storage.log);
 
-    const auto settings = storage.getContext()->getSettings();
+    const auto & settings = storage.getContext()->getSettingsRef();
     return std::make_shared<ConnectionPoolWithFailover>(std::move(pools),
         settings.load_balancing,
         settings.distributed_replica_error_half_life.totalSeconds(),
diff --git a/src/Storages/MergeTree/MergedBlockOutputStream.cpp b/src/Storages/MergeTree/MergedBlockOutputStream.cpp
index 38869aebaa5..4ee68580d3f 100644
--- a/src/Storages/MergeTree/MergedBlockOutputStream.cpp
+++ b/src/Storages/MergeTree/MergedBlockOutputStream.cpp
@@ -34,7 +34,7 @@ MergedBlockOutputStream::MergedBlockOutputStream(
     , write_settings(write_settings_)
 {
     MergeTreeWriterSettings writer_settings(
-        data_part->storage.getContext()->getSettings(),
+        data_part->storage.getContext()->getSettingsRef(),
         write_settings,
         storage_settings,
         data_part->index_granularity_info.mark_type.adaptive,
diff --git a/src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp b/src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp
index c167ac87317..05cd77dcd40 100644
--- a/src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp
+++ b/src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp
@@ -23,7 +23,7 @@ MergedColumnOnlyOutputStream::MergedColumnOnlyOutputStream(
     const MergeTreeIndexGranularityInfo * index_granularity_info)
     : IMergedBlockOutputStream(data_part->storage.getSettings(), data_part->getDataPartStoragePtr(), metadata_snapshot_, columns_list_, /*reset_columns=*/ true)
 {
-    const auto & global_settings = data_part->storage.getContext()->getSettings();
+    const auto & global_settings = data_part->storage.getContext()->getSettingsRef();
 
     MergeTreeWriterSettings writer_settings(
         global_settings,
diff --git a/src/Storages/StorageURL.cpp b/src/Storages/StorageURL.cpp
index 9cec8c75ebe..731bd7ec3d3 100644
--- a/src/Storages/StorageURL.cpp
+++ b/src/Storages/StorageURL.cpp
@@ -462,7 +462,7 @@ std::pair<Poco::URI, std::unique_ptr<ReadWriteBufferFromHTTP>> StorageURLSource:
 
         setCredentials(credentials, request_uri);
 
-        const auto settings = context_->getSettings();
+        const auto & settings = context_->getSettingsRef();
 
         auto proxy_config = getProxyConfiguration(request_uri.getScheme());
 
@@ -1324,7 +1324,7 @@ std::optional<time_t> IStorageURLBase::tryGetLastModificationTime(
     const Poco::Net::HTTPBasicCredentials & credentials,
     const ContextPtr & context)
 {
-    auto settings = context->getSettingsRef();
+    const auto & settings = context->getSettingsRef();
 
     auto uri = Poco::URI(url);
 
diff --git a/src/Storages/StorageView.cpp b/src/Storages/StorageView.cpp
index 5f768bce978..929896e3246 100644
--- a/src/Storages/StorageView.cpp
+++ b/src/Storages/StorageView.cpp
@@ -97,7 +97,7 @@ bool hasJoin(const ASTSelectWithUnionQuery & ast)
 ContextPtr getViewContext(ContextPtr context, const StorageSnapshotPtr & storage_snapshot)
 {
     auto view_context = storage_snapshot->metadata->getSQLSecurityOverriddenContext(context);
-    Settings view_settings = view_context->getSettings();
+    Settings view_settings = view_context->getSettingsCopy();
     view_settings.max_result_rows = 0;
     view_settings.max_result_bytes = 0;
     view_settings.extremes = false;
diff --git a/src/Storages/getStructureOfRemoteTable.cpp b/src/Storages/getStructureOfRemoteTable.cpp
index 56071abaa95..9d23f132759 100644
--- a/src/Storages/getStructureOfRemoteTable.cpp
+++ b/src/Storages/getStructureOfRemoteTable.cpp
@@ -65,7 +65,7 @@ ColumnsDescription getStructureOfRemoteTableInShard(
     /// Ignore limit for result number of rows (that could be set during handling CSE/CTE),
     /// since this is a service query and should not lead to query failure.
     {
-        Settings new_settings = new_context->getSettings();
+        Settings new_settings = new_context->getSettingsCopy();
         new_settings.max_result_rows = 0;
         new_settings.max_result_bytes = 0;
         new_context->setSettings(new_settings);
diff --git a/src/TableFunctions/Hive/TableFunctionHive.cpp b/src/TableFunctions/Hive/TableFunctionHive.cpp
index 80494dbe5a8..759807d7a4f 100644
--- a/src/TableFunctions/Hive/TableFunctionHive.cpp
+++ b/src/TableFunctions/Hive/TableFunctionHive.cpp
@@ -93,7 +93,7 @@ StoragePtr TableFunctionHive::executeImpl(
     ColumnsDescription /*cached_columns_*/,
     bool /*is_insert_query*/) const
 {
-    const Settings & settings = context_->getSettings();
+    const Settings & settings = context_->getSettingsRef();
     ParserExpression partition_by_parser;
     ASTPtr partition_by_ast = parseQuery(
         partition_by_parser,

From 083e4b17db62121d6905c35480c3a462dc26477b Mon Sep 17 00:00:00 2001
From: Xu Jia <jia.xu@clickhouse.com>
Date: Tue, 16 Jul 2024 09:34:52 +0800
Subject: [PATCH 010/139] trigger CI


From b6a790124cd670749b4c504f58a4854307bf7d83 Mon Sep 17 00:00:00 2001
From: Igor Nikonov <igor@clickhouse.com>
Date: Tue, 16 Jul 2024 20:16:47 +0000
Subject: [PATCH 011/139] Handling parallel replicas protocol with priority for
 async communication

---
 src/Processors/IProcessor.h                   |  2 +
 src/Processors/Sources/RemoteSource.cpp       | 23 +++++++++++
 src/Processors/Sources/RemoteSource.h         |  3 ++
 src/QueryPipeline/RemoteQueryExecutor.cpp     | 38 +++++++++++++++++--
 src/QueryPipeline/RemoteQueryExecutor.h       |  4 +-
 .../RemoteQueryExecutorReadContext.h          |  2 +
 6 files changed, 67 insertions(+), 5 deletions(-)

diff --git a/src/Processors/IProcessor.h b/src/Processors/IProcessor.h
index 02f7b6b3d12..358983a2179 100644
--- a/src/Processors/IProcessor.h
+++ b/src/Processors/IProcessor.h
@@ -221,6 +221,8 @@ public:
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method 'schedule' is not implemented for {} processor", getName());
     }
 
+    virtual void asyncJobReady() {}
+
     /** You must call this method if 'prepare' returned ExpandPipeline.
       * This method cannot access any port, but it can create new ports for current processor.
       *
diff --git a/src/Processors/Sources/RemoteSource.cpp b/src/Processors/Sources/RemoteSource.cpp
index 3d7dd3f76b8..f1d47f69782 100644
--- a/src/Processors/Sources/RemoteSource.cpp
+++ b/src/Processors/Sources/RemoteSource.cpp
@@ -89,6 +89,12 @@ ISource::Status RemoteSource::prepare()
 
 void RemoteSource::work()
 {
+    if (async_immediate_work.exchange(false))
+    {
+        LOG_DEBUG(getLogger(__PRETTY_FUNCTION__), "async_immediate_work was true");
+        return;
+    }
+
     /// Connection drain is a heavy operation that may take a long time.
     /// Therefore we move connection drain from prepare() to work(), and drain multiple connections in parallel.
     /// See issue: https://github.com/ClickHouse/ClickHouse/issues/60844
@@ -101,6 +107,23 @@ void RemoteSource::work()
     ISource::work();
 }
 
+void RemoteSource::asyncJobReady()
+{
+    chassert(async_read);
+
+    if (!was_query_sent)
+        return;
+
+    auto res = query_executor->readAsync(/*probe=*/true);
+    if (res.type == RemoteQueryExecutor::ReadResult::Type::ParallelReplicasToken)
+    {
+        LOG_DEBUG(getLogger(__PRETTY_FUNCTION__), "async_immediate_work is {}", async_immediate_work);
+        work();
+        async_immediate_work = true;
+        LOG_DEBUG(getLogger(__PRETTY_FUNCTION__), "async_immediate_work is true");
+    }
+}
+
 std::optional<Chunk> RemoteSource::tryGenerate()
 {
     /// onCancel() will do the cancel if the query was sent.
diff --git a/src/Processors/Sources/RemoteSource.h b/src/Processors/Sources/RemoteSource.h
index 052567bc261..fa04985f101 100644
--- a/src/Processors/Sources/RemoteSource.h
+++ b/src/Processors/Sources/RemoteSource.h
@@ -32,6 +32,8 @@ public:
 
     int schedule() override { return fd; }
 
+    void asyncJobReady() override;
+
     void setStorageLimits(const std::shared_ptr<const StorageLimitsList> & storage_limits_) override;
 
 protected:
@@ -52,6 +54,7 @@ private:
     int fd = -1;
     size_t rows = 0;
     bool manually_add_rows_before_limit_counter = false;
+    std::atomic_bool async_immediate_work{false};
 };
 
 /// Totals source from RemoteQueryExecutor.
diff --git a/src/QueryPipeline/RemoteQueryExecutor.cpp b/src/QueryPipeline/RemoteQueryExecutor.cpp
index b08f2002f64..3ca05b53417 100644
--- a/src/QueryPipeline/RemoteQueryExecutor.cpp
+++ b/src/QueryPipeline/RemoteQueryExecutor.cpp
@@ -469,7 +469,7 @@ RemoteQueryExecutor::ReadResult RemoteQueryExecutor::read()
     return restartQueryWithoutDuplicatedUUIDs();
 }
 
-RemoteQueryExecutor::ReadResult RemoteQueryExecutor::readAsync()
+RemoteQueryExecutor::ReadResult RemoteQueryExecutor::readAsync(bool check_packet_type_only)
 {
 #if defined(OS_LINUX)
     if (!read_context || (resent_query && recreate_read_context))
@@ -486,7 +486,21 @@ RemoteQueryExecutor::ReadResult RemoteQueryExecutor::readAsync()
     {
         std::lock_guard lock(was_cancelled_mutex);
         if (was_cancelled)
+        {
+            LOG_DEBUG(getLogger(__PRETTY_FUNCTION__), "was_cancelled");
             return ReadResult(Block());
+        }
+
+        if (has_postponed_packet)
+        {
+            has_postponed_packet = false;
+            auto read_result = processPacket(read_context->getPacket());
+            if (read_result.getType() == ReadResult::Type::Data || read_result.getType() == ReadResult::Type::ParallelReplicasToken)
+                return read_result;
+
+            if (got_duplicated_part_uuids)
+                break;
+        }
 
         read_context->resume();
 
@@ -506,12 +520,28 @@ RemoteQueryExecutor::ReadResult RemoteQueryExecutor::readAsync()
 
         /// Check if packet is not ready yet.
         if (read_context->isInProgress())
+        {
+            LOG_DEBUG(getLogger(__PRETTY_FUNCTION__), "read_context still in progress");
             return ReadResult(read_context->getFileDescriptor());
+        }
 
-        auto anything = processPacket(read_context->getPacket());
+        const auto packet_type = read_context->getPacketType();
+        LOG_DEBUG(getLogger(__PRETTY_FUNCTION__), "Packet type: {}", packet_type);
 
-        if (anything.getType() == ReadResult::Type::Data || anything.getType() == ReadResult::Type::ParallelReplicasToken)
-            return anything;
+        if (check_packet_type_only)
+        {
+            has_postponed_packet = true;
+            if (packet_type == Protocol::Server::MergeTreeReadTaskRequest
+                || packet_type == Protocol::Server::MergeTreeAllRangesAnnouncement)
+            {
+                return ReadResult(ReadResult::Type::ParallelReplicasToken);
+            }
+            return ReadResult(ReadResult::Type::Nothing);
+        }
+
+        auto read_result = processPacket(read_context->getPacket());
+        if (read_result.getType() == ReadResult::Type::Data || read_result.getType() == ReadResult::Type::ParallelReplicasToken)
+            return read_result;
 
         if (got_duplicated_part_uuids)
             break;
diff --git a/src/QueryPipeline/RemoteQueryExecutor.h b/src/QueryPipeline/RemoteQueryExecutor.h
index 04a59cc3b7e..6849c3e0a07 100644
--- a/src/QueryPipeline/RemoteQueryExecutor.h
+++ b/src/QueryPipeline/RemoteQueryExecutor.h
@@ -183,7 +183,7 @@ public:
     ReadResult read();
 
     /// Async variant of read. Returns ready block or file descriptor which may be used for polling.
-    ReadResult readAsync();
+    ReadResult readAsync(bool check_packet_type_only = false);
 
     /// Receive all remain packets and finish query.
     /// It should be cancelled after read returned empty block.
@@ -303,6 +303,8 @@ private:
       */
     bool got_duplicated_part_uuids = false;
 
+    bool has_postponed_packet = false;
+
     /// Parts uuids, collected from remote replicas
     std::vector<UUID> duplicated_part_uuids;
 
diff --git a/src/QueryPipeline/RemoteQueryExecutorReadContext.h b/src/QueryPipeline/RemoteQueryExecutorReadContext.h
index b8aa8bb9111..c054e75f6f1 100644
--- a/src/QueryPipeline/RemoteQueryExecutorReadContext.h
+++ b/src/QueryPipeline/RemoteQueryExecutorReadContext.h
@@ -39,6 +39,8 @@ public:
 
     Packet getPacket() { return std::move(packet); }
 
+    UInt64 getPacketType() const { return packet.type; }
+
 private:
     bool checkTimeout(bool blocking = false);
 

From a7310e51939ad6053d6ab94b07f0171457e5d779 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Mon, 8 Jul 2024 19:32:27 +0200
Subject: [PATCH 012/139] Ignore async_load_databases for ATTACH query

It is quite odd that when ATTACH finishes the tables may not be exists,
due to async_load_databases.

For server startup it makes total sense, but not for queries.

Plus, you can execute queries in parallel if you want to make it faster.

Note, that server startup does not uses this code, see loadMetadata.cpp.

Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
---
 src/Interpreters/InterpreterCreateQuery.cpp | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/Interpreters/InterpreterCreateQuery.cpp b/src/Interpreters/InterpreterCreateQuery.cpp
index 84d7f0a587c..1d8d885b216 100644
--- a/src/Interpreters/InterpreterCreateQuery.cpp
+++ b/src/Interpreters/InterpreterCreateQuery.cpp
@@ -362,18 +362,10 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
             TablesLoader loader{getContext()->getGlobalContext(), {{database_name, database}}, mode};
             auto load_tasks = loader.loadTablesAsync();
             auto startup_tasks = loader.startupTablesAsync();
-            if (getContext()->getGlobalContext()->getServerSettings().async_load_databases)
-            {
-                scheduleLoad(load_tasks);
-                scheduleLoad(startup_tasks);
-            }
-            else
-            {
-                /// First prioritize, schedule and wait all the load table tasks
-                waitLoad(currentPoolOr(TablesLoaderForegroundPoolId), load_tasks);
-                /// Only then prioritize, schedule and wait all the startup tasks
-                waitLoad(currentPoolOr(TablesLoaderForegroundPoolId), startup_tasks);
-            }
+            /// First prioritize, schedule and wait all the load table tasks
+            waitLoad(currentPoolOr(TablesLoaderForegroundPoolId), load_tasks);
+            /// Only then prioritize, schedule and wait all the startup tasks
+            waitLoad(currentPoolOr(TablesLoaderForegroundPoolId), startup_tasks);
         }
     }
     catch (...)

From f30d35ae2926948f1e6a268917113e757df4e2df Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Mon, 8 Jul 2024 19:34:18 +0200
Subject: [PATCH 013/139] Revert "Merge pull request #65571 from
 ClickHouse/fix-flaky-test-4"

Reverts: https://github.com/ClickHouse/ClickHouse/pull/65571

This reverts commit da9a34ea46b504881ffe5aa605c933106862ba25, reversing
changes made to cbdb9833f207d4b0e35ad09cf4757f5d5b506b77.

Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
---
 .../0_stateless/01254_dict_load_after_detach_attach.reference   | 2 +-
 .../queries/0_stateless/01254_dict_load_after_detach_attach.sql | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/queries/0_stateless/01254_dict_load_after_detach_attach.reference b/tests/queries/0_stateless/01254_dict_load_after_detach_attach.reference
index 9c2c59f6379..2f2d638a294 100644
--- a/tests/queries/0_stateless/01254_dict_load_after_detach_attach.reference
+++ b/tests/queries/0_stateless/01254_dict_load_after_detach_attach.reference
@@ -1,4 +1,4 @@
-NOT_LOADED
+0	NOT_LOADED
 0	LOADED
 10
 1	LOADED
diff --git a/tests/queries/0_stateless/01254_dict_load_after_detach_attach.sql b/tests/queries/0_stateless/01254_dict_load_after_detach_attach.sql
index 11473c6ce32..ef9e940df8b 100644
--- a/tests/queries/0_stateless/01254_dict_load_after_detach_attach.sql
+++ b/tests/queries/0_stateless/01254_dict_load_after_detach_attach.sql
@@ -12,7 +12,7 @@ LAYOUT(FLAT());
 DETACH DATABASE {CLICKHOUSE_DATABASE:Identifier};
 ATTACH DATABASE {CLICKHOUSE_DATABASE:Identifier};
 
-SELECT COALESCE((SELECT status FROM system.dictionaries WHERE database = currentDatabase() AND name = 'dict')::Nullable(String), 'NOT_LOADED');
+SELECT query_count, status FROM system.dictionaries WHERE database = currentDatabase() AND name = 'dict';
 SYSTEM RELOAD DICTIONARY dict;
 SELECT query_count, status FROM system.dictionaries WHERE database = currentDatabase() AND name = 'dict';
 SELECT dictGetUInt64('dict', 'val', toUInt64(0));

From 523e0abb4ec329c0535602c43c17991f4ef043a3 Mon Sep 17 00:00:00 2001
From: Igor Nikonov <igor@clickhouse.com>
Date: Wed, 17 Jul 2024 13:15:14 +0000
Subject: [PATCH 014/139] Remove debug logs

---
 src/Processors/Sources/RemoteSource.cpp   |  7 +------
 src/QueryPipeline/RemoteQueryExecutor.cpp | 10 +---------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/Processors/Sources/RemoteSource.cpp b/src/Processors/Sources/RemoteSource.cpp
index f1d47f69782..e33613564a2 100644
--- a/src/Processors/Sources/RemoteSource.cpp
+++ b/src/Processors/Sources/RemoteSource.cpp
@@ -90,10 +90,7 @@ ISource::Status RemoteSource::prepare()
 void RemoteSource::work()
 {
     if (async_immediate_work.exchange(false))
-    {
-        LOG_DEBUG(getLogger(__PRETTY_FUNCTION__), "async_immediate_work was true");
         return;
-    }
 
     /// Connection drain is a heavy operation that may take a long time.
     /// Therefore we move connection drain from prepare() to work(), and drain multiple connections in parallel.
@@ -114,13 +111,11 @@ void RemoteSource::asyncJobReady()
     if (!was_query_sent)
         return;
 
-    auto res = query_executor->readAsync(/*probe=*/true);
+    auto res = query_executor->readAsync(/*check_packet_type_only=*/true);
     if (res.type == RemoteQueryExecutor::ReadResult::Type::ParallelReplicasToken)
     {
-        LOG_DEBUG(getLogger(__PRETTY_FUNCTION__), "async_immediate_work is {}", async_immediate_work);
         work();
         async_immediate_work = true;
-        LOG_DEBUG(getLogger(__PRETTY_FUNCTION__), "async_immediate_work is true");
     }
 }
 
diff --git a/src/QueryPipeline/RemoteQueryExecutor.cpp b/src/QueryPipeline/RemoteQueryExecutor.cpp
index 3ca05b53417..87f634b8334 100644
--- a/src/QueryPipeline/RemoteQueryExecutor.cpp
+++ b/src/QueryPipeline/RemoteQueryExecutor.cpp
@@ -486,10 +486,7 @@ RemoteQueryExecutor::ReadResult RemoteQueryExecutor::readAsync(bool check_packet
     {
         std::lock_guard lock(was_cancelled_mutex);
         if (was_cancelled)
-        {
-            LOG_DEBUG(getLogger(__PRETTY_FUNCTION__), "was_cancelled");
             return ReadResult(Block());
-        }
 
         if (has_postponed_packet)
         {
@@ -520,17 +517,12 @@ RemoteQueryExecutor::ReadResult RemoteQueryExecutor::readAsync(bool check_packet
 
         /// Check if packet is not ready yet.
         if (read_context->isInProgress())
-        {
-            LOG_DEBUG(getLogger(__PRETTY_FUNCTION__), "read_context still in progress");
             return ReadResult(read_context->getFileDescriptor());
-        }
-
-        const auto packet_type = read_context->getPacketType();
-        LOG_DEBUG(getLogger(__PRETTY_FUNCTION__), "Packet type: {}", packet_type);
 
         if (check_packet_type_only)
         {
             has_postponed_packet = true;
+            const auto packet_type = read_context->getPacketType();
             if (packet_type == Protocol::Server::MergeTreeReadTaskRequest
                 || packet_type == Protocol::Server::MergeTreeAllRangesAnnouncement)
             {

From b8fbfd227fb60e0f244bda716ef5a9bb89376986 Mon Sep 17 00:00:00 2001
From: Xu Jia <jia.xu@clickhouse.com>
Date: Thu, 18 Jul 2024 15:41:08 +0800
Subject: [PATCH 015/139] format

---
 src/Interpreters/InterpreterInsertQuery.cpp   |  1 -
 .../test.py                                   | 40 ++++++++-----------
 2 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/src/Interpreters/InterpreterInsertQuery.cpp b/src/Interpreters/InterpreterInsertQuery.cpp
index 4064cd82b67..181fb064b54 100644
--- a/src/Interpreters/InterpreterInsertQuery.cpp
+++ b/src/Interpreters/InterpreterInsertQuery.cpp
@@ -49,7 +49,6 @@ namespace ProfileEvents
 {
     extern const Event InsertQueriesWithSubqueries;
     extern const Event QueriesWithSubqueries;
-    extern const int QUERY_IS_PROHIBITED;
 }
 
 namespace DB
diff --git a/tests/integration/test_disable_insertion_and_mutation/test.py b/tests/integration/test_disable_insertion_and_mutation/test.py
index f098f130d2b..f25964d27b8 100644
--- a/tests/integration/test_disable_insertion_and_mutation/test.py
+++ b/tests/integration/test_disable_insertion_and_mutation/test.py
@@ -37,29 +37,25 @@ def started_cluster():
 def test_disable_insertion_and_mutation(started_cluster):
     writing_node.query("""CREATE TABLE my_table on cluster default (key UInt64, value String) ENGINE=ReplicatedMergeTree('/clickhouse/tables/{shard}/default.my_table', '{replica}') ORDER BY key partition by (key % 5) """)
 
-    assert (
-        "QUERY_IS_PROHIBITED"
-        in reading_node.query_and_get_error("INSERT INTO my_table VALUES (1, 'hello')")
+    assert "QUERY_IS_PROHIBITED" in reading_node.query_and_get_error(
+        "INSERT INTO my_table VALUES (1, 'hello')"
     )
 
-    assert (
-        "QUERY_IS_PROHIBITED"
-        in reading_node.query_and_get_error("INSERT INTO my_table SETTINGS async_insert = 1 VALUES (1, 'hello')")
+    assert "QUERY_IS_PROHIBITED" in reading_node.query_and_get_error(
+        "INSERT INTO my_table SETTINGS async_insert = 1 VALUES (1, 'hello')"
     )
 
-    assert (
-        "QUERY_IS_PROHIBITED"
-        in reading_node.query_and_get_error("ALTER TABLE my_table delete where 1")
+    assert "QUERY_IS_PROHIBITED" in reading_node.query_and_get_error(
+        "ALTER TABLE my_table delete where 1"
+    )
+    
+
+    assert "QUERY_IS_PROHIBITED" in reading_node.query_and_get_error(
+        "ALTER table my_table update key = 1 where 1"
     )
 
-    assert (
-        "QUERY_IS_PROHIBITED"
-        in reading_node.query_and_get_error("ALTER table my_table update key = 1 where 1")
-    )
-
-    assert (
-        "QUERY_IS_PROHIBITED"
-        in reading_node.query_and_get_error("ALTER TABLE my_table drop partition 0")
+    assert "QUERY_IS_PROHIBITED" in reading_node.query_and_get_error(
+        "ALTER TABLE my_table drop partition 0"
     )
 
     reading_node.query("SELECT * from my_table");
@@ -73,12 +69,10 @@ def test_disable_insertion_and_mutation(started_cluster):
 
     reading_node.query("ALter Table my_table MODIFY COLUMN new_column String")
 
-    assert(
-        "new_column\tString"
-        in reading_node.query("DESC my_table")
+    assert "new_column\tString" in reading_node.query(
+        "DESC my_table"
     )
 
-    assert(
-        "new_column\tString"
-        in writing_node.query("DESC my_table")
+    assert "new_column\tString" in writing_node.query(
+        "DESC my_table"
     )

From 884dc496a0a978074d3e0bd70f4df8d0225e69c1 Mon Sep 17 00:00:00 2001
From: Xu Jia <jia.xu@clickhouse.com>
Date: Thu, 18 Jul 2024 20:58:37 +0800
Subject: [PATCH 016/139] format

---
 .../test_disable_insertion_and_mutation/test.py    | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/tests/integration/test_disable_insertion_and_mutation/test.py b/tests/integration/test_disable_insertion_and_mutation/test.py
index f25964d27b8..b6431690245 100644
--- a/tests/integration/test_disable_insertion_and_mutation/test.py
+++ b/tests/integration/test_disable_insertion_and_mutation/test.py
@@ -35,7 +35,9 @@ def started_cluster():
 
 
 def test_disable_insertion_and_mutation(started_cluster):
-    writing_node.query("""CREATE TABLE my_table on cluster default (key UInt64, value String) ENGINE=ReplicatedMergeTree('/clickhouse/tables/{shard}/default.my_table', '{replica}') ORDER BY key partition by (key % 5) """)
+    writing_node.query(
+        """CREATE TABLE my_table on cluster default (key UInt64, value String) ENGINE=ReplicatedMergeTree('/clickhouse/tables/{shard}/default.my_table', '{replica}') ORDER BY key partition by (key % 5) """
+    )
 
     assert "QUERY_IS_PROHIBITED" in reading_node.query_and_get_error(
         "INSERT INTO my_table VALUES (1, 'hello')"
@@ -58,7 +60,7 @@ def test_disable_insertion_and_mutation(started_cluster):
         "ALTER TABLE my_table drop partition 0"
     )
 
-    reading_node.query("SELECT * from my_table");
+    reading_node.query("SELECT * from my_table")
     writing_node.query("INSERT INTO my_table VALUES (1, 'hello')")
     writing_node.query("ALTER TABLE my_table delete where 1")
     writing_node.query("ALTER table my_table update value = 'no hello' where 1")
@@ -69,10 +71,6 @@ def test_disable_insertion_and_mutation(started_cluster):
 
     reading_node.query("ALter Table my_table MODIFY COLUMN new_column String")
 
-    assert "new_column\tString" in reading_node.query(
-        "DESC my_table"
-    )
+    assert "new_column\tString" in reading_node.query("DESC my_table")
 
-    assert "new_column\tString" in writing_node.query(
-        "DESC my_table"
-    )
+    assert "new_column\tString" in writing_node.query("DESC my_table")

From c01e2cbeea02ebecfc4dea4692baffff3087b043 Mon Sep 17 00:00:00 2001
From: Xu Jia <jia.xu@clickhouse.com>
Date: Thu, 18 Jul 2024 22:58:30 +0800
Subject: [PATCH 017/139] format

---
 tests/integration/test_disable_insertion_and_mutation/test.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/integration/test_disable_insertion_and_mutation/test.py b/tests/integration/test_disable_insertion_and_mutation/test.py
index b6431690245..b6da7ed548f 100644
--- a/tests/integration/test_disable_insertion_and_mutation/test.py
+++ b/tests/integration/test_disable_insertion_and_mutation/test.py
@@ -50,7 +50,6 @@ def test_disable_insertion_and_mutation(started_cluster):
     assert "QUERY_IS_PROHIBITED" in reading_node.query_and_get_error(
         "ALTER TABLE my_table delete where 1"
     )
-    
 
     assert "QUERY_IS_PROHIBITED" in reading_node.query_and_get_error(
         "ALTER table my_table update key = 1 where 1"

From e806123856f5ded0f2e92f4f4b42c38132276c15 Mon Sep 17 00:00:00 2001
From: Igor Nikonov <igor@clickhouse.com>
Date: Thu, 18 Jul 2024 20:30:56 +0000
Subject: [PATCH 018/139] Fix non x86 build

---
 src/QueryPipeline/RemoteQueryExecutor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/QueryPipeline/RemoteQueryExecutor.cpp b/src/QueryPipeline/RemoteQueryExecutor.cpp
index 87f634b8334..d7edbc9ed35 100644
--- a/src/QueryPipeline/RemoteQueryExecutor.cpp
+++ b/src/QueryPipeline/RemoteQueryExecutor.cpp
@@ -469,7 +469,7 @@ RemoteQueryExecutor::ReadResult RemoteQueryExecutor::read()
     return restartQueryWithoutDuplicatedUUIDs();
 }
 
-RemoteQueryExecutor::ReadResult RemoteQueryExecutor::readAsync(bool check_packet_type_only)
+RemoteQueryExecutor::ReadResult RemoteQueryExecutor::readAsync([[maybe_unused]] bool check_packet_type_only)
 {
 #if defined(OS_LINUX)
     if (!read_context || (resent_query && recreate_read_context))

From 48e7708d7bcf575123ea20cee9455e0a4cf26791 Mon Sep 17 00:00:00 2001
From: Xu Jia <jia.xu@clickhouse.com>
Date: Fri, 19 Jul 2024 10:29:13 +0800
Subject: [PATCH 019/139] fix compile error

---
 src/Interpreters/InterpreterAlterQuery.cpp  | 1 +
 src/Interpreters/InterpreterDeleteQuery.cpp | 1 +
 src/Interpreters/InterpreterInsertQuery.cpp | 8 ++++----
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Interpreters/InterpreterAlterQuery.cpp b/src/Interpreters/InterpreterAlterQuery.cpp
index 398fe31f1a9..9b5b5dfc20a 100644
--- a/src/Interpreters/InterpreterAlterQuery.cpp
+++ b/src/Interpreters/InterpreterAlterQuery.cpp
@@ -5,6 +5,7 @@
 #include <Access/Common/AccessRightsElement.h>
 #include <Common/typeid_cast.h>
 #include <Core/Settings.h>
+#include <Core/ServerSettings.h>
 #include <Databases/DatabaseFactory.h>
 #include <Databases/DatabaseReplicated.h>
 #include <Databases/IDatabase.h>
diff --git a/src/Interpreters/InterpreterDeleteQuery.cpp b/src/Interpreters/InterpreterDeleteQuery.cpp
index b37ec4de4ab..291c8e19db0 100644
--- a/src/Interpreters/InterpreterDeleteQuery.cpp
+++ b/src/Interpreters/InterpreterDeleteQuery.cpp
@@ -3,6 +3,7 @@
 
 #include <Access/ContextAccess.h>
 #include <Core/Settings.h>
+#include <Core/ServerSettings.h>
 #include <Databases/DatabaseReplicated.h>
 #include <Databases/IDatabase.h>
 #include <Interpreters/Context.h>
diff --git a/src/Interpreters/InterpreterInsertQuery.cpp b/src/Interpreters/InterpreterInsertQuery.cpp
index 181fb064b54..aef6c1249d5 100644
--- a/src/Interpreters/InterpreterInsertQuery.cpp
+++ b/src/Interpreters/InterpreterInsertQuery.cpp
@@ -6,6 +6,7 @@
 #include <AggregateFunctions/AggregateFunctionFactory.h>
 #include <Columns/ColumnNullable.h>
 #include <Core/Settings.h>
+#include <Core/ServerSettings.h>
 #include <Processors/Transforms/buildPushingToViewsChain.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <Interpreters/DatabaseCatalog.h>
@@ -411,10 +412,6 @@ std::pair<std::vector<Chain>, std::vector<Chain>> InterpreterInsertQuery::buildP
     if (!running_group)
         running_group = std::make_shared<ThreadGroup>(getContext());
 
-    if (getContext()->getServerSettings().disable_insertion_and_mutation
-        && query.table_id.database_name != DatabaseCatalog::SYSTEM_DATABASE)
-        throw Exception(ErrorCodes::QUERY_IS_PROHIBITED, "Insert queries are prohibited");
-
     std::vector<Chain> sink_chains;
     std::vector<Chain> presink_chains;
 
@@ -737,6 +734,9 @@ BlockIO InterpreterInsertQuery::execute()
     const Settings & settings = getContext()->getSettingsRef();
     auto & query = query_ptr->as<ASTInsertQuery &>();
 
+    if (getContext()->getServerSettings().disable_insertion_and_mutation
+        && query.table_id.database_name != DatabaseCatalog::SYSTEM_DATABASE)
+        throw Exception(ErrorCodes::QUERY_IS_PROHIBITED, "Insert queries are prohibited");
 
     StoragePtr table = getTable(query);
     checkStorageSupportsTransactionsIfNeeded(table, getContext());

From 4cb862432c50848e3406899f5c7079b4cf1d62a8 Mon Sep 17 00:00:00 2001
From: Igor Nikonov <igor@clickhouse.com>
Date: Fri, 19 Jul 2024 09:34:20 +0000
Subject: [PATCH 020/139] Rename method

---
 src/Processors/IProcessor.h             | 2 +-
 src/Processors/Sources/RemoteSource.cpp | 2 +-
 src/Processors/Sources/RemoteSource.h   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Processors/IProcessor.h b/src/Processors/IProcessor.h
index 358983a2179..0776921a814 100644
--- a/src/Processors/IProcessor.h
+++ b/src/Processors/IProcessor.h
@@ -221,7 +221,7 @@ public:
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method 'schedule' is not implemented for {} processor", getName());
     }
 
-    virtual void asyncJobReady() {}
+    virtual void onAsyncJobReady() {}
 
     /** You must call this method if 'prepare' returned ExpandPipeline.
       * This method cannot access any port, but it can create new ports for current processor.
diff --git a/src/Processors/Sources/RemoteSource.cpp b/src/Processors/Sources/RemoteSource.cpp
index 3ec2356a121..587f6e2001b 100644
--- a/src/Processors/Sources/RemoteSource.cpp
+++ b/src/Processors/Sources/RemoteSource.cpp
@@ -104,7 +104,7 @@ void RemoteSource::work()
     ISource::work();
 }
 
-void RemoteSource::asyncJobReady()
+void RemoteSource::onAsyncJobReady()
 {
     chassert(async_read);
 
diff --git a/src/Processors/Sources/RemoteSource.h b/src/Processors/Sources/RemoteSource.h
index fa04985f101..2247c781584 100644
--- a/src/Processors/Sources/RemoteSource.h
+++ b/src/Processors/Sources/RemoteSource.h
@@ -32,7 +32,7 @@ public:
 
     int schedule() override { return fd; }
 
-    void asyncJobReady() override;
+    void onAsyncJobReady() override;
 
     void setStorageLimits(const std::shared_ptr<const StorageLimitsList> & storage_limits_) override;
 

From 8349d260952a6daeb84c653c37ac000cf5302cfd Mon Sep 17 00:00:00 2001
From: Igor Nikonov <igor@clickhouse.com>
Date: Fri, 19 Jul 2024 11:25:34 +0000
Subject: [PATCH 021/139] Simplified implementation

---
 src/Processors/Sources/RemoteSource.cpp   | 17 +++++------
 src/Processors/Sources/RemoteSource.h     |  2 +-
 src/QueryPipeline/RemoteQueryExecutor.cpp | 37 +++++++++++++++++++++++
 src/QueryPipeline/RemoteQueryExecutor.h   |  3 ++
 4 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/src/Processors/Sources/RemoteSource.cpp b/src/Processors/Sources/RemoteSource.cpp
index 587f6e2001b..46c27676e12 100644
--- a/src/Processors/Sources/RemoteSource.cpp
+++ b/src/Processors/Sources/RemoteSource.cpp
@@ -89,9 +89,6 @@ ISource::Status RemoteSource::prepare()
 
 void RemoteSource::work()
 {
-    if (async_immediate_work.exchange(false))
-        return;
-
     /// Connection drain is a heavy operation that may take a long time.
     /// Therefore we move connection drain from prepare() to work(), and drain multiple connections in parallel.
     /// See issue: https://github.com/ClickHouse/ClickHouse/issues/60844
@@ -101,6 +98,13 @@ void RemoteSource::work()
         executor_finished = true;
         return;
     }
+
+    if (preprocessed_packet)
+    {
+        preprocessed_packet = false;
+        return;
+    }
+
     ISource::work();
 }
 
@@ -111,12 +115,7 @@ void RemoteSource::onAsyncJobReady()
     if (!was_query_sent)
         return;
 
-    auto res = query_executor->readAsync(/*check_packet_type_only=*/true);
-    if (res.type == RemoteQueryExecutor::ReadResult::Type::ParallelReplicasToken)
-    {
-        work();
-        async_immediate_work = true;
-    }
+    preprocessed_packet = query_executor->processParallelReplicaPacketIfAny();
 }
 
 std::optional<Chunk> RemoteSource::tryGenerate()
diff --git a/src/Processors/Sources/RemoteSource.h b/src/Processors/Sources/RemoteSource.h
index 2247c781584..22d3921708b 100644
--- a/src/Processors/Sources/RemoteSource.h
+++ b/src/Processors/Sources/RemoteSource.h
@@ -54,7 +54,7 @@ private:
     int fd = -1;
     size_t rows = 0;
     bool manually_add_rows_before_limit_counter = false;
-    std::atomic_bool async_immediate_work{false};
+    bool preprocessed_packet = false;
 };
 
 /// Totals source from RemoteQueryExecutor.
diff --git a/src/QueryPipeline/RemoteQueryExecutor.cpp b/src/QueryPipeline/RemoteQueryExecutor.cpp
index d7edbc9ed35..b15e31a120f 100644
--- a/src/QueryPipeline/RemoteQueryExecutor.cpp
+++ b/src/QueryPipeline/RemoteQueryExecutor.cpp
@@ -936,4 +936,41 @@ bool RemoteQueryExecutor::needToSkipUnavailableShard() const
     return context->getSettingsRef().skip_unavailable_shards && (0 == connections->size());
 }
 
+bool  RemoteQueryExecutor::processParallelReplicaPacketIfAny()
+{
+#if defined(OS_LINUX)
+    if (!read_context || (resent_query && recreate_read_context))
+    {
+        std::lock_guard lock(was_cancelled_mutex);
+        if (was_cancelled)
+            return false;
+
+        read_context = std::make_unique<ReadContext>(*this);
+        recreate_read_context = false;
+    }
+
+    {
+        std::lock_guard lock(was_cancelled_mutex);
+        if (was_cancelled)
+            return false;
+
+        chassert(!has_postponed_packet);
+
+        read_context->resume();
+        if (read_context->isInProgress()) // <- nothing to process
+            return false;
+
+        const auto packet_type = read_context->getPacketType();
+        if (packet_type == Protocol::Server::MergeTreeReadTaskRequest || packet_type == Protocol::Server::MergeTreeAllRangesAnnouncement)
+        {
+            processPacket(read_context->getPacket());
+            return true;
+        }
+
+        has_postponed_packet = true;
+        return false;
+    }
+#endif
+}
+
 }
diff --git a/src/QueryPipeline/RemoteQueryExecutor.h b/src/QueryPipeline/RemoteQueryExecutor.h
index 6849c3e0a07..6f56df71f1d 100644
--- a/src/QueryPipeline/RemoteQueryExecutor.h
+++ b/src/QueryPipeline/RemoteQueryExecutor.h
@@ -222,6 +222,9 @@ public:
 
     bool isReplicaUnavailable() const { return extension && extension->parallel_reading_coordinator && connections->size() == 0; }
 
+    /// return true if parallel replica packet was processed
+    bool processParallelReplicaPacketIfAny();
+
 private:
     RemoteQueryExecutor(
         const String & query_,

From 53ea5510143ded0862fd51922077a7cdc1344fe2 Mon Sep 17 00:00:00 2001
From: Igor Nikonov <igor@clickhouse.com>
Date: Fri, 19 Jul 2024 11:30:55 +0000
Subject: [PATCH 022/139] Remove unused code

---
 src/QueryPipeline/RemoteQueryExecutor.cpp | 14 +-------------
 src/QueryPipeline/RemoteQueryExecutor.h   |  2 +-
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/QueryPipeline/RemoteQueryExecutor.cpp b/src/QueryPipeline/RemoteQueryExecutor.cpp
index b15e31a120f..b78c38a4134 100644
--- a/src/QueryPipeline/RemoteQueryExecutor.cpp
+++ b/src/QueryPipeline/RemoteQueryExecutor.cpp
@@ -469,7 +469,7 @@ RemoteQueryExecutor::ReadResult RemoteQueryExecutor::read()
     return restartQueryWithoutDuplicatedUUIDs();
 }
 
-RemoteQueryExecutor::ReadResult RemoteQueryExecutor::readAsync([[maybe_unused]] bool check_packet_type_only)
+RemoteQueryExecutor::ReadResult RemoteQueryExecutor::readAsync()
 {
 #if defined(OS_LINUX)
     if (!read_context || (resent_query && recreate_read_context))
@@ -519,18 +519,6 @@ RemoteQueryExecutor::ReadResult RemoteQueryExecutor::readAsync([[maybe_unused]]
         if (read_context->isInProgress())
             return ReadResult(read_context->getFileDescriptor());
 
-        if (check_packet_type_only)
-        {
-            has_postponed_packet = true;
-            const auto packet_type = read_context->getPacketType();
-            if (packet_type == Protocol::Server::MergeTreeReadTaskRequest
-                || packet_type == Protocol::Server::MergeTreeAllRangesAnnouncement)
-            {
-                return ReadResult(ReadResult::Type::ParallelReplicasToken);
-            }
-            return ReadResult(ReadResult::Type::Nothing);
-        }
-
         auto read_result = processPacket(read_context->getPacket());
         if (read_result.getType() == ReadResult::Type::Data || read_result.getType() == ReadResult::Type::ParallelReplicasToken)
             return read_result;
diff --git a/src/QueryPipeline/RemoteQueryExecutor.h b/src/QueryPipeline/RemoteQueryExecutor.h
index 6f56df71f1d..7289e2a2243 100644
--- a/src/QueryPipeline/RemoteQueryExecutor.h
+++ b/src/QueryPipeline/RemoteQueryExecutor.h
@@ -183,7 +183,7 @@ public:
     ReadResult read();
 
     /// Async variant of read. Returns ready block or file descriptor which may be used for polling.
-    ReadResult readAsync(bool check_packet_type_only = false);
+    ReadResult readAsync();
 
     /// Receive all remain packets and finish query.
     /// It should be cancelled after read returned empty block.

From f3fb729f53860d55db1d72ccfc88f9c5d018aea1 Mon Sep 17 00:00:00 2001
From: Igor Nikonov <igor@clickhouse.com>
Date: Fri, 19 Jul 2024 20:12:14 +0000
Subject: [PATCH 023/139] Call onAsyncJobReady()

---
 src/Processors/Executors/ExecutorTasks.cpp  | 2 ++
 src/Processors/Executors/ExecutorTasks.h    | 2 +-
 src/Processors/Executors/PipelineExecutor.h | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Processors/Executors/ExecutorTasks.cpp b/src/Processors/Executors/ExecutorTasks.cpp
index 7e3bee239ef..d045f59a2e2 100644
--- a/src/Processors/Executors/ExecutorTasks.cpp
+++ b/src/Processors/Executors/ExecutorTasks.cpp
@@ -204,6 +204,8 @@ void ExecutorTasks::processAsyncTasks()
         while (auto task = async_task_queue.wait(lock))
         {
             auto * node = static_cast<ExecutingGraph::Node *>(task.data);
+            node->processor->onAsyncJobReady();
+
             executor_contexts[task.thread_num]->pushAsyncTask(node);
             ++num_waiting_async_tasks;
 
diff --git a/src/Processors/Executors/ExecutorTasks.h b/src/Processors/Executors/ExecutorTasks.h
index 202ca253c6c..b2201873edf 100644
--- a/src/Processors/Executors/ExecutorTasks.h
+++ b/src/Processors/Executors/ExecutorTasks.h
@@ -28,7 +28,7 @@ class ExecutorTasks
     TaskQueue<ExecutingGraph::Node> task_queue;
 
     /// Queue which stores tasks where processors returned Async status after prepare.
-    /// If multiple threads are using, main thread will wait for async tasks.
+    /// If multiple threads are used, main thread will wait for async tasks.
     /// For single thread, will wait for async tasks only when task_queue is empty.
     PollingQueue async_task_queue;
 
diff --git a/src/Processors/Executors/PipelineExecutor.h b/src/Processors/Executors/PipelineExecutor.h
index 03f0f7f1a0a..ae119355cb5 100644
--- a/src/Processors/Executors/PipelineExecutor.h
+++ b/src/Processors/Executors/PipelineExecutor.h
@@ -9,7 +9,6 @@
 
 #include <deque>
 #include <queue>
-#include <mutex>
 #include <memory>
 
 

From 465a34d3dfe3e313471e10d59cab8219b3e5837e Mon Sep 17 00:00:00 2001
From: Igor Nikonov <igor@clickhouse.com>
Date: Fri, 19 Jul 2024 20:27:57 +0000
Subject: [PATCH 024/139] Simplify, fix build

---
 src/QueryPipeline/RemoteQueryExecutor.cpp | 48 +++++++++++------------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/src/QueryPipeline/RemoteQueryExecutor.cpp b/src/QueryPipeline/RemoteQueryExecutor.cpp
index b78c38a4134..61a512bcfc5 100644
--- a/src/QueryPipeline/RemoteQueryExecutor.cpp
+++ b/src/QueryPipeline/RemoteQueryExecutor.cpp
@@ -924,41 +924,37 @@ bool RemoteQueryExecutor::needToSkipUnavailableShard() const
     return context->getSettingsRef().skip_unavailable_shards && (0 == connections->size());
 }
 
-bool  RemoteQueryExecutor::processParallelReplicaPacketIfAny()
+bool RemoteQueryExecutor::processParallelReplicaPacketIfAny()
 {
 #if defined(OS_LINUX)
+
+    std::lock_guard lock(was_cancelled_mutex);
+    if (was_cancelled)
+        return false;
+
     if (!read_context || (resent_query && recreate_read_context))
     {
-        std::lock_guard lock(was_cancelled_mutex);
-        if (was_cancelled)
-            return false;
-
         read_context = std::make_unique<ReadContext>(*this);
         recreate_read_context = false;
     }
 
-    {
-        std::lock_guard lock(was_cancelled_mutex);
-        if (was_cancelled)
-            return false;
+    chassert(!has_postponed_packet);
 
-        chassert(!has_postponed_packet);
-
-        read_context->resume();
-        if (read_context->isInProgress()) // <- nothing to process
-            return false;
-
-        const auto packet_type = read_context->getPacketType();
-        if (packet_type == Protocol::Server::MergeTreeReadTaskRequest || packet_type == Protocol::Server::MergeTreeAllRangesAnnouncement)
-        {
-            processPacket(read_context->getPacket());
-            return true;
-        }
-
-        has_postponed_packet = true;
+    read_context->resume();
+    if (read_context->isInProgress()) // <- nothing to process
         return false;
-    }
-#endif
-}
 
+    const auto packet_type = read_context->getPacketType();
+    if (packet_type == Protocol::Server::MergeTreeReadTaskRequest || packet_type == Protocol::Server::MergeTreeAllRangesAnnouncement)
+    {
+        processPacket(read_context->getPacket());
+        return true;
+    }
+
+    has_postponed_packet = true;
+
+#endif
+
+    return false;
+}
 }

From 8d7471f8bd2e0c6dc242231c4358448787e6c56f Mon Sep 17 00:00:00 2001
From: Alexander Gololobov <davenger@clickhouse.com>
Date: Sat, 20 Jul 2024 00:03:40 +0200
Subject: [PATCH 025/139] Fix for deadlock in getDDLWorker

---
 src/Interpreters/Context.cpp | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/Interpreters/Context.cpp b/src/Interpreters/Context.cpp
index 94bcb88ed53..48878733a00 100644
--- a/src/Interpreters/Context.cpp
+++ b/src/Interpreters/Context.cpp
@@ -3490,18 +3490,22 @@ DDLWorker & Context::getDDLWorker() const
     if (shared->ddl_worker_startup_task)
         waitLoad(shared->ddl_worker_startup_task); // Just wait and do not prioritize, because it depends on all load and startup tasks
 
-    SharedLockGuard lock(shared->mutex);
-    if (!shared->ddl_worker)
     {
-        if (!hasZooKeeper())
-            throw Exception(ErrorCodes::NO_ELEMENTS_IN_CONFIG, "There is no Zookeeper configuration in server config");
-
-        if (!hasDistributedDDL())
-            throw Exception(ErrorCodes::NO_ELEMENTS_IN_CONFIG, "There is no DistributedDDL configuration in server config");
-
-        throw Exception(ErrorCodes::NO_ELEMENTS_IN_CONFIG, "DDL background thread is not initialized");
+        /// Only acquire the lock for reading ddl_worker field.
+        /// hasZooKeeper() and hasDistributedDDL() acquire the same lock as well and double acquisition of the lock in shared mode can lead
+        /// to a deadlock if an exclusive lock attempt is made in the meantime by another thread.
+        SharedLockGuard lock(shared->mutex);
+        if (shared->ddl_worker)
+            return *shared->ddl_worker;
     }
-    return *shared->ddl_worker;
+
+    if (!hasZooKeeper())
+        throw Exception(ErrorCodes::NO_ELEMENTS_IN_CONFIG, "There is no Zookeeper configuration in server config");
+
+    if (!hasDistributedDDL())
+        throw Exception(ErrorCodes::NO_ELEMENTS_IN_CONFIG, "There is no DistributedDDL configuration in server config");
+
+    throw Exception(ErrorCodes::NO_ELEMENTS_IN_CONFIG, "DDL background thread is not initialized");
 }
 
 zkutil::ZooKeeperPtr Context::getZooKeeper() const

From 71cdf82643fb17b5b68003df314c54ebbca0842f Mon Sep 17 00:00:00 2001
From: Igor Nikonov <igor@clickhouse.com>
Date: Mon, 22 Jul 2024 18:41:30 +0000
Subject: [PATCH 026/139] Fix: reset is_async_state flag

---
 src/Processors/Sources/RemoteSource.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Processors/Sources/RemoteSource.cpp b/src/Processors/Sources/RemoteSource.cpp
index 46c27676e12..2f9a30296be 100644
--- a/src/Processors/Sources/RemoteSource.cpp
+++ b/src/Processors/Sources/RemoteSource.cpp
@@ -115,7 +115,10 @@ void RemoteSource::onAsyncJobReady()
     if (!was_query_sent)
         return;
 
+    chassert(!preprocessed_packet);
     preprocessed_packet = query_executor->processParallelReplicaPacketIfAny();
+    if (preprocessed_packet)
+        is_async_state = false;
 }
 
 std::optional<Chunk> RemoteSource::tryGenerate()

From 223eee3f46b07c38de3223fb56575f9ecbc5bea7 Mon Sep 17 00:00:00 2001
From: Igor Nikonov <igor@clickhouse.com>
Date: Tue, 23 Jul 2024 07:57:03 +0000
Subject: [PATCH 027/139] Comment to new IProcessor method

---
 src/Processors/IProcessor.h | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/Processors/IProcessor.h b/src/Processors/IProcessor.h
index 0776921a814..94e93595f4e 100644
--- a/src/Processors/IProcessor.h
+++ b/src/Processors/IProcessor.h
@@ -221,6 +221,21 @@ public:
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method 'schedule' is not implemented for {} processor", getName());
     }
 
+    /* The method is called right after asynchronous job is done
+     * i.e. when file descriptor returned by schedule() is readable.
+     * The sequence of method calls:
+     * ... prepare() -> schedule() -> onAsyncJobReady() -> work() ...
+     * See also comment to schedule() method
+     *
+     * It allows doing some preprocessing immediately after asynchronous job is done.
+     * The implementation should return control quickly, to avoid blocking another asynchronous completed jobs
+     * created by the same pipeline.
+     *
+     * Example, scheduling tasks for remote workers (file descriptor in this case is a socket)
+     * When the remote worker asks for the next task, doing it in onAsyncJobReady() we can provide it immediately.
+     * Otherwise, the returning of the next task for the remote worker can be delayed by current work done in the pipeline
+     * i.e. processor->work(), which will create unnecessary latency in query processing by remote workers   Not Committed Yet
+     */
     virtual void onAsyncJobReady() {}
 
     /** You must call this method if 'prepare' returned ExpandPipeline.

From d74dc587d7a183225b7cf0846b85e8213dcb7fc0 Mon Sep 17 00:00:00 2001
From: Igor Nikonov <igor@clickhouse.com>
Date: Tue, 23 Jul 2024 13:06:58 +0000
Subject: [PATCH 028/139] Fix comment

---
 src/Processors/IProcessor.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Processors/IProcessor.h b/src/Processors/IProcessor.h
index 94e93595f4e..4fd00d5e164 100644
--- a/src/Processors/IProcessor.h
+++ b/src/Processors/IProcessor.h
@@ -234,7 +234,7 @@ public:
      * Example, scheduling tasks for remote workers (file descriptor in this case is a socket)
      * When the remote worker asks for the next task, doing it in onAsyncJobReady() we can provide it immediately.
      * Otherwise, the returning of the next task for the remote worker can be delayed by current work done in the pipeline
-     * i.e. processor->work(), which will create unnecessary latency in query processing by remote workers   Not Committed Yet
+     * (by other processors), which will create unnecessary latency in query processing by remote workers
      */
     virtual void onAsyncJobReady() {}
 

From b25cad23ed3b90dc8c0903710dba0714bac7219c Mon Sep 17 00:00:00 2001
From: Pablo Marcos <pablo.marcos.oltra@clickhouse.com>
Date: Wed, 24 Jul 2024 11:42:28 +0000
Subject: [PATCH 029/139] Use unique names for tables and files

---
 .../integration/test_storage_s3_queue/test.py | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/tests/integration/test_storage_s3_queue/test.py b/tests/integration/test_storage_s3_queue/test.py
index bf3c28c5429..cf24e91f36b 100644
--- a/tests/integration/test_storage_s3_queue/test.py
+++ b/tests/integration/test_storage_s3_queue/test.py
@@ -7,6 +7,7 @@ import pytest
 from helpers.client import QueryRuntimeException
 from helpers.cluster import ClickHouseCluster, ClickHouseInstance
 import json
+from uuid import uuid4
 
 
 AVAILABLE_MODES = ["unordered", "ordered"]
@@ -822,7 +823,7 @@ def test_multiple_tables_streaming_sync_distributed(started_cluster, mode):
 
 def test_max_set_age(started_cluster):
     node = started_cluster.instances["instance"]
-    table_name = f"max_set_age"
+    table_name = f"max_set_age_{uuid4().hex}"
     dst_table_name = f"{table_name}_dst"
     keeper_path = f"/clickhouse/test_{table_name}"
     files_path = f"{table_name}_data"
@@ -847,11 +848,11 @@ def test_max_set_age(started_cluster):
     )
     create_mv(node, table_name, dst_table_name)
 
-    total_values = generate_random_files(
+    _ = generate_random_files(
         started_cluster, files_path, files_to_generate, row_num=1
     )
 
-    expected_rows = 10
+    expected_rows = files_to_generate
 
     node.wait_for_log_line("Checking node limits")
     node.wait_for_log_line("Node limits check finished")
@@ -865,11 +866,11 @@ def test_max_set_age(started_cluster):
         time.sleep(1)
 
     assert expected_rows == get_count()
-    assert 10 == int(node.query(f"SELECT uniq(_path) from {dst_table_name}"))
+    assert files_to_generate == int(node.query(f"SELECT uniq(_path) from {dst_table_name}"))
 
     time.sleep(max_age + 5)
 
-    expected_rows = 20
+    expected_rows *= 2
 
     for _ in range(20):
         if expected_rows == get_count():
@@ -877,7 +878,7 @@ def test_max_set_age(started_cluster):
         time.sleep(1)
 
     assert expected_rows == get_count()
-    assert 10 == int(node.query(f"SELECT uniq(_path) from {dst_table_name}"))
+    assert files_to_generate == int(node.query(f"SELECT uniq(_path) from {dst_table_name}"))
 
     paths_count = [
         int(x)
@@ -885,7 +886,7 @@ def test_max_set_age(started_cluster):
             f"SELECT count() from {dst_table_name} GROUP BY _path"
         ).splitlines()
     ]
-    assert 10 == len(paths_count)
+    assert files_to_generate == len(paths_count)
     for path_count in paths_count:
         assert 2 == path_count
 
@@ -901,7 +902,8 @@ def test_max_set_age(started_cluster):
     values_csv = (
         "\n".join((",".join(map(str, row)) for row in values)) + "\n"
     ).encode()
-    put_s3_file_content(started_cluster, f"{files_path}/fff.csv", values_csv)
+    file_with_error = f"fff_{uuid4().hex}.csv"
+    put_s3_file_content(started_cluster, f"{files_path}/{file_with_error}", values_csv)
 
     for _ in range(30):
         if failed_count + 1 == int(
@@ -920,16 +922,17 @@ def test_max_set_age(started_cluster):
 
     node.query("SYSTEM FLUSH LOGS")
     assert "Cannot parse input" in node.query(
-        "SELECT exception FROM system.s3queue WHERE file_name ilike '%fff.csv'"
+        f"SELECT exception FROM system.s3queue WHERE file_name ilike '%{file_with_error}'"
     )
+
     assert 1 == int(
         node.query(
-            "SELECT count() FROM system.s3queue_log WHERE file_name ilike '%fff.csv'"
+            f"SELECT count() FROM system.s3queue_log WHERE file_name ilike '%{file_with_error}'"
         )
     )
     assert 1 == int(
         node.query(
-            "SELECT count() FROM system.s3queue_log WHERE file_name ilike '%fff.csv' AND notEmpty(exception)"
+            f"SELECT count() FROM system.s3queue_log WHERE file_name ilike '%{file_with_error}' AND notEmpty(exception)"
         )
     )
 
@@ -943,11 +946,11 @@ def test_max_set_age(started_cluster):
 
     node.query("SYSTEM FLUSH LOGS")
     assert "Cannot parse input" in node.query(
-        "SELECT exception FROM system.s3queue WHERE file_name ilike '%fff.csv' ORDER BY processing_end_time DESC LIMIT 1"
+        f"SELECT exception FROM system.s3queue WHERE file_name ilike '%{file_with_error}' ORDER BY processing_end_time DESC LIMIT 1"
     )
     assert 1 < int(
         node.query(
-            "SELECT count() FROM system.s3queue_log WHERE file_name ilike '%fff.csv' AND notEmpty(exception)"
+            f"SELECT count() FROM system.s3queue_log WHERE file_name ilike '%{file_with_error}' AND notEmpty(exception)"
         )
     )
 

From 91b7001df6e827f801bd792e7bd9d96cdd947946 Mon Sep 17 00:00:00 2001
From: Pablo Marcos <pablo.marcos.oltra@clickhouse.com>
Date: Wed, 24 Jul 2024 12:08:31 +0000
Subject: [PATCH 030/139] Refactor test to improve it

- Create wait_for_condition that checks greedily for a period of time
- Remove redundant checks
- Allow other tests running in parallel to have `ObjectStorageQueueFailedFiles` errors
---
 .../integration/test_storage_s3_queue/test.py | 56 ++++++-------------
 1 file changed, 16 insertions(+), 40 deletions(-)

diff --git a/tests/integration/test_storage_s3_queue/test.py b/tests/integration/test_storage_s3_queue/test.py
index cf24e91f36b..e178b3b6608 100644
--- a/tests/integration/test_storage_s3_queue/test.py
+++ b/tests/integration/test_storage_s3_queue/test.py
@@ -860,24 +860,21 @@ def test_max_set_age(started_cluster):
     def get_count():
         return int(node.query(f"SELECT count() FROM {dst_table_name}"))
 
-    for _ in range(20):
-        if expected_rows == get_count():
-            break
-        time.sleep(1)
+    def wait_for_condition(check_function, max_wait_time=30):
+        before = time.time()
+        while time.time() - before < max_wait_time:
+            if check_function():
+                return
+            time.sleep(0.1)
+        assert False
 
-    assert expected_rows == get_count()
+    wait_for_condition(lambda: get_count() == expected_rows)
     assert files_to_generate == int(node.query(f"SELECT uniq(_path) from {dst_table_name}"))
 
     time.sleep(max_age + 5)
 
     expected_rows *= 2
-
-    for _ in range(20):
-        if expected_rows == get_count():
-            break
-        time.sleep(1)
-
-    assert expected_rows == get_count()
+    wait_for_condition(lambda: get_count() == expected_rows)
     assert files_to_generate == int(node.query(f"SELECT uniq(_path) from {dst_table_name}"))
 
     paths_count = [
@@ -890,11 +887,12 @@ def test_max_set_age(started_cluster):
     for path_count in paths_count:
         assert 2 == path_count
 
-    failed_count = int(
-        node.query(
+    def get_object_storage_failures():
+        return int(node.query(
             "SELECT value FROM system.events WHERE name = 'ObjectStorageQueueFailedFiles' SETTINGS system_events_show_zero_values=1"
-        )
-    )
+        ))
+
+    failed_count = get_object_storage_failures()
 
     values = [
         ["failed", 1, 1],
@@ -905,31 +903,13 @@ def test_max_set_age(started_cluster):
     file_with_error = f"fff_{uuid4().hex}.csv"
     put_s3_file_content(started_cluster, f"{files_path}/{file_with_error}", values_csv)
 
-    for _ in range(30):
-        if failed_count + 1 == int(
-            node.query(
-                "SELECT value FROM system.events WHERE name = 'ObjectStorageQueueFailedFiles' SETTINGS system_events_show_zero_values=1"
-            )
-        ):
-            break
-        time.sleep(1)
-
-    assert failed_count + 1 == int(
-        node.query(
-            "SELECT value FROM system.events WHERE name = 'ObjectStorageQueueFailedFiles' SETTINGS system_events_show_zero_values=1"
-        )
-    )
+    wait_for_condition(lambda: failed_count + 1 <= get_object_storage_failures())
 
     node.query("SYSTEM FLUSH LOGS")
     assert "Cannot parse input" in node.query(
         f"SELECT exception FROM system.s3queue WHERE file_name ilike '%{file_with_error}'"
     )
 
-    assert 1 == int(
-        node.query(
-            f"SELECT count() FROM system.s3queue_log WHERE file_name ilike '%{file_with_error}'"
-        )
-    )
     assert 1 == int(
         node.query(
             f"SELECT count() FROM system.s3queue_log WHERE file_name ilike '%{file_with_error}' AND notEmpty(exception)"
@@ -938,11 +918,7 @@ def test_max_set_age(started_cluster):
 
     time.sleep(max_age + 1)
 
-    assert failed_count + 2 == int(
-        node.query(
-            "SELECT value FROM system.events WHERE name = 'ObjectStorageQueueFailedFiles'"
-        )
-    )
+    assert failed_count + 2 <= get_object_storage_failures()
 
     node.query("SYSTEM FLUSH LOGS")
     assert "Cannot parse input" in node.query(

From f03d4bb7d5d40203bba68c4f8958d584f27ae881 Mon Sep 17 00:00:00 2001
From: Pablo Marcos <pablo.marcos.oltra@clickhouse.com>
Date: Wed, 24 Jul 2024 15:07:53 +0000
Subject: [PATCH 031/139] Format with black

---
 .../integration/test_storage_s3_queue/test.py | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/tests/integration/test_storage_s3_queue/test.py b/tests/integration/test_storage_s3_queue/test.py
index e178b3b6608..4348857acd3 100644
--- a/tests/integration/test_storage_s3_queue/test.py
+++ b/tests/integration/test_storage_s3_queue/test.py
@@ -823,7 +823,7 @@ def test_multiple_tables_streaming_sync_distributed(started_cluster, mode):
 
 def test_max_set_age(started_cluster):
     node = started_cluster.instances["instance"]
-    table_name = f"max_set_age_{uuid4().hex}"
+    table_name = "max_set_age"
     dst_table_name = f"{table_name}_dst"
     keeper_path = f"/clickhouse/test_{table_name}"
     files_path = f"{table_name}_data"
@@ -848,9 +848,7 @@ def test_max_set_age(started_cluster):
     )
     create_mv(node, table_name, dst_table_name)
 
-    _ = generate_random_files(
-        started_cluster, files_path, files_to_generate, row_num=1
-    )
+    _ = generate_random_files(started_cluster, files_path, files_to_generate, row_num=1)
 
     expected_rows = files_to_generate
 
@@ -869,13 +867,17 @@ def test_max_set_age(started_cluster):
         assert False
 
     wait_for_condition(lambda: get_count() == expected_rows)
-    assert files_to_generate == int(node.query(f"SELECT uniq(_path) from {dst_table_name}"))
+    assert files_to_generate == int(
+        node.query(f"SELECT uniq(_path) from {dst_table_name}")
+    )
 
     time.sleep(max_age + 5)
 
     expected_rows *= 2
     wait_for_condition(lambda: get_count() == expected_rows)
-    assert files_to_generate == int(node.query(f"SELECT uniq(_path) from {dst_table_name}"))
+    assert files_to_generate == int(
+        node.query(f"SELECT uniq(_path) from {dst_table_name}")
+    )
 
     paths_count = [
         int(x)
@@ -888,9 +890,11 @@ def test_max_set_age(started_cluster):
         assert 2 == path_count
 
     def get_object_storage_failures():
-        return int(node.query(
-            "SELECT value FROM system.events WHERE name = 'ObjectStorageQueueFailedFiles' SETTINGS system_events_show_zero_values=1"
-        ))
+        return int(
+            node.query(
+                "SELECT value FROM system.events WHERE name = 'ObjectStorageQueueFailedFiles' SETTINGS system_events_show_zero_values=1"
+            )
+        )
 
     failed_count = get_object_storage_failures()
 
@@ -900,6 +904,8 @@ def test_max_set_age(started_cluster):
     values_csv = (
         "\n".join((",".join(map(str, row)) for row in values)) + "\n"
     ).encode()
+
+    # use a different filename for each test to allow running a bunch of them sequentially with --count
     file_with_error = f"fff_{uuid4().hex}.csv"
     put_s3_file_content(started_cluster, f"{files_path}/{file_with_error}", values_csv)
 

From 7612060d232a24dbd721597c8e33cd1f556cddd6 Mon Sep 17 00:00:00 2001
From: Yakov Olkhovskiy <yakov@clickhouse.com>
Date: Thu, 25 Jul 2024 06:40:51 +0000
Subject: [PATCH 032/139] allow only equal types in lagInFrame and leadInFrame

---
 src/Processors/Transforms/WindowTransform.cpp | 15 ++------------
 .../03210_lag_lead_inframe_types.reference    | 20 +++++++++++++++++++
 .../03210_lag_lead_inframe_types.sql          |  4 ++++
 3 files changed, 26 insertions(+), 13 deletions(-)
 create mode 100644 tests/queries/0_stateless/03210_lag_lead_inframe_types.reference
 create mode 100644 tests/queries/0_stateless/03210_lag_lead_inframe_types.sql

diff --git a/src/Processors/Transforms/WindowTransform.cpp b/src/Processors/Transforms/WindowTransform.cpp
index 86421adf4fb..06ae2bfb25e 100644
--- a/src/Processors/Transforms/WindowTransform.cpp
+++ b/src/Processors/Transforms/WindowTransform.cpp
@@ -2385,22 +2385,11 @@ struct WindowFunctionLagLeadInFrame final : public WindowFunction
             return;
         }
 
-        const auto supertype = getLeastSupertype(DataTypes{argument_types[0], argument_types[2]});
-        if (!supertype)
-        {
+        if (!argument_types[0]->equals(*argument_types[2]))
             throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                "There is no supertype for the argument type '{}' and the default value type '{}'",
+                "Argument type '{}' and the default value type '{}' are different",
                 argument_types[0]->getName(),
                 argument_types[2]->getName());
-        }
-        if (!argument_types[0]->equals(*supertype))
-        {
-            throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                "The supertype '{}' for the argument type '{}' and the default value type '{}' is not the same as the argument type",
-                supertype->getName(),
-                argument_types[0]->getName(),
-                argument_types[2]->getName());
-        }
 
         if (argument_types.size() > 3)
         {
diff --git a/tests/queries/0_stateless/03210_lag_lead_inframe_types.reference b/tests/queries/0_stateless/03210_lag_lead_inframe_types.reference
new file mode 100644
index 00000000000..cc3b9a096b9
--- /dev/null
+++ b/tests/queries/0_stateless/03210_lag_lead_inframe_types.reference
@@ -0,0 +1,20 @@
+0
+1
+2
+2
+2
+2
+2
+2
+2
+2
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
diff --git a/tests/queries/0_stateless/03210_lag_lead_inframe_types.sql b/tests/queries/0_stateless/03210_lag_lead_inframe_types.sql
new file mode 100644
index 00000000000..5466cfe0fad
--- /dev/null
+++ b/tests/queries/0_stateless/03210_lag_lead_inframe_types.sql
@@ -0,0 +1,4 @@
+SELECT lagInFrame(2::UInt128, 2, number) OVER w FROM numbers(10) WINDOW w AS (ORDER BY number); -- { serverError BAD_ARGUMENTS }
+SELECT leadInFrame(2::UInt128, 2, number) OVER w FROM numbers(10) WINDOW w AS (ORDER BY number); -- { serverError BAD_ARGUMENTS }
+SELECT lagInFrame(2::UInt64, 2, number) OVER w FROM numbers(10) WINDOW w AS (ORDER BY number);
+SELECT leadInFrame(2::UInt64, 2, number) OVER w FROM numbers(10) WINDOW w AS (ORDER BY number);

From beb506a5b8179f5c88a6f5fc90d62b8e74bf0d35 Mon Sep 17 00:00:00 2001
From: maxvostrikov <max.vostrikov@clickhouse.com>
Date: Thu, 25 Jul 2024 12:37:05 +0200
Subject: [PATCH 033/139] added somme tests in relation with
 https://github.com/ClickHouse/ClickHouse/pull/54881 with new behaviour when
 enable_named_columns_in_function_tuple=1 (default value)

---
 .../0_stateless/00307_format_xml.reference    |  41 ++++++++++++++++++
 .../queries/0_stateless/00307_format_xml.sql  |   3 ++
 .../0_stateless/00309_formats.reference       | Bin 18537 -> 18736 bytes
 tests/queries/0_stateless/00309_formats.sql   |   5 +++
 4 files changed, 49 insertions(+)

diff --git a/tests/queries/0_stateless/00307_format_xml.reference b/tests/queries/0_stateless/00307_format_xml.reference
index 2d9badc5a3e..14e74653d4f 100644
--- a/tests/queries/0_stateless/00307_format_xml.reference
+++ b/tests/queries/0_stateless/00307_format_xml.reference
@@ -1,3 +1,4 @@
+unnamed columns in tuple
 <?xml version='1.0' encoding='UTF-8' ?>
 <result>
 	<meta>
@@ -54,3 +55,43 @@
 	</extremes>
 	<rows>1</rows>
 </result>
+named columns in tuple
+<?xml version='1.0' encoding='UTF-8' ?>
+<result>
+	<meta>
+		<columns>
+			<column>
+				<name>s</name>
+				<type>String</type>
+			</column>
+			<column>
+				<name>time</name>
+				<type>DateTime</type>
+			</column>
+			<column>
+				<name>tpl</name>
+				<type>Tuple(String, DateTime)</type>
+			</column>
+		</columns>
+	</meta>
+	<data>
+		<row>
+			<s>Hello &amp; world</s>
+			<time>2001-02-03 04:05:06</time>
+			<tpl><tuple><elem>Hello &amp; world</elem><elem>2001-02-03 04:05:06</elem></tuple></tpl>
+		</row>
+	</data>
+	<extremes>
+		<min>
+			<s>Hello &amp; world</s>
+			<time>2001-02-03 04:05:06</time>
+			<tpl><tuple><elem>Hello &amp; world</elem><elem>2001-02-03 04:05:06</elem></tuple></tpl>
+		</min>
+		<max>
+			<s>Hello &amp; world</s>
+			<time>2001-02-03 04:05:06</time>
+			<tpl><tuple><elem>Hello &amp; world</elem><elem>2001-02-03 04:05:06</elem></tuple></tpl>
+		</max>
+	</extremes>
+	<rows>1</rows>
+</result>
diff --git a/tests/queries/0_stateless/00307_format_xml.sql b/tests/queries/0_stateless/00307_format_xml.sql
index 29c733bb186..22566112bc7 100644
--- a/tests/queries/0_stateless/00307_format_xml.sql
+++ b/tests/queries/0_stateless/00307_format_xml.sql
@@ -1,2 +1,5 @@
 SET output_format_write_statistics = 0;
+SELECT 'unnamed columns in tuple';
 SELECT 'Hello & world' AS s, 'Hello\n<World>', toDateTime('2001-02-03 04:05:06') AS time, arrayMap(x -> toString(x), range(10)) AS arr, (s, time) AS tpl SETTINGS extremes = 1, enable_named_columns_in_function_tuple = 0 FORMAT XML;
+SELECT 'named columns in tuple';
+SELECT 'Hello & world' AS s, toDateTime('2001-02-03 04:05:06') AS time, (s, time) AS tpl SETTINGS extremes = 1, enable_named_columns_in_function_tuple = 0 FORMAT XML;`
diff --git a/tests/queries/0_stateless/00309_formats.reference b/tests/queries/0_stateless/00309_formats.reference
index e637ee0363a7b35152a155ae3fa73a4f451d5148..a63720618ba54c6cc456f3356512449322dc2e80 100644
GIT binary patch
delta 149
zcmaDkfpNnm#toSsmduQKj47-or3E>uY@wccC1xfpE{P?n;vparjXVX2n2th<0!Ubs
ziva?zYfU!f5;0_8gmBMl=W(WRf=%Iq=->n?=fp5&@&sYg$;X8ig*A*!&2-d_3=9l(
M4J>sHjny@|06s7$QUCw|

delta 9
QcmdlmiSgwG#toSs02V|99{>OV

diff --git a/tests/queries/0_stateless/00309_formats.sql b/tests/queries/0_stateless/00309_formats.sql
index b0939c00a10..691fc6e7ab6 100644
--- a/tests/queries/0_stateless/00309_formats.sql
+++ b/tests/queries/0_stateless/00309_formats.sql
@@ -9,3 +9,8 @@ SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, range(n) AS arr, a
 SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, range(n) AS arr, arrayStringConcat(arrayMap(x -> reinterpretAsString(x), arr)) AS s, (n, d) AS tuple FROM system.numbers LIMIT 2 FORMAT JSON;
 SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, range(n) AS arr, arrayStringConcat(arrayMap(x -> reinterpretAsString(x), arr)) AS s, (n, d) AS tuple FROM system.numbers LIMIT 2 FORMAT JSONCompact;
 SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, range(n) AS arr, arrayStringConcat(arrayMap(x -> reinterpretAsString(x), arr)) AS s, (n, d) AS tuple FROM system.numbers LIMIT 2 FORMAT XML;
+
+SET enable_named_columns_in_function_tuple = 1;
+
+SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, (n, d) AS tuple FROM system.numbers LIMIT 2 FORMAT RowBinaryWithNamesAndTypes;
+SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, (n, d) AS tuple FROM system.numbers LIMIT 2 FORMAT TabSeparatedWithNamesAndTypes;

From bd721950b0401f94be652c11015bd1985c283f3a Mon Sep 17 00:00:00 2001
From: maxvostrikov <max.vostrikov@clickhouse.com>
Date: Thu, 25 Jul 2024 16:24:17 +0200
Subject: [PATCH 034/139] squash! added somme tests in relation with
 https://github.com/ClickHouse/ClickHouse/pull/54881 with new behaviour when
 enable_named_columns_in_function_tuple=1 (default value)

---
 .../0_stateless/00309_formats.reference       | Bin 18736 -> 18666 bytes
 tests/queries/0_stateless/00309_formats.sql   |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/queries/0_stateless/00309_formats.reference b/tests/queries/0_stateless/00309_formats.reference
index a63720618ba54c6cc456f3356512449322dc2e80..f3ea45520bb50fb936caf6724e9fedf3cdd00b75 100644
GIT binary patch
delta 54
zcmdlmiSgA$#tkJN8myt7c_kJsE{P?nVj-mkIjI_X3Sc1}g%kylsHVzCEg+hFz{3v!
D3NRA?

delta 99
zcmaDgk#WN$#tkJNdTgPdc_n5hEG~&9sp27}1v#l2c?u9Q9fcGHkgz5f0|Z>xnrz4=
o!o|P{;hxo=JjcUt@=alWVGScwGaYp!0|NtH14~^)V|7g~0E0RhwEzGB

diff --git a/tests/queries/0_stateless/00309_formats.sql b/tests/queries/0_stateless/00309_formats.sql
index 691fc6e7ab6..0366cdeea5c 100644
--- a/tests/queries/0_stateless/00309_formats.sql
+++ b/tests/queries/0_stateless/00309_formats.sql
@@ -12,5 +12,5 @@ SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, range(n) AS arr, a
 
 SET enable_named_columns_in_function_tuple = 1;
 
-SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, (n, d) AS tuple FROM system.numbers LIMIT 2 FORMAT RowBinaryWithNamesAndTypes;
-SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, (n, d) AS tuple FROM system.numbers LIMIT 2 FORMAT TabSeparatedWithNamesAndTypes;
+SELECT 36 AS n, toDate('2000-01-01') + n AS d, (n, d) AS tuple FROM system.numbers LIMIT 1 FORMAT RowBinaryWithNamesAndTypes;
+SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, (n, d) AS tuple FROM system.numbers LIMIT 1 FORMAT TabSeparatedWithNamesAndTypes;

From 59f9c125044b6e56a3ded8034478eff79e930018 Mon Sep 17 00:00:00 2001
From: Pablo Marcos <pablo.marcos.oltra@clickhouse.com>
Date: Thu, 25 Jul 2024 14:37:47 +0000
Subject: [PATCH 035/139] Increase sleep time make sure there is a new failure

The previous sleep was already adding +5s to make sure
the TTL was properly applied, so we'd rather use the
same value here instead of just 1s.
---
 tests/integration/test_storage_s3_queue/test.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/integration/test_storage_s3_queue/test.py b/tests/integration/test_storage_s3_queue/test.py
index 4348857acd3..2e339a9b5c9 100644
--- a/tests/integration/test_storage_s3_queue/test.py
+++ b/tests/integration/test_storage_s3_queue/test.py
@@ -871,7 +871,7 @@ def test_max_set_age(started_cluster):
         node.query(f"SELECT uniq(_path) from {dst_table_name}")
     )
 
-    time.sleep(max_age + 5)
+    time.sleep(max_age + max_age / 2)
 
     expected_rows *= 2
     wait_for_condition(lambda: get_count() == expected_rows)
@@ -922,7 +922,7 @@ def test_max_set_age(started_cluster):
         )
     )
 
-    time.sleep(max_age + 1)
+    time.sleep(max_age + max_age / 2)
 
     assert failed_count + 2 <= get_object_storage_failures()
 

From 10b36c09e9ffd96f53d2fdada725f9c999241dd1 Mon Sep 17 00:00:00 2001
From: kevinyhzou <kevinyunhe8@gmail.com>
Date: Fri, 26 Jul 2024 15:38:26 +0800
Subject: [PATCH 036/139] support set orc reader time zone name

---
 src/Core/Settings.h                                    |  2 +-
 src/Core/SettingsChangesHistory.cpp                    |  2 +-
 src/Formats/FormatFactory.cpp                          |  2 +-
 src/Formats/FormatSettings.h                           |  2 +-
 .../Formats/Impl/NativeORCBlockInputFormat.cpp         |  6 +-----
 tests/queries/0_stateless/03198_orc_read_time_zone.sh  | 10 +++++-----
 6 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/Core/Settings.h b/src/Core/Settings.h
index 2a665326afc..a5220c3017c 100644
--- a/src/Core/Settings.h
+++ b/src/Core/Settings.h
@@ -1073,7 +1073,7 @@ class IColumn;
     M(Bool, input_format_orc_allow_missing_columns, true, "Allow missing columns while reading ORC input formats", 0) \
     M(Bool, input_format_orc_use_fast_decoder, true, "Use a faster ORC decoder implementation.", 0) \
     M(Bool, input_format_orc_filter_push_down, true, "When reading ORC files, skip whole stripes or row groups based on the WHERE/PREWHERE expressions, min/max statistics or bloom filter in the ORC metadata.", 0) \
-    M(Bool, input_format_orc_read_use_writer_time_zone, false, "Whether use the writer's time zone in ORC stripe for ORC row reader, the default ORC row reader's time zone is GMT.", 0) \
+    M(String, input_format_orc_reader_time_zone_name, "GMT", "The time zone name for ORC row reader, the default ORC row reader's time zone is GMT.", 0) \
     M(Bool, input_format_parquet_allow_missing_columns, true, "Allow missing columns while reading Parquet input formats", 0) \
     M(UInt64, input_format_parquet_local_file_min_bytes_for_seek, 8192, "Min bytes required for local read (file) to do seek, instead of read with ignore in Parquet input format", 0) \
     M(Bool, input_format_arrow_allow_missing_columns, true, "Allow missing columns while reading Arrow input formats", 0) \
diff --git a/src/Core/SettingsChangesHistory.cpp b/src/Core/SettingsChangesHistory.cpp
index acd119c159b..457caa76bb6 100644
--- a/src/Core/SettingsChangesHistory.cpp
+++ b/src/Core/SettingsChangesHistory.cpp
@@ -69,7 +69,7 @@ static std::initializer_list<std::pair<ClickHouseVersion, SettingsChangesHistory
               {"dictionary_validate_primary_key_type", false, false, "Validate primary key type for dictionaries. By default id type for simple layouts will be implicitly converted to UInt64."},
               {"collect_hash_table_stats_during_joins", false, true, "New setting."},
               {"max_size_to_preallocate_for_joins", 0, 100'000'000, "New setting."},
-              {"input_format_orc_read_use_writer_time_zone", false, false, "Whether use the writer's time zone in ORC stripe for ORC row reader, the default ORC row reader's time zone is GMT."},
+              {"input_format_orc_reader_time_zone_name", "GMT", "GMT", "The time zone name for ORC row reader, the default ORC row reader's time zone is GMT."},
               {"lightweight_mutation_projection_mode", "throw", "throw", "When lightweight delete happens on a table with projection(s), the possible operations include throw the exception as projection exists, or drop all projection related to this table then do lightweight delete."},
               {"database_replicated_allow_heavy_create", true, false, "Long-running DDL queries (CREATE AS SELECT and POPULATE) for Replicated database engine was forbidden"},
               {"query_plan_merge_filters", false, false, "Allow to merge filters in the query plan"},
diff --git a/src/Formats/FormatFactory.cpp b/src/Formats/FormatFactory.cpp
index 1271cdfb7ad..e61bd16b537 100644
--- a/src/Formats/FormatFactory.cpp
+++ b/src/Formats/FormatFactory.cpp
@@ -244,7 +244,7 @@ FormatSettings getFormatSettings(const ContextPtr & context, const Settings & se
     format_settings.orc.output_row_index_stride = settings.output_format_orc_row_index_stride;
     format_settings.orc.use_fast_decoder = settings.input_format_orc_use_fast_decoder;
     format_settings.orc.filter_push_down = settings.input_format_orc_filter_push_down;
-    format_settings.orc.read_use_writer_time_zone = settings.input_format_orc_read_use_writer_time_zone;
+    format_settings.orc.reader_time_zone_name = settings.input_format_orc_reader_time_zone_name;
     format_settings.defaults_for_omitted_fields = settings.input_format_defaults_for_omitted_fields;
     format_settings.capn_proto.enum_comparing_mode = settings.format_capn_proto_enum_comparising_mode;
     format_settings.capn_proto.skip_fields_with_unsupported_types_in_schema_inference = settings.input_format_capn_proto_skip_fields_with_unsupported_types_in_schema_inference;
diff --git a/src/Formats/FormatSettings.h b/src/Formats/FormatSettings.h
index a736bb1a558..2df8c9ca171 100644
--- a/src/Formats/FormatSettings.h
+++ b/src/Formats/FormatSettings.h
@@ -409,7 +409,7 @@ struct FormatSettings
         bool use_fast_decoder = true;
         bool filter_push_down = true;
         UInt64 output_row_index_stride = 10'000;
-        bool read_use_writer_time_zone = false;
+        String reader_time_zone_name = "GMT";
     } orc{};
 
     /// For capnProto format we should determine how to
diff --git a/src/Processors/Formats/Impl/NativeORCBlockInputFormat.cpp b/src/Processors/Formats/Impl/NativeORCBlockInputFormat.cpp
index c10969b02b7..649721f28bf 100644
--- a/src/Processors/Formats/Impl/NativeORCBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/NativeORCBlockInputFormat.cpp
@@ -900,11 +900,7 @@ bool NativeORCBlockInputFormat::prepareStripeReader()
 
     orc::RowReaderOptions row_reader_options;
     row_reader_options.includeTypes(include_indices);
-    if (format_settings.orc.read_use_writer_time_zone)
-    {
-        String writer_time_zone = current_stripe_info->getWriterTimezone();
-        row_reader_options.setTimezoneName(writer_time_zone);
-    }
+    row_reader_options.setTimezoneName(format_settings.orc.reader_time_zone_name);
     row_reader_options.range(current_stripe_info->getOffset(), current_stripe_info->getLength());
     if (format_settings.orc.filter_push_down && sarg)
     {
diff --git a/tests/queries/0_stateless/03198_orc_read_time_zone.sh b/tests/queries/0_stateless/03198_orc_read_time_zone.sh
index 27530c06237..7e931e16e48 100755
--- a/tests/queries/0_stateless/03198_orc_read_time_zone.sh
+++ b/tests/queries/0_stateless/03198_orc_read_time_zone.sh
@@ -5,8 +5,8 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT -q "drop table if exists test"
-$CLICKHOUSE_CLIENT -q "create table test(id UInt64, t DateTime64) Engine=MergeTree order by id"
-$CLICKHOUSE_CLIENT -q "insert into test from infile '$CURDIR/data_orc/test_reader_time_zone.snappy.orc' SETTINGS input_format_orc_read_use_writer_time_zone=true FORMAT ORC"
-$CLICKHOUSE_CLIENT -q "select * from test SETTINGS session_timezone='Asia/Shanghai'"
-$CLICKHOUSE_CLIENT -q "drop table test"
\ No newline at end of file
+$CLICKHOUSE_CLIENT -q "drop table if exists test_orc_read_timezone"
+$CLICKHOUSE_CLIENT -q "create table test_orc_read_timezone(id UInt64, t DateTime64) Engine=MergeTree order by id"
+$CLICKHOUSE_CLIENT -q "insert into test_orc_read_timezone from infile '$CURDIR/data_orc/test_reader_time_zone.snappy.orc' SETTINGS input_format_orc_reader_time_zone_name='Asia/Shanghai' FORMAT ORC"
+$CLICKHOUSE_CLIENT -q "select * from test_orc_read_timezone"
+$CLICKHOUSE_CLIENT -q "drop table test_orc_read_timezone"
\ No newline at end of file

From de84f4f045f5ece627ca8295a09a5f2cf1eab6aa Mon Sep 17 00:00:00 2001
From: Yakov Olkhovskiy <yakov@clickhouse.com>
Date: Fri, 26 Jul 2024 08:13:21 +0000
Subject: [PATCH 037/139] add proper cast to lagInFrame/leadInFrame

---
 src/Processors/Transforms/WindowTransform.cpp | 86 ++++++++++++++++---
 src/Processors/Transforms/WindowTransform.h   |  1 +
 2 files changed, 75 insertions(+), 12 deletions(-)

diff --git a/src/Processors/Transforms/WindowTransform.cpp b/src/Processors/Transforms/WindowTransform.cpp
index 06ae2bfb25e..006593edeaa 100644
--- a/src/Processors/Transforms/WindowTransform.cpp
+++ b/src/Processors/Transforms/WindowTransform.cpp
@@ -16,6 +16,9 @@
 #include <Common/Arena.h>
 #include <Common/FieldVisitorConvertToNumber.h>
 #include <Common/FieldVisitorsAccurateComparison.h>
+#include <Functions/CastOverloadResolver.h>
+#include <Functions/IFunction.h>
+#include <DataTypes/DataTypeString.h>
 
 #include <Poco/Logger.h>
 #include <Common/logger_useful.h>
@@ -75,6 +78,8 @@ public:
 
     virtual std::optional<WindowFrame> getDefaultFrame() const { return {}; }
 
+    virtual ColumnPtr castColumn(const Columns &, const std::vector<size_t> &) { return nullptr; }
+
     /// Is the frame type supported by this function.
     virtual bool checkWindowFrameType(const WindowTransform * /*transform*/) const { return true; }
 };
@@ -1171,6 +1176,9 @@ void WindowTransform::appendChunk(Chunk & chunk)
         // Initialize output columns.
         for (auto & ws : workspaces)
         {
+            if (ws.window_function_impl)
+                block.casted_columns.push_back(ws.window_function_impl->castColumn(block.input_columns, ws.argument_column_indices));
+
             block.output_columns.push_back(ws.aggregate_function->getResultType()
                 ->createColumn());
             block.output_columns.back()->reserve(block.rows);
@@ -2358,6 +2366,8 @@ public:
 template <bool is_lead>
 struct WindowFunctionLagLeadInFrame final : public WindowFunction
 {
+    FunctionBasePtr func_cast = nullptr;
+
     WindowFunctionLagLeadInFrame(const std::string & name_,
             const DataTypes & argument_types_, const Array & parameters_)
         : WindowFunction(name_, argument_types_, parameters_, createResultType(argument_types_, name_))
@@ -2385,18 +2395,71 @@ struct WindowFunctionLagLeadInFrame final : public WindowFunction
             return;
         }
 
-        if (!argument_types[0]->equals(*argument_types[2]))
-            throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                "Argument type '{}' and the default value type '{}' are different",
-                argument_types[0]->getName(),
-                argument_types[2]->getName());
-
         if (argument_types.size() > 3)
         {
             throw Exception(ErrorCodes::BAD_ARGUMENTS,
                 "Function '{}' accepts at most 3 arguments, {} given",
                 name, argument_types.size());
         }
+
+        if (argument_types[0]->equals(*argument_types[2]))
+            return;
+
+        const auto supertype = getLeastSupertype(DataTypes{argument_types[0], argument_types[2]});
+        if (!supertype)
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "There is no supertype for the argument type '{}' and the default value type '{}'",
+                argument_types[0]->getName(),
+                argument_types[2]->getName());
+        }
+        if (!argument_types[0]->equals(*supertype))
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "The supertype '{}' for the argument type '{}' and the default value type '{}' is not the same as the argument type",
+                supertype->getName(),
+                argument_types[0]->getName(),
+                argument_types[2]->getName());
+        }
+    
+        const auto from_name = argument_types[2]->getName();
+        const auto to_name = argument_types[0]->getName();
+        ColumnsWithTypeAndName arguments
+        {
+            { argument_types[2], "" },
+            {
+                DataTypeString().createColumnConst(0, to_name),
+                std::make_shared<DataTypeString>(),
+                ""
+            }
+        };
+
+        auto get_cast_func = [&arguments]
+        {
+            FunctionOverloadResolverPtr func_builder_cast = createInternalCastOverloadResolver(CastType::accurate, {});
+            return func_builder_cast->build(arguments);
+        };
+
+        func_cast = get_cast_func();
+
+    }
+
+    ColumnPtr castColumn(const Columns & columns, const std::vector<size_t> & idx) override
+    {
+        if (!func_cast)
+            return nullptr;
+
+        ColumnsWithTypeAndName arguments
+        {
+            { columns[idx[2]], argument_types[2], "" },
+            {
+                DataTypeString().createColumnConst(columns[idx[2]]->size(), argument_types[0]->getName()),
+                std::make_shared<DataTypeString>(),
+                ""
+            }
+        };
+
+        return func_cast->execute(arguments, argument_types[0], columns[idx[2]]->size());
     }
 
     static DataTypePtr createResultType(const DataTypes & argument_types_, const std::string & name_)
@@ -2446,12 +2509,11 @@ struct WindowFunctionLagLeadInFrame final : public WindowFunction
             if (argument_types.size() > 2)
             {
                 // Column with default values is specified.
-                // The conversion through Field is inefficient, but we accept
-                // subtypes of the argument type as a default value (for convenience),
-                // and it's a pain to write conversion that respects ColumnNothing
-                // and ColumnConst and so on.
-                const IColumn & default_column = *current_block.input_columns[
-                    workspace.argument_column_indices[2]].get();
+                const IColumn & default_column =
+                    current_block.casted_columns[function_index] ?
+                        *current_block.casted_columns[function_index].get() :
+                        *current_block.input_columns[workspace.argument_column_indices[2]].get();
+
                 to.insert(default_column[transform->current_row.row]);
             }
             else
diff --git a/src/Processors/Transforms/WindowTransform.h b/src/Processors/Transforms/WindowTransform.h
index 43fa6b28019..fe4f79e997c 100644
--- a/src/Processors/Transforms/WindowTransform.h
+++ b/src/Processors/Transforms/WindowTransform.h
@@ -50,6 +50,7 @@ struct WindowTransformBlock
 {
     Columns original_input_columns;
     Columns input_columns;
+    Columns casted_columns;
     MutableColumns output_columns;
 
     size_t rows = 0;

From 5bf89a433128985944cb5dd6ad6ef40a9658ff52 Mon Sep 17 00:00:00 2001
From: Pablo Marcos <pablo.marcos.oltra@clickhouse.com>
Date: Fri, 26 Jul 2024 08:42:52 +0000
Subject: [PATCH 038/139] Set a different instance dir when using pytest-xdist

This allows executing in integration tests in parallel
without directory clashes.
---
 tests/integration/helpers/cluster.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/integration/helpers/cluster.py b/tests/integration/helpers/cluster.py
index 548b58a17e8..0c8278048bf 100644
--- a/tests/integration/helpers/cluster.py
+++ b/tests/integration/helpers/cluster.py
@@ -434,6 +434,11 @@ class ClickHouseCluster:
         # docker-compose removes everything non-alphanumeric from project names so we do it too.
         self.project_name = re.sub(r"[^a-z0-9]", "", project_name.lower())
         self.instances_dir_name = get_instances_dir(self.name)
+        xdist_worker = os.getenv("PYTEST_XDIST_WORKER")
+        if xdist_worker:
+            self.project_name += f"_{xdist_worker}"
+            self.instances_dir_name += f"_{xdist_worker}"
+
         self.instances_dir = p.join(self.base_dir, self.instances_dir_name)
         self.docker_logs_path = p.join(self.instances_dir, "docker.log")
         self.env_file = p.join(self.instances_dir, DEFAULT_ENV_NAME)

From 72ebff825c0752e66cefa4f367ce43ff23d77703 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= <git@rmr.ninja>
Date: Fri, 26 Jul 2024 12:19:09 +0200
Subject: [PATCH 039/139] Reduce max time of
 00763_long_lock_buffer_alter_destination_table

---
 ...ong_lock_buffer_alter_destination_table.sh | 33 +++++++++++++++----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/tests/queries/0_stateless/00763_long_lock_buffer_alter_destination_table.sh b/tests/queries/0_stateless/00763_long_lock_buffer_alter_destination_table.sh
index 7e2384cfc52..c12b4426740 100755
--- a/tests/queries/0_stateless/00763_long_lock_buffer_alter_destination_table.sh
+++ b/tests/queries/0_stateless/00763_long_lock_buffer_alter_destination_table.sh
@@ -16,18 +16,39 @@ ${CLICKHOUSE_CLIENT} --query="CREATE TABLE buffer_00763_1 (s String) ENGINE = Bu
 ${CLICKHOUSE_CLIENT} --query="CREATE TABLE mt_00763_1 (x UInt32, s String) ENGINE = MergeTree ORDER BY x"
 ${CLICKHOUSE_CLIENT} --query="INSERT INTO mt_00763_1 VALUES (1, '1'), (2, '2'), (3, '3')"
 
-function thread1()
+function thread_alter()
 {
-    seq 1 300 | sed -r -e 's/.+/ALTER TABLE mt_00763_1 MODIFY column s UInt32; ALTER TABLE mt_00763_1 MODIFY column s String;/' | ${CLICKHOUSE_CLIENT} --multiquery --ignore-error ||:
+    local TIMELIMIT=$((SECONDS+$1))
+    local it=0
+    while [ $SECONDS -lt "$TIMELIMIT" ] && [ $it -lt 300 ];
+    do
+        it=$((it+1))
+        $CLICKHOUSE_CLIENT --multiquery --ignore-error -q "
+            ALTER TABLE mt_00763_1 MODIFY column s UInt32;
+            ALTER TABLE mt_00763_1 MODIFY column s String;
+        " ||:
+    done
 }
 
-function thread2()
+function thread_query()
 {
-    seq 1 2000 | sed -r -e 's/.+/SELECT sum(length(s)) FROM buffer_00763_1;/' | ${CLICKHOUSE_CLIENT} --multiquery --ignore-error 2>&1 | grep -vP '(^3$|^Received exception from server|^Code: 473)'
+    local TIMELIMIT=$((SECONDS+$1))
+    local it=0
+    while [ $SECONDS -lt "$TIMELIMIT" ] && [ $it -lt 2000 ];
+    do
+        it=$((it+1))
+        $CLICKHOUSE_CLIENT --multiquery --ignore-error -q "
+            SELECT sum(length(s)) FROM buffer_00763_1;
+        " 2>&1 | grep -vP '(^3$|^Received exception from server|^Code: 473)'
+    done
 }
 
-thread1 &
-thread2 &
+export -f thread_alter
+export -f thread_query
+
+TIMEOUT=30
+thread_alter $TIMEOUT &
+thread_query $TIMEOUT &
 
 wait
 

From 98418120cd3167983b5436834d7c568cb42865af Mon Sep 17 00:00:00 2001
From: Pablo Marcos <pablo.marcos.oltra@clickhouse.com>
Date: Fri, 26 Jul 2024 10:21:43 +0000
Subject: [PATCH 040/139] Add parallel integration test execution to doc

---
 tests/integration/README.md | 67 ++++++++++++++++++++++++++++++++++---
 1 file changed, 62 insertions(+), 5 deletions(-)

diff --git a/tests/integration/README.md b/tests/integration/README.md
index cde4cb05aec..5d4fa407e3f 100644
--- a/tests/integration/README.md
+++ b/tests/integration/README.md
@@ -16,7 +16,7 @@ Don't use Docker from your system repository.
 * [py.test](https://docs.pytest.org/) testing framework. To install: `sudo -H pip install pytest`
 * [docker-compose](https://docs.docker.com/compose/) and additional python libraries. To install:
 
-```
+```bash
 sudo -H pip install \
     PyMySQL \
     avro \
@@ -78,7 +78,7 @@ Notes:
 * Some tests maybe require a lot of resources (CPU, RAM, etc.). Better not try large tests like `test_distributed_ddl*` on your laptop.
 
 You can run tests via `./runner` script and pass pytest arguments as last arg:
-```
+```bash
 $ ./runner --binary $HOME/ClickHouse/programs/clickhouse  --odbc-bridge-binary $HOME/ClickHouse/programs/clickhouse-odbc-bridge --base-configs-dir $HOME/ClickHouse/programs/server/ 'test_ssl_cert_authentication -ss'
 Start tests
 ====================================================================================================== test session starts ======================================================================================================
@@ -102,7 +102,7 @@ test_ssl_cert_authentication/test.py::test_create_user PASSED
 ```
 
 Path to binary and configs maybe specified via env variables:
-```
+```bash
 $ export CLICKHOUSE_TESTS_BASE_CONFIG_DIR=$HOME/ClickHouse/programs/server/
 $ export CLICKHOUSE_TESTS_SERVER_BIN_PATH=$HOME/ClickHouse/programs/clickhouse
 $ export CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH=$HOME/ClickHouse/programs/clickhouse-odbc-bridge
@@ -121,6 +121,63 @@ test_odbc_interaction/test.py ......                                     [100%]
 You can just open shell inside a container by overwritting the command:
 ./runner --command=bash
 
+### Parallel test execution
+
+On the CI, we run a number of parallel runners (5 at the time of this writing), each on its own
+Docker container. These runner containers spawn more containers for the services needed such as
+ZooKeeper, MySQL, PostgreSQL and minio, among others. Within each runner, tests are parallelized
+using [pytest-xdist](https://pytest-xdist.readthedocs.io/en/stable/). We're using `--dist=loadfile`
+to [distribute the load](https://pytest-xdist.readthedocs.io/en/stable/distribution.html). In other
+words: tests are grouped by module for test functions and by class for test methods. This means that
+any test within the same module (or any class) will never execute their tests in parallel. They'll
+be executed on the same worker one after the other.
+
+If the test supports parallel and repeated execution, you can run a bunch of them in parallel to
+look for flakiness. We use [pytest-repeat](https://pypi.org/project/pytest-repeat/) to set the
+number of times we want to execute a test through the `--count` argument. Then, `-n` sets the number
+of parallel workers for `pytest-xdist`.
+
+```bash
+$ export CLICKHOUSE_TESTS_BASE_CONFIG_DIR=$HOME/ClickHouse/programs/server/
+$ export CLICKHOUSE_TESTS_SERVER_BIN_PATH=$HOME/ClickHouse/programs/clickhouse
+$ export CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH=$HOME/ClickHouse/programs/clickhouse-odbc-bridge
+$ ./runner 'test_storage_s3_queue/test.py::test_max_set_age -- --count 10 -n 5'
+Start tests
+=============================================================================== test session starts ================================================================================
+platform linux -- Python 3.10.12, pytest-7.4.4, pluggy-1.5.0 -- /usr/bin/python3
+cachedir: .pytest_cache
+rootdir: /ClickHouse/tests/integration
+configfile: pytest.ini
+plugins: reportlog-0.4.0, xdist-3.5.0, random-0.2, repeat-0.9.3, order-1.0.0, timeout-2.2.0
+timeout: 900.0s
+timeout method: signal
+timeout func_only: False
+5 workers [10 items]
+scheduling tests via LoadScheduling
+
+test_storage_s3_queue/test.py::test_max_set_age[9-10]
+test_storage_s3_queue/test.py::test_max_set_age[7-10]
+test_storage_s3_queue/test.py::test_max_set_age[5-10]
+test_storage_s3_queue/test.py::test_max_set_age[1-10]
+test_storage_s3_queue/test.py::test_max_set_age[3-10]
+[gw3] [ 10%] PASSED test_storage_s3_queue/test.py::test_max_set_age[7-10]
+test_storage_s3_queue/test.py::test_max_set_age[8-10]
+[gw4] [ 20%] PASSED test_storage_s3_queue/test.py::test_max_set_age[9-10]
+test_storage_s3_queue/test.py::test_max_set_age[10-10]
+[gw0] [ 30%] PASSED test_storage_s3_queue/test.py::test_max_set_age[1-10]
+test_storage_s3_queue/test.py::test_max_set_age[2-10]
+[gw1] [ 40%] PASSED test_storage_s3_queue/test.py::test_max_set_age[3-10]
+test_storage_s3_queue/test.py::test_max_set_age[4-10]
+[gw2] [ 50%] PASSED test_storage_s3_queue/test.py::test_max_set_age[5-10]
+test_storage_s3_queue/test.py::test_max_set_age[6-10]
+[gw3] [ 60%] PASSED test_storage_s3_queue/test.py::test_max_set_age[8-10]
+[gw4] [ 70%] PASSED test_storage_s3_queue/test.py::test_max_set_age[10-10]
+[gw0] [ 80%] PASSED test_storage_s3_queue/test.py::test_max_set_age[2-10]
+[gw1] [ 90%] PASSED test_storage_s3_queue/test.py::test_max_set_age[4-10]
+[gw2] [100%] PASSED test_storage_s3_queue/test.py::test_max_set_age[6-10]
+========================================================================== 10 passed in 120.65s (0:02:00) ==========================================================================
+```
+
 ### Rebuilding the docker containers
 
 The main container used for integration tests lives in `docker/test/integration/base/Dockerfile`. Rebuild it with
@@ -149,7 +206,7 @@ will automagically detect the types of variables and only the small diff of two
 
 If tests failing for mysterious reasons, this may help:
 
-```
+```bash
 sudo service docker stop
 sudo bash -c 'rm -rf /var/lib/docker/*'
 sudo service docker start
@@ -159,6 +216,6 @@ sudo service docker start
 
 On Ubuntu 20.10 and later in host network mode (default) one may encounter problem with nested containers not seeing each other. It happens because legacy and nftables rules are out of sync. Problem can be solved by:
 
-```
+```bash
 sudo iptables -P FORWARD ACCEPT
 ```

From 60cca77c8a415142fe6f181b25aaed84232ea3c0 Mon Sep 17 00:00:00 2001
From: Blargian <shaunstruwig.ss@gmail.com>
Date: Fri, 26 Jul 2024 12:39:35 +0200
Subject: [PATCH 041/139] add example for materialize function

---
 .../functions/other-functions.md              | 32 ++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/docs/en/sql-reference/functions/other-functions.md b/docs/en/sql-reference/functions/other-functions.md
index b7e4094f30e..797607e552a 100644
--- a/docs/en/sql-reference/functions/other-functions.md
+++ b/docs/en/sql-reference/functions/other-functions.md
@@ -346,7 +346,9 @@ Result:
 ## materialize
 
 Turns a constant into a full column containing a single value.
-Full columns and constants are represented differently in memory. Functions usually execute different code for normal and constant arguments, although the result should typically be the same. This function can be used to debug this behavior.
+Full columns and constants are represented differently in memory.
+Functions usually execute different code for normal and constant arguments, although the result should typically be the same. 
+This function can be used to debug this behavior.
 
 **Syntax**
 
@@ -354,6 +356,34 @@ Full columns and constants are represented differently in memory. Functions usua
 materialize(x)
 ```
 
+**Parameters**
+
+- `x` — A constant. [Constant](../functions/index.md/#constants).
+
+**Returned value**
+
+- A column containing a single value `x`.
+
+**Example**
+
+In the example below the `countMatches` function expects a constant second argument. 
+This behaviour can be debugged by using the `materialize` function to turn a constant into a full column, 
+verifying that the function throws an error for a non-constant argument.
+
+Query:
+
+```sql
+SELECT countMatches('foobarfoo', 'foo');
+SELECT countMatches('foobarfoo', materialize('foo'));
+```
+
+Result:
+
+```response
+2
+Code: 44. DB::Exception: Received from localhost:9000. DB::Exception: Illegal type of argument #2 'pattern' of function countMatches, expected constant String, got String
+```
+
 ## ignore
 
 Accepts any arguments, including `NULL` and does nothing. Always returns 0.

From 3f1dbdfce978bab2b2ce2aedecdbb5afbf54c4a0 Mon Sep 17 00:00:00 2001
From: Pablo Marcos <pablo.marcos.oltra@clickhouse.com>
Date: Fri, 26 Jul 2024 11:01:10 +0000
Subject: [PATCH 042/139] Clarify documentation

---
 tests/integration/README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/integration/README.md b/tests/integration/README.md
index 5d4fa407e3f..ab984b7bd04 100644
--- a/tests/integration/README.md
+++ b/tests/integration/README.md
@@ -127,10 +127,10 @@ On the CI, we run a number of parallel runners (5 at the time of this writing),
 Docker container. These runner containers spawn more containers for the services needed such as
 ZooKeeper, MySQL, PostgreSQL and minio, among others. Within each runner, tests are parallelized
 using [pytest-xdist](https://pytest-xdist.readthedocs.io/en/stable/). We're using `--dist=loadfile`
-to [distribute the load](https://pytest-xdist.readthedocs.io/en/stable/distribution.html). In other
-words: tests are grouped by module for test functions and by class for test methods. This means that
-any test within the same module (or any class) will never execute their tests in parallel. They'll
-be executed on the same worker one after the other.
+to [distribute the load](https://pytest-xdist.readthedocs.io/en/stable/distribution.html). In the
+documentation words: this guarantees that all tests in a file run in the same worker. This means
+that any test within the same file will never execute their tests in parallel. They'll be executed
+on the same worker one after the other.
 
 If the test supports parallel and repeated execution, you can run a bunch of them in parallel to
 look for flakiness. We use [pytest-repeat](https://pypi.org/project/pytest-repeat/) to set the

From 28e991708be1facd87c3760f7929cd5ddc299805 Mon Sep 17 00:00:00 2001
From: maxvostrikov <max.vostrikov@clickhouse.com>
Date: Fri, 26 Jul 2024 13:45:57 +0200
Subject: [PATCH 043/139] squash! added somme tests in relation with
 https://github.com/ClickHouse/ClickHouse/pull/54881 with new behaviour when
 enable_named_columns_in_function_tuple=1 (default value)

---
 .../0_stateless/00309_formats.reference       | Bin 18666 -> 20353 bytes
 tests/queries/0_stateless/00309_formats.sql   |   5 -----
 2 files changed, 5 deletions(-)

diff --git a/tests/queries/0_stateless/00309_formats.reference b/tests/queries/0_stateless/00309_formats.reference
index f3ea45520bb50fb936caf6724e9fedf3cdd00b75..cab311692be229716b58af39079275d3942b01cc 100644
GIT binary patch
literal 20353
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
Lvprlx%YOd>&)TR8

delta 3052
zcmeIy$4}c(00wZIgtksdZ-w^I3JD}eL2?j6{R4XG1$t-?y;Q0c4wb5?2YL>Bj|8*#
z-Xp>6y?59U_TGDMNaN%a?SDX3#j^bK`<|bk?ZfAlN^UDiN<bJ6jY24SuCXUb!%+R!
z(?lWq$P}8rBt@#-Sf0!i4|+jw=mUMBAM}R-Fc1d8U>E{JVHgaD5e8+19DxExLIy^`
zXcz-yVH}Ky2`~{R!DN^MQ}xOSA`L-0%z&9N3ueO{m<#h@J}iKRum~2z5?IQq+n-P(
zP{A_D!g5#vD`6F^hBdGj*1>w%02^VGPHumqnY-wY76U{pY=iBv19rkL*bRGNFYJT;
zPz?v*AoeGQ5Ddc+I10z$IGlhQI0>iVG@OC6a1PGH1;h6f#3F(vxC~d|DqMr>a070_
zEw~ML;4a*Q`|v>j|8;{y1V``~p1@Oh2G8LIyo6Wq8s5NLcn9yHg%&qjk~HD*O`kk{
zMhS#wBF4@26;n)ok$HM~`}q3#2LuKMhlGZON5~bCOjLACY+QUoVp4KSYFc_mW>$7i
zZeD&tVNr2OsZv$OmRD3(RoB$k)i*RYHMg|3wRd!Ob@%l4^{WR4hlWQ+$Hpf#lT*_(
zvvczci%ZKZt842Un_JsEyL<ZwheyXJr)TFEmsi&}w|Dmf?L&1j3gH`4#3+R{X>2uP
zs~KC(*lPbltFhlLRQ$(oSyIc$t;|{F>ph;XVgHfpC$+5H%8ajnp%+Y<&DY2OORU_k
z(V7&oZmv$Gj7LgIiK)l0pFiA9KYx&VyyL(B=HYJsi3@C{mioxSQew%acGgGsx>HI?
tDE$HfH|yd|adXt)D_oo(mI%Z&<wVo8BQ16miz!<%?O^j~Y-3_4_zmv{|2Y5v

diff --git a/tests/queries/0_stateless/00309_formats.sql b/tests/queries/0_stateless/00309_formats.sql
index 0366cdeea5c..b0939c00a10 100644
--- a/tests/queries/0_stateless/00309_formats.sql
+++ b/tests/queries/0_stateless/00309_formats.sql
@@ -9,8 +9,3 @@ SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, range(n) AS arr, a
 SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, range(n) AS arr, arrayStringConcat(arrayMap(x -> reinterpretAsString(x), arr)) AS s, (n, d) AS tuple FROM system.numbers LIMIT 2 FORMAT JSON;
 SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, range(n) AS arr, arrayStringConcat(arrayMap(x -> reinterpretAsString(x), arr)) AS s, (n, d) AS tuple FROM system.numbers LIMIT 2 FORMAT JSONCompact;
 SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, range(n) AS arr, arrayStringConcat(arrayMap(x -> reinterpretAsString(x), arr)) AS s, (n, d) AS tuple FROM system.numbers LIMIT 2 FORMAT XML;
-
-SET enable_named_columns_in_function_tuple = 1;
-
-SELECT 36 AS n, toDate('2000-01-01') + n AS d, (n, d) AS tuple FROM system.numbers LIMIT 1 FORMAT RowBinaryWithNamesAndTypes;
-SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, (n, d) AS tuple FROM system.numbers LIMIT 1 FORMAT TabSeparatedWithNamesAndTypes;

From aec7848525d2d6bd1cc9e7c573c25bd3b4ac79e7 Mon Sep 17 00:00:00 2001
From: Yakov Olkhovskiy <yakov@clickhouse.com>
Date: Fri, 26 Jul 2024 13:04:44 +0000
Subject: [PATCH 044/139] fix

---
 src/Processors/Transforms/WindowTransform.cpp |  2 +-
 .../03210_lag_lead_inframe_types.reference    | 20 +++++++++++++++++++
 .../03210_lag_lead_inframe_types.sql          |  4 ++--
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/Processors/Transforms/WindowTransform.cpp b/src/Processors/Transforms/WindowTransform.cpp
index 61be0c32a7d..1eac08780e9 100644
--- a/src/Processors/Transforms/WindowTransform.cpp
+++ b/src/Processors/Transforms/WindowTransform.cpp
@@ -2424,7 +2424,7 @@ struct WindowFunctionLagLeadInFrame final : public WindowFunction
                 argument_types[0]->getName(),
                 argument_types[2]->getName());
         }
-    
+
         const auto from_name = argument_types[2]->getName();
         const auto to_name = argument_types[0]->getName();
         ColumnsWithTypeAndName arguments
diff --git a/tests/queries/0_stateless/03210_lag_lead_inframe_types.reference b/tests/queries/0_stateless/03210_lag_lead_inframe_types.reference
index cc3b9a096b9..d4734a85e72 100644
--- a/tests/queries/0_stateless/03210_lag_lead_inframe_types.reference
+++ b/tests/queries/0_stateless/03210_lag_lead_inframe_types.reference
@@ -18,3 +18,23 @@
 7
 8
 9
+0
+1
+2
+2
+2
+2
+2
+2
+2
+2
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
diff --git a/tests/queries/0_stateless/03210_lag_lead_inframe_types.sql b/tests/queries/0_stateless/03210_lag_lead_inframe_types.sql
index 5466cfe0fad..f6017ee6690 100644
--- a/tests/queries/0_stateless/03210_lag_lead_inframe_types.sql
+++ b/tests/queries/0_stateless/03210_lag_lead_inframe_types.sql
@@ -1,4 +1,4 @@
-SELECT lagInFrame(2::UInt128, 2, number) OVER w FROM numbers(10) WINDOW w AS (ORDER BY number); -- { serverError BAD_ARGUMENTS }
-SELECT leadInFrame(2::UInt128, 2, number) OVER w FROM numbers(10) WINDOW w AS (ORDER BY number); -- { serverError BAD_ARGUMENTS }
+SELECT lagInFrame(2::UInt128, 2, number) OVER w FROM numbers(10) WINDOW w AS (ORDER BY number);
+SELECT leadInFrame(2::UInt128, 2, number) OVER w FROM numbers(10) WINDOW w AS (ORDER BY number);
 SELECT lagInFrame(2::UInt64, 2, number) OVER w FROM numbers(10) WINDOW w AS (ORDER BY number);
 SELECT leadInFrame(2::UInt64, 2, number) OVER w FROM numbers(10) WINDOW w AS (ORDER BY number);

From 42384af0ef38dd326337e8cf18327871924f7359 Mon Sep 17 00:00:00 2001
From: Pablo Marcos <pablo.marcos.oltra@clickhouse.com>
Date: Thu, 25 Jul 2024 15:42:50 +0000
Subject: [PATCH 045/139] Fix crash when the connection is empty

---
 src/Storages/Distributed/DistributedAsyncInsertBatch.cpp    | 6 ++++++
 .../Distributed/DistributedAsyncInsertDirectoryQueue.cpp    | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/src/Storages/Distributed/DistributedAsyncInsertBatch.cpp b/src/Storages/Distributed/DistributedAsyncInsertBatch.cpp
index e1facec5b40..31779a32c1f 100644
--- a/src/Storages/Distributed/DistributedAsyncInsertBatch.cpp
+++ b/src/Storages/Distributed/DistributedAsyncInsertBatch.cpp
@@ -245,6 +245,9 @@ void DistributedAsyncInsertBatch::sendBatch(const SettingsChanges & settings_cha
                 connection = std::move(result.front().entry);
                 compression_expected = connection->getCompression() == Protocol::Compression::Enable;
 
+                if (connection.isNull())
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Empty connection");
+
                 LOG_DEBUG(parent.log, "Sending a batch of {} files to {} ({} rows, {} bytes).",
                     files.size(),
                     connection->getDescription(),
@@ -303,6 +306,9 @@ void DistributedAsyncInsertBatch::sendSeparateFiles(const SettingsChanges & sett
             auto connection = std::move(result.front().entry);
             bool compression_expected = connection->getCompression() == Protocol::Compression::Enable;
 
+            if (connection.isNull())
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Empty connection");
+
             RemoteInserter remote(*connection, timeouts,
                 distributed_header.insert_query,
                 insert_settings,
diff --git a/src/Storages/Distributed/DistributedAsyncInsertDirectoryQueue.cpp b/src/Storages/Distributed/DistributedAsyncInsertDirectoryQueue.cpp
index d471c67553d..15998776d27 100644
--- a/src/Storages/Distributed/DistributedAsyncInsertDirectoryQueue.cpp
+++ b/src/Storages/Distributed/DistributedAsyncInsertDirectoryQueue.cpp
@@ -415,6 +415,9 @@ void DistributedAsyncInsertDirectoryQueue::processFile(std::string & file_path,
         auto result = pool->getManyCheckedForInsert(timeouts, insert_settings, PoolMode::GET_ONE, storage.remote_storage.getQualifiedName());
         auto connection = std::move(result.front().entry);
 
+        if (connection.isNull())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Empty connection");
+
         LOG_DEBUG(log, "Sending `{}` to {} ({} rows, {} bytes)",
             file_path,
             connection->getDescription(),

From 981135bfb104b5ecfa0f1da5533e3d12f6850838 Mon Sep 17 00:00:00 2001
From: Pablo Marcos <pablo.marcos.oltra@clickhouse.com>
Date: Fri, 26 Jul 2024 13:38:42 +0000
Subject: [PATCH 046/139] Fix style check

---
 src/Storages/Distributed/DistributedAsyncInsertBatch.cpp     | 5 +++--
 .../Distributed/DistributedAsyncInsertDirectoryQueue.cpp     | 2 +-
 src/Storages/Distributed/DistributedSink.cpp                 | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Storages/Distributed/DistributedAsyncInsertBatch.cpp b/src/Storages/Distributed/DistributedAsyncInsertBatch.cpp
index 31779a32c1f..5e7b4b979c7 100644
--- a/src/Storages/Distributed/DistributedAsyncInsertBatch.cpp
+++ b/src/Storages/Distributed/DistributedAsyncInsertBatch.cpp
@@ -28,6 +28,7 @@ namespace ErrorCodes
     extern const int TOO_MANY_PARTITIONS;
     extern const int DISTRIBUTED_TOO_MANY_PENDING_BYTES;
     extern const int ARGUMENT_OUT_OF_BOUND;
+    extern const int LOGICAL_ERROR;
 }
 
 /// Can the batch be split and send files from batch one-by-one instead?
@@ -246,7 +247,7 @@ void DistributedAsyncInsertBatch::sendBatch(const SettingsChanges & settings_cha
                 compression_expected = connection->getCompression() == Protocol::Compression::Enable;
 
                 if (connection.isNull())
-                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Empty connection");
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Got empty connection");
 
                 LOG_DEBUG(parent.log, "Sending a batch of {} files to {} ({} rows, {} bytes).",
                     files.size(),
@@ -307,7 +308,7 @@ void DistributedAsyncInsertBatch::sendSeparateFiles(const SettingsChanges & sett
             bool compression_expected = connection->getCompression() == Protocol::Compression::Enable;
 
             if (connection.isNull())
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Empty connection");
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Got empty connection");
 
             RemoteInserter remote(*connection, timeouts,
                 distributed_header.insert_query,
diff --git a/src/Storages/Distributed/DistributedAsyncInsertDirectoryQueue.cpp b/src/Storages/Distributed/DistributedAsyncInsertDirectoryQueue.cpp
index 15998776d27..2bb0e720c72 100644
--- a/src/Storages/Distributed/DistributedAsyncInsertDirectoryQueue.cpp
+++ b/src/Storages/Distributed/DistributedAsyncInsertDirectoryQueue.cpp
@@ -416,7 +416,7 @@ void DistributedAsyncInsertDirectoryQueue::processFile(std::string & file_path,
         auto connection = std::move(result.front().entry);
 
         if (connection.isNull())
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Empty connection");
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Got empty connection");
 
         LOG_DEBUG(log, "Sending `{}` to {} ({} rows, {} bytes)",
             file_path,
diff --git a/src/Storages/Distributed/DistributedSink.cpp b/src/Storages/Distributed/DistributedSink.cpp
index b2ce62caf0a..f8bbc081e55 100644
--- a/src/Storages/Distributed/DistributedSink.cpp
+++ b/src/Storages/Distributed/DistributedSink.cpp
@@ -378,6 +378,8 @@ DistributedSink::runWritingJob(JobReplica & job, const Block & current_block, si
                     /// (anyway fallback_to_stale_replicas_for_distributed_queries=true by default)
                     auto results = shard_info.pool->getManyCheckedForInsert(timeouts, settings, PoolMode::GET_ONE, storage.remote_storage.getQualifiedName());
                     job.connection_entry = std::move(results.front().entry);
+                    if (job.connection_entry.isNull())
+                        throw Exception(ErrorCodes::LOGICAL_ERROR, "Got empty connection");
                 }
                 else
                 {

From ff5cd2051fc8bfd609a9040ffba02697283e69af Mon Sep 17 00:00:00 2001
From: maxvostrikov <max.vostrikov@clickhouse.com>
Date: Fri, 26 Jul 2024 17:10:39 +0200
Subject: [PATCH 047/139] squash! added somme tests in relation with
 https://github.com/ClickHouse/ClickHouse/pull/54881 with new behaviour when
 enable_named_columns_in_function_tuple=1 (default value)

---
 tests/queries/0_stateless/00307_format_xml.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/queries/0_stateless/00307_format_xml.sql b/tests/queries/0_stateless/00307_format_xml.sql
index 22566112bc7..a7e0e628945 100644
--- a/tests/queries/0_stateless/00307_format_xml.sql
+++ b/tests/queries/0_stateless/00307_format_xml.sql
@@ -2,4 +2,4 @@ SET output_format_write_statistics = 0;
 SELECT 'unnamed columns in tuple';
 SELECT 'Hello & world' AS s, 'Hello\n<World>', toDateTime('2001-02-03 04:05:06') AS time, arrayMap(x -> toString(x), range(10)) AS arr, (s, time) AS tpl SETTINGS extremes = 1, enable_named_columns_in_function_tuple = 0 FORMAT XML;
 SELECT 'named columns in tuple';
-SELECT 'Hello & world' AS s, toDateTime('2001-02-03 04:05:06') AS time, (s, time) AS tpl SETTINGS extremes = 1, enable_named_columns_in_function_tuple = 0 FORMAT XML;`
+SELECT 'Hello & world' AS s, toDateTime('2001-02-03 04:05:06') AS time, (s, time) AS tpl SETTINGS extremes = 1, enable_named_columns_in_function_tuple = 0 FORMAT XML;

From 343f1fa4bae219f7c287cb314ed6e04feb9a0de4 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nk@clickhouse.com>
Date: Fri, 26 Jul 2024 17:42:06 +0000
Subject: [PATCH 048/139] Check type after
 optimize_rewrite_aggregate_function_with_if.

---
 .../RewriteAggregateFunctionWithIfPass.cpp    | 32 ++++++++++++++++---
 src/Analyzer/Resolve/QueryAnalyzer.cpp        |  4 ++-
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/Analyzer/Passes/RewriteAggregateFunctionWithIfPass.cpp b/src/Analyzer/Passes/RewriteAggregateFunctionWithIfPass.cpp
index c1adf05ac76..a48e88132a6 100644
--- a/src/Analyzer/Passes/RewriteAggregateFunctionWithIfPass.cpp
+++ b/src/Analyzer/Passes/RewriteAggregateFunctionWithIfPass.cpp
@@ -2,6 +2,7 @@
 
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeAggregateFunction.h>
 
 #include <AggregateFunctions/AggregateFunctionFactory.h>
 #include <AggregateFunctions/IAggregateFunction.h>
@@ -42,7 +43,7 @@ public:
         if (lower_name.ends_with("if"))
             return;
 
-        auto & function_arguments_nodes = function_node->getArguments().getNodes();
+        const auto & function_arguments_nodes = function_node->getArguments().getNodes();
         if (function_arguments_nodes.size() != 1)
             return;
 
@@ -50,6 +51,8 @@ public:
         if (!if_node || if_node->getFunctionName() != "if")
             return;
 
+        FunctionNodePtr replaced_node;
+
         auto if_arguments_nodes = if_node->getArguments().getNodes();
         auto * first_const_node = if_arguments_nodes[1]->as<ConstantNode>();
         auto * second_const_node = if_arguments_nodes[2]->as<ConstantNode>();
@@ -75,8 +78,11 @@ public:
                     new_arguments[0] = std::move(if_arguments_nodes[1]);
 
                 new_arguments[1] = std::move(if_arguments_nodes[0]);
-                function_arguments_nodes = std::move(new_arguments);
-                resolveAggregateFunctionNodeByName(*function_node, function_node->getFunctionName() + "If");
+
+                replaced_node = std::make_shared<FunctionNode>(function_node->getFunctionName() + "If");
+                replaced_node->getArguments().getNodes() = std::move(new_arguments);
+                replaced_node->getParameters().getNodes() = function_node->getParameters().getNodes();
+                resolveAggregateFunctionNodeByName(*replaced_node, replaced_node->getFunctionName());
             }
         }
         else if (first_const_node)
@@ -104,10 +110,26 @@ public:
                     FunctionFactory::instance().get("not", getContext())->build(not_function->getArgumentColumns()));
                 new_arguments[1] = std::move(not_function);
 
-                function_arguments_nodes = std::move(new_arguments);
-                resolveAggregateFunctionNodeByName(*function_node, function_node->getFunctionName() + "If");
+                replaced_node = std::make_shared<FunctionNode>(function_node->getFunctionName() + "If");
+                replaced_node->getArguments().getNodes() = std::move(new_arguments);
+                replaced_node->getParameters().getNodes() = function_node->getParameters().getNodes();
+                resolveAggregateFunctionNodeByName(*replaced_node, replaced_node->getFunctionName());
             }
         }
+
+        if (!replaced_node)
+            return;
+
+        auto prev_type = function_node->getResultType();
+        auto curr_type = replaced_node->getResultType();
+        if (!prev_type->equals(*curr_type))
+            return;
+
+        /// Just in case, CAST compatible aggregate function states.
+        if (WhichDataType(prev_type).isAggregateFunction() && !DataTypeAggregateFunction::strictEquals(prev_type, curr_type))
+            node = createCastFunction(std::move(replaced_node), prev_type, getContext());
+        else
+            node = std::move(replaced_node);
     }
 };
 
diff --git a/src/Analyzer/Resolve/QueryAnalyzer.cpp b/src/Analyzer/Resolve/QueryAnalyzer.cpp
index b1fe2554988..b1603bb18dd 100644
--- a/src/Analyzer/Resolve/QueryAnalyzer.cpp
+++ b/src/Analyzer/Resolve/QueryAnalyzer.cpp
@@ -3239,11 +3239,13 @@ ProjectionNames QueryAnalyzer::resolveFunction(QueryTreeNodePtr & node, Identifi
 
         auto action = function_node_ptr->getNullsAction();
         std::string aggregate_function_name = rewriteAggregateFunctionNameIfNeeded(function_name, action, scope.context);
+        std::cerr << "==================== " << function_name << " -> " << aggregate_function_name << std::endl;
+
 
         AggregateFunctionProperties properties;
         auto aggregate_function
             = AggregateFunctionFactory::instance().get(aggregate_function_name, action, argument_types, parameters, properties);
-
+        std::cerr << aggregate_function->getName()  << ' ' << aggregate_function->getResultType()->getName() << std::endl;
         function_node.resolveAsAggregateFunction(std::move(aggregate_function));
 
         return result_projection_names;

From 4833b46a1a86bb1847d2520ea12ea4650c497abc Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nk@clickhouse.com>
Date: Fri, 26 Jul 2024 17:43:30 +0000
Subject: [PATCH 049/139] Remove debug code

---
 src/Analyzer/Resolve/QueryAnalyzer.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Analyzer/Resolve/QueryAnalyzer.cpp b/src/Analyzer/Resolve/QueryAnalyzer.cpp
index b1603bb18dd..b1fe2554988 100644
--- a/src/Analyzer/Resolve/QueryAnalyzer.cpp
+++ b/src/Analyzer/Resolve/QueryAnalyzer.cpp
@@ -3239,13 +3239,11 @@ ProjectionNames QueryAnalyzer::resolveFunction(QueryTreeNodePtr & node, Identifi
 
         auto action = function_node_ptr->getNullsAction();
         std::string aggregate_function_name = rewriteAggregateFunctionNameIfNeeded(function_name, action, scope.context);
-        std::cerr << "==================== " << function_name << " -> " << aggregate_function_name << std::endl;
-
 
         AggregateFunctionProperties properties;
         auto aggregate_function
             = AggregateFunctionFactory::instance().get(aggregate_function_name, action, argument_types, parameters, properties);
-        std::cerr << aggregate_function->getName()  << ' ' << aggregate_function->getResultType()->getName() << std::endl;
+
         function_node.resolveAsAggregateFunction(std::move(aggregate_function));
 
         return result_projection_names;

From 870ec237bb427243388acbe5bca770241eeb7fbb Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Sat, 22 Jun 2024 14:14:11 +0200
Subject: [PATCH 050/139] Add ability to load dashboards for system.dashboards
 from config

One of the obvious reasons is to allow rendering them with readonly
user, which is not possible right now, due to usage of merge() function
there.

Another one, is to add some custom metrics.

Note, that once set, they overrides the default dashboards preset.

Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
---
 programs/server/Server.cpp                    |  2 +
 programs/server/config.xml                    | 25 ++++++++++
 src/Interpreters/Context.cpp                  | 49 +++++++++++++++++++
 src/Interpreters/Context.h                    |  4 ++
 .../System/StorageSystemDashboards.cpp        | 26 +++++++---
 src/Storages/System/StorageSystemDashboards.h |  2 +-
 .../test_custom_dashboards/__init__.py        |  0
 .../configs/config.d/overrides.xml            | 15 ++++++
 .../test_custom_dashboards/test.py            | 35 +++++++++++++
 9 files changed, 149 insertions(+), 9 deletions(-)
 create mode 100644 tests/integration/test_custom_dashboards/__init__.py
 create mode 100644 tests/integration/test_custom_dashboards/configs/config.d/overrides.xml
 create mode 100644 tests/integration/test_custom_dashboards/test.py

diff --git a/programs/server/Server.cpp b/programs/server/Server.cpp
index 16888015f8b..f8aea3ad10c 100644
--- a/programs/server/Server.cpp
+++ b/programs/server/Server.cpp
@@ -1582,6 +1582,8 @@ try
             global_context->setMacros(std::make_unique<Macros>(*config, "macros", log));
             global_context->setExternalAuthenticatorsConfig(*config);
 
+            global_context->setDashboardsConfig(config);
+
             if (global_context->isServerCompletelyStarted())
             {
                 /// It does not make sense to reload anything before server has started.
diff --git a/programs/server/config.xml b/programs/server/config.xml
index 94825a55f67..5dedd78ff2a 100644
--- a/programs/server/config.xml
+++ b/programs/server/config.xml
@@ -1312,6 +1312,31 @@
         <ttl>event_date + INTERVAL 30 DAY</ttl>
     </blob_storage_log>
 
+    <!-- Configure system.dashboards for dashboard.html.
+
+         Could have any query parameters, for which there will be an input on the page.
+         For instance an example from comments have the following:
+         - seconds
+         - rounding
+
+         NOTE: All default dashboards will be overwritten if it was set here. -->
+    <!-- Here is an example without merge() function, to make it work with readonly user -->
+    <!--
+    <dashboards>
+        <dashboard>
+            <dashboard>Overview</dashboard>
+            <title>Queries/second</title>
+            <query>
+                SELECT toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t, avg(ProfileEvent_Query)
+                FROM system.metric_log
+                WHERE event_date >= toDate(now() - {seconds:UInt32}) AND event_time >= now() - {seconds:UInt32}
+                GROUP BY t
+                ORDER BY t WITH FILL STEP {rounding:UInt32}
+            </query>
+        </dashboard>
+    </dashboards>
+    -->
+
     <!-- <top_level_domains_path>/var/lib/clickhouse/top_level_domains/</top_level_domains_path> -->
     <!-- Custom TLD lists.
          Format: <name>/path/to/file</name>
diff --git a/src/Interpreters/Context.cpp b/src/Interpreters/Context.cpp
index 94bcb88ed53..104f90fdb42 100644
--- a/src/Interpreters/Context.cpp
+++ b/src/Interpreters/Context.cpp
@@ -379,6 +379,10 @@ struct ContextSharedPart : boost::noncopyable
     ActionLocksManagerPtr action_locks_manager;             /// Set of storages' action lockers
     OnceFlag system_logs_initialized;
     std::unique_ptr<SystemLogs> system_logs TSA_GUARDED_BY(mutex);                /// Used to log queries and operations on parts
+
+    mutable std::mutex dashboard_mutex;
+    std::optional<Context::Dashboards> dashboards;
+
     std::optional<S3SettingsByEndpoint> storage_s3_settings TSA_GUARDED_BY(mutex);   /// Settings of S3 storage
     std::vector<String> warnings TSA_GUARDED_BY(mutex);                           /// Store warning messages about server configuration.
 
@@ -4313,6 +4317,51 @@ std::vector<ISystemLog *> Context::getSystemLogs() const
     return shared->system_logs->logs;
 }
 
+std::optional<Context::Dashboards> Context::getDashboards() const
+{
+    std::lock_guard lock(shared->dashboard_mutex);
+
+    if (!shared->dashboards)
+        return {};
+    return shared->dashboards;
+}
+
+namespace
+{
+
+String trim(const String & text)
+{
+    std::string_view view(text);
+    ::trim(view, '\n');
+    return String(view);
+}
+
+}
+
+void Context::setDashboardsConfig(const ConfigurationPtr & config)
+{
+    Poco::Util::AbstractConfiguration::Keys keys;
+    config->keys("dashboards", keys);
+
+    Dashboards dashboards;
+    for (const auto & key : keys)
+    {
+        const auto & prefix = "dashboards." + key + ".";
+        dashboards.push_back({
+            { "dashboard", config->getString(prefix + "dashboard") },
+            { "title",     config->getString(prefix + "title") },
+            { "query",     trim(config->getString(prefix + "query")) },
+        });
+    }
+
+    {
+        std::lock_guard lock(shared->dashboard_mutex);
+        if (!dashboards.empty())
+            shared->dashboards.emplace(std::move(dashboards));
+        else
+            shared->dashboards.reset();
+    }
+}
 
 CompressionCodecPtr Context::chooseCompressionCodec(size_t part_size, double part_size_ratio) const
 {
diff --git a/src/Interpreters/Context.h b/src/Interpreters/Context.h
index cb553d07513..e3cc96ccfc9 100644
--- a/src/Interpreters/Context.h
+++ b/src/Interpreters/Context.h
@@ -1153,6 +1153,10 @@ public:
 
     std::vector<ISystemLog *> getSystemLogs() const;
 
+    using Dashboards = std::vector<std::map<String, String>>;
+    std::optional<Dashboards> getDashboards() const;
+    void setDashboardsConfig(const ConfigurationPtr & config);
+
     /// Returns an object used to log operations with parts if it possible.
     /// Provide table name to make required checks.
     std::shared_ptr<PartLog> getPartLog(const String & part_database) const;
diff --git a/src/Storages/System/StorageSystemDashboards.cpp b/src/Storages/System/StorageSystemDashboards.cpp
index 5faa37d951e..96ba7e59cf2 100644
--- a/src/Storages/System/StorageSystemDashboards.cpp
+++ b/src/Storages/System/StorageSystemDashboards.cpp
@@ -1,6 +1,7 @@
 #include <string_view>
 #include <Storages/System/StorageSystemDashboards.h>
 #include <Common/StringUtils.h>
+#include <Interpreters/Context.h>
 
 namespace DB
 {
@@ -22,9 +23,9 @@ String trim(const char * text)
     return String(view);
 }
 
-void StorageSystemDashboards::fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const
+void StorageSystemDashboards::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
-    static const std::vector<std::map<String, String>> dashboards
+    static const std::vector<std::map<String, String>> default_dashboards
     {
         /// Default dashboard for self-managed ClickHouse
         {
@@ -371,13 +372,22 @@ ORDER BY t WITH FILL STEP {rounding:UInt32}
         }
     };
 
-    for (const auto & row : dashboards)
+    auto add_dashboards = [&](const auto & dashboards)
     {
-        size_t i = 0;
-        res_columns[i++]->insert(row.at("dashboard"));
-        res_columns[i++]->insert(row.at("title"));
-        res_columns[i++]->insert(row.at("query"));
-    }
+        for (const auto & row : dashboards)
+        {
+            size_t i = 0;
+            res_columns[i++]->insert(row.at("dashboard"));
+            res_columns[i++]->insert(row.at("title"));
+            res_columns[i++]->insert(row.at("query"));
+        }
+    };
+
+    const auto & context_dashboards = context->getDashboards();
+    if (context_dashboards.has_value())
+        add_dashboards(*context_dashboards);
+    else
+        add_dashboards(default_dashboards);
 }
 
 }
diff --git a/src/Storages/System/StorageSystemDashboards.h b/src/Storages/System/StorageSystemDashboards.h
index f3e957e06c5..1862d53849b 100644
--- a/src/Storages/System/StorageSystemDashboards.h
+++ b/src/Storages/System/StorageSystemDashboards.h
@@ -22,7 +22,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/tests/integration/test_custom_dashboards/__init__.py b/tests/integration/test_custom_dashboards/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_custom_dashboards/configs/config.d/overrides.xml b/tests/integration/test_custom_dashboards/configs/config.d/overrides.xml
new file mode 100644
index 00000000000..c3825784785
--- /dev/null
+++ b/tests/integration/test_custom_dashboards/configs/config.d/overrides.xml
@@ -0,0 +1,15 @@
+<clickhouse>
+    <dashboards>
+        <dashboard>
+            <dashboard>Overview</dashboard>
+            <title>Queries/second</title>
+            <query>
+                SELECT toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t, avg(ProfileEvent_Query)
+                FROM system.metric_log
+                WHERE event_date >= toDate(now() - {seconds:UInt32}) AND event_time >= now() - {seconds:UInt32}
+                GROUP BY t
+                ORDER BY t WITH FILL STEP {rounding:UInt32}
+            </query>
+        </dashboard>
+    </dashboards>
+</clickhouse>
diff --git a/tests/integration/test_custom_dashboards/test.py b/tests/integration/test_custom_dashboards/test.py
new file mode 100644
index 00000000000..7b360f58dc7
--- /dev/null
+++ b/tests/integration/test_custom_dashboards/test.py
@@ -0,0 +1,35 @@
+import pytest
+from helpers.cluster import ClickHouseCluster
+
+
+cluster = ClickHouseCluster(__file__)
+
+default = cluster.add_instance("default")
+custom = cluster.add_instance("custom", main_configs=["configs/config.d/overrides.xml"])
+
+
+@pytest.fixture(scope="module", autouse=True)
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def test_custom_dashboards():
+    assert int(default.query("select count()>10 from system.dashboards")) == 1
+    assert int(custom.query("select count() from system.dashboards")) == 1
+    assert (
+        default.query(
+            "select normalizeQuery(query) from system.dashboards where dashboard = 'Overview' and title = 'Queries/second'"
+        ).strip()
+        == """
+SELECT toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t, avg(ProfileEvent_Query) FROM merge(?..) WHERE event_date >= toDate(now() - {seconds:UInt32}) AND event_time >= now() - {seconds:UInt32} GROUP BY t ORDER BY t WITH FILL STEP {rounding:UInt32}
+    """.strip()
+    )
+    custom.query(
+        "select normalizeQuery(query) from system.dashboards where dashboard = 'Overview' and title = 'Queries/second'"
+    ).strip == """
+SELECT toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t, avg(ProfileEvent_Query) FROM system.metric_log WHERE event_date >= toDate(now() - {seconds:UInt32}) AND event_time >= now() - {seconds:UInt32} GROUP BY t ORDER BY t WITH FILL STEP {rounding:UInt32}
+    """.strip()

From 109bd52296550f506b14134b934c6eb8fd3ec094 Mon Sep 17 00:00:00 2001
From: Nikita Taranov <nikita.taranov@clickhouse.com>
Date: Fri, 26 Jul 2024 23:05:56 +0100
Subject: [PATCH 051/139] impl

---
 cmake/sanitize.cmake                                           | 2 +-
 contrib/libprotobuf-mutator                                    | 2 +-
 src/AggregateFunctions/fuzzers/CMakeLists.txt                  | 2 +-
 .../aggregate_function_state_deserialization_fuzzer.cpp        | 1 +
 src/Common/MemoryTracker.cpp                                   | 3 +++
 src/Core/SettingsFields.cpp                                    | 3 +++
 src/Core/fuzzers/CMakeLists.txt                                | 2 +-
 src/DataTypes/fuzzers/CMakeLists.txt                           | 2 +-
 src/Formats/fuzzers/CMakeLists.txt                             | 2 +-
 src/Functions/DateTimeTransforms.h                             | 3 +++
 src/Functions/parseReadableSize.cpp                            | 3 +++
 src/Parsers/fuzzers/codegen_fuzzer/codegen_select_fuzzer.cpp   | 3 ++-
 src/Parsers/fuzzers/create_parser_fuzzer.cpp                   | 2 +-
 src/Storages/fuzzers/CMakeLists.txt                            | 2 +-
 src/Storages/fuzzers/columns_description_fuzzer.cpp            | 2 ++
 15 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/cmake/sanitize.cmake b/cmake/sanitize.cmake
index 08716c1196b..3f111bc65c4 100644
--- a/cmake/sanitize.cmake
+++ b/cmake/sanitize.cmake
@@ -57,7 +57,7 @@ option(WITH_COVERAGE "Instrumentation for code coverage with default implementat
 
 if (WITH_COVERAGE)
     message (STATUS "Enabled instrumentation for code coverage")
-    set(COVERAGE_FLAGS "-fprofile-instr-generate -fcoverage-mapping")
+    set(COVERAGE_FLAGS "SHELL:-fprofile-instr-generate -fcoverage-mapping")
 endif()
 
 option (SANITIZE_COVERAGE "Instrumentation for code coverage with custom callbacks" OFF)
diff --git a/contrib/libprotobuf-mutator b/contrib/libprotobuf-mutator
index a304ec48dcf..1f95f808306 160000
--- a/contrib/libprotobuf-mutator
+++ b/contrib/libprotobuf-mutator
@@ -1 +1 @@
-Subproject commit a304ec48dcf15d942607032151f7e9ee504b5dcf
+Subproject commit 1f95f8083066f5b38fd2db172e7e7f9aa7c49d2d
diff --git a/src/AggregateFunctions/fuzzers/CMakeLists.txt b/src/AggregateFunctions/fuzzers/CMakeLists.txt
index 907a275b4b3..3ff7c86a00c 100644
--- a/src/AggregateFunctions/fuzzers/CMakeLists.txt
+++ b/src/AggregateFunctions/fuzzers/CMakeLists.txt
@@ -1,2 +1,2 @@
 clickhouse_add_executable(aggregate_function_state_deserialization_fuzzer aggregate_function_state_deserialization_fuzzer.cpp ${SRCS})
-target_link_libraries(aggregate_function_state_deserialization_fuzzer PRIVATE dbms clickhouse_aggregate_functions)
+target_link_libraries(aggregate_function_state_deserialization_fuzzer PRIVATE dbms clickhouse_aggregate_functions clickhouse_functions)
diff --git a/src/AggregateFunctions/fuzzers/aggregate_function_state_deserialization_fuzzer.cpp b/src/AggregateFunctions/fuzzers/aggregate_function_state_deserialization_fuzzer.cpp
index 425364efb9c..31fc93e4288 100644
--- a/src/AggregateFunctions/fuzzers/aggregate_function_state_deserialization_fuzzer.cpp
+++ b/src/AggregateFunctions/fuzzers/aggregate_function_state_deserialization_fuzzer.cpp
@@ -12,6 +12,7 @@
 
 #include <Interpreters/Context.h>
 
+#include <AggregateFunctions/IAggregateFunction.h>
 #include <AggregateFunctions/registerAggregateFunctions.h>
 
 #include <base/scope_guard.h>
diff --git a/src/Common/MemoryTracker.cpp b/src/Common/MemoryTracker.cpp
index ac412684cf7..7c0115467c6 100644
--- a/src/Common/MemoryTracker.cpp
+++ b/src/Common/MemoryTracker.cpp
@@ -86,7 +86,10 @@ inline std::string_view toDescription(OvercommitResult result)
 
 bool shouldTrackAllocation(Float64 probability, void * ptr)
 {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wimplicit-const-int-float-conversion"
     return intHash64(uintptr_t(ptr)) < std::numeric_limits<uint64_t>::max() * probability;
+#pragma clang diagnostic pop
 }
 
 }
diff --git a/src/Core/SettingsFields.cpp b/src/Core/SettingsFields.cpp
index 7d094e2a107..68304a29a23 100644
--- a/src/Core/SettingsFields.cpp
+++ b/src/Core/SettingsFields.cpp
@@ -271,9 +271,12 @@ namespace
         if (d != 0.0 && !std::isnormal(d))
             throw Exception(
                 ErrorCodes::CANNOT_PARSE_NUMBER, "A setting's value in seconds must be a normal floating point number or zero. Got {}", d);
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wimplicit-const-int-float-conversion"
         if (d * 1000000 > std::numeric_limits<Poco::Timespan::TimeDiff>::max() || d * 1000000 < std::numeric_limits<Poco::Timespan::TimeDiff>::min())
             throw Exception(
                 ErrorCodes::BAD_ARGUMENTS, "Cannot convert seconds to microseconds: the setting's value in seconds is too big: {}", d);
+#pragma clang diagnostic pop
 
         return static_cast<Poco::Timespan::TimeDiff>(d * 1000000);
     }
diff --git a/src/Core/fuzzers/CMakeLists.txt b/src/Core/fuzzers/CMakeLists.txt
index 51db6fa0b53..3c5c0eed4e6 100644
--- a/src/Core/fuzzers/CMakeLists.txt
+++ b/src/Core/fuzzers/CMakeLists.txt
@@ -1,2 +1,2 @@
 clickhouse_add_executable (names_and_types_fuzzer names_and_types_fuzzer.cpp)
-target_link_libraries (names_and_types_fuzzer PRIVATE dbms)
+target_link_libraries (names_and_types_fuzzer PRIVATE dbms clickhouse_functions)
diff --git a/src/DataTypes/fuzzers/CMakeLists.txt b/src/DataTypes/fuzzers/CMakeLists.txt
index 939bf5f5e3f..bc640358673 100644
--- a/src/DataTypes/fuzzers/CMakeLists.txt
+++ b/src/DataTypes/fuzzers/CMakeLists.txt
@@ -1,2 +1,2 @@
 clickhouse_add_executable(data_type_deserialization_fuzzer data_type_deserialization_fuzzer.cpp ${SRCS})
-target_link_libraries(data_type_deserialization_fuzzer PRIVATE dbms clickhouse_aggregate_functions)
+target_link_libraries(data_type_deserialization_fuzzer PRIVATE dbms clickhouse_aggregate_functions clickhouse_functions)
diff --git a/src/Formats/fuzzers/CMakeLists.txt b/src/Formats/fuzzers/CMakeLists.txt
index 38009aeec1d..99e57bfbca3 100644
--- a/src/Formats/fuzzers/CMakeLists.txt
+++ b/src/Formats/fuzzers/CMakeLists.txt
@@ -1,2 +1,2 @@
 clickhouse_add_executable(format_fuzzer format_fuzzer.cpp ${SRCS})
-target_link_libraries(format_fuzzer PRIVATE dbms clickhouse_aggregate_functions)
+target_link_libraries(format_fuzzer PRIVATE dbms clickhouse_aggregate_functions clickhouse_functions)
diff --git a/src/Functions/DateTimeTransforms.h b/src/Functions/DateTimeTransforms.h
index 5f745f3ccad..9d9acd2483b 100644
--- a/src/Functions/DateTimeTransforms.h
+++ b/src/Functions/DateTimeTransforms.h
@@ -2147,7 +2147,10 @@ struct Transformer
                 if constexpr (std::is_same_v<Additions, DateTimeAccurateConvertStrategyAdditions>
                     || std::is_same_v<Additions, DateTimeAccurateOrNullConvertStrategyAdditions>)
                 {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wimplicit-const-int-float-conversion"
                     bool is_valid_input = vec_from[i] >= 0 && vec_from[i] <= 0xFFFFFFFFL;
+#pragma clang diagnostic pop
                     if (!is_valid_input)
                     {
                         if constexpr (std::is_same_v<Additions, DateTimeAccurateOrNullConvertStrategyAdditions>)
diff --git a/src/Functions/parseReadableSize.cpp b/src/Functions/parseReadableSize.cpp
index 1abcf7f164f..4f6afb939a5 100644
--- a/src/Functions/parseReadableSize.cpp
+++ b/src/Functions/parseReadableSize.cpp
@@ -217,7 +217,10 @@ private:
         }
 
         Float64 num_bytes_with_decimals = base * iter->second;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wimplicit-const-int-float-conversion"
         if (num_bytes_with_decimals > std::numeric_limits<UInt64>::max())
+#pragma clang diagnostic pop
         {
             throw Exception(
                 ErrorCodes::BAD_ARGUMENTS,
diff --git a/src/Parsers/fuzzers/codegen_fuzzer/codegen_select_fuzzer.cpp b/src/Parsers/fuzzers/codegen_fuzzer/codegen_select_fuzzer.cpp
index 9310d7d59f7..09af67c337c 100644
--- a/src/Parsers/fuzzers/codegen_fuzzer/codegen_select_fuzzer.cpp
+++ b/src/Parsers/fuzzers/codegen_fuzzer/codegen_select_fuzzer.cpp
@@ -27,7 +27,8 @@ DEFINE_BINARY_PROTO_FUZZER(const Sentence& main)
         DB::ParserQueryWithOutput parser(input.data() + input.size());
         try
         {
-            DB::ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0);
+            DB::ASTPtr ast
+                = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0, DB::DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
 
             DB::WriteBufferFromOStream out(std::cerr, 4096);
             DB::formatAST(*ast, out);
diff --git a/src/Parsers/fuzzers/create_parser_fuzzer.cpp b/src/Parsers/fuzzers/create_parser_fuzzer.cpp
index 854885ad33b..bab8db5671d 100644
--- a/src/Parsers/fuzzers/create_parser_fuzzer.cpp
+++ b/src/Parsers/fuzzers/create_parser_fuzzer.cpp
@@ -14,7 +14,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size)
         std::string input = std::string(reinterpret_cast<const char*>(data), size);
 
         DB::ParserCreateQuery parser;
-        DB::ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 1000);
+        DB::ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 1000, DB::DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
 
         const UInt64 max_ast_depth = 1000;
         ast->checkDepth(max_ast_depth);
diff --git a/src/Storages/fuzzers/CMakeLists.txt b/src/Storages/fuzzers/CMakeLists.txt
index 719b9b77cd9..e36fccec8df 100644
--- a/src/Storages/fuzzers/CMakeLists.txt
+++ b/src/Storages/fuzzers/CMakeLists.txt
@@ -4,4 +4,4 @@ clickhouse_add_executable (mergetree_checksum_fuzzer mergetree_checksum_fuzzer.c
 target_link_libraries (mergetree_checksum_fuzzer PRIVATE dbms)
 
 clickhouse_add_executable (columns_description_fuzzer columns_description_fuzzer.cpp)
-target_link_libraries (columns_description_fuzzer PRIVATE dbms)
+target_link_libraries (columns_description_fuzzer PRIVATE dbms clickhouse_functions)
diff --git a/src/Storages/fuzzers/columns_description_fuzzer.cpp b/src/Storages/fuzzers/columns_description_fuzzer.cpp
index b703a1e7051..469bfe2fb38 100644
--- a/src/Storages/fuzzers/columns_description_fuzzer.cpp
+++ b/src/Storages/fuzzers/columns_description_fuzzer.cpp
@@ -1,5 +1,7 @@
 #include <Storages/ColumnsDescription.h>
 
+#include <iostream>
+
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size)
 {

From f5576867748c8941cfc13360cc28526f2703e575 Mon Sep 17 00:00:00 2001
From: Nikita Taranov <nikita.taranov@clickhouse.com>
Date: Sat, 27 Jul 2024 21:24:13 +0100
Subject: [PATCH 052/139] cherry on top of this cake

---
 cmake/sanitize.cmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmake/sanitize.cmake b/cmake/sanitize.cmake
index 3f111bc65c4..d8d211b9329 100644
--- a/cmake/sanitize.cmake
+++ b/cmake/sanitize.cmake
@@ -58,6 +58,7 @@ option(WITH_COVERAGE "Instrumentation for code coverage with default implementat
 if (WITH_COVERAGE)
     message (STATUS "Enabled instrumentation for code coverage")
     set(COVERAGE_FLAGS "SHELL:-fprofile-instr-generate -fcoverage-mapping")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fprofile-instr-generate -fcoverage-mapping")
 endif()
 
 option (SANITIZE_COVERAGE "Instrumentation for code coverage with custom callbacks" OFF)

From 99322feabe5b15ebfee7f3699ec4de984725ecda Mon Sep 17 00:00:00 2001
From: Vitaly Baranov <vitlibar@clickhouse.com>
Date: Fri, 26 Jul 2024 21:06:55 +0200
Subject: [PATCH 053/139] Add parameter 'backups.test_randomize_order' to
 backup configuration to make reproducing the issue easier.

---
 src/Backups/BackupsWorker.cpp                    | 16 ++++++++++++++--
 src/Backups/BackupsWorker.h                      |  1 +
 .../test_broken_projections/config.d/backups.xml |  1 +
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/Backups/BackupsWorker.cpp b/src/Backups/BackupsWorker.cpp
index 15a7d7c1eca..ab278429f5f 100644
--- a/src/Backups/BackupsWorker.cpp
+++ b/src/Backups/BackupsWorker.cpp
@@ -384,6 +384,7 @@ BackupsWorker::BackupsWorker(ContextMutablePtr global_context, size_t num_backup
     , allow_concurrent_backups(global_context->getConfigRef().getBool("backups.allow_concurrent_backups", true))
     , allow_concurrent_restores(global_context->getConfigRef().getBool("backups.allow_concurrent_restores", true))
     , remove_backup_files_after_failure(global_context->getConfigRef().getBool("backups.remove_backup_files_after_failure", true))
+    , test_randomize_order(global_context->getConfigRef().getBool("backups.test_randomize_order", false))
     , test_inject_sleep(global_context->getConfigRef().getBool("backups.test_inject_sleep", false))
     , log(getLogger("BackupsWorker"))
     , backup_log(global_context->getBackupLog())
@@ -713,14 +714,25 @@ void BackupsWorker::writeBackupEntries(
     bool always_single_threaded = !backup->supportsWritingInMultipleThreads();
     auto & thread_pool = getThreadPool(ThreadPoolId::BACKUP_COPY_FILES);
 
+    std::vector<size_t> writing_order;
+    if (test_randomize_order)
+    {
+        /// Randomize the order in which we write backup entries to the backup.
+        writing_order.resize(backup_entries.size());
+        std::iota(writing_order.begin(), writing_order.end(), 0);
+        std::shuffle(writing_order.begin(), writing_order.end(), thread_local_rng);
+    }
+
     ThreadPoolCallbackRunnerLocal<void> runner(thread_pool, "BackupWorker");
     for (size_t i = 0; i != backup_entries.size(); ++i)
     {
         if (failed)
             break;
 
-        auto & entry = backup_entries[i].second;
-        const auto & file_info = file_infos[i];
+        size_t index = !writing_order.empty() ? writing_order[i] : i;
+
+        auto & entry = backup_entries[index].second;
+        const auto & file_info = file_infos[index];
 
         auto job = [&]()
         {
diff --git a/src/Backups/BackupsWorker.h b/src/Backups/BackupsWorker.h
index e7ace91dace..946562b575f 100644
--- a/src/Backups/BackupsWorker.h
+++ b/src/Backups/BackupsWorker.h
@@ -119,6 +119,7 @@ private:
     const bool allow_concurrent_backups;
     const bool allow_concurrent_restores;
     const bool remove_backup_files_after_failure;
+    const bool test_randomize_order;
     const bool test_inject_sleep;
 
     LoggerPtr log;
diff --git a/tests/integration/test_broken_projections/config.d/backups.xml b/tests/integration/test_broken_projections/config.d/backups.xml
index 4da8edffd67..76068cb01c2 100644
--- a/tests/integration/test_broken_projections/config.d/backups.xml
+++ b/tests/integration/test_broken_projections/config.d/backups.xml
@@ -9,5 +9,6 @@
     </storage_configuration>
     <backups>
         <allowed_disk>backups</allowed_disk>
+        <test_randomize_order>true</test_randomize_order>
     </backups>
 </clickhouse>

From 56353f7d228fc2ac7942cbc974b1027c57071aff Mon Sep 17 00:00:00 2001
From: Vitaly Baranov <vitlibar@clickhouse.com>
Date: Sun, 28 Jul 2024 03:47:13 +0200
Subject: [PATCH 054/139] Remove test test_broken_projections_in_backups_1

---
 .../test_broken_projections/test.py           | 48 -------------------
 1 file changed, 48 deletions(-)

diff --git a/tests/integration/test_broken_projections/test.py b/tests/integration/test_broken_projections/test.py
index e198f98e4c5..2cbbee5563f 100644
--- a/tests/integration/test_broken_projections/test.py
+++ b/tests/integration/test_broken_projections/test.py
@@ -450,54 +450,6 @@ def get_random_string(string_length=8):
     return "".join((random.choice(alphabet) for _ in range(string_length)))
 
 
-def test_broken_projections_in_backups_1(cluster):
-    node = cluster.instances["node"]
-
-    table_name = "test4"
-    create_table(node, table_name, 1, aggressive_merge=False, data_prefix=table_name)
-
-    node.query("SYSTEM STOP MERGES")
-
-    insert(node, table_name, 0, 5)
-    insert(node, table_name, 5, 5)
-    insert(node, table_name, 10, 5)
-    insert(node, table_name, 15, 5)
-
-    assert ["all_0_0_0", "all_1_1_0", "all_2_2_0", "all_3_3_0"] == get_parts(
-        node, table_name
-    )
-
-    check(node, table_name, 1)
-
-    break_projection(node, table_name, "proj1", "all_2_2_0", "data")
-    check(node, table_name, 0, "proj1", "FILE_DOESNT_EXIST")
-
-    assert "all_2_2_0\tproj1\tNO_FILE_IN_DATA_PART" in get_broken_projections_info(
-        node, table_name
-    )
-
-    backup_name = f"b1-{get_random_string()}"
-    assert "BACKUP_CREATED" in node.query(
-        f"""
-    set backup_restore_keeper_fault_injection_probability=0.0;
-    backup table {table_name} to Disk('backups', '{backup_name}') settings check_projection_parts=false;
-    """
-    )
-
-    assert "RESTORED" in node.query(
-        f"""
-    drop table {table_name} sync;
-    set backup_restore_keeper_fault_injection_probability=0.0;
-    restore table {table_name} from Disk('backups', '{backup_name}');
-    """
-    )
-
-    node.query("SYSTEM STOP MERGES")
-
-    check(node, table_name, 1)
-    assert "" == get_broken_projections_info(node, table_name)
-
-
 def test_broken_projections_in_backups_2(cluster):
     node = cluster.instances["node"]
 

From 5b9427dc566b1e76a82be9f650b9dbc386567fc4 Mon Sep 17 00:00:00 2001
From: Pablo Marcos <pablo.marcos.oltra@clickhouse.com>
Date: Fri, 26 Jul 2024 13:19:57 +0000
Subject: [PATCH 055/139] Fix test flakiness

- Increase from 10s to 20s the max_age. Removes flakiness due to
  the files in minio still present in following execution, even
  if the cleanup stage of the test is clearly removing them.
- Use a busy-loop to check conditions directly, removing the
  unnecessary sleep.
---
 .../integration/test_storage_s3_queue/test.py | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/tests/integration/test_storage_s3_queue/test.py b/tests/integration/test_storage_s3_queue/test.py
index 2e339a9b5c9..963089c3777 100644
--- a/tests/integration/test_storage_s3_queue/test.py
+++ b/tests/integration/test_storage_s3_queue/test.py
@@ -827,7 +827,7 @@ def test_max_set_age(started_cluster):
     dst_table_name = f"{table_name}_dst"
     keeper_path = f"/clickhouse/test_{table_name}"
     files_path = f"{table_name}_data"
-    max_age = 10
+    max_age = 20
     files_to_generate = 10
 
     create_table(
@@ -858,12 +858,17 @@ def test_max_set_age(started_cluster):
     def get_count():
         return int(node.query(f"SELECT count() FROM {dst_table_name}"))
 
-    def wait_for_condition(check_function, max_wait_time=30):
+    import os
+
+    def wait_for_condition(check_function, max_wait_time=1.5 * max_age):
+        logging.debug(f"{os.getenv('PYTEST_XDIST_WORKER')} - PMO: Waiting for condition")
         before = time.time()
         while time.time() - before < max_wait_time:
             if check_function():
+                logging.debug(f"{os.getenv('PYTEST_XDIST_WORKER')} - PMO: Condition verified")
                 return
-            time.sleep(0.1)
+            time.sleep(0.25)
+        logging.debug(f"{os.getenv('PYTEST_XDIST_WORKER')} - PMO: Oh oh... Condition not verified")
         assert False
 
     wait_for_condition(lambda: get_count() == expected_rows)
@@ -871,8 +876,6 @@ def test_max_set_age(started_cluster):
         node.query(f"SELECT uniq(_path) from {dst_table_name}")
     )
 
-    time.sleep(max_age + max_age / 2)
-
     expected_rows *= 2
     wait_for_condition(lambda: get_count() == expected_rows)
     assert files_to_generate == int(
@@ -886,8 +889,12 @@ def test_max_set_age(started_cluster):
         ).splitlines()
     ]
     assert files_to_generate == len(paths_count)
-    for path_count in paths_count:
-        assert 2 == path_count
+    try:
+        for path_count in paths_count:
+            assert 2 == path_count
+    finally:
+        logging.debug(f"{os.getenv('PYTEST_XDIST_WORKER')} - PMO: Got path count {path_count} for paths_count {paths_count}")
+        logging.debug(f"{os.getenv('PYTEST_XDIST_WORKER')} - PMO: Got paths: {node.query('SELECT *, _path from ' + dst_table_name + ' FORMAT JSONEachRow')}")
 
     def get_object_storage_failures():
         return int(
@@ -897,6 +904,7 @@ def test_max_set_age(started_cluster):
         )
 
     failed_count = get_object_storage_failures()
+    logging.debug(f"{os.getenv('PYTEST_XDIST_WORKER')} - PMO: Got failed count {failed_count}")
 
     values = [
         ["failed", 1, 1],
@@ -906,7 +914,7 @@ def test_max_set_age(started_cluster):
     ).encode()
 
     # use a different filename for each test to allow running a bunch of them sequentially with --count
-    file_with_error = f"fff_{uuid4().hex}.csv"
+    file_with_error = f"max_set_age_fail_{uuid4().hex[:8]}.csv"
     put_s3_file_content(started_cluster, f"{files_path}/{file_with_error}", values_csv)
 
     wait_for_condition(lambda: failed_count + 1 <= get_object_storage_failures())
@@ -922,9 +930,7 @@ def test_max_set_age(started_cluster):
         )
     )
 
-    time.sleep(max_age + max_age / 2)
-
-    assert failed_count + 2 <= get_object_storage_failures()
+    wait_for_condition(lambda: failed_count + 2 <= get_object_storage_failures())
 
     node.query("SYSTEM FLUSH LOGS")
     assert "Cannot parse input" in node.query(

From e6c708124553b67eb4f18b6e39c96a24ad1c2dbb Mon Sep 17 00:00:00 2001
From: maxvostrikov <max.vostrikov@clickhouse.com>
Date: Mon, 29 Jul 2024 12:44:33 +0200
Subject: [PATCH 056/139] squash! added somme tests in relation with
 https://github.com/ClickHouse/ClickHouse/pull/54881 with new behaviour when
 enable_named_columns_in_function_tuple=1 (default value)

---
 .../0_stateless/00309_formats.reference       | Bin 20353 -> 18666 bytes
 tests/queries/0_stateless/00309_formats.sql   |   5 +++++
 2 files changed, 5 insertions(+)

diff --git a/tests/queries/0_stateless/00309_formats.reference b/tests/queries/0_stateless/00309_formats.reference
index cab311692be229716b58af39079275d3942b01cc..f3ea45520bb50fb936caf6724e9fedf3cdd00b75 100644
GIT binary patch
delta 3052
zcmeIy$4}c(00wZIgtksdZ-w^I3JD}eL2?j6{R4XG1$t-?y;Q0c4wb5?2YL>Bj|8*#
z-Xp>6y?59U_TGDMNaN%a?SDX3#j^bK`<|bk?ZfAlN^UDiN<bJ6jY24SuCXUb!%+R!
z(?lWq$P}8rBt@#-Sf0!i4|+jw=mUMBAM}R-Fc1d8U>E{JVHgaD5e8+19DxExLIy^`
zXcz-yVH}Ky2`~{R!DN^MQ}xOSA`L-0%z&9N3ueO{m<#h@J}iKRum~2z5?IQq+n-P(
zP{A_D!g5#vD`6F^hBdGj*1>w%02^VGPHumqnY-wY76U{pY=iBv19rkL*bRGNFYJT;
zPz?v*AoeGQ5Ddc+I10z$IGlhQI0>iVG@OC6a1PGH1;h6f#3F(vxC~d|DqMr>a070_
zEw~ML;4a*Q`|v>j|8;{y1V``~p1@Oh2G8LIyo6Wq8s5NLcn9yHg%&qjk~HD*O`kk{
zMhS#wBF4@26;n)ok$HM~`}q3#2LuKMhlGZON5~bCOjLACY+QUoVp4KSYFc_mW>$7i
zZeD&tVNr2OsZv$OmRD3(RoB$k)i*RYHMg|3wRd!Ob@%l4^{WR4hlWQ+$Hpf#lT*_(
zvvczci%ZKZt842Un_JsEyL<ZwheyXJr)TFEmsi&}w|Dmf?L&1j3gH`4#3+R{X>2uP
zs~KC(*lPbltFhlLRQ$(oSyIc$t;|{F>ph;XVgHfpC$+5H%8ajnp%+Y<&DY2OORU_k
z(V7&oZmv$Gj7LgIiK)l0pFiA9KYx&VyyL(B=HYJsi3@C{mioxSQew%acGgGsx>HI?
tDE$HfH|yd|adXt)D_oo(mI%Z&<wVo8BQ16miz!<%?O^j~Y-3_4_zmv{|2Y5v

literal 20353
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
Lvprlx%YOd>&)TR8

diff --git a/tests/queries/0_stateless/00309_formats.sql b/tests/queries/0_stateless/00309_formats.sql
index b0939c00a10..0366cdeea5c 100644
--- a/tests/queries/0_stateless/00309_formats.sql
+++ b/tests/queries/0_stateless/00309_formats.sql
@@ -9,3 +9,8 @@ SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, range(n) AS arr, a
 SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, range(n) AS arr, arrayStringConcat(arrayMap(x -> reinterpretAsString(x), arr)) AS s, (n, d) AS tuple FROM system.numbers LIMIT 2 FORMAT JSON;
 SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, range(n) AS arr, arrayStringConcat(arrayMap(x -> reinterpretAsString(x), arr)) AS s, (n, d) AS tuple FROM system.numbers LIMIT 2 FORMAT JSONCompact;
 SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, range(n) AS arr, arrayStringConcat(arrayMap(x -> reinterpretAsString(x), arr)) AS s, (n, d) AS tuple FROM system.numbers LIMIT 2 FORMAT XML;
+
+SET enable_named_columns_in_function_tuple = 1;
+
+SELECT 36 AS n, toDate('2000-01-01') + n AS d, (n, d) AS tuple FROM system.numbers LIMIT 1 FORMAT RowBinaryWithNamesAndTypes;
+SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, (n, d) AS tuple FROM system.numbers LIMIT 1 FORMAT TabSeparatedWithNamesAndTypes;

From 4cf7e6a79d2748bd4f055f14d0504959f567574e Mon Sep 17 00:00:00 2001
From: Pablo Marcos <pablo.marcos.oltra@clickhouse.com>
Date: Mon, 29 Jul 2024 11:15:03 +0000
Subject: [PATCH 057/139] Remove logging traces to help debugging

---
 tests/integration/test_storage_s3_queue/test.py | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/tests/integration/test_storage_s3_queue/test.py b/tests/integration/test_storage_s3_queue/test.py
index 963089c3777..e3445d14cdb 100644
--- a/tests/integration/test_storage_s3_queue/test.py
+++ b/tests/integration/test_storage_s3_queue/test.py
@@ -858,17 +858,12 @@ def test_max_set_age(started_cluster):
     def get_count():
         return int(node.query(f"SELECT count() FROM {dst_table_name}"))
 
-    import os
-
     def wait_for_condition(check_function, max_wait_time=1.5 * max_age):
-        logging.debug(f"{os.getenv('PYTEST_XDIST_WORKER')} - PMO: Waiting for condition")
         before = time.time()
         while time.time() - before < max_wait_time:
             if check_function():
-                logging.debug(f"{os.getenv('PYTEST_XDIST_WORKER')} - PMO: Condition verified")
                 return
             time.sleep(0.25)
-        logging.debug(f"{os.getenv('PYTEST_XDIST_WORKER')} - PMO: Oh oh... Condition not verified")
         assert False
 
     wait_for_condition(lambda: get_count() == expected_rows)
@@ -889,12 +884,8 @@ def test_max_set_age(started_cluster):
         ).splitlines()
     ]
     assert files_to_generate == len(paths_count)
-    try:
-        for path_count in paths_count:
-            assert 2 == path_count
-    finally:
-        logging.debug(f"{os.getenv('PYTEST_XDIST_WORKER')} - PMO: Got path count {path_count} for paths_count {paths_count}")
-        logging.debug(f"{os.getenv('PYTEST_XDIST_WORKER')} - PMO: Got paths: {node.query('SELECT *, _path from ' + dst_table_name + ' FORMAT JSONEachRow')}")
+    for path_count in paths_count:
+        assert 2 == path_count
 
     def get_object_storage_failures():
         return int(
@@ -904,7 +895,6 @@ def test_max_set_age(started_cluster):
         )
 
     failed_count = get_object_storage_failures()
-    logging.debug(f"{os.getenv('PYTEST_XDIST_WORKER')} - PMO: Got failed count {failed_count}")
 
     values = [
         ["failed", 1, 1],

From aa50bb098767865995d8c7d204e9823213e37764 Mon Sep 17 00:00:00 2001
From: Antonio Andelic <antonio@clickhouse.com>
Date: Mon, 29 Jul 2024 13:47:06 +0200
Subject: [PATCH 058/139] Fix attach thread after exception

---
 .../MergeTree/ReplicatedMergeTreeRestartingThread.cpp  |  2 +-
 .../configs/fault_injection.xml                        |  7 +++++++
 tests/integration/test_replicated_table_attach/test.py | 10 +++++++++-
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 tests/integration/test_replicated_table_attach/configs/fault_injection.xml

diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
index 268cead2a0e..05fd6f6915b 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
@@ -344,7 +344,7 @@ void ReplicatedMergeTreeRestartingThread::partialShutdown(bool part_of_full_shut
 void ReplicatedMergeTreeRestartingThread::shutdown(bool part_of_full_shutdown)
 {
     /// Stop restarting_thread before stopping other tasks - so that it won't restart them again.
-    need_stop = true;
+    need_stop = part_of_full_shutdown;
     task->deactivate();
 
     /// Explicitly set the event, because the restarting thread will not set it again
diff --git a/tests/integration/test_replicated_table_attach/configs/fault_injection.xml b/tests/integration/test_replicated_table_attach/configs/fault_injection.xml
new file mode 100644
index 00000000000..7ee4ab92f37
--- /dev/null
+++ b/tests/integration/test_replicated_table_attach/configs/fault_injection.xml
@@ -0,0 +1,7 @@
+<clickhouse>
+    <zookeeper>
+        <enable_fault_injections_during_startup>1</enable_fault_injections_during_startup>
+        <send_fault_probability>0.001</send_fault_probability>
+        <recv_fault_probability>0.001</recv_fault_probability>
+    </zookeeper>
+</clickhouse>
diff --git a/tests/integration/test_replicated_table_attach/test.py b/tests/integration/test_replicated_table_attach/test.py
index dee2be3fcf7..02ef1ad6353 100644
--- a/tests/integration/test_replicated_table_attach/test.py
+++ b/tests/integration/test_replicated_table_attach/test.py
@@ -3,8 +3,11 @@ import pytest
 from helpers.cluster import ClickHouseCluster
 from helpers.network import PartitionManager
 
+import os
+
 
 cluster = ClickHouseCluster(__file__)
+CONFIG_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "configs")
 
 node = cluster.add_instance(
     "node",
@@ -54,7 +57,12 @@ def test_startup_with_small_bg_pool_partitioned(started_cluster):
     assert_values()
     with PartitionManager() as pm:
         pm.drop_instance_zk_connections(node)
-        node.restart_clickhouse(stop_start_wait_sec=300)
+        node.stop_clickhouse(stop_wait_sec=150)
+        node.copy_file_to_container(
+            os.path.join(CONFIG_DIR, "fault_injection.xml"),
+            "/etc/clickhouse-server/config.d/fault_injection.xml",
+        )
+        node.start_clickhouse(start_wait_sec=150)
         assert_values()
 
     # check that we activate it in the end

From 327fb40178fcff7051e17ca47d8446e5671b5383 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nk@clickhouse.com>
Date: Mon, 29 Jul 2024 13:21:22 +0000
Subject: [PATCH 059/139] Add a test.

---
 ...e_function_with_if_implicit_cast.reference | 32 ++++++++--------
 ...function_with_if_return_type_bug.reference |  9 +++++
 ...egate_function_with_if_return_type_bug.sql | 37 +++++++++++++++++++
 3 files changed, 62 insertions(+), 16 deletions(-)
 create mode 100644 tests/queries/0_stateless/03210_optimize_rewrite_aggregate_function_with_if_return_type_bug.reference
 create mode 100644 tests/queries/0_stateless/03210_optimize_rewrite_aggregate_function_with_if_return_type_bug.sql

diff --git a/tests/queries/0_stateless/03132_rewrite_aggregate_function_with_if_implicit_cast.reference b/tests/queries/0_stateless/03132_rewrite_aggregate_function_with_if_implicit_cast.reference
index 070a6c9e21c..8289ab68ae4 100644
--- a/tests/queries/0_stateless/03132_rewrite_aggregate_function_with_if_implicit_cast.reference
+++ b/tests/queries/0_stateless/03132_rewrite_aggregate_function_with_if_implicit_cast.reference
@@ -30,14 +30,14 @@ QUERY id: 0
       FUNCTION id: 15, function_name: toTypeName, function_type: ordinary, result_type: String
         ARGUMENTS
           LIST id: 16, nodes: 1
-            FUNCTION id: 2, function_name: anyIf, function_type: aggregate, result_type: Nullable(Int128)
+            FUNCTION id: 17, function_name: anyIf, function_type: aggregate, result_type: Nullable(Int128)
               ARGUMENTS
-                LIST id: 3, nodes: 2
-                  FUNCTION id: 4, function_name: _CAST, function_type: ordinary, result_type: Nullable(Int128)
+                LIST id: 18, nodes: 2
+                  FUNCTION id: 19, function_name: _CAST, function_type: ordinary, result_type: Nullable(Int128)
                     ARGUMENTS
-                      LIST id: 5, nodes: 2
+                      LIST id: 20, nodes: 2
                         COLUMN id: 6, column_name: number, result_type: UInt64, source_id: 7
-                        CONSTANT id: 8, constant_value: \'Nullable(Int128)\', constant_value_type: String
+                        CONSTANT id: 21, constant_value: \'Nullable(Int128)\', constant_value_type: String
                   FUNCTION id: 9, function_name: equals, function_type: ordinary, result_type: UInt8
                     ARGUMENTS
                       LIST id: 10, nodes: 2
@@ -50,8 +50,8 @@ QUERY id: 0
   JOIN TREE
     TABLE_FUNCTION id: 7, alias: __table1, table_function_name: numbers
       ARGUMENTS
-        LIST id: 17, nodes: 1
-          CONSTANT id: 18, constant_value: UInt64_100, constant_value_type: UInt8
+        LIST id: 22, nodes: 1
+          CONSTANT id: 23, constant_value: UInt64_100, constant_value_type: UInt8
 SELECT any(if((number % 10) = 5, CAST(NULL, 'Nullable(Int128)'), number)) AS a, toTypeName(a) FROM numbers(100) AS a;
 0	Nullable(Int128)
 EXPLAIN QUERY TREE SELECT any(if((number % 10) = 5, CAST(NULL, 'Nullable(Int128)'), number)) AS a, toTypeName(a) FROM numbers(100);
@@ -84,17 +84,17 @@ QUERY id: 0
       FUNCTION id: 17, function_name: toTypeName, function_type: ordinary, result_type: String
         ARGUMENTS
           LIST id: 18, nodes: 1
-            FUNCTION id: 2, function_name: anyIf, function_type: aggregate, result_type: Nullable(Int128)
+            FUNCTION id: 19, function_name: anyIf, function_type: aggregate, result_type: Nullable(Int128)
               ARGUMENTS
-                LIST id: 3, nodes: 2
-                  FUNCTION id: 4, function_name: _CAST, function_type: ordinary, result_type: Nullable(Int128)
+                LIST id: 20, nodes: 2
+                  FUNCTION id: 21, function_name: _CAST, function_type: ordinary, result_type: Nullable(Int128)
                     ARGUMENTS
-                      LIST id: 5, nodes: 2
+                      LIST id: 22, nodes: 2
                         COLUMN id: 6, column_name: number, result_type: UInt64, source_id: 7
-                        CONSTANT id: 8, constant_value: \'Nullable(Int128)\', constant_value_type: String
-                  FUNCTION id: 9, function_name: not, function_type: ordinary, result_type: UInt8
+                        CONSTANT id: 23, constant_value: \'Nullable(Int128)\', constant_value_type: String
+                  FUNCTION id: 24, function_name: not, function_type: ordinary, result_type: UInt8
                     ARGUMENTS
-                      LIST id: 10, nodes: 1
+                      LIST id: 25, nodes: 1
                         FUNCTION id: 11, function_name: equals, function_type: ordinary, result_type: UInt8
                           ARGUMENTS
                             LIST id: 12, nodes: 2
@@ -107,5 +107,5 @@ QUERY id: 0
   JOIN TREE
     TABLE_FUNCTION id: 7, alias: __table1, table_function_name: numbers
       ARGUMENTS
-        LIST id: 19, nodes: 1
-          CONSTANT id: 20, constant_value: UInt64_100, constant_value_type: UInt8
+        LIST id: 26, nodes: 1
+          CONSTANT id: 27, constant_value: UInt64_100, constant_value_type: UInt8
diff --git a/tests/queries/0_stateless/03210_optimize_rewrite_aggregate_function_with_if_return_type_bug.reference b/tests/queries/0_stateless/03210_optimize_rewrite_aggregate_function_with_if_return_type_bug.reference
new file mode 100644
index 00000000000..0693acb9168
--- /dev/null
+++ b/tests/queries/0_stateless/03210_optimize_rewrite_aggregate_function_with_if_return_type_bug.reference
@@ -0,0 +1,9 @@
+03
+AggregateFunction(count, Nullable(UInt64))
+function_name: _CAST, function_type: ordinary, result_type: AggregateFunction(count, Nullable(UInt64))
+function_name: countStateIf, function_type: aggregate, result_type: AggregateFunction(count, UInt64)
+constant_value: \'AggregateFunction(count, Nullable(UInt64))\', constant_value_type: String
+AggregateFunction(uniq, Nullable(UInt64))
+010003000000007518F0A8E7830665
+function_name: uniqState, function_type: aggregate, result_type: AggregateFunction(uniq, Nullable(UInt64))
+----
diff --git a/tests/queries/0_stateless/03210_optimize_rewrite_aggregate_function_with_if_return_type_bug.sql b/tests/queries/0_stateless/03210_optimize_rewrite_aggregate_function_with_if_return_type_bug.sql
new file mode 100644
index 00000000000..b620a6434bf
--- /dev/null
+++ b/tests/queries/0_stateless/03210_optimize_rewrite_aggregate_function_with_if_return_type_bug.sql
@@ -0,0 +1,37 @@
+-- For function count, rewrite countState to countStateIf changes the type from AggregateFunction(count, Nullable(UInt64)) to AggregateFunction(count, UInt64)
+-- We can cast AggregateFunction(count, UInt64) back to AggregateFunction(count, Nullable(UInt64)) with additional _CAST
+select hex(countState(if(toNullable(number % 2 = 0), number, null))) from numbers(5) settings optimize_rewrite_aggregate_function_with_if=1;
+select toTypeName(countState(if(toNullable(number % 2 = 0), number, null))) from numbers(5) settings optimize_rewrite_aggregate_function_with_if=1;
+select arrayStringConcat(arraySlice(splitByString(', ', trimLeft(explain)), 2), ', ') from (explain query tree select hex(countState(if(toNullable(number % 2 = 0), number, null))) from numbers(5) settings optimize_rewrite_aggregate_function_with_if=1) where explain like '%AggregateFunction%';
+
+-- For function uniq, rewrite uniqState to uniqStateIf changes the type from AggregateFunction(uniq, Nullable(UInt64)) to AggregateFunction(uniq, UInt64)
+-- We can't cast AggregateFunction(uniq, UInt64) back to AggregateFunction(uniq, Nullable(UInt64)) so rewrite is not happening.
+select toTypeName(uniqState(if(toNullable(number % 2 = 0), number, null))) from numbers(5) settings optimize_rewrite_aggregate_function_with_if=1;
+select hex(uniqState(if(toNullable(number % 2 = 0), number, null))) from numbers(5) settings optimize_rewrite_aggregate_function_with_if=1;
+select arrayStringConcat(arraySlice(splitByString(', ', trimLeft(explain)), 2), ', ') from (explain query tree select hex(uniqState(if(toNullable(number % 2 = 0), number, null))) from numbers(5) settings optimize_rewrite_aggregate_function_with_if=1) where explain like '%AggregateFunction%';
+
+select '----';
+
+CREATE TABLE a
+(
+    `a_id` String
+)
+ENGINE = MergeTree
+PARTITION BY tuple()
+ORDER BY tuple();
+
+
+CREATE TABLE b
+(
+    `b_id` AggregateFunction(uniq, Nullable(String))
+)
+ENGINE = AggregatingMergeTree
+PARTITION BY tuple()
+ORDER BY tuple();
+
+CREATE MATERIALIZED VIEW mv TO b
+(
+    `b_id` AggregateFunction(uniq, Nullable(String))
+)
+AS SELECT uniqState(if(a_id != '', a_id, NULL)) AS b_id
+FROM a;

From c48770fdf6f769c5f4678db32ca27245b9fa3158 Mon Sep 17 00:00:00 2001
From: maxvostrikov <max.vostrikov@clickhouse.com>
Date: Mon, 29 Jul 2024 16:46:38 +0200
Subject: [PATCH 060/139] squash! added somme tests in relation with
 https://github.com/ClickHouse/ClickHouse/pull/54881 with new behaviour when
 enable_named_columns_in_function_tuple=1 (default value)

---
 .../0_stateless/00309_formats.reference       | Bin 18666 -> 20353 bytes
 tests/queries/0_stateless/00309_formats.sql   |   5 -----
 2 files changed, 5 deletions(-)

diff --git a/tests/queries/0_stateless/00309_formats.reference b/tests/queries/0_stateless/00309_formats.reference
index f3ea45520bb50fb936caf6724e9fedf3cdd00b75..cab311692be229716b58af39079275d3942b01cc 100644
GIT binary patch
literal 20353
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
Lvprlx%YOd>&)TR8

delta 3052
zcmeIy$4}c(00wZIgtksdZ-w^I3JD}eL2?j6{R4XG1$t-?y;Q0c4wb5?2YL>Bj|8*#
z-Xp>6y?59U_TGDMNaN%a?SDX3#j^bK`<|bk?ZfAlN^UDiN<bJ6jY24SuCXUb!%+R!
z(?lWq$P}8rBt@#-Sf0!i4|+jw=mUMBAM}R-Fc1d8U>E{JVHgaD5e8+19DxExLIy^`
zXcz-yVH}Ky2`~{R!DN^MQ}xOSA`L-0%z&9N3ueO{m<#h@J}iKRum~2z5?IQq+n-P(
zP{A_D!g5#vD`6F^hBdGj*1>w%02^VGPHumqnY-wY76U{pY=iBv19rkL*bRGNFYJT;
zPz?v*AoeGQ5Ddc+I10z$IGlhQI0>iVG@OC6a1PGH1;h6f#3F(vxC~d|DqMr>a070_
zEw~ML;4a*Q`|v>j|8;{y1V``~p1@Oh2G8LIyo6Wq8s5NLcn9yHg%&qjk~HD*O`kk{
zMhS#wBF4@26;n)ok$HM~`}q3#2LuKMhlGZON5~bCOjLACY+QUoVp4KSYFc_mW>$7i
zZeD&tVNr2OsZv$OmRD3(RoB$k)i*RYHMg|3wRd!Ob@%l4^{WR4hlWQ+$Hpf#lT*_(
zvvczci%ZKZt842Un_JsEyL<ZwheyXJr)TFEmsi&}w|Dmf?L&1j3gH`4#3+R{X>2uP
zs~KC(*lPbltFhlLRQ$(oSyIc$t;|{F>ph;XVgHfpC$+5H%8ajnp%+Y<&DY2OORU_k
z(V7&oZmv$Gj7LgIiK)l0pFiA9KYx&VyyL(B=HYJsi3@C{mioxSQew%acGgGsx>HI?
tDE$HfH|yd|adXt)D_oo(mI%Z&<wVo8BQ16miz!<%?O^j~Y-3_4_zmv{|2Y5v

diff --git a/tests/queries/0_stateless/00309_formats.sql b/tests/queries/0_stateless/00309_formats.sql
index 0366cdeea5c..b0939c00a10 100644
--- a/tests/queries/0_stateless/00309_formats.sql
+++ b/tests/queries/0_stateless/00309_formats.sql
@@ -9,8 +9,3 @@ SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, range(n) AS arr, a
 SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, range(n) AS arr, arrayStringConcat(arrayMap(x -> reinterpretAsString(x), arr)) AS s, (n, d) AS tuple FROM system.numbers LIMIT 2 FORMAT JSON;
 SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, range(n) AS arr, arrayStringConcat(arrayMap(x -> reinterpretAsString(x), arr)) AS s, (n, d) AS tuple FROM system.numbers LIMIT 2 FORMAT JSONCompact;
 SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, range(n) AS arr, arrayStringConcat(arrayMap(x -> reinterpretAsString(x), arr)) AS s, (n, d) AS tuple FROM system.numbers LIMIT 2 FORMAT XML;
-
-SET enable_named_columns_in_function_tuple = 1;
-
-SELECT 36 AS n, toDate('2000-01-01') + n AS d, (n, d) AS tuple FROM system.numbers LIMIT 1 FORMAT RowBinaryWithNamesAndTypes;
-SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, (n, d) AS tuple FROM system.numbers LIMIT 1 FORMAT TabSeparatedWithNamesAndTypes;

From 59c517dd91e996ffadd6d4fe51f8f0cf247467c0 Mon Sep 17 00:00:00 2001
From: Nikita Taranov <nikita.taranov@clickhouse.com>
Date: Mon, 29 Jul 2024 16:08:38 +0100
Subject: [PATCH 061/139] fix format_fuzzer

---
 src/Formats/fuzzers/format_fuzzer.cpp | 47 ++++++++++++---------------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/src/Formats/fuzzers/format_fuzzer.cpp b/src/Formats/fuzzers/format_fuzzer.cpp
index 46661e4828c..408e7218221 100644
--- a/src/Formats/fuzzers/format_fuzzer.cpp
+++ b/src/Formats/fuzzers/format_fuzzer.cpp
@@ -20,37 +20,32 @@
 
 #include <AggregateFunctions/registerAggregateFunctions.h>
 
+using namespace DB;
+
+
+ContextMutablePtr context;
+
+extern "C" int LLVMFuzzerInitialize(int *, char ***)
+{
+    if (context)
+        return true;
+
+    SharedContextHolder shared_context = Context::createShared();
+    context = Context::createGlobal(shared_context.get());
+    context->makeGlobalContext();
+
+    MainThreadStatus::getInstance();
+
+    registerAggregateFunctions();
+    registerFormats();
+
+    return 0;
+}
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size)
 {
     try
     {
-        using namespace DB;
-
-        static SharedContextHolder shared_context;
-        static ContextMutablePtr context;
-
-        auto initialize = [&]() mutable
-        {
-            if (context)
-                return true;
-
-            shared_context = Context::createShared();
-            context = Context::createGlobal(shared_context.get());
-            context->makeGlobalContext();
-            context->setApplicationType(Context::ApplicationType::LOCAL);
-
-            MainThreadStatus::getInstance();
-
-            registerAggregateFunctions();
-            registerFormats();
-
-            return true;
-        };
-
-        static bool initialized = initialize();
-        (void) initialized;
-
         total_memory_tracker.resetCounters();
         total_memory_tracker.setHardLimit(1_GiB);
         CurrentThread::get().memory_tracker.resetCounters();

From e1677bc1b60be3de954c6305b665732e1d4fe062 Mon Sep 17 00:00:00 2001
From: Nikita Taranov <nikita.taranov@clickhouse.com>
Date: Mon, 29 Jul 2024 17:13:05 +0100
Subject: [PATCH 062/139] fix rest

---
 ..._function_state_deserialization_fuzzer.cpp | 45 ++++++++--------
 .../data_type_deserialization_fuzzer.cpp      | 43 +++++++--------
 .../fuzzers/execute_query_fuzzer.cpp          | 54 +++++++++----------
 3 files changed, 65 insertions(+), 77 deletions(-)

diff --git a/src/AggregateFunctions/fuzzers/aggregate_function_state_deserialization_fuzzer.cpp b/src/AggregateFunctions/fuzzers/aggregate_function_state_deserialization_fuzzer.cpp
index 31fc93e4288..87979259c9e 100644
--- a/src/AggregateFunctions/fuzzers/aggregate_function_state_deserialization_fuzzer.cpp
+++ b/src/AggregateFunctions/fuzzers/aggregate_function_state_deserialization_fuzzer.cpp
@@ -17,34 +17,31 @@
 
 #include <base/scope_guard.h>
 
+using namespace DB;
+
+
+ContextMutablePtr context;
+
+extern "C" int LLVMFuzzerInitialize(int *, char ***)
+{
+    if (context)
+        return true;
+
+    SharedContextHolder shared_context = Context::createShared();
+    context = Context::createGlobal(shared_context.get());
+    context->makeGlobalContext();
+
+    MainThreadStatus::getInstance();
+
+    registerAggregateFunctions();
+
+    return 0;
+}
+
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size)
 {
     try
     {
-        using namespace DB;
-
-        static SharedContextHolder shared_context;
-        static ContextMutablePtr context;
-
-        auto initialize = [&]() mutable
-        {
-            if (context)
-                return true;
-
-            shared_context = Context::createShared();
-            context = Context::createGlobal(shared_context.get());
-            context->makeGlobalContext();
-            context->setApplicationType(Context::ApplicationType::LOCAL);
-
-            MainThreadStatus::getInstance();
-
-            registerAggregateFunctions();
-            return true;
-        };
-
-        static bool initialized = initialize();
-        (void) initialized;
-
         total_memory_tracker.resetCounters();
         total_memory_tracker.setHardLimit(1_GiB);
         CurrentThread::get().memory_tracker.resetCounters();
diff --git a/src/DataTypes/fuzzers/data_type_deserialization_fuzzer.cpp b/src/DataTypes/fuzzers/data_type_deserialization_fuzzer.cpp
index 033a6ea8a4a..f9a733647e1 100644
--- a/src/DataTypes/fuzzers/data_type_deserialization_fuzzer.cpp
+++ b/src/DataTypes/fuzzers/data_type_deserialization_fuzzer.cpp
@@ -12,35 +12,30 @@
 
 #include <AggregateFunctions/registerAggregateFunctions.h>
 
+using namespace DB;
+
+
+ContextMutablePtr context;
+
+extern "C" int LLVMFuzzerInitialize(int *, char ***)
+{
+    if (context)
+        return true;
+
+    SharedContextHolder shared_context = Context::createShared();
+    context = Context::createGlobal(shared_context.get());
+    context->makeGlobalContext();
+
+    MainThreadStatus::getInstance();
+
+    registerAggregateFunctions();
+    return 0;
+}
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size)
 {
     try
     {
-        using namespace DB;
-
-        static SharedContextHolder shared_context;
-        static ContextMutablePtr context;
-
-        auto initialize = [&]() mutable
-        {
-            if (context)
-                return true;
-
-            shared_context = Context::createShared();
-            context = Context::createGlobal(shared_context.get());
-            context->makeGlobalContext();
-            context->setApplicationType(Context::ApplicationType::LOCAL);
-
-            MainThreadStatus::getInstance();
-
-            registerAggregateFunctions();
-            return true;
-        };
-
-        static bool initialized = initialize();
-        (void) initialized;
-
         total_memory_tracker.resetCounters();
         total_memory_tracker.setHardLimit(1_GiB);
         CurrentThread::get().memory_tracker.resetCounters();
diff --git a/src/Interpreters/fuzzers/execute_query_fuzzer.cpp b/src/Interpreters/fuzzers/execute_query_fuzzer.cpp
index a02ce66e6b5..c29efae1e7d 100644
--- a/src/Interpreters/fuzzers/execute_query_fuzzer.cpp
+++ b/src/Interpreters/fuzzers/execute_query_fuzzer.cpp
@@ -14,41 +14,37 @@
 
 using namespace DB;
 
+
+ContextMutablePtr context;
+
+extern "C" int LLVMFuzzerInitialize(int *, char ***)
+{
+    if (context)
+        return true;
+
+    SharedContextHolder shared_context = Context::createShared();
+    context = Context::createGlobal(shared_context.get());
+    context->makeGlobalContext();
+
+    registerInterpreters();
+    registerFunctions();
+    registerAggregateFunctions();
+    registerTableFunctions();
+    registerDatabases();
+    registerStorages();
+    registerDictionaries();
+    registerDisks(/* global_skip_access_check= */ true);
+    registerFormats();
+
+    return 0;
+}
+
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size)
 {
     try
     {
         std::string input = std::string(reinterpret_cast<const char*>(data), size);
 
-        static SharedContextHolder shared_context;
-        static ContextMutablePtr context;
-
-        auto initialize = [&]() mutable
-        {
-            if (context)
-                return true;
-
-            shared_context = Context::createShared();
-            context = Context::createGlobal(shared_context.get());
-            context->makeGlobalContext();
-            context->setApplicationType(Context::ApplicationType::LOCAL);
-
-            registerInterpreters();
-            registerFunctions();
-            registerAggregateFunctions();
-            registerTableFunctions();
-            registerDatabases();
-            registerStorages();
-            registerDictionaries();
-            registerDisks(/* global_skip_access_check= */ true);
-            registerFormats();
-
-            return true;
-        };
-
-        static bool initialized = initialize();
-        (void) initialized;
-
         auto io = DB::executeQuery(input, context, QueryFlags{ .internal = true }, QueryProcessingStage::Complete).second;
 
         PullingPipelineExecutor executor(io.pipeline);

From eaede913b2ae0d5a4cb02ae82db20b6011270fe6 Mon Sep 17 00:00:00 2001
From: Pablo Marcos <pablo.marcos.oltra@clickhouse.com>
Date: Mon, 29 Jul 2024 16:26:10 +0000
Subject: [PATCH 063/139] Ensure there's no logical error using
 PoolWithFailoverBase::getMany

Prevents a segfault in case the connection is null, but also checks
all other conditions to ensure the logic is the expected one.
---
 src/Client/ConnectionPoolWithFailover.h       |  1 +
 src/Common/PoolWithFailoverBase.h             | 11 +++++++++-
 .../DistributedAsyncInsertBatch.cpp           | 22 ++++++++++---------
 .../DistributedAsyncInsertDirectoryQueue.cpp  |  9 ++++----
 src/Storages/Distributed/DistributedSink.cpp  |  8 ++++---
 5 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/src/Client/ConnectionPoolWithFailover.h b/src/Client/ConnectionPoolWithFailover.h
index 7b9f480aa4e..a2dc188eb7d 100644
--- a/src/Client/ConnectionPoolWithFailover.h
+++ b/src/Client/ConnectionPoolWithFailover.h
@@ -42,6 +42,7 @@ public:
             size_t max_error_cap = DBMS_CONNECTION_POOL_WITH_FAILOVER_MAX_ERROR_COUNT);
 
     using Entry = IConnectionPool::Entry;
+    using PoolWithFailoverBase<IConnectionPool>::isTryResultInvalid;
 
     /** Allocates connection to work. */
     Entry get(const ConnectionTimeouts & timeouts) override;
diff --git a/src/Common/PoolWithFailoverBase.h b/src/Common/PoolWithFailoverBase.h
index 3d4de773a36..c44ab7df53a 100644
--- a/src/Common/PoolWithFailoverBase.h
+++ b/src/Common/PoolWithFailoverBase.h
@@ -116,6 +116,12 @@ public:
             const TryGetEntryFunc & try_get_entry,
             const GetPriorityFunc & get_priority);
 
+    // Returns if the TryResult provided is an invalid one that cannot be used. Used to prevent logical errors.
+    bool isTryResultInvalid(const TryResult & result, bool skip_read_only_replicas) const
+    {
+        return result.entry.isNull() || !result.is_usable || (skip_read_only_replicas && result.is_readonly);
+    }
+
     size_t getPoolSize() const { return nested_pools.size(); }
 
 protected:
@@ -300,7 +306,7 @@ PoolWithFailoverBase<TNestedPool>::getMany(
         throw DB::NetException(DB::ErrorCodes::ALL_CONNECTION_TRIES_FAILED,
                 "All connection tries failed. Log: \n\n{}\n", fail_messages);
 
-    std::erase_if(try_results, [&](const TryResult & r) { return r.entry.isNull() || !r.is_usable || (skip_read_only_replicas && r.is_readonly); });
+    std::erase_if(try_results, [&](const TryResult & r) { return isTryResultInvalid(r, skip_read_only_replicas); });
 
     /// Sort so that preferred items are near the beginning.
     std::stable_sort(
@@ -321,6 +327,9 @@ PoolWithFailoverBase<TNestedPool>::getMany(
     }
     else if (up_to_date_count >= min_entries)
     {
+        if (try_results.size() < up_to_date_count)
+            throw DB::Exception(DB::ErrorCodes::LOGICAL_ERROR, "Could not find enough connections for up-to-date results. Got: {}, needed: {}", try_results.size(), up_to_date_count);
+
         /// There is enough up-to-date entries.
         try_results.resize(up_to_date_count);
     }
diff --git a/src/Storages/Distributed/DistributedAsyncInsertBatch.cpp b/src/Storages/Distributed/DistributedAsyncInsertBatch.cpp
index 5e7b4b979c7..2cf69b9f6b7 100644
--- a/src/Storages/Distributed/DistributedAsyncInsertBatch.cpp
+++ b/src/Storages/Distributed/DistributedAsyncInsertBatch.cpp
@@ -242,12 +242,13 @@ void DistributedAsyncInsertBatch::sendBatch(const SettingsChanges & settings_cha
                 insert_settings.applyChanges(settings_changes);
 
                 auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(insert_settings);
-                auto result = parent.pool->getManyCheckedForInsert(timeouts, insert_settings, PoolMode::GET_ONE, parent.storage.remote_storage.getQualifiedName());
-                connection = std::move(result.front().entry);
-                compression_expected = connection->getCompression() == Protocol::Compression::Enable;
+                auto results = parent.pool->getManyCheckedForInsert(timeouts, insert_settings, PoolMode::GET_ONE, parent.storage.remote_storage.getQualifiedName());
+                auto result = results.front();
+                if (parent.pool->isTryResultInvalid(result, insert_settings.distributed_insert_skip_read_only_replicas))
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Got an invalid connection result");
 
-                if (connection.isNull())
-                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Got empty connection");
+                connection = std::move(result.entry);
+                compression_expected = connection->getCompression() == Protocol::Compression::Enable;
 
                 LOG_DEBUG(parent.log, "Sending a batch of {} files to {} ({} rows, {} bytes).",
                     files.size(),
@@ -303,12 +304,13 @@ void DistributedAsyncInsertBatch::sendSeparateFiles(const SettingsChanges & sett
                 parent.storage.getContext()->getOpenTelemetrySpanLog());
 
             auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(insert_settings);
-            auto result = parent.pool->getManyCheckedForInsert(timeouts, insert_settings, PoolMode::GET_ONE, parent.storage.remote_storage.getQualifiedName());
-            auto connection = std::move(result.front().entry);
-            bool compression_expected = connection->getCompression() == Protocol::Compression::Enable;
+            auto results = parent.pool->getManyCheckedForInsert(timeouts, insert_settings, PoolMode::GET_ONE, parent.storage.remote_storage.getQualifiedName());
+            auto result = results.front();
+            if (parent.pool->isTryResultInvalid(result, insert_settings.distributed_insert_skip_read_only_replicas))
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Got an invalid connection result");
 
-            if (connection.isNull())
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Got empty connection");
+            auto connection = std::move(result.entry);
+            bool compression_expected = connection->getCompression() == Protocol::Compression::Enable;
 
             RemoteInserter remote(*connection, timeouts,
                 distributed_header.insert_query,
diff --git a/src/Storages/Distributed/DistributedAsyncInsertDirectoryQueue.cpp b/src/Storages/Distributed/DistributedAsyncInsertDirectoryQueue.cpp
index 2bb0e720c72..876eff0021f 100644
--- a/src/Storages/Distributed/DistributedAsyncInsertDirectoryQueue.cpp
+++ b/src/Storages/Distributed/DistributedAsyncInsertDirectoryQueue.cpp
@@ -412,11 +412,12 @@ void DistributedAsyncInsertDirectoryQueue::processFile(std::string & file_path,
         insert_settings.applyChanges(settings_changes);
 
         auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(insert_settings);
-        auto result = pool->getManyCheckedForInsert(timeouts, insert_settings, PoolMode::GET_ONE, storage.remote_storage.getQualifiedName());
-        auto connection = std::move(result.front().entry);
+        auto results = pool->getManyCheckedForInsert(timeouts, insert_settings, PoolMode::GET_ONE, storage.remote_storage.getQualifiedName());
+        auto result = results.front();
+        if (pool->isTryResultInvalid(result, insert_settings.distributed_insert_skip_read_only_replicas))
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Got an invalid connection result");
 
-        if (connection.isNull())
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Got empty connection");
+        auto connection = std::move(result.entry);
 
         LOG_DEBUG(log, "Sending `{}` to {} ({} rows, {} bytes)",
             file_path,
diff --git a/src/Storages/Distributed/DistributedSink.cpp b/src/Storages/Distributed/DistributedSink.cpp
index f8bbc081e55..e0baefd5838 100644
--- a/src/Storages/Distributed/DistributedSink.cpp
+++ b/src/Storages/Distributed/DistributedSink.cpp
@@ -377,9 +377,11 @@ DistributedSink::runWritingJob(JobReplica & job, const Block & current_block, si
                     /// NOTE: INSERT will also take into account max_replica_delay_for_distributed_queries
                     /// (anyway fallback_to_stale_replicas_for_distributed_queries=true by default)
                     auto results = shard_info.pool->getManyCheckedForInsert(timeouts, settings, PoolMode::GET_ONE, storage.remote_storage.getQualifiedName());
-                    job.connection_entry = std::move(results.front().entry);
-                    if (job.connection_entry.isNull())
-                        throw Exception(ErrorCodes::LOGICAL_ERROR, "Got empty connection");
+                    auto result = results.front();
+                    if (shard_info.pool->isTryResultInvalid(result, settings.distributed_insert_skip_read_only_replicas))
+                        throw Exception(ErrorCodes::LOGICAL_ERROR, "Got an invalid connection result");
+
+                    job.connection_entry = std::move(result.entry);
                 }
                 else
                 {

From b2d8eaf1e6d67ab76f3e86cd4fd857e9535a9d20 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@clickhouse.com>
Date: Mon, 29 Jul 2024 18:55:08 +0200
Subject: [PATCH 064/139] Debug TimerDescriptor

---
 src/Common/TimerDescriptor.cpp   | 26 ++++++++++++++++++++++++--
 src/IO/MMappedFileDescriptor.cpp |  2 --
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/Common/TimerDescriptor.cpp b/src/Common/TimerDescriptor.cpp
index b36ea4059cb..9a171ae9487 100644
--- a/src/Common/TimerDescriptor.cpp
+++ b/src/Common/TimerDescriptor.cpp
@@ -2,9 +2,11 @@
 
 #include <Common/TimerDescriptor.h>
 #include <Common/Exception.h>
+#include <Common/logger_useful.h>
 
 #include <sys/timerfd.h>
 #include <unistd.h>
+#include <fmt/format.h>
 
 
 namespace DB
@@ -89,9 +91,29 @@ void TimerDescriptor::drain() const
 
             /// A signal happened, need to retry.
             if (errno == EINTR)
-                continue;
+            {
+                /** This is to help with debugging.
+                  *
+                  * Sometimes reading from timer_fd blocks, which should not happen, because we opened it in a non-blocking mode.
+                  * But it could be possible if a rogue 3rd-party library closed our file descriptor by mistake
+                  * (for example by double closing due to the lack of exception safety or if it is a crappy code in plain C)
+                  * and then another file descriptor is opened in its place.
+                  *
+                  * Let's try to get a name of this file descriptor and log it.
+                  */
+                LoggerPtr log = getLogger("TimerDescriptor");
 
-            throw ErrnoException(ErrorCodes::CANNOT_READ_FROM_SOCKET, "Cannot drain timer_fd");
+                static constexpr ssize_t max_link_path_length = 256;
+                char link_path[max_link_path_length];
+                ssize_t link_path_length = readlink(fmt::format("/proc/self/fd/{}", timer_fd).c_str(), link_path, max_link_path_length);
+                if (-1 == link_path_length)
+                    throw ErrnoException(ErrorCodes::CANNOT_READ_FROM_SOCKET, "Cannot readlink for a timer_fd {}", timer_fd);
+
+                LOG_TRACE(log, "Received EINTR while trying to drain a TimerDescriptor, fd {}: {}", timer_fd, std::string_view(link_path, link_path_length));
+                continue;
+            }
+
+            throw ErrnoException(ErrorCodes::CANNOT_READ_FROM_SOCKET, "Cannot drain timer_fd {}", timer_fd);
         }
 
         chassert(res == sizeof(buf));
diff --git a/src/IO/MMappedFileDescriptor.cpp b/src/IO/MMappedFileDescriptor.cpp
index a7eb8e4ede5..47f80005c9d 100644
--- a/src/IO/MMappedFileDescriptor.cpp
+++ b/src/IO/MMappedFileDescriptor.cpp
@@ -3,8 +3,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include <fmt/format.h>
-
 #include <Common/formatReadable.h>
 #include <Common/Exception.h>
 #include <base/getPageSize.h>

From 45db7c85cf25f9b4b27cedd7464a786c53580d3f Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nk@clickhouse.com>
Date: Mon, 29 Jul 2024 16:57:15 +0000
Subject: [PATCH 065/139] Remove has_single_port property from plan stream.

---
 src/Processors/QueryPlan/AggregatingStep.cpp   | 2 --
 src/Processors/QueryPlan/FillingStep.cpp       | 8 +++-----
 src/Processors/QueryPlan/IQueryPlanStep.h      | 6 +-----
 src/Processors/QueryPlan/ITransformingStep.cpp | 3 ---
 src/Processors/QueryPlan/ReadNothingStep.cpp   | 2 +-
 5 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/Processors/QueryPlan/AggregatingStep.cpp b/src/Processors/QueryPlan/AggregatingStep.cpp
index f31de80b22d..8a5ed7fde65 100644
--- a/src/Processors/QueryPlan/AggregatingStep.cpp
+++ b/src/Processors/QueryPlan/AggregatingStep.cpp
@@ -134,7 +134,6 @@ AggregatingStep::AggregatingStep(
     {
         output_stream->sort_description = group_by_sort_description;
         output_stream->sort_scope = DataStream::SortScope::Global;
-        output_stream->has_single_port = true;
     }
 }
 
@@ -147,7 +146,6 @@ void AggregatingStep::applyOrder(SortDescription sort_description_for_merging_,
     {
         output_stream->sort_description = group_by_sort_description;
         output_stream->sort_scope = DataStream::SortScope::Global;
-        output_stream->has_single_port = true;
     }
 
     explicit_sorting_required_for_aggregation_in_order = false;
diff --git a/src/Processors/QueryPlan/FillingStep.cpp b/src/Processors/QueryPlan/FillingStep.cpp
index 65c9cf11661..81622389ada 100644
--- a/src/Processors/QueryPlan/FillingStep.cpp
+++ b/src/Processors/QueryPlan/FillingStep.cpp
@@ -39,12 +39,13 @@ FillingStep::FillingStep(
     , interpolate_description(interpolate_description_)
     , use_with_fill_by_sorting_prefix(use_with_fill_by_sorting_prefix_)
 {
-    if (!input_stream_.has_single_port)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "FillingStep expects single input");
 }
 
 void FillingStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
 {
+    if (pipeline.getNumStreams() != 1)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "FillingStep expects single input");
+
     pipeline.addSimpleTransform([&](const Block & header, QueryPipelineBuilder::StreamType stream_type) -> ProcessorPtr
     {
         if (stream_type == QueryPipelineBuilder::StreamType::Totals)
@@ -69,9 +70,6 @@ void FillingStep::describeActions(JSONBuilder::JSONMap & map) const
 
 void FillingStep::updateOutputStream()
 {
-    if (!input_streams.front().has_single_port)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "FillingStep expects single input");
-
     output_stream = createOutputStream(
         input_streams.front(), FillingTransform::transformHeader(input_streams.front().header, sort_description), getDataStreamTraits());
 }
diff --git a/src/Processors/QueryPlan/IQueryPlanStep.h b/src/Processors/QueryPlan/IQueryPlanStep.h
index daca88fcceb..44eb7ea0c59 100644
--- a/src/Processors/QueryPlan/IQueryPlanStep.h
+++ b/src/Processors/QueryPlan/IQueryPlanStep.h
@@ -28,9 +28,6 @@ class DataStream
 public:
     Block header;
 
-    /// QueryPipeline has single port. Totals or extremes ports are not counted.
-    bool has_single_port = false;
-
     /// Sorting scope. Please keep the mutual order (more strong mode should have greater value).
     enum class SortScope : uint8_t
     {
@@ -51,8 +48,7 @@ public:
 
     bool hasEqualPropertiesWith(const DataStream & other) const
     {
-        return has_single_port == other.has_single_port
-            && sort_description == other.sort_description
+        return sort_description == other.sort_description
             && (sort_description.empty() || sort_scope == other.sort_scope);
     }
 
diff --git a/src/Processors/QueryPlan/ITransformingStep.cpp b/src/Processors/QueryPlan/ITransformingStep.cpp
index 9ecfdb0af22..3fa9d1b8308 100644
--- a/src/Processors/QueryPlan/ITransformingStep.cpp
+++ b/src/Processors/QueryPlan/ITransformingStep.cpp
@@ -20,9 +20,6 @@ DataStream ITransformingStep::createOutputStream(
 {
     DataStream output_stream{.header = std::move(output_header)};
 
-    output_stream.has_single_port = stream_traits.returns_single_stream
-                                     || (input_stream.has_single_port && stream_traits.preserves_number_of_streams);
-
     if (stream_traits.preserves_sorting)
     {
         output_stream.sort_description = input_stream.sort_description;
diff --git a/src/Processors/QueryPlan/ReadNothingStep.cpp b/src/Processors/QueryPlan/ReadNothingStep.cpp
index 253f3a5b980..3037172bbd4 100644
--- a/src/Processors/QueryPlan/ReadNothingStep.cpp
+++ b/src/Processors/QueryPlan/ReadNothingStep.cpp
@@ -6,7 +6,7 @@ namespace DB
 {
 
 ReadNothingStep::ReadNothingStep(Block output_header)
-    : ISourceStep(DataStream{.header = std::move(output_header), .has_single_port = true})
+    : ISourceStep(DataStream{.header = std::move(output_header)})
 {
 }
 

From 1c9d60ca972eab618b82704e14f1a680daed9c04 Mon Sep 17 00:00:00 2001
From: Nikita Mikhaylov <nikitamikhaylov@clickhouse.com>
Date: Mon, 15 Jul 2024 16:36:45 +0000
Subject: [PATCH 066/139] Refactoring

---
 programs/client/Client.h             |   6 +-
 programs/local/LocalServer.h         |   4 +-
 src/Client/ClientApplicationBase.cpp | 539 +++++++++++++++++++++++++++
 src/Client/ClientApplicationBase.h   |  54 +++
 src/Client/ClientBase.cpp            | 362 +-----------------
 src/Client/ClientBase.h              |  73 +++-
 6 files changed, 659 insertions(+), 379 deletions(-)
 create mode 100644 src/Client/ClientApplicationBase.cpp
 create mode 100644 src/Client/ClientApplicationBase.h

diff --git a/programs/client/Client.h b/programs/client/Client.h
index 9571440d6ba..7fdf77031ab 100644
--- a/programs/client/Client.h
+++ b/programs/client/Client.h
@@ -1,14 +1,16 @@
 #pragma once
 
-#include <Client/ClientBase.h>
+#include <Client/ClientApplicationBase.h>
 
 
 namespace DB
 {
 
-class Client : public ClientBase
+class Client : public ClientApplicationBase
 {
 public:
+    using Arguments = ClientApplicationBase::Arguments;
+
     Client() = default;
 
     void initialize(Poco::Util::Application & self) override;
diff --git a/programs/local/LocalServer.h b/programs/local/LocalServer.h
index ae9980311e1..b18a7a90961 100644
--- a/programs/local/LocalServer.h
+++ b/programs/local/LocalServer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Client/ClientBase.h>
+#include <Client/ClientApplicationBase.h>
 #include <Client/LocalConnection.h>
 
 #include <Core/ServerSettings.h>
@@ -21,7 +21,7 @@ namespace DB
 /// Lightweight Application for clickhouse-local
 /// No networking, no extra configs and working directories, no pid and status files, no dictionaries, no logging.
 /// Quiet mode by default
-class LocalServer : public ClientBase, public Loggers
+class LocalServer : public ClientApplicationBase, public Loggers
 {
 public:
     LocalServer() = default;
diff --git a/src/Client/ClientApplicationBase.cpp b/src/Client/ClientApplicationBase.cpp
new file mode 100644
index 00000000000..59c98983694
--- /dev/null
+++ b/src/Client/ClientApplicationBase.cpp
@@ -0,0 +1,539 @@
+#include <Client/ClientApplicationBase.h>
+
+#include <base/argsToConfig.h>
+#include <base/safeExit.h>
+#include <Core/BaseSettingsProgramOptions.h>
+#include <Common/clearPasswordFromCommandLine.h>
+#include <Common/TerminalSize.h>
+#include <Common/Exception.h>
+
+#include <Common/config_version.h>
+#include "config.h"
+
+#include <unordered_set>
+#include <string>
+#include <boost/algorithm/string/case_conv.hpp>
+#include <boost/algorithm/string/replace.hpp>
+#include <boost/algorithm/string/split.hpp>
+
+using namespace std::literals;
+
+namespace CurrentMetrics
+{
+    extern const Metric MemoryTracking;
+}
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+    extern const int CANNOT_SET_SIGNAL_HANDLER;
+    extern const int UNRECOGNIZED_ARGUMENTS;
+}
+
+static ClientInfo::QueryKind parseQueryKind(const String & query_kind)
+{
+    if (query_kind == "initial_query")
+        return ClientInfo::QueryKind::INITIAL_QUERY;
+    if (query_kind == "secondary_query")
+        return ClientInfo::QueryKind::SECONDARY_QUERY;
+    if (query_kind == "no_query")
+        return ClientInfo::QueryKind::NO_QUERY;
+    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown query kind {}", query_kind);
+}
+
+/// This signal handler is set only for SIGINT and SIGQUIT.
+void interruptSignalHandler(int signum)
+{
+    if (ClientApplicationBase::getInstance().tryStopQuery())
+        safeExit(128 + signum);
+}
+
+ClientApplicationBase::~ClientApplicationBase() = default;
+ClientApplicationBase::ClientApplicationBase() : ClientBase(STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO, std::cin, std::cout, std::cerr) {}
+
+ClientApplicationBase & ClientApplicationBase::getInstance()
+{
+    return dynamic_cast<ClientApplicationBase&>(Poco::Util::Application::instance());
+}
+
+void ClientApplicationBase::setupSignalHandler()
+{
+    ClientApplicationBase::getInstance().stopQuery();
+
+    struct sigaction new_act;
+    memset(&new_act, 0, sizeof(new_act));
+
+    new_act.sa_handler = interruptSignalHandler;
+    new_act.sa_flags = 0;
+
+#if defined(OS_DARWIN)
+    sigemptyset(&new_act.sa_mask);
+#else
+    if (sigemptyset(&new_act.sa_mask))
+        throw ErrnoException(ErrorCodes::CANNOT_SET_SIGNAL_HANDLER, "Cannot set signal handler");
+#endif
+
+    if (sigaction(SIGINT, &new_act, nullptr))
+        throw ErrnoException(ErrorCodes::CANNOT_SET_SIGNAL_HANDLER, "Cannot set signal handler");
+
+    if (sigaction(SIGQUIT, &new_act, nullptr))
+        throw ErrnoException(ErrorCodes::CANNOT_SET_SIGNAL_HANDLER, "Cannot set signal handler");
+}
+
+
+namespace
+{
+
+/// Define transparent hash to we can use
+/// std::string_view with the containers
+struct TransparentStringHash
+{
+    using is_transparent = void;
+    size_t operator()(std::string_view txt) const
+    {
+        return std::hash<std::string_view>{}(txt);
+    }
+};
+
+/*
+ * This functor is used to parse command line arguments and replace dashes with underscores,
+ * allowing options to be specified using either dashes or underscores.
+ */
+class OptionsAliasParser
+{
+public:
+    explicit OptionsAliasParser(const boost::program_options::options_description& options)
+    {
+        options_names.reserve(options.options().size());
+        for (const auto& option : options.options())
+            options_names.insert(option->long_name());
+    }
+
+    /*
+     * Parses arguments by replacing dashes with underscores, and matches the resulting name with known options
+     * Implements boost::program_options::ext_parser logic
+     */
+    std::pair<std::string, std::string> operator()(const std::string & token) const
+    {
+        if (!token.starts_with("--"))
+            return {};
+        std::string arg = token.substr(2);
+
+        // divide token by '=' to separate key and value if options style=long_allow_adjacent
+        auto pos_eq = arg.find('=');
+        std::string key = arg.substr(0, pos_eq);
+
+        if (options_names.contains(key))
+            // option does not require any changes, because it is already correct
+            return {};
+
+        std::replace(key.begin(), key.end(), '-', '_');
+        if (!options_names.contains(key))
+            // after replacing '-' with '_' argument is still unknown
+            return {};
+
+        std::string value;
+        if (pos_eq != std::string::npos && pos_eq < arg.size())
+            value = arg.substr(pos_eq + 1);
+
+        return {key, value};
+    }
+
+private:
+    std::unordered_set<std::string> options_names;
+};
+
+}
+
+/// Enable optimizations even in debug builds because otherwise options parsing becomes extremely slow affecting .sh tests
+#if defined(__clang__)
+#pragma clang optimize on
+#endif
+void ClientApplicationBase::parseAndCheckOptions(OptionsDescription & options_description, po::variables_map & options, Arguments & arguments)
+{
+    if (allow_repeated_settings)
+        addProgramOptionsAsMultitokens(cmd_settings, options_description.main_description.value());
+    else
+        addProgramOptions(cmd_settings, options_description.main_description.value());
+
+    if (allow_merge_tree_settings)
+    {
+        /// Add merge tree settings manually, because names of some settings
+        /// may clash. Query settings have higher priority and we just
+        /// skip ambiguous merge tree settings.
+        auto & main_options = options_description.main_description.value();
+
+        std::unordered_set<std::string, TransparentStringHash, std::equal_to<>> main_option_names;
+        for (const auto & option : main_options.options())
+            main_option_names.insert(option->long_name());
+
+        for (const auto & setting : cmd_merge_tree_settings.all())
+        {
+            const auto add_setting = [&](const std::string_view name)
+            {
+                if (auto it = main_option_names.find(name); it != main_option_names.end())
+                    return;
+
+                if (allow_repeated_settings)
+                    addProgramOptionAsMultitoken(cmd_merge_tree_settings, main_options, name, setting);
+                else
+                    addProgramOption(cmd_merge_tree_settings, main_options, name, setting);
+            };
+
+            const auto & setting_name = setting.getName();
+
+            add_setting(setting_name);
+
+            const auto & settings_to_aliases = MergeTreeSettings::Traits::settingsToAliases();
+            if (auto it = settings_to_aliases.find(setting_name); it != settings_to_aliases.end())
+            {
+                for (const auto alias : it->second)
+                {
+                    add_setting(alias);
+                }
+            }
+        }
+    }
+
+    /// Parse main commandline options.
+    auto parser = po::command_line_parser(arguments)
+                      .options(options_description.main_description.value())
+                      .extra_parser(OptionsAliasParser(options_description.main_description.value()))
+                      .allow_unregistered();
+    po::parsed_options parsed = parser.run();
+
+    /// Check unrecognized options without positional options.
+    auto unrecognized_options = po::collect_unrecognized(parsed.options, po::collect_unrecognized_mode::exclude_positional);
+    if (!unrecognized_options.empty())
+    {
+        auto hints = this->getHints(unrecognized_options[0]);
+        if (!hints.empty())
+            throw Exception(ErrorCodes::UNRECOGNIZED_ARGUMENTS, "Unrecognized option '{}'. Maybe you meant {}",
+                            unrecognized_options[0], toString(hints));
+
+        throw Exception(ErrorCodes::UNRECOGNIZED_ARGUMENTS, "Unrecognized option '{}'", unrecognized_options[0]);
+    }
+
+    /// Check positional options.
+    for (const auto & op : parsed.options)
+    {
+        if (!op.unregistered && op.string_key.empty() && !op.original_tokens[0].starts_with("--")
+            && !op.original_tokens[0].empty() && !op.value.empty())
+        {
+            /// Two special cases for better usability:
+            /// - if the option contains a whitespace, it might be a query: clickhouse "SELECT 1"
+            /// These are relevant for interactive usage - user-friendly, but questionable in general.
+            /// In case of ambiguity or for scripts, prefer using proper options.
+
+            const auto & token = op.original_tokens[0];
+            po::variable_value value(boost::any(op.value), false);
+
+            const char * option;
+            if (token.contains(' '))
+                option = "query";
+            else
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Positional option `{}` is not supported.", token);
+
+            if (!options.emplace(option, value).second)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Positional option `{}` is not supported.", token);
+        }
+    }
+
+    po::store(parsed, options);
+}
+
+void ClientApplicationBase::addMultiquery(std::string_view query, Arguments & common_arguments) const
+{
+    common_arguments.emplace_back("--multiquery");
+    common_arguments.emplace_back("-q");
+    common_arguments.emplace_back(query);
+}
+
+Poco::Util::LayeredConfiguration & ClientApplicationBase::getClientConfiguration()
+{
+    return config();
+}
+
+void ClientApplicationBase::init(int argc, char ** argv)
+{
+    namespace po = boost::program_options;
+
+    /// Don't parse options with Poco library, we prefer neat boost::program_options.
+    stopOptionsProcessing();
+
+    stdin_is_a_tty = isatty(STDIN_FILENO);
+    stdout_is_a_tty = isatty(STDOUT_FILENO);
+    stderr_is_a_tty = isatty(STDERR_FILENO);
+    terminal_width = getTerminalWidth();
+
+    std::vector<Arguments> external_tables_arguments;
+    Arguments common_arguments = {""}; /// 0th argument is ignored.
+    std::vector<Arguments> hosts_and_ports_arguments;
+
+    if (argc)
+        argv0 = argv[0];
+    readArguments(argc, argv, common_arguments, external_tables_arguments, hosts_and_ports_arguments);
+
+    /// Support for Unicode dashes
+    /// Interpret Unicode dashes as default double-hyphen
+    for (auto & arg : common_arguments)
+    {
+        // replace em-dash(U+2014)
+        boost::replace_all(arg, "—", "--");
+        // replace en-dash(U+2013)
+        boost::replace_all(arg, "–", "--");
+        // replace mathematical minus(U+2212)
+        boost::replace_all(arg, "−", "--");
+    }
+
+
+    OptionsDescription options_description;
+    options_description.main_description.emplace(createOptionsDescription("Main options", terminal_width));
+
+    /// Common options for clickhouse-client and clickhouse-local.
+    options_description.main_description->add_options()
+        ("help", "print usage summary, combine with --verbose to display all options")
+        ("verbose", "print query and other debugging info")
+        ("version,V", "print version information and exit")
+        ("version-clean", "print version in machine-readable format and exit")
+
+        ("config-file,C", po::value<std::string>(), "config-file path")
+
+        ("query,q", po::value<std::vector<std::string>>()->multitoken(), R"(Query. Can be specified multiple times (--query "SELECT 1" --query "SELECT 2") or once with multiple comma-separated queries (--query "SELECT 1; SELECT 2;"). In the latter case, INSERT queries with non-VALUE format must be separated by empty lines.)")
+        ("queries-file", po::value<std::vector<std::string>>()->multitoken(), "file path with queries to execute; multiple files can be specified (--queries-file file1 file2...)")
+        ("multiquery,n", "Obsolete, does nothing")
+        ("multiline,m", "If specified, allow multiline queries (do not send the query on Enter)")
+        ("database,d", po::value<std::string>(), "database")
+        ("query_kind", po::value<std::string>()->default_value("initial_query"), "One of initial_query/secondary_query/no_query")
+        ("query_id", po::value<std::string>(), "query_id")
+
+        ("history_file", po::value<std::string>(), "path to history file")
+
+        ("stage", po::value<std::string>()->default_value("complete"), "Request query processing up to specified stage: complete,fetch_columns,with_mergeable_state,with_mergeable_state_after_aggregation,with_mergeable_state_after_aggregation_and_limit")
+        ("progress", po::value<ProgressOption>()->implicit_value(ProgressOption::TTY, "tty")->default_value(ProgressOption::DEFAULT, "default"), "Print progress of queries execution - to TTY: tty|on|1|true|yes; to STDERR non-interactive mode: err; OFF: off|0|false|no; DEFAULT - interactive to TTY, non-interactive is off")
+
+        ("disable_suggestion,A", "Disable loading suggestion data. Note that suggestion data is loaded asynchronously through a second connection to ClickHouse server. Also it is reasonable to disable suggestion if you want to paste a query with TAB characters. Shorthand option -A is for those who get used to mysql client.")
+        ("wait_for_suggestions_to_load", "Load suggestion data synchonously.")
+        ("time,t", "print query execution time to stderr in non-interactive mode (for benchmarks)")
+        ("memory-usage", po::value<std::string>()->implicit_value("default")->default_value("none"), "print memory usage to stderr in non-interactive mode (for benchmarks). Values: 'none', 'default', 'readable'")
+
+        ("echo", "in batch mode, print query before execution")
+
+        ("log-level", po::value<std::string>(), "log level")
+        ("server_logs_file", po::value<std::string>(), "put server logs into specified file")
+
+        ("suggestion_limit", po::value<int>()->default_value(10000), "Suggestion limit for how many databases, tables and columns to fetch.")
+
+        ("format,f", po::value<std::string>(), "default output format (and input format for clickhouse-local)")
+        ("output-format", po::value<std::string>(), "default output format (this option has preference over --format)")
+
+        ("vertical,E", "vertical output format, same as --format=Vertical or FORMAT Vertical or \\G at end of command")
+        ("highlight", po::value<bool>()->default_value(true), "enable or disable basic syntax highlight in interactive command line")
+
+        ("ignore-error", "do not stop processing when an error occurs")
+        ("stacktrace", "print stack traces of exceptions")
+        ("hardware-utilization", "print hardware utilization information in progress bar")
+        ("print-profile-events", po::value(&profile_events.print)->zero_tokens(), "Printing ProfileEvents packets")
+        ("profile-events-delay-ms", po::value<UInt64>()->default_value(profile_events.delay_ms), "Delay between printing `ProfileEvents` packets (-1 - print only totals, 0 - print every single packet)")
+        ("processed-rows", "print the number of locally processed rows")
+
+        ("interactive", "Process queries-file or --query query and start interactive mode")
+        ("pager", po::value<std::string>(), "Pipe all output into this command (less or similar)")
+        ("max_memory_usage_in_client", po::value<std::string>(), "Set memory limit in client/local server")
+
+        ("fuzzer-args", po::value<std::string>(), "Command line arguments for the LLVM's libFuzzer driver. Only relevant if the application is compiled with libFuzzer.")
+
+        ("client_logs_file", po::value<std::string>(), "Path to a file for writing client logs. Currently we only have fatal logs (when the client crashes)")
+    ;
+
+    addOptions(options_description);
+
+    OptionsDescription options_description_non_verbose = options_description;
+
+    auto getter = [](const auto & op)
+    {
+        String op_long_name = op->long_name();
+        return "--" + String(op_long_name);
+    };
+
+    if (options_description.main_description)
+    {
+        const auto & main_options = options_description.main_description->options();
+        std::transform(main_options.begin(), main_options.end(), std::back_inserter(cmd_options), getter);
+    }
+
+    if (options_description.external_description)
+    {
+        const auto & external_options = options_description.external_description->options();
+        std::transform(external_options.begin(), external_options.end(), std::back_inserter(cmd_options), getter);
+    }
+
+    po::variables_map options;
+    parseAndCheckOptions(options_description, options, common_arguments);
+    po::notify(options);
+
+    if (options.count("version") || options.count("V"))
+    {
+        showClientVersion();
+        exit(0); // NOLINT(concurrency-mt-unsafe)
+    }
+
+    if (options.count("version-clean"))
+    {
+        output_stream << VERSION_STRING;
+        exit(0); // NOLINT(concurrency-mt-unsafe)
+    }
+
+    if (options.count("verbose"))
+        getClientConfiguration().setBool("verbose", true);
+
+    /// Output of help message.
+    if (options.count("help")
+        || (options.count("host") && options["host"].as<std::string>() == "elp")) /// If user writes -help instead of --help.
+    {
+        if (getClientConfiguration().getBool("verbose", false))
+            printHelpMessage(options_description, true);
+        else
+            printHelpMessage(options_description_non_verbose, false);
+        exit(0); // NOLINT(concurrency-mt-unsafe)
+    }
+
+    /// Common options for clickhouse-client and clickhouse-local.
+
+    /// Output execution time to stderr in batch mode.
+    if (options.count("time"))
+        getClientConfiguration().setBool("print-time-to-stderr", true);
+    if (options.count("memory-usage"))
+    {
+        const auto & memory_usage_mode = options["memory-usage"].as<std::string>();
+        if (memory_usage_mode != "none" && memory_usage_mode != "default" && memory_usage_mode != "readable")
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown memory-usage mode: {}", memory_usage_mode);
+        getClientConfiguration().setString("print-memory-to-stderr", memory_usage_mode);
+    }
+
+    if (options.count("query"))
+        queries = options["query"].as<std::vector<std::string>>();
+    if (options.count("query_id"))
+        getClientConfiguration().setString("query_id", options["query_id"].as<std::string>());
+    if (options.count("database"))
+        getClientConfiguration().setString("database", options["database"].as<std::string>());
+    if (options.count("config-file"))
+        getClientConfiguration().setString("config-file", options["config-file"].as<std::string>());
+    if (options.count("queries-file"))
+        queries_files = options["queries-file"].as<std::vector<std::string>>();
+    if (options.count("multiline"))
+        getClientConfiguration().setBool("multiline", true);
+    if (options.count("ignore-error"))
+        getClientConfiguration().setBool("ignore-error", true);
+    if (options.count("format"))
+        getClientConfiguration().setString("format", options["format"].as<std::string>());
+    if (options.count("output-format"))
+        getClientConfiguration().setString("output-format", options["output-format"].as<std::string>());
+    if (options.count("vertical"))
+        getClientConfiguration().setBool("vertical", true);
+    if (options.count("stacktrace"))
+        getClientConfiguration().setBool("stacktrace", true);
+    if (options.count("print-profile-events"))
+        getClientConfiguration().setBool("print-profile-events", true);
+    if (options.count("profile-events-delay-ms"))
+        getClientConfiguration().setUInt64("profile-events-delay-ms", options["profile-events-delay-ms"].as<UInt64>());
+    /// Whether to print the number of processed rows at
+    if (options.count("processed-rows"))
+        getClientConfiguration().setBool("print-num-processed-rows", true);
+    if (options.count("progress"))
+    {
+        switch (options["progress"].as<ProgressOption>())
+        {
+            case DEFAULT:
+                getClientConfiguration().setString("progress", "default");
+                break;
+            case OFF:
+                getClientConfiguration().setString("progress", "off");
+                break;
+            case TTY:
+                getClientConfiguration().setString("progress", "tty");
+                break;
+            case ERR:
+                getClientConfiguration().setString("progress", "err");
+                break;
+        }
+    }
+    if (options.count("echo"))
+        getClientConfiguration().setBool("echo", true);
+    if (options.count("disable_suggestion"))
+        getClientConfiguration().setBool("disable_suggestion", true);
+    if (options.count("wait_for_suggestions_to_load"))
+        getClientConfiguration().setBool("wait_for_suggestions_to_load", true);
+    if (options.count("suggestion_limit"))
+        getClientConfiguration().setInt("suggestion_limit", options["suggestion_limit"].as<int>());
+    if (options.count("highlight"))
+        getClientConfiguration().setBool("highlight", options["highlight"].as<bool>());
+    if (options.count("history_file"))
+        getClientConfiguration().setString("history_file", options["history_file"].as<std::string>());
+    if (options.count("interactive"))
+        getClientConfiguration().setBool("interactive", true);
+    if (options.count("pager"))
+        getClientConfiguration().setString("pager", options["pager"].as<std::string>());
+
+    if (options.count("log-level"))
+        Poco::Logger::root().setLevel(options["log-level"].as<std::string>());
+    if (options.count("server_logs_file"))
+        server_logs_file = options["server_logs_file"].as<std::string>();
+
+    query_processing_stage = QueryProcessingStage::fromString(options["stage"].as<std::string>());
+    query_kind = parseQueryKind(options["query_kind"].as<std::string>());
+    profile_events.print = options.count("print-profile-events");
+    profile_events.delay_ms = options["profile-events-delay-ms"].as<UInt64>();
+
+    processOptions(options_description, options, external_tables_arguments, hosts_and_ports_arguments);
+    {
+        std::unordered_set<std::string> alias_names;
+        alias_names.reserve(options_description.main_description->options().size());
+        for (const auto& option : options_description.main_description->options())
+            alias_names.insert(option->long_name());
+        argsToConfig(common_arguments, getClientConfiguration(), 100, &alias_names);
+    }
+
+    clearPasswordFromCommandLine(argc, argv);
+
+    /// Limit on total memory usage
+    std::string max_client_memory_usage = getClientConfiguration().getString("max_memory_usage_in_client", "0" /*default value*/);
+    if (max_client_memory_usage != "0")
+    {
+        UInt64 max_client_memory_usage_int = parseWithSizeSuffix<UInt64>(max_client_memory_usage.c_str(), max_client_memory_usage.length());
+
+        total_memory_tracker.setHardLimit(max_client_memory_usage_int);
+        total_memory_tracker.setDescription("(total)");
+        total_memory_tracker.setMetric(CurrentMetrics::MemoryTracking);
+    }
+
+    /// Print stacktrace in case of crash
+    HandledSignals::instance().setupTerminateHandler();
+    HandledSignals::instance().setupCommonDeadlySignalHandlers();
+    /// We don't setup signal handlers for SIGINT, SIGQUIT, SIGTERM because we don't
+    /// have an option for client to shutdown gracefully.
+
+    fatal_channel_ptr = new Poco::SplitterChannel;
+    fatal_console_channel_ptr = new Poco::ConsoleChannel;
+    fatal_channel_ptr->addChannel(fatal_console_channel_ptr);
+    if (options.count("client_logs_file"))
+    {
+        fatal_file_channel_ptr = new Poco::SimpleFileChannel(options["client_logs_file"].as<std::string>());
+        fatal_channel_ptr->addChannel(fatal_file_channel_ptr);
+    }
+
+    fatal_log = createLogger("ClientBase", fatal_channel_ptr.get(), Poco::Message::PRIO_FATAL);
+    signal_listener = std::make_unique<SignalListener>(nullptr, fatal_log);
+    signal_listener_thread.start(*signal_listener);
+
+#if USE_GWP_ASAN
+    GWPAsan::initFinished();
+#endif
+
+}
+
+
+}
diff --git a/src/Client/ClientApplicationBase.h b/src/Client/ClientApplicationBase.h
new file mode 100644
index 00000000000..217fa29c3f4
--- /dev/null
+++ b/src/Client/ClientApplicationBase.h
@@ -0,0 +1,54 @@
+#pragma once
+
+
+#include <Poco/Util/Application.h>
+#include <Client/ClientBase.h>
+#include <Client/Suggest.h>
+#include <Common/NamePrompter.h>
+#include <Common/QueryFuzzer.h>
+#include <boost/program_options.hpp>
+
+#include <vector>
+
+namespace po = boost::program_options;
+
+namespace DB
+{
+
+void interruptSignalHandler(int signum);
+
+/**
+ * The base class for client appliucations such as
+ * clickhouse-client or clickhouse-local.
+ * The main purpose and responsibility of it is dealing with
+ * application-specific stuff such as command line arguments parsing
+ * and setting up signal handlers, so queries will be cancelled after
+ * Ctrl+C is pressed.
+ */
+class ClientApplicationBase : public ClientBase, public Poco::Util::Application, public IHints<2>
+{
+public:
+    using ClientBase::processOptions;
+    using Arguments = ClientBase::Arguments;
+
+    static ClientApplicationBase & getInstance();
+
+    ClientApplicationBase();
+    ~ClientApplicationBase() override;
+
+    void init(int argc, char ** argv);
+    std::vector<String> getAllRegisteredNames() const override { return cmd_options; }
+
+protected:
+    Poco::Util::LayeredConfiguration & getClientConfiguration() override;
+    void setupSignalHandler() override;
+    void addMultiquery(std::string_view query, Arguments & common_arguments) const;
+
+private:
+    void parseAndCheckOptions(OptionsDescription & options_description, po::variables_map & options, Arguments & arguments);
+
+    std::vector<String> cmd_options;
+};
+
+
+}
diff --git a/src/Client/ClientBase.cpp b/src/Client/ClientBase.cpp
index a88eed25db1..9cf3b955d26 100644
--- a/src/Client/ClientBase.cpp
+++ b/src/Client/ClientBase.cpp
@@ -5,7 +5,6 @@
 #include <Client/InternalTextLogs.h>
 #include <Client/TestTags.h>
 
-#include <base/argsToConfig.h>
 #include <base/safeExit.h>
 #include <Core/Block.h>
 #include <Core/BaseSettingsProgramOptions.h>
@@ -17,7 +16,6 @@
 #include <Common/getNumberOfPhysicalCPUCores.h>
 #include <Common/typeid_cast.h>
 #include <Common/TerminalSize.h>
-#include <Common/clearPasswordFromCommandLine.h>
 #include <Common/StringUtils.h>
 #include <Common/filesystemHelpers.h>
 #include <Common/NetException.h>
@@ -158,17 +156,6 @@ std::istream& operator>> (std::istream & in, ProgressOption & progress)
     return in;
 }
 
-static ClientInfo::QueryKind parseQueryKind(const String & query_kind)
-{
-    if (query_kind == "initial_query")
-        return ClientInfo::QueryKind::INITIAL_QUERY;
-    if (query_kind == "secondary_query")
-        return ClientInfo::QueryKind::SECONDARY_QUERY;
-    if (query_kind == "no_query")
-        return ClientInfo::QueryKind::NO_QUERY;
-    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown query kind {}", query_kind);
-}
-
 static void incrementProfileEventsBlock(Block & dst, const Block & src)
 {
     if (!dst)
@@ -269,36 +256,6 @@ static void incrementProfileEventsBlock(Block & dst, const Block & src)
     dst.setColumns(std::move(mutable_columns));
 }
 
-
-std::atomic<Int32> exit_after_signals = 0;
-
-class QueryInterruptHandler : private boost::noncopyable
-{
-public:
-    /// Store how much interrupt signals can be before stopping the query
-    /// by default stop after the first interrupt signal.
-    static void start(Int32 signals_before_stop = 1) { exit_after_signals.store(signals_before_stop); }
-
-    /// Set value not greater then 0 to mark the query as stopped.
-    static void stop() { exit_after_signals.store(0); }
-
-    /// Return true if the query was stopped.
-    /// Query was stopped if it received at least "signals_before_stop" interrupt signals.
-    static bool try_stop() { return exit_after_signals.fetch_sub(1) <= 0; }
-    static bool cancelled() { return exit_after_signals.load() <= 0; }
-
-    /// Return how much interrupt signals remain before stop.
-    static Int32 cancelled_status() { return exit_after_signals.load(); }
-};
-
-/// This signal handler is set for SIGINT and SIGQUIT.
-void interruptSignalHandler(int signum)
-{
-    if (QueryInterruptHandler::try_stop())
-        safeExit(128 + signum);
-}
-
-
 /// To cancel the query on local format error.
 class LocalFormatError : public DB::Exception
 {
@@ -345,31 +302,6 @@ ClientBase::ClientBase(
     terminal_width = getTerminalWidth(in_fd, err_fd);
 }
 
-void ClientBase::setupSignalHandler()
-{
-    QueryInterruptHandler::stop();
-
-    struct sigaction new_act;
-    memset(&new_act, 0, sizeof(new_act));
-
-    new_act.sa_handler = interruptSignalHandler;
-    new_act.sa_flags = 0;
-
-#if defined(OS_DARWIN)
-    sigemptyset(&new_act.sa_mask);
-#else
-    if (sigemptyset(&new_act.sa_mask))
-        throw ErrnoException(ErrorCodes::CANNOT_SET_SIGNAL_HANDLER, "Cannot set signal handler");
-#endif
-
-    if (sigaction(SIGINT, &new_act, nullptr))
-        throw ErrnoException(ErrorCodes::CANNOT_SET_SIGNAL_HANDLER, "Cannot set signal handler");
-
-    if (sigaction(SIGQUIT, &new_act, nullptr))
-        throw ErrnoException(ErrorCodes::CANNOT_SET_SIGNAL_HANDLER, "Cannot set signal handler");
-}
-
-
 ASTPtr ClientBase::parseQuery(const char *& pos, const char * end, const Settings & settings, bool allow_multi_statements)
 {
     std::unique_ptr<IParserBase> parser;
@@ -1113,8 +1045,8 @@ void ClientBase::processOrdinaryQuery(const String & query_to_execute, ASTPtr pa
     {
         try
         {
-            QueryInterruptHandler::start(signals_before_stop);
-            SCOPE_EXIT({ QueryInterruptHandler::stop(); });
+            query_interrupt_handler.start(signals_before_stop);
+            SCOPE_EXIT({ query_interrupt_handler.stop(); });
 
             connection->sendQuery(
                 connection_parameters.timeouts,
@@ -1178,13 +1110,13 @@ void ClientBase::receiveResult(ASTPtr parsed_query, Int32 signals_before_stop, b
             /// to avoid losing sync.
             if (!cancelled)
             {
-                if (partial_result_on_first_cancel && QueryInterruptHandler::cancelled_status() == signals_before_stop - 1)
+                if (partial_result_on_first_cancel && query_interrupt_handler.cancelled_status() == signals_before_stop - 1)
                 {
                     connection->sendCancel();
                     /// First cancel reading request was sent. Next requests will only be with a full cancel
                     partial_result_on_first_cancel = false;
                 }
-                else if (QueryInterruptHandler::cancelled())
+                else if (query_interrupt_handler.cancelled())
                 {
                     cancelQuery();
                 }
@@ -1563,8 +1495,8 @@ void ClientBase::processInsertQuery(const String & query_to_execute, ASTPtr pars
             return;
     }
 
-    QueryInterruptHandler::start();
-    SCOPE_EXIT({ QueryInterruptHandler::stop(); });
+    query_interrupt_handler.start();
+    SCOPE_EXIT({ query_interrupt_handler.stop(); });
 
     connection->sendQuery(
         connection_parameters.timeouts,
@@ -1775,7 +1707,7 @@ try
     Block block;
     while (executor.pull(block))
     {
-        if (!cancelled && QueryInterruptHandler::cancelled())
+        if (!cancelled && query_interrupt_handler.cancelled())
         {
             cancelQuery();
             executor.cancel();
@@ -2857,7 +2789,6 @@ void ClientBase::runLibFuzzer()
 void ClientBase::runLibFuzzer() {}
 #endif
 
-
 void ClientBase::clearTerminal()
 {
     /// Clear from cursor until end of screen.
@@ -2867,288 +2798,9 @@ void ClientBase::clearTerminal()
     output_stream << "\033[0J" "\033[?25h";
 }
 
-
 void ClientBase::showClientVersion()
 {
     output_stream << VERSION_NAME << " " + getName() + " version " << VERSION_STRING << VERSION_OFFICIAL << "." << std::endl;
 }
 
-void ClientBase::init(int argc, char ** argv)
-{
-    namespace po = boost::program_options;
-
-    /// Don't parse options with Poco library, we prefer neat boost::program_options.
-    stopOptionsProcessing();
-
-    stdin_is_a_tty = isatty(STDIN_FILENO);
-    stdout_is_a_tty = isatty(STDOUT_FILENO);
-    stderr_is_a_tty = isatty(STDERR_FILENO);
-    terminal_width = getTerminalWidth();
-
-    std::vector<Arguments> external_tables_arguments;
-    Arguments common_arguments = {""}; /// 0th argument is ignored.
-    std::vector<Arguments> hosts_and_ports_arguments;
-
-    if (argc)
-        argv0 = argv[0];
-    readArguments(argc, argv, common_arguments, external_tables_arguments, hosts_and_ports_arguments);
-
-    /// Support for Unicode dashes
-    /// Interpret Unicode dashes as default double-hyphen
-    for (auto & arg : common_arguments)
-    {
-        // replace em-dash(U+2014)
-        boost::replace_all(arg, "—", "--");
-        // replace en-dash(U+2013)
-        boost::replace_all(arg, "–", "--");
-        // replace mathematical minus(U+2212)
-        boost::replace_all(arg, "−", "--");
-    }
-
-
-    OptionsDescription options_description;
-    options_description.main_description.emplace(createOptionsDescription("Main options", terminal_width));
-
-    /// Common options for clickhouse-client and clickhouse-local.
-    options_description.main_description->add_options()
-        ("help", "print usage summary, combine with --verbose to display all options")
-        ("verbose", "print query and other debugging info")
-        ("version,V", "print version information and exit")
-        ("version-clean", "print version in machine-readable format and exit")
-
-        ("config-file,C", po::value<std::string>(), "config-file path")
-
-        ("query,q", po::value<std::vector<std::string>>()->multitoken(), R"(Query. Can be specified multiple times (--query "SELECT 1" --query "SELECT 2") or once with multiple comma-separated queries (--query "SELECT 1; SELECT 2;"). In the latter case, INSERT queries with non-VALUE format must be separated by empty lines.)")
-        ("queries-file", po::value<std::vector<std::string>>()->multitoken(), "file path with queries to execute; multiple files can be specified (--queries-file file1 file2...)")
-        ("multiquery,n", "Obsolete, does nothing")
-        ("multiline,m", "If specified, allow multiline queries (do not send the query on Enter)")
-        ("database,d", po::value<std::string>(), "database")
-        ("query_kind", po::value<std::string>()->default_value("initial_query"), "One of initial_query/secondary_query/no_query")
-        ("query_id", po::value<std::string>(), "query_id")
-
-        ("history_file", po::value<std::string>(), "path to history file")
-
-        ("stage", po::value<std::string>()->default_value("complete"), "Request query processing up to specified stage: complete,fetch_columns,with_mergeable_state,with_mergeable_state_after_aggregation,with_mergeable_state_after_aggregation_and_limit")
-        ("progress", po::value<ProgressOption>()->implicit_value(ProgressOption::TTY, "tty")->default_value(ProgressOption::DEFAULT, "default"), "Print progress of queries execution - to TTY: tty|on|1|true|yes; to STDERR non-interactive mode: err; OFF: off|0|false|no; DEFAULT - interactive to TTY, non-interactive is off")
-
-        ("disable_suggestion,A", "Disable loading suggestion data. Note that suggestion data is loaded asynchronously through a second connection to ClickHouse server. Also it is reasonable to disable suggestion if you want to paste a query with TAB characters. Shorthand option -A is for those who get used to mysql client.")
-        ("wait_for_suggestions_to_load", "Load suggestion data synchonously.")
-        ("time,t", "print query execution time to stderr in non-interactive mode (for benchmarks)")
-        ("memory-usage", po::value<std::string>()->implicit_value("default")->default_value("none"), "print memory usage to stderr in non-interactive mode (for benchmarks). Values: 'none', 'default', 'readable'")
-
-        ("echo", "in batch mode, print query before execution")
-
-        ("log-level", po::value<std::string>(), "log level")
-        ("server_logs_file", po::value<std::string>(), "put server logs into specified file")
-
-        ("suggestion_limit", po::value<int>()->default_value(10000), "Suggestion limit for how many databases, tables and columns to fetch.")
-
-        ("format,f", po::value<std::string>(), "default output format (and input format for clickhouse-local)")
-        ("output-format", po::value<std::string>(), "default output format (this option has preference over --format)")
-
-        ("vertical,E", "vertical output format, same as --format=Vertical or FORMAT Vertical or \\G at end of command")
-        ("highlight", po::value<bool>()->default_value(true), "enable or disable basic syntax highlight in interactive command line")
-
-        ("ignore-error", "do not stop processing when an error occurs")
-        ("stacktrace", "print stack traces of exceptions")
-        ("hardware-utilization", "print hardware utilization information in progress bar")
-        ("print-profile-events", po::value(&profile_events.print)->zero_tokens(), "Printing ProfileEvents packets")
-        ("profile-events-delay-ms", po::value<UInt64>()->default_value(profile_events.delay_ms), "Delay between printing `ProfileEvents` packets (-1 - print only totals, 0 - print every single packet)")
-        ("processed-rows", "print the number of locally processed rows")
-
-        ("interactive", "Process queries-file or --query query and start interactive mode")
-        ("pager", po::value<std::string>(), "Pipe all output into this command (less or similar)")
-        ("max_memory_usage_in_client", po::value<std::string>(), "Set memory limit in client/local server")
-
-        ("fuzzer-args", po::value<std::string>(), "Command line arguments for the LLVM's libFuzzer driver. Only relevant if the application is compiled with libFuzzer.")
-
-        ("client_logs_file", po::value<std::string>(), "Path to a file for writing client logs. Currently we only have fatal logs (when the client crashes)")
-    ;
-
-    addOptions(options_description);
-
-    OptionsDescription options_description_non_verbose = options_description;
-
-    auto getter = [](const auto & op)
-    {
-        String op_long_name = op->long_name();
-        return "--" + String(op_long_name);
-    };
-
-    if (options_description.main_description)
-    {
-        const auto & main_options = options_description.main_description->options();
-        std::transform(main_options.begin(), main_options.end(), std::back_inserter(cmd_options), getter);
-    }
-
-    if (options_description.external_description)
-    {
-        const auto & external_options = options_description.external_description->options();
-        std::transform(external_options.begin(), external_options.end(), std::back_inserter(cmd_options), getter);
-    }
-
-    po::variables_map options;
-    parseAndCheckOptions(options_description, options, common_arguments);
-    po::notify(options);
-
-    if (options.count("version") || options.count("V"))
-    {
-        showClientVersion();
-        exit(0); // NOLINT(concurrency-mt-unsafe)
-    }
-
-    if (options.count("version-clean"))
-    {
-        output_stream << VERSION_STRING;
-        exit(0); // NOLINT(concurrency-mt-unsafe)
-    }
-
-    if (options.count("verbose"))
-        getClientConfiguration().setBool("verbose", true);
-
-    /// Output of help message.
-    if (options.count("help")
-        || (options.count("host") && options["host"].as<std::string>() == "elp")) /// If user writes -help instead of --help.
-    {
-        if (getClientConfiguration().getBool("verbose", false))
-            printHelpMessage(options_description, true);
-        else
-            printHelpMessage(options_description_non_verbose, false);
-        exit(0); // NOLINT(concurrency-mt-unsafe)
-    }
-
-    /// Common options for clickhouse-client and clickhouse-local.
-
-    /// Output execution time to stderr in batch mode.
-    if (options.count("time"))
-        getClientConfiguration().setBool("print-time-to-stderr", true);
-    if (options.count("memory-usage"))
-    {
-        const auto & memory_usage_mode = options["memory-usage"].as<std::string>();
-        if (memory_usage_mode != "none" && memory_usage_mode != "default" && memory_usage_mode != "readable")
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown memory-usage mode: {}", memory_usage_mode);
-        getClientConfiguration().setString("print-memory-to-stderr", memory_usage_mode);
-    }
-
-    if (options.count("query"))
-        queries = options["query"].as<std::vector<std::string>>();
-    if (options.count("query_id"))
-        getClientConfiguration().setString("query_id", options["query_id"].as<std::string>());
-    if (options.count("database"))
-        getClientConfiguration().setString("database", options["database"].as<std::string>());
-    if (options.count("config-file"))
-        getClientConfiguration().setString("config-file", options["config-file"].as<std::string>());
-    if (options.count("queries-file"))
-        queries_files = options["queries-file"].as<std::vector<std::string>>();
-    if (options.count("multiline"))
-        getClientConfiguration().setBool("multiline", true);
-    if (options.count("ignore-error"))
-        getClientConfiguration().setBool("ignore-error", true);
-    if (options.count("format"))
-        getClientConfiguration().setString("format", options["format"].as<std::string>());
-    if (options.count("output-format"))
-        getClientConfiguration().setString("output-format", options["output-format"].as<std::string>());
-    if (options.count("vertical"))
-        getClientConfiguration().setBool("vertical", true);
-    if (options.count("stacktrace"))
-        getClientConfiguration().setBool("stacktrace", true);
-    if (options.count("print-profile-events"))
-        getClientConfiguration().setBool("print-profile-events", true);
-    if (options.count("profile-events-delay-ms"))
-        getClientConfiguration().setUInt64("profile-events-delay-ms", options["profile-events-delay-ms"].as<UInt64>());
-    /// Whether to print the number of processed rows at
-    if (options.count("processed-rows"))
-        getClientConfiguration().setBool("print-num-processed-rows", true);
-    if (options.count("progress"))
-    {
-        switch (options["progress"].as<ProgressOption>())
-        {
-            case DEFAULT:
-                getClientConfiguration().setString("progress", "default");
-                break;
-            case OFF:
-                getClientConfiguration().setString("progress", "off");
-                break;
-            case TTY:
-                getClientConfiguration().setString("progress", "tty");
-                break;
-            case ERR:
-                getClientConfiguration().setString("progress", "err");
-                break;
-        }
-    }
-    if (options.count("echo"))
-        getClientConfiguration().setBool("echo", true);
-    if (options.count("disable_suggestion"))
-        getClientConfiguration().setBool("disable_suggestion", true);
-    if (options.count("wait_for_suggestions_to_load"))
-        getClientConfiguration().setBool("wait_for_suggestions_to_load", true);
-    if (options.count("suggestion_limit"))
-        getClientConfiguration().setInt("suggestion_limit", options["suggestion_limit"].as<int>());
-    if (options.count("highlight"))
-        getClientConfiguration().setBool("highlight", options["highlight"].as<bool>());
-    if (options.count("history_file"))
-        getClientConfiguration().setString("history_file", options["history_file"].as<std::string>());
-    if (options.count("interactive"))
-        getClientConfiguration().setBool("interactive", true);
-    if (options.count("pager"))
-        getClientConfiguration().setString("pager", options["pager"].as<std::string>());
-
-    if (options.count("log-level"))
-        Poco::Logger::root().setLevel(options["log-level"].as<std::string>());
-    if (options.count("server_logs_file"))
-        server_logs_file = options["server_logs_file"].as<std::string>();
-
-    query_processing_stage = QueryProcessingStage::fromString(options["stage"].as<std::string>());
-    query_kind = parseQueryKind(options["query_kind"].as<std::string>());
-    profile_events.print = options.count("print-profile-events");
-    profile_events.delay_ms = options["profile-events-delay-ms"].as<UInt64>();
-
-    processOptions(options_description, options, external_tables_arguments, hosts_and_ports_arguments);
-    {
-        std::unordered_set<std::string> alias_names;
-        alias_names.reserve(options_description.main_description->options().size());
-        for (const auto& option : options_description.main_description->options())
-            alias_names.insert(option->long_name());
-        argsToConfig(common_arguments, getClientConfiguration(), 100, &alias_names);
-    }
-
-    clearPasswordFromCommandLine(argc, argv);
-
-    /// Limit on total memory usage
-    std::string max_client_memory_usage = getClientConfiguration().getString("max_memory_usage_in_client", "0" /*default value*/);
-    if (max_client_memory_usage != "0")
-    {
-        UInt64 max_client_memory_usage_int = parseWithSizeSuffix<UInt64>(max_client_memory_usage.c_str(), max_client_memory_usage.length());
-
-        total_memory_tracker.setHardLimit(max_client_memory_usage_int);
-        total_memory_tracker.setDescription("(total)");
-        total_memory_tracker.setMetric(CurrentMetrics::MemoryTracking);
-    }
-
-    /// Print stacktrace in case of crash
-    HandledSignals::instance().setupTerminateHandler();
-    HandledSignals::instance().setupCommonDeadlySignalHandlers();
-    /// We don't setup signal handlers for SIGINT, SIGQUIT, SIGTERM because we don't
-    /// have an option for client to shutdown gracefully.
-
-    fatal_channel_ptr = new Poco::SplitterChannel;
-    fatal_console_channel_ptr = new Poco::ConsoleChannel;
-    fatal_channel_ptr->addChannel(fatal_console_channel_ptr);
-    if (options.count("client_logs_file"))
-    {
-        fatal_file_channel_ptr = new Poco::SimpleFileChannel(options["client_logs_file"].as<std::string>());
-        fatal_channel_ptr->addChannel(fatal_file_channel_ptr);
-    }
-
-    fatal_log = createLogger("ClientBase", fatal_channel_ptr.get(), Poco::Message::PRIO_FATAL);
-    signal_listener = std::make_unique<SignalListener>(nullptr, fatal_log);
-    signal_listener_thread.start(*signal_listener);
-
-#if USE_GWP_ASAN
-    GWPAsan::initFinished();
-#endif
-
-}
-
 }
diff --git a/src/Client/ClientBase.h b/src/Client/ClientBase.h
index 7689744a373..557ac30d27c 100644
--- a/src/Client/ClientBase.h
+++ b/src/Client/ClientBase.h
@@ -1,26 +1,30 @@
 #pragma once
 
-#include <string_view>
-#include "Common/NamePrompter.h"
-#include <Parsers/ASTCreateQuery.h>
-#include <Common/ProgressIndication.h>
+
+#include <Client/Suggest.h>
+#include <Common/DNSResolver.h>
 #include <Common/InterruptListener.h>
+#include <Common/ProgressIndication.h>
 #include <Common/ShellCommand.h>
 #include <Common/Stopwatch.h>
-#include <Common/DNSResolver.h>
 #include <Core/ExternalTable.h>
 #include <Core/Settings.h>
-#include <Poco/Util/Application.h>
 #include <Poco/ConsoleChannel.h>
 #include <Poco/SimpleFileChannel.h>
 #include <Poco/SplitterChannel.h>
 #include <Interpreters/Context.h>
-#include <Client/Suggest.h>
-#include <Client/QueryFuzzer.h>
-#include <boost/program_options.hpp>
-#include <Storages/StorageFile.h>
-#include <Storages/SelectQueryInfo.h>
+#include <Parsers/ASTCreateQuery.h>
+#include <Poco/Util/Application.h>
 #include <Storages/MergeTree/MergeTreeSettings.h>
+#include <Storages/SelectQueryInfo.h>
+#include <Storages/StorageFile.h>
+
+#include <boost/program_options.hpp>
+
+#include <atomic>
+#include <optional>
+#include <string_view>
+#include <string>
 
 namespace po = boost::program_options;
 
@@ -64,9 +68,16 @@ std::istream& operator>> (std::istream & in, ProgressOption & progress);
 class InternalTextLogs;
 class WriteBufferFromFileDescriptor;
 
-class ClientBase : public Poco::Util::Application, public IHints<2>
+/**
+ * The base class which encapsulates the core functionality of a client.
+ * Can be used in a standalone application (clickhouse-client or clickhouse-local),
+ * or be embedded into server.
+ * Always keep in mind that there can be several instances of this class within
+ * a process. Thus, it cannot keep its state in global shared variables or even use them.
+ * The best example - std::cin, std::cout and std::cerr.
+ */
+class ClientBase
 {
-
 public:
     using Arguments = std::vector<String>;
 
@@ -79,12 +90,11 @@ public:
         std::ostream & output_stream_ = std::cout,
         std::ostream & error_stream_ = std::cerr
     );
+    virtual ~ClientBase();
 
-    ~ClientBase() override;
+    bool tryStopQuery() { return query_interrupt_handler.tryStop(); }
+    void stopQuery() { return query_interrupt_handler.stop(); }
 
-    void init(int argc, char ** argv);
-
-    std::vector<String> getAllRegisteredNames() const override { return cmd_options; }
     ASTPtr parseQuery(const char *& pos, const char * end, const Settings & settings, bool allow_multi_statements);
 
 protected:
@@ -114,7 +124,7 @@ protected:
         ASTPtr parsed_query, std::optional<bool> echo_query_ = {}, bool report_error = false);
 
     static void adjustQueryEnd(const char *& this_query_end, const char * all_queries_end, uint32_t max_parser_depth, uint32_t max_parser_backtracks);
-    static void setupSignalHandler();
+    virtual void setupSignalHandler() = 0;
 
     bool executeMultiQuery(const String & all_queries_text);
     MultiQueryProcessingStage analyzeMultiQueryText(
@@ -188,7 +198,6 @@ private:
     String prompt() const;
 
     void resetOutput();
-    void parseAndCheckOptions(OptionsDescription & options_description, po::variables_map & options, Arguments & arguments);
 
     void updateSuggest(const ASTPtr & ast);
 
@@ -196,6 +205,31 @@ private:
     bool addMergeTreeSettings(ASTCreateQuery & ast_create);
 
 protected:
+
+    class QueryInterruptHandler : private boost::noncopyable
+    {
+    public:
+        /// Store how much interrupt signals can be before stopping the query
+        /// by default stop after the first interrupt signal.
+        void start(Int32 signals_before_stop = 1) { exit_after_signals.store(signals_before_stop); }
+
+        /// Set value not greater then 0 to mark the query as stopped.
+        void stop() { exit_after_signals.store(0); }
+
+        /// Return true if the query was stopped.
+        /// Query was stopped if it received at least "signals_before_stop" interrupt signals.
+        bool tryStop() { return exit_after_signals.fetch_sub(1) <= 0; }
+        bool cancelled() { return exit_after_signals.load() <= 0; }
+
+        /// Return how much interrupt signals remain before stop.
+        Int32 cancelled_status() { return exit_after_signals.load(); }
+
+    private:
+        std::atomic<Int32> exit_after_signals = 0;
+    };
+
+    QueryInterruptHandler query_interrupt_handler;
+
     static bool isSyncInsertWithData(const ASTInsertQuery & insert_query, const ContextPtr & context);
     bool processMultiQueryFromFile(const String & file_name);
 
@@ -239,7 +273,6 @@ protected:
     std::vector<String> queries; /// Queries passed via '--query'
     std::vector<String> queries_files; /// If not empty, queries will be read from these files
     std::vector<String> interleave_queries_files; /// If not empty, run queries from these files before processing every file from 'queries_files'.
-    std::vector<String> cmd_options;
 
     bool stdin_is_a_tty = false; /// stdin is a terminal.
     bool stdout_is_a_tty = false; /// stdout is a terminal.

From 9186e647eb672283b8cb95d2fc152e0994f6df6f Mon Sep 17 00:00:00 2001
From: Nikita Mikhaylov <nikitamikhaylov@clickhouse.com>
Date: Mon, 15 Jul 2024 17:05:09 +0000
Subject: [PATCH 067/139] Fix style

---
 src/Client/ClientBase.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/Client/ClientBase.cpp b/src/Client/ClientBase.cpp
index 9cf3b955d26..56685f9d3f4 100644
--- a/src/Client/ClientBase.cpp
+++ b/src/Client/ClientBase.cpp
@@ -88,12 +88,6 @@
 namespace fs = std::filesystem;
 using namespace std::literals;
 
-
-namespace CurrentMetrics
-{
-    extern const Metric MemoryTracking;
-}
-
 namespace DB
 {
 

From af2c9fcaaf4e2f38c9db105c246ee24b095b256f Mon Sep 17 00:00:00 2001
From: Nikita Mikhaylov <nikitamikhaylov@clickhouse.com>
Date: Mon, 15 Jul 2024 18:18:42 +0000
Subject: [PATCH 068/139] Skip file

---
 utils/check-style/check-style | 1 +
 1 file changed, 1 insertion(+)

diff --git a/utils/check-style/check-style b/utils/check-style/check-style
index 380656cd1ca..3c959617d02 100755
--- a/utils/check-style/check-style
+++ b/utils/check-style/check-style
@@ -318,6 +318,7 @@ std_cerr_cout_excludes=(
     src/Interpreters/Context.cpp
     # IProcessor::dump()
     src/Processors/IProcessor.cpp
+    src/Client/ClientApplicationBase.cpp
     src/Client/ClientBase.cpp
     src/Client/LineReader.cpp
     src/Client/QueryFuzzer.cpp

From 8ba85074e74f403b3d5106f6ef811019075cefb4 Mon Sep 17 00:00:00 2001
From: Nikita Mikhaylov <nikitamikhaylov@clickhouse.com>
Date: Fri, 19 Jul 2024 12:25:17 +0000
Subject: [PATCH 069/139] Fix build

---
 src/Client/ClientApplicationBase.cpp | 16 +++++++++++++++-
 src/Client/ClientApplicationBase.h   | 11 +++++++++++
 src/Client/ClientBase.cpp            | 14 +-------------
 src/Client/ClientBase.h              | 10 ----------
 4 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/src/Client/ClientApplicationBase.cpp b/src/Client/ClientApplicationBase.cpp
index 59c98983694..6b19898ef5c 100644
--- a/src/Client/ClientApplicationBase.cpp
+++ b/src/Client/ClientApplicationBase.cpp
@@ -6,6 +6,7 @@
 #include <Common/clearPasswordFromCommandLine.h>
 #include <Common/TerminalSize.h>
 #include <Common/Exception.h>
+#include <Common/SignalHandlers.h>
 
 #include <Common/config_version.h>
 #include "config.h"
@@ -51,7 +52,20 @@ void interruptSignalHandler(int signum)
         safeExit(128 + signum);
 }
 
-ClientApplicationBase::~ClientApplicationBase() = default;
+ClientApplicationBase::~ClientApplicationBase()
+{
+    try
+    {
+        writeSignalIDtoSignalPipe(SignalListener::StopThread);
+        signal_listener_thread.join();
+        HandledSignals::instance().reset();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
+}
+
 ClientApplicationBase::ClientApplicationBase() : ClientBase(STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO, std::cin, std::cout, std::cerr) {}
 
 ClientApplicationBase & ClientApplicationBase::getInstance()
diff --git a/src/Client/ClientApplicationBase.h b/src/Client/ClientApplicationBase.h
index 217fa29c3f4..771bb948cb7 100644
--- a/src/Client/ClientApplicationBase.h
+++ b/src/Client/ClientApplicationBase.h
@@ -6,6 +6,10 @@
 #include <Client/Suggest.h>
 #include <Common/NamePrompter.h>
 #include <Common/QueryFuzzer.h>
+#include <Poco/ConsoleChannel.h>
+#include <Poco/SimpleFileChannel.h>
+#include <Poco/SplitterChannel.h>
+
 #include <boost/program_options.hpp>
 
 #include <vector>
@@ -48,6 +52,13 @@ private:
     void parseAndCheckOptions(OptionsDescription & options_description, po::variables_map & options, Arguments & arguments);
 
     std::vector<String> cmd_options;
+
+    LoggerPtr fatal_log;
+    Poco::AutoPtr<Poco::SplitterChannel> fatal_channel_ptr;
+    Poco::AutoPtr<Poco::Channel> fatal_console_channel_ptr;
+    Poco::AutoPtr<Poco::Channel> fatal_file_channel_ptr;
+    Poco::Thread signal_listener_thread;
+    std::unique_ptr<Poco::Runnable> signal_listener;
 };
 
 
diff --git a/src/Client/ClientBase.cpp b/src/Client/ClientBase.cpp
index 56685f9d3f4..85dfb767e75 100644
--- a/src/Client/ClientBase.cpp
+++ b/src/Client/ClientBase.cpp
@@ -258,19 +258,7 @@ public:
 };
 
 
-ClientBase::~ClientBase()
-{
-    try
-    {
-        writeSignalIDtoSignalPipe(SignalListener::StopThread);
-        signal_listener_thread.join();
-        HandledSignals::instance().reset();
-    }
-    catch (...)
-    {
-        tryLogCurrentException(__PRETTY_FUNCTION__);
-    }
-}
+ClientBase::~ClientBase() = default;
 
 ClientBase::ClientBase(
     int in_fd_,
diff --git a/src/Client/ClientBase.h b/src/Client/ClientBase.h
index 557ac30d27c..304d8c4b890 100644
--- a/src/Client/ClientBase.h
+++ b/src/Client/ClientBase.h
@@ -9,9 +9,6 @@
 #include <Common/Stopwatch.h>
 #include <Core/ExternalTable.h>
 #include <Core/Settings.h>
-#include <Poco/ConsoleChannel.h>
-#include <Poco/SimpleFileChannel.h>
-#include <Poco/SplitterChannel.h>
 #include <Interpreters/Context.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Poco/Util/Application.h>
@@ -253,13 +250,6 @@ protected:
     /// Client context is a context used only by the client to parse queries, process query parameters and to connect to clickhouse-server.
     ContextMutablePtr client_context;
 
-    LoggerPtr fatal_log;
-    Poco::AutoPtr<Poco::SplitterChannel> fatal_channel_ptr;
-    Poco::AutoPtr<Poco::Channel> fatal_console_channel_ptr;
-    Poco::AutoPtr<Poco::Channel> fatal_file_channel_ptr;
-    Poco::Thread signal_listener_thread;
-    std::unique_ptr<Poco::Runnable> signal_listener;
-
     bool is_interactive = false; /// Use either interactive line editing interface or batch mode.
     bool delayed_interactive = false;
 

From 49dc30d5c28392d361ce0ef1e18f7db73841617f Mon Sep 17 00:00:00 2001
From: Nikita Mikhaylov <nikitamikhaylov@clickhouse.com>
Date: Wed, 24 Jul 2024 21:42:36 +0000
Subject: [PATCH 070/139] Small adjustement

---
 src/Client/ClientApplicationBase.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Client/ClientApplicationBase.cpp b/src/Client/ClientApplicationBase.cpp
index 6b19898ef5c..0306468d084 100644
--- a/src/Client/ClientApplicationBase.cpp
+++ b/src/Client/ClientApplicationBase.cpp
@@ -48,8 +48,13 @@ static ClientInfo::QueryKind parseQueryKind(const String & query_kind)
 /// This signal handler is set only for SIGINT and SIGQUIT.
 void interruptSignalHandler(int signum)
 {
-    if (ClientApplicationBase::getInstance().tryStopQuery())
-        safeExit(128 + signum);
+    /// Signal handler might be called even before the setup is fully finished
+    /// and client application started to process the query.
+    /// Because of that we have to manually check it.
+    if (auto * instance = ClientApplicationBase::instanceRawPtr(); instance)
+        if (auto * base = dynamic_cast<ClientApplicationBase *>(instance); base)
+            if (base->tryStopQuery())
+                safeExit(128 + signum);
 }
 
 ClientApplicationBase::~ClientApplicationBase()

From c7c1f10720cd194d85de6d81156cbd37304ab52b Mon Sep 17 00:00:00 2001
From: Nikita Mikhaylov <nikitamikhaylov@clickhouse.com>
Date: Wed, 24 Jul 2024 21:45:16 +0000
Subject: [PATCH 071/139] Added new method

---
 base/poco/Util/include/Poco/Util/Application.h | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/base/poco/Util/include/Poco/Util/Application.h b/base/poco/Util/include/Poco/Util/Application.h
index c8d18e1bce9..d1a2021eb67 100644
--- a/base/poco/Util/include/Poco/Util/Application.h
+++ b/base/poco/Util/include/Poco/Util/Application.h
@@ -261,6 +261,11 @@ namespace Util
         ///
         /// Throws a NullPointerException if no Application instance exists.
 
+        static Application * instanceRawPtr();
+        /// Returns a raw pointer to the Application sigleton.
+        ///
+        /// The caller should check whether the result is nullptr.
+
         const Poco::Timestamp & startTime() const;
         /// Returns the application start time (UTC).
 
@@ -448,6 +453,12 @@ namespace Util
     }
 
 
+    inline Application * Application::instanceRawPtr()
+    {
+        return _pInstance;
+    }
+
+
     inline const Poco::Timestamp & Application::startTime() const
     {
         return _startTime;

From 6f068639db627944aaab978c79866ad5a2a234e7 Mon Sep 17 00:00:00 2001
From: Nikita Mikhaylov <nikitamikhaylov@clickhouse.com>
Date: Thu, 25 Jul 2024 16:38:26 +0000
Subject: [PATCH 072/139] Better

---
 src/Client/ClientApplicationBase.h | 1 -
 src/Client/ClientBase.h            | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Client/ClientApplicationBase.h b/src/Client/ClientApplicationBase.h
index 771bb948cb7..3663271dd25 100644
--- a/src/Client/ClientApplicationBase.h
+++ b/src/Client/ClientApplicationBase.h
@@ -5,7 +5,6 @@
 #include <Client/ClientBase.h>
 #include <Client/Suggest.h>
 #include <Common/NamePrompter.h>
-#include <Common/QueryFuzzer.h>
 #include <Poco/ConsoleChannel.h>
 #include <Poco/SimpleFileChannel.h>
 #include <Poco/SplitterChannel.h>
diff --git a/src/Client/ClientBase.h b/src/Client/ClientBase.h
index 304d8c4b890..175ebe97075 100644
--- a/src/Client/ClientBase.h
+++ b/src/Client/ClientBase.h
@@ -2,6 +2,7 @@
 
 
 #include <Client/Suggest.h>
+#include <Client/QueryFuzzer.h>
 #include <Common/DNSResolver.h>
 #include <Common/InterruptListener.h>
 #include <Common/ProgressIndication.h>
@@ -9,9 +10,13 @@
 #include <Common/Stopwatch.h>
 #include <Core/ExternalTable.h>
 #include <Core/Settings.h>
+#include <Poco/ConsoleChannel.h>
+#include <Poco/SimpleFileChannel.h>
+#include <Poco/SplitterChannel.h>
 #include <Interpreters/Context.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Poco/Util/Application.h>
+
 #include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/SelectQueryInfo.h>
 #include <Storages/StorageFile.h>

From a457db34b216ea987a4875a3cbeb5363878d5d5a Mon Sep 17 00:00:00 2001
From: Nikita Mikhaylov <nikitamikhaylov@clickhouse.com>
Date: Thu, 25 Jul 2024 16:58:41 +0000
Subject: [PATCH 073/139] Fixed a typo

---
 base/poco/Util/include/Poco/Util/Application.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base/poco/Util/include/Poco/Util/Application.h b/base/poco/Util/include/Poco/Util/Application.h
index d1a2021eb67..786e331fe73 100644
--- a/base/poco/Util/include/Poco/Util/Application.h
+++ b/base/poco/Util/include/Poco/Util/Application.h
@@ -262,7 +262,7 @@ namespace Util
         /// Throws a NullPointerException if no Application instance exists.
 
         static Application * instanceRawPtr();
-        /// Returns a raw pointer to the Application sigleton.
+        /// Returns a raw pointer to the Application singleton.
         ///
         /// The caller should check whether the result is nullptr.
 

From 2f255dc68d2cffb8bc17efc153a9e75a9166675d Mon Sep 17 00:00:00 2001
From: Nikita Mikhaylov <mikhaylovnikitka@gmail.com>
Date: Fri, 26 Jul 2024 01:11:40 +0200
Subject: [PATCH 074/139] Fix clang-tidy

---
 src/Client/ClientBase.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Client/ClientBase.h b/src/Client/ClientBase.h
index 175ebe97075..1a23b6b1363 100644
--- a/src/Client/ClientBase.h
+++ b/src/Client/ClientBase.h
@@ -95,7 +95,7 @@ public:
     virtual ~ClientBase();
 
     bool tryStopQuery() { return query_interrupt_handler.tryStop(); }
-    void stopQuery() { return query_interrupt_handler.stop(); }
+    void stopQuery() { query_interrupt_handler.stop(); }
 
     ASTPtr parseQuery(const char *& pos, const char * end, const Settings & settings, bool allow_multi_statements);
 

From 9b4accebb3d19789e69b422ae2f235149e453f94 Mon Sep 17 00:00:00 2001
From: Nikita Mikhaylov <nikitamikhaylov@clickhouse.com>
Date: Mon, 29 Jul 2024 15:47:52 +0000
Subject: [PATCH 075/139] Fix build

---
 src/Client/ClientApplicationBase.cpp    | 162 ------------------------
 src/Client/ClientBaseOptimizedParts.cpp |   4 +-
 2 files changed, 2 insertions(+), 164 deletions(-)

diff --git a/src/Client/ClientApplicationBase.cpp b/src/Client/ClientApplicationBase.cpp
index 0306468d084..4aa8b6c0bbe 100644
--- a/src/Client/ClientApplicationBase.cpp
+++ b/src/Client/ClientApplicationBase.cpp
@@ -102,168 +102,6 @@ void ClientApplicationBase::setupSignalHandler()
         throw ErrnoException(ErrorCodes::CANNOT_SET_SIGNAL_HANDLER, "Cannot set signal handler");
 }
 
-
-namespace
-{
-
-/// Define transparent hash to we can use
-/// std::string_view with the containers
-struct TransparentStringHash
-{
-    using is_transparent = void;
-    size_t operator()(std::string_view txt) const
-    {
-        return std::hash<std::string_view>{}(txt);
-    }
-};
-
-/*
- * This functor is used to parse command line arguments and replace dashes with underscores,
- * allowing options to be specified using either dashes or underscores.
- */
-class OptionsAliasParser
-{
-public:
-    explicit OptionsAliasParser(const boost::program_options::options_description& options)
-    {
-        options_names.reserve(options.options().size());
-        for (const auto& option : options.options())
-            options_names.insert(option->long_name());
-    }
-
-    /*
-     * Parses arguments by replacing dashes with underscores, and matches the resulting name with known options
-     * Implements boost::program_options::ext_parser logic
-     */
-    std::pair<std::string, std::string> operator()(const std::string & token) const
-    {
-        if (!token.starts_with("--"))
-            return {};
-        std::string arg = token.substr(2);
-
-        // divide token by '=' to separate key and value if options style=long_allow_adjacent
-        auto pos_eq = arg.find('=');
-        std::string key = arg.substr(0, pos_eq);
-
-        if (options_names.contains(key))
-            // option does not require any changes, because it is already correct
-            return {};
-
-        std::replace(key.begin(), key.end(), '-', '_');
-        if (!options_names.contains(key))
-            // after replacing '-' with '_' argument is still unknown
-            return {};
-
-        std::string value;
-        if (pos_eq != std::string::npos && pos_eq < arg.size())
-            value = arg.substr(pos_eq + 1);
-
-        return {key, value};
-    }
-
-private:
-    std::unordered_set<std::string> options_names;
-};
-
-}
-
-/// Enable optimizations even in debug builds because otherwise options parsing becomes extremely slow affecting .sh tests
-#if defined(__clang__)
-#pragma clang optimize on
-#endif
-void ClientApplicationBase::parseAndCheckOptions(OptionsDescription & options_description, po::variables_map & options, Arguments & arguments)
-{
-    if (allow_repeated_settings)
-        addProgramOptionsAsMultitokens(cmd_settings, options_description.main_description.value());
-    else
-        addProgramOptions(cmd_settings, options_description.main_description.value());
-
-    if (allow_merge_tree_settings)
-    {
-        /// Add merge tree settings manually, because names of some settings
-        /// may clash. Query settings have higher priority and we just
-        /// skip ambiguous merge tree settings.
-        auto & main_options = options_description.main_description.value();
-
-        std::unordered_set<std::string, TransparentStringHash, std::equal_to<>> main_option_names;
-        for (const auto & option : main_options.options())
-            main_option_names.insert(option->long_name());
-
-        for (const auto & setting : cmd_merge_tree_settings.all())
-        {
-            const auto add_setting = [&](const std::string_view name)
-            {
-                if (auto it = main_option_names.find(name); it != main_option_names.end())
-                    return;
-
-                if (allow_repeated_settings)
-                    addProgramOptionAsMultitoken(cmd_merge_tree_settings, main_options, name, setting);
-                else
-                    addProgramOption(cmd_merge_tree_settings, main_options, name, setting);
-            };
-
-            const auto & setting_name = setting.getName();
-
-            add_setting(setting_name);
-
-            const auto & settings_to_aliases = MergeTreeSettings::Traits::settingsToAliases();
-            if (auto it = settings_to_aliases.find(setting_name); it != settings_to_aliases.end())
-            {
-                for (const auto alias : it->second)
-                {
-                    add_setting(alias);
-                }
-            }
-        }
-    }
-
-    /// Parse main commandline options.
-    auto parser = po::command_line_parser(arguments)
-                      .options(options_description.main_description.value())
-                      .extra_parser(OptionsAliasParser(options_description.main_description.value()))
-                      .allow_unregistered();
-    po::parsed_options parsed = parser.run();
-
-    /// Check unrecognized options without positional options.
-    auto unrecognized_options = po::collect_unrecognized(parsed.options, po::collect_unrecognized_mode::exclude_positional);
-    if (!unrecognized_options.empty())
-    {
-        auto hints = this->getHints(unrecognized_options[0]);
-        if (!hints.empty())
-            throw Exception(ErrorCodes::UNRECOGNIZED_ARGUMENTS, "Unrecognized option '{}'. Maybe you meant {}",
-                            unrecognized_options[0], toString(hints));
-
-        throw Exception(ErrorCodes::UNRECOGNIZED_ARGUMENTS, "Unrecognized option '{}'", unrecognized_options[0]);
-    }
-
-    /// Check positional options.
-    for (const auto & op : parsed.options)
-    {
-        if (!op.unregistered && op.string_key.empty() && !op.original_tokens[0].starts_with("--")
-            && !op.original_tokens[0].empty() && !op.value.empty())
-        {
-            /// Two special cases for better usability:
-            /// - if the option contains a whitespace, it might be a query: clickhouse "SELECT 1"
-            /// These are relevant for interactive usage - user-friendly, but questionable in general.
-            /// In case of ambiguity or for scripts, prefer using proper options.
-
-            const auto & token = op.original_tokens[0];
-            po::variable_value value(boost::any(op.value), false);
-
-            const char * option;
-            if (token.contains(' '))
-                option = "query";
-            else
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Positional option `{}` is not supported.", token);
-
-            if (!options.emplace(option, value).second)
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Positional option `{}` is not supported.", token);
-        }
-    }
-
-    po::store(parsed, options);
-}
-
 void ClientApplicationBase::addMultiquery(std::string_view query, Arguments & common_arguments) const
 {
     common_arguments.emplace_back("--multiquery");
diff --git a/src/Client/ClientBaseOptimizedParts.cpp b/src/Client/ClientBaseOptimizedParts.cpp
index 421843a0e79..297b8e7ce51 100644
--- a/src/Client/ClientBaseOptimizedParts.cpp
+++ b/src/Client/ClientBaseOptimizedParts.cpp
@@ -1,4 +1,4 @@
-#include <Client/ClientBase.h>
+#include <Client/ClientApplicationBase.h>
 #include <Core/BaseSettingsProgramOptions.h>
 
 namespace DB
@@ -80,7 +80,7 @@ private:
 
 }
 
-void ClientBase::parseAndCheckOptions(OptionsDescription & options_description, po::variables_map & options, Arguments & arguments)
+void ClientApplicationBase::parseAndCheckOptions(OptionsDescription & options_description, po::variables_map & options, Arguments & arguments)
 {
     if (allow_repeated_settings)
         addProgramOptionsAsMultitokens(cmd_settings, options_description.main_description.value());

From 6f16ca02a74a81956b7524958c5f94eb7a2c7bf5 Mon Sep 17 00:00:00 2001
From: Nikita Mikhaylov <nikitamikhaylov@clickhouse.com>
Date: Mon, 29 Jul 2024 16:14:31 +0000
Subject: [PATCH 076/139] Fixed Style Check

---
 src/Client/ClientApplicationBase.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Client/ClientApplicationBase.cpp b/src/Client/ClientApplicationBase.cpp
index 4aa8b6c0bbe..9f133616d2e 100644
--- a/src/Client/ClientApplicationBase.cpp
+++ b/src/Client/ClientApplicationBase.cpp
@@ -31,7 +31,6 @@ namespace ErrorCodes
 {
     extern const int BAD_ARGUMENTS;
     extern const int CANNOT_SET_SIGNAL_HANDLER;
-    extern const int UNRECOGNIZED_ARGUMENTS;
 }
 
 static ClientInfo::QueryKind parseQueryKind(const String & query_kind)

From 8dfe4a93f6c1afde8475984a899cd5604f415d78 Mon Sep 17 00:00:00 2001
From: Vitaly Baranov <vitlibar@clickhouse.com>
Date: Mon, 29 Jul 2024 22:07:10 +0200
Subject: [PATCH 077/139] Rewrite function get_broken_projections_info()
 without using system.errors

---
 .../test_broken_projections/test.py           | 86 +++++++++----------
 1 file changed, 42 insertions(+), 44 deletions(-)

diff --git a/tests/integration/test_broken_projections/test.py b/tests/integration/test_broken_projections/test.py
index 2cbbee5563f..9493937d936 100644
--- a/tests/integration/test_broken_projections/test.py
+++ b/tests/integration/test_broken_projections/test.py
@@ -148,23 +148,22 @@ def break_part(node, table, part):
     bash(node, f"rm '{part_path}/columns.txt'")
 
 
-def get_broken_projections_info(node, table, active=True):
+def get_broken_projections_info(node, table, part=None, projection=None, active=True):
+    parent_name_filter = f" AND parent_name = '{part}'" if part else ""
+    name_filter = f" AND name = '{projection}'" if projection else ""
     return node.query(
         f"""
-    SELECT parent_name, name, errors.name FROM
-    (
-        SELECT parent_name, name, exception_code
+    SELECT parent_name, name, exception
         FROM system.projection_parts
         WHERE table='{table}'
         AND database=currentDatabase()
         AND is_broken = 1
         AND active = {active}
-    ) AS parts_info
-    INNER JOIN system.errors AS errors
-    ON parts_info.exception_code = errors.code
+        {parent_name_filter}
+        {name_filter}
     ORDER BY parent_name, name
     """
-    ).strip()
+    )
 
 
 def get_projections_info(node, table):
@@ -312,8 +311,8 @@ def test_broken_ignored(cluster):
 
     # Projection 'proj1' from part all_2_2_0 will now appear in broken parts info
     # because it was marked broken during "check table" query.
-    assert "all_2_2_0\tproj1\tFILE_DOESNT_EXIST" in get_broken_projections_info(
-        node, table_name
+    assert "FILE_DOESNT_EXIST" in get_broken_projections_info(
+        node, table_name, part="all_2_2_0", projection="proj1"
     )
 
     # Check table query will also show a list of parts which have broken projections.
@@ -323,14 +322,14 @@ def test_broken_ignored(cluster):
     break_projection(node, table_name, "proj2", "all_2_2_0", "data")
 
     # It will not yet appear in broken projections info.
-    assert "proj2" not in get_broken_projections_info(node, table_name)
+    assert not get_broken_projections_info(node, table_name, projection="proj2")
 
     # Select now fails with error "File doesn't exist"
     check(node, table_name, 0, "proj2", "FILE_DOESNT_EXIST")
 
     # Projection 'proj2' from part all_2_2_0 will now appear in broken parts info.
-    assert "all_2_2_0\tproj2\tNO_FILE_IN_DATA_PART" in get_broken_projections_info(
-        node, table_name
+    assert "NO_FILE_IN_DATA_PART" in get_broken_projections_info(
+        node, table_name, part="all_2_2_0", projection="proj2"
     )
 
     # Second select works, because projection is now marked as broken.
@@ -340,7 +339,7 @@ def test_broken_ignored(cluster):
     break_projection(node, table_name, "proj2", "all_3_3_0", "data")
 
     # It will not yet appear in broken projections info.
-    assert "all_3_3_0" not in get_broken_projections_info(node, table_name)
+    assert not get_broken_projections_info(node, table_name, part="all_3_3_0")
 
     insert(node, table_name, 20, 5)
     insert(node, table_name, 25, 5)
@@ -371,8 +370,8 @@ def test_broken_ignored(cluster):
         node, table_name
     )
 
-    assert "all_3_3_0" in get_broken_projections_info(node, table_name, active=False)
-    assert "all_2_2_0" in get_broken_projections_info(node, table_name, active=True)
+    assert get_broken_projections_info(node, table_name, part="all_3_3_0", active=False)
+    assert get_broken_projections_info(node, table_name, part="all_2_2_0", active=True)
 
     # 0 because of all_2_2_0
     check(node, table_name, 0)
@@ -396,8 +395,8 @@ def test_materialize_broken_projection(cluster):
     break_projection(node, table_name, "proj1", "all_1_1_0", "metadata")
     reattach(node, table_name)
 
-    assert "all_1_1_0\tproj1\tNO_FILE_IN_DATA_PART" in get_broken_projections_info(
-        node, table_name
+    assert "NO_FILE_IN_DATA_PART" in get_broken_projections_info(
+        node, table_name, part="all_1_1_0", projection="proj1"
     )
     assert "Part all_1_1_0 has a broken projection proj1" in check_table_full(
         node, table_name
@@ -406,8 +405,8 @@ def test_materialize_broken_projection(cluster):
     break_projection(node, table_name, "proj2", "all_1_1_0", "data")
     reattach(node, table_name)
 
-    assert "all_1_1_0\tproj2\tFILE_DOESNT_EXIST" in get_broken_projections_info(
-        node, table_name
+    assert "FILE_DOESNT_EXIST" in get_broken_projections_info(
+        node, table_name, part="all_1_1_0", projection="proj2"
     )
     assert "Part all_1_1_0 has a broken projection proj2" in check_table_full(
         node, table_name
@@ -469,8 +468,8 @@ def test_broken_projections_in_backups_2(cluster):
     break_projection(node, table_name, "proj2", "all_2_2_0", "part")
     check(node, table_name, 0, "proj2", "ErrnoException")
 
-    assert "all_2_2_0\tproj2\tFILE_DOESNT_EXIST" == get_broken_projections_info(
-        node, table_name
+    assert "FILE_DOESNT_EXIST" in get_broken_projections_info(
+        node, table_name, part="all_2_2_0", projection="proj2"
     )
 
     assert "FILE_DOESNT_EXIST" in node.query_and_get_error(
@@ -524,8 +523,8 @@ def test_broken_projections_in_backups_3(cluster):
     assert "Part all_1_1_0 has a broken projection proj1" in check_table_full(
         node, table_name
     )
-    assert "all_1_1_0\tproj1\tFILE_DOESNT_EXIST" == get_broken_projections_info(
-        node, table_name
+    assert "FILE_DOESNT_EXIST" in get_broken_projections_info(
+        node, table_name, part="all_1_1_0", projection="proj1"
     )
 
     backup_name = f"b4-{get_random_string()}"
@@ -545,8 +544,11 @@ def test_broken_projections_in_backups_3(cluster):
     )
 
     check(node, table_name, 0)
-    assert "all_1_1_0\tproj1\tNO_FILE_IN_DATA_PART" == get_broken_projections_info(
-        node, table_name
+    assert (
+        "Projection directory proj1.proj does not exist while loading projections"
+        in get_broken_projections_info(
+            node, table_name, part="all_1_1_0", projection="proj1"
+        )
     )
 
 
@@ -569,7 +571,7 @@ def test_check_part_thread(cluster):
     break_projection(node, table_name, "proj2", "all_2_2_0", "data")
 
     # It will not yet appear in broken projections info.
-    assert "proj2" not in get_broken_projections_info(node, table_name)
+    assert not get_broken_projections_info(node, table_name, projection="proj2")
 
     # Select now fails with error "File doesn't exist"
     check(node, table_name, 0, "proj2", "FILE_DOESNT_EXIST", do_check_command=False)
@@ -606,15 +608,15 @@ def test_broken_on_start(cluster):
     break_projection(node, table_name, "proj2", "all_2_2_0", "data")
 
     # It will not yet appear in broken projections info.
-    assert "proj2" not in get_broken_projections_info(node, table_name)
+    assert not get_broken_projections_info(node, table_name, projection="proj2")
 
     # Select now fails with error "File doesn't exist"
     # We will mark projection as broken.
     check(node, table_name, 0, "proj2", "FILE_DOESNT_EXIST")
 
     # Projection 'proj2' from part all_2_2_0 will now appear in broken parts info.
-    assert "all_2_2_0\tproj2\tNO_FILE_IN_DATA_PART" in get_broken_projections_info(
-        node, table_name
+    assert "NO_FILE_IN_DATA_PART" in get_broken_projections_info(
+        node, table_name, part="all_2_2_0", projection="proj2"
     )
 
     # Second select works, because projection is now marked as broken.
@@ -623,7 +625,7 @@ def test_broken_on_start(cluster):
     node.restart_clickhouse()
 
     # It will not yet appear in broken projections info.
-    assert "proj2" in get_broken_projections_info(node, table_name)
+    assert get_broken_projections_info(node, table_name, projection="proj2")
 
     # Select works
     check(node, table_name, 0)
@@ -654,7 +656,7 @@ def test_mutation_with_broken_projection(cluster):
         node, table_name
     )
 
-    assert "" == get_broken_projections_info(node, table_name)
+    assert not get_broken_projections_info(node, table_name)
 
     check(node, table_name, 1)
 
@@ -662,21 +664,21 @@ def test_mutation_with_broken_projection(cluster):
     break_projection(node, table_name, "proj2", "all_2_2_0_4", "data")
 
     # It will not yet appear in broken projections info.
-    assert "proj2" not in get_broken_projections_info(node, table_name)
+    assert not get_broken_projections_info(node, table_name, projection="proj2")
 
     # Select now fails with error "File doesn't exist"
     # We will mark projection as broken.
     check(node, table_name, 0, "proj2", "FILE_DOESNT_EXIST")
 
     # Projection 'proj2' from part all_2_2_0_4 will now appear in broken parts info.
-    assert "all_2_2_0_4\tproj2\tNO_FILE_IN_DATA_PART" in get_broken_projections_info(
-        node, table_name
+    assert "NO_FILE_IN_DATA_PART" in get_broken_projections_info(
+        node, table_name, part="all_2_2_0_4", projection="proj2"
     )
 
     # Second select works, because projection is now marked as broken.
     check(node, table_name, 0)
 
-    assert "all_2_2_0_4" in get_broken_projections_info(node, table_name)
+    assert get_broken_projections_info(node, table_name, part="all_2_2_0_4")
 
     node.query(
         f"ALTER TABLE {table_name} DELETE WHERE _part == 'all_0_0_0_4' SETTINGS mutations_sync = 1"
@@ -690,14 +692,10 @@ def test_mutation_with_broken_projection(cluster):
 
     # Still broken because it was hardlinked.
     broken = get_broken_projections_info(node, table_name)
-    assert (
-        "all_2_2_0_5" in broken or "" == broken
-    )  # second could be because of a merge.
+    if broken:  # can be not broken because of a merge.
+        assert get_broken_projections_info(node, table_name, part="all_2_2_0_5")
 
-    if "" == broken:
-        check(node, table_name, 1)
-    else:
-        check(node, table_name, 0)
+    check(node, table_name, not broken)
 
     node.query(
         f"ALTER TABLE {table_name} DELETE WHERE c == 13 SETTINGS mutations_sync = 1"
@@ -710,6 +708,6 @@ def test_mutation_with_broken_projection(cluster):
     )
 
     # Not broken anymore.
-    assert "" == get_broken_projections_info(node, table_name)
+    assert not get_broken_projections_info(node, table_name)
 
     check(node, table_name, 1)

From f94bebb0530b7a9fdd3db104ad4261a467fafad3 Mon Sep 17 00:00:00 2001
From: Yakov Olkhovskiy <yakov@clickhouse.com>
Date: Mon, 29 Jul 2024 22:36:59 +0000
Subject: [PATCH 078/139] fix

---
 docs/en/sql-reference/window-functions/lagInFrame.md  | 2 +-
 docs/en/sql-reference/window-functions/leadInFrame.md | 2 +-
 src/Processors/Transforms/WindowTransform.cpp         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/en/sql-reference/window-functions/lagInFrame.md b/docs/en/sql-reference/window-functions/lagInFrame.md
index 049e095c10f..de6e9005baa 100644
--- a/docs/en/sql-reference/window-functions/lagInFrame.md
+++ b/docs/en/sql-reference/window-functions/lagInFrame.md
@@ -23,7 +23,7 @@ For more detail on window function syntax see: [Window Functions - Syntax](./ind
 **Parameters**
 - `x` — Column name. 
 - `offset` — Offset to apply. [(U)Int*](../data-types/int-uint.md). (Optional - `1` by default).
-- `default` — Value to return if calculated row exceeds the boundaries of the window frame. (Optional - `null` by default).
+- `default` — Value to return if calculated row exceeds the boundaries of the window frame. (Optional - default value of column type when omitted).
 
 **Returned value**
 
diff --git a/docs/en/sql-reference/window-functions/leadInFrame.md b/docs/en/sql-reference/window-functions/leadInFrame.md
index fc1b92cc266..4a82c03f6e6 100644
--- a/docs/en/sql-reference/window-functions/leadInFrame.md
+++ b/docs/en/sql-reference/window-functions/leadInFrame.md
@@ -23,7 +23,7 @@ For more detail on window function syntax see: [Window Functions - Syntax](./ind
 **Parameters**
 - `x` — Column name.
 - `offset` — Offset to apply. [(U)Int*](../data-types/int-uint.md). (Optional - `1` by default).
-- `default` — Value to return if calculated row exceeds the boundaries of the window frame. (Optional - `null` by default).
+- `default` — Value to return if calculated row exceeds the boundaries of the window frame. (Optional - default value of column type when omitted).
 
 **Returned value**
 
diff --git a/src/Processors/Transforms/WindowTransform.cpp b/src/Processors/Transforms/WindowTransform.cpp
index 1eac08780e9..f76e2d64368 100644
--- a/src/Processors/Transforms/WindowTransform.cpp
+++ b/src/Processors/Transforms/WindowTransform.cpp
@@ -2408,7 +2408,7 @@ struct WindowFunctionLagLeadInFrame final : public WindowFunction
         if (argument_types[0]->equals(*argument_types[2]))
             return;
 
-        const auto supertype = getLeastSupertype(DataTypes{argument_types[0], argument_types[2]});
+        const auto supertype = tryGetLeastSupertype(DataTypes{argument_types[0], argument_types[2]});
         if (!supertype)
         {
             throw Exception(ErrorCodes::BAD_ARGUMENTS,

From 2aafd711463d30cb7803a054f434268335817db8 Mon Sep 17 00:00:00 2001
From: Nikita Mikhaylov <nikitamikhaylov@clickhouse.com>
Date: Fri, 26 Jul 2024 19:08:07 +0200
Subject: [PATCH 079/139] Moved settings to ServerSettings and made the table
 drop even faster

(cherry picked from commit e1eb542dcc2b9fbc6a470a3cd9a183e79c86d7c7)
---
 programs/local/LocalServer.cpp            |  5 +++
 programs/server/Server.cpp                |  5 +++
 src/Core/ServerSettings.cpp               |  2 +-
 src/Core/ServerSettings.h                 |  9 ++++
 src/IO/SharedThreadPools.cpp              | 10 +++++
 src/IO/SharedThreadPools.h                |  3 ++
 src/Interpreters/DatabaseCatalog.cpp      | 50 ++++++++++-------------
 src/Interpreters/DatabaseCatalog.h        | 15 -------
 src/Interpreters/InterpreterDropQuery.cpp | 19 +++++++--
 9 files changed, 70 insertions(+), 48 deletions(-)

diff --git a/programs/local/LocalServer.cpp b/programs/local/LocalServer.cpp
index 88d5a0253d1..250c5e3b6c8 100644
--- a/programs/local/LocalServer.cpp
+++ b/programs/local/LocalServer.cpp
@@ -184,6 +184,11 @@ void LocalServer::initialize(Poco::Util::Application & self)
         cleanup_threads,
         0, // We don't need any threads one all the parts will be deleted
         cleanup_threads);
+
+    getDatabaseCatalogDropTablesThreadPool().initialize(
+        server_settings.database_catalog_drop_table_concurrency,
+        0, // We don't need any threads if there are no DROP queries.
+        server_settings.database_catalog_drop_table_concurrency);
 }
 
 
diff --git a/programs/server/Server.cpp b/programs/server/Server.cpp
index 16888015f8b..dd56114de0f 100644
--- a/programs/server/Server.cpp
+++ b/programs/server/Server.cpp
@@ -1035,6 +1035,11 @@ try
         0, // We don't need any threads once all the tables will be created
         max_database_replicated_create_table_thread_pool_size);
 
+    getDatabaseCatalogDropTablesThreadPool().initialize(
+        server_settings.database_catalog_drop_table_concurrency,
+        0, // We don't need any threads if there are no DROP queries.
+        server_settings.database_catalog_drop_table_concurrency);
+
     /// Initialize global local cache for remote filesystem.
     if (config().has("local_cache_for_remote_fs"))
     {
diff --git a/src/Core/ServerSettings.cpp b/src/Core/ServerSettings.cpp
index fbf86d3e9ad..6c498014996 100644
--- a/src/Core/ServerSettings.cpp
+++ b/src/Core/ServerSettings.cpp
@@ -1,4 +1,4 @@
-#include "ServerSettings.h"
+#include <Core/ServerSettings.h>
 #include <Poco/Util/AbstractConfiguration.h>
 
 namespace DB
diff --git a/src/Core/ServerSettings.h b/src/Core/ServerSettings.h
index 28b32a6e6a5..f2f78f70e91 100644
--- a/src/Core/ServerSettings.h
+++ b/src/Core/ServerSettings.h
@@ -66,6 +66,15 @@ namespace DB
     M(Bool, async_insert_queue_flush_on_shutdown, true, "If true queue of asynchronous inserts is flushed on graceful shutdown", 0) \
     M(Bool, ignore_empty_sql_security_in_create_view_query, true, "If true, ClickHouse doesn't write defaults for empty SQL security statement in CREATE VIEW queries. This setting is only necessary for the migration period and will become obsolete in 24.4", 0)  \
     \
+    /* Database Catalog */ \
+    M(UInt64, database_atomic_delay_before_drop_table_sec, 8 * 60, "The delay during which a dropped table can be restored using the UNDROP statement. If DROP TABLE ran with a SYNC modifier, the setting is ignored.", 0) \
+    M(UInt64, database_catalog_unused_dir_hide_timeout_sec, 60 * 60, "Parameter of a task that cleans up garbage from store/ directory. If some subdirectory is not used by clickhouse-server and this directory was not modified for last database_catalog_unused_dir_hide_timeout_sec seconds, the task will 'hide' this directory by removing all access rights. It also works for directories that clickhouse-server does not expect to see inside store/. Zero means 'immediately'.", 0) \
+    M(UInt64, database_catalog_unused_dir_rm_timeout_sec, 30 * 24 * 60 * 60, "Parameter of a task that cleans up garbage from store/ directory. If some subdirectory is not used by clickhouse-server and it was previously 'hidden' (see database_catalog_unused_dir_hide_timeout_sec) and this directory was not modified for last database_catalog_unused_dir_rm_timeout_sec seconds, the task will remove this directory. It also works for directories that clickhouse-server does not expect to see inside store/. Zero means 'never'.", 0) \
+    M(UInt64, database_catalog_unused_dir_cleanup_period_sec, 24 * 60 * 60, "Parameter of a task that cleans up garbage from store/ directory. Sets scheduling period of the task. Zero means 'never'.", 0) \
+    M(UInt64, database_catalog_drop_error_cooldown_sec, 5, "In case if drop table failed, ClickHouse will wait for this timeout before retrying the operation.", 0) \
+    M(UInt64, database_catalog_drop_table_concurrency, 16, "The size of the threadpool used for dropping tables.", 0) \
+    \
+    \
     M(UInt64, max_concurrent_queries, 0, "Maximum number of concurrently executed queries. Zero means unlimited.", 0) \
     M(UInt64, max_concurrent_insert_queries, 0, "Maximum number of concurrently INSERT queries. Zero means unlimited.", 0) \
     M(UInt64, max_concurrent_select_queries, 0, "Maximum number of concurrently SELECT queries. Zero means unlimited.", 0) \
diff --git a/src/IO/SharedThreadPools.cpp b/src/IO/SharedThreadPools.cpp
index 3606ddd984c..cda7bc01bbf 100644
--- a/src/IO/SharedThreadPools.cpp
+++ b/src/IO/SharedThreadPools.cpp
@@ -23,6 +23,9 @@ namespace CurrentMetrics
     extern const Metric MergeTreeUnexpectedPartsLoaderThreads;
     extern const Metric MergeTreeUnexpectedPartsLoaderThreadsActive;
     extern const Metric MergeTreeUnexpectedPartsLoaderThreadsScheduled;
+    extern const Metric DatabaseCatalogThreads;
+    extern const Metric DatabaseCatalogThreadsActive;
+    extern const Metric DatabaseCatalogThreadsScheduled;
     extern const Metric DatabaseReplicatedCreateTablesThreads;
     extern const Metric DatabaseReplicatedCreateTablesThreadsActive;
     extern const Metric DatabaseReplicatedCreateTablesThreadsScheduled;
@@ -166,4 +169,11 @@ StaticThreadPool & getDatabaseReplicatedCreateTablesThreadPool()
     return instance;
 }
 
+/// ThreadPool used for dropping tables.
+StaticThreadPool & getDatabaseCatalogDropTablesThreadPool()
+{
+    static StaticThreadPool instance("DropTablesThreadPool", CurrentMetrics::DatabaseCatalogThreads, CurrentMetrics::DatabaseCatalogThreadsActive, CurrentMetrics::DatabaseCatalogThreadsScheduled);
+    return instance;
+}
+
 }
diff --git a/src/IO/SharedThreadPools.h b/src/IO/SharedThreadPools.h
index 50adc70c9a0..06ccebd20b2 100644
--- a/src/IO/SharedThreadPools.h
+++ b/src/IO/SharedThreadPools.h
@@ -69,4 +69,7 @@ StaticThreadPool & getUnexpectedPartsLoadingThreadPool();
 /// ThreadPool used for creating tables in DatabaseReplicated.
 StaticThreadPool & getDatabaseReplicatedCreateTablesThreadPool();
 
+/// ThreadPool used for dropping tables.
+StaticThreadPool & getDatabaseCatalogDropTablesThreadPool();
+
 }
diff --git a/src/Interpreters/DatabaseCatalog.cpp b/src/Interpreters/DatabaseCatalog.cpp
index bb2dd158710..f64f8a06f38 100644
--- a/src/Interpreters/DatabaseCatalog.cpp
+++ b/src/Interpreters/DatabaseCatalog.cpp
@@ -19,6 +19,8 @@
 #include <IO/ReadHelpers.h>
 #include <Poco/DirectoryIterator.h>
 #include <Poco/Util/AbstractConfiguration.h>
+#include <Core/ServerSettings.h>
+#include <IO/SharedThreadPools.h>
 #include <Common/Exception.h>
 #include <Common/quoteString.h>
 #include <Common/atomicRename.h>
@@ -189,13 +191,6 @@ StoragePtr TemporaryTableHolder::getTable() const
 
 void DatabaseCatalog::initializeAndLoadTemporaryDatabase()
 {
-    drop_delay_sec = getContext()->getConfigRef().getInt("database_atomic_delay_before_drop_table_sec", default_drop_delay_sec);
-    unused_dir_hide_timeout_sec = getContext()->getConfigRef().getInt64("database_catalog_unused_dir_hide_timeout_sec", unused_dir_hide_timeout_sec);
-    unused_dir_rm_timeout_sec = getContext()->getConfigRef().getInt64("database_catalog_unused_dir_rm_timeout_sec", unused_dir_rm_timeout_sec);
-    unused_dir_cleanup_period_sec = getContext()->getConfigRef().getInt64("database_catalog_unused_dir_cleanup_period_sec", unused_dir_cleanup_period_sec);
-    drop_error_cooldown_sec = getContext()->getConfigRef().getInt64("database_catalog_drop_error_cooldown_sec", drop_error_cooldown_sec);
-    drop_table_concurrency = getContext()->getConfigRef().getInt64("database_catalog_drop_table_concurrency", drop_table_concurrency);
-
     auto db_for_temporary_and_external_tables = std::make_shared<DatabaseMemory>(TEMPORARY_DATABASE, getContext());
     attachDatabase(TEMPORARY_DATABASE, db_for_temporary_and_external_tables);
 }
@@ -203,7 +198,7 @@ void DatabaseCatalog::initializeAndLoadTemporaryDatabase()
 void DatabaseCatalog::createBackgroundTasks()
 {
     /// It has to be done before databases are loaded (to avoid a race condition on initialization)
-    if (Context::getGlobalContextInstance()->getApplicationType() == Context::ApplicationType::SERVER && unused_dir_cleanup_period_sec)
+    if (Context::getGlobalContextInstance()->getApplicationType() == Context::ApplicationType::SERVER && getContext()->getServerSettings().database_catalog_unused_dir_cleanup_period_sec)
     {
         auto cleanup_task_holder
             = getContext()->getSchedulePool().createTask("DatabaseCatalogCleanupStoreDirectoryTask", [this]() { this->cleanupStoreDirectoryTask(); });
@@ -224,7 +219,7 @@ void DatabaseCatalog::startupBackgroundTasks()
     {
         (*cleanup_task)->activate();
         /// Do not start task immediately on server startup, it's not urgent.
-        (*cleanup_task)->scheduleAfter(unused_dir_hide_timeout_sec * 1000);
+        (*cleanup_task)->scheduleAfter(static_cast<time_t>(getContext()->getServerSettings().database_catalog_unused_dir_hide_timeout_sec) * 1000);
     }
 
     (*drop_task)->activate();
@@ -1038,15 +1033,12 @@ void DatabaseCatalog::loadMarkedAsDroppedTables()
 
     LOG_INFO(log, "Found {} partially dropped tables. Will load them and retry removal.", dropped_metadata.size());
 
-    ThreadPool pool(CurrentMetrics::DatabaseCatalogThreads, CurrentMetrics::DatabaseCatalogThreadsActive, CurrentMetrics::DatabaseCatalogThreadsScheduled);
+    ThreadPoolCallbackRunnerLocal<void> runner(getDatabaseCatalogDropTablesThreadPool().get(), "DropTables");
     for (const auto & elem : dropped_metadata)
     {
-        pool.scheduleOrThrowOnError([&]()
-        {
-            this->enqueueDroppedTableCleanup(elem.second, nullptr, elem.first);
-        });
+        runner([this, &elem](){ this->enqueueDroppedTableCleanup(elem.second, nullptr, elem.first); });
     }
-    pool.wait();
+    runner.waitForAllToFinishAndRethrowFirstError();
 }
 
 String DatabaseCatalog::getPathForDroppedMetadata(const StorageID & table_id) const
@@ -1135,7 +1127,13 @@ void DatabaseCatalog::enqueueDroppedTableCleanup(StorageID table_id, StoragePtr
     }
     else
     {
-        tables_marked_dropped.push_back({table_id, table, dropped_metadata_path, drop_time + drop_delay_sec});
+        tables_marked_dropped.push_back
+        ({
+            table_id,
+            table,
+            dropped_metadata_path,
+            drop_time + static_cast<time_t>(getContext()->getServerSettings().database_atomic_delay_before_drop_table_sec)
+        });
         if (first_async_drop_in_queue == tables_marked_dropped.end())
             --first_async_drop_in_queue;
     }
@@ -1289,13 +1287,7 @@ void DatabaseCatalog::dropTablesParallel(std::vector<DatabaseCatalog::TablesMark
     if (tables_to_drop.empty())
         return;
 
-    ThreadPool pool(
-        CurrentMetrics::DatabaseCatalogThreads,
-        CurrentMetrics::DatabaseCatalogThreadsActive,
-        CurrentMetrics::DatabaseCatalogThreadsScheduled,
-        /* max_threads */drop_table_concurrency,
-        /* max_free_threads */0,
-        /* queue_size */tables_to_drop.size());
+    ThreadPoolCallbackRunnerLocal<void> runner(getDatabaseCatalogDropTablesThreadPool().get(), "DropTables");
 
     for (const auto & item : tables_to_drop)
     {
@@ -1332,7 +1324,7 @@ void DatabaseCatalog::dropTablesParallel(std::vector<DatabaseCatalog::TablesMark
                         ++first_async_drop_in_queue;
 
                     tables_marked_dropped.splice(tables_marked_dropped.end(), tables_marked_dropped, table_iterator);
-                    table_iterator->drop_time = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now()) + drop_error_cooldown_sec;
+                    table_iterator->drop_time = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now()) + getContext()->getServerSettings().database_catalog_drop_error_cooldown_sec;
 
                     if (first_async_drop_in_queue == tables_marked_dropped.end())
                         --first_async_drop_in_queue;
@@ -1342,7 +1334,7 @@ void DatabaseCatalog::dropTablesParallel(std::vector<DatabaseCatalog::TablesMark
 
         try
         {
-            pool.scheduleOrThrowOnError(std::move(job));
+            runner(std::move(job));
         }
         catch (...)
         {
@@ -1353,7 +1345,7 @@ void DatabaseCatalog::dropTablesParallel(std::vector<DatabaseCatalog::TablesMark
 
     try
     {
-        pool.wait();
+        runner.waitForAllToFinishAndRethrowFirstError();
     }
     catch (...)
     {
@@ -1718,7 +1710,7 @@ void DatabaseCatalog::cleanupStoreDirectoryTask()
             LOG_TEST(log, "Nothing to clean up from store/ on disk {}", disk_name);
     }
 
-    (*cleanup_task)->scheduleAfter(unused_dir_cleanup_period_sec * 1000);
+    (*cleanup_task)->scheduleAfter(static_cast<time_t>(getContext()->getServerSettings().database_catalog_unused_dir_cleanup_period_sec) * 1000);
 }
 
 bool DatabaseCatalog::maybeRemoveDirectory(const String & disk_name, const DiskPtr & disk, const String & unused_dir)
@@ -1742,7 +1734,7 @@ bool DatabaseCatalog::maybeRemoveDirectory(const String & disk_name, const DiskP
         time_t current_time = time(nullptr);
         if (st.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO))
         {
-            if (current_time <= max_modification_time + unused_dir_hide_timeout_sec)
+            if (current_time <= max_modification_time + static_cast<time_t>(getContext()->getServerSettings().database_catalog_unused_dir_hide_timeout_sec))
                 return false;
 
             LOG_INFO(log, "Removing access rights for unused directory {} from disk {} (will remove it when timeout exceed)", unused_dir, disk_name);
@@ -1758,6 +1750,8 @@ bool DatabaseCatalog::maybeRemoveDirectory(const String & disk_name, const DiskP
         }
         else
         {
+            auto unused_dir_rm_timeout_sec = static_cast<time_t>(getContext()->getServerSettings().database_catalog_unused_dir_rm_timeout_sec);
+
             if (!unused_dir_rm_timeout_sec)
                 return false;
 
diff --git a/src/Interpreters/DatabaseCatalog.h b/src/Interpreters/DatabaseCatalog.h
index 23e38a6445e..83a302f117d 100644
--- a/src/Interpreters/DatabaseCatalog.h
+++ b/src/Interpreters/DatabaseCatalog.h
@@ -354,23 +354,8 @@ private:
     mutable std::mutex tables_marked_dropped_mutex;
 
     std::unique_ptr<BackgroundSchedulePoolTaskHolder> drop_task;
-    static constexpr time_t default_drop_delay_sec = 8 * 60;
-    time_t drop_delay_sec = default_drop_delay_sec;
     std::condition_variable wait_table_finally_dropped;
-
     std::unique_ptr<BackgroundSchedulePoolTaskHolder> cleanup_task;
-    static constexpr time_t default_unused_dir_hide_timeout_sec = 60 * 60;              /// 1 hour
-    time_t unused_dir_hide_timeout_sec = default_unused_dir_hide_timeout_sec;
-    static constexpr time_t default_unused_dir_rm_timeout_sec = 30 * 24 * 60 * 60;      /// 30 days
-    time_t unused_dir_rm_timeout_sec = default_unused_dir_rm_timeout_sec;
-    static constexpr time_t default_unused_dir_cleanup_period_sec = 24 * 60 * 60;       /// 1 day
-    time_t unused_dir_cleanup_period_sec = default_unused_dir_cleanup_period_sec;
-
-    static constexpr time_t default_drop_error_cooldown_sec = 5;
-    time_t drop_error_cooldown_sec = default_drop_error_cooldown_sec;
-
-    static constexpr size_t default_drop_table_concurrency = 10;
-    size_t drop_table_concurrency = default_drop_table_concurrency;
 
     std::unique_ptr<BackgroundSchedulePoolTaskHolder> reload_disks_task;
     std::mutex reload_disks_mutex;
diff --git a/src/Interpreters/InterpreterDropQuery.cpp b/src/Interpreters/InterpreterDropQuery.cpp
index bad3e5277db..d8056ddd1a3 100644
--- a/src/Interpreters/InterpreterDropQuery.cpp
+++ b/src/Interpreters/InterpreterDropQuery.cpp
@@ -6,6 +6,7 @@
 #include <Interpreters/InterpreterDropQuery.h>
 #include <Interpreters/ExternalDictionariesLoader.h>
 #include <Interpreters/QueryLog.h>
+#include <IO/SharedThreadPools.h>
 #include <Access/Common/AccessRightsElement.h>
 #include <Parsers/ASTDropQuery.h>
 #include <Parsers/ASTIdentifier.h>
@@ -424,18 +425,28 @@ BlockIO InterpreterDropQuery::executeToDatabaseImpl(const ASTDropQuery & query,
                 auto table_context = Context::createCopy(getContext());
                 table_context->setInternalQuery(true);
                 /// Do not hold extra shared pointers to tables
-                std::vector<std::pair<String, bool>> tables_to_drop;
+                std::vector<std::pair<StorageID, bool>> tables_to_drop;
                 // NOTE: This means we wait for all tables to be loaded inside getTablesIterator() call in case of `async_load_databases = true`.
                 for (auto iterator = database->getTablesIterator(table_context); iterator->isValid(); iterator->next())
                 {
                     auto table_ptr = iterator->table();
-                    table_ptr->flushAndPrepareForShutdown();
-                    tables_to_drop.push_back({iterator->name(), table_ptr->isDictionary()});
+                    tables_to_drop.push_back({table_ptr->getStorageID(), table_ptr->isDictionary()});
                 }
 
+                /// Prepare tables for shutdown in parallel.
+                ThreadPoolCallbackRunnerLocal<void> runner(getDatabaseCatalogDropTablesThreadPool().get(), "DropTables");
+                for (const auto & [name, _] : tables_to_drop)
+                {
+                    auto table_ptr = DatabaseCatalog::instance().getTable(name, table_context);
+                    runner([my_table_ptr = std::move(table_ptr)](){
+                        my_table_ptr->flushAndPrepareForShutdown();
+                    });
+                }
+                runner.waitForAllToFinishAndRethrowFirstError();
+
                 for (const auto & table : tables_to_drop)
                 {
-                    query_for_table.setTable(table.first);
+                    query_for_table.setTable(table.first.getTableName());
                     query_for_table.is_dictionary = table.second;
                     DatabasePtr db;
                     UUID table_to_wait = UUIDHelpers::Nil;

From 1427b16689601d7dd29d26de99b233c132905fde Mon Sep 17 00:00:00 2001
From: Nikita Mikhaylov <nikitamikhaylov@clickhouse.com>
Date: Fri, 26 Jul 2024 21:44:15 +0200
Subject: [PATCH 080/139] Fixed style

---
 src/Interpreters/DatabaseCatalog.cpp      | 3 ---
 src/Interpreters/InterpreterDropQuery.cpp | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Interpreters/DatabaseCatalog.cpp b/src/Interpreters/DatabaseCatalog.cpp
index f64f8a06f38..30b151eb81d 100644
--- a/src/Interpreters/DatabaseCatalog.cpp
+++ b/src/Interpreters/DatabaseCatalog.cpp
@@ -50,9 +50,6 @@
 namespace CurrentMetrics
 {
     extern const Metric TablesToDropQueueSize;
-    extern const Metric DatabaseCatalogThreads;
-    extern const Metric DatabaseCatalogThreadsActive;
-    extern const Metric DatabaseCatalogThreadsScheduled;
 }
 
 namespace DB
diff --git a/src/Interpreters/InterpreterDropQuery.cpp b/src/Interpreters/InterpreterDropQuery.cpp
index d8056ddd1a3..ef560ec3405 100644
--- a/src/Interpreters/InterpreterDropQuery.cpp
+++ b/src/Interpreters/InterpreterDropQuery.cpp
@@ -438,7 +438,8 @@ BlockIO InterpreterDropQuery::executeToDatabaseImpl(const ASTDropQuery & query,
                 for (const auto & [name, _] : tables_to_drop)
                 {
                     auto table_ptr = DatabaseCatalog::instance().getTable(name, table_context);
-                    runner([my_table_ptr = std::move(table_ptr)](){
+                    runner([my_table_ptr = std::move(table_ptr)]()
+                    {
                         my_table_ptr->flushAndPrepareForShutdown();
                     });
                 }

From 1096a4ff33497c64eb786f6dbb603b18ccf804b1 Mon Sep 17 00:00:00 2001
From: Nikita Mikhaylov <nikitamikhaylov@clickhouse.com>
Date: Mon, 29 Jul 2024 13:37:36 +0000
Subject: [PATCH 081/139] Fixed occasional LOGICAL_ERROR

---
 src/Interpreters/DatabaseCatalog.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Interpreters/DatabaseCatalog.cpp b/src/Interpreters/DatabaseCatalog.cpp
index 30b151eb81d..eaf8cf1cc82 100644
--- a/src/Interpreters/DatabaseCatalog.cpp
+++ b/src/Interpreters/DatabaseCatalog.cpp
@@ -1336,7 +1336,7 @@ void DatabaseCatalog::dropTablesParallel(std::vector<DatabaseCatalog::TablesMark
         catch (...)
         {
             tryLogCurrentException(log, "Cannot drop tables. Will retry later.");
-            break;
+            throw;
         }
     }
 
@@ -1347,6 +1347,7 @@ void DatabaseCatalog::dropTablesParallel(std::vector<DatabaseCatalog::TablesMark
     catch (...)
     {
         tryLogCurrentException(log, "Cannot drop tables. Will retry later.");
+        throw;
     }
 }
 

From 77f0180ff833c776789e2ef0aeedf224fe3eaadf Mon Sep 17 00:00:00 2001
From: Nikita Mikhaylov <mikhaylovnikitka@gmail.com>
Date: Tue, 30 Jul 2024 00:39:16 +0200
Subject: [PATCH 082/139] Dont throw

---
 src/Interpreters/DatabaseCatalog.cpp | 30 ++++++++++------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/src/Interpreters/DatabaseCatalog.cpp b/src/Interpreters/DatabaseCatalog.cpp
index eaf8cf1cc82..98526e5c1cd 100644
--- a/src/Interpreters/DatabaseCatalog.cpp
+++ b/src/Interpreters/DatabaseCatalog.cpp
@@ -1329,26 +1329,10 @@ void DatabaseCatalog::dropTablesParallel(std::vector<DatabaseCatalog::TablesMark
             }
         };
 
-        try
-        {
-            runner(std::move(job));
-        }
-        catch (...)
-        {
-            tryLogCurrentException(log, "Cannot drop tables. Will retry later.");
-            throw;
-        }
+        runner(std::move(job));
     }
 
-    try
-    {
-        runner.waitForAllToFinishAndRethrowFirstError();
-    }
-    catch (...)
-    {
-        tryLogCurrentException(log, "Cannot drop tables. Will retry later.");
-        throw;
-    }
+    runner.waitForAllToFinishAndRethrowFirstError();
 }
 
 void DatabaseCatalog::dropTableDataTask()
@@ -1365,7 +1349,15 @@ void DatabaseCatalog::dropTableDataTask()
         LOG_INFO(log, "Have {} tables in drop queue ({} of them are in use), will try drop {} tables",
             drop_tables_count, drop_tables_in_use_count, tables_to_drop.size());
 
-        dropTablesParallel(tables_to_drop);
+        try
+        {
+            dropTablesParallel(tables_to_drop);
+        }
+        catch (...)
+        {
+            /// We don't re-throw expection, because we are in a background pool.
+            tryLogCurrentException(log, "Cannot drop tables. Will retry later.");
+        }
     }
 
     rescheduleDropTableTask();

From 4eb2bf3419d7f3640ec8b77bc0ca80a138cd2584 Mon Sep 17 00:00:00 2001
From: Michael Kolupaev <michael.kolupaev@clickhouse.com>
Date: Mon, 29 Jul 2024 23:10:13 +0000
Subject: [PATCH 083/139] Fix Dwarf range list parsing in stack symbolizer

---
 src/Common/Dwarf.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Common/Dwarf.cpp b/src/Common/Dwarf.cpp
index 8439c01b22c..1f22e3b05aa 100644
--- a/src/Common/Dwarf.cpp
+++ b/src/Common/Dwarf.cpp
@@ -1559,8 +1559,7 @@ bool Dwarf::isAddrInRangeList(const CompilationUnit & cu,
                     auto sp_start = addr_.substr(*cu.addr_base + index_start * sizeof(uint64_t));
                     auto start = read<uint64_t>(sp_start);
 
-                    auto sp_end = addr_.substr(*cu.addr_base + index_start * sizeof(uint64_t) + length);
-                    auto end = read<uint64_t>(sp_end);
+                    auto end = start + length;
                     if (start != end && address >= start && address < end)
                     {
                         return true;

From 8f920d064ccca8ed8d9341b10d54ebef7500484c Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@clickhouse.com>
Date: Tue, 30 Jul 2024 04:05:43 +0200
Subject: [PATCH 084/139] Fix inconsistent formatting of CODEC and STATISTICS

---
 src/Parsers/ASTFunction.cpp                    | 4 +++-
 src/Parsers/ASTFunction.h                      | 2 ++
 src/Parsers/ExpressionElementParsers.cpp       | 2 ++
 src/Parsers/FunctionSecretArgumentsFinderAST.h | 4 +++-
 src/Parsers/IAST.h                             | 1 +
 src/Storages/StatisticsDescription.cpp         | 1 +
 6 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/Parsers/ASTFunction.cpp b/src/Parsers/ASTFunction.cpp
index 230d4c778e8..cd9e910d45a 100644
--- a/src/Parsers/ASTFunction.cpp
+++ b/src/Parsers/ASTFunction.cpp
@@ -285,6 +285,8 @@ static bool formatNamedArgWithHiddenValue(IAST * arg, const IAST::FormatSettings
 void ASTFunction::formatImplWithoutAlias(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const
 {
     frame.expression_list_prepend_whitespace = false;
+    if (kind == Kind::CODEC || kind == Kind::STATISTICS || kind == Kind::BACKUP_NAME)
+        frame.allow_operators = false;
     FormatStateStacked nested_need_parens = frame;
     FormatStateStacked nested_dont_need_parens = frame;
     nested_need_parens.need_parens = true;
@@ -308,7 +310,7 @@ void ASTFunction::formatImplWithoutAlias(const FormatSettings & settings, Format
 
     /// Should this function to be written as operator?
     bool written = false;
-    if (arguments && !parameters && nulls_action == NullsAction::EMPTY)
+    if (arguments && !parameters && frame.allow_operators && nulls_action == NullsAction::EMPTY)
     {
         /// Unary prefix operators.
         if (arguments->children.size() == 1)
diff --git a/src/Parsers/ASTFunction.h b/src/Parsers/ASTFunction.h
index be2b6beae54..1b4a5928d1c 100644
--- a/src/Parsers/ASTFunction.h
+++ b/src/Parsers/ASTFunction.h
@@ -58,6 +58,8 @@ public:
         TABLE_ENGINE,
         DATABASE_ENGINE,
         BACKUP_NAME,
+        CODEC,
+        STATISTICS,
     };
     Kind kind = Kind::ORDINARY_FUNCTION;
 
diff --git a/src/Parsers/ExpressionElementParsers.cpp b/src/Parsers/ExpressionElementParsers.cpp
index 865d07faaa7..9927acdcf17 100644
--- a/src/Parsers/ExpressionElementParsers.cpp
+++ b/src/Parsers/ExpressionElementParsers.cpp
@@ -696,6 +696,7 @@ bool ParserCodec::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 
     auto function_node = std::make_shared<ASTFunction>();
     function_node->name = "CODEC";
+    function_node->kind = ASTFunction::Kind::CODEC;
     function_node->arguments = expr_list_args;
     function_node->children.push_back(function_node->arguments);
 
@@ -723,6 +724,7 @@ bool ParserStatisticsType::parseImpl(Pos & pos, ASTPtr & node, Expected & expect
 
     auto function_node = std::make_shared<ASTFunction>();
     function_node->name = "STATISTICS";
+    function_node->kind = ASTFunction::Kind::STATISTICS;
     function_node->arguments = stat_type;
     function_node->children.push_back(function_node->arguments);
     node = function_node;
diff --git a/src/Parsers/FunctionSecretArgumentsFinderAST.h b/src/Parsers/FunctionSecretArgumentsFinderAST.h
index 5b77485afb0..94da30922cc 100644
--- a/src/Parsers/FunctionSecretArgumentsFinderAST.h
+++ b/src/Parsers/FunctionSecretArgumentsFinderAST.h
@@ -33,7 +33,9 @@ public:
         {
             case ASTFunction::Kind::ORDINARY_FUNCTION: findOrdinaryFunctionSecretArguments(); break;
             case ASTFunction::Kind::WINDOW_FUNCTION: break;
-            case ASTFunction::Kind::LAMBDA_FUNCTION:  break;
+            case ASTFunction::Kind::LAMBDA_FUNCTION: break;
+            case ASTFunction::Kind::CODEC: break;
+            case ASTFunction::Kind::STATISTICS: break;
             case ASTFunction::Kind::TABLE_ENGINE: findTableEngineSecretArguments(); break;
             case ASTFunction::Kind::DATABASE_ENGINE: findDatabaseEngineSecretArguments(); break;
             case ASTFunction::Kind::BACKUP_NAME: findBackupNameSecretArguments(); break;
diff --git a/src/Parsers/IAST.h b/src/Parsers/IAST.h
index d70c1cd0b6c..e2cf7579667 100644
--- a/src/Parsers/IAST.h
+++ b/src/Parsers/IAST.h
@@ -256,6 +256,7 @@ public:
         bool expression_list_always_start_on_new_line = false;  /// Line feed and indent before expression list even if it's of single element.
         bool expression_list_prepend_whitespace = false; /// Prepend whitespace (if it is required)
         bool surround_each_list_element_with_parens = false;
+        bool allow_operators = true; /// Format some functions, such as "plus", "in", etc. as operators.
         size_t list_element_index = 0;
         const IAST * current_select = nullptr;
     };
diff --git a/src/Storages/StatisticsDescription.cpp b/src/Storages/StatisticsDescription.cpp
index 9c5fd3604b2..63c849e3806 100644
--- a/src/Storages/StatisticsDescription.cpp
+++ b/src/Storages/StatisticsDescription.cpp
@@ -193,6 +193,7 @@ ASTPtr ColumnStatisticsDescription::getAST() const
 {
     auto function_node = std::make_shared<ASTFunction>();
     function_node->name = "STATISTICS";
+    function_node->kind = ASTFunction::Kind::STATISTICS;
     function_node->arguments = std::make_shared<ASTExpressionList>();
     for (const auto & [type, desc] : types_to_desc)
     {

From c1e7b7be89f5c5e39318ab093b00fa6cd8114ff3 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@clickhouse.com>
Date: Tue, 30 Jul 2024 04:07:46 +0200
Subject: [PATCH 085/139] Add a test

---
 ...nconsistent_formatting_of_codecs_statistics.reference | 2 ++
 ...03214_inconsistent_formatting_of_codecs_statistics.sh | 9 +++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 tests/queries/0_stateless/03214_inconsistent_formatting_of_codecs_statistics.reference
 create mode 100755 tests/queries/0_stateless/03214_inconsistent_formatting_of_codecs_statistics.sh

diff --git a/tests/queries/0_stateless/03214_inconsistent_formatting_of_codecs_statistics.reference b/tests/queries/0_stateless/03214_inconsistent_formatting_of_codecs_statistics.reference
new file mode 100644
index 00000000000..7213baa3e5b
--- /dev/null
+++ b/tests/queries/0_stateless/03214_inconsistent_formatting_of_codecs_statistics.reference
@@ -0,0 +1,2 @@
+ALTER TABLE t MODIFY COLUMN `c` CODEC(in(1, 2))
+ALTER TABLE t MODIFY COLUMN `c` STATISTICS(plus(1, 2))
diff --git a/tests/queries/0_stateless/03214_inconsistent_formatting_of_codecs_statistics.sh b/tests/queries/0_stateless/03214_inconsistent_formatting_of_codecs_statistics.sh
new file mode 100755
index 00000000000..c3f8d89b9a4
--- /dev/null
+++ b/tests/queries/0_stateless/03214_inconsistent_formatting_of_codecs_statistics.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+# Ensure that these (possibly incorrect) queries can at least be parsed back after formatting.
+$CLICKHOUSE_FORMAT --oneline --query "ALTER TABLE t MODIFY COLUMN c CODEC(in(1, 2))" | $CLICKHOUSE_FORMAT --oneline
+$CLICKHOUSE_FORMAT --oneline --query "ALTER TABLE t MODIFY COLUMN c STATISTICS(plus(1, 2))" | $CLICKHOUSE_FORMAT --oneline

From cb6b6329c8e763f61f70797a95dab8ef24fd47d1 Mon Sep 17 00:00:00 2001
From: kevinyhzou <kevinyunhe8@gmail.com>
Date: Tue, 30 Jul 2024 10:45:36 +0800
Subject: [PATCH 086/139] add session timezone settings

---
 tests/queries/0_stateless/03198_orc_read_time_zone.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/queries/0_stateless/03198_orc_read_time_zone.sh b/tests/queries/0_stateless/03198_orc_read_time_zone.sh
index 7e931e16e48..7d1da0c1579 100755
--- a/tests/queries/0_stateless/03198_orc_read_time_zone.sh
+++ b/tests/queries/0_stateless/03198_orc_read_time_zone.sh
@@ -8,5 +8,5 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 $CLICKHOUSE_CLIENT -q "drop table if exists test_orc_read_timezone"
 $CLICKHOUSE_CLIENT -q "create table test_orc_read_timezone(id UInt64, t DateTime64) Engine=MergeTree order by id"
 $CLICKHOUSE_CLIENT -q "insert into test_orc_read_timezone from infile '$CURDIR/data_orc/test_reader_time_zone.snappy.orc' SETTINGS input_format_orc_reader_time_zone_name='Asia/Shanghai' FORMAT ORC"
-$CLICKHOUSE_CLIENT -q "select * from test_orc_read_timezone"
+$CLICKHOUSE_CLIENT -q "select * from test_orc_read_timezone SETTINGS session_timezone='Asia/Shanghai'"
 $CLICKHOUSE_CLIENT -q "drop table test_orc_read_timezone"
\ No newline at end of file

From dd5819ab6ab2df3231737a4808d0445ad5345555 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@clickhouse.com>
Date: Tue, 30 Jul 2024 05:16:09 +0200
Subject: [PATCH 087/139] Changelog sanity

---
 CHANGELOG.md | 55 +++++++++++++++++++++++++---------------------------
 1 file changed, 26 insertions(+), 29 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 620b7c99bac..06f7bcdd84e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
 * Metric `KeeperOutstandingRequets` was renamed to `KeeperOutstandingRequests`. [#66206](https://github.com/ClickHouse/ClickHouse/pull/66206) ([Robert Schulze](https://github.com/rschu1ze)).
 * Remove `is_deterministic` field from the `system.functions` table. [#66630](https://github.com/ClickHouse/ClickHouse/pull/66630) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Function `tuple` will now try to construct named tuples in query (controlled by `enable_named_columns_in_function_tuple`). Introduce function `tupleNames` to extract names from tuples. [#54881](https://github.com/ClickHouse/ClickHouse/pull/54881) ([Amos Bird](https://github.com/amosbird)).
+* Change how deduplication for Materialized Views works. Fixed a lot of cases like: - on destination table: data is split for 2 or more blocks and that blocks is considered as duplicate when that block is inserted in parallel. - on MV destination table: the equal blocks are deduplicated, that happens when MV often produces equal data as a result for different input data due to performing aggregation. - on MV destination table: the equal blocks which comes from different MV are deduplicated. [#61601](https://github.com/ClickHouse/ClickHouse/pull/61601) ([Sema Checherinda](https://github.com/CheSema)).
 
 #### New Feature
 * Add `ASOF JOIN` support for `full_sorting_join` algorithm. [#55051](https://github.com/ClickHouse/ClickHouse/pull/55051) ([vdimir](https://github.com/vdimir)).
@@ -32,13 +33,14 @@
 * Add a new setting to disable/enable writing page index into parquet files. [#65475](https://github.com/ClickHouse/ClickHouse/pull/65475) ([lgbo](https://github.com/lgbo-ustc)).
 * Introduce `logger.console_log_level` server config to control the log level to the console (if enabled). [#65559](https://github.com/ClickHouse/ClickHouse/pull/65559) ([Azat Khuzhin](https://github.com/azat)).
 * Automatically append a wildcard `*` to the end of a directory path with table function `file`. [#66019](https://github.com/ClickHouse/ClickHouse/pull/66019) ([Zhidong (David) Guo](https://github.com/Gun9niR)).
-* Add `--memory-usage` option to client in non interactive mode. [#66393](https://github.com/ClickHouse/ClickHouse/pull/66393) ([vdimir](https://github.com/vdimir)).
+* Add `--memory-usage` option to client in non-interactive mode. [#66393](https://github.com/ClickHouse/ClickHouse/pull/66393) ([vdimir](https://github.com/vdimir)).
 * Make an interactive client for clickhouse-disks, add local disk from the local directory. [#64446](https://github.com/ClickHouse/ClickHouse/pull/64446) ([Daniil Ivanik](https://github.com/divanik)).
 * When lightweight delete happens on a table with projection(s), users have choices either throw an exception (by default) or drop the projection [#65594](https://github.com/ClickHouse/ClickHouse/pull/65594) ([jsc0218](https://github.com/jsc0218)).
+* Add system tables with main information about all detached tables. [#65400](https://github.com/ClickHouse/ClickHouse/pull/65400) ([Konstantin Morozov](https://github.com/k-morozov)).
 
 #### Experimental Feature
 * Change binary serialization of Variant data type: add `compact` mode to avoid writing the same discriminator multiple times for granules with single variant or with only NULL values. Add MergeTree setting `use_compact_variant_discriminators_serialization` that is enabled by default. Note that Variant type is still experimental and backward-incompatible change in serialization is ok. [#62774](https://github.com/ClickHouse/ClickHouse/pull/62774) ([Kruglov Pavel](https://github.com/Avogar)).
-* Support rocksdb as backend storage of keeper. [#56626](https://github.com/ClickHouse/ClickHouse/pull/56626) ([Han Fei](https://github.com/hanfei1991)).
+* Support rocksdb as backend storage of clickhouse-keeper. [#56626](https://github.com/ClickHouse/ClickHouse/pull/56626) ([Han Fei](https://github.com/hanfei1991)).
 * Refactor JSONExtract functions, support more types including experimental Dynamic type. [#66046](https://github.com/ClickHouse/ClickHouse/pull/66046) ([Kruglov Pavel](https://github.com/Avogar)).
 * Support null map subcolumn for Variant and Dynamic subcolumns. [#66178](https://github.com/ClickHouse/ClickHouse/pull/66178) ([Kruglov Pavel](https://github.com/Avogar)).
 * Fix reading dynamic subcolumns from altered Memory table. Previously if `max_types` parameter of a Dynamic type was changed in Memory table via alter, further subcolumns reading can return wrong result. [#66066](https://github.com/ClickHouse/ClickHouse/pull/66066) ([Kruglov Pavel](https://github.com/Avogar)).
@@ -46,8 +48,8 @@
 
 #### Performance Improvement
 * Replace int to string algorithm with a faster one (from a modified amdn/itoa to a modified jeaiii/itoa). [#61661](https://github.com/ClickHouse/ClickHouse/pull/61661) ([Raúl Marín](https://github.com/Algunenano)).
-* Sizes of hash tables created by join (`parallel_hash` algorithm) is collected and cached now. This information will be used to preallocate space in hash tables for subsequent query executions and save time on hash table resizes. [#64553](https://github.com/ClickHouse/ClickHouse/pull/64553) ([Nikita Taranov](https://github.com/nickitat)).
-* Optimized queries with `ORDER BY` primary key and `WHERE` that have a condition with high selectivity by using of buffering. It is controlled by setting `read_in_order_use_buffering` (enabled by default) and can increase memory usage of query. [#64607](https://github.com/ClickHouse/ClickHouse/pull/64607) ([Anton Popov](https://github.com/CurtizJ)).
+* Sizes of hash tables created by join (`parallel_hash` algorithm) are collected and cached now. This information will be used to preallocate space in hash tables for subsequent query executions and save time on hash table resizes. [#64553](https://github.com/ClickHouse/ClickHouse/pull/64553) ([Nikita Taranov](https://github.com/nickitat)).
+* Optimized queries with `ORDER BY` primary key and `WHERE` that have a condition with high selectivity by using buffering. It is controlled by setting `read_in_order_use_buffering` (enabled by default) and can increase memory usage of query. [#64607](https://github.com/ClickHouse/ClickHouse/pull/64607) ([Anton Popov](https://github.com/CurtizJ)).
 * Improve performance of loading `plain_rewritable` metadata. [#65634](https://github.com/ClickHouse/ClickHouse/pull/65634) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Attaching tables on read-only disks will use fewer resources by not loading outdated parts. [#65635](https://github.com/ClickHouse/ClickHouse/pull/65635) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Support minmax hyperrectangle for Set indices. [#65676](https://github.com/ClickHouse/ClickHouse/pull/65676) ([AntiTopQuark](https://github.com/AntiTopQuark)).
@@ -59,11 +61,11 @@
 * DatabaseCatalog drops tables faster by using up to database_catalog_drop_table_concurrency threads. [#66065](https://github.com/ClickHouse/ClickHouse/pull/66065) ([Sema Checherinda](https://github.com/CheSema)).
 
 #### Improvement
+* Improved ZooKeeper load balancing. The current session doesn't expire until the optimal nodes become available despite `fallback_session_lifetime`. Added support for AZ-aware balancing. [#65570](https://github.com/ClickHouse/ClickHouse/pull/65570) ([Alexander Tokmakov](https://github.com/tavplubix)).
 * The setting `optimize_trivial_insert_select` is disabled by default. In most cases, it should be beneficial. Nevertheless, if you are seeing slower INSERT SELECT or increased memory usage, you can enable it back or `SET compatibility = '24.6'`. [#58970](https://github.com/ClickHouse/ClickHouse/pull/58970) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Print stacktrace and diagnostic info if `clickhouse-client` or `clickhouse-local` crashes. [#61109](https://github.com/ClickHouse/ClickHouse/pull/61109) ([Alexander Tokmakov](https://github.com/tavplubix)).
 * The result of `SHOW INDEX | INDEXES | INDICES | KEYS` was previously sorted by the primary key column names. Since this was unintuitive, the result is now sorted by the position of the primary key columns within the primary key. [#61131](https://github.com/ClickHouse/ClickHouse/pull/61131) ([Robert Schulze](https://github.com/rschu1ze)).
-* Change how deduplication for Materialized Views works. Fixed a lot of cases like: - on destination table: data is split for 2 or more blocks and that blocks is considered as duplicate when that block is inserted in parallel. - on MV destination table: the equal blocks are deduplicated, that happens when MV often produces equal data as a result for different input data due to performing aggregation. - on MV destination table: the equal blocks which comes from different MV are deduplicated. [#61601](https://github.com/ClickHouse/ClickHouse/pull/61601) ([Sema Checherinda](https://github.com/CheSema)).
-* Allow matching column names in a case insensitive manner when reading json files (`input_format_json_case_insensitive_column_matching`). [#61750](https://github.com/ClickHouse/ClickHouse/pull/61750) ([kevinyhzou](https://github.com/KevinyhZou)).
+* Allow matching column names in a case-insensitive manner when reading json files (`input_format_json_case_insensitive_column_matching`). [#61750](https://github.com/ClickHouse/ClickHouse/pull/61750) ([kevinyhzou](https://github.com/KevinyhZou)).
 * Support reading partitioned data DeltaLake data. Infer DeltaLake schema by reading metadata instead of data. [#63201](https://github.com/ClickHouse/ClickHouse/pull/63201) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * In composable protocols TLS layer accepted only `certificateFile` and `privateKeyFile` parameters. https://clickhouse.com/docs/en/operations/settings/composable-protocols. [#63985](https://github.com/ClickHouse/ClickHouse/pull/63985) ([Anton Ivashkin](https://github.com/ianton-ru)).
 * Added profile event `SelectQueriesWithPrimaryKeyUsage` which indicates how many SELECT queries use the primary key to evaluate the WHERE clause. [#64492](https://github.com/ClickHouse/ClickHouse/pull/64492) ([0x01f](https://github.com/0xfei)).
@@ -71,7 +73,6 @@
 * Support aliases in parametrized view function (only new analyzer). [#65190](https://github.com/ClickHouse/ClickHouse/pull/65190) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Updated to mask account key in logs in azureBlobStorage. [#65273](https://github.com/ClickHouse/ClickHouse/pull/65273) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
 * Partition pruning for `IN` predicates when filter expression is a part of `PARTITION BY` expression. [#65335](https://github.com/ClickHouse/ClickHouse/pull/65335) ([Eduard Karacharov](https://github.com/korowa)).
-* Add system tables with main information about all detached tables. [#65400](https://github.com/ClickHouse/ClickHouse/pull/65400) ([Konstantin Morozov](https://github.com/k-morozov)).
 * `arrayMin`/`arrayMax` can be applicable to all data types that are comparable. [#65455](https://github.com/ClickHouse/ClickHouse/pull/65455) ([pn](https://github.com/chloro-pn)).
 * Improved memory accounting for cgroups v2 to exclude the amount occupied by the page cache. [#65470](https://github.com/ClickHouse/ClickHouse/pull/65470) ([Nikita Taranov](https://github.com/nickitat)).
 * Do not create format settings for each row when serializing chunks to insert to EmbeddedRocksDB table. [#65474](https://github.com/ClickHouse/ClickHouse/pull/65474) ([Duc Canh Le](https://github.com/canhld94)).
@@ -80,36 +81,35 @@
 * Disable filesystem cache background download by default. It will be enabled back when we fix the issue with possible "Memory limit exceeded" because memory deallocation is done outside of query context (while buffer is allocated inside of query context) if we use background download threads. Plus we need to add a separate setting to define max size to download for background workers (currently it is limited by max_file_segment_size, which might be too big). [#65534](https://github.com/ClickHouse/ClickHouse/pull/65534) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Add new option to config `<config_reload_interval_ms>` which allow to specify how often clickhouse will reload config. [#65545](https://github.com/ClickHouse/ClickHouse/pull/65545) ([alesapin](https://github.com/alesapin)).
 * Implement binary encoding for ClickHouse data types and add its specification in docs. Use it in Dynamic binary serialization, allow to use it in RowBinaryWithNamesAndTypes and Native formats under settings. [#65546](https://github.com/ClickHouse/ClickHouse/pull/65546) ([Kruglov Pavel](https://github.com/Avogar)).
-* Improved ZooKeeper load balancing. The current session doesn't expire until the optimal nodes become available despite `fallback_session_lifetime`. Added support for AZ-aware balancing. [#65570](https://github.com/ClickHouse/ClickHouse/pull/65570) ([Alexander Tokmakov](https://github.com/tavplubix)).
 * Server settings `compiled_expression_cache_size` and `compiled_expression_cache_elements_size` are now shown in `system.server_settings`. [#65584](https://github.com/ClickHouse/ClickHouse/pull/65584) ([Robert Schulze](https://github.com/rschu1ze)).
 * Add support for user identification based on x509 SubjectAltName extension. [#65626](https://github.com/ClickHouse/ClickHouse/pull/65626) ([Anton Kozlov](https://github.com/tonickkozlov)).
 * `clickhouse-local` will respect the `max_server_memory_usage` and `max_server_memory_usage_to_ram_ratio` from the configuration file. It will also set the max memory usage to 90% of the system memory by default, like `clickhouse-server` does. [#65697](https://github.com/ClickHouse/ClickHouse/pull/65697) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Add a script to backup your files to ClickHouse. [#65699](https://github.com/ClickHouse/ClickHouse/pull/65699) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* PostgreSQL source support cancel. [#65722](https://github.com/ClickHouse/ClickHouse/pull/65722) ([Maksim Kita](https://github.com/kitaisreal)).
-* Make allow_experimental_analyzer be controlled by the initiator for distributed queries. This ensures compatibility and correctness during operations in mixed version clusters. [#65777](https://github.com/ClickHouse/ClickHouse/pull/65777) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* PostgreSQL source to support query cancellations. [#65722](https://github.com/ClickHouse/ClickHouse/pull/65722) ([Maksim Kita](https://github.com/kitaisreal)).
+* Make `allow_experimental_analyzer` be controlled by the initiator for distributed queries. This ensures compatibility and correctness during operations in mixed version clusters. [#65777](https://github.com/ClickHouse/ClickHouse/pull/65777) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
 * Respect cgroup CPU limit in Keeper. [#65819](https://github.com/ClickHouse/ClickHouse/pull/65819) ([Antonio Andelic](https://github.com/antonio2368)).
-* Allow to use `concat` function with empty arguments ``` sql :) select concat();. [#65887](https://github.com/ClickHouse/ClickHouse/pull/65887) ([李扬](https://github.com/taiyang-li)).
-* Allow controlling named collections in clickhouse-local. [#65973](https://github.com/ClickHouse/ClickHouse/pull/65973) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Improve Azure profile events. [#65999](https://github.com/ClickHouse/ClickHouse/pull/65999) ([alesapin](https://github.com/alesapin)).
-* Support ORC file read by writer time zone. [#66025](https://github.com/ClickHouse/ClickHouse/pull/66025) ([kevinyhzou](https://github.com/KevinyhZou)).
-* Add settings to control connection to the PostgreSQL. * Setting `postgresql_connection_attempt_timeout` specifies the value passed to `connect_timeout` parameter of connection URL. * Setting `postgresql_connection_pool_retries` specifies the number of retries to establish a connection to the PostgreSQL end-point. [#66232](https://github.com/ClickHouse/ClickHouse/pull/66232) ([Dmitry Novik](https://github.com/novikd)).
-* Reduce inaccuracy of input_wait_elapsed_us/input_wait_elapsed_us/elapsed_us. [#66239](https://github.com/ClickHouse/ClickHouse/pull/66239) ([Azat Khuzhin](https://github.com/azat)).
-* Improve FilesystemCache ProfileEvents. [#66249](https://github.com/ClickHouse/ClickHouse/pull/66249) ([zhukai](https://github.com/nauu)).
-* Add settings to ignore ON CLUSTER clause in queries for named collection management with replicated storage. [#66288](https://github.com/ClickHouse/ClickHouse/pull/66288) ([MikhailBurdukov](https://github.com/MikhailBurdukov)).
+* Allow to use `concat` function with empty arguments `:) select concat();`. [#65887](https://github.com/ClickHouse/ClickHouse/pull/65887) ([李扬](https://github.com/taiyang-li)).
+* Allow controlling named collections in `clickhouse-local`. [#65973](https://github.com/ClickHouse/ClickHouse/pull/65973) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Improve Azure-related profile events. [#65999](https://github.com/ClickHouse/ClickHouse/pull/65999) ([alesapin](https://github.com/alesapin)).
+* Support ORC file read by writer's time zone. [#66025](https://github.com/ClickHouse/ClickHouse/pull/66025) ([kevinyhzou](https://github.com/KevinyhZou)).
+* Add settings to control connections to PostgreSQL. The setting `postgresql_connection_attempt_timeout` specifies the value passed to `connect_timeout` parameter of connection URL. The setting `postgresql_connection_pool_retries` specifies the number of retries to establish a connection to the PostgreSQL end-point. [#66232](https://github.com/ClickHouse/ClickHouse/pull/66232) ([Dmitry Novik](https://github.com/novikd)).
+* Reduce inaccuracy of `input_wait_elapsed_us`/`elapsed_us` in the `system.processors_profile_log`. [#66239](https://github.com/ClickHouse/ClickHouse/pull/66239) ([Azat Khuzhin](https://github.com/azat)).
+* Improve ProfileEvents for the filesystem cache. [#66249](https://github.com/ClickHouse/ClickHouse/pull/66249) ([zhukai](https://github.com/nauu)).
+* Add settings to ignore the `ON CLUSTER` clause in queries for named collection management with the replicated storage. [#66288](https://github.com/ClickHouse/ClickHouse/pull/66288) ([MikhailBurdukov](https://github.com/MikhailBurdukov)).
 * Function `generateSnowflakeID` now allows to specify a machine ID as a parameter to prevent collisions in large clusters. [#66374](https://github.com/ClickHouse/ClickHouse/pull/66374) ([ZAWA_ll](https://github.com/Zawa-ll)).
-* Disable suspending on Ctrl+Z in interactive mode. This is a common trap and is not expected behavior for almost all users. I imagine only a few extreme power users could appreciate suspending terminal applications to the background, but I don't know any. [#66511](https://github.com/ClickHouse/ClickHouse/pull/66511) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Add option for validating the Primary key type in Dictionaries. Without this option for simple layouts any column type will be implicitly converted to UInt64. ### Documentation entry for user-facing changes. [#66595](https://github.com/ClickHouse/ClickHouse/pull/66595) ([MikhailBurdukov](https://github.com/MikhailBurdukov)).
+* Disable suspending on `Ctrl+Z` in interactive mode. This is a common trap and is not expected behavior for almost all users. I imagine only a few extreme power users could appreciate suspending terminal applications to the background, but I don't know any. [#66511](https://github.com/ClickHouse/ClickHouse/pull/66511) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add option for validating the primary key type in Dictionaries. Without this option for simple layouts any column type will be implicitly converted to UInt64. [#66595](https://github.com/ClickHouse/ClickHouse/pull/66595) ([MikhailBurdukov](https://github.com/MikhailBurdukov)).
 
 #### Bug Fix (user-visible misbehavior in an official stable release)
-* Fix unexpected size of low cardinality column in function calls. [#65298](https://github.com/ClickHouse/ClickHouse/pull/65298) ([Raúl Marín](https://github.com/Algunenano)).
 * Check cyclic dependencies on CREATE/REPLACE/RENAME/EXCHANGE queries and throw an exception if there is a cyclic dependency. Previously such cyclic dependencies could lead to a deadlock during server startup. Also fix some bugs in dependencies creation. [#65405](https://github.com/ClickHouse/ClickHouse/pull/65405) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix unexpected sizes of `LowCardinality` columns in function calls. [#65298](https://github.com/ClickHouse/ClickHouse/pull/65298) ([Raúl Marín](https://github.com/Algunenano)).
 * Fix crash in maxIntersections. [#65689](https://github.com/ClickHouse/ClickHouse/pull/65689) ([Raúl Marín](https://github.com/Algunenano)).
-* Fix the VALID UNTIL clause in the user definition resetting after a restart. [#66409](https://github.com/ClickHouse/ClickHouse/pull/66409) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Fix SHOW MERGES remaining time. [#66735](https://github.com/ClickHouse/ClickHouse/pull/66735) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix the `VALID UNTIL` clause in the user definition resetting after a restart. [#66409](https://github.com/ClickHouse/ClickHouse/pull/66409) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Fix the remaining time column in `SHOW MERGES`. [#66735](https://github.com/ClickHouse/ClickHouse/pull/66735) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * `Query was cancelled` might have been printed twice in clickhouse-client. This behaviour is fixed. [#66005](https://github.com/ClickHouse/ClickHouse/pull/66005) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Fixed crash while using MaterializedMySQL with TABLE OVERRIDE that maps MySQL NULL field into ClickHouse not NULL field. [#54649](https://github.com/ClickHouse/ClickHouse/pull/54649) ([Filipp Ozinov](https://github.com/bakwc)).
-* Fix logical error when PREWHERE expression read no columns and table has no adaptive index granularity (very old table). [#59173](https://github.com/ClickHouse/ClickHouse/pull/59173) ([Alexander Gololobov](https://github.com/davenger)).
-* Fix bug with cancellation buffer when canceling a query. [#64478](https://github.com/ClickHouse/ClickHouse/pull/64478) ([Sema Checherinda](https://github.com/CheSema)).
+* Fixed crash while using `MaterializedMySQL` (which is an unsupported, experimental feature) with TABLE OVERRIDE that maps MySQL NULL field into ClickHouse not NULL field. [#54649](https://github.com/ClickHouse/ClickHouse/pull/54649) ([Filipp Ozinov](https://github.com/bakwc)).
+* Fix logical error when `PREWHERE` expression read no columns and table has no adaptive index granularity (very old table). [#59173](https://github.com/ClickHouse/ClickHouse/pull/59173) ([Alexander Gololobov](https://github.com/davenger)).
+* Fix bug with the cancellation buffer when canceling a query. [#64478](https://github.com/ClickHouse/ClickHouse/pull/64478) ([Sema Checherinda](https://github.com/CheSema)).
 * Fix filling parts columns from metadata (when columns.txt does not exists). [#64757](https://github.com/ClickHouse/ClickHouse/pull/64757) ([Azat Khuzhin](https://github.com/azat)).
 * Fix crash for `ALTER TABLE ... ON CLUSTER ... MODIFY SQL SECURITY`. [#64957](https://github.com/ClickHouse/ClickHouse/pull/64957) ([pufit](https://github.com/pufit)).
 * Fix crash on destroying AccessControl: add explicit shutdown. [#64993](https://github.com/ClickHouse/ClickHouse/pull/64993) ([Vitaly Baranov](https://github.com/vitlibar)).
@@ -178,9 +178,6 @@
 * Fix `indexHint` function case found by fuzzer. [#66286](https://github.com/ClickHouse/ClickHouse/pull/66286) ([Anton Popov](https://github.com/CurtizJ)).
 * Fix AST formatting of 'create table b empty as a'. [#64951](https://github.com/ClickHouse/ClickHouse/pull/64951) ([Michael Kolupaev](https://github.com/al13n321)).
 
-#### Build/Testing/Packaging Improvement
-* Instantiate template methods ahead in different .cpp files, avoid too large translation units during compiling. [#64818](https://github.com/ClickHouse/ClickHouse/pull/64818) ([lgbo](https://github.com/lgbo-ustc)).
-
 ### <a id="246"></a> ClickHouse release 24.6, 2024-07-01
 
 #### Backward Incompatible Change

From 3a7ffb3284003d853974baf12cf442bdc1105143 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@clickhouse.com>
Date: Tue, 30 Jul 2024 05:19:10 +0200
Subject: [PATCH 088/139] Changelog sanity

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06f7bcdd84e..9d1a63cb3a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -156,7 +156,7 @@
 * Fixed how the ClickHouse server detects the maximum number of usable CPU cores as specified by cgroups v2 if the server runs in a container such as Docker. In more detail, containers often run their process in the root cgroup which has an empty name. In that case, ClickHouse ignored the CPU limits set by cgroups v2. [#66237](https://github.com/ClickHouse/ClickHouse/pull/66237) ([filimonov](https://github.com/filimonov)).
 * Fix the `Not-ready set` error when a subquery with `IN` is used in the constraint. [#66261](https://github.com/ClickHouse/ClickHouse/pull/66261) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Fix error reporting while copying to S3 or AzureBlobStorage. [#66295](https://github.com/ClickHouse/ClickHouse/pull/66295) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Prevent watchdog from keeping descriptors of unlinked(rotated) log files. [#66334](https://github.com/ClickHouse/ClickHouse/pull/66334) ([Aleksei Filatov](https://github.com/aalexfvk)).
+* Prevent watchdog from keeping descriptors of unlinked (rotated) log files. [#66334](https://github.com/ClickHouse/ClickHouse/pull/66334) ([Aleksei Filatov](https://github.com/aalexfvk)).
 * Fix the bug that logicalexpressionoptimizerpass lost logical type of constant. [#66344](https://github.com/ClickHouse/ClickHouse/pull/66344) ([pn](https://github.com/chloro-pn)).
 * Fix `Column identifier is already registered` error with `group_by_use_nulls=true` and new analyzer. [#66400](https://github.com/ClickHouse/ClickHouse/pull/66400) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Fix possible incorrect result for queries joining and filtering table external engine (like PostgreSQL), due to too aggressive filter pushdown. Since now, conditions from where section won't be send to external database in case of outer join with external table. [#66402](https://github.com/ClickHouse/ClickHouse/pull/66402) ([vdimir](https://github.com/vdimir)).

From 368b9a058379c2e7902fd9ee7a21b664f0500df9 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@clickhouse.com>
Date: Tue, 30 Jul 2024 05:29:36 +0200
Subject: [PATCH 089/139] Changelog sanity

---
 CHANGELOG.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d1a63cb3a9..722ae4f8268 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,11 +39,11 @@
 * Add system tables with main information about all detached tables. [#65400](https://github.com/ClickHouse/ClickHouse/pull/65400) ([Konstantin Morozov](https://github.com/k-morozov)).
 
 #### Experimental Feature
-* Change binary serialization of Variant data type: add `compact` mode to avoid writing the same discriminator multiple times for granules with single variant or with only NULL values. Add MergeTree setting `use_compact_variant_discriminators_serialization` that is enabled by default. Note that Variant type is still experimental and backward-incompatible change in serialization is ok. [#62774](https://github.com/ClickHouse/ClickHouse/pull/62774) ([Kruglov Pavel](https://github.com/Avogar)).
-* Support rocksdb as backend storage of clickhouse-keeper. [#56626](https://github.com/ClickHouse/ClickHouse/pull/56626) ([Han Fei](https://github.com/hanfei1991)).
+* Change binary serialization of the `Variant` data type: add `compact` mode to avoid writing the same discriminator multiple times for granules with single variant or with only NULL values. Add MergeTree setting `use_compact_variant_discriminators_serialization` that is enabled by default. Note that Variant type is still experimental and backward-incompatible change in serialization is ok. [#62774](https://github.com/ClickHouse/ClickHouse/pull/62774) ([Kruglov Pavel](https://github.com/Avogar)).
+* Support on-disk backend storage for clickhouse-keeper. [#56626](https://github.com/ClickHouse/ClickHouse/pull/56626) ([Han Fei](https://github.com/hanfei1991)).
 * Refactor JSONExtract functions, support more types including experimental Dynamic type. [#66046](https://github.com/ClickHouse/ClickHouse/pull/66046) ([Kruglov Pavel](https://github.com/Avogar)).
-* Support null map subcolumn for Variant and Dynamic subcolumns. [#66178](https://github.com/ClickHouse/ClickHouse/pull/66178) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix reading dynamic subcolumns from altered Memory table. Previously if `max_types` parameter of a Dynamic type was changed in Memory table via alter, further subcolumns reading can return wrong result. [#66066](https://github.com/ClickHouse/ClickHouse/pull/66066) ([Kruglov Pavel](https://github.com/Avogar)).
+* Support null map subcolumn for `Variant` and `Dynamic` subcolumns. [#66178](https://github.com/ClickHouse/ClickHouse/pull/66178) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix reading `Dynamic` subcolumns from altered `Memory` table. Previously if `max_types` parameter of a Dynamic type was changed in Memory table via alter, further subcolumns reading can return wrong result. [#66066](https://github.com/ClickHouse/ClickHouse/pull/66066) ([Kruglov Pavel](https://github.com/Avogar)).
 * Add support for `cluster_for_parallel_replicas` when using custom key parallel replicas. It allows you to use parallel replicas with custom key with MergeTree tables. [#65453](https://github.com/ClickHouse/ClickHouse/pull/65453) ([Antonio Andelic](https://github.com/antonio2368)).
 
 #### Performance Improvement

From f90b88c978d87225a5cf5f66136714ff5535d69c Mon Sep 17 00:00:00 2001
From: Alexey Gerasimchuck <a.gerasimchuck@arenadata.io>
Date: Tue, 30 Jul 2024 05:57:07 +0000
Subject: [PATCH 090/139] Reduced comprexity of the test

---
 ...2832_alter_max_sessions_for_user.reference |  7 +--
 .../02832_alter_max_sessions_for_user.sh      | 62 ++++++++-----------
 2 files changed, 30 insertions(+), 39 deletions(-)

diff --git a/tests/queries/0_stateless/02832_alter_max_sessions_for_user.reference b/tests/queries/0_stateless/02832_alter_max_sessions_for_user.reference
index f80f8738ff8..c2e103d61cb 100644
--- a/tests/queries/0_stateless/02832_alter_max_sessions_for_user.reference
+++ b/tests/queries/0_stateless/02832_alter_max_sessions_for_user.reference
@@ -1,8 +1,7 @@
-test_alter_profile case: max_session_count 1 alter_sessions_count 1
-test_alter_profile case: max_session_count 2 alter_sessions_count 1
+test_alter_profile case: max_sessions_for_user 1
+USER_SESSION_LIMIT_EXCEEDED
+test_alter_profile case: max_sessions_for_user 2
 USER_SESSION_LIMIT_EXCEEDED
-test_alter_profile case: max_session_count 1 alter_sessions_count 2
-test_alter_profile case: max_session_count 2 alter_sessions_count 2
 READONLY
 READONLY
 READONLY
diff --git a/tests/queries/0_stateless/02832_alter_max_sessions_for_user.sh b/tests/queries/0_stateless/02832_alter_max_sessions_for_user.sh
index 87fbffdb1e6..55f9e3e97a4 100755
--- a/tests/queries/0_stateless/02832_alter_max_sessions_for_user.sh
+++ b/tests/queries/0_stateless/02832_alter_max_sessions_for_user.sh
@@ -5,7 +5,6 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-SESSION_ID_PREFIX="02832_alter_max_sessions_session_$$"
 QUERY_ID_PREFIX="02832_alter_max_sessions_query_$$"
 PROFILE="02832_alter_max_sessions_profile_$$"
 USER="02832_alter_max_sessions_user_$$"
@@ -17,48 +16,41 @@ ${CLICKHOUSE_CLIENT} -q $"DROP PROFILE IF EXISTS ${PROFILE}"
 ${CLICKHOUSE_CLIENT} -q $"CREATE SETTINGS PROFILE ${PROFILE}"
 ${CLICKHOUSE_CLIENT} -q $"CREATE USER '${USER}' SETTINGS PROFILE '${PROFILE}'"
 
-function run_sessions_set()
+function wait_for_query_to_start()
 {
-    local sessions_count="$1"
-    local session_check="$2"
-    for ((i = 1 ; i <= ${sessions_count} ; i++)); do
-        local session_id="${SESSION_ID_PREFIX}_${i}"
-        local query_id="${QUERY_ID_PREFIX}_${i}"
-        # Write only expected error text
-        # More than alter_sessions_count queries will not start.
-        ${CLICKHOUSE_CURL} -sS -X POST "${CLICKHOUSE_URL}&user=${USER}&query_id=${query_id}&session_id=${session_id}&session_check=${session_check}&session_timeout=600&function_sleep_max_microseconds_per_block=120000000" --data-binary "SELECT sleep(120)" | grep -o  -m 1 'USER_SESSION_LIMIT_EXCEEDED' &
+    while [[ $($CLICKHOUSE_CLIENT -q "SELECT count() FROM system.processes WHERE query_id = '$1'") == 0 ]]; do sleep 0.2; done
+}
+
+function test_alter_max_sessions_for_user()
+{
+    local max_sessions_for_user="$1"
+    echo $"test_alter_profile case: max_sessions_for_user ${max_sessions_for_user}"
+
+    # Step 0: Set max_sessions_for_user.
+    ${CLICKHOUSE_CLIENT} -q $"ALTER SETTINGS PROFILE ${PROFILE} SETTINGS max_sessions_for_user = ${max_sessions_for_user}"
+
+    # Step 1: Simulaneously run `max_sessions_for_user` queries. These queries should run without any problems.
+    for ((i = 1 ; i <= max_sessions_for_user ; i++)); do
+        local query_id="${QUERY_ID_PREFIX}_${i}_${max_sessions_for_user}"
+        ${CLICKHOUSE_CLIENT} --max_block_size 1 --query_id $query_id --user $USER --function_sleep_max_microseconds_per_block=120000000 -q "SELECT sleepEachRow(0.1) FROM numbers(1200)" &>/dev/null &
+        wait_for_query_to_start $query_id
     done
 
-    for ((i = 1 ; i <= ${sessions_count} ; i++)); do
-        local query_id="${QUERY_ID_PREFIX}_${i}"
-        $CLICKHOUSE_CLIENT --query "KILL QUERY WHERE query_id='$query_id' SYNC" >/dev/null
+    # Step 2: Run another `max_sessions_for_user` + 1 query. That query should fail.
+    local query_id="${QUERY_ID_PREFIX}_should_fail"
+    ${CLICKHOUSE_CLIENT} --query_id $query_id --user $USER -q "SELECT 1" 2>&1 | grep -o -m 1 'USER_SESSION_LIMIT_EXCEEDED'
+    
+    # Step 3: Stop running queries launched at step 1.
+    for ((i = 1 ; i <= max_sessions_for_user ; i++)); do
+        local query_id="${QUERY_ID_PREFIX}_${i}_${max_sessions_for_user}"
+        $CLICKHOUSE_CLIENT --query "KILL QUERY WHERE query_id='$query_id' ASYNC" >/dev/null
     done
 
     wait
 }
 
-function test_alter_profile()
-{
-    local max_session_count="$1"
-    local alter_sessions_count="$2"
-    echo $"test_alter_profile case: max_session_count ${max_session_count} alter_sessions_count ${alter_sessions_count}"
-
-    ${CLICKHOUSE_CLIENT} -q $"ALTER SETTINGS PROFILE ${PROFILE} SETTINGS max_sessions_for_user = ${max_session_count}"
-
-    # Create sessions with $max_session_count restriction
-    run_sessions_set $max_session_count 0
-
-    # Update restriction to $alter_sessions_count
-    ${CLICKHOUSE_CLIENT} -q $"ALTER SETTINGS PROFILE ${PROFILE} SETTINGS max_sessions_for_user = ${alter_sessions_count}"
-
-    # Simultaneous sessions should use max settings from profile ($alter_sessions_count)
-    run_sessions_set $max_session_count 1
-}
-
-test_alter_profile 1 1
-test_alter_profile 2 1
-test_alter_profile 1 2
-test_alter_profile 2 2
+test_alter_max_sessions_for_user 1
+test_alter_max_sessions_for_user 2
 
 ${CLICKHOUSE_CLIENT} -q "SELECT 1 SETTINGS max_sessions_for_user = 1" 2>&1 | grep -m 1 -o 'READONLY' | head -1
 ${CLICKHOUSE_CLIENT} -q $"SET max_sessions_for_user = 1 " 2>&1 | grep -o  -m 1 'READONLY' | head -1

From 861bdb51f8e098c4b06cb14988e00febbb5a0ac7 Mon Sep 17 00:00:00 2001
From: Antonio Andelic <antonio@clickhouse.com>
Date: Tue, 30 Jul 2024 09:42:38 +0200
Subject: [PATCH 091/139] Fix test

---
 .../test_replicated_table_attach/test.py           | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tests/integration/test_replicated_table_attach/test.py b/tests/integration/test_replicated_table_attach/test.py
index 02ef1ad6353..499220def2c 100644
--- a/tests/integration/test_replicated_table_attach/test.py
+++ b/tests/integration/test_replicated_table_attach/test.py
@@ -27,7 +27,20 @@ def started_cluster():
         cluster.shutdown()
 
 
+def start_clean_clickhouse():
+    # remove fault injection if present
+    if "fault_injection.xml" in node.exec_in_container(
+        ["bash", "-c", "ls /etc/clickhouse-server/config.d"]
+    ):
+        print("Removing fault injection")
+        node.exec_in_container(
+            ["bash", "-c", "rm /etc/clickhouse-server/config.d/fault_injection.xml"]
+        )
+        node.restart_clickhouse()
+
+
 def test_startup_with_small_bg_pool(started_cluster):
+    start_clean_clickhouse()
     node.query(
         "CREATE TABLE replicated_table (k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree('/clickhouse/replicated_table', 'r1') ORDER BY k"
     )
@@ -45,6 +58,7 @@ def test_startup_with_small_bg_pool(started_cluster):
 
 
 def test_startup_with_small_bg_pool_partitioned(started_cluster):
+    start_clean_clickhouse()
     node.query(
         "CREATE TABLE replicated_table_partitioned (k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree('/clickhouse/replicated_table_partitioned', 'r1') ORDER BY k"
     )

From c427c4e2bba852f6f8f9b9346a9a2d0a09f0e4be Mon Sep 17 00:00:00 2001
From: Nikita Mikhaylov <mikhaylovnikitka@gmail.com>
Date: Tue, 30 Jul 2024 10:34:47 +0200
Subject: [PATCH 092/139] Typo

---
 src/Interpreters/DatabaseCatalog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Interpreters/DatabaseCatalog.cpp b/src/Interpreters/DatabaseCatalog.cpp
index 98526e5c1cd..a8e5fd7e6aa 100644
--- a/src/Interpreters/DatabaseCatalog.cpp
+++ b/src/Interpreters/DatabaseCatalog.cpp
@@ -1355,7 +1355,7 @@ void DatabaseCatalog::dropTableDataTask()
         }
         catch (...)
         {
-            /// We don't re-throw expection, because we are in a background pool.
+            /// We don't re-throw exception, because we are in a background pool.
             tryLogCurrentException(log, "Cannot drop tables. Will retry later.");
         }
     }

From 5381619b2ab465386f11e86242883419e48e5f6b Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@clickhouse.com>
Date: Tue, 30 Jul 2024 11:36:25 +0200
Subject: [PATCH 093/139] Remove bad feature.

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 722ae4f8268..a4c873ba3f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -65,7 +65,6 @@
 * The setting `optimize_trivial_insert_select` is disabled by default. In most cases, it should be beneficial. Nevertheless, if you are seeing slower INSERT SELECT or increased memory usage, you can enable it back or `SET compatibility = '24.6'`. [#58970](https://github.com/ClickHouse/ClickHouse/pull/58970) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Print stacktrace and diagnostic info if `clickhouse-client` or `clickhouse-local` crashes. [#61109](https://github.com/ClickHouse/ClickHouse/pull/61109) ([Alexander Tokmakov](https://github.com/tavplubix)).
 * The result of `SHOW INDEX | INDEXES | INDICES | KEYS` was previously sorted by the primary key column names. Since this was unintuitive, the result is now sorted by the position of the primary key columns within the primary key. [#61131](https://github.com/ClickHouse/ClickHouse/pull/61131) ([Robert Schulze](https://github.com/rschu1ze)).
-* Allow matching column names in a case-insensitive manner when reading json files (`input_format_json_case_insensitive_column_matching`). [#61750](https://github.com/ClickHouse/ClickHouse/pull/61750) ([kevinyhzou](https://github.com/KevinyhZou)).
 * Support reading partitioned data DeltaLake data. Infer DeltaLake schema by reading metadata instead of data. [#63201](https://github.com/ClickHouse/ClickHouse/pull/63201) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * In composable protocols TLS layer accepted only `certificateFile` and `privateKeyFile` parameters. https://clickhouse.com/docs/en/operations/settings/composable-protocols. [#63985](https://github.com/ClickHouse/ClickHouse/pull/63985) ([Anton Ivashkin](https://github.com/ianton-ru)).
 * Added profile event `SelectQueriesWithPrimaryKeyUsage` which indicates how many SELECT queries use the primary key to evaluate the WHERE clause. [#64492](https://github.com/ClickHouse/ClickHouse/pull/64492) ([0x01f](https://github.com/0xfei)).

From d7534c5b40c315cdb3d52101f626dbee7d565cdb Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nk@clickhouse.com>
Date: Tue, 30 Jul 2024 12:20:54 +0200
Subject: [PATCH 094/139] Update
 03210_optimize_rewrite_aggregate_function_with_if_return_type_bug.sql

---
 ...imize_rewrite_aggregate_function_with_if_return_type_bug.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/queries/0_stateless/03210_optimize_rewrite_aggregate_function_with_if_return_type_bug.sql b/tests/queries/0_stateless/03210_optimize_rewrite_aggregate_function_with_if_return_type_bug.sql
index b620a6434bf..565a481940a 100644
--- a/tests/queries/0_stateless/03210_optimize_rewrite_aggregate_function_with_if_return_type_bug.sql
+++ b/tests/queries/0_stateless/03210_optimize_rewrite_aggregate_function_with_if_return_type_bug.sql
@@ -1,3 +1,5 @@
+SET allow_experimental_analyzer = 1;
+
 -- For function count, rewrite countState to countStateIf changes the type from AggregateFunction(count, Nullable(UInt64)) to AggregateFunction(count, UInt64)
 -- We can cast AggregateFunction(count, UInt64) back to AggregateFunction(count, Nullable(UInt64)) with additional _CAST
 select hex(countState(if(toNullable(number % 2 = 0), number, null))) from numbers(5) settings optimize_rewrite_aggregate_function_with_if=1;

From 6ef628a7c80ebd6ec727365ee69d8141a4f11400 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nk@clickhouse.com>
Date: Tue, 30 Jul 2024 10:33:22 +0000
Subject: [PATCH 095/139] Fixing build.

---
 src/Processors/QueryPlan/DistinctStep.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Processors/QueryPlan/DistinctStep.cpp b/src/Processors/QueryPlan/DistinctStep.cpp
index a481454139d..b1c24fc01ce 100644
--- a/src/Processors/QueryPlan/DistinctStep.cpp
+++ b/src/Processors/QueryPlan/DistinctStep.cpp
@@ -10,6 +10,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
 static ITransformingStep::Traits getTraits(bool pre_distinct)
 {
     const bool preserves_number_of_streams = pre_distinct;
@@ -90,7 +95,8 @@ void DistinctStep::transformPipeline(QueryPipelineBuilder & pipeline, const Buil
             /// final distinct for sorted stream (sorting inside and among chunks)
             if (input_stream.sort_scope == DataStream::SortScope::Global)
             {
-                assert(input_stream.has_single_port);
+                if (pipeline.getNumStreams() != 1)
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "DistinctStep with in-order expects single input");
 
                 if (distinct_sort_desc.size() < columns.size())
                 {

From 0f8feff4d3806fa6f81d24184ab68bcd6e727551 Mon Sep 17 00:00:00 2001
From: Antonio Andelic <antonio@clickhouse.com>
Date: Tue, 30 Jul 2024 12:34:30 +0200
Subject: [PATCH 096/139] Add KeeperMap retries

---
 src/Storages/StorageKeeperMap.cpp | 132 +++++++++++++++++-------------
 1 file changed, 73 insertions(+), 59 deletions(-)

diff --git a/src/Storages/StorageKeeperMap.cpp b/src/Storages/StorageKeeperMap.cpp
index ef157239e26..5534bb7f346 100644
--- a/src/Storages/StorageKeeperMap.cpp
+++ b/src/Storages/StorageKeeperMap.cpp
@@ -35,6 +35,7 @@
 #include <Storages/StorageInMemoryMetadata.h>
 #include <Storages/checkAndGetLiteralArgument.h>
 
+#include "Common/ZooKeeper/ZooKeeperRetries.h"
 #include <Common/Base64.h>
 #include <Common/Exception.h>
 #include <Common/FailPoint.h>
@@ -120,7 +121,7 @@ public:
         : SinkToStorage(header), storage(storage_), context(std::move(context_))
     {
         auto primary_key = storage.getPrimaryKey();
-        assert(primary_key.size() == 1);
+        chassert(primary_key.size() == 1);
         primary_key_pos = getHeader().getPositionByName(primary_key[0]);
     }
 
@@ -171,76 +172,89 @@ public:
     template <bool for_update>
     void finalize(bool strict)
     {
-        auto zookeeper = storage.getClient();
+        const auto & settings = context->getSettingsRef();
 
-        auto keys_limit = storage.keysLimit();
+        ZooKeeperRetriesControl zk_retry{
+            getName(),
+            getLogger(getName()),
+            ZooKeeperRetriesInfo{
+                settings.insert_keeper_max_retries,
+                settings.insert_keeper_retry_initial_backoff_ms,
+                settings.insert_keeper_retry_max_backoff_ms},
+            context->getProcessListElement()};
 
-        size_t current_keys_num = 0;
-        size_t new_keys_num = 0;
-
-        // We use keys limit as a soft limit so we ignore some cases when it can be still exceeded
-        // (e.g if parallel insert queries are being run)
-        if (keys_limit != 0)
+        retries_ctl.retryLoop([&]()
         {
-            Coordination::Stat data_stat;
-            zookeeper->get(storage.dataPath(), &data_stat);
-            current_keys_num = data_stat.numChildren;
-        }
+            auto zookeeper = storage.getClient();
+            auto keys_limit = storage.keysLimit();
 
-        std::vector<std::string> key_paths;
-        key_paths.reserve(new_values.size());
-        for (const auto & [key, _] : new_values)
-            key_paths.push_back(storage.fullPathForKey(key));
+            size_t current_keys_num = 0;
+            size_t new_keys_num = 0;
 
-        zkutil::ZooKeeper::MultiExistsResponse results;
-
-        if constexpr (!for_update)
-        {
-            if (!strict)
-                results = zookeeper->exists(key_paths);
-        }
-
-        Coordination::Requests requests;
-        requests.reserve(key_paths.size());
-        for (size_t i = 0; i < key_paths.size(); ++i)
-        {
-            auto key = fs::path(key_paths[i]).filename();
-
-            if constexpr (for_update)
+            // We use keys limit as a soft limit so we ignore some cases when it can be still exceeded
+            // (e.g if parallel insert queries are being run)
+            if (keys_limit != 0)
             {
-                int32_t version = -1;
-                if (strict)
-                    version = versions.at(key);
-
-                requests.push_back(zkutil::makeSetRequest(key_paths[i], new_values[key], version));
+                Coordination::Stat data_stat;
+                zookeeper->get(storage.dataPath(), &data_stat);
+                current_keys_num = data_stat.numChildren;
             }
-            else
+
+            std::vector<std::string> key_paths;
+            key_paths.reserve(new_values.size());
+            for (const auto & [key, _] : new_values)
+                key_paths.push_back(storage.fullPathForKey(key));
+
+            zkutil::ZooKeeper::MultiExistsResponse results;
+
+            if constexpr (!for_update)
             {
-                if (!strict && results[i].error == Coordination::Error::ZOK)
+                if (!strict)
+                    results = zookeeper->exists(key_paths);
+            }
+
+            Coordination::Requests requests;
+            requests.reserve(key_paths.size());
+            for (size_t i = 0; i < key_paths.size(); ++i)
+            {
+                auto key = fs::path(key_paths[i]).filename();
+
+                if constexpr (for_update)
                 {
-                    requests.push_back(zkutil::makeSetRequest(key_paths[i], new_values[key], -1));
+                    int32_t version = -1;
+                    if (strict)
+                        version = versions.at(key);
+
+                    requests.push_back(zkutil::makeSetRequest(key_paths[i], new_values[key], version));
                 }
                 else
                 {
-                    requests.push_back(zkutil::makeCreateRequest(key_paths[i], new_values[key], zkutil::CreateMode::Persistent));
-                    ++new_keys_num;
+                    if (!strict && results[i].error == Coordination::Error::ZOK)
+                    {
+                        requests.push_back(zkutil::makeSetRequest(key_paths[i], new_values[key], -1));
+                    }
+                    else
+                    {
+                        requests.push_back(zkutil::makeCreateRequest(key_paths[i], new_values[key], zkutil::CreateMode::Persistent));
+                        ++new_keys_num;
+                    }
                 }
             }
-        }
 
-        if (new_keys_num != 0)
-        {
-            auto will_be = current_keys_num + new_keys_num;
-            if (keys_limit != 0 && will_be > keys_limit)
-                throw Exception(
-                    ErrorCodes::LIMIT_EXCEEDED,
-                    "Limit would be exceeded by inserting {} new key(s). Limit is {}, while the number of keys would be {}",
-                    new_keys_num,
-                    keys_limit,
-                    will_be);
-        }
+            if (new_keys_num != 0)
+            {
+                auto will_be = current_keys_num + new_keys_num;
+                if (keys_limit != 0 && will_be > keys_limit)
+                    throw Exception(
+                        ErrorCodes::LIMIT_EXCEEDED,
+                        "Limit would be exceeded by inserting {} new key(s). Limit is {}, while the number of keys would be {}",
+                        new_keys_num,
+                        keys_limit,
+                        will_be);
+            }
 
-        zookeeper->multi(requests, /* check_session_valid */ true);
+            zookeeper->multi(requests, /* check_session_valid */ true);
+        });
     }
 };
 
@@ -529,8 +543,8 @@ Pipe StorageKeeperMap::read(
         size_t num_keys = keys->size();
         size_t num_threads = std::min<size_t>(num_streams, keys->size());
 
-        assert(num_keys <= std::numeric_limits<uint32_t>::max());
-        assert(num_threads <= std::numeric_limits<uint32_t>::max());
+        chassert(num_keys <= std::numeric_limits<uint32_t>::max());
+        chassert(num_threads <= std::numeric_limits<uint32_t>::max());
 
         for (size_t thread_idx = 0; thread_idx < num_threads; ++thread_idx)
         {
@@ -1160,7 +1174,7 @@ void StorageKeeperMap::mutate(const MutationCommands & commands, ContextPtr loca
 
     bool strict = local_context->getSettingsRef().keeper_map_strict_mode;
 
-    assert(commands.size() == 1);
+    chassert(commands.size() == 1);
 
     auto metadata_snapshot = getInMemoryMetadataPtr();
     auto storage = getStorageID();
@@ -1236,7 +1250,7 @@ void StorageKeeperMap::mutate(const MutationCommands & commands, ContextPtr loca
         return;
     }
 
-    assert(commands.front().type == MutationCommand::Type::UPDATE);
+    chassert(commands.front().type == MutationCommand::Type::UPDATE);
     if (commands.front().column_to_update_expression.contains(primary_key))
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "Primary key cannot be updated (cannot update column {})", primary_key);
 

From 72d6467fd2c34a82e1ef8ac73a451240843279a6 Mon Sep 17 00:00:00 2001
From: Robert Schulze <robert@clickhouse.com>
Date: Tue, 30 Jul 2024 10:43:21 +0000
Subject: [PATCH 097/139] Bump Azure to 1.13

---
 contrib/azure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/azure b/contrib/azure
index ea3e19a7be0..67272b7ee0a 160000
--- a/contrib/azure
+++ b/contrib/azure
@@ -1 +1 @@
-Subproject commit ea3e19a7be08519134c643177d56c7484dfec884
+Subproject commit 67272b7ee0adff6b69921b26eb071ba1a353062c

From d4d3d590e38436da44b13dbf11a92cc6d00863e7 Mon Sep 17 00:00:00 2001
From: Robert Schulze <robert@clickhouse.com>
Date: Mon, 29 Jul 2024 20:06:55 +0000
Subject: [PATCH 098/139] Remove obsolete --multiquery parameter from tests

---
 .../integration/test_distributed_format/test.py  |  8 ++++----
 ...80_client_break_at_exception_in_batch_mode.sh |  2 +-
 .../00463_long_sessions_in_http_interface.sh     | 10 +++++-----
 .../0_stateless/00474_readonly_settings.sh       |  4 ++--
 .../0_stateless/00612_pk_in_tuple_perf.sh        |  4 ++--
 .../0_stateless/00630_arbitrary_csv_delimiter.sh |  6 +++---
 .../00650_csv_with_specified_quote_rule.sh       |  4 ++--
 ...00651_default_database_on_client_reconnect.sh |  2 +-
 .../00652_mutations_default_database.sh          |  2 +-
 ...cated_mutations_default_database_zookeeper.sh |  2 +-
 .../00699_materialized_view_mutations.sh         |  8 ++++----
 .../00704_drop_truncate_memory_table.sh          |  6 +++---
 .../0_stateless/00705_drop_create_merge_tree.sh  |  4 ++--
 .../0_stateless/00763_lock_buffer_long.sh        |  4 ++--
 ...3_long_lock_buffer_alter_destination_table.sh |  4 ++--
 .../00825_protobuf_format_array_3dim.sh          |  2 +-
 .../00825_protobuf_format_array_of_arrays.sh     |  2 +-
 .../00825_protobuf_format_enum_mapping.sh        |  2 +-
 .../0_stateless/00825_protobuf_format_map.sh     |  2 +-
 .../00825_protobuf_format_nested_in_nested.sh    |  2 +-
 .../00825_protobuf_format_nested_optional.sh     |  2 +-
 .../00825_protobuf_format_no_length_delimiter.sh |  6 +++---
 .../0_stateless/00825_protobuf_format_persons.sh |  4 ++--
 ...5_protobuf_format_skipped_column_in_nested.sh |  2 +-
 .../00825_protobuf_format_splitted_nested.sh     |  2 +-
 .../0_stateless/00825_protobuf_format_squares.sh |  2 +-
 .../00825_protobuf_format_table_default.sh       |  2 +-
 .../0_stateless/00900_long_parquet_load.sh       |  2 +-
 .../0_stateless/00900_orc_arrow_parquet_maps.sh  |  2 +-
 .../00937_format_schema_rows_template.sh         |  4 ++--
 .../0_stateless/00956_sensitive_data_masking.sh  | 12 ++++++------
 .../01019_alter_materialized_view_atomic.sh      |  2 +-
 .../01019_alter_materialized_view_consistent.sh  |  2 +-
 .../0_stateless/01035_lc_empty_part_bug.sh       |  4 ++--
 ...ystem_reload_dictionary_reloads_completely.sh |  2 +-
 .../01052_window_view_proc_tumble_to_now.sh      |  2 +-
 .../01053_window_view_proc_hop_to_now.sh         |  2 +-
 .../01054_window_view_proc_tumble_to.sh          |  2 +-
 .../0_stateless/01055_window_view_proc_hop_to.sh |  2 +-
 ...057_window_view_event_tumble_to_strict_asc.sh |  2 +-
 .../01058_window_view_event_hop_to_strict_asc.sh |  2 +-
 .../01060_window_view_event_tumble_to_asc.sh     |  2 +-
 .../01061_window_view_event_hop_to_asc.sh        |  2 +-
 .../01063_window_view_event_tumble_to_bounded.sh |  2 +-
 .../01064_window_view_event_hop_to_bounded.sh    |  2 +-
 ...w_view_event_tumble_to_strict_asc_lateness.sh |  2 +-
 ...7_window_view_event_tumble_to_asc_lateness.sh |  2 +-
 ...ndow_view_event_tumble_to_bounded_lateness.sh |  2 +-
 .../01071_window_view_event_tumble_asc_join.sh   |  2 +-
 ...01072_window_view_multiple_columns_groupby.sh |  2 +-
 ...3_window_view_event_tumble_to_asc_populate.sh |  4 ++--
 ...window_view_event_tumble_asc_join_populate.sh |  2 +-
 ...75_window_view_proc_tumble_to_now_populate.sh |  2 +-
 .../01076_window_view_alter_query_to.sh          |  4 ++--
 ...7_window_view_alter_query_to_modify_source.sh |  4 ++--
 ...1079_window_view_inner_table_memory_tumble.sh |  2 +-
 .../01080_window_view_inner_table_memory_hop.sh  |  2 +-
 .../01081_window_view_target_table_engine.sh     |  2 +-
 .../0_stateless/01083_window_view_select.sh      |  2 +-
 .../01084_window_view_with_table_identifier.sh   |  2 +-
 .../0_stateless/01086_window_view_cleanup.sh     |  2 +-
 .../0_stateless/01087_window_view_alter_query.sh |  4 ++--
 .../01088_window_view_default_column.sh          |  2 +-
 .../0_stateless/01133_begin_commit_race.sh       |  6 +++---
 .../01169_alter_partition_isolation_stress.sh    |  4 ++--
 ...01169_old_alter_partition_isolation_stress.sh | 10 +++++-----
 .../01171_mv_select_insert_isolation_long.sh     | 14 +++++++-------
 .../0_stateless/01174_select_insert_isolation.sh |  8 ++++----
 .../0_stateless/01198_client_quota_key.sh        |  2 +-
 .../0_stateless/01285_engine_join_donmikel.sh    |  4 ++--
 .../0_stateless/01293_optimize_final_force.sh    |  2 +-
 .../queries/0_stateless/01304_direct_io_long.sh  |  4 ++--
 ...orage_file_tsv_csv_with_names_write_prefix.sh |  4 ++--
 .../0_stateless/01443_merge_truncate_long.sh     |  2 +-
 .../01527_clickhouse_local_optimize.sh           |  2 +-
 .../01543_avro_deserialization_with_lc.sh        |  2 +-
 .../0_stateless/01544_file_engine_settings.sh    |  4 ++--
 .../0_stateless/01600_detach_permanently.sh      |  2 +-
 .../01600_parts_states_metrics_long.sh           |  2 +-
 tests/queries/0_stateless/01606_git_import.sh    |  4 ++--
 .../0_stateless/01607_arrays_as_nested_csv.sh    |  4 ++--
 .../0_stateless/01632_tinylog_read_write.sh      |  4 ++--
 .../01658_read_file_to_stringcolumn.sh           |  4 ++--
 .../01666_merge_tree_max_query_limit.sh          |  2 +-
 .../0_stateless/01747_system_session_log_long.sh |  6 +++---
 .../01801_nullable_low_cardinality_tsv.sh        |  2 +-
 .../01834_alias_columns_laziness_filimonov.sh    |  2 +-
 .../01923_network_receive_time_metric_insert.sh  |  4 ++--
 .../01939_network_receive_bytes_metrics.sh       |  4 ++--
 .../01946_test_wrong_host_name_access.sh         |  2 +-
 ..._with_escape_sequence_at_the_end_of_buffer.sh |  2 +-
 tests/queries/0_stateless/02009_from_infile.sh   |  2 +-
 .../0_stateless/02024_compression_in_query.sh    |  6 +++---
 .../02048_parallel_reading_from_infile.sh        |  6 +++---
 ...02104_clickhouse_local_columns_description.sh |  2 +-
 ...insert_deduplication_token_multiple_blocks.sh | 10 +++++-----
 ...eduplication_token_multiple_blocks_replica.sh | 10 +++++-----
 .../queries/0_stateless/02125_many_mutations.sh  |  6 +++---
 .../0_stateless/02125_many_mutations_2.sh        |  6 +++---
 .../queries/0_stateless/02135_local_create_db.sh |  2 +-
 .../0_stateless/02151_client_option_echo.sh      |  4 ++--
 .../0_stateless/02151_hash_table_sizes_stats.sh  |  2 +-
 .../02151_hash_table_sizes_stats_distributed.sh  |  2 +-
 .../02158_explain_ast_alter_commands.sh          |  2 +-
 .../02206_clickhouse_local_use_database.sh       |  2 +-
 .../02226_filesystem_cache_profile_events.sh     | 14 +++++++-------
 .../02227_test_create_empty_sqlite_db.sh         |  4 ++--
 .../0_stateless/02235_remote_fs_cache_stress.sh  |  6 +++---
 .../02240_protobuflist_format_persons.sh         |  4 ++--
 .../02246_clickhouse_local_drop_database.sh      |  4 ++--
 .../0_stateless/02286_drop_filesystem_cache.sh   |  2 +-
 .../02337_drop_filesystem_cache_access.sh        |  8 ++++----
 .../0_stateless/02364_window_view_segfault.sh    |  2 +-
 .../0_stateless/02373_datetime64_monotonicity.sh |  2 +-
 .../0_stateless/02416_rename_database_rbac.sh    |  4 ++--
 .../02435_rollback_cancelled_queries.sh          |  2 +-
 ...60_projections_and_aggregate_null_if_empty.sh |  2 +-
 .../02494_query_cache_user_isolation.sh          |  8 ++++----
 ...503_cache_on_write_with_small_segment_size.sh |  4 ++--
 .../queries/0_stateless/02521_merge_over_gap.sh  |  2 +-
 .../02530_dictionaries_update_field.sh           |  2 +-
 .../0_stateless/02702_allow_skip_errors_enum.sh  |  2 +-
 .../0_stateless/02704_keeper_map_zk_nodes.sh     |  2 +-
 ...ckhouse_local_implicit_file_table_function.sh |  4 ++--
 .../02712_bool_better_exception_message.sh       |  8 ++++----
 .../0_stateless/02722_database_filesystem.sh     |  8 ++++----
 tests/queries/0_stateless/02724_database_s3.sh   | 14 +++++++-------
 tests/queries/0_stateless/02725_database_hdfs.sh | 10 +++++-----
 .../0_stateless/02725_local_query_parameters.sh  |  2 +-
 .../02751_multiquery_with_argument.reference     |  2 --
 .../02751_multiquery_with_argument.sh            | 16 ++++++----------
 .../02815_no_throw_in_simple_queries.sh          |  2 +-
 .../02843_insertion_table_schema_infer.sh        |  2 +-
 .../02864_restore_table_with_broken_part.sh      |  2 +-
 ...ultiple_batches_array_inconsistent_offsets.sh |  2 +-
 .../0_stateless/02875_merge_engine_set_index.sh  |  2 +-
 .../02877_optimize_read_in_order_from_view.sh    |  2 +-
 ...02884_create_view_with_sql_security_option.sh | 16 ++++++++--------
 ...885_async_insert_access_check_for_defaults.sh |  4 ++--
 ...900_clickhouse_local_drop_current_database.sh |  2 +-
 .../02956_clickhouse_local_system_parts.sh       |  2 +-
 .../02973_backup_of_in_memory_compressed.sh      | 10 +++++-----
 .../02973_parse_crlf_with_tsv_files.sh           |  2 +-
 .../0_stateless/02995_forget_partition.sh        |  4 ++--
 tests/queries/0_stateless/02995_index_1.sh       |  6 +++---
 tests/queries/0_stateless/02995_index_10.sh      |  6 +++---
 tests/queries/0_stateless/02995_index_2.sh       |  6 +++---
 tests/queries/0_stateless/02995_index_3.sh       |  6 +++---
 tests/queries/0_stateless/02995_index_4.sh       |  6 +++---
 tests/queries/0_stateless/02995_index_5.sh       |  6 +++---
 tests/queries/0_stateless/02995_index_6.sh       |  6 +++---
 tests/queries/0_stateless/02995_index_7.sh       |  6 +++---
 tests/queries/0_stateless/02995_index_8.sh       |  6 +++---
 tests/queries/0_stateless/02995_index_9.sh       |  6 +++---
 .../0_stateless/02998_native_parquet_reader.sh   |  2 +-
 .../03001_backup_matview_after_modify_query.sh   |  2 +-
 .../03001_matview_columns_after_modify_query.sh  |  2 +-
 .../03006_correct_revoke_for_partial_rights.sh   |  2 +-
 .../03147_system_columns_access_checks.sh        |  4 ++--
 .../0_stateless/03201_local_named_collections.sh |  6 +++---
 .../0_stateless/03212_thousand_exceptions.sh     |  2 +-
 161 files changed, 316 insertions(+), 322 deletions(-)

diff --git a/tests/integration/test_distributed_format/test.py b/tests/integration/test_distributed_format/test.py
index 91afb8f7b34..5611f465e8b 100644
--- a/tests/integration/test_distributed_format/test.py
+++ b/tests/integration/test_distributed_format/test.py
@@ -55,7 +55,7 @@ def test_single_file(started_cluster, cluster):
     path = get_dist_path(cluster, "distr_1", 1)
     query = f"select * from file('{path}/1.bin', 'Distributed')"
     out = node.exec_in_container(
-        ["/usr/bin/clickhouse", "local", "--multiquery", "--stacktrace", "-q", query]
+        ["/usr/bin/clickhouse", "local", "--stacktrace", "-q", query]
     )
 
     assert out == "1\ta\n2\tbb\n3\tccc\n"
@@ -65,7 +65,7 @@ def test_single_file(started_cluster, cluster):
     select * from t;
     """
     out = node.exec_in_container(
-        ["/usr/bin/clickhouse", "local", "--multiquery", "--stacktrace", "-q", query]
+        ["/usr/bin/clickhouse", "local", "--stacktrace", "-q", query]
     )
 
     assert out == "1\ta\n2\tbb\n3\tccc\n"
@@ -106,7 +106,7 @@ def test_two_files(started_cluster, cluster):
     select * from t order by x;
     """
     out = node.exec_in_container(
-        ["/usr/bin/clickhouse", "local", "--multiquery", "--stacktrace", "-q", query]
+        ["/usr/bin/clickhouse", "local", "--stacktrace", "-q", query]
     )
 
     assert out == "0\t_\n1\ta\n2\tbb\n3\tccc\n"
@@ -141,7 +141,7 @@ def test_single_file_old(started_cluster, cluster):
     select * from t;
     """
     out = node.exec_in_container(
-        ["/usr/bin/clickhouse", "local", "--multiquery", "--stacktrace", "-q", query]
+        ["/usr/bin/clickhouse", "local", "--stacktrace", "-q", query]
     )
 
     assert out == "1\ta\n2\tbb\n3\tccc\n"
diff --git a/tests/queries/0_stateless/00380_client_break_at_exception_in_batch_mode.sh b/tests/queries/0_stateless/00380_client_break_at_exception_in_batch_mode.sh
index 62f891db33c..0aab52d15c2 100755
--- a/tests/queries/0_stateless/00380_client_break_at_exception_in_batch_mode.sh
+++ b/tests/queries/0_stateless/00380_client_break_at_exception_in_batch_mode.sh
@@ -5,4 +5,4 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --multiquery --query="SELECT 1; SELECT xyz; SELECT 2;" 2> /dev/null || true;
+$CLICKHOUSE_CLIENT --query="SELECT 1; SELECT xyz; SELECT 2;" 2> /dev/null || true;
diff --git a/tests/queries/0_stateless/00463_long_sessions_in_http_interface.sh b/tests/queries/0_stateless/00463_long_sessions_in_http_interface.sh
index d41d6409315..6ee1649c9ed 100755
--- a/tests/queries/0_stateless/00463_long_sessions_in_http_interface.sh
+++ b/tests/queries/0_stateless/00463_long_sessions_in_http_interface.sh
@@ -25,7 +25,7 @@ ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_4&se
 ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_5&session_timeout=60" --data-binary "SELECT 1"
 
 echo "Sessions are local per user:"
-${CLICKHOUSE_CLIENT} --multiquery --query "DROP USER IF EXISTS test_00463; CREATE USER test_00463; GRANT ALL ON *.* TO test_00463;"
+${CLICKHOUSE_CLIENT} --query "DROP USER IF EXISTS test_00463; CREATE USER test_00463; GRANT ALL ON *.* TO test_00463;"
 
 ${CLICKHOUSE_CURL} -sS -X POST "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_6&session_timeout=600" --data-binary "CREATE TEMPORARY TABLE t (s String)"
 ${CLICKHOUSE_CURL} -sS -X POST "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_6" --data-binary "INSERT INTO t VALUES ('Hello')"
@@ -37,7 +37,7 @@ ${CLICKHOUSE_CURL} -sS -X POST "${CLICKHOUSE_URL}&user=test_00463&session_id=${C
 ${CLICKHOUSE_CURL} -sS -X POST "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_6" --data-binary "SELECT * FROM t"
 ${CLICKHOUSE_CURL} -sS -X POST "${CLICKHOUSE_URL}&user=test_00463&session_id=${CLICKHOUSE_DATABASE}_6" --data-binary "SELECT * FROM t"
 
-${CLICKHOUSE_CLIENT} --multiquery --query "DROP USER test_00463";
+${CLICKHOUSE_CLIENT} --query "DROP USER test_00463";
 
 echo "And cannot be accessed for a non-existent user:"
 ${CLICKHOUSE_CURL} -sS -X POST "${CLICKHOUSE_URL}&user=test_00463&session_id=${CLICKHOUSE_DATABASE}_6" --data-binary "SELECT * FROM t" | grep -c -F 'Exception'
@@ -59,7 +59,7 @@ done
 
 echo "A session successfully expire after a timeout and the session's temporary table shadows the permanent table:"
 # An infinite loop is required to make the test reliable. We will check that the timeout corresponds to the observed time at least once
-${CLICKHOUSE_CLIENT} --multiquery --query "DROP TABLE IF EXISTS t; CREATE TABLE t (s String) ENGINE = Memory; INSERT INTO t VALUES ('World');"
+${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS t; CREATE TABLE t (s String) ENGINE = Memory; INSERT INTO t VALUES ('World');"
 while true
 do
     (
@@ -70,7 +70,7 @@ do
         ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_8" --data-binary "SELECT * FROM t"
     ) | tr -d '\n' | grep -F 'HelloWorld' && break || sleep 1
 done
-${CLICKHOUSE_CLIENT} --multiquery --query "DROP TABLE t"
+${CLICKHOUSE_CLIENT} --query "DROP TABLE t"
 
 echo "A session cannot be used by concurrent connections:"
 
@@ -83,5 +83,5 @@ do
 done
 
 ${CLICKHOUSE_CURL} -sS -X POST "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_9" --data-binary "SELECT 1" | grep -c -F 'SESSION_IS_LOCKED'
-${CLICKHOUSE_CLIENT} --multiquery --query "KILL QUERY WHERE query_id = '${CLICKHOUSE_DATABASE}_9' SYNC FORMAT Null";
+${CLICKHOUSE_CLIENT} --query "KILL QUERY WHERE query_id = '${CLICKHOUSE_DATABASE}_9' SYNC FORMAT Null";
 wait
diff --git a/tests/queries/0_stateless/00474_readonly_settings.sh b/tests/queries/0_stateless/00474_readonly_settings.sh
index 3a857d81a74..ed3558c6d7a 100755
--- a/tests/queries/0_stateless/00474_readonly_settings.sh
+++ b/tests/queries/0_stateless/00474_readonly_settings.sh
@@ -8,8 +8,8 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 $CLICKHOUSE_CLIENT --query="select toUInt64(pow(2, 62)) as value format JSON" --output_format_json_quote_64bit_integers=0 | grep value
 $CLICKHOUSE_CLIENT --query="select toUInt64(pow(2, 62)) as value format JSON" --output_format_json_quote_64bit_integers=1 | grep value
 
-$CLICKHOUSE_CLIENT --readonly=1 --multiquery --query="set output_format_json_quote_64bit_integers=1 ; select toUInt64(pow(2, 63)) as value format JSON" --server_logs_file=/dev/null 2>&1 | grep -o -q 'value\|Cannot modify .* setting in readonly mode' && echo "OK" || echo "FAIL"
-$CLICKHOUSE_CLIENT --readonly=1 --multiquery --query="set output_format_json_quote_64bit_integers=0 ; select toUInt64(pow(2, 63)) as value format JSON" --server_logs_file=/dev/null 2>&1 | grep -o -q 'value\|Cannot modify .* setting in readonly mode' && echo "OK" || echo "FAIL"
+$CLICKHOUSE_CLIENT --readonly=1 --query="set output_format_json_quote_64bit_integers=1 ; select toUInt64(pow(2, 63)) as value format JSON" --server_logs_file=/dev/null 2>&1 | grep -o -q 'value\|Cannot modify .* setting in readonly mode' && echo "OK" || echo "FAIL"
+$CLICKHOUSE_CLIENT --readonly=1 --query="set output_format_json_quote_64bit_integers=0 ; select toUInt64(pow(2, 63)) as value format JSON" --server_logs_file=/dev/null 2>&1 | grep -o -q 'value\|Cannot modify .* setting in readonly mode' && echo "OK" || echo "FAIL"
 
 ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&query=SELECT+toUInt64(pow(2,+63))+as+value+format+JSON&output_format_json_quote_64bit_integers=1" | grep value
 ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&query=SELECT+toUInt64(pow(2,+63))+as+value+format+JSON&output_format_json_quote_64bit_integers=0" | grep value
diff --git a/tests/queries/0_stateless/00612_pk_in_tuple_perf.sh b/tests/queries/0_stateless/00612_pk_in_tuple_perf.sh
index c8297635c43..7b2973669de 100755
--- a/tests/queries/0_stateless/00612_pk_in_tuple_perf.sh
+++ b/tests/queries/0_stateless/00612_pk_in_tuple_perf.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+$CLICKHOUSE_CLIENT <<EOF
 DROP TABLE IF EXISTS pk_in_tuple_perf;
 CREATE TABLE pk_in_tuple_perf
 (
@@ -27,7 +27,7 @@ $CLICKHOUSE_CLIENT --query "$query FORMAT JSON" | grep "rows_read"
 
 ## Test with non-const args in tuple
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+$CLICKHOUSE_CLIENT <<EOF
 DROP TABLE IF EXISTS pk_in_tuple_perf_non_const;
 CREATE TABLE pk_in_tuple_perf_non_const
 (
diff --git a/tests/queries/0_stateless/00630_arbitrary_csv_delimiter.sh b/tests/queries/0_stateless/00630_arbitrary_csv_delimiter.sh
index 978b7bdb671..921cab8d865 100755
--- a/tests/queries/0_stateless/00630_arbitrary_csv_delimiter.sh
+++ b/tests/queries/0_stateless/00630_arbitrary_csv_delimiter.sh
@@ -22,7 +22,7 @@ echo '"Hello, world"; 123; "2016-01-01"
 "Hello, ""world"""; "456"; 2016-01-02;
 Hello "world"; 789 ;2016-01-03
 "Hello
- world"; 100; 2016-01-04;' | $CLICKHOUSE_CLIENT --multiquery --query="SET format_csv_delimiter=';'; INSERT INTO csv FORMAT CSV";
+ world"; 100; 2016-01-04;' | $CLICKHOUSE_CLIENT --query="SET format_csv_delimiter=';'; INSERT INTO csv FORMAT CSV";
 
 $CLICKHOUSE_CLIENT --query="SELECT * FROM csv ORDER BY d";
 $CLICKHOUSE_CLIENT --format_csv_delimiter=";" --query="SELECT * FROM csv ORDER BY d FORMAT CSV";
@@ -33,7 +33,7 @@ $CLICKHOUSE_CLIENT --query="CREATE TABLE csv (s1 String, s2 String) ENGINE = Mem
 
 echo 'abc,def;hello;
 hello; world;
-"hello ""world""";abc,def;' | $CLICKHOUSE_CLIENT --multiquery --query="SET format_csv_delimiter=';'; INSERT INTO csv FORMAT CSV";
+"hello ""world""";abc,def;' | $CLICKHOUSE_CLIENT --query="SET format_csv_delimiter=';'; INSERT INTO csv FORMAT CSV";
 
 
 $CLICKHOUSE_CLIENT --query="SELECT * FROM csv";
@@ -44,7 +44,7 @@ $CLICKHOUSE_CLIENT --query="CREATE TABLE csv (s1 String, s2 String) ENGINE = Mem
 echo '"s1";"s2"
 abc,def;hello;
 hello; world;
-"hello ""world""";abc,def;' | $CLICKHOUSE_CLIENT --multiquery --query="SET format_csv_delimiter=';'; INSERT INTO csv FORMAT CSVWithNames";
+"hello ""world""";abc,def;' | $CLICKHOUSE_CLIENT --query="SET format_csv_delimiter=';'; INSERT INTO csv FORMAT CSVWithNames";
 
 $CLICKHOUSE_CLIENT --format_csv_delimiter=";" --query="SELECT * FROM csv FORMAT CSV";
 $CLICKHOUSE_CLIENT --format_csv_delimiter="," --query="SELECT * FROM csv FORMAT CSV";
diff --git a/tests/queries/0_stateless/00650_csv_with_specified_quote_rule.sh b/tests/queries/0_stateless/00650_csv_with_specified_quote_rule.sh
index 3971510f7f6..2f76b3e63ac 100755
--- a/tests/queries/0_stateless/00650_csv_with_specified_quote_rule.sh
+++ b/tests/queries/0_stateless/00650_csv_with_specified_quote_rule.sh
@@ -18,7 +18,7 @@ $CLICKHOUSE_CLIENT --query="DROP TABLE csv";
 $CLICKHOUSE_CLIENT --query="CREATE TABLE csv (s String, n UInt64, d Date) ENGINE = Memory";
 
 echo "'single quote' not end, 123, 2016-01-01
-'em good, 456, 2016-01-02" | $CLICKHOUSE_CLIENT --multiquery --query="SET format_csv_allow_single_quotes=0; INSERT INTO csv FORMAT CSV";
+'em good, 456, 2016-01-02" | $CLICKHOUSE_CLIENT --query="SET format_csv_allow_single_quotes=0; INSERT INTO csv FORMAT CSV";
 
 $CLICKHOUSE_CLIENT --query="SELECT * FROM csv ORDER BY d";
 
@@ -38,7 +38,7 @@ $CLICKHOUSE_CLIENT --query="DROP TABLE csv";
 $CLICKHOUSE_CLIENT --query="CREATE TABLE csv (s String, n UInt64, d Date) ENGINE = Memory";
 
 echo '"double quote" not end, 123, 2016-01-01
-"em good, 456, 2016-01-02' | $CLICKHOUSE_CLIENT --multiquery --query="SET format_csv_allow_double_quotes=0; INSERT INTO csv FORMAT CSV";
+"em good, 456, 2016-01-02' | $CLICKHOUSE_CLIENT --query="SET format_csv_allow_double_quotes=0; INSERT INTO csv FORMAT CSV";
 
 $CLICKHOUSE_CLIENT --query="SELECT * FROM csv ORDER BY d";
 
diff --git a/tests/queries/0_stateless/00651_default_database_on_client_reconnect.sh b/tests/queries/0_stateless/00651_default_database_on_client_reconnect.sh
index 994114c9c50..df0afeb707c 100755
--- a/tests/queries/0_stateless/00651_default_database_on_client_reconnect.sh
+++ b/tests/queries/0_stateless/00651_default_database_on_client_reconnect.sh
@@ -5,4 +5,4 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --ignore-error --multiquery --query "DROP TABLE IF EXISTS tab_00651; CREATE TABLE tab_00651 (val UInt64) engine = Memory; SHOW CREATE TABLE tab_00651 format abcd; DESC tab_00651; DROP TABLE tab_00651;" 2>/dev/null ||:
+${CLICKHOUSE_CLIENT} --ignore-error --query "DROP TABLE IF EXISTS tab_00651; CREATE TABLE tab_00651 (val UInt64) engine = Memory; SHOW CREATE TABLE tab_00651 format abcd; DESC tab_00651; DROP TABLE tab_00651;" 2>/dev/null ||:
diff --git a/tests/queries/0_stateless/00652_mutations_default_database.sh b/tests/queries/0_stateless/00652_mutations_default_database.sh
index eed45540f9b..577943bc3fd 100755
--- a/tests/queries/0_stateless/00652_mutations_default_database.sh
+++ b/tests/queries/0_stateless/00652_mutations_default_database.sh
@@ -4,7 +4,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --multiquery --mutations_sync=1 << EOF
+${CLICKHOUSE_CLIENT} --mutations_sync=1 << EOF
 DROP TABLE IF EXISTS mutations;
 DROP TABLE IF EXISTS for_subquery;
 
diff --git a/tests/queries/0_stateless/00652_replicated_mutations_default_database_zookeeper.sh b/tests/queries/0_stateless/00652_replicated_mutations_default_database_zookeeper.sh
index 0ac5a2f748a..d4f6d3b290c 100755
--- a/tests/queries/0_stateless/00652_replicated_mutations_default_database_zookeeper.sh
+++ b/tests/queries/0_stateless/00652_replicated_mutations_default_database_zookeeper.sh
@@ -9,7 +9,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=./mergetree_mutations.lib
 . "$CURDIR"/mergetree_mutations.lib
 
-${CLICKHOUSE_CLIENT} --allow_nondeterministic_mutations=1 --multiquery << EOF
+${CLICKHOUSE_CLIENT} --allow_nondeterministic_mutations=1 << EOF
 DROP TABLE IF EXISTS mutations_r1;
 DROP TABLE IF EXISTS for_subquery;
 
diff --git a/tests/queries/0_stateless/00699_materialized_view_mutations.sh b/tests/queries/0_stateless/00699_materialized_view_mutations.sh
index a0f7db536dc..07ca9bc0f67 100755
--- a/tests/queries/0_stateless/00699_materialized_view_mutations.sh
+++ b/tests/queries/0_stateless/00699_materialized_view_mutations.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 
-${CLICKHOUSE_CLIENT} --multiquery --query="
+${CLICKHOUSE_CLIENT} --query="
 DROP TABLE IF EXISTS view_00699;
 DROP TABLE IF EXISTS null_00699;
 
@@ -20,14 +20,14 @@ SELECT count(), min(x), max(x) FROM view_00699;
 
 ALTER TABLE null_00699 DELETE WHERE x % 2 = 0;"  --mutations_sync=1
 
-${CLICKHOUSE_CLIENT} --multiquery --query="
+${CLICKHOUSE_CLIENT} --query="
 SELECT count(), min(x), max(x) FROM null_00699;
 SELECT count(), min(x), max(x) FROM view_00699;
 
 ALTER TABLE view_00699 DELETE WHERE x % 2 = 0;
 " --mutations_sync=1
 
-${CLICKHOUSE_CLIENT} --multiquery --query="
+${CLICKHOUSE_CLIENT} --query="
 SELECT count(), min(x), max(x) FROM null_00699;
 SELECT count(), min(x), max(x) FROM view_00699;
 
@@ -35,7 +35,7 @@ ALTER TABLE null_00699 DELETE WHERE x % 2 = 1;
 ALTER TABLE view_00699 DELETE WHERE x % 2 = 1;
 " --mutations_sync=1
 
-${CLICKHOUSE_CLIENT} --multiquery --query="
+${CLICKHOUSE_CLIENT} --query="
 SELECT count(), min(x), max(x) FROM null_00699;
 SELECT count(), min(x), max(x) FROM view_00699;
 
diff --git a/tests/queries/0_stateless/00704_drop_truncate_memory_table.sh b/tests/queries/0_stateless/00704_drop_truncate_memory_table.sh
index e1540d1a25e..e40da11b893 100755
--- a/tests/queries/0_stateless/00704_drop_truncate_memory_table.sh
+++ b/tests/queries/0_stateless/00704_drop_truncate_memory_table.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --multiquery --query="
+${CLICKHOUSE_CLIENT} --query="
 DROP TABLE IF EXISTS memory;
 CREATE TABLE memory (x UInt64) ENGINE = Memory;
 
@@ -21,13 +21,13 @@ INSERT INTO memory SELECT * FROM numbers(1000);"
 # But if the table will be dropped before query - just pass.
 # It's Ok, because otherwise the test will depend on the race condition in the test itself.
 
-${CLICKHOUSE_CLIENT} --multiquery --query="
+${CLICKHOUSE_CLIENT} --query="
 SET max_threads = 1;
 SELECT count() FROM memory WHERE NOT ignore(sleep(0.0001));" 2>&1 | grep -c -P '^1000$|^0$|Exception' &
 
 sleep 0.05;
 
-${CLICKHOUSE_CLIENT} --multiquery --query="
+${CLICKHOUSE_CLIENT} --query="
 TRUNCATE TABLE memory;
 DROP TABLE memory;
 "
diff --git a/tests/queries/0_stateless/00705_drop_create_merge_tree.sh b/tests/queries/0_stateless/00705_drop_create_merge_tree.sh
index ea8b9d02e49..fd002668696 100755
--- a/tests/queries/0_stateless/00705_drop_create_merge_tree.sh
+++ b/tests/queries/0_stateless/00705_drop_create_merge_tree.sh
@@ -5,8 +5,8 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-yes 'CREATE TABLE IF NOT EXISTS table (x UInt8) ENGINE = MergeTree ORDER BY tuple();' | head -n 1000 | $CLICKHOUSE_CLIENT --multiquery &
-yes 'DROP TABLE IF EXISTS table;' | head -n 1000 | $CLICKHOUSE_CLIENT --multiquery &
+yes 'CREATE TABLE IF NOT EXISTS table (x UInt8) ENGINE = MergeTree ORDER BY tuple();' | head -n 1000 | $CLICKHOUSE_CLIENT &
+yes 'DROP TABLE IF EXISTS table;' | head -n 1000 | $CLICKHOUSE_CLIENT &
 wait
 
 ${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS table"
diff --git a/tests/queries/0_stateless/00763_lock_buffer_long.sh b/tests/queries/0_stateless/00763_lock_buffer_long.sh
index 444a66767aa..92f917aa287 100755
--- a/tests/queries/0_stateless/00763_lock_buffer_long.sh
+++ b/tests/queries/0_stateless/00763_lock_buffer_long.sh
@@ -16,12 +16,12 @@ ${CLICKHOUSE_CLIENT} --query="CREATE TABLE buffer_00763_2 (s String) ENGINE = Bu
 
 function thread1()
 {
-    seq 1 500 | sed -r -e 's/.+/DROP TABLE IF EXISTS mt_00763_2; CREATE TABLE mt_00763_2 (s String) ENGINE = MergeTree ORDER BY s; INSERT INTO mt_00763_2 SELECT toString(number) FROM numbers(10);/' | ${CLICKHOUSE_CLIENT} --fsync-metadata 0 --multiquery --ignore-error ||:
+    seq 1 500 | sed -r -e 's/.+/DROP TABLE IF EXISTS mt_00763_2; CREATE TABLE mt_00763_2 (s String) ENGINE = MergeTree ORDER BY s; INSERT INTO mt_00763_2 SELECT toString(number) FROM numbers(10);/' | ${CLICKHOUSE_CLIENT} --fsync-metadata 0 --ignore-error ||:
 }
 
 function thread2()
 {
-    seq 1 500 | sed -r -e 's/.+/SELECT count() FROM buffer_00763_2;/' | ${CLICKHOUSE_CLIENT} --multiquery --server_logs_file='/dev/null' --ignore-error 2>&1 | grep -vP '^0$|^10$|^Received exception|^Code: 60|^Code: 218|^Code: 473' | grep -v '(query: '
+    seq 1 500 | sed -r -e 's/.+/SELECT count() FROM buffer_00763_2;/' | ${CLICKHOUSE_CLIENT} --server_logs_file='/dev/null' --ignore-error 2>&1 | grep -vP '^0$|^10$|^Received exception|^Code: 60|^Code: 218|^Code: 473' | grep -v '(query: '
 }
 
 thread1 &
diff --git a/tests/queries/0_stateless/00763_long_lock_buffer_alter_destination_table.sh b/tests/queries/0_stateless/00763_long_lock_buffer_alter_destination_table.sh
index 7e2384cfc52..79df667d45f 100755
--- a/tests/queries/0_stateless/00763_long_lock_buffer_alter_destination_table.sh
+++ b/tests/queries/0_stateless/00763_long_lock_buffer_alter_destination_table.sh
@@ -18,12 +18,12 @@ ${CLICKHOUSE_CLIENT} --query="INSERT INTO mt_00763_1 VALUES (1, '1'), (2, '2'),
 
 function thread1()
 {
-    seq 1 300 | sed -r -e 's/.+/ALTER TABLE mt_00763_1 MODIFY column s UInt32; ALTER TABLE mt_00763_1 MODIFY column s String;/' | ${CLICKHOUSE_CLIENT} --multiquery --ignore-error ||:
+    seq 1 300 | sed -r -e 's/.+/ALTER TABLE mt_00763_1 MODIFY column s UInt32; ALTER TABLE mt_00763_1 MODIFY column s String;/' | ${CLICKHOUSE_CLIENT} --ignore-error ||:
 }
 
 function thread2()
 {
-    seq 1 2000 | sed -r -e 's/.+/SELECT sum(length(s)) FROM buffer_00763_1;/' | ${CLICKHOUSE_CLIENT} --multiquery --ignore-error 2>&1 | grep -vP '(^3$|^Received exception from server|^Code: 473)'
+    seq 1 2000 | sed -r -e 's/.+/SELECT sum(length(s)) FROM buffer_00763_1;/' | ${CLICKHOUSE_CLIENT} --ignore-error 2>&1 | grep -vP '(^3$|^Received exception from server|^Code: 473)'
 }
 
 thread1 &
diff --git a/tests/queries/0_stateless/00825_protobuf_format_array_3dim.sh b/tests/queries/0_stateless/00825_protobuf_format_array_3dim.sh
index 3cd842a10ba..468ced802cd 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_array_3dim.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_array_3dim.sh
@@ -9,7 +9,7 @@ SCHEMADIR=$CURDIR/format_schemas
 set -eo pipefail
 
 # Run the client.
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+$CLICKHOUSE_CLIENT <<EOF
 DROP TABLE IF EXISTS array_3dim_protobuf_00825;
 
 CREATE TABLE array_3dim_protobuf_00825
diff --git a/tests/queries/0_stateless/00825_protobuf_format_array_of_arrays.sh b/tests/queries/0_stateless/00825_protobuf_format_array_of_arrays.sh
index 76c5a63c4f2..47f0e2a31e7 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_array_of_arrays.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_array_of_arrays.sh
@@ -11,7 +11,7 @@ SCHEMADIR=$CURDIR/format_schemas
 set -eo pipefail
 
 # Run the client.
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+$CLICKHOUSE_CLIENT <<EOF
 DROP TABLE IF EXISTS array_of_arrays_protobuf_00825;
 
 CREATE TABLE array_of_arrays_protobuf_00825
diff --git a/tests/queries/0_stateless/00825_protobuf_format_enum_mapping.sh b/tests/queries/0_stateless/00825_protobuf_format_enum_mapping.sh
index 1258230610d..da359f2ab5c 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_enum_mapping.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_enum_mapping.sh
@@ -11,7 +11,7 @@ SCHEMADIR=$CURDIR/format_schemas
 set -eo pipefail
 
 # Run the client.
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+$CLICKHOUSE_CLIENT <<EOF
 DROP TABLE IF EXISTS enum_mapping_protobuf_00825;
 
 CREATE TABLE enum_mapping_protobuf_00825
diff --git a/tests/queries/0_stateless/00825_protobuf_format_map.sh b/tests/queries/0_stateless/00825_protobuf_format_map.sh
index 82ebcc6959a..155754a2f00 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_map.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_map.sh
@@ -9,7 +9,7 @@ SCHEMADIR=$CURDIR/format_schemas
 set -eo pipefail
 
 # Run the client.
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+$CLICKHOUSE_CLIENT <<EOF
 DROP TABLE IF EXISTS map_protobuf_00825;
 
 CREATE TABLE map_protobuf_00825
diff --git a/tests/queries/0_stateless/00825_protobuf_format_nested_in_nested.sh b/tests/queries/0_stateless/00825_protobuf_format_nested_in_nested.sh
index b0a16c2fbba..9b4a12a3ae4 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_nested_in_nested.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_nested_in_nested.sh
@@ -11,7 +11,7 @@ SCHEMADIR=$CURDIR/format_schemas
 set -eo pipefail
 
 # Run the client.
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+$CLICKHOUSE_CLIENT <<EOF
 DROP TABLE IF EXISTS nested_in_nested_protobuf_00825;
 
 CREATE TABLE nested_in_nested_protobuf_00825 (x Nested (y Nested (z Int64))) ENGINE = MergeTree ORDER BY tuple();
diff --git a/tests/queries/0_stateless/00825_protobuf_format_nested_optional.sh b/tests/queries/0_stateless/00825_protobuf_format_nested_optional.sh
index cf9c47f5ea9..acec56b1790 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_nested_optional.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_nested_optional.sh
@@ -11,7 +11,7 @@ SCHEMADIR=$CURDIR/format_schemas
 set -eo pipefail
 
 # Run the client.
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+$CLICKHOUSE_CLIENT <<EOF
 DROP TABLE IF EXISTS nested_optional_protobuf_00825;
 
 CREATE TABLE nested_optional_protobuf_00825
diff --git a/tests/queries/0_stateless/00825_protobuf_format_no_length_delimiter.sh b/tests/queries/0_stateless/00825_protobuf_format_no_length_delimiter.sh
index 0f168c38395..ce6f6275028 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_no_length_delimiter.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_no_length_delimiter.sh
@@ -9,7 +9,7 @@ SCHEMADIR=$CURDIR/format_schemas
 set -eo pipefail
 
 # Run the client.
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+$CLICKHOUSE_CLIENT <<EOF
 DROP TABLE IF EXISTS no_length_delimiter_protobuf_00825;
 DROP TABLE IF EXISTS roundtrip_no_length_delimiter_protobuf_00825;
 
@@ -43,11 +43,11 @@ $CLICKHOUSE_CLIENT --query "SELECT * FROM roundtrip_no_length_delimiter_protobuf
 rm "$BINARY_FILE_PATH"
 
 # The ProtobufSingle format can't be used to write multiple rows because this format doesn't have any row delimiter.
-$CLICKHOUSE_CLIENT --multiquery > /dev/null <<EOF
+$CLICKHOUSE_CLIENT > /dev/null <<EOF
 SELECT * FROM no_length_delimiter_protobuf_00825 FORMAT ProtobufSingle SETTINGS format_schema = '$SCHEMADIR/00825_protobuf_format_no_length_delimiter:Message'; -- { clientError 546 }
 EOF
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+$CLICKHOUSE_CLIENT <<EOF
 DROP TABLE no_length_delimiter_protobuf_00825;
 DROP TABLE roundtrip_no_length_delimiter_protobuf_00825;
 EOF
diff --git a/tests/queries/0_stateless/00825_protobuf_format_persons.sh b/tests/queries/0_stateless/00825_protobuf_format_persons.sh
index a9ac49a1e30..1f199dc4691 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_persons.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_persons.sh
@@ -17,7 +17,7 @@ SCHEMADIR=$CURDIR/format_schemas
 set -eo pipefail
 
 # Run the client.
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+$CLICKHOUSE_CLIENT <<EOF
 DROP TABLE IF EXISTS persons_00825;
 DROP TABLE IF EXISTS roundtrip_persons_00825;
 DROP TABLE IF EXISTS alt_persons_00825;
@@ -129,7 +129,7 @@ $CLICKHOUSE_CLIENT --query "INSERT INTO edition2023_persons_00825 SETTINGS forma
 $CLICKHOUSE_CLIENT --query "SELECT * FROM edition2023_persons_00825 ORDER BY name"
 rm "$BINARY_FILE_PATH"
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+$CLICKHOUSE_CLIENT <<EOF
 DROP TABLE persons_00825;
 DROP TABLE roundtrip_persons_00825;
 DROP TABLE alt_persons_00825;
diff --git a/tests/queries/0_stateless/00825_protobuf_format_skipped_column_in_nested.sh b/tests/queries/0_stateless/00825_protobuf_format_skipped_column_in_nested.sh
index 1c1dde82b4a..c98205b5126 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_skipped_column_in_nested.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_skipped_column_in_nested.sh
@@ -11,7 +11,7 @@ SCHEMADIR=$CURDIR/format_schemas
 set -eo pipefail
 
 # Run the client.
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+$CLICKHOUSE_CLIENT <<EOF
 DROP TABLE IF EXISTS table_skipped_column_in_nested_00825;
 
 CREATE TABLE table_skipped_column_in_nested_00825 (
diff --git a/tests/queries/0_stateless/00825_protobuf_format_splitted_nested.sh b/tests/queries/0_stateless/00825_protobuf_format_splitted_nested.sh
index f4525ba609c..eafe1919606 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_splitted_nested.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_splitted_nested.sh
@@ -9,7 +9,7 @@ SCHEMADIR=$CURDIR/format_schemas
 set -eo pipefail
 
 # Run the client.
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+$CLICKHOUSE_CLIENT <<EOF
 DROP TABLE IF EXISTS splitted_nested_protobuf_00825;
 
 CREATE TABLE splitted_nested_protobuf_00825 (
diff --git a/tests/queries/0_stateless/00825_protobuf_format_squares.sh b/tests/queries/0_stateless/00825_protobuf_format_squares.sh
index f04cf60d78b..9c6778d519d 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_squares.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_squares.sh
@@ -9,7 +9,7 @@ SCHEMADIR=$CURDIR/format_schemas
 set -eo pipefail
 
 # Run the client.
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+$CLICKHOUSE_CLIENT <<EOF
 DROP TABLE IF EXISTS squares_protobuf_00825;
 
 CREATE TABLE squares_protobuf_00825 (number UInt32, square UInt64) ENGINE = MergeTree ORDER BY tuple();
diff --git a/tests/queries/0_stateless/00825_protobuf_format_table_default.sh b/tests/queries/0_stateless/00825_protobuf_format_table_default.sh
index 5701ee2cb4d..8ccb022b669 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_table_default.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_table_default.sh
@@ -9,7 +9,7 @@ SCHEMADIR=$CURDIR/format_schemas
 set -eo pipefail
 
 # Run the client.
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+$CLICKHOUSE_CLIENT <<EOF
 DROP TABLE IF EXISTS table_default_protobuf_00825;
 
 CREATE TABLE table_default_protobuf_00825
diff --git a/tests/queries/0_stateless/00900_long_parquet_load.sh b/tests/queries/0_stateless/00900_long_parquet_load.sh
index 97fee5e97ec..1bafb033f56 100755
--- a/tests/queries/0_stateless/00900_long_parquet_load.sh
+++ b/tests/queries/0_stateless/00900_long_parquet_load.sh
@@ -58,7 +58,7 @@ for NAME in $(find "$DATA_DIR"/*.parquet -print0 | xargs -0 -n 1 basename | LC_A
     COLUMNS=$(cat "$COLUMNS_FILE") || continue
 
     ${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS parquet_load"
-    $CLICKHOUSE_CLIENT --multiquery <<EOF
+    $CLICKHOUSE_CLIENT <<EOF
 CREATE TABLE parquet_load ($COLUMNS) ENGINE = Memory;
 EOF
 
diff --git a/tests/queries/0_stateless/00900_orc_arrow_parquet_maps.sh b/tests/queries/0_stateless/00900_orc_arrow_parquet_maps.sh
index 4e258911078..db14a3b1032 100755
--- a/tests/queries/0_stateless/00900_orc_arrow_parquet_maps.sh
+++ b/tests/queries/0_stateless/00900_orc_arrow_parquet_maps.sh
@@ -6,7 +6,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CUR_DIR"/../shell_config.sh
 
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS maps"
-${CLICKHOUSE_CLIENT} --multiquery <<EOF
+${CLICKHOUSE_CLIENT} <<EOF
 CREATE TABLE maps (m1 Map(UInt32, UInt32), m2 Map(String, String), m3 Map(UInt32, Tuple(UInt32, UInt32)), m4 Map(UInt32, Array(UInt32)), m5 Array(Map(UInt32, UInt32)), m6 Tuple(Map(UInt32, UInt32), Map(String, String)), m7 Array(Map(UInt32, Array(Tuple(Map(UInt32, UInt32), Tuple(UInt32)))))) ENGINE=Memory();
 EOF
 
diff --git a/tests/queries/0_stateless/00937_format_schema_rows_template.sh b/tests/queries/0_stateless/00937_format_schema_rows_template.sh
index 0221527f9c9..f020e15b2d7 100755
--- a/tests/queries/0_stateless/00937_format_schema_rows_template.sh
+++ b/tests/queries/0_stateless/00937_format_schema_rows_template.sh
@@ -23,7 +23,7 @@ echo -e "\n"
 # Test that if both format_template_row_format setting and format_template_row are provided, error is thrown
 row_format_file="$CURDIR"/"${CLICKHOUSE_TEST_UNIQUE_NAME}"_template_output_format_row.tmp
 echo -ne 'Question: ${question:Quoted}, Answer: ${answer:Quoted}, Number of Likes: ${likes:Raw}, Date: ${date:Raw}' > $row_format_file
-$CLICKHOUSE_CLIENT --multiline --multiquery --query "SELECT * FROM template GROUP BY question, answer, likes, date WITH TOTALS ORDER BY date LIMIT 3 FORMAT Template SETTINGS \
+$CLICKHOUSE_CLIENT --multiline --query "SELECT * FROM template GROUP BY question, answer, likes, date WITH TOTALS ORDER BY date LIMIT 3 FORMAT Template SETTINGS \
 format_template_row = '$row_format_file', \
 format_template_row_format = 'Question: \${question:Quoted}, Answer: \${answer:Quoted}, Number of Likes: \${likes:Raw}, Date: \${date:Raw}', \
 format_template_rows_between_delimiter = ';\n'; --{clientError 474}"
@@ -38,7 +38,7 @@ format_template_rows_between_delimiter = ';\n'";
 # Test that if both format_template_result_format setting and format_template_resultset are provided, error is thrown
 resultset_output_file="$CURDIR"/"$CLICKHOUSE_TEST_UNIQUE_NAME"_template_output_format_resultset.tmp
 echo -ne '===== Resultset ===== \n \${data} \n ===============' > $resultset_output_file
-$CLICKHOUSE_CLIENT --multiline --multiquery --query "SELECT * FROM template GROUP BY question, answer, likes, date WITH TOTALS ORDER BY date LIMIT 3 FORMAT Template SETTINGS \
+$CLICKHOUSE_CLIENT --multiline --query "SELECT * FROM template GROUP BY question, answer, likes, date WITH TOTALS ORDER BY date LIMIT 3 FORMAT Template SETTINGS \
 format_template_resultset = '$resultset_output_file', \
 format_template_resultset_format = '===== Resultset ===== \n \${data} \n ===============', \
 format_template_row_format = 'Question: \${question:Quoted}, Answer: \${answer:Quoted}, Number of Likes: \${likes:Raw}, Date: \${date:Raw}', \
diff --git a/tests/queries/0_stateless/00956_sensitive_data_masking.sh b/tests/queries/0_stateless/00956_sensitive_data_masking.sh
index 926557e4ba6..bd65b937648 100755
--- a/tests/queries/0_stateless/00956_sensitive_data_masking.sh
+++ b/tests/queries/0_stateless/00956_sensitive_data_masking.sh
@@ -17,7 +17,7 @@ echo 1
 # normal execution
 $CLICKHOUSE_CLIENT \
   --query="SELECT 'find_me_TOPSECRET=TOPSECRET' FROM numbers(1) FORMAT Null" \
-  --log_queries=1 --ignore-error --multiquery >"$tmp_file" 2>&1
+  --log_queries=1 --ignore-error >"$tmp_file" 2>&1
 
 grep -F 'find_me_[hidden]' "$tmp_file" >/dev/null || echo 'fail 1a'
 grep -F 'TOPSECRET' "$tmp_file" && echo 'fail 1b'
@@ -38,7 +38,7 @@ echo 3
 # failure at before query start
 $CLICKHOUSE_CLIENT \
   --query="SELECT 1 FROM system.numbers WHERE credit_card_number='find_me_TOPSECRET=TOPSECRET' FORMAT Null" \
-  --log_queries=1 --ignore-error --multiquery |& grep -v '^(query: ' > "$tmp_file"
+  --log_queries=1 --ignore-error |& grep -v '^(query: ' > "$tmp_file"
 
 grep -F 'find_me_[hidden]' "$tmp_file" >/dev/null || echo 'fail 3a'
 grep -F 'TOPSECRET' "$tmp_file" && echo 'fail 3b'
@@ -56,7 +56,7 @@ echo 4
 # failure at the end of query
 $CLICKHOUSE_CLIENT \
   --query="SELECT 'find_me_TOPSECRET=TOPSECRET', intDiv( 100, number - 10) FROM numbers(11) FORMAT Null" \
-  --log_queries=1 --ignore-error --max_block_size=2 --multiquery |& grep -v '^(query: ' > "$tmp_file"
+  --log_queries=1 --ignore-error --max_block_size=2 |& grep -v '^(query: ' > "$tmp_file"
 
 grep -F 'find_me_[hidden]' "$tmp_file" >/dev/null || echo 'fail 4a'
 grep -F 'TOPSECRET' "$tmp_file" && echo 'fail 4b'
@@ -67,7 +67,7 @@ rm -f "$tmp_file2" >/dev/null 2>&1
 bash -c "$CLICKHOUSE_CLIENT \
   --function_sleep_max_microseconds_per_block 60000000 \
   --query=\"select sleepEachRow(1) from numbers(10) where ignore('find_me_TOPSECRET=TOPSECRET')=0 and ignore('fwerkh_that_magic_string_make_me_unique') = 0 FORMAT Null\" \
-  --log_queries=1 --ignore-error --multiquery |& grep -v '^(query: ' > $tmp_file2" &
+  --log_queries=1 --ignore-error |& grep -v '^(query: ' > $tmp_file2" &
 
 rm -f "$tmp_file" >/dev/null 2>&1
 # check that executing query doesn't expose secrets in processlist
@@ -133,7 +133,7 @@ insert into sensitive select number as id, toDate('2019-01-01') as date, 'abcd'
 insert into sensitive select number as id, toDate('2019-01-01') as date, 'find_me_TOPSECRET=TOPSECRET' as value1, rand() as valuer from numbers(10);
 insert into sensitive select number as id, toDate('2019-01-01') as date, 'abcd' as value1, rand() as valuer from numbers(10000);
 select * from sensitive WHERE value1 = 'find_me_TOPSECRET=TOPSECRET' FORMAT Null;
-drop table sensitive;" --log_queries=1 --ignore-error --multiquery >"$tmp_file" 2>&1
+drop table sensitive;" --log_queries=1 --ignore-error >"$tmp_file" 2>&1
 
 grep -F 'find_me_[hidden]' "$tmp_file" >/dev/null || echo 'fail 8a'
 grep -F 'TOPSECRET' "$tmp_file" && echo 'fail 8b'
@@ -144,7 +144,7 @@ echo 9
 $CLICKHOUSE_CLIENT \
    --server_logs_file=/dev/null \
    --query="SELECT if( count() > 0, 'text_log non empty', 'text_log empty') FROM system.text_log WHERE event_date >= yesterday() and message like '%find_me%';
-   select * from system.text_log where event_date >= yesterday() and message like '%TOPSECRET=TOPSECRET%';"  --ignore-error --multiquery
+   select * from system.text_log where event_date >= yesterday() and message like '%TOPSECRET=TOPSECRET%';"  --ignore-error 
 
 echo 'finish'
 rm -f "$tmp_file" >/dev/null 2>&1
diff --git a/tests/queries/0_stateless/01019_alter_materialized_view_atomic.sh b/tests/queries/0_stateless/01019_alter_materialized_view_atomic.sh
index 4bd21fcee02..eb12a76eb62 100755
--- a/tests/queries/0_stateless/01019_alter_materialized_view_atomic.sh
+++ b/tests/queries/0_stateless/01019_alter_materialized_view_atomic.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+$CLICKHOUSE_CLIENT <<EOF
 DROP TABLE IF EXISTS src;
 DROP TABLE IF EXISTS mv;
 
diff --git a/tests/queries/0_stateless/01019_alter_materialized_view_consistent.sh b/tests/queries/0_stateless/01019_alter_materialized_view_consistent.sh
index 26c2e54e637..eccf456d330 100755
--- a/tests/queries/0_stateless/01019_alter_materialized_view_consistent.sh
+++ b/tests/queries/0_stateless/01019_alter_materialized_view_consistent.sh
@@ -6,7 +6,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+$CLICKHOUSE_CLIENT <<EOF
 DROP TABLE IF EXISTS src_a;
 DROP TABLE IF EXISTS src_b;
 
diff --git a/tests/queries/0_stateless/01035_lc_empty_part_bug.sh b/tests/queries/0_stateless/01035_lc_empty_part_bug.sh
index 185c4ef4a4e..a509fcf629c 100755
--- a/tests/queries/0_stateless/01035_lc_empty_part_bug.sh
+++ b/tests/queries/0_stateless/01035_lc_empty_part_bug.sh
@@ -6,7 +6,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 # that test is failing on versions <= 19.11.12
 
-${CLICKHOUSE_CLIENT} --multiquery --query="
+${CLICKHOUSE_CLIENT} --query="
     DROP TABLE IF EXISTS lc_empty_part_bug;
     create table lc_empty_part_bug (id  UInt64, s String) Engine=MergeTree ORDER BY id SETTINGS number_of_free_entries_in_pool_to_execute_mutation=0;
     insert into lc_empty_part_bug select number as id, toString(rand()) from numbers(100);
@@ -15,7 +15,7 @@ ${CLICKHOUSE_CLIENT} --multiquery --query="
 
 echo 'Waited for mutation to finish'
 
-${CLICKHOUSE_CLIENT} --multiquery --query="
+${CLICKHOUSE_CLIENT} --query="
     alter table lc_empty_part_bug modify column s LowCardinality(String);
     SELECT 'still alive';
     insert into lc_empty_part_bug select number+100 as id, toString(rand()) from numbers(100);
diff --git a/tests/queries/0_stateless/01042_system_reload_dictionary_reloads_completely.sh b/tests/queries/0_stateless/01042_system_reload_dictionary_reloads_completely.sh
index 42488ca946c..03dd376f802 100755
--- a/tests/queries/0_stateless/01042_system_reload_dictionary_reloads_completely.sh
+++ b/tests/queries/0_stateless/01042_system_reload_dictionary_reloads_completely.sh
@@ -8,7 +8,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 set -e -o pipefail
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+$CLICKHOUSE_CLIENT <<EOF
 CREATE TABLE ${CLICKHOUSE_DATABASE}.table(x Int64, y Int64, insert_time DateTime) ENGINE = MergeTree ORDER BY tuple();
 INSERT INTO ${CLICKHOUSE_DATABASE}.table VALUES (12, 102, now());
 
diff --git a/tests/queries/0_stateless/01052_window_view_proc_tumble_to_now.sh b/tests/queries/0_stateless/01052_window_view_proc_tumble_to_now.sh
index 5c70806ea7b..4f8482558c8 100755
--- a/tests/queries/0_stateless/01052_window_view_proc_tumble_to_now.sh
+++ b/tests/queries/0_stateless/01052_window_view_proc_tumble_to_now.sh
@@ -9,7 +9,7 @@ opts=(
     "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
diff --git a/tests/queries/0_stateless/01053_window_view_proc_hop_to_now.sh b/tests/queries/0_stateless/01053_window_view_proc_hop_to_now.sh
index 32c9c52ab09..efd1721e594 100755
--- a/tests/queries/0_stateless/01053_window_view_proc_hop_to_now.sh
+++ b/tests/queries/0_stateless/01053_window_view_proc_hop_to_now.sh
@@ -9,7 +9,7 @@ opts=(
     "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
diff --git a/tests/queries/0_stateless/01054_window_view_proc_tumble_to.sh b/tests/queries/0_stateless/01054_window_view_proc_tumble_to.sh
index ba566bb4ae6..5e603382e5b 100755
--- a/tests/queries/0_stateless/01054_window_view_proc_tumble_to.sh
+++ b/tests/queries/0_stateless/01054_window_view_proc_tumble_to.sh
@@ -9,7 +9,7 @@ opts=(
     "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
diff --git a/tests/queries/0_stateless/01055_window_view_proc_hop_to.sh b/tests/queries/0_stateless/01055_window_view_proc_hop_to.sh
index 0db4173b3dc..00f8f239336 100755
--- a/tests/queries/0_stateless/01055_window_view_proc_hop_to.sh
+++ b/tests/queries/0_stateless/01055_window_view_proc_hop_to.sh
@@ -9,7 +9,7 @@ opts=(
     "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
diff --git a/tests/queries/0_stateless/01057_window_view_event_tumble_to_strict_asc.sh b/tests/queries/0_stateless/01057_window_view_event_tumble_to_strict_asc.sh
index 087e2577e5f..841d5e701a4 100755
--- a/tests/queries/0_stateless/01057_window_view_event_tumble_to_strict_asc.sh
+++ b/tests/queries/0_stateless/01057_window_view_event_tumble_to_strict_asc.sh
@@ -8,7 +8,7 @@ opts=(
     "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
diff --git a/tests/queries/0_stateless/01058_window_view_event_hop_to_strict_asc.sh b/tests/queries/0_stateless/01058_window_view_event_hop_to_strict_asc.sh
index b74e8cc6d25..315959bca9f 100755
--- a/tests/queries/0_stateless/01058_window_view_event_hop_to_strict_asc.sh
+++ b/tests/queries/0_stateless/01058_window_view_event_hop_to_strict_asc.sh
@@ -8,7 +8,7 @@ opts=(
     "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
diff --git a/tests/queries/0_stateless/01060_window_view_event_tumble_to_asc.sh b/tests/queries/0_stateless/01060_window_view_event_tumble_to_asc.sh
index 8161e54923d..592ee93a3af 100755
--- a/tests/queries/0_stateless/01060_window_view_event_tumble_to_asc.sh
+++ b/tests/queries/0_stateless/01060_window_view_event_tumble_to_asc.sh
@@ -8,7 +8,7 @@ opts=(
     "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
diff --git a/tests/queries/0_stateless/01061_window_view_event_hop_to_asc.sh b/tests/queries/0_stateless/01061_window_view_event_hop_to_asc.sh
index 2230fc28fca..6089a56ecc7 100755
--- a/tests/queries/0_stateless/01061_window_view_event_hop_to_asc.sh
+++ b/tests/queries/0_stateless/01061_window_view_event_hop_to_asc.sh
@@ -8,7 +8,7 @@ opts=(
     "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
diff --git a/tests/queries/0_stateless/01063_window_view_event_tumble_to_bounded.sh b/tests/queries/0_stateless/01063_window_view_event_tumble_to_bounded.sh
index 913f2b69b9c..349f73ec637 100755
--- a/tests/queries/0_stateless/01063_window_view_event_tumble_to_bounded.sh
+++ b/tests/queries/0_stateless/01063_window_view_event_tumble_to_bounded.sh
@@ -8,7 +8,7 @@ opts=(
     "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
diff --git a/tests/queries/0_stateless/01064_window_view_event_hop_to_bounded.sh b/tests/queries/0_stateless/01064_window_view_event_hop_to_bounded.sh
index 20e6a72f7d9..8db211edc5d 100755
--- a/tests/queries/0_stateless/01064_window_view_event_hop_to_bounded.sh
+++ b/tests/queries/0_stateless/01064_window_view_event_hop_to_bounded.sh
@@ -8,7 +8,7 @@ opts=(
     "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
diff --git a/tests/queries/0_stateless/01066_window_view_event_tumble_to_strict_asc_lateness.sh b/tests/queries/0_stateless/01066_window_view_event_tumble_to_strict_asc_lateness.sh
index 756c74d4fa9..72988bb5496 100755
--- a/tests/queries/0_stateless/01066_window_view_event_tumble_to_strict_asc_lateness.sh
+++ b/tests/queries/0_stateless/01066_window_view_event_tumble_to_strict_asc_lateness.sh
@@ -8,7 +8,7 @@ opts=(
     "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
diff --git a/tests/queries/0_stateless/01067_window_view_event_tumble_to_asc_lateness.sh b/tests/queries/0_stateless/01067_window_view_event_tumble_to_asc_lateness.sh
index 8d2c58a7332..1c0ef8183ac 100755
--- a/tests/queries/0_stateless/01067_window_view_event_tumble_to_asc_lateness.sh
+++ b/tests/queries/0_stateless/01067_window_view_event_tumble_to_asc_lateness.sh
@@ -8,7 +8,7 @@ opts=(
     "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
diff --git a/tests/queries/0_stateless/01068_window_view_event_tumble_to_bounded_lateness.sh b/tests/queries/0_stateless/01068_window_view_event_tumble_to_bounded_lateness.sh
index 3367bba1e03..af8f70e7ab8 100755
--- a/tests/queries/0_stateless/01068_window_view_event_tumble_to_bounded_lateness.sh
+++ b/tests/queries/0_stateless/01068_window_view_event_tumble_to_bounded_lateness.sh
@@ -8,7 +8,7 @@ opts=(
     "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
diff --git a/tests/queries/0_stateless/01071_window_view_event_tumble_asc_join.sh b/tests/queries/0_stateless/01071_window_view_event_tumble_asc_join.sh
index f1d426228cf..b71ef68a9c8 100755
--- a/tests/queries/0_stateless/01071_window_view_event_tumble_asc_join.sh
+++ b/tests/queries/0_stateless/01071_window_view_event_tumble_asc_join.sh
@@ -8,7 +8,7 @@ opts=(
     "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS info;
diff --git a/tests/queries/0_stateless/01072_window_view_multiple_columns_groupby.sh b/tests/queries/0_stateless/01072_window_view_multiple_columns_groupby.sh
index 062ecf648a7..7117e3207fe 100755
--- a/tests/queries/0_stateless/01072_window_view_multiple_columns_groupby.sh
+++ b/tests/queries/0_stateless/01072_window_view_multiple_columns_groupby.sh
@@ -10,7 +10,7 @@ opts=(
     "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
diff --git a/tests/queries/0_stateless/01073_window_view_event_tumble_to_asc_populate.sh b/tests/queries/0_stateless/01073_window_view_event_tumble_to_asc_populate.sh
index b2a98897aff..27527df05f8 100755
--- a/tests/queries/0_stateless/01073_window_view_event_tumble_to_asc_populate.sh
+++ b/tests/queries/0_stateless/01073_window_view_event_tumble_to_asc_populate.sh
@@ -8,7 +8,7 @@ opts=(
     "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
@@ -33,7 +33,7 @@ while true; do
 	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM dst" | grep -q "7" && break || sleep .5 ||:
 done
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
 SELECT * FROM dst ORDER BY market, w_end;
 INSERT INTO mt VALUES (1, 8, '1990/01/01 12:00:35');
 INSERT INTO mt VALUES (1, 8, '1990/01/01 12:00:37');
diff --git a/tests/queries/0_stateless/01074_window_view_event_tumble_asc_join_populate.sh b/tests/queries/0_stateless/01074_window_view_event_tumble_asc_join_populate.sh
index 5f169920dee..3cd9f750f7c 100755
--- a/tests/queries/0_stateless/01074_window_view_event_tumble_asc_join_populate.sh
+++ b/tests/queries/0_stateless/01074_window_view_event_tumble_asc_join_populate.sh
@@ -8,7 +8,7 @@ opts=(
     "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS info;
diff --git a/tests/queries/0_stateless/01075_window_view_proc_tumble_to_now_populate.sh b/tests/queries/0_stateless/01075_window_view_proc_tumble_to_now_populate.sh
index 67c249a9d0e..8bb604997af 100755
--- a/tests/queries/0_stateless/01075_window_view_proc_tumble_to_now_populate.sh
+++ b/tests/queries/0_stateless/01075_window_view_proc_tumble_to_now_populate.sh
@@ -9,7 +9,7 @@ opts=(
     "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
diff --git a/tests/queries/0_stateless/01076_window_view_alter_query_to.sh b/tests/queries/0_stateless/01076_window_view_alter_query_to.sh
index 11c126ea6de..043a2108f0c 100755
--- a/tests/queries/0_stateless/01076_window_view_alter_query_to.sh
+++ b/tests/queries/0_stateless/01076_window_view_alter_query_to.sh
@@ -8,7 +8,7 @@ opts=(
     "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
@@ -33,7 +33,7 @@ done
 $CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT * FROM dst ORDER BY market, w_end;"
 $CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT '----ALTER TABLE...MODIFY QUERY----';"
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
 ALTER TABLE wv MODIFY QUERY SELECT count(a) AS count, mt.market * 2 as market, tumbleEnd(wid) AS w_end FROM mt GROUP BY tumble(timestamp, INTERVAL '5' SECOND, 'US/Samoa') AS wid, mt.market;
 
 INSERT INTO mt VALUES (1, 6, '1990/01/01 12:00:10');
diff --git a/tests/queries/0_stateless/01077_window_view_alter_query_to_modify_source.sh b/tests/queries/0_stateless/01077_window_view_alter_query_to_modify_source.sh
index 17c28e2daf5..4d10d7fd2f3 100755
--- a/tests/queries/0_stateless/01077_window_view_alter_query_to_modify_source.sh
+++ b/tests/queries/0_stateless/01077_window_view_alter_query_to_modify_source.sh
@@ -8,7 +8,7 @@ opts=(
     "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS mt2;
@@ -35,7 +35,7 @@ done
 $CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT * FROM dst ORDER BY market, w_end;"
 $CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT '----ALTER TABLE...MODIFY QUERY----';"
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
 ALTER TABLE wv MODIFY QUERY SELECT count(a) AS count, mt2.market * 2 as market, tumbleEnd(wid) AS w_end FROM mt2 GROUP BY tumble(timestamp, INTERVAL '5' SECOND, 'US/Samoa') AS wid, mt2.market;
 
 INSERT INTO mt2 VALUES (1, 6, '1990/01/01 12:00:10');
diff --git a/tests/queries/0_stateless/01079_window_view_inner_table_memory_tumble.sh b/tests/queries/0_stateless/01079_window_view_inner_table_memory_tumble.sh
index 7747e343bfb..299c0086874 100755
--- a/tests/queries/0_stateless/01079_window_view_inner_table_memory_tumble.sh
+++ b/tests/queries/0_stateless/01079_window_view_inner_table_memory_tumble.sh
@@ -8,7 +8,7 @@ opts=(
     "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
diff --git a/tests/queries/0_stateless/01080_window_view_inner_table_memory_hop.sh b/tests/queries/0_stateless/01080_window_view_inner_table_memory_hop.sh
index 25576ff3c06..34a96d90e80 100755
--- a/tests/queries/0_stateless/01080_window_view_inner_table_memory_hop.sh
+++ b/tests/queries/0_stateless/01080_window_view_inner_table_memory_hop.sh
@@ -8,7 +8,7 @@ opts=(
     "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
diff --git a/tests/queries/0_stateless/01081_window_view_target_table_engine.sh b/tests/queries/0_stateless/01081_window_view_target_table_engine.sh
index dea0e5a7ba0..180653d4931 100755
--- a/tests/queries/0_stateless/01081_window_view_target_table_engine.sh
+++ b/tests/queries/0_stateless/01081_window_view_target_table_engine.sh
@@ -8,7 +8,7 @@ opts=(
     "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS wv;
diff --git a/tests/queries/0_stateless/01083_window_view_select.sh b/tests/queries/0_stateless/01083_window_view_select.sh
index ca9195aa00d..4d7c3cf5ace 100755
--- a/tests/queries/0_stateless/01083_window_view_select.sh
+++ b/tests/queries/0_stateless/01083_window_view_select.sh
@@ -8,7 +8,7 @@ opts=(
     "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
diff --git a/tests/queries/0_stateless/01084_window_view_with_table_identifier.sh b/tests/queries/0_stateless/01084_window_view_with_table_identifier.sh
index d8a29be781d..64210de7ed0 100755
--- a/tests/queries/0_stateless/01084_window_view_with_table_identifier.sh
+++ b/tests/queries/0_stateless/01084_window_view_with_table_identifier.sh
@@ -8,7 +8,7 @@ opts=(
     "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS wv;
diff --git a/tests/queries/0_stateless/01086_window_view_cleanup.sh b/tests/queries/0_stateless/01086_window_view_cleanup.sh
index 01bf50bc14d..113bcffb2af 100755
--- a/tests/queries/0_stateless/01086_window_view_cleanup.sh
+++ b/tests/queries/0_stateless/01086_window_view_cleanup.sh
@@ -12,7 +12,7 @@ opts=(
     "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --allow_deprecated_database_ordinary=1 --multiquery <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" --allow_deprecated_database_ordinary=1 <<EOF
 SET allow_experimental_window_view = 1;
 SET window_view_clean_interval = 1;
 
diff --git a/tests/queries/0_stateless/01087_window_view_alter_query.sh b/tests/queries/0_stateless/01087_window_view_alter_query.sh
index a28ee4bc425..b9dd0d19234 100755
--- a/tests/queries/0_stateless/01087_window_view_alter_query.sh
+++ b/tests/queries/0_stateless/01087_window_view_alter_query.sh
@@ -8,7 +8,7 @@ opts=(
     "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS wv;
@@ -31,7 +31,7 @@ done
 $CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT * FROM wv ORDER BY market, w_end;"
 $CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT '----ALTER TABLE...MODIFY QUERY----';"
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
 ALTER TABLE wv MODIFY QUERY SELECT count(a) AS count, mt.market * 2 as market, tumbleEnd(wid) AS w_end FROM mt GROUP BY tumble(timestamp, INTERVAL '5' SECOND, 'US/Samoa') AS wid, mt.market;
 
 INSERT INTO mt VALUES (1, 6, toDateTime('1990/01/01 12:00:10', 'US/Samoa'));
diff --git a/tests/queries/0_stateless/01088_window_view_default_column.sh b/tests/queries/0_stateless/01088_window_view_default_column.sh
index 1cdd9e3c9b9..03be3459e54 100755
--- a/tests/queries/0_stateless/01088_window_view_default_column.sh
+++ b/tests/queries/0_stateless/01088_window_view_default_column.sh
@@ -8,7 +8,7 @@ opts=(
     "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS wv;
diff --git a/tests/queries/0_stateless/01133_begin_commit_race.sh b/tests/queries/0_stateless/01133_begin_commit_race.sh
index 2b266527541..81e88e387ee 100755
--- a/tests/queries/0_stateless/01133_begin_commit_race.sh
+++ b/tests/queries/0_stateless/01133_begin_commit_race.sh
@@ -14,7 +14,7 @@ $CLICKHOUSE_CLIENT --query "CREATE TABLE mt (n Int64) ENGINE=MergeTree ORDER BY
 function begin_commit_readonly()
 {
   while true; do
-    $CLICKHOUSE_CLIENT --multiquery --query "
+    $CLICKHOUSE_CLIENT --query "
             SET wait_changes_become_visible_after_commit_mode='wait';
             BEGIN TRANSACTION;
             COMMIT;" 2>&1| grep -Fa "Exception: " | grep -Fv UNKNOWN_STATUS_OF_TRANSACTION
@@ -24,7 +24,7 @@ function begin_commit_readonly()
 function begin_rollback_readonly()
 {
   while true; do
-    $CLICKHOUSE_CLIENT --wait_changes_become_visible_after_commit_mode=wait_unknown --multiquery --query "
+    $CLICKHOUSE_CLIENT --wait_changes_become_visible_after_commit_mode=wait_unknown --query "
             BEGIN TRANSACTION;
             SET TRANSACTION SNAPSHOT 42;
             ROLLBACK;"
@@ -34,7 +34,7 @@ function begin_rollback_readonly()
 function begin_insert_commit()
 {
   while true; do
-    $CLICKHOUSE_CLIENT --wait_changes_become_visible_after_commit_mode=async --multiquery --query "
+    $CLICKHOUSE_CLIENT --wait_changes_become_visible_after_commit_mode=async --query "
             BEGIN TRANSACTION;
             INSERT INTO mt VALUES ($RANDOM);
             COMMIT;" 2>&1| grep -Fa "Exception: " | grep -Fv UNKNOWN_STATUS_OF_TRANSACTION
diff --git a/tests/queries/0_stateless/01169_alter_partition_isolation_stress.sh b/tests/queries/0_stateless/01169_alter_partition_isolation_stress.sh
index d4884cbf457..8873fd88f0e 100755
--- a/tests/queries/0_stateless/01169_alter_partition_isolation_stress.sh
+++ b/tests/queries/0_stateless/01169_alter_partition_isolation_stress.sh
@@ -22,7 +22,7 @@ function thread_insert()
     set -eu
     val=1
     while true; do
-        $CLICKHOUSE_CLIENT --multiquery --query "
+        $CLICKHOUSE_CLIENT --query "
         BEGIN TRANSACTION;
         INSERT INTO src VALUES /* ($val, 1) */ ($val, 1);
         INSERT INTO src VALUES /* ($val, 2) */ ($val, 2);
@@ -210,7 +210,7 @@ function thread_select()
     set -eu
     while true; do
         output=$(
-        $CLICKHOUSE_CLIENT --multiquery --query "
+        $CLICKHOUSE_CLIENT --query "
         BEGIN TRANSACTION;
         -- no duplicates
         SELECT type, throwIf(count(n) != countDistinct(n)) FROM src GROUP BY type FORMAT Null;
diff --git a/tests/queries/0_stateless/01169_old_alter_partition_isolation_stress.sh b/tests/queries/0_stateless/01169_old_alter_partition_isolation_stress.sh
index 0d2016952d4..404042ab64e 100755
--- a/tests/queries/0_stateless/01169_old_alter_partition_isolation_stress.sh
+++ b/tests/queries/0_stateless/01169_old_alter_partition_isolation_stress.sh
@@ -19,7 +19,7 @@ function thread_insert()
     set -e
     val=1
     while true; do
-        $CLICKHOUSE_CLIENT --multiquery --query "
+        $CLICKHOUSE_CLIENT --query "
         BEGIN TRANSACTION;
         INSERT INTO src VALUES /* ($val, 1) */ ($val, 1);
         INSERT INTO src VALUES /* ($val, 2) */ ($val, 2);
@@ -40,7 +40,7 @@ function thread_partition_src_to_dst()
     sum=0
     for i in {1..20}; do
         out=$(
-        $CLICKHOUSE_CLIENT --multiquery --query "
+        $CLICKHOUSE_CLIENT --query "
         BEGIN TRANSACTION;
         INSERT INTO src VALUES /* ($i, 3) */ ($i, 3);
         INSERT INTO dst SELECT * FROM src;
@@ -49,7 +49,7 @@ function thread_partition_src_to_dst()
         SELECT throwIf((SELECT (count(), sum(n)) FROM merge(currentDatabase(), '') WHERE type=3) != ($count + 1, $sum + $i)) FORMAT Null;
         COMMIT;" 2>&1) ||:
 
-        echo "$out" | grep -Fv "SERIALIZATION_ERROR" | grep -F "Received from " && $CLICKHOUSE_CLIENT --multiquery --query "
+        echo "$out" | grep -Fv "SERIALIZATION_ERROR" | grep -F "Received from " && $CLICKHOUSE_CLIENT --query "
                                                                                    begin transaction;
                                                                                    set transaction snapshot 3;
                                                                                    select $i, 'src', type, n, _part from src order by type, n;
@@ -68,7 +68,7 @@ function thread_partition_dst_to_src()
         if (( i % 2 )); then
             action="COMMIT"
         fi
-        $CLICKHOUSE_CLIENT --multiquery --query "
+        $CLICKHOUSE_CLIENT --query "
         SYSTEM STOP MERGES dst;
         ALTER TABLE dst DROP PARTITION ID 'nonexistent';  -- STOP MERGES doesn't wait for started merges to finish, so we use this trick
         SYSTEM SYNC TRANSACTION LOG;
@@ -87,7 +87,7 @@ function thread_select()
 {
     set -e
     while true; do
-        $CLICKHOUSE_CLIENT --multiquery --query "
+        $CLICKHOUSE_CLIENT --query "
         BEGIN TRANSACTION;
         -- no duplicates
         SELECT type, throwIf(count(n) != countDistinct(n)) FROM src GROUP BY type FORMAT Null;
diff --git a/tests/queries/0_stateless/01171_mv_select_insert_isolation_long.sh b/tests/queries/0_stateless/01171_mv_select_insert_isolation_long.sh
index 3b9bb50517d..2fb58e4cc57 100755
--- a/tests/queries/0_stateless/01171_mv_select_insert_isolation_long.sh
+++ b/tests/queries/0_stateless/01171_mv_select_insert_isolation_long.sh
@@ -65,7 +65,7 @@ function insert_commit_action()
     local tag=$1; shift
 
     # some transactions will fail due to constraint
-    $CLICKHOUSE_CLIENT --multiquery --query "
+    $CLICKHOUSE_CLIENT --query "
         BEGIN TRANSACTION;
         INSERT INTO src VALUES /* ($i, $tag) */ ($i, $tag);
         SELECT throwIf((SELECT sum(nm) FROM mv) != $(($i * $tag))) /* ($i, $tag) */ FORMAT Null;
@@ -83,7 +83,7 @@ function insert_rollback_action()
     local i=$1; shift
     local tag=$1; shift
 
-    $CLICKHOUSE_CLIENT --multiquery --query "
+    $CLICKHOUSE_CLIENT --query "
         BEGIN TRANSACTION;
         INSERT INTO src VALUES /* (42, $tag) */ (42, $tag);
         SELECT throwIf((SELECT count() FROM src WHERE n=42 AND m=$tag) != 1) FORMAT Null;
@@ -112,7 +112,7 @@ function optimize_action()
         action="ROLLBACK"
     fi
 
-    $CLICKHOUSE_CLIENT --multiquery --query "
+    $CLICKHOUSE_CLIENT --query "
         BEGIN TRANSACTION;
             $optimize_query;
         $action;
@@ -126,7 +126,7 @@ function select_action()
 {
     set -e
 
-    $CLICKHOUSE_CLIENT --multiquery --query "
+    $CLICKHOUSE_CLIENT --query "
         BEGIN TRANSACTION;
         SELECT throwIf((SELECT (sum(n), count() % 2) FROM src) != (0, 1)) FORMAT Null;
         SELECT throwIf((SELECT (sum(nm), count() % 2) FROM mv) != (0, 1)) FORMAT Null;
@@ -140,7 +140,7 @@ function select_insert_action()
 {
     set -e
 
-    $CLICKHOUSE_CLIENT --multiquery --query "
+    $CLICKHOUSE_CLIENT --query "
         BEGIN TRANSACTION;
         SELECT throwIf((SELECT count() FROM tmp) != 0) FORMAT Null;
         INSERT INTO tmp SELECT 1, n*m FROM src;
@@ -199,7 +199,7 @@ wait $PID_8 || echo "second select_insert_action has failed with status $?" 2>&1
 
 wait_for_queries_to_finish $WAIT_FINISH
 
-$CLICKHOUSE_CLIENT --multiquery --query "
+$CLICKHOUSE_CLIENT --query "
     BEGIN TRANSACTION;
         SELECT throwIf((SELECT (sum(n), count() % 2) FROM src) != (0, 1)) FORMAT Null;
         SELECT throwIf((SELECT (sum(nm), count() % 2) FROM mv) != (0, 1)) FORMAT Null;
@@ -209,7 +209,7 @@ $CLICKHOUSE_CLIENT --multiquery --query "
     COMMIT;
 "
 
-$CLICKHOUSE_CLIENT --multiquery --query  "
+$CLICKHOUSE_CLIENT --query  "
     SELECT throwIf((SELECT (sum(n), count() % 2) FROM src) != (0, 1)) FORMAT Null;
     SELECT throwIf((SELECT (sum(nm), count() % 2) FROM mv) != (0, 1)) FORMAT Null;
     SELECT throwIf((SELECT (sum(nm), count() % 2) FROM dst) != (0, 1)) FORMAT Null;
diff --git a/tests/queries/0_stateless/01174_select_insert_isolation.sh b/tests/queries/0_stateless/01174_select_insert_isolation.sh
index 6321f6ff01b..235d98fb5de 100755
--- a/tests/queries/0_stateless/01174_select_insert_isolation.sh
+++ b/tests/queries/0_stateless/01174_select_insert_isolation.sh
@@ -16,7 +16,7 @@ $CLICKHOUSE_CLIENT --query "CREATE TABLE mt (n Int8, m Int8) ENGINE=MergeTree OR
 function thread_insert_commit()
 {
     for i in {1..50}; do
-        $CLICKHOUSE_CLIENT --multiquery --query "
+        $CLICKHOUSE_CLIENT --query "
         BEGIN TRANSACTION;
         INSERT INTO mt VALUES /* ($i, $1) */ ($i, $1);
         INSERT INTO mt VALUES /* (-$i, $1) */ (-$i, $1);
@@ -27,7 +27,7 @@ function thread_insert_commit()
 function thread_insert_rollback()
 {
     for _ in {1..50}; do
-        $CLICKHOUSE_CLIENT --multiquery --query "
+        $CLICKHOUSE_CLIENT --query "
         BEGIN TRANSACTION;
         INSERT INTO mt VALUES /* (42, $1) */ (42, $1);
         ROLLBACK;";
@@ -38,7 +38,7 @@ function thread_select()
 {
     while true; do
         # The first and the last queries must get the same result
-        $CLICKHOUSE_CLIENT --multiquery --query "
+        $CLICKHOUSE_CLIENT --query "
         BEGIN TRANSACTION;
         SET throw_on_unsupported_query_inside_transaction=0;
         CREATE TEMPORARY TABLE tmp AS SELECT arraySort(groupArray(n)), arraySort(groupArray(m)), arraySort(groupArray(_part)) FROM mt FORMAT Null;
@@ -58,7 +58,7 @@ kill -TERM $PID_4
 wait
 wait_for_queries_to_finish 40
 
-$CLICKHOUSE_CLIENT --multiquery --query "
+$CLICKHOUSE_CLIENT --query "
 BEGIN TRANSACTION;
 SELECT count(), sum(n), sum(m=1), sum(m=2), sum(m=3) FROM mt;";
 
diff --git a/tests/queries/0_stateless/01198_client_quota_key.sh b/tests/queries/0_stateless/01198_client_quota_key.sh
index 3f5f5df5071..d08aa2e364f 100755
--- a/tests/queries/0_stateless/01198_client_quota_key.sh
+++ b/tests/queries/0_stateless/01198_client_quota_key.sh
@@ -5,4 +5,4 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --quota_key Hello --query_id test_quota_key --log_queries 1 --multiquery --query "SELECT 1; SYSTEM FLUSH LOGS; SELECT DISTINCT quota_key FROM system.query_log WHERE current_database = currentDatabase() AND event_date >= yesterday() AND event_time >= now() - 300 AND query_id = 'test_quota_key'"
+$CLICKHOUSE_CLIENT --quota_key Hello --query_id test_quota_key --log_queries 1 --query "SELECT 1; SYSTEM FLUSH LOGS; SELECT DISTINCT quota_key FROM system.query_log WHERE current_database = currentDatabase() AND event_date >= yesterday() AND event_time >= now() - 300 AND query_id = 'test_quota_key'"
diff --git a/tests/queries/0_stateless/01285_engine_join_donmikel.sh b/tests/queries/0_stateless/01285_engine_join_donmikel.sh
index 7522ed9924b..ce273ab8e0c 100755
--- a/tests/queries/0_stateless/01285_engine_join_donmikel.sh
+++ b/tests/queries/0_stateless/01285_engine_join_donmikel.sh
@@ -4,7 +4,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --multiquery --query "
+$CLICKHOUSE_CLIENT --query "
 DROP TABLE IF EXISTS NmSubj;
 DROP TABLE IF EXISTS events;
 
@@ -60,7 +60,7 @@ FROM events as e INNER JOIN NmSubj as ns
 ON ns.NmId = toUInt32(e.Param1)
 WHERE e.EventDate = today() - 7 AND e.EventId = 'GCO' AND ns.SubjectId = 2073"
 
-$CLICKHOUSE_CLIENT --multiquery --query "
+$CLICKHOUSE_CLIENT --query "
 DROP TABLE NmSubj;
 DROP TABLE events;
 "
diff --git a/tests/queries/0_stateless/01293_optimize_final_force.sh b/tests/queries/0_stateless/01293_optimize_final_force.sh
index e838af8af9b..9c135d272e4 100755
--- a/tests/queries/0_stateless/01293_optimize_final_force.sh
+++ b/tests/queries/0_stateless/01293_optimize_final_force.sh
@@ -11,7 +11,7 @@ TIMELIMIT=31
 while [ $SECONDS -lt "$TIMELIMIT" ] && [ $it -lt 100 ];
 do
     it=$((it+1))
-    $CLICKHOUSE_CLIENT --multiquery --query "
+    $CLICKHOUSE_CLIENT --query "
         DROP TABLE IF EXISTS mt;
         CREATE TABLE mt (x UInt8, k UInt8 DEFAULT 0) ENGINE = SummingMergeTree ORDER BY k;
 
diff --git a/tests/queries/0_stateless/01304_direct_io_long.sh b/tests/queries/0_stateless/01304_direct_io_long.sh
index 2e27c2f7728..1241f299d94 100755
--- a/tests/queries/0_stateless/01304_direct_io_long.sh
+++ b/tests/queries/0_stateless/01304_direct_io_long.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --multiquery --query "
+$CLICKHOUSE_CLIENT --query "
     DROP TABLE IF EXISTS bug;
     CREATE TABLE bug (UserID UInt64, Date Date) ENGINE = MergeTree ORDER BY Date
         SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi', merge_max_block_size = 8192;
@@ -18,5 +18,5 @@ cat "$LOG" | grep Loaded
 
 rm "$LOG"
 
-$CLICKHOUSE_CLIENT --multiquery --query "
+$CLICKHOUSE_CLIENT --query "
     DROP TABLE bug;"
diff --git a/tests/queries/0_stateless/01375_storage_file_tsv_csv_with_names_write_prefix.sh b/tests/queries/0_stateless/01375_storage_file_tsv_csv_with_names_write_prefix.sh
index af8d3f4e69b..a634f689dca 100755
--- a/tests/queries/0_stateless/01375_storage_file_tsv_csv_with_names_write_prefix.sh
+++ b/tests/queries/0_stateless/01375_storage_file_tsv_csv_with_names_write_prefix.sh
@@ -9,7 +9,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 echo 'zero rows'
 for format in TSVWithNames TSVWithNamesAndTypes CSVWithNames CSVWithNamesAndTypes JSONCompactEachRowWithNames JSONCompactEachRowWithNamesAndTypes JSONCompactStringsEachRow JSONCompactStringsEachRowWithNamesAndTypes; do
     echo $format
-    ${CLICKHOUSE_LOCAL} --multiquery --query="
+    ${CLICKHOUSE_LOCAL} --query="
         CREATE TABLE ${format}_01375 ENGINE File($format, '01375_$format') AS SELECT * FROM numbers(1) WHERE number < 0;
         SELECT * FROM ${format}_01375;
         DROP TABLE ${format}_01375;
@@ -22,7 +22,7 @@ echo 'multi clickhouse-local one file'
 for format in TSVWithNames TSVWithNamesAndTypes CSVWithNames CSVWithNamesAndTypes JSONCompactEachRowWithNames JSONCompactEachRowWithNamesAndTypes JSONCompactStringsEachRow JSONCompactStringsEachRowWithNamesAndTypes; do
     echo $format
     for _ in {1..2}; do
-        ${CLICKHOUSE_LOCAL} --multiquery --query="
+        ${CLICKHOUSE_LOCAL} --query="
             CREATE TABLE ${format}_01375 ENGINE File($format, '01375_$format') AS SELECT * FROM numbers(1);
             SELECT * FROM ${format}_01375;
             DROP TABLE ${format}_01375;
diff --git a/tests/queries/0_stateless/01443_merge_truncate_long.sh b/tests/queries/0_stateless/01443_merge_truncate_long.sh
index 65b9bcd366e..51654b2e4e1 100755
--- a/tests/queries/0_stateless/01443_merge_truncate_long.sh
+++ b/tests/queries/0_stateless/01443_merge_truncate_long.sh
@@ -34,7 +34,7 @@ do
         SELECT count() FROM t HAVING count() > 0;
         SELECT ${i};
         "
-done | ${CLICKHOUSE_CLIENT} --multiquery
+done | ${CLICKHOUSE_CLIENT}
 
 wait
 
diff --git a/tests/queries/0_stateless/01527_clickhouse_local_optimize.sh b/tests/queries/0_stateless/01527_clickhouse_local_optimize.sh
index d61d34244d9..c1d5c357308 100755
--- a/tests/queries/0_stateless/01527_clickhouse_local_optimize.sh
+++ b/tests/queries/0_stateless/01527_clickhouse_local_optimize.sh
@@ -10,6 +10,6 @@ rm -rf "${WORKING_FOLDER_01527}"
 mkdir -p "${WORKING_FOLDER_01527}"
 
 # OPTIMIZE was crashing due to lack of temporary volume in local
-${CLICKHOUSE_LOCAL} --multiquery --query "drop database if exists d; create database d; create table d.t engine MergeTree order by a as select 1 a; optimize table d.t final" --path="${WORKING_FOLDER_01527}"
+${CLICKHOUSE_LOCAL} --query "drop database if exists d; create database d; create table d.t engine MergeTree order by a as select 1 a; optimize table d.t final" --path="${WORKING_FOLDER_01527}"
 
 rm -rf "${WORKING_FOLDER_01527}"
diff --git a/tests/queries/0_stateless/01543_avro_deserialization_with_lc.sh b/tests/queries/0_stateless/01543_avro_deserialization_with_lc.sh
index a5697a62dc2..bc9efaedd5d 100755
--- a/tests/queries/0_stateless/01543_avro_deserialization_with_lc.sh
+++ b/tests/queries/0_stateless/01543_avro_deserialization_with_lc.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --multiquery --query "
+$CLICKHOUSE_CLIENT --query "
 SET allow_suspicious_low_cardinality_types=1;
 CREATE TABLE IF NOT EXISTS test_01543 (value LowCardinality(String), value2 LowCardinality(UInt64)) ENGINE=Memory();
 "
diff --git a/tests/queries/0_stateless/01544_file_engine_settings.sh b/tests/queries/0_stateless/01544_file_engine_settings.sh
index b31754f9531..eb0a8a964d0 100755
--- a/tests/queries/0_stateless/01544_file_engine_settings.sh
+++ b/tests/queries/0_stateless/01544_file_engine_settings.sh
@@ -10,7 +10,7 @@ rm -f -- "$the_file"
 
 # We are going to check that format settings work for File engine,
 # by creating a table with a non-default delimiter, and reading from it.
-${CLICKHOUSE_LOCAL} --multiquery --query "
+${CLICKHOUSE_LOCAL} --query "
     create table t(a int, b int) engine File(CSV, '$the_file') settings format_csv_delimiter = '|';
     insert into t select 1 a, 1 b;
 "
@@ -18,7 +18,7 @@ ${CLICKHOUSE_LOCAL} --multiquery --query "
 # See what's in the file
 cat "$the_file"
 
-${CLICKHOUSE_LOCAL} --multiquery --query "
+${CLICKHOUSE_LOCAL} --query "
     create table t(a int, b int) engine File(CSV, '$the_file') settings format_csv_delimiter = '|';
     select * from t;
 " 
diff --git a/tests/queries/0_stateless/01600_detach_permanently.sh b/tests/queries/0_stateless/01600_detach_permanently.sh
index 6721dbf3015..679e9a749ee 100755
--- a/tests/queries/0_stateless/01600_detach_permanently.sh
+++ b/tests/queries/0_stateless/01600_detach_permanently.sh
@@ -18,7 +18,7 @@ mkdir -p "${WORKING_FOLDER_01600}"
 clickhouse_local() {
     local query="$1"
     shift
-    ${CLICKHOUSE_LOCAL} --allow_deprecated_database_ordinary=1 --multiquery --query "$query" "$@" --path="${WORKING_FOLDER_01600}"
+    ${CLICKHOUSE_LOCAL} --allow_deprecated_database_ordinary=1 --query "$query" "$@" --path="${WORKING_FOLDER_01600}"
 }
 
 test_detach_attach_sequence() {
diff --git a/tests/queries/0_stateless/01600_parts_states_metrics_long.sh b/tests/queries/0_stateless/01600_parts_states_metrics_long.sh
index 7215f270a4c..47b5a4dea13 100755
--- a/tests/queries/0_stateless/01600_parts_states_metrics_long.sh
+++ b/tests/queries/0_stateless/01600_parts_states_metrics_long.sh
@@ -24,7 +24,7 @@ verify()
 
         if [[ $i -eq 5000 ]]
         then
-            $CLICKHOUSE_CLIENT --multiquery "
+            $CLICKHOUSE_CLIENT "
               SELECT sumIf(value, metric = 'PartsActive'), sumIf(value, metric = 'PartsOutdated') FROM system.metrics;
               SELECT sum(active), sum(NOT active) FROM system.parts;
               SELECT sum(active), sum(NOT active) FROM system.projection_parts;
diff --git a/tests/queries/0_stateless/01606_git_import.sh b/tests/queries/0_stateless/01606_git_import.sh
index 48558d79f93..6986d6b14cf 100755
--- a/tests/queries/0_stateless/01606_git_import.sh
+++ b/tests/queries/0_stateless/01606_git_import.sh
@@ -19,7 +19,7 @@ done
 
 ${CLICKHOUSE_GIT_IMPORT} 2>&1 | wc -l
 
-${CLICKHOUSE_CLIENT} --multiline --multiquery --query "
+${CLICKHOUSE_CLIENT} --multiline --query "
 
 DROP TABLE IF EXISTS commits;
 DROP TABLE IF EXISTS file_changes;
@@ -122,7 +122,7 @@ ${CLICKHOUSE_CLIENT} --query "SELECT count() FROM commits"
 ${CLICKHOUSE_CLIENT} --query "SELECT count() FROM file_changes"
 ${CLICKHOUSE_CLIENT} --query "SELECT count(), round(avg(indent), 1) FROM line_changes"
 
-${CLICKHOUSE_CLIENT} --multiline --multiquery --query "
+${CLICKHOUSE_CLIENT} --multiline --query "
 DROP TABLE commits;
 DROP TABLE file_changes;
 DROP TABLE line_changes;
diff --git a/tests/queries/0_stateless/01607_arrays_as_nested_csv.sh b/tests/queries/0_stateless/01607_arrays_as_nested_csv.sh
index 946be7fb4af..2a1182c14c1 100755
--- a/tests/queries/0_stateless/01607_arrays_as_nested_csv.sh
+++ b/tests/queries/0_stateless/01607_arrays_as_nested_csv.sh
@@ -4,7 +4,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --multiquery --query "
+${CLICKHOUSE_CLIENT} --query "
 DROP TABLE IF EXISTS test;
 CREATE TABLE test (a Array(String)) ENGINE = Memory;
 "
@@ -22,7 +22,7 @@ ${CLICKHOUSE_CLIENT} --input_format_csv_arrays_as_nested_csv 1 --query "INSERT I
 """Hello"", ""world"", ""42"""" TV"""
 END
 
-${CLICKHOUSE_CLIENT} --multiquery --query "
+${CLICKHOUSE_CLIENT} --query "
 SELECT * FROM test;
 DROP TABLE IF EXISTS test;
 "
diff --git a/tests/queries/0_stateless/01632_tinylog_read_write.sh b/tests/queries/0_stateless/01632_tinylog_read_write.sh
index 10625ec5d27..68d28b080e9 100755
--- a/tests/queries/0_stateless/01632_tinylog_read_write.sh
+++ b/tests/queries/0_stateless/01632_tinylog_read_write.sh
@@ -8,7 +8,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 
-$CLICKHOUSE_CLIENT --multiquery --query "DROP TABLE IF EXISTS test; CREATE TABLE IF NOT EXISTS test (x UInt64, s Array(Nullable(String))) ENGINE = TinyLog;"
+$CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS test; CREATE TABLE IF NOT EXISTS test (x UInt64, s Array(Nullable(String))) ENGINE = TinyLog;"
 
 function thread_select {
     local TIMELIMIT=$((SECONDS+$1))
@@ -47,4 +47,4 @@ thread_insert $TIMEOUT &
 wait
 echo "Done"
 
-$CLICKHOUSE_CLIENT --multiquery --query "DROP TABLE IF EXISTS test;"
+$CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS test;"
diff --git a/tests/queries/0_stateless/01658_read_file_to_stringcolumn.sh b/tests/queries/0_stateless/01658_read_file_to_stringcolumn.sh
index 685fe69642a..ceb6aa060ea 100755
--- a/tests/queries/0_stateless/01658_read_file_to_stringcolumn.sh
+++ b/tests/queries/0_stateless/01658_read_file_to_stringcolumn.sh
@@ -24,7 +24,7 @@ ${CLICKHOUSE_CLIENT} --query "select file('a.txt'), file('b.txt');";echo ":"$?
 ${CLICKHOUSE_CLIENT} --query "insert into data select file('a.txt'), file('b.txt');";echo ":"$?
 ${CLICKHOUSE_CLIENT} --query "insert into data select file('a.txt'), file('b.txt');";echo ":"$?
 ${CLICKHOUSE_CLIENT} --query "select file('c.txt'), * from data";echo ":"$?
-${CLICKHOUSE_CLIENT} --multiquery --query "
+${CLICKHOUSE_CLIENT} --query "
     create table filenames(name String) engine=MergeTree() order by tuple();
     insert into filenames values ('a.txt'), ('b.txt'), ('c.txt');
     select file(name) from filenames format TSV;
@@ -56,7 +56,7 @@ echo $c_count
 
 # Valid cases:
 # The default dir is the CWD path in LOCAL mode
-${CLICKHOUSE_LOCAL} --multiquery --query "
+${CLICKHOUSE_LOCAL} --query "
     drop table if exists data;
     create table data (A String, B String) engine=MergeTree() order by A;
     select file('a.txt'), file('b.txt');
diff --git a/tests/queries/0_stateless/01666_merge_tree_max_query_limit.sh b/tests/queries/0_stateless/01666_merge_tree_max_query_limit.sh
index e04c9515009..ec318db98bf 100755
--- a/tests/queries/0_stateless/01666_merge_tree_max_query_limit.sh
+++ b/tests/queries/0_stateless/01666_merge_tree_max_query_limit.sh
@@ -8,7 +8,7 @@ function wait_for_query_to_start() {
     while [[ $($CLICKHOUSE_CURL -sS "$CLICKHOUSE_URL" -d "SELECT sum(read_rows) FROM system.processes WHERE query_id = '$1'") == 0 ]]; do sleep 0.1; done
 }
 
-${CLICKHOUSE_CLIENT} --multiline --multiquery --query "
+${CLICKHOUSE_CLIENT} --multiline --query "
 drop table if exists simple;
 
 create table simple (i int, j int) engine = MergeTree order by i
diff --git a/tests/queries/0_stateless/01747_system_session_log_long.sh b/tests/queries/0_stateless/01747_system_session_log_long.sh
index 022bf488886..07055f96782 100755
--- a/tests/queries/0_stateless/01747_system_session_log_long.sh
+++ b/tests/queries/0_stateless/01747_system_session_log_long.sh
@@ -82,7 +82,7 @@ trap "cleanup" EXIT
 function executeQueryExpectError()
 {
     cat - > "${TMP_QUERY_FILE}"
-    ! ${CLICKHOUSE_CLIENT} --multiquery --queries-file "${TMP_QUERY_FILE}" "${@}"  2>&1 | tee -a "${TMP_QUERY_FILE}"
+    ! ${CLICKHOUSE_CLIENT} --queries-file "${TMP_QUERY_FILE}" "${@}"  2>&1 | tee -a "${TMP_QUERY_FILE}"
 }
 
 function createUser()
@@ -303,7 +303,7 @@ function runEndpointTests()
     if [[ -n "${setup_queries}" ]]
     then
         # echo "Executing setup queries: ${setup_queries}"
-        echo "${setup_queries}" | executeQuery --multiquery
+        echo "${setup_queries}" | executeQuery
     fi
 
     testTCP "${auth_type}" "${username}" "${password}"
@@ -357,7 +357,7 @@ testAsUserIdentifiedBy "plaintext_password"
 testAsUserIdentifiedBy "sha256_password"
 testAsUserIdentifiedBy "double_sha1_password"
 
-executeQuery --multiquery <<EOF
+executeQuery <<EOF
 SYSTEM FLUSH LOGS;
 
 WITH
diff --git a/tests/queries/0_stateless/01801_nullable_low_cardinality_tsv.sh b/tests/queries/0_stateless/01801_nullable_low_cardinality_tsv.sh
index 935bfe18cfc..43cd0014864 100755
--- a/tests/queries/0_stateless/01801_nullable_low_cardinality_tsv.sh
+++ b/tests/queries/0_stateless/01801_nullable_low_cardinality_tsv.sh
@@ -5,7 +5,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CUR_DIR"/../shell_config.sh
 
 $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS nullable_low_cardinality_tsv_test;";
-$CLICKHOUSE_CLIENT --multiquery --query="CREATE TABLE nullable_low_cardinality_tsv_test
+$CLICKHOUSE_CLIENT --query="CREATE TABLE nullable_low_cardinality_tsv_test
 (
     A Date,
     S LowCardinality(Nullable(String)),
diff --git a/tests/queries/0_stateless/01834_alias_columns_laziness_filimonov.sh b/tests/queries/0_stateless/01834_alias_columns_laziness_filimonov.sh
index bf8bb716a9f..7b8d3ce1504 100755
--- a/tests/queries/0_stateless/01834_alias_columns_laziness_filimonov.sh
+++ b/tests/queries/0_stateless/01834_alias_columns_laziness_filimonov.sh
@@ -4,7 +4,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --multiquery --query "
+${CLICKHOUSE_CLIENT} --query "
 drop table if exists aliases_lazyness;
 create table aliases_lazyness (x UInt32, y ALIAS sleepEachRow(0.1)) Engine=MergeTree ORDER BY x;
 insert into aliases_lazyness(x) select * from numbers(100);
diff --git a/tests/queries/0_stateless/01923_network_receive_time_metric_insert.sh b/tests/queries/0_stateless/01923_network_receive_time_metric_insert.sh
index a6b83eba27d..97835d97965 100755
--- a/tests/queries/0_stateless/01923_network_receive_time_metric_insert.sh
+++ b/tests/queries/0_stateless/01923_network_receive_time_metric_insert.sh
@@ -6,13 +6,13 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --multiquery --query "DROP TABLE IF EXISTS t; CREATE TABLE t (x UInt64) ENGINE = Memory;"
+${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS t; CREATE TABLE t (x UInt64) ENGINE = Memory;"
 
 # Rate limit is chosen for operation to spent more than one second.
 seq 1 1000 | pv --quiet --rate-limit 400 | ${CLICKHOUSE_CLIENT} --query "INSERT INTO t FORMAT TSV"
 
 # We check that the value of NetworkReceiveElapsedMicroseconds correctly includes the time spent waiting data from the client.
-${CLICKHOUSE_CLIENT} --multiquery --query "SYSTEM FLUSH LOGS;
+${CLICKHOUSE_CLIENT} --query "SYSTEM FLUSH LOGS;
     WITH ProfileEvents['NetworkReceiveElapsedMicroseconds'] AS time
     SELECT time >= 1000000 ? 1 : time FROM system.query_log
         WHERE current_database = currentDatabase() AND query_kind = 'Insert' AND event_date >= yesterday() AND type = 2 ORDER BY event_time DESC LIMIT 1;"
diff --git a/tests/queries/0_stateless/01939_network_receive_bytes_metrics.sh b/tests/queries/0_stateless/01939_network_receive_bytes_metrics.sh
index 03babad40f3..b2335a0365b 100755
--- a/tests/queries/0_stateless/01939_network_receive_bytes_metrics.sh
+++ b/tests/queries/0_stateless/01939_network_receive_bytes_metrics.sh
@@ -4,11 +4,11 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --multiquery --query "DROP TABLE IF EXISTS t; CREATE TABLE t (x UInt64) ENGINE = Memory;"
+${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS t; CREATE TABLE t (x UInt64) ENGINE = Memory;"
 
 seq 1 1000 | ${CLICKHOUSE_CLIENT} --query "INSERT INTO t FORMAT TSV"
 
-${CLICKHOUSE_CLIENT} --multiquery --query "SYSTEM FLUSH LOGS;
+${CLICKHOUSE_CLIENT} --query "SYSTEM FLUSH LOGS;
     WITH ProfileEvents['NetworkReceiveBytes'] AS bytes
     SELECT bytes >= 8000 AND bytes < 9000 ? 1 : bytes FROM system.query_log
         WHERE current_database = currentDatabase() AND query_kind = 'Insert' AND event_date >= yesterday() AND type = 2 ORDER BY event_time DESC LIMIT 1;"
diff --git a/tests/queries/0_stateless/01946_test_wrong_host_name_access.sh b/tests/queries/0_stateless/01946_test_wrong_host_name_access.sh
index a00f307673e..ed2828c3f54 100755
--- a/tests/queries/0_stateless/01946_test_wrong_host_name_access.sh
+++ b/tests/queries/0_stateless/01946_test_wrong_host_name_access.sh
@@ -7,7 +7,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --multiquery --query "
+${CLICKHOUSE_CLIENT} --query "
     DROP USER IF EXISTS dns_fail_1, dns_fail_2;
     CREATE USER dns_fail_1 HOST NAME 'non.existing.host.name', '${MYHOSTNAME}';
     CREATE USER dns_fail_2 HOST NAME '${MYHOSTNAME}', 'non.existing.host.name';"
diff --git a/tests/queries/0_stateless/01946_test_zstd_decompression_with_escape_sequence_at_the_end_of_buffer.sh b/tests/queries/0_stateless/01946_test_zstd_decompression_with_escape_sequence_at_the_end_of_buffer.sh
index 0aedef028a2..b3748581f4f 100755
--- a/tests/queries/0_stateless/01946_test_zstd_decompression_with_escape_sequence_at_the_end_of_buffer.sh
+++ b/tests/queries/0_stateless/01946_test_zstd_decompression_with_escape_sequence_at_the_end_of_buffer.sh
@@ -9,7 +9,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 mkdir -p ${USER_FILES_PATH}/
 cp $CUR_DIR/data_zstd/test_01946.zstd ${USER_FILES_PATH}/
 
-${CLICKHOUSE_CLIENT} --multiline --multiquery --query "
+${CLICKHOUSE_CLIENT} --multiline --query "
 set min_chunk_bytes_for_parallel_parsing=10485760;
 set max_read_buffer_size = 65536;
 set input_format_parallel_parsing = 0;
diff --git a/tests/queries/0_stateless/02009_from_infile.sh b/tests/queries/0_stateless/02009_from_infile.sh
index 6a31aa4ac55..578ac14f558 100755
--- a/tests/queries/0_stateless/02009_from_infile.sh
+++ b/tests/queries/0_stateless/02009_from_infile.sh
@@ -19,7 +19,7 @@ ${CLICKHOUSE_CLIENT} --query "INSERT INTO test_infile FROM INFILE '${CLICKHOUSE_
 ${CLICKHOUSE_CLIENT} --query "SELECT * FROM test_infile;"
 
 # if it not fails, select will print information
-${CLICKHOUSE_LOCAL} --multiquery --query "CREATE TABLE test_infile (word String) ENGINE=Memory(); INSERT INTO test_infile FROM INFILE '${CLICKHOUSE_TMP}/test_infile.gz' FORMAT CSV; SELECT * from test_infile;"
+${CLICKHOUSE_LOCAL} --query "CREATE TABLE test_infile (word String) ENGINE=Memory(); INSERT INTO test_infile FROM INFILE '${CLICKHOUSE_TMP}/test_infile.gz' FORMAT CSV; SELECT * from test_infile;"
 
 ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&query=DROP+TABLE" -d 'IF EXISTS test_infile_url'
 ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&query=CREATE" -d 'TABLE test_infile_url (x String) ENGINE = Memory'
diff --git a/tests/queries/0_stateless/02024_compression_in_query.sh b/tests/queries/0_stateless/02024_compression_in_query.sh
index caa74523bd7..2936568c991 100755
--- a/tests/queries/0_stateless/02024_compression_in_query.sh
+++ b/tests/queries/0_stateless/02024_compression_in_query.sh
@@ -55,8 +55,8 @@ ${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS test_compression_keyword;"
 [ -e "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output_without_gz.gz ] && rm "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output_without_gz.gz
 
 # create files using compression method and without it to check that both queries work correct
-${CLICKHOUSE_LOCAL} --multiquery --query "SELECT * FROM (SELECT 'Hello, World! From local.') INTO OUTFILE '${CLICKHOUSE_TMP}/test_comp_for_input_and_output.gz' FORMAT TabSeparated;"
-${CLICKHOUSE_LOCAL} --multiquery --query "SELECT * FROM (SELECT 'Hello, World! From local.') INTO OUTFILE '${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz' COMPRESSION 'GZ' FORMAT TabSeparated;"
+${CLICKHOUSE_LOCAL} --query "SELECT * FROM (SELECT 'Hello, World! From local.') INTO OUTFILE '${CLICKHOUSE_TMP}/test_comp_for_input_and_output.gz' FORMAT TabSeparated;"
+${CLICKHOUSE_LOCAL} --query "SELECT * FROM (SELECT 'Hello, World! From local.') INTO OUTFILE '${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz' COMPRESSION 'GZ' FORMAT TabSeparated;"
 
 # check content of files
 cp ${CLICKHOUSE_TMP}/test_comp_for_input_and_output.gz ${CLICKHOUSE_TMP}/test_comp_for_input_and_output_to_decomp.gz
@@ -68,7 +68,7 @@ gunzip ${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz_to_decomp.gz
 cat ${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz_to_decomp
 
 # create table to check inserts
-${CLICKHOUSE_LOCAL} --multiquery --query "
+${CLICKHOUSE_LOCAL} --query "
 DROP TABLE IF EXISTS test_compression_keyword;
 CREATE TABLE test_compression_keyword (text String) Engine=Memory;
 INSERT INTO TABLE test_compression_keyword FROM INFILE '${CLICKHOUSE_TMP}/test_comp_for_input_and_output.gz' FORMAT TabSeparated;
diff --git a/tests/queries/0_stateless/02048_parallel_reading_from_infile.sh b/tests/queries/0_stateless/02048_parallel_reading_from_infile.sh
index f055ea304b2..efc19cad054 100755
--- a/tests/queries/0_stateless/02048_parallel_reading_from_infile.sh
+++ b/tests/queries/0_stateless/02048_parallel_reading_from_infile.sh
@@ -17,7 +17,7 @@ echo -e "103" > "${CLICKHOUSE_TMP}"/test_infile_parallel_3
 
 gzip "${CLICKHOUSE_TMP}"/test_infile_parallel
 
-${CLICKHOUSE_CLIENT} --multiquery  <<EOF
+${CLICKHOUSE_CLIENT} <<EOF
 DROP TABLE IF EXISTS test_infile_parallel;
 CREATE TABLE test_infile_parallel (Id Int32,Value Enum('first' = 1, 'second' = 2)) ENGINE=Memory();
 SET input_format_allow_errors_num=1;
@@ -27,13 +27,13 @@ SELECT count() FROM test_infile_parallel WHERE Value='second';
 EOF
 
 # Error code is 27 (DB::ParsingException). It is not ignored.
-${CLICKHOUSE_CLIENT}  -m --multiquery --query "DROP TABLE IF EXISTS test_infile_parallel;
+${CLICKHOUSE_CLIENT}  -m --query "DROP TABLE IF EXISTS test_infile_parallel;
 CREATE TABLE test_infile_parallel (Id Int32,Value Enum('first' = 1, 'second' = 2)) ENGINE=Memory();
 SET input_format_allow_errors_num=0;
 INSERT INTO test_infile_parallel FROM INFILE '${CLICKHOUSE_TMP}/test_infile_parallel*' FORMAT TSV;
 " 2>&1 | grep -q "27" && echo "Correct" || echo 'Fail'
 
-${CLICKHOUSE_LOCAL} --multiquery <<EOF
+${CLICKHOUSE_LOCAL} <<EOF
 DROP TABLE IF EXISTS test_infile_parallel; 
 SET input_format_allow_errors_num=1;
 CREATE TABLE test_infile_parallel (Id Int32,Value Enum('first' = 1, 'second' = 2)) ENGINE=Memory(); 
diff --git a/tests/queries/0_stateless/02104_clickhouse_local_columns_description.sh b/tests/queries/0_stateless/02104_clickhouse_local_columns_description.sh
index f0ea5b4415c..f88a8de80f5 100755
--- a/tests/queries/0_stateless/02104_clickhouse_local_columns_description.sh
+++ b/tests/queries/0_stateless/02104_clickhouse_local_columns_description.sh
@@ -4,4 +4,4 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-${CLICKHOUSE_LOCAL} --multiquery --query "create table t (n int, m int default 42) engine=Memory;insert into t values (1, NULL);select * from t"
+${CLICKHOUSE_LOCAL} --query "create table t (n int, m int default 42) engine=Memory;insert into t values (1, NULL);select * from t"
diff --git a/tests/queries/0_stateless/02124_insert_deduplication_token_multiple_blocks.sh b/tests/queries/0_stateless/02124_insert_deduplication_token_multiple_blocks.sh
index 9a7ac2007f1..ca7ac0d51fe 100755
--- a/tests/queries/0_stateless/02124_insert_deduplication_token_multiple_blocks.sh
+++ b/tests/queries/0_stateless/02124_insert_deduplication_token_multiple_blocks.sh
@@ -14,24 +14,24 @@ $CLICKHOUSE_CLIENT --query="SYSTEM STOP MERGES block_dedup_token;"
 $CLICKHOUSE_CLIENT --query="SELECT 'insert 2 blocks with dedup token, 1 row per block'"
 DEDUP_TOKEN='dedup1'
 echo 'INSERT INTO block_dedup_token VALUES (1), (2)' | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&$INSERT_BLOCK_SETTINGS&insert_deduplication_token='$DEDUP_TOKEN'&query=" --data-binary @-
-$CLICKHOUSE_CLIENT --multiquery --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
+$CLICKHOUSE_CLIENT --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
 
 $CLICKHOUSE_CLIENT --query="SELECT 'insert deduplicated by token'"
 echo 'INSERT INTO block_dedup_token VALUES (1), (2)' | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&$INSERT_BLOCK_SETTINGS&insert_deduplication_token='$DEDUP_TOKEN'&query=" --data-binary @-
-$CLICKHOUSE_CLIENT --multiquery --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
+$CLICKHOUSE_CLIENT --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
 
 $CLICKHOUSE_CLIENT --query="SELECT 'insert the same data by providing different dedup token'"
 DEDUP_TOKEN='dedup2'
 echo 'INSERT INTO block_dedup_token VALUES (1), (2)' | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&$INSERT_BLOCK_SETTINGS&insert_deduplication_token='$DEDUP_TOKEN'&query=" --data-binary @-
-$CLICKHOUSE_CLIENT --multiquery --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
+$CLICKHOUSE_CLIENT --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
 
 $CLICKHOUSE_CLIENT --query="SELECT 'insert 4 blocks, 2 deduplicated, 2 inserted'"
 echo 'INSERT INTO block_dedup_token VALUES (1), (2), (3), (4)' | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&$INSERT_BLOCK_SETTINGS&insert_deduplication_token='$DEDUP_TOKEN'&query=" --data-binary @-
-$CLICKHOUSE_CLIENT --multiquery --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
+$CLICKHOUSE_CLIENT --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
 
 $CLICKHOUSE_CLIENT --query="SELECT 'disable token based deduplication, insert the same data as with token'"
 DEDUP_TOKEN=''
 echo 'INSERT INTO block_dedup_token VALUES (1), (2), (3), (4)' | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&$INSERT_BLOCK_SETTINGS&insert_deduplication_token='$DEDUP_TOKEN'&query=" --data-binary @-
-$CLICKHOUSE_CLIENT --multiquery --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
+$CLICKHOUSE_CLIENT --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
 
 $CLICKHOUSE_CLIENT --query="DROP TABLE block_dedup_token SYNC"
diff --git a/tests/queries/0_stateless/02124_insert_deduplication_token_multiple_blocks_replica.sh b/tests/queries/0_stateless/02124_insert_deduplication_token_multiple_blocks_replica.sh
index 0c95abb9867..c4ce97aad40 100755
--- a/tests/queries/0_stateless/02124_insert_deduplication_token_multiple_blocks_replica.sh
+++ b/tests/queries/0_stateless/02124_insert_deduplication_token_multiple_blocks_replica.sh
@@ -15,24 +15,24 @@ $CLICKHOUSE_CLIENT --query="SYSTEM STOP MERGES block_dedup_token_replica"
 $CLICKHOUSE_CLIENT --query="SELECT 'insert 2 blocks with dedup token, 1 row per block'"
 DEDUP_TOKEN='dedup1'
 echo 'INSERT INTO block_dedup_token_replica VALUES (1), (2)' | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&$INSERT_BLOCK_SETTINGS&insert_deduplication_token='$DEDUP_TOKEN'&query=" --data-binary @-
-$CLICKHOUSE_CLIENT --multiquery --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
+$CLICKHOUSE_CLIENT --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
 
 $CLICKHOUSE_CLIENT --query="SELECT 'insert deduplicated by token'"
 echo 'INSERT INTO block_dedup_token_replica VALUES (1), (2)' | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&$INSERT_BLOCK_SETTINGS&insert_deduplication_token='$DEDUP_TOKEN'&query=" --data-binary @-
-$CLICKHOUSE_CLIENT --multiquery --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
+$CLICKHOUSE_CLIENT --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
 
 $CLICKHOUSE_CLIENT --query="SELECT 'insert the same data by providing different dedup token'"
 DEDUP_TOKEN='dedup2'
 echo 'INSERT INTO block_dedup_token_replica VALUES (1), (2)' | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&$INSERT_BLOCK_SETTINGS&insert_deduplication_token='$DEDUP_TOKEN'&query=" --data-binary @-
-$CLICKHOUSE_CLIENT --multiquery --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
+$CLICKHOUSE_CLIENT --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
 
 $CLICKHOUSE_CLIENT --query="SELECT 'insert 4 blocks, 2 deduplicated, 2 inserted'"
 echo 'INSERT INTO block_dedup_token_replica VALUES (1), (2), (3), (4)' | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&$INSERT_BLOCK_SETTINGS&insert_deduplication_token='$DEDUP_TOKEN'&query=" --data-binary @-
-$CLICKHOUSE_CLIENT --multiquery --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
+$CLICKHOUSE_CLIENT --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
 
 $CLICKHOUSE_CLIENT --query="SELECT 'disable token based deduplication, insert the same data as with token'"
 DEDUP_TOKEN=''
 echo 'INSERT INTO block_dedup_token_replica VALUES (1), (2), (3), (4)' | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&$INSERT_BLOCK_SETTINGS&insert_deduplication_token='$DEDUP_TOKEN'&query=" --data-binary @-
-$CLICKHOUSE_CLIENT --multiquery --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
+$CLICKHOUSE_CLIENT --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
 
 $CLICKHOUSE_CLIENT --query="DROP TABLE block_dedup_token_replica SYNC"
diff --git a/tests/queries/0_stateless/02125_many_mutations.sh b/tests/queries/0_stateless/02125_many_mutations.sh
index 239f30811d4..9b0afaca585 100755
--- a/tests/queries/0_stateless/02125_many_mutations.sh
+++ b/tests/queries/0_stateless/02125_many_mutations.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 # "max_parts_to_merge_at_once = 1" prevents merges to start in background before our own OPTIMIZE FINAL
 
-$CLICKHOUSE_CLIENT --multiquery -q "
+$CLICKHOUSE_CLIENT -q "
 drop table if exists many_mutations;
 create table many_mutations (x UInt32, y UInt32) engine = MergeTree order by x settings number_of_mutations_to_delay = 0, number_of_mutations_to_throw = 0, max_parts_to_merge_at_once = 1;
 insert into many_mutations values (0, 0), (1, 1);
@@ -17,7 +17,7 @@ select x, y from many_mutations order by x;
 
 job()
 {
-   yes "alter table many_mutations update y = y + 1 where 1;" | head -n 1000 | $CLICKHOUSE_CLIENT --multiquery
+   yes "alter table many_mutations update y = y + 1 where 1;" | head -n 1000 | $CLICKHOUSE_CLIENT
 }
 
 job &
@@ -44,7 +44,7 @@ job &
 wait
 
 # truncate before drop, avoid removing all the mutations (it's slow) in DatabaseCatalog's thread (may affect other tests)
-$CLICKHOUSE_CLIENT --multiquery -q "
+$CLICKHOUSE_CLIENT -q "
 select count() from system.mutations where database = currentDatabase() and table = 'many_mutations' and not is_done;
 system start merges many_mutations;
 optimize table many_mutations final SETTINGS optimize_throw_if_noop = 1;
diff --git a/tests/queries/0_stateless/02125_many_mutations_2.sh b/tests/queries/0_stateless/02125_many_mutations_2.sh
index 958f50287b2..d0025e6d8cc 100755
--- a/tests/queries/0_stateless/02125_many_mutations_2.sh
+++ b/tests/queries/0_stateless/02125_many_mutations_2.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 # "max_parts_to_merge_at_once = 1" prevents merges to start in background before our own OPTIMIZE FINAL
 
-$CLICKHOUSE_CLIENT --multiquery -q "
+$CLICKHOUSE_CLIENT -q "
 drop table if exists many_mutations;
 create table many_mutations (x UInt32, y UInt32) engine = MergeTree order by x settings number_of_mutations_to_delay = 0, number_of_mutations_to_throw = 0, max_parts_to_merge_at_once = 1;
 insert into many_mutations select number, number + 1 from numbers(2000);
@@ -21,7 +21,7 @@ job()
    for i in {1..1000}
    do
       echo "alter table many_mutations delete where y = ${i} * 2 settings mutations_sync = 0;"
-   done | $CLICKHOUSE_CLIENT --multiquery
+   done | $CLICKHOUSE_CLIENT
 }
 
 job &
@@ -48,7 +48,7 @@ job &
 wait
 
 # truncate before drop, avoid removing all the mutations (it's slow) in DatabaseCatalog's thread (may affect other tests)
-$CLICKHOUSE_CLIENT --multiquery -q "
+$CLICKHOUSE_CLIENT -q "
 select count() from system.mutations where database = currentDatabase() and table = 'many_mutations' and not is_done;
 system start merges many_mutations;
 optimize table many_mutations final SETTINGS optimize_throw_if_noop = 1;
diff --git a/tests/queries/0_stateless/02135_local_create_db.sh b/tests/queries/0_stateless/02135_local_create_db.sh
index 55c5c85468f..5004cd35f99 100755
--- a/tests/queries/0_stateless/02135_local_create_db.sh
+++ b/tests/queries/0_stateless/02135_local_create_db.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 for Engine in Atomic Ordinary; do
-    $CLICKHOUSE_LOCAL --allow_deprecated_database_ordinary=1 --multiquery --query """
+    $CLICKHOUSE_LOCAL --allow_deprecated_database_ordinary=1 --query """
     CREATE DATABASE foo_$Engine Engine=$Engine;
     DROP DATABASE foo_$Engine;
     """
diff --git a/tests/queries/0_stateless/02151_client_option_echo.sh b/tests/queries/0_stateless/02151_client_option_echo.sh
index 8056b3b5ed1..565a3a16fe9 100755
--- a/tests/queries/0_stateless/02151_client_option_echo.sh
+++ b/tests/queries/0_stateless/02151_client_option_echo.sh
@@ -11,6 +11,6 @@ ${CLICKHOUSE_CLIENT} --echo --query="DROP TABLE IF EXISTS echo_test_0"
 # single query echo off
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS echo_test_1"
 # multi query echo on
-${CLICKHOUSE_CLIENT} --echo --multiquery --query="DROP TABLE IF EXISTS echo_test_2;DROP TABLE IF EXISTS echo_test_3"
+${CLICKHOUSE_CLIENT} --echo --query="DROP TABLE IF EXISTS echo_test_2;DROP TABLE IF EXISTS echo_test_3"
 # multi query echo off
-${CLICKHOUSE_CLIENT} --multiquery --query="DROP TABLE IF EXISTS echo_test_4;DROP TABLE IF EXISTS echo_test_5"
+${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS echo_test_4;DROP TABLE IF EXISTS echo_test_5"
diff --git a/tests/queries/0_stateless/02151_hash_table_sizes_stats.sh b/tests/queries/0_stateless/02151_hash_table_sizes_stats.sh
index f99dbdacec2..b679c962232 100755
--- a/tests/queries/0_stateless/02151_hash_table_sizes_stats.sh
+++ b/tests/queries/0_stateless/02151_hash_table_sizes_stats.sh
@@ -35,7 +35,7 @@ prepare_table_with_sorting_key() {
 
 run_query() {
   query_id="${CLICKHOUSE_DATABASE}_hash_table_sizes_stats_$RANDOM$RANDOM"
-  $CLICKHOUSE_CLIENT --query_id="$query_id" --multiquery -q "
+  $CLICKHOUSE_CLIENT --query_id="$query_id" -q "
     SET max_block_size = $((table_size / 10));
     SET merge_tree_min_rows_for_concurrent_read = 1;
     SET max_untracked_memory = 0;
diff --git a/tests/queries/0_stateless/02151_hash_table_sizes_stats_distributed.sh b/tests/queries/0_stateless/02151_hash_table_sizes_stats_distributed.sh
index 056c176c1ff..67afa26d02a 100755
--- a/tests/queries/0_stateless/02151_hash_table_sizes_stats_distributed.sh
+++ b/tests/queries/0_stateless/02151_hash_table_sizes_stats_distributed.sh
@@ -40,7 +40,7 @@ prepare_table_with_sorting_key() {
 
 run_query() {
   query_id="${CLICKHOUSE_DATABASE}_hash_table_sizes_stats_$RANDOM$RANDOM"
-  $CLICKHOUSE_CLIENT --query_id="$query_id" --multiquery -q "
+  $CLICKHOUSE_CLIENT --query_id="$query_id" -q "
     SET max_block_size = $((table_size / 10));
     SET merge_tree_min_rows_for_concurrent_read = 1;
     SET max_untracked_memory = 0;
diff --git a/tests/queries/0_stateless/02158_explain_ast_alter_commands.sh b/tests/queries/0_stateless/02158_explain_ast_alter_commands.sh
index 8dfb61eedfb..7a504ab1d31 100755
--- a/tests/queries/0_stateless/02158_explain_ast_alter_commands.sh
+++ b/tests/queries/0_stateless/02158_explain_ast_alter_commands.sh
@@ -47,4 +47,4 @@ EXPLAIN AST ALTER TABLE t UPDATE c = 1 WHERE 1;
 EXPLAIN AST ALTER TABLE t UPDATE c = 1 IN PARTITION 'p' WHERE 1;
 EXPLAIN AST ALTER TABLE t DELETE WHERE c = 1;
 EXPLAIN AST ALTER TABLE t DELETE IN PARTITION 'p' WHERE c = 1;" | \
-    $CLICKHOUSE_CLIENT --readonly 1 --multiquery 2>&1 | grep 'AlterCommand'
+    $CLICKHOUSE_CLIENT --readonly 1 2>&1 | grep 'AlterCommand'
diff --git a/tests/queries/0_stateless/02206_clickhouse_local_use_database.sh b/tests/queries/0_stateless/02206_clickhouse_local_use_database.sh
index 59ede739e4a..3b71c8754c9 100755
--- a/tests/queries/0_stateless/02206_clickhouse_local_use_database.sh
+++ b/tests/queries/0_stateless/02206_clickhouse_local_use_database.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 
-$CLICKHOUSE_LOCAL --echo --multiline --multiquery -q """
+$CLICKHOUSE_LOCAL --echo --multiline -q """
 SHOW TABLES;
 CREATE DATABASE test1;
 CREATE TABLE test1.table1 (a Int32) ENGINE=Memory;
diff --git a/tests/queries/0_stateless/02226_filesystem_cache_profile_events.sh b/tests/queries/0_stateless/02226_filesystem_cache_profile_events.sh
index d0e61541b15..18ae2d7b4b3 100755
--- a/tests/queries/0_stateless/02226_filesystem_cache_profile_events.sh
+++ b/tests/queries/0_stateless/02226_filesystem_cache_profile_events.sh
@@ -10,7 +10,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 for STORAGE_POLICY in 's3_cache' 'local_cache' 'azure_cache'; do
     echo "Using storage policy: $STORAGE_POLICY"
 
-    $CLICKHOUSE_CLIENT --multiquery --multiline  --query """
+    $CLICKHOUSE_CLIENT --multiline  --query """
     SET max_memory_usage='20G';
     SET enable_filesystem_cache_on_write_operations = 0;
 
@@ -25,7 +25,7 @@ for STORAGE_POLICY in 's3_cache' 'local_cache' 'azure_cache'; do
 
     query_id=$($CLICKHOUSE_CLIENT --query "select queryID() from ($query) limit 1" 2>&1)
 
-    $CLICKHOUSE_CLIENT --multiquery --multiline  --query """
+    $CLICKHOUSE_CLIENT --multiline  --query """
     SYSTEM FLUSH LOGS;
     SELECT ProfileEvents['CachedReadBufferReadFromCacheHits'] > 0 as remote_fs_cache_hit,
            ProfileEvents['CachedReadBufferReadFromCacheMisses'] > 0 as remote_fs_cache_miss,
@@ -40,14 +40,14 @@ for STORAGE_POLICY in 's3_cache' 'local_cache' 'azure_cache'; do
     LIMIT 1;
     """
 
-    $CLICKHOUSE_CLIENT --multiquery --multiline --query """
+    $CLICKHOUSE_CLIENT --multiline --query """
     set remote_filesystem_read_method = 'read';
     set local_filesystem_read_method = 'pread';
     """
 
     query_id=$($CLICKHOUSE_CLIENT --query "select queryID() from ($query) limit 1" 2>&1)
 
-    $CLICKHOUSE_CLIENT --multiquery --multiline  --query """
+    $CLICKHOUSE_CLIENT --multiline  --query """
     SYSTEM FLUSH LOGS;
     SELECT ProfileEvents['CachedReadBufferReadFromCacheHits'] > 0 as remote_fs_cache_hit,
            ProfileEvents['CachedReadBufferReadFromCacheMisses'] > 0 as remote_fs_cache_miss,
@@ -63,13 +63,13 @@ for STORAGE_POLICY in 's3_cache' 'local_cache' 'azure_cache'; do
     """
 
 
-    $CLICKHOUSE_CLIENT --multiquery --multiline --query """
+    $CLICKHOUSE_CLIENT --multiline --query """
     set remote_filesystem_read_method='threadpool';
     """
 
     query_id=$($CLICKHOUSE_CLIENT --query "select queryID() from ($query) limit 1")
 
-    $CLICKHOUSE_CLIENT --multiquery --multiline  --query """
+    $CLICKHOUSE_CLIENT --multiline  --query """
     SYSTEM FLUSH LOGS;
     SELECT ProfileEvents['CachedReadBufferReadFromCacheHits'] > 0 as remote_fs_cache_hit,
            ProfileEvents['CachedReadBufferReadFromCacheMisses'] > 0 as remote_fs_cache_miss,
@@ -84,7 +84,7 @@ for STORAGE_POLICY in 's3_cache' 'local_cache' 'azure_cache'; do
     LIMIT 1;
     """
 
-    $CLICKHOUSE_CLIENT --multiquery --multiline  --query """
+    $CLICKHOUSE_CLIENT --multiline  --query """
     SELECT * FROM test_02226 WHERE value LIKE '%abc%' ORDER BY value LIMIT 10 FORMAT Null;
 
     SET enable_filesystem_cache_on_write_operations = 1;
diff --git a/tests/queries/0_stateless/02227_test_create_empty_sqlite_db.sh b/tests/queries/0_stateless/02227_test_create_empty_sqlite_db.sh
index 344452767cc..a3fe5f19de0 100755
--- a/tests/queries/0_stateless/02227_test_create_empty_sqlite_db.sh
+++ b/tests/queries/0_stateless/02227_test_create_empty_sqlite_db.sh
@@ -17,7 +17,7 @@ export CURR_DATABASE="test_01889_sqllite_${CLICKHOUSE_DATABASE}"
 
 DB_PATH=${USER_FILES_PATH}/${CURR_DATABASE}_db1
 
-${CLICKHOUSE_CLIENT} --multiquery --multiline --query="""
+${CLICKHOUSE_CLIENT} --multiline --query="""
 DROP DATABASE IF EXISTS ${CURR_DATABASE};
 CREATE DATABASE ${CURR_DATABASE} ENGINE = SQLite('${DB_PATH}');
 SHOW TABLES FROM ${CURR_DATABASE};
@@ -25,6 +25,6 @@ SHOW TABLES FROM ${CURR_DATABASE};
 
 sqlite3 "${DB_PATH}" 'CREATE TABLE table1 (col1 text, col2 smallint);'
 
-${CLICKHOUSE_CLIENT} --multiquery --multiline --query="""
+${CLICKHOUSE_CLIENT} --multiline --query="""
 SHOW TABLES FROM ${CURR_DATABASE};
 """
diff --git a/tests/queries/0_stateless/02235_remote_fs_cache_stress.sh b/tests/queries/0_stateless/02235_remote_fs_cache_stress.sh
index ffc38c0c1bd..aa5db33417c 100755
--- a/tests/queries/0_stateless/02235_remote_fs_cache_stress.sh
+++ b/tests/queries/0_stateless/02235_remote_fs_cache_stress.sh
@@ -6,7 +6,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CUR_DIR"/../shell_config.sh
 
 
-${CLICKHOUSE_CLIENT} --allow_suspicious_low_cardinality_types=1 --multiquery --multiline --query="""
+${CLICKHOUSE_CLIENT} --allow_suspicious_low_cardinality_types=1 --multiline --query="""
 
 DROP TABLE IF EXISTS t_01411;
 DROP TABLE IF EXISTS t_01411_num;
@@ -35,7 +35,7 @@ insert into lc_dict_reading select number, if(number < 8192 * 4, number % 100, n
 function go()
 {
 
-${CLICKHOUSE_CLIENT} --multiquery --multiline --query="""
+${CLICKHOUSE_CLIENT} --multiline --query="""
 
 select sum(toUInt64(str)), sum(toUInt64(pat)) from lc_dict_reading where val < 8129 or val > 8192 * 4;
 
@@ -67,7 +67,7 @@ for _ in `seq 1 32`; do go | grep -q "Exception" && echo 'FAIL' || echo 'OK' ||:
 
 wait
 
-${CLICKHOUSE_CLIENT} --multiquery --multiline --query="""
+${CLICKHOUSE_CLIENT} --multiline --query="""
 DROP TABLE IF EXISTS t_01411;
 DROP TABLE IF EXISTS t_01411_num;
 """
diff --git a/tests/queries/0_stateless/02240_protobuflist_format_persons.sh b/tests/queries/0_stateless/02240_protobuflist_format_persons.sh
index 637e01b9e63..e5e717d00a8 100755
--- a/tests/queries/0_stateless/02240_protobuflist_format_persons.sh
+++ b/tests/queries/0_stateless/02240_protobuflist_format_persons.sh
@@ -15,7 +15,7 @@ SCHEMADIR=$CURDIR/format_schemas
 set -eo pipefail
 
 # Run the client.
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+$CLICKHOUSE_CLIENT <<EOF
 DROP TABLE IF EXISTS persons_02240;
 DROP TABLE IF EXISTS roundtrip_persons_02240;
 DROP TABLE IF EXISTS alt_persons_02240;
@@ -118,7 +118,7 @@ $CLICKHOUSE_CLIENT --query "INSERT INTO syntax2_persons_02240 SETTINGS format_sc
 $CLICKHOUSE_CLIENT --query "SELECT * FROM syntax2_persons_02240 ORDER BY name"
 rm "$BINARY_FILE_PATH"
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+$CLICKHOUSE_CLIENT <<EOF
 DROP TABLE persons_02240;
 DROP TABLE roundtrip_persons_02240;
 DROP TABLE alt_persons_02240;
diff --git a/tests/queries/0_stateless/02246_clickhouse_local_drop_database.sh b/tests/queries/0_stateless/02246_clickhouse_local_drop_database.sh
index 7e25e099626..b653c9f3e94 100755
--- a/tests/queries/0_stateless/02246_clickhouse_local_drop_database.sh
+++ b/tests/queries/0_stateless/02246_clickhouse_local_drop_database.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 dir=${CLICKHOUSE_TEST_UNIQUE_NAME}
 [[ -d $dir ]] && rm -r $dir
 mkdir $dir
-$CLICKHOUSE_LOCAL --multiline --multiquery --path $dir -q """
+$CLICKHOUSE_LOCAL --multiline --path $dir -q """
 DROP DATABASE IF EXISTS test;
 CREATE DATABASE IF NOT EXISTS test;
 USE test;
@@ -15,7 +15,7 @@ CREATE TABLE test (id Int32) ENGINE=MergeTree() ORDER BY id;
 DROP DATABASE test;
 """
 
-$CLICKHOUSE_LOCAL --multiline --multiquery -q """
+$CLICKHOUSE_LOCAL --multiline -q """
 DROP DATABASE IF EXISTS test;
 CREATE DATABASE IF NOT EXISTS test;
 USE test;
diff --git a/tests/queries/0_stateless/02286_drop_filesystem_cache.sh b/tests/queries/0_stateless/02286_drop_filesystem_cache.sh
index 32c9e9cb060..dab777fcc31 100755
--- a/tests/queries/0_stateless/02286_drop_filesystem_cache.sh
+++ b/tests/queries/0_stateless/02286_drop_filesystem_cache.sh
@@ -31,7 +31,7 @@ for STORAGE_POLICY in 's3_cache' 'local_cache' 'azure_cache'; do
     $CLICKHOUSE_CLIENT --query "SELECT * FROM test_02286 FORMAT Null"
     $CLICKHOUSE_CLIENT --query "SELECT count() FROM system.filesystem_cache"
 
-    $CLICKHOUSE_CLIENT --multiline --multiquery --query "SYSTEM DROP FILESYSTEM CACHE 'ff'; --{serverError 36}"
+    $CLICKHOUSE_CLIENT --multiline --query "SYSTEM DROP FILESYSTEM CACHE 'ff'; --{serverError 36}"
 
     $CLICKHOUSE_CLIENT --query "SELECT count() FROM system.filesystem_cache"
 
diff --git a/tests/queries/0_stateless/02337_drop_filesystem_cache_access.sh b/tests/queries/0_stateless/02337_drop_filesystem_cache_access.sh
index 7f2103e6ddb..07d5f641571 100755
--- a/tests/queries/0_stateless/02337_drop_filesystem_cache_access.sh
+++ b/tests/queries/0_stateless/02337_drop_filesystem_cache_access.sh
@@ -7,17 +7,17 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
+${CLICKHOUSE_CLIENT} --multiline -q """
 DROP USER IF EXISTS user_test_02337;
 CREATE USER user_test_02337 IDENTIFIED WITH plaintext_password BY 'user_test_02337';
 REVOKE ALL ON *.* FROM user_test_02337;
 """
-${CLICKHOUSE_CLIENT} --multiline --multiquery --user user_test_02337 --password user_test_02337 -q """
+${CLICKHOUSE_CLIENT} --multiline --user user_test_02337 --password user_test_02337 -q """
 SYSTEM DROP FILESYSTEM CACHE; -- { serverError 497 }
 """
-${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
+${CLICKHOUSE_CLIENT} --multiline -q """
 GRANT SYSTEM DROP FILESYSTEM CACHE ON *.* TO user_test_02337 WITH GRANT OPTION;
 """
-${CLICKHOUSE_CLIENT} --multiline --multiquery --user user_test_02337 --password user_test_02337 -q """
+${CLICKHOUSE_CLIENT} --multiline --user user_test_02337 --password user_test_02337 -q """
 SYSTEM DROP FILESYSTEM CACHE;
 """
diff --git a/tests/queries/0_stateless/02364_window_view_segfault.sh b/tests/queries/0_stateless/02364_window_view_segfault.sh
index 9accf7f30c3..4173b6c6b8d 100755
--- a/tests/queries/0_stateless/02364_window_view_segfault.sh
+++ b/tests/queries/0_stateless/02364_window_view_segfault.sh
@@ -9,7 +9,7 @@ opts=(
     "--allow_experimental_analyzer=0"
 )
 
-${CLICKHOUSE_CLIENT} "${opts[@]}" --multiquery --multiline --query """
+${CLICKHOUSE_CLIENT} "${opts[@]}" --multiline --query """
 DROP TABLE IF EXISTS mt ON CLUSTER test_shard_localhost;
 DROP TABLE IF EXISTS wv ON CLUSTER test_shard_localhost;
 CREATE TABLE mt ON CLUSTER test_shard_localhost (a Int32, timestamp DateTime) ENGINE=MergeTree ORDER BY tuple();
diff --git a/tests/queries/0_stateless/02373_datetime64_monotonicity.sh b/tests/queries/0_stateless/02373_datetime64_monotonicity.sh
index 7e852aa24b0..73a32e28be9 100755
--- a/tests/queries/0_stateless/02373_datetime64_monotonicity.sh
+++ b/tests/queries/0_stateless/02373_datetime64_monotonicity.sh
@@ -7,7 +7,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 for tz in Asia/Tehran UTC Canada/Atlantic Europe/Berlin
 do
     echo "$tz"
-    TZ=$tz $CLICKHOUSE_LOCAL --multiline --multiquery "
+    TZ=$tz $CLICKHOUSE_LOCAL --multiline "
       drop table if exists dt64_monotonicity_test;
       drop table if exists dt64_monotonicity_test_string;
       CREATE TABLE dt64_monotonicity_test (date_time DateTime64(3, 'Europe/Berlin'), id String) ENGINE = MergeTree PARTITION BY toDate(date_time, 'Europe/Berlin') ORDER BY date_time;
diff --git a/tests/queries/0_stateless/02416_rename_database_rbac.sh b/tests/queries/0_stateless/02416_rename_database_rbac.sh
index c319136d29c..4d4b54e9384 100755
--- a/tests/queries/0_stateless/02416_rename_database_rbac.sh
+++ b/tests/queries/0_stateless/02416_rename_database_rbac.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
+${CLICKHOUSE_CLIENT} --multiline -q """
 DROP DATABASE IF EXISTS database_02416;
 CREATE DATABASE database_02416;
 
@@ -18,6 +18,6 @@ REVOKE DROP DATABASE ON database_02416.* FROM 'user_test_02416';
 GRANT CREATE TABLE ON *.* TO 'user_test_02416' WITH GRANT OPTION;
 GRANT DROP TABLE ON *.* TO 'user_test_02416' WITH GRANT OPTION;
 """
-${CLICKHOUSE_CLIENT} --multiline --multiquery --user user_test_02416 --password user_test_02416 -q """
+${CLICKHOUSE_CLIENT} --multiline --user user_test_02416 --password user_test_02416 -q """
 RENAME DATABASE user_test_02416 to aaaaaaaaa; -- { serverError 497 }
 """
diff --git a/tests/queries/0_stateless/02435_rollback_cancelled_queries.sh b/tests/queries/0_stateless/02435_rollback_cancelled_queries.sh
index a0312b7a40c..ba652013a57 100755
--- a/tests/queries/0_stateless/02435_rollback_cancelled_queries.sh
+++ b/tests/queries/0_stateless/02435_rollback_cancelled_queries.sh
@@ -41,7 +41,7 @@ function insert_data
     else
         # client will send 1000-rows blocks, server will squash them into 110000-rows blocks (more chances to catch a bug on query cancellation)
         $CLICKHOUSE_CLIENT --stacktrace --query_id="$ID" --throw_on_unsupported_query_inside_transaction=0 --implicit_transaction="$IMPLICIT" \
-            --max_block_size=1000 --max_insert_block_size=1000 --multiquery -q \
+            --max_block_size=1000 --max_insert_block_size=1000 -q \
             "${BEGIN}insert into dedup_test settings max_insert_block_size=110000, min_insert_block_size_rows=110000 format TSV$COMMIT" < $DATA_FILE \
             | grep -Fv "Transaction is not in RUNNING state"
     fi
diff --git a/tests/queries/0_stateless/02460_projections_and_aggregate_null_if_empty.sh b/tests/queries/0_stateless/02460_projections_and_aggregate_null_if_empty.sh
index 6e96b9b8afc..748e134ea99 100755
--- a/tests/queries/0_stateless/02460_projections_and_aggregate_null_if_empty.sh
+++ b/tests/queries/0_stateless/02460_projections_and_aggregate_null_if_empty.sh
@@ -6,4 +6,4 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_LOCAL} --aggregate_functions_null_for_empty=1 --multiquery --query "create table test_date (date Int32) ENGINE = MergeTree ORDER BY (date) as select 20220920; SELECT max(date) FROM test_date";
+${CLICKHOUSE_LOCAL} --aggregate_functions_null_for_empty=1 --query "create table test_date (date Int32) ENGINE = MergeTree ORDER BY (date) as select 20220920; SELECT max(date) FROM test_date";
diff --git a/tests/queries/0_stateless/02494_query_cache_user_isolation.sh b/tests/queries/0_stateless/02494_query_cache_user_isolation.sh
index d55e2460619..dcad921e013 100755
--- a/tests/queries/0_stateless/02494_query_cache_user_isolation.sh
+++ b/tests/queries/0_stateless/02494_query_cache_user_isolation.sh
@@ -91,16 +91,16 @@ ${CLICKHOUSE_CLIENT} --user "admin" --query "INSERT INTO user_data (ID, userID)
 
 # Test...
 ${CLICKHOUSE_CLIENT} --user "admin" --query "SELECT '-- policy_1 test'"
-${CLICKHOUSE_CLIENT} --user "admin" --multiquery "SET ROLE user_role_1; SELECT * FROM user_data" # should only return rows with userID = 1
+${CLICKHOUSE_CLIENT} --user "admin" "SET ROLE user_role_1; SELECT * FROM user_data" # should only return rows with userID = 1
 
 ${CLICKHOUSE_CLIENT} --user "admin" --query "SELECT '-- policy_2 test'"
-${CLICKHOUSE_CLIENT} --user "admin" --multiquery "SET ROLE user_role_2; SELECT * FROM user_data" # should only return rows with userID = 2
+${CLICKHOUSE_CLIENT} --user "admin" "SET ROLE user_role_2; SELECT * FROM user_data" # should only return rows with userID = 2
 
 ${CLICKHOUSE_CLIENT} --user "admin" --query "SELECT '-- policy_1 with query cache test'"
-${CLICKHOUSE_CLIENT} --user "admin" --multiquery "SET ROLE user_role_1; SELECT * FROM user_data SETTINGS use_query_cache = 1" # should only return rows with userID = 1
+${CLICKHOUSE_CLIENT} --user "admin" "SET ROLE user_role_1; SELECT * FROM user_data SETTINGS use_query_cache = 1" # should only return rows with userID = 1
 
 ${CLICKHOUSE_CLIENT} --user "admin" --query "SELECT '-- policy_2 with query cache test'"
-${CLICKHOUSE_CLIENT} --user "admin" --multiquery "SET ROLE user_role_2; SELECT * FROM user_data SETTINGS use_query_cache = 1" # should only return rows with userID = 2 (not userID = 1!)
+${CLICKHOUSE_CLIENT} --user "admin" "SET ROLE user_role_2; SELECT * FROM user_data SETTINGS use_query_cache = 1" # should only return rows with userID = 2 (not userID = 1!)
 
 # Cleanup
 ${CLICKHOUSE_CLIENT} --user "admin" --query "DROP ROLE user_role_1"
diff --git a/tests/queries/0_stateless/02503_cache_on_write_with_small_segment_size.sh b/tests/queries/0_stateless/02503_cache_on_write_with_small_segment_size.sh
index 5aeab4c746e..13412502dd4 100755
--- a/tests/queries/0_stateless/02503_cache_on_write_with_small_segment_size.sh
+++ b/tests/queries/0_stateless/02503_cache_on_write_with_small_segment_size.sh
@@ -11,7 +11,7 @@ function random {
      cat /dev/urandom | LC_ALL=C tr -dc 'a-zA-Z' | fold -w ${1:-8} | head -n 1
 }
 
-${CLICKHOUSE_CLIENT} --multiline --multiquery -q "
+${CLICKHOUSE_CLIENT} --multiline -q "
 drop table if exists ttt;
 
 CREATE TABLE ttt (id Int32, value String)
@@ -46,7 +46,7 @@ ${CLICKHOUSE_CLIENT}  -q "
 select count() from system.filesystem_cache_log where query_id = '$query_id' AND read_type == 'READ_FROM_CACHE';
 "
 
-${CLICKHOUSE_CLIENT} --multiline --multiquery -q "
+${CLICKHOUSE_CLIENT} --multiline -q "
 select count() from ttt;
 drop table ttt sync;
 "
diff --git a/tests/queries/0_stateless/02521_merge_over_gap.sh b/tests/queries/0_stateless/02521_merge_over_gap.sh
index 4f73b5bceee..3c549a2a0dc 100755
--- a/tests/queries/0_stateless/02521_merge_over_gap.sh
+++ b/tests/queries/0_stateless/02521_merge_over_gap.sh
@@ -15,7 +15,7 @@ $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS table_with_gap;"
 $CLICKHOUSE_CLIENT --query "CREATE TABLE table_with_gap (v UInt8) ENGINE = MergeTree() ORDER BY tuple() settings old_parts_lifetime = 10000;"
 $CLICKHOUSE_CLIENT --query "SYSTEM STOP MERGES table_with_gap;"
 
-$CLICKHOUSE_CLIENT --multiquery --query "
+$CLICKHOUSE_CLIENT --query "
     INSERT INTO table_with_gap VALUES (1);
     INSERT INTO table_with_gap VALUES (2);
     INSERT INTO table_with_gap VALUES (3);
diff --git a/tests/queries/0_stateless/02530_dictionaries_update_field.sh b/tests/queries/0_stateless/02530_dictionaries_update_field.sh
index a8e5804fba4..968756368d1 100755
--- a/tests/queries/0_stateless/02530_dictionaries_update_field.sh
+++ b/tests/queries/0_stateless/02530_dictionaries_update_field.sh
@@ -35,7 +35,7 @@ for layout in "${layouts[@]}"; do
             echo "$layout"
         fi
 
-        $CLICKHOUSE_CLIENT --multiquery "
+        $CLICKHOUSE_CLIENT "
             TRUNCATE TABLE table_for_update_field_dictionary;
 
             CREATE DICTIONARY $dictionary_name
diff --git a/tests/queries/0_stateless/02702_allow_skip_errors_enum.sh b/tests/queries/0_stateless/02702_allow_skip_errors_enum.sh
index e68f5517d52..9c73ad3a809 100755
--- a/tests/queries/0_stateless/02702_allow_skip_errors_enum.sh
+++ b/tests/queries/0_stateless/02702_allow_skip_errors_enum.sh
@@ -4,7 +4,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --multiquery --query "DROP TABLE IF EXISTS t; CREATE TABLE t (x Enum('Hello' = 1, 'World' = 2)) ENGINE = Memory;"
+$CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS t; CREATE TABLE t (x Enum('Hello' = 1, 'World' = 2)) ENGINE = Memory;"
 $CLICKHOUSE_CLIENT --input_format_allow_errors_num 1 --query "INSERT INTO t FORMAT CSV" <<END
 Hello
 Goodbye
diff --git a/tests/queries/0_stateless/02704_keeper_map_zk_nodes.sh b/tests/queries/0_stateless/02704_keeper_map_zk_nodes.sh
index 9689d4f5a50..758313814be 100755
--- a/tests/queries/0_stateless/02704_keeper_map_zk_nodes.sh
+++ b/tests/queries/0_stateless/02704_keeper_map_zk_nodes.sh
@@ -8,7 +8,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 table_name="02704_keeper_map_zk_nodes"
 table_name_another="02704_keeper_map_zk_nodes_new_table"
 
-$CLICKHOUSE_CLIENT --multiquery --query="
+$CLICKHOUSE_CLIENT --query="
 DROP TABLE IF EXISTS $table_name;
 DROP TABLE IF EXISTS $table_name_another;
 CREATE TABLE $table_name (key UInt64, value UInt64)
diff --git a/tests/queries/0_stateless/02707_clickhouse_local_implicit_file_table_function.sh b/tests/queries/0_stateless/02707_clickhouse_local_implicit_file_table_function.sh
index dabea8a373a..644767de85f 100755
--- a/tests/queries/0_stateless/02707_clickhouse_local_implicit_file_table_function.sh
+++ b/tests/queries/0_stateless/02707_clickhouse_local_implicit_file_table_function.sh
@@ -42,7 +42,7 @@ $CLICKHOUSE_LOCAL -q "SELECT COUNT(*) FROM \"${dir}/tmp.csv\""
 
 #################
 echo "Test 2: check Filesystem database"
-$CLICKHOUSE_LOCAL --multiline --multiquery -q """
+$CLICKHOUSE_LOCAL --multiline -q """
 DROP DATABASE IF EXISTS test;
 CREATE DATABASE test ENGINE = Filesystem('${dir}');
 SELECT COUNT(*) FROM test.\`tmp.csv\`;
@@ -57,7 +57,7 @@ DROP DATABASE test;
 
 #################
 echo "Test 3: check show database with Filesystem"
-$CLICKHOUSE_LOCAL --multiline --multiquery -q """
+$CLICKHOUSE_LOCAL --multiline -q """
 DROP DATABASE IF EXISTS test02707;
 CREATE DATABASE test02707 ENGINE = Filesystem('${dir}');
 SHOW DATABASES;
diff --git a/tests/queries/0_stateless/02712_bool_better_exception_message.sh b/tests/queries/0_stateless/02712_bool_better_exception_message.sh
index ee006958d93..1da70d7025b 100755
--- a/tests/queries/0_stateless/02712_bool_better_exception_message.sh
+++ b/tests/queries/0_stateless/02712_bool_better_exception_message.sh
@@ -6,19 +6,19 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 
-$CLICKHOUSE_LOCAL --multiquery <<END
+$CLICKHOUSE_LOCAL <<END
     SELECT * FROM format(JSONEachRow, 'x Bool', '{"x": 1}');
     SELECT * FROM format(JSONEachRow, 'x Bool', '{"x": null}');
 END
 
-$CLICKHOUSE_LOCAL --multiquery <<END 2>&1 | rg -Fc "'w' character"
+$CLICKHOUSE_LOCAL <<END 2>&1 | rg -Fc "'w' character"
     SELECT * FROM format(JSONEachRow, 'x Bool', '{"x": wtf}');
 END
 
-$CLICKHOUSE_LOCAL --multiquery <<END 2>&1 | rg -Fc "expected 'false'"
+$CLICKHOUSE_LOCAL <<END 2>&1 | rg -Fc "expected 'false'"
     SELECT * FROM format(JSONEachRow, 'x Bool', '{"x": ftw}');
 END
 
-$CLICKHOUSE_LOCAL --multiquery <<END 2>&1 | rg -Fc "'{' character"
+$CLICKHOUSE_LOCAL <<END 2>&1 | rg -Fc "'{' character"
     SELECT * FROM format(JSONEachRow, 'x Bool', '{"x": {}}');
 END
diff --git a/tests/queries/0_stateless/02722_database_filesystem.sh b/tests/queries/0_stateless/02722_database_filesystem.sh
index 2d0ff256c95..fa23d847d90 100755
--- a/tests/queries/0_stateless/02722_database_filesystem.sh
+++ b/tests/queries/0_stateless/02722_database_filesystem.sh
@@ -30,7 +30,7 @@ cp ${user_files_tmp_dir}/tmp_numbers_1.csv ${user_files_tmp_dir}/tmp/tmp_numbers
 
 #################
 echo "Test 1: create filesystem database and check implicit calls"
-${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
+${CLICKHOUSE_CLIENT} --multiline -q """
 DROP DATABASE IF EXISTS test1;
 CREATE DATABASE test1 ENGINE = Filesystem;
 """
@@ -57,20 +57,20 @@ ${CLICKHOUSE_CLIENT} --query "SELECT COUNT(*) FROM test1.\`/tmp/tmp.csv\`;" 2>&1
 ${CLICKHOUSE_CLIENT} --query "SELECT COUNT(*) FROM test1.\`../*/tmp_numbers_*.csv\`;" 2>&1 | tr '\n' ' ' | grep -oF "PATH_ACCESS_DENIED" > /dev/null && echo "OK" || echo 'FAIL' ||:
 ${CLICKHOUSE_CLIENT} --query "SELECT COUNT(*) FROM test1.\`../tmp_numbers_*.csv\`;" 2>&1 | tr '\n' ' ' | grep -oF "PATH_ACCESS_DENIED" > /dev/null && echo "OK" || echo 'FAIL' ||:
 ${CLICKHOUSE_CLIENT} --query "SELECT COUNT(*) FROM test1.\`../*.csv\`;" 2>&1 | tr '\n' ' ' | grep -oF "PATH_ACCESS_DENIED" > /dev/null && echo "OK" || echo 'FAIL' ||:
-${CLICKHOUSE_CLIENT} --multiline --multiquery --query """
+${CLICKHOUSE_CLIENT} --multiline --query """
 USE test1;
 SELECT COUNT(*) FROM \"../${tmp_dir}/tmp.csv\";
 """ 2>&1 | tr '\n' ' ' | grep -oF "PATH_ACCESS_DENIED" > /dev/null && echo "OK" || echo 'FAIL' ||:
 ${CLICKHOUSE_CLIENT} --query "SELECT COUNT(*) FROM test1.\`../../../../../../tmp.csv\`;" 2>&1 | tr '\n' ' ' | grep -oF "PATH_ACCESS_DENIED" > /dev/null && echo "OK" || echo 'FAIL' ||:
 
 # BAD_ARGUMENTS: path should be inside user_files
-${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
+${CLICKHOUSE_CLIENT} --multiline -q """
 DROP DATABASE IF EXISTS test2;
 CREATE DATABASE test2 ENGINE = Filesystem('/tmp');
 """ 2>&1 | tr '\n' ' ' | grep -oF -e "UNKNOWN_TABLE" -e "BAD_ARGUMENTS" > /dev/null && echo "OK" || echo 'FAIL' ||:
 
 # BAD_ARGUMENTS: .../user_files/relative_unknown_dir does not exist
-${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
+${CLICKHOUSE_CLIENT} --multiline -q """
 DROP DATABASE IF EXISTS test2;
 CREATE DATABASE test2 ENGINE = Filesystem('relative_unknown_dir');
 """ 2>&1 | tr '\n' ' ' | grep -oF -e "UNKNOWN_TABLE" -e "BAD_ARGUMENTS" > /dev/null && echo "OK" || echo 'FAIL' ||:
diff --git a/tests/queries/0_stateless/02724_database_s3.sh b/tests/queries/0_stateless/02724_database_s3.sh
index 80b47282146..cc7f012c8cf 100755
--- a/tests/queries/0_stateless/02724_database_s3.sh
+++ b/tests/queries/0_stateless/02724_database_s3.sh
@@ -8,7 +8,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 #################
 echo "Test 1: select from s3"
-${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
+${CLICKHOUSE_CLIENT} --multiline -q """
 DROP DATABASE IF EXISTS test1;
 CREATE DATABASE test1 ENGINE = S3;
 USE test1;
@@ -17,7 +17,7 @@ SELECT * FROM \"http://localhost:11111/test/a.tsv\"
 ${CLICKHOUSE_CLIENT} -q "SHOW DATABASES;" | grep test1
 
 # check credentials with absolute path
-${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
+${CLICKHOUSE_CLIENT} --multiline -q """
 DROP DATABASE IF EXISTS test2;
 CREATE DATABASE test2 ENGINE = S3('', 'test', 'testtest');
 USE test2;
@@ -25,7 +25,7 @@ SELECT * FROM \"http://localhost:11111/test/b.tsv\"
 """
 
 # check credentials with relative path
-${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
+${CLICKHOUSE_CLIENT} --multiline -q """
 DROP DATABASE IF EXISTS test4;
 CREATE DATABASE test4 ENGINE = S3('http://localhost:11111/test', 'test', 'testtest');
 USE test4;
@@ -33,7 +33,7 @@ SELECT * FROM \"b.tsv\"
 """
 
 # Check named collection loading
-${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
+${CLICKHOUSE_CLIENT} --multiline -q """
 DROP DATABASE IF EXISTS test5;
 CREATE DATABASE test5 ENGINE = S3(s3_conn_db);
 SELECT * FROM test5.\`b.tsv\`
@@ -41,20 +41,20 @@ SELECT * FROM test5.\`b.tsv\`
 
 #################
 echo "Test 2: check exceptions"
-${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
+${CLICKHOUSE_CLIENT} --multiline -q """
 DROP DATABASE IF EXISTS test3;
 CREATE DATABASE test3 ENGINE = S3;
 USE test3;
 SELECT * FROM \"http://localhost:11111/test/a.myext\"
 """ 2>&1 | tr '\n' ' ' | grep -oF -e "UNKNOWN_TABLE" -e "S3_ERROR" > /dev/null && echo "OK" || echo 'FAIL' ||:
 
-${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
+${CLICKHOUSE_CLIENT} --multiline -q """
 USE test3;
 SELECT * FROM \"abacaba\"
 """ 2>&1 | tr '\n' ' ' | grep -oF -e "UNKNOWN_TABLE" -e "BAD_ARGUMENTS" > /dev/null && echo "OK" || echo 'FAIL' ||:
 
 # Cleanup
-${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
+${CLICKHOUSE_CLIENT} --multiline -q """
 DROP DATABASE IF EXISTS test1;
 DROP DATABASE IF EXISTS test2;
 DROP DATABASE IF EXISTS test3;
diff --git a/tests/queries/0_stateless/02725_database_hdfs.sh b/tests/queries/0_stateless/02725_database_hdfs.sh
index 1eb22976b84..7fd35c72ef1 100755
--- a/tests/queries/0_stateless/02725_database_hdfs.sh
+++ b/tests/queries/0_stateless/02725_database_hdfs.sh
@@ -25,7 +25,7 @@ fi
 echo "Test 1: select from hdfs database"
 
 # Database without specific host
-${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
+${CLICKHOUSE_CLIENT} --multiline -q """
 DROP DATABASE IF EXISTS test_hdfs_1;
 CREATE DATABASE test_hdfs_1 ENGINE = HDFS;
 USE test_hdfs_1;
@@ -34,7 +34,7 @@ SELECT * FROM \"hdfs://localhost:12222/test_02725_1.tsv\"
 ${CLICKHOUSE_CLIENT} -q "SHOW DATABASES;" | grep test_hdfs_1
 
 # Database with host
-${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
+${CLICKHOUSE_CLIENT} --multiline -q """
 DROP DATABASE IF EXISTS test_hdfs_2;
 CREATE DATABASE test_hdfs_2 ENGINE = HDFS('hdfs://localhost:12222');
 USE test_hdfs_2;
@@ -45,12 +45,12 @@ ${CLICKHOUSE_CLIENT} -q "SHOW DATABASES;" | grep test_hdfs_2
 #################
 echo "Test 2: check exceptions"
 
-${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
+${CLICKHOUSE_CLIENT} --multiline -q """
 DROP DATABASE IF EXISTS test_hdfs_3;
 CREATE DATABASE test_hdfs_3 ENGINE = HDFS('abacaba');
 """ 2>&1 | tr '\n' ' ' | grep -oF "BAD_ARGUMENTS"
 
-${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
+${CLICKHOUSE_CLIENT} --multiline -q """
 DROP DATABASE IF EXISTS test_hdfs_4;
 CREATE DATABASE test_hdfs_4 ENGINE = HDFS;
 USE test_hdfs_4;
@@ -64,7 +64,7 @@ ${CLICKHOUSE_CLIENT} --query "SELECT * FROM test_hdfs_4.\`hdfs://localhost:12222
 
 
 # Cleanup
-${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
+${CLICKHOUSE_CLIENT} --multiline -q """
 DROP DATABASE IF EXISTS test_hdfs_1;
 DROP DATABASE IF EXISTS test_hdfs_2;
 DROP DATABASE IF EXISTS test_hdfs_3;
diff --git a/tests/queries/0_stateless/02725_local_query_parameters.sh b/tests/queries/0_stateless/02725_local_query_parameters.sh
index 92d7f645454..151a854d5b9 100755
--- a/tests/queries/0_stateless/02725_local_query_parameters.sh
+++ b/tests/queries/0_stateless/02725_local_query_parameters.sh
@@ -5,6 +5,6 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_LOCAL --multiquery -q "
+$CLICKHOUSE_LOCAL -q "
     SET param_x=1;
     SELECT {x:UInt64}, {x:String};"
diff --git a/tests/queries/0_stateless/02751_multiquery_with_argument.reference b/tests/queries/0_stateless/02751_multiquery_with_argument.reference
index 2e55712e49c..f02e9bab2cd 100644
--- a/tests/queries/0_stateless/02751_multiquery_with_argument.reference
+++ b/tests/queries/0_stateless/02751_multiquery_with_argument.reference
@@ -5,8 +5,6 @@
 Syntax error
 Empty query
 Empty query
-BAD_ARGUMENTS
-BAD_ARGUMENTS
 301
 302
 304
diff --git a/tests/queries/0_stateless/02751_multiquery_with_argument.sh b/tests/queries/0_stateless/02751_multiquery_with_argument.sh
index 7b959a3c3dc..4021194656b 100755
--- a/tests/queries/0_stateless/02751_multiquery_with_argument.sh
+++ b/tests/queries/0_stateless/02751_multiquery_with_argument.sh
@@ -4,18 +4,14 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_LOCAL --multiquery "SELECT 100"
-$CLICKHOUSE_LOCAL --multiquery "SELECT 101;"
-$CLICKHOUSE_LOCAL --multiquery "SELECT 102;SELECT 103;"
+$CLICKHOUSE_LOCAL "SELECT 100"
+$CLICKHOUSE_LOCAL "SELECT 101;"
+$CLICKHOUSE_LOCAL "SELECT 102;SELECT 103;"
 
 # Invalid SQL.
-$CLICKHOUSE_LOCAL --multiquery "SELECT 200; S" 2>&1 | grep -o 'Syntax error'
-$CLICKHOUSE_LOCAL --multiquery "; SELECT 201;" 2>&1 | grep -o 'Empty query'
-$CLICKHOUSE_LOCAL --multiquery "; S; SELECT 202" 2>&1 | grep -o 'Empty query'
-
-# Simultaneously passing --queries-file + --query (multiquery) is prohibited.
-$CLICKHOUSE_LOCAL --queries-file "queries.csv" --multiquery "SELECT 250;" 2>&1 | grep -o 'BAD_ARGUMENTS'
-$CLICKHOUSE_CLIENT --queries-file "queries.csv" --multiquery "SELECT 251;" 2>&1 | grep -o 'BAD_ARGUMENTS'
+$CLICKHOUSE_LOCAL "SELECT 200; S" 2>&1 | grep -o 'Syntax error'
+$CLICKHOUSE_LOCAL "; SELECT 201;" 2>&1 | grep -o 'Empty query'
+$CLICKHOUSE_LOCAL "; S; SELECT 202" 2>&1 | grep -o 'Empty query'
 
 # Error expectation cases.
 # -n <SQL> is also interpreted as a query
diff --git a/tests/queries/0_stateless/02815_no_throw_in_simple_queries.sh b/tests/queries/0_stateless/02815_no_throw_in_simple_queries.sh
index 68c55f9b66a..18ffc9dfec3 100755
--- a/tests/queries/0_stateless/02815_no_throw_in_simple_queries.sh
+++ b/tests/queries/0_stateless/02815_no_throw_in_simple_queries.sh
@@ -19,7 +19,7 @@ $CLICKHOUSE_CLIENT --query "SHOW TABLES" || echo "Failed"
 $CLICKHOUSE_CLIENT --query "SELECT * FROM system.tables WHERE database = currentDatabase() FORMAT Null" || echo "Failed"
 
 # Multi queries are ok:
-$CLICKHOUSE_LOCAL --multiquery "SELECT 1; SELECT 2;" || echo "Failed"
+$CLICKHOUSE_LOCAL "SELECT 1; SELECT 2;" || echo "Failed"
 
 # It can run in interactive mode:
 function run()
diff --git a/tests/queries/0_stateless/02843_insertion_table_schema_infer.sh b/tests/queries/0_stateless/02843_insertion_table_schema_infer.sh
index d806b678456..9207e48092f 100755
--- a/tests/queries/0_stateless/02843_insertion_table_schema_infer.sh
+++ b/tests/queries/0_stateless/02843_insertion_table_schema_infer.sh
@@ -9,7 +9,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 DATA_DIR=$CUR_DIR/data_tsv
 
-$CLICKHOUSE_LOCAL --multiquery \
+$CLICKHOUSE_LOCAL \
 "CREATE VIEW users AS SELECT * FROM file('$DATA_DIR/mock_data.tsv', TSVWithNamesAndTypes); 
  CREATE TABLE users_output (name String, tag UInt64)ENGINE = Memory;
  INSERT INTO users_output WITH (SELECT groupUniqArrayArray(mapKeys(Tags)) FROM users) AS unique_tags SELECT UserName AS name, length(unique_tags) AS tag FROM users;
diff --git a/tests/queries/0_stateless/02864_restore_table_with_broken_part.sh b/tests/queries/0_stateless/02864_restore_table_with_broken_part.sh
index 08313e2fd3b..229f832ba14 100755
--- a/tests/queries/0_stateless/02864_restore_table_with_broken_part.sh
+++ b/tests/queries/0_stateless/02864_restore_table_with_broken_part.sh
@@ -39,7 +39,7 @@ $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS tbl"
 # Then try to restore with the setting `restore_broken_parts_as_detached` set to true.
 $CLICKHOUSE_CLIENT --query "RESTORE TABLE default.tbl AS tbl FROM Disk('backups', '${backup_name}') SETTINGS restore_broken_parts_as_detached = true" 2>/dev/null | awk -F '\t' '{print $2}'
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+$CLICKHOUSE_CLIENT <<EOF
 SELECT * FROM tbl ORDER BY x;
 SELECT name, reason FROM system.detached_parts WHERE database = currentDatabase() AND table = 'tbl';
 
diff --git a/tests/queries/0_stateless/02874_parquet_multiple_batches_array_inconsistent_offsets.sh b/tests/queries/0_stateless/02874_parquet_multiple_batches_array_inconsistent_offsets.sh
index c96531ffea9..2df3e90c98c 100755
--- a/tests/queries/0_stateless/02874_parquet_multiple_batches_array_inconsistent_offsets.sh
+++ b/tests/queries/0_stateless/02874_parquet_multiple_batches_array_inconsistent_offsets.sh
@@ -123,7 +123,7 @@ echo "Parquet"
 
 DATA_FILE=$CUR_DIR/data_parquet/string_int_list_inconsistent_offset_multiple_batches.parquet
 
-${CLICKHOUSE_LOCAL} --multiquery "
+${CLICKHOUSE_LOCAL} "
 DROP TABLE IF EXISTS parquet_load;
 CREATE TABLE parquet_load (ints Array(Int64), strings Nullable(String)) ENGINE = Memory;
 INSERT INTO parquet_load FROM INFILE '$DATA_FILE';
diff --git a/tests/queries/0_stateless/02875_merge_engine_set_index.sh b/tests/queries/0_stateless/02875_merge_engine_set_index.sh
index 57b5db374c1..355d83167a6 100755
--- a/tests/queries/0_stateless/02875_merge_engine_set_index.sh
+++ b/tests/queries/0_stateless/02875_merge_engine_set_index.sh
@@ -38,7 +38,7 @@ $CLICKHOUSE_CLIENT -nq "
     ENGINE = Merge(currentDatabase(), 't*');"
 
 query_id="${CLICKHOUSE_DATABASE}_merge_engine_set_index_$RANDOM$RANDOM"
-$CLICKHOUSE_CLIENT --query_id="$query_id" --multiquery -q "
+$CLICKHOUSE_CLIENT --query_id="$query_id" -q "
 SELECT
     a,
     b
diff --git a/tests/queries/0_stateless/02877_optimize_read_in_order_from_view.sh b/tests/queries/0_stateless/02877_optimize_read_in_order_from_view.sh
index a3a906a9891..dc9cc71757e 100755
--- a/tests/queries/0_stateless/02877_optimize_read_in_order_from_view.sh
+++ b/tests/queries/0_stateless/02877_optimize_read_in_order_from_view.sh
@@ -4,7 +4,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 set -eo pipefail
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+$CLICKHOUSE_CLIENT <<EOF
 DROP TABLE IF EXISTS view1;
 DROP TABLE IF EXISTS table1;
 CREATE TABLE table1 (number UInt64) ENGINE=MergeTree ORDER BY number SETTINGS index_granularity=1;
diff --git a/tests/queries/0_stateless/02884_create_view_with_sql_security_option.sh b/tests/queries/0_stateless/02884_create_view_with_sql_security_option.sh
index dd869cd9988..cc4e76a9ed9 100755
--- a/tests/queries/0_stateless/02884_create_view_with_sql_security_option.sh
+++ b/tests/queries/0_stateless/02884_create_view_with_sql_security_option.sh
@@ -11,7 +11,7 @@ user2="user02884_2_${CLICKHOUSE_DATABASE}_$RANDOM"
 user3="user02884_3_${CLICKHOUSE_DATABASE}_$RANDOM"
 db=${CLICKHOUSE_DATABASE}
 
-${CLICKHOUSE_CLIENT} --multiquery <<EOF
+${CLICKHOUSE_CLIENT} <<EOF
 CREATE TABLE $db.test_table (s String) ENGINE = MergeTree ORDER BY s;
 
 DROP USER IF EXISTS $user1, $user2, $user3;
@@ -20,7 +20,7 @@ GRANT SELECT ON $db.* TO $user1;
 EOF
 
 echo "===== StorageView ====="
-${CLICKHOUSE_CLIENT} --multiquery <<EOF
+${CLICKHOUSE_CLIENT} <<EOF
 CREATE VIEW $db.test_view_1 (s String)
 AS SELECT * FROM $db.test_table;
 
@@ -63,7 +63,7 @@ EOF
 (( $(${CLICKHOUSE_CLIENT} --query "SHOW TABLE $db.test_view_5" 2>&1 | grep -c "INVOKER") >= 1 )) && echo "OK" || echo "UNEXPECTED"
 (( $(${CLICKHOUSE_CLIENT} --query "SHOW TABLE $db.test_view_2" 2>&1 | grep -c "DEFINER = $user1") >= 1 )) && echo "OK" || echo "UNEXPECTED"
 
-${CLICKHOUSE_CLIENT} --multiquery <<EOF
+${CLICKHOUSE_CLIENT} <<EOF
 GRANT SELECT ON $db.test_view_1 TO $user2;
 GRANT SELECT ON $db.test_view_2 TO $user2;
 GRANT SELECT ON $db.test_view_3 TO $user2;
@@ -159,7 +159,7 @@ ${CLICKHOUSE_CLIENT} --query "REVOKE SELECT ON $db.test_table FROM $user1"
 (( $(${CLICKHOUSE_CLIENT} --user $user2 --query "SELECT * FROM $db.test_mv_4" 2>&1 | grep -c "Not enough privileges") >= 1 )) && echo "OK" || echo "UNEXPECTED"
 (( $(${CLICKHOUSE_CLIENT} --query "INSERT INTO $db.test_table VALUES ('foo'), ('bar');" 2>&1 | grep -c "Not enough privileges") >= 1 )) && echo "OK" || echo "UNEXPECTED"
 
-${CLICKHOUSE_CLIENT} --multiquery <<EOF
+${CLICKHOUSE_CLIENT} <<EOF
 CREATE TABLE $db.source
 (
     a UInt64
@@ -232,7 +232,7 @@ ${CLICKHOUSE_CLIENT} --user $user1 --query "
 ${CLICKHOUSE_CLIENT} --query "GRANT SET DEFINER ON $user2 TO $user1"
 
 echo "===== TestRowPolicy ====="
-${CLICKHOUSE_CLIENT} --multiquery <<EOF
+${CLICKHOUSE_CLIENT} <<EOF
 CREATE TABLE $db.test_row_t (x Int32, y Int32) ENGINE = MergeTree ORDER BY x;
 
 CREATE VIEW $db.test_view_row_1 DEFINER = $user1 SQL SECURITY DEFINER AS SELECT x, y AS z FROM $db.test_row_t;
@@ -246,7 +246,7 @@ EOF
 
 ${CLICKHOUSE_CLIENT} --user $user2 --query "SELECT * FROM $db.test_view_row_1"
 
-${CLICKHOUSE_CLIENT} --multiquery <<EOF
+${CLICKHOUSE_CLIENT} <<EOF
 CREATE TABLE $db.test_row_t2 (x Int32, y Int32) ENGINE = MergeTree ORDER BY x;
 
 CREATE VIEW $db.test_mv_row_2 DEFINER = $user1 SQL SECURITY DEFINER AS SELECT x, y AS z FROM $db.test_row_t2;
@@ -262,7 +262,7 @@ ${CLICKHOUSE_CLIENT} --user $user2 --query "SELECT * FROM $db.test_mv_row_2"
 
 echo "===== TestInsertChain ====="
 
-${CLICKHOUSE_CLIENT} --multiquery <<EOF
+${CLICKHOUSE_CLIENT} <<EOF
 CREATE TABLE $db.session_events(
     clientId UUID,
     sessionId UUID,
@@ -302,7 +302,7 @@ ${CLICKHOUSE_CLIENT} --user $user3 --query "SELECT count(*) FROM session_events"
 ${CLICKHOUSE_CLIENT} --query "SELECT count(*) FROM materialized_events"
 
 echo "===== TestOnCluster ====="
-${CLICKHOUSE_CLIENT} --multiquery <<EOF
+${CLICKHOUSE_CLIENT} <<EOF
 
 CREATE TABLE $db.test_cluster ON CLUSTER test_shard_localhost (a String) Engine = MergeTree() ORDER BY a FORMAT Null;
 CREATE TABLE $db.test_cluster_2 ON CLUSTER test_shard_localhost (a String) Engine = MergeTree() ORDER BY a FORMAT Null;
diff --git a/tests/queries/0_stateless/02885_async_insert_access_check_for_defaults.sh b/tests/queries/0_stateless/02885_async_insert_access_check_for_defaults.sh
index b2525e67d4a..72346e0cb59 100755
--- a/tests/queries/0_stateless/02885_async_insert_access_check_for_defaults.sh
+++ b/tests/queries/0_stateless/02885_async_insert_access_check_for_defaults.sh
@@ -8,7 +8,7 @@ restricted_user=${CLICKHOUSE_DATABASE}_restricted_user_$RANDOM$RANDOM
 # The 'restricted_user' will not have access to the dictionary 'dict',
 # so they shouldn't be able to insert to a table with DEFAULT dictGet(dict, ...)
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+$CLICKHOUSE_CLIENT <<EOF
 DROP USER IF EXISTS ${restricted_user};
 DROP TABLE IF EXISTS table_with_default;
 DROP DICTIONARY IF EXISTS dict;
@@ -50,7 +50,7 @@ $CLICKHOUSE_CLIENT --user "${restricted_user}" --query "INSERT INTO table_with_d
 $CLICKHOUSE_CLIENT --user "${restricted_user}" --async_insert=1 --query "INSERT INTO table_with_default (key) VALUES (6)"
 $CLICKHOUSE_CLIENT --query "SELECT * FROM table_with_default WHERE key IN [5, 6] ORDER BY key"
 
-$CLICKHOUSE_CLIENT --multiquery <<EOF
+$CLICKHOUSE_CLIENT <<EOF
 DROP USER ${restricted_user};
 DROP TABLE table_with_default;
 DROP DICTIONARY dict;
diff --git a/tests/queries/0_stateless/02900_clickhouse_local_drop_current_database.sh b/tests/queries/0_stateless/02900_clickhouse_local_drop_current_database.sh
index 3250c70a268..7a52ccc3fd5 100755
--- a/tests/queries/0_stateless/02900_clickhouse_local_drop_current_database.sh
+++ b/tests/queries/0_stateless/02900_clickhouse_local_drop_current_database.sh
@@ -4,7 +4,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-${CLICKHOUSE_LOCAL} --echo --multiquery "
+${CLICKHOUSE_LOCAL} --echo "
     CREATE DATABASE foo;
     USE foo;
     SELECT 1;
diff --git a/tests/queries/0_stateless/02956_clickhouse_local_system_parts.sh b/tests/queries/0_stateless/02956_clickhouse_local_system_parts.sh
index dac0cc2b865..4f49adb26d5 100755
--- a/tests/queries/0_stateless/02956_clickhouse_local_system_parts.sh
+++ b/tests/queries/0_stateless/02956_clickhouse_local_system_parts.sh
@@ -5,7 +5,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-$CLICKHOUSE_LOCAL --multiquery "
+$CLICKHOUSE_LOCAL "
     CREATE TABLE test (x UInt8) ENGINE = MergeTree ORDER BY ();
     INSERT INTO test SELECT 1;
 
diff --git a/tests/queries/0_stateless/02973_backup_of_in_memory_compressed.sh b/tests/queries/0_stateless/02973_backup_of_in_memory_compressed.sh
index b212e42061f..2b92c2865ad 100755
--- a/tests/queries/0_stateless/02973_backup_of_in_memory_compressed.sh
+++ b/tests/queries/0_stateless/02973_backup_of_in_memory_compressed.sh
@@ -6,26 +6,26 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --multiquery "
+$CLICKHOUSE_CLIENT "
 DROP TABLE IF EXISTS test;
 CREATE TABLE test (x String) ENGINE = Memory SETTINGS compress = 1;
 INSERT INTO test SELECT 'Hello, world' FROM numbers(1000000);
 "
 
-$CLICKHOUSE_CLIENT --multiquery "
+$CLICKHOUSE_CLIENT "
 BACKUP TABLE test TO File('test.zip');
 " --format Null
 
-$CLICKHOUSE_CLIENT --multiquery "
+$CLICKHOUSE_CLIENT "
 TRUNCATE TABLE test;
 SELECT count() FROM test;
 "
 
-$CLICKHOUSE_CLIENT --multiquery "
+$CLICKHOUSE_CLIENT "
 RESTORE TABLE test FROM File('test.zip');
 " --format Null
 
-$CLICKHOUSE_CLIENT --multiquery "
+$CLICKHOUSE_CLIENT "
 SELECT count(), min(x), max(x) FROM test;
 DROP TABLE test;
 "
diff --git a/tests/queries/0_stateless/02973_parse_crlf_with_tsv_files.sh b/tests/queries/0_stateless/02973_parse_crlf_with_tsv_files.sh
index 6edac86be5b..9608925d087 100755
--- a/tests/queries/0_stateless/02973_parse_crlf_with_tsv_files.sh
+++ b/tests/queries/0_stateless/02973_parse_crlf_with_tsv_files.sh
@@ -17,7 +17,7 @@ echo -ne "Akiba_Hebrew_Academy\t2017-08-01\t241\r\nAegithina_tiphia\t2018-02-01\
 
 echo -e "<-- Read UNIX endings -->\n"
 $CLICKHOUSE_CLIENT --query "SELECT * FROM file(${UNIX_ENDINGS}, 'TabSeparated', 'SearchTerm String, Date Date, Hits UInt32');" 
-$CLICKHOUSE_CLIENT --multiquery --query "SELECT * FROM file(${DOS_ENDINGS}, 'TabSeparated', 'SearchTerm String, Date Date, Hits UInt32'); --{serverError 117}" 
+$CLICKHOUSE_CLIENT --query "SELECT * FROM file(${DOS_ENDINGS}, 'TabSeparated', 'SearchTerm String, Date Date, Hits UInt32'); --{serverError 117}" 
 
 echo -e "\n<-- Read DOS endings with setting input_format_tsv_crlf_end_of_line=1 -->\n"
 $CLICKHOUSE_CLIENT --query "SELECT * FROM file(${DOS_ENDINGS}, 'TabSeparated', 'SearchTerm String, Date Date, Hits UInt32') SETTINGS input_format_tsv_crlf_end_of_line = 1;"
diff --git a/tests/queries/0_stateless/02995_forget_partition.sh b/tests/queries/0_stateless/02995_forget_partition.sh
index c22f5829130..6fa0b96e90d 100755
--- a/tests/queries/0_stateless/02995_forget_partition.sh
+++ b/tests/queries/0_stateless/02995_forget_partition.sh
@@ -6,7 +6,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CUR_DIR"/../shell_config.sh
 
 
-${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
+${CLICKHOUSE_CLIENT} --multiline -q """
 drop table if exists forget_partition;
 
 create table forget_partition
@@ -31,7 +31,7 @@ alter table forget_partition drop partition '20240102';
 # DROP PARTITION do not wait for a part to be removed from memory due to possible concurrent SELECTs, so we have to do wait manually here
 while [[ $(${CLICKHOUSE_CLIENT} -q "select count() from system.parts where database=currentDatabase() and table='forget_partition' and partition IN ('20240101', '20240102')") != 0 ]]; do sleep 1; done
 
-${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
+${CLICKHOUSE_CLIENT} --multiline -q """
 set allow_unrestricted_reads_from_keeper=1;
 
 select '---before---';
diff --git a/tests/queries/0_stateless/02995_index_1.sh b/tests/queries/0_stateless/02995_index_1.sh
index a5f1b30c2e8..128697fd0fe 100755
--- a/tests/queries/0_stateless/02995_index_1.sh
+++ b/tests/queries/0_stateless/02995_index_1.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --multiquery "
+${CLICKHOUSE_CLIENT} "
 
 DROP TABLE IF EXISTS test;
 CREATE TABLE test (a String, b String, c String) ENGINE = MergeTree ORDER BY (a, b, c) SETTINGS index_granularity = 11;
@@ -39,6 +39,6 @@ WHERE a >= (round(pow(sipHash64(1, try), 1 / (3 + sipHash64(2, try) % 8))) AS a1
   AND c <= (c1 + round(pow(sipHash64(11, try), 1 / (3 + sipHash64(12, try) % 8))))::String
 HAVING count() > 0;
 "
-done | ${CLICKHOUSE_CLIENT} --multiquery
+done | ${CLICKHOUSE_CLIENT} 
 
-${CLICKHOUSE_CLIENT} --multiquery "DROP TABLE test"
+${CLICKHOUSE_CLIENT} "DROP TABLE test"
diff --git a/tests/queries/0_stateless/02995_index_10.sh b/tests/queries/0_stateless/02995_index_10.sh
index d72c7c72705..c15ba00fd05 100755
--- a/tests/queries/0_stateless/02995_index_10.sh
+++ b/tests/queries/0_stateless/02995_index_10.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --multiquery "
+${CLICKHOUSE_CLIENT} "
 
 DROP TABLE IF EXISTS test;
 CREATE TABLE test (a String, b String, c String) ENGINE = MergeTree ORDER BY (a, b, c) SETTINGS index_granularity = 11;
@@ -39,6 +39,6 @@ WHERE a >= (round(pow(sipHash64(1, try), 1 / (3 + sipHash64(2, try) % 8))) AS a1
   AND c <= (c1 + round(pow(sipHash64(11, try), 1 / (3 + sipHash64(12, try) % 8))))::String
 HAVING count() > 0;
 "
-done | ${CLICKHOUSE_CLIENT} --multiquery
+done | ${CLICKHOUSE_CLIENT} 
 
-${CLICKHOUSE_CLIENT} --multiquery "DROP TABLE test"
+${CLICKHOUSE_CLIENT} "DROP TABLE test"
diff --git a/tests/queries/0_stateless/02995_index_2.sh b/tests/queries/0_stateless/02995_index_2.sh
index e7451c7ee4b..a32f5c511f8 100755
--- a/tests/queries/0_stateless/02995_index_2.sh
+++ b/tests/queries/0_stateless/02995_index_2.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --multiquery "
+${CLICKHOUSE_CLIENT} "
 
 DROP TABLE IF EXISTS test;
 CREATE TABLE test (a String, b String, c String) ENGINE = MergeTree ORDER BY (a, b, c) SETTINGS index_granularity = 11;
@@ -39,6 +39,6 @@ WHERE a >= (round(pow(sipHash64(1, try), 1 / (3 + sipHash64(2, try) % 8))) AS a1
   AND c <= (c1 + round(pow(sipHash64(11, try), 1 / (3 + sipHash64(12, try) % 8))))::String
 HAVING count() > 0;
 "
-done | ${CLICKHOUSE_CLIENT} --multiquery
+done | ${CLICKHOUSE_CLIENT}
 
-${CLICKHOUSE_CLIENT} --multiquery "DROP TABLE test"
+${CLICKHOUSE_CLIENT} "DROP TABLE test"
diff --git a/tests/queries/0_stateless/02995_index_3.sh b/tests/queries/0_stateless/02995_index_3.sh
index 506429e2696..9cc937391fc 100755
--- a/tests/queries/0_stateless/02995_index_3.sh
+++ b/tests/queries/0_stateless/02995_index_3.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --multiquery "
+${CLICKHOUSE_CLIENT} "
 
 DROP TABLE IF EXISTS test;
 CREATE TABLE test (a String, b String, c String) ENGINE = MergeTree ORDER BY (a, b, c) SETTINGS index_granularity = 11;
@@ -39,6 +39,6 @@ WHERE a >= (round(pow(sipHash64(1, try), 1 / (3 + sipHash64(2, try) % 8))) AS a1
   AND c <= (c1 + round(pow(sipHash64(11, try), 1 / (3 + sipHash64(12, try) % 8))))::String
 HAVING count() > 0;
 "
-done | ${CLICKHOUSE_CLIENT} --multiquery
+done | ${CLICKHOUSE_CLIENT} 
 
-${CLICKHOUSE_CLIENT} --multiquery "DROP TABLE test"
+${CLICKHOUSE_CLIENT} "DROP TABLE test"
diff --git a/tests/queries/0_stateless/02995_index_4.sh b/tests/queries/0_stateless/02995_index_4.sh
index 1a0458728f9..e450997e48b 100755
--- a/tests/queries/0_stateless/02995_index_4.sh
+++ b/tests/queries/0_stateless/02995_index_4.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --multiquery "
+${CLICKHOUSE_CLIENT} "
 
 DROP TABLE IF EXISTS test;
 CREATE TABLE test (a String, b String, c String) ENGINE = MergeTree ORDER BY (a, b, c) SETTINGS index_granularity = 11;
@@ -39,6 +39,6 @@ WHERE a >= (round(pow(sipHash64(1, try), 1 / (3 + sipHash64(2, try) % 8))) AS a1
   AND c <= (c1 + round(pow(sipHash64(11, try), 1 / (3 + sipHash64(12, try) % 8))))::String
 HAVING count() > 0;
 "
-done | ${CLICKHOUSE_CLIENT} --multiquery
+done | ${CLICKHOUSE_CLIENT} 
 
-${CLICKHOUSE_CLIENT} --multiquery "DROP TABLE test"
+${CLICKHOUSE_CLIENT} "DROP TABLE test"
diff --git a/tests/queries/0_stateless/02995_index_5.sh b/tests/queries/0_stateless/02995_index_5.sh
index 60c12a8146d..80f75a532e3 100755
--- a/tests/queries/0_stateless/02995_index_5.sh
+++ b/tests/queries/0_stateless/02995_index_5.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --multiquery "
+${CLICKHOUSE_CLIENT} "
 
 DROP TABLE IF EXISTS test;
 CREATE TABLE test (a String, b String, c String) ENGINE = MergeTree ORDER BY (a, b, c) SETTINGS index_granularity = 11;
@@ -39,6 +39,6 @@ WHERE a >= (round(pow(sipHash64(1, try), 1 / (3 + sipHash64(2, try) % 8))) AS a1
   AND c <= (c1 + round(pow(sipHash64(11, try), 1 / (3 + sipHash64(12, try) % 8))))::String
 HAVING count() > 0;
 "
-done | ${CLICKHOUSE_CLIENT} --multiquery
+done | ${CLICKHOUSE_CLIENT} 
 
-${CLICKHOUSE_CLIENT} --multiquery "DROP TABLE test"
+${CLICKHOUSE_CLIENT} "DROP TABLE test"
diff --git a/tests/queries/0_stateless/02995_index_6.sh b/tests/queries/0_stateless/02995_index_6.sh
index 4936f73f36b..e90387c7c0c 100755
--- a/tests/queries/0_stateless/02995_index_6.sh
+++ b/tests/queries/0_stateless/02995_index_6.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --multiquery "
+${CLICKHOUSE_CLIENT} "
 
 DROP TABLE IF EXISTS test;
 CREATE TABLE test (a String, b String, c String) ENGINE = MergeTree ORDER BY (a, b, c) SETTINGS index_granularity = 11;
@@ -39,6 +39,6 @@ WHERE a >= (round(pow(sipHash64(1, try), 1 / (3 + sipHash64(2, try) % 8))) AS a1
   AND c <= (c1 + round(pow(sipHash64(11, try), 1 / (3 + sipHash64(12, try) % 8))))::String
 HAVING count() > 0;
 "
-done | ${CLICKHOUSE_CLIENT} --multiquery
+done | ${CLICKHOUSE_CLIENT}
 
-${CLICKHOUSE_CLIENT} --multiquery "DROP TABLE test"
+${CLICKHOUSE_CLIENT} "DROP TABLE test"
diff --git a/tests/queries/0_stateless/02995_index_7.sh b/tests/queries/0_stateless/02995_index_7.sh
index 26be310abce..a5fdd98b2f8 100755
--- a/tests/queries/0_stateless/02995_index_7.sh
+++ b/tests/queries/0_stateless/02995_index_7.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --multiquery "
+${CLICKHOUSE_CLIENT} "
 
 DROP TABLE IF EXISTS test;
 CREATE TABLE test (a String, b String, c String) ENGINE = MergeTree ORDER BY (a, b, c) SETTINGS index_granularity = 11;
@@ -39,6 +39,6 @@ WHERE a >= (round(pow(sipHash64(1, try), 1 / (3 + sipHash64(2, try) % 8))) AS a1
   AND c <= (c1 + round(pow(sipHash64(11, try), 1 / (3 + sipHash64(12, try) % 8))))::String
 HAVING count() > 0;
 "
-done | ${CLICKHOUSE_CLIENT} --multiquery
+done | ${CLICKHOUSE_CLIENT} 
 
-${CLICKHOUSE_CLIENT} --multiquery "DROP TABLE test"
+${CLICKHOUSE_CLIENT} "DROP TABLE test"
diff --git a/tests/queries/0_stateless/02995_index_8.sh b/tests/queries/0_stateless/02995_index_8.sh
index 8c2620b59fd..adb835aedca 100755
--- a/tests/queries/0_stateless/02995_index_8.sh
+++ b/tests/queries/0_stateless/02995_index_8.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --multiquery "
+${CLICKHOUSE_CLIENT} "
 
 DROP TABLE IF EXISTS test;
 CREATE TABLE test (a String, b String, c String) ENGINE = MergeTree ORDER BY (a, b, c) SETTINGS index_granularity = 11;
@@ -39,6 +39,6 @@ WHERE a >= (round(pow(sipHash64(1, try), 1 / (3 + sipHash64(2, try) % 8))) AS a1
   AND c <= (c1 + round(pow(sipHash64(11, try), 1 / (3 + sipHash64(12, try) % 8))))::String
 HAVING count() > 0;
 "
-done | ${CLICKHOUSE_CLIENT} --multiquery
+done | ${CLICKHOUSE_CLIENT} 
 
-${CLICKHOUSE_CLIENT} --multiquery "DROP TABLE test"
+${CLICKHOUSE_CLIENT} "DROP TABLE test"
diff --git a/tests/queries/0_stateless/02995_index_9.sh b/tests/queries/0_stateless/02995_index_9.sh
index 76160c62aaa..4b78777cd2a 100755
--- a/tests/queries/0_stateless/02995_index_9.sh
+++ b/tests/queries/0_stateless/02995_index_9.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --multiquery "
+${CLICKHOUSE_CLIENT} "
 
 DROP TABLE IF EXISTS test;
 CREATE TABLE test (a String, b String, c String) ENGINE = MergeTree ORDER BY (a, b, c) SETTINGS index_granularity = 11;
@@ -39,6 +39,6 @@ WHERE a >= (round(pow(sipHash64(1, try), 1 / (3 + sipHash64(2, try) % 8))) AS a1
   AND c <= (c1 + round(pow(sipHash64(11, try), 1 / (3 + sipHash64(12, try) % 8))))::String
 HAVING count() > 0;
 "
-done | ${CLICKHOUSE_CLIENT} --multiquery
+done | ${CLICKHOUSE_CLIENT} 
 
-${CLICKHOUSE_CLIENT} --multiquery "DROP TABLE test"
+${CLICKHOUSE_CLIENT} "DROP TABLE test"
diff --git a/tests/queries/0_stateless/02998_native_parquet_reader.sh b/tests/queries/0_stateless/02998_native_parquet_reader.sh
index d6369c4921b..95b659815ed 100755
--- a/tests/queries/0_stateless/02998_native_parquet_reader.sh
+++ b/tests/queries/0_stateless/02998_native_parquet_reader.sh
@@ -208,4 +208,4 @@ CH_SCHEMA="\
 QUERY="SELECT * from file('$PAR_PATH', 'Parquet', '$CH_SCHEMA')"
 
 # there may be more than on group in parquet files, unstable results may generated by multithreads
-$CLICKHOUSE_LOCAL --multiquery --max_threads 1 --max_parsing_threads 1 --input_format_parquet_use_native_reader true --query "$QUERY"
+$CLICKHOUSE_LOCAL --max_threads 1 --max_parsing_threads 1 --input_format_parquet_use_native_reader true --query "$QUERY"
diff --git a/tests/queries/0_stateless/03001_backup_matview_after_modify_query.sh b/tests/queries/0_stateless/03001_backup_matview_after_modify_query.sh
index f857358a5ea..8c6aa70f14c 100755
--- a/tests/queries/0_stateless/03001_backup_matview_after_modify_query.sh
+++ b/tests/queries/0_stateless/03001_backup_matview_after_modify_query.sh
@@ -9,7 +9,7 @@ db="$CLICKHOUSE_DATABASE"
 db_2="${db}_2"
 backup_name="${db}_backup"
 
-${CLICKHOUSE_CLIENT} --multiquery "
+${CLICKHOUSE_CLIENT} "
 DROP TABLE IF EXISTS src;
 DROP TABLE IF EXISTS mv;
 CREATE TABLE src(Timestamp DateTime64(9), c1 String, c2 String) ENGINE=MergeTree ORDER BY Timestamp;
diff --git a/tests/queries/0_stateless/03001_matview_columns_after_modify_query.sh b/tests/queries/0_stateless/03001_matview_columns_after_modify_query.sh
index 2ec5832fac6..96cbd391a44 100755
--- a/tests/queries/0_stateless/03001_matview_columns_after_modify_query.sh
+++ b/tests/queries/0_stateless/03001_matview_columns_after_modify_query.sh
@@ -4,7 +4,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --multiquery "
+${CLICKHOUSE_CLIENT} "
 DROP TABLE IF EXISTS src;
 DROP TABLE IF EXISTS mv;
 CREATE TABLE src(Timestamp DateTime64(9), c1 String, c2 String) ENGINE=MergeTree ORDER BY Timestamp;
diff --git a/tests/queries/0_stateless/03006_correct_revoke_for_partial_rights.sh b/tests/queries/0_stateless/03006_correct_revoke_for_partial_rights.sh
index 8c79dfdbafc..312fb03668c 100755
--- a/tests/queries/0_stateless/03006_correct_revoke_for_partial_rights.sh
+++ b/tests/queries/0_stateless/03006_correct_revoke_for_partial_rights.sh
@@ -8,7 +8,7 @@ db=${CLICKHOUSE_DATABASE}
 user1="user1_03006_${db}_$RANDOM"
 user2="user2_03006_${db}_$RANDOM"
 
-${CLICKHOUSE_CLIENT} --multiquery <<EOF
+${CLICKHOUSE_CLIENT} <<EOF
 DROP DATABASE IF EXISTS $db;
 CREATE DATABASE $db;
 CREATE USER $user1, $user2;
diff --git a/tests/queries/0_stateless/03147_system_columns_access_checks.sh b/tests/queries/0_stateless/03147_system_columns_access_checks.sh
index b027ea28504..9887c29cff7 100755
--- a/tests/queries/0_stateless/03147_system_columns_access_checks.sh
+++ b/tests/queries/0_stateless/03147_system_columns_access_checks.sh
@@ -18,7 +18,7 @@ seq 1 $NUM_TABLES | xargs -P "${THREADS}" -I{} bash -c "
 "
 echo
 
-$CLICKHOUSE_CLIENT --multiquery "
+$CLICKHOUSE_CLIENT "
 DROP USER IF EXISTS test_03147;
 CREATE USER test_03147;
 GRANT SELECT (end) ON ${CLICKHOUSE_DATABASE}.test1 TO test_03147;
@@ -31,6 +31,6 @@ GRANT SELECT (end) ON ${CLICKHOUSE_DATABASE}.test1 TO test_03147;
 # The test could succeed even on the previous version, but it will show up as being too slow.
 $CLICKHOUSE_CLIENT --user test_03147 --query "SELECT name FROM system.columns WHERE database = currentDatabase()"
 
-$CLICKHOUSE_CLIENT --multiquery "
+$CLICKHOUSE_CLIENT "
 DROP USER test_03147;
 "
diff --git a/tests/queries/0_stateless/03201_local_named_collections.sh b/tests/queries/0_stateless/03201_local_named_collections.sh
index 809b4b52f41..86135d027f6 100755
--- a/tests/queries/0_stateless/03201_local_named_collections.sh
+++ b/tests/queries/0_stateless/03201_local_named_collections.sh
@@ -4,17 +4,17 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --multiquery "
+${CLICKHOUSE_CLIENT} "
 DROP TABLE IF EXISTS test;
 CREATE TABLE test (s String) ORDER BY ();
 INSERT INTO test VALUES ('Hello, world!');
 "
 
-${CLICKHOUSE_LOCAL} --multiquery "
+${CLICKHOUSE_LOCAL} "
 CREATE NAMED COLLECTION mydb AS host = '${CLICKHOUSE_HOST}', port = ${CLICKHOUSE_PORT_TCP}, user = 'default', password = '', db = '${CLICKHOUSE_DATABASE}';
 SELECT * FROM remote(mydb, table = 'test');
 " 2>&1 | grep --text -F -v "ASan doesn't fully support makecontext/swapcontext functions"
 
-${CLICKHOUSE_CLIENT} --multiquery "
+${CLICKHOUSE_CLIENT} "
 DROP TABLE test;
 "
diff --git a/tests/queries/0_stateless/03212_thousand_exceptions.sh b/tests/queries/0_stateless/03212_thousand_exceptions.sh
index 0a6abf35c10..1237cbf537f 100755
--- a/tests/queries/0_stateless/03212_thousand_exceptions.sh
+++ b/tests/queries/0_stateless/03212_thousand_exceptions.sh
@@ -6,4 +6,4 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 # This should not be too slow, even under sanitizers.
-yes "SELECT throwIf(1); SELECT '.' FORMAT Values;" | head -n 1000 | $CLICKHOUSE_CLIENT --multiquery --ignore-error 2>/dev/null
+yes "SELECT throwIf(1); SELECT '.' FORMAT Values;" | head -n 1000 | $CLICKHOUSE_CLIENT --ignore-error 2>/dev/null

From eb129b539fce2a407182d892ce3bd00f782a5833 Mon Sep 17 00:00:00 2001
From: Antonio Andelic <antonio@clickhouse.com>
Date: Tue, 30 Jul 2024 13:46:27 +0200
Subject: [PATCH 099/139] Add tests

---
 src/Storages/StorageKeeperMap.cpp             | 135 +++++++++++++-----
 src/Storages/StorageKeeperMap.h               |   3 +-
 .../test_keeper_map_retries/__init__.py       |   0
 .../configs/enable_keeper_map.xml             |   3 +
 .../configs/fault_injection.xml               |   6 +
 .../test_keeper_map_retries/test.py           |  78 ++++++++++
 .../02911_backup_restore_keeper_map.sh        |  15 +-
 7 files changed, 194 insertions(+), 46 deletions(-)
 create mode 100644 tests/integration/test_keeper_map_retries/__init__.py
 create mode 100644 tests/integration/test_keeper_map_retries/configs/enable_keeper_map.xml
 create mode 100644 tests/integration/test_keeper_map_retries/configs/fault_injection.xml
 create mode 100644 tests/integration/test_keeper_map_retries/test.py

diff --git a/src/Storages/StorageKeeperMap.cpp b/src/Storages/StorageKeeperMap.cpp
index 5534bb7f346..09c21ae28f5 100644
--- a/src/Storages/StorageKeeperMap.cpp
+++ b/src/Storages/StorageKeeperMap.cpp
@@ -183,7 +183,7 @@ public:
                 settings.insert_keeper_retry_max_backoff_ms},
             context->getProcessListElement()};
 
-        retries_ctl.retryLoop([&]()
+        zk_retry.retryLoop([&]()
         {
             auto zookeeper = storage.getClient();
             auto keys_limit = storage.keysLimit();
@@ -205,12 +205,12 @@ public:
             for (const auto & [key, _] : new_values)
                 key_paths.push_back(storage.fullPathForKey(key));
 
-            zkutil::ZooKeeper::MultiExistsResponse results;
+            zkutil::ZooKeeper::MultiTryGetResponse results;
 
             if constexpr (!for_update)
             {
                 if (!strict)
-                    results = zookeeper->exists(key_paths);
+                    results = zookeeper->tryGet(key_paths);
             }
 
             Coordination::Requests requests;
@@ -231,7 +231,8 @@ public:
                 {
                     if (!strict && results[i].error == Coordination::Error::ZOK)
                     {
-                        requests.push_back(zkutil::makeSetRequest(key_paths[i], new_values[key], -1));
+                        if (results[i].data != new_values[key])
+                            requests.push_back(zkutil::makeSetRequest(key_paths[i], new_values[key], -1));
                     }
                     else
                     {
@@ -241,6 +242,9 @@ public:
                 }
             }
 
+            if (requests.empty())
+                return;
+
             if (new_keys_num != 0)
             {
                 auto will_be = current_keys_num + new_keys_num;
@@ -259,7 +263,7 @@ public:
 };
 
 template <typename KeyContainer>
-class StorageKeeperMapSource : public ISource
+class StorageKeeperMapSource : public ISource, WithContext
 {
     const StorageKeeperMap & storage;
     size_t max_block_size;
@@ -290,8 +294,15 @@ public:
         KeyContainerPtr container_,
         KeyContainerIter begin_,
         KeyContainerIter end_,
-        bool with_version_column_)
-        : ISource(getHeader(header, with_version_column_)), storage(storage_), max_block_size(max_block_size_), container(std::move(container_)), it(begin_), end(end_)
+        bool with_version_column_,
+        ContextPtr context_)
+        : ISource(getHeader(header, with_version_column_))
+        , WithContext(std::move(context_))
+        , storage(storage_)
+        , max_block_size(max_block_size_)
+        , container(std::move(container_))
+        , it(begin_)
+        , end(end_)
         , with_version_column(with_version_column_)
     {
     }
@@ -316,12 +327,12 @@ public:
             for (auto & raw_key : raw_keys)
                 raw_key = base64Encode(raw_key, /* url_encoding */ true);
 
-            return storage.getBySerializedKeys(raw_keys, nullptr, with_version_column);
+            return storage.getBySerializedKeys(raw_keys, nullptr, with_version_column, getContext());
         }
         else
         {
             size_t elem_num = std::min(max_block_size, static_cast<size_t>(end - it));
-            auto chunk = storage.getBySerializedKeys(std::span{it, it + elem_num}, nullptr, with_version_column);
+            auto chunk = storage.getBySerializedKeys(std::span{it, it + elem_num}, nullptr, with_version_column, getContext());
             it += elem_num;
             return chunk;
         }
@@ -553,14 +564,31 @@ Pipe StorageKeeperMap::read(
 
             using KeyContainer = typename KeyContainerPtr::element_type;
             pipes.emplace_back(std::make_shared<StorageKeeperMapSource<KeyContainer>>(
-                *this, sample_block, max_block_size, keys, keys->begin() + begin, keys->begin() + end, with_version_column));
+                *this, sample_block, max_block_size, keys, keys->begin() + begin, keys->begin() + end, with_version_column, context_));
         }
         return Pipe::unitePipes(std::move(pipes));
     };
 
-    auto client = getClient();
     if (all_scan)
-        return process_keys(std::make_shared<std::vector<std::string>>(client->getChildren(zk_data_path)));
+    {
+        const auto & settings = context_->getSettingsRef();
+        ZooKeeperRetriesControl zk_retry{
+            getName(),
+            getLogger(getName()),
+            ZooKeeperRetriesInfo{
+                settings.keeper_max_retries,
+                settings.keeper_retry_initial_backoff_ms,
+                settings.keeper_retry_max_backoff_ms},
+            context_->getProcessListElement()};
+
+        std::vector<std::string> children;
+        zk_retry.retryLoop([&]
+        {
+            auto client = getClient();
+            children = client->getChildren(zk_data_path);
+        });
+        return process_keys(std::make_shared<std::vector<std::string>>(std::move(children)));
+    }
 
     return process_keys(std::move(filtered_keys));
 }
@@ -571,11 +599,24 @@ SinkToStoragePtr StorageKeeperMap::write(const ASTPtr & /*query*/, const Storage
     return std::make_shared<StorageKeeperMapSink>(*this, metadata_snapshot->getSampleBlock(), local_context);
 }
 
-void StorageKeeperMap::truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr, TableExclusiveLockHolder &)
+void StorageKeeperMap::truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr local_context, TableExclusiveLockHolder &)
 {
     checkTable<true>();
-    auto client = getClient();
-    client->tryRemoveChildrenRecursive(zk_data_path, true);
+    const auto & settings = local_context->getSettingsRef();
+    ZooKeeperRetriesControl zk_retry{
+        getName(),
+        getLogger(getName()),
+        ZooKeeperRetriesInfo{
+            settings.keeper_max_retries,
+            settings.keeper_retry_initial_backoff_ms,
+            settings.keeper_retry_max_backoff_ms},
+        local_context->getProcessListElement()};
+
+    zk_retry.retryLoop([&]
+    {
+        auto client = getClient();
+        client->tryRemoveChildrenRecursive(zk_data_path, true);
+    });
 }
 
 bool StorageKeeperMap::dropTable(zkutil::ZooKeeperPtr zookeeper, const zkutil::EphemeralNodeHolder::Ptr & metadata_drop_lock)
@@ -1064,10 +1105,11 @@ Chunk StorageKeeperMap::getByKeys(const ColumnsWithTypeAndName & keys, PaddedPOD
     if (raw_keys.size() != keys[0].column->size())
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Assertion failed: {} != {}", raw_keys.size(), keys[0].column->size());
 
-    return getBySerializedKeys(raw_keys, &null_map, /* version_column */ false);
+    return getBySerializedKeys(raw_keys, &null_map, /* version_column */ false, getContext());
 }
 
-Chunk StorageKeeperMap::getBySerializedKeys(const std::span<const std::string> keys, PaddedPODArray<UInt8> * null_map, bool with_version) const
+Chunk StorageKeeperMap::getBySerializedKeys(
+    const std::span<const std::string> keys, PaddedPODArray<UInt8> * null_map, bool with_version, const ContextPtr & local_context) const
 {
     Block sample_block = getInMemoryMetadataPtr()->getSampleBlock();
     MutableColumns columns = sample_block.cloneEmptyColumns();
@@ -1084,17 +1126,27 @@ Chunk StorageKeeperMap::getBySerializedKeys(const std::span<const std::string> k
         null_map->resize_fill(keys.size(), 1);
     }
 
-    auto client = getClient();
-
     Strings full_key_paths;
     full_key_paths.reserve(keys.size());
 
     for (const auto & key : keys)
-    {
         full_key_paths.emplace_back(fullPathForKey(key));
-    }
 
-    auto values = client->tryGet(full_key_paths);
+    const auto & settings = local_context->getSettingsRef();
+    ZooKeeperRetriesControl zk_retry{
+        getName(),
+        getLogger(getName()),
+        ZooKeeperRetriesInfo{
+            settings.keeper_max_retries,
+            settings.keeper_retry_initial_backoff_ms,
+            settings.keeper_retry_max_backoff_ms},
+        local_context->getProcessListElement()};
+
+    zkutil::ZooKeeper::MultiTryGetResponse values;
+    zk_retry.retryLoop([&]{
+        auto client = getClient();
+        values = client->tryGet(full_key_paths);
+    });
 
     for (size_t i = 0; i < keys.size(); ++i)
     {
@@ -1182,16 +1234,16 @@ void StorageKeeperMap::mutate(const MutationCommands & commands, ContextPtr loca
 
     if (commands.front().type == MutationCommand::Type::DELETE)
     {
-        MutationsInterpreter::Settings settings(true);
-        settings.return_all_columns = true;
-        settings.return_mutated_rows = true;
+        MutationsInterpreter::Settings mutation_settings(true);
+        mutation_settings.return_all_columns = true;
+        mutation_settings.return_mutated_rows = true;
 
         auto interpreter = std::make_unique<MutationsInterpreter>(
             storage_ptr,
             metadata_snapshot,
             commands,
             local_context,
-            settings);
+            mutation_settings);
 
         auto pipeline = QueryPipelineBuilder::getPipeline(interpreter->execute());
         PullingPipelineExecutor executor(pipeline);
@@ -1200,8 +1252,6 @@ void StorageKeeperMap::mutate(const MutationCommands & commands, ContextPtr loca
         auto primary_key_pos = header.getPositionByName(primary_key);
         auto version_position = header.getPositionByName(std::string{version_column_name});
 
-        auto client = getClient();
-
         Block block;
         while (executor.pull(block))
         {
@@ -1229,7 +1279,23 @@ void StorageKeeperMap::mutate(const MutationCommands & commands, ContextPtr loca
             }
 
             Coordination::Responses responses;
-            auto status = client->tryMulti(delete_requests, responses, /* check_session_valid */ true);
+
+            const auto & settings = local_context->getSettingsRef();
+            ZooKeeperRetriesControl zk_retry{
+                getName(),
+                getLogger(getName()),
+                ZooKeeperRetriesInfo{
+                    settings.keeper_max_retries,
+                    settings.keeper_retry_initial_backoff_ms,
+                    settings.keeper_retry_max_backoff_ms},
+                local_context->getProcessListElement()};
+
+            Coordination::Error status;
+            zk_retry.retryLoop([&]
+            {
+                auto client = getClient();
+                status = client->tryMulti(delete_requests, responses, /* check_session_valid */ true);
+            });
 
             if (status == Coordination::Error::ZOK)
                 return;
@@ -1241,9 +1307,14 @@ void StorageKeeperMap::mutate(const MutationCommands & commands, ContextPtr loca
 
             for (const auto & delete_request : delete_requests)
             {
-                auto code = client->tryRemove(delete_request->getPath());
-                if (code != Coordination::Error::ZOK && code != Coordination::Error::ZNONODE)
-                    throw zkutil::KeeperException::fromPath(code, delete_request->getPath());
+                zk_retry.retryLoop([&]
+                {
+                    auto client = getClient();
+                    status = client->tryRemove(delete_request->getPath());
+                });
+
+                if (status != Coordination::Error::ZOK && status != Coordination::Error::ZNONODE)
+                    throw zkutil::KeeperException::fromPath(status, delete_request->getPath());
             }
         }
 
diff --git a/src/Storages/StorageKeeperMap.h b/src/Storages/StorageKeeperMap.h
index d4556792c48..cfbb35ab2fe 100644
--- a/src/Storages/StorageKeeperMap.h
+++ b/src/Storages/StorageKeeperMap.h
@@ -54,7 +54,8 @@ public:
     Names getPrimaryKey() const override { return {primary_key}; }
 
     Chunk getByKeys(const ColumnsWithTypeAndName & keys, PaddedPODArray<UInt8> & null_map, const Names &) const override;
-    Chunk getBySerializedKeys(std::span<const std::string> keys, PaddedPODArray<UInt8> * null_map, bool with_version) const;
+    Chunk getBySerializedKeys(
+        std::span<const std::string> keys, PaddedPODArray<UInt8> * null_map, bool with_version, const ContextPtr & local_context) const;
 
     Block getSampleBlock(const Names &) const override;
 
diff --git a/tests/integration/test_keeper_map_retries/__init__.py b/tests/integration/test_keeper_map_retries/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_keeper_map_retries/configs/enable_keeper_map.xml b/tests/integration/test_keeper_map_retries/configs/enable_keeper_map.xml
new file mode 100644
index 00000000000..b4cbb6a954b
--- /dev/null
+++ b/tests/integration/test_keeper_map_retries/configs/enable_keeper_map.xml
@@ -0,0 +1,3 @@
+<clickhouse>
+    <keeper_map_path_prefix>/test_keeper_map</keeper_map_path_prefix>
+</clickhouse>
diff --git a/tests/integration/test_keeper_map_retries/configs/fault_injection.xml b/tests/integration/test_keeper_map_retries/configs/fault_injection.xml
new file mode 100644
index 00000000000..145945c7c7c
--- /dev/null
+++ b/tests/integration/test_keeper_map_retries/configs/fault_injection.xml
@@ -0,0 +1,6 @@
+<clickhouse>
+    <zookeeper>
+        <send_fault_probability>0.05</send_fault_probability>
+        <recv_fault_probability>0.05</recv_fault_probability>
+    </zookeeper>
+</clickhouse>
diff --git a/tests/integration/test_keeper_map_retries/test.py b/tests/integration/test_keeper_map_retries/test.py
new file mode 100644
index 00000000000..352119147cd
--- /dev/null
+++ b/tests/integration/test_keeper_map_retries/test.py
@@ -0,0 +1,78 @@
+import pytest
+
+from helpers.cluster import ClickHouseCluster
+
+import os
+
+CONFIG_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "configs")
+
+cluster = ClickHouseCluster(__file__)
+
+node = cluster.add_instance(
+    "node",
+    main_configs=["configs/enable_keeper_map.xml"],
+    with_zookeeper=True,
+    stay_alive=True,
+)
+
+
+def start_clean_clickhouse():
+    # remove fault injection if present
+    if "fault_injection.xml" in node.exec_in_container(
+        ["bash", "-c", "ls /etc/clickhouse-server/config.d"]
+    ):
+        print("Removing fault injection")
+        node.exec_in_container(
+            ["bash", "-c", "rm /etc/clickhouse-server/config.d/fault_injection.xml"]
+        )
+        node.restart_clickhouse()
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def repeat_query(query, repeat):
+    for _ in range(repeat):
+        node.query(
+            query,
+            settings={
+                "keeper_max_retries": 20,
+                "keeper_retry_max_backoff_ms": 10000,
+            },
+        )
+
+
+def test_queries(started_cluster):
+    start_clean_clickhouse()
+
+    node.query("DROP TABLE IF EXISTS keeper_map_retries SYNC")
+    node.query(
+        "CREATE TABLE keeper_map_retries (a UInt64, b UInt64) Engine=KeeperMap('/keeper_map_retries') PRIMARY KEY a"
+    )
+
+    node.stop_clickhouse()
+    node.copy_file_to_container(
+        os.path.join(CONFIG_DIR, "fault_injection.xml"),
+        "/etc/clickhouse-server/config.d/fault_injection.xml",
+    )
+    node.start_clickhouse()
+
+    repeat_count = 10
+
+    repeat_query(
+        "INSERT INTO keeper_map_retries SELECT number, number FROM numbers(500)",
+        repeat_count,
+    )
+    repeat_query("SELECT * FROM keeper_map_retries", repeat_count)
+    repeat_query(
+        "ALTER TABLE keeper_map_retries UPDATE b = 3 WHERE a > 2", repeat_count
+    )
+    repeat_query("ALTER TABLE keeper_map_retries DELETE WHERE a > 2", repeat_count)
+    repeat_query("TRUNCATE keeper_map_retries", repeat_count)
diff --git a/tests/queries/0_stateless/02911_backup_restore_keeper_map.sh b/tests/queries/0_stateless/02911_backup_restore_keeper_map.sh
index ee070b40f6f..c04667505c3 100755
--- a/tests/queries/0_stateless/02911_backup_restore_keeper_map.sh
+++ b/tests/queries/0_stateless/02911_backup_restore_keeper_map.sh
@@ -13,20 +13,9 @@ $CLICKHOUSE_CLIENT -nm -q "
     CREATE TABLE $database_name.02911_backup_restore_keeper_map3 (key UInt64, value String) Engine=KeeperMap('/' || currentDatabase() || '/test02911_different') PRIMARY KEY key;
 "
 
-# KeeperMap table engine doesn't have internal retries for interaction with Keeper. Do it on our own, otherwise tests with overloaded server can be flaky.
-while true
-do
-    $CLICKHOUSE_CLIENT -nm -q "INSERT INTO $database_name.02911_backup_restore_keeper_map2 SELECT number, 'test' || toString(number) FROM system.numbers LIMIT 5000;
-    " 2>&1 | grep -q "KEEPER_EXCEPTION" && sleep 1 && continue
-    break
-done
+$CLICKHOUSE_CLIENT -nm -q "INSERT INTO $database_name.02911_backup_restore_keeper_map2 SELECT number, 'test' || toString(number) FROM system.numbers LIMIT 5000;"
 
-while true
-do
-    $CLICKHOUSE_CLIENT -nm -q "INSERT INTO $database_name.02911_backup_restore_keeper_map3 SELECT number, 'test' || toString(number) FROM system.numbers LIMIT 3000;
-    "  2>&1 | grep -q "KEEPER_EXCEPTION" && sleep 1 && continue
-    break
-done
+$CLICKHOUSE_CLIENT -nm -q "INSERT INTO $database_name.02911_backup_restore_keeper_map3 SELECT number, 'test' || toString(number) FROM system.numbers LIMIT 3000;"
 
 backup_path="$database_name"
 for i in $(seq 1 3); do

From fd26672864a7e1557908b878d7daa018de20c61a Mon Sep 17 00:00:00 2001
From: Antonio Andelic <antonio@clickhouse.com>
Date: Tue, 30 Jul 2024 13:54:30 +0200
Subject: [PATCH 100/139] Revert some change

---
 src/Storages/StorageKeeperMap.cpp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/Storages/StorageKeeperMap.cpp b/src/Storages/StorageKeeperMap.cpp
index 09c21ae28f5..1559b442e43 100644
--- a/src/Storages/StorageKeeperMap.cpp
+++ b/src/Storages/StorageKeeperMap.cpp
@@ -35,7 +35,6 @@
 #include <Storages/StorageInMemoryMetadata.h>
 #include <Storages/checkAndGetLiteralArgument.h>
 
-#include "Common/ZooKeeper/ZooKeeperRetries.h"
 #include <Common/Base64.h>
 #include <Common/Exception.h>
 #include <Common/FailPoint.h>
@@ -44,6 +43,7 @@
 #include <Common/ZooKeeper/Types.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Common/ZooKeeper/ZooKeeperConstants.h>
+#include <Common/ZooKeeper/ZooKeeperRetries.h>
 
 #include <Backups/BackupEntriesCollector.h>
 #include <Backups/IBackupCoordination.h>
@@ -205,12 +205,12 @@ public:
             for (const auto & [key, _] : new_values)
                 key_paths.push_back(storage.fullPathForKey(key));
 
-            zkutil::ZooKeeper::MultiTryGetResponse results;
+            zkutil::ZooKeeper::MultiExistsResponse results;
 
             if constexpr (!for_update)
             {
                 if (!strict)
-                    results = zookeeper->tryGet(key_paths);
+                    results = zookeeper->exists(key_paths);
             }
 
             Coordination::Requests requests;
@@ -231,8 +231,7 @@ public:
                 {
                     if (!strict && results[i].error == Coordination::Error::ZOK)
                     {
-                        if (results[i].data != new_values[key])
-                            requests.push_back(zkutil::makeSetRequest(key_paths[i], new_values[key], -1));
+                        requests.push_back(zkutil::makeSetRequest(key_paths[i], new_values[key], -1));
                     }
                     else
                     {
@@ -242,9 +241,6 @@ public:
                 }
             }
 
-            if (requests.empty())
-                return;
-
             if (new_keys_num != 0)
             {
                 auto will_be = current_keys_num + new_keys_num;

From 0124d211ec81a3779fe0e99c868fe85be8856629 Mon Sep 17 00:00:00 2001
From: Antonio Andelic <antonio@clickhouse.com>
Date: Tue, 30 Jul 2024 14:00:52 +0200
Subject: [PATCH 101/139] Better

---
 tests/integration/test_replicated_table_attach/test.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/integration/test_replicated_table_attach/test.py b/tests/integration/test_replicated_table_attach/test.py
index 499220def2c..de60b7ec291 100644
--- a/tests/integration/test_replicated_table_attach/test.py
+++ b/tests/integration/test_replicated_table_attach/test.py
@@ -41,6 +41,7 @@ def start_clean_clickhouse():
 
 def test_startup_with_small_bg_pool(started_cluster):
     start_clean_clickhouse()
+    node.query("DROP TABLE IF EXISTS replicated_table SYNC")
     node.query(
         "CREATE TABLE replicated_table (k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree('/clickhouse/replicated_table', 'r1') ORDER BY k"
     )
@@ -54,11 +55,10 @@ def test_startup_with_small_bg_pool(started_cluster):
     node.restart_clickhouse(stop_start_wait_sec=10)
     assert_values()
 
-    node.query("DROP TABLE replicated_table SYNC")
-
 
 def test_startup_with_small_bg_pool_partitioned(started_cluster):
     start_clean_clickhouse()
+    node.query("DROP TABLE IF EXISTS replicated_table_partitioned SYNC")
     node.query(
         "CREATE TABLE replicated_table_partitioned (k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree('/clickhouse/replicated_table_partitioned', 'r1') ORDER BY k"
     )
@@ -81,5 +81,3 @@ def test_startup_with_small_bg_pool_partitioned(started_cluster):
 
     # check that we activate it in the end
     node.query_with_retry("INSERT INTO replicated_table_partitioned VALUES(20, 30)")
-
-    node.query("DROP TABLE replicated_table_partitioned SYNC")

From c3e8825c8f14bb82f60c41754a021813d3dbc8aa Mon Sep 17 00:00:00 2001
From: Antonio Andelic <antonio@clickhouse.com>
Date: Tue, 30 Jul 2024 14:23:32 +0200
Subject: [PATCH 102/139] Use correct order of fields in StorageURLSource

---
 src/Storages/StorageURL.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Storages/StorageURL.h b/src/Storages/StorageURL.h
index 63d01a02417..6c95cad474c 100644
--- a/src/Storages/StorageURL.h
+++ b/src/Storages/StorageURL.h
@@ -228,12 +228,12 @@ private:
     bool need_only_count;
     size_t total_rows_in_file = 0;
 
+    Poco::Net::HTTPBasicCredentials credentials;
+
     std::unique_ptr<ReadBuffer> read_buf;
     std::shared_ptr<IInputFormat> input_format;
     std::unique_ptr<QueryPipeline> pipeline;
     std::unique_ptr<PullingPipelineExecutor> reader;
-
-    Poco::Net::HTTPBasicCredentials credentials;
 };
 
 class StorageURLSink : public SinkToStorage

From 7d5c30e76cf0fd17515803fec96899f4aad1294e Mon Sep 17 00:00:00 2001
From: Antonio Andelic <antonio@clickhouse.com>
Date: Tue, 30 Jul 2024 16:26:19 +0200
Subject: [PATCH 103/139] No retries when partitioned

---
 tests/integration/test_keeper_map/test.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/integration/test_keeper_map/test.py b/tests/integration/test_keeper_map/test.py
index 31316af7b1e..7aee5df5746 100644
--- a/tests/integration/test_keeper_map/test.py
+++ b/tests/integration/test_keeper_map/test.py
@@ -46,7 +46,11 @@ def assert_keeper_exception_after_partition(query):
     with PartitionManager() as pm:
         pm.drop_instance_zk_connections(node)
         try:
-            error = node.query_and_get_error_with_retry(query, sleep_time=1)
+            error = node.query_and_get_error_with_retry(
+                query,
+                sleep_time=1,
+                settings={"insert_keeper_max_retries": 1, "keeper_max_retries": 1},
+            )
             assert "Coordination::Exception" in error
         except:
             print_iptables_rules()
@@ -84,7 +88,9 @@ def test_keeper_map_without_zk(started_cluster):
         node.restart_clickhouse(60)
         try:
             error = node.query_and_get_error_with_retry(
-                "SELECT * FROM test_keeper_map_without_zk", sleep_time=1
+                "SELECT * FROM test_keeper_map_without_zk",
+                sleep_time=1,
+                settings={"keeper_max_retries": 1},
             )
             assert "Failed to activate table because of connection issues" in error
         except:

From 83c6d97cd2aae0a3f79c2776ffc3a5691f8fd4bb Mon Sep 17 00:00:00 2001
From: maxvostrikov <max.vostrikov@clickhouse.com>
Date: Tue, 30 Jul 2024 17:34:38 +0200
Subject: [PATCH 104/139] squash! added somme tests in relation with
 https://github.com/ClickHouse/ClickHouse/pull/54881 with new behaviour when
 enable_named_columns_in_function_tuple=1 (default value)

---
 .../0_stateless/00309_formats.reference       | Bin 20353 -> 18666 bytes
 tests/queries/0_stateless/00309_formats.sql   |   5 +++++
 2 files changed, 5 insertions(+)

diff --git a/tests/queries/0_stateless/00309_formats.reference b/tests/queries/0_stateless/00309_formats.reference
index cab311692be229716b58af39079275d3942b01cc..f3ea45520bb50fb936caf6724e9fedf3cdd00b75 100644
GIT binary patch
delta 3052
zcmeIy$4}c(00wZIgtksdZ-w^I3JD}eL2?j6{R4XG1$t-?y;Q0c4wb5?2YL>Bj|8*#
z-Xp>6y?59U_TGDMNaN%a?SDX3#j^bK`<|bk?ZfAlN^UDiN<bJ6jY24SuCXUb!%+R!
z(?lWq$P}8rBt@#-Sf0!i4|+jw=mUMBAM}R-Fc1d8U>E{JVHgaD5e8+19DxExLIy^`
zXcz-yVH}Ky2`~{R!DN^MQ}xOSA`L-0%z&9N3ueO{m<#h@J}iKRum~2z5?IQq+n-P(
zP{A_D!g5#vD`6F^hBdGj*1>w%02^VGPHumqnY-wY76U{pY=iBv19rkL*bRGNFYJT;
zPz?v*AoeGQ5Ddc+I10z$IGlhQI0>iVG@OC6a1PGH1;h6f#3F(vxC~d|DqMr>a070_
zEw~ML;4a*Q`|v>j|8;{y1V``~p1@Oh2G8LIyo6Wq8s5NLcn9yHg%&qjk~HD*O`kk{
zMhS#wBF4@26;n)ok$HM~`}q3#2LuKMhlGZON5~bCOjLACY+QUoVp4KSYFc_mW>$7i
zZeD&tVNr2OsZv$OmRD3(RoB$k)i*RYHMg|3wRd!Ob@%l4^{WR4hlWQ+$Hpf#lT*_(
zvvczci%ZKZt842Un_JsEyL<ZwheyXJr)TFEmsi&}w|Dmf?L&1j3gH`4#3+R{X>2uP
zs~KC(*lPbltFhlLRQ$(oSyIc$t;|{F>ph;XVgHfpC$+5H%8ajnp%+Y<&DY2OORU_k
z(V7&oZmv$Gj7LgIiK)l0pFiA9KYx&VyyL(B=HYJsi3@C{mioxSQew%acGgGsx>HI?
tDE$HfH|yd|adXt)D_oo(mI%Z&<wVo8BQ16miz!<%?O^j~Y-3_4_zmv{|2Y5v

literal 20353
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
Lvprlx%YOd>&)TR8

diff --git a/tests/queries/0_stateless/00309_formats.sql b/tests/queries/0_stateless/00309_formats.sql
index b0939c00a10..0366cdeea5c 100644
--- a/tests/queries/0_stateless/00309_formats.sql
+++ b/tests/queries/0_stateless/00309_formats.sql
@@ -9,3 +9,8 @@ SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, range(n) AS arr, a
 SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, range(n) AS arr, arrayStringConcat(arrayMap(x -> reinterpretAsString(x), arr)) AS s, (n, d) AS tuple FROM system.numbers LIMIT 2 FORMAT JSON;
 SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, range(n) AS arr, arrayStringConcat(arrayMap(x -> reinterpretAsString(x), arr)) AS s, (n, d) AS tuple FROM system.numbers LIMIT 2 FORMAT JSONCompact;
 SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, range(n) AS arr, arrayStringConcat(arrayMap(x -> reinterpretAsString(x), arr)) AS s, (n, d) AS tuple FROM system.numbers LIMIT 2 FORMAT XML;
+
+SET enable_named_columns_in_function_tuple = 1;
+
+SELECT 36 AS n, toDate('2000-01-01') + n AS d, (n, d) AS tuple FROM system.numbers LIMIT 1 FORMAT RowBinaryWithNamesAndTypes;
+SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, (n, d) AS tuple FROM system.numbers LIMIT 1 FORMAT TabSeparatedWithNamesAndTypes;

From 7e51e9962c34320a9c60ba6abcf8b38cf517e86c Mon Sep 17 00:00:00 2001
From: Alex Katsman <alex.katsman@clickhouse.com>
Date: Tue, 30 Jul 2024 17:20:07 +0000
Subject: [PATCH 105/139] Fix WriteBuffer destructor when finalize has failed
 for MergeTreeDeduplicationLog::shutdown

---
 src/Storages/MergeTree/MergeTreeDeduplicationLog.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Storages/MergeTree/MergeTreeDeduplicationLog.cpp b/src/Storages/MergeTree/MergeTreeDeduplicationLog.cpp
index 22ff9b7194f..a8110500f13 100644
--- a/src/Storages/MergeTree/MergeTreeDeduplicationLog.cpp
+++ b/src/Storages/MergeTree/MergeTreeDeduplicationLog.cpp
@@ -341,15 +341,19 @@ void MergeTreeDeduplicationLog::shutdown()
     stopped = true;
     if (current_writer)
     {
+        /// If an error has occurred during finalize, we'd like to have the exception set for reset.
+        /// Otherwise, we'll be in a situation when a finalization didn't happen, and we didn't get
+        /// any error, causing logical error (see ~MemoryBuffer()).
         try
         {
             current_writer->finalize();
+            current_writer.reset();
         }
         catch (...)
         {
             tryLogCurrentException(__PRETTY_FUNCTION__);
+            current_writer.reset();
         }
-        current_writer.reset();
     }
 }
 

From 51af0d305c9959fb4870bd8a57035d48207648b2 Mon Sep 17 00:00:00 2001
From: Alexander Gololobov <davenger@clickhouse.com>
Date: Tue, 30 Jul 2024 20:00:23 +0200
Subject: [PATCH 106/139] Reduce number of tested combinations

---
 tests/queries/0_stateless/02473_multistep_prewhere.python | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/queries/0_stateless/02473_multistep_prewhere.python b/tests/queries/0_stateless/02473_multistep_prewhere.python
index a942568233c..11095202039 100644
--- a/tests/queries/0_stateless/02473_multistep_prewhere.python
+++ b/tests/queries/0_stateless/02473_multistep_prewhere.python
@@ -193,7 +193,7 @@ def main():
     url = os.environ["CLICKHOUSE_URL"] + "&max_threads=1"
 
     default_index_granularity = 10
-    total_rows = 8 * default_index_granularity
+    total_rows = 7 * default_index_granularity
     step = default_index_granularity
     session = requests.Session()
     for index_granularity in [

From dacf044c3dee65d799242b7f4846f7d6d8b2bd34 Mon Sep 17 00:00:00 2001
From: robot-clickhouse <robot-clickhouse@users.noreply.github.com>
Date: Tue, 30 Jul 2024 19:20:52 +0000
Subject: [PATCH 107/139] Update version_date.tsv and changelogs after
 v24.7.1.2915-stable

---
 SECURITY.md                            |   3 +-
 docker/keeper/Dockerfile               |   2 +-
 docker/server/Dockerfile.alpine        |   2 +-
 docker/server/Dockerfile.ubuntu        |   2 +-
 docs/changelogs/v24.7.1.2915-stable.md | 524 +++++++++++++++++++++++++
 utils/list-versions/version_date.tsv   |   1 +
 6 files changed, 530 insertions(+), 4 deletions(-)
 create mode 100644 docs/changelogs/v24.7.1.2915-stable.md

diff --git a/SECURITY.md b/SECURITY.md
index 53328b6e16b..8930dc96f8a 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -14,9 +14,10 @@ The following versions of ClickHouse server are currently supported with securit
 
 | Version | Supported |
 |:-|:-|
+| 24.7 | ✔️ |
 | 24.6 | ✔️ |
 | 24.5 | ✔️ |
-| 24.4 | ✔️ |
+| 24.4 | ❌ |
 | 24.3 | ✔️ |
 | 24.2 | ❌ |
 | 24.1 | ❌ |
diff --git a/docker/keeper/Dockerfile b/docker/keeper/Dockerfile
index c59ef1b919a..e99c86267f9 100644
--- a/docker/keeper/Dockerfile
+++ b/docker/keeper/Dockerfile
@@ -34,7 +34,7 @@ RUN arch=${TARGETARCH:-amd64} \
 # lts / testing / prestable / etc
 ARG REPO_CHANNEL="stable"
 ARG REPOSITORY="https://packages.clickhouse.com/tgz/${REPO_CHANNEL}"
-ARG VERSION="24.6.2.17"
+ARG VERSION="24.7.1.2915"
 ARG PACKAGES="clickhouse-keeper"
 ARG DIRECT_DOWNLOAD_URLS=""
 
diff --git a/docker/server/Dockerfile.alpine b/docker/server/Dockerfile.alpine
index 240df79aeb1..fb562b911a3 100644
--- a/docker/server/Dockerfile.alpine
+++ b/docker/server/Dockerfile.alpine
@@ -32,7 +32,7 @@ RUN arch=${TARGETARCH:-amd64} \
 # lts / testing / prestable / etc
 ARG REPO_CHANNEL="stable"
 ARG REPOSITORY="https://packages.clickhouse.com/tgz/${REPO_CHANNEL}"
-ARG VERSION="24.6.2.17"
+ARG VERSION="24.7.1.2915"
 ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
 ARG DIRECT_DOWNLOAD_URLS=""
 
diff --git a/docker/server/Dockerfile.ubuntu b/docker/server/Dockerfile.ubuntu
index ac64655991a..51f4e6a0f40 100644
--- a/docker/server/Dockerfile.ubuntu
+++ b/docker/server/Dockerfile.ubuntu
@@ -28,7 +28,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="24.6.2.17"
+ARG VERSION="24.7.1.2915"
 ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
 
 #docker-official-library:off
diff --git a/docs/changelogs/v24.7.1.2915-stable.md b/docs/changelogs/v24.7.1.2915-stable.md
new file mode 100644
index 00000000000..abffbe58bfc
--- /dev/null
+++ b/docs/changelogs/v24.7.1.2915-stable.md
@@ -0,0 +1,524 @@
+---
+sidebar_position: 1
+sidebar_label: 2024
+---
+
+# 2024 Changelog
+
+### ClickHouse release v24.7.1.2915-stable (a37d2d43da7) FIXME as compared to v24.7.1.1-new (aa023477a92)
+
+#### Backward Incompatible Change
+* Change binary serialization of Variant data type: add `compact` mode to avoid writing the same discriminator multiple times for granules with single variant or with only NULL values. Add MergeTree setting `use_compact_variant_discriminators_serialization` that is enabled by default. Note that Variant type is still experimental and backward-incompatible change in serialization is ok. [#62774](https://github.com/ClickHouse/ClickHouse/pull/62774) ([Kruglov Pavel](https://github.com/Avogar)).
+* Forbid `CREATE MATERIALIZED VIEW ... ENGINE Replicated*MergeTree POPULATE AS SELECT ...` with Replicated databases. [#63963](https://github.com/ClickHouse/ClickHouse/pull/63963) ([vdimir](https://github.com/vdimir)).
+* `clickhouse-keeper-client` will only accept paths in string literals, such as `ls '/hello/world'`, not bare strings such as `ls /hello/world`. [#65494](https://github.com/ClickHouse/ClickHouse/pull/65494) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Metric `KeeperOutstandingRequets` was renamed to `KeeperOutstandingRequests`. This fixes a typo reported in [#66179](https://github.com/ClickHouse/ClickHouse/issues/66179). [#66206](https://github.com/ClickHouse/ClickHouse/pull/66206) ([Robert Schulze](https://github.com/rschu1ze)).
+* Remove `is_deterministic` field from the `system.functions` table. [#66630](https://github.com/ClickHouse/ClickHouse/pull/66630) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+
+#### New Feature
+* Extend function `tuple` to construct named tuples in query. Introduce function `tupleNames` to extract names from tuples. [#54881](https://github.com/ClickHouse/ClickHouse/pull/54881) ([Amos Bird](https://github.com/amosbird)).
+* `ASOF JOIN` support for `full_sorting_join` algorithm Close [#54493](https://github.com/ClickHouse/ClickHouse/issues/54493). [#55051](https://github.com/ClickHouse/ClickHouse/pull/55051) ([vdimir](https://github.com/vdimir)).
+* A new table function, `fuzzQuery,` was added. This function allows you to modify a given query string with random variations. Example: `SELECT query FROM fuzzQuery('SELECT 1');`. [#62103](https://github.com/ClickHouse/ClickHouse/pull/62103) ([pufit](https://github.com/pufit)).
+* Add new window function `percent_rank`. [#62747](https://github.com/ClickHouse/ClickHouse/pull/62747) ([lgbo](https://github.com/lgbo-ustc)).
+* Support JWT authentication in `clickhouse-client`. [#62829](https://github.com/ClickHouse/ClickHouse/pull/62829) ([Konstantin Bogdanov](https://github.com/thevar1able)).
+* Add SQL functions `changeYear`, `changeMonth`, `changeDay`, `changeHour`, `changeMinute`, `changeSecond`. For example, `SELECT changeMonth(toDate('2024-06-14'), 7)` returns date `2024-07-14`. [#63186](https://github.com/ClickHouse/ClickHouse/pull/63186) ([cucumber95](https://github.com/cucumber95)).
+* Introduce startup scripts, which allow the execution of preconfigured queries at the startup stage. [#64889](https://github.com/ClickHouse/ClickHouse/pull/64889) ([pufit](https://github.com/pufit)).
+* Support accept_invalid_certificate in client's config in order to allow for client to connect over secure TCP to a server running with self-signed certificate - can be used as a shorthand for corresponding `openSSL` client settings `verificationMode=none` + `invalidCertificateHandler.name=AcceptCertificateHandler`. [#65238](https://github.com/ClickHouse/ClickHouse/pull/65238) ([peacewalker122](https://github.com/peacewalker122)).
+* Add system.error_log which contains history of error values from table system.errors, periodically flushed to disk. [#65381](https://github.com/ClickHouse/ClickHouse/pull/65381) ([Pablo Marcos](https://github.com/pamarcos)).
+* Add aggregate function `groupConcat`. About the same as `arrayStringConcat( groupArray(column), ',')` Can receive 2 parameters: a string delimiter and the number of elements to be processed. [#65451](https://github.com/ClickHouse/ClickHouse/pull/65451) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
+* Add AzureQueue storage. [#65458](https://github.com/ClickHouse/ClickHouse/pull/65458) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Add a new setting to disable/enable writing page index into parquet files. [#65475](https://github.com/ClickHouse/ClickHouse/pull/65475) ([lgbo](https://github.com/lgbo-ustc)).
+* Allow system administrators to configure `logger.console_log_level`. [#65559](https://github.com/ClickHouse/ClickHouse/pull/65559) ([Azat Khuzhin](https://github.com/azat)).
+* Automatically append a wildcard `*` to the end of a directory path with table function `file`. [#66019](https://github.com/ClickHouse/ClickHouse/pull/66019) ([Zhidong (David) Guo](https://github.com/Gun9niR)).
+* Add `--memory-usage` option to client in non interactive mode. [#66393](https://github.com/ClickHouse/ClickHouse/pull/66393) ([vdimir](https://github.com/vdimir)).
+
+#### Performance Improvement
+* Enable `optimize_functions_to_subcolumns` by default. [#58661](https://github.com/ClickHouse/ClickHouse/pull/58661) ([Anton Popov](https://github.com/CurtizJ)).
+* Replace int to string algorithm with a faster one (from a modified amdn/itoa to a modified jeaiii/itoa). [#61661](https://github.com/ClickHouse/ClickHouse/pull/61661) ([Raúl Marín](https://github.com/Algunenano)).
+* Sizes of hash tables created by join (`parallel_hash` algorithm) is collected and cached now. This information will be used to preallocate space in hash tables for subsequent query executions and save time on hash table resizes. [#64553](https://github.com/ClickHouse/ClickHouse/pull/64553) ([Nikita Taranov](https://github.com/nickitat)).
+* Optimized queries with `ORDER BY` primary key and `WHERE` that have a condition with high selectivity by using of buffering. It is controlled by setting `read_in_order_use_buffering` (enabled by default) and can increase memory usage of query. [#64607](https://github.com/ClickHouse/ClickHouse/pull/64607) ([Anton Popov](https://github.com/CurtizJ)).
+* Improve performance of loading `plain_rewritable` metadata. [#65634](https://github.com/ClickHouse/ClickHouse/pull/65634) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Attaching tables on read-only disks will use fewer resources by not loading outdated parts. [#65635](https://github.com/ClickHouse/ClickHouse/pull/65635) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Support minmax hyperrectangle for Set indices. [#65676](https://github.com/ClickHouse/ClickHouse/pull/65676) ([AntiTopQuark](https://github.com/AntiTopQuark)).
+* Unload primary index of outdated parts to reduce total memory usage. [#65852](https://github.com/ClickHouse/ClickHouse/pull/65852) ([Anton Popov](https://github.com/CurtizJ)).
+* Functions `replaceRegexpAll` and `replaceRegexpOne` are now significantly faster if the pattern is trivial, i.e. contains no metacharacters, pattern classes, flags, grouping characters etc. (Thanks to Taiyang Li). [#66185](https://github.com/ClickHouse/ClickHouse/pull/66185) ([Robert Schulze](https://github.com/rschu1ze)).
+
+#### Improvement
+* Support rocksdb as backend storage of keeper. [#56626](https://github.com/ClickHouse/ClickHouse/pull/56626) ([Han Fei](https://github.com/hanfei1991)).
+* The setting `optimize_trivial_insert_select` is disabled by default. In most cases, it should be beneficial. Nevertheless, if you are seeing slower INSERT SELECT or increased memory usage, you can enable it back or `SET compatibility = '24.6'`. [#58970](https://github.com/ClickHouse/ClickHouse/pull/58970) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Print stacktrace and diagnostic info if `clickhouse-client` or `clickhouse-local` crashes. [#61109](https://github.com/ClickHouse/ClickHouse/pull/61109) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* The result of `SHOW INDEX | INDEXES | INDICES | KEYS` was previously sorted by the primary key column names. Since this was unintuitive, the result is now sorted by the position of the primary key columns within the primary key. [#61131](https://github.com/ClickHouse/ClickHouse/pull/61131) ([Robert Schulze](https://github.com/rschu1ze)).
+* This PR changes how deduplication for MV works. Fixed a lot of cases like: - on destination table: data is split for 2 or more blocks and that blocks is considered as duplicate when that block is inserted in parallel. - on MV destination table: the equal blocks are deduplicated, that happens when MV often produces equal data as a result for different input data due to performing aggregation. - on MV destination table: the equal blocks which comes from different MV are deduplicated. [#61601](https://github.com/ClickHouse/ClickHouse/pull/61601) ([Sema Checherinda](https://github.com/CheSema)).
+* Allow matching column names in a case insensitive manner when reading json files (`input_format_json_case_insensitive_column_matching`). [#61750](https://github.com/ClickHouse/ClickHouse/pull/61750) ([kevinyhzou](https://github.com/KevinyhZou)).
+* Support reading partitioned data DeltaLake data. Infer DeltaLake schema by reading metadata instead of data. [#63201](https://github.com/ClickHouse/ClickHouse/pull/63201) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* In composable protocols TLS layer accepted only `certificateFile` and `privateKeyFile` parameters. https://clickhouse.com/docs/en/operations/settings/composable-protocols. [#63985](https://github.com/ClickHouse/ClickHouse/pull/63985) ([Anton Ivashkin](https://github.com/ianton-ru)).
+* Make an interactive client for clickhouse-disks, add local disk from the local directory. Fixes [#56791](https://github.com/ClickHouse/ClickHouse/issues/56791). [#64446](https://github.com/ClickHouse/ClickHouse/pull/64446) ([Daniil Ivanik](https://github.com/divanik)).
+* Added profile event `SelectQueriesWithPrimaryKeyUsage` which indicates how many SELECT queries use the primary key to evaluate the WHERE clause. [#64492](https://github.com/ClickHouse/ClickHouse/pull/64492) ([0x01f](https://github.com/0xfei)).
+* `StorageS3Queue` related fixes and improvements. Deduce a default value of `s3queue_processing_threads_num` according to the number of physical cpu cores on the server (instead of the previous default value as 1). Set default value of `s3queue_loading_retries` to 10. Fix possible vague "Uncaught exception" in exception column of `system.s3queue`. Do not increment retry count on `MEMORY_LIMIT_EXCEEDED` exception. Move files commit to a stage after insertion into table fully finished to avoid files being commited while not inserted. Add settings `s3queue_max_processed_files_before_commit`, `s3queue_max_processed_rows_before_commit`, `s3queue_max_processed_bytes_before_commit`, `s3queue_max_processing_time_sec_before_commit`, to better control commit and flush time. [#65046](https://github.com/ClickHouse/ClickHouse/pull/65046) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fixed broken multiple columns aggregation on s390x. [#65062](https://github.com/ClickHouse/ClickHouse/pull/65062) ([Harry Lee](https://github.com/HarryLeeIBM)).
+* Support aliases in parametrized view function (only new analyzer). [#65190](https://github.com/ClickHouse/ClickHouse/pull/65190) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* S3. reduce retires time for queries, increase retries count for backups. 8.5 minutes and 100 retires for queries, 1.2 hours and 1000 retries for backup restore. [#65232](https://github.com/ClickHouse/ClickHouse/pull/65232) ([Sema Checherinda](https://github.com/CheSema)).
+* Updated to mask account key in logs in azureBlobStorage. [#65273](https://github.com/ClickHouse/ClickHouse/pull/65273) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
+* Partition pruning for `IN` predicates when filter expression is a part of `PARTITION BY` expression. [#65335](https://github.com/ClickHouse/ClickHouse/pull/65335) ([Eduard Karacharov](https://github.com/korowa)).
+* Add system tables with main information about all detached tables. [#65400](https://github.com/ClickHouse/ClickHouse/pull/65400) ([Konstantin Morozov](https://github.com/k-morozov)).
+* Add support for `cluster_for_parallel_replicas` when using custom key parallel replicas. It allows you to use parallel replicas with custom key with MergeTree tables. [#65453](https://github.com/ClickHouse/ClickHouse/pull/65453) ([Antonio Andelic](https://github.com/antonio2368)).
+* Support query plan LIMIT optimization. Support LIMIT pushdown for PostgreSQL storage and table function. [#65454](https://github.com/ClickHouse/ClickHouse/pull/65454) ([Maksim Kita](https://github.com/kitaisreal)).
+* Arraymin/max can be applicable to all data types that are comparable. [#65455](https://github.com/ClickHouse/ClickHouse/pull/65455) ([pn](https://github.com/chloro-pn)).
+* Improved memory accounting for cgroups v2 to exclude the amount occupied by the page cache. [#65470](https://github.com/ClickHouse/ClickHouse/pull/65470) ([Nikita Taranov](https://github.com/nickitat)).
+* Do not create format settings for each rows when serializing chunks to insert to EmbeddedRocksDB table. [#65474](https://github.com/ClickHouse/ClickHouse/pull/65474) ([Duc Canh Le](https://github.com/canhld94)).
+* Fixed out-of-range exception in parsing Dwarf5 on s390x. [#65501](https://github.com/ClickHouse/ClickHouse/pull/65501) ([Harry Lee](https://github.com/HarryLeeIBM)).
+* Reduce `clickhouse-local` prompt to just `:)`. `getFQDNOrHostName()` takes too long on macOS, and we don't want a hostname in the prompt for `clickhouse-local` anyway. [#65510](https://github.com/ClickHouse/ClickHouse/pull/65510) ([Konstantin Bogdanov](https://github.com/thevar1able)).
+* Avoid printing a message from jemalloc about per-CPU arenas on low-end virtual machines. [#65532](https://github.com/ClickHouse/ClickHouse/pull/65532) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Disable filesystem cache background download by default. It will be enabled back when we fix the issue with possible "Memory limit exceeded" because memory deallocation is done outside of query context (while buffer is allocated inside of query context) if we use background download threads. Plus we need to add a separate setting to define max size to download for background workers (currently it is limited by max_file_segment_size, which might be too big). [#65534](https://github.com/ClickHouse/ClickHouse/pull/65534) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Add new option to config `<config_reload_interval_ms>` which allow to specify how often clickhouse will reload config. [#65545](https://github.com/ClickHouse/ClickHouse/pull/65545) ([alesapin](https://github.com/alesapin)).
+* Implement binary encoding for ClickHouse data types and add its specification in docs. Use it in Dynamic binary serialization, allow to use it in RowBinaryWithNamesAndTypes and Native formats under settings. [#65546](https://github.com/ClickHouse/ClickHouse/pull/65546) ([Kruglov Pavel](https://github.com/Avogar)).
+* Improved ZooKeeper load balancing. The current session doesn't expire until the optimal nodes become available despite `fallback_session_lifetime`. Added support for AZ-aware balancing. [#65570](https://github.com/ClickHouse/ClickHouse/pull/65570) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Server settings `compiled_expression_cache_size` and `compiled_expression_cache_elements_size` are now shown in `system.server_settings`. [#65584](https://github.com/ClickHouse/ClickHouse/pull/65584) ([Robert Schulze](https://github.com/rschu1ze)).
+* When lightweight delete happens on a table with projection(s), users have choices either throw an exception (by default) or drop the projection lightweight delete would happen. [#65594](https://github.com/ClickHouse/ClickHouse/pull/65594) ([jsc0218](https://github.com/jsc0218)).
+* Add support for user identification based on x509 SubjectAltName extension. [#65626](https://github.com/ClickHouse/ClickHouse/pull/65626) ([Anton Kozlov](https://github.com/tonickkozlov)).
+* `clickhouse-local` will respect the `max_server_memory_usage` and `max_server_memory_usage_to_ram_ratio` from the configuration file. It will also set the max memory usage to 90% of the system memory by default, like `clickhouse-server` does. This closes [#65695](https://github.com/ClickHouse/ClickHouse/issues/65695). [#65697](https://github.com/ClickHouse/ClickHouse/pull/65697) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add a script to backup your files to ClickHouse. This is strange, but works. [#65699](https://github.com/ClickHouse/ClickHouse/pull/65699) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* PostgreSQL source support cancel. [#65722](https://github.com/ClickHouse/ClickHouse/pull/65722) ([Maksim Kita](https://github.com/kitaisreal)).
+* Make allow_experimental_analyzer be controlled by the initiator for distributed queries. This ensures compatibility and correctness during operations in mixed version clusters. [#65777](https://github.com/ClickHouse/ClickHouse/pull/65777) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Respect cgroup CPU limit in Keeper. [#65819](https://github.com/ClickHouse/ClickHouse/pull/65819) ([Antonio Andelic](https://github.com/antonio2368)).
+* Allow to use `concat` function with empty arguments ``` sql :) select concat();. [#65887](https://github.com/ClickHouse/ClickHouse/pull/65887) ([李扬](https://github.com/taiyang-li)).
+* Allow controlling named collections in clickhouse-local. [#65973](https://github.com/ClickHouse/ClickHouse/pull/65973) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Improve Azure profile events. [#65999](https://github.com/ClickHouse/ClickHouse/pull/65999) ([alesapin](https://github.com/alesapin)).
+* `Query was cancelled` might have been printed twice in clickhouse-client. This behaviour is fixed. [#66005](https://github.com/ClickHouse/ClickHouse/pull/66005) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Support ORC file read by writer time zone. [#66025](https://github.com/ClickHouse/ClickHouse/pull/66025) ([kevinyhzou](https://github.com/KevinyhZou)).
+* Refactor JSONExtract functions, support more types including experimental Dynamic type. [#66046](https://github.com/ClickHouse/ClickHouse/pull/66046) ([Kruglov Pavel](https://github.com/Avogar)).
+* DatabaseCatalog drops tables faster by using up to database_catalog_drop_table_concurrency threads. [#66065](https://github.com/ClickHouse/ClickHouse/pull/66065) ([Sema Checherinda](https://github.com/CheSema)).
+* This PR changes how deduplication for MV works. Fixed a lot of cases like: - on destination table: data is split for 2 or more blocks and that blocks is considered as duplicate when that block is inserted in parallel. - on MV destination table: the equal blocks are deduplicated, that happens when MV often produces equal data as a result for different input data due to performing aggregation. - on MV destination table: the equal blocks which comes from different MV are deduplicated. [#66144](https://github.com/ClickHouse/ClickHouse/pull/66144) ([Sema Checherinda](https://github.com/CheSema)).
+* Support null map subcolumn for Variant and Dynamic subcolumns. [#66178](https://github.com/ClickHouse/ClickHouse/pull/66178) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add settings to control connection to the PostgreSQL. * Setting `postgresql_connection_attempt_timeout` specifies the value passed to `connect_timeout` parameter of connection URL. * Setting `postgresql_connection_pool_retries` specifies the number of retries to establish a connection to the PostgreSQL end-point. [#66232](https://github.com/ClickHouse/ClickHouse/pull/66232) ([Dmitry Novik](https://github.com/novikd)).
+* Reduce inaccuracy of input_wait_elapsed_us/input_wait_elapsed_us/elapsed_us. [#66239](https://github.com/ClickHouse/ClickHouse/pull/66239) ([Azat Khuzhin](https://github.com/azat)).
+* Improve FilesystemCache ProfileEvents. [#66249](https://github.com/ClickHouse/ClickHouse/pull/66249) ([zhukai](https://github.com/nauu)).
+* Add settings to ignore ON CLUSTER clause in queries for named collection management with replicated storage. [#66288](https://github.com/ClickHouse/ClickHouse/pull/66288) ([MikhailBurdukov](https://github.com/MikhailBurdukov)).
+* Upgraded `pocketfft` dependency to the recent commit https://github.com/mreineck/pocketfft/commit/f4c1aa8aa9ce79ad39e80f2c9c41b92ead90fda3. [#66291](https://github.com/ClickHouse/ClickHouse/pull/66291) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Upgraded `azure-sdk-for-cpp` to the recent commit https://github.com/ClickHouse/azure-sdk-for-cpp/commit/ea3e19a7be08519134c643177d56c7484dfec884. [#66292](https://github.com/ClickHouse/ClickHouse/pull/66292) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Function `generateSnowflakeID` now allows to specify a machine ID as a parameter to prevent collisions in large clusters. [#66374](https://github.com/ClickHouse/ClickHouse/pull/66374) ([ZAWA_ll](https://github.com/Zawa-ll)).
+* Disable suspending on Ctrl+Z in interactive mode. This is a common trap and is not expected behavior for almost all users. I imagine only a few extreme power users could appreciate suspending terminal applications to the background, but I don't know any. [#66511](https://github.com/ClickHouse/ClickHouse/pull/66511) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add option for validating the Primary key type in Dictionaries. Without this option for simple layouts any column type will be implicitly converted to UInt64. ### Documentation entry for user-facing changes. [#66595](https://github.com/ClickHouse/ClickHouse/pull/66595) ([MikhailBurdukov](https://github.com/MikhailBurdukov)).
+* Fix SHOW MERGES remaining time. [#66735](https://github.com/ClickHouse/ClickHouse/pull/66735) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+
+#### Critical Bug Fix (crash, LOGICAL_ERROR, data loss, RBAC)
+* Fix unexpeced size of low cardinality column in function calls. [#65298](https://github.com/ClickHouse/ClickHouse/pull/65298) ([Raúl Marín](https://github.com/Algunenano)).
+* Check cyclic dependencies on CREATE/REPLACE/RENAME/EXCHANGE queries and throw an exception if there is a cyclic dependency. Previously such cyclic dependencies could lead to a deadlock during server startup. Closes [#65355](https://github.com/ClickHouse/ClickHouse/issues/65355). Also fix some bugs in dependencies creation. [#65405](https://github.com/ClickHouse/ClickHouse/pull/65405) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix crash in maxIntersections. [#65689](https://github.com/ClickHouse/ClickHouse/pull/65689) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix the VALID UNTIL clause in the user definition resetting after a restart. Closes [#66405](https://github.com/ClickHouse/ClickHouse/issues/66405). [#66409](https://github.com/ClickHouse/ClickHouse/pull/66409) ([Nikolay Degterinsky](https://github.com/evillique)).
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+* Fixed crash while using MaterializedMySQL with TABLE OVERRIDE that maps MySQL NULL field into ClickHouse not NULL field. [#54649](https://github.com/ClickHouse/ClickHouse/pull/54649) ([Filipp Ozinov](https://github.com/bakwc)).
+* Fix logical error when PREWHERE expression read no columns and table has no adaptive index granularity (very old table). Fix [#56640](https://github.com/ClickHouse/ClickHouse/issues/56640). [#59173](https://github.com/ClickHouse/ClickHouse/pull/59173) ([Alexander Gololobov](https://github.com/davenger)).
+* Fix bug with cancelation buffer when canceling a query. [#64478](https://github.com/ClickHouse/ClickHouse/pull/64478) ([Sema Checherinda](https://github.com/CheSema)).
+* Fix filling parts columns from metadata (when columns.txt does not exists). [#64757](https://github.com/ClickHouse/ClickHouse/pull/64757) ([Azat Khuzhin](https://github.com/azat)).
+* Fix AST formatting of 'create table b empty as a'. [#64951](https://github.com/ClickHouse/ClickHouse/pull/64951) ([Michael Kolupaev](https://github.com/al13n321)).
+* Fix crash for `ALTER TABLE ... ON CLUSTER ... MODIFY SQL SECURITY`. [#64957](https://github.com/ClickHouse/ClickHouse/pull/64957) ([pufit](https://github.com/pufit)).
+* Fix crash on destroying AccessControl: add explicit shutdown. [#64993](https://github.com/ClickHouse/ClickHouse/pull/64993) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Eliminate injective function in argument of functions `uniq*` recursively. This used to work correctly but was broken in the new analyzer. [#65140](https://github.com/ClickHouse/ClickHouse/pull/65140) ([Duc Canh Le](https://github.com/canhld94)).
+* Fix unexpected projection name when query with CTE. [#65267](https://github.com/ClickHouse/ClickHouse/pull/65267) ([wudidapaopao](https://github.com/wudidapaopao)).
+* Require `dictGet` privilege when accessing dictionaries via direct query or the `Dictionary` table engine. [#65359](https://github.com/ClickHouse/ClickHouse/pull/65359) ([Joe Lynch](https://github.com/joelynch)).
+* Fix user-specific S3 auth with incremental backups. [#65481](https://github.com/ClickHouse/ClickHouse/pull/65481) ([Antonio Andelic](https://github.com/antonio2368)).
+* Disable `non-intersecting-parts` optimization for queries with `FINAL` in case of `read-in-order` optimization was enabled. This could lead to an incorrect query result. As a workaround, disable `do_not_merge_across_partitions_select_final` and `split_parts_ranges_into_intersecting_and_non_intersecting_final` before this fix is merged. [#65505](https://github.com/ClickHouse/ClickHouse/pull/65505) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix getting exception `Index out of bound for blob metadata` in case all files from list batch were filtered out. [#65523](https://github.com/ClickHouse/ClickHouse/pull/65523) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix NOT_FOUND_COLUMN_IN_BLOCK for deduplicate merge of projection. [#65573](https://github.com/ClickHouse/ClickHouse/pull/65573) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Fixed bug in MergeJoin. Column in sparse serialisation might be treated as a column of its nested type though the required conversion wasn't performed. [#65632](https://github.com/ClickHouse/ClickHouse/pull/65632) ([Nikita Taranov](https://github.com/nickitat)).
+* Fixed a bug that compatibility level '23.4' was not properly applied. [#65737](https://github.com/ClickHouse/ClickHouse/pull/65737) ([cw5121](https://github.com/cw5121)).
+* Fix odbc table with nullable fields. [#65738](https://github.com/ClickHouse/ClickHouse/pull/65738) ([Rodolphe Dugé de Bernonville](https://github.com/RodolpheDuge)).
+* Fix data race in `TCPHandler`, which could happen on fatal error. [#65744](https://github.com/ClickHouse/ClickHouse/pull/65744) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix invalid exceptions in function `parseDateTime` with `%F` and `%D` placeholders. [#65768](https://github.com/ClickHouse/ClickHouse/pull/65768) ([Antonio Andelic](https://github.com/antonio2368)).
+* For queries that read from `PostgreSQL`, cancel the internal `PostgreSQL` query if the ClickHouse query is finished. Otherwise, `ClickHouse` query cannot be canceled until the internal `PostgreSQL` query is finished. [#65771](https://github.com/ClickHouse/ClickHouse/pull/65771) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix a bug in short circuit logic when old analyzer and dictGetOrDefault is used. [#65802](https://github.com/ClickHouse/ClickHouse/pull/65802) ([jsc0218](https://github.com/jsc0218)).
+* Fix a bug leads to EmbeddedRocksDB with TTL write corrupted SST files. [#65816](https://github.com/ClickHouse/ClickHouse/pull/65816) ([Duc Canh Le](https://github.com/canhld94)).
+* Functions `bitTest`, `bitTestAll`, and `bitTestAny` now return an error if the specified bit index is out-of-bounds (issue [#65517](https://github.com/ClickHouse/ClickHouse/issues/65517)). [#65818](https://github.com/ClickHouse/ClickHouse/pull/65818) ([Pablo Marcos](https://github.com/pamarcos)).
+* Setting `join_any_take_last_row` is supported in any query with hash join. [#65820](https://github.com/ClickHouse/ClickHouse/pull/65820) ([vdimir](https://github.com/vdimir)).
+* Better handling of join conditions involving `IS NULL` checks (for example `ON (a = b AND (a IS NOT NULL) AND (b IS NOT NULL) ) OR ( (a IS NULL) AND (b IS NULL) )` is rewritten to `ON a <=> b`), fix incorrect optimization when condition other then `IS NULL` are present. [#65835](https://github.com/ClickHouse/ClickHouse/pull/65835) ([vdimir](https://github.com/vdimir)).
+* Functions `bitShiftLeft` and `bitShitfRight` return an error for out of bounds shift positions (issue [#65516](https://github.com/ClickHouse/ClickHouse/issues/65516)). [#65838](https://github.com/ClickHouse/ClickHouse/pull/65838) ([Pablo Marcos](https://github.com/pamarcos)).
+* Fix growing memory usage in S3Queue. [#65839](https://github.com/ClickHouse/ClickHouse/pull/65839) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix tie handling in `arrayAUC` to match sklearn. [#65840](https://github.com/ClickHouse/ClickHouse/pull/65840) ([gabrielmcg44](https://github.com/gabrielmcg44)).
+* Fix possible issues with MySQL server protocol TLS connections. [#65917](https://github.com/ClickHouse/ClickHouse/pull/65917) ([Azat Khuzhin](https://github.com/azat)).
+* Fix possible issues with MySQL client protocol TLS connections. [#65938](https://github.com/ClickHouse/ClickHouse/pull/65938) ([Azat Khuzhin](https://github.com/azat)).
+* Fix handling of `SSL_ERROR_WANT_READ`/`SSL_ERROR_WANT_WRITE` with zero timeout. [#65941](https://github.com/ClickHouse/ClickHouse/pull/65941) ([Azat Khuzhin](https://github.com/azat)).
+* Add missing settings `input_format_csv_skip_first_lines/input_format_tsv_skip_first_lines/input_format_csv_try_infer_numbers_from_strings/input_format_csv_try_infer_strings_from_quoted_tuples` in schema inference cache because they can change the resulting schema. It prevents from incorrect result of schema inference with these settings changed. [#65980](https://github.com/ClickHouse/ClickHouse/pull/65980) ([Kruglov Pavel](https://github.com/Avogar)).
+* Column _size in s3 engine and s3 table function denotes the size of a file inside the archive, not a size of the archive itself. [#65993](https://github.com/ClickHouse/ClickHouse/pull/65993) ([Daniil Ivanik](https://github.com/divanik)).
+* Fix resolving dynamic subcolumns in analyzer, avoid reading the whole column on dynamic subcolumn reading. [#66004](https://github.com/ClickHouse/ClickHouse/pull/66004) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix config merging for from_env with replace overrides. [#66034](https://github.com/ClickHouse/ClickHouse/pull/66034) ([Azat Khuzhin](https://github.com/azat)).
+* Fix a possible hanging in `GRPCServer` during shutdown. This PR fixes [#65622](https://github.com/ClickHouse/ClickHouse/issues/65622). [#66061](https://github.com/ClickHouse/ClickHouse/pull/66061) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix reading dynamic subcolumns from altered Memory table. Previously if `max_types` peremeter of a Dynamic type was changed in Memory table via alter, further subcolumns reading can return wrong result. [#66066](https://github.com/ClickHouse/ClickHouse/pull/66066) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fixed several cases in function `has` with non-constant `LowCardinality` arguments. [#66088](https://github.com/ClickHouse/ClickHouse/pull/66088) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix for `groupArrayIntersect`. It had incorrect behavior in the `merge()` function. Also, fixed behavior in `deserialise()` for numeric and general data. [#66103](https://github.com/ClickHouse/ClickHouse/pull/66103) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
+* Fixed buffer overflow bug in `unbin`/`unhex` implementation. [#66106](https://github.com/ClickHouse/ClickHouse/pull/66106) ([Nikita Taranov](https://github.com/nickitat)).
+* Disable the `merge-filters` optimization introduced in [#64760](https://github.com/ClickHouse/ClickHouse/issues/64760). It may cause an exception if optimization merges two filter expressions and does not apply a short-circuit evaluation. [#66126](https://github.com/ClickHouse/ClickHouse/pull/66126) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed the issue when the server failed to parse Avro files with negative block size arrays encoded, which is now allowed by the Avro specification. [#66130](https://github.com/ClickHouse/ClickHouse/pull/66130) ([Serge Klochkov](https://github.com/slvrtrn)).
+* Fixed a bug in ZooKeeper client: a session could get stuck in unusable state after receiving a hardware error from ZooKeeper. For example, this might happen due to "soft memory limit" in ClickHouse Keeper. [#66140](https://github.com/ClickHouse/ClickHouse/pull/66140) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix issue in SumIfToCountIfVisitor and signed integers. [#66146](https://github.com/ClickHouse/ClickHouse/pull/66146) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix rare case with missing data in the result of distributed query, close [#61432](https://github.com/ClickHouse/ClickHouse/issues/61432). [#66174](https://github.com/ClickHouse/ClickHouse/pull/66174) ([vdimir](https://github.com/vdimir)).
+* Fix order of parsing metadata fields in StorageDeltaLake. [#66211](https://github.com/ClickHouse/ClickHouse/pull/66211) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Don't throw `TIMEOUT_EXCEEDED` for `none_only_active` mode of `distributed_ddl_output_mode`. [#66218](https://github.com/ClickHouse/ClickHouse/pull/66218) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix handling limit for `system.numbers_mt` when no index can be used. [#66231](https://github.com/ClickHouse/ClickHouse/pull/66231) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
+* Fixed how the ClickHouse server detects the maximum number of usable CPU cores as specified by cgroups v2 if the server runs in a container such as Docker. In more detail, containers often run their process in the root cgroup which has an empty name. In that case, ClickHouse ignored the CPU limits set by cgroups v2. [#66237](https://github.com/ClickHouse/ClickHouse/pull/66237) ([filimonov](https://github.com/filimonov)).
+* Fix the `Not-ready set` error when a subquery with `IN` is used in the constraint. [#66261](https://github.com/ClickHouse/ClickHouse/pull/66261) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix indexHint function case found by fuzzer. [#66286](https://github.com/ClickHouse/ClickHouse/pull/66286) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix error reporting while copying to S3 or AzureBlobStorage. [#66295](https://github.com/ClickHouse/ClickHouse/pull/66295) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Prevent watchdog from keeping descriptors of unlinked(rotated) log files. [#66334](https://github.com/ClickHouse/ClickHouse/pull/66334) ([Aleksei Filatov](https://github.com/aalexfvk)).
+* Fix the bug that logicalexpressionoptimizerpass lost logical type of constant. closes [#64487](https://github.com/ClickHouse/ClickHouse/issues/64487). [#66344](https://github.com/ClickHouse/ClickHouse/pull/66344) ([pn](https://github.com/chloro-pn)).
+* Fix `Column identifier is already registered` error with `group_by_use_nulls=true` and new analyzer. [#66400](https://github.com/ClickHouse/ClickHouse/pull/66400) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix possible incorrect result for queries joining and filtering table external engine (like PostgreSQL), due to too aggressive filter pushdown. Since now, conditions from where section won't be send to external database in case of outer join with external table. [#66402](https://github.com/ClickHouse/ClickHouse/pull/66402) ([vdimir](https://github.com/vdimir)).
+* Added missing column materialization for cross join. [#66413](https://github.com/ClickHouse/ClickHouse/pull/66413) ([lgbo](https://github.com/lgbo-ustc)).
+* Fix `Cannot find column` error for queries with constant expression in `GROUP BY` key and new analyzer enabled. [#66433](https://github.com/ClickHouse/ClickHouse/pull/66433) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Avoid possible logical error during import from Npy format in case of bad array nesting level, fix testing of other kinds of errors. [#66461](https://github.com/ClickHouse/ClickHouse/pull/66461) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
+* Fix wrong count() result when there is non-deterministic function in predicate. [#66510](https://github.com/ClickHouse/ClickHouse/pull/66510) ([Duc Canh Le](https://github.com/canhld94)).
+* Correctly track memory for `Allocator::realloc`. [#66548](https://github.com/ClickHouse/ClickHouse/pull/66548) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix reading of uninitialized memory when hashing empty tuples. This closes [#66559](https://github.com/ClickHouse/ClickHouse/issues/66559). [#66562](https://github.com/ClickHouse/ClickHouse/pull/66562) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix an invalid result for queries with `WINDOW`. This could happen when `PARTITION` columns have sparse serialization and window functions are executed in parallel. [#66579](https://github.com/ClickHouse/ClickHouse/pull/66579) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix removing named collections in local storage. [#66599](https://github.com/ClickHouse/ClickHouse/pull/66599) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
+* Fix logical error in `PrometheusRequestHandler`. [#66621](https://github.com/ClickHouse/ClickHouse/pull/66621) ([Vitaly Baranov](https://github.com/vitlibar)).
+* `column_length` is not updated in `ColumnTuple::insertManyFrom`. [#66626](https://github.com/ClickHouse/ClickHouse/pull/66626) ([lgbo](https://github.com/lgbo-ustc)).
+* Fix `Unknown identifier` and `Column is not under aggregate function` errors for queries with the expression `(column IS NULL).` The bug was triggered by [#65088](https://github.com/ClickHouse/ClickHouse/issues/65088), with the disabled analyzer only. [#66654](https://github.com/ClickHouse/ClickHouse/pull/66654) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix `Method getResultType is not supported for QUERY query node` error when scalar subquery was used as the first argument of IN (with new analyzer). [#66655](https://github.com/ClickHouse/ClickHouse/pull/66655) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix possible PARAMETER_OUT_OF_BOUND error during reading variant subcolumn. [#66659](https://github.com/ClickHouse/ClickHouse/pull/66659) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix rare case of stuck merge after drop column. [#66707](https://github.com/ClickHouse/ClickHouse/pull/66707) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix assertion `isUniqTypes` when insert select from remote sources. [#66722](https://github.com/ClickHouse/ClickHouse/pull/66722) ([Sema Checherinda](https://github.com/CheSema)).
+* Backported in [#67026](https://github.com/ClickHouse/ClickHouse/issues/67026): In rare cases ClickHouse could consider parts as broken because of some unexpected projections on disk. Now it's fixed. [#66898](https://github.com/ClickHouse/ClickHouse/pull/66898) ([alesapin](https://github.com/alesapin)).
+* Backported in [#67443](https://github.com/ClickHouse/ClickHouse/issues/67443): Forbid create as select even when database_replicated_allow_heavy_create is set. It was unconditionally forbidden in 23.12 and accidentally allowed under the setting in unreleased 24.7. [#66980](https://github.com/ClickHouse/ClickHouse/pull/66980) ([vdimir](https://github.com/vdimir)).
+* Backported in [#67201](https://github.com/ClickHouse/ClickHouse/issues/67201): TRUNCATE DATABASE used to stop replication as if it was a DROP DATABASE query, it's fixed. [#67129](https://github.com/ClickHouse/ClickHouse/pull/67129) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Backported in [#67383](https://github.com/ClickHouse/ClickHouse/issues/67383): Fix error `Cannot convert column because it is non constant in source stream but must be constant in result.` for a query that reads from the `Merge` table over the `Distriburted` table with one shard. [#67146](https://github.com/ClickHouse/ClickHouse/pull/67146) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Backported in [#67246](https://github.com/ClickHouse/ClickHouse/issues/67246): This closes [#67156](https://github.com/ClickHouse/ClickHouse/issues/67156). This closes [#66447](https://github.com/ClickHouse/ClickHouse/issues/66447). The bug was introduced in https://github.com/ClickHouse/ClickHouse/pull/62907. [#67178](https://github.com/ClickHouse/ClickHouse/pull/67178) ([Maksim Kita](https://github.com/kitaisreal)).
+
+#### Build/Testing/Packaging Improvement
+* Instantiate template methods ahead in different .cpp files, avoid too large translation units during compiling. [#64818](https://github.com/ClickHouse/ClickHouse/pull/64818) ([lgbo](https://github.com/lgbo-ustc)).
+* Stateless tests: Improve tests speed and decrease number of parallel jobs. [#65186](https://github.com/ClickHouse/ClickHouse/pull/65186) ([Nikita Fomichev](https://github.com/fm4v)).
+* Add tests for `base64URLEncode` and `base64URLDecode`. Add analyzer tests. [#65979](https://github.com/ClickHouse/ClickHouse/pull/65979) ([Nikita Fomichev](https://github.com/fm4v)).
+* Fix problem when github terminate instances by timeout and artifacts are not collected and full test report is not generated. [#66036](https://github.com/ClickHouse/ClickHouse/pull/66036) ([Nikita Fomichev](https://github.com/fm4v)).
+* Fix test [test_grpc_protocol/test.py::test_progress](https://s3.amazonaws.com/clickhouse-test-reports/57695/188f8a3df74caf830ad1ced3c4cf6dfb0aa90093/integration_tests__asan__old_analyzer__[4_6].html). [#66063](https://github.com/ClickHouse/ClickHouse/pull/66063) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Stateless tests: Improve tests speed and decrease number of parallel jobs. [#66305](https://github.com/ClickHouse/ClickHouse/pull/66305) ([Nikita Fomichev](https://github.com/fm4v)).
+* Stateless tests: Improve tests speed and decrease number of parallel jobs 3. [#66363](https://github.com/ClickHouse/ClickHouse/pull/66363) ([Nikita Fomichev](https://github.com/fm4v)).
+* Tests: fix tests hang up in cases when gdb catches error. [#66411](https://github.com/ClickHouse/ClickHouse/pull/66411) ([Nikita Fomichev](https://github.com/fm4v)).
+* ... since [Release v24.6.1.4423-stable](https://github.com/ClickHouse/ClickHouse/releases/tag/v24.6.1.4423-stable) when build in ppc64le with dynamic openssl build (`cmake -DENABLE_OPENSSL_DYNAMIC=1 -DCMAKE_TOOLCHAIN_FILE= cmake/linux/toolchain-ppc64le.cmake `) got error: ` ld.lld: error: duplicate symbol: OPENSSL_cleanse`. [#66733](https://github.com/ClickHouse/ClickHouse/pull/66733) ([Yong Wang](https://github.com/kashwy)).
+
+#### NO CL CATEGORY
+
+* Backported in [#67084](https://github.com/ClickHouse/ClickHouse/issues/67084):. [#67040](https://github.com/ClickHouse/ClickHouse/pull/67040) ([Raúl Marín](https://github.com/Algunenano)).
+* Backported in [#67452](https://github.com/ClickHouse/ClickHouse/issues/67452):. [#67392](https://github.com/ClickHouse/ClickHouse/pull/67392) ([alesapin](https://github.com/alesapin)).
+
+#### NO CL ENTRY
+
+* NO CL ENTRY:  'Revert "Revert "Small fix for 02340_parts_refcnt_mergetree""'. [#65155](https://github.com/ClickHouse/ClickHouse/pull/65155) ([Nikita Taranov](https://github.com/nickitat)).
+* NO CL ENTRY:  'Revert "Use 1MB HTTP buffers to avoid frequent send syscalls"'. [#65498](https://github.com/ClickHouse/ClickHouse/pull/65498) ([Sergei Trifonov](https://github.com/serxa)).
+* NO CL ENTRY:  'Revert "Resubmit http_external_tables_memory_tracking test"'. [#65500](https://github.com/ClickHouse/ClickHouse/pull/65500) ([Nikita Taranov](https://github.com/nickitat)).
+* NO CL ENTRY:  'Revert "Add an assertion in ReplicatedMergeTreeQueue"'. [#65686](https://github.com/ClickHouse/ClickHouse/pull/65686) ([Raúl Marín](https://github.com/Algunenano)).
+* NO CL ENTRY:  'Revert "insertion deduplication on retries for materialised views"'. [#66134](https://github.com/ClickHouse/ClickHouse/pull/66134) ([Sema Checherinda](https://github.com/CheSema)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Return and fix 01600_parts_states_metrics_long test. [#58748](https://github.com/ClickHouse/ClickHouse/pull/58748) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Add azure_cache as storage policy to tests. [#59943](https://github.com/ClickHouse/ClickHouse/pull/59943) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
+* Minor: replaced expression with LEGACY_MAX_LEVEL. [#61268](https://github.com/ClickHouse/ClickHouse/pull/61268) ([Vasily Nemkov](https://github.com/Enmk)).
+* Make write to temporary data in cache do all checks and assertions as during write to ordinary cache. [#63348](https://github.com/ClickHouse/ClickHouse/pull/63348) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Refactoring near azure blob storage. [#63636](https://github.com/ClickHouse/ClickHouse/pull/63636) ([Anton Popov](https://github.com/CurtizJ)).
+* Everything should work with Analyzer. [#63643](https://github.com/ClickHouse/ClickHouse/pull/63643) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* add some log for non using detached tables. [#64992](https://github.com/ClickHouse/ClickHouse/pull/64992) ([Konstantin Morozov](https://github.com/k-morozov)).
+* Remove dag flags. [#65234](https://github.com/ClickHouse/ClickHouse/pull/65234) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix flaky autocompletion test. [#65246](https://github.com/ClickHouse/ClickHouse/pull/65246) ([Konstantin Bogdanov](https://github.com/thevar1able)).
+* Disable userspace page cache by default. [#65305](https://github.com/ClickHouse/ClickHouse/pull/65305) ([Michael Kolupaev](https://github.com/al13n321)).
+* Update version_date.tsv and changelogs after v24.4.3.25-stable. [#65308](https://github.com/ClickHouse/ClickHouse/pull/65308) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Do not raise a NOT_IMPLEMENTED error when getting s3 metrics with a multiple disk configuration. [#65403](https://github.com/ClickHouse/ClickHouse/pull/65403) ([Elena Torró](https://github.com/elenatorro)).
+* Dodging reading from wrong table with parallel replicas. [#65417](https://github.com/ClickHouse/ClickHouse/pull/65417) ([Nikita Taranov](https://github.com/nickitat)).
+* Fix: return error if can't connect to any replicas chosen for query execution. [#65467](https://github.com/ClickHouse/ClickHouse/pull/65467) ([Igor Nikonov](https://github.com/devcrafter)).
+* Fix `AzureObjectStorage::exists` method. [#65471](https://github.com/ClickHouse/ClickHouse/pull/65471) ([Anton Popov](https://github.com/CurtizJ)).
+* Update version after release. [#65483](https://github.com/ClickHouse/ClickHouse/pull/65483) ([Raúl Marín](https://github.com/Algunenano)).
+* Generate 24.6 changelog. [#65485](https://github.com/ClickHouse/ClickHouse/pull/65485) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix of `PlanSquashingTransform`: pipeline stuck. [#65487](https://github.com/ClickHouse/ClickHouse/pull/65487) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
+* Fix bad test `02922_deduplication_with_zero_copy`. [#65492](https://github.com/ClickHouse/ClickHouse/pull/65492) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Disable clang-format in special areas. [#65495](https://github.com/ClickHouse/ClickHouse/pull/65495) ([Nikita Taranov](https://github.com/nickitat)).
+* Fix `test_keeper_snapshots`. [#65497](https://github.com/ClickHouse/ClickHouse/pull/65497) ([Antonio Andelic](https://github.com/antonio2368)).
+* Update to libunwind 8.1.7. [#65509](https://github.com/ClickHouse/ClickHouse/pull/65509) ([Michael Kolupaev](https://github.com/al13n321)).
+* Setting `uniform_snowflake_conversion_functions` (not in any release yet) was replaced by setting `allow_deprecated_snowflake_conversion_functions`. The latter controls if the legacy snowflake conversion functions are available (by default, they are not). [#65522](https://github.com/ClickHouse/ClickHouse/pull/65522) ([Robert Schulze](https://github.com/rschu1ze)).
+* Try CI without RerunCheck, jobs can be easily rerun manually though extra amount of work in CI will follow on workflow restart. [#65524](https://github.com/ClickHouse/ClickHouse/pull/65524) ([Max K.](https://github.com/maxknv)).
+* Bump re2 to latest HEAD. [#65526](https://github.com/ClickHouse/ClickHouse/pull/65526) ([Robert Schulze](https://github.com/rschu1ze)).
+* OpenSSL: Replace temporary fix for unsynchronized access by official fix. [#65529](https://github.com/ClickHouse/ClickHouse/pull/65529) ([Robert Schulze](https://github.com/rschu1ze)).
+* Update README.md. [#65531](https://github.com/ClickHouse/ClickHouse/pull/65531) ([Tyler Hannan](https://github.com/tylerhannan)).
+* CI: some time there are timeouts on DROP TABLES for random tests. [#65535](https://github.com/ClickHouse/ClickHouse/pull/65535) ([Sema Checherinda](https://github.com/CheSema)).
+* Synchronize `MARK_CACHE_SIZE` value in default settings and config. [#65547](https://github.com/ClickHouse/ClickHouse/pull/65547) ([Denny Crane](https://github.com/den-crane)).
+* CI: Skip removed test files in stateless flaky check job. [#65553](https://github.com/ClickHouse/ClickHouse/pull/65553) ([Max K.](https://github.com/maxknv)).
+* Renames Build report jobs. [#65554](https://github.com/ClickHouse/ClickHouse/pull/65554) ([Max K.](https://github.com/maxknv)).
+* Parse user from URL for dashboard.html (useful for sharing). [#65556](https://github.com/ClickHouse/ClickHouse/pull/65556) ([Azat Khuzhin](https://github.com/azat)).
+* Remove tech debt. [#65561](https://github.com/ClickHouse/ClickHouse/pull/65561) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Maybe fix test `00763_lock_buffer_long.sh`. [#65562](https://github.com/ClickHouse/ClickHouse/pull/65562) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix clickhouse-keeper with not system-wide directories and provide override for local development. [#65563](https://github.com/ClickHouse/ClickHouse/pull/65563) ([Azat Khuzhin](https://github.com/azat)).
+* Re-configure yamllint to allow document-start. [#65565](https://github.com/ClickHouse/ClickHouse/pull/65565) ([Azat Khuzhin](https://github.com/azat)).
+* Fix flaky test `01254_dict_load_after_detach_attach.sql`. [#65571](https://github.com/ClickHouse/ClickHouse/pull/65571) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Improve flaky test to provide more diagnostics. [#65586](https://github.com/ClickHouse/ClickHouse/pull/65586) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix test_parallel_replicas_distributed_skip_shards flakiness. [#65588](https://github.com/ClickHouse/ClickHouse/pull/65588) ([Igor Nikonov](https://github.com/devcrafter)).
+* Fix an error in the test about metadata_type. [#65592](https://github.com/ClickHouse/ClickHouse/pull/65592) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix slow test. [#65593](https://github.com/ClickHouse/ClickHouse/pull/65593) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* fix flaky 02864_statistics_uniq. [#65599](https://github.com/ClickHouse/ClickHouse/pull/65599) ([Han Fei](https://github.com/hanfei1991)).
+* Fix 03172_error_log_table_not_empty. [#65604](https://github.com/ClickHouse/ClickHouse/pull/65604) ([Pablo Marcos](https://github.com/pamarcos)).
+* Enable realtime digest for Jepsen tests. [#65608](https://github.com/ClickHouse/ClickHouse/pull/65608) ([Antonio Andelic](https://github.com/antonio2368)).
+* CI: Return Job Rerun check. [#65613](https://github.com/ClickHouse/ClickHouse/pull/65613) ([Max K.](https://github.com/maxknv)).
+* Update CHANGELOG.md. [#65624](https://github.com/ClickHouse/ClickHouse/pull/65624) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Module is required for authenticating in GH (in cloud). [#65628](https://github.com/ClickHouse/ClickHouse/pull/65628) ([Max K.](https://github.com/maxknv)).
+* Update IObjectStorage.h. [#65631](https://github.com/ClickHouse/ClickHouse/pull/65631) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix 02834_apache_arrow_abort flakiness with MSAN. [#65640](https://github.com/ClickHouse/ClickHouse/pull/65640) ([Michael Kolupaev](https://github.com/al13n321)).
+* Fix overflow in StorageWindowView. [#65641](https://github.com/ClickHouse/ClickHouse/pull/65641) ([Michael Kolupaev](https://github.com/al13n321)).
+* Fix inconsistent AST formatting when a keyword is used as type name. [#65648](https://github.com/ClickHouse/ClickHouse/pull/65648) ([Michael Kolupaev](https://github.com/al13n321)).
+* CI: Single point of setting mergeable check status. [#65658](https://github.com/ClickHouse/ClickHouse/pull/65658) ([Max K.](https://github.com/maxknv)).
+* Miscellaneous and insignificant changes around Client/ClientBase. [#65669](https://github.com/ClickHouse/ClickHouse/pull/65669) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Add Replicated database names to ZooKeeper for introspection. [#65675](https://github.com/ClickHouse/ClickHouse/pull/65675) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Introduce type contract checks in `IColumn`. [#65687](https://github.com/ClickHouse/ClickHouse/pull/65687) ([Nikita Taranov](https://github.com/nickitat)).
+* Print slightly more information in 02982_aggregation_states_destruction. [#65688](https://github.com/ClickHouse/ClickHouse/pull/65688) ([Michael Kolupaev](https://github.com/al13n321)).
+* Disable stacktrace collection in GWPAsan by default. [#65701](https://github.com/ClickHouse/ClickHouse/pull/65701) ([Antonio Andelic](https://github.com/antonio2368)).
+* Build jemalloc with profiler. [#65702](https://github.com/ClickHouse/ClickHouse/pull/65702) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix duplicate symbol linkage error. [#65705](https://github.com/ClickHouse/ClickHouse/pull/65705) ([Nikita Taranov](https://github.com/nickitat)).
+* Fix server restarts in performance tests. [#65717](https://github.com/ClickHouse/ClickHouse/pull/65717) ([Antonio Andelic](https://github.com/antonio2368)).
+* Update 03002_part_log_rmt_fetch_mutate_error.sql. [#65720](https://github.com/ClickHouse/ClickHouse/pull/65720) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix bug with session closing in Keeper. [#65735](https://github.com/ClickHouse/ClickHouse/pull/65735) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix flaky `02265_column_ttl`. Closes [#65719](https://github.com/ClickHouse/ClickHouse/issues/65719). [#65742](https://github.com/ClickHouse/ClickHouse/pull/65742) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
+* See [#65745](https://github.com/ClickHouse/ClickHouse/issues/65745). It doesn't solve the issue, but helps a bit. [#65746](https://github.com/ClickHouse/ClickHouse/pull/65746) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Update CHANGELOG.md. [#65752](https://github.com/ClickHouse/ClickHouse/pull/65752) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* document declarative ssh-keys authentication. [#65756](https://github.com/ClickHouse/ClickHouse/pull/65756) ([Tobias Florek](https://github.com/ibotty)).
+* `base64En/Decode64Url` --> `base64En/Decode64URL`. [#65760](https://github.com/ClickHouse/ClickHouse/pull/65760) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix for issue [#65757](https://github.com/ClickHouse/ClickHouse/issues/65757). [#65763](https://github.com/ClickHouse/ClickHouse/pull/65763) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
+* Fix flaky `test_replicated_database::test_alter_attach`. [#65766](https://github.com/ClickHouse/ClickHouse/pull/65766) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix: progress bar for read in order queries. [#65769](https://github.com/ClickHouse/ClickHouse/pull/65769) ([Igor Nikonov](https://github.com/devcrafter)).
+* CI: Fix for Builds report job in backports and releases. [#65774](https://github.com/ClickHouse/ClickHouse/pull/65774) ([Max K.](https://github.com/maxknv)).
+* CI: New create release workflow. [#65775](https://github.com/ClickHouse/ClickHouse/pull/65775) ([Max K.](https://github.com/maxknv)).
+* fixed misspelled word. [#65778](https://github.com/ClickHouse/ClickHouse/pull/65778) ([Linh Giang](https://github.com/linhgiang24)).
+* Refactor statistics interface. [#65792](https://github.com/ClickHouse/ClickHouse/pull/65792) ([Robert Schulze](https://github.com/rschu1ze)).
+* Try to make `test_ldap_external_user_directory` less flaky. [#65794](https://github.com/ClickHouse/ClickHouse/pull/65794) ([Andrey Zvonov](https://github.com/zvonand)).
+* AMI image with gh and jwt. [#65795](https://github.com/ClickHouse/ClickHouse/pull/65795) ([Max K.](https://github.com/maxknv)).
+* Forbid join algorithm randomisation for 03094_one_thousand_joins. [#65798](https://github.com/ClickHouse/ClickHouse/pull/65798) ([Nikita Taranov](https://github.com/nickitat)).
+* Fix 02931_rewrite_sum_column_and_constant flakiness. [#65800](https://github.com/ClickHouse/ClickHouse/pull/65800) ([Michael Kolupaev](https://github.com/al13n321)).
+* Update StorageMaterializedView.cpp. [#65801](https://github.com/ClickHouse/ClickHouse/pull/65801) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Fix slow `getFQDNOrHostNameImpl` on macOS. [#65803](https://github.com/ClickHouse/ClickHouse/pull/65803) ([Konstantin Bogdanov](https://github.com/thevar1able)).
+* No jemalloc profiler for non-Linux. [#65834](https://github.com/ClickHouse/ClickHouse/pull/65834) ([Antonio Andelic](https://github.com/antonio2368)).
+* Add missing workload identity changes. [#65848](https://github.com/ClickHouse/ClickHouse/pull/65848) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
+* Fix rocksdb. [#65858](https://github.com/ClickHouse/ClickHouse/pull/65858) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Update the list of easy tasks. [#65865](https://github.com/ClickHouse/ClickHouse/pull/65865) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Update CHANGELOG.md. [#65866](https://github.com/ClickHouse/ClickHouse/pull/65866) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* This closes [#43003](https://github.com/ClickHouse/ClickHouse/issues/43003). [#65870](https://github.com/ClickHouse/ClickHouse/pull/65870) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Uninteresting changes. [#65871](https://github.com/ClickHouse/ClickHouse/pull/65871) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Max sessions for user tests improvements. [#65888](https://github.com/ClickHouse/ClickHouse/pull/65888) ([Alexey Gerasimchuck](https://github.com/Demilivor)).
+* Update version_date.tsv and changelogs after v24.6.1.4423-stable. [#65909](https://github.com/ClickHouse/ClickHouse/pull/65909) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Remove standalone Keeper build. [#65910](https://github.com/ClickHouse/ClickHouse/pull/65910) ([Antonio Andelic](https://github.com/antonio2368)).
+* Add extra profiling helpers for Keeper. [#65918](https://github.com/ClickHouse/ClickHouse/pull/65918) ([Antonio Andelic](https://github.com/antonio2368)).
+* PostgreSQL source cancel query comments. [#65919](https://github.com/ClickHouse/ClickHouse/pull/65919) ([Maksim Kita](https://github.com/kitaisreal)).
+* Remove mysqlxx::Pool::Entry assignment operator. [#65920](https://github.com/ClickHouse/ClickHouse/pull/65920) ([Azat Khuzhin](https://github.com/azat)).
+* No random settings for a test with `Object(JSON)`. [#65921](https://github.com/ClickHouse/ClickHouse/pull/65921) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Follow up to [#65046](https://github.com/ClickHouse/ClickHouse/issues/65046). [#65928](https://github.com/ClickHouse/ClickHouse/pull/65928) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* add restriction for storage join. [#65936](https://github.com/ClickHouse/ClickHouse/pull/65936) ([Han Fei](https://github.com/hanfei1991)).
+* Update version_date.tsv and changelogs after v24.5.4.49-stable. [#65937](https://github.com/ClickHouse/ClickHouse/pull/65937) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Add table name to MergeTreeSource spans. [#65940](https://github.com/ClickHouse/ClickHouse/pull/65940) ([Nikita Taranov](https://github.com/nickitat)).
+* Fix SettingsChangesHistory 24.7. [#65945](https://github.com/ClickHouse/ClickHouse/pull/65945) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix logical error "Expected ReadBufferFromFile, but got DB::EmptyReadBuffer". [#65949](https://github.com/ClickHouse/ClickHouse/pull/65949) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Use -Og instead of -O0 for debug builds. [#65953](https://github.com/ClickHouse/ClickHouse/pull/65953) ([Michael Kolupaev](https://github.com/al13n321)).
+* Fix data race for Keeper snapshot queue. [#65970](https://github.com/ClickHouse/ClickHouse/pull/65970) ([Antonio Andelic](https://github.com/antonio2368)).
+* Minor changes in CHANGELOG. [#65971](https://github.com/ClickHouse/ClickHouse/pull/65971) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Remove unnatural punctuation from Parquet. [#65972](https://github.com/ClickHouse/ClickHouse/pull/65972) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Try fix "Check timeout expired" without any server logs in report in stateless tests. [#65977](https://github.com/ClickHouse/ClickHouse/pull/65977) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix support of non-const scale arguments in rounding functions. [#65983](https://github.com/ClickHouse/ClickHouse/pull/65983) ([Mikhail Gorshkov](https://github.com/mgorshkov)).
+* More aesthetic error messages. [#65985](https://github.com/ClickHouse/ClickHouse/pull/65985) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix race in s3queue. [#65986](https://github.com/ClickHouse/ClickHouse/pull/65986) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Now it's possible to specify `s3-storage`, `azure-object-storage` and in general `object-storage`. [#65988](https://github.com/ClickHouse/ClickHouse/pull/65988) ([alesapin](https://github.com/alesapin)).
+* Fix flaky test_storage_s3_queue tests. [#66009](https://github.com/ClickHouse/ClickHouse/pull/66009) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Relax the check in 02982_aggregation_states_destruction. [#66011](https://github.com/ClickHouse/ClickHouse/pull/66011) ([Nikita Taranov](https://github.com/nickitat)).
+* Fix `01158_zookeeper_log_long`. [#66012](https://github.com/ClickHouse/ClickHouse/pull/66012) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Remove scary jemalloc log. [#66028](https://github.com/ClickHouse/ClickHouse/pull/66028) ([Antonio Andelic](https://github.com/antonio2368)).
+* Move experimental settings to the experimental block. [#66030](https://github.com/ClickHouse/ClickHouse/pull/66030) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix lock-order-inversion in DatabaseCatalog. [#66038](https://github.com/ClickHouse/ClickHouse/pull/66038) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Try disabling jemalloc background threads. [#66041](https://github.com/ClickHouse/ClickHouse/pull/66041) ([Antonio Andelic](https://github.com/antonio2368)).
+* Try to avoid conflicts in `SettingsChangesHistory.cpp`. [#66042](https://github.com/ClickHouse/ClickHouse/pull/66042) ([Anton Popov](https://github.com/CurtizJ)).
+* Add profile events for regex cache. [#66050](https://github.com/ClickHouse/ClickHouse/pull/66050) ([Antonio Andelic](https://github.com/antonio2368)).
+* Bump vectorscan to 5.4.10.1. [#66056](https://github.com/ClickHouse/ClickHouse/pull/66056) ([Robert Schulze](https://github.com/rschu1ze)).
+* Remove obsolete comment. [#66059](https://github.com/ClickHouse/ClickHouse/pull/66059) ([Robert Schulze](https://github.com/rschu1ze)).
+* Maybe fix tsan assert in `test_mysql_killed_while_insert_8_0`. [#66064](https://github.com/ClickHouse/ClickHouse/pull/66064) ([Robert Schulze](https://github.com/rschu1ze)).
+* Move some of `HTTPHandler` stuff to separate source files in order to reuse it in `PrometheusRequestHandler`. This PR is required for https://github.com/ClickHouse/ClickHouse/pull/64183. [#66067](https://github.com/ClickHouse/ClickHouse/pull/66067) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Bump rocksdb to v6.23.3. [#66068](https://github.com/ClickHouse/ClickHouse/pull/66068) ([Robert Schulze](https://github.com/rschu1ze)).
+* Add protobufs for `Prometheus` `remote-write` / `remote-read` protocols to our repository. Fix cmake script for compiling protobufs. [#66069](https://github.com/ClickHouse/ClickHouse/pull/66069) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Use pinned versions of all python packages in CI docker images. Also makes clang-18.1.8 work with sanitizers and surprisingly fixes [#66049](https://github.com/ClickHouse/ClickHouse/issues/66049). [#66070](https://github.com/ClickHouse/ClickHouse/pull/66070) ([alesapin](https://github.com/alesapin)).
+* Clean-up custom LLVM 15 patches. [#66072](https://github.com/ClickHouse/ClickHouse/pull/66072) ([Robert Schulze](https://github.com/rschu1ze)).
+* Minor JWT client fixes. [#66073](https://github.com/ClickHouse/ClickHouse/pull/66073) ([Konstantin Bogdanov](https://github.com/thevar1able)).
+* Bump vectorscan to 5.4.11. [#66082](https://github.com/ClickHouse/ClickHouse/pull/66082) ([Robert Schulze](https://github.com/rschu1ze)).
+* Print stacktrace in case of abort after logical error. [#66091](https://github.com/ClickHouse/ClickHouse/pull/66091) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* fix flaky 03172_error_log_table_not_empty. [#66093](https://github.com/ClickHouse/ClickHouse/pull/66093) ([Sema Checherinda](https://github.com/CheSema)).
+* Bump s2geometry to latest master. [#66094](https://github.com/ClickHouse/ClickHouse/pull/66094) ([Robert Schulze](https://github.com/rschu1ze)).
+* update keeper bench example config file. [#66095](https://github.com/ClickHouse/ClickHouse/pull/66095) ([Han Fei](https://github.com/hanfei1991)).
+* Avoid using source directory for generated files. [#66097](https://github.com/ClickHouse/ClickHouse/pull/66097) ([Azat Khuzhin](https://github.com/azat)).
+* More precise warning message about sanitizers. [#66098](https://github.com/ClickHouse/ClickHouse/pull/66098) ([Anton Popov](https://github.com/CurtizJ)).
+* Slightly better calculation of primary index. [#66099](https://github.com/ClickHouse/ClickHouse/pull/66099) ([Anton Popov](https://github.com/CurtizJ)).
+* Bump Azure to 1.12. [#66100](https://github.com/ClickHouse/ClickHouse/pull/66100) ([Robert Schulze](https://github.com/rschu1ze)).
+* Add a test for [#58998](https://github.com/ClickHouse/ClickHouse/issues/58998). [#66101](https://github.com/ClickHouse/ClickHouse/pull/66101) ([Anton Popov](https://github.com/CurtizJ)).
+* CI: Fix sync pr merge. [#66105](https://github.com/ClickHouse/ClickHouse/pull/66105) ([Max K.](https://github.com/maxknv)).
+* Remove flaky case from 02956_rocksdb_bulk_sink. [#66107](https://github.com/ClickHouse/ClickHouse/pull/66107) ([vdimir](https://github.com/vdimir)).
+* Fix bugfix checker. [#66120](https://github.com/ClickHouse/ClickHouse/pull/66120) ([Raúl Marín](https://github.com/Algunenano)).
+* Correctly print long processing requests in Keeper. [#66124](https://github.com/ClickHouse/ClickHouse/pull/66124) ([Antonio Andelic](https://github.com/antonio2368)).
+* Update version_date.tsv and changelogs after v24.6.2.17-stable. [#66127](https://github.com/ClickHouse/ClickHouse/pull/66127) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Bump s2geometry again. [#66136](https://github.com/ClickHouse/ClickHouse/pull/66136) ([Robert Schulze](https://github.com/rschu1ze)).
+* Switch submodule `contrib/orc` to a proper commit in the [main](https://github.com/ClickHouse/orc/tree/main) branch. Previously a commit from a removed branch was used ([see](https://github.com/ClickHouse/orc/pull/13)). [#66137](https://github.com/ClickHouse/ClickHouse/pull/66137) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Finalize MergedBlockOutputStream in dtor. [#66138](https://github.com/ClickHouse/ClickHouse/pull/66138) ([Nikita Taranov](https://github.com/nickitat)).
+* Proper destruction order of AsyncLoader::Pool fields. [#66145](https://github.com/ClickHouse/ClickHouse/pull/66145) ([Sergei Trifonov](https://github.com/serxa)).
+* Playing minesweeper with build system. [#66147](https://github.com/ClickHouse/ClickHouse/pull/66147) ([Nikita Taranov](https://github.com/nickitat)).
+* Fix clang-tidy error in BufferWithOwnMemory.h. [#66161](https://github.com/ClickHouse/ClickHouse/pull/66161) ([Nikita Taranov](https://github.com/nickitat)).
+* Use peak_threads_usage instead of arrayUniq(thread_ids) in tests. [#66162](https://github.com/ClickHouse/ClickHouse/pull/66162) ([Azat Khuzhin](https://github.com/azat)).
+* Fix crash when adding empty tuple to query cache. [#66168](https://github.com/ClickHouse/ClickHouse/pull/66168) ([Michael Kolupaev](https://github.com/al13n321)).
+* tests: fix 01563_distributed_query_finish flakiness (due to system.*_log_sender). [#66171](https://github.com/ClickHouse/ClickHouse/pull/66171) ([Azat Khuzhin](https://github.com/azat)).
+* Refactor `OptimizeIfWithConstantConditionVisitor` using `InDepthNodeVisitor`. [#66184](https://github.com/ClickHouse/ClickHouse/pull/66184) ([zhongyuankai](https://github.com/zhongyuankai)).
+* Update README.md. [#66186](https://github.com/ClickHouse/ClickHouse/pull/66186) ([Tyler Hannan](https://github.com/tylerhannan)).
+* Fix 01246_buffer_flush flakiness. [#66188](https://github.com/ClickHouse/ClickHouse/pull/66188) ([Azat Khuzhin](https://github.com/azat)).
+* Avoid using harmful function `rand()` in grpc. [#66191](https://github.com/ClickHouse/ClickHouse/pull/66191) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Bump RocksDB. [#66216](https://github.com/ClickHouse/ClickHouse/pull/66216) ([Robert Schulze](https://github.com/rschu1ze)).
+* Update README.md. [#66217](https://github.com/ClickHouse/ClickHouse/pull/66217) ([Tyler Hannan](https://github.com/tylerhannan)).
+* Fixes peak_threads_usage metric when materialised views are involved. [#66230](https://github.com/ClickHouse/ClickHouse/pull/66230) ([Sema Checherinda](https://github.com/CheSema)).
+* Remove test as requested in https://github.com/ClickHouse/ClickHouse/pull/65277#issuecomment-2211361465. [#66233](https://github.com/ClickHouse/ClickHouse/pull/66233) ([Arthur Passos](https://github.com/arthurpassos)).
+* Fix test `00504_mergetree_arrays_rw.sql`. [#66248](https://github.com/ClickHouse/ClickHouse/pull/66248) ([Anton Popov](https://github.com/CurtizJ)).
+* CI: Do not finalize CI running status unless all success. [#66276](https://github.com/ClickHouse/ClickHouse/pull/66276) ([Max K.](https://github.com/maxknv)).
+* Collect core dumps in more tests. [#66281](https://github.com/ClickHouse/ClickHouse/pull/66281) ([Antonio Andelic](https://github.com/antonio2368)).
+* Add a stateless test for gRPC protocol. [#66284](https://github.com/ClickHouse/ClickHouse/pull/66284) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Log message: Failed to connect to replica ... [#66289](https://github.com/ClickHouse/ClickHouse/pull/66289) ([Igor Nikonov](https://github.com/devcrafter)).
+* Update run.sh. [#66290](https://github.com/ClickHouse/ClickHouse/pull/66290) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Some changes in the codebase as a preparation for LLVM 18. [#66293](https://github.com/ClickHouse/ClickHouse/pull/66293) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* There's some problem with iptables in parallel tests. [#66304](https://github.com/ClickHouse/ClickHouse/pull/66304) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Disable broken cases from 02911_join_on_nullsafe_optimization. [#66310](https://github.com/ClickHouse/ClickHouse/pull/66310) ([vdimir](https://github.com/vdimir)).
+* Build failure if ENABLE_AWS_S3 is OFF fixed. [#66335](https://github.com/ClickHouse/ClickHouse/pull/66335) ([Ilya Golshtein](https://github.com/ilejn)).
+* Enable checks in assert_cast under sanitizers. [#66336](https://github.com/ClickHouse/ClickHouse/pull/66336) ([Nikita Taranov](https://github.com/nickitat)).
+* Create release workflow. [#66339](https://github.com/ClickHouse/ClickHouse/pull/66339) ([Max K.](https://github.com/maxknv)).
+* Fix invalid XML. [#66342](https://github.com/ClickHouse/ClickHouse/pull/66342) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
+* Fix possible deadlock for jemalloc with enabled profiler. [#66346](https://github.com/ClickHouse/ClickHouse/pull/66346) ([Azat Khuzhin](https://github.com/azat)).
+* Fix test_parallel_replicas_custom_key. [#66349](https://github.com/ClickHouse/ClickHouse/pull/66349) ([Antonio Andelic](https://github.com/antonio2368)).
+* Collect logs from `minio` in stateless and statefull tests. [#66353](https://github.com/ClickHouse/ClickHouse/pull/66353) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
+* Fix "Sending a batch of X files to Y (0.00 rows, 0.00 B bytes)." in case of batch restoring. [#66375](https://github.com/ClickHouse/ClickHouse/pull/66375) ([Azat Khuzhin](https://github.com/azat)).
+* Fix 03030_system_flush_distributed_settings flakiness. [#66376](https://github.com/ClickHouse/ClickHouse/pull/66376) ([Azat Khuzhin](https://github.com/azat)).
+* PR cleanup: remove redundant code. [#66380](https://github.com/ClickHouse/ClickHouse/pull/66380) ([Igor Nikonov](https://github.com/devcrafter)).
+* New slack bot to post messages about CI events - Post message if OOM. [#66392](https://github.com/ClickHouse/ClickHouse/pull/66392) ([Max K.](https://github.com/maxknv)).
+* Ignore subquery for IN in DDLLoadingDependencyVisitor. [#66395](https://github.com/ClickHouse/ClickHouse/pull/66395) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Update test_storage_rabbitmq/test.py. [#66396](https://github.com/ClickHouse/ClickHouse/pull/66396) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Add query elapsed time for non-default format in play UI. [#66398](https://github.com/ClickHouse/ClickHouse/pull/66398) ([Azat Khuzhin](https://github.com/azat)).
+* Untangle setting headers. [#66404](https://github.com/ClickHouse/ClickHouse/pull/66404) ([Raúl Marín](https://github.com/Algunenano)).
+* Remove noisy message. [#66406](https://github.com/ClickHouse/ClickHouse/pull/66406) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* If job detected as in-progress in PR workflow run - just remove it from todo list, as it not affected by the change. [#66407](https://github.com/ClickHouse/ClickHouse/pull/66407) ([Max K.](https://github.com/maxknv)).
+* CI: CIBuddy to post from master only. [#66417](https://github.com/ClickHouse/ClickHouse/pull/66417) ([Max K.](https://github.com/maxknv)).
+* Add a test for [#66333](https://github.com/ClickHouse/ClickHouse/issues/66333). [#66432](https://github.com/ClickHouse/ClickHouse/pull/66432) ([max-vostrikov](https://github.com/max-vostrikov)).
+* Limit number of linker jobs on arm to avoid OOM during build. [#66435](https://github.com/ClickHouse/ClickHouse/pull/66435) ([Nikita Taranov](https://github.com/nickitat)).
+* [RFC] Fix jemalloc assertion due to non-monotonic CLOCK_MONOTONIC_COARSE. [#66439](https://github.com/ClickHouse/ClickHouse/pull/66439) ([Azat Khuzhin](https://github.com/azat)).
+* CI: Do not block CI on few number of test failures. [#66440](https://github.com/ClickHouse/ClickHouse/pull/66440) ([Max K.](https://github.com/maxknv)).
+* Stateless tests: fix flaky tests 01037_polygon_dicts*. [#66445](https://github.com/ClickHouse/ClickHouse/pull/66445) ([Nikita Fomichev](https://github.com/fm4v)).
+* Related to https://github.com/ClickHouse/ClickHouse/pull/62067 https://s3.amazonaws.com/clickhouse-test-reports/66410/5557dce188cabc7477bb4e874d47e3b80278ee66/stateless_tests__release_.html ``` 2024-07-12 16:04:29 +Queries for alter_table did not finish automatically after 250+ seconds 2024-07-12 16:04:29 +==================== QUERIES ==================== 2024-07-12 16:04:29 +Row 1: 2024-07-12 16:04:29 +────── 2024-07-12 16:04:29 +is_initial_query: 1 2024-07-12 16:04:29 +user: default 2024-07-12 16:04:29 +query_id: b43ffd7d-aee6-4161-aa82-bf9fff9d78c0 2024-07-12 16:04:29 +address: ::1 2024-07-12 16:04:29 +port: 58360 2024-07-12 16:04:29 +initial_user: default 2024-07-12 16:04:29 +initial_query_id: b43ffd7d-aee6-4161-aa82-bf9fff9d78c0 ... 2024-07-12 16:04:29 +query: OPTIMIZE TABLE alter_table0 FINAL ```. [#66460](https://github.com/ClickHouse/ClickHouse/pull/66460) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* OOM error was not visible since process is killed and status is not set Change sets ERROR status if job was killed. [#66463](https://github.com/ClickHouse/ClickHouse/pull/66463) ([Max K.](https://github.com/maxknv)).
+* Add AST fuzzers jobs for CI caching so that they can be skipped in PRs not related to build or tests. [#66468](https://github.com/ClickHouse/ClickHouse/pull/66468) ([Max K.](https://github.com/maxknv)).
+* If job with the same digest has been seen in master's CI it should be skipped in PR run. [#66471](https://github.com/ClickHouse/ClickHouse/pull/66471) ([Max K.](https://github.com/maxknv)).
+* CI: Check job's exit status and report if killed. [#66477](https://github.com/ClickHouse/ClickHouse/pull/66477) ([Max K.](https://github.com/maxknv)).
+* This closes [#37557](https://github.com/ClickHouse/ClickHouse/issues/37557). [#66482](https://github.com/ClickHouse/ClickHouse/pull/66482) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* CI: Add retry for GH set_status_comment call. [#66488](https://github.com/ClickHouse/ClickHouse/pull/66488) ([Max K.](https://github.com/maxknv)).
+* OpenSSL: Minor follow-up to [#66064](https://github.com/ClickHouse/ClickHouse/issues/66064). [#66489](https://github.com/ClickHouse/ClickHouse/pull/66489) ([Robert Schulze](https://github.com/rschu1ze)).
+* CI: Fix for job filtering in PRs. [#66490](https://github.com/ClickHouse/ClickHouse/pull/66490) ([Max K.](https://github.com/maxknv)).
+* CI: Create release workflow updates. [#66498](https://github.com/ClickHouse/ClickHouse/pull/66498) ([Max K.](https://github.com/maxknv)).
+* Add one more revision to ignore. [#66499](https://github.com/ClickHouse/ClickHouse/pull/66499) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Unit tests vomit a ton of garbage, see https://s3.amazonaws.com/clickhouse-test-reports/66457/0c82dc91f07b29ba503d7579c7d3ebecba532b73/unit_tests__tsan_/run.log - remove it. [#66501](https://github.com/ClickHouse/ClickHouse/pull/66501) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix double whitespace in EXPLAIN AST CREATE. [#66505](https://github.com/ClickHouse/ClickHouse/pull/66505) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix bad test `02530_dictionaries_update_field`. [#66507](https://github.com/ClickHouse/ClickHouse/pull/66507) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Https://play.clickhouse.com/play?user=play#u0vmrunuignozwnrx3n0yxj0x3rpbwusignozwnrx25hbwusihrlc3rfbmftzswgcmvwb3j0x3vybapguk9nignozwnrcwpxsevsrsbjagvja19zdgfydf90aw1lid49ig5vdygpic0gsu5urvjwquwgmjqwiehpvvikicagieforcbwdwxsx3jlcxvlc3rfbnvtymvyid0gmaogicagqu5eihrlc3rfc3rhdhvzice9icdts0lquevejwogicagqu5eihrlc3rfc3rhdhvziexjs0ugj0yljwogicagqu5eignozwnrx3n0yxr1cyahpsanc3vjy2vzcyckicagieforcbwb3npdglvbih0zxn0x25hbwusicdhcgfjagvfyxjyb3cnksa+idakt1jervigqlkgy2hly2tfc3rhcnrfdgltzq==. [#66508](https://github.com/ClickHouse/ClickHouse/pull/66508) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix MSan report in GRPC. [#66509](https://github.com/ClickHouse/ClickHouse/pull/66509) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* CI: Fix for skipping Builds_2 in PRs' CI. [#66512](https://github.com/ClickHouse/ClickHouse/pull/66512) ([Max K.](https://github.com/maxknv)).
+* CI: Do not block Tests_3 unless MAX_FAILED_TESTS exceeded. [#66513](https://github.com/ClickHouse/ClickHouse/pull/66513) ([Max K.](https://github.com/maxknv)).
+* Fix `02918_parallel_replicas_custom_key_unavailable_replica`. [#66516](https://github.com/ClickHouse/ClickHouse/pull/66516) ([Antonio Andelic](https://github.com/antonio2368)).
+* Stateless tests: improvements related to OOM of test runs. [#66520](https://github.com/ClickHouse/ClickHouse/pull/66520) ([Nikita Fomichev](https://github.com/fm4v)).
+* Tests: rename bad log names. [#66522](https://github.com/ClickHouse/ClickHouse/pull/66522) ([Nikita Fomichev](https://github.com/fm4v)).
+* Add additional log masking in CI. [#66523](https://github.com/ClickHouse/ClickHouse/pull/66523) ([Raúl Marín](https://github.com/Algunenano)).
+* CI: Multiple fixes for handling killed jobs. [#66524](https://github.com/ClickHouse/ClickHouse/pull/66524) ([Max K.](https://github.com/maxknv)).
+* Allow GWP Asan allocations only when initialization is finished. [#66526](https://github.com/ClickHouse/ClickHouse/pull/66526) ([Alexey Katsman](https://github.com/alexkats)).
+* Update 02443_detach_attach_partition.sh. [#66529](https://github.com/ClickHouse/ClickHouse/pull/66529) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Follow up [#66435](https://github.com/ClickHouse/ClickHouse/issues/66435). [#66530](https://github.com/ClickHouse/ClickHouse/pull/66530) ([Nikita Taranov](https://github.com/nickitat)).
+* fix log in keeper tcp handler. [#66531](https://github.com/ClickHouse/ClickHouse/pull/66531) ([Han Fei](https://github.com/hanfei1991)).
+* CI: Report job start and finish to CI DB. [#66533](https://github.com/ClickHouse/ClickHouse/pull/66533) ([Max K.](https://github.com/maxknv)).
+* Update 01396_inactive_replica_cleanup_nodes_zookeeper.sh. [#66535](https://github.com/ClickHouse/ClickHouse/pull/66535) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Add dedicated runner to libfuzzer, update docker. [#66551](https://github.com/ClickHouse/ClickHouse/pull/66551) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* fix tidy build. [#66552](https://github.com/ClickHouse/ClickHouse/pull/66552) ([Sema Checherinda](https://github.com/CheSema)).
+* No-op env change. [#66553](https://github.com/ClickHouse/ClickHouse/pull/66553) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix typo in new_delete.cpp. [#66554](https://github.com/ClickHouse/ClickHouse/pull/66554) ([alesapin](https://github.com/alesapin)).
+* Fix something in Fast Test. [#66558](https://github.com/ClickHouse/ClickHouse/pull/66558) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* update trusted contributors. [#66561](https://github.com/ClickHouse/ClickHouse/pull/66561) ([Xu Jia](https://github.com/XuJia0210)).
+* Delete bad test `02805_distributed_queries_timeouts`. [#66563](https://github.com/ClickHouse/ClickHouse/pull/66563) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* More clarity in the test `03001_consider_lwd_when_merge`. [#66564](https://github.com/ClickHouse/ClickHouse/pull/66564) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Stateless tests: temporary disable sequential tests in parallel. [#66585](https://github.com/ClickHouse/ClickHouse/pull/66585) ([Nikita Fomichev](https://github.com/fm4v)).
+* Move view targets to separate AST class `ASTViewTargets` in order to allow extending it to support more kinds of view targets. [#66590](https://github.com/ClickHouse/ClickHouse/pull/66590) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix bsdtar for @nikitamikhaylov. [#66592](https://github.com/ClickHouse/ClickHouse/pull/66592) ([alesapin](https://github.com/alesapin)).
+* CI: POC for Auto Releases. [#66593](https://github.com/ClickHouse/ClickHouse/pull/66593) ([Max K.](https://github.com/maxknv)).
+* Fix clang tidy after [#66402](https://github.com/ClickHouse/ClickHouse/issues/66402). [#66597](https://github.com/ClickHouse/ClickHouse/pull/66597) ([vdimir](https://github.com/vdimir)).
+* Adjust the runtime of some slow performance test. [#66619](https://github.com/ClickHouse/ClickHouse/pull/66619) ([Robert Schulze](https://github.com/rschu1ze)).
+* CI: Scale down AutoScaling Groups from runners. [#66622](https://github.com/ClickHouse/ClickHouse/pull/66622) ([Max K.](https://github.com/maxknv)).
+* Allow to run clang-tidy with clang-19. [#66625](https://github.com/ClickHouse/ClickHouse/pull/66625) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix terrible test @arthurpassos. [#66632](https://github.com/ClickHouse/ClickHouse/pull/66632) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix bad log message. [#66633](https://github.com/ClickHouse/ClickHouse/pull/66633) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Negative sign in prewhere optimization. [#66637](https://github.com/ClickHouse/ClickHouse/pull/66637) ([cangyin](https://github.com/cangyin)).
+* Closes [#66639](https://github.com/ClickHouse/ClickHouse/issues/66639#event-13533944949). [#66640](https://github.com/ClickHouse/ClickHouse/pull/66640) ([Kruglov Pavel](https://github.com/Avogar)).
+* Avoid generating named tuple for special keywords (null, true, false). [#66641](https://github.com/ClickHouse/ClickHouse/pull/66641) ([Amos Bird](https://github.com/amosbird)).
+* rearrange heavy tests 03008_deduplication. [#66642](https://github.com/ClickHouse/ClickHouse/pull/66642) ([Sema Checherinda](https://github.com/CheSema)).
+* Fix data race in S3::ClientCache. [#66644](https://github.com/ClickHouse/ClickHouse/pull/66644) ([Konstantin Morozov](https://github.com/k-morozov)).
+* CI: Remove aws lambda packages from oss. [#66651](https://github.com/ClickHouse/ClickHouse/pull/66651) ([Max K.](https://github.com/maxknv)).
+* Introduce separate DEBUG_OR_SANITIZER_BUILD macro. [#66652](https://github.com/ClickHouse/ClickHouse/pull/66652) ([Nikita Taranov](https://github.com/nickitat)).
+* Increase backoff because with slow builds sometimes 100ms is not enough to recover. [#66653](https://github.com/ClickHouse/ClickHouse/pull/66653) ([alesapin](https://github.com/alesapin)).
+* Fix wrong queries hung error because of 02044_url_glob_parallel_connection_refused. [#66657](https://github.com/ClickHouse/ClickHouse/pull/66657) ([Nikita Taranov](https://github.com/nickitat)).
+* add log for splitBlockIntoParts. [#66658](https://github.com/ClickHouse/ClickHouse/pull/66658) ([Han Fei](https://github.com/hanfei1991)).
+* Minor: Make `CaseSensitiveness` an enum class. [#66673](https://github.com/ClickHouse/ClickHouse/pull/66673) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix bad test `02210_processors_profile_log`. [#66684](https://github.com/ClickHouse/ClickHouse/pull/66684) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix something around clang-tidy. [#66694](https://github.com/ClickHouse/ClickHouse/pull/66694) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* ci: dump dmesg in case of OOM. [#66705](https://github.com/ClickHouse/ClickHouse/pull/66705) ([Azat Khuzhin](https://github.com/azat)).
+* fix clang tidy. [#66706](https://github.com/ClickHouse/ClickHouse/pull/66706) ([Han Fei](https://github.com/hanfei1991)).
+* Https://s3.amazonaws.com/clickhouse-test-reports/61109/5cf2b53f146c1a4f24d8212f9f810d587c46bfc0/stateless_tests__release_.html. [#66724](https://github.com/ClickHouse/ClickHouse/pull/66724) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Support one more case in JOIN ON ... IS NULL. [#66725](https://github.com/ClickHouse/ClickHouse/pull/66725) ([vdimir](https://github.com/vdimir)).
+* CI: Fix issue with a skipped Build report. [#66726](https://github.com/ClickHouse/ClickHouse/pull/66726) ([Max K.](https://github.com/maxknv)).
+* relax condition in test, remove unused counters. [#66730](https://github.com/ClickHouse/ClickHouse/pull/66730) ([Sema Checherinda](https://github.com/CheSema)).
+* Remove bad test `host_resolver_fail_count`. [#66731](https://github.com/ClickHouse/ClickHouse/pull/66731) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix bad test `03036_join_filter_push_down_equivalent_sets`. [#66736](https://github.com/ClickHouse/ClickHouse/pull/66736) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix bad tests `long_select_and_alter`. [#66737](https://github.com/ClickHouse/ClickHouse/pull/66737) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add test test_storage_mysql/test.py::test_joins. [#66743](https://github.com/ClickHouse/ClickHouse/pull/66743) ([vdimir](https://github.com/vdimir)).
+* Disallow build exclusion only by CI settings (ci_include_, ci_exclude_) to avoid running builds in auto sync prs. [#66744](https://github.com/ClickHouse/ClickHouse/pull/66744) ([Max K.](https://github.com/maxknv)).
+* Use non-existent address to check connection error at table creation. [#66760](https://github.com/ClickHouse/ClickHouse/pull/66760) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
+* Backported in [#67063](https://github.com/ClickHouse/ClickHouse/issues/67063): Increase asio pool size in case the server is tiny. [#66761](https://github.com/ClickHouse/ClickHouse/pull/66761) ([alesapin](https://github.com/alesapin)).
+* Fix flakiness of async insert tests due to adaptive timeout. [#66771](https://github.com/ClickHouse/ClickHouse/pull/66771) ([Raúl Marín](https://github.com/Algunenano)).
+* Attempt to fix flakiness of 01194_http_query_id. [#66774](https://github.com/ClickHouse/ClickHouse/pull/66774) ([Raúl Marín](https://github.com/Algunenano)).
+* Turn off randomization of harmful setting. [#66776](https://github.com/ClickHouse/ClickHouse/pull/66776) ([alesapin](https://github.com/alesapin)).
+* The number of batches was reduced in https://github.com/ClickHouse/ClickHouse/pull/65186, but then the parallel execution was disabled in https://github.com/ClickHouse/ClickHouse/pull/66585. So now tasks fail with timeout sometimes: https://s3.amazonaws.com/clickhouse-test-reports/66724/36275fdacc34206931f69087fe77539e25bbbedd/stateless_tests__tsan__s3_storage__[2_3].html. [#66783](https://github.com/ClickHouse/ClickHouse/pull/66783) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Remove obsolete code from CMakeLists. [#66786](https://github.com/ClickHouse/ClickHouse/pull/66786) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Stateless tests: split parallel tests more evenly. [#66787](https://github.com/ClickHouse/ClickHouse/pull/66787) ([Nikita Fomichev](https://github.com/fm4v)).
+* Fix test `02724_limit_num_mutations.sh`. [#66788](https://github.com/ClickHouse/ClickHouse/pull/66788) ([Anton Popov](https://github.com/CurtizJ)).
+* Better diagnostics in `test_disk_configuration`. [#66802](https://github.com/ClickHouse/ClickHouse/pull/66802) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix bad test `02950_part_log_bytes_uncompressed`. [#66803](https://github.com/ClickHouse/ClickHouse/pull/66803) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Better diagnostics for test trace_events_stress. [#66804](https://github.com/ClickHouse/ClickHouse/pull/66804) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Make test `00997_set_index_array` lighter. [#66817](https://github.com/ClickHouse/ClickHouse/pull/66817) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Miscellaneous. [#66818](https://github.com/ClickHouse/ClickHouse/pull/66818) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix inconsistent formatting of lambda functions inside composite types. [#66819](https://github.com/ClickHouse/ClickHouse/pull/66819) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Small fix in realloc memory tracking. [#66820](https://github.com/ClickHouse/ClickHouse/pull/66820) ([Antonio Andelic](https://github.com/antonio2368)).
+* Never await in CI on BuildReport - just redo (await can be longer) - Remove BuildReport if no build jobs in workflow (for instance: Docs change) - Do not fail CheckReadyForMerge job if the only non-green status is Cloud Sync. [#66822](https://github.com/ClickHouse/ClickHouse/pull/66822) ([Max K.](https://github.com/maxknv)).
+* Remove bad tests @azat. [#66823](https://github.com/ClickHouse/ClickHouse/pull/66823) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* CI: New Release workflow updates and fixes. [#66830](https://github.com/ClickHouse/ClickHouse/pull/66830) ([Max K.](https://github.com/maxknv)).
+* Fix signed integer overflow in function `age`. [#66831](https://github.com/ClickHouse/ClickHouse/pull/66831) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix RocksDB bs. [#66838](https://github.com/ClickHouse/ClickHouse/pull/66838) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Split a test for index. [#66839](https://github.com/ClickHouse/ClickHouse/pull/66839) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix inconsistent formatting of `NOT ((SELECT ...))`. [#66840](https://github.com/ClickHouse/ClickHouse/pull/66840) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Make test `01592_long_window_functions1` lighter. [#66841](https://github.com/ClickHouse/ClickHouse/pull/66841) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* What if I will change the test for SSL authentication?. [#66844](https://github.com/ClickHouse/ClickHouse/pull/66844) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Functions `[a-g]*`: Iterate over `input_rows_count` where appropriate. [#66846](https://github.com/ClickHouse/ClickHouse/pull/66846) ([Robert Schulze](https://github.com/rschu1ze)).
+* Revert libunwind patch. [#66850](https://github.com/ClickHouse/ClickHouse/pull/66850) ([Antonio Andelic](https://github.com/antonio2368)).
+* Split test 03038_nested_dynamic_merges to avoid timeouts. [#66863](https://github.com/ClickHouse/ClickHouse/pull/66863) ([Kruglov Pavel](https://github.com/Avogar)).
+* CI: Print instance info in runner's init script. [#66868](https://github.com/ClickHouse/ClickHouse/pull/66868) ([Max K.](https://github.com/maxknv)).
+* Backported in [#67257](https://github.com/ClickHouse/ClickHouse/issues/67257): Followup [#66725](https://github.com/ClickHouse/ClickHouse/issues/66725). [#66869](https://github.com/ClickHouse/ClickHouse/pull/66869) ([vdimir](https://github.com/vdimir)).
+* CI: CI Buddy to notify about fatal workflow failures. [#66890](https://github.com/ClickHouse/ClickHouse/pull/66890) ([Max K.](https://github.com/maxknv)).
+* CI: Add ec2 instance lifecycle metadata to CIDB. [#66918](https://github.com/ClickHouse/ClickHouse/pull/66918) ([Max K.](https://github.com/maxknv)).
+* CI: Remove ci runners scripts from oss. [#66920](https://github.com/ClickHouse/ClickHouse/pull/66920) ([Max K.](https://github.com/maxknv)).
+* Backported in [#67209](https://github.com/ClickHouse/ClickHouse/issues/67209): Decrease rate limit in `01923_network_receive_time_metric_insert`. [#66924](https://github.com/ClickHouse/ClickHouse/pull/66924) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
+* Backported in [#67227](https://github.com/ClickHouse/ClickHouse/issues/67227): Grouparrayintersect: fix serialization bug. [#66928](https://github.com/ClickHouse/ClickHouse/pull/66928) ([Raúl Marín](https://github.com/Algunenano)).
+* Backported in [#67207](https://github.com/ClickHouse/ClickHouse/issues/67207): Un-flake test_runtime_configurable_cache_size. [#66934](https://github.com/ClickHouse/ClickHouse/pull/66934) ([Robert Schulze](https://github.com/rschu1ze)).
+* Backported in [#66975](https://github.com/ClickHouse/ClickHouse/issues/66975): CI: Fixes docker server build for release branches. [#66955](https://github.com/ClickHouse/ClickHouse/pull/66955) ([Max K.](https://github.com/maxknv)).
+* Backported in [#67213](https://github.com/ClickHouse/ClickHouse/issues/67213): [CI Fest] Split dynamic tests and rewrite them from sh to sql to avoid timeouts. [#66981](https://github.com/ClickHouse/ClickHouse/pull/66981) ([Kruglov Pavel](https://github.com/Avogar)).
+* Backported in [#67033](https://github.com/ClickHouse/ClickHouse/issues/67033): [CI Fest] Fix use-of-uninitialized-value in JSONExtract* numeric functions. [#66984](https://github.com/ClickHouse/ClickHouse/pull/66984) ([Kruglov Pavel](https://github.com/Avogar)).
+* Backported in [#67051](https://github.com/ClickHouse/ClickHouse/issues/67051): CI: Fix for workflow results parsing. [#67000](https://github.com/ClickHouse/ClickHouse/pull/67000) ([Max K.](https://github.com/maxknv)).
+* Backported in [#67116](https://github.com/ClickHouse/ClickHouse/issues/67116): Disable setting `optimize_functions_to_subcolumns`. [#67046](https://github.com/ClickHouse/ClickHouse/pull/67046) ([Anton Popov](https://github.com/CurtizJ)).
+* Backported in [#67205](https://github.com/ClickHouse/ClickHouse/issues/67205): Increase max allocation size for sanitizers. [#67049](https://github.com/ClickHouse/ClickHouse/pull/67049) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
+* Backported in [#67124](https://github.com/ClickHouse/ClickHouse/issues/67124): Very sad failure: ``` 2024.07.24 13:28:45.517777 [ 10 ] {08745bf9-4bc1-4946-b9a8-c03d82ec55dc} <Debug> executeQuery: (from 172.16.11.1:55890) OPTIMIZE TABLE replicated_mt FINAL (stage: Complete) 2024.07.24 13:28:45.525945 [ 10 ] {08745bf9-4bc1-4946-b9a8-c03d82ec55dc} <Trace> default.replicated_mt (ReplicatedMergeTreeQueue): Waiting for 4 entries to be processed: queue-0000000004, queue-0000000002, queue-0000000001, queue-0000000000 2024.07.24 13:29:15.528024 [ 10 ] {08745bf9-4bc1-4946-b9a8-c03d82ec55dc} <Debug> default.replicated_mt (6581a6fb-8458-466d-8350-89951eb1ac8e) (MergerMutator): Selected 3 parts from all_0_0_0 to all_2_2_0 2024.07.24 13:29:15.530736 [ 10 ] {08745bf9-4bc1-4946-b9a8-c03d82ec55dc} <Trace> default.replicated_mt (6581a6fb-8458-466d-8350-89951eb1ac8e): Created log entry /clickhouse/tables/replicated_mt/log/log-0000000004 for merge all_0_2_1 2024.07.24 13:29:15.530873 [ 10 ] {08745bf9-4bc1-4946-b9a8-c03d82ec55dc} <Debug> default.replicated_mt (6581a6fb-8458-466d-8350-89951eb1ac8e): Waiting for node1 to process log entry 2024.07.24 13:29:15.530919 [ 10 ] {08745bf9-4bc1-4946-b9a8-c03d82ec55dc} <Debug> default.replicated_mt (6581a6fb-8458-466d-8350-89951eb1ac8e): Waiting for node1 to pull log-0000000004 to queue 2024.07.24 13:29:15.534286 [ 10 ] {08745bf9-4bc1-4946-b9a8-c03d82ec55dc} <Debug> default.replicated_mt (6581a6fb-8458-466d-8350-89951eb1ac8e): Looking for node corresponding to log-0000000004 in node1 queue 2024.07.24 13:29:15.534793 [ 10 ] {08745bf9-4bc1-4946-b9a8-c03d82ec55dc} <Debug> default.replicated_mt (6581a6fb-8458-466d-8350-89951eb1ac8e): Waiting for queue-0000000005 to disappear from node1 queue 2024.07.24 13:29:15.585533 [ 10 ] {08745bf9-4bc1-4946-b9a8-c03d82ec55dc} <Debug> TCPHandler: Processed in 30.067804125 sec. ```. [#67067](https://github.com/ClickHouse/ClickHouse/pull/67067) ([alesapin](https://github.com/alesapin)).
+* Backported in [#67203](https://github.com/ClickHouse/ClickHouse/issues/67203): Fix flaky `test_seekable_formats_url` and `test_seekable_formats` S3 storage tests. [#67070](https://github.com/ClickHouse/ClickHouse/pull/67070) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
+* Backported in [#67222](https://github.com/ClickHouse/ClickHouse/issues/67222): Fix 2680 flasky. [#67078](https://github.com/ClickHouse/ClickHouse/pull/67078) ([jsc0218](https://github.com/jsc0218)).
+* Backported in [#67190](https://github.com/ClickHouse/ClickHouse/issues/67190): Attempt to fix flakiness of some window view tests. [#67130](https://github.com/ClickHouse/ClickHouse/pull/67130) ([Robert Schulze](https://github.com/rschu1ze)).
+* Backported in [#67272](https://github.com/ClickHouse/ClickHouse/issues/67272): Rename (unreleased) bad setting. [#67149](https://github.com/ClickHouse/ClickHouse/pull/67149) ([Raúl Marín](https://github.com/Algunenano)).
+* Backported in [#67441](https://github.com/ClickHouse/ClickHouse/issues/67441): Try to fix 2572. [#67158](https://github.com/ClickHouse/ClickHouse/pull/67158) ([jsc0218](https://github.com/jsc0218)).
+* Backported in [#67416](https://github.com/ClickHouse/ClickHouse/issues/67416): CI: Fix build results for release branches. [#67402](https://github.com/ClickHouse/ClickHouse/pull/67402) ([Max K.](https://github.com/maxknv)).
+
diff --git a/utils/list-versions/version_date.tsv b/utils/list-versions/version_date.tsv
index 271065a78fb..027b207d3ad 100644
--- a/utils/list-versions/version_date.tsv
+++ b/utils/list-versions/version_date.tsv
@@ -1,3 +1,4 @@
+v24.7.1.2915-stable	2024-07-30
 v24.6.2.17-stable	2024-07-05
 v24.6.1.4423-stable	2024-07-01
 v24.5.4.49-stable	2024-07-01

From 5152248d438ef9162845507b68e18f1d8541a250 Mon Sep 17 00:00:00 2001
From: Vitaly Baranov <vitlibar@clickhouse.com>
Date: Wed, 31 Jul 2024 09:25:59 +0200
Subject: [PATCH 108/139] Add test.

---
 .../02864_restore_table_with_broken_part.sh   |  25 ++--------------
 ...ackup_with_matview_inner_table_metadata.sh |  25 ++--------------
 ..._clear_old_temporary_directories.reference |   2 ++
 ...kup_and_clear_old_temporary_directories.sh |  22 ++++++++++++++
 .../0_stateless/backups/mt_250_parts.zip      | Bin 0 -> 265998 bytes
 .../helpers/install_predefined_backup.sh      |  27 ++++++++++++++++++
 6 files changed, 55 insertions(+), 46 deletions(-)
 create mode 100644 tests/queries/0_stateless/03214_backup_and_clear_old_temporary_directories.reference
 create mode 100755 tests/queries/0_stateless/03214_backup_and_clear_old_temporary_directories.sh
 create mode 100644 tests/queries/0_stateless/backups/mt_250_parts.zip
 create mode 100755 tests/queries/0_stateless/helpers/install_predefined_backup.sh

diff --git a/tests/queries/0_stateless/02864_restore_table_with_broken_part.sh b/tests/queries/0_stateless/02864_restore_table_with_broken_part.sh
index 08313e2fd3b..bf76727f76f 100755
--- a/tests/queries/0_stateless/02864_restore_table_with_broken_part.sh
+++ b/tests/queries/0_stateless/02864_restore_table_with_broken_part.sh
@@ -5,29 +5,8 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-# Copies a test predefined backup from "/tests/queries/0_stateless/backups/" folder to the "backups" disk,
-# returns the path to the backup relative to that disk.
-function install_test_backup()
-{
-    local test_backup_filename="$1"
-    local test_backup_path="$CURDIR/backups/${test_backup_filename}"
-
-    local backups_disk_root
-    backups_disk_root=$($CLICKHOUSE_CLIENT --query "SELECT path FROM system.disks WHERE name='backups'")
-
-    if [ -z "${backups_disk_root}" ]; then
-        echo "Disk '${backups_disk_root}' not found"
-        exit 1
-    fi
-
-    local install_path=${backups_disk_root}/${CLICKHOUSE_DATABASE}/${test_backup_filename}
-    mkdir -p "$(dirname "${install_path}")"
-    ln -s "${test_backup_path}" "${install_path}"
-
-    echo "${CLICKHOUSE_DATABASE}/${test_backup_filename}"
-}
-
-backup_name="$(install_test_backup with_broken_part.zip)"
+# In this test we restore from "/tests/queries/0_stateless/backups/with_broken_part.zip"
+backup_name="$($CURDIR/helpers/install_predefined_backup.sh with_broken_part.zip)"
 
 $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS tbl"
 
diff --git a/tests/queries/0_stateless/03001_restore_from_old_backup_with_matview_inner_table_metadata.sh b/tests/queries/0_stateless/03001_restore_from_old_backup_with_matview_inner_table_metadata.sh
index 8d987dbf1df..2c70cb1e3be 100755
--- a/tests/queries/0_stateless/03001_restore_from_old_backup_with_matview_inner_table_metadata.sh
+++ b/tests/queries/0_stateless/03001_restore_from_old_backup_with_matview_inner_table_metadata.sh
@@ -5,29 +5,8 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-# Copies a test predefined backup from "/tests/queries/0_stateless/backups/" folder to the "backups" disk,
-# returns the path to the backup relative to that disk.
-function install_test_backup()
-{
-    local test_backup_filename="$1"
-    local test_backup_path="$CURDIR/backups/${test_backup_filename}"
-
-    local backups_disk_root
-    backups_disk_root=$($CLICKHOUSE_CLIENT --query "SELECT path FROM system.disks WHERE name='backups'")
-
-    if [ -z "${backups_disk_root}" ]; then
-        echo "Disk '${backups_disk_root}' not found"
-        exit 1
-    fi
-
-    local install_path=${backups_disk_root}/${CLICKHOUSE_DATABASE}/${test_backup_filename}
-    mkdir -p "$(dirname "${install_path}")"
-    ln -s "${test_backup_path}" "${install_path}"
-
-    echo "${CLICKHOUSE_DATABASE}/${test_backup_filename}"
-}
-
-backup_name="$(install_test_backup old_backup_with_matview_inner_table_metadata.zip)"
+# In this test we restore from "/tests/queries/0_stateless/backups/old_backup_with_matview_inner_table_metadata.zip"
+backup_name="$($CURDIR/helpers/install_predefined_backup.sh old_backup_with_matview_inner_table_metadata.zip)"
 
 $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS mv"
 $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS src"
diff --git a/tests/queries/0_stateless/03214_backup_and_clear_old_temporary_directories.reference b/tests/queries/0_stateless/03214_backup_and_clear_old_temporary_directories.reference
new file mode 100644
index 00000000000..3f3fbd9ab58
--- /dev/null
+++ b/tests/queries/0_stateless/03214_backup_and_clear_old_temporary_directories.reference
@@ -0,0 +1,2 @@
+RESTORED
+250	31375
diff --git a/tests/queries/0_stateless/03214_backup_and_clear_old_temporary_directories.sh b/tests/queries/0_stateless/03214_backup_and_clear_old_temporary_directories.sh
new file mode 100755
index 00000000000..e0c8f08e695
--- /dev/null
+++ b/tests/queries/0_stateless/03214_backup_and_clear_old_temporary_directories.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+# In this test we restore from "/tests/queries/0_stateless/backups/mt_250_parts.zip"
+backup_name="$($CURDIR/helpers/install_predefined_backup.sh mt_250_parts.zip)"
+
+${CLICKHOUSE_CLIENT} -nm --query "
+DROP TABLE IF EXISTS manyparts;
+CREATE TABLE manyparts (x Int64) ENGINE=MergeTree ORDER BY tuple() SETTINGS merge_tree_clear_old_temporary_directories_interval_seconds=1, temporary_directories_lifetime=1;
+"
+
+# RESTORE must protect its temporary directories from removing.
+${CLICKHOUSE_CLIENT} --query "RESTORE TABLE default.mt_250_parts AS manyparts FROM Disk('backups', '${backup_name}') SETTINGS allow_different_table_def=true" | grep -o "RESTORED"
+
+${CLICKHOUSE_CLIENT} -nm --query "
+SELECT count(), sum(x) FROM manyparts;
+DROP TABLE manyparts;
+"
diff --git a/tests/queries/0_stateless/backups/mt_250_parts.zip b/tests/queries/0_stateless/backups/mt_250_parts.zip
new file mode 100644
index 0000000000000000000000000000000000000000..15310b79054e09c75876efd20845bbdabdfec2f5
GIT binary patch
literal 265998
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%0AR*l2v-Q6hGNL2OHp3zk
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
WjrnhVO8F_}M?YJeR4bU4&Hn(aX&2Q1

literal 0
HcmV?d00001

diff --git a/tests/queries/0_stateless/helpers/install_predefined_backup.sh b/tests/queries/0_stateless/helpers/install_predefined_backup.sh
new file mode 100755
index 00000000000..4445168bc33
--- /dev/null
+++ b/tests/queries/0_stateless/helpers/install_predefined_backup.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+# Copies a test predefined backup from "/tests/queries/0_stateless/backups/" folder to the "backups" disk,
+# returns the path to the backup relative to that disk.
+#
+# Usage:
+#     install_predefined_backup.sh <filename_in_backups_folder>
+
+HELPERS_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+
+src_backup_filename="$1"
+src_backup_path="$HELPERS_DIR/../backups/${src_backup_filename}"
+
+backups_disk_root=$($CLICKHOUSE_CLIENT --query "SELECT path FROM system.disks WHERE name='backups'")
+
+if [ -z "${backups_disk_root}" ]; then
+    echo "Disk 'backups' not found"
+    exit 1
+fi
+
+dest_relative_path=${CLICKHOUSE_DATABASE}/${src_backup_filename}
+dest_path=${backups_disk_root}/${dest_relative_path}
+
+mkdir -p "$(dirname "${dest_path}")"
+ln -s "${src_backup_path}" "${dest_path}"
+
+echo "${dest_relative_path}"

From d421636a5fdc3b73fa5cb05e83529483d69e75e2 Mon Sep 17 00:00:00 2001
From: Vitaly Baranov <vitlibar@clickhouse.com>
Date: Wed, 31 Jul 2024 09:26:09 +0200
Subject: [PATCH 109/139] Protect temporary part directories from removing
 during RESTORE.

---
 src/Storages/MergeTree/MergeTreeData.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/Storages/MergeTree/MergeTreeData.cpp b/src/Storages/MergeTree/MergeTreeData.cpp
index 2e10f5a0227..ce27ad24e10 100644
--- a/src/Storages/MergeTree/MergeTreeData.cpp
+++ b/src/Storages/MergeTree/MergeTreeData.cpp
@@ -5557,12 +5557,16 @@ public:
         auto it = temp_part_dirs.find(part_name);
         if (it == temp_part_dirs.end())
         {
-            auto temp_part_dir = std::make_shared<TemporaryFileOnDisk>(disk, fs::path{storage->getRelativeDataPath()} / ("tmp_restore_" + part_name + "-"));
+            auto temp_dir_deleter = std::make_unique<TemporaryFileOnDisk>(disk, fs::path{storage->getRelativeDataPath()} / ("tmp_restore_" + part_name + "-"));
+            auto temp_part_dir = fs::path{temp_dir_deleter->getRelativePath()}.filename();
             /// Attaching parts will rename them so it's expected for a temporary part directory not to exist anymore in the end.
-            temp_part_dir->setShowWarningIfRemoved(false);
-            it = temp_part_dirs.emplace(part_name, temp_part_dir).first;
+            temp_dir_deleter->setShowWarningIfRemoved(false);
+            /// The following holder is needed to prevent clearOldTemporaryDirectories() from clearing `temp_part_dir` before we attach the part.
+            auto temp_dir_holder = storage->getTemporaryPartDirectoryHolder(temp_part_dir);
+            it = temp_part_dirs.emplace(part_name,
+                                        std::make_pair(std::move(temp_dir_deleter), std::move(temp_dir_holder))).first;
         }
-        return it->second->getRelativePath();
+        return it->second.first->getRelativePath();
     }
 
 private:
@@ -5588,7 +5592,7 @@ private:
     size_t num_parts = 0;
     size_t num_broken_parts = 0;
     MutableDataPartsVector parts;
-    std::map<String /* part_name*/, std::shared_ptr<TemporaryFileOnDisk>> temp_part_dirs;
+    std::map<String /* part_name*/, std::pair<std::unique_ptr<TemporaryFileOnDisk>, scope_guard>> temp_part_dirs;
     mutable std::mutex mutex;
 };
 

From 4e2f8576e5a6e8e39a16334d0c697d5cb09e0469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= <git@rmr.ninja>
Date: Wed, 31 Jul 2024 11:50:58 +0200
Subject: [PATCH 110/139] Revert "Add settings to replace external engines to
 Null during create"

---
 docs/en/operations/settings/settings.md       |  12 -
 src/Core/Settings.h                           |   2 -
 src/Core/SettingsChangesHistory.cpp           |   4 +-
 src/Interpreters/InterpreterCreateQuery.cpp   |  35 ---
 .../test_restore_external_engines/__init__.py |   0
 .../configs/backups_disk.xml                  |  14 --
 .../configs/remote_servers.xml                |  21 --
 .../test_restore_external_engines/test.py     | 218 ------------------
 8 files changed, 1 insertion(+), 305 deletions(-)
 delete mode 100644 tests/integration/test_restore_external_engines/__init__.py
 delete mode 100644 tests/integration/test_restore_external_engines/configs/backups_disk.xml
 delete mode 100644 tests/integration/test_restore_external_engines/configs/remote_servers.xml
 delete mode 100644 tests/integration/test_restore_external_engines/test.py

diff --git a/docs/en/operations/settings/settings.md b/docs/en/operations/settings/settings.md
index 8739414464e..c3f697c3bdc 100644
--- a/docs/en/operations/settings/settings.md
+++ b/docs/en/operations/settings/settings.md
@@ -5608,15 +5608,3 @@ Default value: `10000000`.
 Minimal size of block to compress in CROSS JOIN. Zero value means - disable this threshold. This block is compressed when any of the two thresholds (by rows or by bytes) are reached.
 
 Default value: `1GiB`.
-
-## restore_replace_external_engines_to_null
-
-For testing purposes. Replaces all external engines to Null to not initiate external connections.
-
-Default value: `False`
-
-## restore_replace_external_table_functions_to_null
-
-For testing purposes. Replaces all external table functions to Null to not initiate external connections.
-
-Default value: `False`
\ No newline at end of file
diff --git a/src/Core/Settings.h b/src/Core/Settings.h
index 27b71558bd3..4fc2034b855 100644
--- a/src/Core/Settings.h
+++ b/src/Core/Settings.h
@@ -893,8 +893,6 @@ class IColumn;
     M(Bool, optimize_distinct_in_order, true, "Enable DISTINCT optimization if some columns in DISTINCT form a prefix of sorting. For example, prefix of sorting key in merge tree or ORDER BY statement", 0) \
     M(Bool, keeper_map_strict_mode, false, "Enforce additional checks during operations on KeeperMap. E.g. throw an exception on an insert for already existing key", 0) \
     M(UInt64, extract_key_value_pairs_max_pairs_per_row, 1000, "Max number of pairs that can be produced by the `extractKeyValuePairs` function. Used as a safeguard against consuming too much memory.", 0) ALIAS(extract_kvp_max_pairs_per_row) \
-    M(Bool, restore_replace_external_engines_to_null, false, "Replace all the external table engines to Null on restore. Useful for testing purposes", 0) \
-    M(Bool, restore_replace_external_table_functions_to_null, false, "Replace all table functions to Null on restore. Useful for testing purposes", 0) \
     \
     \
     /* ###################################### */ \
diff --git a/src/Core/SettingsChangesHistory.cpp b/src/Core/SettingsChangesHistory.cpp
index 8bea0b1eed3..9faf77e9087 100644
--- a/src/Core/SettingsChangesHistory.cpp
+++ b/src/Core/SettingsChangesHistory.cpp
@@ -80,9 +80,7 @@ static std::initializer_list<std::pair<ClickHouseVersion, SettingsChangesHistory
               {"ignore_on_cluster_for_replicated_named_collections_queries", false, false, "Ignore ON CLUSTER clause for replicated named collections management queries."},
               {"backup_restore_s3_retry_attempts", 1000,1000, "Setting for Aws::Client::RetryStrategy, Aws::Client does retries itself, 0 means no retries. It takes place only for backup/restore."},
               {"postgresql_connection_attempt_timeout", 2, 2, "Allow to control 'connect_timeout' parameter of PostgreSQL connection."},
-              {"postgresql_connection_pool_retries", 2, 2, "Allow to control the number of retries in PostgreSQL connection pool."},
-              {"restore_replace_external_table_functions_to_null", false, false, "New setting."},
-              {"restore_replace_external_engines_to_null", false, false, "New setting."}
+              {"postgresql_connection_pool_retries", 2, 2, "Allow to control the number of retries in PostgreSQL connection pool."}
               }},
     {"24.6", {{"materialize_skip_indexes_on_insert", true, true, "Added new setting to allow to disable materialization of skip indexes on insert"},
               {"materialize_statistics_on_insert", true, true, "Added new setting to allow to disable materialization of statistics on insert"},
diff --git a/src/Interpreters/InterpreterCreateQuery.cpp b/src/Interpreters/InterpreterCreateQuery.cpp
index b8646e1a971..427378decd5 100644
--- a/src/Interpreters/InterpreterCreateQuery.cpp
+++ b/src/Interpreters/InterpreterCreateQuery.cpp
@@ -959,40 +959,12 @@ namespace
         engine_ast->no_empty_args = true;
         storage.set(storage.engine, engine_ast);
     }
-
-    void setNullTableEngine(ASTStorage & storage)
-    {
-        auto engine_ast = std::make_shared<ASTFunction>();
-        engine_ast->name = "Null";
-        engine_ast->no_empty_args = true;
-        storage.set(storage.engine, engine_ast);
-    }
-
 }
 
 void InterpreterCreateQuery::setEngine(ASTCreateQuery & create) const
 {
     if (create.as_table_function)
-    {
-        if (getContext()->getSettingsRef().restore_replace_external_table_functions_to_null)
-        {
-            const auto & factory = TableFunctionFactory::instance();
-
-            auto properties = factory.tryGetProperties(create.as_table_function->as<ASTFunction>()->name);
-            if (properties && properties->allow_readonly)
-                return;
-            if (!create.storage)
-            {
-                auto storage_ast = std::make_shared<ASTStorage>();
-                create.set(create.storage, storage_ast);
-            }
-            else
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Storage should not be created yet, it's a bug.");
-            create.as_table_function = nullptr;
-            setNullTableEngine(*create.storage);
-        }
         return;
-    }
 
     if (create.is_dictionary || create.is_ordinary_view || create.is_live_view || create.is_window_view)
         return;
@@ -1043,13 +1015,6 @@ void InterpreterCreateQuery::setEngine(ASTCreateQuery & create) const
             /// Some part of storage definition (such as PARTITION BY) is specified, but ENGINE is not: just set default one.
             setDefaultTableEngine(*create.storage, getContext()->getSettingsRef().default_table_engine.value);
         }
-        /// For external tables with restore_replace_external_engine_to_null setting we replace external engines to
-        /// Null table engine.
-        else if (getContext()->getSettingsRef().restore_replace_external_engines_to_null)
-        {
-            if (StorageFactory::instance().getStorageFeatures(create.storage->engine->name).source_access_type != AccessType::NONE)
-                setNullTableEngine(*create.storage);
-        }
         return;
     }
 
diff --git a/tests/integration/test_restore_external_engines/__init__.py b/tests/integration/test_restore_external_engines/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/integration/test_restore_external_engines/configs/backups_disk.xml b/tests/integration/test_restore_external_engines/configs/backups_disk.xml
deleted file mode 100644
index f7d666c6542..00000000000
--- a/tests/integration/test_restore_external_engines/configs/backups_disk.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<clickhouse>
-    <storage_configuration>
-        <disks>
-            <backups>
-                <type>local</type>
-                <path>/backups/</path>
-            </backups>
-        </disks>
-    </storage_configuration>
-    <backups>
-        <allowed_disk>backups</allowed_disk>
-        <allowed_path>/backups/</allowed_path>
-    </backups>
-</clickhouse>
diff --git a/tests/integration/test_restore_external_engines/configs/remote_servers.xml b/tests/integration/test_restore_external_engines/configs/remote_servers.xml
deleted file mode 100644
index 76ad3618339..00000000000
--- a/tests/integration/test_restore_external_engines/configs/remote_servers.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<clickhouse>
-    <remote_servers>
-        <test_cluster>
-            <shard>
-                <internal_replication>true</internal_replication>
-                <replica>
-                    <host>replica1</host>
-                    <port>9000</port>
-                </replica>
-                <replica>
-                    <host>replica2</host>
-                    <port>9000</port>
-                </replica>
-                 <replica>
-                    <host>replica3</host>
-                    <port>9000</port>
-                </replica>
-            </shard>
-        </test_cluster>
-    </remote_servers>
-</clickhouse>
diff --git a/tests/integration/test_restore_external_engines/test.py b/tests/integration/test_restore_external_engines/test.py
deleted file mode 100644
index cf189f2a6ed..00000000000
--- a/tests/integration/test_restore_external_engines/test.py
+++ /dev/null
@@ -1,218 +0,0 @@
-import pytest
-
-import pymysql.cursors
-import pytest
-from helpers.cluster import ClickHouseCluster
-
-cluster = ClickHouseCluster(__file__)
-configs = ["configs/remote_servers.xml", "configs/backups_disk.xml"]
-
-node1 = cluster.add_instance(
-    "replica1",
-    with_zookeeper=True,
-    with_mysql8=True,
-    main_configs=configs,
-    external_dirs=["/backups/"],
-)
-node2 = cluster.add_instance(
-    "replica2",
-    with_zookeeper=True,
-    with_mysql8=True,
-    main_configs=configs,
-    external_dirs=["/backups/"],
-)
-node3 = cluster.add_instance(
-    "replica3",
-    with_zookeeper=True,
-    with_mysql8=True,
-    main_configs=configs,
-    external_dirs=["/backups/"],
-)
-nodes = [node1, node2, node3]
-
-backup_id_counter = 0
-
-
-def new_backup_name():
-    global backup_id_counter
-    backup_id_counter += 1
-    return f"Disk('backups', '{backup_id_counter}/')"
-
-
-def cleanup_nodes(nodes, dbname):
-    for node in nodes:
-        node.query(f"DROP DATABASE IF EXISTS {dbname} SYNC")
-
-
-def fill_nodes(nodes, dbname):
-    cleanup_nodes(nodes, dbname)
-    for node in nodes:
-        node.query(
-            f"CREATE DATABASE {dbname} ENGINE = Replicated('/clickhouse/databases/{dbname}', 'default', '{node.name}')"
-        )
-
-
-def drop_mysql_table(conn, tableName):
-    with conn.cursor() as cursor:
-        cursor.execute(f"DROP TABLE IF EXISTS `clickhouse`.`{tableName}`")
-
-
-def get_mysql_conn(cluster):
-    conn = pymysql.connect(
-        user="root",
-        password="clickhouse",
-        host=cluster.mysql8_ip,
-        port=cluster.mysql8_port,
-    )
-    return conn
-
-
-def fill_tables(cluster, dbname):
-    fill_nodes(nodes, dbname)
-
-    conn = get_mysql_conn(cluster)
-
-    with conn.cursor() as cursor:
-        cursor.execute("DROP DATABASE IF EXISTS clickhouse")
-        cursor.execute("CREATE DATABASE clickhouse")
-        cursor.execute("DROP TABLE IF EXISTS clickhouse.inference_table")
-        cursor.execute(
-            "CREATE TABLE clickhouse.inference_table (id INT PRIMARY KEY, data BINARY(16) NOT NULL)"
-        )
-        cursor.execute(
-            "INSERT INTO clickhouse.inference_table VALUES (100, X'9fad5e9eefdfb449')"
-        )
-        conn.commit()
-
-    parameters = "'mysql80:3306', 'clickhouse', 'inference_table', 'root', 'clickhouse'"
-
-    node1.query(
-        f"CREATE TABLE {dbname}.mysql_schema_inference_engine ENGINE=MySQL({parameters})"
-    )
-    node1.query(
-        f"CREATE TABLE {dbname}.mysql_schema_inference_function AS mysql({parameters})"
-    )
-
-    node1.query(f"CREATE TABLE {dbname}.merge_tree (id UInt64, b String) ORDER BY id")
-    node1.query(f"INSERT INTO {dbname}.merge_tree VALUES (100, 'abc')")
-
-    expected = "id\tInt32\t\t\t\t\t\ndata\tFixedString(16)\t\t\t\t\t\n"
-    assert (
-        node1.query(f"DESCRIBE TABLE {dbname}.mysql_schema_inference_engine")
-        == expected
-    )
-    assert (
-        node1.query(f"DESCRIBE TABLE {dbname}.mysql_schema_inference_function")
-        == expected
-    )
-    assert node1.query(f"SELECT id FROM mysql({parameters})") == "100\n"
-    assert (
-        node1.query(f"SELECT id FROM {dbname}.mysql_schema_inference_engine") == "100\n"
-    )
-    assert (
-        node1.query(f"SELECT id FROM {dbname}.mysql_schema_inference_function")
-        == "100\n"
-    )
-    assert node1.query(f"SELECT id FROM {dbname}.merge_tree") == "100\n"
-
-
-@pytest.fixture(scope="module")
-def start_cluster():
-    try:
-        cluster.start()
-        yield cluster
-
-    except Exception as ex:
-        print(ex)
-
-    finally:
-        cluster.shutdown()
-
-
-def test_restore_table(start_cluster):
-    fill_tables(cluster, "replicated")
-    backup_name = new_backup_name()
-    node2.query(f"SYSTEM SYNC DATABASE REPLICA replicated")
-
-    node2.query(f"BACKUP DATABASE replicated TO {backup_name}")
-
-    node2.query("DROP TABLE replicated.mysql_schema_inference_engine")
-    node2.query("DROP TABLE replicated.mysql_schema_inference_function")
-
-    node3.query(f"SYSTEM SYNC DATABASE REPLICA replicated")
-
-    assert node3.query("EXISTS replicated.mysql_schema_inference_engine") == "0\n"
-    assert node3.query("EXISTS replicated.mysql_schema_inference_function") == "0\n"
-
-    node3.query(
-        f"RESTORE DATABASE replicated FROM {backup_name} SETTINGS allow_different_database_def=true"
-    )
-    node1.query(f"SYSTEM SYNC DATABASE REPLICA replicated")
-
-    assert (
-        node1.query(
-            "SELECT count(), sum(id) FROM replicated.mysql_schema_inference_engine"
-        )
-        == "1\t100\n"
-    )
-    assert (
-        node1.query(
-            "SELECT count(), sum(id) FROM replicated.mysql_schema_inference_function"
-        )
-        == "1\t100\n"
-    )
-    assert (
-        node1.query("SELECT count(), sum(id) FROM replicated.merge_tree") == "1\t100\n"
-    )
-    cleanup_nodes(nodes, "replicated")
-
-
-def test_restore_table_null(start_cluster):
-    fill_tables(cluster, "replicated2")
-
-    backup_name = new_backup_name()
-    node2.query(f"SYSTEM SYNC DATABASE REPLICA replicated2")
-
-    node2.query(f"BACKUP DATABASE replicated2 TO {backup_name}")
-
-    node2.query("DROP TABLE replicated2.mysql_schema_inference_engine")
-    node2.query("DROP TABLE replicated2.mysql_schema_inference_function")
-
-    node3.query(f"SYSTEM SYNC DATABASE REPLICA replicated2")
-
-    assert node3.query("EXISTS replicated2.mysql_schema_inference_engine") == "0\n"
-    assert node3.query("EXISTS replicated2.mysql_schema_inference_function") == "0\n"
-
-    node3.query(
-        f"RESTORE DATABASE replicated2 FROM {backup_name} SETTINGS allow_different_database_def=1, allow_different_table_def=1 SETTINGS restore_replace_external_engines_to_null=1, restore_replace_external_table_functions_to_null=1"
-    )
-    node1.query(f"SYSTEM SYNC DATABASE REPLICA replicated2")
-
-    assert (
-        node1.query(
-            "SELECT count(), sum(id) FROM replicated2.mysql_schema_inference_engine"
-        )
-        == "0\t0\n"
-    )
-    assert (
-        node1.query(
-            "SELECT count(), sum(id) FROM replicated2.mysql_schema_inference_function"
-        )
-        == "0\t0\n"
-    )
-    assert (
-        node1.query("SELECT count(), sum(id) FROM replicated2.merge_tree") == "1\t100\n"
-    )
-    assert (
-        node1.query(
-            "SELECT engine FROM system.tables where database = 'replicated2' and name like '%mysql%'"
-        )
-        == "Null\nNull\n"
-    )
-    assert (
-        node1.query(
-            "SELECT engine FROM system.tables where database = 'replicated2' and name like '%merge_tree%'"
-        )
-        == "MergeTree\n"
-    )
-    cleanup_nodes(nodes, "replicated2")

From 06863cf4157765c04759109afa756022dc5e9c55 Mon Sep 17 00:00:00 2001
From: maxvostrikov <max.vostrikov@clickhouse.com>
Date: Wed, 31 Jul 2024 12:12:30 +0200
Subject: [PATCH 111/139] fix for allow_experimental_analyzer

---
 tests/queries/0_stateless/00309_formats.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/queries/0_stateless/00309_formats.sql b/tests/queries/0_stateless/00309_formats.sql
index 0366cdeea5c..b784907be08 100644
--- a/tests/queries/0_stateless/00309_formats.sql
+++ b/tests/queries/0_stateless/00309_formats.sql
@@ -12,5 +12,5 @@ SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, range(n) AS arr, a
 
 SET enable_named_columns_in_function_tuple = 1;
 
-SELECT 36 AS n, toDate('2000-01-01') + n AS d, (n, d) AS tuple FROM system.numbers LIMIT 1 FORMAT RowBinaryWithNamesAndTypes;
-SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, (n, d) AS tuple FROM system.numbers LIMIT 1 FORMAT TabSeparatedWithNamesAndTypes;
+SELECT 36 AS n, toDate('2000-01-01') + n AS d, (n, d) AS tuple FROM system.numbers LIMIT 1 FORMAT RowBinaryWithNamesAndTypes SETTINGS allow_experimental_analyzer=1;
+SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, (n, d) AS tuple FROM system.numbers LIMIT 1 FORMAT TabSeparatedWithNamesAndTypes SETTINGS allow_experimental_analyzer=1;

From debcc2e61053f763cb84e34e48275dbebd5bd544 Mon Sep 17 00:00:00 2001
From: Vitaly Baranov <vitlibar@clickhouse.com>
Date: Wed, 31 Jul 2024 10:46:19 +0200
Subject: [PATCH 112/139] Fix test test_mutation

---
 tests/integration/test_backup_restore_on_cluster/test.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/integration/test_backup_restore_on_cluster/test.py b/tests/integration/test_backup_restore_on_cluster/test.py
index 1b7f4aaa97d..d20e10e8a04 100644
--- a/tests/integration/test_backup_restore_on_cluster/test.py
+++ b/tests/integration/test_backup_restore_on_cluster/test.py
@@ -1054,9 +1054,12 @@ def test_mutation():
     backup_name = new_backup_name()
     node1.query(f"BACKUP TABLE tbl ON CLUSTER 'cluster' TO {backup_name}")
 
-    assert not has_mutation_in_backup("0000000000", backup_name, "default", "tbl")
+    # mutation #0000000000: "UPDATE x=x+1 WHERE 1" could already finish before starting the backup
+    # mutation #0000000001: "UPDATE x=x+1+sleep(3) WHERE 1"
     assert has_mutation_in_backup("0000000001", backup_name, "default", "tbl")
+    # mutation #0000000002: "UPDATE x=x+1+sleep(3) WHERE 1"
     assert has_mutation_in_backup("0000000002", backup_name, "default", "tbl")
+    # mutation #0000000003: not expected
     assert not has_mutation_in_backup("0000000003", backup_name, "default", "tbl")
 
     node1.query("DROP TABLE tbl ON CLUSTER 'cluster' SYNC")

From 15e0033016eb0e23a7e6f512d5096e50863e3187 Mon Sep 17 00:00:00 2001
From: Pablo Marcos <pablo.marcos.oltra@clickhouse.com>
Date: Wed, 31 Jul 2024 12:09:49 +0000
Subject: [PATCH 113/139] Bring back the strict check

Also update the doc.
---
 tests/integration/README.md                     | 9 +++++----
 tests/integration/test_storage_s3_queue/test.py | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/tests/integration/README.md b/tests/integration/README.md
index ab984b7bd04..a8deb97b526 100644
--- a/tests/integration/README.md
+++ b/tests/integration/README.md
@@ -124,10 +124,11 @@ You can just open shell inside a container by overwritting the command:
 ### Parallel test execution
 
 On the CI, we run a number of parallel runners (5 at the time of this writing), each on its own
-Docker container. These runner containers spawn more containers for the services needed such as
-ZooKeeper, MySQL, PostgreSQL and minio, among others. Within each runner, tests are parallelized
-using [pytest-xdist](https://pytest-xdist.readthedocs.io/en/stable/). We're using `--dist=loadfile`
-to [distribute the load](https://pytest-xdist.readthedocs.io/en/stable/distribution.html). In the
+Docker container. These runner containers spawn more containers for each test for the services
+needed such as ZooKeeper, MySQL, PostgreSQL and minio, among others. This means that tests do not
+share any services among them. Within each runner, tests are parallelized using
+[pytest-xdist](https://pytest-xdist.readthedocs.io/en/stable/). We're using `--dist=loadfile` to
+[distribute the load](https://pytest-xdist.readthedocs.io/en/stable/distribution.html). In the
 documentation words: this guarantees that all tests in a file run in the same worker. This means
 that any test within the same file will never execute their tests in parallel. They'll be executed
 on the same worker one after the other.
diff --git a/tests/integration/test_storage_s3_queue/test.py b/tests/integration/test_storage_s3_queue/test.py
index e3445d14cdb..9a97e8c23d1 100644
--- a/tests/integration/test_storage_s3_queue/test.py
+++ b/tests/integration/test_storage_s3_queue/test.py
@@ -907,7 +907,7 @@ def test_max_set_age(started_cluster):
     file_with_error = f"max_set_age_fail_{uuid4().hex[:8]}.csv"
     put_s3_file_content(started_cluster, f"{files_path}/{file_with_error}", values_csv)
 
-    wait_for_condition(lambda: failed_count + 1 <= get_object_storage_failures())
+    wait_for_condition(lambda: failed_count + 1 == get_object_storage_failures())
 
     node.query("SYSTEM FLUSH LOGS")
     assert "Cannot parse input" in node.query(
@@ -920,7 +920,7 @@ def test_max_set_age(started_cluster):
         )
     )
 
-    wait_for_condition(lambda: failed_count + 2 <= get_object_storage_failures())
+    wait_for_condition(lambda: failed_count + 2 == get_object_storage_failures())
 
     node.query("SYSTEM FLUSH LOGS")
     assert "Cannot parse input" in node.query(

From 9d14053cfe7867fd688c08b493c264ee679a4a61 Mon Sep 17 00:00:00 2001
From: avogar <avogar@clickhouse.com>
Date: Wed, 31 Jul 2024 12:17:56 +0000
Subject: [PATCH 114/139] Proper fix for short circuit execution with nested
 dictGetOrDefaultt

---
 src/Columns/ColumnFunction.cpp                | 26 ++++++++++++++-----
 src/Interpreters/ExpressionActions.cpp        |  4 ---
 ...sted_short_circuit_functions_bug.reference |  2 ++
 ...210_nested_short_circuit_functions_bug.sql |  3 +++
 4 files changed, 24 insertions(+), 11 deletions(-)
 create mode 100644 tests/queries/0_stateless/03210_nested_short_circuit_functions_bug.reference
 create mode 100644 tests/queries/0_stateless/03210_nested_short_circuit_functions_bug.sql

diff --git a/src/Columns/ColumnFunction.cpp b/src/Columns/ColumnFunction.cpp
index fc81efaac0c..18c343c6ca6 100644
--- a/src/Columns/ColumnFunction.cpp
+++ b/src/Columns/ColumnFunction.cpp
@@ -296,16 +296,28 @@ ColumnWithTypeAndName ColumnFunction::reduce() const
                         function->getName(), toString(args), toString(captured));
 
     ColumnsWithTypeAndName columns = captured_columns;
-    IFunction::ShortCircuitSettings settings;
     /// Arguments of lazy executed function can also be lazy executed.
-    /// But we shouldn't execute arguments if this function is short circuit,
-    /// because it will handle lazy executed arguments by itself.
-    if (is_short_circuit_argument && !function->isShortCircuit(settings, args))
+    if (is_short_circuit_argument)
     {
-        for (auto & col : columns)
+        IFunction::ShortCircuitSettings settings;
+        /// We shouldn't execute all arguments if this function is short circuit,
+        /// because it will handle lazy executed arguments by itself.
+        /// Execute only arguments with disabled lazy execution.
+        if (function->isShortCircuit(settings, args))
         {
-            if (const ColumnFunction * arg = checkAndGetShortCircuitArgument(col.column))
-                col = arg->reduce();
+            for (size_t i : settings.arguments_with_disabled_lazy_execution)
+            {
+                if (const ColumnFunction * arg = checkAndGetShortCircuitArgument(columns[i].column))
+                    columns[i] = arg->reduce();
+            }
+        }
+        else
+        {
+            for (auto & col : columns)
+            {
+                if (const ColumnFunction * arg = checkAndGetShortCircuitArgument(col.column))
+                    col = arg->reduce();
+            }
         }
     }
 
diff --git a/src/Interpreters/ExpressionActions.cpp b/src/Interpreters/ExpressionActions.cpp
index d832f568cb8..8993830af14 100644
--- a/src/Interpreters/ExpressionActions.cpp
+++ b/src/Interpreters/ExpressionActions.cpp
@@ -195,10 +195,6 @@ static void setLazyExecutionInfo(
             }
 
             lazy_execution_info.short_circuit_ancestors_info[parent].insert(indexes.begin(), indexes.end());
-            /// After checking arguments_with_disabled_lazy_execution, if there is no relation with parent,
-            /// disable the current node.
-            if (indexes.empty())
-                lazy_execution_info.can_be_lazy_executed = false;
         }
         else
             /// If lazy execution is disabled for one of parents, we should disable it for current node.
diff --git a/tests/queries/0_stateless/03210_nested_short_circuit_functions_bug.reference b/tests/queries/0_stateless/03210_nested_short_circuit_functions_bug.reference
new file mode 100644
index 00000000000..aa47d0d46d4
--- /dev/null
+++ b/tests/queries/0_stateless/03210_nested_short_circuit_functions_bug.reference
@@ -0,0 +1,2 @@
+0
+0
diff --git a/tests/queries/0_stateless/03210_nested_short_circuit_functions_bug.sql b/tests/queries/0_stateless/03210_nested_short_circuit_functions_bug.sql
new file mode 100644
index 00000000000..923f1e3be1f
--- /dev/null
+++ b/tests/queries/0_stateless/03210_nested_short_circuit_functions_bug.sql
@@ -0,0 +1,3 @@
+select if(equals(materialize('abc'), 'aws.lambda.duration'), if(toFloat64(materialize('x86_74')) < 50.0000, 0, 1), 0) settings short_circuit_function_evaluation='enable';
+select if(equals(materialize('abc'), 'aws.lambda.duration'), if(toFloat64(materialize('x86_74')) < 50.0000, 0, 1), 0) settings short_circuit_function_evaluation='force_enable';
+

From 6b7c5eb5da1be1fc31d4ebfd4f0dfa0c6a6e728c Mon Sep 17 00:00:00 2001
From: Antonio Andelic <antonio@clickhouse.com>
Date: Wed, 31 Jul 2024 14:09:07 +0200
Subject: [PATCH 115/139] Fix drop

---
 src/Storages/StorageKeeperMap.cpp         | 34 +++++++++++++++--------
 src/Storages/StorageKeeperMap.h           | 21 ++++++++++----
 tests/integration/test_keeper_map/test.py |  5 ++--
 3 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/src/Storages/StorageKeeperMap.cpp b/src/Storages/StorageKeeperMap.cpp
index 1559b442e43..0634c7be6ee 100644
--- a/src/Storages/StorageKeeperMap.cpp
+++ b/src/Storages/StorageKeeperMap.cpp
@@ -79,6 +79,7 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
     extern const int LIMIT_EXCEEDED;
     extern const int CANNOT_RESTORE_TABLE;
+    extern const int INVALID_STATE;
 }
 
 namespace
@@ -497,7 +498,7 @@ StorageKeeperMap::StorageKeeperMap(
         }
 
 
-        table_is_valid = true;
+        table_status = TableStatus::VALID;
         /// we are the first table created for the specified Keeper path, i.e. we are the first replica
         return;
     }
@@ -656,7 +657,18 @@ bool StorageKeeperMap::dropTable(zkutil::ZooKeeperPtr zookeeper, const zkutil::E
 
 void StorageKeeperMap::drop()
 {
-    checkTable<true>();
+    auto current_table_status = getTableStatus();
+    if (current_table_status == TableStatus::UNKNOWN)
+    {
+            static constexpr auto error_msg = "Failed to activate table because of connection issues. It will be activated "
+                                              "once a connection is established and metadata is verified";
+            throw Exception(ErrorCodes::INVALID_STATE, error_msg);
+    }
+
+    /// if only column metadata is wrong we can still drop the table correctly
+    if (current_table_status == TableStatus::INVALID_KEEPER_STRUCTURE)
+        return;
+
     auto client = getClient();
 
     // we allow ZNONODE in case we got hardware error on previous drop
@@ -1017,11 +1029,11 @@ UInt64 StorageKeeperMap::keysLimit() const
     return keys_limit;
 }
 
-std::optional<bool> StorageKeeperMap::isTableValid() const
+StorageKeeperMap::TableStatus StorageKeeperMap::getTableStatus() const
 {
     std::lock_guard lock{init_mutex};
-    if (table_is_valid.has_value())
-        return table_is_valid;
+    if (table_status != TableStatus::UNKNOWN)
+        return table_status;
 
     [&]
     {
@@ -1034,7 +1046,7 @@ std::optional<bool> StorageKeeperMap::isTableValid() const
 
             if (metadata_stat.numChildren == 0)
             {
-                table_is_valid = false;
+                table_status = TableStatus::INVALID_KEEPER_STRUCTURE;
                 return;
             }
 
@@ -1045,7 +1057,7 @@ std::optional<bool> StorageKeeperMap::isTableValid() const
                     "Table definition does not match to the one stored in the path {}. Stored definition: {}",
                     zk_root_path,
                     stored_metadata_string);
-                table_is_valid = false;
+                table_status = TableStatus::INVALID_METADATA;
                 return;
             }
 
@@ -1058,7 +1070,7 @@ std::optional<bool> StorageKeeperMap::isTableValid() const
             Coordination::Responses responses;
             client->tryMulti(requests, responses);
 
-            table_is_valid = false;
+            table_status = TableStatus::INVALID_KEEPER_STRUCTURE;
             if (responses[0]->error != Coordination::Error::ZOK)
             {
                 LOG_ERROR(log, "Table node ({}) is missing", zk_table_path);
@@ -1077,18 +1089,18 @@ std::optional<bool> StorageKeeperMap::isTableValid() const
                 return;
             }
 
-            table_is_valid = true;
+            table_status = TableStatus::VALID;
         }
         catch (const Coordination::Exception & e)
         {
             tryLogCurrentException(log);
 
             if (!Coordination::isHardwareError(e.code))
-                table_is_valid = false;
+                table_status = TableStatus::INVALID_KEEPER_STRUCTURE;
         }
     }();
 
-    return table_is_valid;
+    return table_status;
 }
 
 Chunk StorageKeeperMap::getByKeys(const ColumnsWithTypeAndName & keys, PaddedPODArray<UInt8> & null_map, const Names &) const
diff --git a/src/Storages/StorageKeeperMap.h b/src/Storages/StorageKeeperMap.h
index cfbb35ab2fe..8ed348a4f6f 100644
--- a/src/Storages/StorageKeeperMap.h
+++ b/src/Storages/StorageKeeperMap.h
@@ -80,8 +80,8 @@ public:
     template <bool throw_on_error>
     void checkTable() const
     {
-        auto is_table_valid = isTableValid();
-        if (!is_table_valid.has_value())
+        auto current_table_status = getTableStatus();
+        if (table_status == TableStatus::UNKNOWN)
         {
             static constexpr auto error_msg = "Failed to activate table because of connection issues. It will be activated "
                                                           "once a connection is established and metadata is verified";
@@ -94,10 +94,10 @@ public:
             }
         }
 
-        if (!*is_table_valid)
+        if (current_table_status != TableStatus::VALID)
         {
             static constexpr auto error_msg
-                = "Failed to activate table because of invalid metadata in ZooKeeper. Please DETACH table";
+                = "Failed to activate table because of invalid metadata in ZooKeeper. Please DROP/DETACH table";
             if constexpr (throw_on_error)
                 throw Exception(ErrorCodes::INVALID_STATE, error_msg);
             else
@@ -111,7 +111,15 @@ public:
 private:
     bool dropTable(zkutil::ZooKeeperPtr zookeeper, const zkutil::EphemeralNodeHolder::Ptr & metadata_drop_lock);
 
-    std::optional<bool> isTableValid() const;
+    enum class TableStatus : uint8_t
+    {
+        UNKNOWN,
+        INVALID_METADATA,
+        INVALID_KEEPER_STRUCTURE,
+        VALID
+    };
+
+    TableStatus getTableStatus() const;
 
     void restoreDataImpl(
         const BackupPtr & backup,
@@ -143,7 +151,8 @@ private:
     mutable zkutil::ZooKeeperPtr zookeeper_client{nullptr};
 
     mutable std::mutex init_mutex;
-    mutable std::optional<bool> table_is_valid;
+
+    mutable TableStatus table_status{TableStatus::UNKNOWN};
 
     LoggerPtr log;
 };
diff --git a/tests/integration/test_keeper_map/test.py b/tests/integration/test_keeper_map/test.py
index 7aee5df5746..4b1bcd11cfe 100644
--- a/tests/integration/test_keeper_map/test.py
+++ b/tests/integration/test_keeper_map/test.py
@@ -67,6 +67,7 @@ def run_query(query):
 
 
 def test_keeper_map_without_zk(started_cluster):
+    run_query("DROP TABLE IF EXISTS test_keeper_map_without_zk SYNC")
     assert_keeper_exception_after_partition(
         "CREATE TABLE test_keeper_map_without_zk (key UInt64, value UInt64) ENGINE = KeeperMap('/test_keeper_map_without_zk') PRIMARY KEY(key);"
     )
@@ -107,12 +108,12 @@ def test_keeper_map_without_zk(started_cluster):
     )
     assert "Failed to activate table because of invalid metadata in ZooKeeper" in error
 
-    node.query("DETACH TABLE test_keeper_map_without_zk")
-
     client.stop()
 
 
 def test_keeper_map_with_failed_drop(started_cluster):
+    run_query("DROP TABLE IF EXISTS test_keeper_map_with_failed_drop SYNC")
+    run_query("DROP TABLE IF EXISTS test_keeper_map_with_failed_drop_another SYNC")
     run_query(
         "CREATE TABLE test_keeper_map_with_failed_drop (key UInt64, value UInt64) ENGINE = KeeperMap('/test_keeper_map_with_failed_drop') PRIMARY KEY(key);"
     )

From 7160e954c16100e963371e416878837437569d74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= <git@rmr.ninja>
Date: Wed, 31 Jul 2024 13:32:24 +0200
Subject: [PATCH 116/139] 02995_new_settings_history: Update ref

---
 ..._23_12_1.tsv => 02995_baseline_24_7_1.tsv} | 182 +++++++++++++++---
 .../0_stateless/02995_new_settings_history.sh |  14 +-
 2 files changed, 167 insertions(+), 29 deletions(-)
 rename tests/queries/0_stateless/{02995_baseline_23_12_1.tsv => 02995_baseline_24_7_1.tsv} (82%)

diff --git a/tests/queries/0_stateless/02995_baseline_23_12_1.tsv b/tests/queries/0_stateless/02995_baseline_24_7_1.tsv
similarity index 82%
rename from tests/queries/0_stateless/02995_baseline_23_12_1.tsv
rename to tests/queries/0_stateless/02995_baseline_24_7_1.tsv
index a391473e7c9..6c830da8646 100644
--- a/tests/queries/0_stateless/02995_baseline_23_12_1.tsv
+++ b/tests/queries/0_stateless/02995_baseline_24_7_1.tsv
@@ -11,23 +11,28 @@ allow_create_index_without_type	0
 allow_custom_error_code_in_throwif	0
 allow_ddl	1
 allow_deprecated_database_ordinary	0
+allow_deprecated_error_prone_window_functions	0
+allow_deprecated_snowflake_conversion_functions	0
 allow_deprecated_syntax_for_merge_tree	0
 allow_distributed_ddl	1
 allow_drop_detached	0
 allow_execute_multiif_columnar	1
 allow_experimental_alter_materialized_view_structure	1
-allow_experimental_analyzer	0
+allow_experimental_analyzer	1
 allow_experimental_annoy_index	0
 allow_experimental_bigint_types	1
 allow_experimental_codecs	0
 allow_experimental_database_atomic	1
 allow_experimental_database_materialized_mysql	0
 allow_experimental_database_materialized_postgresql	0
-allow_experimental_database_replicated	0
+allow_experimental_database_replicated	1
+allow_experimental_dynamic_type	0
+allow_experimental_full_text_index	0
 allow_experimental_funnel_functions	0
 allow_experimental_geo_types	1
 allow_experimental_hash_functions	0
 allow_experimental_inverted_index	0
+allow_experimental_join_condition	0
 allow_experimental_lightweight_delete	1
 allow_experimental_live_view	0
 allow_experimental_map_type	1
@@ -40,12 +45,15 @@ allow_experimental_query_cache	1
 allow_experimental_query_deduplication	0
 allow_experimental_refreshable_materialized_view	0
 allow_experimental_s3queue	1
-allow_experimental_shared_merge_tree	0
+allow_experimental_shared_merge_tree	1
+allow_experimental_statistic	0
 allow_experimental_statistics	0
 allow_experimental_undrop_table_query	1
 allow_experimental_usearch_index	0
+allow_experimental_variant_type	0
 allow_experimental_window_functions	1
 allow_experimental_window_view	0
+allow_get_client_http_header	0
 allow_hyperscan	1
 allow_introspection_functions	0
 allow_named_collection_override_by_default	1
@@ -58,17 +66,21 @@ allow_prefetched_read_pool_for_remote_filesystem	1
 allow_push_predicate_when_subquery_contains_with	1
 allow_settings_after_format_in_insert	0
 allow_simdjson	1
+allow_statistic_optimize	0
 allow_statistics_optimize	0
 allow_suspicious_codecs	0
 allow_suspicious_fixed_string_types	0
 allow_suspicious_indices	0
 allow_suspicious_low_cardinality_types	0
+allow_suspicious_primary_key	0
 allow_suspicious_ttl_expressions	0
+allow_suspicious_variant_types	0
 allow_unrestricted_reads_from_keeper	0
 alter_move_to_space_execute_async	0
 alter_partition_verbose_result	0
 alter_sync	1
 analyze_index_with_space_filling_curves	1
+analyzer_compatibility_join_using_top_level_identifier	0
 annoy_index_search_k_nodes	-1
 any_join_distinct_right_table_keys	0
 apply_deleted_mask	1
@@ -76,20 +88,42 @@ apply_mutations_on_fly	0
 asterisk_include_alias_columns	0
 asterisk_include_materialized_columns	0
 async_insert	0
+async_insert_busy_timeout_decrease_rate	0.2
+async_insert_busy_timeout_increase_rate	0.2
+async_insert_busy_timeout_max_ms	200
+async_insert_busy_timeout_min_ms	50
 async_insert_busy_timeout_ms	200
 async_insert_cleanup_timeout_ms	1000
 async_insert_deduplicate	0
-async_insert_max_data_size	1000000
+async_insert_max_data_size	10485760
 async_insert_max_query_number	450
+async_insert_poll_timeout_ms	10
 async_insert_stale_timeout_ms	0
 async_insert_threads	16
+async_insert_use_adaptive_busy_timeout	1
 async_query_sending_for_remote	1
 async_socket_for_remote	1
+azure_allow_parallel_part_upload	1
 azure_create_new_file_on_insert	0
+azure_ignore_file_doesnt_exist	0
 azure_list_object_keys_size	1000
+azure_max_blocks_in_multipart_upload	50000
+azure_max_inflight_parts_for_one_file	20
+azure_max_single_part_copy_size	268435456
 azure_max_single_part_upload_size	104857600
 azure_max_single_read_retries	4
+azure_max_unexpected_write_error_retries	4
+azure_max_upload_part_size	5368709120
+azure_min_upload_part_size	16777216
+azure_sdk_max_retries	10
+azure_sdk_retry_initial_backoff_ms	10
+azure_sdk_retry_max_backoff_ms	1000
+azure_skip_empty_files	0
+azure_strict_upload_part_size	0
+azure_throw_on_zero_files_match	0
 azure_truncate_on_insert	0
+azure_upload_part_size_multiply_factor	2
+azure_upload_part_size_multiply_parts_count_threshold	500
 background_buffer_flush_schedule_pool_size	16
 background_common_pool_size	8
 background_distributed_schedule_pool_size	16
@@ -107,6 +141,7 @@ backup_restore_keeper_max_retries	20
 backup_restore_keeper_retry_initial_backoff_ms	100
 backup_restore_keeper_retry_max_backoff_ms	5000
 backup_restore_keeper_value_max_size	1048576
+backup_restore_s3_retry_attempts	1000
 backup_threads	16
 bool_false_representation	false
 bool_true_representation	true
@@ -115,6 +150,7 @@ calculate_text_stack_trace	1
 cancel_http_readonly_queries_on_client_close	0
 cast_ipv4_ipv6_default_on_conversion_error	0
 cast_keep_nullable	0
+cast_string_to_dynamic_use_inference	0
 check_query_single_value_result	1
 check_referential_table_dependencies	0
 check_table_dependencies	1
@@ -123,6 +159,7 @@ cloud_mode	0
 cloud_mode_engine	1
 cluster_for_parallel_replicas	
 collect_hash_table_stats_during_aggregation	1
+collect_hash_table_stats_during_joins	1
 column_names_for_schema_inference	
 compatibility	
 compatibility_ignore_auto_increment_in_create_table	0
@@ -141,9 +178,12 @@ count_distinct_optimization	0
 create_index_ignore_unique	0
 create_replicated_merge_tree_fault_injection_probability	0
 create_table_empty_primary_key_by_default	0
+cross_join_min_bytes_to_compress	1073741824
+cross_join_min_rows_to_compress	10000000
 cross_to_inner_join_rewrite	1
 data_type_default_nullable	0
 database_atomic_wait_for_drop_and_detach_synchronously	0
+database_replicated_allow_heavy_create	0
 database_replicated_allow_only_replicated_engine	0
 database_replicated_allow_replicated_engine_arguments	1
 database_replicated_always_detach_permanently	0
@@ -156,15 +196,19 @@ date_time_overflow_behavior	ignore
 decimal_check_overflow	1
 deduplicate_blocks_in_dependent_materialized_views	0
 default_database_engine	Atomic
+default_materialized_view_sql_security	DEFINER
 default_max_bytes_in_join	1000000000
-default_table_engine	None
+default_normal_view_sql_security	INVOKER
+default_table_engine	MergeTree
 default_temporary_table_engine	Memory
+default_view_definer	CURRENT_USER
 describe_compact_output	0
 describe_extend_object_types	0
 describe_include_subcolumns	0
 describe_include_virtual_columns	0
 dialect	clickhouse
 dictionary_use_async_executor	0
+dictionary_validate_primary_key_type	0
 distinct_overflow_mode	throw
 distributed_aggregation_memory_efficient	1
 distributed_background_insert_batch	0
@@ -182,6 +226,7 @@ distributed_directory_monitor_sleep_time_ms	100
 distributed_directory_monitor_split_batch_on_failure	0
 distributed_foreground_insert	0
 distributed_group_by_no_merge	0
+distributed_insert_skip_read_only_replicas	0
 distributed_product_mode	deny
 distributed_push_down_limit	1
 distributed_replica_error_cap	1000
@@ -191,6 +236,7 @@ do_not_merge_across_partitions_select_final	0
 drain_timeout	3
 empty_result_for_aggregation_by_constant_keys_on_empty_set	1
 empty_result_for_aggregation_by_empty_set	0
+enable_blob_storage_log	1
 enable_debug_queries	0
 enable_deflate_qpl_codec	0
 enable_early_constant_folding	1
@@ -205,6 +251,7 @@ enable_job_stack_trace	0
 enable_lightweight_delete	1
 enable_memory_bound_merging_of_aggregation_results	1
 enable_multiple_prewhere_read_steps	1
+enable_named_columns_in_function_tuple	1
 enable_optimize_predicate_expression	1
 enable_optimize_predicate_expression_to_final_subquery	1
 enable_order_by_all	1
@@ -216,7 +263,9 @@ enable_sharing_sets_for_mutations	1
 enable_software_prefetch_in_aggregation	1
 enable_unaligned_array_join	0
 enable_url_encoding	1
+enable_vertical_final	1
 enable_writes_to_query_cache	1
+enable_zstd_qat_codec	0
 engine_file_allow_create_multiple_files	0
 engine_file_empty_if_not_exists	0
 engine_file_skip_empty_files	0
@@ -231,10 +280,12 @@ external_storage_max_read_rows	0
 external_storage_rw_timeout_sec	300
 external_table_functions_use_nulls	1
 external_table_strict_query	0
+extract_key_value_pairs_max_pairs_per_row	1000
 extract_kvp_max_pairs_per_row	1000
 extremes	0
 fallback_to_stale_replicas_for_distributed_queries	1
 filesystem_cache_max_download_size	137438953472
+filesystem_cache_reserve_space_wait_lock_timeout_milliseconds	1000
 filesystem_cache_segments_batch_size	20
 filesystem_prefetch_max_memory_usage	1073741824
 filesystem_prefetch_min_bytes_for_single_read_task	2097152
@@ -278,7 +329,9 @@ format_regexp_escaping_rule	Raw
 format_regexp_skip_unmatched	0
 format_schema	
 format_template_resultset	
+format_template_resultset_format	
 format_template_row	
+format_template_row_format	
 format_template_rows_between_delimiter	\n
 format_tsv_null_representation	\\N
 formatdatetime_f_prints_single_zero	0
@@ -288,8 +341,11 @@ fsync_metadata	1
 function_implementation	
 function_json_value_return_type_allow_complex	0
 function_json_value_return_type_allow_nullable	0
+function_locate_has_mysql_compatible_argument_order	1
 function_range_max_elements_in_block	500000000
 function_sleep_max_microseconds_per_block	3000000
+function_visible_width_behavior	1
+geo_distance_returns_float64_on_float64_arguments	1
 glob_expansion_max_elements	1000
 grace_hash_join_initial_buckets	1
 grace_hash_join_max_buckets	1024
@@ -300,8 +356,10 @@ group_by_use_nulls	0
 handle_kafka_error_mode	default
 handshake_timeout_ms	10000
 hdfs_create_new_file_on_insert	0
+hdfs_ignore_file_doesnt_exist	0
 hdfs_replication	0
 hdfs_skip_empty_files	0
+hdfs_throw_on_zero_files_match	0
 hdfs_truncate_on_insert	0
 hedged_connection_timeout_ms	50
 hsts_max_age	0
@@ -326,10 +384,14 @@ http_skip_not_found_url_for_globs	1
 http_wait_end_of_query	0
 http_write_exception_in_output_format	1
 http_zlib_compression_level	3
+iceberg_engine_ignore_schema_evolution	0
 idle_connection_timeout	3600
 ignore_cold_parts_seconds	0
 ignore_data_skipping_indices	
+ignore_drop_queries_probability	0
+ignore_materialized_views_with_dropped_target_table	0
 ignore_on_cluster_for_replicated_access_entities_queries	0
+ignore_on_cluster_for_replicated_named_collections_queries	0
 ignore_on_cluster_for_replicated_udf_queries	0
 implicit_transaction	0
 input_format_allow_errors_num	0
@@ -341,12 +403,14 @@ input_format_arrow_import_nested	0
 input_format_arrow_skip_columns_with_unsupported_types_in_schema_inference	0
 input_format_avro_allow_missing_fields	0
 input_format_avro_null_as_default	0
+input_format_binary_decode_types_in_binary_format	0
 input_format_bson_skip_fields_with_unsupported_types_in_schema_inference	0
 input_format_capn_proto_skip_fields_with_unsupported_types_in_schema_inference	0
 input_format_csv_allow_cr_end_of_line	0
 input_format_csv_allow_variable_number_of_columns	0
 input_format_csv_allow_whitespace_or_tab_as_delimiter	0
 input_format_csv_arrays_as_nested_csv	0
+input_format_csv_deserialize_separate_columns_into_tuple	1
 input_format_csv_detect_header	1
 input_format_csv_empty_as_default	1
 input_format_csv_enum_as_number	0
@@ -354,29 +418,37 @@ input_format_csv_skip_first_lines	0
 input_format_csv_skip_trailing_empty_lines	0
 input_format_csv_trim_whitespaces	1
 input_format_csv_try_infer_numbers_from_strings	0
+input_format_csv_try_infer_strings_from_quoted_tuples	1
 input_format_csv_use_best_effort_in_schema_inference	1
 input_format_csv_use_default_on_bad_values	0
 input_format_custom_allow_variable_number_of_columns	0
 input_format_custom_detect_header	1
 input_format_custom_skip_trailing_empty_lines	0
 input_format_defaults_for_omitted_fields	1
+input_format_force_null_for_omitted_fields	0
+input_format_hive_text_allow_variable_number_of_columns	1
 input_format_hive_text_collection_items_delimiter	
 input_format_hive_text_fields_delimiter	

 input_format_hive_text_map_keys_delimiter	
 input_format_import_nested_json	0
 input_format_ipv4_default_on_conversion_error	0
 input_format_ipv6_default_on_conversion_error	0
+input_format_json_case_insensitive_column_matching	0
 input_format_json_compact_allow_variable_number_of_columns	0
 input_format_json_defaults_for_missing_elements_in_named_tuple	1
 input_format_json_ignore_unknown_keys_in_named_tuple	1
+input_format_json_ignore_unnecessary_fields	1
 input_format_json_infer_incomplete_types_as_strings	1
 input_format_json_named_tuples_as_objects	1
 input_format_json_read_arrays_as_strings	1
 input_format_json_read_bools_as_numbers	1
+input_format_json_read_bools_as_strings	1
 input_format_json_read_numbers_as_strings	1
 input_format_json_read_objects_as_strings	1
+input_format_json_throw_on_bad_escape_sequence	1
 input_format_json_try_infer_named_tuples_from_objects	1
 input_format_json_try_infer_numbers_from_strings	0
+input_format_json_use_string_type_for_ambiguous_paths_in_named_tuples_inference_from_objects	0
 input_format_json_validate_types_from_metadata	1
 input_format_max_bytes_to_read_for_schema_inference	33554432
 input_format_max_rows_to_read_for_schema_inference	25000
@@ -384,11 +456,13 @@ input_format_msgpack_number_of_columns	0
 input_format_mysql_dump_map_column_names	1
 input_format_mysql_dump_table_name	
 input_format_native_allow_types_conversion	1
+input_format_native_decode_types_in_binary_format	0
 input_format_null_as_default	1
 input_format_orc_allow_missing_columns	1
 input_format_orc_case_insensitive_column_matching	0
 input_format_orc_filter_push_down	1
 input_format_orc_import_nested	0
+input_format_orc_read_use_writer_time_zone	0
 input_format_orc_row_batch_size	100000
 input_format_orc_skip_columns_with_unsupported_types_in_schema_inference	0
 input_format_orc_use_fast_decoder	1
@@ -398,17 +472,21 @@ input_format_parquet_case_insensitive_column_matching	0
 input_format_parquet_filter_push_down	1
 input_format_parquet_import_nested	0
 input_format_parquet_local_file_min_bytes_for_seek	8192
-input_format_parquet_max_block_size	8192
+input_format_parquet_max_block_size	65409
+input_format_parquet_prefer_block_bytes	16744704
 input_format_parquet_preserve_order	0
 input_format_parquet_skip_columns_with_unsupported_types_in_schema_inference	0
+input_format_parquet_use_native_reader	0
 input_format_protobuf_flatten_google_wrappers	0
 input_format_protobuf_skip_fields_with_unsupported_types_in_schema_inference	0
 input_format_record_errors_file_path	
 input_format_skip_unknown_fields	1
 input_format_try_infer_dates	1
 input_format_try_infer_datetimes	1
+input_format_try_infer_exponent_floats	0
 input_format_try_infer_integers	1
 input_format_tsv_allow_variable_number_of_columns	0
+input_format_tsv_crlf_end_of_line	0
 input_format_tsv_detect_header	1
 input_format_tsv_empty_as_default	0
 input_format_tsv_enum_as_number	0
@@ -450,7 +528,12 @@ joined_subquery_requires_alias	1
 kafka_disable_num_consumers_limit	0
 kafka_max_wait_ms	5000
 keeper_map_strict_mode	0
+keeper_max_retries	10
+keeper_retry_initial_backoff_ms	100
+keeper_retry_max_backoff_ms	5000
 legacy_column_name_of_tuple_literal	0
+lightweight_deletes_sync	2
+lightweight_mutation_projection_mode	throw
 limit	0
 live_view_heartbeat_interval	15
 load_balancing	random
@@ -461,7 +544,7 @@ local_filesystem_read_prefetch	0
 lock_acquire_timeout	120
 log_comment	
 log_formatted_queries	0
-log_processors_profiles	0
+log_processors_profiles	1
 log_profile_events	1
 log_queries	1
 log_queries_cut_to_length	100000
@@ -474,6 +557,8 @@ log_query_views	1
 low_cardinality_allow_in_native_format	1
 low_cardinality_max_dictionary_size	8192
 low_cardinality_use_single_dictionary_for_part	0
+materialize_skip_indexes_on_insert	1
+materialize_statistics_on_insert	1
 materialize_ttl_after_modify	1
 materialized_views_ignore_errors	0
 max_alter_threads	\'auto(16)\'
@@ -501,6 +586,7 @@ max_distributed_depth	5
 max_download_buffer_size	10485760
 max_download_threads	4
 max_entries_for_hash_table_stats	10000
+max_estimated_execution_time	0
 max_execution_speed	0
 max_execution_speed_bytes	0
 max_execution_time	0
@@ -528,7 +614,9 @@ max_network_bandwidth_for_user	0
 max_network_bytes	0
 max_number_of_partitions_for_independent_aggregation	128
 max_parallel_replicas	1
+max_parser_backtracks	1000000
 max_parser_depth	1000
+max_parsing_threads	\'auto(16)\'
 max_partition_size_to_drop	50000000000
 max_partitions_per_insert_block	100
 max_partitions_to_read	-1
@@ -537,6 +625,7 @@ max_query_size	262144
 max_read_buffer_size	1048576
 max_read_buffer_size_local_fs	131072
 max_read_buffer_size_remote_fs	0
+max_recursive_cte_evaluation_depth	1000
 max_remote_read_network_bandwidth	0
 max_remote_read_network_bandwidth_for_server	0
 max_remote_write_network_bandwidth	0
@@ -549,7 +638,7 @@ max_result_rows	0
 max_rows_in_distinct	0
 max_rows_in_join	0
 max_rows_in_set	0
-max_rows_in_set_to_optimize_join	100000
+max_rows_in_set_to_optimize_join	0
 max_rows_to_group_by	0
 max_rows_to_read	0
 max_rows_to_read_leaf	0
@@ -557,6 +646,7 @@ max_rows_to_sort	0
 max_rows_to_transfer	0
 max_sessions_for_user	0
 max_size_to_preallocate_for_aggregation	100000000
+max_size_to_preallocate_for_joins	100000000
 max_streams_for_merge_tree_reading	0
 max_streams_multiplier_for_merge_tables	5
 max_streams_to_max_threads_ratio	1
@@ -592,6 +682,7 @@ merge_tree_min_bytes_per_task_for_remote_reading	4194304
 merge_tree_min_rows_for_concurrent_read	163840
 merge_tree_min_rows_for_concurrent_read_for_remote_filesystem	163840
 merge_tree_min_rows_for_seek	0
+merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability	0
 merge_tree_use_const_size_tasks_for_remote_reading	1
 metrics_perf_events_enabled	0
 metrics_perf_events_list	
@@ -604,6 +695,8 @@ min_count_to_compile_expression	3
 min_count_to_compile_sort_description	3
 min_execution_speed	0
 min_execution_speed_bytes	0
+min_external_table_block_size_bytes	268402944
+min_external_table_block_size_rows	1048449
 min_free_disk_space_for_temporary_data	0
 min_hit_rate_to_use_consecutive_keys_optimization	0.5
 min_insert_block_size_bytes	268402944
@@ -619,8 +712,8 @@ mutations_execute_subqueries_on_initiator	0
 mutations_max_literal_size_to_replace	16384
 mutations_sync	0
 mysql_datatypes_support_level	
-mysql_map_fixed_string_to_text_in_show_columns	0
-mysql_map_string_to_text_in_show_columns	0
+mysql_map_fixed_string_to_text_in_show_columns	1
+mysql_map_string_to_text_in_show_columns	1
 mysql_max_rows_to_insert	65536
 network_compression_method	LZ4
 network_zstd_compression_level	1
@@ -647,6 +740,7 @@ optimize_group_by_constant_keys	1
 optimize_group_by_function_keys	1
 optimize_if_chain_to_multiif	0
 optimize_if_transform_strings_to_enum	0
+optimize_injective_functions_in_group_by	1
 optimize_injective_functions_inside_uniq	1
 optimize_min_equality_disjunction_chain_length	3
 optimize_min_inequality_conjunction_chain_length	3
@@ -664,7 +758,7 @@ optimize_redundant_functions_in_order_by	1
 optimize_respect_aliases	1
 optimize_rewrite_aggregate_function_with_if	1
 optimize_rewrite_array_exists_to_has	0
-optimize_rewrite_sum_if_to_count_if	0
+optimize_rewrite_sum_if_to_count_if	1
 optimize_skip_merged_partitions	0
 optimize_skip_unused_shards	0
 optimize_skip_unused_shards_limit	1000
@@ -674,9 +768,10 @@ optimize_sorting_by_input_stream_properties	1
 optimize_substitute_columns	0
 optimize_syntax_fuse_functions	0
 optimize_throw_if_noop	0
+optimize_time_filter_with_preimage	1
 optimize_trivial_approximate_count_query	0
 optimize_trivial_count_query	1
-optimize_trivial_insert_select	1
+optimize_trivial_insert_select	0
 optimize_uniq_to_count	1
 optimize_use_implicit_projections	1
 optimize_use_projections	1
@@ -685,13 +780,19 @@ os_thread_priority	0
 output_format_arrow_compression_method	lz4_frame
 output_format_arrow_fixed_string_as_fixed_byte_array	1
 output_format_arrow_low_cardinality_as_dictionary	0
-output_format_arrow_string_as_string	0
+output_format_arrow_string_as_string	1
+output_format_arrow_use_64_bit_indexes_for_dictionary	0
+output_format_arrow_use_signed_indexes_for_dictionary	1
 output_format_avro_codec	
 output_format_avro_rows_in_file	1
 output_format_avro_string_column_pattern	
 output_format_avro_sync_interval	16384
+output_format_binary_encode_types_in_binary_format	0
 output_format_bson_string_as_string	0
+output_format_compression_level	3
+output_format_compression_zstd_window_log	0
 output_format_csv_crlf_end_of_line	0
+output_format_csv_serialize_tuple_into_separate_columns	1
 output_format_decimal_trailing_zeros	0
 output_format_enable_streaming	0
 output_format_json_array_of_rows	0
@@ -705,27 +806,34 @@ output_format_json_skip_null_value_in_named_tuples	0
 output_format_json_validate_utf8	0
 output_format_markdown_escape_special_characters	0
 output_format_msgpack_uuid_representation	ext
-output_format_orc_compression_method	lz4
+output_format_native_encode_types_in_binary_format	0
+output_format_orc_compression_method	zstd
 output_format_orc_row_index_stride	10000
-output_format_orc_string_as_string	0
+output_format_orc_string_as_string	1
 output_format_parallel_formatting	1
 output_format_parquet_batch_size	1024
 output_format_parquet_compliant_nested_types	1
-output_format_parquet_compression_method	lz4
+output_format_parquet_compression_method	zstd
 output_format_parquet_data_page_size	1048576
 output_format_parquet_fixed_string_as_fixed_byte_array	1
 output_format_parquet_parallel_encoding	1
 output_format_parquet_row_group_size	1000000
 output_format_parquet_row_group_size_bytes	536870912
-output_format_parquet_string_as_string	0
-output_format_parquet_use_custom_encoder	0
+output_format_parquet_string_as_string	1
+output_format_parquet_use_custom_encoder	1
 output_format_parquet_version	2.latest
-output_format_pretty_color	1
+output_format_parquet_write_page_index	1
+output_format_pretty_color	auto
+output_format_pretty_display_footer_column_names	1
+output_format_pretty_display_footer_column_names_min_rows	50
 output_format_pretty_grid_charset	UTF-8
+output_format_pretty_highlight_digit_groups	1
 output_format_pretty_max_column_pad_width	250
 output_format_pretty_max_rows	10000
 output_format_pretty_max_value_width	10000
-output_format_pretty_row_numbers	0
+output_format_pretty_max_value_width_apply_for_single_value	0
+output_format_pretty_row_numbers	1
+output_format_pretty_single_large_number_tip_threshold	1000000
 output_format_protobuf_nullables_with_google_wrappers	0
 output_format_schema	
 output_format_sql_insert_include_column_names	1
@@ -734,15 +842,22 @@ output_format_sql_insert_quote_names	1
 output_format_sql_insert_table_name	table
 output_format_sql_insert_use_replace	0
 output_format_tsv_crlf_end_of_line	0
+output_format_values_escape_quote_with_quote	0
 output_format_write_statistics	1
+page_cache_inject_eviction	0
 parallel_distributed_insert_select	0
 parallel_replica_offset	0
+parallel_replicas_allow_in_with_subquery	1
 parallel_replicas_count	0
 parallel_replicas_custom_key	
 parallel_replicas_custom_key_filter_type	default
+parallel_replicas_custom_key_range_lower	0
+parallel_replicas_custom_key_range_upper	0
 parallel_replicas_for_non_replicated_merge_tree	0
+parallel_replicas_mark_segment_size	128
 parallel_replicas_min_number_of_granules_to_enable	0
 parallel_replicas_min_number_of_rows_per_replica	0
+parallel_replicas_prefer_local_join	1
 parallel_replicas_single_task_marks_count_multiplier	2
 parallel_view_processing	0
 parallelize_output_from_storages	1
@@ -755,11 +870,14 @@ parts_to_delay_insert	0
 parts_to_throw_insert	0
 periodic_live_view_refresh	60
 poll_interval	10
+postgresql_connection_attempt_timeout	2
 postgresql_connection_pool_auto_close_connection	0
+postgresql_connection_pool_retries	2
 postgresql_connection_pool_size	16
 postgresql_connection_pool_wait_timeout	5000
 precise_float_parsing	0
 prefer_column_name_to_alias	0
+prefer_external_sort_block_bytes	16744704
 prefer_global_in_and_join	0
 prefer_localhost_replica	1
 prefer_warmed_unmerged_parts_seconds	0
@@ -767,7 +885,7 @@ preferred_block_size_bytes	1000000
 preferred_max_column_in_block_size_bytes	0
 preferred_optimize_projection_name	
 prefetch_buffer_size	1048576
-print_pretty_type_names	0
+print_pretty_type_names	1
 priority	0
 query_cache_compress_entries	1
 query_cache_max_entries	0
@@ -778,8 +896,10 @@ query_cache_nondeterministic_function_handling	throw
 query_cache_share_between_users	0
 query_cache_squash_partial_results	1
 query_cache_store_results_of_queries_with_nondeterministic_functions	0
+query_cache_system_table_handling	throw
 query_cache_ttl	60
 query_plan_aggregation_in_order	1
+query_plan_convert_outer_join_to_inner_join	1
 query_plan_enable_multithreading_after_window_functions	1
 query_plan_enable_optimizations	1
 query_plan_execute_functions_after_sorting	1
@@ -788,6 +908,8 @@ query_plan_lift_up_array_join	1
 query_plan_lift_up_union	1
 query_plan_max_optimizations_to_apply	10000
 query_plan_merge_expressions	1
+query_plan_merge_filters	0
+query_plan_optimize_prewhere	1
 query_plan_optimize_primary_key	1
 query_plan_optimize_projection	1
 query_plan_push_down_limit	1
@@ -806,7 +928,9 @@ read_backoff_min_events	2
 read_backoff_min_interval_between_events_ms	1000
 read_backoff_min_latency_ms	1000
 read_from_filesystem_cache_if_exists_otherwise_bypass_cache	0
+read_from_page_cache_if_exists_otherwise_bypass_cache	0
 read_in_order_two_level_merge_threshold	100
+read_in_order_use_buffering	1
 read_overflow_mode	throw
 read_overflow_mode_leaf	throw
 read_priority	0
@@ -835,17 +959,20 @@ result_overflow_mode	throw
 rewrite_count_distinct_if_with_count_distinct_implementation	0
 s3_allow_parallel_part_upload	1
 s3_check_objects_after_upload	0
+s3_connect_timeout_ms	1000
 s3_create_new_file_on_insert	0
 s3_disable_checksum	0
-s3_http_connection_pool_size	1000
+s3_ignore_file_doesnt_exist	0
 s3_list_object_keys_size	1000
 s3_max_connections	1024
 s3_max_get_burst	0
 s3_max_get_rps	0
 s3_max_inflight_parts_for_one_file	20
+s3_max_part_number	10000
 s3_max_put_burst	0
 s3_max_put_rps	0
 s3_max_redirects	10
+s3_max_single_operation_copy_size	33554432
 s3_max_single_part_upload_size	33554432
 s3_max_single_read_retries	4
 s3_max_unexpected_write_error_retries	4
@@ -860,6 +987,8 @@ s3_truncate_on_insert	0
 s3_upload_part_size_multiply_factor	2
 s3_upload_part_size_multiply_parts_count_threshold	500
 s3_use_adaptive_timeouts	1
+s3_validate_request_settings	1
+s3queue_allow_experimental_sharded_mode	0
 s3queue_default_zookeeper_path	/clickhouse/s3queue/
 s3queue_enable_logging_to_s3queue_log	0
 schema_inference_cache_require_modification_time_for_url	1
@@ -887,6 +1016,8 @@ sleep_after_receiving_query_ms	0
 sleep_in_send_data_ms	0
 sleep_in_send_tables_status_ms	0
 sort_overflow_mode	throw
+split_intersecting_parts_ranges_into_layers_final	1
+split_parts_ranges_into_intersecting_and_non_intersecting_final	1
 splitby_max_substrings_includes_remaining_string	0
 stop_refreshable_materialized_views_on_startup	0
 storage_file_read_method	pread
@@ -898,8 +1029,10 @@ stream_poll_timeout_ms	500
 system_events_show_zero_values	0
 table_function_remote_max_addresses	1000
 tcp_keep_alive_timeout	290
+temporary_data_in_cache_reserve_space_wait_lock_timeout_milliseconds	600000
 temporary_files_codec	LZ4
 temporary_live_view_timeout	1
+throw_if_deduplication_in_dependent_materialized_views_enabled_with_async_insert	1
 throw_if_no_data_to_insert	1
 throw_on_error_from_cache_on_write_operations	0
 throw_on_max_partitions_per_insert_block	1
@@ -912,8 +1045,10 @@ totals_mode	after_having_exclusive
 trace_profile_events	0
 transfer_overflow_mode	throw
 transform_null_in	0
+traverse_shadow_remote_data_paths	0
 union_default_mode	
 unknown_packet_in_send_data	0
+update_insert_deduplication_token_in_dependent_materialized_views	0
 use_cache_for_count_from_files	1
 use_client_time_zone	0
 use_compact_format_in_distributed_parts_names	1
@@ -923,12 +1058,15 @@ use_index_for_in_with_subqueries	1
 use_index_for_in_with_subqueries_max_values	0
 use_local_cache_for_remote_storage	1
 use_mysql_types_in_show_columns	0
+use_page_cache_for_disks_without_file_cache	0
 use_query_cache	0
 use_skip_indexes	1
 use_skip_indexes_if_final	0
 use_structure_from_insertion_table_in_table_functions	2
 use_uncompressed_cache	0
+use_variant_as_common_type	0
 use_with_fill_by_sorting_prefix	1
+validate_experimental_and_suspicious_types_inside_nested_types	1
 validate_polygons	1
 wait_changes_become_visible_after_commit_mode	wait_unknown
 wait_for_async_insert	1
diff --git a/tests/queries/0_stateless/02995_new_settings_history.sh b/tests/queries/0_stateless/02995_new_settings_history.sh
index 8de98c55b6a..917dacc04b0 100755
--- a/tests/queries/0_stateless/02995_new_settings_history.sh
+++ b/tests/queries/0_stateless/02995_new_settings_history.sh
@@ -7,12 +7,12 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CUR_DIR"/../shell_config.sh
 
 # Note that this is a broad check. A per version check is done in the upgrade test
-# Baseline generated with 23.12.1
-# clickhouse local --query "select name, default from system.settings order by name format TSV" > 02995_baseline_23_12_1.tsv
+# Baseline generated with 24.7.1
+# clickhouse local --query "select name, default from system.settings order by name format TSV" > 02995_baseline_24_7_1.tsv
 $CLICKHOUSE_LOCAL --query "
     WITH old_settings AS
     (
-        SELECT * FROM file('${CUR_DIR}/02995_baseline_23_12_1.tsv', 'TSV', 'name String, default String')
+        SELECT * FROM file('${CUR_DIR}/02995_baseline_24_7_1.tsv', 'TSV', 'name String, default String')
     ),
     new_settings AS
     (
@@ -21,7 +21,7 @@ $CLICKHOUSE_LOCAL --query "
     )
     SELECT * FROM
     (
-        SELECT 'PLEASE ADD THE NEW SETTING TO SettingsChangesHistory.h: ' || name || ' WAS ADDED',
+        SELECT 'PLEASE ADD THE NEW SETTING TO SettingsChangesHistory.cpp: ' || name || ' WAS ADDED',
         FROM new_settings
         WHERE (name NOT IN (
             SELECT name
@@ -29,17 +29,17 @@ $CLICKHOUSE_LOCAL --query "
         )) AND (name NOT IN (
             SELECT arrayJoin(tupleElement(changes, 'name'))
             FROM system.settings_changes
-            WHERE splitByChar('.', version())[1] >= '24'
+            WHERE splitByChar('.', version)[1]::UInt64 >= 24 AND splitByChar('.', version)[2]::UInt64 > 7
         ))
         UNION ALL
         (
-            SELECT 'PLEASE ADD THE SETTING VALUE CHANGE TO SettingsChangesHistory.h: ' || name || ' WAS CHANGED FROM ' || old_settings.default || ' TO ' || new_settings.default,
+            SELECT 'PLEASE ADD THE SETTING VALUE CHANGE TO SettingsChangesHistory.cpp: ' || name || ' WAS CHANGED FROM ' || old_settings.default || ' TO ' || new_settings.default,
             FROM new_settings
             LEFT JOIN old_settings ON new_settings.name = old_settings.name
             WHERE (new_settings.default != old_settings.default) AND (name NOT IN (
                 SELECT arrayJoin(tupleElement(changes, 'name'))
                 FROM system.settings_changes
-                WHERE splitByChar('.', version())[1] >= '24'
+                WHERE splitByChar('.', version)[1]::UInt64 >= 24 AND splitByChar('.', version)[2]::UInt64 > 7
             ))
         )
     )

From b178eea09ec80fed40b5043ccf1635d95b9cf19b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= <git@rmr.ninja>
Date: Wed, 31 Jul 2024 14:59:17 +0200
Subject: [PATCH 117/139] Fix broken settings

---
 src/Core/SettingsChangesHistory.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Core/SettingsChangesHistory.cpp b/src/Core/SettingsChangesHistory.cpp
index 9faf77e9087..ecc558e64d7 100644
--- a/src/Core/SettingsChangesHistory.cpp
+++ b/src/Core/SettingsChangesHistory.cpp
@@ -57,6 +57,16 @@ String ClickHouseVersion::toString() const
 /// Note: please check if the key already exists to prevent duplicate entries.
 static std::initializer_list<std::pair<ClickHouseVersion, SettingsChangesHistory::SettingsChanges>> settings_changes_history_initializer =
 {
+    {"24.12",{
+             }},
+    {"24.11",{
+             }},
+    {"24.10",{
+             }},
+    {"24.9", {
+             }},
+    {"24.8", {{"merge_tree_min_bytes_per_task_for_remote_reading", 4194304, 2097152, "Value is unified with `filesystem_prefetch_min_bytes_for_single_read_task`"},
+              }},
     {"24.7", {{"output_format_parquet_write_page_index", false, true, "Add a possibility to write page index into parquet files."},
               {"output_format_binary_encode_types_in_binary_format", false, false, "Added new setting to allow to write type names in binary format in RowBinaryWithNamesAndTypes output format"},
               {"input_format_binary_decode_types_in_binary_format", false, false, "Added new setting to allow to read type names in binary format in RowBinaryWithNamesAndTypes input format"},
@@ -76,7 +86,6 @@ static std::initializer_list<std::pair<ClickHouseVersion, SettingsChangesHistory
               {"azure_sdk_max_retries", 10, 10, "Maximum number of retries in azure sdk"},
               {"azure_sdk_retry_initial_backoff_ms", 10, 10, "Minimal backoff between retries in azure sdk"},
               {"azure_sdk_retry_max_backoff_ms", 1000, 1000, "Maximal backoff between retries in azure sdk"},
-              {"merge_tree_min_bytes_per_task_for_remote_reading", 4194304, 2097152, "Value is unified with `filesystem_prefetch_min_bytes_for_single_read_task`"},
               {"ignore_on_cluster_for_replicated_named_collections_queries", false, false, "Ignore ON CLUSTER clause for replicated named collections management queries."},
               {"backup_restore_s3_retry_attempts", 1000,1000, "Setting for Aws::Client::RetryStrategy, Aws::Client does retries itself, 0 means no retries. It takes place only for backup/restore."},
               {"postgresql_connection_attempt_timeout", 2, 2, "Allow to control 'connect_timeout' parameter of PostgreSQL connection."},

From baae45889bad6bb6827278ca677025b01dab1da7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= <git@rmr.ninja>
Date: Wed, 31 Jul 2024 15:11:55 +0200
Subject: [PATCH 118/139] Try a less conflict prone format

---
 src/Core/SettingsChangesHistory.cpp | 709 +++++++++++++++++-----------
 1 file changed, 441 insertions(+), 268 deletions(-)

diff --git a/src/Core/SettingsChangesHistory.cpp b/src/Core/SettingsChangesHistory.cpp
index ecc558e64d7..21c89b3c5c5 100644
--- a/src/Core/SettingsChangesHistory.cpp
+++ b/src/Core/SettingsChangesHistory.cpp
@@ -57,274 +57,447 @@ String ClickHouseVersion::toString() const
 /// Note: please check if the key already exists to prevent duplicate entries.
 static std::initializer_list<std::pair<ClickHouseVersion, SettingsChangesHistory::SettingsChanges>> settings_changes_history_initializer =
 {
-    {"24.12",{
-             }},
-    {"24.11",{
-             }},
-    {"24.10",{
-             }},
-    {"24.9", {
-             }},
-    {"24.8", {{"merge_tree_min_bytes_per_task_for_remote_reading", 4194304, 2097152, "Value is unified with `filesystem_prefetch_min_bytes_for_single_read_task`"},
-              }},
-    {"24.7", {{"output_format_parquet_write_page_index", false, true, "Add a possibility to write page index into parquet files."},
-              {"output_format_binary_encode_types_in_binary_format", false, false, "Added new setting to allow to write type names in binary format in RowBinaryWithNamesAndTypes output format"},
-              {"input_format_binary_decode_types_in_binary_format", false, false, "Added new setting to allow to read type names in binary format in RowBinaryWithNamesAndTypes input format"},
-              {"output_format_native_encode_types_in_binary_format", false, false, "Added new setting to allow to write type names in binary format in Native output format"},
-              {"input_format_native_decode_types_in_binary_format", false, false, "Added new setting to allow to read type names in binary format in Native output format"},
-              {"read_in_order_use_buffering", false, true, "Use buffering before merging while reading in order of primary key"},
-              {"enable_named_columns_in_function_tuple", false, true, "Generate named tuples in function tuple() when all names are unique and can be treated as unquoted identifiers."},
-              {"input_format_json_case_insensitive_column_matching", false, false, "Ignore case when matching JSON keys with CH columns."},
-              {"optimize_trivial_insert_select", true, false, "The optimization does not make sense in many cases."},
-              {"dictionary_validate_primary_key_type", false, false, "Validate primary key type for dictionaries. By default id type for simple layouts will be implicitly converted to UInt64."},
-              {"collect_hash_table_stats_during_joins", false, true, "New setting."},
-              {"max_size_to_preallocate_for_joins", 0, 100'000'000, "New setting."},
-              {"input_format_orc_read_use_writer_time_zone", false, false, "Whether use the writer's time zone in ORC stripe for ORC row reader, the default ORC row reader's time zone is GMT."},
-              {"lightweight_mutation_projection_mode", "throw", "throw", "When lightweight delete happens on a table with projection(s), the possible operations include throw the exception as projection exists, or drop all projection related to this table then do lightweight delete."},
-              {"database_replicated_allow_heavy_create", true, false, "Long-running DDL queries (CREATE AS SELECT and POPULATE) for Replicated database engine was forbidden"},
-              {"query_plan_merge_filters", false, false, "Allow to merge filters in the query plan"},
-              {"azure_sdk_max_retries", 10, 10, "Maximum number of retries in azure sdk"},
-              {"azure_sdk_retry_initial_backoff_ms", 10, 10, "Minimal backoff between retries in azure sdk"},
-              {"azure_sdk_retry_max_backoff_ms", 1000, 1000, "Maximal backoff between retries in azure sdk"},
-              {"ignore_on_cluster_for_replicated_named_collections_queries", false, false, "Ignore ON CLUSTER clause for replicated named collections management queries."},
-              {"backup_restore_s3_retry_attempts", 1000,1000, "Setting for Aws::Client::RetryStrategy, Aws::Client does retries itself, 0 means no retries. It takes place only for backup/restore."},
-              {"postgresql_connection_attempt_timeout", 2, 2, "Allow to control 'connect_timeout' parameter of PostgreSQL connection."},
-              {"postgresql_connection_pool_retries", 2, 2, "Allow to control the number of retries in PostgreSQL connection pool."}
-              }},
-    {"24.6", {{"materialize_skip_indexes_on_insert", true, true, "Added new setting to allow to disable materialization of skip indexes on insert"},
-              {"materialize_statistics_on_insert", true, true, "Added new setting to allow to disable materialization of statistics on insert"},
-              {"input_format_parquet_use_native_reader", false, false, "When reading Parquet files, to use native reader instead of arrow reader."},
-              {"hdfs_throw_on_zero_files_match", false, false, "Allow to throw an error when ListObjects request cannot match any files in HDFS engine instead of empty query result"},
-              {"azure_throw_on_zero_files_match", false, false, "Allow to throw an error when ListObjects request cannot match any files in AzureBlobStorage engine instead of empty query result"},
-              {"s3_validate_request_settings", true, true, "Allow to disable S3 request settings validation"},
-              {"allow_experimental_full_text_index", false, false, "Enable experimental full-text index"},
-              {"azure_skip_empty_files", false, false, "Allow to skip empty files in azure table engine"},
-              {"hdfs_ignore_file_doesnt_exist", false, false, "Allow to return 0 rows when the requested files don't exist instead of throwing an exception in HDFS table engine"},
-              {"azure_ignore_file_doesnt_exist", false, false, "Allow to return 0 rows when the requested files don't exist instead of throwing an exception in AzureBlobStorage table engine"},
-              {"s3_ignore_file_doesnt_exist", false, false, "Allow to return 0 rows when the requested files don't exist instead of throwing an exception in S3 table engine"},
-              {"s3_max_part_number", 10000, 10000, "Maximum part number number for s3 upload part"},
-              {"s3_max_single_operation_copy_size", 32 * 1024 * 1024, 32 * 1024 * 1024, "Maximum size for a single copy operation in s3"},
-              {"input_format_parquet_max_block_size", 8192, DEFAULT_BLOCK_SIZE, "Increase block size for parquet reader."},
-              {"input_format_parquet_prefer_block_bytes", 0, DEFAULT_BLOCK_SIZE * 256, "Average block bytes output by parquet reader."},
-              {"enable_blob_storage_log", true, true, "Write information about blob storage operations to system.blob_storage_log table"},
-              {"allow_deprecated_snowflake_conversion_functions", true, false, "Disabled deprecated functions snowflakeToDateTime[64] and dateTime[64]ToSnowflake."},
-              {"allow_statistic_optimize", false, false, "Old setting which popped up here being renamed."},
-              {"allow_experimental_statistic", false, false, "Old setting which popped up here being renamed."},
-              {"allow_statistics_optimize", false, false, "The setting was renamed. The previous name is `allow_statistic_optimize`."},
-              {"allow_experimental_statistics", false, false, "The setting was renamed. The previous name is `allow_experimental_statistic`."},
-              {"enable_vertical_final", false, true, "Enable vertical final by default again after fixing bug"},
-              {"parallel_replicas_custom_key_range_lower", 0, 0, "Add settings to control the range filter when using parallel replicas with dynamic shards"},
-              {"parallel_replicas_custom_key_range_upper", 0, 0, "Add settings to control the range filter when using parallel replicas with dynamic shards. A value of 0 disables the upper limit"},
-              {"output_format_pretty_display_footer_column_names", 0, 1, "Add a setting to display column names in the footer if there are many rows. Threshold value is controlled by output_format_pretty_display_footer_column_names_min_rows."},
-              {"output_format_pretty_display_footer_column_names_min_rows", 0, 50, "Add a setting to control the threshold value for setting output_format_pretty_display_footer_column_names_min_rows. Default 50."},
-              {"output_format_csv_serialize_tuple_into_separate_columns", true, true, "A new way of how interpret tuples in CSV format was added."},
-              {"input_format_csv_deserialize_separate_columns_into_tuple", true, true, "A new way of how interpret tuples in CSV format was added."},
-              {"input_format_csv_try_infer_strings_from_quoted_tuples", true, true, "A new way of how interpret tuples in CSV format was added."},
-              }},
-    {"24.5", {{"allow_deprecated_error_prone_window_functions", true, false, "Allow usage of deprecated error prone window functions (neighbor, runningAccumulate, runningDifferenceStartingWithFirstValue, runningDifference)"},
-              {"allow_experimental_join_condition", false, false, "Support join with inequal conditions which involve columns from both left and right table. e.g. t1.y < t2.y."},
-              {"input_format_tsv_crlf_end_of_line", false, false, "Enables reading of CRLF line endings with TSV formats"},
-              {"output_format_parquet_use_custom_encoder", false, true, "Enable custom Parquet encoder."},
-              {"cross_join_min_rows_to_compress", 0, 10000000, "Minimal count of rows to compress block in CROSS JOIN. Zero value means - disable this threshold. This block is compressed when any of the two thresholds (by rows or by bytes) are reached."},
-              {"cross_join_min_bytes_to_compress", 0, 1_GiB, "Minimal size of block to compress in CROSS JOIN. Zero value means - disable this threshold. This block is compressed when any of the two thresholds (by rows or by bytes) are reached."},
-              {"http_max_chunk_size", 0, 0, "Internal limitation"},
-              {"prefer_external_sort_block_bytes", 0, DEFAULT_BLOCK_SIZE * 256, "Prefer maximum block bytes for external sort, reduce the memory usage during merging."},
-              {"input_format_force_null_for_omitted_fields", false, false, "Disable type-defaults for omitted fields when needed"},
-              {"cast_string_to_dynamic_use_inference", false, false, "Add setting to allow converting String to Dynamic through parsing"},
-              {"allow_experimental_dynamic_type", false, false, "Add new experimental Dynamic type"},
-              {"azure_max_blocks_in_multipart_upload", 50000, 50000, "Maximum number of blocks in multipart upload for Azure."},
-              }},
-    {"24.4", {{"input_format_json_throw_on_bad_escape_sequence", true, true, "Allow to save JSON strings with bad escape sequences"},
-              {"max_parsing_threads", 0, 0, "Add a separate setting to control number of threads in parallel parsing from files"},
-              {"ignore_drop_queries_probability", 0, 0, "Allow to ignore drop queries in server with specified probability for testing purposes"},
-              {"lightweight_deletes_sync", 2, 2, "The same as 'mutation_sync', but controls only execution of lightweight deletes"},
-              {"query_cache_system_table_handling", "save", "throw", "The query cache no longer caches results of queries against system tables"},
-              {"input_format_json_ignore_unnecessary_fields", false, true, "Ignore unnecessary fields and not parse them. Enabling this may not throw exceptions on json strings of invalid format or with duplicated fields"},
-              {"input_format_hive_text_allow_variable_number_of_columns", false, true, "Ignore extra columns in Hive Text input (if file has more columns than expected) and treat missing fields in Hive Text input as default values."},
-              {"allow_experimental_database_replicated", false, true, "Database engine Replicated is now in Beta stage"},
-              {"temporary_data_in_cache_reserve_space_wait_lock_timeout_milliseconds", (10 * 60 * 1000), (10 * 60 * 1000), "Wait time to lock cache for sapce reservation in temporary data in filesystem cache"},
-              {"optimize_rewrite_sum_if_to_count_if", false, true, "Only available for the analyzer, where it works correctly"},
-              {"azure_allow_parallel_part_upload", "true", "true", "Use multiple threads for azure multipart upload."},
-              {"max_recursive_cte_evaluation_depth", DBMS_RECURSIVE_CTE_MAX_EVALUATION_DEPTH, DBMS_RECURSIVE_CTE_MAX_EVALUATION_DEPTH, "Maximum limit on recursive CTE evaluation depth"},
-              {"query_plan_convert_outer_join_to_inner_join", false, true, "Allow to convert OUTER JOIN to INNER JOIN if filter after JOIN always filters default values"},
-              }},
-    {"24.3", {{"s3_connect_timeout_ms", 1000, 1000, "Introduce new dedicated setting for s3 connection timeout"},
-              {"allow_experimental_shared_merge_tree", false, true, "The setting is obsolete"},
-              {"use_page_cache_for_disks_without_file_cache", false, false, "Added userspace page cache"},
-              {"read_from_page_cache_if_exists_otherwise_bypass_cache", false, false, "Added userspace page cache"},
-              {"page_cache_inject_eviction", false, false, "Added userspace page cache"},
-              {"default_table_engine", "None", "MergeTree", "Set default table engine to MergeTree for better usability"},
-              {"input_format_json_use_string_type_for_ambiguous_paths_in_named_tuples_inference_from_objects", false, false, "Allow to use String type for ambiguous paths during named tuple inference from JSON objects"},
-              {"traverse_shadow_remote_data_paths", false, false, "Traverse shadow directory when query system.remote_data_paths."},
-              {"throw_if_deduplication_in_dependent_materialized_views_enabled_with_async_insert", false, true, "Deduplication in dependent materialized view cannot work together with async inserts."},
-              {"parallel_replicas_allow_in_with_subquery", false, true, "If true, subquery for IN will be executed on every follower replica"},
-              {"log_processors_profiles", false, true, "Enable by default"},
-              {"function_locate_has_mysql_compatible_argument_order", false, true, "Increase compatibility with MySQL's locate function."},
-              {"allow_suspicious_primary_key", true, false, "Forbid suspicious PRIMARY KEY/ORDER BY for MergeTree (i.e. SimpleAggregateFunction)"},
-              {"filesystem_cache_reserve_space_wait_lock_timeout_milliseconds", 1000, 1000, "Wait time to lock cache for sapce reservation in filesystem cache"},
-              {"max_parser_backtracks", 0, 1000000, "Limiting the complexity of parsing"},
-              {"analyzer_compatibility_join_using_top_level_identifier", false, false, "Force to resolve identifier in JOIN USING from projection"},
-              {"distributed_insert_skip_read_only_replicas", false, false, "If true, INSERT into Distributed will skip read-only replicas"},
-              {"keeper_max_retries", 10, 10, "Max retries for general keeper operations"},
-              {"keeper_retry_initial_backoff_ms", 100, 100, "Initial backoff timeout for general keeper operations"},
-              {"keeper_retry_max_backoff_ms", 5000, 5000, "Max backoff timeout for general keeper operations"},
-              {"s3queue_allow_experimental_sharded_mode", false, false, "Enable experimental sharded mode of S3Queue table engine. It is experimental because it will be rewritten"},
-              {"allow_experimental_analyzer", false, true, "Enable analyzer and planner by default."},
-              {"merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability", 0.0, 0.0, "For testing of `PartsSplitter` - split read ranges into intersecting and non intersecting every time you read from MergeTree with the specified probability."},
-              {"allow_get_client_http_header", false, false, "Introduced a new function."},
-              {"output_format_pretty_row_numbers", false, true, "It is better for usability."},
-              {"output_format_pretty_max_value_width_apply_for_single_value", true, false, "Single values in Pretty formats won't be cut."},
-              {"output_format_parquet_string_as_string", false, true, "ClickHouse allows arbitrary binary data in the String data type, which is typically UTF-8. Parquet/ORC/Arrow Strings only support UTF-8. That's why you can choose which Arrow's data type to use for the ClickHouse String data type - String or Binary. While Binary would be more correct and compatible, using String by default will correspond to user expectations in most cases."},
-              {"output_format_orc_string_as_string", false, true, "ClickHouse allows arbitrary binary data in the String data type, which is typically UTF-8. Parquet/ORC/Arrow Strings only support UTF-8. That's why you can choose which Arrow's data type to use for the ClickHouse String data type - String or Binary. While Binary would be more correct and compatible, using String by default will correspond to user expectations in most cases."},
-              {"output_format_arrow_string_as_string", false, true, "ClickHouse allows arbitrary binary data in the String data type, which is typically UTF-8. Parquet/ORC/Arrow Strings only support UTF-8. That's why you can choose which Arrow's data type to use for the ClickHouse String data type - String or Binary. While Binary would be more correct and compatible, using String by default will correspond to user expectations in most cases."},
-              {"output_format_parquet_compression_method", "lz4", "zstd", "Parquet/ORC/Arrow support many compression methods, including lz4 and zstd. ClickHouse supports each and every compression method. Some inferior tools, such as 'duckdb', lack support for the faster `lz4` compression method, that's why we set zstd by default."},
-              {"output_format_orc_compression_method", "lz4", "zstd", "Parquet/ORC/Arrow support many compression methods, including lz4 and zstd. ClickHouse supports each and every compression method. Some inferior tools, such as 'duckdb', lack support for the faster `lz4` compression method, that's why we set zstd by default."},
-              {"output_format_pretty_highlight_digit_groups", false, true, "If enabled and if output is a terminal, highlight every digit corresponding to the number of thousands, millions, etc. with underline."},
-              {"geo_distance_returns_float64_on_float64_arguments", false, true, "Increase the default precision."},
-              {"azure_max_inflight_parts_for_one_file", 20, 20, "The maximum number of a concurrent loaded parts in multipart upload request. 0 means unlimited."},
-              {"azure_strict_upload_part_size", 0, 0, "The exact size of part to upload during multipart upload to Azure blob storage."},
-              {"azure_min_upload_part_size", 16*1024*1024, 16*1024*1024, "The minimum size of part to upload during multipart upload to Azure blob storage."},
-              {"azure_max_upload_part_size", 5ull*1024*1024*1024, 5ull*1024*1024*1024, "The maximum size of part to upload during multipart upload to Azure blob storage."},
-              {"azure_upload_part_size_multiply_factor", 2, 2, "Multiply azure_min_upload_part_size by this factor each time azure_multiply_parts_count_threshold parts were uploaded from a single write to Azure blob storage."},
-              {"azure_upload_part_size_multiply_parts_count_threshold", 500, 500, "Each time this number of parts was uploaded to Azure blob storage, azure_min_upload_part_size is multiplied by azure_upload_part_size_multiply_factor."},
-              {"output_format_csv_serialize_tuple_into_separate_columns", true, true, "A new way of how interpret tuples in CSV format was added."},
-              {"input_format_csv_deserialize_separate_columns_into_tuple", true, true, "A new way of how interpret tuples in CSV format was added."},
-              {"input_format_csv_try_infer_strings_from_quoted_tuples", true, true, "A new way of how interpret tuples in CSV format was added."},
-              }},
-    {"24.2", {{"allow_suspicious_variant_types", true, false, "Don't allow creating Variant type with suspicious variants by default"},
-              {"validate_experimental_and_suspicious_types_inside_nested_types", false, true, "Validate usage of experimental and suspicious types inside nested types"},
-              {"output_format_values_escape_quote_with_quote", false, false, "If true escape ' with '', otherwise quoted with \\'"},
-              {"output_format_pretty_single_large_number_tip_threshold", 0, 1'000'000, "Print a readable number tip on the right side of the table if the block consists of a single number which exceeds this value (except 0)"},
-              {"input_format_try_infer_exponent_floats", true, false, "Don't infer floats in exponential notation by default"},
-              {"query_plan_optimize_prewhere", true, true, "Allow to push down filter to PREWHERE expression for supported storages"},
-              {"async_insert_max_data_size", 1000000, 10485760, "The previous value appeared to be too small."},
-              {"async_insert_poll_timeout_ms", 10, 10, "Timeout in milliseconds for polling data from asynchronous insert queue"},
-              {"async_insert_use_adaptive_busy_timeout", false, true, "Use adaptive asynchronous insert timeout"},
-              {"async_insert_busy_timeout_min_ms", 50, 50, "The minimum value of the asynchronous insert timeout in milliseconds; it also serves as the initial value, which may be increased later by the adaptive algorithm"},
-              {"async_insert_busy_timeout_max_ms", 200, 200, "The minimum value of the asynchronous insert timeout in milliseconds; async_insert_busy_timeout_ms is aliased to async_insert_busy_timeout_max_ms"},
-              {"async_insert_busy_timeout_increase_rate", 0.2, 0.2, "The exponential growth rate at which the adaptive asynchronous insert timeout increases"},
-              {"async_insert_busy_timeout_decrease_rate", 0.2, 0.2, "The exponential growth rate at which the adaptive asynchronous insert timeout decreases"},
-              {"format_template_row_format", "", "", "Template row format string can be set directly in query"},
-              {"format_template_resultset_format", "", "", "Template result set format string can be set in query"},
-              {"split_parts_ranges_into_intersecting_and_non_intersecting_final", true, true, "Allow to split parts ranges into intersecting and non intersecting during FINAL optimization"},
-              {"split_intersecting_parts_ranges_into_layers_final", true, true, "Allow to split intersecting parts ranges into layers during FINAL optimization"},
-              {"azure_max_single_part_copy_size", 256*1024*1024, 256*1024*1024, "The maximum size of object to copy using single part copy to Azure blob storage."},
-              {"min_external_table_block_size_rows", DEFAULT_INSERT_BLOCK_SIZE, DEFAULT_INSERT_BLOCK_SIZE, "Squash blocks passed to external table to specified size in rows, if blocks are not big enough"},
-              {"min_external_table_block_size_bytes", DEFAULT_INSERT_BLOCK_SIZE * 256, DEFAULT_INSERT_BLOCK_SIZE * 256, "Squash blocks passed to external table to specified size in bytes, if blocks are not big enough."},
-              {"parallel_replicas_prefer_local_join", true, true, "If true, and JOIN can be executed with parallel replicas algorithm, and all storages of right JOIN part are *MergeTree, local JOIN will be used instead of GLOBAL JOIN."},
-              {"optimize_time_filter_with_preimage", true, true, "Optimize Date and DateTime predicates by converting functions into equivalent comparisons without conversions (e.g. toYear(col) = 2023 -> col >= '2023-01-01' AND col <= '2023-12-31')"},
-              {"extract_key_value_pairs_max_pairs_per_row", 0, 0, "Max number of pairs that can be produced by the `extractKeyValuePairs` function. Used as a safeguard against consuming too much memory."},
-              {"default_view_definer", "CURRENT_USER", "CURRENT_USER", "Allows to set default `DEFINER` option while creating a view"},
-              {"default_materialized_view_sql_security", "DEFINER", "DEFINER", "Allows to set a default value for SQL SECURITY option when creating a materialized view"},
-              {"default_normal_view_sql_security", "INVOKER", "INVOKER", "Allows to set default `SQL SECURITY` option while creating a normal view"},
-              {"mysql_map_string_to_text_in_show_columns", false, true, "Reduce the configuration effort to connect ClickHouse with BI tools."},
-              {"mysql_map_fixed_string_to_text_in_show_columns", false, true, "Reduce the configuration effort to connect ClickHouse with BI tools."},
-              }},
-    {"24.1", {{"print_pretty_type_names", false, true, "Better user experience."},
-              {"input_format_json_read_bools_as_strings", false, true, "Allow to read bools as strings in JSON formats by default"},
-              {"output_format_arrow_use_signed_indexes_for_dictionary", false, true, "Use signed indexes type for Arrow dictionaries by default as it's recommended"},
-              {"allow_experimental_variant_type", false, false, "Add new experimental Variant type"},
-              {"use_variant_as_common_type", false, false, "Allow to use Variant in if/multiIf if there is no common type"},
-              {"output_format_arrow_use_64_bit_indexes_for_dictionary", false, false, "Allow to use 64 bit indexes type in Arrow dictionaries"},
-              {"parallel_replicas_mark_segment_size", 128, 128, "Add new setting to control segment size in new parallel replicas coordinator implementation"},
-              {"ignore_materialized_views_with_dropped_target_table", false, false, "Add new setting to allow to ignore materialized views with dropped target table"},
-              {"output_format_compression_level", 3, 3, "Allow to change compression level in the query output"},
-              {"output_format_compression_zstd_window_log", 0, 0, "Allow to change zstd window log in the query output when zstd compression is used"},
-              {"enable_zstd_qat_codec", false, false, "Add new ZSTD_QAT codec"},
-              {"enable_vertical_final", false, true, "Use vertical final by default"},
-              {"output_format_arrow_use_64_bit_indexes_for_dictionary", false, false, "Allow to use 64 bit indexes type in Arrow dictionaries"},
-              {"max_rows_in_set_to_optimize_join", 100000, 0, "Disable join optimization as it prevents from read in order optimization"},
-              {"output_format_pretty_color", true, "auto", "Setting is changed to allow also for auto value, disabling ANSI escapes if output is not a tty"},
-              {"function_visible_width_behavior", 0, 1, "We changed the default behavior of `visibleWidth` to be more precise"},
-              {"max_estimated_execution_time", 0, 0, "Separate max_execution_time and max_estimated_execution_time"},
-              {"iceberg_engine_ignore_schema_evolution", false, false, "Allow to ignore schema evolution in Iceberg table engine"},
-              {"optimize_injective_functions_in_group_by", false, true, "Replace injective functions by it's arguments in GROUP BY section in analyzer"},
-              {"update_insert_deduplication_token_in_dependent_materialized_views", false, false, "Allow to update insert deduplication token with table identifier during insert in dependent materialized views"},
-              {"azure_max_unexpected_write_error_retries", 4, 4, "The maximum number of retries in case of unexpected errors during Azure blob storage write"},
-              {"split_parts_ranges_into_intersecting_and_non_intersecting_final", false, true, "Allow to split parts ranges into intersecting and non intersecting during FINAL optimization"},
-              {"split_intersecting_parts_ranges_into_layers_final", true, true, "Allow to split intersecting parts ranges into layers during FINAL optimization"}}},
-    {"23.12", {{"allow_suspicious_ttl_expressions", true, false, "It is a new setting, and in previous versions the behavior was equivalent to allowing."},
-              {"input_format_parquet_allow_missing_columns", false, true, "Allow missing columns in Parquet files by default"},
-              {"input_format_orc_allow_missing_columns", false, true, "Allow missing columns in ORC files by default"},
-              {"input_format_arrow_allow_missing_columns", false, true, "Allow missing columns in Arrow files by default"}}},
-    {"23.11", {{"parsedatetime_parse_without_leading_zeros", false, true, "Improved compatibility with MySQL DATE_FORMAT/STR_TO_DATE"}}},
-    {"23.9", {{"optimize_group_by_constant_keys", false, true, "Optimize group by constant keys by default"},
-              {"input_format_json_try_infer_named_tuples_from_objects", false, true, "Try to infer named Tuples from JSON objects by default"},
-              {"input_format_json_read_numbers_as_strings", false, true, "Allow to read numbers as strings in JSON formats by default"},
-              {"input_format_json_read_arrays_as_strings", false, true, "Allow to read arrays as strings in JSON formats by default"},
-              {"input_format_json_infer_incomplete_types_as_strings", false, true, "Allow to infer incomplete types as Strings in JSON formats by default"},
-              {"input_format_json_try_infer_numbers_from_strings", true, false, "Don't infer numbers from strings in JSON formats by default to prevent possible parsing errors"},
-              {"http_write_exception_in_output_format", false, true, "Output valid JSON/XML on exception in HTTP streaming."}}},
-    {"23.8", {{"rewrite_count_distinct_if_with_count_distinct_implementation", false, true, "Rewrite countDistinctIf with count_distinct_implementation configuration"}}},
-    {"23.7", {{"function_sleep_max_microseconds_per_block", 0, 3000000, "In previous versions, the maximum sleep time of 3 seconds was applied only for `sleep`, but not for `sleepEachRow` function. In the new version, we introduce this setting. If you set compatibility with the previous versions, we will disable the limit altogether."}}},
-    {"23.6", {{"http_send_timeout", 180, 30, "3 minutes seems crazy long. Note that this is timeout for a single network write call, not for the whole upload operation."},
-              {"http_receive_timeout", 180, 30, "See http_send_timeout."}}},
-    {"23.5", {{"input_format_parquet_preserve_order", true, false, "Allow Parquet reader to reorder rows for better parallelism."},
-              {"parallelize_output_from_storages", false, true, "Allow parallelism when executing queries that read from file/url/s3/etc. This may reorder rows."},
-              {"use_with_fill_by_sorting_prefix", false, true, "Columns preceding WITH FILL columns in ORDER BY clause form sorting prefix. Rows with different values in sorting prefix are filled independently"},
-              {"output_format_parquet_compliant_nested_types", false, true, "Change an internal field name in output Parquet file schema."}}},
-    {"23.4", {{"allow_suspicious_indices", true, false, "If true, index can defined with identical expressions"},
-              {"allow_nonconst_timezone_arguments", true, false, "Allow non-const timezone arguments in certain time-related functions like toTimeZone(), fromUnixTimestamp*(), snowflakeToDateTime*()."},
-              {"connect_timeout_with_failover_ms", 50, 1000, "Increase default connect timeout because of async connect"},
-              {"connect_timeout_with_failover_secure_ms", 100, 1000, "Increase default secure connect timeout because of async connect"},
-              {"hedged_connection_timeout_ms", 100, 50, "Start new connection in hedged requests after 50 ms instead of 100 to correspond with previous connect timeout"},
-              {"formatdatetime_f_prints_single_zero", true, false, "Improved compatibility with MySQL DATE_FORMAT()/STR_TO_DATE()"},
-              {"formatdatetime_parsedatetime_m_is_month_name", false, true, "Improved compatibility with MySQL DATE_FORMAT/STR_TO_DATE"}}},
-    {"23.3", {{"output_format_parquet_version", "1.0", "2.latest", "Use latest Parquet format version for output format"},
-              {"input_format_json_ignore_unknown_keys_in_named_tuple", false, true, "Improve parsing JSON objects as named tuples"},
-              {"input_format_native_allow_types_conversion", false, true, "Allow types conversion in Native input forma"},
-              {"output_format_arrow_compression_method", "none", "lz4_frame", "Use lz4 compression in Arrow output format by default"},
-              {"output_format_parquet_compression_method", "snappy", "lz4", "Use lz4 compression in Parquet output format by default"},
-              {"output_format_orc_compression_method", "none", "lz4_frame", "Use lz4 compression in ORC output format by default"},
-              {"async_query_sending_for_remote", false, true, "Create connections and send query async across shards"}}},
-    {"23.2", {{"output_format_parquet_fixed_string_as_fixed_byte_array", false, true, "Use Parquet FIXED_LENGTH_BYTE_ARRAY type for FixedString by default"},
-              {"output_format_arrow_fixed_string_as_fixed_byte_array", false, true, "Use Arrow FIXED_SIZE_BINARY type for FixedString by default"},
-              {"query_plan_remove_redundant_distinct", false, true, "Remove redundant Distinct step in query plan"},
-              {"optimize_duplicate_order_by_and_distinct", true, false, "Remove duplicate ORDER BY and DISTINCT if it's possible"},
-              {"insert_keeper_max_retries", 0, 20, "Enable reconnections to Keeper on INSERT, improve reliability"}}},
-    {"23.1", {{"input_format_json_read_objects_as_strings", 0, 1, "Enable reading nested json objects as strings while object type is experimental"},
-              {"input_format_json_defaults_for_missing_elements_in_named_tuple", false, true, "Allow missing elements in JSON objects while reading named tuples by default"},
-              {"input_format_csv_detect_header", false, true, "Detect header in CSV format by default"},
-              {"input_format_tsv_detect_header", false, true, "Detect header in TSV format by default"},
-              {"input_format_custom_detect_header", false, true, "Detect header in CustomSeparated format by default"},
-              {"query_plan_remove_redundant_sorting", false, true, "Remove redundant sorting in query plan. For example, sorting steps related to ORDER BY clauses in subqueries"}}},
-    {"22.12", {{"max_size_to_preallocate_for_aggregation", 10'000'000, 100'000'000, "This optimizes performance"},
-               {"query_plan_aggregation_in_order", 0, 1, "Enable some refactoring around query plan"},
-               {"format_binary_max_string_size", 0, 1_GiB, "Prevent allocating large amount of memory"}}},
-    {"22.11", {{"use_structure_from_insertion_table_in_table_functions", 0, 2, "Improve using structure from insertion table in table functions"}}},
-    {"22.9", {{"force_grouping_standard_compatibility", false, true, "Make GROUPING function output the same as in SQL standard and other DBMS"}}},
-    {"22.7", {{"cross_to_inner_join_rewrite", 1, 2, "Force rewrite comma join to inner"},
-              {"enable_positional_arguments", false, true, "Enable positional arguments feature by default"},
-              {"format_csv_allow_single_quotes", true, false, "Most tools don't treat single quote in CSV specially, don't do it by default too"}}},
-    {"22.6", {{"output_format_json_named_tuples_as_objects", false, true, "Allow to serialize named tuples as JSON objects in JSON formats by default"},
-              {"input_format_skip_unknown_fields", false, true, "Optimize reading subset of columns for some input formats"}}},
-    {"22.5", {{"memory_overcommit_ratio_denominator", 0, 1073741824, "Enable memory overcommit feature by default"},
-              {"memory_overcommit_ratio_denominator_for_user", 0, 1073741824, "Enable memory overcommit feature by default"}}},
-    {"22.4", {{"allow_settings_after_format_in_insert", true, false, "Do not allow SETTINGS after FORMAT for INSERT queries because ClickHouse interpret SETTINGS as some values, which is misleading"}}},
-    {"22.3", {{"cast_ipv4_ipv6_default_on_conversion_error", true, false, "Make functions cast(value, 'IPv4') and cast(value, 'IPv6') behave same as toIPv4 and toIPv6 functions"}}},
-    {"21.12", {{"stream_like_engine_allow_direct_select", true, false, "Do not allow direct select for Kafka/RabbitMQ/FileLog by default"}}},
-    {"21.9", {{"output_format_decimal_trailing_zeros", true, false, "Do not output trailing zeros in text representation of Decimal types by default for better looking output"},
-              {"use_hedged_requests", false, true, "Enable Hedged Requests feature by default"}}},
-    {"21.7", {{"legacy_column_name_of_tuple_literal", true, false, "Add this setting only for compatibility reasons. It makes sense to set to 'true', while doing rolling update of cluster from version lower than 21.7 to higher"}}},
-    {"21.5", {{"async_socket_for_remote", false, true, "Fix all problems and turn on asynchronous reads from socket for remote queries by default again"}}},
-    {"21.3", {{"async_socket_for_remote", true, false, "Turn off asynchronous reads from socket for remote queries because of some problems"},
-              {"optimize_normalize_count_variants", false, true, "Rewrite aggregate functions that semantically equals to count() as count() by default"},
-              {"normalize_function_names", false, true, "Normalize function names to their canonical names, this was needed for projection query routing"}}},
-    {"21.2", {{"enable_global_with_statement", false, true, "Propagate WITH statements to UNION queries and all subqueries by default"}}},
-    {"21.1", {{"insert_quorum_parallel", false, true, "Use parallel quorum inserts by default. It is significantly more convenient to use than sequential quorum inserts"},
-              {"input_format_null_as_default", false, true, "Allow to insert NULL as default for input formats by default"},
-              {"optimize_on_insert", false, true, "Enable data optimization on INSERT by default for better user experience"},
-              {"use_compact_format_in_distributed_parts_names", false, true, "Use compact format for async INSERT into Distributed tables by default"}}},
-    {"20.10", {{"format_regexp_escaping_rule", "Escaped", "Raw", "Use Raw as default escaping rule for Regexp format to male the behaviour more like to what users expect"}}},
-    {"20.7", {{"show_table_uuid_in_table_create_query_if_not_nil", true, false, "Stop showing  UID of the table in its CREATE query for Engine=Atomic"}}},
-    {"20.5", {{"input_format_with_names_use_header", false, true, "Enable using header with names for formats with WithNames/WithNamesAndTypes suffixes"},
-              {"allow_suspicious_codecs", true, false, "Don't allow to specify meaningless compression codecs"}}},
-    {"20.4", {{"validate_polygons", false, true, "Throw exception if polygon is invalid in function pointInPolygon by default instead of returning possibly wrong results"}}},
-    {"19.18", {{"enable_scalar_subquery_optimization", false, true, "Prevent scalar subqueries from (de)serializing large scalar values and possibly avoid running the same subquery more than once"}}},
-    {"19.14", {{"any_join_distinct_right_table_keys", true, false, "Disable ANY RIGHT and ANY FULL JOINs by default to avoid inconsistency"}}},
-    {"19.12", {{"input_format_defaults_for_omitted_fields", false, true, "Enable calculation of complex default expressions for omitted fields for some input formats, because it should be the expected behaviour"}}},
-    {"19.5", {{"max_partitions_per_insert_block", 0, 100, "Add a limit for the number of partitions in one block"}}},
-    {"18.12.17", {{"enable_optimize_predicate_expression", 0, 1, "Optimize predicates to subqueries by default"}}},
+    {"24.12",
+        {
+        }
+    },
+    {"24.11",
+        {
+        }
+    },
+    {"24.10",
+        {
+        }
+    },
+    {"24.9",
+        {
+        }
+    },
+    {"24.8",
+        {
+            {"merge_tree_min_bytes_per_task_for_remote_reading", 4194304, 2097152, "Value is unified with `filesystem_prefetch_min_bytes_for_single_read_task`"},
+        }
+    },
+    {"24.7",
+        {
+            {"output_format_parquet_write_page_index", false, true, "Add a possibility to write page index into parquet files."},
+            {"output_format_binary_encode_types_in_binary_format", false, false, "Added new setting to allow to write type names in binary format in RowBinaryWithNamesAndTypes output format"},
+            {"input_format_binary_decode_types_in_binary_format", false, false, "Added new setting to allow to read type names in binary format in RowBinaryWithNamesAndTypes input format"},
+            {"output_format_native_encode_types_in_binary_format", false, false, "Added new setting to allow to write type names in binary format in Native output format"},
+            {"input_format_native_decode_types_in_binary_format", false, false, "Added new setting to allow to read type names in binary format in Native output format"},
+            {"read_in_order_use_buffering", false, true, "Use buffering before merging while reading in order of primary key"},
+            {"enable_named_columns_in_function_tuple", false, true, "Generate named tuples in function tuple() when all names are unique and can be treated as unquoted identifiers."},
+            {"input_format_json_case_insensitive_column_matching", false, false, "Ignore case when matching JSON keys with CH columns."},
+            {"optimize_trivial_insert_select", true, false, "The optimization does not make sense in many cases."},
+            {"dictionary_validate_primary_key_type", false, false, "Validate primary key type for dictionaries. By default id type for simple layouts will be implicitly converted to UInt64."},
+            {"collect_hash_table_stats_during_joins", false, true, "New setting."},
+            {"max_size_to_preallocate_for_joins", 0, 100'000'000, "New setting."},
+            {"input_format_orc_read_use_writer_time_zone", false, false, "Whether use the writer's time zone in ORC stripe for ORC row reader, the default ORC row reader's time zone is GMT."},
+            {"lightweight_mutation_projection_mode", "throw", "throw", "When lightweight delete happens on a table with projection(s), the possible operations include throw the exception as projection exists, or drop all projection related to this table then do lightweight delete."},
+            {"database_replicated_allow_heavy_create", true, false, "Long-running DDL queries (CREATE AS SELECT and POPULATE) for Replicated database engine was forbidden"},
+            {"query_plan_merge_filters", false, false, "Allow to merge filters in the query plan"},
+            {"azure_sdk_max_retries", 10, 10, "Maximum number of retries in azure sdk"},
+            {"azure_sdk_retry_initial_backoff_ms", 10, 10, "Minimal backoff between retries in azure sdk"},
+            {"azure_sdk_retry_max_backoff_ms", 1000, 1000, "Maximal backoff between retries in azure sdk"},
+            {"ignore_on_cluster_for_replicated_named_collections_queries", false, false, "Ignore ON CLUSTER clause for replicated named collections management queries."},
+            {"backup_restore_s3_retry_attempts", 1000,1000, "Setting for Aws::Client::RetryStrategy, Aws::Client does retries itself, 0 means no retries. It takes place only for backup/restore."},
+            {"postgresql_connection_attempt_timeout", 2, 2, "Allow to control 'connect_timeout' parameter of PostgreSQL connection."},
+            {"postgresql_connection_pool_retries", 2, 2, "Allow to control the number of retries in PostgreSQL connection pool."}
+        }
+    },
+    {"24.6",
+        {
+            {"materialize_skip_indexes_on_insert", true, true, "Added new setting to allow to disable materialization of skip indexes on insert"},
+            {"materialize_statistics_on_insert", true, true, "Added new setting to allow to disable materialization of statistics on insert"},
+            {"input_format_parquet_use_native_reader", false, false, "When reading Parquet files, to use native reader instead of arrow reader."},
+            {"hdfs_throw_on_zero_files_match", false, false, "Allow to throw an error when ListObjects request cannot match any files in HDFS engine instead of empty query result"},
+            {"azure_throw_on_zero_files_match", false, false, "Allow to throw an error when ListObjects request cannot match any files in AzureBlobStorage engine instead of empty query result"},
+            {"s3_validate_request_settings", true, true, "Allow to disable S3 request settings validation"},
+            {"allow_experimental_full_text_index", false, false, "Enable experimental full-text index"},
+            {"azure_skip_empty_files", false, false, "Allow to skip empty files in azure table engine"},
+            {"hdfs_ignore_file_doesnt_exist", false, false, "Allow to return 0 rows when the requested files don't exist instead of throwing an exception in HDFS table engine"},
+            {"azure_ignore_file_doesnt_exist", false, false, "Allow to return 0 rows when the requested files don't exist instead of throwing an exception in AzureBlobStorage table engine"},
+            {"s3_ignore_file_doesnt_exist", false, false, "Allow to return 0 rows when the requested files don't exist instead of throwing an exception in S3 table engine"},
+            {"s3_max_part_number", 10000, 10000, "Maximum part number number for s3 upload part"},
+            {"s3_max_single_operation_copy_size", 32 * 1024 * 1024, 32 * 1024 * 1024, "Maximum size for a single copy operation in s3"},
+            {"input_format_parquet_max_block_size", 8192, DEFAULT_BLOCK_SIZE, "Increase block size for parquet reader."},
+            {"input_format_parquet_prefer_block_bytes", 0, DEFAULT_BLOCK_SIZE * 256, "Average block bytes output by parquet reader."},
+            {"enable_blob_storage_log", true, true, "Write information about blob storage operations to system.blob_storage_log table"},
+            {"allow_deprecated_snowflake_conversion_functions", true, false, "Disabled deprecated functions snowflakeToDateTime[64] and dateTime[64]ToSnowflake."},
+            {"allow_statistic_optimize", false, false, "Old setting which popped up here being renamed."},
+            {"allow_experimental_statistic", false, false, "Old setting which popped up here being renamed."},
+            {"allow_statistics_optimize", false, false, "The setting was renamed. The previous name is `allow_statistic_optimize`."},
+            {"allow_experimental_statistics", false, false, "The setting was renamed. The previous name is `allow_experimental_statistic`."},
+            {"enable_vertical_final", false, true, "Enable vertical final by default again after fixing bug"},
+            {"parallel_replicas_custom_key_range_lower", 0, 0, "Add settings to control the range filter when using parallel replicas with dynamic shards"},
+            {"parallel_replicas_custom_key_range_upper", 0, 0, "Add settings to control the range filter when using parallel replicas with dynamic shards. A value of 0 disables the upper limit"},
+            {"output_format_pretty_display_footer_column_names", 0, 1, "Add a setting to display column names in the footer if there are many rows. Threshold value is controlled by output_format_pretty_display_footer_column_names_min_rows."},
+            {"output_format_pretty_display_footer_column_names_min_rows", 0, 50, "Add a setting to control the threshold value for setting output_format_pretty_display_footer_column_names_min_rows. Default 50."},
+            {"output_format_csv_serialize_tuple_into_separate_columns", true, true, "A new way of how interpret tuples in CSV format was added."},
+            {"input_format_csv_deserialize_separate_columns_into_tuple", true, true, "A new way of how interpret tuples in CSV format was added."},
+            {"input_format_csv_try_infer_strings_from_quoted_tuples", true, true, "A new way of how interpret tuples in CSV format was added."},
+        }
+    },
+    {"24.5",
+        {
+            {"allow_deprecated_error_prone_window_functions", true, false, "Allow usage of deprecated error prone window functions (neighbor, runningAccumulate, runningDifferenceStartingWithFirstValue, runningDifference)"},
+            {"allow_experimental_join_condition", false, false, "Support join with inequal conditions which involve columns from both left and right table. e.g. t1.y < t2.y."},
+            {"input_format_tsv_crlf_end_of_line", false, false, "Enables reading of CRLF line endings with TSV formats"},
+            {"output_format_parquet_use_custom_encoder", false, true, "Enable custom Parquet encoder."},
+            {"cross_join_min_rows_to_compress", 0, 10000000, "Minimal count of rows to compress block in CROSS JOIN. Zero value means - disable this threshold. This block is compressed when any of the two thresholds (by rows or by bytes) are reached."},
+            {"cross_join_min_bytes_to_compress", 0, 1_GiB, "Minimal size of block to compress in CROSS JOIN. Zero value means - disable this threshold. This block is compressed when any of the two thresholds (by rows or by bytes) are reached."},
+            {"http_max_chunk_size", 0, 0, "Internal limitation"},
+            {"prefer_external_sort_block_bytes", 0, DEFAULT_BLOCK_SIZE * 256, "Prefer maximum block bytes for external sort, reduce the memory usage during merging."},
+            {"input_format_force_null_for_omitted_fields", false, false, "Disable type-defaults for omitted fields when needed"},
+            {"cast_string_to_dynamic_use_inference", false, false, "Add setting to allow converting String to Dynamic through parsing"},
+            {"allow_experimental_dynamic_type", false, false, "Add new experimental Dynamic type"},
+            {"azure_max_blocks_in_multipart_upload", 50000, 50000, "Maximum number of blocks in multipart upload for Azure."},
+        }
+    },
+    {"24.4",
+        {
+            {"input_format_json_throw_on_bad_escape_sequence", true, true, "Allow to save JSON strings with bad escape sequences"},
+            {"max_parsing_threads", 0, 0, "Add a separate setting to control number of threads in parallel parsing from files"},
+            {"ignore_drop_queries_probability", 0, 0, "Allow to ignore drop queries in server with specified probability for testing purposes"},
+            {"lightweight_deletes_sync", 2, 2, "The same as 'mutation_sync', but controls only execution of lightweight deletes"},
+            {"query_cache_system_table_handling", "save", "throw", "The query cache no longer caches results of queries against system tables"},
+            {"input_format_json_ignore_unnecessary_fields", false, true, "Ignore unnecessary fields and not parse them. Enabling this may not throw exceptions on json strings of invalid format or with duplicated fields"},
+            {"input_format_hive_text_allow_variable_number_of_columns", false, true, "Ignore extra columns in Hive Text input (if file has more columns than expected) and treat missing fields in Hive Text input as default values."},
+            {"allow_experimental_database_replicated", false, true, "Database engine Replicated is now in Beta stage"},
+            {"temporary_data_in_cache_reserve_space_wait_lock_timeout_milliseconds", (10 * 60 * 1000), (10 * 60 * 1000), "Wait time to lock cache for sapce reservation in temporary data in filesystem cache"},
+            {"optimize_rewrite_sum_if_to_count_if", false, true, "Only available for the analyzer, where it works correctly"},
+            {"azure_allow_parallel_part_upload", "true", "true", "Use multiple threads for azure multipart upload."},
+            {"max_recursive_cte_evaluation_depth", DBMS_RECURSIVE_CTE_MAX_EVALUATION_DEPTH, DBMS_RECURSIVE_CTE_MAX_EVALUATION_DEPTH, "Maximum limit on recursive CTE evaluation depth"},
+            {"query_plan_convert_outer_join_to_inner_join", false, true, "Allow to convert OUTER JOIN to INNER JOIN if filter after JOIN always filters default values"},
+        }
+    },
+    {"24.3",
+        {
+            {"s3_connect_timeout_ms", 1000, 1000, "Introduce new dedicated setting for s3 connection timeout"},
+            {"allow_experimental_shared_merge_tree", false, true, "The setting is obsolete"},
+            {"use_page_cache_for_disks_without_file_cache", false, false, "Added userspace page cache"},
+            {"read_from_page_cache_if_exists_otherwise_bypass_cache", false, false, "Added userspace page cache"},
+            {"page_cache_inject_eviction", false, false, "Added userspace page cache"},
+            {"default_table_engine", "None", "MergeTree", "Set default table engine to MergeTree for better usability"},
+            {"input_format_json_use_string_type_for_ambiguous_paths_in_named_tuples_inference_from_objects", false, false, "Allow to use String type for ambiguous paths during named tuple inference from JSON objects"},
+            {"traverse_shadow_remote_data_paths", false, false, "Traverse shadow directory when query system.remote_data_paths."},
+            {"throw_if_deduplication_in_dependent_materialized_views_enabled_with_async_insert", false, true, "Deduplication in dependent materialized view cannot work together with async inserts."},
+            {"parallel_replicas_allow_in_with_subquery", false, true, "If true, subquery for IN will be executed on every follower replica"},
+            {"log_processors_profiles", false, true, "Enable by default"},
+            {"function_locate_has_mysql_compatible_argument_order", false, true, "Increase compatibility with MySQL's locate function."},
+            {"allow_suspicious_primary_key", true, false, "Forbid suspicious PRIMARY KEY/ORDER BY for MergeTree (i.e. SimpleAggregateFunction)"},
+            {"filesystem_cache_reserve_space_wait_lock_timeout_milliseconds", 1000, 1000, "Wait time to lock cache for sapce reservation in filesystem cache"},
+            {"max_parser_backtracks", 0, 1000000, "Limiting the complexity of parsing"},
+            {"analyzer_compatibility_join_using_top_level_identifier", false, false, "Force to resolve identifier in JOIN USING from projection"},
+            {"distributed_insert_skip_read_only_replicas", false, false, "If true, INSERT into Distributed will skip read-only replicas"},
+            {"keeper_max_retries", 10, 10, "Max retries for general keeper operations"},
+            {"keeper_retry_initial_backoff_ms", 100, 100, "Initial backoff timeout for general keeper operations"},
+            {"keeper_retry_max_backoff_ms", 5000, 5000, "Max backoff timeout for general keeper operations"},
+            {"s3queue_allow_experimental_sharded_mode", false, false, "Enable experimental sharded mode of S3Queue table engine. It is experimental because it will be rewritten"},
+            {"allow_experimental_analyzer", false, true, "Enable analyzer and planner by default."},
+            {"merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability", 0.0, 0.0, "For testing of `PartsSplitter` - split read ranges into intersecting and non intersecting every time you read from MergeTree with the specified probability."},
+            {"allow_get_client_http_header", false, false, "Introduced a new function."},
+            {"output_format_pretty_row_numbers", false, true, "It is better for usability."},
+            {"output_format_pretty_max_value_width_apply_for_single_value", true, false, "Single values in Pretty formats won't be cut."},
+            {"output_format_parquet_string_as_string", false, true, "ClickHouse allows arbitrary binary data in the String data type, which is typically UTF-8. Parquet/ORC/Arrow Strings only support UTF-8. That's why you can choose which Arrow's data type to use for the ClickHouse String data type - String or Binary. While Binary would be more correct and compatible, using String by default will correspond to user expectations in most cases."},
+            {"output_format_orc_string_as_string", false, true, "ClickHouse allows arbitrary binary data in the String data type, which is typically UTF-8. Parquet/ORC/Arrow Strings only support UTF-8. That's why you can choose which Arrow's data type to use for the ClickHouse String data type - String or Binary. While Binary would be more correct and compatible, using String by default will correspond to user expectations in most cases."},
+            {"output_format_arrow_string_as_string", false, true, "ClickHouse allows arbitrary binary data in the String data type, which is typically UTF-8. Parquet/ORC/Arrow Strings only support UTF-8. That's why you can choose which Arrow's data type to use for the ClickHouse String data type - String or Binary. While Binary would be more correct and compatible, using String by default will correspond to user expectations in most cases."},
+            {"output_format_parquet_compression_method", "lz4", "zstd", "Parquet/ORC/Arrow support many compression methods, including lz4 and zstd. ClickHouse supports each and every compression method. Some inferior tools, such as 'duckdb', lack support for the faster `lz4` compression method, that's why we set zstd by default."},
+            {"output_format_orc_compression_method", "lz4", "zstd", "Parquet/ORC/Arrow support many compression methods, including lz4 and zstd. ClickHouse supports each and every compression method. Some inferior tools, such as 'duckdb', lack support for the faster `lz4` compression method, that's why we set zstd by default."},
+            {"output_format_pretty_highlight_digit_groups", false, true, "If enabled and if output is a terminal, highlight every digit corresponding to the number of thousands, millions, etc. with underline."},
+            {"geo_distance_returns_float64_on_float64_arguments", false, true, "Increase the default precision."},
+            {"azure_max_inflight_parts_for_one_file", 20, 20, "The maximum number of a concurrent loaded parts in multipart upload request. 0 means unlimited."},
+            {"azure_strict_upload_part_size", 0, 0, "The exact size of part to upload during multipart upload to Azure blob storage."},
+            {"azure_min_upload_part_size", 16*1024*1024, 16*1024*1024, "The minimum size of part to upload during multipart upload to Azure blob storage."},
+            {"azure_max_upload_part_size", 5ull*1024*1024*1024, 5ull*1024*1024*1024, "The maximum size of part to upload during multipart upload to Azure blob storage."},
+            {"azure_upload_part_size_multiply_factor", 2, 2, "Multiply azure_min_upload_part_size by this factor each time azure_multiply_parts_count_threshold parts were uploaded from a single write to Azure blob storage."},
+            {"azure_upload_part_size_multiply_parts_count_threshold", 500, 500, "Each time this number of parts was uploaded to Azure blob storage, azure_min_upload_part_size is multiplied by azure_upload_part_size_multiply_factor."},
+            {"output_format_csv_serialize_tuple_into_separate_columns", true, true, "A new way of how interpret tuples in CSV format was added."},
+            {"input_format_csv_deserialize_separate_columns_into_tuple", true, true, "A new way of how interpret tuples in CSV format was added."},
+            {"input_format_csv_try_infer_strings_from_quoted_tuples", true, true, "A new way of how interpret tuples in CSV format was added."},
+        }
+    },
+    {"24.2",
+        {
+            {"allow_suspicious_variant_types", true, false, "Don't allow creating Variant type with suspicious variants by default"},
+            {"validate_experimental_and_suspicious_types_inside_nested_types", false, true, "Validate usage of experimental and suspicious types inside nested types"},
+            {"output_format_values_escape_quote_with_quote", false, false, "If true escape ' with '', otherwise quoted with \\'"},
+            {"output_format_pretty_single_large_number_tip_threshold", 0, 1'000'000, "Print a readable number tip on the right side of the table if the block consists of a single number which exceeds this value (except 0)"},
+            {"input_format_try_infer_exponent_floats", true, false, "Don't infer floats in exponential notation by default"},
+            {"query_plan_optimize_prewhere", true, true, "Allow to push down filter to PREWHERE expression for supported storages"},
+            {"async_insert_max_data_size", 1000000, 10485760, "The previous value appeared to be too small."},
+            {"async_insert_poll_timeout_ms", 10, 10, "Timeout in milliseconds for polling data from asynchronous insert queue"},
+            {"async_insert_use_adaptive_busy_timeout", false, true, "Use adaptive asynchronous insert timeout"},
+            {"async_insert_busy_timeout_min_ms", 50, 50, "The minimum value of the asynchronous insert timeout in milliseconds; it also serves as the initial value, which may be increased later by the adaptive algorithm"},
+            {"async_insert_busy_timeout_max_ms", 200, 200, "The minimum value of the asynchronous insert timeout in milliseconds; async_insert_busy_timeout_ms is aliased to async_insert_busy_timeout_max_ms"},
+            {"async_insert_busy_timeout_increase_rate", 0.2, 0.2, "The exponential growth rate at which the adaptive asynchronous insert timeout increases"},
+            {"async_insert_busy_timeout_decrease_rate", 0.2, 0.2, "The exponential growth rate at which the adaptive asynchronous insert timeout decreases"},
+            {"format_template_row_format", "", "", "Template row format string can be set directly in query"},
+            {"format_template_resultset_format", "", "", "Template result set format string can be set in query"},
+            {"split_parts_ranges_into_intersecting_and_non_intersecting_final", true, true, "Allow to split parts ranges into intersecting and non intersecting during FINAL optimization"},
+            {"split_intersecting_parts_ranges_into_layers_final", true, true, "Allow to split intersecting parts ranges into layers during FINAL optimization"},
+            {"azure_max_single_part_copy_size", 256*1024*1024, 256*1024*1024, "The maximum size of object to copy using single part copy to Azure blob storage."},
+            {"min_external_table_block_size_rows", DEFAULT_INSERT_BLOCK_SIZE, DEFAULT_INSERT_BLOCK_SIZE, "Squash blocks passed to external table to specified size in rows, if blocks are not big enough"},
+            {"min_external_table_block_size_bytes", DEFAULT_INSERT_BLOCK_SIZE * 256, DEFAULT_INSERT_BLOCK_SIZE * 256, "Squash blocks passed to external table to specified size in bytes, if blocks are not big enough."},
+            {"parallel_replicas_prefer_local_join", true, true, "If true, and JOIN can be executed with parallel replicas algorithm, and all storages of right JOIN part are *MergeTree, local JOIN will be used instead of GLOBAL JOIN."},
+            {"optimize_time_filter_with_preimage", true, true, "Optimize Date and DateTime predicates by converting functions into equivalent comparisons without conversions (e.g. toYear(col) = 2023 -> col >= '2023-01-01' AND col <= '2023-12-31')"},
+            {"extract_key_value_pairs_max_pairs_per_row", 0, 0, "Max number of pairs that can be produced by the `extractKeyValuePairs` function. Used as a safeguard against consuming too much memory."},
+            {"default_view_definer", "CURRENT_USER", "CURRENT_USER", "Allows to set default `DEFINER` option while creating a view"},
+            {"default_materialized_view_sql_security", "DEFINER", "DEFINER", "Allows to set a default value for SQL SECURITY option when creating a materialized view"},
+            {"default_normal_view_sql_security", "INVOKER", "INVOKER", "Allows to set default `SQL SECURITY` option while creating a normal view"},
+            {"mysql_map_string_to_text_in_show_columns", false, true, "Reduce the configuration effort to connect ClickHouse with BI tools."},
+            {"mysql_map_fixed_string_to_text_in_show_columns", false, true, "Reduce the configuration effort to connect ClickHouse with BI tools."},
+        }
+    },
+    {"24.1",
+        {
+            {"print_pretty_type_names", false, true, "Better user experience."},
+            {"input_format_json_read_bools_as_strings", false, true, "Allow to read bools as strings in JSON formats by default"},
+            {"output_format_arrow_use_signed_indexes_for_dictionary", false, true, "Use signed indexes type for Arrow dictionaries by default as it's recommended"},
+            {"allow_experimental_variant_type", false, false, "Add new experimental Variant type"},
+            {"use_variant_as_common_type", false, false, "Allow to use Variant in if/multiIf if there is no common type"},
+            {"output_format_arrow_use_64_bit_indexes_for_dictionary", false, false, "Allow to use 64 bit indexes type in Arrow dictionaries"},
+            {"parallel_replicas_mark_segment_size", 128, 128, "Add new setting to control segment size in new parallel replicas coordinator implementation"},
+            {"ignore_materialized_views_with_dropped_target_table", false, false, "Add new setting to allow to ignore materialized views with dropped target table"},
+            {"output_format_compression_level", 3, 3, "Allow to change compression level in the query output"},
+            {"output_format_compression_zstd_window_log", 0, 0, "Allow to change zstd window log in the query output when zstd compression is used"},
+            {"enable_zstd_qat_codec", false, false, "Add new ZSTD_QAT codec"},
+            {"enable_vertical_final", false, true, "Use vertical final by default"},
+            {"output_format_arrow_use_64_bit_indexes_for_dictionary", false, false, "Allow to use 64 bit indexes type in Arrow dictionaries"},
+            {"max_rows_in_set_to_optimize_join", 100000, 0, "Disable join optimization as it prevents from read in order optimization"},
+            {"output_format_pretty_color", true, "auto", "Setting is changed to allow also for auto value, disabling ANSI escapes if output is not a tty"},
+            {"function_visible_width_behavior", 0, 1, "We changed the default behavior of `visibleWidth` to be more precise"},
+            {"max_estimated_execution_time", 0, 0, "Separate max_execution_time and max_estimated_execution_time"},
+            {"iceberg_engine_ignore_schema_evolution", false, false, "Allow to ignore schema evolution in Iceberg table engine"},
+            {"optimize_injective_functions_in_group_by", false, true, "Replace injective functions by it's arguments in GROUP BY section in analyzer"},
+            {"update_insert_deduplication_token_in_dependent_materialized_views", false, false, "Allow to update insert deduplication token with table identifier during insert in dependent materialized views"},
+            {"azure_max_unexpected_write_error_retries", 4, 4, "The maximum number of retries in case of unexpected errors during Azure blob storage write"},
+            {"split_parts_ranges_into_intersecting_and_non_intersecting_final", false, true, "Allow to split parts ranges into intersecting and non intersecting during FINAL optimization"},
+            {"split_intersecting_parts_ranges_into_layers_final", true, true, "Allow to split intersecting parts ranges into layers during FINAL optimization"}
+        }
+    },
+    {"23.12",
+        {
+            {"allow_suspicious_ttl_expressions", true, false, "It is a new setting, and in previous versions the behavior was equivalent to allowing."},
+            {"input_format_parquet_allow_missing_columns", false, true, "Allow missing columns in Parquet files by default"},
+            {"input_format_orc_allow_missing_columns", false, true, "Allow missing columns in ORC files by default"},
+            {"input_format_arrow_allow_missing_columns", false, true, "Allow missing columns in Arrow files by default"}
+        }
+    },
+    {"23.11",
+        {
+            {"parsedatetime_parse_without_leading_zeros", false, true, "Improved compatibility with MySQL DATE_FORMAT/STR_TO_DATE"}
+        }
+    },
+    {"23.9",
+        {
+            {"optimize_group_by_constant_keys", false, true, "Optimize group by constant keys by default"},
+            {"input_format_json_try_infer_named_tuples_from_objects", false, true, "Try to infer named Tuples from JSON objects by default"},
+            {"input_format_json_read_numbers_as_strings", false, true, "Allow to read numbers as strings in JSON formats by default"},
+            {"input_format_json_read_arrays_as_strings", false, true, "Allow to read arrays as strings in JSON formats by default"},
+            {"input_format_json_infer_incomplete_types_as_strings", false, true, "Allow to infer incomplete types as Strings in JSON formats by default"},
+            {"input_format_json_try_infer_numbers_from_strings", true, false, "Don't infer numbers from strings in JSON formats by default to prevent possible parsing errors"},
+            {"http_write_exception_in_output_format", false, true, "Output valid JSON/XML on exception in HTTP streaming."}
+        }
+    },
+    {"23.8",
+        {
+            {"rewrite_count_distinct_if_with_count_distinct_implementation", false, true, "Rewrite countDistinctIf with count_distinct_implementation configuration"}
+        }
+    },
+    {"23.7",
+        {
+            {"function_sleep_max_microseconds_per_block", 0, 3000000, "In previous versions, the maximum sleep time of 3 seconds was applied only for `sleep`, but not for `sleepEachRow` function. In the new version, we introduce this setting. If you set compatibility with the previous versions, we will disable the limit altogether."}
+        }
+    },
+    {"23.6",
+        {
+            {"http_send_timeout", 180, 30, "3 minutes seems crazy long. Note that this is timeout for a single network write call, not for the whole upload operation."},
+            {"http_receive_timeout", 180, 30, "See http_send_timeout."}
+        }
+    },
+    {"23.5",
+        {
+            {"input_format_parquet_preserve_order", true, false, "Allow Parquet reader to reorder rows for better parallelism."},
+            {"parallelize_output_from_storages", false, true, "Allow parallelism when executing queries that read from file/url/s3/etc. This may reorder rows."},
+            {"use_with_fill_by_sorting_prefix", false, true, "Columns preceding WITH FILL columns in ORDER BY clause form sorting prefix. Rows with different values in sorting prefix are filled independently"},
+            {"output_format_parquet_compliant_nested_types", false, true, "Change an internal field name in output Parquet file schema."}
+        }
+    },
+    {"23.4",
+        {
+            {"allow_suspicious_indices", true, false, "If true, index can defined with identical expressions"},
+            {"allow_nonconst_timezone_arguments", true, false, "Allow non-const timezone arguments in certain time-related functions like toTimeZone(), fromUnixTimestamp*(), snowflakeToDateTime*()."},
+            {"connect_timeout_with_failover_ms", 50, 1000, "Increase default connect timeout because of async connect"},
+            {"connect_timeout_with_failover_secure_ms", 100, 1000, "Increase default secure connect timeout because of async connect"},
+            {"hedged_connection_timeout_ms", 100, 50, "Start new connection in hedged requests after 50 ms instead of 100 to correspond with previous connect timeout"},
+            {"formatdatetime_f_prints_single_zero", true, false, "Improved compatibility with MySQL DATE_FORMAT()/STR_TO_DATE()"},
+            {"formatdatetime_parsedatetime_m_is_month_name", false, true, "Improved compatibility with MySQL DATE_FORMAT/STR_TO_DATE"}
+        }
+    },
+    {"23.3",
+        {
+            {"output_format_parquet_version", "1.0", "2.latest", "Use latest Parquet format version for output format"},
+            {"input_format_json_ignore_unknown_keys_in_named_tuple", false, true, "Improve parsing JSON objects as named tuples"},
+            {"input_format_native_allow_types_conversion", false, true, "Allow types conversion in Native input forma"},
+            {"output_format_arrow_compression_method", "none", "lz4_frame", "Use lz4 compression in Arrow output format by default"},
+            {"output_format_parquet_compression_method", "snappy", "lz4", "Use lz4 compression in Parquet output format by default"},
+            {"output_format_orc_compression_method", "none", "lz4_frame", "Use lz4 compression in ORC output format by default"},
+            {"async_query_sending_for_remote", false, true, "Create connections and send query async across shards"}
+        }
+    },
+    {"23.2",
+        {
+            {"output_format_parquet_fixed_string_as_fixed_byte_array", false, true, "Use Parquet FIXED_LENGTH_BYTE_ARRAY type for FixedString by default"},
+            {"output_format_arrow_fixed_string_as_fixed_byte_array", false, true, "Use Arrow FIXED_SIZE_BINARY type for FixedString by default"},
+            {"query_plan_remove_redundant_distinct", false, true, "Remove redundant Distinct step in query plan"},
+            {"optimize_duplicate_order_by_and_distinct", true, false, "Remove duplicate ORDER BY and DISTINCT if it's possible"},
+            {"insert_keeper_max_retries", 0, 20, "Enable reconnections to Keeper on INSERT, improve reliability"}
+        }
+    },
+    {"23.1",
+        {
+            {"input_format_json_read_objects_as_strings", 0, 1, "Enable reading nested json objects as strings while object type is experimental"},
+            {"input_format_json_defaults_for_missing_elements_in_named_tuple", false, true, "Allow missing elements in JSON objects while reading named tuples by default"},
+            {"input_format_csv_detect_header", false, true, "Detect header in CSV format by default"},
+            {"input_format_tsv_detect_header", false, true, "Detect header in TSV format by default"},
+            {"input_format_custom_detect_header", false, true, "Detect header in CustomSeparated format by default"},
+            {"query_plan_remove_redundant_sorting", false, true, "Remove redundant sorting in query plan. For example, sorting steps related to ORDER BY clauses in subqueries"}
+        }
+    },
+    {"22.12",
+        {
+            {"max_size_to_preallocate_for_aggregation", 10'000'000, 100'000'000, "This optimizes performance"},
+            {"query_plan_aggregation_in_order", 0, 1, "Enable some refactoring around query plan"},
+            {"format_binary_max_string_size", 0, 1_GiB, "Prevent allocating large amount of memory"}
+        }
+    },
+    {"22.11",
+        {
+            {"use_structure_from_insertion_table_in_table_functions", 0, 2, "Improve using structure from insertion table in table functions"}
+        }
+    },
+    {"22.9",
+        {
+            {"force_grouping_standard_compatibility", false, true, "Make GROUPING function output the same as in SQL standard and other DBMS"}
+        }
+    },
+    {"22.7",
+        {
+            {"cross_to_inner_join_rewrite", 1, 2, "Force rewrite comma join to inner"},
+            {"enable_positional_arguments", false, true, "Enable positional arguments feature by default"},
+            {"format_csv_allow_single_quotes", true, false, "Most tools don't treat single quote in CSV specially, don't do it by default too"}
+        }
+    },
+    {"22.6",
+        {
+            {"output_format_json_named_tuples_as_objects", false, true, "Allow to serialize named tuples as JSON objects in JSON formats by default"},
+            {"input_format_skip_unknown_fields", false, true, "Optimize reading subset of columns for some input formats"}
+        }
+    },
+    {"22.5",
+        {
+            {"memory_overcommit_ratio_denominator", 0, 1073741824, "Enable memory overcommit feature by default"},
+            {"memory_overcommit_ratio_denominator_for_user", 0, 1073741824, "Enable memory overcommit feature by default"}
+        }
+    },
+    {"22.4",
+        {
+            {"allow_settings_after_format_in_insert", true, false, "Do not allow SETTINGS after FORMAT for INSERT queries because ClickHouse interpret SETTINGS as some values, which is misleading"}
+        }
+    },
+    {"22.3",
+        {
+            {"cast_ipv4_ipv6_default_on_conversion_error", true, false, "Make functions cast(value, 'IPv4') and cast(value, 'IPv6') behave same as toIPv4 and toIPv6 functions"}
+        }
+    },
+    {"21.12",
+        {
+            {"stream_like_engine_allow_direct_select", true, false, "Do not allow direct select for Kafka/RabbitMQ/FileLog by default"}
+        }
+    },
+    {"21.9",
+        {
+            {"output_format_decimal_trailing_zeros", true, false, "Do not output trailing zeros in text representation of Decimal types by default for better looking output"},
+            {"use_hedged_requests", false, true, "Enable Hedged Requests feature by default"}
+        }
+    },
+    {"21.7",
+        {
+            {"legacy_column_name_of_tuple_literal", true, false, "Add this setting only for compatibility reasons. It makes sense to set to 'true', while doing rolling update of cluster from version lower than 21.7 to higher"}
+        }
+    },
+    {"21.5",
+        {
+            {"async_socket_for_remote", false, true, "Fix all problems and turn on asynchronous reads from socket for remote queries by default again"}
+        }
+    },
+    {"21.3",
+        {
+            {"async_socket_for_remote", true, false, "Turn off asynchronous reads from socket for remote queries because of some problems"},
+            {"optimize_normalize_count_variants", false, true, "Rewrite aggregate functions that semantically equals to count() as count() by default"},
+            {"normalize_function_names", false, true, "Normalize function names to their canonical names, this was needed for projection query routing"}
+        }
+    },
+    {"21.2",
+        {
+            {"enable_global_with_statement", false, true, "Propagate WITH statements to UNION queries and all subqueries by default"}
+        }
+    },
+    {"21.1",
+        {
+            {"insert_quorum_parallel", false, true, "Use parallel quorum inserts by default. It is significantly more convenient to use than sequential quorum inserts"},
+            {"input_format_null_as_default", false, true, "Allow to insert NULL as default for input formats by default"},
+            {"optimize_on_insert", false, true, "Enable data optimization on INSERT by default for better user experience"},
+            {"use_compact_format_in_distributed_parts_names", false, true, "Use compact format for async INSERT into Distributed tables by default"}
+        }
+    },
+    {"20.10",
+        {
+            {"format_regexp_escaping_rule", "Escaped", "Raw", "Use Raw as default escaping rule for Regexp format to male the behaviour more like to what users expect"}
+        }
+    },
+    {"20.7",
+        {
+            {"show_table_uuid_in_table_create_query_if_not_nil", true, false, "Stop showing  UID of the table in its CREATE query for Engine=Atomic"}
+        }
+    },
+    {"20.5",
+        {
+            {"input_format_with_names_use_header", false, true, "Enable using header with names for formats with WithNames/WithNamesAndTypes suffixes"},
+            {"allow_suspicious_codecs", true, false, "Don't allow to specify meaningless compression codecs"}
+        }
+    },
+    {"20.4",
+        {
+            {"validate_polygons", false, true, "Throw exception if polygon is invalid in function pointInPolygon by default instead of returning possibly wrong results"}
+        }
+    },
+    {"19.18",
+        {
+            {"enable_scalar_subquery_optimization", false, true, "Prevent scalar subqueries from (de)serializing large scalar values and possibly avoid running the same subquery more than once"}
+        }
+    },
+    {"19.14",
+        {
+            {"any_join_distinct_right_table_keys", true, false, "Disable ANY RIGHT and ANY FULL JOINs by default to avoid inconsistency"}
+        }
+    },
+    {"19.12",
+        {
+            {"input_format_defaults_for_omitted_fields", false, true, "Enable calculation of complex default expressions for omitted fields for some input formats, because it should be the expected behaviour"}
+        }
+    },
+    {"19.5",
+        {
+            {"max_partitions_per_insert_block", 0, 100, "Add a limit for the number of partitions in one block"}
+        }
+    },
+    {"18.12.17",
+        {
+            {"enable_optimize_predicate_expression", 0, 1, "Optimize predicates to subqueries by default"}
+        }
+    },
 };
 
 

From c3c653e7692a755c3467b77e866555734d50ef50 Mon Sep 17 00:00:00 2001
From: Nikita Mikhaylov <nikitamikhaylov@clickhouse.com>
Date: Wed, 31 Jul 2024 14:58:52 +0000
Subject: [PATCH 119/139] Better

---
 src/Interpreters/DatabaseCatalog.cpp                           | 2 ++
 .../config.d/database_catalog_drop_table_concurrency.xml       | 3 +++
 tests/config/install.sh                                        | 1 +
 3 files changed, 6 insertions(+)
 create mode 100644 tests/config/config.d/database_catalog_drop_table_concurrency.xml

diff --git a/src/Interpreters/DatabaseCatalog.cpp b/src/Interpreters/DatabaseCatalog.cpp
index a8e5fd7e6aa..48b01a9df43 100644
--- a/src/Interpreters/DatabaseCatalog.cpp
+++ b/src/Interpreters/DatabaseCatalog.cpp
@@ -1406,6 +1406,8 @@ void DatabaseCatalog::waitTableFinallyDropped(const UUID & uuid)
         return !tables_marked_dropped_ids.contains(uuid) || is_shutting_down;
     });
 
+    LOG_DEBUG(log, "Done waiting for the table {} to be dropped. The outcome: {}", toString(uuid), tables_marked_dropped_ids).contains(uuid) ? "table still exists" : "table dropped successfully");
+
     /// TSA doesn't support unique_lock
     if (TSA_SUPPRESS_WARNING_FOR_READ(tables_marked_dropped_ids).contains(uuid))
         throw Exception(ErrorCodes::UNFINISHED, "Did not finish dropping the table with UUID {} because the server is shutting down, "
diff --git a/tests/config/config.d/database_catalog_drop_table_concurrency.xml b/tests/config/config.d/database_catalog_drop_table_concurrency.xml
new file mode 100644
index 00000000000..ac118625f4e
--- /dev/null
+++ b/tests/config/config.d/database_catalog_drop_table_concurrency.xml
@@ -0,0 +1,3 @@
+<clickhouse>
+    <database_catalog_drop_table_concurrency>256</database_catalog_drop_table_concurrency>
+</clickhouse>
diff --git a/tests/config/install.sh b/tests/config/install.sh
index 1b0edc5fc16..7c4b36dc4bd 100755
--- a/tests/config/install.sh
+++ b/tests/config/install.sh
@@ -21,6 +21,7 @@ ln -sf $SRC_PATH/config.d/listen.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/text_log.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/blob_storage_log.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/custom_settings_prefixes.xml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/config.d/database_catalog_drop_table_concurrency.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/enable_access_control_improvements.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/macros.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/secure_ports.xml $DEST_SERVER_PATH/config.d/

From 19cd00000373a5707178214744444b4d8c4034a5 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@clickhouse.com>
Date: Wed, 31 Jul 2024 17:18:55 +0200
Subject: [PATCH 120/139] Update src/Interpreters/DatabaseCatalog.cpp

---
 src/Interpreters/DatabaseCatalog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Interpreters/DatabaseCatalog.cpp b/src/Interpreters/DatabaseCatalog.cpp
index 48b01a9df43..56d9c323d39 100644
--- a/src/Interpreters/DatabaseCatalog.cpp
+++ b/src/Interpreters/DatabaseCatalog.cpp
@@ -1406,7 +1406,7 @@ void DatabaseCatalog::waitTableFinallyDropped(const UUID & uuid)
         return !tables_marked_dropped_ids.contains(uuid) || is_shutting_down;
     });
 
-    LOG_DEBUG(log, "Done waiting for the table {} to be dropped. The outcome: {}", toString(uuid), tables_marked_dropped_ids).contains(uuid) ? "table still exists" : "table dropped successfully");
+    LOG_DEBUG(log, "Done waiting for the table {} to be dropped. The outcome: {}", toString(uuid), tables_marked_dropped_ids.contains(uuid) ? "table still exists" : "table dropped successfully");
 
     /// TSA doesn't support unique_lock
     if (TSA_SUPPRESS_WARNING_FOR_READ(tables_marked_dropped_ids).contains(uuid))

From f032c015ca9ec10b7938bbf3d67bb6181776d24a Mon Sep 17 00:00:00 2001
From: Robert Schulze <robert@clickhouse.com>
Date: Wed, 31 Jul 2024 15:40:37 +0000
Subject: [PATCH 121/139] Ignore some tests

---
 tests/queries/0_stateless/00705_drop_create_merge_tree.sh     | 4 ++--
 .../0_stateless/01019_alter_materialized_view_atomic.sh       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/queries/0_stateless/00705_drop_create_merge_tree.sh b/tests/queries/0_stateless/00705_drop_create_merge_tree.sh
index fd002668696..ea8b9d02e49 100755
--- a/tests/queries/0_stateless/00705_drop_create_merge_tree.sh
+++ b/tests/queries/0_stateless/00705_drop_create_merge_tree.sh
@@ -5,8 +5,8 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-yes 'CREATE TABLE IF NOT EXISTS table (x UInt8) ENGINE = MergeTree ORDER BY tuple();' | head -n 1000 | $CLICKHOUSE_CLIENT &
-yes 'DROP TABLE IF EXISTS table;' | head -n 1000 | $CLICKHOUSE_CLIENT &
+yes 'CREATE TABLE IF NOT EXISTS table (x UInt8) ENGINE = MergeTree ORDER BY tuple();' | head -n 1000 | $CLICKHOUSE_CLIENT --multiquery &
+yes 'DROP TABLE IF EXISTS table;' | head -n 1000 | $CLICKHOUSE_CLIENT --multiquery &
 wait
 
 ${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS table"
diff --git a/tests/queries/0_stateless/01019_alter_materialized_view_atomic.sh b/tests/queries/0_stateless/01019_alter_materialized_view_atomic.sh
index eb12a76eb62..4bd21fcee02 100755
--- a/tests/queries/0_stateless/01019_alter_materialized_view_atomic.sh
+++ b/tests/queries/0_stateless/01019_alter_materialized_view_atomic.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT <<EOF
+$CLICKHOUSE_CLIENT --multiquery <<EOF
 DROP TABLE IF EXISTS src;
 DROP TABLE IF EXISTS mv;
 

From 1e257bd5be3a94e3c33de9f902d6de7958e588d5 Mon Sep 17 00:00:00 2001
From: Nikita Mikhaylov <nikitamikhaylov@clickhouse.com>
Date: Wed, 31 Jul 2024 15:41:37 +0000
Subject: [PATCH 122/139] Fix build

---
 src/Interpreters/DatabaseCatalog.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Interpreters/DatabaseCatalog.cpp b/src/Interpreters/DatabaseCatalog.cpp
index 56d9c323d39..273e5720679 100644
--- a/src/Interpreters/DatabaseCatalog.cpp
+++ b/src/Interpreters/DatabaseCatalog.cpp
@@ -1406,10 +1406,11 @@ void DatabaseCatalog::waitTableFinallyDropped(const UUID & uuid)
         return !tables_marked_dropped_ids.contains(uuid) || is_shutting_down;
     });
 
-    LOG_DEBUG(log, "Done waiting for the table {} to be dropped. The outcome: {}", toString(uuid), tables_marked_dropped_ids.contains(uuid) ? "table still exists" : "table dropped successfully");
-
     /// TSA doesn't support unique_lock
-    if (TSA_SUPPRESS_WARNING_FOR_READ(tables_marked_dropped_ids).contains(uuid))
+    const bool has_table = TSA_SUPPRESS_WARNING_FOR_READ(tables_marked_dropped_ids).contains(uuid);
+    LOG_DEBUG(log, "Done waiting for the table {} to be dropped. The outcome: {}", toString(uuid), has_table ? "table still exists" : "table dropped successfully");
+
+    if has_table)
         throw Exception(ErrorCodes::UNFINISHED, "Did not finish dropping the table with UUID {} because the server is shutting down, "
                                                 "will finish after restart", uuid);
 }

From 8afe61e04581d0b95ac2d6e927bb9d2427247c7a Mon Sep 17 00:00:00 2001
From: Nikita Mikhaylov <mikhaylovnikitka@gmail.com>
Date: Wed, 31 Jul 2024 17:58:41 +0200
Subject: [PATCH 123/139] Better

---
 src/Interpreters/DatabaseCatalog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Interpreters/DatabaseCatalog.cpp b/src/Interpreters/DatabaseCatalog.cpp
index 273e5720679..fb4fad85f66 100644
--- a/src/Interpreters/DatabaseCatalog.cpp
+++ b/src/Interpreters/DatabaseCatalog.cpp
@@ -1410,7 +1410,7 @@ void DatabaseCatalog::waitTableFinallyDropped(const UUID & uuid)
     const bool has_table = TSA_SUPPRESS_WARNING_FOR_READ(tables_marked_dropped_ids).contains(uuid);
     LOG_DEBUG(log, "Done waiting for the table {} to be dropped. The outcome: {}", toString(uuid), has_table ? "table still exists" : "table dropped successfully");
 
-    if has_table)
+    if (has_table)
         throw Exception(ErrorCodes::UNFINISHED, "Did not finish dropping the table with UUID {} because the server is shutting down, "
                                                 "will finish after restart", uuid);
 }

From 9def8cea8121ae8001649629a96e73eb1e10159b Mon Sep 17 00:00:00 2001
From: robot-clickhouse <robot-clickhouse@users.noreply.github.com>
Date: Wed, 31 Jul 2024 18:57:08 +0000
Subject: [PATCH 124/139] Update version_date.tsv and changelogs after
 v24.4.4.107-stable

---
 docs/changelogs/v24.4.4.107-stable.md | 70 +++++++++++++++++++++++++++
 utils/list-versions/version_date.tsv  |  1 +
 2 files changed, 71 insertions(+)
 create mode 100644 docs/changelogs/v24.4.4.107-stable.md

diff --git a/docs/changelogs/v24.4.4.107-stable.md b/docs/changelogs/v24.4.4.107-stable.md
new file mode 100644
index 00000000000..ba7c576715e
--- /dev/null
+++ b/docs/changelogs/v24.4.4.107-stable.md
@@ -0,0 +1,70 @@
+---
+sidebar_position: 1
+sidebar_label: 2024
+---
+
+# 2024 Changelog
+
+### ClickHouse release v24.4.4.107-stable (af0ed6b197e) FIXME as compared to v24.4.3.25-stable (a915dd4eda4)
+
+#### Improvement
+* Backported in [#65884](https://github.com/ClickHouse/ClickHouse/issues/65884): Always start Keeper with sufficient amount of threads in global thread pool. [#64444](https://github.com/ClickHouse/ClickHouse/pull/64444) ([Duc Canh Le](https://github.com/canhld94)).
+* Backported in [#65303](https://github.com/ClickHouse/ClickHouse/issues/65303): Returned back the behaviour of how ClickHouse works and interprets Tuples in CSV format. This change effectively reverts https://github.com/ClickHouse/ClickHouse/pull/60994 and makes it available only under a few settings: `output_format_csv_serialize_tuple_into_separate_columns`, `input_format_csv_deserialize_separate_columns_into_tuple` and `input_format_csv_try_infer_strings_from_quoted_tuples`. [#65170](https://github.com/ClickHouse/ClickHouse/pull/65170) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Backported in [#65894](https://github.com/ClickHouse/ClickHouse/issues/65894): Respect cgroup CPU limit in Keeper. [#65819](https://github.com/ClickHouse/ClickHouse/pull/65819) ([Antonio Andelic](https://github.com/antonio2368)).
+
+#### Critical Bug Fix (crash, LOGICAL_ERROR, data loss, RBAC)
+* Backported in [#65372](https://github.com/ClickHouse/ClickHouse/issues/65372): Fix a bug in ClickHouse Keeper that causes digest mismatch during closing session. [#65198](https://github.com/ClickHouse/ClickHouse/pull/65198) ([Aleksei Filatov](https://github.com/aalexfvk)).
+* Backported in [#66883](https://github.com/ClickHouse/ClickHouse/issues/66883): Fix unexpeced size of low cardinality column in function calls. [#65298](https://github.com/ClickHouse/ClickHouse/pull/65298) ([Raúl Marín](https://github.com/Algunenano)).
+* Backported in [#65435](https://github.com/ClickHouse/ClickHouse/issues/65435): Forbid `QUALIFY` clause in the old analyzer. The old analyzer ignored `QUALIFY`, so it could lead to unexpected data removal in mutations. [#65356](https://github.com/ClickHouse/ClickHouse/pull/65356) ([Dmitry Novik](https://github.com/novikd)).
+* Backported in [#65448](https://github.com/ClickHouse/ClickHouse/issues/65448): Use correct memory alignment for Distinct combinator. Previously, crash could happen because of invalid memory allocation when the combinator was used. [#65379](https://github.com/ClickHouse/ClickHouse/pull/65379) ([Antonio Andelic](https://github.com/antonio2368)).
+* Backported in [#65710](https://github.com/ClickHouse/ClickHouse/issues/65710): Fix crash in maxIntersections. [#65689](https://github.com/ClickHouse/ClickHouse/pull/65689) ([Raúl Marín](https://github.com/Algunenano)).
+* Backported in [#66689](https://github.com/ClickHouse/ClickHouse/issues/66689): Fix the VALID UNTIL clause in the user definition resetting after a restart. Closes [#66405](https://github.com/ClickHouse/ClickHouse/issues/66405). [#66409](https://github.com/ClickHouse/ClickHouse/pull/66409) ([Nikolay Degterinsky](https://github.com/evillique)).
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+* Backported in [#65353](https://github.com/ClickHouse/ClickHouse/issues/65353): Fix possible abort on uncaught exception in ~WriteBufferFromFileDescriptor in StatusFile. [#64206](https://github.com/ClickHouse/ClickHouse/pull/64206) ([Kruglov Pavel](https://github.com/Avogar)).
+* Backported in [#65060](https://github.com/ClickHouse/ClickHouse/issues/65060): Fix the `Expression nodes list expected 1 projection names` and `Unknown expression or identifier` errors for queries with aliases to `GLOBAL IN.`. [#64517](https://github.com/ClickHouse/ClickHouse/pull/64517) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Backported in [#65329](https://github.com/ClickHouse/ClickHouse/issues/65329): Fix the crash loop when restoring from backup is blocked by creating an MV with a definer that hasn't been restored yet. [#64595](https://github.com/ClickHouse/ClickHouse/pull/64595) ([pufit](https://github.com/pufit)).
+* Backported in [#64833](https://github.com/ClickHouse/ClickHouse/issues/64833): Fix bug which could lead to non-working TTLs with expressions. [#64694](https://github.com/ClickHouse/ClickHouse/pull/64694) ([alesapin](https://github.com/alesapin)).
+* Backported in [#65086](https://github.com/ClickHouse/ClickHouse/issues/65086): Fix removing the `WHERE` and `PREWHERE` expressions, which are always true (for the new analyzer). [#64695](https://github.com/ClickHouse/ClickHouse/pull/64695) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Backported in [#65540](https://github.com/ClickHouse/ClickHouse/issues/65540): Fix crash for `ALTER TABLE ... ON CLUSTER ... MODIFY SQL SECURITY`. [#64957](https://github.com/ClickHouse/ClickHouse/pull/64957) ([pufit](https://github.com/pufit)).
+* Backported in [#65578](https://github.com/ClickHouse/ClickHouse/issues/65578): Fix crash on destroying AccessControl: add explicit shutdown. [#64993](https://github.com/ClickHouse/ClickHouse/pull/64993) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Backported in [#65161](https://github.com/ClickHouse/ClickHouse/issues/65161): Fix pushing arithmetic operations out of aggregation. In the new analyzer, optimization was applied only once. [#65104](https://github.com/ClickHouse/ClickHouse/pull/65104) ([Dmitry Novik](https://github.com/novikd)).
+* Backported in [#65616](https://github.com/ClickHouse/ClickHouse/issues/65616): Fix aggregate function name rewriting in the new analyzer. [#65110](https://github.com/ClickHouse/ClickHouse/pull/65110) ([Dmitry Novik](https://github.com/novikd)).
+* Backported in [#65730](https://github.com/ClickHouse/ClickHouse/issues/65730): Eliminate injective function in argument of functions `uniq*` recursively. This used to work correctly but was broken in the new analyzer. [#65140](https://github.com/ClickHouse/ClickHouse/pull/65140) ([Duc Canh Le](https://github.com/canhld94)).
+* Backported in [#65668](https://github.com/ClickHouse/ClickHouse/issues/65668): Disable `non-intersecting-parts` optimization for queries with `FINAL` in case of `read-in-order` optimization was enabled. This could lead to an incorrect query result. As a workaround, disable `do_not_merge_across_partitions_select_final` and `split_parts_ranges_into_intersecting_and_non_intersecting_final` before this fix is merged. [#65505](https://github.com/ClickHouse/ClickHouse/pull/65505) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Backported in [#65786](https://github.com/ClickHouse/ClickHouse/issues/65786): Fixed bug in MergeJoin. Column in sparse serialisation might be treated as a column of its nested type though the required conversion wasn't performed. [#65632](https://github.com/ClickHouse/ClickHouse/pull/65632) ([Nikita Taranov](https://github.com/nickitat)).
+* Backported in [#65810](https://github.com/ClickHouse/ClickHouse/issues/65810): Fix invalid exceptions in function `parseDateTime` with `%F` and `%D` placeholders. [#65768](https://github.com/ClickHouse/ClickHouse/pull/65768) ([Antonio Andelic](https://github.com/antonio2368)).
+* Backported in [#65931](https://github.com/ClickHouse/ClickHouse/issues/65931): For queries that read from `PostgreSQL`, cancel the internal `PostgreSQL` query if the ClickHouse query is finished. Otherwise, `ClickHouse` query cannot be canceled until the internal `PostgreSQL` query is finished. [#65771](https://github.com/ClickHouse/ClickHouse/pull/65771) ([Maksim Kita](https://github.com/kitaisreal)).
+* Backported in [#65826](https://github.com/ClickHouse/ClickHouse/issues/65826): Fix a bug in short circuit logic when old analyzer and dictGetOrDefault is used. [#65802](https://github.com/ClickHouse/ClickHouse/pull/65802) ([jsc0218](https://github.com/jsc0218)).
+* Backported in [#66299](https://github.com/ClickHouse/ClickHouse/issues/66299): Better handling of join conditions involving `IS NULL` checks (for example `ON (a = b AND (a IS NOT NULL) AND (b IS NOT NULL) ) OR ( (a IS NULL) AND (b IS NULL) )` is rewritten to `ON a <=> b`), fix incorrect optimization when condition other then `IS NULL` are present. [#65835](https://github.com/ClickHouse/ClickHouse/pull/65835) ([vdimir](https://github.com/vdimir)).
+* Backported in [#66326](https://github.com/ClickHouse/ClickHouse/issues/66326): Add missing settings `input_format_csv_skip_first_lines/input_format_tsv_skip_first_lines/input_format_csv_try_infer_numbers_from_strings/input_format_csv_try_infer_strings_from_quoted_tuples` in schema inference cache because they can change the resulting schema. It prevents from incorrect result of schema inference with these settings changed. [#65980](https://github.com/ClickHouse/ClickHouse/pull/65980) ([Kruglov Pavel](https://github.com/Avogar)).
+* Backported in [#66153](https://github.com/ClickHouse/ClickHouse/issues/66153): Fixed buffer overflow bug in `unbin`/`unhex` implementation. [#66106](https://github.com/ClickHouse/ClickHouse/pull/66106) ([Nikita Taranov](https://github.com/nickitat)).
+* Backported in [#66459](https://github.com/ClickHouse/ClickHouse/issues/66459): Fixed a bug in ZooKeeper client: a session could get stuck in unusable state after receiving a hardware error from ZooKeeper. For example, this might happen due to "soft memory limit" in ClickHouse Keeper. [#66140](https://github.com/ClickHouse/ClickHouse/pull/66140) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Backported in [#66224](https://github.com/ClickHouse/ClickHouse/issues/66224): Fix issue in SumIfToCountIfVisitor and signed integers. [#66146](https://github.com/ClickHouse/ClickHouse/pull/66146) ([Raúl Marín](https://github.com/Algunenano)).
+* Backported in [#66267](https://github.com/ClickHouse/ClickHouse/issues/66267): Don't throw `TIMEOUT_EXCEEDED` for `none_only_active` mode of `distributed_ddl_output_mode`. [#66218](https://github.com/ClickHouse/ClickHouse/pull/66218) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Backported in [#66678](https://github.com/ClickHouse/ClickHouse/issues/66678): Fix handling limit for `system.numbers_mt` when no index can be used. [#66231](https://github.com/ClickHouse/ClickHouse/pull/66231) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
+* Backported in [#66603](https://github.com/ClickHouse/ClickHouse/issues/66603): Fixed how the ClickHouse server detects the maximum number of usable CPU cores as specified by cgroups v2 if the server runs in a container such as Docker. In more detail, containers often run their process in the root cgroup which has an empty name. In that case, ClickHouse ignored the CPU limits set by cgroups v2. [#66237](https://github.com/ClickHouse/ClickHouse/pull/66237) ([filimonov](https://github.com/filimonov)).
+* Backported in [#66358](https://github.com/ClickHouse/ClickHouse/issues/66358): Fix the `Not-ready set` error when a subquery with `IN` is used in the constraint. [#66261](https://github.com/ClickHouse/ClickHouse/pull/66261) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Backported in [#66971](https://github.com/ClickHouse/ClickHouse/issues/66971): Fix `Column identifier is already registered` error with `group_by_use_nulls=true` and new analyzer. [#66400](https://github.com/ClickHouse/ClickHouse/pull/66400) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Backported in [#66968](https://github.com/ClickHouse/ClickHouse/issues/66968): Fix `Cannot find column` error for queries with constant expression in `GROUP BY` key and new analyzer enabled. [#66433](https://github.com/ClickHouse/ClickHouse/pull/66433) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Backported in [#66719](https://github.com/ClickHouse/ClickHouse/issues/66719): Correctly track memory for `Allocator::realloc`. [#66548](https://github.com/ClickHouse/ClickHouse/pull/66548) ([Antonio Andelic](https://github.com/antonio2368)).
+* Backported in [#66950](https://github.com/ClickHouse/ClickHouse/issues/66950): Fix an invalid result for queries with `WINDOW`. This could happen when `PARTITION` columns have sparse serialization and window functions are executed in parallel. [#66579](https://github.com/ClickHouse/ClickHouse/pull/66579) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Backported in [#66947](https://github.com/ClickHouse/ClickHouse/issues/66947): Fix `Method getResultType is not supported for QUERY query node` error when scalar subquery was used as the first argument of IN (with new analyzer). [#66655](https://github.com/ClickHouse/ClickHouse/pull/66655) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Backported in [#67195](https://github.com/ClickHouse/ClickHouse/issues/67195): TRUNCATE DATABASE used to stop replication as if it was a DROP DATABASE query, it's fixed. [#67129](https://github.com/ClickHouse/ClickHouse/pull/67129) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Backported in [#67377](https://github.com/ClickHouse/ClickHouse/issues/67377): Fix error `Cannot convert column because it is non constant in source stream but must be constant in result.` for a query that reads from the `Merge` table over the `Distriburted` table with one shard. [#67146](https://github.com/ClickHouse/ClickHouse/pull/67146) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Backported in [#67240](https://github.com/ClickHouse/ClickHouse/issues/67240): This closes [#67156](https://github.com/ClickHouse/ClickHouse/issues/67156). This closes [#66447](https://github.com/ClickHouse/ClickHouse/issues/66447). The bug was introduced in https://github.com/ClickHouse/ClickHouse/pull/62907. [#67178](https://github.com/ClickHouse/ClickHouse/pull/67178) ([Maksim Kita](https://github.com/kitaisreal)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Backported in [#65410](https://github.com/ClickHouse/ClickHouse/issues/65410): Re-enable OpenSSL session caching. [#65111](https://github.com/ClickHouse/ClickHouse/pull/65111) ([Robert Schulze](https://github.com/rschu1ze)).
+* Backported in [#65903](https://github.com/ClickHouse/ClickHouse/issues/65903): Fix bug with session closing in Keeper. [#65735](https://github.com/ClickHouse/ClickHouse/pull/65735) ([Antonio Andelic](https://github.com/antonio2368)).
+* Backported in [#66385](https://github.com/ClickHouse/ClickHouse/issues/66385): Disable broken cases from 02911_join_on_nullsafe_optimization. [#66310](https://github.com/ClickHouse/ClickHouse/pull/66310) ([vdimir](https://github.com/vdimir)).
+* Backported in [#66424](https://github.com/ClickHouse/ClickHouse/issues/66424): Ignore subquery for IN in DDLLoadingDependencyVisitor. [#66395](https://github.com/ClickHouse/ClickHouse/pull/66395) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Backported in [#66542](https://github.com/ClickHouse/ClickHouse/issues/66542): Add additional log masking in CI. [#66523](https://github.com/ClickHouse/ClickHouse/pull/66523) ([Raúl Marín](https://github.com/Algunenano)).
+* Backported in [#66857](https://github.com/ClickHouse/ClickHouse/issues/66857): Fix data race in S3::ClientCache. [#66644](https://github.com/ClickHouse/ClickHouse/pull/66644) ([Konstantin Morozov](https://github.com/k-morozov)).
+* Backported in [#66873](https://github.com/ClickHouse/ClickHouse/issues/66873): Support one more case in JOIN ON ... IS NULL. [#66725](https://github.com/ClickHouse/ClickHouse/pull/66725) ([vdimir](https://github.com/vdimir)).
+* Backported in [#67057](https://github.com/ClickHouse/ClickHouse/issues/67057): Increase asio pool size in case the server is tiny. [#66761](https://github.com/ClickHouse/ClickHouse/pull/66761) ([alesapin](https://github.com/alesapin)).
+* Backported in [#66944](https://github.com/ClickHouse/ClickHouse/issues/66944): Small fix in realloc memory tracking. [#66820](https://github.com/ClickHouse/ClickHouse/pull/66820) ([Antonio Andelic](https://github.com/antonio2368)).
+* Backported in [#67250](https://github.com/ClickHouse/ClickHouse/issues/67250): Followup [#66725](https://github.com/ClickHouse/ClickHouse/issues/66725). [#66869](https://github.com/ClickHouse/ClickHouse/pull/66869) ([vdimir](https://github.com/vdimir)).
+* Backported in [#67410](https://github.com/ClickHouse/ClickHouse/issues/67410): CI: Fix build results for release branches. [#67402](https://github.com/ClickHouse/ClickHouse/pull/67402) ([Max K.](https://github.com/maxknv)).
+
diff --git a/utils/list-versions/version_date.tsv b/utils/list-versions/version_date.tsv
index 027b207d3ad..abd8f84ec74 100644
--- a/utils/list-versions/version_date.tsv
+++ b/utils/list-versions/version_date.tsv
@@ -5,6 +5,7 @@ v24.5.4.49-stable	2024-07-01
 v24.5.3.5-stable	2024-06-13
 v24.5.2.34-stable	2024-06-13
 v24.5.1.1763-stable	2024-06-01
+v24.4.4.107-stable	2024-07-31
 v24.4.3.25-stable	2024-06-14
 v24.4.2.141-stable	2024-06-07
 v24.4.1.2088-stable	2024-05-01

From 6e914ff6da67be1c1381ffed2d04b5758704baf3 Mon Sep 17 00:00:00 2001
From: Thom O'Connor <thom@clickhouse.com>
Date: Wed, 31 Jul 2024 21:59:37 +0000
Subject: [PATCH 125/139] Update settings.md

Removing duplicate header "## background_merges_mutations_scheduling_policy"
---
 docs/en/operations/server-configuration-parameters/settings.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/en/operations/server-configuration-parameters/settings.md b/docs/en/operations/server-configuration-parameters/settings.md
index 8278f8c8699..a1e3c292b04 100644
--- a/docs/en/operations/server-configuration-parameters/settings.md
+++ b/docs/en/operations/server-configuration-parameters/settings.md
@@ -103,8 +103,6 @@ Default: 2
 
 The policy on how to perform a scheduling for background merges and mutations. Possible values are: `round_robin` and `shortest_task_first`.
 
-## background_merges_mutations_scheduling_policy
-
 Algorithm used to select next merge or mutation to be executed by background thread pool. Policy may be changed at runtime without server restart.
 Could be applied from the `default` profile for backward compatibility.
 

From f162d6bd5e03c6f717b4f45cf4c7ba6491aaa5fa Mon Sep 17 00:00:00 2001
From: robot-clickhouse <robot-clickhouse@users.noreply.github.com>
Date: Thu, 1 Aug 2024 06:35:22 +0000
Subject: [PATCH 126/139] Update version_date.tsv and changelogs after
 v24.7.2.13-stable

---
 docker/keeper/Dockerfile             |  2 +-
 docker/server/Dockerfile.alpine      |  2 +-
 docker/server/Dockerfile.ubuntu      |  2 +-
 docs/changelogs/v24.7.2.13-stable.md | 24 ++++++++++++++++++++++++
 utils/list-versions/version_date.tsv |  2 +-
 5 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 docs/changelogs/v24.7.2.13-stable.md

diff --git a/docker/keeper/Dockerfile b/docker/keeper/Dockerfile
index e99c86267f9..94603763572 100644
--- a/docker/keeper/Dockerfile
+++ b/docker/keeper/Dockerfile
@@ -34,7 +34,7 @@ RUN arch=${TARGETARCH:-amd64} \
 # lts / testing / prestable / etc
 ARG REPO_CHANNEL="stable"
 ARG REPOSITORY="https://packages.clickhouse.com/tgz/${REPO_CHANNEL}"
-ARG VERSION="24.7.1.2915"
+ARG VERSION="24.7.2.13"
 ARG PACKAGES="clickhouse-keeper"
 ARG DIRECT_DOWNLOAD_URLS=""
 
diff --git a/docker/server/Dockerfile.alpine b/docker/server/Dockerfile.alpine
index fb562b911a3..f40118c7b06 100644
--- a/docker/server/Dockerfile.alpine
+++ b/docker/server/Dockerfile.alpine
@@ -32,7 +32,7 @@ RUN arch=${TARGETARCH:-amd64} \
 # lts / testing / prestable / etc
 ARG REPO_CHANNEL="stable"
 ARG REPOSITORY="https://packages.clickhouse.com/tgz/${REPO_CHANNEL}"
-ARG VERSION="24.7.1.2915"
+ARG VERSION="24.7.2.13"
 ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
 ARG DIRECT_DOWNLOAD_URLS=""
 
diff --git a/docker/server/Dockerfile.ubuntu b/docker/server/Dockerfile.ubuntu
index 51f4e6a0f40..032aa862e4a 100644
--- a/docker/server/Dockerfile.ubuntu
+++ b/docker/server/Dockerfile.ubuntu
@@ -28,7 +28,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="24.7.1.2915"
+ARG VERSION="24.7.2.13"
 ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
 
 #docker-official-library:off
diff --git a/docs/changelogs/v24.7.2.13-stable.md b/docs/changelogs/v24.7.2.13-stable.md
new file mode 100644
index 00000000000..4a2fb665116
--- /dev/null
+++ b/docs/changelogs/v24.7.2.13-stable.md
@@ -0,0 +1,24 @@
+---
+sidebar_position: 1
+sidebar_label: 2024
+---
+
+# 2024 Changelog
+
+### ClickHouse release v24.7.2.13-stable (6e41f601b2f) FIXME as compared to v24.7.1.2915-stable (a37d2d43da7)
+
+#### Improvement
+* Backported in [#67531](https://github.com/ClickHouse/ClickHouse/issues/67531): In pr : https://github.com/ClickHouse/ClickHouse/pull/66025, we introduce a settings `input_format_orc_read_use_writer_time_zone` to fix when read orc file, make the reader use writer timezone, not always use `GMT`. [#67175](https://github.com/ClickHouse/ClickHouse/pull/67175) ([kevinyhzou](https://github.com/KevinyhZou)).
+
+#### Critical Bug Fix (crash, LOGICAL_ERROR, data loss, RBAC)
+* Backported in [#67505](https://github.com/ClickHouse/ClickHouse/issues/67505): Fix crash in DistributedAsyncInsert when connection is empty. [#67219](https://github.com/ClickHouse/ClickHouse/pull/67219) ([Pablo Marcos](https://github.com/pamarcos)).
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+* Backported in [#67580](https://github.com/ClickHouse/ClickHouse/issues/67580): Fix execution of nested short-circuit functions. [#67520](https://github.com/ClickHouse/ClickHouse/pull/67520) ([Kruglov Pavel](https://github.com/Avogar)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Backported in [#67551](https://github.com/ClickHouse/ClickHouse/issues/67551): [Green CI] Fix test test_storage_s3_queue/test.py::test_max_set_age. [#67035](https://github.com/ClickHouse/ClickHouse/pull/67035) ([Pablo Marcos](https://github.com/pamarcos)).
+* Backported in [#67514](https://github.com/ClickHouse/ClickHouse/issues/67514): Split test 02967_parallel_replicas_join_algo_and_analyzer. [#67211](https://github.com/ClickHouse/ClickHouse/pull/67211) ([Nikita Taranov](https://github.com/nickitat)).
+* Backported in [#67545](https://github.com/ClickHouse/ClickHouse/issues/67545): [Green CI] Fix WriteBuffer destructor when finalize has failed for MergeTreeDeduplicationLog::shutdown. [#67474](https://github.com/ClickHouse/ClickHouse/pull/67474) ([Alexey Katsman](https://github.com/alexkats)).
+
diff --git a/utils/list-versions/version_date.tsv b/utils/list-versions/version_date.tsv
index abd8f84ec74..b1391c2d781 100644
--- a/utils/list-versions/version_date.tsv
+++ b/utils/list-versions/version_date.tsv
@@ -1,3 +1,4 @@
+v24.7.2.13-stable	2024-08-01
 v24.7.1.2915-stable	2024-07-30
 v24.6.2.17-stable	2024-07-05
 v24.6.1.4423-stable	2024-07-01
@@ -5,7 +6,6 @@ v24.5.4.49-stable	2024-07-01
 v24.5.3.5-stable	2024-06-13
 v24.5.2.34-stable	2024-06-13
 v24.5.1.1763-stable	2024-06-01
-v24.4.4.107-stable	2024-07-31
 v24.4.3.25-stable	2024-06-14
 v24.4.2.141-stable	2024-06-07
 v24.4.1.2088-stable	2024-05-01

From c2df527a32d640f52296ea7aefae177e22504082 Mon Sep 17 00:00:00 2001
From: Antonio Andelic <antonio@clickhouse.com>
Date: Thu, 1 Aug 2024 08:42:54 +0200
Subject: [PATCH 127/139] Reduce fault rate

---
 .../test_keeper_map_retries/configs/fault_injection.xml       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/integration/test_keeper_map_retries/configs/fault_injection.xml b/tests/integration/test_keeper_map_retries/configs/fault_injection.xml
index 145945c7c7c..0933b6b3031 100644
--- a/tests/integration/test_keeper_map_retries/configs/fault_injection.xml
+++ b/tests/integration/test_keeper_map_retries/configs/fault_injection.xml
@@ -1,6 +1,6 @@
 <clickhouse>
     <zookeeper>
-        <send_fault_probability>0.05</send_fault_probability>
-        <recv_fault_probability>0.05</recv_fault_probability>
+        <send_fault_probability>0.005</send_fault_probability>
+        <recv_fault_probability>0.005</recv_fault_probability>
     </zookeeper>
 </clickhouse>

From 7db4065898633ace1f909711d4caeda8d135cace Mon Sep 17 00:00:00 2001
From: Antonio Andelic <antonio@clickhouse.com>
Date: Thu, 1 Aug 2024 10:30:50 +0200
Subject: [PATCH 128/139] Add retries to create

---
 src/Storages/StorageKeeperMap.cpp             | 373 +++++++++++-------
 src/Storages/StorageKeeperMap.h               |   6 +-
 .../configs/keeper_retries.xml                |  14 +
 tests/integration/test_keeper_map/test.py     |   3 +-
 .../configs/fault_injection.xml               |   1 +
 .../configs/keeper_retries.xml                |  14 +
 .../test_keeper_map_retries/test.py           |  13 +-
 7 files changed, 275 insertions(+), 149 deletions(-)
 create mode 100644 tests/integration/test_keeper_map/configs/keeper_retries.xml
 create mode 100644 tests/integration/test_keeper_map_retries/configs/keeper_retries.xml

diff --git a/src/Storages/StorageKeeperMap.cpp b/src/Storages/StorageKeeperMap.cpp
index 0634c7be6ee..a6be9f8da04 100644
--- a/src/Storages/StorageKeeperMap.cpp
+++ b/src/Storages/StorageKeeperMap.cpp
@@ -408,104 +408,192 @@ StorageKeeperMap::StorageKeeperMap(
 
     if (attach)
     {
-        checkTable<false>();
+        checkTable<false>(context_);
         return;
     }
 
-    auto client = getClient();
+    const auto & settings = context_->getSettingsRef();
+    ZooKeeperRetriesControl zk_retry{
+        getName(),
+        getLogger(getName()),
+        ZooKeeperRetriesInfo{settings.keeper_max_retries, settings.keeper_retry_initial_backoff_ms, settings.keeper_retry_max_backoff_ms},
+        context_->getProcessListElement()};
 
-    if (zk_root_path != "/" && !client->exists(zk_root_path))
-    {
-        LOG_TRACE(log, "Creating root path {}", zk_root_path);
-        client->createAncestors(zk_root_path);
-        client->createIfNotExists(zk_root_path, "");
-    }
+    zk_retry.retryLoop(
+        [&]
+        {
+            auto client = getClient();
 
+            if (zk_root_path != "/" && !client->exists(zk_root_path))
+            {
+                LOG_TRACE(log, "Creating root path {}", zk_root_path);
+                client->createAncestors(zk_root_path);
+                client->createIfNotExists(zk_root_path, "");
+            }
+        });
+
+    std::shared_ptr<zkutil::EphemeralNodeHolder> metadata_drop_lock;
+    int32_t drop_lock_version = -1;
     for (size_t i = 0; i < 1000; ++i)
     {
-        std::string stored_metadata_string;
-        auto exists = client->tryGet(zk_metadata_path, stored_metadata_string);
-
-        if (exists)
-        {
-            // this requires same name for columns
-            // maybe we can do a smarter comparison for columns and primary key expression
-            if (stored_metadata_string != metadata_string)
-                throw Exception(
-                    ErrorCodes::BAD_ARGUMENTS,
-                    "Path {} is already used but the stored table definition doesn't match. Stored metadata: {}",
-                    zk_root_path,
-                    stored_metadata_string);
-
-            auto code = client->tryCreate(zk_table_path, "", zkutil::CreateMode::Persistent);
-
-            /// A table on the same Keeper path already exists, we just appended our table id to subscribe as a new replica
-            /// We still don't know if the table matches the expected metadata so table_is_valid is not changed
-            /// It will be checked lazily on the first operation
-            if (code == Coordination::Error::ZOK)
-                return;
-
-            if (code != Coordination::Error::ZNONODE)
-                throw zkutil::KeeperException(code, "Failed to create table on path {} because a table with same UUID already exists", zk_root_path);
-
-            /// ZNONODE means we dropped zk_tables_path but didn't finish drop completely
-        }
-
-        if (client->exists(zk_dropped_path))
-        {
-            LOG_INFO(log, "Removing leftover nodes");
-            auto code = client->tryCreate(zk_dropped_lock_path, "", zkutil::CreateMode::Ephemeral);
-
-            if (code == Coordination::Error::ZNONODE)
+        bool success = false;
+        zk_retry.retryLoop(
+            [&]
             {
-                LOG_INFO(log, "Someone else removed leftover nodes");
-            }
-            else if (code == Coordination::Error::ZNODEEXISTS)
-            {
-                LOG_INFO(log, "Someone else is removing leftover nodes");
-                continue;
-            }
-            else if (code != Coordination::Error::ZOK)
-            {
-                throw Coordination::Exception::fromPath(code, zk_dropped_lock_path);
-            }
-            else
-            {
-                auto metadata_drop_lock = zkutil::EphemeralNodeHolder::existing(zk_dropped_lock_path, *client);
-                if (!dropTable(client, metadata_drop_lock))
-                    continue;
-            }
-        }
+                auto client = getClient();
+                std::string stored_metadata_string;
+                auto exists = client->tryGet(zk_metadata_path, stored_metadata_string);
 
-        Coordination::Requests create_requests
-        {
-            zkutil::makeCreateRequest(zk_metadata_path, metadata_string, zkutil::CreateMode::Persistent),
-            zkutil::makeCreateRequest(zk_data_path, metadata_string, zkutil::CreateMode::Persistent),
-            zkutil::makeCreateRequest(zk_tables_path, "", zkutil::CreateMode::Persistent),
-            zkutil::makeCreateRequest(zk_table_path, "", zkutil::CreateMode::Persistent),
-        };
+                if (exists)
+                {
+                    // this requires same name for columns
+                    // maybe we can do a smarter comparison for columns and primary key expression
+                    if (stored_metadata_string != metadata_string)
+                        throw Exception(
+                            ErrorCodes::BAD_ARGUMENTS,
+                            "Path {} is already used but the stored table definition doesn't match. Stored metadata: {}",
+                            zk_root_path,
+                            stored_metadata_string);
 
-        Coordination::Responses create_responses;
-        auto code = client->tryMulti(create_requests, create_responses);
-        if (code == Coordination::Error::ZNODEEXISTS)
-        {
-            LOG_INFO(log, "It looks like a table on path {} was created by another server at the same moment, will retry", zk_root_path);
-            continue;
-        }
-        else if (code != Coordination::Error::ZOK)
-        {
-            zkutil::KeeperMultiException::check(code, create_requests, create_responses);
-        }
+                    auto code = client->tryCreate(zk_table_path, "", zkutil::CreateMode::Persistent);
 
+                    /// A table on the same Keeper path already exists, we just appended our table id to subscribe as a new replica
+                    /// We still don't know if the table matches the expected metadata so table_is_valid is not changed
+                    /// It will be checked lazily on the first operation
+                    if (code == Coordination::Error::ZOK)
+                    {
+                        success = true;
+                        return;
+                    }
 
-        table_status = TableStatus::VALID;
-        /// we are the first table created for the specified Keeper path, i.e. we are the first replica
-        return;
+                    /// We most likely created the path but got a timeout or disconnect
+                    if (code == Coordination::Error::ZNODEEXISTS && zk_retry.isRetry())
+                    {
+                        success = true;
+                        return;
+                    }
+
+                    if (code != Coordination::Error::ZNONODE)
+                        throw zkutil::KeeperException(
+                            code, "Failed to create table on path {} because a table with same UUID already exists", zk_root_path);
+
+                    /// ZNONODE means we dropped zk_tables_path but didn't finish drop completely
+                }
+
+                if (client->exists(zk_dropped_path))
+                {
+                    LOG_INFO(log, "Removing leftover nodes");
+
+                    bool drop_finished = false;
+                    if (zk_retry.isRetry() && metadata_drop_lock != nullptr && drop_lock_version != -1)
+                    {
+                        /// if we have leftover lock from previous try, we need to recreate the ephemeral with our session
+                        Coordination::Requests drop_lock_requests{
+                            zkutil::makeRemoveRequest(zk_dropped_lock_path, drop_lock_version),
+                            zkutil::makeCreateRequest(zk_dropped_lock_path, "", zkutil::CreateMode::Ephemeral),
+                        };
+
+                        Coordination::Responses drop_lock_responses;
+                        auto lock_code = client->tryMulti(drop_lock_requests, drop_lock_responses);
+                        if (lock_code == Coordination::Error::ZBADVERSION)
+                        {
+                            LOG_INFO(log, "Someone else is removing leftover nodes");
+                            metadata_drop_lock->setAlreadyRemoved();
+                            metadata_drop_lock.reset();
+                            return;
+                        }
+
+                        if (drop_lock_responses[0]->error == Coordination::Error::ZNONODE)
+                        {
+                            /// someone else removed metadata nodes or the previous ephemeral node expired
+                            /// we will try creating dropped lock again to make sure
+                            metadata_drop_lock->setAlreadyRemoved();
+                            metadata_drop_lock.reset();
+                        }
+                        else if (lock_code == Coordination::Error::ZOK)
+                        {
+                            metadata_drop_lock->setAlreadyRemoved();
+                            metadata_drop_lock = zkutil::EphemeralNodeHolder::existing(zk_dropped_lock_path, *client);
+                            drop_lock_version = -1;
+                            Coordination::Stat lock_stat;
+                            client->get(zk_dropped_lock_path, &lock_stat);
+                            drop_lock_version = lock_stat.version;
+                            if (!dropTable(client, metadata_drop_lock))
+                            {
+                                metadata_drop_lock.reset();
+                                return;
+                            }
+                            drop_finished = true;
+                        }
+                    }
+
+                    if (!drop_finished)
+                    {
+                        auto code = client->tryCreate(zk_dropped_lock_path, "", zkutil::CreateMode::Ephemeral);
+
+                        if (code == Coordination::Error::ZNONODE)
+                        {
+                            LOG_INFO(log, "Someone else removed leftover nodes");
+                        }
+                        else if (code == Coordination::Error::ZNODEEXISTS)
+                        {
+                            LOG_INFO(log, "Someone else is removing leftover nodes");
+                            return;
+                        }
+                        else if (code != Coordination::Error::ZOK)
+                        {
+                            throw Coordination::Exception::fromPath(code, zk_dropped_lock_path);
+                        }
+                        else
+                        {
+                            metadata_drop_lock = zkutil::EphemeralNodeHolder::existing(zk_dropped_lock_path, *client);
+                            drop_lock_version = -1;
+                            Coordination::Stat lock_stat;
+                            client->get(zk_dropped_lock_path, &lock_stat);
+                            drop_lock_version = lock_stat.version;
+                            if (!dropTable(client, metadata_drop_lock))
+                            {
+                                metadata_drop_lock.reset();
+                                return;
+                            }
+                        }
+                    }
+                }
+
+                Coordination::Requests create_requests{
+                    zkutil::makeCreateRequest(zk_metadata_path, metadata_string, zkutil::CreateMode::Persistent),
+                    zkutil::makeCreateRequest(zk_data_path, metadata_string, zkutil::CreateMode::Persistent),
+                    zkutil::makeCreateRequest(zk_tables_path, "", zkutil::CreateMode::Persistent),
+                    zkutil::makeCreateRequest(zk_table_path, "", zkutil::CreateMode::Persistent),
+                };
+
+                Coordination::Responses create_responses;
+                auto code = client->tryMulti(create_requests, create_responses);
+                if (code == Coordination::Error::ZNODEEXISTS)
+                {
+                    LOG_INFO(
+                        log, "It looks like a table on path {} was created by another server at the same moment, will retry", zk_root_path);
+                    return;
+                }
+                else if (code != Coordination::Error::ZOK)
+                {
+                    zkutil::KeeperMultiException::check(code, create_requests, create_responses);
+                }
+
+                table_status = TableStatus::VALID;
+                /// we are the first table created for the specified Keeper path, i.e. we are the first replica
+                success = true;
+            });
+
+        if (success)
+            return;
     }
 
-    throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                    "Cannot create metadata for table, because it is removed concurrently or because "
-                    "of wrong zk_root_path ({})", zk_root_path);
+    throw Exception(
+        ErrorCodes::BAD_ARGUMENTS,
+        "Cannot create metadata for table, because it is removed concurrently or because "
+        "of wrong zk_root_path ({})",
+        zk_root_path);
 }
 
 
@@ -518,7 +606,7 @@ Pipe StorageKeeperMap::read(
     size_t max_block_size,
     size_t num_streams)
 {
-    checkTable<true>();
+    checkTable<true>(context_);
     storage_snapshot->check(column_names);
 
     FieldVectorPtr filtered_keys;
@@ -592,13 +680,13 @@ Pipe StorageKeeperMap::read(
 
 SinkToStoragePtr StorageKeeperMap::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr local_context, bool /*async_insert*/)
 {
-    checkTable<true>();
+    checkTable<true>(local_context);
     return std::make_shared<StorageKeeperMapSink>(*this, metadata_snapshot->getSampleBlock(), local_context);
 }
 
 void StorageKeeperMap::truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr local_context, TableExclusiveLockHolder &)
 {
-    checkTable<true>();
+    checkTable<true>(local_context);
     const auto & settings = local_context->getSettingsRef();
     ZooKeeperRetriesControl zk_retry{
         getName(),
@@ -657,7 +745,7 @@ bool StorageKeeperMap::dropTable(zkutil::ZooKeeperPtr zookeeper, const zkutil::E
 
 void StorageKeeperMap::drop()
 {
-    auto current_table_status = getTableStatus();
+    auto current_table_status = getTableStatus(getContext());
     if (current_table_status == TableStatus::UNKNOWN)
     {
             static constexpr auto error_msg = "Failed to activate table because of connection issues. It will be activated "
@@ -666,7 +754,7 @@ void StorageKeeperMap::drop()
     }
 
     /// if only column metadata is wrong we can still drop the table correctly
-    if (current_table_status == TableStatus::INVALID_KEEPER_STRUCTURE)
+    if (current_table_status == TableStatus::INVALID_METADATA)
         return;
 
     auto client = getClient();
@@ -1029,7 +1117,7 @@ UInt64 StorageKeeperMap::keysLimit() const
     return keys_limit;
 }
 
-StorageKeeperMap::TableStatus StorageKeeperMap::getTableStatus() const
+StorageKeeperMap::TableStatus StorageKeeperMap::getTableStatus(const ContextPtr & local_context) const
 {
     std::lock_guard lock{init_mutex};
     if (table_status != TableStatus::UNKNOWN)
@@ -1039,57 +1127,70 @@ StorageKeeperMap::TableStatus StorageKeeperMap::getTableStatus() const
     {
         try
         {
-            auto client = getClient();
+            const auto & settings = local_context->getSettingsRef();
+            ZooKeeperRetriesControl zk_retry{
+                getName(),
+                getLogger(getName()),
+                ZooKeeperRetriesInfo{
+                    settings.keeper_max_retries,
+                    settings.keeper_retry_initial_backoff_ms,
+                    settings.keeper_retry_max_backoff_ms},
+                local_context->getProcessListElement()};
 
-            Coordination::Stat metadata_stat;
-            auto stored_metadata_string = client->get(zk_metadata_path, &metadata_stat);
-
-            if (metadata_stat.numChildren == 0)
+            zk_retry.retryLoop([&]
             {
+                auto client = getClient();
+
+                Coordination::Stat metadata_stat;
+                auto stored_metadata_string = client->get(zk_metadata_path, &metadata_stat);
+
+                if (metadata_stat.numChildren == 0)
+                {
+                    table_status = TableStatus::INVALID_KEEPER_STRUCTURE;
+                    return;
+                }
+
+                if (metadata_string != stored_metadata_string)
+                {
+                    LOG_ERROR(
+                        log,
+                        "Table definition does not match to the one stored in the path {}. Stored definition: {}",
+                        zk_root_path,
+                        stored_metadata_string);
+                    table_status = TableStatus::INVALID_METADATA;
+                    return;
+                }
+
+                // validate all metadata and data nodes are present
+                Coordination::Requests requests;
+                requests.push_back(zkutil::makeCheckRequest(zk_table_path, -1));
+                requests.push_back(zkutil::makeCheckRequest(zk_data_path, -1));
+                requests.push_back(zkutil::makeCheckRequest(zk_dropped_path, -1));
+
+                Coordination::Responses responses;
+                client->tryMulti(requests, responses);
+
                 table_status = TableStatus::INVALID_KEEPER_STRUCTURE;
-                return;
-            }
+                if (responses[0]->error != Coordination::Error::ZOK)
+                {
+                    LOG_ERROR(log, "Table node ({}) is missing", zk_table_path);
+                    return;
+                }
 
-            if (metadata_string != stored_metadata_string)
-            {
-                LOG_ERROR(
-                    log,
-                    "Table definition does not match to the one stored in the path {}. Stored definition: {}",
-                    zk_root_path,
-                    stored_metadata_string);
-                table_status = TableStatus::INVALID_METADATA;
-                return;
-            }
+                if (responses[1]->error != Coordination::Error::ZOK)
+                {
+                    LOG_ERROR(log, "Data node ({}) is missing", zk_data_path);
+                    return;
+                }
 
-            // validate all metadata and data nodes are present
-            Coordination::Requests requests;
-            requests.push_back(zkutil::makeCheckRequest(zk_table_path, -1));
-            requests.push_back(zkutil::makeCheckRequest(zk_data_path, -1));
-            requests.push_back(zkutil::makeCheckRequest(zk_dropped_path, -1));
+                if (responses[2]->error == Coordination::Error::ZOK)
+                {
+                    LOG_ERROR(log, "Tables with root node {} are being dropped", zk_root_path);
+                    return;
+                }
 
-            Coordination::Responses responses;
-            client->tryMulti(requests, responses);
-
-            table_status = TableStatus::INVALID_KEEPER_STRUCTURE;
-            if (responses[0]->error != Coordination::Error::ZOK)
-            {
-                LOG_ERROR(log, "Table node ({}) is missing", zk_table_path);
-                return;
-            }
-
-            if (responses[1]->error != Coordination::Error::ZOK)
-            {
-                LOG_ERROR(log, "Data node ({}) is missing", zk_data_path);
-                return;
-            }
-
-            if (responses[2]->error == Coordination::Error::ZOK)
-            {
-                LOG_ERROR(log, "Tables with root node {} are being dropped", zk_root_path);
-                return;
-            }
-
-            table_status = TableStatus::VALID;
+                table_status = TableStatus::VALID;
+            });
         }
         catch (const Coordination::Exception & e)
         {
@@ -1227,7 +1328,7 @@ void StorageKeeperMap::checkMutationIsPossible(const MutationCommands & commands
 
 void StorageKeeperMap::mutate(const MutationCommands & commands, ContextPtr local_context)
 {
-    checkTable<true>();
+    checkTable<true>(local_context);
 
     if (commands.empty())
         return;
diff --git a/src/Storages/StorageKeeperMap.h b/src/Storages/StorageKeeperMap.h
index 8ed348a4f6f..1464eeaabad 100644
--- a/src/Storages/StorageKeeperMap.h
+++ b/src/Storages/StorageKeeperMap.h
@@ -78,9 +78,9 @@ public:
     UInt64 keysLimit() const;
 
     template <bool throw_on_error>
-    void checkTable() const
+    void checkTable(const ContextPtr & local_context) const
     {
-        auto current_table_status = getTableStatus();
+        auto current_table_status = getTableStatus(local_context);
         if (table_status == TableStatus::UNKNOWN)
         {
             static constexpr auto error_msg = "Failed to activate table because of connection issues. It will be activated "
@@ -119,7 +119,7 @@ private:
         VALID
     };
 
-    TableStatus getTableStatus() const;
+    TableStatus getTableStatus(const ContextPtr & context) const;
 
     void restoreDataImpl(
         const BackupPtr & backup,
diff --git a/tests/integration/test_keeper_map/configs/keeper_retries.xml b/tests/integration/test_keeper_map/configs/keeper_retries.xml
new file mode 100644
index 00000000000..43e5b9a09e8
--- /dev/null
+++ b/tests/integration/test_keeper_map/configs/keeper_retries.xml
@@ -0,0 +1,14 @@
+<clickhouse>
+    <profiles>
+        <default>
+            <insert_keeper_max_retries>0</insert_keeper_max_retries>
+            <keeper_max_retries>0</keeper_max_retries>
+        </default>
+    </profiles>
+    <users>
+        <default>
+            <password></password>
+            <profile>default</profile>
+        </default>
+    </users>
+</clickhouse>
diff --git a/tests/integration/test_keeper_map/test.py b/tests/integration/test_keeper_map/test.py
index 4b1bcd11cfe..861a7c47687 100644
--- a/tests/integration/test_keeper_map/test.py
+++ b/tests/integration/test_keeper_map/test.py
@@ -10,6 +10,7 @@ cluster = ClickHouseCluster(__file__)
 node = cluster.add_instance(
     "node",
     main_configs=["configs/enable_keeper_map.xml"],
+    user_configs=["configs/keeper_retries.xml"],
     with_zookeeper=True,
     stay_alive=True,
 )
@@ -49,7 +50,6 @@ def assert_keeper_exception_after_partition(query):
             error = node.query_and_get_error_with_retry(
                 query,
                 sleep_time=1,
-                settings={"insert_keeper_max_retries": 1, "keeper_max_retries": 1},
             )
             assert "Coordination::Exception" in error
         except:
@@ -91,7 +91,6 @@ def test_keeper_map_without_zk(started_cluster):
             error = node.query_and_get_error_with_retry(
                 "SELECT * FROM test_keeper_map_without_zk",
                 sleep_time=1,
-                settings={"keeper_max_retries": 1},
             )
             assert "Failed to activate table because of connection issues" in error
         except:
diff --git a/tests/integration/test_keeper_map_retries/configs/fault_injection.xml b/tests/integration/test_keeper_map_retries/configs/fault_injection.xml
index 0933b6b3031..8406b7db785 100644
--- a/tests/integration/test_keeper_map_retries/configs/fault_injection.xml
+++ b/tests/integration/test_keeper_map_retries/configs/fault_injection.xml
@@ -1,5 +1,6 @@
 <clickhouse>
     <zookeeper>
+        <enable_fault_injections_during_startup>1</enable_fault_injections_during_startup>
         <send_fault_probability>0.005</send_fault_probability>
         <recv_fault_probability>0.005</recv_fault_probability>
     </zookeeper>
diff --git a/tests/integration/test_keeper_map_retries/configs/keeper_retries.xml b/tests/integration/test_keeper_map_retries/configs/keeper_retries.xml
new file mode 100644
index 00000000000..208dd6e47fa
--- /dev/null
+++ b/tests/integration/test_keeper_map_retries/configs/keeper_retries.xml
@@ -0,0 +1,14 @@
+<clickhouse>
+    <profiles>
+        <default>
+            <keeper_max_retries>20</keeper_max_retries>
+            <keeper_retry_max_backoff_ms>10000</keeper_retry_max_backoff_ms>
+        </default>
+    </profiles>
+    <users>
+        <default>
+            <password></password>
+            <profile>default</profile>
+        </default>
+    </users>
+</clickhouse>
diff --git a/tests/integration/test_keeper_map_retries/test.py b/tests/integration/test_keeper_map_retries/test.py
index 352119147cd..c6760e5d1a2 100644
--- a/tests/integration/test_keeper_map_retries/test.py
+++ b/tests/integration/test_keeper_map_retries/test.py
@@ -11,6 +11,7 @@ cluster = ClickHouseCluster(__file__)
 node = cluster.add_instance(
     "node",
     main_configs=["configs/enable_keeper_map.xml"],
+    user_configs=["configs/keeper_retries.xml"],
     with_zookeeper=True,
     stay_alive=True,
 )
@@ -42,10 +43,6 @@ def repeat_query(query, repeat):
     for _ in range(repeat):
         node.query(
             query,
-            settings={
-                "keeper_max_retries": 20,
-                "keeper_retry_max_backoff_ms": 10000,
-            },
         )
 
 
@@ -53,10 +50,6 @@ def test_queries(started_cluster):
     start_clean_clickhouse()
 
     node.query("DROP TABLE IF EXISTS keeper_map_retries SYNC")
-    node.query(
-        "CREATE TABLE keeper_map_retries (a UInt64, b UInt64) Engine=KeeperMap('/keeper_map_retries') PRIMARY KEY a"
-    )
-
     node.stop_clickhouse()
     node.copy_file_to_container(
         os.path.join(CONFIG_DIR, "fault_injection.xml"),
@@ -66,6 +59,10 @@ def test_queries(started_cluster):
 
     repeat_count = 10
 
+    node.query(
+        "CREATE TABLE keeper_map_retries (a UInt64, b UInt64) Engine=KeeperMap('/keeper_map_retries') PRIMARY KEY a",
+    )
+
     repeat_query(
         "INSERT INTO keeper_map_retries SELECT number, number FROM numbers(500)",
         repeat_count,

From ca01c1c5691e4562ae6fc71af7b1867cf39f7ad1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= <git@rmr.ninja>
Date: Thu, 1 Aug 2024 11:33:22 +0200
Subject: [PATCH 129/139] Fix bad merge

---
 src/Core/SettingsChangesHistory.cpp | 259 ----------------------------
 1 file changed, 259 deletions(-)

diff --git a/src/Core/SettingsChangesHistory.cpp b/src/Core/SettingsChangesHistory.cpp
index c3b9805700f..8f73e10c44f 100644
--- a/src/Core/SettingsChangesHistory.cpp
+++ b/src/Core/SettingsChangesHistory.cpp
@@ -497,265 +497,6 @@ static std::initializer_list<std::pair<ClickHouseVersion, SettingsChangesHistory
             {"enable_optimize_predicate_expression", 0, 1, "Optimize predicates to subqueries by default"}
         }
     },
-    {"24.7", {{"output_format_parquet_write_page_index", false, true, "Add a possibility to write page index into parquet files."},
-              {"output_format_binary_encode_types_in_binary_format", false, false, "Added new setting to allow to write type names in binary format in RowBinaryWithNamesAndTypes output format"},
-              {"input_format_binary_decode_types_in_binary_format", false, false, "Added new setting to allow to read type names in binary format in RowBinaryWithNamesAndTypes input format"},
-              {"output_format_native_encode_types_in_binary_format", false, false, "Added new setting to allow to write type names in binary format in Native output format"},
-              {"input_format_native_decode_types_in_binary_format", false, false, "Added new setting to allow to read type names in binary format in Native output format"},
-              {"read_in_order_use_buffering", false, true, "Use buffering before merging while reading in order of primary key"},
-              {"enable_named_columns_in_function_tuple", false, true, "Generate named tuples in function tuple() when all names are unique and can be treated as unquoted identifiers."},
-              {"input_format_json_case_insensitive_column_matching", false, false, "Ignore case when matching JSON keys with CH columns."},
-              {"optimize_trivial_insert_select", true, false, "The optimization does not make sense in many cases."},
-              {"dictionary_validate_primary_key_type", false, false, "Validate primary key type for dictionaries. By default id type for simple layouts will be implicitly converted to UInt64."},
-              {"collect_hash_table_stats_during_joins", false, true, "New setting."},
-              {"max_size_to_preallocate_for_joins", 0, 100'000'000, "New setting."},
-              {"input_format_orc_reader_time_zone_name", "GMT", "GMT", "The time zone name for ORC row reader, the default ORC row reader's time zone is GMT."},
-              {"lightweight_mutation_projection_mode", "throw", "throw", "When lightweight delete happens on a table with projection(s), the possible operations include throw the exception as projection exists, or drop all projection related to this table then do lightweight delete."},
-              {"database_replicated_allow_heavy_create", true, false, "Long-running DDL queries (CREATE AS SELECT and POPULATE) for Replicated database engine was forbidden"},
-              {"query_plan_merge_filters", false, false, "Allow to merge filters in the query plan"},
-              {"azure_sdk_max_retries", 10, 10, "Maximum number of retries in azure sdk"},
-              {"azure_sdk_retry_initial_backoff_ms", 10, 10, "Minimal backoff between retries in azure sdk"},
-              {"azure_sdk_retry_max_backoff_ms", 1000, 1000, "Maximal backoff between retries in azure sdk"},
-              {"merge_tree_min_bytes_per_task_for_remote_reading", 4194304, 2097152, "Value is unified with `filesystem_prefetch_min_bytes_for_single_read_task`"},
-              {"ignore_on_cluster_for_replicated_named_collections_queries", false, false, "Ignore ON CLUSTER clause for replicated named collections management queries."},
-              {"backup_restore_s3_retry_attempts", 1000,1000, "Setting for Aws::Client::RetryStrategy, Aws::Client does retries itself, 0 means no retries. It takes place only for backup/restore."},
-              {"postgresql_connection_attempt_timeout", 2, 2, "Allow to control 'connect_timeout' parameter of PostgreSQL connection."},
-              {"postgresql_connection_pool_retries", 2, 2, "Allow to control the number of retries in PostgreSQL connection pool."}
-              }},
-    {"24.6", {{"materialize_skip_indexes_on_insert", true, true, "Added new setting to allow to disable materialization of skip indexes on insert"},
-              {"materialize_statistics_on_insert", true, true, "Added new setting to allow to disable materialization of statistics on insert"},
-              {"input_format_parquet_use_native_reader", false, false, "When reading Parquet files, to use native reader instead of arrow reader."},
-              {"hdfs_throw_on_zero_files_match", false, false, "Allow to throw an error when ListObjects request cannot match any files in HDFS engine instead of empty query result"},
-              {"azure_throw_on_zero_files_match", false, false, "Allow to throw an error when ListObjects request cannot match any files in AzureBlobStorage engine instead of empty query result"},
-              {"s3_validate_request_settings", true, true, "Allow to disable S3 request settings validation"},
-              {"allow_experimental_full_text_index", false, false, "Enable experimental full-text index"},
-              {"azure_skip_empty_files", false, false, "Allow to skip empty files in azure table engine"},
-              {"hdfs_ignore_file_doesnt_exist", false, false, "Allow to return 0 rows when the requested files don't exist instead of throwing an exception in HDFS table engine"},
-              {"azure_ignore_file_doesnt_exist", false, false, "Allow to return 0 rows when the requested files don't exist instead of throwing an exception in AzureBlobStorage table engine"},
-              {"s3_ignore_file_doesnt_exist", false, false, "Allow to return 0 rows when the requested files don't exist instead of throwing an exception in S3 table engine"},
-              {"s3_max_part_number", 10000, 10000, "Maximum part number number for s3 upload part"},
-              {"s3_max_single_operation_copy_size", 32 * 1024 * 1024, 32 * 1024 * 1024, "Maximum size for a single copy operation in s3"},
-              {"input_format_parquet_max_block_size", 8192, DEFAULT_BLOCK_SIZE, "Increase block size for parquet reader."},
-              {"input_format_parquet_prefer_block_bytes", 0, DEFAULT_BLOCK_SIZE * 256, "Average block bytes output by parquet reader."},
-              {"enable_blob_storage_log", true, true, "Write information about blob storage operations to system.blob_storage_log table"},
-              {"allow_deprecated_snowflake_conversion_functions", true, false, "Disabled deprecated functions snowflakeToDateTime[64] and dateTime[64]ToSnowflake."},
-              {"allow_statistic_optimize", false, false, "Old setting which popped up here being renamed."},
-              {"allow_experimental_statistic", false, false, "Old setting which popped up here being renamed."},
-              {"allow_statistics_optimize", false, false, "The setting was renamed. The previous name is `allow_statistic_optimize`."},
-              {"allow_experimental_statistics", false, false, "The setting was renamed. The previous name is `allow_experimental_statistic`."},
-              {"enable_vertical_final", false, true, "Enable vertical final by default again after fixing bug"},
-              {"parallel_replicas_custom_key_range_lower", 0, 0, "Add settings to control the range filter when using parallel replicas with dynamic shards"},
-              {"parallel_replicas_custom_key_range_upper", 0, 0, "Add settings to control the range filter when using parallel replicas with dynamic shards. A value of 0 disables the upper limit"},
-              {"output_format_pretty_display_footer_column_names", 0, 1, "Add a setting to display column names in the footer if there are many rows. Threshold value is controlled by output_format_pretty_display_footer_column_names_min_rows."},
-              {"output_format_pretty_display_footer_column_names_min_rows", 0, 50, "Add a setting to control the threshold value for setting output_format_pretty_display_footer_column_names_min_rows. Default 50."},
-              {"output_format_csv_serialize_tuple_into_separate_columns", true, true, "A new way of how interpret tuples in CSV format was added."},
-              {"input_format_csv_deserialize_separate_columns_into_tuple", true, true, "A new way of how interpret tuples in CSV format was added."},
-              {"input_format_csv_try_infer_strings_from_quoted_tuples", true, true, "A new way of how interpret tuples in CSV format was added."},
-              }},
-    {"24.5", {{"allow_deprecated_error_prone_window_functions", true, false, "Allow usage of deprecated error prone window functions (neighbor, runningAccumulate, runningDifferenceStartingWithFirstValue, runningDifference)"},
-              {"allow_experimental_join_condition", false, false, "Support join with inequal conditions which involve columns from both left and right table. e.g. t1.y < t2.y."},
-              {"input_format_tsv_crlf_end_of_line", false, false, "Enables reading of CRLF line endings with TSV formats"},
-              {"output_format_parquet_use_custom_encoder", false, true, "Enable custom Parquet encoder."},
-              {"cross_join_min_rows_to_compress", 0, 10000000, "Minimal count of rows to compress block in CROSS JOIN. Zero value means - disable this threshold. This block is compressed when any of the two thresholds (by rows or by bytes) are reached."},
-              {"cross_join_min_bytes_to_compress", 0, 1_GiB, "Minimal size of block to compress in CROSS JOIN. Zero value means - disable this threshold. This block is compressed when any of the two thresholds (by rows or by bytes) are reached."},
-              {"http_max_chunk_size", 0, 0, "Internal limitation"},
-              {"prefer_external_sort_block_bytes", 0, DEFAULT_BLOCK_SIZE * 256, "Prefer maximum block bytes for external sort, reduce the memory usage during merging."},
-              {"input_format_force_null_for_omitted_fields", false, false, "Disable type-defaults for omitted fields when needed"},
-              {"cast_string_to_dynamic_use_inference", false, false, "Add setting to allow converting String to Dynamic through parsing"},
-              {"allow_experimental_dynamic_type", false, false, "Add new experimental Dynamic type"},
-              {"azure_max_blocks_in_multipart_upload", 50000, 50000, "Maximum number of blocks in multipart upload for Azure."},
-              }},
-    {"24.4", {{"input_format_json_throw_on_bad_escape_sequence", true, true, "Allow to save JSON strings with bad escape sequences"},
-              {"max_parsing_threads", 0, 0, "Add a separate setting to control number of threads in parallel parsing from files"},
-              {"ignore_drop_queries_probability", 0, 0, "Allow to ignore drop queries in server with specified probability for testing purposes"},
-              {"lightweight_deletes_sync", 2, 2, "The same as 'mutation_sync', but controls only execution of lightweight deletes"},
-              {"query_cache_system_table_handling", "save", "throw", "The query cache no longer caches results of queries against system tables"},
-              {"input_format_json_ignore_unnecessary_fields", false, true, "Ignore unnecessary fields and not parse them. Enabling this may not throw exceptions on json strings of invalid format or with duplicated fields"},
-              {"input_format_hive_text_allow_variable_number_of_columns", false, true, "Ignore extra columns in Hive Text input (if file has more columns than expected) and treat missing fields in Hive Text input as default values."},
-              {"allow_experimental_database_replicated", false, true, "Database engine Replicated is now in Beta stage"},
-              {"temporary_data_in_cache_reserve_space_wait_lock_timeout_milliseconds", (10 * 60 * 1000), (10 * 60 * 1000), "Wait time to lock cache for sapce reservation in temporary data in filesystem cache"},
-              {"optimize_rewrite_sum_if_to_count_if", false, true, "Only available for the analyzer, where it works correctly"},
-              {"azure_allow_parallel_part_upload", "true", "true", "Use multiple threads for azure multipart upload."},
-              {"max_recursive_cte_evaluation_depth", DBMS_RECURSIVE_CTE_MAX_EVALUATION_DEPTH, DBMS_RECURSIVE_CTE_MAX_EVALUATION_DEPTH, "Maximum limit on recursive CTE evaluation depth"},
-              {"query_plan_convert_outer_join_to_inner_join", false, true, "Allow to convert OUTER JOIN to INNER JOIN if filter after JOIN always filters default values"},
-              }},
-    {"24.3", {{"s3_connect_timeout_ms", 1000, 1000, "Introduce new dedicated setting for s3 connection timeout"},
-              {"allow_experimental_shared_merge_tree", false, true, "The setting is obsolete"},
-              {"use_page_cache_for_disks_without_file_cache", false, false, "Added userspace page cache"},
-              {"read_from_page_cache_if_exists_otherwise_bypass_cache", false, false, "Added userspace page cache"},
-              {"page_cache_inject_eviction", false, false, "Added userspace page cache"},
-              {"default_table_engine", "None", "MergeTree", "Set default table engine to MergeTree for better usability"},
-              {"input_format_json_use_string_type_for_ambiguous_paths_in_named_tuples_inference_from_objects", false, false, "Allow to use String type for ambiguous paths during named tuple inference from JSON objects"},
-              {"traverse_shadow_remote_data_paths", false, false, "Traverse shadow directory when query system.remote_data_paths."},
-              {"throw_if_deduplication_in_dependent_materialized_views_enabled_with_async_insert", false, true, "Deduplication in dependent materialized view cannot work together with async inserts."},
-              {"parallel_replicas_allow_in_with_subquery", false, true, "If true, subquery for IN will be executed on every follower replica"},
-              {"log_processors_profiles", false, true, "Enable by default"},
-              {"function_locate_has_mysql_compatible_argument_order", false, true, "Increase compatibility with MySQL's locate function."},
-              {"allow_suspicious_primary_key", true, false, "Forbid suspicious PRIMARY KEY/ORDER BY for MergeTree (i.e. SimpleAggregateFunction)"},
-              {"filesystem_cache_reserve_space_wait_lock_timeout_milliseconds", 1000, 1000, "Wait time to lock cache for sapce reservation in filesystem cache"},
-              {"max_parser_backtracks", 0, 1000000, "Limiting the complexity of parsing"},
-              {"analyzer_compatibility_join_using_top_level_identifier", false, false, "Force to resolve identifier in JOIN USING from projection"},
-              {"distributed_insert_skip_read_only_replicas", false, false, "If true, INSERT into Distributed will skip read-only replicas"},
-              {"keeper_max_retries", 10, 10, "Max retries for general keeper operations"},
-              {"keeper_retry_initial_backoff_ms", 100, 100, "Initial backoff timeout for general keeper operations"},
-              {"keeper_retry_max_backoff_ms", 5000, 5000, "Max backoff timeout for general keeper operations"},
-              {"s3queue_allow_experimental_sharded_mode", false, false, "Enable experimental sharded mode of S3Queue table engine. It is experimental because it will be rewritten"},
-              {"allow_experimental_analyzer", false, true, "Enable analyzer and planner by default."},
-              {"merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability", 0.0, 0.0, "For testing of `PartsSplitter` - split read ranges into intersecting and non intersecting every time you read from MergeTree with the specified probability."},
-              {"allow_get_client_http_header", false, false, "Introduced a new function."},
-              {"output_format_pretty_row_numbers", false, true, "It is better for usability."},
-              {"output_format_pretty_max_value_width_apply_for_single_value", true, false, "Single values in Pretty formats won't be cut."},
-              {"output_format_parquet_string_as_string", false, true, "ClickHouse allows arbitrary binary data in the String data type, which is typically UTF-8. Parquet/ORC/Arrow Strings only support UTF-8. That's why you can choose which Arrow's data type to use for the ClickHouse String data type - String or Binary. While Binary would be more correct and compatible, using String by default will correspond to user expectations in most cases."},
-              {"output_format_orc_string_as_string", false, true, "ClickHouse allows arbitrary binary data in the String data type, which is typically UTF-8. Parquet/ORC/Arrow Strings only support UTF-8. That's why you can choose which Arrow's data type to use for the ClickHouse String data type - String or Binary. While Binary would be more correct and compatible, using String by default will correspond to user expectations in most cases."},
-              {"output_format_arrow_string_as_string", false, true, "ClickHouse allows arbitrary binary data in the String data type, which is typically UTF-8. Parquet/ORC/Arrow Strings only support UTF-8. That's why you can choose which Arrow's data type to use for the ClickHouse String data type - String or Binary. While Binary would be more correct and compatible, using String by default will correspond to user expectations in most cases."},
-              {"output_format_parquet_compression_method", "lz4", "zstd", "Parquet/ORC/Arrow support many compression methods, including lz4 and zstd. ClickHouse supports each and every compression method. Some inferior tools, such as 'duckdb', lack support for the faster `lz4` compression method, that's why we set zstd by default."},
-              {"output_format_orc_compression_method", "lz4", "zstd", "Parquet/ORC/Arrow support many compression methods, including lz4 and zstd. ClickHouse supports each and every compression method. Some inferior tools, such as 'duckdb', lack support for the faster `lz4` compression method, that's why we set zstd by default."},
-              {"output_format_pretty_highlight_digit_groups", false, true, "If enabled and if output is a terminal, highlight every digit corresponding to the number of thousands, millions, etc. with underline."},
-              {"geo_distance_returns_float64_on_float64_arguments", false, true, "Increase the default precision."},
-              {"azure_max_inflight_parts_for_one_file", 20, 20, "The maximum number of a concurrent loaded parts in multipart upload request. 0 means unlimited."},
-              {"azure_strict_upload_part_size", 0, 0, "The exact size of part to upload during multipart upload to Azure blob storage."},
-              {"azure_min_upload_part_size", 16*1024*1024, 16*1024*1024, "The minimum size of part to upload during multipart upload to Azure blob storage."},
-              {"azure_max_upload_part_size", 5ull*1024*1024*1024, 5ull*1024*1024*1024, "The maximum size of part to upload during multipart upload to Azure blob storage."},
-              {"azure_upload_part_size_multiply_factor", 2, 2, "Multiply azure_min_upload_part_size by this factor each time azure_multiply_parts_count_threshold parts were uploaded from a single write to Azure blob storage."},
-              {"azure_upload_part_size_multiply_parts_count_threshold", 500, 500, "Each time this number of parts was uploaded to Azure blob storage, azure_min_upload_part_size is multiplied by azure_upload_part_size_multiply_factor."},
-              {"output_format_csv_serialize_tuple_into_separate_columns", true, true, "A new way of how interpret tuples in CSV format was added."},
-              {"input_format_csv_deserialize_separate_columns_into_tuple", true, true, "A new way of how interpret tuples in CSV format was added."},
-              {"input_format_csv_try_infer_strings_from_quoted_tuples", true, true, "A new way of how interpret tuples in CSV format was added."},
-              }},
-    {"24.2", {{"allow_suspicious_variant_types", true, false, "Don't allow creating Variant type with suspicious variants by default"},
-              {"validate_experimental_and_suspicious_types_inside_nested_types", false, true, "Validate usage of experimental and suspicious types inside nested types"},
-              {"output_format_values_escape_quote_with_quote", false, false, "If true escape ' with '', otherwise quoted with \\'"},
-              {"output_format_pretty_single_large_number_tip_threshold", 0, 1'000'000, "Print a readable number tip on the right side of the table if the block consists of a single number which exceeds this value (except 0)"},
-              {"input_format_try_infer_exponent_floats", true, false, "Don't infer floats in exponential notation by default"},
-              {"query_plan_optimize_prewhere", true, true, "Allow to push down filter to PREWHERE expression for supported storages"},
-              {"async_insert_max_data_size", 1000000, 10485760, "The previous value appeared to be too small."},
-              {"async_insert_poll_timeout_ms", 10, 10, "Timeout in milliseconds for polling data from asynchronous insert queue"},
-              {"async_insert_use_adaptive_busy_timeout", false, true, "Use adaptive asynchronous insert timeout"},
-              {"async_insert_busy_timeout_min_ms", 50, 50, "The minimum value of the asynchronous insert timeout in milliseconds; it also serves as the initial value, which may be increased later by the adaptive algorithm"},
-              {"async_insert_busy_timeout_max_ms", 200, 200, "The minimum value of the asynchronous insert timeout in milliseconds; async_insert_busy_timeout_ms is aliased to async_insert_busy_timeout_max_ms"},
-              {"async_insert_busy_timeout_increase_rate", 0.2, 0.2, "The exponential growth rate at which the adaptive asynchronous insert timeout increases"},
-              {"async_insert_busy_timeout_decrease_rate", 0.2, 0.2, "The exponential growth rate at which the adaptive asynchronous insert timeout decreases"},
-              {"format_template_row_format", "", "", "Template row format string can be set directly in query"},
-              {"format_template_resultset_format", "", "", "Template result set format string can be set in query"},
-              {"split_parts_ranges_into_intersecting_and_non_intersecting_final", true, true, "Allow to split parts ranges into intersecting and non intersecting during FINAL optimization"},
-              {"split_intersecting_parts_ranges_into_layers_final", true, true, "Allow to split intersecting parts ranges into layers during FINAL optimization"},
-              {"azure_max_single_part_copy_size", 256*1024*1024, 256*1024*1024, "The maximum size of object to copy using single part copy to Azure blob storage."},
-              {"min_external_table_block_size_rows", DEFAULT_INSERT_BLOCK_SIZE, DEFAULT_INSERT_BLOCK_SIZE, "Squash blocks passed to external table to specified size in rows, if blocks are not big enough"},
-              {"min_external_table_block_size_bytes", DEFAULT_INSERT_BLOCK_SIZE * 256, DEFAULT_INSERT_BLOCK_SIZE * 256, "Squash blocks passed to external table to specified size in bytes, if blocks are not big enough."},
-              {"parallel_replicas_prefer_local_join", true, true, "If true, and JOIN can be executed with parallel replicas algorithm, and all storages of right JOIN part are *MergeTree, local JOIN will be used instead of GLOBAL JOIN."},
-              {"optimize_time_filter_with_preimage", true, true, "Optimize Date and DateTime predicates by converting functions into equivalent comparisons without conversions (e.g. toYear(col) = 2023 -> col >= '2023-01-01' AND col <= '2023-12-31')"},
-              {"extract_key_value_pairs_max_pairs_per_row", 0, 0, "Max number of pairs that can be produced by the `extractKeyValuePairs` function. Used as a safeguard against consuming too much memory."},
-              {"default_view_definer", "CURRENT_USER", "CURRENT_USER", "Allows to set default `DEFINER` option while creating a view"},
-              {"default_materialized_view_sql_security", "DEFINER", "DEFINER", "Allows to set a default value for SQL SECURITY option when creating a materialized view"},
-              {"default_normal_view_sql_security", "INVOKER", "INVOKER", "Allows to set default `SQL SECURITY` option while creating a normal view"},
-              {"mysql_map_string_to_text_in_show_columns", false, true, "Reduce the configuration effort to connect ClickHouse with BI tools."},
-              {"mysql_map_fixed_string_to_text_in_show_columns", false, true, "Reduce the configuration effort to connect ClickHouse with BI tools."},
-              }},
-    {"24.1", {{"print_pretty_type_names", false, true, "Better user experience."},
-              {"input_format_json_read_bools_as_strings", false, true, "Allow to read bools as strings in JSON formats by default"},
-              {"output_format_arrow_use_signed_indexes_for_dictionary", false, true, "Use signed indexes type for Arrow dictionaries by default as it's recommended"},
-              {"allow_experimental_variant_type", false, false, "Add new experimental Variant type"},
-              {"use_variant_as_common_type", false, false, "Allow to use Variant in if/multiIf if there is no common type"},
-              {"output_format_arrow_use_64_bit_indexes_for_dictionary", false, false, "Allow to use 64 bit indexes type in Arrow dictionaries"},
-              {"parallel_replicas_mark_segment_size", 128, 128, "Add new setting to control segment size in new parallel replicas coordinator implementation"},
-              {"ignore_materialized_views_with_dropped_target_table", false, false, "Add new setting to allow to ignore materialized views with dropped target table"},
-              {"output_format_compression_level", 3, 3, "Allow to change compression level in the query output"},
-              {"output_format_compression_zstd_window_log", 0, 0, "Allow to change zstd window log in the query output when zstd compression is used"},
-              {"enable_zstd_qat_codec", false, false, "Add new ZSTD_QAT codec"},
-              {"enable_vertical_final", false, true, "Use vertical final by default"},
-              {"output_format_arrow_use_64_bit_indexes_for_dictionary", false, false, "Allow to use 64 bit indexes type in Arrow dictionaries"},
-              {"max_rows_in_set_to_optimize_join", 100000, 0, "Disable join optimization as it prevents from read in order optimization"},
-              {"output_format_pretty_color", true, "auto", "Setting is changed to allow also for auto value, disabling ANSI escapes if output is not a tty"},
-              {"function_visible_width_behavior", 0, 1, "We changed the default behavior of `visibleWidth` to be more precise"},
-              {"max_estimated_execution_time", 0, 0, "Separate max_execution_time and max_estimated_execution_time"},
-              {"iceberg_engine_ignore_schema_evolution", false, false, "Allow to ignore schema evolution in Iceberg table engine"},
-              {"optimize_injective_functions_in_group_by", false, true, "Replace injective functions by it's arguments in GROUP BY section in analyzer"},
-              {"update_insert_deduplication_token_in_dependent_materialized_views", false, false, "Allow to update insert deduplication token with table identifier during insert in dependent materialized views"},
-              {"azure_max_unexpected_write_error_retries", 4, 4, "The maximum number of retries in case of unexpected errors during Azure blob storage write"},
-              {"split_parts_ranges_into_intersecting_and_non_intersecting_final", false, true, "Allow to split parts ranges into intersecting and non intersecting during FINAL optimization"},
-              {"split_intersecting_parts_ranges_into_layers_final", true, true, "Allow to split intersecting parts ranges into layers during FINAL optimization"}}},
-    {"23.12", {{"allow_suspicious_ttl_expressions", true, false, "It is a new setting, and in previous versions the behavior was equivalent to allowing."},
-              {"input_format_parquet_allow_missing_columns", false, true, "Allow missing columns in Parquet files by default"},
-              {"input_format_orc_allow_missing_columns", false, true, "Allow missing columns in ORC files by default"},
-              {"input_format_arrow_allow_missing_columns", false, true, "Allow missing columns in Arrow files by default"}}},
-    {"23.11", {{"parsedatetime_parse_without_leading_zeros", false, true, "Improved compatibility with MySQL DATE_FORMAT/STR_TO_DATE"}}},
-    {"23.9", {{"optimize_group_by_constant_keys", false, true, "Optimize group by constant keys by default"},
-              {"input_format_json_try_infer_named_tuples_from_objects", false, true, "Try to infer named Tuples from JSON objects by default"},
-              {"input_format_json_read_numbers_as_strings", false, true, "Allow to read numbers as strings in JSON formats by default"},
-              {"input_format_json_read_arrays_as_strings", false, true, "Allow to read arrays as strings in JSON formats by default"},
-              {"input_format_json_infer_incomplete_types_as_strings", false, true, "Allow to infer incomplete types as Strings in JSON formats by default"},
-              {"input_format_json_try_infer_numbers_from_strings", true, false, "Don't infer numbers from strings in JSON formats by default to prevent possible parsing errors"},
-              {"http_write_exception_in_output_format", false, true, "Output valid JSON/XML on exception in HTTP streaming."}}},
-    {"23.8", {{"rewrite_count_distinct_if_with_count_distinct_implementation", false, true, "Rewrite countDistinctIf with count_distinct_implementation configuration"}}},
-    {"23.7", {{"function_sleep_max_microseconds_per_block", 0, 3000000, "In previous versions, the maximum sleep time of 3 seconds was applied only for `sleep`, but not for `sleepEachRow` function. In the new version, we introduce this setting. If you set compatibility with the previous versions, we will disable the limit altogether."}}},
-    {"23.6", {{"http_send_timeout", 180, 30, "3 minutes seems crazy long. Note that this is timeout for a single network write call, not for the whole upload operation."},
-              {"http_receive_timeout", 180, 30, "See http_send_timeout."}}},
-    {"23.5", {{"input_format_parquet_preserve_order", true, false, "Allow Parquet reader to reorder rows for better parallelism."},
-              {"parallelize_output_from_storages", false, true, "Allow parallelism when executing queries that read from file/url/s3/etc. This may reorder rows."},
-              {"use_with_fill_by_sorting_prefix", false, true, "Columns preceding WITH FILL columns in ORDER BY clause form sorting prefix. Rows with different values in sorting prefix are filled independently"},
-              {"output_format_parquet_compliant_nested_types", false, true, "Change an internal field name in output Parquet file schema."}}},
-    {"23.4", {{"allow_suspicious_indices", true, false, "If true, index can defined with identical expressions"},
-              {"allow_nonconst_timezone_arguments", true, false, "Allow non-const timezone arguments in certain time-related functions like toTimeZone(), fromUnixTimestamp*(), snowflakeToDateTime*()."},
-              {"connect_timeout_with_failover_ms", 50, 1000, "Increase default connect timeout because of async connect"},
-              {"connect_timeout_with_failover_secure_ms", 100, 1000, "Increase default secure connect timeout because of async connect"},
-              {"hedged_connection_timeout_ms", 100, 50, "Start new connection in hedged requests after 50 ms instead of 100 to correspond with previous connect timeout"},
-              {"formatdatetime_f_prints_single_zero", true, false, "Improved compatibility with MySQL DATE_FORMAT()/STR_TO_DATE()"},
-              {"formatdatetime_parsedatetime_m_is_month_name", false, true, "Improved compatibility with MySQL DATE_FORMAT/STR_TO_DATE"}}},
-    {"23.3", {{"output_format_parquet_version", "1.0", "2.latest", "Use latest Parquet format version for output format"},
-              {"input_format_json_ignore_unknown_keys_in_named_tuple", false, true, "Improve parsing JSON objects as named tuples"},
-              {"input_format_native_allow_types_conversion", false, true, "Allow types conversion in Native input forma"},
-              {"output_format_arrow_compression_method", "none", "lz4_frame", "Use lz4 compression in Arrow output format by default"},
-              {"output_format_parquet_compression_method", "snappy", "lz4", "Use lz4 compression in Parquet output format by default"},
-              {"output_format_orc_compression_method", "none", "lz4_frame", "Use lz4 compression in ORC output format by default"},
-              {"async_query_sending_for_remote", false, true, "Create connections and send query async across shards"}}},
-    {"23.2", {{"output_format_parquet_fixed_string_as_fixed_byte_array", false, true, "Use Parquet FIXED_LENGTH_BYTE_ARRAY type for FixedString by default"},
-              {"output_format_arrow_fixed_string_as_fixed_byte_array", false, true, "Use Arrow FIXED_SIZE_BINARY type for FixedString by default"},
-              {"query_plan_remove_redundant_distinct", false, true, "Remove redundant Distinct step in query plan"},
-              {"optimize_duplicate_order_by_and_distinct", true, false, "Remove duplicate ORDER BY and DISTINCT if it's possible"},
-              {"insert_keeper_max_retries", 0, 20, "Enable reconnections to Keeper on INSERT, improve reliability"}}},
-    {"23.1", {{"input_format_json_read_objects_as_strings", 0, 1, "Enable reading nested json objects as strings while object type is experimental"},
-              {"input_format_json_defaults_for_missing_elements_in_named_tuple", false, true, "Allow missing elements in JSON objects while reading named tuples by default"},
-              {"input_format_csv_detect_header", false, true, "Detect header in CSV format by default"},
-              {"input_format_tsv_detect_header", false, true, "Detect header in TSV format by default"},
-              {"input_format_custom_detect_header", false, true, "Detect header in CustomSeparated format by default"},
-              {"query_plan_remove_redundant_sorting", false, true, "Remove redundant sorting in query plan. For example, sorting steps related to ORDER BY clauses in subqueries"}}},
-    {"22.12", {{"max_size_to_preallocate_for_aggregation", 10'000'000, 100'000'000, "This optimizes performance"},
-               {"query_plan_aggregation_in_order", 0, 1, "Enable some refactoring around query plan"},
-               {"format_binary_max_string_size", 0, 1_GiB, "Prevent allocating large amount of memory"}}},
-    {"22.11", {{"use_structure_from_insertion_table_in_table_functions", 0, 2, "Improve using structure from insertion table in table functions"}}},
-    {"22.9", {{"force_grouping_standard_compatibility", false, true, "Make GROUPING function output the same as in SQL standard and other DBMS"}}},
-    {"22.7", {{"cross_to_inner_join_rewrite", 1, 2, "Force rewrite comma join to inner"},
-              {"enable_positional_arguments", false, true, "Enable positional arguments feature by default"},
-              {"format_csv_allow_single_quotes", true, false, "Most tools don't treat single quote in CSV specially, don't do it by default too"}}},
-    {"22.6", {{"output_format_json_named_tuples_as_objects", false, true, "Allow to serialize named tuples as JSON objects in JSON formats by default"},
-              {"input_format_skip_unknown_fields", false, true, "Optimize reading subset of columns for some input formats"}}},
-    {"22.5", {{"memory_overcommit_ratio_denominator", 0, 1073741824, "Enable memory overcommit feature by default"},
-              {"memory_overcommit_ratio_denominator_for_user", 0, 1073741824, "Enable memory overcommit feature by default"}}},
-    {"22.4", {{"allow_settings_after_format_in_insert", true, false, "Do not allow SETTINGS after FORMAT for INSERT queries because ClickHouse interpret SETTINGS as some values, which is misleading"}}},
-    {"22.3", {{"cast_ipv4_ipv6_default_on_conversion_error", true, false, "Make functions cast(value, 'IPv4') and cast(value, 'IPv6') behave same as toIPv4 and toIPv6 functions"}}},
-    {"21.12", {{"stream_like_engine_allow_direct_select", true, false, "Do not allow direct select for Kafka/RabbitMQ/FileLog by default"}}},
-    {"21.9", {{"output_format_decimal_trailing_zeros", true, false, "Do not output trailing zeros in text representation of Decimal types by default for better looking output"},
-              {"use_hedged_requests", false, true, "Enable Hedged Requests feature by default"}}},
-    {"21.7", {{"legacy_column_name_of_tuple_literal", true, false, "Add this setting only for compatibility reasons. It makes sense to set to 'true', while doing rolling update of cluster from version lower than 21.7 to higher"}}},
-    {"21.5", {{"async_socket_for_remote", false, true, "Fix all problems and turn on asynchronous reads from socket for remote queries by default again"}}},
-    {"21.3", {{"async_socket_for_remote", true, false, "Turn off asynchronous reads from socket for remote queries because of some problems"},
-              {"optimize_normalize_count_variants", false, true, "Rewrite aggregate functions that semantically equals to count() as count() by default"},
-              {"normalize_function_names", false, true, "Normalize function names to their canonical names, this was needed for projection query routing"}}},
-    {"21.2", {{"enable_global_with_statement", false, true, "Propagate WITH statements to UNION queries and all subqueries by default"}}},
-    {"21.1", {{"insert_quorum_parallel", false, true, "Use parallel quorum inserts by default. It is significantly more convenient to use than sequential quorum inserts"},
-              {"input_format_null_as_default", false, true, "Allow to insert NULL as default for input formats by default"},
-              {"optimize_on_insert", false, true, "Enable data optimization on INSERT by default for better user experience"},
-              {"use_compact_format_in_distributed_parts_names", false, true, "Use compact format for async INSERT into Distributed tables by default"}}},
-    {"20.10", {{"format_regexp_escaping_rule", "Escaped", "Raw", "Use Raw as default escaping rule for Regexp format to male the behaviour more like to what users expect"}}},
-    {"20.7", {{"show_table_uuid_in_table_create_query_if_not_nil", true, false, "Stop showing  UID of the table in its CREATE query for Engine=Atomic"}}},
-    {"20.5", {{"input_format_with_names_use_header", false, true, "Enable using header with names for formats with WithNames/WithNamesAndTypes suffixes"},
-              {"allow_suspicious_codecs", true, false, "Don't allow to specify meaningless compression codecs"}}},
-    {"20.4", {{"validate_polygons", false, true, "Throw exception if polygon is invalid in function pointInPolygon by default instead of returning possibly wrong results"}}},
-    {"19.18", {{"enable_scalar_subquery_optimization", false, true, "Prevent scalar subqueries from (de)serializing large scalar values and possibly avoid running the same subquery more than once"}}},
-    {"19.14", {{"any_join_distinct_right_table_keys", true, false, "Disable ANY RIGHT and ANY FULL JOINs by default to avoid inconsistency"}}},
-    {"19.12", {{"input_format_defaults_for_omitted_fields", false, true, "Enable calculation of complex default expressions for omitted fields for some input formats, because it should be the expected behaviour"}}},
-    {"19.5", {{"max_partitions_per_insert_block", 0, 100, "Add a limit for the number of partitions in one block"}}},
-    {"18.12.17", {{"enable_optimize_predicate_expression", 0, 1, "Optimize predicates to subqueries by default"}}},
 };
 
 

From 4768e3878552ae0ce9007c1e4f400943a5712825 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= <git@rmr.ninja>
Date: Thu, 1 Aug 2024 11:37:42 +0200
Subject: [PATCH 130/139] Update ref to 24.7.2

---
 ...{02995_baseline_24_7_1.tsv => 02995_baseline_24_7_2.tsv} | 2 +-
 tests/queries/0_stateless/02995_new_settings_history.sh     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename tests/queries/0_stateless/{02995_baseline_24_7_1.tsv => 02995_baseline_24_7_2.tsv} (99%)

diff --git a/tests/queries/0_stateless/02995_baseline_24_7_1.tsv b/tests/queries/0_stateless/02995_baseline_24_7_2.tsv
similarity index 99%
rename from tests/queries/0_stateless/02995_baseline_24_7_1.tsv
rename to tests/queries/0_stateless/02995_baseline_24_7_2.tsv
index 6c830da8646..10b392f3e04 100644
--- a/tests/queries/0_stateless/02995_baseline_24_7_1.tsv
+++ b/tests/queries/0_stateless/02995_baseline_24_7_2.tsv
@@ -462,7 +462,7 @@ input_format_orc_allow_missing_columns	1
 input_format_orc_case_insensitive_column_matching	0
 input_format_orc_filter_push_down	1
 input_format_orc_import_nested	0
-input_format_orc_read_use_writer_time_zone	0
+input_format_orc_reader_time_zone_name	GMT
 input_format_orc_row_batch_size	100000
 input_format_orc_skip_columns_with_unsupported_types_in_schema_inference	0
 input_format_orc_use_fast_decoder	1
diff --git a/tests/queries/0_stateless/02995_new_settings_history.sh b/tests/queries/0_stateless/02995_new_settings_history.sh
index 917dacc04b0..7fb21f88fae 100755
--- a/tests/queries/0_stateless/02995_new_settings_history.sh
+++ b/tests/queries/0_stateless/02995_new_settings_history.sh
@@ -7,12 +7,12 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CUR_DIR"/../shell_config.sh
 
 # Note that this is a broad check. A per version check is done in the upgrade test
-# Baseline generated with 24.7.1
-# clickhouse local --query "select name, default from system.settings order by name format TSV" > 02995_baseline_24_7_1.tsv
+# Baseline generated with 24.7.2
+# clickhouse local --query "select name, default from system.settings order by name format TSV" > 02995_baseline_24_7_2.tsv
 $CLICKHOUSE_LOCAL --query "
     WITH old_settings AS
     (
-        SELECT * FROM file('${CUR_DIR}/02995_baseline_24_7_1.tsv', 'TSV', 'name String, default String')
+        SELECT * FROM file('${CUR_DIR}/02995_baseline_24_7_2.tsv', 'TSV', 'name String, default String')
     ),
     new_settings AS
     (

From da3a37c561679daaecbcdece74f92ce98380b2b5 Mon Sep 17 00:00:00 2001
From: Pablo Marcos <pablo.marcos.oltra@clickhouse.com>
Date: Thu, 1 Aug 2024 09:38:27 +0000
Subject: [PATCH 131/139] Improve regex to take into account the xdist name in
 the instance

---
 .../test.py                                   | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/integration/test_zookeeper_config_load_balancing/test.py b/tests/integration/test_zookeeper_config_load_balancing/test.py
index 9cdf7db2b08..cc0a9022674 100644
--- a/tests/integration/test_zookeeper_config_load_balancing/test.py
+++ b/tests/integration/test_zookeeper_config_load_balancing/test.py
@@ -71,7 +71,7 @@ def test_first_or_random(started_cluster):
                     [
                         "bash",
                         "-c",
-                        "lsof -a -i4 -i6 -itcp -w | grep 'testzookeeperconfigloadbalancing_zoo1_1.*testzookeeperconfigloadbalancing_default:2181' | grep ESTABLISHED | wc -l",
+                        "lsof -a -i4 -i6 -itcp -w | grep -P 'testzookeeperconfigloadbalancing_(gw\\d+_)?zoo1_1.*testzookeeperconfigloadbalancing_(gw\\d+_)?default:2181' | grep ESTABLISHED | wc -l",
                     ],
                     privileged=True,
                     user="root",
@@ -99,7 +99,7 @@ def test_first_or_random(started_cluster):
                     [
                         "bash",
                         "-c",
-                        "lsof -a -i4 -i6 -itcp -w | grep 'testzookeeperconfigloadbalancing_zoo1_1.*testzookeeperconfigloadbalancing_default:2181' | grep ESTABLISHED | wc -l",
+                        "lsof -a -i4 -i6 -itcp -w | grep -P 'testzookeeperconfigloadbalancing_(gw\\d+_)?zoo1_1.*testzookeeperconfigloadbalancing_(gw\\d+_)?default:2181' | grep ESTABLISHED | wc -l",
                     ],
                     privileged=True,
                     user="root",
@@ -127,7 +127,7 @@ def test_first_or_random(started_cluster):
                     [
                         "bash",
                         "-c",
-                        "lsof -a -i4 -i6 -itcp -w | grep 'testzookeeperconfigloadbalancing_zoo1_1.*testzookeeperconfigloadbalancing_default:2181' | grep ESTABLISHED | wc -l",
+                        "lsof -a -i4 -i6 -itcp -w | grep -P 'testzookeeperconfigloadbalancing_(gw\\d+_)?zoo1_1.*testzookeeperconfigloadbalancing_(gw\\d+_)?default:2181' | grep ESTABLISHED | wc -l",
                     ],
                     privileged=True,
                     user="root",
@@ -161,7 +161,7 @@ def test_in_order(started_cluster):
                     [
                         "bash",
                         "-c",
-                        "lsof -a -i4 -i6 -itcp -w | grep 'testzookeeperconfigloadbalancing_zoo1_1.*testzookeeperconfigloadbalancing_default:2181' | grep ESTABLISHED | wc -l",
+                        "lsof -a -i4 -i6 -itcp -w | grep -P 'testzookeeperconfigloadbalancing_(gw\\d+_)?zoo1_1.*testzookeeperconfigloadbalancing_(gw\\d+_)?default:2181' | grep ESTABLISHED | wc -l",
                     ],
                     privileged=True,
                     user="root",
@@ -189,7 +189,7 @@ def test_in_order(started_cluster):
                     [
                         "bash",
                         "-c",
-                        "lsof -a -i4 -i6 -itcp -w | grep 'testzookeeperconfigloadbalancing_zoo1_1.*testzookeeperconfigloadbalancing_default:2181' | grep ESTABLISHED | wc -l",
+                        "lsof -a -i4 -i6 -itcp -w | grep -P 'testzookeeperconfigloadbalancing_(gw\\d+_)?zoo1_1.*testzookeeperconfigloadbalancing_(gw\\d+_)?default:2181' | grep ESTABLISHED | wc -l",
                     ],
                     privileged=True,
                     user="root",
@@ -217,7 +217,7 @@ def test_in_order(started_cluster):
                     [
                         "bash",
                         "-c",
-                        "lsof -a -i4 -i6 -itcp -w | grep 'testzookeeperconfigloadbalancing_zoo1_1.*testzookeeperconfigloadbalancing_default:2181' | grep ESTABLISHED | wc -l",
+                        "lsof -a -i4 -i6 -itcp -w | grep -P 'testzookeeperconfigloadbalancing_(gw\\d+_)?zoo1_1.*testzookeeperconfigloadbalancing_(gw\\d+_)?default:2181' | grep ESTABLISHED | wc -l",
                     ],
                     privileged=True,
                     user="root",
@@ -251,7 +251,7 @@ def test_nearest_hostname(started_cluster):
                     [
                         "bash",
                         "-c",
-                        "lsof -a -i4 -i6 -itcp -w | grep 'testzookeeperconfigloadbalancing_zoo1_1.*testzookeeperconfigloadbalancing_default:2181' | grep ESTABLISHED | wc -l",
+                        "lsof -a -i4 -i6 -itcp -w | grep -P 'testzookeeperconfigloadbalancing_(gw\\d+_)?zoo1_1.*testzookeeperconfigloadbalancing_(gw\\d+_)?default:2181' | grep ESTABLISHED | wc -l",
                     ],
                     privileged=True,
                     user="root",
@@ -279,7 +279,7 @@ def test_nearest_hostname(started_cluster):
                     [
                         "bash",
                         "-c",
-                        "lsof -a -i4 -i6 -itcp -w | grep 'testzookeeperconfigloadbalancing_zoo2_1.*testzookeeperconfigloadbalancing_default:2181' | grep ESTABLISHED | wc -l",
+                        "lsof -a -i4 -i6 -itcp -w | grep -P 'testzookeeperconfigloadbalancing_(gw\\d+_)?zoo2_1.*testzookeeperconfigloadbalancing_(gw\\d+_)?default:2181' | grep ESTABLISHED | wc -l",
                     ],
                     privileged=True,
                     user="root",
@@ -307,7 +307,7 @@ def test_nearest_hostname(started_cluster):
                     [
                         "bash",
                         "-c",
-                        "lsof -a -i4 -i6 -itcp -w | grep 'testzookeeperconfigloadbalancing_zoo3_1.*testzookeeperconfigloadbalancing_default:2181' | grep ESTABLISHED | wc -l",
+                        "lsof -a -i4 -i6 -itcp -w | grep -P 'testzookeeperconfigloadbalancing_(gw\\d+_)?zoo3_1.*testzookeeperconfigloadbalancing_(gw\\d+_)?default:2181' | grep ESTABLISHED | wc -l",
                     ],
                     privileged=True,
                     user="root",
@@ -341,7 +341,7 @@ def test_hostname_levenshtein_distance(started_cluster):
                     [
                         "bash",
                         "-c",
-                        "lsof -a -i4 -i6 -itcp -w | grep 'testzookeeperconfigloadbalancing_zoo1_1.*testzookeeperconfigloadbalancing_default:2181' | grep ESTABLISHED | wc -l",
+                        "lsof -a -i4 -i6 -itcp -w | grep -P 'testzookeeperconfigloadbalancing_(gw\\d+_)?zoo1_1.*testzookeeperconfigloadbalancing_(gw\\d+_)?default:2181' | grep ESTABLISHED | wc -l",
                     ],
                     privileged=True,
                     user="root",
@@ -369,7 +369,7 @@ def test_hostname_levenshtein_distance(started_cluster):
                     [
                         "bash",
                         "-c",
-                        "lsof -a -i4 -i6 -itcp -w | grep 'testzookeeperconfigloadbalancing_zoo2_1.*testzookeeperconfigloadbalancing_default:2181' | grep ESTABLISHED | wc -l",
+                        "lsof -a -i4 -i6 -itcp -w | grep -P 'testzookeeperconfigloadbalancing_(gw\\d+_)?zoo2_1.*testzookeeperconfigloadbalancing_(gw\\d+_)?default:2181' | grep ESTABLISHED | wc -l",
                     ],
                     privileged=True,
                     user="root",
@@ -397,7 +397,7 @@ def test_hostname_levenshtein_distance(started_cluster):
                     [
                         "bash",
                         "-c",
-                        "lsof -a -i4 -i6 -itcp -w | grep 'testzookeeperconfigloadbalancing_zoo3_1.*testzookeeperconfigloadbalancing_default:2181' | grep ESTABLISHED | wc -l",
+                        "lsof -a -i4 -i6 -itcp -w | grep -P 'testzookeeperconfigloadbalancing_(gw\\d+_)?zoo3_1.*testzookeeperconfigloadbalancing_(gw\\d+_)?default:2181' | grep ESTABLISHED | wc -l",
                     ],
                     privileged=True,
                     user="root",

From c77f6d78d976430faf4353e350d0205bbecf2837 Mon Sep 17 00:00:00 2001
From: Antonio Andelic <antonio@clickhouse.com>
Date: Thu, 1 Aug 2024 12:09:58 +0200
Subject: [PATCH 132/139] Update minio

---
 tests/integration/compose/docker_compose_minio.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/integration/compose/docker_compose_minio.yml b/tests/integration/compose/docker_compose_minio.yml
index 4255a529f6d..40098d05b04 100644
--- a/tests/integration/compose/docker_compose_minio.yml
+++ b/tests/integration/compose/docker_compose_minio.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   minio1:
-    image: minio/minio:RELEASE.2023-09-30T07-02-29Z
+    image: minio/minio:RELEASE.2024-07-31T05-46-26Z
     volumes:
       - data1-1:/data1
       - ${MINIO_CERTS_DIR:-}:/certs

From 70228acd7e809230582883a0b6b70c4cd9c04daa Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@clickhouse.com>
Date: Thu, 1 Aug 2024 15:02:29 +0200
Subject: [PATCH 133/139] Update CHANGELOG.md

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4c873ba3f9..5cd4200d9ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,7 +22,6 @@
 
 #### New Feature
 * Add `ASOF JOIN` support for `full_sorting_join` algorithm. [#55051](https://github.com/ClickHouse/ClickHouse/pull/55051) ([vdimir](https://github.com/vdimir)).
-* Add new window function `percent_rank`. [#62747](https://github.com/ClickHouse/ClickHouse/pull/62747) ([lgbo](https://github.com/lgbo-ustc)).
 * Support JWT authentication in `clickhouse-client` (will be available only in ClickHouse Cloud). [#62829](https://github.com/ClickHouse/ClickHouse/pull/62829) ([Konstantin Bogdanov](https://github.com/thevar1able)).
 * Add SQL functions `changeYear`, `changeMonth`, `changeDay`, `changeHour`, `changeMinute`, `changeSecond`. For example, `SELECT changeMonth(toDate('2024-06-14'), 7)` returns date `2024-07-14`. [#63186](https://github.com/ClickHouse/ClickHouse/pull/63186) ([cucumber95](https://github.com/cucumber95)).
 * Introduce startup scripts, which allow the execution of preconfigured queries at the startup stage. [#64889](https://github.com/ClickHouse/ClickHouse/pull/64889) ([pufit](https://github.com/pufit)).

From 0913f0189ba350236d32d774265770b654860a80 Mon Sep 17 00:00:00 2001
From: Alex Katsman <alex.katsman@clickhouse.com>
Date: Wed, 31 Jul 2024 09:06:30 +0000
Subject: [PATCH 134/139] Don't count a search query as a search pattern match

---
 tests/integration/helpers/cluster.py              | 10 +++++++---
 .../integration/test_mask_sensitive_info/test.py  | 15 +++++++--------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/tests/integration/helpers/cluster.py b/tests/integration/helpers/cluster.py
index 90b28a4cda3..6bc0ece63ca 100644
--- a/tests/integration/helpers/cluster.py
+++ b/tests/integration/helpers/cluster.py
@@ -3922,7 +3922,11 @@ class ClickHouseInstance:
         )
 
     def contains_in_log(
-        self, substring, from_host=False, filename="clickhouse-server.log"
+        self,
+        substring,
+        from_host=False,
+        filename="clickhouse-server.log",
+        exclusion_substring="",
     ):
         if from_host:
             # We check fist file exists but want to look for all rotated logs as well
@@ -3930,7 +3934,7 @@ class ClickHouseInstance:
                 [
                     "bash",
                     "-c",
-                    f'[ -f {self.logs_dir}/{filename} ] && zgrep -aH "{substring}" {self.logs_dir}/{filename}* || true',
+                    f'[ -f {self.logs_dir}/{filename} ] && zgrep -aH "{substring}" {self.logs_dir}/{filename}* | ( [ -z "{exclusion_substring}" ] && cat || grep -v "${exclusion_substring}" ) || true',
                 ]
             )
         else:
@@ -3938,7 +3942,7 @@ class ClickHouseInstance:
                 [
                     "bash",
                     "-c",
-                    f'[ -f /var/log/clickhouse-server/{filename} ] && zgrep -aH "{substring}" /var/log/clickhouse-server/{filename} || true',
+                    f'[ -f /var/log/clickhouse-server/{filename} ] && zgrep -aH "{substring}" /var/log/clickhouse-server/{filename} | ( [ -z "{exclusion_substring}" ] && cat || grep -v "${exclusion_substring}" ) || true',
                 ]
             )
         return len(result) > 0
diff --git a/tests/integration/test_mask_sensitive_info/test.py b/tests/integration/test_mask_sensitive_info/test.py
index 902d3800324..6f6dc4d287f 100644
--- a/tests/integration/test_mask_sensitive_info/test.py
+++ b/tests/integration/test_mask_sensitive_info/test.py
@@ -13,6 +13,7 @@ node = cluster.add_instance(
     with_zookeeper=True,
     with_azurite=True,
 )
+base_search_query = "SELECT COUNT() FROM system.query_log WHERE query LIKE "
 
 
 @pytest.fixture(scope="module", autouse=True)
@@ -35,7 +36,7 @@ def check_logs(must_contain=[], must_not_contain=[]):
             .replace("]", "\\]")
             .replace("*", "\\*")
         )
-        assert node.contains_in_log(escaped_str)
+        assert node.contains_in_log(escaped_str, exclusion_substring=base_search_query)
 
     for str in must_not_contain:
         escaped_str = (
@@ -44,7 +45,9 @@ def check_logs(must_contain=[], must_not_contain=[]):
             .replace("]", "\\]")
             .replace("*", "\\*")
         )
-        assert not node.contains_in_log(escaped_str)
+        assert not node.contains_in_log(
+            escaped_str, exclusion_substring=base_search_query
+        )
 
     for str in must_contain:
         escaped_str = str.replace("'", "\\'")
@@ -60,7 +63,7 @@ def system_query_log_contains_search_pattern(search_pattern):
     return (
         int(
             node.query(
-                f"SELECT COUNT() FROM system.query_log WHERE query LIKE '%{search_pattern}%'"
+                f"{base_search_query}'%{search_pattern}%' AND query NOT LIKE '{base_search_query}%'"
             ).strip()
         )
         >= 1
@@ -105,7 +108,6 @@ def test_create_alter_user():
         must_not_contain=[
             password,
             "IDENTIFIED BY",
-            "IDENTIFIED BY",
             "IDENTIFIED WITH plaintext_password BY",
         ],
     )
@@ -366,10 +368,7 @@ def test_table_functions():
         f"remoteSecure(named_collection_6, addresses_expr = '127.{{2..11}}', database = 'default', table = 'remote_table', user = 'remote_user', password = '{password}')",
         f"s3('http://minio1:9001/root/data/test9.csv.gz', 'NOSIGN', 'CSV')",
         f"s3('http://minio1:9001/root/data/test10.csv.gz', 'minio', '{password}')",
-        (
-            f"deltaLake('http://minio1:9001/root/data/test11.csv.gz', 'minio', '{password}')",
-            "DNS_ERROR",
-        ),
+        f"deltaLake('http://minio1:9001/root/data/test11.csv.gz', 'minio', '{password}')",
         f"azureBlobStorage('{azure_conn_string}', 'cont', 'test_simple.csv', 'CSV')",
         f"azureBlobStorage('{azure_conn_string}', 'cont', 'test_simple_1.csv', 'CSV', 'none')",
         f"azureBlobStorage('{azure_conn_string}', 'cont', 'test_simple_2.csv', 'CSV', 'none', 'auto')",

From 048fbacc40062b05510916134c9d9525e7fab63a Mon Sep 17 00:00:00 2001
From: Tyler Hannan <tyler@clickhouse.com>
Date: Thu, 1 Aug 2024 16:48:19 +0200
Subject: [PATCH 135/139] Update README.md

---
 README.md | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 98f9108f14c..2120a4d1211 100644
--- a/README.md
+++ b/README.md
@@ -34,17 +34,13 @@ curl https://clickhouse.com/ | sh
 
 Every month we get together with the community (users, contributors, customers, those interested in learning more about ClickHouse) to discuss what is coming in the latest release. If you are interested in sharing what you've built on ClickHouse, let us know.
 
-* [v24.7 Community Call](https://clickhouse.com/company/events/v24-7-community-release-call) - Jul 30
+* [v24.8 Community Call](https://clickhouse.com/company/events/v24-8-community-release-call) - August 29
 
 ## Upcoming Events
 
 Keep an eye out for upcoming meetups and events around the world. Somewhere else you want us to be? Please feel free to reach out to tyler `<at>` clickhouse `<dot>` com. You can also peruse [ClickHouse Events](https://clickhouse.com/company/news-events) for a list of all upcoming trainings, meetups, speaking engagements, etc.
 
-* [ClickHouse Meetup in Paris](https://www.meetup.com/clickhouse-france-user-group/events/300783448/) - Jul 9
-* [ClickHouse Cloud - Live Update Call](https://clickhouse.com/company/events/202407-cloud-update-live) - Jul 9
-* [ClickHouse Meetup @ Ramp - New York City](https://www.meetup.com/clickhouse-new-york-user-group/events/300595845/) - Jul 9
-* [AWS Summit in New York](https://clickhouse.com/company/events/2024-07-awssummit-nyc) - Jul 10
-* [ClickHouse Meetup @ Klaviyo - Boston](https://www.meetup.com/clickhouse-boston-user-group/events/300907870) - Jul 11
+* MORE COMING SOON!
 
 ## Recent Recordings
 * **Recent Meetup Videos**: [Meetup Playlist](https://www.youtube.com/playlist?list=PL0Z2YDlm0b3iNDUzpY1S3L_iV4nARda_U) Whenever possible recordings of the ClickHouse Community Meetups are edited and presented as individual talks. Current featuring "Modern SQL in 2023", "Fast, Concurrent, and Consistent Asynchronous INSERTS in ClickHouse", and "Full-Text Indices: Design and Experiments"

From 1e8d0d4a5e8d83a1d123a4b5b6c5a91b41caac1c Mon Sep 17 00:00:00 2001
From: Julia Kartseva <yulia.kartseva@gmail.com>
Date: Wed, 31 Jul 2024 06:09:14 +0000
Subject: [PATCH 136/139] disable parallel run for
 network_receive_time_metric_insert

If run in parallel, several tests may affect the
value of the `NetworkReceiveElapsedMicroseconds` profile event.
This may contribute to test flakiness.
---
 .../0_stateless/01923_network_receive_time_metric_insert.sh    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/queries/0_stateless/01923_network_receive_time_metric_insert.sh b/tests/queries/0_stateless/01923_network_receive_time_metric_insert.sh
index 97835d97965..77b909ed89e 100755
--- a/tests/queries/0_stateless/01923_network_receive_time_metric_insert.sh
+++ b/tests/queries/0_stateless/01923_network_receive_time_metric_insert.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
-# Tags: no-fasttest
+# Tags: no-fasttest, no-parallel
 # Tag no-fasttest: needs pv
+# Tag no-parallel: reads from a system table
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh

From 4709222dd1f3a37c5f97e638526c21ade6b5218f Mon Sep 17 00:00:00 2001
From: Julia Kartseva <yulia.kartseva@gmail.com>
Date: Wed, 31 Jul 2024 23:16:43 +0000
Subject: [PATCH 137/139] print debug info if the test fails

---
 ...1923_network_receive_time_metric_insert.sh | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/tests/queries/0_stateless/01923_network_receive_time_metric_insert.sh b/tests/queries/0_stateless/01923_network_receive_time_metric_insert.sh
index 77b909ed89e..adf4fd96a00 100755
--- a/tests/queries/0_stateless/01923_network_receive_time_metric_insert.sh
+++ b/tests/queries/0_stateless/01923_network_receive_time_metric_insert.sh
@@ -13,9 +13,23 @@ ${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS t; CREATE TABLE t (x UInt64)
 seq 1 1000 | pv --quiet --rate-limit 400 | ${CLICKHOUSE_CLIENT} --query "INSERT INTO t FORMAT TSV"
 
 # We check that the value of NetworkReceiveElapsedMicroseconds correctly includes the time spent waiting data from the client.
-${CLICKHOUSE_CLIENT} --query "SYSTEM FLUSH LOGS;
-    WITH ProfileEvents['NetworkReceiveElapsedMicroseconds'] AS time
-    SELECT time >= 1000000 ? 1 : time FROM system.query_log
-        WHERE current_database = currentDatabase() AND query_kind = 'Insert' AND event_date >= yesterday() AND type = 2 ORDER BY event_time DESC LIMIT 1;"
+result=$(${CLICKHOUSE_CLIENT} --query "SYSTEM FLUSH LOGS;
+    WITH ProfileEvents['NetworkReceiveElapsedMicroseconds'] AS elapsed_us
+    SELECT elapsed_us FROM system.query_log
+    WHERE current_database = currentDatabase() AND query_kind = 'Insert' AND event_date >= yesterday() AND type = 'QueryFinish'
+    ORDER BY event_time DESC LIMIT 1;")
+
+elapsed_us=$(echo $result | sed 's/ .*//')
+
+min_elapsed_us=1000000
+if [[ "$elapsed_us" -ge "$min_elapsed_us" ]]; then
+    echo 1
+else
+    # Print debug info
+    ${CLICKHOUSE_CLIENT} --query "
+    WITH ProfileEvents['NetworkReceiveElapsedMicroseconds'] AS elapsed_us
+    SELECT query_start_time_microseconds, event_time_microseconds, query_duration_ms, elapsed_us, query FROM system.query_log
+    WHERE current_database = currentDatabase() and event_date >= yesterday() AND type = 'QueryFinish' ORDER BY query_start_time;"
+fi
 
 ${CLICKHOUSE_CLIENT} --query "DROP TABLE t"

From 797144270b3e20e9e4306949bde95c9a9a32c5e0 Mon Sep 17 00:00:00 2001
From: robot-clickhouse <robot-clickhouse@users.noreply.github.com>
Date: Fri, 2 Aug 2024 07:09:39 +0000
Subject: [PATCH 138/139] Update version_date.tsv and changelogs after
 v24.4.4.113-stable

---
 docs/changelogs/v24.4.4.113-stable.md | 73 +++++++++++++++++++++++++++
 utils/list-versions/version_date.tsv  |  1 +
 2 files changed, 74 insertions(+)
 create mode 100644 docs/changelogs/v24.4.4.113-stable.md

diff --git a/docs/changelogs/v24.4.4.113-stable.md b/docs/changelogs/v24.4.4.113-stable.md
new file mode 100644
index 00000000000..1f8a221a0a2
--- /dev/null
+++ b/docs/changelogs/v24.4.4.113-stable.md
@@ -0,0 +1,73 @@
+---
+sidebar_position: 1
+sidebar_label: 2024
+---
+
+# 2024 Changelog
+
+### ClickHouse release v24.4.4.113-stable (d63a54957bd) FIXME as compared to v24.4.3.25-stable (a915dd4eda4)
+
+#### Improvement
+* Backported in [#65884](https://github.com/ClickHouse/ClickHouse/issues/65884): Always start Keeper with sufficient amount of threads in global thread pool. [#64444](https://github.com/ClickHouse/ClickHouse/pull/64444) ([Duc Canh Le](https://github.com/canhld94)).
+* Backported in [#65303](https://github.com/ClickHouse/ClickHouse/issues/65303): Returned back the behaviour of how ClickHouse works and interprets Tuples in CSV format. This change effectively reverts https://github.com/ClickHouse/ClickHouse/pull/60994 and makes it available only under a few settings: `output_format_csv_serialize_tuple_into_separate_columns`, `input_format_csv_deserialize_separate_columns_into_tuple` and `input_format_csv_try_infer_strings_from_quoted_tuples`. [#65170](https://github.com/ClickHouse/ClickHouse/pull/65170) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Backported in [#65894](https://github.com/ClickHouse/ClickHouse/issues/65894): Respect cgroup CPU limit in Keeper. [#65819](https://github.com/ClickHouse/ClickHouse/pull/65819) ([Antonio Andelic](https://github.com/antonio2368)).
+
+#### Critical Bug Fix (crash, LOGICAL_ERROR, data loss, RBAC)
+* Backported in [#65372](https://github.com/ClickHouse/ClickHouse/issues/65372): Fix a bug in ClickHouse Keeper that causes digest mismatch during closing session. [#65198](https://github.com/ClickHouse/ClickHouse/pull/65198) ([Aleksei Filatov](https://github.com/aalexfvk)).
+* Backported in [#66883](https://github.com/ClickHouse/ClickHouse/issues/66883): Fix unexpeced size of low cardinality column in function calls. [#65298](https://github.com/ClickHouse/ClickHouse/pull/65298) ([Raúl Marín](https://github.com/Algunenano)).
+* Backported in [#65435](https://github.com/ClickHouse/ClickHouse/issues/65435): Forbid `QUALIFY` clause in the old analyzer. The old analyzer ignored `QUALIFY`, so it could lead to unexpected data removal in mutations. [#65356](https://github.com/ClickHouse/ClickHouse/pull/65356) ([Dmitry Novik](https://github.com/novikd)).
+* Backported in [#65448](https://github.com/ClickHouse/ClickHouse/issues/65448): Use correct memory alignment for Distinct combinator. Previously, crash could happen because of invalid memory allocation when the combinator was used. [#65379](https://github.com/ClickHouse/ClickHouse/pull/65379) ([Antonio Andelic](https://github.com/antonio2368)).
+* Backported in [#65710](https://github.com/ClickHouse/ClickHouse/issues/65710): Fix crash in maxIntersections. [#65689](https://github.com/ClickHouse/ClickHouse/pull/65689) ([Raúl Marín](https://github.com/Algunenano)).
+* Backported in [#66689](https://github.com/ClickHouse/ClickHouse/issues/66689): Fix the VALID UNTIL clause in the user definition resetting after a restart. Closes [#66405](https://github.com/ClickHouse/ClickHouse/issues/66405). [#66409](https://github.com/ClickHouse/ClickHouse/pull/66409) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Backported in [#67499](https://github.com/ClickHouse/ClickHouse/issues/67499): Fix crash in DistributedAsyncInsert when connection is empty. [#67219](https://github.com/ClickHouse/ClickHouse/pull/67219) ([Pablo Marcos](https://github.com/pamarcos)).
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+* Backported in [#65353](https://github.com/ClickHouse/ClickHouse/issues/65353): Fix possible abort on uncaught exception in ~WriteBufferFromFileDescriptor in StatusFile. [#64206](https://github.com/ClickHouse/ClickHouse/pull/64206) ([Kruglov Pavel](https://github.com/Avogar)).
+* Backported in [#65060](https://github.com/ClickHouse/ClickHouse/issues/65060): Fix the `Expression nodes list expected 1 projection names` and `Unknown expression or identifier` errors for queries with aliases to `GLOBAL IN.`. [#64517](https://github.com/ClickHouse/ClickHouse/pull/64517) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Backported in [#65329](https://github.com/ClickHouse/ClickHouse/issues/65329): Fix the crash loop when restoring from backup is blocked by creating an MV with a definer that hasn't been restored yet. [#64595](https://github.com/ClickHouse/ClickHouse/pull/64595) ([pufit](https://github.com/pufit)).
+* Backported in [#64833](https://github.com/ClickHouse/ClickHouse/issues/64833): Fix bug which could lead to non-working TTLs with expressions. [#64694](https://github.com/ClickHouse/ClickHouse/pull/64694) ([alesapin](https://github.com/alesapin)).
+* Backported in [#65086](https://github.com/ClickHouse/ClickHouse/issues/65086): Fix removing the `WHERE` and `PREWHERE` expressions, which are always true (for the new analyzer). [#64695](https://github.com/ClickHouse/ClickHouse/pull/64695) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Backported in [#65540](https://github.com/ClickHouse/ClickHouse/issues/65540): Fix crash for `ALTER TABLE ... ON CLUSTER ... MODIFY SQL SECURITY`. [#64957](https://github.com/ClickHouse/ClickHouse/pull/64957) ([pufit](https://github.com/pufit)).
+* Backported in [#65578](https://github.com/ClickHouse/ClickHouse/issues/65578): Fix crash on destroying AccessControl: add explicit shutdown. [#64993](https://github.com/ClickHouse/ClickHouse/pull/64993) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Backported in [#65161](https://github.com/ClickHouse/ClickHouse/issues/65161): Fix pushing arithmetic operations out of aggregation. In the new analyzer, optimization was applied only once. [#65104](https://github.com/ClickHouse/ClickHouse/pull/65104) ([Dmitry Novik](https://github.com/novikd)).
+* Backported in [#65616](https://github.com/ClickHouse/ClickHouse/issues/65616): Fix aggregate function name rewriting in the new analyzer. [#65110](https://github.com/ClickHouse/ClickHouse/pull/65110) ([Dmitry Novik](https://github.com/novikd)).
+* Backported in [#65730](https://github.com/ClickHouse/ClickHouse/issues/65730): Eliminate injective function in argument of functions `uniq*` recursively. This used to work correctly but was broken in the new analyzer. [#65140](https://github.com/ClickHouse/ClickHouse/pull/65140) ([Duc Canh Le](https://github.com/canhld94)).
+* Backported in [#65668](https://github.com/ClickHouse/ClickHouse/issues/65668): Disable `non-intersecting-parts` optimization for queries with `FINAL` in case of `read-in-order` optimization was enabled. This could lead to an incorrect query result. As a workaround, disable `do_not_merge_across_partitions_select_final` and `split_parts_ranges_into_intersecting_and_non_intersecting_final` before this fix is merged. [#65505](https://github.com/ClickHouse/ClickHouse/pull/65505) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Backported in [#65786](https://github.com/ClickHouse/ClickHouse/issues/65786): Fixed bug in MergeJoin. Column in sparse serialisation might be treated as a column of its nested type though the required conversion wasn't performed. [#65632](https://github.com/ClickHouse/ClickHouse/pull/65632) ([Nikita Taranov](https://github.com/nickitat)).
+* Backported in [#65810](https://github.com/ClickHouse/ClickHouse/issues/65810): Fix invalid exceptions in function `parseDateTime` with `%F` and `%D` placeholders. [#65768](https://github.com/ClickHouse/ClickHouse/pull/65768) ([Antonio Andelic](https://github.com/antonio2368)).
+* Backported in [#65931](https://github.com/ClickHouse/ClickHouse/issues/65931): For queries that read from `PostgreSQL`, cancel the internal `PostgreSQL` query if the ClickHouse query is finished. Otherwise, `ClickHouse` query cannot be canceled until the internal `PostgreSQL` query is finished. [#65771](https://github.com/ClickHouse/ClickHouse/pull/65771) ([Maksim Kita](https://github.com/kitaisreal)).
+* Backported in [#65826](https://github.com/ClickHouse/ClickHouse/issues/65826): Fix a bug in short circuit logic when old analyzer and dictGetOrDefault is used. [#65802](https://github.com/ClickHouse/ClickHouse/pull/65802) ([jsc0218](https://github.com/jsc0218)).
+* Backported in [#66299](https://github.com/ClickHouse/ClickHouse/issues/66299): Better handling of join conditions involving `IS NULL` checks (for example `ON (a = b AND (a IS NOT NULL) AND (b IS NOT NULL) ) OR ( (a IS NULL) AND (b IS NULL) )` is rewritten to `ON a <=> b`), fix incorrect optimization when condition other then `IS NULL` are present. [#65835](https://github.com/ClickHouse/ClickHouse/pull/65835) ([vdimir](https://github.com/vdimir)).
+* Backported in [#66326](https://github.com/ClickHouse/ClickHouse/issues/66326): Add missing settings `input_format_csv_skip_first_lines/input_format_tsv_skip_first_lines/input_format_csv_try_infer_numbers_from_strings/input_format_csv_try_infer_strings_from_quoted_tuples` in schema inference cache because they can change the resulting schema. It prevents from incorrect result of schema inference with these settings changed. [#65980](https://github.com/ClickHouse/ClickHouse/pull/65980) ([Kruglov Pavel](https://github.com/Avogar)).
+* Backported in [#66153](https://github.com/ClickHouse/ClickHouse/issues/66153): Fixed buffer overflow bug in `unbin`/`unhex` implementation. [#66106](https://github.com/ClickHouse/ClickHouse/pull/66106) ([Nikita Taranov](https://github.com/nickitat)).
+* Backported in [#66459](https://github.com/ClickHouse/ClickHouse/issues/66459): Fixed a bug in ZooKeeper client: a session could get stuck in unusable state after receiving a hardware error from ZooKeeper. For example, this might happen due to "soft memory limit" in ClickHouse Keeper. [#66140](https://github.com/ClickHouse/ClickHouse/pull/66140) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Backported in [#66224](https://github.com/ClickHouse/ClickHouse/issues/66224): Fix issue in SumIfToCountIfVisitor and signed integers. [#66146](https://github.com/ClickHouse/ClickHouse/pull/66146) ([Raúl Marín](https://github.com/Algunenano)).
+* Backported in [#66267](https://github.com/ClickHouse/ClickHouse/issues/66267): Don't throw `TIMEOUT_EXCEEDED` for `none_only_active` mode of `distributed_ddl_output_mode`. [#66218](https://github.com/ClickHouse/ClickHouse/pull/66218) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Backported in [#66678](https://github.com/ClickHouse/ClickHouse/issues/66678): Fix handling limit for `system.numbers_mt` when no index can be used. [#66231](https://github.com/ClickHouse/ClickHouse/pull/66231) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
+* Backported in [#66603](https://github.com/ClickHouse/ClickHouse/issues/66603): Fixed how the ClickHouse server detects the maximum number of usable CPU cores as specified by cgroups v2 if the server runs in a container such as Docker. In more detail, containers often run their process in the root cgroup which has an empty name. In that case, ClickHouse ignored the CPU limits set by cgroups v2. [#66237](https://github.com/ClickHouse/ClickHouse/pull/66237) ([filimonov](https://github.com/filimonov)).
+* Backported in [#66358](https://github.com/ClickHouse/ClickHouse/issues/66358): Fix the `Not-ready set` error when a subquery with `IN` is used in the constraint. [#66261](https://github.com/ClickHouse/ClickHouse/pull/66261) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Backported in [#66971](https://github.com/ClickHouse/ClickHouse/issues/66971): Fix `Column identifier is already registered` error with `group_by_use_nulls=true` and new analyzer. [#66400](https://github.com/ClickHouse/ClickHouse/pull/66400) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Backported in [#66968](https://github.com/ClickHouse/ClickHouse/issues/66968): Fix `Cannot find column` error for queries with constant expression in `GROUP BY` key and new analyzer enabled. [#66433](https://github.com/ClickHouse/ClickHouse/pull/66433) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Backported in [#66719](https://github.com/ClickHouse/ClickHouse/issues/66719): Correctly track memory for `Allocator::realloc`. [#66548](https://github.com/ClickHouse/ClickHouse/pull/66548) ([Antonio Andelic](https://github.com/antonio2368)).
+* Backported in [#66950](https://github.com/ClickHouse/ClickHouse/issues/66950): Fix an invalid result for queries with `WINDOW`. This could happen when `PARTITION` columns have sparse serialization and window functions are executed in parallel. [#66579](https://github.com/ClickHouse/ClickHouse/pull/66579) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Backported in [#66947](https://github.com/ClickHouse/ClickHouse/issues/66947): Fix `Method getResultType is not supported for QUERY query node` error when scalar subquery was used as the first argument of IN (with new analyzer). [#66655](https://github.com/ClickHouse/ClickHouse/pull/66655) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Backported in [#67631](https://github.com/ClickHouse/ClickHouse/issues/67631): Fix for occasional deadlock in Context::getDDLWorker. [#66843](https://github.com/ClickHouse/ClickHouse/pull/66843) ([Alexander Gololobov](https://github.com/davenger)).
+* Backported in [#67195](https://github.com/ClickHouse/ClickHouse/issues/67195): TRUNCATE DATABASE used to stop replication as if it was a DROP DATABASE query, it's fixed. [#67129](https://github.com/ClickHouse/ClickHouse/pull/67129) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Backported in [#67377](https://github.com/ClickHouse/ClickHouse/issues/67377): Fix error `Cannot convert column because it is non constant in source stream but must be constant in result.` for a query that reads from the `Merge` table over the `Distriburted` table with one shard. [#67146](https://github.com/ClickHouse/ClickHouse/pull/67146) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Backported in [#67240](https://github.com/ClickHouse/ClickHouse/issues/67240): This closes [#67156](https://github.com/ClickHouse/ClickHouse/issues/67156). This closes [#66447](https://github.com/ClickHouse/ClickHouse/issues/66447). The bug was introduced in https://github.com/ClickHouse/ClickHouse/pull/62907. [#67178](https://github.com/ClickHouse/ClickHouse/pull/67178) ([Maksim Kita](https://github.com/kitaisreal)).
+* Backported in [#67574](https://github.com/ClickHouse/ClickHouse/issues/67574): Fix execution of nested short-circuit functions. [#67520](https://github.com/ClickHouse/ClickHouse/pull/67520) ([Kruglov Pavel](https://github.com/Avogar)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Backported in [#65410](https://github.com/ClickHouse/ClickHouse/issues/65410): Re-enable OpenSSL session caching. [#65111](https://github.com/ClickHouse/ClickHouse/pull/65111) ([Robert Schulze](https://github.com/rschu1ze)).
+* Backported in [#65903](https://github.com/ClickHouse/ClickHouse/issues/65903): Fix bug with session closing in Keeper. [#65735](https://github.com/ClickHouse/ClickHouse/pull/65735) ([Antonio Andelic](https://github.com/antonio2368)).
+* Backported in [#66385](https://github.com/ClickHouse/ClickHouse/issues/66385): Disable broken cases from 02911_join_on_nullsafe_optimization. [#66310](https://github.com/ClickHouse/ClickHouse/pull/66310) ([vdimir](https://github.com/vdimir)).
+* Backported in [#66424](https://github.com/ClickHouse/ClickHouse/issues/66424): Ignore subquery for IN in DDLLoadingDependencyVisitor. [#66395](https://github.com/ClickHouse/ClickHouse/pull/66395) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Backported in [#66542](https://github.com/ClickHouse/ClickHouse/issues/66542): Add additional log masking in CI. [#66523](https://github.com/ClickHouse/ClickHouse/pull/66523) ([Raúl Marín](https://github.com/Algunenano)).
+* Backported in [#66857](https://github.com/ClickHouse/ClickHouse/issues/66857): Fix data race in S3::ClientCache. [#66644](https://github.com/ClickHouse/ClickHouse/pull/66644) ([Konstantin Morozov](https://github.com/k-morozov)).
+* Backported in [#66873](https://github.com/ClickHouse/ClickHouse/issues/66873): Support one more case in JOIN ON ... IS NULL. [#66725](https://github.com/ClickHouse/ClickHouse/pull/66725) ([vdimir](https://github.com/vdimir)).
+* Backported in [#67057](https://github.com/ClickHouse/ClickHouse/issues/67057): Increase asio pool size in case the server is tiny. [#66761](https://github.com/ClickHouse/ClickHouse/pull/66761) ([alesapin](https://github.com/alesapin)).
+* Backported in [#66944](https://github.com/ClickHouse/ClickHouse/issues/66944): Small fix in realloc memory tracking. [#66820](https://github.com/ClickHouse/ClickHouse/pull/66820) ([Antonio Andelic](https://github.com/antonio2368)).
+* Backported in [#67250](https://github.com/ClickHouse/ClickHouse/issues/67250): Followup [#66725](https://github.com/ClickHouse/ClickHouse/issues/66725). [#66869](https://github.com/ClickHouse/ClickHouse/pull/66869) ([vdimir](https://github.com/vdimir)).
+* Backported in [#67410](https://github.com/ClickHouse/ClickHouse/issues/67410): CI: Fix build results for release branches. [#67402](https://github.com/ClickHouse/ClickHouse/pull/67402) ([Max K.](https://github.com/maxknv)).
+
diff --git a/utils/list-versions/version_date.tsv b/utils/list-versions/version_date.tsv
index b1391c2d781..7b5dcda82e3 100644
--- a/utils/list-versions/version_date.tsv
+++ b/utils/list-versions/version_date.tsv
@@ -6,6 +6,7 @@ v24.5.4.49-stable	2024-07-01
 v24.5.3.5-stable	2024-06-13
 v24.5.2.34-stable	2024-06-13
 v24.5.1.1763-stable	2024-06-01
+v24.4.4.113-stable	2024-08-02
 v24.4.3.25-stable	2024-06-14
 v24.4.2.141-stable	2024-06-07
 v24.4.1.2088-stable	2024-05-01

From dc65c0aa078cf06357291c0fe68f6c035698320f Mon Sep 17 00:00:00 2001
From: Pablo Marcos <pablo.marcos.oltra@clickhouse.com>
Date: Fri, 2 Aug 2024 07:15:40 +0000
Subject: [PATCH 139/139] Fix doc for parallel test execution

Copy-pasterino strikes again. I forgot to remove the single quote.
With it, pytest thinks the whole argument is a file:

(no name '/ClickHouse/tests/integration/test_storage_s3_queue/test.py::test_max_set_age -- --count 10 -n 5' in any of [<Module test.py>])
---
 tests/integration/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/integration/README.md b/tests/integration/README.md
index a8deb97b526..85146c79b1e 100644
--- a/tests/integration/README.md
+++ b/tests/integration/README.md
@@ -142,7 +142,7 @@ of parallel workers for `pytest-xdist`.
 $ export CLICKHOUSE_TESTS_BASE_CONFIG_DIR=$HOME/ClickHouse/programs/server/
 $ export CLICKHOUSE_TESTS_SERVER_BIN_PATH=$HOME/ClickHouse/programs/clickhouse
 $ export CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH=$HOME/ClickHouse/programs/clickhouse-odbc-bridge
-$ ./runner 'test_storage_s3_queue/test.py::test_max_set_age -- --count 10 -n 5'
+$ ./runner test_storage_s3_queue/test.py::test_max_set_age --count 10 -n 5
 Start tests
 =============================================================================== test session starts ================================================================================
 platform linux -- Python 3.10.12, pytest-7.4.4, pluggy-1.5.0 -- /usr/bin/python3