From eb1cce7b07bae5dcb80868f449db1b4dd7dbeb52 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@clickhouse.com>
Date: Sat, 11 May 2024 03:09:25 +0200
Subject: [PATCH 01/51] Everything should work with Analyzer

---
 .../0_stateless/01487_distributed_in_not_default_db.sql       | 4 ----
 tests/queries/0_stateless/02942_variant_cast.sql              | 1 -
 tests/queries/0_stateless/02944_variant_as_common_type.sql    | 3 ---
 3 files changed, 8 deletions(-)

diff --git a/tests/queries/0_stateless/01487_distributed_in_not_default_db.sql b/tests/queries/0_stateless/01487_distributed_in_not_default_db.sql
index cd027530ac8..ccd2c571290 100644
--- a/tests/queries/0_stateless/01487_distributed_in_not_default_db.sql
+++ b/tests/queries/0_stateless/01487_distributed_in_not_default_db.sql
@@ -25,10 +25,6 @@ CREATE TABLE d AS t ENGINE = Distributed(test_cluster_two_shards_different_datab
 USE test_01487;
 DROP DATABASE test_01487;
 
--- After the default database is dropped QueryAnalysisPass cannot process the following SELECT query.
--- That query is invalid on the initiator node.
-set allow_experimental_analyzer = 0;
-
 SELECT * FROM main_01487.d WHERE value IN (SELECT l.value FROM l) ORDER BY value;
 
 USE main_01487;
diff --git a/tests/queries/0_stateless/02942_variant_cast.sql b/tests/queries/0_stateless/02942_variant_cast.sql
index fc2d1d63657..33587e3e438 100644
--- a/tests/queries/0_stateless/02942_variant_cast.sql
+++ b/tests/queries/0_stateless/02942_variant_cast.sql
@@ -1,5 +1,4 @@
 set allow_experimental_variant_type=1;
-set allow_experimental_analyzer=0; -- It's currently doesn't work with analyzer because of the way it works with constants, but it will be refactored and fixed in future
 
 select NULL::Variant(String, UInt64);
 select 42::UInt64::Variant(String, UInt64);
diff --git a/tests/queries/0_stateless/02944_variant_as_common_type.sql b/tests/queries/0_stateless/02944_variant_as_common_type.sql
index e985cf365dd..b3b86427b06 100644
--- a/tests/queries/0_stateless/02944_variant_as_common_type.sql
+++ b/tests/queries/0_stateless/02944_variant_as_common_type.sql
@@ -1,5 +1,3 @@
-set allow_experimental_analyzer=0; -- The result type for if function with constant is different with analyzer. It wil be fixed after refactoring around constants in analyzer.
-
 set allow_experimental_variant_type=1;
 set use_variant_as_common_type=1;
 
@@ -73,4 +71,3 @@ select toTypeName(res), array([1, 2, 3], [[1, 2, 3]]) as res;
 select toTypeName(res), map('a', 1, 'b', 'str_1') as res;
 select toTypeName(res), map('a', 1, 'b', map('c', 2, 'd', 'str_1')) as res;
 select toTypeName(res), map('a', 1, 'b', [1, 2, 3], 'c', [[4, 5, 6]]) as res;
-

From cae2f023852f3f49c4a0f25e8e11bcb3fe6ed49a Mon Sep 17 00:00:00 2001
From: wudidapaopao <664920313@qq.com>
Date: Fri, 14 Jun 2024 14:39:00 +0800
Subject: [PATCH 02/51] Fix unexpected projection name when query with CTE

---
 src/Analyzer/Resolve/QueryAnalyzer.cpp               |  6 +++++-
 .../02378_analyzer_projection_names.reference        | 12 ++++++++++++
 .../0_stateless/02378_analyzer_projection_names.sql  | 10 ++++++++++
 .../0_stateless/03123_analyzer_dist_join_CTE.sql     |  2 +-
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/Analyzer/Resolve/QueryAnalyzer.cpp b/src/Analyzer/Resolve/QueryAnalyzer.cpp
index 5e5ecaaa93a..dc35462a4b0 100644
--- a/src/Analyzer/Resolve/QueryAnalyzer.cpp
+++ b/src/Analyzer/Resolve/QueryAnalyzer.cpp
@@ -1484,7 +1484,11 @@ void QueryAnalyzer::qualifyColumnNodesWithProjectionNames(const QueryTreeNodes &
     /// Build additional column qualification parts array
     std::vector<std::string> additional_column_qualification_parts;
 
-    if (table_expression_node->hasAlias())
+    auto * query_node = table_expression_node->as<QueryNode>();
+    auto * union_node = table_expression_node->as<UnionNode>();
+    bool is_cte = (query_node && query_node->isCTE()) || (union_node && union_node->isCTE());
+
+    if (!is_cte && table_expression_node->hasAlias())
         additional_column_qualification_parts = {table_expression_node->getAlias()};
     else if (auto * table_node = table_expression_node->as<TableNode>())
         additional_column_qualification_parts = {table_node->getStorageID().getDatabaseName(), table_node->getStorageID().getTableName()};
diff --git a/tests/queries/0_stateless/02378_analyzer_projection_names.reference b/tests/queries/0_stateless/02378_analyzer_projection_names.reference
index fd5bc7d4ae8..5860f1deb0d 100644
--- a/tests/queries/0_stateless/02378_analyzer_projection_names.reference
+++ b/tests/queries/0_stateless/02378_analyzer_projection_names.reference
@@ -443,6 +443,18 @@ SELECT '--';
 --
 DESCRIBE (WITH test_table_in_cte AS (SELECT id FROM test_table) SELECT id IN test_table_in_cte FROM test_table);
 in(id, test_table_in_cte)	UInt8					
+SELECT '--';
+--
+DESCRIBE (WITH test_table_in_cte_1 AS (SELECT 1 AS c1), test_table_in_cte_2 AS (SELECT 1 AS c1) SELECT *
+FROM test_table_in_cte_1 INNER JOIN test_table_in_cte_2 as test_table_in_cte_2 ON test_table_in_cte_1.c1 = test_table_in_cte_2.c1);
+c1	UInt8					
+c1	UInt8					
+SELECT '--';
+--
+DESCRIBE (WITH test_table_in_cte_1 AS (SELECT 1 AS c1), test_table_in_cte_2 AS (SELECT 1 AS c1 UNION ALL SELECT 1 AS c1) SELECT *
+FROM test_table_in_cte_1 INNER JOIN test_table_in_cte_2 as test_table_in_cte_2 ON test_table_in_cte_1.c1 = test_table_in_cte_2.c1);
+c1	UInt8					
+c1	UInt8					
 SELECT 'Joins';
 Joins
 DESCRIBE (SELECT * FROM test_table_join_1, test_table_join_2);
diff --git a/tests/queries/0_stateless/02378_analyzer_projection_names.sql b/tests/queries/0_stateless/02378_analyzer_projection_names.sql
index f5ac5f7476f..f41afe6a950 100644
--- a/tests/queries/0_stateless/02378_analyzer_projection_names.sql
+++ b/tests/queries/0_stateless/02378_analyzer_projection_names.sql
@@ -408,6 +408,16 @@ SELECT '--';
 
 DESCRIBE (WITH test_table_in_cte AS (SELECT id FROM test_table) SELECT id IN test_table_in_cte FROM test_table);
 
+SELECT '--';
+
+DESCRIBE (WITH test_table_in_cte_1 AS (SELECT 1 AS c1), test_table_in_cte_2 AS (SELECT 1 AS c1) SELECT *
+FROM test_table_in_cte_1 INNER JOIN test_table_in_cte_2 as test_table_in_cte_2 ON test_table_in_cte_1.c1 = test_table_in_cte_2.c1);
+
+SELECT '--';
+
+DESCRIBE (WITH test_table_in_cte_1 AS (SELECT 1 AS c1), test_table_in_cte_2 AS (SELECT 1 AS c1 UNION ALL SELECT 1 AS c1) SELECT *
+FROM test_table_in_cte_1 INNER JOIN test_table_in_cte_2 as test_table_in_cte_2 ON test_table_in_cte_1.c1 = test_table_in_cte_2.c1);
+
 SELECT 'Joins';
 
 DESCRIBE (SELECT * FROM test_table_join_1, test_table_join_2);
diff --git a/tests/queries/0_stateless/03123_analyzer_dist_join_CTE.sql b/tests/queries/0_stateless/03123_analyzer_dist_join_CTE.sql
index 4fb8e0b91c4..4275f405d13 100644
--- a/tests/queries/0_stateless/03123_analyzer_dist_join_CTE.sql
+++ b/tests/queries/0_stateless/03123_analyzer_dist_join_CTE.sql
@@ -20,7 +20,7 @@ WITH
          SELECT toInt64(number) AS a
          FROM numbers(10)
     )
-SELECT *
+SELECT a.a, b, b.a, c.a
 FROM dist_t0 AS a
 LEFT JOIN b AS b ON a.a = b.a
 LEFT JOIN c AS c ON a.a = c.a

From 409b24b8d8d185e7840bc082fd73afc1b13314d2 Mon Sep 17 00:00:00 2001
From: wudidapaopao <664920313@qq.com>
Date: Tue, 18 Jun 2024 16:22:00 +0800
Subject: [PATCH 03/51] empty commit


From f4c1266975ff1a1aabe71e61ae318d1765931a62 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@clickhouse.com>
Date: Sun, 30 Jun 2024 18:56:05 +0200
Subject: [PATCH 04/51] Remove incorrect test

---
 ...87_distributed_in_not_default_db.reference |  2 -
 .../01487_distributed_in_not_default_db.sql   | 39 -------------------
 2 files changed, 41 deletions(-)
 delete mode 100644 tests/queries/0_stateless/01487_distributed_in_not_default_db.reference
 delete mode 100644 tests/queries/0_stateless/01487_distributed_in_not_default_db.sql

diff --git a/tests/queries/0_stateless/01487_distributed_in_not_default_db.reference b/tests/queries/0_stateless/01487_distributed_in_not_default_db.reference
deleted file mode 100644
index 0d66ea1aee9..00000000000
--- a/tests/queries/0_stateless/01487_distributed_in_not_default_db.reference
+++ /dev/null
@@ -1,2 +0,0 @@
-0
-1
diff --git a/tests/queries/0_stateless/01487_distributed_in_not_default_db.sql b/tests/queries/0_stateless/01487_distributed_in_not_default_db.sql
deleted file mode 100644
index ccd2c571290..00000000000
--- a/tests/queries/0_stateless/01487_distributed_in_not_default_db.sql
+++ /dev/null
@@ -1,39 +0,0 @@
--- Tags: distributed, no-parallel
-
-CREATE DATABASE IF NOT EXISTS shard_0;
-CREATE DATABASE IF NOT EXISTS shard_1;
-CREATE DATABASE IF NOT EXISTS main_01487;
-CREATE DATABASE IF NOT EXISTS test_01487;
-
-USE main_01487;
-
-DROP TABLE IF EXISTS shard_0.l;
-DROP TABLE IF EXISTS shard_1.l;
-DROP TABLE IF EXISTS d;
-DROP TABLE IF EXISTS t;
-
-CREATE TABLE shard_0.l (value UInt8) ENGINE = MergeTree ORDER BY value;
-CREATE TABLE shard_1.l (value UInt8) ENGINE = MergeTree ORDER BY value;
-CREATE TABLE t (value UInt8) ENGINE = Memory;
-
-INSERT INTO shard_0.l VALUES (0);
-INSERT INTO shard_1.l VALUES (1);
-INSERT INTO t VALUES (0), (1), (2);
-
-CREATE TABLE d AS t ENGINE = Distributed(test_cluster_two_shards_different_databases, currentDatabase(), t);
-
-USE test_01487;
-DROP DATABASE test_01487;
-
-SELECT * FROM main_01487.d WHERE value IN (SELECT l.value FROM l) ORDER BY value;
-
-USE main_01487;
-
-DROP TABLE IF EXISTS shard_0.l;
-DROP TABLE IF EXISTS shard_1.l;
-DROP TABLE IF EXISTS d;
-DROP TABLE IF EXISTS t;
-
-DROP DATABASE shard_0;
-DROP DATABASE shard_1;
-DROP DATABASE main_01487;

From 84fb836ecba44b0674f8e4bdbb1626e1aae02ba6 Mon Sep 17 00:00:00 2001
From: Yakov Olkhovskiy <yakov@clickhouse.com>
Date: Tue, 2 Jul 2024 23:27:02 +0000
Subject: [PATCH 05/51] proper qualification for CTE, fix tests

---
 src/Analyzer/Resolve/QueryAnalyzer.cpp                 | 10 +++++-----
 .../02378_analyzer_projection_names.reference          |  4 ++--
 .../0_stateless/03123_analyzer_dist_join_CTE.sql       |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Analyzer/Resolve/QueryAnalyzer.cpp b/src/Analyzer/Resolve/QueryAnalyzer.cpp
index dc35462a4b0..58a85debf37 100644
--- a/src/Analyzer/Resolve/QueryAnalyzer.cpp
+++ b/src/Analyzer/Resolve/QueryAnalyzer.cpp
@@ -1484,14 +1484,14 @@ void QueryAnalyzer::qualifyColumnNodesWithProjectionNames(const QueryTreeNodes &
     /// Build additional column qualification parts array
     std::vector<std::string> additional_column_qualification_parts;
 
-    auto * query_node = table_expression_node->as<QueryNode>();
-    auto * union_node = table_expression_node->as<UnionNode>();
-    bool is_cte = (query_node && query_node->isCTE()) || (union_node && union_node->isCTE());
-
-    if (!is_cte && table_expression_node->hasAlias())
+    if (table_expression_node->hasAlias())
         additional_column_qualification_parts = {table_expression_node->getAlias()};
     else if (auto * table_node = table_expression_node->as<TableNode>())
         additional_column_qualification_parts = {table_node->getStorageID().getDatabaseName(), table_node->getStorageID().getTableName()};
+    else if (auto * query_node = table_expression_node->as<QueryNode>(); query_node && query_node->isCTE())
+        additional_column_qualification_parts = {"", query_node->getCTEName()};
+    else if (auto * union_node = table_expression_node->as<UnionNode>(); union_node && union_node->isCTE())
+        additional_column_qualification_parts = {"", union_node->getCTEName()};
 
     size_t additional_column_qualification_parts_size = additional_column_qualification_parts.size();
     const auto & table_expression_data = scope.getTableExpressionDataOrThrow(table_expression_node);
diff --git a/tests/queries/0_stateless/02378_analyzer_projection_names.reference b/tests/queries/0_stateless/02378_analyzer_projection_names.reference
index 5860f1deb0d..170f3e9e1ad 100644
--- a/tests/queries/0_stateless/02378_analyzer_projection_names.reference
+++ b/tests/queries/0_stateless/02378_analyzer_projection_names.reference
@@ -448,13 +448,13 @@ SELECT '--';
 DESCRIBE (WITH test_table_in_cte_1 AS (SELECT 1 AS c1), test_table_in_cte_2 AS (SELECT 1 AS c1) SELECT *
 FROM test_table_in_cte_1 INNER JOIN test_table_in_cte_2 as test_table_in_cte_2 ON test_table_in_cte_1.c1 = test_table_in_cte_2.c1);
 c1	UInt8					
-c1	UInt8					
+test_table_in_cte_2.c1	UInt8					
 SELECT '--';
 --
 DESCRIBE (WITH test_table_in_cte_1 AS (SELECT 1 AS c1), test_table_in_cte_2 AS (SELECT 1 AS c1 UNION ALL SELECT 1 AS c1) SELECT *
 FROM test_table_in_cte_1 INNER JOIN test_table_in_cte_2 as test_table_in_cte_2 ON test_table_in_cte_1.c1 = test_table_in_cte_2.c1);
 c1	UInt8					
-c1	UInt8					
+test_table_in_cte_2.c1	UInt8					
 SELECT 'Joins';
 Joins
 DESCRIBE (SELECT * FROM test_table_join_1, test_table_join_2);
diff --git a/tests/queries/0_stateless/03123_analyzer_dist_join_CTE.sql b/tests/queries/0_stateless/03123_analyzer_dist_join_CTE.sql
index 4275f405d13..4fb8e0b91c4 100644
--- a/tests/queries/0_stateless/03123_analyzer_dist_join_CTE.sql
+++ b/tests/queries/0_stateless/03123_analyzer_dist_join_CTE.sql
@@ -20,7 +20,7 @@ WITH
          SELECT toInt64(number) AS a
          FROM numbers(10)
     )
-SELECT a.a, b, b.a, c.a
+SELECT *
 FROM dist_t0 AS a
 LEFT JOIN b AS b ON a.a = b.a
 LEFT JOIN c AS c ON a.a = c.a

From 6128f53f63332d57e9e7f34e54dcd3b9f5c89df5 Mon Sep 17 00:00:00 2001
From: Yakov Olkhovskiy <yakov@clickhouse.com>
Date: Wed, 3 Jul 2024 02:56:47 +0000
Subject: [PATCH 06/51] fix

---
 src/Analyzer/Resolve/IdentifierResolver.cpp |  2 +-
 src/Analyzer/Resolve/QueryAnalyzer.cpp      | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/Analyzer/Resolve/IdentifierResolver.cpp b/src/Analyzer/Resolve/IdentifierResolver.cpp
index 692a31b66ba..59cf82989e7 100644
--- a/src/Analyzer/Resolve/IdentifierResolver.cpp
+++ b/src/Analyzer/Resolve/IdentifierResolver.cpp
@@ -1129,7 +1129,7 @@ QueryTreeNodePtr IdentifierResolver::tryResolveIdentifierFromJoin(const Identifi
                 resolved_identifier = left_resolved_identifier;
             }
         }
-        else if (scope.joins_count == 1 && scope.context->getSettingsRef().single_join_prefer_left_table)
+        else if (scope.joins_count && scope.context->getSettingsRef().single_join_prefer_left_table)
         {
             resolved_side = JoinTableSide::Left;
             resolved_identifier = left_resolved_identifier;
diff --git a/src/Analyzer/Resolve/QueryAnalyzer.cpp b/src/Analyzer/Resolve/QueryAnalyzer.cpp
index 58a85debf37..25ab3752f11 100644
--- a/src/Analyzer/Resolve/QueryAnalyzer.cpp
+++ b/src/Analyzer/Resolve/QueryAnalyzer.cpp
@@ -1489,9 +1489,9 @@ void QueryAnalyzer::qualifyColumnNodesWithProjectionNames(const QueryTreeNodes &
     else if (auto * table_node = table_expression_node->as<TableNode>())
         additional_column_qualification_parts = {table_node->getStorageID().getDatabaseName(), table_node->getStorageID().getTableName()};
     else if (auto * query_node = table_expression_node->as<QueryNode>(); query_node && query_node->isCTE())
-        additional_column_qualification_parts = {"", query_node->getCTEName()};
+        additional_column_qualification_parts = {query_node->getCTEName()};
     else if (auto * union_node = table_expression_node->as<UnionNode>(); union_node && union_node->isCTE())
-        additional_column_qualification_parts = {"", union_node->getCTEName()};
+        additional_column_qualification_parts = {union_node->getCTEName()};
 
     size_t additional_column_qualification_parts_size = additional_column_qualification_parts.size();
     const auto & table_expression_data = scope.getTableExpressionDataOrThrow(table_expression_node);
@@ -4455,10 +4455,11 @@ void QueryAnalyzer::initializeTableExpressionData(const QueryTreeNodePtr & table
     if (auto * scope_query_node = scope.scope_node->as<QueryNode>())
     {
         auto left_table_expression = extractLeftTableExpression(scope_query_node->getJoinTree());
+        bool is_cte = (query_node && query_node->isCTE()) || (union_node && union_node->isCTE());
         if (table_expression_node.get() == left_table_expression.get() &&
-            scope.joins_count == 1 &&
-            scope.context->getSettingsRef().single_join_prefer_left_table)
-            table_expression_data.should_qualify_columns = false;
+            scope.joins_count &&
+            (scope.context->getSettingsRef().single_join_prefer_left_table || is_cte))
+                table_expression_data.should_qualify_columns = false;
     }
 
     scope.table_expression_node_to_data.emplace(table_expression_node, std::move(table_expression_data));

From e11b48c7b5ef1bb25369f8a687b99b16b8ab198d Mon Sep 17 00:00:00 2001
From: Yakov Olkhovskiy <yakov@clickhouse.com>
Date: Wed, 3 Jul 2024 23:04:13 +0000
Subject: [PATCH 07/51] fix

---
 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 9e4d3fead6c..fc7e56c281f 100644
--- a/src/Analyzer/Resolve/QueryAnalyzer.cpp
+++ b/src/Analyzer/Resolve/QueryAnalyzer.cpp
@@ -4458,10 +4458,8 @@ void QueryAnalyzer::initializeTableExpressionData(const QueryTreeNodePtr & table
     if (auto * scope_query_node = scope.scope_node->as<QueryNode>())
     {
         auto left_table_expression = extractLeftTableExpression(scope_query_node->getJoinTree());
-        bool is_cte = (query_node && query_node->isCTE()) || (union_node && union_node->isCTE());
         if (table_expression_node.get() == left_table_expression.get() &&
-            scope.joins_count &&
-            (scope.context->getSettingsRef().single_join_prefer_left_table || is_cte))
+            scope.joins_count && scope.context->getSettingsRef().single_join_prefer_left_table)
                 table_expression_data.should_qualify_columns = false;
     }
 

From 8fded210bc7320d144bdccfa05feabf0b07ce67e Mon Sep 17 00:00:00 2001
From: Yakov Olkhovskiy <yakov@clickhouse.com>
Date: Fri, 5 Jul 2024 14:49:19 +0000
Subject: [PATCH 08/51] revert to one join

---
 src/Analyzer/Resolve/IdentifierResolver.cpp | 2 +-
 src/Analyzer/Resolve/QueryAnalyzer.cpp      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Analyzer/Resolve/IdentifierResolver.cpp b/src/Analyzer/Resolve/IdentifierResolver.cpp
index 59cf82989e7..692a31b66ba 100644
--- a/src/Analyzer/Resolve/IdentifierResolver.cpp
+++ b/src/Analyzer/Resolve/IdentifierResolver.cpp
@@ -1129,7 +1129,7 @@ QueryTreeNodePtr IdentifierResolver::tryResolveIdentifierFromJoin(const Identifi
                 resolved_identifier = left_resolved_identifier;
             }
         }
-        else if (scope.joins_count && scope.context->getSettingsRef().single_join_prefer_left_table)
+        else if (scope.joins_count == 1 && scope.context->getSettingsRef().single_join_prefer_left_table)
         {
             resolved_side = JoinTableSide::Left;
             resolved_identifier = left_resolved_identifier;
diff --git a/src/Analyzer/Resolve/QueryAnalyzer.cpp b/src/Analyzer/Resolve/QueryAnalyzer.cpp
index fc7e56c281f..134b2759c93 100644
--- a/src/Analyzer/Resolve/QueryAnalyzer.cpp
+++ b/src/Analyzer/Resolve/QueryAnalyzer.cpp
@@ -4459,7 +4459,7 @@ void QueryAnalyzer::initializeTableExpressionData(const QueryTreeNodePtr & table
     {
         auto left_table_expression = extractLeftTableExpression(scope_query_node->getJoinTree());
         if (table_expression_node.get() == left_table_expression.get() &&
-            scope.joins_count && scope.context->getSettingsRef().single_join_prefer_left_table)
+            scope.joins_count == 1 && scope.context->getSettingsRef().single_join_prefer_left_table)
                 table_expression_data.should_qualify_columns = false;
     }
 

From 1f0c6061556cd64225a58933177df0228b4c185a Mon Sep 17 00:00:00 2001
From: Yakov Olkhovskiy <yakov@clickhouse.com>
Date: Fri, 5 Jul 2024 18:48:01 +0000
Subject: [PATCH 09/51] fix tests

---
 .../02378_analyzer_projection_names.reference   |  4 ++--
 ...056_analyzer_double_subquery_alias.reference |  1 -
 .../03056_analyzer_double_subquery_alias.sql    | 17 -----------------
 3 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 tests/queries/0_stateless/03056_analyzer_double_subquery_alias.reference
 delete mode 100644 tests/queries/0_stateless/03056_analyzer_double_subquery_alias.sql

diff --git a/tests/queries/0_stateless/02378_analyzer_projection_names.reference b/tests/queries/0_stateless/02378_analyzer_projection_names.reference
index 170f3e9e1ad..532414f117c 100644
--- a/tests/queries/0_stateless/02378_analyzer_projection_names.reference
+++ b/tests/queries/0_stateless/02378_analyzer_projection_names.reference
@@ -447,13 +447,13 @@ SELECT '--';
 --
 DESCRIBE (WITH test_table_in_cte_1 AS (SELECT 1 AS c1), test_table_in_cte_2 AS (SELECT 1 AS c1) SELECT *
 FROM test_table_in_cte_1 INNER JOIN test_table_in_cte_2 as test_table_in_cte_2 ON test_table_in_cte_1.c1 = test_table_in_cte_2.c1);
-c1	UInt8					
+test_table_in_cte_1.c1	UInt8					
 test_table_in_cte_2.c1	UInt8					
 SELECT '--';
 --
 DESCRIBE (WITH test_table_in_cte_1 AS (SELECT 1 AS c1), test_table_in_cte_2 AS (SELECT 1 AS c1 UNION ALL SELECT 1 AS c1) SELECT *
 FROM test_table_in_cte_1 INNER JOIN test_table_in_cte_2 as test_table_in_cte_2 ON test_table_in_cte_1.c1 = test_table_in_cte_2.c1);
-c1	UInt8					
+test_table_in_cte_1.c1	UInt8					
 test_table_in_cte_2.c1	UInt8					
 SELECT 'Joins';
 Joins
diff --git a/tests/queries/0_stateless/03056_analyzer_double_subquery_alias.reference b/tests/queries/0_stateless/03056_analyzer_double_subquery_alias.reference
deleted file mode 100644
index 72749c905a3..00000000000
--- a/tests/queries/0_stateless/03056_analyzer_double_subquery_alias.reference
+++ /dev/null
@@ -1 +0,0 @@
-1	1	1
diff --git a/tests/queries/0_stateless/03056_analyzer_double_subquery_alias.sql b/tests/queries/0_stateless/03056_analyzer_double_subquery_alias.sql
deleted file mode 100644
index de471c1a091..00000000000
--- a/tests/queries/0_stateless/03056_analyzer_double_subquery_alias.sql
+++ /dev/null
@@ -1,17 +0,0 @@
--- https://github.com/ClickHouse/ClickHouse/issues/22627
-SET allow_experimental_analyzer=1;
-WITH
-    x AS
-    (
-        SELECT 1 AS a
-    ),
-    xx AS
-    (
-        SELECT *
-        FROM x
-        , x AS x1
-        , x AS x2
-    )
-SELECT *
-FROM xx
-WHERE a = 1;

From f00a8a42a0c26f3805ddf10e09b11fd0e4d5325e Mon Sep 17 00:00:00 2001
From: Blargian <shaunstruwig.ss@gmail.com>
Date: Fri, 5 Jul 2024 20:55:46 +0200
Subject: [PATCH 10/51] update partitionId

---
 .../functions/other-functions.md              | 51 +++++++++++++++++++
 .../aspell-ignore/en/aspell-dict.txt          |  1 +
 2 files changed, 52 insertions(+)

diff --git a/docs/en/sql-reference/functions/other-functions.md b/docs/en/sql-reference/functions/other-functions.md
index 58fc1eba02e..8d8b54b64f5 100644
--- a/docs/en/sql-reference/functions/other-functions.md
+++ b/docs/en/sql-reference/functions/other-functions.md
@@ -2984,6 +2984,57 @@ Result:
 └─────────┘
 ```
 
+## partitionId
+
+Returns computed [partition](../../engines/table-engines/mergetree-family/custom-partitioning-key.md) IDs of its arguments.
+
+:::note
+This function is slow and should not be called for large amount of rows.
+:::
+
+**Syntax**
+
+```sql
+partitionId(x[, y, ...]);
+```
+
+**Arguments**
+
+- `x` — Column for which to return the partition ID.
+- `y, ...` — Remaining N columns for which to return the partition ID (optional).
+
+**Return Type**
+
+- Partition ID that the row belongs to. [String](../data-types/string.md).
+
+**Example**
+
+Query:
+
+```sql
+DROP TABLE IF EXISTS mt;
+CREATE TABLE mt (n UInt64) ENGINE=MergeTree ORDER BY n PARTITION BY n % 2;
+INSERT INTO mt SELECT * FROM numbers(10);
+SELECT partitionId(*) FROM mt;
+```
+Result:
+
+```response
+    ┌─partitionId(n)─┐
+ 1. │ 0              │
+ 2. │ 2              │
+ 3. │ 4              │
+ 4. │ 6              │
+ 5. │ 8              │
+ 6. │ 10             │
+ 7. │ 12             │
+ 8. │ 14             │
+ 9. │ 16             │
+10. │ 18             │
+    └────────────────┘
+```
+
+
 ## shardNum
 
 Returns the index of a shard which processes a part of data in a distributed query. Indices are started from `1`.
diff --git a/utils/check-style/aspell-ignore/en/aspell-dict.txt b/utils/check-style/aspell-ignore/en/aspell-dict.txt
index 229eccefa48..d6406e2bb76 100644
--- a/utils/check-style/aspell-ignore/en/aspell-dict.txt
+++ b/utils/check-style/aspell-ignore/en/aspell-dict.txt
@@ -2184,6 +2184,7 @@ parseReadableSizeOrZero
 parseTimeDelta
 parseable
 parsers
+partitionId
 pathFull
 pclmulqdq
 pcre

From 02ff6a70737b77a7711a9427eaa487cf705f7378 Mon Sep 17 00:00:00 2001
From: Blargian <shaunstruwig.ss@gmail.com>
Date: Sat, 6 Jul 2024 11:36:13 +0200
Subject: [PATCH 11/51] Update example for partitionId

---
 .../functions/other-functions.md              | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/docs/en/sql-reference/functions/other-functions.md b/docs/en/sql-reference/functions/other-functions.md
index 8d8b54b64f5..b1424c8b19a 100644
--- a/docs/en/sql-reference/functions/other-functions.md
+++ b/docs/en/sql-reference/functions/other-functions.md
@@ -3013,25 +3013,24 @@ Query:
 
 ```sql
 DROP TABLE IF EXISTS mt;
-CREATE TABLE mt (n UInt64) ENGINE=MergeTree ORDER BY n PARTITION BY n % 2;
-INSERT INTO mt SELECT * FROM numbers(10);
-SELECT partitionId(*) FROM mt;
+CREATE TABLE mt (i int, j int) ENGINE=MergeTree PARTITION BY i ORDER BY j SETTINGS index_granularity = 1;
+INSERT INTO mt VALUES (1, 1), (1, 2), (1, 3), (2, 4), (2, 5), (2, 6);
+SELECT * FROM mt WHERE _partition_id = partitionId(1);
+SELECT * FROM mt WHERE _partition_id = partitionId(2);
 ```
 Result:
 
 ```response
-    ┌─partitionId(n)─┐
- 1. │ 0              │
- 2. │ 2              │
- 3. │ 4              │
- 4. │ 6              │
- 5. │ 8              │
- 6. │ 10             │
- 7. │ 12             │
- 8. │ 14             │
- 9. │ 16             │
-10. │ 18             │
-    └────────────────┘
+   ┌─i─┬─j─┐
+1. │ 1 │ 1 │
+2. │ 1 │ 2 │
+3. │ 1 │ 3 │
+   └───┴───┘
+   ┌─i─┬─j─┐
+1. │ 2 │ 4 │
+2. │ 2 │ 5 │
+3. │ 2 │ 6 │
+   └───┴───┘
 ```
 
 

From f1d373bb1c95a1b852e88b7890b44789e7ae4026 Mon Sep 17 00:00:00 2001
From: Blargian <shaunstruwig.ss@gmail.com>
Date: Sat, 6 Jul 2024 11:38:32 +0200
Subject: [PATCH 12/51] update example formatting

---
 docs/en/sql-reference/functions/other-functions.md | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/docs/en/sql-reference/functions/other-functions.md b/docs/en/sql-reference/functions/other-functions.md
index b1424c8b19a..c0225f009b7 100644
--- a/docs/en/sql-reference/functions/other-functions.md
+++ b/docs/en/sql-reference/functions/other-functions.md
@@ -3013,8 +3013,18 @@ Query:
 
 ```sql
 DROP TABLE IF EXISTS mt;
-CREATE TABLE mt (i int, j int) ENGINE=MergeTree PARTITION BY i ORDER BY j SETTINGS index_granularity = 1;
+CREATE TABLE mt
+(
+  `i` int,
+  `j` int
+)
+  ENGINE = MergeTree
+PARTITION BY i
+ORDER BY j
+SETTINGS index_granularity = 1;
+
 INSERT INTO mt VALUES (1, 1), (1, 2), (1, 3), (2, 4), (2, 5), (2, 6);
+
 SELECT * FROM mt WHERE _partition_id = partitionId(1);
 SELECT * FROM mt WHERE _partition_id = partitionId(2);
 ```

From b9c662e1da504c4964b67d6408ad06fe9bcc0f95 Mon Sep 17 00:00:00 2001
From: Blargian <shaunstruwig.ss@gmail.com>
Date: Sat, 6 Jul 2024 11:39:11 +0200
Subject: [PATCH 13/51] update example formatting

---
 docs/en/sql-reference/functions/other-functions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/sql-reference/functions/other-functions.md b/docs/en/sql-reference/functions/other-functions.md
index c0225f009b7..86a03ed6df8 100644
--- a/docs/en/sql-reference/functions/other-functions.md
+++ b/docs/en/sql-reference/functions/other-functions.md
@@ -3018,7 +3018,7 @@ CREATE TABLE mt
   `i` int,
   `j` int
 )
-  ENGINE = MergeTree
+ENGINE = MergeTree
 PARTITION BY i
 ORDER BY j
 SETTINGS index_granularity = 1;

From c3b72386a2f26ad40431eca0c1985b14663b43ca Mon Sep 17 00:00:00 2001
From: Blargian <shaunstruwig.ss@gmail.com>
Date: Mon, 8 Jul 2024 14:14:13 +0200
Subject: [PATCH 14/51] remove partitionID function, update tests and remove
 from documentation

---
 .../functions/other-functions.md              | 60 ----------------
 src/Functions/partitionId.cpp                 | 71 -------------------
 tests/integration/test_lost_part/test.py      |  2 +-
 .../01748_partition_id_pruning.sql            |  6 +-
 4 files changed, 4 insertions(+), 135 deletions(-)
 delete mode 100644 src/Functions/partitionId.cpp

diff --git a/docs/en/sql-reference/functions/other-functions.md b/docs/en/sql-reference/functions/other-functions.md
index 86a03ed6df8..58fc1eba02e 100644
--- a/docs/en/sql-reference/functions/other-functions.md
+++ b/docs/en/sql-reference/functions/other-functions.md
@@ -2984,66 +2984,6 @@ Result:
 └─────────┘
 ```
 
-## partitionId
-
-Returns computed [partition](../../engines/table-engines/mergetree-family/custom-partitioning-key.md) IDs of its arguments.
-
-:::note
-This function is slow and should not be called for large amount of rows.
-:::
-
-**Syntax**
-
-```sql
-partitionId(x[, y, ...]);
-```
-
-**Arguments**
-
-- `x` — Column for which to return the partition ID.
-- `y, ...` — Remaining N columns for which to return the partition ID (optional).
-
-**Return Type**
-
-- Partition ID that the row belongs to. [String](../data-types/string.md).
-
-**Example**
-
-Query:
-
-```sql
-DROP TABLE IF EXISTS mt;
-CREATE TABLE mt
-(
-  `i` int,
-  `j` int
-)
-ENGINE = MergeTree
-PARTITION BY i
-ORDER BY j
-SETTINGS index_granularity = 1;
-
-INSERT INTO mt VALUES (1, 1), (1, 2), (1, 3), (2, 4), (2, 5), (2, 6);
-
-SELECT * FROM mt WHERE _partition_id = partitionId(1);
-SELECT * FROM mt WHERE _partition_id = partitionId(2);
-```
-Result:
-
-```response
-   ┌─i─┬─j─┐
-1. │ 1 │ 1 │
-2. │ 1 │ 2 │
-3. │ 1 │ 3 │
-   └───┴───┘
-   ┌─i─┬─j─┐
-1. │ 2 │ 4 │
-2. │ 2 │ 5 │
-3. │ 2 │ 6 │
-   └───┴───┘
-```
-
-
 ## shardNum
 
 Returns the index of a shard which processes a part of data in a distributed query. Indices are started from `1`.
diff --git a/src/Functions/partitionId.cpp b/src/Functions/partitionId.cpp
deleted file mode 100644
index e2e9038cd8b..00000000000
--- a/src/Functions/partitionId.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-#include <memory>
-#include <Columns/ColumnString.h>
-#include <Core/Block.h>
-#include <DataTypes/DataTypeString.h>
-#include <Functions/FunctionFactory.h>
-#include <Functions/IFunction.h>
-#include <Storages/MergeTree/MergeTreePartition.h>
-
-
-namespace DB
-{
-namespace ErrorCodes
-{
-    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
-}
-
-
-/** partitionId(x, y, ...) is a function that computes partition ids of arguments.
-  * The function is slow and should not be called for large amount of rows.
-  */
-class FunctionPartitionId : public IFunction
-{
-public:
-    static constexpr auto name = "partitionId";
-
-    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionPartitionId>(); }
-
-    String getName() const override { return name; }
-
-    bool isVariadic() const override { return true; }
-
-    size_t getNumberOfArguments() const override { return 0; }
-
-    bool isInjective(const ColumnsWithTypeAndName & /*sample_columns*/) const override { return true; }
-
-    bool useDefaultImplementationForNulls() const override { return true; }
-    bool useDefaultImplementationForConstants() const override { return true; }
-    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
-
-    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
-    {
-        if (arguments.empty())
-            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Function {} requires at least one argument.", getName());
-
-        return std::make_shared<DataTypeString>();
-    }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
-    {
-        Block sample_block(arguments);
-        size_t size = arguments.size();
-
-        auto result_column = ColumnString::create();
-        for (size_t j = 0; j < input_rows_count; ++j)
-        {
-            Row row(size);
-            for (size_t i = 0; i < size; ++i)
-                arguments[i].column->get(j, row[i]);
-            MergeTreePartition partition(std::move(row));
-            result_column->insert(partition.getID(sample_block));
-        }
-        return result_column;
-    }
-};
-
-REGISTER_FUNCTION(PartitionId)
-{
-    factory.registerFunction<FunctionPartitionId>();
-}
-
-}
diff --git a/tests/integration/test_lost_part/test.py b/tests/integration/test_lost_part/test.py
index b8e67551d79..5d0ec383a39 100644
--- a/tests/integration/test_lost_part/test.py
+++ b/tests/integration/test_lost_part/test.py
@@ -266,7 +266,7 @@ def test_lost_last_part(start_cluster):
             "ALTER TABLE mt3 UPDATE id = 777 WHERE 1", settings={"mutations_sync": "0"}
         )
 
-        partition_id = node1.query("select partitionId('x')").strip()
+        partition_id = node1.query("select _partition_id").strip()
         remove_part_from_disk(node1, "mt3", f"{partition_id}_0_0_0")
 
         # other way to detect broken parts
diff --git a/tests/queries/0_stateless/01748_partition_id_pruning.sql b/tests/queries/0_stateless/01748_partition_id_pruning.sql
index b637528bc6c..0e942573652 100644
--- a/tests/queries/0_stateless/01748_partition_id_pruning.sql
+++ b/tests/queries/0_stateless/01748_partition_id_pruning.sql
@@ -8,17 +8,17 @@ insert into x values (1, 1), (1, 2), (1, 3), (2, 4), (2, 5), (2, 6);
 
 set max_rows_to_read = 3;
 
-select * from x where _partition_id = partitionId(1);
+select * from x where _partition_id = '1';
 
 set max_rows_to_read = 5; -- one row for subquery + subquery
 
-select * from x where _partition_id in (select partitionId(number + 1) from numbers(1));
+select * from x where _partition_id in (select number + 1 from numbers(1));
 
 -- trivial count optimization test
 set max_rows_to_read = 2; -- one row for subquery + subquery itself
 -- TODO: Relax the limits because we might build prepared set twice with _minmax_count_projection
 set max_rows_to_read = 3;
-select count() from x where _partition_id in (select partitionId(number + 1) from numbers(1));
+select count() from x where _partition_id in (select number + 1 from numbers(1));
 
 drop table x;
 

From ee4162f5ec3c34e2e35eec5fca012d75aee84401 Mon Sep 17 00:00:00 2001
From: Shaun Struwig <41984034+Blargian@users.noreply.github.com>
Date: Mon, 8 Jul 2024 15:23:58 +0200
Subject: [PATCH 15/51] Update
 02415_all_new_functions_must_be_documented.reference

---
 .../02415_all_new_functions_must_be_documented.reference         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/queries/0_stateless/02415_all_new_functions_must_be_documented.reference b/tests/queries/0_stateless/02415_all_new_functions_must_be_documented.reference
index a152066a460..eb5ae5b4f44 100644
--- a/tests/queries/0_stateless/02415_all_new_functions_must_be_documented.reference
+++ b/tests/queries/0_stateless/02415_all_new_functions_must_be_documented.reference
@@ -534,7 +534,6 @@ parseDateTimeInJodaSyntaxOrZero
 parseDateTimeOrNull
 parseDateTimeOrZero
 parseTimeDelta
-partitionId
 path
 pathFull
 pi

From 85f5fe832a23fa25e9784728b9f26d712057148a Mon Sep 17 00:00:00 2001
From: Robert Schulze <robert@clickhouse.com>
Date: Mon, 8 Jul 2024 20:46:56 +0000
Subject: [PATCH 16/51] Fix integration tests

---
 tests/integration/test_backward_compatibility/test_functions.py | 2 ++
 tests/integration/test_lost_part/test.py                        | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/integration/test_backward_compatibility/test_functions.py b/tests/integration/test_backward_compatibility/test_functions.py
index fc03a77030e..551a0550c0c 100644
--- a/tests/integration/test_backward_compatibility/test_functions.py
+++ b/tests/integration/test_backward_compatibility/test_functions.py
@@ -168,6 +168,8 @@ def test_string_functions(start_cluster):
         "filesystemAvailable",
         # Exclude it for now. Looks like the result depends on the build type.
         "farmHash64",
+        # Removed in 24.7
+        "partitionId",
     ]
     functions = filter(lambda x: x not in excludes, functions)
 
diff --git a/tests/integration/test_lost_part/test.py b/tests/integration/test_lost_part/test.py
index 5d0ec383a39..5070b3c5b68 100644
--- a/tests/integration/test_lost_part/test.py
+++ b/tests/integration/test_lost_part/test.py
@@ -266,7 +266,7 @@ def test_lost_last_part(start_cluster):
             "ALTER TABLE mt3 UPDATE id = 777 WHERE 1", settings={"mutations_sync": "0"}
         )
 
-        partition_id = node1.query("select _partition_id").strip()
+        partition_id = node1.query("select distinct _partition_id from mt3 where p = 'x'").strip()
         remove_part_from_disk(node1, "mt3", f"{partition_id}_0_0_0")
 
         # other way to detect broken parts

From 0eb081f899bd0fa9c185add84c9c59e212dfd6ca Mon Sep 17 00:00:00 2001
From: Robert Schulze <robert@clickhouse.com>
Date: Tue, 9 Jul 2024 10:30:07 +0000
Subject: [PATCH 17/51] Fix style

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

diff --git a/tests/integration/test_lost_part/test.py b/tests/integration/test_lost_part/test.py
index 5070b3c5b68..e88b84775b4 100644
--- a/tests/integration/test_lost_part/test.py
+++ b/tests/integration/test_lost_part/test.py
@@ -266,7 +266,9 @@ def test_lost_last_part(start_cluster):
             "ALTER TABLE mt3 UPDATE id = 777 WHERE 1", settings={"mutations_sync": "0"}
         )
 
-        partition_id = node1.query("select distinct _partition_id from mt3 where p = 'x'").strip()
+        partition_id = node1.query(
+            "select distinct _partition_id from mt3 where p = 'x'"
+        ).strip()
         remove_part_from_disk(node1, "mt3", f"{partition_id}_0_0_0")
 
         # other way to detect broken parts

From a339dd020f97e0e31d20e97966aa18c6afb4c3c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= <git@rmr.ninja>
Date: Tue, 9 Jul 2024 18:52:34 +0200
Subject: [PATCH 18/51] Reduce dependencies on MergeTreeSettings.h

---
 programs/server/Server.cpp                    |  1 +
 src/Access/AccessControl.cpp                  |  1 -
 src/Databases/DatabaseOrdinary.cpp            |  1 +
 src/Interpreters/InterpreterCreateQuery.cpp   |  4 +-
 src/Interpreters/MutationsInterpreter.cpp     |  2 +
 .../QueryPlan/ReadFromMergeTree.cpp           |  1 +
 src/Server/ReplicasStatusHandler.cpp          |  1 +
 src/Storages/AlterCommands.cpp                |  2 +-
 src/Storages/MergeTree/AsyncBlockIDsCache.cpp |  5 +-
 src/Storages/MergeTree/DataPartsExchange.cpp  |  1 +
 src/Storages/MergeTree/IMergeTreeDataPart.cpp |  1 +
 .../MergeTree/IMergeTreeDataPartWriter.h      |  6 ++-
 .../MergeTree/IMergedBlockOutputStream.cpp    |  1 +
 .../MergeTree/IMergedBlockOutputStream.h      |  8 +--
 .../MergeTree/MergeFromLogEntryTask.cpp       |  1 +
 src/Storages/MergeTree/MergeTask.cpp          | 11 ++++
 src/Storages/MergeTree/MergeTask.h            | 11 +---
 src/Storages/MergeTree/MergeTreeData.cpp      | 13 +++++
 src/Storages/MergeTree/MergeTreeData.h        | 19 ++-----
 .../MergeTree/MergeTreeDataMergerMutator.cpp  |  1 +
 .../MergeTreeDataPartWriterOnDisk.cpp         |  1 +
 .../MergeTree/MergeTreeDataPartWriterWide.cpp |  1 +
 .../MergeTree/MergeTreeDataSelectExecutor.cpp |  1 +
 .../MergeTree/MergeTreeDataWriter.cpp         |  1 +
 .../MergeTree/MergeTreeIOSettings.cpp         | 37 +++++++++++++
 src/Storages/MergeTree/MergeTreeIOSettings.h  | 30 +++--------
 .../MergeTreeIndexGranularityInfo.cpp         |  3 +-
 .../MergeTree/MergeTreePartsMover.cpp         |  3 +-
 .../MergeTree/MergeTreeSequentialSource.cpp   |  1 +
 src/Storages/MergeTree/MergeTreeSettings.cpp  | 10 ++++
 src/Storages/MergeTree/MergeTreeSettings.h    | 19 +++----
 .../MergeTree/MutateFromLogEntryTask.cpp      |  1 +
 src/Storages/MergeTree/MutateTask.cpp         |  4 ++
 .../PartMovesBetweenShardsOrchestrator.cpp    |  1 +
 .../ReplicatedMergeMutateTaskBase.cpp         |  3 +-
 .../ReplicatedMergeTreeAttachThread.cpp       |  1 +
 .../ReplicatedMergeTreeCleanupThread.cpp      |  5 +-
 ...ReplicatedMergeTreeMergeStrategyPicker.cpp |  3 +-
 .../ReplicatedMergeTreePartCheckThread.cpp    |  1 +
 .../MergeTree/ReplicatedMergeTreeQueue.cpp    |  1 +
 .../ReplicatedMergeTreeRestartingThread.cpp   |  1 +
 .../MergeTree/ReplicatedMergeTreeSink.cpp     |  1 +
 .../ReplicatedMergeTreeTableMetadata.cpp      |  1 +
 .../MergeTree/StorageFromMergeTreeDataPart.h  | 48 +++--------------
 src/Storages/MergeTree/checkDataPart.cpp      |  1 +
 .../MergeTree/registerStorageMergeTree.cpp    |  1 +
 src/Storages/StorageFromMergeTreeDataPart.cpp | 54 +++++++++++++++++++
 src/Storages/StorageMergeTree.cpp             |  1 +
 src/Storages/StorageReplicatedMergeTree.cpp   |  1 +
 .../System/StorageSystemMergeTreeSettings.cpp |  1 +
 .../System/StorageSystemMergeTreeSettings.h   |  1 -
 51 files changed, 210 insertions(+), 119 deletions(-)
 create mode 100644 src/Storages/MergeTree/MergeTreeIOSettings.cpp
 create mode 100644 src/Storages/StorageFromMergeTreeDataPart.cpp

diff --git a/programs/server/Server.cpp b/programs/server/Server.cpp
index 3b88bb36954..053ddaf8d8b 100644
--- a/programs/server/Server.cpp
+++ b/programs/server/Server.cpp
@@ -68,6 +68,7 @@
 #include <Interpreters/registerInterpreters.h>
 #include <Interpreters/JIT/CompiledExpressionCache.h>
 #include <Access/AccessControl.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/StorageReplicatedMergeTree.h>
 #include <Storages/System/attachSystemTables.h>
 #include <Storages/System/attachInformationSchemaTables.h>
diff --git a/src/Access/AccessControl.cpp b/src/Access/AccessControl.cpp
index 353358fac65..95a467bbbe5 100644
--- a/src/Access/AccessControl.cpp
+++ b/src/Access/AccessControl.cpp
@@ -21,7 +21,6 @@
 #include <Backups/BackupEntriesCollector.h>
 #include <Backups/RestorerFromBackup.h>
 #include <Core/Settings.h>
-#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <base/defines.h>
 #include <IO/Operators.h>
 #include <Common/re2.h>
diff --git a/src/Databases/DatabaseOrdinary.cpp b/src/Databases/DatabaseOrdinary.cpp
index 7d4bb07e8ef..46830861c75 100644
--- a/src/Databases/DatabaseOrdinary.cpp
+++ b/src/Databases/DatabaseOrdinary.cpp
@@ -30,6 +30,7 @@
 #include <Common/logger_useful.h>
 #include <Common/CurrentMetrics.h>
 #include <Core/Defines.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/StorageReplicatedMergeTree.h>
 
 #include <boost/algorithm/string/replace.hpp>
diff --git a/src/Interpreters/InterpreterCreateQuery.cpp b/src/Interpreters/InterpreterCreateQuery.cpp
index 0ee2bb6c0e9..15e987750c2 100644
--- a/src/Interpreters/InterpreterCreateQuery.cpp
+++ b/src/Interpreters/InterpreterCreateQuery.cpp
@@ -15,7 +15,6 @@
 #include <Common/PoolId.h>
 #include <Common/logger_useful.h>
 #include <Parsers/ASTSetQuery.h>
-#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <base/hex.h>
 
 #include <Core/Defines.h>
@@ -34,10 +33,11 @@
 #include <Parsers/formatAST.h>
 #include <Parsers/parseQuery.h>
 
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/StorageFactory.h>
 #include <Storages/StorageInMemoryMetadata.h>
-#include <Storages/WindowView/StorageWindowView.h>
 #include <Storages/StorageReplicatedMergeTree.h>
+#include <Storages/WindowView/StorageWindowView.h>
 
 #include <Interpreters/Context.h>
 #include <Interpreters/executeDDLQueryOnCluster.h>
diff --git a/src/Interpreters/MutationsInterpreter.cpp b/src/Interpreters/MutationsInterpreter.cpp
index 6d3a4f30b34..f2eec8ff8f5 100644
--- a/src/Interpreters/MutationsInterpreter.cpp
+++ b/src/Interpreters/MutationsInterpreter.cpp
@@ -17,6 +17,7 @@
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/ExpressionStep.h>
 #include <Processors/QueryPlan/FilterStep.h>
+#include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
 #include <Processors/QueryPlan/ReadFromPreparedSource.h>
 #include <Processors/Executors/PullingAsyncPipelineExecutor.h>
 #include <Processors/Transforms/CheckSortedTransform.h>
@@ -41,6 +42,7 @@
 #include <Parsers/makeASTForLogicalFunction.h>
 #include <Common/logger_useful.h>
 #include <Storages/MergeTree/MergeTreeDataPartType.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 
 namespace DB
 {
diff --git a/src/Processors/QueryPlan/ReadFromMergeTree.cpp b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
index dc6d96a721e..2829f43a0e8 100644
--- a/src/Processors/QueryPlan/ReadFromMergeTree.cpp
+++ b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
@@ -31,6 +31,7 @@
 #include <Storages/MergeTree/MergeTreeReadPoolInOrder.h>
 #include <Storages/MergeTree/MergeTreeReadPoolParallelReplicas.h>
 #include <Storages/MergeTree/MergeTreeReadPoolParallelReplicasInOrder.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/MergeTree/MergeTreeSource.h>
 #include <Storages/MergeTree/RangesInDataPart.h>
 #include <Storages/MergeTree/RequestResponse.h>
diff --git a/src/Server/ReplicasStatusHandler.cpp b/src/Server/ReplicasStatusHandler.cpp
index 67823117758..5a29612c263 100644
--- a/src/Server/ReplicasStatusHandler.cpp
+++ b/src/Server/ReplicasStatusHandler.cpp
@@ -7,6 +7,7 @@
 #include <Server/HTTPHandlerFactory.h>
 #include <Server/HTTPHandlerRequestFilter.h>
 #include <Server/IServer.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/StorageReplicatedMergeTree.h>
 #include <Common/typeid_cast.h>
 
diff --git a/src/Storages/AlterCommands.cpp b/src/Storages/AlterCommands.cpp
index 35a5e95e643..eef83025097 100644
--- a/src/Storages/AlterCommands.cpp
+++ b/src/Storages/AlterCommands.cpp
@@ -33,9 +33,9 @@
 #include <Storages/AlterCommands.h>
 #include <Storages/IStorage.h>
 #include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Common/typeid_cast.h>
 #include <Common/randomSeed.h>
-#include <Storages/MergeTree/MergeTreeSettings.h>
 
 #include <ranges>
 
diff --git a/src/Storages/MergeTree/AsyncBlockIDsCache.cpp b/src/Storages/MergeTree/AsyncBlockIDsCache.cpp
index 9d64592ed64..6606b00e287 100644
--- a/src/Storages/MergeTree/AsyncBlockIDsCache.cpp
+++ b/src/Storages/MergeTree/AsyncBlockIDsCache.cpp
@@ -1,7 +1,8 @@
+#include <Storages/MergeTree/AsyncBlockIDsCache.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
+#include <Storages/StorageReplicatedMergeTree.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/ProfileEvents.h>
-#include <Storages/MergeTree/AsyncBlockIDsCache.h>
-#include <Storages/StorageReplicatedMergeTree.h>
 
 #include <unordered_set>
 
diff --git a/src/Storages/MergeTree/DataPartsExchange.cpp b/src/Storages/MergeTree/DataPartsExchange.cpp
index b7fdcc63e1b..8e73021d3e7 100644
--- a/src/Storages/MergeTree/DataPartsExchange.cpp
+++ b/src/Storages/MergeTree/DataPartsExchange.cpp
@@ -15,6 +15,7 @@
 #include <Storages/StorageReplicatedMergeTree.h>
 #include <Storages/MergeTree/DataPartStorageOnDiskFull.h>
 #include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/NetException.h>
 #include <Common/randomDelay.h>
diff --git a/src/Storages/MergeTree/IMergeTreeDataPart.cpp b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
index c2e0e778220..70044db7336 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPart.cpp
+++ b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
@@ -24,6 +24,7 @@
 #include <Parsers/queryToString.h>
 #include <Storages/ColumnsDescription.h>
 #include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/MergeTree/PartMetadataManagerOrdinary.h>
 #include <Storages/MergeTree/checkDataPart.h>
 #include <Storages/MergeTree/Backup.h>
diff --git a/src/Storages/MergeTree/IMergeTreeDataPartWriter.h b/src/Storages/MergeTree/IMergeTreeDataPartWriter.h
index d9e9a433827..adaa4eddb98 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPartWriter.h
+++ b/src/Storages/MergeTree/IMergeTreeDataPartWriter.h
@@ -1,11 +1,10 @@
 #pragma once
 
+#include <Storages/MergeTree/IDataPartStorage.h>
 #include <Storages/MergeTree/MergeTreeDataPartType.h>
-#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/MergeTree/MergeTreeIndexGranularity.h>
 #include <Storages/MergeTree/MergeTreeIndexGranularityInfo.h>
 #include <Storages/MergeTree/MergeTreeIndices.h>
-#include <Storages/MergeTree/IDataPartStorage.h>
 #include <Storages/Statistics/Statistics.h>
 #include <Storages/VirtualColumnsDescription.h>
 
@@ -13,6 +12,9 @@
 namespace DB
 {
 
+struct MergeTreeSettings;
+using MergeTreeSettingsPtr = std::shared_ptr<const MergeTreeSettings>;
+
 Block getBlockAndPermute(const Block & block, const Names & names, const IColumn::Permutation * permutation);
 
 Block permuteBlockIfNeeded(const Block & block, const IColumn::Permutation * permutation);
diff --git a/src/Storages/MergeTree/IMergedBlockOutputStream.cpp b/src/Storages/MergeTree/IMergedBlockOutputStream.cpp
index 89c813ab233..70e838e666a 100644
--- a/src/Storages/MergeTree/IMergedBlockOutputStream.cpp
+++ b/src/Storages/MergeTree/IMergedBlockOutputStream.cpp
@@ -1,5 +1,6 @@
 #include <Storages/MergeTree/IMergedBlockOutputStream.h>
 #include <Storages/MergeTree/MergeTreeIOSettings.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/MergeTree/IMergeTreeDataPartWriter.h>
 #include <Common/logger_useful.h>
 
diff --git a/src/Storages/MergeTree/IMergedBlockOutputStream.h b/src/Storages/MergeTree/IMergedBlockOutputStream.h
index a9b058418ea..cfcfb177e05 100644
--- a/src/Storages/MergeTree/IMergedBlockOutputStream.h
+++ b/src/Storages/MergeTree/IMergedBlockOutputStream.h
@@ -1,16 +1,18 @@
 #pragma once
 
 #include <Storages/MergeTree/IDataPartStorage.h>
-#include <Storages/MergeTree/MergeTreeSettings.h>
-#include <Storages/MergeTree/MergeTreeIndexGranularity.h>
-#include <Storages/MergeTree/MergeTreeData.h>
 #include <Storages/MergeTree/IMergeTreeDataPart.h>
 #include <Storages/MergeTree/IMergeTreeDataPartWriter.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/MergeTreeIndexGranularity.h>
 #include <Common/Logger.h>
 
 namespace DB
 {
 
+struct MergeTreeSettings;
+using MergeTreeSettingsPtr = std::shared_ptr<const MergeTreeSettings>;
+
 class IMergedBlockOutputStream
 {
 public:
diff --git a/src/Storages/MergeTree/MergeFromLogEntryTask.cpp b/src/Storages/MergeTree/MergeFromLogEntryTask.cpp
index 79efb0ca8b3..4c947487d21 100644
--- a/src/Storages/MergeTree/MergeFromLogEntryTask.cpp
+++ b/src/Storages/MergeTree/MergeFromLogEntryTask.cpp
@@ -3,6 +3,7 @@
 #include <Common/logger_useful.h>
 #include <Common/ProfileEvents.h>
 #include <Common/ProfileEventsScope.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/StorageReplicatedMergeTree.h>
 #include <pcg_random.hpp>
 #include <Common/randomSeed.h>
diff --git a/src/Storages/MergeTree/MergeTask.cpp b/src/Storages/MergeTree/MergeTask.cpp
index c8f1a08128b..dafb562f0d8 100644
--- a/src/Storages/MergeTree/MergeTask.cpp
+++ b/src/Storages/MergeTree/MergeTask.cpp
@@ -16,6 +16,7 @@
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <Storages/MergeTree/IMergeTreeDataPart.h>
 #include <Storages/MergeTree/MergeTreeSequentialSource.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/MergeTree/FutureMergedMutatedPart.h>
 #include <Storages/MergeTree/MergeTreeDataMergerMutator.h>
 #include <Processors/Transforms/ExpressionTransform.h>
@@ -422,6 +423,16 @@ bool MergeTask::ExecuteAndFinalizeHorizontalPart::prepare()
     return false;
 }
 
+bool MergeTask::enabledBlockNumberColumn(GlobalRuntimeContextPtr global_ctx)
+{
+    return global_ctx->data->getSettings()->enable_block_number_column && global_ctx->metadata_snapshot->getGroupByTTLs().empty();
+}
+
+bool MergeTask::enabledBlockOffsetColumn(GlobalRuntimeContextPtr global_ctx)
+{
+    return global_ctx->data->getSettings()->enable_block_offset_column && global_ctx->metadata_snapshot->getGroupByTTLs().empty();
+}
+
 void MergeTask::addGatheringColumn(GlobalRuntimeContextPtr global_ctx, const String & name, const DataTypePtr & type)
 {
     if (global_ctx->storage_columns.contains(name))
diff --git a/src/Storages/MergeTree/MergeTask.h b/src/Storages/MergeTree/MergeTask.h
index 56909d1b7a0..8b0f2130e8e 100644
--- a/src/Storages/MergeTree/MergeTask.h
+++ b/src/Storages/MergeTree/MergeTask.h
@@ -408,15 +408,8 @@ private:
 
     Stages::const_iterator stages_iterator = stages.begin();
 
-    static bool enabledBlockNumberColumn(GlobalRuntimeContextPtr global_ctx)
-    {
-        return global_ctx->data->getSettings()->enable_block_number_column && global_ctx->metadata_snapshot->getGroupByTTLs().empty();
-    }
-
-    static bool enabledBlockOffsetColumn(GlobalRuntimeContextPtr global_ctx)
-    {
-        return global_ctx->data->getSettings()->enable_block_offset_column && global_ctx->metadata_snapshot->getGroupByTTLs().empty();
-    }
+    static bool enabledBlockNumberColumn(GlobalRuntimeContextPtr global_ctx);
+    static bool enabledBlockOffsetColumn(GlobalRuntimeContextPtr global_ctx);
 
     static void addGatheringColumn(GlobalRuntimeContextPtr global_ctx, const String & name, const DataTypePtr & type);
 };
diff --git a/src/Storages/MergeTree/MergeTreeData.cpp b/src/Storages/MergeTree/MergeTreeData.cpp
index 467a5c82141..59a4032f235 100644
--- a/src/Storages/MergeTree/MergeTreeData.cpp
+++ b/src/Storages/MergeTree/MergeTreeData.cpp
@@ -73,6 +73,7 @@
 #include <Storages/MergeTree/DataPartStorageOnDiskFull.h>
 #include <Storages/MergeTree/MergeTreeDataPartBuilder.h>
 #include <Storages/MergeTree/MergeTreeDataPartCompact.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/Statistics/ConditionSelectivityEstimator.h>
 #include <Storages/MergeTree/MergeTreeSelectProcessor.h>
 #include <Storages/MergeTree/checkDataPart.h>
@@ -6172,6 +6173,11 @@ bool MergeTreeData::hasProjection() const
     return false;
 }
 
+bool MergeTreeData::areAsynchronousInsertsEnabled() const
+{
+    return getSettings()->async_insert;
+}
+
 MergeTreeData::ProjectionPartsVector MergeTreeData::getAllProjectionPartsVector(MergeTreeData::DataPartStateVector * out_states) const
 {
     ProjectionPartsVector res;
@@ -7393,6 +7399,13 @@ std::pair<MergeTreeData::MutableDataPartPtr, scope_guard> MergeTreeData::cloneAn
     return std::make_pair(dst_data_part, std::move(temporary_directory_lock));
 }
 
+bool MergeTreeData::canUseAdaptiveGranularity() const
+{
+    const auto settings = getSettings();
+    return settings->index_granularity_bytes != 0
+        && (settings->enable_mixed_granularity_parts || !has_non_adaptive_index_granularity_parts);
+}
+
 String MergeTreeData::getFullPathOnDisk(const DiskPtr & disk) const
 {
     return disk->getPath() + relative_data_path;
diff --git a/src/Storages/MergeTree/MergeTreeData.h b/src/Storages/MergeTree/MergeTreeData.h
index c8b721038c6..7076b680521 100644
--- a/src/Storages/MergeTree/MergeTreeData.h
+++ b/src/Storages/MergeTree/MergeTreeData.h
@@ -18,7 +18,6 @@
 #include <Storages/MergeTree/BackgroundJobsAssignee.h>
 #include <Storages/MergeTree/MergeTreeIndices.h>
 #include <Storages/MergeTree/MergeTreePartInfo.h>
-#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/MergeTree/MergeTreeMutationStatus.h>
 #include <Storages/MergeTree/MergeList.h>
 #include <Storages/MergeTree/IMergeTreeDataPart.h>
@@ -65,6 +64,7 @@ using BackupEntries = std::vector<std::pair<String, std::shared_ptr<const IBacku
 class MergeTreeTransaction;
 using MergeTreeTransactionPtr = std::shared_ptr<MergeTreeTransaction>;
 
+struct MergeTreeSettings;
 struct WriteSettings;
 
 /// Auxiliary struct holding information about the future merged or mutated part.
@@ -441,7 +441,7 @@ public:
 
     bool hasProjection() const override;
 
-    bool areAsynchronousInsertsEnabled() const override { return getSettings()->async_insert; }
+    bool areAsynchronousInsertsEnabled() const override;
 
     bool supportsTrivialCountOptimization(const StorageSnapshotPtr &, ContextPtr) const override;
 
@@ -860,12 +860,7 @@ public:
 
     /// Returns true if table can create new parts with adaptive granularity
     /// Has additional constraint in replicated version
-    virtual bool canUseAdaptiveGranularity() const
-    {
-        const auto settings = getSettings();
-        return settings->index_granularity_bytes != 0 &&
-            (settings->enable_mixed_granularity_parts || !has_non_adaptive_index_granularity_parts);
-    }
+    virtual bool canUseAdaptiveGranularity() const;
 
     /// Get constant pointer to storage settings.
     /// Copy this pointer into your scope and you will
@@ -1735,14 +1730,6 @@ struct CurrentlySubmergingEmergingTagger
     ~CurrentlySubmergingEmergingTagger();
 };
 
-
-/// TODO: move it somewhere
-[[ maybe_unused ]] static bool needSyncPart(size_t input_rows, size_t input_bytes, const MergeTreeSettings & settings)
-{
-    return ((settings.min_rows_to_fsync_after_merge && input_rows >= settings.min_rows_to_fsync_after_merge)
-        || (settings.min_compressed_bytes_to_fsync_after_merge && input_bytes >= settings.min_compressed_bytes_to_fsync_after_merge));
-}
-
 /// Look at MutationCommands if it contains mutations for AlterConversions, update the counter.
 /// Return true if the counter had been updated
 bool updateAlterConversionsMutations(const MutationCommands & commands, std::atomic<ssize_t> & alter_conversions_mutations, bool remove);
diff --git a/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp b/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
index 2d49e1df19b..3c223b8d748 100644
--- a/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
@@ -11,6 +11,7 @@
 #include <Storages/MergeTree/FutureMergedMutatedPart.h>
 #include <Storages/MergeTree/IMergeTreeDataPart.h>
 #include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/MergeTree/MergeProgress.h>
 #include <Storages/MergeTree/MergeTask.h>
 #include <Storages/MergeTree/ActiveDataPartSet.h>
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp b/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp
index 5c9191dbb54..6dc7e649b06 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp
@@ -1,5 +1,6 @@
 #include <Storages/MergeTree/MergeTreeDataPartWriterOnDisk.h>
 #include <Storages/MergeTree/MergeTreeIndexFullText.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Common/ElapsedTimeProfileEventIncrement.h>
 #include <Common/MemoryTrackerBlockerInThread.h>
 #include <Common/logger_useful.h>
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp b/src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp
index 74ea89a8864..3fbabe1dd52 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp
@@ -7,6 +7,7 @@
 #include <Columns/ColumnSparse.h>
 #include <Common/logger_useful.h>
 #include <Storages/ColumnsDescription.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 
 namespace DB
 {
diff --git a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
index 2e287ff3042..758d6ad6140 100644
--- a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
@@ -6,6 +6,7 @@
 #include <Storages/MergeTree/MergeTreeReadPool.h>
 #include <Storages/MergeTree/MergeTreeIndices.h>
 #include <Storages/MergeTree/MergeTreeIndexReader.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/MergeTree/KeyCondition.h>
 #include <Storages/MergeTree/MergeTreeDataPartUUID.h>
 #include <Storages/MergeTree/StorageFromMergeTreeDataPart.h>
diff --git a/src/Storages/MergeTree/MergeTreeDataWriter.cpp b/src/Storages/MergeTree/MergeTreeDataWriter.cpp
index 5c8aa32949d..bf05f3afaf4 100644
--- a/src/Storages/MergeTree/MergeTreeDataWriter.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataWriter.cpp
@@ -12,6 +12,7 @@
 #include <Storages/MergeTree/DataPartStorageOnDiskFull.h>
 #include <Storages/MergeTree/MergeTreeDataWriter.h>
 #include <Storages/MergeTree/MergedBlockOutputStream.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/MergeTree/RowOrderOptimizer.h>
 #include <Common/ElapsedTimeProfileEventIncrement.h>
 #include <Common/Exception.h>
diff --git a/src/Storages/MergeTree/MergeTreeIOSettings.cpp b/src/Storages/MergeTree/MergeTreeIOSettings.cpp
new file mode 100644
index 00000000000..58c3bd28d6a
--- /dev/null
+++ b/src/Storages/MergeTree/MergeTreeIOSettings.cpp
@@ -0,0 +1,37 @@
+#include <Core/Settings.h>
+#include <DataTypes/ObjectUtils.h>
+#include <Storages/MergeTree/MergeTreeIOSettings.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
+#include <Storages/StorageInMemoryMetadata.h>
+
+namespace DB
+{
+
+MergeTreeWriterSettings::MergeTreeWriterSettings(
+    const Settings & global_settings,
+    const WriteSettings & query_write_settings_,
+    const MergeTreeSettingsPtr & storage_settings,
+    bool can_use_adaptive_granularity_,
+    bool rewrite_primary_key_,
+    bool blocks_are_granules_size_)
+    : min_compress_block_size(
+          storage_settings->min_compress_block_size ? storage_settings->min_compress_block_size : global_settings.min_compress_block_size)
+    , max_compress_block_size(
+          storage_settings->max_compress_block_size ? storage_settings->max_compress_block_size : global_settings.max_compress_block_size)
+    , marks_compression_codec(storage_settings->marks_compression_codec)
+    , marks_compress_block_size(storage_settings->marks_compress_block_size)
+    , compress_primary_key(storage_settings->compress_primary_key)
+    , primary_key_compression_codec(storage_settings->primary_key_compression_codec)
+    , primary_key_compress_block_size(storage_settings->primary_key_compress_block_size)
+    , can_use_adaptive_granularity(can_use_adaptive_granularity_)
+    , rewrite_primary_key(rewrite_primary_key_)
+    , blocks_are_granules_size(blocks_are_granules_size_)
+    , query_write_settings(query_write_settings_)
+    , max_threads_for_annoy_index_creation(global_settings.max_threads_for_annoy_index_creation)
+    , low_cardinality_max_dictionary_size(global_settings.low_cardinality_max_dictionary_size)
+    , low_cardinality_use_single_dictionary_for_part(global_settings.low_cardinality_use_single_dictionary_for_part != 0)
+    , use_compact_variant_discriminators_serialization(storage_settings->use_compact_variant_discriminators_serialization)
+{
+}
+
+}
diff --git a/src/Storages/MergeTree/MergeTreeIOSettings.h b/src/Storages/MergeTree/MergeTreeIOSettings.h
index 04171656fcf..c79ca1e66ee 100644
--- a/src/Storages/MergeTree/MergeTreeIOSettings.h
+++ b/src/Storages/MergeTree/MergeTreeIOSettings.h
@@ -1,15 +1,17 @@
 #pragma once
 #include <cstddef>
-#include <Core/Settings.h>
-#include <Storages/MergeTree/MergeTreeSettings.h>
-#include <IO/WriteSettings.h>
 #include <Compression/CompressionFactory.h>
 #include <Compression/ICompressionCodec.h>
+#include <IO/WriteSettings.h>
 
 
 namespace DB
 {
 
+struct MergeTreeSettings;
+using MergeTreeSettingsPtr = std::shared_ptr<const MergeTreeSettings>;
+struct Settings;
+
 class MMappedFileCache;
 using MMappedFileCachePtr = std::shared_ptr<MMappedFileCache>;
 
@@ -58,27 +60,7 @@ struct MergeTreeWriterSettings
         const MergeTreeSettingsPtr & storage_settings,
         bool can_use_adaptive_granularity_,
         bool rewrite_primary_key_,
-        bool blocks_are_granules_size_ = false)
-        : min_compress_block_size(
-            storage_settings->min_compress_block_size ? storage_settings->min_compress_block_size : global_settings.min_compress_block_size)
-        , max_compress_block_size(
-              storage_settings->max_compress_block_size ? storage_settings->max_compress_block_size
-                                                        : global_settings.max_compress_block_size)
-        , marks_compression_codec(storage_settings->marks_compression_codec)
-        , marks_compress_block_size(storage_settings->marks_compress_block_size)
-        , compress_primary_key(storage_settings->compress_primary_key)
-        , primary_key_compression_codec(storage_settings->primary_key_compression_codec)
-        , primary_key_compress_block_size(storage_settings->primary_key_compress_block_size)
-        , can_use_adaptive_granularity(can_use_adaptive_granularity_)
-        , rewrite_primary_key(rewrite_primary_key_)
-        , blocks_are_granules_size(blocks_are_granules_size_)
-        , query_write_settings(query_write_settings_)
-        , max_threads_for_annoy_index_creation(global_settings.max_threads_for_annoy_index_creation)
-        , low_cardinality_max_dictionary_size(global_settings.low_cardinality_max_dictionary_size)
-        , low_cardinality_use_single_dictionary_for_part(global_settings.low_cardinality_use_single_dictionary_for_part != 0)
-        , use_compact_variant_discriminators_serialization(storage_settings->use_compact_variant_discriminators_serialization)
-    {
-    }
+        bool blocks_are_granules_size_ = false);
 
     size_t min_compress_block_size;
     size_t max_compress_block_size;
diff --git a/src/Storages/MergeTree/MergeTreeIndexGranularityInfo.cpp b/src/Storages/MergeTree/MergeTreeIndexGranularityInfo.cpp
index 62bb31dff68..067a692a3b5 100644
--- a/src/Storages/MergeTree/MergeTreeIndexGranularityInfo.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexGranularityInfo.cpp
@@ -1,5 +1,6 @@
-#include <Storages/MergeTree/MergeTreeIndexGranularityInfo.h>
 #include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/MergeTreeIndexGranularityInfo.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 
 
 namespace fs = std::filesystem;
diff --git a/src/Storages/MergeTree/MergeTreePartsMover.cpp b/src/Storages/MergeTree/MergeTreePartsMover.cpp
index 1db70162bff..9223d6fd5b1 100644
--- a/src/Storages/MergeTree/MergeTreePartsMover.cpp
+++ b/src/Storages/MergeTree/MergeTreePartsMover.cpp
@@ -1,5 +1,6 @@
-#include <Storages/MergeTree/MergeTreePartsMover.h>
 #include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/MergeTreePartsMover.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Common/logger_useful.h>
 
 #include <set>
diff --git a/src/Storages/MergeTree/MergeTreeSequentialSource.cpp b/src/Storages/MergeTree/MergeTreeSequentialSource.cpp
index 02f8d6f4f6a..ecf7ac08294 100644
--- a/src/Storages/MergeTree/MergeTreeSequentialSource.cpp
+++ b/src/Storages/MergeTree/MergeTreeSequentialSource.cpp
@@ -2,6 +2,7 @@
 #include <Storages/MergeTree/MergeTreeBlockReadUtils.h>
 #include <Storages/MergeTree/LoadedMergeTreeDataPartInfoForReader.h>
 #include <Storages/MergeTree/MergeTreeDataSelectExecutor.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/MergeTree/MergeTreeVirtualColumns.h>
 #include <Processors/Transforms/FilterTransform.h>
 #include <Processors/QueryPlan/ISourceStep.h>
diff --git a/src/Storages/MergeTree/MergeTreeSettings.cpp b/src/Storages/MergeTree/MergeTreeSettings.cpp
index 5d6f08d3c53..c968ad84936 100644
--- a/src/Storages/MergeTree/MergeTreeSettings.cpp
+++ b/src/Storages/MergeTree/MergeTreeSettings.cpp
@@ -115,6 +115,16 @@ void MergeTreeSettings::loadFromQuery(ASTStorage & storage_def, ContextPtr conte
 #undef ADD_IF_ABSENT
 }
 
+bool MergeTreeSettings::isReadonlySetting(const String & name)
+{
+    return name == "index_granularity" || name == "index_granularity_bytes" || name == "enable_mixed_granularity_parts";
+}
+
+bool MergeTreeSettings::isPartFormatSetting(const String & name)
+{
+    return name == "min_bytes_for_wide_part" || name == "min_rows_for_wide_part";
+}
+
 void MergeTreeSettings::sanityCheck(size_t background_pool_tasks) const
 {
     if (number_of_free_entries_in_pool_to_execute_mutation > background_pool_tasks)
diff --git a/src/Storages/MergeTree/MergeTreeSettings.h b/src/Storages/MergeTree/MergeTreeSettings.h
index c0afd781c7e..f5ada81cf55 100644
--- a/src/Storages/MergeTree/MergeTreeSettings.h
+++ b/src/Storages/MergeTree/MergeTreeSettings.h
@@ -268,17 +268,8 @@ struct MergeTreeSettings : public BaseSettings<MergeTreeSettingsTraits>, public
     /// NOTE: will rewrite the AST to add immutable settings.
     void loadFromQuery(ASTStorage & storage_def, ContextPtr context, bool is_attach);
 
-    /// We check settings after storage creation
-    static bool isReadonlySetting(const String & name)
-    {
-        return name == "index_granularity" || name == "index_granularity_bytes"
-            || name == "enable_mixed_granularity_parts";
-    }
-
-    static bool isPartFormatSetting(const String & name)
-    {
-        return name == "min_bytes_for_wide_part" || name == "min_rows_for_wide_part";
-    }
+    static bool isReadonlySetting(const String & name);
+    static bool isPartFormatSetting(const String & name);
 
     /// Check that the values are sane taking also query-level settings into account.
     void sanityCheck(size_t background_pool_tasks) const;
@@ -295,4 +286,10 @@ namespace MergeTreeColumnSettings
     void validate(const SettingsChanges & changes);
 }
 
+[[maybe_unused]] static bool needSyncPart(size_t input_rows, size_t input_bytes, const MergeTreeSettings & settings)
+{
+    return (
+        (settings.min_rows_to_fsync_after_merge && input_rows >= settings.min_rows_to_fsync_after_merge)
+        || (settings.min_compressed_bytes_to_fsync_after_merge && input_bytes >= settings.min_compressed_bytes_to_fsync_after_merge));
+}
 }
diff --git a/src/Storages/MergeTree/MutateFromLogEntryTask.cpp b/src/Storages/MergeTree/MutateFromLogEntryTask.cpp
index 4c96cbf2c97..73084f487b9 100644
--- a/src/Storages/MergeTree/MutateFromLogEntryTask.cpp
+++ b/src/Storages/MergeTree/MutateFromLogEntryTask.cpp
@@ -2,6 +2,7 @@
 
 #include <Common/logger_useful.h>
 #include <Common/ProfileEvents.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/StorageReplicatedMergeTree.h>
 #include <cmath>
 
diff --git a/src/Storages/MergeTree/MutateTask.cpp b/src/Storages/MergeTree/MutateTask.cpp
index a552ee89aee..35333af4b03 100644
--- a/src/Storages/MergeTree/MutateTask.cpp
+++ b/src/Storages/MergeTree/MutateTask.cpp
@@ -1,5 +1,6 @@
 #include <Storages/MergeTree/MutateTask.h>
 
+#include <DataTypes/ObjectUtils.h>
 #include <IO/HashingWriteBuffer.h>
 #include <Common/logger_useful.h>
 #include <Common/escapeForFileName.h>
@@ -19,11 +20,13 @@
 #include <Processors/Transforms/MaterializingTransform.h>
 #include <Processors/Executors/PullingPipelineExecutor.h>
 #include <Processors/QueryPlan/CreatingSetsStep.h>
+#include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
 #include <Storages/MergeTree/StorageFromMergeTreeDataPart.h>
 #include <Storages/MergeTree/MergeTreeDataWriter.h>
 #include <Storages/MutationCommands.h>
 #include <Storages/MergeTree/MergeTreeDataMergerMutator.h>
 #include <Storages/MergeTree/MergeTreeIndexFullText.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/MergeTree/MergeTreeVirtualColumns.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeVariant.h>
@@ -32,6 +35,7 @@
 #include <Core/ColumnsWithTypeAndName.h>
 
 
+
 namespace ProfileEvents
 {
 extern const Event MutateTaskProjectionsCalculationMicroseconds;
diff --git a/src/Storages/MergeTree/PartMovesBetweenShardsOrchestrator.cpp b/src/Storages/MergeTree/PartMovesBetweenShardsOrchestrator.cpp
index 4228d7b70b6..10c7bef72fc 100644
--- a/src/Storages/MergeTree/PartMovesBetweenShardsOrchestrator.cpp
+++ b/src/Storages/MergeTree/PartMovesBetweenShardsOrchestrator.cpp
@@ -1,5 +1,6 @@
 #include <Storages/MergeTree/PartMovesBetweenShardsOrchestrator.h>
 #include <Storages/MergeTree/PinnedPartUUIDs.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/StorageReplicatedMergeTree.h>
 #include <Common/ZooKeeper/KeeperException.h>
 #include <Poco/JSON/JSON.h>
diff --git a/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.cpp b/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.cpp
index 2fc5238827d..24929365b72 100644
--- a/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.cpp
@@ -1,8 +1,9 @@
 #include <Storages/MergeTree/ReplicatedMergeMutateTaskBase.h>
 
-#include <Storages/StorageReplicatedMergeTree.h>
 #include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/MergeTree/ReplicatedMergeTreeQueue.h>
+#include <Storages/StorageReplicatedMergeTree.h>
 #include <Common/ProfileEventsScope.h>
 
 
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeAttachThread.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeAttachThread.cpp
index 336d19692d4..6e22a3515bc 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeAttachThread.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeAttachThread.cpp
@@ -1,3 +1,4 @@
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/MergeTree/ReplicatedMergeTreeAttachThread.h>
 #include <Storages/StorageReplicatedMergeTree.h>
 #include <Common/ZooKeeper/IKeeper.h>
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp
index 328c03a5b94..7aef249c366 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp
@@ -1,13 +1,14 @@
+#include <Interpreters/Context.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h>
 #include <Storages/StorageReplicatedMergeTree.h>
-#include <Poco/Timestamp.h>
-#include <Interpreters/Context.h>
 #include <Common/ZooKeeper/KeeperException.h>
 
 #include <random>
 #include <unordered_set>
 
 #include <base/sort.h>
+#include <Poco/Timestamp.h>
 
 
 namespace DB
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.cpp
index 192f0d23f96..3e64a4c7c52 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.cpp
@@ -1,6 +1,7 @@
+#include <Storages/MergeTree/MergeTreeSettings.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeLogEntry.h>
 #include <Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.h>
 #include <Storages/StorageReplicatedMergeTree.h>
-#include <Storages/MergeTree/ReplicatedMergeTreeLogEntry.h>
 
 #include <base/types.h>
 #include <base/sort.h>
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp b/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp
index d7601e6e638..dc242a7b084 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp
@@ -1,5 +1,6 @@
 #include <Storages/MergeTree/ReplicatedMergeTreePartCheckThread.h>
 #include <Storages/MergeTree/checkDataPart.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/MergeTree/ReplicatedMergeTreePartHeader.h>
 #include <Storages/StorageReplicatedMergeTree.h>
 #include <Common/ThreadFuzzer.h>
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
index 30ba95c46f0..627bda3f8bf 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
@@ -2,6 +2,7 @@
 #include <Storages/StorageReplicatedMergeTree.h>
 #include <Storages/MergeTree/IMergeTreeDataPart.h>
 #include <Storages/MergeTree/MergeTreeDataMergerMutator.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h>
 #include <Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.h>
 #include <IO/ReadHelpers.h>
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
index 35f355d1d9b..268cead2a0e 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
@@ -1,5 +1,6 @@
 #include <IO/Operators.h>
 #include <Storages/StorageReplicatedMergeTree.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h>
 #include <Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h>
 #include <Storages/MergeTree/ReplicatedMergeTreeAddress.h>
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp
index 4b4f4c33e7d..0fd7d93b9aa 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp
@@ -11,6 +11,7 @@
 #include <Common/ThreadFuzzer.h>
 #include <Storages/MergeTree/MergeAlgorithm.h>
 #include <Storages/MergeTree/MergeTreeDataWriter.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/MergeTree/AsyncBlockIDsCache.h>
 #include <DataTypes/ObjectUtils.h>
 #include <Core/Block.h>
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.cpp
index 287a4d20543..c4bae5352cb 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.cpp
@@ -1,5 +1,6 @@
 #include <Storages/MergeTree/ReplicatedMergeTreeTableMetadata.h>
 #include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Parsers/formatAST.h>
 #include <Parsers/parseQuery.h>
 #include <Parsers/ASTFunction.h>
diff --git a/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h b/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h
index a94508ad41f..731c30f4b79 100644
--- a/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h
+++ b/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h
@@ -1,16 +1,12 @@
 #pragma once
 
+#include <Core/Defines.h>
 #include <Storages/IStorage.h>
 #include <Storages/MergeTree/IMergeTreeDataPart.h>
 #include <Storages/MergeTree/MergeTreeDataSelectExecutor.h>
 #include <Storages/MergeTree/AlterConversions.h>
-#include <DataTypes/ObjectUtils.h>
-#include <Processors/QueryPlan/QueryPlan.h>
-#include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
-#include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
-#include <Core/Defines.h>
-#include <Common/Exception.h>
+
 
 
 namespace DB
@@ -21,6 +17,8 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
+class QueryPlan;
+
 /// A Storage that allows reading from a single MergeTree data part.
 class StorageFromMergeTreeDataPart final : public IStorage
 {
@@ -46,20 +44,7 @@ public:
 
     String getName() const override { return "FromMergeTreeDataPart"; }
 
-    StorageSnapshotPtr getStorageSnapshot(
-        const StorageMetadataPtr & metadata_snapshot, ContextPtr /*query_context*/) const override
-    {
-        const auto & storage_columns = metadata_snapshot->getColumns();
-        if (!hasDynamicSubcolumns(storage_columns))
-            return std::make_shared<StorageSnapshot>(*this, metadata_snapshot);
-
-        auto data_parts = storage.getDataPartsVectorForInternalUsage();
-
-        auto object_columns = getConcreteObjectColumns(
-            data_parts.begin(), data_parts.end(), storage_columns, [](const auto & part) -> const auto & { return part->getColumns(); });
-
-        return std::make_shared<StorageSnapshot>(*this, metadata_snapshot, std::move(object_columns));
-    }
+    StorageSnapshotPtr getStorageSnapshot(const StorageMetadataPtr & metadata_snapshot, ContextPtr /*query_context*/) const override;
 
     void read(
         QueryPlan & query_plan,
@@ -69,21 +54,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum /*processed_stage*/,
         size_t max_block_size,
-        size_t num_streams) override
-    {
-        query_plan.addStep(MergeTreeDataSelectExecutor(storage)
-                                              .readFromParts(
-                                                  parts,
-                                                  alter_conversions,
-                                                  column_names,
-                                                  storage_snapshot,
-                                                  query_info,
-                                                  context,
-                                                  max_block_size,
-                                                  num_streams,
-                                                  nullptr,
-                                                  analysis_result_ptr));
-    }
+        size_t num_streams) override;
 
     bool supportsPrewhere() const override { return true; }
 
@@ -102,12 +73,7 @@ public:
         return storage.getPartitionIDFromQuery(ast, context);
     }
 
-    bool materializeTTLRecalculateOnly() const
-    {
-        if (parts.empty())
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "parts must not be empty for materializeTTLRecalculateOnly");
-        return parts.front()->storage.getSettings()->materialize_ttl_recalculate_only;
-    }
+    bool materializeTTLRecalculateOnly() const;
 
     bool hasLightweightDeletedMask() const override
     {
diff --git a/src/Storages/MergeTree/checkDataPart.cpp b/src/Storages/MergeTree/checkDataPart.cpp
index 525960d5314..774fd95ebc6 100644
--- a/src/Storages/MergeTree/checkDataPart.cpp
+++ b/src/Storages/MergeTree/checkDataPart.cpp
@@ -6,6 +6,7 @@
 #include <Storages/MergeTree/MergeTreeIndexGranularity.h>
 #include <Storages/MergeTree/checkDataPart.h>
 #include <Storages/MergeTree/MergeTreeDataPartCompact.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/MergeTree/IDataPartStorage.h>
 #include <Interpreters/Cache/FileCache.h>
 #include <Interpreters/Cache/FileCacheFactory.h>
diff --git a/src/Storages/MergeTree/registerStorageMergeTree.cpp b/src/Storages/MergeTree/registerStorageMergeTree.cpp
index d234103e52b..0ada6fae220 100644
--- a/src/Storages/MergeTree/registerStorageMergeTree.cpp
+++ b/src/Storages/MergeTree/registerStorageMergeTree.cpp
@@ -1,6 +1,7 @@
 #include <Databases/DatabaseReplicatedHelpers.h>
 #include <Storages/MergeTree/MergeTreeIndexMinMax.h>
 #include <Storages/MergeTree/MergeTreeIndices.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/MergeTree/extractZooKeeperPathFromReplicatedTableDef.h>
 #include <Storages/StorageFactory.h>
 #include <Storages/StorageMergeTree.h>
diff --git a/src/Storages/StorageFromMergeTreeDataPart.cpp b/src/Storages/StorageFromMergeTreeDataPart.cpp
new file mode 100644
index 00000000000..37e142d246a
--- /dev/null
+++ b/src/Storages/StorageFromMergeTreeDataPart.cpp
@@ -0,0 +1,54 @@
+#include <DataTypes/ObjectUtils.h>
+#include <Processors/QueryPlan/QueryPlan.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
+#include <Storages/MergeTree/StorageFromMergeTreeDataPart.h>
+
+namespace DB
+{
+
+bool StorageFromMergeTreeDataPart::materializeTTLRecalculateOnly() const
+{
+    if (parts.empty())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "parts must not be empty for materializeTTLRecalculateOnly");
+    return parts.front()->storage.getSettings()->materialize_ttl_recalculate_only;
+}
+
+void StorageFromMergeTreeDataPart::read(
+    QueryPlan & query_plan,
+    const Names & column_names,
+    const StorageSnapshotPtr & storage_snapshot,
+    SelectQueryInfo & query_info,
+    ContextPtr context,
+    QueryProcessingStage::Enum /*processed_stage*/,
+    size_t max_block_size,
+    size_t num_streams)
+{
+    query_plan.addStep(MergeTreeDataSelectExecutor(storage).readFromParts(
+        parts,
+        alter_conversions,
+        column_names,
+        storage_snapshot,
+        query_info,
+        context,
+        max_block_size,
+        num_streams,
+        nullptr,
+        analysis_result_ptr));
+}
+
+StorageSnapshotPtr
+StorageFromMergeTreeDataPart::getStorageSnapshot(const StorageMetadataPtr & metadata_snapshot, ContextPtr /*query_context*/) const
+{
+    const auto & storage_columns = metadata_snapshot->getColumns();
+    if (!hasDynamicSubcolumns(storage_columns))
+        return std::make_shared<StorageSnapshot>(*this, metadata_snapshot);
+
+    auto data_parts = storage.getDataPartsVectorForInternalUsage();
+
+    auto object_columns = getConcreteObjectColumns(
+        data_parts.begin(), data_parts.end(), storage_columns, [](const auto & part) -> const auto & { return part->getColumns(); });
+
+    return std::make_shared<StorageSnapshot>(*this, metadata_snapshot, std::move(object_columns));
+}
+
+}
diff --git a/src/Storages/StorageMergeTree.cpp b/src/Storages/StorageMergeTree.cpp
index 20ad064f1fc..65afd9c3230 100644
--- a/src/Storages/StorageMergeTree.cpp
+++ b/src/Storages/StorageMergeTree.cpp
@@ -32,6 +32,7 @@
 #include <Storages/MergeTree/MergeList.h>
 #include <Storages/MergeTree/MergePlainMergeTreeTask.h>
 #include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/MergeTree/MergeTreeSink.h>
 #include <Storages/MergeTree/PartitionPruner.h>
 #include <Storages/MergeTree/checkDataPart.h>
diff --git a/src/Storages/StorageReplicatedMergeTree.cpp b/src/Storages/StorageReplicatedMergeTree.cpp
index 13b7cc582a9..af0dd59213c 100644
--- a/src/Storages/StorageReplicatedMergeTree.cpp
+++ b/src/Storages/StorageReplicatedMergeTree.cpp
@@ -39,6 +39,7 @@
 #include <Storages/MergeTree/MergeTreeDataFormatVersion.h>
 #include <Storages/MergeTree/MergeTreePartInfo.h>
 #include <Storages/MergeTree/MergeTreeReaderCompact.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/MergeTree/MutateFromLogEntryTask.h>
 #include <Storages/MergeTree/PinnedPartUUIDs.h>
 #include <Storages/MergeTree/ReplicatedMergeTreeAddress.h>
diff --git a/src/Storages/System/StorageSystemMergeTreeSettings.cpp b/src/Storages/System/StorageSystemMergeTreeSettings.cpp
index 7781e3789a4..db8fd55cfc5 100644
--- a/src/Storages/System/StorageSystemMergeTreeSettings.cpp
+++ b/src/Storages/System/StorageSystemMergeTreeSettings.cpp
@@ -2,6 +2,7 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <Interpreters/Context.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/System/StorageSystemMergeTreeSettings.h>
 #include <Access/SettingsConstraintsAndProfileIDs.h>
 
diff --git a/src/Storages/System/StorageSystemMergeTreeSettings.h b/src/Storages/System/StorageSystemMergeTreeSettings.h
index e2913a7e55b..4d4150dcec2 100644
--- a/src/Storages/System/StorageSystemMergeTreeSettings.h
+++ b/src/Storages/System/StorageSystemMergeTreeSettings.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 

From 314174013b95c4bff17ed05b835391c5c4290834 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= <git@rmr.ninja>
Date: Wed, 10 Jul 2024 18:10:19 +0200
Subject: [PATCH 19/51] Reduce dependencies on ServerSettings.h

---
 programs/local/LocalServer.h                        | 7 ++++---
 src/Backups/DDLAdjustingForBackupVisitor.cpp        | 6 +++---
 src/BridgeHelper/LibraryBridgeHelper.cpp            | 1 +
 src/Databases/DatabaseOrdinary.cpp                  | 1 +
 src/Databases/DatabaseReplicated.cpp                | 1 +
 src/Dictionaries/HTTPDictionarySource.cpp           | 3 ++-
 src/Dictionaries/XDBCDictionarySource.cpp           | 1 +
 src/Disks/IO/ReadBufferFromWebServer.cpp            | 6 ++++--
 src/Disks/ObjectStorages/Web/WebObjectStorage.cpp   | 2 ++
 src/IO/ConnectionTimeouts.cpp                       | 4 +++-
 src/IO/ConnectionTimeouts.h                         | 2 +-
 src/IO/S3/copyS3File.cpp                            | 6 +++---
 src/Interpreters/InterpreterSystemQuery.cpp         | 1 +
 src/Server/HTTP/sendExceptionToHTTPClient.cpp       | 1 +
 src/Server/HTTPHandler.cpp                          | 1 +
 src/Server/InterserverIOHTTPHandler.cpp             | 1 +
 src/Server/NotFoundHandler.cpp                      | 1 +
 src/Server/ReplicasStatusHandler.cpp                | 1 +
 src/Server/StaticRequestHandler.cpp                 | 5 +++--
 src/Server/WebUIRequestHandler.cpp                  | 3 ++-
 src/Storages/MergeTree/registerStorageMergeTree.cpp | 1 +
 src/Storages/StorageReplicatedMergeTree.cpp         | 1 +
 src/Storages/StorageURL.cpp                         | 1 +
 src/Storages/StorageXDBC.cpp                        | 1 +
 src/TableFunctions/ITableFunctionXDBC.cpp           | 7 ++++---
 25 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/programs/local/LocalServer.h b/programs/local/LocalServer.h
index da2466650a7..0715f358313 100644
--- a/programs/local/LocalServer.h
+++ b/programs/local/LocalServer.h
@@ -3,11 +3,12 @@
 #include <Client/ClientBase.h>
 #include <Client/LocalConnection.h>
 
-#include <Common/StatusFile.h>
-#include <Common/InterruptListener.h>
-#include <Loggers/Loggers.h>
+#include <Core/ServerSettings.h>
 #include <Core/Settings.h>
 #include <Interpreters/Context.h>
+#include <Loggers/Loggers.h>
+#include <Common/InterruptListener.h>
+#include <Common/StatusFile.h>
 
 #include <filesystem>
 #include <memory>
diff --git a/src/Backups/DDLAdjustingForBackupVisitor.cpp b/src/Backups/DDLAdjustingForBackupVisitor.cpp
index 7e5ce91629b..910831195a3 100644
--- a/src/Backups/DDLAdjustingForBackupVisitor.cpp
+++ b/src/Backups/DDLAdjustingForBackupVisitor.cpp
@@ -1,11 +1,11 @@
 #include <Backups/DDLAdjustingForBackupVisitor.h>
+#include <Core/ServerSettings.h>
+#include <Interpreters/Context.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTLiteral.h>
-#include <Interpreters/Context.h>
-#include <Storages/StorageReplicatedMergeTree.h>
-
 #include <Parsers/formatAST.h>
+#include <Storages/StorageReplicatedMergeTree.h>
 
 
 namespace DB
diff --git a/src/BridgeHelper/LibraryBridgeHelper.cpp b/src/BridgeHelper/LibraryBridgeHelper.cpp
index 84bfe096e79..57baf7e5a33 100644
--- a/src/BridgeHelper/LibraryBridgeHelper.cpp
+++ b/src/BridgeHelper/LibraryBridgeHelper.cpp
@@ -1,5 +1,6 @@
 #include "LibraryBridgeHelper.h"
 
+#include <Core/ServerSettings.h>
 #include <IO/ConnectionTimeouts.h>
 
 namespace DB
diff --git a/src/Databases/DatabaseOrdinary.cpp b/src/Databases/DatabaseOrdinary.cpp
index 46830861c75..6555c4444e2 100644
--- a/src/Databases/DatabaseOrdinary.cpp
+++ b/src/Databases/DatabaseOrdinary.cpp
@@ -1,5 +1,6 @@
 #include <filesystem>
 
+#include <Core/ServerSettings.h>
 #include <Core/Settings.h>
 #include <Databases/DatabaseFactory.h>
 #include <Databases/DatabaseOnDisk.h>
diff --git a/src/Databases/DatabaseReplicated.cpp b/src/Databases/DatabaseReplicated.cpp
index 4ca9afc49eb..7b8955f7111 100644
--- a/src/Databases/DatabaseReplicated.cpp
+++ b/src/Databases/DatabaseReplicated.cpp
@@ -13,6 +13,7 @@
 #include <Common/ZooKeeper/Types.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Common/PoolId.h>
+#include <Core/ServerSettings.h>
 #include <Databases/DatabaseFactory.h>
 #include <Databases/DatabaseReplicated.h>
 #include <Databases/DatabaseReplicatedWorker.h>
diff --git a/src/Dictionaries/HTTPDictionarySource.cpp b/src/Dictionaries/HTTPDictionarySource.cpp
index dae8ec06d30..663c63dd6c6 100644
--- a/src/Dictionaries/HTTPDictionarySource.cpp
+++ b/src/Dictionaries/HTTPDictionarySource.cpp
@@ -1,12 +1,13 @@
 #include "HTTPDictionarySource.h"
+#include <Core/ServerSettings.h>
 #include <Formats/formatBlock.h>
 #include <IO/ConnectionTimeouts.h>
 #include <IO/ReadWriteBufferFromHTTP.h>
 #include <IO/WriteBufferFromOStream.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/WriteHelpers.h>
-#include <Processors/Formats/IInputFormat.h>
 #include <Interpreters/Context.h>
+#include <Processors/Formats/IInputFormat.h>
 #include <Storages/ExternalDataSourceConfiguration.h>
 #include <Poco/Net/HTTPRequest.h>
 #include <Common/logger_useful.h>
diff --git a/src/Dictionaries/XDBCDictionarySource.cpp b/src/Dictionaries/XDBCDictionarySource.cpp
index 1ebfc4a29b0..65a9f806722 100644
--- a/src/Dictionaries/XDBCDictionarySource.cpp
+++ b/src/Dictionaries/XDBCDictionarySource.cpp
@@ -15,6 +15,7 @@
 #include "readInvalidateQuery.h"
 #include "registerDictionaries.h"
 #include <Common/escapeForFileName.h>
+#include <Core/ServerSettings.h>
 #include <QueryPipeline/QueryPipeline.h>
 #include <Processors/Formats/IInputFormat.h>
 #include "config.h"
diff --git a/src/Disks/IO/ReadBufferFromWebServer.cpp b/src/Disks/IO/ReadBufferFromWebServer.cpp
index 7c5de8a13de..af4fae6b723 100644
--- a/src/Disks/IO/ReadBufferFromWebServer.cpp
+++ b/src/Disks/IO/ReadBufferFromWebServer.cpp
@@ -1,9 +1,11 @@
 #include "ReadBufferFromWebServer.h"
 
-#include <Common/logger_useful.h>
+#include <Core/ServerSettings.h>
+#include <IO/Operators.h>
 #include <IO/ReadWriteBufferFromHTTP.h>
 #include <IO/WriteBufferFromString.h>
-#include <IO/Operators.h>
+#include <Common/logger_useful.h>
+
 #include <thread>
 
 
diff --git a/src/Disks/ObjectStorages/Web/WebObjectStorage.cpp b/src/Disks/ObjectStorages/Web/WebObjectStorage.cpp
index e837e056acc..7f7a3fe1a62 100644
--- a/src/Disks/ObjectStorages/Web/WebObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/Web/WebObjectStorage.cpp
@@ -3,6 +3,8 @@
 #include <Common/logger_useful.h>
 #include <Common/escapeForFileName.h>
 
+#include <Core/ServerSettings.h>
+
 #include <IO/ReadWriteBufferFromHTTP.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
diff --git a/src/IO/ConnectionTimeouts.cpp b/src/IO/ConnectionTimeouts.cpp
index da6214ae477..c2eb67c6f3b 100644
--- a/src/IO/ConnectionTimeouts.cpp
+++ b/src/IO/ConnectionTimeouts.cpp
@@ -1,7 +1,9 @@
+#include <Core/ServerSettings.h>
 #include <IO/ConnectionTimeouts.h>
-#include <Poco/Util/AbstractConfiguration.h>
 #include <Interpreters/Context.h>
 
+#include <Poco/Util/AbstractConfiguration.h>
+
 namespace DB
 {
 
diff --git a/src/IO/ConnectionTimeouts.h b/src/IO/ConnectionTimeouts.h
index b86ec44d21c..b84db46d656 100644
--- a/src/IO/ConnectionTimeouts.h
+++ b/src/IO/ConnectionTimeouts.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <Core/Defines.h>
-#include <Core/ServerSettings.h>
 #include <Interpreters/Context_fwd.h>
 
 #include <Poco/Net/HTTPClientSession.h>
@@ -10,6 +9,7 @@
 namespace DB
 {
 
+struct ServerSettings;
 struct Settings;
 
 #define APPLY_FOR_ALL_CONNECTION_TIMEOUT_MEMBERS(M) \
diff --git a/src/IO/S3/copyS3File.cpp b/src/IO/S3/copyS3File.cpp
index bb654c3f5c9..db10b4c2086 100644
--- a/src/IO/S3/copyS3File.cpp
+++ b/src/IO/S3/copyS3File.cpp
@@ -290,9 +290,9 @@ namespace
             if (!total_size)
                 throw Exception(ErrorCodes::LOGICAL_ERROR, "Chosen multipart upload for an empty file. This must not happen");
 
-            auto max_part_number = request_settings.max_part_number;
-            auto min_upload_part_size = request_settings.min_upload_part_size;
-            auto max_upload_part_size = request_settings.max_upload_part_size;
+            UInt64 max_part_number = request_settings.max_part_number;
+            UInt64 min_upload_part_size = request_settings.min_upload_part_size;
+            UInt64 max_upload_part_size = request_settings.max_upload_part_size;
 
             if (!max_part_number)
                 throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "max_part_number must not be 0");
diff --git a/src/Interpreters/InterpreterSystemQuery.cpp b/src/Interpreters/InterpreterSystemQuery.cpp
index d3526941b33..c284acfa308 100644
--- a/src/Interpreters/InterpreterSystemQuery.cpp
+++ b/src/Interpreters/InterpreterSystemQuery.cpp
@@ -12,6 +12,7 @@
 #include <Common/FailPoint.h>
 #include <Common/PageCache.h>
 #include <Common/HostResolvePool.h>
+#include <Core/ServerSettings.h>
 #include <Interpreters/Cache/FileCacheFactory.h>
 #include <Interpreters/Cache/FileCache.h>
 #include <Interpreters/Context.h>
diff --git a/src/Server/HTTP/sendExceptionToHTTPClient.cpp b/src/Server/HTTP/sendExceptionToHTTPClient.cpp
index 78650758e35..022a763a9a2 100644
--- a/src/Server/HTTP/sendExceptionToHTTPClient.cpp
+++ b/src/Server/HTTP/sendExceptionToHTTPClient.cpp
@@ -1,5 +1,6 @@
 #include <Server/HTTP/sendExceptionToHTTPClient.h>
 
+#include <IO/WriteHelpers.h>
 #include <Server/HTTP/HTTPServerRequest.h>
 #include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
 #include <Server/HTTP/exceptionCodeToHTTPStatus.h>
diff --git a/src/Server/HTTPHandler.cpp b/src/Server/HTTPHandler.cpp
index 370af79e456..75901e6b901 100644
--- a/src/Server/HTTPHandler.cpp
+++ b/src/Server/HTTPHandler.cpp
@@ -4,6 +4,7 @@
 #include <Compression/CompressedReadBuffer.h>
 #include <Compression/CompressedWriteBuffer.h>
 #include <Core/ExternalTable.h>
+#include <Core/ServerSettings.h>
 #include <Disks/StoragePolicy.h>
 #include <IO/CascadeWriteBuffer.h>
 #include <IO/ConcatReadBuffer.h>
diff --git a/src/Server/InterserverIOHTTPHandler.cpp b/src/Server/InterserverIOHTTPHandler.cpp
index 45c28babe3a..e46021c8e68 100644
--- a/src/Server/InterserverIOHTTPHandler.cpp
+++ b/src/Server/InterserverIOHTTPHandler.cpp
@@ -3,6 +3,7 @@
 #include <Server/IServer.h>
 
 #include <Compression/CompressedWriteBuffer.h>
+#include <Core/ServerSettings.h>
 #include <IO/ReadBufferFromIStream.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/InterserverIOHandler.h>
diff --git a/src/Server/NotFoundHandler.cpp b/src/Server/NotFoundHandler.cpp
index 38f56921c89..304021ee8dc 100644
--- a/src/Server/NotFoundHandler.cpp
+++ b/src/Server/NotFoundHandler.cpp
@@ -1,6 +1,7 @@
 #include <Server/NotFoundHandler.h>
 
 #include <IO/HTTPCommon.h>
+#include <IO/Operators.h>
 #include <Common/Exception.h>
 
 namespace DB
diff --git a/src/Server/ReplicasStatusHandler.cpp b/src/Server/ReplicasStatusHandler.cpp
index 5a29612c263..f43357db0a8 100644
--- a/src/Server/ReplicasStatusHandler.cpp
+++ b/src/Server/ReplicasStatusHandler.cpp
@@ -1,5 +1,6 @@
 #include <Server/ReplicasStatusHandler.h>
 
+#include <Core/ServerSettings.h>
 #include <Databases/IDatabase.h>
 #include <IO/HTTPCommon.h>
 #include <Interpreters/Context.h>
diff --git a/src/Server/StaticRequestHandler.cpp b/src/Server/StaticRequestHandler.cpp
index 331b7a84857..f3981dea9fb 100644
--- a/src/Server/StaticRequestHandler.cpp
+++ b/src/Server/StaticRequestHandler.cpp
@@ -4,13 +4,14 @@
 #include "HTTPHandlerFactory.h"
 #include "HTTPResponseHeaderWriter.h"
 
+#include <Core/ServerSettings.h>
 #include <IO/HTTPCommon.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/WriteBufferFromString.h>
-#include <IO/copyData.h>
 #include <IO/WriteHelpers.h>
-#include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
+#include <IO/copyData.h>
 #include <Interpreters/Context.h>
+#include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
 
 #include <Common/Exception.h>
 
diff --git a/src/Server/WebUIRequestHandler.cpp b/src/Server/WebUIRequestHandler.cpp
index 68d3ff0b325..a3d098014e7 100644
--- a/src/Server/WebUIRequestHandler.cpp
+++ b/src/Server/WebUIRequestHandler.cpp
@@ -5,8 +5,9 @@
 #include <Poco/Net/HTTPServerResponse.h>
 #include <Poco/Util/LayeredConfiguration.h>
 
-#include <Interpreters/Context.h>
+#include <Core/ServerSettings.h>
 #include <IO/HTTPCommon.h>
+#include <Interpreters/Context.h>
 #include <Common/re2.h>
 
 #include <incbin.h>
diff --git a/src/Storages/MergeTree/registerStorageMergeTree.cpp b/src/Storages/MergeTree/registerStorageMergeTree.cpp
index 0ada6fae220..343c2c1008e 100644
--- a/src/Storages/MergeTree/registerStorageMergeTree.cpp
+++ b/src/Storages/MergeTree/registerStorageMergeTree.cpp
@@ -7,6 +7,7 @@
 #include <Storages/StorageMergeTree.h>
 #include <Storages/StorageReplicatedMergeTree.h>
 
+#include <Core/ServerSettings.h>
 #include <Common/Macros.h>
 #include <Common/OptimizedRegularExpression.h>
 #include <Common/typeid_cast.h>
diff --git a/src/Storages/StorageReplicatedMergeTree.cpp b/src/Storages/StorageReplicatedMergeTree.cpp
index af0dd59213c..dffc5f08aa2 100644
--- a/src/Storages/StorageReplicatedMergeTree.cpp
+++ b/src/Storages/StorageReplicatedMergeTree.cpp
@@ -20,6 +20,7 @@
 #include <Common/FailPoint.h>
 #include <Common/randomDelay.h>
 
+#include <Core/ServerSettings.h>
 #include <Core/ServerUUID.h>
 
 #include <Disks/ObjectStorages/IMetadataStorage.h>
diff --git a/src/Storages/StorageURL.cpp b/src/Storages/StorageURL.cpp
index 895da028fc2..cd1282bb02c 100644
--- a/src/Storages/StorageURL.cpp
+++ b/src/Storages/StorageURL.cpp
@@ -36,6 +36,7 @@
 #include <Common/thread_local_rng.h>
 #include <Common/logger_useful.h>
 #include <Common/re2.h>
+#include <Core/ServerSettings.h>
 #include <IO/ReadWriteBufferFromHTTP.h>
 #include <IO/HTTPHeaderEntries.h>
 
diff --git a/src/Storages/StorageXDBC.cpp b/src/Storages/StorageXDBC.cpp
index fb8fa2d6da4..b1bcae0f7e9 100644
--- a/src/Storages/StorageXDBC.cpp
+++ b/src/Storages/StorageXDBC.cpp
@@ -4,6 +4,7 @@
 #include <Storages/transformQueryForExternalDatabase.h>
 #include <Storages/checkAndGetLiteralArgument.h>
 
+#include <Core/ServerSettings.h>
 #include <Formats/FormatFactory.h>
 #include <IO/ConnectionTimeouts.h>
 #include <Interpreters/Context.h>
diff --git a/src/TableFunctions/ITableFunctionXDBC.cpp b/src/TableFunctions/ITableFunctionXDBC.cpp
index a5c16b3a5aa..043712f97b8 100644
--- a/src/TableFunctions/ITableFunctionXDBC.cpp
+++ b/src/TableFunctions/ITableFunctionXDBC.cpp
@@ -1,8 +1,9 @@
+#include <Core/ServerSettings.h>
 #include <DataTypes/DataTypeFactory.h>
-#include <IO/ReadHelpers.h>
-#include <IO/WriteHelpers.h>
-#include <IO/ReadWriteBufferFromHTTP.h>
 #include <IO/ConnectionTimeouts.h>
+#include <IO/ReadHelpers.h>
+#include <IO/ReadWriteBufferFromHTTP.h>
+#include <IO/WriteHelpers.h>
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTLiteral.h>

From d2f89a044a41eab1ffd1bf6241525e022c5143cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= <git@rmr.ninja>
Date: Wed, 10 Jul 2024 18:20:39 +0200
Subject: [PATCH 20/51] Reduce dependencies on CoordinationSettings.h

---
 src/Coordination/FourLetterCommand.cpp        | 1 +
 src/Coordination/KeeperDispatcher.cpp         | 3 ++-
 src/Coordination/KeeperDispatcher.h           | 1 -
 src/Coordination/KeeperServer.cpp             | 8 +++++---
 src/Coordination/KeeperServer.h               | 4 +++-
 src/Coordination/KeeperStateMachine.cpp       | 1 +
 src/Coordination/KeeperStateMachine.h         | 1 -
 src/Coordination/KeeperStateManager.h         | 5 ++---
 src/Coordination/KeeperStorage.cpp            | 3 ++-
 src/Coordination/tests/gtest_coordination.cpp | 1 +
 src/Server/KeeperReadinessHandler.cpp         | 1 +
 src/Server/KeeperTCPHandler.cpp               | 1 +
 12 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/Coordination/FourLetterCommand.cpp b/src/Coordination/FourLetterCommand.cpp
index 8de9f8dfa1c..d0ecbe744a0 100644
--- a/src/Coordination/FourLetterCommand.cpp
+++ b/src/Coordination/FourLetterCommand.cpp
@@ -1,5 +1,6 @@
 #include <Coordination/FourLetterCommand.h>
 
+#include <Coordination/CoordinationSettings.h>
 #include <Coordination/KeeperDispatcher.h>
 #include <Server/KeeperTCPHandler.h>
 #include <Common/ZooKeeper/IKeeper.h>
diff --git a/src/Coordination/KeeperDispatcher.cpp b/src/Coordination/KeeperDispatcher.cpp
index 6f57fa6d2e2..097103ff378 100644
--- a/src/Coordination/KeeperDispatcher.cpp
+++ b/src/Coordination/KeeperDispatcher.cpp
@@ -5,7 +5,7 @@
 #include <Poco/Util/AbstractConfiguration.h>
 
 #include <base/hex.h>
-#include "Common/ZooKeeper/IKeeper.h"
+#include <Common/ZooKeeper/IKeeper.h>
 #include <Common/setThreadName.h>
 #include <Common/ZooKeeper/KeeperException.h>
 #include <Common/checkStackSize.h>
@@ -13,6 +13,7 @@
 #include <Common/ProfileEvents.h>
 #include <Common/logger_useful.h>
 #include <Common/formatReadable.h>
+#include <Coordination/CoordinationSettings.h>
 
 #include <Disks/IDisk.h>
 
diff --git a/src/Coordination/KeeperDispatcher.h b/src/Coordination/KeeperDispatcher.h
index 2e0c73131d5..4e2b9d9e247 100644
--- a/src/Coordination/KeeperDispatcher.h
+++ b/src/Coordination/KeeperDispatcher.h
@@ -11,7 +11,6 @@
 #include <Common/Exception.h>
 #include <functional>
 #include <Coordination/KeeperServer.h>
-#include <Coordination/CoordinationSettings.h>
 #include <Coordination/Keeper4LWInfo.h>
 #include <Coordination/KeeperConnectionStats.h>
 #include <Coordination/KeeperSnapshotManagerS3.h>
diff --git a/src/Coordination/KeeperServer.cpp b/src/Coordination/KeeperServer.cpp
index 09a1132e96d..dc9658e895f 100644
--- a/src/Coordination/KeeperServer.cpp
+++ b/src/Coordination/KeeperServer.cpp
@@ -3,9 +3,7 @@
 
 #include "config.h"
 
-#include <chrono>
-#include <mutex>
-#include <string>
+#include <Coordination/CoordinationSettings.h>
 #include <Coordination/KeeperLogStore.h>
 #include <Coordination/KeeperSnapshotManagerS3.h>
 #include <Coordination/KeeperStateMachine.h>
@@ -30,6 +28,10 @@
 #include <Common/getMultipleKeysFromConfig.h>
 #include <Common/getNumberOfPhysicalCPUCores.h>
 
+#include <chrono>
+#include <mutex>
+#include <string>
+
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
 #include <fmt/chrono.h>
 
diff --git a/src/Coordination/KeeperServer.h b/src/Coordination/KeeperServer.h
index 5e45a552cba..2eb630b4dd6 100644
--- a/src/Coordination/KeeperServer.h
+++ b/src/Coordination/KeeperServer.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <Coordination/CoordinationSettings.h>
 #include <Coordination/InMemoryLogStore.h>
 #include <Coordination/KeeperStateMachine.h>
 #include <Coordination/KeeperStateManager.h>
@@ -17,6 +16,9 @@ namespace DB
 
 using RaftAppendResult = nuraft::ptr<nuraft::cmd_result<nuraft::ptr<nuraft::buffer>>>;
 
+struct KeeperConfigurationAndSettings;
+using KeeperConfigurationAndSettingsPtr = std::shared_ptr<KeeperConfigurationAndSettings>;
+
 class KeeperServer
 {
 private:
diff --git a/src/Coordination/KeeperStateMachine.cpp b/src/Coordination/KeeperStateMachine.cpp
index e7cae714ba6..413d600717a 100644
--- a/src/Coordination/KeeperStateMachine.cpp
+++ b/src/Coordination/KeeperStateMachine.cpp
@@ -1,6 +1,7 @@
 #include <atomic>
 #include <cerrno>
 #include <chrono>
+#include <Coordination/CoordinationSettings.h>
 #include <Coordination/KeeperDispatcher.h>
 #include <Coordination/KeeperReconfiguration.h>
 #include <Coordination/KeeperSnapshotManager.h>
diff --git a/src/Coordination/KeeperStateMachine.h b/src/Coordination/KeeperStateMachine.h
index 7ea14aa2d30..6357fd170df 100644
--- a/src/Coordination/KeeperStateMachine.h
+++ b/src/Coordination/KeeperStateMachine.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <Coordination/CoordinationSettings.h>
 #include <Coordination/KeeperSnapshotManager.h>
 #include <Coordination/KeeperSnapshotManagerS3.h>
 #include <Coordination/KeeperContext.h>
diff --git a/src/Coordination/KeeperStateManager.h b/src/Coordination/KeeperStateManager.h
index 60f6dbe7b62..e5ab5fb4807 100644
--- a/src/Coordination/KeeperStateManager.h
+++ b/src/Coordination/KeeperStateManager.h
@@ -1,14 +1,13 @@
 #pragma once
 
-#include <Core/Types.h>
 #include <string>
 #include <Coordination/KeeperLogStore.h>
-#include <Coordination/CoordinationSettings.h>
+#include <Coordination/KeeperSnapshotManager.h>
+#include <Core/Types.h>
 #include <libnuraft/nuraft.hxx>
 #include <Poco/Util/AbstractConfiguration.h>
 #include "Coordination/KeeperStateMachine.h"
 #include "Coordination/RaftServerConfig.h"
-#include <Coordination/KeeperSnapshotManager.h>
 
 namespace DB
 {
diff --git a/src/Coordination/KeeperStorage.cpp b/src/Coordination/KeeperStorage.cpp
index 1542eb0d71a..efb57ae96e2 100644
--- a/src/Coordination/KeeperStorage.cpp
+++ b/src/Coordination/KeeperStorage.cpp
@@ -20,11 +20,12 @@
 #include <Common/LockMemoryExceptionInThread.h>
 #include <Common/ProfileEvents.h>
 
+#include <Coordination/CoordinationSettings.h>
 #include <Coordination/KeeperCommon.h>
 #include <Coordination/KeeperConstants.h>
+#include <Coordination/KeeperDispatcher.h>
 #include <Coordination/KeeperReconfiguration.h>
 #include <Coordination/KeeperStorage.h>
-#include <Coordination/KeeperDispatcher.h>
 
 #include <functional>
 #include <base/defines.h>
diff --git a/src/Coordination/tests/gtest_coordination.cpp b/src/Coordination/tests/gtest_coordination.cpp
index a329bec8e2a..b65e9358a72 100644
--- a/src/Coordination/tests/gtest_coordination.cpp
+++ b/src/Coordination/tests/gtest_coordination.cpp
@@ -7,6 +7,7 @@
 #include <filesystem>
 #include <thread>
 #include <Coordination/Changelog.h>
+#include <Coordination/CoordinationSettings.h>
 #include <Coordination/InMemoryLogStore.h>
 #include <Coordination/KeeperContext.h>
 #include <Coordination/KeeperConstants.h>
diff --git a/src/Server/KeeperReadinessHandler.cpp b/src/Server/KeeperReadinessHandler.cpp
index c973be040c8..1972c3263b2 100644
--- a/src/Server/KeeperReadinessHandler.cpp
+++ b/src/Server/KeeperReadinessHandler.cpp
@@ -5,6 +5,7 @@
 #include <memory>
 
 #include <IO/HTTPCommon.h>
+#include <IO/Operators.h>
 #include <Coordination/KeeperDispatcher.h>
 #include <Server/HTTPHandlerFactory.h>
 #include <Server/HTTPHandlerRequestFilter.h>
diff --git a/src/Server/KeeperTCPHandler.cpp b/src/Server/KeeperTCPHandler.cpp
index 47064b467e7..71ff320e2ff 100644
--- a/src/Server/KeeperTCPHandler.cpp
+++ b/src/Server/KeeperTCPHandler.cpp
@@ -4,6 +4,7 @@
 
 #include <Common/ZooKeeper/ZooKeeperIO.h>
 #include <Core/Types.h>
+#include <Coordination/CoordinationSettings.h>
 #include <IO/WriteBufferFromPocoSocket.h>
 #include <IO/ReadBufferFromPocoSocket.h>
 #include <Poco/Net/NetException.h>

From b08be12252cddccb62279bae34a2978d9dc7832c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= <git@rmr.ninja>
Date: Wed, 10 Jul 2024 19:19:10 +0200
Subject: [PATCH 21/51] Remove dependency on SettingsFields from FormatSettings

---
 src/Common/ThreadFuzzer.cpp                           | 5 +++--
 src/DataTypes/EnumValues.h                            | 2 +-
 src/Formats/FormatFactory.cpp                         | 2 +-
 src/Formats/FormatSettings.h                          | 6 +++---
 src/Processors/Formats/Impl/PrettyBlockOutputFormat.h | 3 ++-
 src/Storages/StorageSet.cpp                           | 1 +
 src/Storages/StorageSet.h                             | 1 -
 7 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/Common/ThreadFuzzer.cpp b/src/Common/ThreadFuzzer.cpp
index 7b96d1f075b..719ac9593ff 100644
--- a/src/Common/ThreadFuzzer.cpp
+++ b/src/Common/ThreadFuzzer.cpp
@@ -12,13 +12,14 @@
 #include <base/sleep.h>
 
 #include <IO/ReadHelpers.h>
-#include <Common/logger_useful.h>
 
+#include <Common/CurrentMemoryTracker.h>
 #include <Common/Exception.h>
 #include <Common/MemoryTracker.h>
+#include <Common/ThreadFuzzer.h>
+#include <Common/logger_useful.h>
 #include <Common/thread_local_rng.h>
 
-#include <Common/ThreadFuzzer.h>
 #include "config.h" // USE_JEMALLOC
 
 
diff --git a/src/DataTypes/EnumValues.h b/src/DataTypes/EnumValues.h
index 889878bc60f..9762ff5870f 100644
--- a/src/DataTypes/EnumValues.h
+++ b/src/DataTypes/EnumValues.h
@@ -7,7 +7,7 @@
 namespace DB
 {
 
-namespace ErrorCodesEnumValues
+namespace ErrorCodes
 {
     extern const int BAD_ARGUMENTS;
 }
diff --git a/src/Formats/FormatFactory.cpp b/src/Formats/FormatFactory.cpp
index 6de106893f3..484ea084d63 100644
--- a/src/Formats/FormatFactory.cpp
+++ b/src/Formats/FormatFactory.cpp
@@ -175,7 +175,7 @@ FormatSettings getFormatSettings(const ContextPtr & context, const Settings & se
     format_settings.parquet.write_page_index = settings.output_format_parquet_write_page_index;
     format_settings.parquet.local_read_min_bytes_for_seek = settings.input_format_parquet_local_file_min_bytes_for_seek;
     format_settings.pretty.charset = settings.output_format_pretty_grid_charset.toString() == "ASCII" ? FormatSettings::Pretty::Charset::ASCII : FormatSettings::Pretty::Charset::UTF8;
-    format_settings.pretty.color = settings.output_format_pretty_color;
+    format_settings.pretty.color = settings.output_format_pretty_color.valueOr(2);
     format_settings.pretty.max_column_pad_width = settings.output_format_pretty_max_column_pad_width;
     format_settings.pretty.max_rows = settings.output_format_pretty_max_rows;
     format_settings.pretty.max_value_width = settings.output_format_pretty_max_value_width;
diff --git a/src/Formats/FormatSettings.h b/src/Formats/FormatSettings.h
index 446dc17a187..0f9b5e6f681 100644
--- a/src/Formats/FormatSettings.h
+++ b/src/Formats/FormatSettings.h
@@ -1,10 +1,9 @@
 #pragma once
 
-#include <Core/Names.h>
 #include <Core/Defines.h>
+#include <Core/Names.h>
 #include <base/types.h>
 #include <base/unit.h>
-#include <Core/SettingsFields.h>
 
 namespace DB
 {
@@ -287,7 +286,8 @@ struct FormatSettings
         UInt64 max_value_width = 10000;
         UInt64 max_value_width_apply_for_single_value = false;
         bool highlight_digit_groups = true;
-        SettingFieldUInt64Auto color{"auto"};
+        /// Set to 2 for auto
+        UInt64 color = 2;
 
         bool output_format_pretty_row_numbers = false;
         UInt64 output_format_pretty_single_large_number_tip_threshold = 1'000'000;
diff --git a/src/Processors/Formats/Impl/PrettyBlockOutputFormat.h b/src/Processors/Formats/Impl/PrettyBlockOutputFormat.h
index 4c52300fbd1..698efecd4b2 100644
--- a/src/Processors/Formats/Impl/PrettyBlockOutputFormat.h
+++ b/src/Processors/Formats/Impl/PrettyBlockOutputFormat.h
@@ -74,7 +74,8 @@ void registerPrettyFormatWithNoEscapesAndMonoBlock(FormatFactory & factory, cons
             const Block & sample,
             const FormatSettings & format_settings)
         {
-            bool color = !no_escapes && format_settings.pretty.color.valueOr(format_settings.is_writing_to_terminal);
+            bool color = !no_escapes
+                    && (format_settings.pretty.color == 1 || (format_settings.pretty.color == 2 && format_settings.is_writing_to_terminal));
             return std::make_shared<OutputFormat>(buf, sample, format_settings, mono_block, color);
         });
         if (!mono_block)
diff --git a/src/Storages/StorageSet.cpp b/src/Storages/StorageSet.cpp
index 5b7f9fc0ac2..22bd01e0071 100644
--- a/src/Storages/StorageSet.cpp
+++ b/src/Storages/StorageSet.cpp
@@ -1,3 +1,4 @@
+#include <Storages/SetSettings.h>
 #include <Storages/StorageSet.h>
 #include <Storages/StorageFactory.h>
 #include <Compression/CompressedReadBuffer.h>
diff --git a/src/Storages/StorageSet.h b/src/Storages/StorageSet.h
index 67a9528ff5e..5b6d899b48d 100644
--- a/src/Storages/StorageSet.h
+++ b/src/Storages/StorageSet.h
@@ -2,7 +2,6 @@
 
 #include <Interpreters/Context_fwd.h>
 #include <Storages/IStorage.h>
-#include <Storages/SetSettings.h>
 
 
 namespace DB

From 71afe96e0f40cdbf260929d3460fca6f250c2fba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= <git@rmr.ninja>
Date: Wed, 10 Jul 2024 19:43:50 +0200
Subject: [PATCH 22/51] Less deps for SettingsEnums.h

---
 src/Core/SettingsEnums.h                          |  8 +-------
 src/Core/ShortCircuitFunctionEvaluation.h         | 15 +++++++++++++++
 src/Interpreters/ExpressionActionsSettings.h      |  2 +-
 .../ObjectStorageQueueMetadata.h                  |  6 ++----
 4 files changed, 19 insertions(+), 12 deletions(-)
 create mode 100644 src/Core/ShortCircuitFunctionEvaluation.h

diff --git a/src/Core/SettingsEnums.h b/src/Core/SettingsEnums.h
index 67fbce31be8..8c2f5364448 100644
--- a/src/Core/SettingsEnums.h
+++ b/src/Core/SettingsEnums.h
@@ -3,6 +3,7 @@
 #include <Core/Joins.h>
 #include <Core/LogsLevel.h>
 #include <Core/SettingsFields.h>
+#include <Core/ShortCircuitFunctionEvaluation.h>
 #include <Formats/FormatSettings.h>
 #include <IO/ReadSettings.h>
 #include <Parsers/ASTSQLSecurity.h>
@@ -292,13 +293,6 @@ enum class StreamingHandleErrorMode : uint8_t
 
 DECLARE_SETTING_ENUM(StreamingHandleErrorMode)
 
-enum class ShortCircuitFunctionEvaluation : uint8_t
-{
-    ENABLE, // Use short-circuit function evaluation for functions that are suitable for it.
-    FORCE_ENABLE, // Use short-circuit function evaluation for all functions.
-    DISABLE, // Disable short-circuit function evaluation.
-};
-
 DECLARE_SETTING_ENUM(ShortCircuitFunctionEvaluation)
 
 enum class TransactionsWaitCSNMode : uint8_t
diff --git a/src/Core/ShortCircuitFunctionEvaluation.h b/src/Core/ShortCircuitFunctionEvaluation.h
new file mode 100644
index 00000000000..3785efe8015
--- /dev/null
+++ b/src/Core/ShortCircuitFunctionEvaluation.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include <cstdint>
+
+namespace DB
+{
+
+enum class ShortCircuitFunctionEvaluation : uint8_t
+{
+    ENABLE, // Use short-circuit function evaluation for functions that are suitable for it.
+    FORCE_ENABLE, // Use short-circuit function evaluation for all functions.
+    DISABLE, // Disable short-circuit function evaluation.
+};
+
+}
diff --git a/src/Interpreters/ExpressionActionsSettings.h b/src/Interpreters/ExpressionActionsSettings.h
index 326de983748..384a61a54a2 100644
--- a/src/Interpreters/ExpressionActionsSettings.h
+++ b/src/Interpreters/ExpressionActionsSettings.h
@@ -1,7 +1,7 @@
 #pragma once
 
+#include <Core/ShortCircuitFunctionEvaluation.h>
 #include <Interpreters/Context_fwd.h>
-#include <Core/SettingsEnums.h>
 
 #include <cstddef>
 
diff --git a/src/Storages/ObjectStorageQueue/ObjectStorageQueueMetadata.h b/src/Storages/ObjectStorageQueue/ObjectStorageQueueMetadata.h
index 05060931b5a..e5fae047ac5 100644
--- a/src/Storages/ObjectStorageQueue/ObjectStorageQueueMetadata.h
+++ b/src/Storages/ObjectStorageQueue/ObjectStorageQueueMetadata.h
@@ -2,21 +2,19 @@
 #include "config.h"
 
 #include <filesystem>
-#include <Core/Types.h>
-#include <Core/SettingsEnums.h>
 #include <Core/BackgroundSchedulePool.h>
-#include <Common/ZooKeeper/ZooKeeper.h>
+#include <Core/Types.h>
 #include <Storages/ObjectStorage/StorageObjectStorage.h>
 #include <Storages/ObjectStorageQueue/ObjectStorageQueueIFileMetadata.h>
 #include <Storages/ObjectStorageQueue/ObjectStorageQueueOrderedFileMetadata.h>
 #include <Storages/ObjectStorageQueue/ObjectStorageQueueSettings.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
 
 namespace fs = std::filesystem;
 namespace Poco { class Logger; }
 
 namespace DB
 {
-struct ObjectStorageQueueSettings;
 class StorageObjectStorageQueue;
 struct ObjectStorageQueueTableMetadata;
 struct StorageInMemoryMetadata;

From 9e599576ab01b66b4bd12a56a464fb77abd34a1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= <git@rmr.ninja>
Date: Thu, 11 Jul 2024 14:00:05 +0200
Subject: [PATCH 23/51] Hide Settings object from Context.h

---
 programs/client/Client.cpp                    |   5 +-
 .../library-bridge/LibraryBridgeHandlers.cpp  |   1 +
 programs/odbc-bridge/ColumnInfoHandler.cpp    |   1 +
 .../odbc-bridge/IdentifierQuoteHandler.cpp    |   1 +
 programs/odbc-bridge/MainHandler.cpp          |   1 +
 programs/odbc-bridge/SchemaAllowedHandler.cpp |   2 +
 .../AggregateFunctionFactory.cpp              |   1 +
 src/Analyzer/InDepthQueryTreeVisitor.h        |   1 -
 .../AggregateFunctionOfGroupByKeysPass.cpp    |   2 +
 ...egateFunctionsArithmericOperationsPass.cpp |   2 +
 src/Analyzer/Passes/ArrayExistsToHasPass.cpp  |   2 +
 src/Analyzer/Passes/AutoFinalOnQueryPass.cpp  |   2 +
 .../Passes/ConvertOrLikeChainPass.cpp         |   2 +
 src/Analyzer/Passes/ConvertQueryToCNFPass.cpp |   2 +
 src/Analyzer/Passes/CountDistinctPass.cpp     |   2 +
 src/Analyzer/Passes/CrossToInnerJoinPass.cpp  |   3 +-
 .../Passes/FunctionToSubcolumnsPass.cpp       |   2 +
 src/Analyzer/Passes/FuseFunctionsPass.cpp     |   1 +
 .../Passes/GroupingFunctionsResolvePass.cpp   |   1 +
 src/Analyzer/Passes/IfChainToMultiIfPass.cpp  |   1 +
 .../Passes/IfTransformStringsToEnumPass.cpp   |   1 +
 .../Passes/LogicalExpressionOptimizerPass.cpp |   1 +
 src/Analyzer/Passes/MultiIfToIfPass.cpp       |   1 +
 .../Passes/NormalizeCountVariantsPass.cpp     |   1 +
 ...ateOrDateTimeConverterWithPreimagePass.cpp |   1 +
 .../OptimizeGroupByFunctionKeysPass.cpp       |   1 +
 .../OptimizeGroupByInjectiveFunctionsPass.cpp |   1 +
 ...ptimizeRedundantFunctionsInOrderByPass.cpp |   1 +
 .../RewriteAggregateFunctionWithIfPass.cpp    |   2 +
 .../RewriteSumFunctionWithSumAndCountPass.cpp |   1 +
 src/Analyzer/Passes/SumIfToCountIfPass.cpp    |  15 +-
 .../UniqInjectiveFunctionsEliminationPass.cpp |   2 +
 src/Analyzer/Passes/UniqToCountPass.cpp       |   2 +
 src/Analyzer/QueryTreeBuilder.cpp             |   2 +
 .../Resolve/IdentifierResolveScope.cpp        |   3 +-
 src/Analyzer/Resolve/IdentifierResolver.cpp   |   2 +
 src/Analyzer/Resolve/QueryAnalyzer.cpp        |   2 +
 src/Analyzer/TableNode.cpp                    |   2 +
 src/Analyzer/Utils.cpp                        |   2 +
 src/Backups/BackupEntriesCollector.cpp        |   1 +
 src/Backups/BackupIO_S3.cpp                   |   1 +
 src/Backups/BackupsWorker.cpp                 |   1 +
 src/Backups/RestorerFromBackup.cpp            |   3 +-
 src/Backups/WithRetries.cpp                   |   4 +-
 src/Bridge/IBridge.cpp                        |   1 +
 src/BridgeHelper/LibraryBridgeHelper.cpp      |   1 +
 src/Client/ClientBase.h                       |   1 +
 src/Client/ConnectionEstablisher.cpp          |   1 +
 src/Client/ConnectionPool.cpp                 |  12 +
 src/Client/ConnectionPool.h                   |  13 +-
 src/Client/HedgedConnections.cpp              |   1 +
 src/Client/HedgedConnectionsFactory.h         |   3 +-
 src/Client/MultiplexedConnections.cpp         |   1 +
 src/Common/DateLUT.cpp                        |   2 +
 .../NamedCollectionsFactory.cpp               |   1 +
 .../NamedCollectionsMetadataStorage.cpp       |   1 +
 src/Core/ExternalTable.cpp                    |   1 +
 src/Daemon/BaseDaemon.cpp                     |   1 +
 src/DataTypes/DataTypeDecimalBase.cpp         |   1 +
 src/DataTypes/DataTypeFactory.cpp             |   1 +
 src/Databases/DDLDependencyVisitor.cpp        |   1 +
 src/Databases/DatabaseAtomic.cpp              |   3 +-
 src/Databases/DatabaseDictionary.cpp          |   1 +
 src/Databases/DatabaseFactory.cpp             |   1 +
 src/Databases/DatabaseFilesystem.cpp          |   1 +
 src/Databases/DatabaseHDFS.cpp                |   1 +
 src/Databases/DatabaseOnDisk.cpp              |   1 +
 src/Databases/DatabaseReplicated.cpp          |   1 +
 src/Databases/DatabaseReplicatedWorker.cpp    |   1 +
 src/Databases/DatabaseS3.cpp                  |   1 +
 src/Databases/MySQL/DatabaseMySQL.cpp         |   1 +
 .../MySQL/FetchTablesColumnsList.cpp          |   1 +
 src/Databases/MySQL/FetchTablesColumnsList.h  |   3 +-
 src/Databases/MySQL/MaterializeMetadata.h     |   1 +
 .../PostgreSQL/DatabasePostgreSQL.cpp         |   1 +
 src/Databases/SQLite/DatabaseSQLite.cpp       |   1 +
 src/Dictionaries/DirectDictionary.cpp         |   1 +
 .../ExecutablePoolDictionarySource.cpp        |   2 +
 src/Dictionaries/HashedArrayDictionary.cpp    |   1 +
 src/Dictionaries/IPAddressDictionary.cpp      |   7 +-
 .../PolygonDictionaryImplementations.cpp      |   1 +
 .../PostgreSQLDictionarySource.cpp            |   1 +
 src/Dictionaries/RegExpTreeDictionary.cpp     |   1 +
 src/Dictionaries/XDBCDictionarySource.cpp     |   1 +
 .../registerCacheDictionaries.cpp             |   1 +
 src/Dictionaries/registerHashedDictionary.cpp |   2 +-
 .../registerRangeHashedDictionary.cpp         |   1 +
 src/Disks/IO/ReadBufferFromWebServer.cpp      |   1 +
 .../AzureBlobStorageCommon.cpp                |   1 +
 .../AzureBlobStorage/AzureBlobStorageCommon.h |   3 +-
 .../ObjectStorages/ObjectStorageFactory.cpp   |   1 +
 .../ObjectStorages/S3/S3ObjectStorage.cpp     |   1 +
 src/Disks/ObjectStorages/S3/diskSettings.cpp  |   5 +-
 src/Formats/FormatFactory.cpp                 |   1 +
 src/Formats/NumpyDataTypes.h                  |   1 +
 src/Formats/ReadSchemaUtils.cpp               |   1 +
 src/Functions/CastOverloadResolver.cpp        |   1 +
 src/Functions/FunctionBinaryArithmetic.h      |   1 +
 .../FunctionCustomWeekToDateOrDate32.h        |   1 +
 .../FunctionDateOrDateTimeToDateOrDate32.h    |   1 +
 ...tionDateOrDateTimeToDateTimeOrDateTime64.h |   2 +
 src/Functions/FunctionFactory.cpp             |   1 +
 .../FunctionGenerateRandomStructure.h         |   1 +
 src/Functions/FunctionJoinGet.cpp             |   1 +
 src/Functions/FunctionTokens.h                |   1 +
 src/Functions/FunctionUnixTimestamp64.h       |   1 +
 src/Functions/FunctionsCodingIP.cpp           |   1 +
 src/Functions/FunctionsConversion.cpp         |   1 +
 .../FunctionsMultiStringFuzzySearch.h         |   1 +
 src/Functions/FunctionsMultiStringSearch.h    |   1 +
 src/Functions/FunctionsStringSearch.h         |   1 +
 src/Functions/FunctionsTextClassification.h   |   1 +
 src/Functions/PerformanceAdaptors.h           |   1 +
 ...alUserDefinedExecutableFunctionsLoader.cpp |   1 +
 .../UserDefinedSQLObjectsBackup.cpp           |   1 +
 .../UserDefinedSQLObjectsDiskStorage.cpp      |   2 +
 .../UserDefinedSQLObjectsZooKeeperStorage.cpp |   2 +-
 src/Functions/array/array.cpp                 |   1 +
 src/Functions/array/range.cpp                 |   1 +
 src/Functions/castOrDefault.cpp               |   1 +
 src/Functions/formatDateTime.cpp              |   1 +
 src/Functions/formatQuery.cpp                 |   1 +
 src/Functions/getClientHTTPHeader.cpp         |   1 +
 src/Functions/getSetting.cpp                  |   1 +
 src/Functions/hasColumnInTable.cpp            |   1 +
 src/Functions/if.cpp                          |   1 +
 .../keyvaluepair/extractKeyValuePairs.cpp     |   1 +
 src/Functions/lemmatize.cpp                   |   1 +
 src/Functions/map.cpp                         |   1 +
 src/Functions/multiIf.cpp                     |   1 +
 src/Functions/neighbor.cpp                    |   1 +
 src/Functions/now.cpp                         |   1 +
 src/Functions/now64.cpp                       |   1 +
 src/Functions/nowInBlock.cpp                  |   1 +
 src/Functions/parseDateTime.cpp               |   1 +
 src/Functions/pointInPolygon.cpp              |   1 +
 src/Functions/runningAccumulate.cpp           |   1 +
 src/Functions/runningDifference.h             |   1 +
 src/Functions/serverConstants.cpp             |   1 +
 src/Functions/sleep.h                         |   1 +
 src/Functions/snowflake.cpp                   |   1 +
 src/Functions/snowflakeIDToDateTime.cpp       |   1 +
 src/Functions/stem.cpp                        |   1 +
 src/Functions/synonyms.cpp                    |   1 +
 src/Functions/throwIf.cpp                     |   1 +
 src/Functions/toTimezone.cpp                  |   1 +
 src/Functions/toTypeName.cpp                  |   1 +
 src/Functions/tuple.h                         |   1 +
 src/Functions/visibleWidth.cpp                |   1 +
 src/Functions/widthBucket.cpp                 |   2 +
 src/IO/ConnectionTimeouts.cpp                 |   1 +
 src/IO/S3/Client.cpp                          |   3 +-
 src/IO/S3Common.cpp                           |   1 +
 src/IO/S3Common.h                             |   4 +-
 src/IO/S3Settings.cpp                         |   4 +-
 src/Interpreters/ArrayJoinAction.cpp          |   1 +
 .../Cache/WriteBufferToFileSegment.cpp        |   2 +
 src/Interpreters/Context.cpp                  | 258 ++++++++++++------
 src/Interpreters/Context.h                    |  44 +--
 src/Interpreters/DDLTask.cpp                  |   1 +
 src/Interpreters/DDLTask.h                    |   1 +
 .../ExternalDictionariesLoader.cpp            |   1 +
 src/Interpreters/FilesystemCacheLog.h         |   1 -
 src/Interpreters/GraceHashJoin.cpp            |   1 +
 src/Interpreters/IInterpreter.cpp             |   1 +
 .../IInterpreterUnionOrSelectQuery.h          |   2 +
 src/Interpreters/IdentifierSemantic.cpp       |   2 +
 .../InJoinSubqueriesPreprocessor.cpp          |   1 +
 src/Interpreters/InterpreterCheckQuery.cpp    |   2 +
 .../InterpreterCreateIndexQuery.cpp           |   1 +
 .../InterpreterDropIndexQuery.cpp             |   1 +
 .../InterpreterKillQueryQuery.cpp             |   1 +
 src/Interpreters/InterpreterRenameQuery.cpp   |   1 +
 .../InterpreterShowColumnsQuery.cpp           |   1 +
 .../InterpreterTransactionControlQuery.cpp    |   1 +
 .../MutationsNonDeterministicHelpers.cpp      |   1 +
 .../NormalizeSelectWithUnionQueryVisitor.h    |   5 +-
 .../PredicateExpressionsOptimizer.cpp         |   1 +
 src/Interpreters/QueryLog.cpp                 |   1 +
 src/Interpreters/QueryLog.h                   |   4 +-
 .../RewriteCountVariantsVisitor.cpp           |   1 +
 src/Interpreters/Session.cpp                  |   1 +
 src/Interpreters/ThreadStatusExt.cpp          |   1 +
 .../evaluateConstantExpression.cpp            |   2 +
 src/Interpreters/executeDDLQueryOnCluster.cpp |   1 +
 .../formatWithPossiblyHidingSecrets.h         |   2 +
 .../getCustomKeyFilterForParallelReplicas.cpp |   2 +
 src/Interpreters/loadMetadata.cpp             |   1 +
 .../parseColumnsListForTableFunction.cpp      |  13 +
 .../parseColumnsListForTableFunction.h        |  13 +-
 .../removeOnClusterClauseIfNeeded.cpp         |   1 +
 src/Planner/CollectSets.cpp                   |   1 +
 src/Planner/Planner.cpp                       |   1 +
 src/Planner/PlannerActionsVisitor.cpp         |   2 +
 src/Planner/PlannerExpressionAnalysis.cpp     |   2 +
 src/Planner/PlannerJoinTree.cpp               |   2 +
 src/Planner/PlannerJoins.cpp                  |   2 +
 src/Planner/PlannerSorting.cpp                |   2 +
 src/Planner/PlannerWindowFunctions.cpp        |   2 +
 src/Planner/Utils.cpp                         |   2 +
 src/Planner/findParallelReplicasQuery.cpp     |   1 +
 src/Processors/Executors/PipelineExecutor.cpp |   1 +
 .../Impl/ConstantExpressionTemplate.cpp       |   1 +
 .../Formats/Impl/ValuesBlockInputFormat.cpp   |   1 +
 .../Formats/InputFormatErrorsLogger.cpp       |   1 +
 .../Optimizations/optimizePrewhere.cpp        |   2 +
 .../optimizeUseNormalProjection.cpp           |   2 +
 src/Processors/QueryPlan/ReadFromRemote.cpp   |   1 +
 src/Processors/QueryPlan/SortingStep.cpp      |   4 +-
 src/Processors/Sources/MySQLSource.cpp        |   2 +
 src/Processors/Sources/MySQLSource.h          |   3 +-
 src/Processors/Sources/RecursiveCTESource.cpp |   2 +
 .../TTL/TTLAggregationAlgorithm.cpp           |   3 +-
 .../getSourceFromASTInsertQuery.cpp           |   3 +-
 src/QueryPipeline/RemoteQueryExecutor.cpp     |   7 +
 src/QueryPipeline/RemoteQueryExecutor.h       |   2 +-
 src/Server/GRPCServer.cpp                     |   1 +
 .../setReadOnlyIfHTTPMethodIdempotent.cpp     |   1 +
 src/Server/HTTPHandler.cpp                    |   1 +
 src/Server/MySQLHandler.cpp                   |   1 +
 src/Server/MySQLHandler.h                     |   1 +
 src/Server/PostgreSQLHandler.cpp              |   1 +
 src/Server/ProxyV1Handler.cpp                 |   1 +
 src/Storages/Distributed/DistributedSink.cpp  |   1 +
 src/Storages/FileLog/FileLogSettings.cpp      |   1 +
 src/Storages/MaterializedView/RefreshTask.cpp |   1 +
 ...pproximateNearestNeighborIndexesCommon.cpp |   1 +
 src/Storages/MergeTree/KeyCondition.cpp       |   1 +
 .../MergeTree/MergeTreeDataWriter.cpp         |   1 +
 .../MergeTree/MergeTreeIndexAnnoy.cpp         |   1 +
 .../MergeTree/MergeTreePrefetchedReadPool.cpp |   1 +
 src/Storages/MergeTree/MergeTreeReadPool.cpp  |   9 +
 src/Storages/MergeTree/MergeTreeReadPool.h    |   7 +-
 .../MergeTree/MergeTreeWhereOptimizer.cpp     |   1 +
 .../MergeTree/MergedBlockOutputStream.cpp     |   1 +
 .../MergedColumnOnlyOutputStream.cpp          |   1 +
 src/Storages/MergeTree/RPNBuilder.cpp         |   1 +
 .../MergeTree/ReplicatedMergeTreeSink.h       |   1 +
 src/Storages/MySQL/MySQLSettings.cpp          |   1 +
 src/Storages/NamedCollectionsHelpers.cpp      |   1 +
 src/Storages/NamedCollectionsHelpers.h        |   6 +-
 .../ObjectStorage/Azure/Configuration.cpp     |   1 +
 .../DataLakes/IcebergMetadata.cpp             |   2 +-
 .../ObjectStorage/HDFS/Configuration.cpp      |   1 +
 .../ObjectStorage/ReadBufferIterator.cpp      |   1 +
 .../ObjectStorage/S3/Configuration.cpp        |   1 +
 .../ObjectStorage/StorageObjectStorage.cpp    |   1 +
 .../StorageObjectStorageSink.cpp              |   1 +
 .../StorageObjectStorageSource.cpp            |   1 +
 .../registerStorageObjectStorage.cpp          |   3 +-
 src/Storages/ReadInOrderOptimizer.cpp         |   1 +
 .../RocksDB/EmbeddedRocksDBBulkSink.cpp       |   1 +
 src/Storages/RocksDB/StorageSystemRocksDB.cpp |   1 +
 src/Storages/SetSettings.cpp                  |   1 +
 src/Storages/StorageFactory.cpp               |   1 +
 src/Storages/StorageGenerateRandom.cpp        |   1 +
 src/Storages/StorageInMemoryMetadata.cpp      |   2 +
 src/Storages/StorageLog.cpp                   |   1 +
 src/Storages/StorageMySQL.cpp                 |   1 +
 src/Storages/StorageStripeLog.cpp             |   2 +
 src/Storages/StorageURL.cpp                   |   1 +
 src/Storages/StorageXDBC.cpp                  |   1 +
 src/Storages/System/StorageSystemColumns.cpp  |   1 +
 .../System/StorageSystemDDLWorkerQueue.cpp    |   1 +
 .../System/StorageSystemDetachedParts.cpp     |   1 +
 src/Storages/System/StorageSystemErrors.cpp   |   1 +
 src/Storages/System/StorageSystemEvents.cpp   |   1 +
 .../System/StorageSystemMergeTreeSettings.cpp |   1 +
 src/Storages/System/StorageSystemPartsBase.h  |   1 +
 .../System/StorageSystemRemoteDataPaths.cpp   |   1 +
 src/Storages/System/StorageSystemSettings.cpp |   2 +
 .../StorageSystemSettingsProfileElements.cpp  |   1 +
 .../System/StorageSystemStackTrace.cpp        |   1 +
 src/Storages/System/StorageSystemUsers.cpp    |   6 +-
 src/Storages/TTLDescription.cpp               |   1 +
 src/Storages/buildQueryTreeForShard.cpp       |   1 +
 src/Storages/getStructureOfRemoteTable.cpp    |   1 +
 .../transformQueryForExternalDatabase.cpp     |   1 +
 src/TableFunctions/ITableFunctionXDBC.cpp     |   1 +
 src/TableFunctions/TableFunctionExplain.cpp   |   1 +
 src/TableFunctions/TableFunctionFactory.cpp   |   1 +
 src/TableFunctions/TableFunctionFile.cpp      |   1 +
 .../TableFunctionFileCluster.cpp              |   1 +
 src/TableFunctions/TableFunctionFormat.cpp    |   2 +
 src/TableFunctions/TableFunctionMySQL.cpp     |   2 +
 .../TableFunctionPostgreSQL.cpp               |   1 +
 src/TableFunctions/TableFunctionRemote.cpp    |   1 +
 287 files changed, 600 insertions(+), 184 deletions(-)

diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index 6343dc85d00..2400dab4b33 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -24,9 +24,8 @@
 #include <Common/TerminalSize.h>
 #include <Common/config_version.h>
 #include <Common/formatReadable.h>
-
+#include <Core/Settings.h>
 #include <Columns/ColumnString.h>
-#include <Poco/Util/Application.h>
 
 #include <IO/ReadBufferFromString.h>
 #include <IO/ReadHelpers.h>
@@ -49,6 +48,8 @@
 #include <Formats/registerFormats.h>
 #include <Formats/FormatFactory.h>
 
+#include <Poco/Util/Application.h>
+
 namespace fs = std::filesystem;
 using namespace std::literals;
 
diff --git a/programs/library-bridge/LibraryBridgeHandlers.cpp b/programs/library-bridge/LibraryBridgeHandlers.cpp
index 8d116e537aa..53f4b31ca06 100644
--- a/programs/library-bridge/LibraryBridgeHandlers.cpp
+++ b/programs/library-bridge/LibraryBridgeHandlers.cpp
@@ -6,6 +6,7 @@
 #include "ExternalDictionaryLibraryHandlerFactory.h"
 
 #include <Formats/FormatFactory.h>
+#include <IO/Operators.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/ReadHelpers.h>
 #include <Common/BridgeProtocolVersion.h>
diff --git a/programs/odbc-bridge/ColumnInfoHandler.cpp b/programs/odbc-bridge/ColumnInfoHandler.cpp
index 5ff985b3d12..a738d5e8c12 100644
--- a/programs/odbc-bridge/ColumnInfoHandler.cpp
+++ b/programs/odbc-bridge/ColumnInfoHandler.cpp
@@ -2,6 +2,7 @@
 
 #if USE_ODBC
 
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
diff --git a/programs/odbc-bridge/IdentifierQuoteHandler.cpp b/programs/odbc-bridge/IdentifierQuoteHandler.cpp
index cf5acdc4534..2f00e1171bb 100644
--- a/programs/odbc-bridge/IdentifierQuoteHandler.cpp
+++ b/programs/odbc-bridge/IdentifierQuoteHandler.cpp
@@ -11,6 +11,7 @@
 #include <Poco/Net/HTTPServerResponse.h>
 #include <Common/BridgeProtocolVersion.h>
 #include <Common/logger_useful.h>
+#include <Core/Settings.h>
 #include "getIdentifierQuote.h"
 #include "validateODBCConnectionString.h"
 #include "ODBCPooledConnectionFactory.h"
diff --git a/programs/odbc-bridge/MainHandler.cpp b/programs/odbc-bridge/MainHandler.cpp
index 2cf1576ccd7..404f66eab3b 100644
--- a/programs/odbc-bridge/MainHandler.cpp
+++ b/programs/odbc-bridge/MainHandler.cpp
@@ -9,6 +9,7 @@
 #include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
 #include <IO/WriteHelpers.h>
 #include <IO/ReadHelpers.h>
+#include <Core/Settings.h>
 #include <IO/ReadBufferFromIStream.h>
 #include <Poco/Net/HTTPServerRequest.h>
 #include <Poco/Net/HTTPServerResponse.h>
diff --git a/programs/odbc-bridge/SchemaAllowedHandler.cpp b/programs/odbc-bridge/SchemaAllowedHandler.cpp
index c7025ca4311..dfb4333240b 100644
--- a/programs/odbc-bridge/SchemaAllowedHandler.cpp
+++ b/programs/odbc-bridge/SchemaAllowedHandler.cpp
@@ -2,8 +2,10 @@
 
 #if USE_ODBC
 
+#include <Core/Settings.h>
 #include <Server/HTTP/HTMLForm.h>
 #include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
+#include <IO/Operators.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <Poco/Net/HTTPServerRequest.h>
diff --git a/src/AggregateFunctions/AggregateFunctionFactory.cpp b/src/AggregateFunctions/AggregateFunctionFactory.cpp
index 6555ae63128..b5c6440a69c 100644
--- a/src/AggregateFunctions/AggregateFunctionFactory.cpp
+++ b/src/AggregateFunctions/AggregateFunctionFactory.cpp
@@ -6,6 +6,7 @@
 #include <IO/WriteHelpers.h>
 #include <Interpreters/Context.h>
 #include <Common/CurrentThread.h>
+#include <Core/Settings.h>
 
 static constexpr size_t MAX_AGGREGATE_FUNCTION_NAME_LENGTH = 1000;
 
diff --git a/src/Analyzer/InDepthQueryTreeVisitor.h b/src/Analyzer/InDepthQueryTreeVisitor.h
index 62ddc06659c..67e3b75d8b5 100644
--- a/src/Analyzer/InDepthQueryTreeVisitor.h
+++ b/src/Analyzer/InDepthQueryTreeVisitor.h
@@ -3,7 +3,6 @@
 #include <base/scope_guard.h>
 
 #include <Common/Exception.h>
-#include <Core/Settings.h>
 
 #include <Analyzer/IQueryTreeNode.h>
 #include <Analyzer/QueryNode.h>
diff --git a/src/Analyzer/Passes/AggregateFunctionOfGroupByKeysPass.cpp b/src/Analyzer/Passes/AggregateFunctionOfGroupByKeysPass.cpp
index a419bbcc133..b68635ab953 100644
--- a/src/Analyzer/Passes/AggregateFunctionOfGroupByKeysPass.cpp
+++ b/src/Analyzer/Passes/AggregateFunctionOfGroupByKeysPass.cpp
@@ -10,6 +10,8 @@
 #include <Analyzer/TableNode.h>
 #include <Analyzer/UnionNode.h>
 
+#include <Core/Settings.h>
+
 namespace DB
 {
 
diff --git a/src/Analyzer/Passes/AggregateFunctionsArithmericOperationsPass.cpp b/src/Analyzer/Passes/AggregateFunctionsArithmericOperationsPass.cpp
index 098e2858abc..6578a6c5bd7 100644
--- a/src/Analyzer/Passes/AggregateFunctionsArithmericOperationsPass.cpp
+++ b/src/Analyzer/Passes/AggregateFunctionsArithmericOperationsPass.cpp
@@ -11,6 +11,8 @@
 #include <Analyzer/FunctionNode.h>
 #include <Analyzer/Utils.h>
 
+#include <Core/Settings.h>
+
 namespace DB
 {
 
diff --git a/src/Analyzer/Passes/ArrayExistsToHasPass.cpp b/src/Analyzer/Passes/ArrayExistsToHasPass.cpp
index 62db502e1dc..bf4c1232d79 100644
--- a/src/Analyzer/Passes/ArrayExistsToHasPass.cpp
+++ b/src/Analyzer/Passes/ArrayExistsToHasPass.cpp
@@ -11,6 +11,8 @@
 #include <Analyzer/InDepthQueryTreeVisitor.h>
 #include <Analyzer/LambdaNode.h>
 
+#include <Core/Settings.h>
+
 namespace DB
 {
 
diff --git a/src/Analyzer/Passes/AutoFinalOnQueryPass.cpp b/src/Analyzer/Passes/AutoFinalOnQueryPass.cpp
index 70aa1a41548..f7dd542dbf4 100644
--- a/src/Analyzer/Passes/AutoFinalOnQueryPass.cpp
+++ b/src/Analyzer/Passes/AutoFinalOnQueryPass.cpp
@@ -8,6 +8,8 @@
 #include <Analyzer/TableExpressionModifiers.h>
 #include <Analyzer/InDepthQueryTreeVisitor.h>
 
+#include <Core/Settings.h>
+
 namespace DB
 {
 
diff --git a/src/Analyzer/Passes/ConvertOrLikeChainPass.cpp b/src/Analyzer/Passes/ConvertOrLikeChainPass.cpp
index eb897ef8746..2b2ac95d7b9 100644
--- a/src/Analyzer/Passes/ConvertOrLikeChainPass.cpp
+++ b/src/Analyzer/Passes/ConvertOrLikeChainPass.cpp
@@ -22,6 +22,8 @@
 #include <Analyzer/HashUtils.h>
 #include <Analyzer/InDepthQueryTreeVisitor.h>
 
+#include <Core/Settings.h>
+
 namespace DB
 {
 
diff --git a/src/Analyzer/Passes/ConvertQueryToCNFPass.cpp b/src/Analyzer/Passes/ConvertQueryToCNFPass.cpp
index 5951e8fc5ea..f66d092429f 100644
--- a/src/Analyzer/Passes/ConvertQueryToCNFPass.cpp
+++ b/src/Analyzer/Passes/ConvertQueryToCNFPass.cpp
@@ -10,6 +10,8 @@
 #include <Analyzer/Utils.h>
 #include <Analyzer/HashUtils.h>
 
+#include <Core/Settings.h>
+
 #include <Storages/IStorage.h>
 
 #include <Functions/FunctionFactory.h>
diff --git a/src/Analyzer/Passes/CountDistinctPass.cpp b/src/Analyzer/Passes/CountDistinctPass.cpp
index 23fde89a348..3f9185a07ca 100644
--- a/src/Analyzer/Passes/CountDistinctPass.cpp
+++ b/src/Analyzer/Passes/CountDistinctPass.cpp
@@ -11,6 +11,8 @@
 #include <Analyzer/QueryNode.h>
 #include <Analyzer/Utils.h>
 
+#include <Core/Settings.h>
+
 namespace DB
 {
 
diff --git a/src/Analyzer/Passes/CrossToInnerJoinPass.cpp b/src/Analyzer/Passes/CrossToInnerJoinPass.cpp
index 3e2a2055fdb..eb615879893 100644
--- a/src/Analyzer/Passes/CrossToInnerJoinPass.cpp
+++ b/src/Analyzer/Passes/CrossToInnerJoinPass.cpp
@@ -9,13 +9,14 @@
 #include <Analyzer/FunctionNode.h>
 #include <Analyzer/ConstantNode.h>
 #include <Analyzer/ColumnNode.h>
+#include <Analyzer/Utils.h>
 
 #include <Functions/FunctionFactory.h>
 #include <Functions/IFunction.h>
 #include <Functions/logical.h>
 
 #include <Common/logger_useful.h>
-#include <Analyzer/Utils.h>
+#include <Core/Settings.h>
 
 
 namespace DB
diff --git a/src/Analyzer/Passes/FunctionToSubcolumnsPass.cpp b/src/Analyzer/Passes/FunctionToSubcolumnsPass.cpp
index 90051779a26..b968f43c6a6 100644
--- a/src/Analyzer/Passes/FunctionToSubcolumnsPass.cpp
+++ b/src/Analyzer/Passes/FunctionToSubcolumnsPass.cpp
@@ -21,6 +21,8 @@
 #include <Analyzer/Utils.h>
 #include <Analyzer/JoinNode.h>
 
+#include <Core/Settings.h>
+
 namespace DB
 {
 
diff --git a/src/Analyzer/Passes/FuseFunctionsPass.cpp b/src/Analyzer/Passes/FuseFunctionsPass.cpp
index ac4678fb362..0175e304a2b 100644
--- a/src/Analyzer/Passes/FuseFunctionsPass.cpp
+++ b/src/Analyzer/Passes/FuseFunctionsPass.cpp
@@ -1,6 +1,7 @@
 #include <Analyzer/Passes/FuseFunctionsPass.h>
 
 #include <Common/iota.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeTuple.h>
diff --git a/src/Analyzer/Passes/GroupingFunctionsResolvePass.cpp b/src/Analyzer/Passes/GroupingFunctionsResolvePass.cpp
index e259ffa64a6..91f06183523 100644
--- a/src/Analyzer/Passes/GroupingFunctionsResolvePass.cpp
+++ b/src/Analyzer/Passes/GroupingFunctionsResolvePass.cpp
@@ -1,6 +1,7 @@
 #include <Analyzer/Passes/GroupingFunctionsResolvePass.h>
 
 #include <Core/ColumnNumbers.h>
+#include <Core/Settings.h>
 
 #include <Functions/grouping.h>
 
diff --git a/src/Analyzer/Passes/IfChainToMultiIfPass.cpp b/src/Analyzer/Passes/IfChainToMultiIfPass.cpp
index beb2247607e..cff98adb6af 100644
--- a/src/Analyzer/Passes/IfChainToMultiIfPass.cpp
+++ b/src/Analyzer/Passes/IfChainToMultiIfPass.cpp
@@ -4,6 +4,7 @@
 
 #include <Analyzer/InDepthQueryTreeVisitor.h>
 #include <Analyzer/FunctionNode.h>
+#include <Core/Settings.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/multiIf.h>
 
diff --git a/src/Analyzer/Passes/IfTransformStringsToEnumPass.cpp b/src/Analyzer/Passes/IfTransformStringsToEnumPass.cpp
index 29b392a0951..d966f129d08 100644
--- a/src/Analyzer/Passes/IfTransformStringsToEnumPass.cpp
+++ b/src/Analyzer/Passes/IfTransformStringsToEnumPass.cpp
@@ -5,6 +5,7 @@
 #include <Analyzer/IQueryTreeNode.h>
 #include <Analyzer/InDepthQueryTreeVisitor.h>
 #include <Analyzer/Utils.h>
+#include <Core/Settings.h>
 
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeEnum.h>
diff --git a/src/Analyzer/Passes/LogicalExpressionOptimizerPass.cpp b/src/Analyzer/Passes/LogicalExpressionOptimizerPass.cpp
index ac221bd66e7..244a8184ba8 100644
--- a/src/Analyzer/Passes/LogicalExpressionOptimizerPass.cpp
+++ b/src/Analyzer/Passes/LogicalExpressionOptimizerPass.cpp
@@ -8,6 +8,7 @@
 #include <Analyzer/JoinNode.h>
 #include <Analyzer/HashUtils.h>
 #include <Analyzer/Utils.h>
+#include <Core/Settings.h>
 
 #include <DataTypes/DataTypeLowCardinality.h>
 
diff --git a/src/Analyzer/Passes/MultiIfToIfPass.cpp b/src/Analyzer/Passes/MultiIfToIfPass.cpp
index c42ea61b34a..0b441032b02 100644
--- a/src/Analyzer/Passes/MultiIfToIfPass.cpp
+++ b/src/Analyzer/Passes/MultiIfToIfPass.cpp
@@ -2,6 +2,7 @@
 
 #include <Analyzer/InDepthQueryTreeVisitor.h>
 #include <Analyzer/FunctionNode.h>
+#include <Core/Settings.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/if.h>
 
diff --git a/src/Analyzer/Passes/NormalizeCountVariantsPass.cpp b/src/Analyzer/Passes/NormalizeCountVariantsPass.cpp
index f9066b0363c..3a8b6e75d40 100644
--- a/src/Analyzer/Passes/NormalizeCountVariantsPass.cpp
+++ b/src/Analyzer/Passes/NormalizeCountVariantsPass.cpp
@@ -7,6 +7,7 @@
 #include <Analyzer/ConstantNode.h>
 #include <Analyzer/FunctionNode.h>
 #include <Analyzer/Utils.h>
+#include <Core/Settings.h>
 #include <Interpreters/Context.h>
 #include <DataTypes/DataTypesNumber.h>
 
diff --git a/src/Analyzer/Passes/OptimizeDateOrDateTimeConverterWithPreimagePass.cpp b/src/Analyzer/Passes/OptimizeDateOrDateTimeConverterWithPreimagePass.cpp
index a8364f1ab7a..feb8bcc792d 100644
--- a/src/Analyzer/Passes/OptimizeDateOrDateTimeConverterWithPreimagePass.cpp
+++ b/src/Analyzer/Passes/OptimizeDateOrDateTimeConverterWithPreimagePass.cpp
@@ -9,6 +9,7 @@
 #include <Analyzer/InDepthQueryTreeVisitor.h>
 #include <Common/DateLUT.h>
 #include <Common/DateLUTImpl.h>
+#include <Core/Settings.h>
 
 namespace DB
 {
diff --git a/src/Analyzer/Passes/OptimizeGroupByFunctionKeysPass.cpp b/src/Analyzer/Passes/OptimizeGroupByFunctionKeysPass.cpp
index fd8c3e6ee6c..bfb6aa1dd07 100644
--- a/src/Analyzer/Passes/OptimizeGroupByFunctionKeysPass.cpp
+++ b/src/Analyzer/Passes/OptimizeGroupByFunctionKeysPass.cpp
@@ -8,6 +8,7 @@
 #include <Analyzer/IQueryTreeNode.h>
 #include <Analyzer/InDepthQueryTreeVisitor.h>
 #include <Analyzer/QueryNode.h>
+#include <Core/Settings.h>
 
 namespace DB
 {
diff --git a/src/Analyzer/Passes/OptimizeGroupByInjectiveFunctionsPass.cpp b/src/Analyzer/Passes/OptimizeGroupByInjectiveFunctionsPass.cpp
index a30ad2a1590..fc989003c02 100644
--- a/src/Analyzer/Passes/OptimizeGroupByInjectiveFunctionsPass.cpp
+++ b/src/Analyzer/Passes/OptimizeGroupByInjectiveFunctionsPass.cpp
@@ -3,6 +3,7 @@
 #include <Analyzer/FunctionNode.h>
 #include <Analyzer/InDepthQueryTreeVisitor.h>
 #include <Analyzer/IQueryTreeNode.h>
+#include <Core/Settings.h>
 #include <DataTypes/IDataType.h>
 #include <Interpreters/ExternalDictionariesLoader.h>
 
diff --git a/src/Analyzer/Passes/OptimizeRedundantFunctionsInOrderByPass.cpp b/src/Analyzer/Passes/OptimizeRedundantFunctionsInOrderByPass.cpp
index b13af7f00ae..4f0271b4914 100644
--- a/src/Analyzer/Passes/OptimizeRedundantFunctionsInOrderByPass.cpp
+++ b/src/Analyzer/Passes/OptimizeRedundantFunctionsInOrderByPass.cpp
@@ -8,6 +8,7 @@
 #include <Analyzer/InDepthQueryTreeVisitor.h>
 #include <Analyzer/QueryNode.h>
 #include <Analyzer/SortNode.h>
+#include <Core/Settings.h>
 
 namespace DB
 {
diff --git a/src/Analyzer/Passes/RewriteAggregateFunctionWithIfPass.cpp b/src/Analyzer/Passes/RewriteAggregateFunctionWithIfPass.cpp
index 05377f8514e..c1adf05ac76 100644
--- a/src/Analyzer/Passes/RewriteAggregateFunctionWithIfPass.cpp
+++ b/src/Analyzer/Passes/RewriteAggregateFunctionWithIfPass.cpp
@@ -6,6 +6,8 @@
 #include <AggregateFunctions/AggregateFunctionFactory.h>
 #include <AggregateFunctions/IAggregateFunction.h>
 
+#include <Core/Settings.h>
+
 #include <Functions/FunctionFactory.h>
 
 #include <Interpreters/Context.h>
diff --git a/src/Analyzer/Passes/RewriteSumFunctionWithSumAndCountPass.cpp b/src/Analyzer/Passes/RewriteSumFunctionWithSumAndCountPass.cpp
index 524ee807721..a42b4750f47 100644
--- a/src/Analyzer/Passes/RewriteSumFunctionWithSumAndCountPass.cpp
+++ b/src/Analyzer/Passes/RewriteSumFunctionWithSumAndCountPass.cpp
@@ -6,6 +6,7 @@
 #include <Analyzer/ConstantNode.h>
 #include <Analyzer/FunctionNode.h>
 #include <Analyzer/Utils.h>
+#include <Core/Settings.h>
 #include <Functions/FunctionFactory.h>
 
 namespace DB
diff --git a/src/Analyzer/Passes/SumIfToCountIfPass.cpp b/src/Analyzer/Passes/SumIfToCountIfPass.cpp
index e5ee8a0d0b2..1524629dc81 100644
--- a/src/Analyzer/Passes/SumIfToCountIfPass.cpp
+++ b/src/Analyzer/Passes/SumIfToCountIfPass.cpp
@@ -1,19 +1,16 @@
 #include <Analyzer/Passes/SumIfToCountIfPass.h>
 
-#include <DataTypes/DataTypesNumber.h>
-#include <DataTypes/DataTypeNullable.h>
-
 #include <AggregateFunctions/AggregateFunctionFactory.h>
 #include <AggregateFunctions/IAggregateFunction.h>
-#include <Analyzer/Utils.h>
-
-#include <Functions/FunctionFactory.h>
-
-#include <Interpreters/Context.h>
-
 #include <Analyzer/InDepthQueryTreeVisitor.h>
 #include <Analyzer/ConstantNode.h>
 #include <Analyzer/FunctionNode.h>
+#include <Analyzer/Utils.h>
+#include <Core/Settings.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <Functions/FunctionFactory.h>
+#include <Interpreters/Context.h>
 
 namespace DB
 {
diff --git a/src/Analyzer/Passes/UniqInjectiveFunctionsEliminationPass.cpp b/src/Analyzer/Passes/UniqInjectiveFunctionsEliminationPass.cpp
index 947952ac3a8..cb8ef35fc13 100644
--- a/src/Analyzer/Passes/UniqInjectiveFunctionsEliminationPass.cpp
+++ b/src/Analyzer/Passes/UniqInjectiveFunctionsEliminationPass.cpp
@@ -9,6 +9,8 @@
 #include <Analyzer/FunctionNode.h>
 #include <Analyzer/Utils.h>
 
+#include <Core/Settings.h>
+
 
 namespace DB
 {
diff --git a/src/Analyzer/Passes/UniqToCountPass.cpp b/src/Analyzer/Passes/UniqToCountPass.cpp
index 83705f54b38..3f73322d1fa 100644
--- a/src/Analyzer/Passes/UniqToCountPass.cpp
+++ b/src/Analyzer/Passes/UniqToCountPass.cpp
@@ -9,6 +9,8 @@
 #include <Analyzer/QueryNode.h>
 #include <Analyzer/Utils.h>
 
+#include <Core/Settings.h>
+
 namespace DB
 {
 
diff --git a/src/Analyzer/QueryTreeBuilder.cpp b/src/Analyzer/QueryTreeBuilder.cpp
index 6a5db4bc1de..d68918e7027 100644
--- a/src/Analyzer/QueryTreeBuilder.cpp
+++ b/src/Analyzer/QueryTreeBuilder.cpp
@@ -40,6 +40,8 @@
 #include <Analyzer/JoinNode.h>
 #include <Analyzer/UnionNode.h>
 
+#include <Core/Settings.h>
+
 #include <Databases/IDatabase.h>
 
 #include <Interpreters/StorageID.h>
diff --git a/src/Analyzer/Resolve/IdentifierResolveScope.cpp b/src/Analyzer/Resolve/IdentifierResolveScope.cpp
index ae363b57047..eb3e2179440 100644
--- a/src/Analyzer/Resolve/IdentifierResolveScope.cpp
+++ b/src/Analyzer/Resolve/IdentifierResolveScope.cpp
@@ -1,8 +1,9 @@
 #include <Analyzer/Resolve/IdentifierResolveScope.h>
 
-#include <Interpreters/Context.h>
 #include <Analyzer/QueryNode.h>
 #include <Analyzer/UnionNode.h>
+#include <Core/Settings.h>
+#include <Interpreters/Context.h>
 
 namespace DB
 {
diff --git a/src/Analyzer/Resolve/IdentifierResolver.cpp b/src/Analyzer/Resolve/IdentifierResolver.cpp
index 692a31b66ba..9dd8aa1a05f 100644
--- a/src/Analyzer/Resolve/IdentifierResolver.cpp
+++ b/src/Analyzer/Resolve/IdentifierResolver.cpp
@@ -25,6 +25,8 @@
 #include <Analyzer/Resolve/IdentifierResolveScope.h>
 #include <Analyzer/Resolve/ReplaceColumnsVisitor.h>
 
+#include <Core/Settings.h>
+
 namespace DB
 {
 namespace ErrorCodes
diff --git a/src/Analyzer/Resolve/QueryAnalyzer.cpp b/src/Analyzer/Resolve/QueryAnalyzer.cpp
index 576c4943ccb..bd9b16b7649 100644
--- a/src/Analyzer/Resolve/QueryAnalyzer.cpp
+++ b/src/Analyzer/Resolve/QueryAnalyzer.cpp
@@ -64,6 +64,8 @@
 #include <Analyzer/Resolve/TableExpressionsAliasVisitor.h>
 #include <Analyzer/Resolve/ReplaceColumnsVisitor.h>
 
+#include <Core/Settings.h>
+
 namespace ProfileEvents
 {
     extern const Event ScalarSubqueriesGlobalCacheHit;
diff --git a/src/Analyzer/TableNode.cpp b/src/Analyzer/TableNode.cpp
index 1c4d022542d..d5a4b06f652 100644
--- a/src/Analyzer/TableNode.cpp
+++ b/src/Analyzer/TableNode.cpp
@@ -10,6 +10,8 @@
 
 #include <Interpreters/Context.h>
 
+#include <Core/Settings.h>
+
 namespace DB
 {
 
diff --git a/src/Analyzer/Utils.cpp b/src/Analyzer/Utils.cpp
index cf4a3f77e34..d10bbd9bd23 100644
--- a/src/Analyzer/Utils.cpp
+++ b/src/Analyzer/Utils.cpp
@@ -1,5 +1,7 @@
 #include <Analyzer/Utils.h>
 
+#include <Core/Settings.h>
+
 #include <Parsers/ASTTablesInSelectQuery.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTSubquery.h>
diff --git a/src/Backups/BackupEntriesCollector.cpp b/src/Backups/BackupEntriesCollector.cpp
index 64ab2112326..3ee7a05600e 100644
--- a/src/Backups/BackupEntriesCollector.cpp
+++ b/src/Backups/BackupEntriesCollector.cpp
@@ -17,6 +17,7 @@
 #include <base/scope_guard.h>
 #include <base/sleep.h>
 #include <Common/escapeForFileName.h>
+#include <Core/Settings.h>
 
 #include <boost/range/adaptor/map.hpp>
 #include <boost/range/algorithm/copy.hpp>
diff --git a/src/Backups/BackupIO_S3.cpp b/src/Backups/BackupIO_S3.cpp
index 56544312c26..aef37021227 100644
--- a/src/Backups/BackupIO_S3.cpp
+++ b/src/Backups/BackupIO_S3.cpp
@@ -1,6 +1,7 @@
 #include <Backups/BackupIO_S3.h>
 
 #if USE_AWS_S3
+#include <Core/Settings.h>
 #include <Common/quoteString.h>
 #include <Common/threadPoolCallbackRunner.h>
 #include <Interpreters/Context.h>
diff --git a/src/Backups/BackupsWorker.cpp b/src/Backups/BackupsWorker.cpp
index 69d9c52ebd9..15a7d7c1eca 100644
--- a/src/Backups/BackupsWorker.cpp
+++ b/src/Backups/BackupsWorker.cpp
@@ -26,6 +26,7 @@
 #include <Common/setThreadName.h>
 #include <Common/scope_guard_safe.h>
 #include <Common/ThreadPool.h>
+#include <Core/Settings.h>
 
 #include <boost/range/adaptor/map.hpp>
 
diff --git a/src/Backups/RestorerFromBackup.cpp b/src/Backups/RestorerFromBackup.cpp
index 454a0468e9f..3056f9fe421 100644
--- a/src/Backups/RestorerFromBackup.cpp
+++ b/src/Backups/RestorerFromBackup.cpp
@@ -23,8 +23,9 @@
 #include <Common/quoteString.h>
 #include <Common/escapeForFileName.h>
 #include <base/insertAtEnd.h>
-#include <boost/algorithm/string/join.hpp>
+#include <Core/Settings.h>
 
+#include <boost/algorithm/string/join.hpp>
 #include <boost/range/adaptor/map.hpp>
 
 #include <filesystem>
diff --git a/src/Backups/WithRetries.cpp b/src/Backups/WithRetries.cpp
index 66851fa42ce..181e6331ac9 100644
--- a/src/Backups/WithRetries.cpp
+++ b/src/Backups/WithRetries.cpp
@@ -1,5 +1,7 @@
-#include <mutex>
 #include <Backups/WithRetries.h>
+#include <Core/Settings.h>
+
+#include <mutex>
 
 namespace DB
 {
diff --git a/src/Bridge/IBridge.cpp b/src/Bridge/IBridge.cpp
index c25d7bd2fed..de48a4f2b84 100644
--- a/src/Bridge/IBridge.cpp
+++ b/src/Bridge/IBridge.cpp
@@ -8,6 +8,7 @@
 #include <Common/SensitiveDataMasker.h>
 #include <Common/StringUtils.h>
 #include <Common/logger_useful.h>
+#include <Core/Settings.h>
 #include <Formats/registerFormats.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteBufferFromFile.h>
diff --git a/src/BridgeHelper/LibraryBridgeHelper.cpp b/src/BridgeHelper/LibraryBridgeHelper.cpp
index 57baf7e5a33..12ca5564e80 100644
--- a/src/BridgeHelper/LibraryBridgeHelper.cpp
+++ b/src/BridgeHelper/LibraryBridgeHelper.cpp
@@ -1,6 +1,7 @@
 #include "LibraryBridgeHelper.h"
 
 #include <Core/ServerSettings.h>
+#include <Core/Settings.h>
 #include <IO/ConnectionTimeouts.h>
 
 namespace DB
diff --git a/src/Client/ClientBase.h b/src/Client/ClientBase.h
index a260fd5761e..d2b10d7ed2e 100644
--- a/src/Client/ClientBase.h
+++ b/src/Client/ClientBase.h
@@ -10,6 +10,7 @@
 #include <Common/Stopwatch.h>
 #include <Common/DNSResolver.h>
 #include <Core/ExternalTable.h>
+#include <Core/Settings.h>
 #include <Poco/Util/Application.h>
 #include <Interpreters/Context.h>
 #include <Client/Suggest.h>
diff --git a/src/Client/ConnectionEstablisher.cpp b/src/Client/ConnectionEstablisher.cpp
index 303105751ad..ebfabbb15d4 100644
--- a/src/Client/ConnectionEstablisher.cpp
+++ b/src/Client/ConnectionEstablisher.cpp
@@ -1,6 +1,7 @@
 #include <Client/ConnectionEstablisher.h>
 #include <Common/quoteString.h>
 #include <Common/ProfileEvents.h>
+#include <Core/Settings.h>
 
 namespace ProfileEvents
 {
diff --git a/src/Client/ConnectionPool.cpp b/src/Client/ConnectionPool.cpp
index 5cabb1465d1..ed2e7c3c725 100644
--- a/src/Client/ConnectionPool.cpp
+++ b/src/Client/ConnectionPool.cpp
@@ -1,4 +1,5 @@
 #include <Client/ConnectionPool.h>
+#include <Core/Settings.h>
 
 #include <boost/functional/hash.hpp>
 
@@ -85,4 +86,15 @@ ConnectionPoolFactory & ConnectionPoolFactory::instance()
     return ret;
 }
 
+IConnectionPool::Entry ConnectionPool::get(const DB::ConnectionTimeouts& timeouts, const DB::Settings& settings,
+        bool force_connected)
+{
+    Entry entry = Base::get(settings.connection_pool_max_wait_ms.totalMilliseconds());
+
+    if (force_connected)
+        entry->forceConnected(timeouts);
+
+    return entry;
+}
+
 }
diff --git a/src/Client/ConnectionPool.h b/src/Client/ConnectionPool.h
index 725a5e91ac0..d83ecdd75f9 100644
--- a/src/Client/ConnectionPool.h
+++ b/src/Client/ConnectionPool.h
@@ -4,12 +4,13 @@
 #include <Common/Priority.h>
 #include <Client/Connection.h>
 #include <IO/ConnectionTimeouts.h>
-#include <Core/Settings.h>
 #include <base/defines.h>
 
 namespace DB
 {
 
+struct Settings;
+
 /** Interface for connection pools.
   *
   * Usage (using the usual `ConnectionPool` example)
@@ -102,15 +103,7 @@ public:
 
     Entry get(const ConnectionTimeouts & timeouts, /// NOLINT
               const Settings & settings,
-              bool force_connected = true) override
-    {
-        Entry entry = Base::get(settings.connection_pool_max_wait_ms.totalMilliseconds());
-
-        if (force_connected)
-            entry->forceConnected(timeouts);
-
-        return entry;
-    }
+              bool force_connected = true) override;
 
     std::string getDescription() const
     {
diff --git a/src/Client/HedgedConnections.cpp b/src/Client/HedgedConnections.cpp
index 4effc3adafa..dd8348ea04f 100644
--- a/src/Client/HedgedConnections.cpp
+++ b/src/Client/HedgedConnections.cpp
@@ -3,6 +3,7 @@
 
 #include <Client/HedgedConnections.h>
 #include <Common/ProfileEvents.h>
+#include <Core/Settings.h>
 #include <Interpreters/ClientInfo.h>
 #include <Interpreters/Context.h>
 
diff --git a/src/Client/HedgedConnectionsFactory.h b/src/Client/HedgedConnectionsFactory.h
index 51da85ea178..63e39819f58 100644
--- a/src/Client/HedgedConnectionsFactory.h
+++ b/src/Client/HedgedConnectionsFactory.h
@@ -8,13 +8,14 @@
 #include <Common/Fiber.h>
 #include <Client/ConnectionEstablisher.h>
 #include <Client/ConnectionPoolWithFailover.h>
-#include <Core/Settings.h>
 #include <unordered_map>
 #include <memory>
 
 namespace DB
 {
 
+struct Settings;
+
 /** Class for establishing hedged connections with replicas.
   * The process of establishing connection is divided on stages, on each stage if
   * replica doesn't respond for a long time, we start establishing connection with
diff --git a/src/Client/MultiplexedConnections.cpp b/src/Client/MultiplexedConnections.cpp
index bcef286ecbc..207bf6c9e07 100644
--- a/src/Client/MultiplexedConnections.cpp
+++ b/src/Client/MultiplexedConnections.cpp
@@ -2,6 +2,7 @@
 
 #include <Common/thread_local_rng.h>
 #include <Core/Protocol.h>
+#include <Core/Settings.h>
 #include <Interpreters/Context.h>
 #include <IO/ConnectionTimeouts.h>
 #include <IO/Operators.h>
diff --git a/src/Common/DateLUT.cpp b/src/Common/DateLUT.cpp
index 3a20fb1a125..f9bbe2fbf40 100644
--- a/src/Common/DateLUT.cpp
+++ b/src/Common/DateLUT.cpp
@@ -2,7 +2,9 @@
 
 #include <Interpreters/Context.h>
 #include <Common/CurrentThread.h>
+#include <Common/DateLUTImpl.h>
 #include <Common/filesystemHelpers.h>
+#include <Core/Settings.h>
 
 #include <Poco/DigestStream.h>
 #include <Poco/Exception.h>
diff --git a/src/Common/NamedCollections/NamedCollectionsFactory.cpp b/src/Common/NamedCollections/NamedCollectionsFactory.cpp
index 14105a8651d..f8ddcba30b8 100644
--- a/src/Common/NamedCollections/NamedCollectionsFactory.cpp
+++ b/src/Common/NamedCollections/NamedCollectionsFactory.cpp
@@ -1,6 +1,7 @@
 #include <Common/NamedCollections/NamedCollectionsFactory.h>
 #include <Common/NamedCollections/NamedCollectionConfiguration.h>
 #include <Common/NamedCollections/NamedCollectionsMetadataStorage.h>
+#include <Core/Settings.h>
 #include <base/sleep.h>
 
 namespace DB
diff --git a/src/Common/NamedCollections/NamedCollectionsMetadataStorage.cpp b/src/Common/NamedCollections/NamedCollectionsMetadataStorage.cpp
index 32fdb25abd3..7b3dfd5b90f 100644
--- a/src/Common/NamedCollections/NamedCollectionsMetadataStorage.cpp
+++ b/src/Common/NamedCollections/NamedCollectionsMetadataStorage.cpp
@@ -5,6 +5,7 @@
 #include <Common/ZooKeeper/IKeeper.h>
 #include <Common/ZooKeeper/KeeperException.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
+#include <Core/Settings.h>
 #include <IO/WriteBufferFromFile.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/WriteHelpers.h>
diff --git a/src/Core/ExternalTable.cpp b/src/Core/ExternalTable.cpp
index bc72c996384..af681cd5639 100644
--- a/src/Core/ExternalTable.cpp
+++ b/src/Core/ExternalTable.cpp
@@ -16,6 +16,7 @@
 #include <QueryPipeline/QueryPipelineBuilder.h>
 
 #include <Core/ExternalTable.h>
+#include <Core/Settings.h>
 #include <Poco/Net/MessageHeader.h>
 #include <Parsers/ASTNameTypePair.h>
 #include <Parsers/ParserCreateQuery.h>
diff --git a/src/Daemon/BaseDaemon.cpp b/src/Daemon/BaseDaemon.cpp
index 48f76769a09..9b132c3e199 100644
--- a/src/Daemon/BaseDaemon.cpp
+++ b/src/Daemon/BaseDaemon.cpp
@@ -4,6 +4,7 @@
 #include <base/errnoToString.h>
 #include <Common/CurrentThread.h>
 #include <Common/MemoryTracker.h>
+#include <Core/Settings.h>
 #include <Daemon/BaseDaemon.h>
 #include <Daemon/SentryWriter.h>
 #include <Common/GWPAsan.h>
diff --git a/src/DataTypes/DataTypeDecimalBase.cpp b/src/DataTypes/DataTypeDecimalBase.cpp
index 62218694924..2adfda5bb27 100644
--- a/src/DataTypes/DataTypeDecimalBase.cpp
+++ b/src/DataTypes/DataTypeDecimalBase.cpp
@@ -1,3 +1,4 @@
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeDecimalBase.h>
 #include <Interpreters/Context.h>
 #include <type_traits>
diff --git a/src/DataTypes/DataTypeFactory.cpp b/src/DataTypes/DataTypeFactory.cpp
index 8c8f9999ada..07dc4395bfe 100644
--- a/src/DataTypes/DataTypeFactory.cpp
+++ b/src/DataTypes/DataTypeFactory.cpp
@@ -10,6 +10,7 @@
 #include <Common/StringUtils.h>
 #include <IO/WriteHelpers.h>
 #include <Core/Defines.h>
+#include <Core/Settings.h>
 #include <Common/CurrentThread.h>
 #include <Interpreters/Context.h>
 
diff --git a/src/Databases/DDLDependencyVisitor.cpp b/src/Databases/DDLDependencyVisitor.cpp
index c85e8f5688a..d81dc7a76d8 100644
--- a/src/Databases/DDLDependencyVisitor.cpp
+++ b/src/Databases/DDLDependencyVisitor.cpp
@@ -16,6 +16,7 @@
 #include <Parsers/ParserSelectWithUnionQuery.h>
 #include <Parsers/parseQuery.h>
 #include <Common/KnownObjectNames.h>
+#include <Core/Settings.h>
 #include <Poco/String.h>
 
 
diff --git a/src/Databases/DatabaseAtomic.cpp b/src/Databases/DatabaseAtomic.cpp
index ccab72cfbae..35f66cb4583 100644
--- a/src/Databases/DatabaseAtomic.cpp
+++ b/src/Databases/DatabaseAtomic.cpp
@@ -12,10 +12,11 @@
 #include <Interpreters/ExternalDictionariesLoader.h>
 #include <Parsers/formatAST.h>
 #include <Storages/StorageMaterializedView.h>
-#include "Common/logger_useful.h"
+#include <Common/logger_useful.h>
 #include <Common/PoolId.h>
 #include <Common/atomicRename.h>
 #include <Common/filesystemHelpers.h>
+#include <Core/Settings.h>
 
 namespace fs = std::filesystem;
 
diff --git a/src/Databases/DatabaseDictionary.cpp b/src/Databases/DatabaseDictionary.cpp
index adb9a659fcd..52196e75c4a 100644
--- a/src/Databases/DatabaseDictionary.cpp
+++ b/src/Databases/DatabaseDictionary.cpp
@@ -10,6 +10,7 @@
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/parseQuery.h>
 #include <Parsers/IAST.h>
+#include <Core/Settings.h>
 
 
 namespace DB
diff --git a/src/Databases/DatabaseFactory.cpp b/src/Databases/DatabaseFactory.cpp
index 3a4c1423f7c..05a5e057c55 100644
--- a/src/Databases/DatabaseFactory.cpp
+++ b/src/Databases/DatabaseFactory.cpp
@@ -9,6 +9,7 @@
 #include <Parsers/queryToString.h>
 #include <Common/Macros.h>
 #include <Common/filesystemHelpers.h>
+#include <Core/Settings.h>
 
 
 namespace fs = std::filesystem;
diff --git a/src/Databases/DatabaseFilesystem.cpp b/src/Databases/DatabaseFilesystem.cpp
index b27a816a60d..31701e665a1 100644
--- a/src/Databases/DatabaseFilesystem.cpp
+++ b/src/Databases/DatabaseFilesystem.cpp
@@ -1,6 +1,7 @@
 #include <Databases/DatabaseFactory.h>
 #include <Databases/DatabaseFilesystem.h>
 
+#include <Core/Settings.h>
 #include <IO/Operators.h>
 #include <IO/WriteBufferFromString.h>
 #include <Interpreters/Context.h>
diff --git a/src/Databases/DatabaseHDFS.cpp b/src/Databases/DatabaseHDFS.cpp
index 060991d1290..eccaae5f22e 100644
--- a/src/Databases/DatabaseHDFS.cpp
+++ b/src/Databases/DatabaseHDFS.cpp
@@ -15,6 +15,7 @@
 #include <Storages/IStorage.h>
 #include <TableFunctions/TableFunctionFactory.h>
 #include <Common/re2.h>
+#include <Core/Settings.h>
 
 #include <Poco/URI.h>
 
diff --git a/src/Databases/DatabaseOnDisk.cpp b/src/Databases/DatabaseOnDisk.cpp
index b8154372116..07a250e72c7 100644
--- a/src/Databases/DatabaseOnDisk.cpp
+++ b/src/Databases/DatabaseOnDisk.cpp
@@ -28,6 +28,7 @@
 #include <Common/filesystemHelpers.h>
 #include <Common/logger_useful.h>
 #include <Common/setThreadName.h>
+#include <Core/Settings.h>
 
 
 namespace fs = std::filesystem;
diff --git a/src/Databases/DatabaseReplicated.cpp b/src/Databases/DatabaseReplicated.cpp
index 7b8955f7111..7ce2859e962 100644
--- a/src/Databases/DatabaseReplicated.cpp
+++ b/src/Databases/DatabaseReplicated.cpp
@@ -14,6 +14,7 @@
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Common/PoolId.h>
 #include <Core/ServerSettings.h>
+#include <Core/Settings.h>
 #include <Databases/DatabaseFactory.h>
 #include <Databases/DatabaseReplicated.h>
 #include <Databases/DatabaseReplicatedWorker.h>
diff --git a/src/Databases/DatabaseReplicatedWorker.cpp b/src/Databases/DatabaseReplicatedWorker.cpp
index 31d6f7876a8..1ef88dc03bc 100644
--- a/src/Databases/DatabaseReplicatedWorker.cpp
+++ b/src/Databases/DatabaseReplicatedWorker.cpp
@@ -3,6 +3,7 @@
 #include <Interpreters/DDLTask.h>
 #include <Common/ZooKeeper/KeeperException.h>
 #include <Core/ServerUUID.h>
+#include <Core/Settings.h>
 #include <filesystem>
 
 namespace fs = std::filesystem;
diff --git a/src/Databases/DatabaseS3.cpp b/src/Databases/DatabaseS3.cpp
index 1589cc1c75d..2b2d978a846 100644
--- a/src/Databases/DatabaseS3.cpp
+++ b/src/Databases/DatabaseS3.cpp
@@ -5,6 +5,7 @@
 #include <Databases/DatabaseFactory.h>
 #include <Databases/DatabaseS3.h>
 
+#include <Core/Settings.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/evaluateConstantExpression.h>
 #include <IO/S3/URI.h>
diff --git a/src/Databases/MySQL/DatabaseMySQL.cpp b/src/Databases/MySQL/DatabaseMySQL.cpp
index 1c82131af0d..cacb91ce780 100644
--- a/src/Databases/MySQL/DatabaseMySQL.cpp
+++ b/src/Databases/MySQL/DatabaseMySQL.cpp
@@ -29,6 +29,7 @@
 #    include <Common/parseAddress.h>
 #    include <Common/parseRemoteDescription.h>
 #    include <Common/setThreadName.h>
+#    include <Core/Settings.h>
 #    include <filesystem>
 #    include <Common/filesystemHelpers.h>
 #    include <Parsers/ASTIdentifier.h>
diff --git a/src/Databases/MySQL/FetchTablesColumnsList.cpp b/src/Databases/MySQL/FetchTablesColumnsList.cpp
index e78f4aa2234..0828438cad2 100644
--- a/src/Databases/MySQL/FetchTablesColumnsList.cpp
+++ b/src/Databases/MySQL/FetchTablesColumnsList.cpp
@@ -2,6 +2,7 @@
 
 #if USE_MYSQL
 #include <Core/Block.h>
+#include <Core/Settings.h>
 #include <Databases/MySQL/FetchTablesColumnsList.h>
 #include <DataTypes/convertMySQLDataType.h>
 #include <DataTypes/DataTypeString.h>
diff --git a/src/Databases/MySQL/FetchTablesColumnsList.h b/src/Databases/MySQL/FetchTablesColumnsList.h
index 736a0ffd607..ec12cdc73b0 100644
--- a/src/Databases/MySQL/FetchTablesColumnsList.h
+++ b/src/Databases/MySQL/FetchTablesColumnsList.h
@@ -12,11 +12,12 @@
 
 #include <map>
 #include <vector>
-#include <Core/Settings.h>
 
 namespace DB
 {
 
+struct Settings;
+
 std::map<String, ColumnsDescription> fetchTablesColumnsList(
         mysqlxx::PoolWithFailover & pool,
         const String & database_name,
diff --git a/src/Databases/MySQL/MaterializeMetadata.h b/src/Databases/MySQL/MaterializeMetadata.h
index e78b7132c8d..36d3fb569d8 100644
--- a/src/Databases/MySQL/MaterializeMetadata.h
+++ b/src/Databases/MySQL/MaterializeMetadata.h
@@ -6,6 +6,7 @@
 
 #include <base/types.h>
 #include <Core/MySQL/MySQLReplication.h>
+#include <Core/Settings.h>
 #include <mysqlxx/Connection.h>
 #include <mysqlxx/PoolWithFailover.h>
 #include <Interpreters/Context.h>
diff --git a/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp b/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp
index 136fb7fd6d2..b4f8291cef9 100644
--- a/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp
+++ b/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp
@@ -22,6 +22,7 @@
 #include <Common/quoteString.h>
 #include <Common/filesystemHelpers.h>
 #include <Common/logger_useful.h>
+#include <Core/Settings.h>
 #include <filesystem>
 
 namespace fs = std::filesystem;
diff --git a/src/Databases/SQLite/DatabaseSQLite.cpp b/src/Databases/SQLite/DatabaseSQLite.cpp
index e758ea35de5..132a978140c 100644
--- a/src/Databases/SQLite/DatabaseSQLite.cpp
+++ b/src/Databases/SQLite/DatabaseSQLite.cpp
@@ -3,6 +3,7 @@
 #if USE_SQLITE
 
 #include <Common/logger_useful.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <Databases/DatabaseFactory.h>
diff --git a/src/Dictionaries/DirectDictionary.cpp b/src/Dictionaries/DirectDictionary.cpp
index 2c0f7653aff..f3b32402c20 100644
--- a/src/Dictionaries/DirectDictionary.cpp
+++ b/src/Dictionaries/DirectDictionary.cpp
@@ -1,6 +1,7 @@
 #include "DirectDictionary.h"
 
 #include <Core/Defines.h>
+#include <Core/Settings.h>
 #include <Common/HashTable/HashMap.h>
 #include <Functions/FunctionHelpers.h>
 
diff --git a/src/Dictionaries/ExecutablePoolDictionarySource.cpp b/src/Dictionaries/ExecutablePoolDictionarySource.cpp
index d8111afdc19..217a67453e4 100644
--- a/src/Dictionaries/ExecutablePoolDictionarySource.cpp
+++ b/src/Dictionaries/ExecutablePoolDictionarySource.cpp
@@ -8,6 +8,8 @@
 #include <Common/LocalDateTime.h>
 #include <Common/filesystemHelpers.h>
 
+#include <Core/Settings.h>
+
 #include <Processors/Formats/IOutputFormat.h>
 #include <Processors/Sources/ShellCommandSource.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
diff --git a/src/Dictionaries/HashedArrayDictionary.cpp b/src/Dictionaries/HashedArrayDictionary.cpp
index 9b194acf87f..d7d50dfb0a6 100644
--- a/src/Dictionaries/HashedArrayDictionary.cpp
+++ b/src/Dictionaries/HashedArrayDictionary.cpp
@@ -2,6 +2,7 @@
 
 #include <Common/ArenaUtils.h>
 #include <Core/Defines.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypesDecimal.h>
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnNullable.h>
diff --git a/src/Dictionaries/IPAddressDictionary.cpp b/src/Dictionaries/IPAddressDictionary.cpp
index 206516edab0..41fafcc162b 100644
--- a/src/Dictionaries/IPAddressDictionary.cpp
+++ b/src/Dictionaries/IPAddressDictionary.cpp
@@ -1,11 +1,11 @@
 #include "IPAddressDictionary.h"
-#include <stack>
-#include <charconv>
+
 #include <Common/assert_cast.h>
 #include <Common/IPv6ToBinary.h>
 #include <Common/memcmpSmall.h>
 #include <Common/typeid_cast.h>
 #include <Common/logger_useful.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeFixedString.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesDecimal.h>
@@ -23,6 +23,9 @@
 #include <Dictionaries/DictionaryFactory.h>
 #include <Functions/FunctionHelpers.h>
 
+#include <stack>
+#include <charconv>
+
 
 namespace DB
 {
diff --git a/src/Dictionaries/PolygonDictionaryImplementations.cpp b/src/Dictionaries/PolygonDictionaryImplementations.cpp
index e21fadb0e7e..84abeed2731 100644
--- a/src/Dictionaries/PolygonDictionaryImplementations.cpp
+++ b/src/Dictionaries/PolygonDictionaryImplementations.cpp
@@ -8,6 +8,7 @@
 #include <Dictionaries/DictionarySourceHelpers.h>
 
 #include <Common/logger_useful.h>
+#include <Core/Settings.h>
 
 #include <numeric>
 
diff --git a/src/Dictionaries/PostgreSQLDictionarySource.cpp b/src/Dictionaries/PostgreSQLDictionarySource.cpp
index c7401386e40..9e482287cb9 100644
--- a/src/Dictionaries/PostgreSQLDictionarySource.cpp
+++ b/src/Dictionaries/PostgreSQLDictionarySource.cpp
@@ -2,6 +2,7 @@
 
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Core/QualifiedTableName.h>
+#include <Core/Settings.h>
 #include "DictionarySourceFactory.h"
 #include "registerDictionaries.h"
 
diff --git a/src/Dictionaries/RegExpTreeDictionary.cpp b/src/Dictionaries/RegExpTreeDictionary.cpp
index 830f9d09364..a5aa622e01d 100644
--- a/src/Dictionaries/RegExpTreeDictionary.cpp
+++ b/src/Dictionaries/RegExpTreeDictionary.cpp
@@ -14,6 +14,7 @@
 #include <Common/logger_useful.h>
 #include <Common/OptimizedRegularExpression.h>
 #include <Core/ColumnsWithTypeAndName.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
 
diff --git a/src/Dictionaries/XDBCDictionarySource.cpp b/src/Dictionaries/XDBCDictionarySource.cpp
index 65a9f806722..b84cfa109ee 100644
--- a/src/Dictionaries/XDBCDictionarySource.cpp
+++ b/src/Dictionaries/XDBCDictionarySource.cpp
@@ -10,6 +10,7 @@
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Common/LocalDateTime.h>
 #include <Common/logger_useful.h>
+#include <Core/Settings.h>
 #include "DictionarySourceFactory.h"
 #include "DictionaryStructure.h"
 #include "readInvalidateQuery.h"
diff --git a/src/Dictionaries/registerCacheDictionaries.cpp b/src/Dictionaries/registerCacheDictionaries.cpp
index b79261955ff..f2d027575f5 100644
--- a/src/Dictionaries/registerCacheDictionaries.cpp
+++ b/src/Dictionaries/registerCacheDictionaries.cpp
@@ -2,6 +2,7 @@
 #include "CacheDictionaryStorage.h"
 #include "SSDCacheDictionaryStorage.h"
 #include <Common/filesystemHelpers.h>
+#include <Core/Settings.h>
 
 #include <Dictionaries/ClickHouseDictionarySource.h>
 #include <Dictionaries/DictionaryFactory.h>
diff --git a/src/Dictionaries/registerHashedDictionary.cpp b/src/Dictionaries/registerHashedDictionary.cpp
index 5fc4f5d5cb6..068b71170cc 100644
--- a/src/Dictionaries/registerHashedDictionary.cpp
+++ b/src/Dictionaries/registerHashedDictionary.cpp
@@ -1,8 +1,8 @@
+#include <Core/Settings.h>
 #include <Dictionaries/HashedDictionary.h>
 #include <Dictionaries/DictionaryFactory.h>
 #include <Dictionaries/DictionarySourceHelpers.h>
 #include <Dictionaries/ClickHouseDictionarySource.h>
-
 #include <Interpreters/Context.h>
 
 namespace DB
diff --git a/src/Dictionaries/registerRangeHashedDictionary.cpp b/src/Dictionaries/registerRangeHashedDictionary.cpp
index 8123b811198..bc142a6bddc 100644
--- a/src/Dictionaries/registerRangeHashedDictionary.cpp
+++ b/src/Dictionaries/registerRangeHashedDictionary.cpp
@@ -1,5 +1,6 @@
 #include <Dictionaries/RangeHashedDictionary.h>
 
+#include <Core/Settings.h>
 #include <Dictionaries/DictionarySource.h>
 #include <Dictionaries/ClickHouseDictionarySource.h>
 #include <Dictionaries/DictionarySourceHelpers.h>
diff --git a/src/Disks/IO/ReadBufferFromWebServer.cpp b/src/Disks/IO/ReadBufferFromWebServer.cpp
index af4fae6b723..837452aa9f2 100644
--- a/src/Disks/IO/ReadBufferFromWebServer.cpp
+++ b/src/Disks/IO/ReadBufferFromWebServer.cpp
@@ -1,6 +1,7 @@
 #include "ReadBufferFromWebServer.h"
 
 #include <Core/ServerSettings.h>
+#include <Core/Settings.h>
 #include <IO/Operators.h>
 #include <IO/ReadWriteBufferFromHTTP.h>
 #include <IO/WriteBufferFromString.h>
diff --git a/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageCommon.cpp b/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageCommon.cpp
index d9dfedadd48..0aa3b9c40b5 100644
--- a/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageCommon.cpp
+++ b/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageCommon.cpp
@@ -4,6 +4,7 @@
 
 #include <Common/Exception.h>
 #include <Common/re2.h>
+#include <Core/Settings.h>
 #include <azure/identity/managed_identity_credential.hpp>
 #include <azure/identity/workload_identity_credential.hpp>
 #include <azure/storage/blobs/blob_options.hpp>
diff --git a/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageCommon.h b/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageCommon.h
index 19ba48ea225..bb2f0270924 100644
--- a/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageCommon.h
+++ b/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageCommon.h
@@ -11,7 +11,6 @@
 #include <azure/identity/managed_identity_credential.hpp>
 #include <azure/identity/workload_identity_credential.hpp>
 
-#include <Core/Settings.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Interpreters/Context_fwd.h>
 #include <base/strong_typedef.h>
@@ -19,6 +18,8 @@
 namespace DB
 {
 
+struct Settings;
+
 namespace AzureBlobStorage
 {
 
diff --git a/src/Disks/ObjectStorages/ObjectStorageFactory.cpp b/src/Disks/ObjectStorages/ObjectStorageFactory.cpp
index d9535358daf..d42da6dc9c4 100644
--- a/src/Disks/ObjectStorages/ObjectStorageFactory.cpp
+++ b/src/Disks/ObjectStorages/ObjectStorageFactory.cpp
@@ -24,6 +24,7 @@
 #include <Disks/ObjectStorages/createMetadataStorageMetrics.h>
 #include <Interpreters/Context.h>
 #include <Common/Macros.h>
+#include <Core/Settings.h>
 
 #include <filesystem>
 
diff --git a/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp b/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp
index a6781e0ab35..a6672e14e10 100644
--- a/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp
@@ -15,6 +15,7 @@
 #include <IO/S3/copyS3File.h>
 #include <Interpreters/Context.h>
 #include <Common/threadPoolCallbackRunner.h>
+#include <Core/Settings.h>
 #include <IO/S3/BlobStorageLogWriter.h>
 
 #include <Disks/ObjectStorages/S3/diskSettings.h>
diff --git a/src/Disks/ObjectStorages/S3/diskSettings.cpp b/src/Disks/ObjectStorages/S3/diskSettings.cpp
index 62df98f51e6..de78ce4594d 100644
--- a/src/Disks/ObjectStorages/S3/diskSettings.cpp
+++ b/src/Disks/ObjectStorages/S3/diskSettings.cpp
@@ -1,14 +1,14 @@
 #include <Disks/ObjectStorages/S3/diskSettings.h>
-#include <IO/S3/Client.h>
-#include <Common/Exception.h>
 
 #if USE_AWS_S3
 
+#include <Common/Exception.h>
 #include <Common/StringUtils.h>
 #include <Common/logger_useful.h>
 #include <Common/Macros.h>
 #include <Common/Throttler.h>
 #include <Common/ProxyConfigurationResolverProvider.h>
+#include <Core/Settings.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/Context.h>
@@ -17,6 +17,7 @@
 #include <aws/core/client/DefaultRetryStrategy.h>
 #include <base/getFQDNOrHostName.h>
 #include <IO/S3Common.h>
+#include <IO/S3/Client.h>
 #include <IO/S3/Credentials.h>
 
 #include <IO/S3Settings.h>
diff --git a/src/Formats/FormatFactory.cpp b/src/Formats/FormatFactory.cpp
index 484ea084d63..ef1fe1ca38c 100644
--- a/src/Formats/FormatFactory.cpp
+++ b/src/Formats/FormatFactory.cpp
@@ -17,6 +17,7 @@
 #include <Common/Exception.h>
 #include <Common/KnownObjectNames.h>
 #include <Common/tryGetFileNameByFileDescriptor.h>
+#include <Core/Settings.h>
 
 #include <boost/algorithm/string/case_conv.hpp>
 
diff --git a/src/Formats/NumpyDataTypes.h b/src/Formats/NumpyDataTypes.h
index 062f743c0ea..6ccdf65f457 100644
--- a/src/Formats/NumpyDataTypes.h
+++ b/src/Formats/NumpyDataTypes.h
@@ -2,6 +2,7 @@
 #include <cstddef>
 #include <Storages/NamedCollectionsHelpers.h>
 #include <IO/WriteBufferFromString.h>
+#include <IO/WriteHelpers.h>
 
 namespace ErrorCodes
 {
diff --git a/src/Formats/ReadSchemaUtils.cpp b/src/Formats/ReadSchemaUtils.cpp
index 735b536986d..617595c19a2 100644
--- a/src/Formats/ReadSchemaUtils.cpp
+++ b/src/Formats/ReadSchemaUtils.cpp
@@ -7,6 +7,7 @@
 #include <Processors/Formats/ISchemaReader.h>
 #include <Storages/IStorage.h>
 #include <Common/assert_cast.h>
+#include <Core/Settings.h>
 
 namespace DB
 {
diff --git a/src/Functions/CastOverloadResolver.cpp b/src/Functions/CastOverloadResolver.cpp
index 0f54ff52ba2..10a08c6e35f 100644
--- a/src/Functions/CastOverloadResolver.cpp
+++ b/src/Functions/CastOverloadResolver.cpp
@@ -4,6 +4,7 @@
 #include <DataTypes/DataTypeFactory.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <Columns/ColumnString.h>
+#include <Core/Settings.h>
 #include <Interpreters/parseColumnsListForTableFunction.h>
 #include <Interpreters/Context.h>
 
diff --git a/src/Functions/FunctionBinaryArithmetic.h b/src/Functions/FunctionBinaryArithmetic.h
index 5d19ba44d9b..51bc7583cfb 100644
--- a/src/Functions/FunctionBinaryArithmetic.h
+++ b/src/Functions/FunctionBinaryArithmetic.h
@@ -19,6 +19,7 @@
 #include <Core/ColumnWithTypeAndName.h>
 #include <Core/ColumnsWithTypeAndName.h>
 #include <Core/DecimalFunctions.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeAggregateFunction.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeDate.h>
diff --git a/src/Functions/FunctionCustomWeekToDateOrDate32.h b/src/Functions/FunctionCustomWeekToDateOrDate32.h
index c904bfaec30..6ae8c847b65 100644
--- a/src/Functions/FunctionCustomWeekToDateOrDate32.h
+++ b/src/Functions/FunctionCustomWeekToDateOrDate32.h
@@ -1,4 +1,5 @@
 #pragma once
+#include <Core/Settings.h>
 #include <Functions/IFunctionCustomWeek.h>
 
 namespace DB
diff --git a/src/Functions/FunctionDateOrDateTimeToDateOrDate32.h b/src/Functions/FunctionDateOrDateTimeToDateOrDate32.h
index 6eb3e534b62..28caef36879 100644
--- a/src/Functions/FunctionDateOrDateTimeToDateOrDate32.h
+++ b/src/Functions/FunctionDateOrDateTimeToDateOrDate32.h
@@ -1,4 +1,5 @@
 #pragma once
+#include <Core/Settings.h>
 #include <Functions/IFunctionDateOrDateTime.h>
 
 namespace DB
diff --git a/src/Functions/FunctionDateOrDateTimeToDateTimeOrDateTime64.h b/src/Functions/FunctionDateOrDateTimeToDateTimeOrDateTime64.h
index 9f1066fd687..d5a1f28b7cd 100644
--- a/src/Functions/FunctionDateOrDateTimeToDateTimeOrDateTime64.h
+++ b/src/Functions/FunctionDateOrDateTimeToDateTimeOrDateTime64.h
@@ -1,4 +1,6 @@
 #pragma once
+
+#include <Core/Settings.h>
 #include <Functions/IFunctionDateOrDateTime.h>
 
 namespace DB
diff --git a/src/Functions/FunctionFactory.cpp b/src/Functions/FunctionFactory.cpp
index 004ef745a93..de6d5a9e1c1 100644
--- a/src/Functions/FunctionFactory.cpp
+++ b/src/Functions/FunctionFactory.cpp
@@ -4,6 +4,7 @@
 
 #include <Common/Exception.h>
 #include <Common/CurrentThread.h>
+#include <Core/Settings.h>
 
 #include <Poco/String.h>
 
diff --git a/src/Functions/FunctionGenerateRandomStructure.h b/src/Functions/FunctionGenerateRandomStructure.h
index 894096a6e07..b9a83eb261e 100644
--- a/src/Functions/FunctionGenerateRandomStructure.h
+++ b/src/Functions/FunctionGenerateRandomStructure.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Functions/IFunction.h>
+#include <Core/Settings.h>
 #include <Interpreters/Context.h>
 
 #include <pcg_random.hpp>
diff --git a/src/Functions/FunctionJoinGet.cpp b/src/Functions/FunctionJoinGet.cpp
index 0a2859fe864..a67f3a977db 100644
--- a/src/Functions/FunctionJoinGet.cpp
+++ b/src/Functions/FunctionJoinGet.cpp
@@ -1,5 +1,6 @@
 #include <Columns/ColumnString.h>
 #include <Core/Block.h>
+#include <Core/Settings.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/IFunction.h>
diff --git a/src/Functions/FunctionTokens.h b/src/Functions/FunctionTokens.h
index 0ca47126198..f1435ca5651 100644
--- a/src/Functions/FunctionTokens.h
+++ b/src/Functions/FunctionTokens.h
@@ -17,6 +17,7 @@
 #include <Common/StringUtils.h>
 #include <Common/assert_cast.h>
 #include <Common/typeid_cast.h>
+#include <Core/Settings.h>
 
 
 namespace DB
diff --git a/src/Functions/FunctionUnixTimestamp64.h b/src/Functions/FunctionUnixTimestamp64.h
index e282bcfbfe2..652b3fe60ec 100644
--- a/src/Functions/FunctionUnixTimestamp64.h
+++ b/src/Functions/FunctionUnixTimestamp64.h
@@ -6,6 +6,7 @@
 #include <DataTypes/DataTypeDateTime64.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Columns/ColumnsNumber.h>
+#include <Core/Settings.h>
 #include <Interpreters/Context.h>
 
 #include <base/arithmeticOverflow.h>
diff --git a/src/Functions/FunctionsCodingIP.cpp b/src/Functions/FunctionsCodingIP.cpp
index e01967274f4..a134e39fbcd 100644
--- a/src/Functions/FunctionsCodingIP.cpp
+++ b/src/Functions/FunctionsCodingIP.cpp
@@ -10,6 +10,7 @@
 #include <Columns/ColumnTuple.h>
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnNullable.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <DataTypes/DataTypeFixedString.h>
diff --git a/src/Functions/FunctionsConversion.cpp b/src/Functions/FunctionsConversion.cpp
index f3e54d2fbd9..1342e3f2c5d 100644
--- a/src/Functions/FunctionsConversion.cpp
+++ b/src/Functions/FunctionsConversion.cpp
@@ -17,6 +17,7 @@
 #include <Columns/ColumnDynamic.h>
 #include <Columns/ColumnsCommon.h>
 #include <Core/AccurateComparison.h>
+#include <Core/Settings.h>
 #include <Core/Types.h>
 #include <DataTypes/DataTypeAggregateFunction.h>
 #include <DataTypes/DataTypeArray.h>
diff --git a/src/Functions/FunctionsMultiStringFuzzySearch.h b/src/Functions/FunctionsMultiStringFuzzySearch.h
index 18b411e9839..a92a6570279 100644
--- a/src/Functions/FunctionsMultiStringFuzzySearch.h
+++ b/src/Functions/FunctionsMultiStringFuzzySearch.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <Core/Settings.h>
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnString.h>
diff --git a/src/Functions/FunctionsMultiStringSearch.h b/src/Functions/FunctionsMultiStringSearch.h
index c0ed90aa042..03db2651fd0 100644
--- a/src/Functions/FunctionsMultiStringSearch.h
+++ b/src/Functions/FunctionsMultiStringSearch.h
@@ -5,6 +5,7 @@
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnFixedString.h>
 #include <Columns/ColumnVector.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
diff --git a/src/Functions/FunctionsStringSearch.h b/src/Functions/FunctionsStringSearch.h
index 924a66c1130..fba6336ebff 100644
--- a/src/Functions/FunctionsStringSearch.h
+++ b/src/Functions/FunctionsStringSearch.h
@@ -5,6 +5,7 @@
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnFixedString.h>
 #include <Columns/ColumnVector.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeString.h>
diff --git a/src/Functions/FunctionsTextClassification.h b/src/Functions/FunctionsTextClassification.h
index 8e0f236366d..90e8af06ccc 100644
--- a/src/Functions/FunctionsTextClassification.h
+++ b/src/Functions/FunctionsTextClassification.h
@@ -2,6 +2,7 @@
 
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnVector.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/IFunction.h>
diff --git a/src/Functions/PerformanceAdaptors.h b/src/Functions/PerformanceAdaptors.h
index ef2c788bf43..48daf13ba68 100644
--- a/src/Functions/PerformanceAdaptors.h
+++ b/src/Functions/PerformanceAdaptors.h
@@ -4,6 +4,7 @@
 
 #include <Common/TargetSpecific.h>
 #include <Common/Stopwatch.h>
+#include <Core/Settings.h>
 #include <Interpreters/Context.h>
 
 #include <mutex>
diff --git a/src/Functions/UserDefined/ExternalUserDefinedExecutableFunctionsLoader.cpp b/src/Functions/UserDefined/ExternalUserDefinedExecutableFunctionsLoader.cpp
index 2c031158c48..4a5ff19763e 100644
--- a/src/Functions/UserDefined/ExternalUserDefinedExecutableFunctionsLoader.cpp
+++ b/src/Functions/UserDefined/ExternalUserDefinedExecutableFunctionsLoader.cpp
@@ -2,6 +2,7 @@
 
 #include <boost/algorithm/string/split.hpp>
 #include <Common/StringUtils.h>
+#include <Core/Settings.h>
 
 #include <DataTypes/DataTypeFactory.h>
 
diff --git a/src/Functions/UserDefined/UserDefinedSQLObjectsBackup.cpp b/src/Functions/UserDefined/UserDefinedSQLObjectsBackup.cpp
index c15958f81c9..da79e17f18a 100644
--- a/src/Functions/UserDefined/UserDefinedSQLObjectsBackup.cpp
+++ b/src/Functions/UserDefined/UserDefinedSQLObjectsBackup.cpp
@@ -13,6 +13,7 @@
 #include <Parsers/parseQuery.h>
 #include <Parsers/queryToString.h>
 #include <Common/escapeForFileName.h>
+#include <Core/Settings.h>
 
 
 namespace DB
diff --git a/src/Functions/UserDefined/UserDefinedSQLObjectsDiskStorage.cpp b/src/Functions/UserDefined/UserDefinedSQLObjectsDiskStorage.cpp
index b406cc8d317..4c004d2537c 100644
--- a/src/Functions/UserDefined/UserDefinedSQLObjectsDiskStorage.cpp
+++ b/src/Functions/UserDefined/UserDefinedSQLObjectsDiskStorage.cpp
@@ -9,6 +9,8 @@
 #include <Common/logger_useful.h>
 #include <Common/quoteString.h>
 
+#include <Core/Settings.h>
+
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteBufferFromFile.h>
diff --git a/src/Functions/UserDefined/UserDefinedSQLObjectsZooKeeperStorage.cpp b/src/Functions/UserDefined/UserDefinedSQLObjectsZooKeeperStorage.cpp
index 766d63eafb0..01e7e3995fa 100644
--- a/src/Functions/UserDefined/UserDefinedSQLObjectsZooKeeperStorage.cpp
+++ b/src/Functions/UserDefined/UserDefinedSQLObjectsZooKeeperStorage.cpp
@@ -14,7 +14,7 @@
 #include <Common/quoteString.h>
 #include <Common/scope_guard_safe.h>
 #include <Common/setThreadName.h>
-
+#include <Core/Settings.h>
 
 namespace DB
 {
diff --git a/src/Functions/array/array.cpp b/src/Functions/array/array.cpp
index 03b51808799..dfe589fb74f 100644
--- a/src/Functions/array/array.cpp
+++ b/src/Functions/array/array.cpp
@@ -3,6 +3,7 @@
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/getLeastSupertype.h>
 #include <Columns/ColumnArray.h>
+#include <Core/Settings.h>
 #include <Interpreters/castColumn.h>
 #include <Interpreters/Context.h>
 
diff --git a/src/Functions/array/range.cpp b/src/Functions/array/range.cpp
index 1ac698a2745..b8b03ab5e74 100644
--- a/src/Functions/array/range.cpp
+++ b/src/Functions/array/range.cpp
@@ -9,6 +9,7 @@
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnVector.h>
 #include <Columns/ColumnsCommon.h>
+#include <Core/Settings.h>
 #include <Interpreters/castColumn.h>
 #include <Interpreters/Context.h>
 #include <numeric>
diff --git a/src/Functions/castOrDefault.cpp b/src/Functions/castOrDefault.cpp
index 995b5fa91e7..1ece17ca1e3 100644
--- a/src/Functions/castOrDefault.cpp
+++ b/src/Functions/castOrDefault.cpp
@@ -1,3 +1,4 @@
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeString.h>
diff --git a/src/Functions/formatDateTime.cpp b/src/Functions/formatDateTime.cpp
index 1c5dc05c5aa..64b9d4d8c71 100644
--- a/src/Functions/formatDateTime.cpp
+++ b/src/Functions/formatDateTime.cpp
@@ -23,6 +23,7 @@
 #include <Common/DateLUTImpl.h>
 #include <base/find_symbols.h>
 #include <Core/DecimalFunctions.h>
+#include <Core/Settings.h>
 
 #include <type_traits>
 #include <concepts>
diff --git a/src/Functions/formatQuery.cpp b/src/Functions/formatQuery.cpp
index 655ea2e7cde..d10b3f9a5b7 100644
--- a/src/Functions/formatQuery.cpp
+++ b/src/Functions/formatQuery.cpp
@@ -1,5 +1,6 @@
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnString.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeString.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
diff --git a/src/Functions/getClientHTTPHeader.cpp b/src/Functions/getClientHTTPHeader.cpp
index ebd070a90b9..140f39d03b8 100644
--- a/src/Functions/getClientHTTPHeader.cpp
+++ b/src/Functions/getClientHTTPHeader.cpp
@@ -5,6 +5,7 @@
 #include <Columns/ColumnString.h>
 #include <Interpreters/Context.h>
 #include <Core/Field.h>
+#include <Core/Settings.h>
 
 
 namespace DB
diff --git a/src/Functions/getSetting.cpp b/src/Functions/getSetting.cpp
index d6b8946e760..aed6b2119e4 100644
--- a/src/Functions/getSetting.cpp
+++ b/src/Functions/getSetting.cpp
@@ -5,6 +5,7 @@
 #include <Interpreters/convertFieldToType.h>
 #include <Interpreters/Context.h>
 #include <Core/Field.h>
+#include <Core/Settings.h>
 
 
 namespace DB
diff --git a/src/Functions/hasColumnInTable.cpp b/src/Functions/hasColumnInTable.cpp
index 8ea16f688ee..00714997b4a 100644
--- a/src/Functions/hasColumnInTable.cpp
+++ b/src/Functions/hasColumnInTable.cpp
@@ -1,3 +1,4 @@
+#include <Core/Settings.h>
 #include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
diff --git a/src/Functions/if.cpp b/src/Functions/if.cpp
index 4c08cd3b931..30eaa26fa20 100644
--- a/src/Functions/if.cpp
+++ b/src/Functions/if.cpp
@@ -10,6 +10,7 @@
 #include <Columns/ColumnDynamic.h>
 #include <Columns/ColumnVector.h>
 #include <Columns/MaskOperations.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeFixedString.h>
 #include <DataTypes/DataTypeMap.h>
diff --git a/src/Functions/keyvaluepair/extractKeyValuePairs.cpp b/src/Functions/keyvaluepair/extractKeyValuePairs.cpp
index 94f02861af0..02e8412bbf3 100644
--- a/src/Functions/keyvaluepair/extractKeyValuePairs.cpp
+++ b/src/Functions/keyvaluepair/extractKeyValuePairs.cpp
@@ -1,5 +1,6 @@
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnMap.h>
+#include <Core/Settings.h>
 
 #include <Functions/FunctionFactory.h>
 #include <Functions/IFunction.h>
diff --git a/src/Functions/lemmatize.cpp b/src/Functions/lemmatize.cpp
index e1168e077bb..76e5ed7432e 100644
--- a/src/Functions/lemmatize.cpp
+++ b/src/Functions/lemmatize.cpp
@@ -3,6 +3,7 @@
 #if USE_NLP
 
 #include <Columns/ColumnString.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeString.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
diff --git a/src/Functions/map.cpp b/src/Functions/map.cpp
index 66cd10a3f0b..0d42ce2abe1 100644
--- a/src/Functions/map.cpp
+++ b/src/Functions/map.cpp
@@ -10,6 +10,7 @@
 #include <Interpreters/castColumn.h>
 #include <Interpreters/Context.h>
 #include <Common/HashTable/HashSet.h>
+#include <Core/Settings.h>
 
 
 namespace DB
diff --git a/src/Functions/multiIf.cpp b/src/Functions/multiIf.cpp
index d3bf5618f66..c4b675fcf6c 100644
--- a/src/Functions/multiIf.cpp
+++ b/src/Functions/multiIf.cpp
@@ -5,6 +5,7 @@
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnDecimal.h>
 #include <Columns/MaskOperations.h>
+#include <Core/Settings.h>
 #include <Interpreters/castColumn.h>
 #include <Common/assert_cast.h>
 #include <Common/typeid_cast.h>
diff --git a/src/Functions/neighbor.cpp b/src/Functions/neighbor.cpp
index 62f129109f9..49b8980e7e2 100644
--- a/src/Functions/neighbor.cpp
+++ b/src/Functions/neighbor.cpp
@@ -1,3 +1,4 @@
+#include <Core/Settings.h>
 #include <Columns/ColumnConst.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/getLeastSupertype.h>
diff --git a/src/Functions/now.cpp b/src/Functions/now.cpp
index 827b800a243..4e3f7be4f7e 100644
--- a/src/Functions/now.cpp
+++ b/src/Functions/now.cpp
@@ -1,6 +1,7 @@
 #include <ctime>
 #include <Core/Field.h>
 #include <Core/DecimalFunctions.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/IFunction.h>
diff --git a/src/Functions/now64.cpp b/src/Functions/now64.cpp
index d6f8474c984..988694708cc 100644
--- a/src/Functions/now64.cpp
+++ b/src/Functions/now64.cpp
@@ -1,6 +1,7 @@
 #include <DataTypes/DataTypeDateTime64.h>
 
 #include <Core/DecimalFunctions.h>
+#include <Core/Settings.h>
 #include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/extractTimeZoneFromFunctionArguments.h>
diff --git a/src/Functions/nowInBlock.cpp b/src/Functions/nowInBlock.cpp
index 74f420986c8..b79653f501c 100644
--- a/src/Functions/nowInBlock.cpp
+++ b/src/Functions/nowInBlock.cpp
@@ -4,6 +4,7 @@
 #include <DataTypes/DataTypeDateTime.h>
 #include <Columns/ColumnsDateTime.h>
 #include <Columns/ColumnVector.h>
+#include <Core/Settings.h>
 #include <Interpreters/Context.h>
 
 
diff --git a/src/Functions/parseDateTime.cpp b/src/Functions/parseDateTime.cpp
index 339eb4cb26c..2bd8d370ed6 100644
--- a/src/Functions/parseDateTime.cpp
+++ b/src/Functions/parseDateTime.cpp
@@ -2,6 +2,7 @@
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnsDateTime.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeString.h>
 
diff --git a/src/Functions/pointInPolygon.cpp b/src/Functions/pointInPolygon.cpp
index 6b413829bd1..32d5905a513 100644
--- a/src/Functions/pointInPolygon.cpp
+++ b/src/Functions/pointInPolygon.cpp
@@ -11,6 +11,7 @@
 #include <Columns/ColumnsNumber.h>
 #include <Common/ObjectPool.h>
 #include <Common/ProfileEvents.h>
+#include <Core/Settings.h>
 #include <base/arithmeticOverflow.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeTuple.h>
diff --git a/src/Functions/runningAccumulate.cpp b/src/Functions/runningAccumulate.cpp
index d585affd91b..c94cbe67216 100644
--- a/src/Functions/runningAccumulate.cpp
+++ b/src/Functions/runningAccumulate.cpp
@@ -1,5 +1,6 @@
 #include <AggregateFunctions/IAggregateFunction.h>
 #include <Columns/ColumnAggregateFunction.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeAggregateFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
diff --git a/src/Functions/runningDifference.h b/src/Functions/runningDifference.h
index fe477d13744..d51ea805f3c 100644
--- a/src/Functions/runningDifference.h
+++ b/src/Functions/runningDifference.h
@@ -1,6 +1,7 @@
 #pragma once
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnsNumber.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDate32.h>
 #include <DataTypes/DataTypeDateTime.h>
diff --git a/src/Functions/serverConstants.cpp b/src/Functions/serverConstants.cpp
index e7e423058f1..b74edfc3121 100644
--- a/src/Functions/serverConstants.cpp
+++ b/src/Functions/serverConstants.cpp
@@ -5,6 +5,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeUUID.h>
 #include <Core/ServerUUID.h>
+#include <Core/Settings.h>
 #include <Common/SymbolIndex.h>
 #include <Common/DNSResolver.h>
 #include <Common/DateLUT.h>
diff --git a/src/Functions/sleep.h b/src/Functions/sleep.h
index 22748e86888..62ee19fa904 100644
--- a/src/Functions/sleep.h
+++ b/src/Functions/sleep.h
@@ -7,6 +7,7 @@
 #include <Common/FieldVisitorConvertToNumber.h>
 #include <Common/ProfileEvents.h>
 #include <Common/assert_cast.h>
+#include <Core/Settings.h>
 #include <base/sleep.h>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/Context.h>
diff --git a/src/Functions/snowflake.cpp b/src/Functions/snowflake.cpp
index 31ea6a28ece..0d4d65ee4b0 100644
--- a/src/Functions/snowflake.cpp
+++ b/src/Functions/snowflake.cpp
@@ -8,6 +8,7 @@
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnsNumber.h>
 #include <Core/DecimalFunctions.h>
+#include <Core/Settings.h>
 #include <Interpreters/Context.h>
 
 
diff --git a/src/Functions/snowflakeIDToDateTime.cpp b/src/Functions/snowflakeIDToDateTime.cpp
index 9a1d5b8a74b..bd805a2e607 100644
--- a/src/Functions/snowflakeIDToDateTime.cpp
+++ b/src/Functions/snowflakeIDToDateTime.cpp
@@ -9,6 +9,7 @@
 #include <Columns/ColumnsDateTime.h>
 #include <Columns/ColumnsNumber.h>
 #include <Core/DecimalFunctions.h>
+#include <Core/Settings.h>
 #include <Interpreters/Context.h>
 
 
diff --git a/src/Functions/stem.cpp b/src/Functions/stem.cpp
index d326d17a7a8..5b845cf332b 100644
--- a/src/Functions/stem.cpp
+++ b/src/Functions/stem.cpp
@@ -3,6 +3,7 @@
 #if USE_NLP
 
 #include <Columns/ColumnString.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeString.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
diff --git a/src/Functions/synonyms.cpp b/src/Functions/synonyms.cpp
index 6b3e205785c..28dd83627d9 100644
--- a/src/Functions/synonyms.cpp
+++ b/src/Functions/synonyms.cpp
@@ -5,6 +5,7 @@
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnVector.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeString.h>
 #include <Functions/FunctionFactory.h>
diff --git a/src/Functions/throwIf.cpp b/src/Functions/throwIf.cpp
index c6ff5b9151f..becc6d2f772 100644
--- a/src/Functions/throwIf.cpp
+++ b/src/Functions/throwIf.cpp
@@ -4,6 +4,7 @@
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnsCommon.h>
+#include <Core/Settings.h>
 #include <Common/ErrorCodes.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <IO/WriteHelpers.h>
diff --git a/src/Functions/toTimezone.cpp b/src/Functions/toTimezone.cpp
index a0d90351898..be839f1acb3 100644
--- a/src/Functions/toTimezone.cpp
+++ b/src/Functions/toTimezone.cpp
@@ -9,6 +9,7 @@
 
 #include <IO/WriteHelpers.h>
 #include <Common/assert_cast.h>
+#include <Core/Settings.h>
 
 namespace DB
 {
diff --git a/src/Functions/toTypeName.cpp b/src/Functions/toTypeName.cpp
index 63bcc58d65e..abe02148d4a 100644
--- a/src/Functions/toTypeName.cpp
+++ b/src/Functions/toTypeName.cpp
@@ -1,6 +1,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/IFunction.h>
 #include <Core/Field.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeString.h>
 #include <Interpreters/Context.h>
 
diff --git a/src/Functions/tuple.h b/src/Functions/tuple.h
index 94529d86861..a49f346ef2a 100644
--- a/src/Functions/tuple.h
+++ b/src/Functions/tuple.h
@@ -3,6 +3,7 @@
 #include <Functions/IFunction.h>
 
 #include <Columns/ColumnTuple.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeTuple.h>
 #include <Functions/FunctionFactory.h>
 #include <Interpreters/Context.h>
diff --git a/src/Functions/visibleWidth.cpp b/src/Functions/visibleWidth.cpp
index 9a3edd9fbec..ebd4a1ff713 100644
--- a/src/Functions/visibleWidth.cpp
+++ b/src/Functions/visibleWidth.cpp
@@ -6,6 +6,7 @@
 #include <IO/WriteBufferFromString.h>
 #include <Common/UTF8Helpers.h>
 #include <Common/assert_cast.h>
+#include <Core/Settings.h>
 #include <Interpreters/Context.h>
 
 
diff --git a/src/Functions/widthBucket.cpp b/src/Functions/widthBucket.cpp
index 62ed460ca9d..e804808b699 100644
--- a/src/Functions/widthBucket.cpp
+++ b/src/Functions/widthBucket.cpp
@@ -3,6 +3,7 @@
 #include <Core/ColumnWithTypeAndName.h>
 #include <Core/ColumnsWithTypeAndName.h>
 #include <Core/Types.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/IDataType.h>
 #include <DataTypes/NumberTraits.h>
@@ -15,6 +16,7 @@
 #include <Common/Exception.h>
 #include <Common/NaNUtils.h>
 #include <Common/register_objects.h>
+#include <base/range.h>
 
 #include <algorithm>
 #include <iterator>
diff --git a/src/IO/ConnectionTimeouts.cpp b/src/IO/ConnectionTimeouts.cpp
index c2eb67c6f3b..662a2c067cf 100644
--- a/src/IO/ConnectionTimeouts.cpp
+++ b/src/IO/ConnectionTimeouts.cpp
@@ -1,4 +1,5 @@
 #include <Core/ServerSettings.h>
+#include <Core/Settings.h>
 #include <IO/ConnectionTimeouts.h>
 #include <Interpreters/Context.h>
 
diff --git a/src/IO/S3/Client.cpp b/src/IO/S3/Client.cpp
index 55441cfb86b..3b958dea046 100644
--- a/src/IO/S3/Client.cpp
+++ b/src/IO/S3/Client.cpp
@@ -23,10 +23,11 @@
 #include <Interpreters/Context.h>
 
 #include <Common/assert_cast.h>
-
 #include <Common/logger_useful.h>
 #include <Common/ProxyConfigurationResolverProvider.h>
 
+#include <Core/Settings.h>
+
 #include <base/sleep.h>
 
 
diff --git a/src/IO/S3Common.cpp b/src/IO/S3Common.cpp
index 490bf8c2d0c..3f2c1f95e71 100644
--- a/src/IO/S3Common.cpp
+++ b/src/IO/S3Common.cpp
@@ -12,6 +12,7 @@
 
 #if USE_AWS_S3
 
+#include <Core/Settings.h>
 #include <IO/HTTPHeaderEntries.h>
 #include <IO/S3/Client.h>
 #include <IO/S3/Requests.h>
diff --git a/src/IO/S3Common.h b/src/IO/S3Common.h
index 2dca08871d3..fcfd0cfffae 100644
--- a/src/IO/S3Common.h
+++ b/src/IO/S3Common.h
@@ -8,7 +8,7 @@
 #include <Common/Exception.h>
 #include <Common/Throttler_fwd.h>
 #include <Common/Throttler.h>
-#include <Core/Settings.h>
+#include <Core/SettingsEnums.h>
 #include <Core/BaseSettings.h>
 #include <Interpreters/Context.h>
 #include <unordered_set>
@@ -30,6 +30,8 @@ namespace ErrorCodes
     extern const int S3_ERROR;
 }
 
+struct Settings;
+
 class S3Exception : public Exception
 {
 public:
diff --git a/src/IO/S3Settings.cpp b/src/IO/S3Settings.cpp
index a5a50c873cb..f99e8c0105b 100644
--- a/src/IO/S3Settings.cpp
+++ b/src/IO/S3Settings.cpp
@@ -1,9 +1,11 @@
 #include <IO/S3Settings.h>
 
+#include <Core/Settings.h>
 #include <IO/S3Common.h>
-#include <Poco/Util/AbstractConfiguration.h>
 #include <Interpreters/Context.h>
 
+#include <Poco/Util/AbstractConfiguration.h>
+
 
 namespace DB
 {
diff --git a/src/Interpreters/ArrayJoinAction.cpp b/src/Interpreters/ArrayJoinAction.cpp
index 54ff53764e7..df7a0b48057 100644
--- a/src/Interpreters/ArrayJoinAction.cpp
+++ b/src/Interpreters/ArrayJoinAction.cpp
@@ -1,4 +1,5 @@
 #include <Common/typeid_cast.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeMap.h>
 #include <Columns/ColumnArray.h>
diff --git a/src/Interpreters/Cache/WriteBufferToFileSegment.cpp b/src/Interpreters/Cache/WriteBufferToFileSegment.cpp
index dd038948adf..e6ebf6ad50c 100644
--- a/src/Interpreters/Cache/WriteBufferToFileSegment.cpp
+++ b/src/Interpreters/Cache/WriteBufferToFileSegment.cpp
@@ -12,6 +12,8 @@
 #include <Common/formatReadable.h>
 #include <Common/logger_useful.h>
 
+#include <Core/Settings.h>
+
 namespace DB
 {
 
diff --git a/src/Interpreters/Context.cpp b/src/Interpreters/Context.cpp
index adb20f4854f..fe674a747ef 100644
--- a/src/Interpreters/Context.cpp
+++ b/src/Interpreters/Context.cpp
@@ -21,6 +21,7 @@
 #include <Common/NamedCollections/NamedCollectionsFactory.h>
 #include <Coordination/KeeperDispatcher.h>
 #include <Core/BackgroundSchedulePool.h>
+#include <Core/Settings.h>
 #include <Formats/FormatFactory.h>
 #include <Databases/IDatabase.h>
 #include <Server/ServerType.h>
@@ -824,8 +825,69 @@ void ContextSharedMutex::lockSharedImpl()
     ProfileEvents::increment(ProfileEvents::ContextLockWaitMicroseconds, watch.elapsedMicroseconds());
 }
 
-ContextData::ContextData() = default;
-ContextData::ContextData(const ContextData &) = default;
+ContextData::ContextData()
+{
+    settings = std::make_unique<Settings>();
+}
+ContextData::ContextData(const ContextData &o) :
+    shared(o.shared),
+    client_info(o.client_info),
+    external_tables_initializer_callback(o.external_tables_initializer_callback),
+    input_initializer_callback(o.input_initializer_callback),
+    input_blocks_reader(o.input_blocks_reader),
+    user_id(o.user_id),
+    current_roles(o.current_roles),
+    settings_constraints_and_current_profiles(o.settings_constraints_and_current_profiles),
+    access(o.access),
+    need_recalculate_access(o.need_recalculate_access),
+    current_database(o.current_database),
+    settings(std::make_unique<Settings>(*o.settings)),
+    progress_callback(o.progress_callback),
+    file_progress_callback(o.file_progress_callback),
+    process_list_elem(o.process_list_elem),
+    has_process_list_elem(o.has_process_list_elem),
+    insertion_table_info(o.insertion_table_info),
+    is_distributed(o.is_distributed),
+    default_format(o.default_format),
+    insert_format(o.insert_format),
+    external_tables_mapping(o.external_tables_mapping),
+    scalars(o.scalars),
+    special_scalars(o.special_scalars),
+    next_task_callback(o.next_task_callback),
+    merge_tree_read_task_callback(o.merge_tree_read_task_callback),
+    merge_tree_all_ranges_callback(o.merge_tree_all_ranges_callback),
+    parallel_replicas_group_uuid(o.parallel_replicas_group_uuid),
+    client_protocol_version(o.client_protocol_version),
+    query_access_info(std::make_shared<QueryAccessInfo>(*o.query_access_info)),
+    query_factories_info(o.query_factories_info),
+    query_privileges_info(o.query_privileges_info),
+    async_read_counters(o.async_read_counters),
+    view_source(o.view_source),
+    table_function_results(o.table_function_results),
+    query_context(o.query_context),
+    session_context(o.session_context),
+    global_context(o.global_context),
+    buffer_context(o.buffer_context),
+    is_internal_query(o.is_internal_query),
+    temp_data_on_disk(o.temp_data_on_disk),
+    classifier(o.classifier),
+    prepared_sets_cache(o.prepared_sets_cache),
+    offset_parallel_replicas_enabled(o.offset_parallel_replicas_enabled),
+    kitchen_sink(o.kitchen_sink),
+    part_uuids(o.part_uuids),
+    ignored_part_uuids(o.ignored_part_uuids),
+    query_parameters(o.query_parameters),
+    host_context(o.host_context),
+    metadata_transaction(o.metadata_transaction),
+    merge_tree_transaction(o.merge_tree_transaction),
+    merge_tree_transaction_holder(o.merge_tree_transaction_holder),
+    remote_read_query_throttler(o.remote_read_query_throttler),
+    remote_write_query_throttler(o.remote_write_query_throttler),
+    local_read_query_throttler(o.local_read_query_throttler),
+    local_write_query_throttler(o.local_write_query_throttler),
+    backups_query_throttler(o.backups_query_throttler)
+{
+}
 
 Context::Context() = default;
 Context::Context(const Context & rhs) : ContextData(rhs), std::enable_shared_from_this<Context>(rhs) {}
@@ -865,7 +927,6 @@ ContextMutablePtr Context::createCopy(const ContextPtr & other)
 {
     SharedLockGuard lock(other->mutex);
     auto new_context = std::shared_ptr<Context>(new Context(*other));
-    new_context->query_access_info = std::make_shared<QueryAccessInfo>(*other->query_access_info);
     return new_context;
 }
 
@@ -971,7 +1032,7 @@ Strings Context::getWarnings() const
     }
     /// Make setting's name ordered
     std::set<String> obsolete_settings;
-    for (const auto & setting : settings)
+    for (const auto & setting : *settings)
     {
         if (setting.isValueChanged() && setting.isObsolete())
             obsolete_settings.emplace(setting.getName());
@@ -1486,7 +1547,7 @@ std::shared_ptr<const ContextAccessWrapper> Context::getAccess() const
         /// If setUserID() was never called then this must be the global context with the full access.
         bool full_access = !user_id;
 
-        return ContextAccessParams{user_id, full_access, /* use_default_roles= */ false, current_roles, settings, current_database, client_info};
+        return ContextAccessParams{user_id, full_access, /* use_default_roles= */ false, current_roles, *settings, current_database, client_info};
     };
 
     /// Check if the current access rights are still valid, otherwise get parameters for recalculating access rights.
@@ -1568,7 +1629,7 @@ void Context::setCurrentProfilesWithLock(const SettingsProfilesInfo & profiles_i
         checkSettingsConstraintsWithLock(profiles_info.settings, SettingSource::PROFILE);
     applySettingsChangesWithLock(profiles_info.settings, lock);
     settings_constraints_and_current_profiles = profiles_info.getConstraintsAndProfileIDs(settings_constraints_and_current_profiles);
-    contextSanityClampSettingsWithLock(*this, settings, lock);
+    contextSanityClampSettingsWithLock(*this, *settings, lock);
 }
 
 void Context::setCurrentProfile(const String & profile_name, bool check_constraints)
@@ -2209,15 +2270,15 @@ bool Context::displaySecretsInShowAndSelect() const
 Settings Context::getSettings() const
 {
     SharedLockGuard lock(mutex);
-    return settings;
+    return *settings;
 }
 
 void Context::setSettings(const Settings & settings_)
 {
     std::lock_guard lock(mutex);
-    settings = settings_;
+    *settings = settings_;
     need_recalculate_access = true;
-    contextSanityClampSettings(*this, settings);
+    contextSanityClampSettings(*this, *settings);
 }
 
 void Context::setSettingWithLock(std::string_view name, const String & value, const std::lock_guard<ContextSharedMutex> & lock)
@@ -2227,10 +2288,10 @@ void Context::setSettingWithLock(std::string_view name, const String & value, co
         setCurrentProfileWithLock(value, true /*check_constraints*/, lock);
         return;
     }
-    settings.set(name, value);
+    settings->set(name, value);
     if (ContextAccessParams::dependsOnSettingName(name))
         need_recalculate_access = true;
-    contextSanityClampSettingsWithLock(*this, settings, lock);
+    contextSanityClampSettingsWithLock(*this, *settings, lock);
 }
 
 void Context::setSettingWithLock(std::string_view name, const Field & value, const std::lock_guard<ContextSharedMutex> & lock)
@@ -2240,7 +2301,7 @@ void Context::setSettingWithLock(std::string_view name, const Field & value, con
         setCurrentProfileWithLock(value.safeGet<String>(), true /*check_constraints*/, lock);
         return;
     }
-    settings.set(name, value);
+    settings->set(name, value);
     if (ContextAccessParams::dependsOnSettingName(name))
         need_recalculate_access = true;
 }
@@ -2250,7 +2311,7 @@ void Context::applySettingChangeWithLock(const SettingChange & change, const std
     try
     {
         setSettingWithLock(change.name, change.value, lock);
-        contextSanityClampSettingsWithLock(*this, settings, lock);
+        contextSanityClampSettingsWithLock(*this, *settings, lock);
     }
     catch (Exception & e)
     {
@@ -2265,7 +2326,7 @@ void Context::applySettingsChangesWithLock(const SettingsChanges & changes, cons
 {
     for (const SettingChange & change : changes)
         applySettingChangeWithLock(change, lock);
-    applySettingsQuirks(settings);
+    applySettingsQuirks(*settings);
 }
 
 void Context::setSetting(std::string_view name, const String & value)
@@ -2278,7 +2339,7 @@ void Context::setSetting(std::string_view name, const Field & value)
 {
     std::lock_guard lock(mutex);
     setSettingWithLock(name, value, lock);
-    contextSanityClampSettingsWithLock(*this, settings, lock);
+    contextSanityClampSettingsWithLock(*this, *settings, lock);
 }
 
 void Context::setServerSetting(std::string_view name, const Field & value)
@@ -2311,37 +2372,37 @@ void Context::applySettingsChanges(const SettingsChanges & changes)
 
 void Context::checkSettingsConstraintsWithLock(const SettingsProfileElements & profile_elements, SettingSource source)
 {
-    getSettingsConstraintsAndCurrentProfilesWithLock()->constraints.check(settings, profile_elements, source);
+    getSettingsConstraintsAndCurrentProfilesWithLock()->constraints.check(*settings, profile_elements, source);
     if (getApplicationType() == ApplicationType::LOCAL || getApplicationType() == ApplicationType::SERVER)
-        doSettingsSanityCheckClamp(settings, getLogger("SettingsSanity"));
+        doSettingsSanityCheckClamp(*settings, getLogger("SettingsSanity"));
 }
 
 void Context::checkSettingsConstraintsWithLock(const SettingChange & change, SettingSource source)
 {
-    getSettingsConstraintsAndCurrentProfilesWithLock()->constraints.check(settings, change, source);
+    getSettingsConstraintsAndCurrentProfilesWithLock()->constraints.check(*settings, change, source);
     if (getApplicationType() == ApplicationType::LOCAL || getApplicationType() == ApplicationType::SERVER)
-        doSettingsSanityCheckClamp(settings, getLogger("SettingsSanity"));
+        doSettingsSanityCheckClamp(*settings, getLogger("SettingsSanity"));
 }
 
 void Context::checkSettingsConstraintsWithLock(const SettingsChanges & changes, SettingSource source)
 {
-    getSettingsConstraintsAndCurrentProfilesWithLock()->constraints.check(settings, changes, source);
+    getSettingsConstraintsAndCurrentProfilesWithLock()->constraints.check(*settings, changes, source);
     if (getApplicationType() == ApplicationType::LOCAL || getApplicationType() == ApplicationType::SERVER)
-        doSettingsSanityCheckClamp(settings, getLogger("SettingsSanity"));
+        doSettingsSanityCheckClamp(*settings, getLogger("SettingsSanity"));
 }
 
 void Context::checkSettingsConstraintsWithLock(SettingsChanges & changes, SettingSource source)
 {
-    getSettingsConstraintsAndCurrentProfilesWithLock()->constraints.check(settings, changes, source);
+    getSettingsConstraintsAndCurrentProfilesWithLock()->constraints.check(*settings, changes, source);
     if (getApplicationType() == ApplicationType::LOCAL || getApplicationType() == ApplicationType::SERVER)
-        doSettingsSanityCheckClamp(settings, getLogger("SettingsSanity"));
+        doSettingsSanityCheckClamp(*settings, getLogger("SettingsSanity"));
 }
 
 void Context::clampToSettingsConstraintsWithLock(SettingsChanges & changes, SettingSource source)
 {
-    getSettingsConstraintsAndCurrentProfilesWithLock()->constraints.clamp(settings, changes, source);
+    getSettingsConstraintsAndCurrentProfilesWithLock()->constraints.clamp(*settings, changes, source);
     if (getApplicationType() == ApplicationType::LOCAL || getApplicationType() == ApplicationType::SERVER)
-        doSettingsSanityCheckClamp(settings, getLogger("SettingsSanity"));
+        doSettingsSanityCheckClamp(*settings, getLogger("SettingsSanity"));
 }
 
 void Context::checkMergeTreeSettingsConstraintsWithLock(const MergeTreeSettings & merge_tree_settings, const SettingsChanges & changes) const
@@ -2364,8 +2425,8 @@ void Context::checkSettingsConstraints(const SettingChange & change, SettingSour
 void Context::checkSettingsConstraints(const SettingsChanges & changes, SettingSource source)
 {
     SharedLockGuard lock(mutex);
-    getSettingsConstraintsAndCurrentProfilesWithLock()->constraints.check(settings, changes, source);
-    doSettingsSanityCheckClamp(settings, getLogger("SettingsSanity"));
+    getSettingsConstraintsAndCurrentProfilesWithLock()->constraints.check(*settings, changes, source);
+    doSettingsSanityCheckClamp(*settings, getLogger("SettingsSanity"));
 }
 
 void Context::checkSettingsConstraints(SettingsChanges & changes, SettingSource source)
@@ -2390,7 +2451,7 @@ void Context::resetSettingsToDefaultValue(const std::vector<String> & names)
 {
     std::lock_guard lock(mutex);
     for (const String & name: names)
-        settings.setDefaultValue(name);
+        settings->setDefaultValue(name);
 }
 
 std::shared_ptr<const SettingsConstraintsAndProfileIDs> Context::getSettingsConstraintsAndCurrentProfilesWithLock() const
@@ -2610,14 +2671,14 @@ void Context::makeQueryContextForMerge(const MergeTreeSettings & merge_tree_sett
 {
     makeQueryContext();
     classifier.reset(); // It is assumed that there are no active queries running using this classifier, otherwise this will lead to crashes
-    settings.workload = merge_tree_settings.merge_workload.value.empty() ? getMergeWorkload() : merge_tree_settings.merge_workload;
+    settings->workload = merge_tree_settings.merge_workload.value.empty() ? getMergeWorkload() : merge_tree_settings.merge_workload;
 }
 
 void Context::makeQueryContextForMutate(const MergeTreeSettings & merge_tree_settings)
 {
     makeQueryContext();
     classifier.reset(); // It is assumed that there are no active queries running using this classifier, otherwise this will lead to crashes
-    settings.workload = merge_tree_settings.mutation_workload.value.empty() ? getMutationWorkload() : merge_tree_settings.mutation_workload;
+    settings->workload = merge_tree_settings.mutation_workload.value.empty() ? getMutationWorkload() : merge_tree_settings.mutation_workload;
 }
 
 void Context::makeSessionContext()
@@ -3900,7 +3961,7 @@ void Context::reloadClusterConfig() const
         }
 
         const auto & config = cluster_config ? *cluster_config : getConfigRef();
-        auto new_clusters = std::make_shared<Clusters>(config, settings, getMacros());
+        auto new_clusters = std::make_shared<Clusters>(config, *settings, getMacros());
 
         {
             std::lock_guard lock(shared->clusters_mutex);
@@ -3935,7 +3996,7 @@ std::shared_ptr<Clusters> Context::getClustersImpl(std::lock_guard<std::mutex> &
     if (!shared->clusters)
     {
         const auto & config = shared->clusters_config ? *shared->clusters_config : getConfigRef();
-        shared->clusters = std::make_shared<Clusters>(config, settings, getMacros());
+        shared->clusters = std::make_shared<Clusters>(config, *settings, getMacros());
     }
 
     return shared->clusters;
@@ -3967,9 +4028,9 @@ void Context::setClustersConfig(const ConfigurationPtr & config, bool enable_dis
     shared->clusters_config = config;
 
     if (!shared->clusters)
-        shared->clusters = std::make_shared<Clusters>(*shared->clusters_config, settings, getMacros(), config_name);
+        shared->clusters = std::make_shared<Clusters>(*shared->clusters_config, *settings, getMacros(), config_name);
     else
-        shared->clusters->updateClusters(*shared->clusters_config, settings, config_name, old_clusters_config);
+        shared->clusters->updateClusters(*shared->clusters_config, *settings, config_name, old_clusters_config);
 
     ++shared->clusters_version;
 }
@@ -4231,7 +4292,7 @@ std::shared_ptr<BackupLog> Context::getBackupLog() const
 
 std::shared_ptr<BlobStorageLog> Context::getBlobStorageLog() const
 {
-    bool enable_blob_storage_log = settings.enable_blob_storage_log;
+    bool enable_blob_storage_log = settings->enable_blob_storage_log;
     if (hasQueryContext())
         enable_blob_storage_log = getQueryContext()->getSettingsRef().enable_blob_storage_log;
 
@@ -4672,8 +4733,8 @@ void Context::setDefaultProfiles(const Poco::Util::AbstractConfiguration & confi
     shared->system_profile_name = config.getString("system_profile", shared->default_profile_name);
     setCurrentProfile(shared->system_profile_name);
 
-    applySettingsQuirks(settings, getLogger("SettingsQuirks"));
-    doSettingsSanityCheckClamp(settings, getLogger("SettingsSanity"));
+    applySettingsQuirks(*settings, getLogger("SettingsQuirks"));
+    doSettingsSanityCheckClamp(*settings, getLogger("SettingsSanity"));
 
     shared->buffer_profile_name = config.getString("buffer_profile", shared->system_profile_name);
     buffer_context = Context::createCopy(shared_from_this());
@@ -5242,11 +5303,11 @@ AsynchronousInsertQueue * Context::tryGetAsynchronousInsertQueue() const
 
 void Context::setAsynchronousInsertQueue(const std::shared_ptr<AsynchronousInsertQueue> & ptr)
 {
-    AsynchronousInsertQueue::validateSettings(settings, getLogger("Context"));
+    AsynchronousInsertQueue::validateSettings(*settings, getLogger("Context"));
 
     SharedLockGuard lock(shared->mutex);
 
-    if (std::chrono::milliseconds(settings.async_insert_poll_timeout_ms) == std::chrono::milliseconds::zero())
+    if (std::chrono::milliseconds(settings->async_insert_poll_timeout_ms) == std::chrono::milliseconds::zero())
         throw Exception(ErrorCodes::INVALID_SETTING_VALUE, "Setting async_insert_poll_timeout_ms can't be zero");
 
     shared->async_insert_queue = ptr;
@@ -5393,69 +5454,69 @@ ReadSettings Context::getReadSettings() const
 {
     ReadSettings res;
 
-    std::string_view read_method_str = settings.local_filesystem_read_method.value;
+    std::string_view read_method_str = settings->local_filesystem_read_method.value;
 
     if (auto opt_method = magic_enum::enum_cast<LocalFSReadMethod>(read_method_str))
         res.local_fs_method = *opt_method;
     else
         throw Exception(ErrorCodes::UNKNOWN_READ_METHOD, "Unknown read method '{}' for local filesystem", read_method_str);
 
-    read_method_str = settings.remote_filesystem_read_method.value;
+    read_method_str = settings->remote_filesystem_read_method.value;
 
     if (auto opt_method = magic_enum::enum_cast<RemoteFSReadMethod>(read_method_str))
         res.remote_fs_method = *opt_method;
     else
         throw Exception(ErrorCodes::UNKNOWN_READ_METHOD, "Unknown read method '{}' for remote filesystem", read_method_str);
 
-    res.local_fs_prefetch = settings.local_filesystem_read_prefetch;
-    res.remote_fs_prefetch = settings.remote_filesystem_read_prefetch;
+    res.local_fs_prefetch = settings->local_filesystem_read_prefetch;
+    res.remote_fs_prefetch = settings->remote_filesystem_read_prefetch;
 
-    res.load_marks_asynchronously = settings.load_marks_asynchronously;
+    res.load_marks_asynchronously = settings->load_marks_asynchronously;
 
-    res.enable_filesystem_read_prefetches_log = settings.enable_filesystem_read_prefetches_log;
+    res.enable_filesystem_read_prefetches_log = settings->enable_filesystem_read_prefetches_log;
 
-    res.remote_fs_read_max_backoff_ms = settings.remote_fs_read_max_backoff_ms;
-    res.remote_fs_read_backoff_max_tries = settings.remote_fs_read_backoff_max_tries;
-    res.enable_filesystem_cache = settings.enable_filesystem_cache;
-    res.read_from_filesystem_cache_if_exists_otherwise_bypass_cache = settings.read_from_filesystem_cache_if_exists_otherwise_bypass_cache;
-    res.enable_filesystem_cache_log = settings.enable_filesystem_cache_log;
-    res.filesystem_cache_segments_batch_size = settings.filesystem_cache_segments_batch_size;
-    res.filesystem_cache_reserve_space_wait_lock_timeout_milliseconds = settings.filesystem_cache_reserve_space_wait_lock_timeout_milliseconds;
+    res.remote_fs_read_max_backoff_ms = settings->remote_fs_read_max_backoff_ms;
+    res.remote_fs_read_backoff_max_tries = settings->remote_fs_read_backoff_max_tries;
+    res.enable_filesystem_cache = settings->enable_filesystem_cache;
+    res.read_from_filesystem_cache_if_exists_otherwise_bypass_cache = settings->read_from_filesystem_cache_if_exists_otherwise_bypass_cache;
+    res.enable_filesystem_cache_log = settings->enable_filesystem_cache_log;
+    res.filesystem_cache_segments_batch_size = settings->filesystem_cache_segments_batch_size;
+    res.filesystem_cache_reserve_space_wait_lock_timeout_milliseconds = settings->filesystem_cache_reserve_space_wait_lock_timeout_milliseconds;
 
-    res.filesystem_cache_max_download_size = settings.filesystem_cache_max_download_size;
-    res.skip_download_if_exceeds_query_cache = settings.skip_download_if_exceeds_query_cache;
+    res.filesystem_cache_max_download_size = settings->filesystem_cache_max_download_size;
+    res.skip_download_if_exceeds_query_cache = settings->skip_download_if_exceeds_query_cache;
 
     res.page_cache = getPageCache();
-    res.use_page_cache_for_disks_without_file_cache = settings.use_page_cache_for_disks_without_file_cache;
-    res.read_from_page_cache_if_exists_otherwise_bypass_cache = settings.read_from_page_cache_if_exists_otherwise_bypass_cache;
-    res.page_cache_inject_eviction = settings.page_cache_inject_eviction;
+    res.use_page_cache_for_disks_without_file_cache = settings->use_page_cache_for_disks_without_file_cache;
+    res.read_from_page_cache_if_exists_otherwise_bypass_cache = settings->read_from_page_cache_if_exists_otherwise_bypass_cache;
+    res.page_cache_inject_eviction = settings->page_cache_inject_eviction;
 
-    res.remote_read_min_bytes_for_seek = settings.remote_read_min_bytes_for_seek;
+    res.remote_read_min_bytes_for_seek = settings->remote_read_min_bytes_for_seek;
 
     /// Zero read buffer will not make progress.
-    if (!settings.max_read_buffer_size)
+    if (!settings->max_read_buffer_size)
     {
         throw Exception(ErrorCodes::INVALID_SETTING_VALUE,
-            "Invalid value '{}' for max_read_buffer_size", settings.max_read_buffer_size);
+            "Invalid value '{}' for max_read_buffer_size", settings->max_read_buffer_size);
     }
 
     res.local_fs_buffer_size
-        = settings.max_read_buffer_size_local_fs ? settings.max_read_buffer_size_local_fs : settings.max_read_buffer_size;
+        = settings->max_read_buffer_size_local_fs ? settings->max_read_buffer_size_local_fs : settings->max_read_buffer_size;
     res.remote_fs_buffer_size
-        = settings.max_read_buffer_size_remote_fs ? settings.max_read_buffer_size_remote_fs : settings.max_read_buffer_size;
-    res.prefetch_buffer_size = settings.prefetch_buffer_size;
-    res.direct_io_threshold = settings.min_bytes_to_use_direct_io;
-    res.mmap_threshold = settings.min_bytes_to_use_mmap_io;
-    res.priority = Priority{settings.read_priority};
+        = settings->max_read_buffer_size_remote_fs ? settings->max_read_buffer_size_remote_fs : settings->max_read_buffer_size;
+    res.prefetch_buffer_size = settings->prefetch_buffer_size;
+    res.direct_io_threshold = settings->min_bytes_to_use_direct_io;
+    res.mmap_threshold = settings->min_bytes_to_use_mmap_io;
+    res.priority = Priority{settings->read_priority};
 
     res.remote_throttler = getRemoteReadThrottler();
     res.local_throttler = getLocalReadThrottler();
 
-    res.http_max_tries = settings.http_max_tries;
-    res.http_retry_initial_backoff_ms = settings.http_retry_initial_backoff_ms;
-    res.http_retry_max_backoff_ms = settings.http_retry_max_backoff_ms;
-    res.http_skip_not_found_url_for_globs = settings.http_skip_not_found_url_for_globs;
-    res.http_make_head_request = settings.http_make_head_request;
+    res.http_max_tries = settings->http_max_tries;
+    res.http_retry_initial_backoff_ms = settings->http_retry_initial_backoff_ms;
+    res.http_retry_max_backoff_ms = settings->http_retry_max_backoff_ms;
+    res.http_skip_not_found_url_for_globs = settings->http_skip_not_found_url_for_globs;
+    res.http_make_head_request = settings->http_make_head_request;
 
     res.mmap_cache = getMMappedFileCache().get();
 
@@ -5466,13 +5527,13 @@ WriteSettings Context::getWriteSettings() const
 {
     WriteSettings res;
 
-    res.enable_filesystem_cache_on_write_operations = settings.enable_filesystem_cache_on_write_operations;
-    res.enable_filesystem_cache_log = settings.enable_filesystem_cache_log;
-    res.throw_on_error_from_cache = settings.throw_on_error_from_cache_on_write_operations;
-    res.filesystem_cache_reserve_space_wait_lock_timeout_milliseconds = settings.filesystem_cache_reserve_space_wait_lock_timeout_milliseconds;
+    res.enable_filesystem_cache_on_write_operations = settings->enable_filesystem_cache_on_write_operations;
+    res.enable_filesystem_cache_log = settings->enable_filesystem_cache_log;
+    res.throw_on_error_from_cache = settings->throw_on_error_from_cache_on_write_operations;
+    res.filesystem_cache_reserve_space_wait_lock_timeout_milliseconds = settings->filesystem_cache_reserve_space_wait_lock_timeout_milliseconds;
 
-    res.s3_allow_parallel_part_upload = settings.s3_allow_parallel_part_upload;
-    res.azure_allow_parallel_part_upload = settings.azure_allow_parallel_part_upload;
+    res.s3_allow_parallel_part_upload = settings->s3_allow_parallel_part_upload;
+    res.azure_allow_parallel_part_upload = settings->azure_allow_parallel_part_upload;
 
     res.remote_throttler = getRemoteWriteThrottler();
     res.local_throttler = getLocalWriteThrottler();
@@ -5520,7 +5581,7 @@ bool Context::canUseParallelReplicasOnFollower() const
 
 bool Context::canUseParallelReplicasCustomKey() const
 {
-    return settings.max_parallel_replicas > 1 && getParallelReplicasMode() == Context::ParallelReplicasMode::CUSTOM_KEY;
+    return settings->max_parallel_replicas > 1 && getParallelReplicasMode() == Context::ParallelReplicasMode::CUSTOM_KEY;
 }
 
 bool Context::canUseParallelReplicasCustomKeyForCluster(const Cluster & cluster) const
@@ -5530,7 +5591,7 @@ bool Context::canUseParallelReplicasCustomKeyForCluster(const Cluster & cluster)
 
 bool Context::canUseOffsetParallelReplicas() const
 {
-    return offset_parallel_replicas_enabled && settings.max_parallel_replicas > 1
+    return offset_parallel_replicas_enabled && settings->max_parallel_replicas > 1
         && getParallelReplicasMode() != Context::ParallelReplicasMode::READ_TASKS;
 }
 
@@ -5542,13 +5603,13 @@ void Context::disableOffsetParallelReplicas()
 ClusterPtr Context::getClusterForParallelReplicas() const
 {
     /// check cluster for parallel replicas
-    if (settings.cluster_for_parallel_replicas.value.empty())
+    if (settings->cluster_for_parallel_replicas.value.empty())
         throw Exception(
             ErrorCodes::CLUSTER_DOESNT_EXIST,
             "Reading in parallel from replicas is enabled but cluster to execute query is not provided. Please set "
             "'cluster_for_parallel_replicas' setting");
 
-    return getCluster(settings.cluster_for_parallel_replicas);
+    return getCluster(settings->cluster_for_parallel_replicas);
 }
 
 void Context::setPreparedSetsCache(const PreparedSetsCachePtr & cache)
@@ -5576,4 +5637,39 @@ const ServerSettings & Context::getServerSettings() const
     return shared->server_settings;
 }
 
+uint64_t HTTPContext::getMaxHstsAge() const
+{
+    return context->getSettingsRef().hsts_max_age;
+}
+
+    uint64_t HTTPContext::getMaxUriSize() const
+{
+    return context->getSettingsRef().http_max_uri_size;
+}
+
+uint64_t HTTPContext::getMaxFields() const
+{
+return context->getSettingsRef().http_max_fields;
+}
+
+uint64_t HTTPContext::getMaxFieldNameSize() const
+{
+return context->getSettingsRef().http_max_field_name_size;
+}
+
+uint64_t HTTPContext::getMaxFieldValueSize() const
+{
+return context->getSettingsRef().http_max_field_value_size;
+}
+
+Poco::Timespan HTTPContext::getReceiveTimeout() const
+{
+return context->getSettingsRef().http_receive_timeout;
+}
+
+Poco::Timespan HTTPContext::getSendTimeout() const
+{
+return context->getSettingsRef().http_send_timeout;
+}
+
 }
diff --git a/src/Interpreters/Context.h b/src/Interpreters/Context.h
index 8c5492bcbc8..284cac50769 100644
--- a/src/Interpreters/Context.h
+++ b/src/Interpreters/Context.h
@@ -11,9 +11,11 @@
 #include <Common/SharedMutex.h>
 #include <Common/SharedMutexHelper.h>
 #include <Core/NamesAndTypes.h>
-#include <Core/Settings.h>
 #include <Core/UUID.h>
+#include <Formats/FormatSettings.h>
 #include <IO/AsyncReadCounters.h>
+#include <IO/ReadSettings.h>
+#include <IO/WriteSettings.h>
 #include <Disks/IO/getThreadPoolReader.h>
 #include <Interpreters/ClientInfo.h>
 #include <Interpreters/Context_fwd.h>
@@ -129,6 +131,7 @@ class ShellCommand;
 class ICompressionCodec;
 class AccessControl;
 class GSSAcceptorContext;
+struct Settings;
 struct SettingsConstraintsAndProfileIDs;
 class SettingsProfileElements;
 class RemoteHostFilter;
@@ -276,7 +279,7 @@ protected:
     mutable std::shared_ptr<const ContextAccess> access;
     mutable bool need_recalculate_access = true;
     String current_database;
-    Settings settings;  /// Setting for query execution.
+    std::unique_ptr<Settings> settings{};  /// Setting for query execution.
 
     using ProgressCallback = std::function<void(const Progress & progress)>;
     ProgressCallback progress_callback;  /// Callback for tracking progress of query execution.
@@ -952,7 +955,7 @@ public:
     void makeSessionContext();
     void makeGlobalContext();
 
-    const Settings & getSettingsRef() const { return settings; }
+    const Settings & getSettingsRef() const { return *settings; }
 
     void setProgressCallback(ProgressCallback callback);
     /// Used in executeQuery() to pass it to the QueryPipeline.
@@ -1428,40 +1431,19 @@ struct HTTPContext : public IHTTPContext
         : context(Context::createCopy(context_))
     {}
 
-    uint64_t getMaxHstsAge() const override
-    {
-        return context->getSettingsRef().hsts_max_age;
-    }
+    uint64_t getMaxHstsAge() const override;
 
-    uint64_t getMaxUriSize() const override
-    {
-        return context->getSettingsRef().http_max_uri_size;
-    }
+    uint64_t getMaxUriSize() const override;
 
-    uint64_t getMaxFields() const override
-    {
-        return context->getSettingsRef().http_max_fields;
-    }
+    uint64_t getMaxFields() const override;
 
-    uint64_t getMaxFieldNameSize() const override
-    {
-        return context->getSettingsRef().http_max_field_name_size;
-    }
+    uint64_t getMaxFieldNameSize() const override;
 
-    uint64_t getMaxFieldValueSize() const override
-    {
-        return context->getSettingsRef().http_max_field_value_size;
-    }
+    uint64_t getMaxFieldValueSize() const override;
 
-    Poco::Timespan getReceiveTimeout() const override
-    {
-        return context->getSettingsRef().http_receive_timeout;
-    }
+    Poco::Timespan getReceiveTimeout() const override;
 
-    Poco::Timespan getSendTimeout() const override
-    {
-        return context->getSettingsRef().http_send_timeout;
-    }
+    Poco::Timespan getSendTimeout() const override;
 
     ContextPtr context;
 };
diff --git a/src/Interpreters/DDLTask.cpp b/src/Interpreters/DDLTask.cpp
index 6c346836ed8..fa197d59c13 100644
--- a/src/Interpreters/DDLTask.cpp
+++ b/src/Interpreters/DDLTask.cpp
@@ -2,6 +2,7 @@
 #include <base/sort.h>
 #include <Common/DNSResolver.h>
 #include <Common/isLocalAddress.h>
+#include <Core/Settings.h>
 #include <Databases/DatabaseReplicated.h>
 #include <Interpreters/DatabaseCatalog.h>
 #include <IO/WriteHelpers.h>
diff --git a/src/Interpreters/DDLTask.h b/src/Interpreters/DDLTask.h
index 0b0460b26c8..515a35d8671 100644
--- a/src/Interpreters/DDLTask.h
+++ b/src/Interpreters/DDLTask.h
@@ -3,6 +3,7 @@
 #include <Core/Types.h>
 #include <Interpreters/Cluster.h>
 #include <Common/OpenTelemetryTraceContext.h>
+#include <Common/SettingsChanges.h>
 #include <Common/ZooKeeper/Types.h>
 #include <filesystem>
 
diff --git a/src/Interpreters/ExternalDictionariesLoader.cpp b/src/Interpreters/ExternalDictionariesLoader.cpp
index 1685c06d387..5f6d7e33927 100644
--- a/src/Interpreters/ExternalDictionariesLoader.cpp
+++ b/src/Interpreters/ExternalDictionariesLoader.cpp
@@ -6,6 +6,7 @@
 #include <Databases/IDatabase.h>
 #include <Storages/IStorage.h>
 #include <Common/Config/AbstractConfigurationComparison.h>
+#include <Core/Settings.h>
 
 #include "config.h"
 
diff --git a/src/Interpreters/FilesystemCacheLog.h b/src/Interpreters/FilesystemCacheLog.h
index 27c616ff40c..6d92fbd7a43 100644
--- a/src/Interpreters/FilesystemCacheLog.h
+++ b/src/Interpreters/FilesystemCacheLog.h
@@ -2,7 +2,6 @@
 
 #include <Core/NamesAndAliases.h>
 #include <Core/NamesAndTypes.h>
-#include <Core/Settings.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeNumberBase.h>
 #include <DataTypes/DataTypeTuple.h>
diff --git a/src/Interpreters/GraceHashJoin.cpp b/src/Interpreters/GraceHashJoin.cpp
index 6970048269b..a241d1cd258 100644
--- a/src/Interpreters/GraceHashJoin.cpp
+++ b/src/Interpreters/GraceHashJoin.cpp
@@ -10,6 +10,7 @@
 #include <Common/formatReadable.h>
 #include <Common/logger_useful.h>
 #include <Common/thread_local_rng.h>
+#include <Core/Settings.h>
 
 #include <numeric>
 #include <fmt/format.h>
diff --git a/src/Interpreters/IInterpreter.cpp b/src/Interpreters/IInterpreter.cpp
index 148e73e43ce..a291199f24b 100644
--- a/src/Interpreters/IInterpreter.cpp
+++ b/src/Interpreters/IInterpreter.cpp
@@ -1,3 +1,4 @@
+#include <Core/Settings.h>
 #include <Interpreters/IInterpreter.h>
 #include <Interpreters/QueryLog.h>
 #include <Interpreters/Context.h>
diff --git a/src/Interpreters/IInterpreterUnionOrSelectQuery.h b/src/Interpreters/IInterpreterUnionOrSelectQuery.h
index e4425a73505..4ecfc464e90 100644
--- a/src/Interpreters/IInterpreterUnionOrSelectQuery.h
+++ b/src/Interpreters/IInterpreterUnionOrSelectQuery.h
@@ -6,6 +6,8 @@
 #include <Parsers/IAST_fwd.h>
 #include <DataTypes/DataTypesNumber.h>
 
+#include <Core/Settings.h>
+
 namespace DB
 {
 
diff --git a/src/Interpreters/IdentifierSemantic.cpp b/src/Interpreters/IdentifierSemantic.cpp
index 36972aeb03d..24e594661e9 100644
--- a/src/Interpreters/IdentifierSemantic.cpp
+++ b/src/Interpreters/IdentifierSemantic.cpp
@@ -2,6 +2,8 @@
 
 #include <Common/typeid_cast.h>
 
+#include <Core/Settings.h>
+
 #include <Interpreters/Context.h>
 #include <Interpreters/StorageID.h>
 
diff --git a/src/Interpreters/InJoinSubqueriesPreprocessor.cpp b/src/Interpreters/InJoinSubqueriesPreprocessor.cpp
index 3b3ef928b42..22ecb6a5db2 100644
--- a/src/Interpreters/InJoinSubqueriesPreprocessor.cpp
+++ b/src/Interpreters/InJoinSubqueriesPreprocessor.cpp
@@ -11,6 +11,7 @@
 #include <Parsers/ASTFunction.h>
 #include <Common/typeid_cast.h>
 #include <Common/checkStackSize.h>
+#include <Core/Settings.h>
 
 
 namespace DB
diff --git a/src/Interpreters/InterpreterCheckQuery.cpp b/src/Interpreters/InterpreterCheckQuery.cpp
index 4a84a7bf570..5c4fb7a1443 100644
--- a/src/Interpreters/InterpreterCheckQuery.cpp
+++ b/src/Interpreters/InterpreterCheckQuery.cpp
@@ -12,6 +12,8 @@
 #include <Common/thread_local_rng.h>
 #include <Common/typeid_cast.h>
 
+#include <Core/Settings.h>
+
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeString.h>
 
diff --git a/src/Interpreters/InterpreterCreateIndexQuery.cpp b/src/Interpreters/InterpreterCreateIndexQuery.cpp
index a439cb672c8..1c6abe842d4 100644
--- a/src/Interpreters/InterpreterCreateIndexQuery.cpp
+++ b/src/Interpreters/InterpreterCreateIndexQuery.cpp
@@ -1,5 +1,6 @@
 
 #include <Access/ContextAccess.h>
+#include <Core/Settings.h>
 #include <Databases/DatabaseReplicated.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/DatabaseCatalog.h>
diff --git a/src/Interpreters/InterpreterDropIndexQuery.cpp b/src/Interpreters/InterpreterDropIndexQuery.cpp
index f052aa201f1..8777532e4d0 100644
--- a/src/Interpreters/InterpreterDropIndexQuery.cpp
+++ b/src/Interpreters/InterpreterDropIndexQuery.cpp
@@ -1,4 +1,5 @@
 #include <Access/ContextAccess.h>
+#include <Core/Settings.h>
 #include <Databases/DatabaseReplicated.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/DatabaseCatalog.h>
diff --git a/src/Interpreters/InterpreterKillQueryQuery.cpp b/src/Interpreters/InterpreterKillQueryQuery.cpp
index 6d6b1085ffb..7eb487ba7b3 100644
--- a/src/Interpreters/InterpreterKillQueryQuery.cpp
+++ b/src/Interpreters/InterpreterKillQueryQuery.cpp
@@ -16,6 +16,7 @@
 #include <Access/ContextAccess.h>
 #include <Columns/ColumnString.h>
 #include <Common/typeid_cast.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeString.h>
 #include <Columns/ColumnsNumber.h>
 #include <DataTypes/DataTypesNumber.h>
diff --git a/src/Interpreters/InterpreterRenameQuery.cpp b/src/Interpreters/InterpreterRenameQuery.cpp
index 32c475d138f..c6e52590f89 100644
--- a/src/Interpreters/InterpreterRenameQuery.cpp
+++ b/src/Interpreters/InterpreterRenameQuery.cpp
@@ -9,6 +9,7 @@
 #include <Interpreters/QueryLog.h>
 #include <Access/Common/AccessRightsElement.h>
 #include <Common/typeid_cast.h>
+#include <Core/Settings.h>
 #include <Databases/DatabaseReplicated.h>
 
 
diff --git a/src/Interpreters/InterpreterShowColumnsQuery.cpp b/src/Interpreters/InterpreterShowColumnsQuery.cpp
index f32ebceaa63..d8fff4e6026 100644
--- a/src/Interpreters/InterpreterShowColumnsQuery.cpp
+++ b/src/Interpreters/InterpreterShowColumnsQuery.cpp
@@ -3,6 +3,7 @@
 
 #include <Common/quoteString.h>
 #include <Common/escapeString.h>
+#include <Core/Settings.h>
 #include <IO/Operators.h>
 #include <IO/WriteBufferFromString.h>
 #include <Parsers/ASTShowColumnsQuery.h>
diff --git a/src/Interpreters/InterpreterTransactionControlQuery.cpp b/src/Interpreters/InterpreterTransactionControlQuery.cpp
index 13872fbe3f5..e92d6f9c5e7 100644
--- a/src/Interpreters/InterpreterTransactionControlQuery.cpp
+++ b/src/Interpreters/InterpreterTransactionControlQuery.cpp
@@ -3,6 +3,7 @@
 #include <Parsers/ASTTransactionControl.h>
 #include <Interpreters/TransactionLog.h>
 #include <Interpreters/Context.h>
+#include <Core/Settings.h>
 
 namespace DB
 {
diff --git a/src/Interpreters/MutationsNonDeterministicHelpers.cpp b/src/Interpreters/MutationsNonDeterministicHelpers.cpp
index 7a4cb91acc0..bcff3e18b25 100644
--- a/src/Interpreters/MutationsNonDeterministicHelpers.cpp
+++ b/src/Interpreters/MutationsNonDeterministicHelpers.cpp
@@ -5,6 +5,7 @@
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTAlterQuery.h>
 #include <Storages/MutationCommands.h>
+#include <Core/Settings.h>
 #include <Interpreters/InDepthNodeVisitor.h>
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Interpreters/ExecuteScalarSubqueriesVisitor.h>
diff --git a/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.h b/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.h
index e8194f0dfe1..b2f55003da5 100644
--- a/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.h
+++ b/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.h
@@ -1,11 +1,10 @@
 #pragma once
 
-#include <unordered_set>
-
+#include <Core/SettingsEnums.h>
 #include <Interpreters/InDepthNodeVisitor.h>
 #include <Parsers/IAST_fwd.h>
 
-#include <Core/Settings.h>
+#include <unordered_set>
 
 namespace DB
 {
diff --git a/src/Interpreters/PredicateExpressionsOptimizer.cpp b/src/Interpreters/PredicateExpressionsOptimizer.cpp
index 8dc8c1c92cc..af67e62be1a 100644
--- a/src/Interpreters/PredicateExpressionsOptimizer.cpp
+++ b/src/Interpreters/PredicateExpressionsOptimizer.cpp
@@ -1,5 +1,6 @@
 #include <Interpreters/PredicateExpressionsOptimizer.h>
 
+#include <Core/Settings.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/ExtractExpressionInfoVisitor.h>
 #include <Interpreters/PredicateRewriteVisitor.h>
diff --git a/src/Interpreters/QueryLog.cpp b/src/Interpreters/QueryLog.cpp
index e63a2ae31aa..527159dc981 100644
--- a/src/Interpreters/QueryLog.cpp
+++ b/src/Interpreters/QueryLog.cpp
@@ -5,6 +5,7 @@
 #include <Columns/ColumnFixedString.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnsNumber.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeDateTime64.h>
 #include <DataTypes/DataTypeDate.h>
diff --git a/src/Interpreters/QueryLog.h b/src/Interpreters/QueryLog.h
index bbaa7179757..40904bb939c 100644
--- a/src/Interpreters/QueryLog.h
+++ b/src/Interpreters/QueryLog.h
@@ -3,7 +3,7 @@
 #include <Common/ProfileEvents.h>
 #include <Core/NamesAndTypes.h>
 #include <Core/NamesAndAliases.h>
-#include <Core/Settings.h>
+#include <Core/SettingsEnums.h>
 #include <Interpreters/Cache/QueryCache.h>
 #include <Interpreters/ClientInfo.h>
 #include <Interpreters/SystemLog.h>
@@ -22,6 +22,8 @@ namespace ProfileEvents
 namespace DB
 {
 
+struct Settings;
+
 
 /** Allows to log information about queries execution:
   * - info about start of query execution;
diff --git a/src/Interpreters/RewriteCountVariantsVisitor.cpp b/src/Interpreters/RewriteCountVariantsVisitor.cpp
index f207bc51527..4a541c3765a 100644
--- a/src/Interpreters/RewriteCountVariantsVisitor.cpp
+++ b/src/Interpreters/RewriteCountVariantsVisitor.cpp
@@ -6,6 +6,7 @@
 #include <Poco/String.h>
 #include <Common/typeid_cast.h>
 #include <Common/checkStackSize.h>
+#include <Core/Settings.h>
 #include <Interpreters/Context.h>
 
 
diff --git a/src/Interpreters/Session.cpp b/src/Interpreters/Session.cpp
index bb8c415602f..2ef6bec94df 100644
--- a/src/Interpreters/Session.cpp
+++ b/src/Interpreters/Session.cpp
@@ -9,6 +9,7 @@
 #include <Common/Exception.h>
 #include <Common/ThreadPool.h>
 #include <Common/setThreadName.h>
+#include <Core/Settings.h>
 #include <Interpreters/SessionTracker.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/SessionLog.h>
diff --git a/src/Interpreters/ThreadStatusExt.cpp b/src/Interpreters/ThreadStatusExt.cpp
index 6ec6a64b13d..1f7c6b1fe68 100644
--- a/src/Interpreters/ThreadStatusExt.cpp
+++ b/src/Interpreters/ThreadStatusExt.cpp
@@ -20,6 +20,7 @@
 #include <Common/noexcept_scope.h>
 #include <Common/DateLUT.h>
 #include <Common/logger_useful.h>
+#include <Core/Settings.h>
 #include <base/errnoToString.h>
 #include <Core/ServerSettings.h>
 
diff --git a/src/Interpreters/evaluateConstantExpression.cpp b/src/Interpreters/evaluateConstantExpression.cpp
index 4e1a2bcf5ee..ac80ad2fb68 100644
--- a/src/Interpreters/evaluateConstantExpression.cpp
+++ b/src/Interpreters/evaluateConstantExpression.cpp
@@ -4,6 +4,7 @@
 #include <Columns/ColumnSet.h>
 #include <Common/typeid_cast.h>
 #include <Core/Block.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/FieldToDataType.h>
 #include <DataTypes/DataTypeTuple.h>
@@ -24,6 +25,7 @@
 #include <Processors/QueryPlan/Optimizations/actionsDAGUtils.h>
 #include <Storages/MergeTree/KeyCondition.h>
 #include <TableFunctions/TableFunctionFactory.h>
+
 #include <unordered_map>
 
 
diff --git a/src/Interpreters/executeDDLQueryOnCluster.cpp b/src/Interpreters/executeDDLQueryOnCluster.cpp
index 9c3f85128cf..5d237d28089 100644
--- a/src/Interpreters/executeDDLQueryOnCluster.cpp
+++ b/src/Interpreters/executeDDLQueryOnCluster.cpp
@@ -11,6 +11,7 @@
 #include <Parsers/queryToString.h>
 #include <Access/Common/AccessRightsElement.h>
 #include <Access/ContextAccess.h>
+#include <Core/Settings.h>
 #include <Common/Macros.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Databases/DatabaseReplicated.h>
diff --git a/src/Interpreters/formatWithPossiblyHidingSecrets.h b/src/Interpreters/formatWithPossiblyHidingSecrets.h
index 25e1e7a5616..039bcbc2bca 100644
--- a/src/Interpreters/formatWithPossiblyHidingSecrets.h
+++ b/src/Interpreters/formatWithPossiblyHidingSecrets.h
@@ -2,6 +2,8 @@
 #include "Access/ContextAccess.h"
 #include "Interpreters/Context.h"
 
+#include <Core/Settings.h>
+
 namespace DB
 {
 struct SecretHidingFormatSettings
diff --git a/src/Interpreters/getCustomKeyFilterForParallelReplicas.cpp b/src/Interpreters/getCustomKeyFilterForParallelReplicas.cpp
index 43be7c5f043..6f902c7cd7e 100644
--- a/src/Interpreters/getCustomKeyFilterForParallelReplicas.cpp
+++ b/src/Interpreters/getCustomKeyFilterForParallelReplicas.cpp
@@ -1,5 +1,7 @@
 #include <Interpreters/getCustomKeyFilterForParallelReplicas.h>
 
+#include <Core/Settings.h>
+
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTSampleRatio.h>
 #include <Parsers/ExpressionListParsers.h>
diff --git a/src/Interpreters/loadMetadata.cpp b/src/Interpreters/loadMetadata.cpp
index 9c3922b8bda..b5148174043 100644
--- a/src/Interpreters/loadMetadata.cpp
+++ b/src/Interpreters/loadMetadata.cpp
@@ -24,6 +24,7 @@
 #include <Common/typeid_cast.h>
 #include <Common/logger_useful.h>
 #include <Common/CurrentMetrics.h>
+#include <Core/Settings.h>
 
 #include <filesystem>
 
diff --git a/src/Interpreters/parseColumnsListForTableFunction.cpp b/src/Interpreters/parseColumnsListForTableFunction.cpp
index 3529863a623..b9fdaabede1 100644
--- a/src/Interpreters/parseColumnsListForTableFunction.cpp
+++ b/src/Interpreters/parseColumnsListForTableFunction.cpp
@@ -1,3 +1,4 @@
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeFixedString.h>
 #include <DataTypes/DataTypeLowCardinality.h>
 #include <DataTypes/DataTypeNullable.h>
@@ -21,6 +22,18 @@ extern const int ILLEGAL_COLUMN;
 
 }
 
+DataTypeValidationSettings::DataTypeValidationSettings(const DB::Settings& settings)
+        : allow_suspicious_low_cardinality_types(settings.allow_suspicious_low_cardinality_types)
+        , allow_experimental_object_type(settings.allow_experimental_object_type)
+        , allow_suspicious_fixed_string_types(settings.allow_suspicious_fixed_string_types)
+        , allow_experimental_variant_type(settings.allow_experimental_variant_type)
+        , allow_suspicious_variant_types(settings.allow_suspicious_variant_types)
+        , validate_nested_types(settings.validate_experimental_and_suspicious_types_inside_nested_types)
+        , allow_experimental_dynamic_type(settings.allow_experimental_dynamic_type)
+{
+}
+
+
 void validateDataType(const DataTypePtr & type_to_check, const DataTypeValidationSettings & settings)
 {
     auto validate_callback = [&](const IDataType & data_type)
diff --git a/src/Interpreters/parseColumnsListForTableFunction.h b/src/Interpreters/parseColumnsListForTableFunction.h
index e2d2bc97ff7..6f15c585e4f 100644
--- a/src/Interpreters/parseColumnsListForTableFunction.h
+++ b/src/Interpreters/parseColumnsListForTableFunction.h
@@ -2,28 +2,19 @@
 
 #include <string>
 #include <Storages/ColumnsDescription.h>
-#include <Core/Settings.h>
 
 
 namespace DB
 {
 
 class Context;
+struct Settings;
 
 struct DataTypeValidationSettings
 {
     DataTypeValidationSettings() = default;
 
-    explicit DataTypeValidationSettings(const Settings & settings)
-        : allow_suspicious_low_cardinality_types(settings.allow_suspicious_low_cardinality_types)
-        , allow_experimental_object_type(settings.allow_experimental_object_type)
-        , allow_suspicious_fixed_string_types(settings.allow_suspicious_fixed_string_types)
-        , allow_experimental_variant_type(settings.allow_experimental_variant_type)
-        , allow_suspicious_variant_types(settings.allow_suspicious_variant_types)
-        , validate_nested_types(settings.validate_experimental_and_suspicious_types_inside_nested_types)
-        , allow_experimental_dynamic_type(settings.allow_experimental_dynamic_type)
-    {
-    }
+    explicit DataTypeValidationSettings(const Settings & settings);
 
     bool allow_suspicious_low_cardinality_types = true;
     bool allow_experimental_object_type = true;
diff --git a/src/Interpreters/removeOnClusterClauseIfNeeded.cpp b/src/Interpreters/removeOnClusterClauseIfNeeded.cpp
index 44167fe7242..c23c600f95a 100644
--- a/src/Interpreters/removeOnClusterClauseIfNeeded.cpp
+++ b/src/Interpreters/removeOnClusterClauseIfNeeded.cpp
@@ -3,6 +3,7 @@
 #include <Access/AccessControl.h>
 #include <Access/ReplicatedAccessStorage.h>
 #include <Common/logger_useful.h>
+#include <Core/Settings.h>
 #include <Functions/UserDefined/IUserDefinedSQLObjectsStorage.h>
 #include <Interpreters/Context.h>
 #include <Parsers/ASTCreateFunctionQuery.h>
diff --git a/src/Planner/CollectSets.cpp b/src/Planner/CollectSets.cpp
index 52a0d748d63..9cac4e61380 100644
--- a/src/Planner/CollectSets.cpp
+++ b/src/Planner/CollectSets.cpp
@@ -12,6 +12,7 @@
 #include <Analyzer/ConstantNode.h>
 #include <Analyzer/FunctionNode.h>
 #include <Analyzer/TableNode.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypeLowCardinality.h>
 #include <Planner/Planner.h>
diff --git a/src/Planner/Planner.cpp b/src/Planner/Planner.cpp
index 2d42ed73223..fc10a73fae9 100644
--- a/src/Planner/Planner.cpp
+++ b/src/Planner/Planner.cpp
@@ -3,6 +3,7 @@
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnSet.h>
 #include <Core/ProtocolDefines.h>
+#include <Core/Settings.h>
 #include <Common/ProfileEvents.h>
 #include <Common/logger_useful.h>
 
diff --git a/src/Planner/PlannerActionsVisitor.cpp b/src/Planner/PlannerActionsVisitor.cpp
index 7a12d5d690d..a0c7f9b2516 100644
--- a/src/Planner/PlannerActionsVisitor.cpp
+++ b/src/Planner/PlannerActionsVisitor.cpp
@@ -30,6 +30,8 @@
 #include <Planner/TableExpressionData.h>
 #include <Planner/Utils.h>
 
+#include <Core/Settings.h>
+
 
 namespace DB
 {
diff --git a/src/Planner/PlannerExpressionAnalysis.cpp b/src/Planner/PlannerExpressionAnalysis.cpp
index ceb506d1bbb..68e0ef9785e 100644
--- a/src/Planner/PlannerExpressionAnalysis.cpp
+++ b/src/Planner/PlannerExpressionAnalysis.cpp
@@ -23,6 +23,8 @@
 #include <Planner/PlannerWindowFunctions.h>
 #include <Planner/Utils.h>
 
+#include <Core/Settings.h>
+
 namespace DB
 {
 
diff --git a/src/Planner/PlannerJoinTree.cpp b/src/Planner/PlannerJoinTree.cpp
index 47582d2904f..2877dc55b0d 100644
--- a/src/Planner/PlannerJoinTree.cpp
+++ b/src/Planner/PlannerJoinTree.cpp
@@ -1,5 +1,7 @@
 #include <Planner/PlannerJoinTree.h>
 
+#include <Core/Settings.h>
+
 #include <Common/scope_guard_safe.h>
 
 #include <Columns/ColumnAggregateFunction.h>
diff --git a/src/Planner/PlannerJoins.cpp b/src/Planner/PlannerJoins.cpp
index e752c57b08b..ba8af7a7f13 100644
--- a/src/Planner/PlannerJoins.cpp
+++ b/src/Planner/PlannerJoins.cpp
@@ -43,6 +43,8 @@
 #include <Planner/PlannerContext.h>
 #include <Planner/Utils.h>
 
+#include <Core/Settings.h>
+
 namespace DB
 {
 
diff --git a/src/Planner/PlannerSorting.cpp b/src/Planner/PlannerSorting.cpp
index 611a26f78fa..1c6e820fed1 100644
--- a/src/Planner/PlannerSorting.cpp
+++ b/src/Planner/PlannerSorting.cpp
@@ -1,5 +1,7 @@
 #include <Planner/PlannerSorting.h>
 
+#include <Core/Settings.h>
+
 #include <Common/FieldVisitorsAccurateComparison.h>
 
 #include <DataTypes/DataTypeInterval.h>
diff --git a/src/Planner/PlannerWindowFunctions.cpp b/src/Planner/PlannerWindowFunctions.cpp
index ce74d82c08d..225852de5a7 100644
--- a/src/Planner/PlannerWindowFunctions.cpp
+++ b/src/Planner/PlannerWindowFunctions.cpp
@@ -4,6 +4,8 @@
 #include <Analyzer/FunctionNode.h>
 #include <Analyzer/WindowNode.h>
 
+#include <Core/Settings.h>
+
 #include <Interpreters/Context.h>
 
 #include <Planner/PlannerSorting.h>
diff --git a/src/Planner/Utils.cpp b/src/Planner/Utils.cpp
index 18a6d297838..3c54c57a28c 100644
--- a/src/Planner/Utils.cpp
+++ b/src/Planner/Utils.cpp
@@ -33,6 +33,8 @@
 #include <Analyzer/QueryTreeBuilder.h>
 #include <Analyzer/Passes/QueryAnalysisPass.h>
 
+#include <Core/Settings.h>
+
 #include <Planner/PlannerActionsVisitor.h>
 #include <Planner/CollectTableExpressionData.h>
 #include <Planner/CollectSets.h>
diff --git a/src/Planner/findParallelReplicasQuery.cpp b/src/Planner/findParallelReplicasQuery.cpp
index f2bc1f060d8..c89a70be541 100644
--- a/src/Planner/findParallelReplicasQuery.cpp
+++ b/src/Planner/findParallelReplicasQuery.cpp
@@ -4,6 +4,7 @@
 #include <Analyzer/QueryNode.h>
 #include <Analyzer/TableNode.h>
 #include <Analyzer/UnionNode.h>
+#include <Core/Settings.h>
 #include <Interpreters/ClusterProxy/SelectStreamFactory.h>
 #include <Interpreters/ClusterProxy/executeQuery.h>
 #include <Interpreters/InterpreterSelectQueryAnalyzer.h>
diff --git a/src/Processors/Executors/PipelineExecutor.cpp b/src/Processors/Executors/PipelineExecutor.cpp
index 49ec9999521..82cad471a29 100644
--- a/src/Processors/Executors/PipelineExecutor.cpp
+++ b/src/Processors/Executors/PipelineExecutor.cpp
@@ -12,6 +12,7 @@
 #include <Common/scope_guard_safe.h>
 #include <Common/Exception.h>
 #include <Common/OpenTelemetryTraceContext.h>
+#include <Core/Settings.h>
 
 #ifndef NDEBUG
     #include <Common/Stopwatch.h>
diff --git a/src/Processors/Formats/Impl/ConstantExpressionTemplate.cpp b/src/Processors/Formats/Impl/ConstantExpressionTemplate.cpp
index fe82d1b1c53..06e8668cd7c 100644
--- a/src/Processors/Formats/Impl/ConstantExpressionTemplate.cpp
+++ b/src/Processors/Formats/Impl/ConstantExpressionTemplate.cpp
@@ -2,6 +2,7 @@
 #include <Columns/ColumnTuple.h>
 #include <Columns/ColumnMap.h>
 #include <Columns/ColumnsNumber.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeString.h>
diff --git a/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp b/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
index 1493779ec2d..c23d717d52f 100644
--- a/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
@@ -10,6 +10,7 @@
 #include <Common/typeid_cast.h>
 #include <Common/checkStackSize.h>
 #include <Common/logger_useful.h>
+#include <Core/Settings.h>
 #include <Parsers/ASTLiteral.h>
 #include <DataTypes/Serializations/SerializationNullable.h>
 #include <DataTypes/DataTypeTuple.h>
diff --git a/src/Processors/Formats/InputFormatErrorsLogger.cpp b/src/Processors/Formats/InputFormatErrorsLogger.cpp
index 814c4679cf9..b5aa936df07 100644
--- a/src/Processors/Formats/InputFormatErrorsLogger.cpp
+++ b/src/Processors/Formats/InputFormatErrorsLogger.cpp
@@ -5,6 +5,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Common/filesystemHelpers.h>
+#include <Core/Settings.h>
 
 
 namespace DB
diff --git a/src/Processors/QueryPlan/Optimizations/optimizePrewhere.cpp b/src/Processors/QueryPlan/Optimizations/optimizePrewhere.cpp
index 1badd315200..3cb7f8a5d83 100644
--- a/src/Processors/QueryPlan/Optimizations/optimizePrewhere.cpp
+++ b/src/Processors/QueryPlan/Optimizations/optimizePrewhere.cpp
@@ -1,3 +1,4 @@
+#include <Core/Settings.h>
 #include <Processors/QueryPlan/Optimizations/Optimizations.h>
 #include <Processors/QueryPlan/ExpressionStep.h>
 #include <Processors/QueryPlan/FilterStep.h>
@@ -8,6 +9,7 @@
 #include <Interpreters/ActionsDAG.h>
 #include <Functions/FunctionsLogical.h>
 #include <Functions/IFunctionAdaptors.h>
+
 namespace DB
 {
 
diff --git a/src/Processors/QueryPlan/Optimizations/optimizeUseNormalProjection.cpp b/src/Processors/QueryPlan/Optimizations/optimizeUseNormalProjection.cpp
index 0af3869ccf1..44c1bf0f7d5 100644
--- a/src/Processors/QueryPlan/Optimizations/optimizeUseNormalProjection.cpp
+++ b/src/Processors/QueryPlan/Optimizations/optimizeUseNormalProjection.cpp
@@ -7,9 +7,11 @@
 #include <Processors/QueryPlan/ReadFromPreparedSource.h>
 #include <Processors/Sources/NullSource.h>
 #include <Common/logger_useful.h>
+#include <Core/Settings.h>
 #include <Storages/ProjectionsDescription.h>
 #include <Storages/SelectQueryInfo.h>
 #include <Storages/MergeTree/MergeTreeDataSelectExecutor.h>
+
 #include <algorithm>
 
 namespace DB::QueryPlanOptimizations
diff --git a/src/Processors/QueryPlan/ReadFromRemote.cpp b/src/Processors/QueryPlan/ReadFromRemote.cpp
index 84c2515e8ca..fe724a8a198 100644
--- a/src/Processors/QueryPlan/ReadFromRemote.cpp
+++ b/src/Processors/QueryPlan/ReadFromRemote.cpp
@@ -16,6 +16,7 @@
 #include <Common/logger_useful.h>
 #include <Common/checkStackSize.h>
 #include <Core/QueryProcessingStage.h>
+#include <Core/Settings.h>
 #include <Client/ConnectionPool.h>
 #include <Client/ConnectionPoolWithFailover.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
diff --git a/src/Processors/QueryPlan/SortingStep.cpp b/src/Processors/QueryPlan/SortingStep.cpp
index 1c40f84d23d..48fad9f5fdb 100644
--- a/src/Processors/QueryPlan/SortingStep.cpp
+++ b/src/Processors/QueryPlan/SortingStep.cpp
@@ -1,4 +1,3 @@
-#include <memory>
 #include <IO/Operators.h>
 #include <Interpreters/Context.h>
 #include <Processors/Merges/MergingSortedTransform.h>
@@ -10,10 +9,13 @@
 #include <Processors/QueryPlan/BufferChunksTransform.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Common/JSONBuilder.h>
+#include <Core/Settings.h>
 
 #include <Processors/ResizeProcessor.h>
 #include <Processors/Transforms/ScatterByPartitionTransform.h>
 
+#include <memory>
+
 namespace CurrentMetrics
 {
     extern const Metric TemporaryFilesForSort;
diff --git a/src/Processors/Sources/MySQLSource.cpp b/src/Processors/Sources/MySQLSource.cpp
index 985a82a7b17..5d533a7747e 100644
--- a/src/Processors/Sources/MySQLSource.cpp
+++ b/src/Processors/Sources/MySQLSource.cpp
@@ -2,7 +2,9 @@
 
 #if USE_MYSQL
 #include <vector>
+
 #include <Core/MySQL/MySQLReplication.h>
+#include <Core/Settings.h>
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnsNumber.h>
diff --git a/src/Processors/Sources/MySQLSource.h b/src/Processors/Sources/MySQLSource.h
index 4ae5af22dab..b99e48a7759 100644
--- a/src/Processors/Sources/MySQLSource.h
+++ b/src/Processors/Sources/MySQLSource.h
@@ -6,11 +6,12 @@
 #include <mysqlxx/PoolWithFailover.h>
 #include <mysqlxx/Query.h>
 #include <Core/ExternalResultDescription.h>
-#include <Core/Settings.h>
 
 namespace DB
 {
 
+struct Settings;
+
 struct StreamSettings
 {
     /// Check if setting is enabled, otherwise use common `max_block_size` setting.
diff --git a/src/Processors/Sources/RecursiveCTESource.cpp b/src/Processors/Sources/RecursiveCTESource.cpp
index 221198c622a..40e72e9cbb1 100644
--- a/src/Processors/Sources/RecursiveCTESource.cpp
+++ b/src/Processors/Sources/RecursiveCTESource.cpp
@@ -17,6 +17,8 @@
 #include <Analyzer/UnionNode.h>
 #include <Analyzer/TableNode.h>
 
+#include <Core/Settings.h>
+
 namespace DB
 {
 
diff --git a/src/Processors/TTL/TTLAggregationAlgorithm.cpp b/src/Processors/TTL/TTLAggregationAlgorithm.cpp
index 45e8a96412e..2d7a37d0abe 100644
--- a/src/Processors/TTL/TTLAggregationAlgorithm.cpp
+++ b/src/Processors/TTL/TTLAggregationAlgorithm.cpp
@@ -1,5 +1,6 @@
-#include <Processors/TTL/TTLAggregationAlgorithm.h>
+#include <Core/Settings.h>
 #include <Interpreters/Context.h>
+#include <Processors/TTL/TTLAggregationAlgorithm.h>
 
 namespace DB
 {
diff --git a/src/Processors/Transforms/getSourceFromASTInsertQuery.cpp b/src/Processors/Transforms/getSourceFromASTInsertQuery.cpp
index a2a42f27c3f..c33e87815b1 100644
--- a/src/Processors/Transforms/getSourceFromASTInsertQuery.cpp
+++ b/src/Processors/Transforms/getSourceFromASTInsertQuery.cpp
@@ -14,7 +14,8 @@
 #include <QueryPipeline/Pipe.h>
 #include <Processors/Formats/IInputFormat.h>
 #include "IO/CompressionMethod.h"
-#include "Parsers/ASTLiteral.h"
+#include <Core/Settings.h>
+#include <Parsers/ASTLiteral.h>
 
 
 namespace DB
diff --git a/src/QueryPipeline/RemoteQueryExecutor.cpp b/src/QueryPipeline/RemoteQueryExecutor.cpp
index bde8ce78f55..30662b1365c 100644
--- a/src/QueryPipeline/RemoteQueryExecutor.cpp
+++ b/src/QueryPipeline/RemoteQueryExecutor.cpp
@@ -5,6 +5,7 @@
 #include <Columns/ColumnConst.h>
 #include <Common/CurrentThread.h>
 #include <Core/Protocol.h>
+#include <Core/Settings.h>
 #include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
 #include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
@@ -899,4 +900,10 @@ void RemoteQueryExecutor::setProfileInfoCallback(ProfileInfoCallback callback)
     std::lock_guard guard(was_cancelled_mutex);
     profile_info_callback = std::move(callback);
 }
+
+bool RemoteQueryExecutor::needToSkipUnavailableShard() const
+{
+    return context->getSettingsRef().skip_unavailable_shards && (0 == connections->size());
+}
+
 }
diff --git a/src/QueryPipeline/RemoteQueryExecutor.h b/src/QueryPipeline/RemoteQueryExecutor.h
index 6b1539bd08e..04a59cc3b7e 100644
--- a/src/QueryPipeline/RemoteQueryExecutor.h
+++ b/src/QueryPipeline/RemoteQueryExecutor.h
@@ -218,7 +218,7 @@ public:
 
     IConnections & getConnections() { return *connections; }
 
-    bool needToSkipUnavailableShard() const { return context->getSettingsRef().skip_unavailable_shards && (0 == connections->size()); }
+    bool needToSkipUnavailableShard() const;
 
     bool isReplicaUnavailable() const { return extension && extension->parallel_reading_coordinator && connections->size() == 0; }
 
diff --git a/src/Server/GRPCServer.cpp b/src/Server/GRPCServer.cpp
index cb36df1efc0..4546de1ccae 100644
--- a/src/Server/GRPCServer.cpp
+++ b/src/Server/GRPCServer.cpp
@@ -11,6 +11,7 @@
 #include <Common/setThreadName.h>
 #include <Common/Stopwatch.h>
 #include <Common/ThreadPool.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <QueryPipeline/ProfileInfo.h>
 #include <Interpreters/Context.h>
diff --git a/src/Server/HTTP/setReadOnlyIfHTTPMethodIdempotent.cpp b/src/Server/HTTP/setReadOnlyIfHTTPMethodIdempotent.cpp
index d42bd77e339..48a3b39a3e7 100644
--- a/src/Server/HTTP/setReadOnlyIfHTTPMethodIdempotent.cpp
+++ b/src/Server/HTTP/setReadOnlyIfHTTPMethodIdempotent.cpp
@@ -1,5 +1,6 @@
 #include <Server/HTTP/setReadOnlyIfHTTPMethodIdempotent.h>
 
+#include <Core/Settings.h>
 #include <Interpreters/Context.h>
 #include <Server/HTTP/HTTPServerRequest.h>
 
diff --git a/src/Server/HTTPHandler.cpp b/src/Server/HTTPHandler.cpp
index 75901e6b901..c8a58527f2c 100644
--- a/src/Server/HTTPHandler.cpp
+++ b/src/Server/HTTPHandler.cpp
@@ -5,6 +5,7 @@
 #include <Compression/CompressedWriteBuffer.h>
 #include <Core/ExternalTable.h>
 #include <Core/ServerSettings.h>
+#include <Core/Settings.h>
 #include <Disks/StoragePolicy.h>
 #include <IO/CascadeWriteBuffer.h>
 #include <IO/ConcatReadBuffer.h>
diff --git a/src/Server/MySQLHandler.cpp b/src/Server/MySQLHandler.cpp
index c0f015bfcd5..b6d795b1e69 100644
--- a/src/Server/MySQLHandler.cpp
+++ b/src/Server/MySQLHandler.cpp
@@ -8,6 +8,7 @@
 #include <Core/MySQL/PacketsPreparedStatements.h>
 #include <Core/MySQL/PacketsProtocolText.h>
 #include <Core/NamesAndTypes.h>
+#include <Core/Settings.h>
 #include <IO/LimitReadBuffer.h>
 #include <IO/ReadBufferFromPocoSocket.h>
 #include <IO/ReadBufferFromString.h>
diff --git a/src/Server/MySQLHandler.h b/src/Server/MySQLHandler.h
index 2f891ebf810..f632ef51c00 100644
--- a/src/Server/MySQLHandler.h
+++ b/src/Server/MySQLHandler.h
@@ -8,6 +8,7 @@
 #include <base/getFQDNOrHostName.h>
 #include <Poco/Net/TCPServerConnection.h>
 #include <Common/CurrentMetrics.h>
+#include <Common/ProfileEvents.h>
 #include "IO/ReadBufferFromString.h"
 #include "IServer.h"
 
diff --git a/src/Server/PostgreSQLHandler.cpp b/src/Server/PostgreSQLHandler.cpp
index 8ba8421e6f0..cde31b4c58a 100644
--- a/src/Server/PostgreSQLHandler.cpp
+++ b/src/Server/PostgreSQLHandler.cpp
@@ -13,6 +13,7 @@
 #include <Common/config_version.h>
 #include <Common/randomSeed.h>
 #include <Common/setThreadName.h>
+#include <Core/Settings.h>
 
 #if USE_SSL
 #   include <Poco/Net/SecureStreamSocket.h>
diff --git a/src/Server/ProxyV1Handler.cpp b/src/Server/ProxyV1Handler.cpp
index d5e6ab23360..5b33a119cef 100644
--- a/src/Server/ProxyV1Handler.cpp
+++ b/src/Server/ProxyV1Handler.cpp
@@ -1,3 +1,4 @@
+#include <Core/Settings.h>
 #include <Server/ProxyV1Handler.h>
 #include <Poco/Net/NetException.h>
 #include <Common/NetException.h>
diff --git a/src/Storages/Distributed/DistributedSink.cpp b/src/Storages/Distributed/DistributedSink.cpp
index e556bda2561..a2bd7237854 100644
--- a/src/Storages/Distributed/DistributedSink.cpp
+++ b/src/Storages/Distributed/DistributedSink.cpp
@@ -32,6 +32,7 @@
 #include <Common/createHardLink.h>
 #include <Common/logger_useful.h>
 #include <Common/scope_guard_safe.h>
+#include <Core/Settings.h>
 
 #include <filesystem>
 
diff --git a/src/Storages/FileLog/FileLogSettings.cpp b/src/Storages/FileLog/FileLogSettings.cpp
index 8e245285b9a..cf2d6b64d7c 100644
--- a/src/Storages/FileLog/FileLogSettings.cpp
+++ b/src/Storages/FileLog/FileLogSettings.cpp
@@ -3,6 +3,7 @@
 #include <Parsers/ASTSetQuery.h>
 #include <Storages/FileLog/FileLogSettings.h>
 #include <Common/Exception.h>
+#include <Core/BaseSettings.h>
 
 
 namespace DB
diff --git a/src/Storages/MaterializedView/RefreshTask.cpp b/src/Storages/MaterializedView/RefreshTask.cpp
index bc8cb0ce69a..29631b95542 100644
--- a/src/Storages/MaterializedView/RefreshTask.cpp
+++ b/src/Storages/MaterializedView/RefreshTask.cpp
@@ -3,6 +3,7 @@
 #include <Storages/StorageMaterializedView.h>
 
 #include <Common/CurrentMetrics.h>
+#include <Core/Settings.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/InterpreterInsertQuery.h>
 #include <Interpreters/InterpreterDropQuery.h>
diff --git a/src/Storages/MergeTree/ApproximateNearestNeighborIndexesCommon.cpp b/src/Storages/MergeTree/ApproximateNearestNeighborIndexesCommon.cpp
index 69e54dd5f0c..dfd742c9cdd 100644
--- a/src/Storages/MergeTree/ApproximateNearestNeighborIndexesCommon.cpp
+++ b/src/Storages/MergeTree/ApproximateNearestNeighborIndexesCommon.cpp
@@ -1,5 +1,6 @@
 #include <Storages/MergeTree/ApproximateNearestNeighborIndexesCommon.h>
 
+#include <Core/Settings.h>
 #include <Interpreters/Context.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier.h>
diff --git a/src/Storages/MergeTree/KeyCondition.cpp b/src/Storages/MergeTree/KeyCondition.cpp
index 7e4b1db4c89..35fa2a8236f 100644
--- a/src/Storages/MergeTree/KeyCondition.cpp
+++ b/src/Storages/MergeTree/KeyCondition.cpp
@@ -23,6 +23,7 @@
 #include <Common/typeid_cast.h>
 #include <Columns/ColumnSet.h>
 #include <Columns/ColumnConst.h>
+#include <Core/Settings.h>
 #include <Interpreters/convertFieldToType.h>
 #include <Interpreters/Set.h>
 #include <Parsers/queryToString.h>
diff --git a/src/Storages/MergeTree/MergeTreeDataWriter.cpp b/src/Storages/MergeTree/MergeTreeDataWriter.cpp
index bf05f3afaf4..73244b714bf 100644
--- a/src/Storages/MergeTree/MergeTreeDataWriter.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataWriter.cpp
@@ -19,6 +19,7 @@
 #include <Common/HashTable/HashMap.h>
 #include <Common/OpenTelemetryTraceContext.h>
 #include <Common/typeid_cast.h>
+#include <Core/Settings.h>
 
 #include <Parsers/queryToString.h>
 
diff --git a/src/Storages/MergeTree/MergeTreeIndexAnnoy.cpp b/src/Storages/MergeTree/MergeTreeIndexAnnoy.cpp
index e492ca0aec2..c20e31524a0 100644
--- a/src/Storages/MergeTree/MergeTreeIndexAnnoy.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexAnnoy.cpp
@@ -5,6 +5,7 @@
 #include <Columns/ColumnArray.h>
 #include <Common/typeid_cast.h>
 #include <Core/Field.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeTuple.h>
 #include <IO/ReadHelpers.h>
diff --git a/src/Storages/MergeTree/MergeTreePrefetchedReadPool.cpp b/src/Storages/MergeTree/MergeTreePrefetchedReadPool.cpp
index 2c249f7b63b..b6f626c992b 100644
--- a/src/Storages/MergeTree/MergeTreePrefetchedReadPool.cpp
+++ b/src/Storages/MergeTree/MergeTreePrefetchedReadPool.cpp
@@ -14,6 +14,7 @@
 #include <Common/ElapsedTimeProfileEventIncrement.h>
 #include <Common/logger_useful.h>
 #include <Common/FailPoint.h>
+#include <Core/Settings.h>
 
 
 namespace ProfileEvents
diff --git a/src/Storages/MergeTree/MergeTreeReadPool.cpp b/src/Storages/MergeTree/MergeTreeReadPool.cpp
index dc1ba030f45..1daf46b6e25 100644
--- a/src/Storages/MergeTree/MergeTreeReadPool.cpp
+++ b/src/Storages/MergeTree/MergeTreeReadPool.cpp
@@ -7,6 +7,7 @@
 #include <Common/Stopwatch.h>
 #include <Common/formatReadable.h>
 #include <Common/logger_useful.h>
+#include <Core/Settings.h>
 #include <Storages/MergeTree/RequestResponse.h>
 
 
@@ -335,4 +336,12 @@ void MergeTreeReadPool::fillPerThreadInfo(size_t threads, size_t sum_marks)
     }
 }
 
+MergeTreeReadPool::BackoffSettings::BackoffSettings(const DB::Settings& settings)
+    : min_read_latency_ms(settings.read_backoff_min_latency_ms.totalMilliseconds()),
+    max_throughput(settings.read_backoff_max_throughput),
+    min_interval_between_events_ms(settings.read_backoff_min_interval_between_events_ms.totalMilliseconds()),
+    min_events(settings.read_backoff_min_events),
+    min_concurrency(settings.read_backoff_min_concurrency)
+{}
+
 }
diff --git a/src/Storages/MergeTree/MergeTreeReadPool.h b/src/Storages/MergeTree/MergeTreeReadPool.h
index cb0e8a9657f..cd12b9db9fd 100644
--- a/src/Storages/MergeTree/MergeTreeReadPool.h
+++ b/src/Storages/MergeTree/MergeTreeReadPool.h
@@ -64,12 +64,7 @@ public:
         size_t min_concurrency = 1;
 
         /// Constants above is just an example.
-        explicit BackoffSettings(const Settings & settings)
-            : min_read_latency_ms(settings.read_backoff_min_latency_ms.totalMilliseconds()),
-            max_throughput(settings.read_backoff_max_throughput),
-            min_interval_between_events_ms(settings.read_backoff_min_interval_between_events_ms.totalMilliseconds()),
-            min_events(settings.read_backoff_min_events),
-            min_concurrency(settings.read_backoff_min_concurrency) {}
+        explicit BackoffSettings(const Settings & settings);
 
         BackoffSettings() : min_read_latency_ms(0) {}
     };
diff --git a/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp b/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp
index a9a5fddace4..e7b3585ecda 100644
--- a/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp
+++ b/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp
@@ -1,3 +1,4 @@
+#include <Core/Settings.h>
 #include <Storages/MergeTree/MergeTreeWhereOptimizer.h>
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <Storages/MergeTree/KeyCondition.h>
diff --git a/src/Storages/MergeTree/MergedBlockOutputStream.cpp b/src/Storages/MergeTree/MergedBlockOutputStream.cpp
index 9d696b70d9f..38869aebaa5 100644
--- a/src/Storages/MergeTree/MergedBlockOutputStream.cpp
+++ b/src/Storages/MergeTree/MergedBlockOutputStream.cpp
@@ -4,6 +4,7 @@
 #include <Interpreters/MergeTreeTransaction.h>
 #include <Parsers/queryToString.h>
 #include <Common/logger_useful.h>
+#include <Core/Settings.h>
 
 
 namespace DB
diff --git a/src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp b/src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp
index 5ae6517a236..c167ac87317 100644
--- a/src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp
+++ b/src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp
@@ -1,5 +1,6 @@
 #include <Storages/MergeTree/MergedColumnOnlyOutputStream.h>
 #include <Storages/MergeTree/MergeTreeDataPartWriterOnDisk.h>
+#include <Core/Settings.h>
 #include <Interpreters/Context.h>
 #include <IO/WriteSettings.h>
 
diff --git a/src/Storages/MergeTree/RPNBuilder.cpp b/src/Storages/MergeTree/RPNBuilder.cpp
index 4a18d606bb7..93087b0d3fe 100644
--- a/src/Storages/MergeTree/RPNBuilder.cpp
+++ b/src/Storages/MergeTree/RPNBuilder.cpp
@@ -1,6 +1,7 @@
 #include <Storages/MergeTree/RPNBuilder.h>
 
 #include <Common/FieldVisitorToString.h>
+#include <Core/Settings.h>
 
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTIdentifier.h>
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeSink.h b/src/Storages/MergeTree/ReplicatedMergeTreeSink.h
index 39623c20584..13cb98e65a1 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeSink.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeSink.h
@@ -5,6 +5,7 @@
 #include <base/types.h>
 #include <Common/ZooKeeper/ZooKeeperRetries.h>
 #include <Common/ZooKeeper/ZooKeeperWithFaultInjection.h>
+#include <Core/Settings.h>
 #include <Storages/MergeTree/AsyncBlockIDsCache.h>
 
 
diff --git a/src/Storages/MySQL/MySQLSettings.cpp b/src/Storages/MySQL/MySQLSettings.cpp
index fd53174f4f6..1c88e4a94e9 100644
--- a/src/Storages/MySQL/MySQLSettings.cpp
+++ b/src/Storages/MySQL/MySQLSettings.cpp
@@ -6,6 +6,7 @@
 #include <Interpreters/Context.h>
 #include <Parsers/formatAST.h>
 #include <Core/Field.h>
+#include <Core/Settings.h>
 
 
 namespace DB
diff --git a/src/Storages/NamedCollectionsHelpers.cpp b/src/Storages/NamedCollectionsHelpers.cpp
index ba90f21c907..8babb2bd315 100644
--- a/src/Storages/NamedCollectionsHelpers.cpp
+++ b/src/Storages/NamedCollectionsHelpers.cpp
@@ -2,6 +2,7 @@
 #include <Access/ContextAccess.h>
 #include <Common/NamedCollections/NamedCollections.h>
 #include <Common/NamedCollections/NamedCollectionsFactory.h>
+#include <Core/Settings.h>
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Storages/checkAndGetLiteralArgument.h>
 #include <Parsers/ASTIdentifier.h>
diff --git a/src/Storages/NamedCollectionsHelpers.h b/src/Storages/NamedCollectionsHelpers.h
index b4aea096c59..f444a581eb6 100644
--- a/src/Storages/NamedCollectionsHelpers.h
+++ b/src/Storages/NamedCollectionsHelpers.h
@@ -9,14 +9,14 @@
 #include <fmt/format.h>
 
 
+namespace DB
+{
+
 namespace ErrorCodes
 {
     extern const int BAD_ARGUMENTS;
 }
 
-namespace DB
-{
-
 /// Helper function to get named collection for table engine.
 /// Table engines have collection name as first argument of ast and other arguments are key-value overrides.
 MutableNamedCollectionPtr tryGetNamedCollectionWithOverrides(
diff --git a/src/Storages/ObjectStorage/Azure/Configuration.cpp b/src/Storages/ObjectStorage/Azure/Configuration.cpp
index 91cc02de0f0..f0a0a562b92 100644
--- a/src/Storages/ObjectStorage/Azure/Configuration.cpp
+++ b/src/Storages/ObjectStorage/Azure/Configuration.cpp
@@ -14,6 +14,7 @@
 #include <Interpreters/evaluateConstantExpression.h>
 #include <azure/identity/managed_identity_credential.hpp>
 #include <azure/identity/workload_identity_credential.hpp>
+#include <Core/Settings.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTFunction.h>
 
diff --git a/src/Storages/ObjectStorage/DataLakes/IcebergMetadata.cpp b/src/Storages/ObjectStorage/DataLakes/IcebergMetadata.cpp
index 0484f86542c..6d18b13df01 100644
--- a/src/Storages/ObjectStorage/DataLakes/IcebergMetadata.cpp
+++ b/src/Storages/ObjectStorage/DataLakes/IcebergMetadata.cpp
@@ -3,7 +3,7 @@
 #if USE_AWS_S3 && USE_AVRO
 
 #include <Common/logger_useful.h>
-
+#include <Core/Settings.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnTuple.h>
 #include <Columns/IColumn.h>
diff --git a/src/Storages/ObjectStorage/HDFS/Configuration.cpp b/src/Storages/ObjectStorage/HDFS/Configuration.cpp
index 155f51adf61..e8071be6f02 100644
--- a/src/Storages/ObjectStorage/HDFS/Configuration.cpp
+++ b/src/Storages/ObjectStorage/HDFS/Configuration.cpp
@@ -2,6 +2,7 @@
 
 #if USE_HDFS
 #include <Common/logger_useful.h>
+#include <Core/Settings.h>
 #include <Parsers/IAST.h>
 #include <Formats/FormatFactory.h>
 #include <Disks/ObjectStorages/HDFS/HDFSObjectStorage.h>
diff --git a/src/Storages/ObjectStorage/ReadBufferIterator.cpp b/src/Storages/ObjectStorage/ReadBufferIterator.cpp
index 78cdc442f64..d739f7a28c9 100644
--- a/src/Storages/ObjectStorage/ReadBufferIterator.cpp
+++ b/src/Storages/ObjectStorage/ReadBufferIterator.cpp
@@ -1,6 +1,7 @@
 #include <Storages/ObjectStorage/ReadBufferIterator.h>
 #include <Storages/ObjectStorage/StorageObjectStorage.h>
 #include <Storages/ObjectStorage/StorageObjectStorageSource.h>
+#include <Core/Settings.h>
 #include <IO/ReadBufferFromFileBase.h>
 
 
diff --git a/src/Storages/ObjectStorage/S3/Configuration.cpp b/src/Storages/ObjectStorage/S3/Configuration.cpp
index b33d55105e9..094ca069e7a 100644
--- a/src/Storages/ObjectStorage/S3/Configuration.cpp
+++ b/src/Storages/ObjectStorage/S3/Configuration.cpp
@@ -1,6 +1,7 @@
 #include <Storages/ObjectStorage/S3/Configuration.h>
 
 #if USE_AWS_S3
+#include <Core/Settings.h>
 #include <Storages/checkAndGetLiteralArgument.h>
 #include <Storages/NamedCollectionsHelpers.h>
 #include <Storages/StorageURL.h>
diff --git a/src/Storages/ObjectStorage/StorageObjectStorage.cpp b/src/Storages/ObjectStorage/StorageObjectStorage.cpp
index 683473006e3..fe675a17d54 100644
--- a/src/Storages/ObjectStorage/StorageObjectStorage.cpp
+++ b/src/Storages/ObjectStorage/StorageObjectStorage.cpp
@@ -1,5 +1,6 @@
 #include <Storages/ObjectStorage/StorageObjectStorage.h>
 
+#include <Core/Settings.h>
 #include <Formats/FormatFactory.h>
 #include <Parsers/ASTInsertQuery.h>
 #include <Formats/ReadSchemaUtils.h>
diff --git a/src/Storages/ObjectStorage/StorageObjectStorageSink.cpp b/src/Storages/ObjectStorage/StorageObjectStorageSink.cpp
index f2f6eac333c..000e73c70ce 100644
--- a/src/Storages/ObjectStorage/StorageObjectStorageSink.cpp
+++ b/src/Storages/ObjectStorage/StorageObjectStorageSink.cpp
@@ -2,6 +2,7 @@
 #include <Formats/FormatFactory.h>
 #include <Disks/ObjectStorages/IObjectStorage.h>
 #include <Common/isValidUTF8.h>
+#include <Core/Settings.h>
 #include <Storages/ObjectStorage/Utils.h>
 
 namespace DB
diff --git a/src/Storages/ObjectStorage/StorageObjectStorageSource.cpp b/src/Storages/ObjectStorage/StorageObjectStorageSource.cpp
index 6940f10cb91..f25eb0001b9 100644
--- a/src/Storages/ObjectStorage/StorageObjectStorageSource.cpp
+++ b/src/Storages/ObjectStorage/StorageObjectStorageSource.cpp
@@ -13,6 +13,7 @@
 #include <Storages/ObjectStorage/StorageObjectStorage.h>
 #include <Storages/Cache/SchemaCache.h>
 #include <Common/parseGlobs.h>
+#include <Core/Settings.h>
 
 namespace fs = std::filesystem;
 
diff --git a/src/Storages/ObjectStorage/registerStorageObjectStorage.cpp b/src/Storages/ObjectStorage/registerStorageObjectStorage.cpp
index bf595b2f5d4..b5f4cf5bb54 100644
--- a/src/Storages/ObjectStorage/registerStorageObjectStorage.cpp
+++ b/src/Storages/ObjectStorage/registerStorageObjectStorage.cpp
@@ -1,9 +1,10 @@
+#include <Core/Settings.h>
+#include <Formats/FormatFactory.h>
 #include <Storages/ObjectStorage/Azure/Configuration.h>
 #include <Storages/ObjectStorage/S3/Configuration.h>
 #include <Storages/ObjectStorage/HDFS/Configuration.h>
 #include <Storages/ObjectStorage/StorageObjectStorage.h>
 #include <Storages/StorageFactory.h>
-#include <Formats/FormatFactory.h>
 
 namespace DB
 {
diff --git a/src/Storages/ReadInOrderOptimizer.cpp b/src/Storages/ReadInOrderOptimizer.cpp
index e0ef967d491..9c8c4c2fe79 100644
--- a/src/Storages/ReadInOrderOptimizer.cpp
+++ b/src/Storages/ReadInOrderOptimizer.cpp
@@ -1,5 +1,6 @@
 #include <Storages/ReadInOrderOptimizer.h>
 
+#include <Core/Settings.h>
 #include <Interpreters/ExpressionActions.h>
 #include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/TreeRewriter.h>
diff --git a/src/Storages/RocksDB/EmbeddedRocksDBBulkSink.cpp b/src/Storages/RocksDB/EmbeddedRocksDBBulkSink.cpp
index 90792c59d38..b53f694bc5a 100644
--- a/src/Storages/RocksDB/EmbeddedRocksDBBulkSink.cpp
+++ b/src/Storages/RocksDB/EmbeddedRocksDBBulkSink.cpp
@@ -9,6 +9,7 @@
 
 #include <Columns/ColumnString.h>
 #include <Core/SortDescription.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeString.h>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/Context.h>
diff --git a/src/Storages/RocksDB/StorageSystemRocksDB.cpp b/src/Storages/RocksDB/StorageSystemRocksDB.cpp
index 5105b190fd9..744d43e1c77 100644
--- a/src/Storages/RocksDB/StorageSystemRocksDB.cpp
+++ b/src/Storages/RocksDB/StorageSystemRocksDB.cpp
@@ -9,6 +9,7 @@
 #include <Access/ContextAccess.h>
 #include <Common/StringUtils.h>
 #include <Common/typeid_cast.h>
+#include <Core/Settings.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/DatabaseCatalog.h>
 #include <Databases/IDatabase.h>
diff --git a/src/Storages/SetSettings.cpp b/src/Storages/SetSettings.cpp
index baa3d231067..4e6dd6a0519 100644
--- a/src/Storages/SetSettings.cpp
+++ b/src/Storages/SetSettings.cpp
@@ -3,6 +3,7 @@
 #include <Parsers/ASTSetQuery.h>
 #include <Parsers/ASTFunction.h>
 #include <Common/Exception.h>
+#include <Core/BaseSettings.h>
 
 
 namespace DB
diff --git a/src/Storages/StorageFactory.cpp b/src/Storages/StorageFactory.cpp
index 9d12a1569d8..060b271d8f4 100644
--- a/src/Storages/StorageFactory.cpp
+++ b/src/Storages/StorageFactory.cpp
@@ -4,6 +4,7 @@
 #include <Parsers/ASTCreateQuery.h>
 #include <Common/Exception.h>
 #include <Common/StringUtils.h>
+#include <Core/Settings.h>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/StorageID.h>
 
diff --git a/src/Storages/StorageGenerateRandom.cpp b/src/Storages/StorageGenerateRandom.cpp
index 754bc096958..f3eb88f3207 100644
--- a/src/Storages/StorageGenerateRandom.cpp
+++ b/src/Storages/StorageGenerateRandom.cpp
@@ -30,6 +30,7 @@
 
 #include <Common/SipHash.h>
 #include <Common/randomSeed.h>
+#include <Core/Settings.h>
 #include <Interpreters/Context.h>
 
 #include <Functions/FunctionFactory.h>
diff --git a/src/Storages/StorageInMemoryMetadata.cpp b/src/Storages/StorageInMemoryMetadata.cpp
index a5bae0acce5..2226de3e64f 100644
--- a/src/Storages/StorageInMemoryMetadata.cpp
+++ b/src/Storages/StorageInMemoryMetadata.cpp
@@ -3,6 +3,8 @@
 #include <Access/AccessControl.h>
 #include <Access/User.h>
 
+#include <Core/Settings.h>
+
 #include <Common/HashTable/HashMap.h>
 #include <Common/HashTable/HashSet.h>
 #include <Common/quoteString.h>
diff --git a/src/Storages/StorageLog.cpp b/src/Storages/StorageLog.cpp
index de0324d7998..ee0a37b50e3 100644
--- a/src/Storages/StorageLog.cpp
+++ b/src/Storages/StorageLog.cpp
@@ -4,6 +4,7 @@
 #include <Common/Exception.h>
 #include <Common/StringUtils.h>
 #include <Common/typeid_cast.h>
+#include <Core/Settings.h>
 
 #include <Interpreters/evaluateConstantExpression.h>
 
diff --git a/src/Storages/StorageMySQL.cpp b/src/Storages/StorageMySQL.cpp
index da391909dff..f2e19ad4c80 100644
--- a/src/Storages/StorageMySQL.cpp
+++ b/src/Storages/StorageMySQL.cpp
@@ -21,6 +21,7 @@
 #include <Common/parseRemoteDescription.h>
 #include <Common/quoteString.h>
 #include <Common/logger_useful.h>
+#include <Core/Settings.h>
 #include <Storages/NamedCollectionsHelpers.h>
 #include <Databases/MySQL/FetchTablesColumnsList.h>
 
diff --git a/src/Storages/StorageStripeLog.cpp b/src/Storages/StorageStripeLog.cpp
index 8df87d6290f..82de84220f1 100644
--- a/src/Storages/StorageStripeLog.cpp
+++ b/src/Storages/StorageStripeLog.cpp
@@ -7,6 +7,8 @@
 #include <Common/Exception.h>
 #include <Common/FailPoint.h>
 
+#include <Core/Settings.h>
+
 #include <IO/WriteBufferFromFileBase.h>
 #include <Compression/CompressedReadBuffer.h>
 #include <Compression/CompressedReadBufferFromFile.h>
diff --git a/src/Storages/StorageURL.cpp b/src/Storages/StorageURL.cpp
index cd1282bb02c..9cec8c75ebe 100644
--- a/src/Storages/StorageURL.cpp
+++ b/src/Storages/StorageURL.cpp
@@ -37,6 +37,7 @@
 #include <Common/logger_useful.h>
 #include <Common/re2.h>
 #include <Core/ServerSettings.h>
+#include <Core/Settings.h>
 #include <IO/ReadWriteBufferFromHTTP.h>
 #include <IO/HTTPHeaderEntries.h>
 
diff --git a/src/Storages/StorageXDBC.cpp b/src/Storages/StorageXDBC.cpp
index b1bcae0f7e9..fa23a574ade 100644
--- a/src/Storages/StorageXDBC.cpp
+++ b/src/Storages/StorageXDBC.cpp
@@ -5,6 +5,7 @@
 #include <Storages/checkAndGetLiteralArgument.h>
 
 #include <Core/ServerSettings.h>
+#include <Core/Settings.h>
 #include <Formats/FormatFactory.h>
 #include <IO/ConnectionTimeouts.h>
 #include <Interpreters/Context.h>
diff --git a/src/Storages/System/StorageSystemColumns.cpp b/src/Storages/System/StorageSystemColumns.cpp
index 8dd8d3b6154..6a7810b97f9 100644
--- a/src/Storages/System/StorageSystemColumns.cpp
+++ b/src/Storages/System/StorageSystemColumns.cpp
@@ -4,6 +4,7 @@
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnNullable.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypesDecimal.h>
diff --git a/src/Storages/System/StorageSystemDDLWorkerQueue.cpp b/src/Storages/System/StorageSystemDDLWorkerQueue.cpp
index f96b839a322..ae1a233ea81 100644
--- a/src/Storages/System/StorageSystemDDLWorkerQueue.cpp
+++ b/src/Storages/System/StorageSystemDDLWorkerQueue.cpp
@@ -9,6 +9,7 @@
 #include <Interpreters/Context.h>
 #include <Interpreters/ZooKeeperLog.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
+#include <Core/Settings.h>
 #include <Parsers/ASTQueryWithOnCluster.h>
 #include <Parsers/ParserQuery.h>
 #include <Parsers/parseQuery.h>
diff --git a/src/Storages/System/StorageSystemDetachedParts.cpp b/src/Storages/System/StorageSystemDetachedParts.cpp
index f48a8c67971..59eba9b5791 100644
--- a/src/Storages/System/StorageSystemDetachedParts.cpp
+++ b/src/Storages/System/StorageSystemDetachedParts.cpp
@@ -1,5 +1,6 @@
 #include <Storages/System/StorageSystemDetachedParts.h>
 
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeDateTime.h>
diff --git a/src/Storages/System/StorageSystemErrors.cpp b/src/Storages/System/StorageSystemErrors.cpp
index 2da268305f8..2955aebeb7e 100644
--- a/src/Storages/System/StorageSystemErrors.cpp
+++ b/src/Storages/System/StorageSystemErrors.cpp
@@ -5,6 +5,7 @@
 #include <Storages/System/StorageSystemErrors.h>
 #include <Interpreters/Context.h>
 #include <Common/ErrorCodes.h>
+#include <Core/Settings.h>
 
 
 namespace DB
diff --git a/src/Storages/System/StorageSystemEvents.cpp b/src/Storages/System/StorageSystemEvents.cpp
index 822d5c77788..f74c316e3fc 100644
--- a/src/Storages/System/StorageSystemEvents.cpp
+++ b/src/Storages/System/StorageSystemEvents.cpp
@@ -1,4 +1,5 @@
 #include <Common/ProfileEvents.h>
+#include <Core/Settings.h>
 #include <Interpreters/Context.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
diff --git a/src/Storages/System/StorageSystemMergeTreeSettings.cpp b/src/Storages/System/StorageSystemMergeTreeSettings.cpp
index db8fd55cfc5..18730010e53 100644
--- a/src/Storages/System/StorageSystemMergeTreeSettings.cpp
+++ b/src/Storages/System/StorageSystemMergeTreeSettings.cpp
@@ -1,3 +1,4 @@
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeNullable.h>
diff --git a/src/Storages/System/StorageSystemPartsBase.h b/src/Storages/System/StorageSystemPartsBase.h
index be945162b39..8671fd850f8 100644
--- a/src/Storages/System/StorageSystemPartsBase.h
+++ b/src/Storages/System/StorageSystemPartsBase.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <Core/Settings.h>
 #include <Formats/FormatSettings.h>
 #include <Storages/IStorage.h>
 #include <Storages/MergeTree/MergeTreeData.h>
diff --git a/src/Storages/System/StorageSystemRemoteDataPaths.cpp b/src/Storages/System/StorageSystemRemoteDataPaths.cpp
index a5c496db7e7..00b4824cc3d 100644
--- a/src/Storages/System/StorageSystemRemoteDataPaths.cpp
+++ b/src/Storages/System/StorageSystemRemoteDataPaths.cpp
@@ -2,6 +2,7 @@
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnsNumber.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
diff --git a/src/Storages/System/StorageSystemSettings.cpp b/src/Storages/System/StorageSystemSettings.cpp
index b437108b00e..f1e9d542fec 100644
--- a/src/Storages/System/StorageSystemSettings.cpp
+++ b/src/Storages/System/StorageSystemSettings.cpp
@@ -1,4 +1,6 @@
 #include <Storages/System/StorageSystemSettings.h>
+
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypesNumber.h>
diff --git a/src/Storages/System/StorageSystemSettingsProfileElements.cpp b/src/Storages/System/StorageSystemSettingsProfileElements.cpp
index 2af3e6dfd05..40a669351b1 100644
--- a/src/Storages/System/StorageSystemSettingsProfileElements.cpp
+++ b/src/Storages/System/StorageSystemSettingsProfileElements.cpp
@@ -6,6 +6,7 @@
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnsNumber.h>
+#include <Core/Settings.h>
 #include <Access/AccessControl.h>
 #include <Access/Role.h>
 #include <Access/User.h>
diff --git a/src/Storages/System/StorageSystemStackTrace.cpp b/src/Storages/System/StorageSystemStackTrace.cpp
index ba7433fb9ae..cc221bbea69 100644
--- a/src/Storages/System/StorageSystemStackTrace.cpp
+++ b/src/Storages/System/StorageSystemStackTrace.cpp
@@ -25,6 +25,7 @@
 #include <Common/logger_useful.h>
 #include <Common/Stopwatch.h>
 #include <Core/ColumnsWithTypeAndName.h>
+#include <Core/Settings.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/TranslateQualifiedNamesVisitor.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
diff --git a/src/Storages/System/StorageSystemUsers.cpp b/src/Storages/System/StorageSystemUsers.cpp
index 541bd852140..b4d83058c82 100644
--- a/src/Storages/System/StorageSystemUsers.cpp
+++ b/src/Storages/System/StorageSystemUsers.cpp
@@ -18,8 +18,12 @@
 #include <Poco/JSON/Object.h>
 #include <Poco/JSON/Stringifier.h>
 #include <Poco/JSONString.h>
-#include "base/types.h"
+
 #include <Access/Common/SSLCertificateSubjects.h>
+
+#include <base/types.h>
+#include <base/range.h>
+
 #include <sstream>
 
 
diff --git a/src/Storages/TTLDescription.cpp b/src/Storages/TTLDescription.cpp
index f831465277d..ac091e7cf3c 100644
--- a/src/Storages/TTLDescription.cpp
+++ b/src/Storages/TTLDescription.cpp
@@ -1,6 +1,7 @@
 #include <Storages/TTLDescription.h>
 
 #include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <Core/Settings.h>
 #include <Functions/IFunction.h>
 #include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/TreeRewriter.h>
diff --git a/src/Storages/buildQueryTreeForShard.cpp b/src/Storages/buildQueryTreeForShard.cpp
index 84ba92bba00..69e8f0a7880 100644
--- a/src/Storages/buildQueryTreeForShard.cpp
+++ b/src/Storages/buildQueryTreeForShard.cpp
@@ -10,6 +10,7 @@
 #include <Analyzer/QueryNode.h>
 #include <Analyzer/TableNode.h>
 #include <Analyzer/Utils.h>
+#include <Core/Settings.h>
 #include <Functions/FunctionFactory.h>
 #include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/InterpreterSelectQueryAnalyzer.h>
diff --git a/src/Storages/getStructureOfRemoteTable.cpp b/src/Storages/getStructureOfRemoteTable.cpp
index 6ea7bdc312d..56071abaa95 100644
--- a/src/Storages/getStructureOfRemoteTable.cpp
+++ b/src/Storages/getStructureOfRemoteTable.cpp
@@ -1,4 +1,5 @@
 #include "getStructureOfRemoteTable.h"
+#include <Core/Settings.h>
 #include <Interpreters/Cluster.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/ClusterProxy/executeQuery.h>
diff --git a/src/Storages/transformQueryForExternalDatabase.cpp b/src/Storages/transformQueryForExternalDatabase.cpp
index fc85bde11d9..f1b73e939b8 100644
--- a/src/Storages/transformQueryForExternalDatabase.cpp
+++ b/src/Storages/transformQueryForExternalDatabase.cpp
@@ -1,5 +1,6 @@
 #include <Common/typeid_cast.h>
 #include <Columns/ColumnConst.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Parsers/IAST.h>
 #include <Parsers/ASTFunction.h>
diff --git a/src/TableFunctions/ITableFunctionXDBC.cpp b/src/TableFunctions/ITableFunctionXDBC.cpp
index 043712f97b8..83d0ac4ef41 100644
--- a/src/TableFunctions/ITableFunctionXDBC.cpp
+++ b/src/TableFunctions/ITableFunctionXDBC.cpp
@@ -1,4 +1,5 @@
 #include <Core/ServerSettings.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <IO/ConnectionTimeouts.h>
 #include <IO/ReadHelpers.h>
diff --git a/src/TableFunctions/TableFunctionExplain.cpp b/src/TableFunctions/TableFunctionExplain.cpp
index df2835dd630..552b9fde986 100644
--- a/src/TableFunctions/TableFunctionExplain.cpp
+++ b/src/TableFunctions/TableFunctionExplain.cpp
@@ -1,3 +1,4 @@
+#include <Core/Settings.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTSubquery.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
diff --git a/src/TableFunctions/TableFunctionFactory.cpp b/src/TableFunctions/TableFunctionFactory.cpp
index ce3daff0785..6ecdeb47779 100644
--- a/src/TableFunctions/TableFunctionFactory.cpp
+++ b/src/TableFunctions/TableFunctionFactory.cpp
@@ -4,6 +4,7 @@
 #include <Common/CurrentThread.h>
 #include <Common/Exception.h>
 #include <Common/KnownObjectNames.h>
+#include <Core/Settings.h>
 #include <IO/WriteHelpers.h>
 #include <Parsers/ASTFunction.h>
 
diff --git a/src/TableFunctions/TableFunctionFile.cpp b/src/TableFunctions/TableFunctionFile.cpp
index 28bf72e07fb..1b6d86f8fa5 100644
--- a/src/TableFunctions/TableFunctionFile.cpp
+++ b/src/TableFunctions/TableFunctionFile.cpp
@@ -4,6 +4,7 @@
 
 #include "registerTableFunctions.h"
 #include <Access/Common/AccessFlags.h>
+#include <Core/Settings.h>
 #include <Interpreters/Context.h>
 #include <Storages/ColumnsDescription.h>
 #include <Storages/StorageFile.h>
diff --git a/src/TableFunctions/TableFunctionFileCluster.cpp b/src/TableFunctions/TableFunctionFileCluster.cpp
index 3e53349b022..514fa3143d0 100644
--- a/src/TableFunctions/TableFunctionFileCluster.cpp
+++ b/src/TableFunctions/TableFunctionFileCluster.cpp
@@ -1,3 +1,4 @@
+#include <Core/Settings.h>
 #include <Storages/StorageFile.h>
 #include <TableFunctions/TableFunctionFileCluster.h>
 #include <TableFunctions/TableFunctionFactory.h>
diff --git a/src/TableFunctions/TableFunctionFormat.cpp b/src/TableFunctions/TableFunctionFormat.cpp
index ad2a142a140..5a0f47653d5 100644
--- a/src/TableFunctions/TableFunctionFormat.cpp
+++ b/src/TableFunctions/TableFunctionFormat.cpp
@@ -1,5 +1,7 @@
 #include <Formats/ReadSchemaUtils.h>
 
+#include <Core/Settings.h>
+
 #include <IO/ReadBufferFromString.h>
 
 #include <Interpreters/Context.h>
diff --git a/src/TableFunctions/TableFunctionMySQL.cpp b/src/TableFunctions/TableFunctionMySQL.cpp
index b027cf42880..ffd318f36f7 100644
--- a/src/TableFunctions/TableFunctionMySQL.cpp
+++ b/src/TableFunctions/TableFunctionMySQL.cpp
@@ -3,6 +3,8 @@
 #if USE_MYSQL
 
 #include <Storages/StorageMySQL.h>
+
+#include <Core/Settings.h>
 #include <Processors/Sources/MySQLSource.h>
 #include <Interpreters/Context.h>
 #include <Parsers/ASTFunction.h>
diff --git a/src/TableFunctions/TableFunctionPostgreSQL.cpp b/src/TableFunctions/TableFunctionPostgreSQL.cpp
index 8d94988cd65..c6c8655b394 100644
--- a/src/TableFunctions/TableFunctionPostgreSQL.cpp
+++ b/src/TableFunctions/TableFunctionPostgreSQL.cpp
@@ -4,6 +4,7 @@
 
 #include <TableFunctions/ITableFunction.h>
 #include <Core/PostgreSQL/PoolWithFailover.h>
+#include <Core/Settings.h>
 #include <Storages/StoragePostgreSQL.h>
 #include <Parsers/ASTFunction.h>
 #include <TableFunctions/TableFunctionFactory.h>
diff --git a/src/TableFunctions/TableFunctionRemote.cpp b/src/TableFunctions/TableFunctionRemote.cpp
index d7774bb6478..e60c31b2d77 100644
--- a/src/TableFunctions/TableFunctionRemote.cpp
+++ b/src/TableFunctions/TableFunctionRemote.cpp
@@ -17,6 +17,7 @@
 #include <Common/Macros.h>
 #include <TableFunctions/TableFunctionFactory.h>
 #include <Core/Defines.h>
+#include <Core/Settings.h>
 #include <base/range.h>
 #include "registerTableFunctions.h"
 

From 56f497bf7f748bb36b187477e93195567b8fefdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= <git@rmr.ninja>
Date: Thu, 11 Jul 2024 14:09:00 +0200
Subject: [PATCH 24/51] Remove some unnecessary copies

---
 src/Dictionaries/RegExpTreeDictionary.cpp             |  6 +++---
 src/Dictionaries/XDBCDictionarySource.cpp             |  2 +-
 src/Functions/FunctionUnixTimestamp64.h               |  2 +-
 .../ExternalUserDefinedExecutableFunctionsLoader.cpp  |  2 +-
 src/Functions/formatDateTime.cpp                      |  6 +++---
 src/Functions/now.cpp                                 |  2 +-
 src/Functions/now64.cpp                               |  2 +-
 src/Functions/nowInBlock.cpp                          |  2 +-
 src/Functions/parseDateTime.cpp                       |  4 ++--
 src/Functions/snowflakeIDToDateTime.cpp               |  4 ++--
 src/Functions/toTimezone.cpp                          |  2 +-
 src/Interpreters/ActionsVisitor.cpp                   |  2 +-
 src/Interpreters/InterpreterAlterQuery.cpp            |  7 +++----
 src/Interpreters/InterpreterExplainQuery.cpp          |  2 +-
 src/Interpreters/removeOnClusterClauseIfNeeded.cpp    |  4 ++--
 src/Planner/PlannerJoins.cpp                          |  3 ++-
 .../Optimizations/optimizeUseAggregateProjection.cpp  |  9 +++++----
 .../Optimizations/optimizeUseNormalProjection.cpp     |  8 ++++----
 src/Server/GRPCServer.cpp                             |  7 +++----
 src/Storages/Hive/StorageHive.cpp                     |  4 ++--
 .../ApproximateNearestNeighborIndexesCommon.cpp       |  2 +-
 src/Storages/MergeTree/MergeTreeData.cpp              |  2 +-
 src/Storages/MergeTree/MergeTreeIndexAnnoy.cpp        |  2 +-
 src/Storages/NamedCollectionsHelpers.cpp              |  4 ++--
 .../ObjectStorage/StorageObjectStorageSource.cpp      |  2 +-
 src/Storages/StorageExecutable.cpp                    |  4 ++--
 src/Storages/StorageMergeTree.cpp                     | 11 ++++++-----
 src/Storages/StorageReplicatedMergeTree.cpp           |  2 +-
 src/Storages/StorageStripeLog.cpp                     |  2 +-
 29 files changed, 56 insertions(+), 55 deletions(-)

diff --git a/src/Dictionaries/RegExpTreeDictionary.cpp b/src/Dictionaries/RegExpTreeDictionary.cpp
index a5aa622e01d..2522de60183 100644
--- a/src/Dictionaries/RegExpTreeDictionary.cpp
+++ b/src/Dictionaries/RegExpTreeDictionary.cpp
@@ -1003,9 +1003,9 @@ void registerDictionaryRegExpTree(DictionaryFactory & factory)
             dict_struct,
             std::move(source_ptr),
             configuration,
-            context->getSettings().regexp_dict_allow_hyperscan,
-            context->getSettings().regexp_dict_flag_case_insensitive,
-            context->getSettings().regexp_dict_flag_dotall);
+            context->getSettingsRef().regexp_dict_allow_hyperscan,
+            context->getSettingsRef().regexp_dict_flag_case_insensitive,
+            context->getSettingsRef().regexp_dict_flag_dotall);
     };
 
     factory.registerLayout("regexp_tree", create_layout, true);
diff --git a/src/Dictionaries/XDBCDictionarySource.cpp b/src/Dictionaries/XDBCDictionarySource.cpp
index b84cfa109ee..590d000f16e 100644
--- a/src/Dictionaries/XDBCDictionarySource.cpp
+++ b/src/Dictionaries/XDBCDictionarySource.cpp
@@ -241,7 +241,7 @@ void registerDictionarySourceXDBC(DictionarySourceFactory & factory)
 #if USE_ODBC
         BridgeHelperPtr bridge = std::make_shared<XDBCBridgeHelper<ODBCBridgeMixin>>(
             global_context,
-            global_context->getSettings().http_receive_timeout,
+            global_context->getSettingsRef().http_receive_timeout,
             config.getString(config_prefix + ".odbc.connection_string"),
             config.getBool(config_prefix + ".settings.odbc_bridge_use_connection_pooling",
             global_context->getSettingsRef().odbc_bridge_use_connection_pooling));
diff --git a/src/Functions/FunctionUnixTimestamp64.h b/src/Functions/FunctionUnixTimestamp64.h
index 652b3fe60ec..7b8da733f6d 100644
--- a/src/Functions/FunctionUnixTimestamp64.h
+++ b/src/Functions/FunctionUnixTimestamp64.h
@@ -111,7 +111,7 @@ public:
     FunctionFromUnixTimestamp64(size_t target_scale_, const char * name_, ContextPtr context)
         : target_scale(target_scale_)
         , name(name_)
-        , allow_nonconst_timezone_arguments(context->getSettings().allow_nonconst_timezone_arguments)
+        , allow_nonconst_timezone_arguments(context->getSettingsRef().allow_nonconst_timezone_arguments)
     {}
 
     String getName() const override { return name; }
diff --git a/src/Functions/UserDefined/ExternalUserDefinedExecutableFunctionsLoader.cpp b/src/Functions/UserDefined/ExternalUserDefinedExecutableFunctionsLoader.cpp
index 4a5ff19763e..a20e1807487 100644
--- a/src/Functions/UserDefined/ExternalUserDefinedExecutableFunctionsLoader.cpp
+++ b/src/Functions/UserDefined/ExternalUserDefinedExecutableFunctionsLoader.cpp
@@ -185,7 +185,7 @@ ExternalLoader::LoadableMutablePtr ExternalUserDefinedExecutableFunctionsLoader:
         pool_size = config.getUInt64(key_in_config + ".pool_size", 16);
         max_command_execution_time = config.getUInt64(key_in_config + ".max_command_execution_time", 10);
 
-        size_t max_execution_time_seconds = static_cast<size_t>(getContext()->getSettings().max_execution_time.totalSeconds());
+        size_t max_execution_time_seconds = static_cast<size_t>(getContext()->getSettingsRef().max_execution_time.totalSeconds());
         if (max_execution_time_seconds != 0 && max_command_execution_time > max_execution_time_seconds)
             max_command_execution_time = max_execution_time_seconds;
     }
diff --git a/src/Functions/formatDateTime.cpp b/src/Functions/formatDateTime.cpp
index 64b9d4d8c71..c3a5fe036c3 100644
--- a/src/Functions/formatDateTime.cpp
+++ b/src/Functions/formatDateTime.cpp
@@ -783,9 +783,9 @@ public:
     static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionFormatDateTimeImpl>(context); }
 
     explicit FunctionFormatDateTimeImpl(ContextPtr context)
-        : mysql_M_is_month_name(context->getSettings().formatdatetime_parsedatetime_m_is_month_name)
-        , mysql_f_prints_single_zero(context->getSettings().formatdatetime_f_prints_single_zero)
-        , mysql_format_ckl_without_leading_zeros(context->getSettings().formatdatetime_format_without_leading_zeros)
+        : mysql_M_is_month_name(context->getSettingsRef().formatdatetime_parsedatetime_m_is_month_name)
+        , mysql_f_prints_single_zero(context->getSettingsRef().formatdatetime_f_prints_single_zero)
+        , mysql_format_ckl_without_leading_zeros(context->getSettingsRef().formatdatetime_format_without_leading_zeros)
     {
     }
 
diff --git a/src/Functions/now.cpp b/src/Functions/now.cpp
index 4e3f7be4f7e..352c05f8f32 100644
--- a/src/Functions/now.cpp
+++ b/src/Functions/now.cpp
@@ -91,7 +91,7 @@ public:
     size_t getNumberOfArguments() const override { return 0; }
     static FunctionOverloadResolverPtr create(ContextPtr context) { return std::make_unique<NowOverloadResolver>(context); }
     explicit NowOverloadResolver(ContextPtr context)
-        : allow_nonconst_timezone_arguments(context->getSettings().allow_nonconst_timezone_arguments)
+        : allow_nonconst_timezone_arguments(context->getSettingsRef().allow_nonconst_timezone_arguments)
     {}
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
diff --git a/src/Functions/now64.cpp b/src/Functions/now64.cpp
index 988694708cc..23ab8cad003 100644
--- a/src/Functions/now64.cpp
+++ b/src/Functions/now64.cpp
@@ -119,7 +119,7 @@ public:
     size_t getNumberOfArguments() const override { return 0; }
     static FunctionOverloadResolverPtr create(ContextPtr context) { return std::make_unique<Now64OverloadResolver>(context); }
     explicit Now64OverloadResolver(ContextPtr context)
-        : allow_nonconst_timezone_arguments(context->getSettings().allow_nonconst_timezone_arguments)
+        : allow_nonconst_timezone_arguments(context->getSettingsRef().allow_nonconst_timezone_arguments)
     {}
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
diff --git a/src/Functions/nowInBlock.cpp b/src/Functions/nowInBlock.cpp
index b79653f501c..291e43bdce5 100644
--- a/src/Functions/nowInBlock.cpp
+++ b/src/Functions/nowInBlock.cpp
@@ -32,7 +32,7 @@ public:
         return std::make_shared<FunctionNowInBlock>(context);
     }
     explicit FunctionNowInBlock(ContextPtr context)
-        : allow_nonconst_timezone_arguments(context->getSettings().allow_nonconst_timezone_arguments)
+        : allow_nonconst_timezone_arguments(context->getSettingsRef().allow_nonconst_timezone_arguments)
     {}
 
     String getName() const override
diff --git a/src/Functions/parseDateTime.cpp b/src/Functions/parseDateTime.cpp
index 2bd8d370ed6..d2353c19a61 100644
--- a/src/Functions/parseDateTime.cpp
+++ b/src/Functions/parseDateTime.cpp
@@ -565,8 +565,8 @@ namespace
         static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionParseDateTimeImpl>(context); }
 
         explicit FunctionParseDateTimeImpl(ContextPtr context)
-            : mysql_M_is_month_name(context->getSettings().formatdatetime_parsedatetime_m_is_month_name)
-            , mysql_parse_ckl_without_leading_zeros(context->getSettings().parsedatetime_parse_without_leading_zeros)
+            : mysql_M_is_month_name(context->getSettingsRef().formatdatetime_parsedatetime_m_is_month_name)
+            , mysql_parse_ckl_without_leading_zeros(context->getSettingsRef().parsedatetime_parse_without_leading_zeros)
         {
         }
 
diff --git a/src/Functions/snowflakeIDToDateTime.cpp b/src/Functions/snowflakeIDToDateTime.cpp
index bd805a2e607..6c57c72fff1 100644
--- a/src/Functions/snowflakeIDToDateTime.cpp
+++ b/src/Functions/snowflakeIDToDateTime.cpp
@@ -39,7 +39,7 @@ public:
 
     static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionSnowflakeIDToDateTime>(context); }
     explicit FunctionSnowflakeIDToDateTime(ContextPtr context)
-        : allow_nonconst_timezone_arguments(context->getSettings().allow_nonconst_timezone_arguments)
+        : allow_nonconst_timezone_arguments(context->getSettingsRef().allow_nonconst_timezone_arguments)
     {}
 
     String getName() const override { return name; }
@@ -110,7 +110,7 @@ public:
 
     static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionSnowflakeIDToDateTime64>(context); }
     explicit FunctionSnowflakeIDToDateTime64(ContextPtr context)
-        : allow_nonconst_timezone_arguments(context->getSettings().allow_nonconst_timezone_arguments)
+        : allow_nonconst_timezone_arguments(context->getSettingsRef().allow_nonconst_timezone_arguments)
     {}
 
     String getName() const override { return name; }
diff --git a/src/Functions/toTimezone.cpp b/src/Functions/toTimezone.cpp
index be839f1acb3..cbcdf9bc772 100644
--- a/src/Functions/toTimezone.cpp
+++ b/src/Functions/toTimezone.cpp
@@ -89,7 +89,7 @@ public:
     size_t getNumberOfArguments() const override { return 2; }
     static FunctionOverloadResolverPtr create(ContextPtr context) { return std::make_unique<ToTimeZoneOverloadResolver>(context); }
     explicit ToTimeZoneOverloadResolver(ContextPtr context)
-        : allow_nonconst_timezone_arguments(context->getSettings().allow_nonconst_timezone_arguments)
+        : allow_nonconst_timezone_arguments(context->getSettingsRef().allow_nonconst_timezone_arguments)
     {}
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
diff --git a/src/Interpreters/ActionsVisitor.cpp b/src/Interpreters/ActionsVisitor.cpp
index c3285d73145..74d83590ec9 100644
--- a/src/Interpreters/ActionsVisitor.cpp
+++ b/src/Interpreters/ActionsVisitor.cpp
@@ -446,7 +446,7 @@ FutureSetPtr makeExplicitSet(
     else
         block = createBlockForSet(left_arg_type, right_arg, set_element_types, context);
 
-    return prepared_sets.addFromTuple(set_key, block, context->getSettings());
+    return prepared_sets.addFromTuple(set_key, block, context->getSettingsRef());
 }
 
 class ScopeStack::Index
diff --git a/src/Interpreters/InterpreterAlterQuery.cpp b/src/Interpreters/InterpreterAlterQuery.cpp
index c70a3397f4e..a7a524ef836 100644
--- a/src/Interpreters/InterpreterAlterQuery.cpp
+++ b/src/Interpreters/InterpreterAlterQuery.cpp
@@ -175,10 +175,9 @@ BlockIO InterpreterAlterQuery::executeToTable(const ASTAlterQuery & alter)
         else
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Wrong parameter type in ALTER query");
 
-        if (!getContext()->getSettings().allow_experimental_statistics && (
-            command_ast->type == ASTAlterCommand::ADD_STATISTICS ||
-            command_ast->type == ASTAlterCommand::DROP_STATISTICS ||
-            command_ast->type == ASTAlterCommand::MATERIALIZE_STATISTICS))
+        if (!getContext()->getSettingsRef().allow_experimental_statistics
+            && (command_ast->type == ASTAlterCommand::ADD_STATISTICS || command_ast->type == ASTAlterCommand::DROP_STATISTICS
+                || command_ast->type == ASTAlterCommand::MATERIALIZE_STATISTICS))
             throw Exception(ErrorCodes::INCORRECT_QUERY, "Alter table with statistics is now disabled. Turn on allow_experimental_statistics");
     }
 
diff --git a/src/Interpreters/InterpreterExplainQuery.cpp b/src/Interpreters/InterpreterExplainQuery.cpp
index 7c7b4b3f95a..6ec5937f287 100644
--- a/src/Interpreters/InterpreterExplainQuery.cpp
+++ b/src/Interpreters/InterpreterExplainQuery.cpp
@@ -69,7 +69,7 @@ namespace
         static void visit(ASTSelectQuery & select, ASTPtr & node, Data & data)
         {
             /// we need to read statistic when `allow_statistics_optimize` is enabled.
-            bool only_analyze = !data.getContext()->getSettings().allow_statistics_optimize;
+            bool only_analyze = !data.getContext()->getSettingsRef().allow_statistics_optimize;
             InterpreterSelectQuery interpreter(
                 node, data.getContext(), SelectQueryOptions(QueryProcessingStage::FetchColumns).analyze(only_analyze).modify());
 
diff --git a/src/Interpreters/removeOnClusterClauseIfNeeded.cpp b/src/Interpreters/removeOnClusterClauseIfNeeded.cpp
index c23c600f95a..948f5944590 100644
--- a/src/Interpreters/removeOnClusterClauseIfNeeded.cpp
+++ b/src/Interpreters/removeOnClusterClauseIfNeeded.cpp
@@ -47,10 +47,10 @@ ASTPtr removeOnClusterClauseIfNeeded(const ASTPtr & query, ContextPtr context, c
         return query;
 
     if ((isUserDefinedFunctionQuery(query)
-         && context->getSettings().ignore_on_cluster_for_replicated_udf_queries
+         && context->getSettingsRef().ignore_on_cluster_for_replicated_udf_queries
          && context->getUserDefinedSQLObjectsStorage().isReplicated())
         || (isAccessControlQuery(query)
-            && context->getSettings().ignore_on_cluster_for_replicated_access_entities_queries
+            && context->getSettingsRef().ignore_on_cluster_for_replicated_access_entities_queries
             && context->getAccessControl().containsStorage(ReplicatedAccessStorage::STORAGE_TYPE)))
     {
         LOG_DEBUG(getLogger("removeOnClusterClauseIfNeeded"), "ON CLUSTER clause was ignored for query {}", query->getID());
diff --git a/src/Planner/PlannerJoins.cpp b/src/Planner/PlannerJoins.cpp
index ba8af7a7f13..70ccc64e098 100644
--- a/src/Planner/PlannerJoins.cpp
+++ b/src/Planner/PlannerJoins.cpp
@@ -807,7 +807,8 @@ static std::shared_ptr<IJoin> tryCreateJoin(JoinAlgorithm algorithm,
         auto query_context = planner_context->getQueryContext();
 
         if (table_join->allowParallelHashJoin())
-            return std::make_shared<ConcurrentHashJoin>(query_context, table_join, query_context->getSettings().max_threads, right_table_expression_header);
+            return std::make_shared<ConcurrentHashJoin>(
+                query_context, table_join, query_context->getSettingsRef().max_threads, right_table_expression_header);
 
         return std::make_shared<HashJoin>(table_join, right_table_expression_header, query_context->getSettingsRef().join_any_take_last_row);
     }
diff --git a/src/Processors/QueryPlan/Optimizations/optimizeUseAggregateProjection.cpp b/src/Processors/QueryPlan/Optimizations/optimizeUseAggregateProjection.cpp
index 70327bc95b4..f6052846aec 100644
--- a/src/Processors/QueryPlan/Optimizations/optimizeUseAggregateProjection.cpp
+++ b/src/Processors/QueryPlan/Optimizations/optimizeUseAggregateProjection.cpp
@@ -515,10 +515,11 @@ AggregateProjectionCandidates getAggregateProjectionCandidates(
 
     if (!candidates.minmax_projection)
     {
-        auto it = std::find_if(agg_projections.begin(), agg_projections.end(), [&](const auto * projection)
-        {
-            return projection->name == context->getSettings().preferred_optimize_projection_name.value;
-        });
+        auto it = std::find_if(
+            agg_projections.begin(),
+            agg_projections.end(),
+            [&](const auto * projection)
+            { return projection->name == context->getSettingsRef().preferred_optimize_projection_name.value; });
 
         if (it != agg_projections.end())
         {
diff --git a/src/Processors/QueryPlan/Optimizations/optimizeUseNormalProjection.cpp b/src/Processors/QueryPlan/Optimizations/optimizeUseNormalProjection.cpp
index 44c1bf0f7d5..291800c2c86 100644
--- a/src/Processors/QueryPlan/Optimizations/optimizeUseNormalProjection.cpp
+++ b/src/Processors/QueryPlan/Optimizations/optimizeUseNormalProjection.cpp
@@ -112,10 +112,10 @@ std::optional<String> optimizeUseNormalProjections(Stack & stack, QueryPlan::Nod
         return {};
 
     ContextPtr context = reading->getContext();
-    auto it = std::find_if(normal_projections.begin(), normal_projections.end(), [&](const auto * projection)
-    {
-        return projection->name == context->getSettings().preferred_optimize_projection_name.value;
-    });
+    auto it = std::find_if(
+        normal_projections.begin(),
+        normal_projections.end(),
+        [&](const auto * projection) { return projection->name == context->getSettingsRef().preferred_optimize_projection_name.value; });
 
     if (it != normal_projections.end())
     {
diff --git a/src/Server/GRPCServer.cpp b/src/Server/GRPCServer.cpp
index 4546de1ccae..d8a4d7f0e1f 100644
--- a/src/Server/GRPCServer.cpp
+++ b/src/Server/GRPCServer.cpp
@@ -1083,8 +1083,8 @@ namespace
         read_buffer = wrapReadBufferWithCompressionMethod(std::move(read_buffer), input_compression_method);
 
         assert(!pipeline);
-        auto source = query_context->getInputFormat(
-            input_format, *read_buffer, header, query_context->getSettings().max_insert_block_size);
+        auto source
+            = query_context->getInputFormat(input_format, *read_buffer, header, query_context->getSettingsRef().max_insert_block_size);
 
         pipeline = std::make_unique<QueryPipeline>(std::move(source));
         pipeline_executor = std::make_unique<PullingPipelineExecutor>(*pipeline);
@@ -1152,8 +1152,7 @@ namespace
                         external_table_context->applySettingsChanges(settings_changes);
                     }
                     auto in = external_table_context->getInputFormat(
-                        format, *buf, metadata_snapshot->getSampleBlock(),
-                        external_table_context->getSettings().max_insert_block_size);
+                        format, *buf, metadata_snapshot->getSampleBlock(), external_table_context->getSettingsRef().max_insert_block_size);
 
                     QueryPipelineBuilder cur_pipeline;
                     cur_pipeline.init(Pipe(std::move(in)));
diff --git a/src/Storages/Hive/StorageHive.cpp b/src/Storages/Hive/StorageHive.cpp
index 28d8128e052..9063437c065 100644
--- a/src/Storages/Hive/StorageHive.cpp
+++ b/src/Storages/Hive/StorageHive.cpp
@@ -321,7 +321,7 @@ public:
 
     Chunk generateChunkFromMetadata()
     {
-        size_t num_rows = std::min(current_file_remained_rows, UInt64(getContext()->getSettings().max_block_size));
+        size_t num_rows = std::min(current_file_remained_rows, UInt64(getContext()->getSettingsRef().max_block_size));
         current_file_remained_rows -= num_rows;
 
         Block source_block;
@@ -964,7 +964,7 @@ HiveFiles StorageHive::collectHiveFiles(
     /// Hive files to collect
     HiveFiles hive_files;
     Int64 hit_parttions_num = 0;
-    Int64 hive_max_query_partitions = context_->getSettings().max_partitions_to_read;
+    Int64 hive_max_query_partitions = context_->getSettingsRef().max_partitions_to_read;
     /// Mutext to protect hive_files, which maybe appended in multiple threads
     std::mutex hive_files_mutex;
     ThreadPool pool{CurrentMetrics::StorageHiveThreads, CurrentMetrics::StorageHiveThreadsActive, CurrentMetrics::StorageHiveThreadsScheduled, max_threads};
diff --git a/src/Storages/MergeTree/ApproximateNearestNeighborIndexesCommon.cpp b/src/Storages/MergeTree/ApproximateNearestNeighborIndexesCommon.cpp
index dfd742c9cdd..7354243732c 100644
--- a/src/Storages/MergeTree/ApproximateNearestNeighborIndexesCommon.cpp
+++ b/src/Storages/MergeTree/ApproximateNearestNeighborIndexesCommon.cpp
@@ -55,7 +55,7 @@ ApproximateNearestNeighborInformation::Metric stringToMetric(std::string_view me
 ApproximateNearestNeighborCondition::ApproximateNearestNeighborCondition(const SelectQueryInfo & query_info, ContextPtr context)
     : block_with_constants(KeyCondition::getBlockWithConstants(query_info.query, query_info.syntax_analyzer_result, context))
     , index_granularity(context->getMergeTreeSettings().index_granularity)
-    , max_limit_for_ann_queries(context->getSettings().max_limit_for_ann_queries)
+    , max_limit_for_ann_queries(context->getSettingsRef().max_limit_for_ann_queries)
     , index_is_useful(checkQueryStructure(query_info))
 {}
 
diff --git a/src/Storages/MergeTree/MergeTreeData.cpp b/src/Storages/MergeTree/MergeTreeData.cpp
index 59a4032f235..c1551668262 100644
--- a/src/Storages/MergeTree/MergeTreeData.cpp
+++ b/src/Storages/MergeTree/MergeTreeData.cpp
@@ -474,7 +474,7 @@ StoragePolicyPtr MergeTreeData::getStoragePolicy() const
 ConditionSelectivityEstimator MergeTreeData::getConditionSelectivityEstimatorByPredicate(
     const StorageSnapshotPtr & storage_snapshot, const ActionsDAGPtr & filter_dag, ContextPtr local_context) const
 {
-    if (!local_context->getSettings().allow_statistics_optimize)
+    if (!local_context->getSettingsRef().allow_statistics_optimize)
         return {};
 
     const auto & parts = assert_cast<const MergeTreeData::SnapshotData &>(*storage_snapshot->data).parts;
diff --git a/src/Storages/MergeTree/MergeTreeIndexAnnoy.cpp b/src/Storages/MergeTree/MergeTreeIndexAnnoy.cpp
index c20e31524a0..c66aa2373e7 100644
--- a/src/Storages/MergeTree/MergeTreeIndexAnnoy.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexAnnoy.cpp
@@ -231,7 +231,7 @@ MergeTreeIndexConditionAnnoy::MergeTreeIndexConditionAnnoy(
     ContextPtr context)
     : ann_condition(query, context)
     , distance_function(distance_function_)
-    , search_k(context->getSettings().annoy_index_search_k_nodes)
+    , search_k(context->getSettingsRef().annoy_index_search_k_nodes)
 {}
 
 bool MergeTreeIndexConditionAnnoy::mayBeTrueOnGranule(MergeTreeIndexGranulePtr /*idx_granule*/) const
diff --git a/src/Storages/NamedCollectionsHelpers.cpp b/src/Storages/NamedCollectionsHelpers.cpp
index 8babb2bd315..b58aed573ae 100644
--- a/src/Storages/NamedCollectionsHelpers.cpp
+++ b/src/Storages/NamedCollectionsHelpers.cpp
@@ -118,7 +118,7 @@ MutableNamedCollectionPtr tryGetNamedCollectionWithOverrides(
     if (asts.size() == 1)
         return collection_copy;
 
-    const auto allow_override_by_default = context->getSettings().allow_named_collection_override_by_default;
+    const auto allow_override_by_default = context->getSettingsRef().allow_named_collection_override_by_default;
 
     for (auto * it = std::next(asts.begin()); it != asts.end(); ++it)
     {
@@ -163,7 +163,7 @@ MutableNamedCollectionPtr tryGetNamedCollectionWithOverrides(
 
     Poco::Util::AbstractConfiguration::Keys keys;
     config.keys(config_prefix, keys);
-    const auto allow_override_by_default = context->getSettings().allow_named_collection_override_by_default;
+    const auto allow_override_by_default = context->getSettingsRef().allow_named_collection_override_by_default;
     for (const auto & key : keys)
     {
         if (collection_copy->isOverridable(key, allow_override_by_default))
diff --git a/src/Storages/ObjectStorage/StorageObjectStorageSource.cpp b/src/Storages/ObjectStorage/StorageObjectStorageSource.cpp
index f25eb0001b9..2ba9afe88d5 100644
--- a/src/Storages/ObjectStorage/StorageObjectStorageSource.cpp
+++ b/src/Storages/ObjectStorage/StorageObjectStorageSource.cpp
@@ -420,7 +420,7 @@ std::unique_ptr<ReadBuffer> StorageObjectStorageSource::createReadBuffer(
     /// FIXME: Changing this setting to default value breaks something around parquet reading
     read_settings.remote_read_min_bytes_for_seek = read_settings.remote_fs_buffer_size;
 
-    const bool object_too_small = object_size <= 2 * context_->getSettings().max_download_buffer_size;
+    const bool object_too_small = object_size <= 2 * context_->getSettingsRef().max_download_buffer_size;
     const bool use_prefetch = object_too_small && read_settings.remote_fs_method == RemoteFSReadMethod::threadpool;
     read_settings.remote_fs_method = use_prefetch ? RemoteFSReadMethod::threadpool : RemoteFSReadMethod::read;
     /// User's object may change, don't cache it.
diff --git a/src/Storages/StorageExecutable.cpp b/src/Storages/StorageExecutable.cpp
index e475211deb3..66beb403086 100644
--- a/src/Storages/StorageExecutable.cpp
+++ b/src/Storages/StorageExecutable.cpp
@@ -147,7 +147,7 @@ void StorageExecutable::read(
     for (auto & input_query : input_queries)
     {
         QueryPipelineBuilder builder;
-        if (context->getSettings().allow_experimental_analyzer)
+        if (context->getSettingsRef().allow_experimental_analyzer)
             builder = InterpreterSelectQueryAnalyzer(input_query, context, {}).buildQueryPipeline();
         else
             builder = InterpreterSelectWithUnionQuery(input_query, context, {}).buildQueryPipeline();
@@ -225,7 +225,7 @@ void registerStorageExecutable(StorageFactory & factory)
         {
             size_t max_command_execution_time = 10;
 
-            size_t max_execution_time_seconds = static_cast<size_t>(args.getContext()->getSettings().max_execution_time.totalSeconds());
+            size_t max_execution_time_seconds = static_cast<size_t>(args.getContext()->getSettingsRef().max_execution_time.totalSeconds());
             if (max_execution_time_seconds != 0 && max_command_execution_time > max_execution_time_seconds)
                 max_command_execution_time = max_execution_time_seconds;
 
diff --git a/src/Storages/StorageMergeTree.cpp b/src/Storages/StorageMergeTree.cpp
index 65afd9c3230..a27e14abe67 100644
--- a/src/Storages/StorageMergeTree.cpp
+++ b/src/Storages/StorageMergeTree.cpp
@@ -657,12 +657,13 @@ void StorageMergeTree::mutate(const MutationCommands & commands, ContextPtr quer
     {
         /// It's important to serialize order of mutations with alter queries because
         /// they can depend on each other.
-        if (auto alter_lock = tryLockForAlter(query_context->getSettings().lock_acquire_timeout); alter_lock == std::nullopt)
+        if (auto alter_lock = tryLockForAlter(query_context->getSettingsRef().lock_acquire_timeout); alter_lock == std::nullopt)
         {
-            throw Exception(ErrorCodes::TIMEOUT_EXCEEDED,
-                            "Cannot start mutation in {}ms because some metadata-changing ALTER (MODIFY|RENAME|ADD|DROP) is currently executing. "
-                            "You can change this timeout with `lock_acquire_timeout` setting",
-                            query_context->getSettings().lock_acquire_timeout.totalMilliseconds());
+            throw Exception(
+                ErrorCodes::TIMEOUT_EXCEEDED,
+                "Cannot start mutation in {}ms because some metadata-changing ALTER (MODIFY|RENAME|ADD|DROP) is currently executing. "
+                "You can change this timeout with `lock_acquire_timeout` setting",
+                query_context->getSettingsRef().lock_acquire_timeout.totalMilliseconds());
         }
         version = startMutation(commands, query_context);
     }
diff --git a/src/Storages/StorageReplicatedMergeTree.cpp b/src/Storages/StorageReplicatedMergeTree.cpp
index dffc5f08aa2..a73b80e142f 100644
--- a/src/Storages/StorageReplicatedMergeTree.cpp
+++ b/src/Storages/StorageReplicatedMergeTree.cpp
@@ -7349,7 +7349,7 @@ void StorageReplicatedMergeTree::fetchPartition(
         if (try_no)
             LOG_INFO(log, "Some of parts ({}) are missing. Will try to fetch covering parts.", missing_parts.size());
 
-        if (try_no >= query_context->getSettings().max_fetch_partition_retries_count)
+        if (try_no >= query_context->getSettingsRef().max_fetch_partition_retries_count)
             throw Exception(ErrorCodes::TOO_MANY_RETRIES_TO_FETCH_PARTS,
                 "Too many retries to fetch parts from {}:{}", from_zookeeper_name, best_replica_path);
 
diff --git a/src/Storages/StorageStripeLog.cpp b/src/Storages/StorageStripeLog.cpp
index 82de84220f1..b50a92ecb80 100644
--- a/src/Storages/StorageStripeLog.cpp
+++ b/src/Storages/StorageStripeLog.cpp
@@ -291,7 +291,7 @@ StorageStripeLog::StorageStripeLog(
     , data_file_path(table_path + "data.bin")
     , index_file_path(table_path + "index.mrk")
     , file_checker(disk, table_path + "sizes.json")
-    , max_compress_block_size(context_->getSettings().max_compress_block_size)
+    , max_compress_block_size(context_->getSettingsRef().max_compress_block_size)
     , log(getLogger("StorageStripeLog"))
 {
     StorageInMemoryMetadata storage_metadata;

From e0486436d811d7c309bf99e70acbc34968e369a5 Mon Sep 17 00:00:00 2001
From: maxvostrikov <max.vostrikov@clickhouse.com>
Date: Thu, 11 Jul 2024 16:12:48 +0200
Subject: [PATCH 25/51] added a stateless test to check if an analyser bug
 described in https://github.com/ClickHouse/ClickHouse/issues/66333 is still
 happening

---
 ...re_2_conditions_old_analyzer_bug.reference |  4 ++
 ...nd_where_2_conditions_old_analyzer_bug.sql | 42 +++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 tests/queries/0_stateless/03203_multiif_and_where_2_conditions_old_analyzer_bug.reference
 create mode 100644 tests/queries/0_stateless/03203_multiif_and_where_2_conditions_old_analyzer_bug.sql

diff --git a/tests/queries/0_stateless/03203_multiif_and_where_2_conditions_old_analyzer_bug.reference b/tests/queries/0_stateless/03203_multiif_and_where_2_conditions_old_analyzer_bug.reference
new file mode 100644
index 00000000000..38f7434e427
--- /dev/null
+++ b/tests/queries/0_stateless/03203_multiif_and_where_2_conditions_old_analyzer_bug.reference
@@ -0,0 +1,4 @@
+this query used to be broken in old analyser:
+c1	c2	yes	true	1
+this query worked:
+c1	c2	yes	true	1
diff --git a/tests/queries/0_stateless/03203_multiif_and_where_2_conditions_old_analyzer_bug.sql b/tests/queries/0_stateless/03203_multiif_and_where_2_conditions_old_analyzer_bug.sql
new file mode 100644
index 00000000000..8c82c5c3b53
--- /dev/null
+++ b/tests/queries/0_stateless/03203_multiif_and_where_2_conditions_old_analyzer_bug.sql
@@ -0,0 +1,42 @@
+CREATE OR REPLACE TABLE bugcheck1
+ENGINE = MergeTree
+ORDER BY tuple()
+AS SELECT
+    'c1' as column_a,
+    'c2' as column_b;
+
+select 'this query used to be broken in old analyser:';
+SELECT
+    *,
+      multiIf(column_b IN (
+        SELECT 'c2' as someproduct
+    ), 'yes', 'no') AS condition_1,
+    multiIf(column_b  = 'c2', 'true', 'false') AS condition_2,
+  --condition in WHERE is true
+  (condition_1 IN ('yes')) AND (condition_2 in ('true')) as cond
+FROM
+(
+    SELECT column_a, column_b
+    FROM bugcheck1
+)
+WHERE (condition_1 IN ('yes')) AND (condition_2 in ('true'))
+settings allow_experimental_analyzer=0;
+
+select 'this query worked:';
+SELECT
+    *,
+      multiIf(column_b IN (
+        SELECT 'c2' as someproduct
+    ), 'yes', 'no') AS condition_1,
+    multiIf(column_b  = 'c2', 'true', 'false') AS condition_2,
+  --condition in WHERE is true
+  (condition_1 IN ('yes')) AND (condition_2 in ('true')) as cond
+FROM
+(
+    SELECT column_a, column_b
+    FROM bugcheck1
+)
+--the next line is the only difference:
+-- WHERE (condition_1 IN ('yes')) AND (condition_2 in ('true'))
+WHERE (condition_2 in ('true'))
+settings allow_experimental_analyzer=0;

From a41bbc5b3d1aa7fe40ce19f783f7c82237043fc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= <git@rmr.ninja>
Date: Thu, 11 Jul 2024 17:33:14 +0200
Subject: [PATCH 26/51] Less indirect dependencies on Settings.h

---
 .../FunctionGenerateRandomStructure.cpp       |  6 ++++++
 .../FunctionGenerateRandomStructure.h         |  6 +-----
 src/Functions/FunctionUnixTimestamp64.cpp     | 13 +++++++++++++
 src/Functions/FunctionUnixTimestamp64.h       |  7 +------
 src/Functions/tuple.cpp                       |  7 +++++++
 src/Functions/tuple.h                         |  7 +------
 src/Interpreters/ActionsVisitor.cpp           |  1 +
 .../ClusterProxy/SelectStreamFactory.cpp      |  1 +
 src/Interpreters/DDLWorker.cpp                |  1 +
 .../ExecuteScalarSubqueriesVisitor.cpp        |  1 +
 src/Interpreters/GlobalSubqueriesVisitor.h    |  1 +
 .../IInterpreterUnionOrSelectQuery.cpp        | 19 +++++++++++++++++++
 .../IInterpreterUnionOrSelectQuery.h          | 18 +-----------------
 src/Interpreters/InterpreterAlterQuery.cpp    |  3 ++-
 src/Interpreters/InterpreterCreateQuery.cpp   |  3 ++-
 src/Interpreters/InterpreterDeleteQuery.cpp   |  1 +
 src/Interpreters/InterpreterDescribeQuery.cpp |  1 +
 src/Interpreters/InterpreterExplainQuery.cpp  |  1 +
 src/Interpreters/InterpreterFactory.cpp       |  1 +
 src/Interpreters/InterpreterInsertQuery.cpp   |  1 +
 .../InterpreterSelectIntersectExceptQuery.cpp |  1 +
 src/Interpreters/InterpreterSelectQuery.cpp   |  1 +
 .../InterpreterSelectWithUnionQuery.cpp       |  1 +
 src/Interpreters/JoinedTables.cpp             |  1 +
 src/Interpreters/MutationsInterpreter.cpp     |  1 +
 src/Interpreters/PreparedSets.cpp             |  1 +
 .../getHeaderForProcessingStage.cpp           |  1 +
 src/Interpreters/interpretSubquery.cpp        |  1 +
 .../QueryPlan/DistributedCreateLocalPlan.cpp  |  1 +
 .../Optimizations/optimizeReadInOrder.cpp     |  3 ++-
 .../optimizeUseAggregateProjection.cpp        |  1 +
 .../Optimizations/projectionsCommon.cpp       |  1 +
 .../QueryPlan/ReadFromMergeTree.cpp           |  1 +
 .../QueryPlan/ReadFromStreamLikeEngine.cpp    |  1 +
 .../QueryPlan/ReadFromSystemNumbersStep.cpp   |  1 +
 .../Transforms/buildPushingToViewsChain.cpp   |  1 +
 src/Storages/AlterCommands.cpp                |  1 +
 src/Storages/IStorage.cpp                     |  1 +
 src/Storages/IStorageCluster.cpp              |  1 +
 src/Storages/LiveView/StorageLiveView.cpp     |  1 +
 src/Storages/MergeTree/MergeTask.cpp          |  1 +
 src/Storages/MergeTree/MergeTreeData.cpp      |  1 +
 .../MergeTree/MergeTreeDataSelectExecutor.cpp |  1 +
 src/Storages/MergeTree/MergeTreeSink.cpp      |  1 +
 .../MergeTree/MutatePlainMergeTreeTask.cpp    |  1 +
 src/Storages/MergeTree/MutateTask.cpp         |  1 +
 .../MergeTree/ReplicatedMergeTreeSink.cpp     | 11 +++++++++++
 .../MergeTree/ReplicatedMergeTreeSink.h       | 10 +---------
 .../MergeTree/registerStorageMergeTree.cpp    |  1 +
 .../ReadFinalForExternalReplicaStorage.cpp    |  1 +
 .../RocksDB/StorageEmbeddedRocksDB.cpp        |  1 +
 src/Storages/StorageBuffer.cpp                |  1 +
 src/Storages/StorageExecutable.cpp            |  1 +
 src/Storages/StorageExternalDistributed.cpp   |  2 +-
 src/Storages/StorageFile.cpp                  |  2 ++
 src/Storages/StorageJoin.cpp                  |  1 +
 src/Storages/StorageKeeperMap.cpp             |  1 +
 src/Storages/StorageMaterializedView.cpp      |  1 +
 src/Storages/StorageMemory.cpp                |  3 +--
 src/Storages/StorageMerge.cpp                 |  1 +
 src/Storages/StorageMergeTree.cpp             |  1 +
 src/Storages/StorageReplicatedMergeTree.cpp   |  1 +
 src/Storages/StorageURLCluster.cpp            |  1 +
 src/Storages/StorageView.cpp                  |  2 ++
 .../System/StorageSystemZooKeeper.cpp         |  1 +
 src/Storages/WindowView/StorageWindowView.cpp |  1 +
 src/TableFunctions/TableFunctionView.cpp      |  1 +
 .../TableFunctionViewIfPermitted.cpp          |  1 +
 68 files changed, 124 insertions(+), 49 deletions(-)
 create mode 100644 src/Functions/FunctionUnixTimestamp64.cpp

diff --git a/src/Functions/FunctionGenerateRandomStructure.cpp b/src/Functions/FunctionGenerateRandomStructure.cpp
index 6dc68134502..0c6f4287ecb 100644
--- a/src/Functions/FunctionGenerateRandomStructure.cpp
+++ b/src/Functions/FunctionGenerateRandomStructure.cpp
@@ -8,6 +8,7 @@
 #include <Interpreters/Context.h>
 #include <Common/randomSeed.h>
 #include <Common/FunctionDocumentation.h>
+#include <Core/Settings.h>
 #include <IO/WriteHelpers.h>
 #include <IO/WriteBufferFromVector.h>
 
@@ -354,6 +355,11 @@ namespace
     }
 }
 
+    FunctionPtr FunctionGenerateRandomStructure::create(DB::ContextPtr context)
+    {
+        return std::make_shared<FunctionGenerateRandomStructure>(context->getSettingsRef().allow_suspicious_low_cardinality_types.value);
+    }
+
 DataTypePtr FunctionGenerateRandomStructure::getReturnTypeImpl(const DataTypes & arguments) const
 {
     if (arguments.size() > 2)
diff --git a/src/Functions/FunctionGenerateRandomStructure.h b/src/Functions/FunctionGenerateRandomStructure.h
index b9a83eb261e..5901565696f 100644
--- a/src/Functions/FunctionGenerateRandomStructure.h
+++ b/src/Functions/FunctionGenerateRandomStructure.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <Functions/IFunction.h>
-#include <Core/Settings.h>
 #include <Interpreters/Context.h>
 
 #include <pcg_random.hpp>
@@ -18,10 +17,7 @@ public:
     {
     }
 
-    static FunctionPtr create(ContextPtr context)
-    {
-        return std::make_shared<FunctionGenerateRandomStructure>(context->getSettingsRef().allow_suspicious_low_cardinality_types.value);
-    }
+    static FunctionPtr create(ContextPtr context);
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/FunctionUnixTimestamp64.cpp b/src/Functions/FunctionUnixTimestamp64.cpp
new file mode 100644
index 00000000000..a22c035a0ba
--- /dev/null
+++ b/src/Functions/FunctionUnixTimestamp64.cpp
@@ -0,0 +1,13 @@
+#include <Core/Settings.h>
+#include <Functions/FunctionUnixTimestamp64.h>
+
+namespace DB
+{
+
+FunctionFromUnixTimestamp64::FunctionFromUnixTimestamp64(size_t target_scale_, const char * name_, ContextPtr context)
+    : target_scale(target_scale_)
+    , name(name_)
+    , allow_nonconst_timezone_arguments(context->getSettingsRef().allow_nonconst_timezone_arguments)
+{}
+
+}
diff --git a/src/Functions/FunctionUnixTimestamp64.h b/src/Functions/FunctionUnixTimestamp64.h
index 7b8da733f6d..bbd7e586a67 100644
--- a/src/Functions/FunctionUnixTimestamp64.h
+++ b/src/Functions/FunctionUnixTimestamp64.h
@@ -6,7 +6,6 @@
 #include <DataTypes/DataTypeDateTime64.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Columns/ColumnsNumber.h>
-#include <Core/Settings.h>
 #include <Interpreters/Context.h>
 
 #include <base/arithmeticOverflow.h>
@@ -108,11 +107,7 @@ private:
     const bool allow_nonconst_timezone_arguments;
 
 public:
-    FunctionFromUnixTimestamp64(size_t target_scale_, const char * name_, ContextPtr context)
-        : target_scale(target_scale_)
-        , name(name_)
-        , allow_nonconst_timezone_arguments(context->getSettingsRef().allow_nonconst_timezone_arguments)
-    {}
+    FunctionFromUnixTimestamp64(size_t target_scale_, const char * name_, ContextPtr context);
 
     String getName() const override { return name; }
     size_t getNumberOfArguments() const override { return 0; }
diff --git a/src/Functions/tuple.cpp b/src/Functions/tuple.cpp
index 71f50abba6c..84772f79d08 100644
--- a/src/Functions/tuple.cpp
+++ b/src/Functions/tuple.cpp
@@ -1,8 +1,15 @@
 #include <Functions/tuple.h>
 
+#include <Core/Settings.h>
+
 namespace DB
 {
 
+FunctionPtr FunctionTuple::create(DB::ContextPtr context)
+{
+    return std::make_shared<FunctionTuple>(context->getSettingsRef().enable_named_columns_in_function_tuple);
+}
+
 REGISTER_FUNCTION(Tuple)
 {
     factory.registerFunction<FunctionTuple>(FunctionDocumentation{
diff --git a/src/Functions/tuple.h b/src/Functions/tuple.h
index a49f346ef2a..03ba7ec9ef2 100644
--- a/src/Functions/tuple.h
+++ b/src/Functions/tuple.h
@@ -3,7 +3,6 @@
 #include <Functions/IFunction.h>
 
 #include <Columns/ColumnTuple.h>
-#include <Core/Settings.h>
 #include <DataTypes/DataTypeTuple.h>
 #include <Functions/FunctionFactory.h>
 #include <Interpreters/Context.h>
@@ -22,11 +21,7 @@ class FunctionTuple : public IFunction
 public:
     static constexpr auto name = "tuple";
 
-    /// maybe_unused: false-positive
-    [[maybe_unused]] static FunctionPtr create(ContextPtr context)
-    {
-        return std::make_shared<FunctionTuple>(context->getSettingsRef().enable_named_columns_in_function_tuple);
-    }
+    static FunctionPtr create(ContextPtr context);
 
     explicit FunctionTuple(bool enable_named_columns_ = false) : enable_named_columns(enable_named_columns_) { }
 
diff --git a/src/Interpreters/ActionsVisitor.cpp b/src/Interpreters/ActionsVisitor.cpp
index 74d83590ec9..56d80e2d4fe 100644
--- a/src/Interpreters/ActionsVisitor.cpp
+++ b/src/Interpreters/ActionsVisitor.cpp
@@ -8,6 +8,7 @@
 
 #include <Core/ColumnNumbers.h>
 #include <Core/ColumnWithTypeAndName.h>
+#include <Core/Settings.h>
 
 #include <Functions/grouping.h>
 #include <Functions/FunctionFactory.h>
diff --git a/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp b/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp
index 94a02eacdaa..e35d31d2350 100644
--- a/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp
+++ b/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp
@@ -5,6 +5,7 @@
 #include <Common/checkStackSize.h>
 #include <Common/logger_useful.h>
 #include <Common/FailPoint.h>
+#include <Core/Settings.h>
 #include <Interpreters/InterpreterSelectQueryAnalyzer.h>
 #include <Interpreters/SelectQueryOptions.h>
 #include <Planner/Utils.h>
diff --git a/src/Interpreters/DDLWorker.cpp b/src/Interpreters/DDLWorker.cpp
index 5639eed552e..697fd0f406b 100644
--- a/src/Interpreters/DDLWorker.cpp
+++ b/src/Interpreters/DDLWorker.cpp
@@ -25,6 +25,7 @@
 #include <Common/ZooKeeper/ZooKeeperLock.h>
 #include <Common/isLocalAddress.h>
 #include <Core/ServerUUID.h>
+#include <Core/Settings.h>
 #include <Storages/StorageReplicatedMergeTree.h>
 #include <Poco/Timestamp.h>
 #include <base/sleep.h>
diff --git a/src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp b/src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp
index a70ff3c6c53..4bd1c47d5a0 100644
--- a/src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp
+++ b/src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp
@@ -2,6 +2,7 @@
 
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnTuple.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeTuple.h>
 #include <IO/WriteHelpers.h>
diff --git a/src/Interpreters/GlobalSubqueriesVisitor.h b/src/Interpreters/GlobalSubqueriesVisitor.h
index 64b6eb5dce9..986134a6998 100644
--- a/src/Interpreters/GlobalSubqueriesVisitor.h
+++ b/src/Interpreters/GlobalSubqueriesVisitor.h
@@ -2,6 +2,7 @@
 
 #include <Core/Block.h>
 #include <Core/NamesAndTypes.h>
+#include <Core/Settings.h>
 #include <Databases/IDatabase.h>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/Context.h>
diff --git a/src/Interpreters/IInterpreterUnionOrSelectQuery.cpp b/src/Interpreters/IInterpreterUnionOrSelectQuery.cpp
index fed29b410db..d8f6df05ca4 100644
--- a/src/Interpreters/IInterpreterUnionOrSelectQuery.cpp
+++ b/src/Interpreters/IInterpreterUnionOrSelectQuery.cpp
@@ -1,4 +1,6 @@
 #include <Interpreters/IInterpreterUnionOrSelectQuery.h>
+
+#include <Core/Settings.h>
 #include <Interpreters/QueryLog.h>
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
@@ -15,6 +17,23 @@
 namespace DB
 {
 
+IInterpreterUnionOrSelectQuery::IInterpreterUnionOrSelectQuery(const DB::ASTPtr& query_ptr_,
+        const DB::ContextMutablePtr& context_, const DB::SelectQueryOptions& options_)
+        : query_ptr(query_ptr_)
+        , context(context_)
+        , options(options_)
+        , max_streams(context->getSettingsRef().max_threads)
+{
+    if (options.shard_num)
+        context->addSpecialScalar(
+                "_shard_num",
+                Block{{DataTypeUInt32().createColumnConst(1, *options.shard_num), std::make_shared<DataTypeUInt32>(), "_shard_num"}});
+    if (options.shard_count)
+        context->addSpecialScalar(
+                "_shard_count",
+                Block{{DataTypeUInt32().createColumnConst(1, *options.shard_count), std::make_shared<DataTypeUInt32>(), "_shard_count"}});
+}
+
 QueryPipelineBuilder IInterpreterUnionOrSelectQuery::buildQueryPipeline()
 {
     QueryPlan query_plan;
diff --git a/src/Interpreters/IInterpreterUnionOrSelectQuery.h b/src/Interpreters/IInterpreterUnionOrSelectQuery.h
index 4ecfc464e90..ac8e90b5f52 100644
--- a/src/Interpreters/IInterpreterUnionOrSelectQuery.h
+++ b/src/Interpreters/IInterpreterUnionOrSelectQuery.h
@@ -6,8 +6,6 @@
 #include <Parsers/IAST_fwd.h>
 #include <DataTypes/DataTypesNumber.h>
 
-#include <Core/Settings.h>
-
 namespace DB
 {
 
@@ -19,21 +17,7 @@ public:
     {
     }
 
-    IInterpreterUnionOrSelectQuery(const ASTPtr & query_ptr_, const ContextMutablePtr & context_, const SelectQueryOptions & options_)
-        : query_ptr(query_ptr_)
-        , context(context_)
-        , options(options_)
-        , max_streams(context->getSettingsRef().max_threads)
-    {
-        if (options.shard_num)
-            context->addSpecialScalar(
-                "_shard_num",
-                Block{{DataTypeUInt32().createColumnConst(1, *options.shard_num), std::make_shared<DataTypeUInt32>(), "_shard_num"}});
-        if (options.shard_count)
-            context->addSpecialScalar(
-                "_shard_count",
-                Block{{DataTypeUInt32().createColumnConst(1, *options.shard_count), std::make_shared<DataTypeUInt32>(), "_shard_count"}});
-    }
+    IInterpreterUnionOrSelectQuery(const ASTPtr & query_ptr_, const ContextMutablePtr & context_, const SelectQueryOptions & options_);
 
     virtual void buildQueryPlan(QueryPlan & query_plan) = 0;
     QueryPipelineBuilder buildQueryPipeline();
diff --git a/src/Interpreters/InterpreterAlterQuery.cpp b/src/Interpreters/InterpreterAlterQuery.cpp
index a7a524ef836..8f9c6bc533e 100644
--- a/src/Interpreters/InterpreterAlterQuery.cpp
+++ b/src/Interpreters/InterpreterAlterQuery.cpp
@@ -3,6 +3,8 @@
 #include <Interpreters/InterpreterFactory.h>
 
 #include <Access/Common/AccessRightsElement.h>
+#include <Common/typeid_cast.h>
+#include <Core/Settings.h>
 #include <Databases/DatabaseFactory.h>
 #include <Databases/DatabaseReplicated.h>
 #include <Databases/IDatabase.h>
@@ -24,7 +26,6 @@
 #include <Storages/MutationCommands.h>
 #include <Storages/PartitionCommands.h>
 #include <Storages/StorageKeeperMap.h>
-#include <Common/typeid_cast.h>
 
 #include <Functions/UserDefined/UserDefinedSQLFunctionFactory.h>
 #include <Functions/UserDefined/UserDefinedSQLFunctionVisitor.h>
diff --git a/src/Interpreters/InterpreterCreateQuery.cpp b/src/Interpreters/InterpreterCreateQuery.cpp
index 15e987750c2..84d7f0a587c 100644
--- a/src/Interpreters/InterpreterCreateQuery.cpp
+++ b/src/Interpreters/InterpreterCreateQuery.cpp
@@ -5,7 +5,7 @@
 #include <Access/AccessControl.h>
 #include <Access/User.h>
 
-#include "Common/Exception.h"
+#include <Common/Exception.h>
 #include <Common/StringUtils.h>
 #include <Common/escapeForFileName.h>
 #include <Common/typeid_cast.h>
@@ -14,6 +14,7 @@
 #include <Common/atomicRename.h>
 #include <Common/PoolId.h>
 #include <Common/logger_useful.h>
+#include <Core/Settings.h>
 #include <Parsers/ASTSetQuery.h>
 #include <base/hex.h>
 
diff --git a/src/Interpreters/InterpreterDeleteQuery.cpp b/src/Interpreters/InterpreterDeleteQuery.cpp
index 39d5d9e9cef..84fe0a9f4ae 100644
--- a/src/Interpreters/InterpreterDeleteQuery.cpp
+++ b/src/Interpreters/InterpreterDeleteQuery.cpp
@@ -2,6 +2,7 @@
 #include <Interpreters/InterpreterFactory.h>
 
 #include <Access/ContextAccess.h>
+#include <Core/Settings.h>
 #include <Databases/DatabaseReplicated.h>
 #include <Databases/IDatabase.h>
 #include <Interpreters/Context.h>
diff --git a/src/Interpreters/InterpreterDescribeQuery.cpp b/src/Interpreters/InterpreterDescribeQuery.cpp
index 87b0eb89302..39fc85a5e23 100644
--- a/src/Interpreters/InterpreterDescribeQuery.cpp
+++ b/src/Interpreters/InterpreterDescribeQuery.cpp
@@ -4,6 +4,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <Parsers/queryToString.h>
 #include <Common/typeid_cast.h>
+#include <Core/Settings.h>
 #include <TableFunctions/ITableFunction.h>
 #include <TableFunctions/TableFunctionFactory.h>
 #include <Interpreters/InterpreterSelectWithUnionQuery.h>
diff --git a/src/Interpreters/InterpreterExplainQuery.cpp b/src/Interpreters/InterpreterExplainQuery.cpp
index 6ec5937f287..d7addcd6e34 100644
--- a/src/Interpreters/InterpreterExplainQuery.cpp
+++ b/src/Interpreters/InterpreterExplainQuery.cpp
@@ -29,6 +29,7 @@
 #include <QueryPipeline/printPipeline.h>
 
 #include <Common/JSONBuilder.h>
+#include <Core/Settings.h>
 
 #include <Analyzer/QueryTreeBuilder.h>
 #include <Analyzer/QueryTreePassManager.h>
diff --git a/src/Interpreters/InterpreterFactory.cpp b/src/Interpreters/InterpreterFactory.cpp
index 387d056ffe7..12b3b510098 100644
--- a/src/Interpreters/InterpreterFactory.cpp
+++ b/src/Interpreters/InterpreterFactory.cpp
@@ -60,6 +60,7 @@
 #include <Parsers/ASTExternalDDLQuery.h>
 #include <Common/ProfileEvents.h>
 #include <Common/typeid_cast.h>
+#include <Core/Settings.h>
 
 
 namespace ProfileEvents
diff --git a/src/Interpreters/InterpreterInsertQuery.cpp b/src/Interpreters/InterpreterInsertQuery.cpp
index f396db70d21..ef298d4d45a 100644
--- a/src/Interpreters/InterpreterInsertQuery.cpp
+++ b/src/Interpreters/InterpreterInsertQuery.cpp
@@ -5,6 +5,7 @@
 #include <Access/EnabledQuota.h>
 #include <AggregateFunctions/AggregateFunctionFactory.h>
 #include <Columns/ColumnNullable.h>
+#include <Core/Settings.h>
 #include <Processors/Transforms/buildPushingToViewsChain.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <Interpreters/DatabaseCatalog.h>
diff --git a/src/Interpreters/InterpreterSelectIntersectExceptQuery.cpp b/src/Interpreters/InterpreterSelectIntersectExceptQuery.cpp
index 6eac2db20c9..b0da4caa3ac 100644
--- a/src/Interpreters/InterpreterSelectIntersectExceptQuery.cpp
+++ b/src/Interpreters/InterpreterSelectIntersectExceptQuery.cpp
@@ -1,6 +1,7 @@
 #include <Access/AccessControl.h>
 
 #include <Columns/getLeastSuperColumn.h>
+#include <Core/Settings.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/InterpreterSelectIntersectExceptQuery.h>
 #include <Interpreters/InterpreterFactory.h>
diff --git a/src/Interpreters/InterpreterSelectQuery.cpp b/src/Interpreters/InterpreterSelectQuery.cpp
index fae204912fc..f1ec674e0f1 100644
--- a/src/Interpreters/InterpreterSelectQuery.cpp
+++ b/src/Interpreters/InterpreterSelectQuery.cpp
@@ -84,6 +84,7 @@
 #include <Core/ColumnNumbers.h>
 #include <Core/Field.h>
 #include <Core/ProtocolDefines.h>
+#include <Core/Settings.h>
 #include <Interpreters/Aggregator.h>
 #include <Interpreters/IJoin.h>
 #include <QueryPipeline/SizeLimits.h>
diff --git a/src/Interpreters/InterpreterSelectWithUnionQuery.cpp b/src/Interpreters/InterpreterSelectWithUnionQuery.cpp
index cc1d7dd6531..e953a07b41d 100644
--- a/src/Interpreters/InterpreterSelectWithUnionQuery.cpp
+++ b/src/Interpreters/InterpreterSelectWithUnionQuery.cpp
@@ -1,6 +1,7 @@
 #include <Access/AccessControl.h>
 
 #include <Columns/getLeastSuperColumn.h>
+#include <Core/Settings.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/InterpreterSelectIntersectExceptQuery.h>
 #include <Interpreters/InterpreterFactory.h>
diff --git a/src/Interpreters/JoinedTables.cpp b/src/Interpreters/JoinedTables.cpp
index 457ed3ef4a6..0de2bf9cb1f 100644
--- a/src/Interpreters/JoinedTables.cpp
+++ b/src/Interpreters/JoinedTables.cpp
@@ -1,5 +1,6 @@
 #include <Interpreters/JoinedTables.h>
 
+#include <Core/Settings.h>
 #include <Core/SettingsEnums.h>
 
 #include <Interpreters/DatabaseCatalog.h>
diff --git a/src/Interpreters/MutationsInterpreter.cpp b/src/Interpreters/MutationsInterpreter.cpp
index f2eec8ff8f5..480c6736bc5 100644
--- a/src/Interpreters/MutationsInterpreter.cpp
+++ b/src/Interpreters/MutationsInterpreter.cpp
@@ -1,3 +1,4 @@
+#include <Core/Settings.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/IFunction.h>
 #include <Interpreters/InterpreterSelectQuery.h>
diff --git a/src/Interpreters/PreparedSets.cpp b/src/Interpreters/PreparedSets.cpp
index b04c8b1b725..43a04f8aff0 100644
--- a/src/Interpreters/PreparedSets.cpp
+++ b/src/Interpreters/PreparedSets.cpp
@@ -5,6 +5,7 @@
 #include <Interpreters/InterpreterSelectWithUnionQuery.h>
 #include <IO/Operators.h>
 #include <Common/logger_useful.h>
+#include <Core/Settings.h>
 #include <Processors/QueryPlan/CreatingSetsStep.h>
 #include <Processors/Executors/CompletedPipelineExecutor.h>
 #include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
diff --git a/src/Interpreters/getHeaderForProcessingStage.cpp b/src/Interpreters/getHeaderForProcessingStage.cpp
index 06c5d424d2f..cf18cbbb54a 100644
--- a/src/Interpreters/getHeaderForProcessingStage.cpp
+++ b/src/Interpreters/getHeaderForProcessingStage.cpp
@@ -1,5 +1,6 @@
 #include <Analyzer/QueryNode.h>
 #include <Analyzer/Utils.h>
+#include <Core/Settings.h>
 #include <Interpreters/getHeaderForProcessingStage.h>
 #include <Interpreters/InterpreterSelectQuery.h>
 #include <Interpreters/InterpreterSelectQueryAnalyzer.h>
diff --git a/src/Interpreters/interpretSubquery.cpp b/src/Interpreters/interpretSubquery.cpp
index 6b42345f1d6..340f6d1d805 100644
--- a/src/Interpreters/interpretSubquery.cpp
+++ b/src/Interpreters/interpretSubquery.cpp
@@ -1,4 +1,5 @@
 #include <Common/typeid_cast.h>
+#include <Core/Settings.h>
 #include <IO/WriteHelpers.h>
 
 #include <Storages/IStorage.h>
diff --git a/src/Processors/QueryPlan/DistributedCreateLocalPlan.cpp b/src/Processors/QueryPlan/DistributedCreateLocalPlan.cpp
index 1f4f271fa6e..14f58585d3d 100644
--- a/src/Processors/QueryPlan/DistributedCreateLocalPlan.cpp
+++ b/src/Processors/QueryPlan/DistributedCreateLocalPlan.cpp
@@ -1,6 +1,7 @@
 #include <Processors/QueryPlan/DistributedCreateLocalPlan.h>
 
 #include <Common/checkStackSize.h>
+#include <Core/Settings.h>
 #include <Interpreters/ActionsDAG.h>
 #include <Interpreters/InterpreterSelectQuery.h>
 #include <Interpreters/InterpreterSelectQueryAnalyzer.h>
diff --git a/src/Processors/QueryPlan/Optimizations/optimizeReadInOrder.cpp b/src/Processors/QueryPlan/Optimizations/optimizeReadInOrder.cpp
index e1ef38022b5..28eb4da2e17 100644
--- a/src/Processors/QueryPlan/Optimizations/optimizeReadInOrder.cpp
+++ b/src/Processors/QueryPlan/Optimizations/optimizeReadInOrder.cpp
@@ -22,9 +22,10 @@
 #include <Processors/QueryPlan/TotalsHavingStep.h>
 #include <Processors/QueryPlan/UnionStep.h>
 #include <Processors/QueryPlan/WindowStep.h>
-#include "Storages/KeyDescription.h"
+#include <Storages/KeyDescription.h>
 #include <Storages/StorageMerge.h>
 #include <Common/typeid_cast.h>
+#include <Core/Settings.h>
 
 #include <stack>
 
diff --git a/src/Processors/QueryPlan/Optimizations/optimizeUseAggregateProjection.cpp b/src/Processors/QueryPlan/Optimizations/optimizeUseAggregateProjection.cpp
index f6052846aec..9e2c2dcc96d 100644
--- a/src/Processors/QueryPlan/Optimizations/optimizeUseAggregateProjection.cpp
+++ b/src/Processors/QueryPlan/Optimizations/optimizeUseAggregateProjection.cpp
@@ -17,6 +17,7 @@
 #include <Analyzer/QueryNode.h>
 
 #include <Common/logger_useful.h>
+#include <Core/Settings.h>
 #include <Storages/StorageDummy.h>
 #include <Storages/VirtualColumnUtils.h>
 #include <Planner/PlannerExpressionAnalysis.h>
diff --git a/src/Processors/QueryPlan/Optimizations/projectionsCommon.cpp b/src/Processors/QueryPlan/Optimizations/projectionsCommon.cpp
index af1578d6af8..4d60a1135a6 100644
--- a/src/Processors/QueryPlan/Optimizations/projectionsCommon.cpp
+++ b/src/Processors/QueryPlan/Optimizations/projectionsCommon.cpp
@@ -5,6 +5,7 @@
 #include <Processors/QueryPlan/ReadFromMergeTree.h>
 
 #include <Common/logger_useful.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <Functions/IFunctionAdaptors.h>
 #include <Functions/FunctionsLogical.h>
diff --git a/src/Processors/QueryPlan/ReadFromMergeTree.cpp b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
index 2829f43a0e8..6e86d14f5cc 100644
--- a/src/Processors/QueryPlan/ReadFromMergeTree.cpp
+++ b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
@@ -41,6 +41,7 @@
 #include <Common/JSONBuilder.h>
 #include <Common/isLocalAddress.h>
 #include <Common/logger_useful.h>
+#include <Core/Settings.h>
 #include <Processors/QueryPlan/IQueryPlanStep.h>
 #include <Parsers/parseIdentifierOrStringLiteral.h>
 #include <Parsers/ExpressionListParsers.h>
diff --git a/src/Processors/QueryPlan/ReadFromStreamLikeEngine.cpp b/src/Processors/QueryPlan/ReadFromStreamLikeEngine.cpp
index 4a257bba922..51117ad3c9b 100644
--- a/src/Processors/QueryPlan/ReadFromStreamLikeEngine.cpp
+++ b/src/Processors/QueryPlan/ReadFromStreamLikeEngine.cpp
@@ -1,5 +1,6 @@
 #include <Processors/QueryPlan/ReadFromStreamLikeEngine.h>
 
+#include <Core/Settings.h>
 #include <Interpreters/InterpreterSelectQuery.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
 
diff --git a/src/Processors/QueryPlan/ReadFromSystemNumbersStep.cpp b/src/Processors/QueryPlan/ReadFromSystemNumbersStep.cpp
index eb974259c5e..a3ae035afdd 100644
--- a/src/Processors/QueryPlan/ReadFromSystemNumbersStep.cpp
+++ b/src/Processors/QueryPlan/ReadFromSystemNumbersStep.cpp
@@ -12,6 +12,7 @@
 #include <fmt/format.h>
 #include <Common/iota.h>
 #include <Common/typeid_cast.h>
+#include <Core/Settings.h>
 #include <Core/Types.h>
 
 
diff --git a/src/Processors/Transforms/buildPushingToViewsChain.cpp b/src/Processors/Transforms/buildPushingToViewsChain.cpp
index 25fbf13b0e7..c616c882ed9 100644
--- a/src/Processors/Transforms/buildPushingToViewsChain.cpp
+++ b/src/Processors/Transforms/buildPushingToViewsChain.cpp
@@ -24,6 +24,7 @@
 #include <Common/ThreadStatus.h>
 #include <Common/checkStackSize.h>
 #include <Common/logger_useful.h>
+#include <Core/Settings.h>
 
 #include <atomic>
 #include <chrono>
diff --git a/src/Storages/AlterCommands.cpp b/src/Storages/AlterCommands.cpp
index eef83025097..7891042bb96 100644
--- a/src/Storages/AlterCommands.cpp
+++ b/src/Storages/AlterCommands.cpp
@@ -1,4 +1,5 @@
 #include <Compression/CompressionFactory.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDateTime.h>
diff --git a/src/Storages/IStorage.cpp b/src/Storages/IStorage.cpp
index 1f7ac23eb82..3b9c6ff28fa 100644
--- a/src/Storages/IStorage.cpp
+++ b/src/Storages/IStorage.cpp
@@ -1,6 +1,7 @@
 #include <Storages/IStorage.h>
 
 #include <Common/StringUtils.h>
+#include <Core/Settings.h>
 #include <IO/Operators.h>
 #include <IO/WriteBufferFromString.h>
 #include <Interpreters/Context.h>
diff --git a/src/Storages/IStorageCluster.cpp b/src/Storages/IStorageCluster.cpp
index 9c5b29ae265..63467603d16 100644
--- a/src/Storages/IStorageCluster.cpp
+++ b/src/Storages/IStorageCluster.cpp
@@ -1,6 +1,7 @@
 #include <Storages/IStorageCluster.h>
 
 #include <Common/Exception.h>
+#include <Core/Settings.h>
 #include <Core/QueryProcessingStage.h>
 #include <DataTypes/DataTypeString.h>
 #include <IO/ConnectionTimeouts.h>
diff --git a/src/Storages/LiveView/StorageLiveView.cpp b/src/Storages/LiveView/StorageLiveView.cpp
index 57a1ea302f9..f1323d45c26 100644
--- a/src/Storages/LiveView/StorageLiveView.cpp
+++ b/src/Storages/LiveView/StorageLiveView.cpp
@@ -27,6 +27,7 @@ limitations under the License. */
 #include <Common/logger_useful.h>
 #include <Common/typeid_cast.h>
 #include <Common/SipHash.h>
+#include <Core/Settings.h>
 #include <base/hex.h>
 
 #include <Storages/LiveView/StorageLiveView.h>
diff --git a/src/Storages/MergeTree/MergeTask.cpp b/src/Storages/MergeTree/MergeTask.cpp
index dafb562f0d8..fc64fae9a58 100644
--- a/src/Storages/MergeTree/MergeTask.cpp
+++ b/src/Storages/MergeTree/MergeTask.cpp
@@ -7,6 +7,7 @@
 
 #include <Common/logger_useful.h>
 #include <Common/ActionBlocker.h>
+#include <Core/Settings.h>
 #include <Processors/Transforms/CheckSortedTransform.h>
 #include <Storages/MergeTree/DataPartStorageOnDiskFull.h>
 #include <Compression/CompressedWriteBuffer.h>
diff --git a/src/Storages/MergeTree/MergeTreeData.cpp b/src/Storages/MergeTree/MergeTreeData.cpp
index c1551668262..729eab316be 100644
--- a/src/Storages/MergeTree/MergeTreeData.cpp
+++ b/src/Storages/MergeTree/MergeTreeData.cpp
@@ -22,6 +22,7 @@
 #include <Common/quoteString.h>
 #include <Common/scope_guard_safe.h>
 #include <Common/typeid_cast.h>
+#include <Core/Settings.h>
 #include <Storages/MergeTree/RangesInDataPart.h>
 #include <Compression/CompressedReadBuffer.h>
 #include <Core/QueryProcessingStage.h>
diff --git a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
index 758d6ad6140..c5214f0f3d3 100644
--- a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
@@ -37,6 +37,7 @@
 #include <Processors/Transforms/AggregatingTransform.h>
 
 #include <Core/UUID.h>
+#include <Core/Settings.h>
 #include <Common/CurrentMetrics.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeEnum.h>
diff --git a/src/Storages/MergeTree/MergeTreeSink.cpp b/src/Storages/MergeTree/MergeTreeSink.cpp
index 05751e0fa6f..5c71994d68d 100644
--- a/src/Storages/MergeTree/MergeTreeSink.cpp
+++ b/src/Storages/MergeTree/MergeTreeSink.cpp
@@ -3,6 +3,7 @@
 #include <Interpreters/PartLog.h>
 #include <DataTypes/ObjectUtils.h>
 #include <Common/ProfileEventsScope.h>
+#include <Core/Settings.h>
 
 namespace ProfileEvents
 {
diff --git a/src/Storages/MergeTree/MutatePlainMergeTreeTask.cpp b/src/Storages/MergeTree/MutatePlainMergeTreeTask.cpp
index 20f387137e7..9aec074deae 100644
--- a/src/Storages/MergeTree/MutatePlainMergeTreeTask.cpp
+++ b/src/Storages/MergeTree/MutatePlainMergeTreeTask.cpp
@@ -3,6 +3,7 @@
 #include <Storages/StorageMergeTree.h>
 #include <Interpreters/TransactionLog.h>
 #include <Common/ProfileEventsScope.h>
+#include <Core/Settings.h>
 
 namespace DB
 {
diff --git a/src/Storages/MergeTree/MutateTask.cpp b/src/Storages/MergeTree/MutateTask.cpp
index 35333af4b03..0671dc6fa60 100644
--- a/src/Storages/MergeTree/MutateTask.cpp
+++ b/src/Storages/MergeTree/MutateTask.cpp
@@ -4,6 +4,7 @@
 #include <IO/HashingWriteBuffer.h>
 #include <Common/logger_useful.h>
 #include <Common/escapeForFileName.h>
+#include <Core/Settings.h>
 #include <Storages/MergeTree/DataPartStorageOnDiskFull.h>
 #include <Storages/Statistics/Statistics.h>
 #include <Columns/ColumnsNumber.h>
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp
index 0fd7d93b9aa..83e8a7a3bc5 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp
@@ -9,6 +9,7 @@
 #include <Common/SipHash.h>
 #include <Common/ZooKeeper/KeeperException.h>
 #include <Common/ThreadFuzzer.h>
+#include <Core/Settings.h>
 #include <Storages/MergeTree/MergeAlgorithm.h>
 #include <Storages/MergeTree/MergeTreeDataWriter.h>
 #include <Storages/MergeTree/MergeTreeSettings.h>
@@ -575,6 +576,16 @@ bool ReplicatedMergeTreeSinkImpl<false>::writeExistingPart(MergeTreeData::Mutabl
     }
 }
 
+template<bool async_insert>
+bool ReplicatedMergeTreeSinkImpl<async_insert>::lastBlockIsDuplicate() const
+{
+    /// If MV is responsible for deduplication, block is not considered duplicating.
+    if (context->getSettingsRef().deduplicate_blocks_in_dependent_materialized_views)
+        return false;
+
+    return last_block_is_duplicate;
+}
+
 template<bool async_insert>
 std::vector<String> ReplicatedMergeTreeSinkImpl<async_insert>::detectConflictsInAsyncBlockIDs(const std::vector<String> & ids)
 {
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeSink.h b/src/Storages/MergeTree/ReplicatedMergeTreeSink.h
index 13cb98e65a1..8a37d85a750 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeSink.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeSink.h
@@ -5,7 +5,6 @@
 #include <base/types.h>
 #include <Common/ZooKeeper/ZooKeeperRetries.h>
 #include <Common/ZooKeeper/ZooKeeperWithFaultInjection.h>
-#include <Core/Settings.h>
 #include <Storages/MergeTree/AsyncBlockIDsCache.h>
 
 
@@ -61,14 +60,7 @@ public:
     bool writeExistingPart(MergeTreeData::MutableDataPartPtr & part);
 
     /// For proper deduplication in MaterializedViews
-    bool lastBlockIsDuplicate() const override
-    {
-        /// If MV is responsible for deduplication, block is not considered duplicating.
-        if (context->getSettingsRef().deduplicate_blocks_in_dependent_materialized_views)
-            return false;
-
-        return last_block_is_duplicate;
-    }
+    bool lastBlockIsDuplicate() const override;
 
     struct DelayedChunk;
 private:
diff --git a/src/Storages/MergeTree/registerStorageMergeTree.cpp b/src/Storages/MergeTree/registerStorageMergeTree.cpp
index 343c2c1008e..3f0603f6900 100644
--- a/src/Storages/MergeTree/registerStorageMergeTree.cpp
+++ b/src/Storages/MergeTree/registerStorageMergeTree.cpp
@@ -8,6 +8,7 @@
 #include <Storages/StorageReplicatedMergeTree.h>
 
 #include <Core/ServerSettings.h>
+#include <Core/Settings.h>
 #include <Common/Macros.h>
 #include <Common/OptimizedRegularExpression.h>
 #include <Common/typeid_cast.h>
diff --git a/src/Storages/ReadFinalForExternalReplicaStorage.cpp b/src/Storages/ReadFinalForExternalReplicaStorage.cpp
index e1d52eefc20..5070b4a17d8 100644
--- a/src/Storages/ReadFinalForExternalReplicaStorage.cpp
+++ b/src/Storages/ReadFinalForExternalReplicaStorage.cpp
@@ -2,6 +2,7 @@
 
 #if USE_MYSQL || USE_LIBPQXX
 
+#include <Core/Settings.h>
 #include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/TreeRewriter.h>
 #include <Parsers/ASTFunction.h>
diff --git a/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp b/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
index b9d3e071b6c..365915cfd68 100644
--- a/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
+++ b/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
@@ -28,6 +28,7 @@
 #include <Common/Logger.h>
 #include <Common/logger_useful.h>
 #include <Common/Exception.h>
+#include <Core/Settings.h>
 #include <Storages/AlterCommands.h>
 #include <Storages/RocksDB/RocksDBSettings.h>
 #include <IO/SharedThreadPools.h>
diff --git a/src/Storages/StorageBuffer.cpp b/src/Storages/StorageBuffer.cpp
index a3f6b6afc5d..c403287c43c 100644
--- a/src/Storages/StorageBuffer.cpp
+++ b/src/Storages/StorageBuffer.cpp
@@ -38,6 +38,7 @@
 #include <Common/quoteString.h>
 #include <Common/threadPoolCallbackRunner.h>
 #include <Common/typeid_cast.h>
+#include <Core/Settings.h>
 
 
 namespace ProfileEvents
diff --git a/src/Storages/StorageExecutable.cpp b/src/Storages/StorageExecutable.cpp
index 66beb403086..381c20c616d 100644
--- a/src/Storages/StorageExecutable.cpp
+++ b/src/Storages/StorageExecutable.cpp
@@ -8,6 +8,7 @@
 #include <Common/filesystemHelpers.h>
 
 #include <Core/Block.h>
+#include <Core/Settings.h>
 
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
diff --git a/src/Storages/StorageExternalDistributed.cpp b/src/Storages/StorageExternalDistributed.cpp
index beb93afc972..10037c2513a 100644
--- a/src/Storages/StorageExternalDistributed.cpp
+++ b/src/Storages/StorageExternalDistributed.cpp
@@ -1,6 +1,6 @@
 #include "StorageExternalDistributed.h"
 
-
+#include <Core/Settings.h>
 #include <Storages/StorageFactory.h>
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Interpreters/InterpreterSelectQuery.h>
diff --git a/src/Storages/StorageFile.cpp b/src/Storages/StorageFile.cpp
index 7f39ff615f0..24631944efd 100644
--- a/src/Storages/StorageFile.cpp
+++ b/src/Storages/StorageFile.cpp
@@ -53,6 +53,8 @@
 #include <Common/ProfileEvents.h>
 #include <Common/re2.h>
 
+#include <Core/Settings.h>
+
 #include <QueryPipeline/Pipe.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
 
diff --git a/src/Storages/StorageJoin.cpp b/src/Storages/StorageJoin.cpp
index 47e41cccc96..a0d6cf11b64 100644
--- a/src/Storages/StorageJoin.cpp
+++ b/src/Storages/StorageJoin.cpp
@@ -15,6 +15,7 @@
 #include <Common/quoteString.h>
 #include <Common/Exception.h>
 #include <Core/ColumnsWithTypeAndName.h>
+#include <Core/Settings.h>
 #include <Interpreters/JoinUtils.h>
 #include <Formats/NativeWriter.h>
 
diff --git a/src/Storages/StorageKeeperMap.cpp b/src/Storages/StorageKeeperMap.cpp
index 20f99070000..ce760a8d63f 100644
--- a/src/Storages/StorageKeeperMap.cpp
+++ b/src/Storages/StorageKeeperMap.cpp
@@ -8,6 +8,7 @@
 #include <Core/NamesAndTypes.h>
 #include <Core/UUID.h>
 #include <Core/ServerUUID.h>
+#include <Core/Settings.h>
 
 #include <DataTypes/DataTypeString.h>
 
diff --git a/src/Storages/StorageMaterializedView.cpp b/src/Storages/StorageMaterializedView.cpp
index ec1559b71a4..57d95a98f11 100644
--- a/src/Storages/StorageMaterializedView.cpp
+++ b/src/Storages/StorageMaterializedView.cpp
@@ -25,6 +25,7 @@
 #include <Common/typeid_cast.h>
 #include <Common/checkStackSize.h>
 #include <Core/ServerSettings.h>
+#include <Core/Settings.h>
 #include <QueryPipeline/Pipe.h>
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/ExpressionStep.h>
diff --git a/src/Storages/StorageMemory.cpp b/src/Storages/StorageMemory.cpp
index f69c4adb552..dd4b53d7522 100644
--- a/src/Storages/StorageMemory.cpp
+++ b/src/Storages/StorageMemory.cpp
@@ -1,5 +1,5 @@
-#include <cassert>
 #include <Common/Exception.h>
+#include <Core/Settings.h>
 
 #include <boost/noncopyable.hpp>
 #include <Interpreters/MutationsInterpreter.h>
@@ -37,7 +37,6 @@
 #include <Disks/TemporaryFileOnDisk.h>
 #include <IO/copyData.h>
 
-
 namespace DB
 {
 
diff --git a/src/Storages/StorageMerge.cpp b/src/Storages/StorageMerge.cpp
index 2dbe82c92d8..f5bc183931f 100644
--- a/src/Storages/StorageMerge.cpp
+++ b/src/Storages/StorageMerge.cpp
@@ -12,6 +12,7 @@
 #include <Analyzer/Utils.h>
 #include <Columns/ColumnSet.h>
 #include <Columns/ColumnString.h>
+#include <Core/Settings.h>
 #include <Core/SortDescription.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/IDataType.h>
diff --git a/src/Storages/StorageMergeTree.cpp b/src/Storages/StorageMergeTree.cpp
index a27e14abe67..2117d7851cb 100644
--- a/src/Storages/StorageMergeTree.cpp
+++ b/src/Storages/StorageMergeTree.cpp
@@ -5,6 +5,7 @@
 
 #include <Backups/BackupEntriesCollector.h>
 #include <Core/QueryProcessingStage.h>
+#include <Core/Settings.h>
 #include <Databases/IDatabase.h>
 #include <IO/copyData.h>
 #include <Interpreters/ClusterProxy/SelectStreamFactory.h>
diff --git a/src/Storages/StorageReplicatedMergeTree.cpp b/src/Storages/StorageReplicatedMergeTree.cpp
index a73b80e142f..9ce42f74ded 100644
--- a/src/Storages/StorageReplicatedMergeTree.cpp
+++ b/src/Storages/StorageReplicatedMergeTree.cpp
@@ -22,6 +22,7 @@
 
 #include <Core/ServerSettings.h>
 #include <Core/ServerUUID.h>
+#include <Core/Settings.h>
 
 #include <Disks/ObjectStorages/IMetadataStorage.h>
 
diff --git a/src/Storages/StorageURLCluster.cpp b/src/Storages/StorageURLCluster.cpp
index 2e7c63d0097..69041482fd8 100644
--- a/src/Storages/StorageURLCluster.cpp
+++ b/src/Storages/StorageURLCluster.cpp
@@ -3,6 +3,7 @@
 #include <Storages/StorageURLCluster.h>
 
 #include <Core/QueryProcessingStage.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeString.h>
 #include <Interpreters/getHeaderForProcessingStage.h>
 #include <Interpreters/InterpreterSelectQuery.h>
diff --git a/src/Storages/StorageView.cpp b/src/Storages/StorageView.cpp
index 016de94c17c..5f768bce978 100644
--- a/src/Storages/StorageView.cpp
+++ b/src/Storages/StorageView.cpp
@@ -19,6 +19,8 @@
 
 #include <Common/typeid_cast.h>
 
+#include <Core/Settings.h>
+
 #include <QueryPipeline/Pipe.h>
 #include <Processors/Transforms/MaterializingTransform.h>
 #include <Processors/QueryPlan/QueryPlan.h>
diff --git a/src/Storages/System/StorageSystemZooKeeper.cpp b/src/Storages/System/StorageSystemZooKeeper.cpp
index cb46cd19517..ba9fac6d289 100644
--- a/src/Storages/System/StorageSystemZooKeeper.cpp
+++ b/src/Storages/System/StorageSystemZooKeeper.cpp
@@ -17,6 +17,7 @@
 #include <Common/typeid_cast.h>
 #include <Columns/ColumnSet.h>
 #include <Columns/ColumnConst.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeLowCardinality.h>
 #include <Functions/IFunction.h>
diff --git a/src/Storages/WindowView/StorageWindowView.cpp b/src/Storages/WindowView/StorageWindowView.cpp
index 77e6ee9cb24..b842cdda022 100644
--- a/src/Storages/WindowView/StorageWindowView.cpp
+++ b/src/Storages/WindowView/StorageWindowView.cpp
@@ -48,6 +48,7 @@
 #include <Common/typeid_cast.h>
 #include <Common/ProfileEvents.h>
 #include <Common/logger_useful.h>
+#include <Core/Settings.h>
 #include <boost/algorithm/string/replace.hpp>
 
 #include <Storages/LiveView/StorageBlocks.h>
diff --git a/src/TableFunctions/TableFunctionView.cpp b/src/TableFunctions/TableFunctionView.cpp
index 2a50fb2d006..57501df6d4d 100644
--- a/src/TableFunctions/TableFunctionView.cpp
+++ b/src/TableFunctions/TableFunctionView.cpp
@@ -1,3 +1,4 @@
+#include <Core/Settings.h>
 #include <Interpreters/InterpreterSelectWithUnionQuery.h>
 #include <Interpreters/InterpreterSelectQueryAnalyzer.h>
 #include <Parsers/ASTFunction.h>
diff --git a/src/TableFunctions/TableFunctionViewIfPermitted.cpp b/src/TableFunctions/TableFunctionViewIfPermitted.cpp
index b1691803988..935be6c1987 100644
--- a/src/TableFunctions/TableFunctionViewIfPermitted.cpp
+++ b/src/TableFunctions/TableFunctionViewIfPermitted.cpp
@@ -1,3 +1,4 @@
+#include <Core/Settings.h>
 #include <Interpreters/InterpreterSelectWithUnionQuery.h>
 #include <Interpreters/InterpreterSelectQueryAnalyzer.h>
 #include <Parsers/ASTFunction.h>

From ba419e43a6546f9ad9522f2f688270ece821a43c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= <git@rmr.ninja>
Date: Thu, 11 Jul 2024 22:16:04 +0200
Subject: [PATCH 27/51] Style

---
 src/Storages/MergeTree/MutateTask.cpp                 | 1 -
 src/Storages/MergeTree/StorageFromMergeTreeDataPart.h | 6 ------
 src/Storages/StorageFromMergeTreeDataPart.cpp         | 5 +++++
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/Storages/MergeTree/MutateTask.cpp b/src/Storages/MergeTree/MutateTask.cpp
index 0671dc6fa60..f74cccd518b 100644
--- a/src/Storages/MergeTree/MutateTask.cpp
+++ b/src/Storages/MergeTree/MutateTask.cpp
@@ -36,7 +36,6 @@
 #include <Core/ColumnsWithTypeAndName.h>
 
 
-
 namespace ProfileEvents
 {
 extern const Event MutateTaskProjectionsCalculationMicroseconds;
diff --git a/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h b/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h
index 731c30f4b79..82ebbf09988 100644
--- a/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h
+++ b/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h
@@ -8,15 +8,9 @@
 #include <QueryPipeline/QueryPipelineBuilder.h>
 
 
-
 namespace DB
 {
 
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
 class QueryPlan;
 
 /// A Storage that allows reading from a single MergeTree data part.
diff --git a/src/Storages/StorageFromMergeTreeDataPart.cpp b/src/Storages/StorageFromMergeTreeDataPart.cpp
index 37e142d246a..481d9e66901 100644
--- a/src/Storages/StorageFromMergeTreeDataPart.cpp
+++ b/src/Storages/StorageFromMergeTreeDataPart.cpp
@@ -6,6 +6,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+extern const int LOGICAL_ERROR;
+}
+
 bool StorageFromMergeTreeDataPart::materializeTTLRecalculateOnly() const
 {
     if (parts.empty())

From 9a8e4f2993ff5c0add987989d925754a5aa08c8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= <git@rmr.ninja>
Date: Thu, 11 Jul 2024 22:33:41 +0200
Subject: [PATCH 28/51] No libraries

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

diff --git a/src/IO/S3Common.cpp b/src/IO/S3Common.cpp
index 3f2c1f95e71..a794cdbcf05 100644
--- a/src/IO/S3Common.cpp
+++ b/src/IO/S3Common.cpp
@@ -6,13 +6,13 @@
 #include <Common/quoteString.h>
 #include <Common/logger_useful.h>
 #include <Common/NamedCollections/NamedCollections.h>
+#include <Core/Settings.h>
 #include <Poco/Util/AbstractConfiguration.h>
 
 #include "config.h"
 
 #if USE_AWS_S3
 
-#include <Core/Settings.h>
 #include <IO/HTTPHeaderEntries.h>
 #include <IO/S3/Client.h>
 #include <IO/S3/Requests.h>

From 1caaef0676707c8c19664e6ff00cbf782fb508cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= <git@rmr.ninja>
Date: Thu, 11 Jul 2024 23:05:24 +0200
Subject: [PATCH 29/51] Fast build

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

diff --git a/src/Interpreters/InterpreterDropQuery.cpp b/src/Interpreters/InterpreterDropQuery.cpp
index ba788a2e1f3..b68b3ddcd48 100644
--- a/src/Interpreters/InterpreterDropQuery.cpp
+++ b/src/Interpreters/InterpreterDropQuery.cpp
@@ -14,6 +14,7 @@
 #include <Common/escapeForFileName.h>
 #include <Common/quoteString.h>
 #include <Common/typeid_cast.h>
+#include <Core/Settings.h>
 #include <Databases/DatabaseReplicated.h>
 
 #include "config.h"

From e559899193ed7cec978d596bdf92ad6876ec66dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= <git@rmr.ninja>
Date: Fri, 12 Jul 2024 00:00:47 +0200
Subject: [PATCH 30/51] Random missing headers

---
 programs/library-bridge/LibraryBridge.cpp | 2 ++
 programs/odbc-bridge/ODBCBridge.cpp       | 2 ++
 src/Common/ProgressIndication.cpp         | 1 +
 src/Common/ProgressIndication.h           | 7 ++++---
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/programs/library-bridge/LibraryBridge.cpp b/programs/library-bridge/LibraryBridge.cpp
index 8a07ca57104..d35e7a9b832 100644
--- a/programs/library-bridge/LibraryBridge.cpp
+++ b/programs/library-bridge/LibraryBridge.cpp
@@ -1,5 +1,7 @@
 #include "LibraryBridge.h"
 
+#include <iostream>
+
 int mainEntryClickHouseLibraryBridge(int argc, char ** argv)
 {
     DB::LibraryBridge app;
diff --git a/programs/odbc-bridge/ODBCBridge.cpp b/programs/odbc-bridge/ODBCBridge.cpp
index e91cc3158df..155e26c8a27 100644
--- a/programs/odbc-bridge/ODBCBridge.cpp
+++ b/programs/odbc-bridge/ODBCBridge.cpp
@@ -1,5 +1,7 @@
 #include "ODBCBridge.h"
 
+#include <iostream>
+
 int mainEntryClickHouseODBCBridge(int argc, char ** argv)
 {
     DB::ODBCBridge app;
diff --git a/src/Common/ProgressIndication.cpp b/src/Common/ProgressIndication.cpp
index 0b482cb09be..8f0fb3cac6c 100644
--- a/src/Common/ProgressIndication.cpp
+++ b/src/Common/ProgressIndication.cpp
@@ -1,6 +1,7 @@
 #include "ProgressIndication.h"
 #include <algorithm>
 #include <cstddef>
+#include <iostream>
 #include <numeric>
 #include <filesystem>
 #include <cmath>
diff --git a/src/Common/ProgressIndication.h b/src/Common/ProgressIndication.h
index ae39fb49bcc..188ec4ed764 100644
--- a/src/Common/ProgressIndication.h
+++ b/src/Common/ProgressIndication.h
@@ -1,14 +1,15 @@
 #pragma once
 
-#include <unordered_map>
-#include <unordered_set>
-#include <mutex>
 #include <IO/Progress.h>
 #include <Interpreters/Context.h>
 #include <base/types.h>
 #include <Common/Stopwatch.h>
 #include <Common/EventRateMeter.h>
 
+#include <iostream>
+#include <mutex>
+#include <unordered_map>
+#include <unordered_set>
 
 namespace DB
 {

From d654880ad84ef21a4d0811f2f2f71cbca20504b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= <git@rmr.ninja>
Date: Fri, 12 Jul 2024 11:34:20 +0200
Subject: [PATCH 31/51] Fix tidy

---
 utils/keeper-data-dumper/main.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/utils/keeper-data-dumper/main.cpp b/utils/keeper-data-dumper/main.cpp
index 25be8549dd6..db6dac52190 100644
--- a/utils/keeper-data-dumper/main.cpp
+++ b/utils/keeper-data-dumper/main.cpp
@@ -2,6 +2,7 @@
 
 #include <Poco/ConsoleChannel.h>
 #include <Poco/Logger.h>
+#include <Coordination/CoordinationSettings.h>
 #include <Coordination/KeeperStateMachine.h>
 #include <Common/ZooKeeper/ZooKeeperCommon.h>
 #include <Common/ZooKeeper/ZooKeeperIO.h>

From 2e0f553ce768ace955e270a036ae83e94b8b0ac4 Mon Sep 17 00:00:00 2001
From: maxvostrikov <max.vostrikov@clickhouse.com>
Date: Fri, 12 Jul 2024 12:27:35 +0200
Subject: [PATCH 32/51] squash! added a stateless test to check if an analyser
 bug described in https://github.com/ClickHouse/ClickHouse/issues/66333 is
 still happening

---
 ...re_2_conditions_old_analyzer_bug.reference |  4 +-
 ...nd_where_2_conditions_old_analyzer_bug.sql | 37 +++++--------------
 2 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/tests/queries/0_stateless/03203_multiif_and_where_2_conditions_old_analyzer_bug.reference b/tests/queries/0_stateless/03203_multiif_and_where_2_conditions_old_analyzer_bug.reference
index 38f7434e427..9ba9848ee2d 100644
--- a/tests/queries/0_stateless/03203_multiif_and_where_2_conditions_old_analyzer_bug.reference
+++ b/tests/queries/0_stateless/03203_multiif_and_where_2_conditions_old_analyzer_bug.reference
@@ -1,4 +1,4 @@
 this query used to be broken in old analyser:
-c1	c2	yes	true	1
+c1	c2	yes	true
 this query worked:
-c1	c2	yes	true	1
+yes	true
diff --git a/tests/queries/0_stateless/03203_multiif_and_where_2_conditions_old_analyzer_bug.sql b/tests/queries/0_stateless/03203_multiif_and_where_2_conditions_old_analyzer_bug.sql
index 8c82c5c3b53..d5e7f10e395 100644
--- a/tests/queries/0_stateless/03203_multiif_and_where_2_conditions_old_analyzer_bug.sql
+++ b/tests/queries/0_stateless/03203_multiif_and_where_2_conditions_old_analyzer_bug.sql
@@ -6,37 +6,18 @@ AS SELECT
     'c2' as column_b;
 
 select 'this query used to be broken in old analyser:';
-SELECT
-    *,
-      multiIf(column_b IN (
-        SELECT 'c2' as someproduct
-    ), 'yes', 'no') AS condition_1,
-    multiIf(column_b  = 'c2', 'true', 'false') AS condition_2,
-  --condition in WHERE is true
-  (condition_1 IN ('yes')) AND (condition_2 in ('true')) as cond
-FROM
-(
-    SELECT column_a, column_b
-    FROM bugcheck1
-)
+SELECT *,
+    multiIf(column_b IN (SELECT 'c2' as someproduct), 'yes', 'no') AS condition_1,
+    multiIf(column_b  = 'c2', 'true', 'false') AS condition_2
+FROM (SELECT column_a, column_b FROM bugcheck1)
 WHERE (condition_1 IN ('yes')) AND (condition_2 in ('true'))
 settings allow_experimental_analyzer=0;
 
 select 'this query worked:';
+
 SELECT
-    *,
-      multiIf(column_b IN (
-        SELECT 'c2' as someproduct
-    ), 'yes', 'no') AS condition_1,
-    multiIf(column_b  = 'c2', 'true', 'false') AS condition_2,
-  --condition in WHERE is true
-  (condition_1 IN ('yes')) AND (condition_2 in ('true')) as cond
-FROM
-(
-    SELECT column_a, column_b
-    FROM bugcheck1
-)
---the next line is the only difference:
--- WHERE (condition_1 IN ('yes')) AND (condition_2 in ('true'))
-WHERE (condition_2 in ('true'))
+    multiIf(column_b IN (SELECT 'c2' as someproduct), 'yes', 'no') AS condition_1,
+    multiIf(column_b  = 'c2', 'true', 'false') AS condition_2
+FROM (SELECT column_a, column_b FROM bugcheck1)
+WHERE (condition_1 IN ('yes')) AND (condition_2 in ('true'))
 settings allow_experimental_analyzer=0;

From 64764a531f1625777397145a6a67ced07a192278 Mon Sep 17 00:00:00 2001
From: maxvostrikov <max.vostrikov@clickhouse.com>
Date: Fri, 12 Jul 2024 12:49:38 +0200
Subject: [PATCH 33/51] squash! added a stateless test to check if an analyser
 bug described in https://github.com/ClickHouse/ClickHouse/issues/66333 is
 still happening

---
 ...where_2_conditions_old_analyzer_bug.reference |  2 ++
 ...f_and_where_2_conditions_old_analyzer_bug.sql | 16 ++++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/tests/queries/0_stateless/03203_multiif_and_where_2_conditions_old_analyzer_bug.reference b/tests/queries/0_stateless/03203_multiif_and_where_2_conditions_old_analyzer_bug.reference
index 9ba9848ee2d..5512e59cc73 100644
--- a/tests/queries/0_stateless/03203_multiif_and_where_2_conditions_old_analyzer_bug.reference
+++ b/tests/queries/0_stateless/03203_multiif_and_where_2_conditions_old_analyzer_bug.reference
@@ -2,3 +2,5 @@ this query used to be broken in old analyser:
 c1	c2	yes	true
 this query worked:
 yes	true
+experimental analyzer:
+c1	c2	yes	true
diff --git a/tests/queries/0_stateless/03203_multiif_and_where_2_conditions_old_analyzer_bug.sql b/tests/queries/0_stateless/03203_multiif_and_where_2_conditions_old_analyzer_bug.sql
index d5e7f10e395..39d772324bd 100644
--- a/tests/queries/0_stateless/03203_multiif_and_where_2_conditions_old_analyzer_bug.sql
+++ b/tests/queries/0_stateless/03203_multiif_and_where_2_conditions_old_analyzer_bug.sql
@@ -7,8 +7,8 @@ AS SELECT
 
 select 'this query used to be broken in old analyser:';
 SELECT *,
-    multiIf(column_b IN (SELECT 'c2' as someproduct), 'yes', 'no') AS condition_1,
-    multiIf(column_b  = 'c2', 'true', 'false') AS condition_2
+  multiIf(column_b IN (SELECT 'c2' as someproduct), 'yes', 'no') AS condition_1,
+  multiIf(column_b  = 'c2', 'true', 'false') AS condition_2
 FROM (SELECT column_a, column_b FROM bugcheck1)
 WHERE (condition_1 IN ('yes')) AND (condition_2 in ('true'))
 settings allow_experimental_analyzer=0;
@@ -16,8 +16,16 @@ settings allow_experimental_analyzer=0;
 select 'this query worked:';
 
 SELECT
-    multiIf(column_b IN (SELECT 'c2' as someproduct), 'yes', 'no') AS condition_1,
-    multiIf(column_b  = 'c2', 'true', 'false') AS condition_2
+  multiIf(column_b IN (SELECT 'c2' as someproduct), 'yes', 'no') AS condition_1,
+  multiIf(column_b  = 'c2', 'true', 'false') AS condition_2
 FROM (SELECT column_a, column_b FROM bugcheck1)
 WHERE (condition_1 IN ('yes')) AND (condition_2 in ('true'))
 settings allow_experimental_analyzer=0;
+
+select 'experimental analyzer:';
+SELECT *,
+  multiIf(column_b IN (SELECT 'c2' as someproduct), 'yes', 'no') AS condition_1,
+  multiIf(column_b  = 'c2', 'true', 'false') AS condition_2
+FROM (SELECT column_a, column_b FROM bugcheck1)
+WHERE (condition_1 IN ('yes')) AND (condition_2 in ('true'))
+settings allow_experimental_analyzer=1;

From 6e67edfeaa8f1ec3e71275e2cc7c8ada4c2c80ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= <git@rmr.ninja>
Date: Fri, 12 Jul 2024 16:45:42 +0200
Subject: [PATCH 34/51] Conflicts

---
 src/Functions/FunctionsJSON.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Functions/FunctionsJSON.cpp b/src/Functions/FunctionsJSON.cpp
index db1602b1939..47040545677 100644
--- a/src/Functions/FunctionsJSON.cpp
+++ b/src/Functions/FunctionsJSON.cpp
@@ -10,6 +10,7 @@
 #include <Common/assert_cast.h>
 
 #include <Core/AccurateComparison.h>
+#include <Core/Settings.h>
 
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnLowCardinality.h>

From a1229c1ebbb1a783cf75914cc4dd7e1eb002bb6f Mon Sep 17 00:00:00 2001
From: Shaun Struwig <41984034+Blargian@users.noreply.github.com>
Date: Sat, 13 Jul 2024 20:37:13 +0200
Subject: [PATCH 35/51] Update install.md

Production builds will not run on older ARM CPUs
---
 docs/en/getting-started/install.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/getting-started/install.md b/docs/en/getting-started/install.md
index 98e73dec451..6209ef3c8ee 100644
--- a/docs/en/getting-started/install.md
+++ b/docs/en/getting-started/install.md
@@ -15,7 +15,7 @@ You have four options for getting up and running with ClickHouse:
 
 - **[ClickHouse Cloud](https://clickhouse.com/cloud/):** The official ClickHouse as a service, - built by, maintained and supported by the creators of ClickHouse
 - **[Quick Install](#quick-install):** an easy-to-download binary for testing and developing with ClickHouse
-- **[Production Deployments](#available-installation-options):** ClickHouse can run on any Linux, FreeBSD, or macOS with x86-64, ARM, or PowerPC64LE CPU architecture
+- **[Production Deployments](#available-installation-options):** ClickHouse can run on any Linux, FreeBSD, or macOS with x86-64, modern ARM (ARMv8.2-A up), or PowerPC64LE CPU architecture
 - **[Docker Image](https://hub.docker.com/r/clickhouse/clickhouse-server/):** use the official Docker image in Docker Hub
 
 ## ClickHouse Cloud

From 1e03ca16b20e2b185d0b96de0f47f88e7293cf6a Mon Sep 17 00:00:00 2001
From: Shaun Struwig <41984034+Blargian@users.noreply.github.com>
Date: Sat, 13 Jul 2024 21:52:01 +0200
Subject: [PATCH 36/51] Update developer-instruction.md

---
 docs/en/development/developer-instruction.md | 54 ++++++++++++++++++--
 1 file changed, 49 insertions(+), 5 deletions(-)

diff --git a/docs/en/development/developer-instruction.md b/docs/en/development/developer-instruction.md
index 0a1fe58b16f..4b11fb71230 100644
--- a/docs/en/development/developer-instruction.md
+++ b/docs/en/development/developer-instruction.md
@@ -226,15 +226,59 @@ Other IDEs you can use are [Sublime Text](https://www.sublimetext.com/), [Visual
 
 ## Writing Code {#writing-code}
 
-The description of ClickHouse architecture can be found here: https://clickhouse.com/docs/en/development/architecture/
+Below you can find some quick links which may be useful when writing code for ClickHouse:
 
-The Code Style Guide: https://clickhouse.com/docs/en/development/style/
+- [ClickHouse architecture description](https://clickhouse.com/docs/en/development/architecture/). 
+- [The code style guide](https://clickhouse.com/docs/en/development/style/).
+- [Adding third-party libraries](https://clickhouse.com/docs/en/development/contrib/#adding-third-party-libraries)
+- [Writing tests](https://clickhouse.com/docs/en/development/tests/)
+- [List of open issues](https://github.com/ClickHouse/ClickHouse/issues?q=is%3Aopen+is%3Aissue+label%3Ahacktoberfest)
 
-Adding third-party libraries: https://clickhouse.com/docs/en/development/contrib/#adding-third-party-libraries
+## Writing Documentation {#writing-documentation}
 
-Writing tests: https://clickhouse.com/docs/en/development/tests/
+As part of every pull request which adds a new feature, it is necessary to write documentation for it. If you'd like to preview your documentation changes the instructions for how to build the documentation page locally are available in the README.md file [here](https://github.com/ClickHouse/clickhouse-docs). When adding a new function to ClickHouse you can use the template below as a guide:
 
-List of tasks: https://github.com/ClickHouse/ClickHouse/issues?q=is%3Aopen+is%3Aissue+label%3Ahacktoberfest
+```markdown
+# newFunctionName
+
+A short description of the function goes here. It should describe briefly what it does and a typical usage case.
+
+**Syntax**
+
+\```sql
+newFunctionName(arg1, arg2[, arg3])
+\```
+
+**Arguments**
+
+- `arg1` — Description of the argument. [DataType](../data-types/float.md)
+- `arg2` — Description of the argument. [DataType](../data-types/float.md)
+- `arg3` — Description of optional argument (optional). [DataType](../data-types/float.md)
+
+**Implementation Details**
+
+A description of implementation details if relevant.
+
+**Returned value**
+
+- Returns {insert what the function returns here}. [DataType](../data-types/float.md)
+
+**Example**
+
+Query:
+
+\```sql
+SELECT 'write your example query here';
+\```
+
+Response:
+
+\```response
+┌───────────────────────────────────┐
+│ the result of the query           │
+└───────────────────────────────────┘
+\```
+```
 
 ## Test Data {#test-data}
 

From 7e0daae303eda27229743eaa9d5f9371c8bcb6a4 Mon Sep 17 00:00:00 2001
From: Robert Schulze <robert@clickhouse.com>
Date: Sat, 13 Jul 2024 20:05:39 +0000
Subject: [PATCH 37/51] Revert "Fix style"

This reverts commit 0eb081f899bd0fa9c185add84c9c59e212dfd6ca.
---
 tests/integration/test_lost_part/test.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/integration/test_lost_part/test.py b/tests/integration/test_lost_part/test.py
index e88b84775b4..5070b3c5b68 100644
--- a/tests/integration/test_lost_part/test.py
+++ b/tests/integration/test_lost_part/test.py
@@ -266,9 +266,7 @@ def test_lost_last_part(start_cluster):
             "ALTER TABLE mt3 UPDATE id = 777 WHERE 1", settings={"mutations_sync": "0"}
         )
 
-        partition_id = node1.query(
-            "select distinct _partition_id from mt3 where p = 'x'"
-        ).strip()
+        partition_id = node1.query("select distinct _partition_id from mt3 where p = 'x'").strip()
         remove_part_from_disk(node1, "mt3", f"{partition_id}_0_0_0")
 
         # other way to detect broken parts

From 9b87a1469b910d643e603f49228ef883116b3905 Mon Sep 17 00:00:00 2001
From: Robert Schulze <robert@clickhouse.com>
Date: Sat, 13 Jul 2024 20:06:12 +0000
Subject: [PATCH 38/51] Revert "Fix integration tests"

This reverts commit 85f5fe832a23fa25e9784728b9f26d712057148a.
---
 tests/integration/test_backward_compatibility/test_functions.py | 2 --
 tests/integration/test_lost_part/test.py                        | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/integration/test_backward_compatibility/test_functions.py b/tests/integration/test_backward_compatibility/test_functions.py
index 551a0550c0c..fc03a77030e 100644
--- a/tests/integration/test_backward_compatibility/test_functions.py
+++ b/tests/integration/test_backward_compatibility/test_functions.py
@@ -168,8 +168,6 @@ def test_string_functions(start_cluster):
         "filesystemAvailable",
         # Exclude it for now. Looks like the result depends on the build type.
         "farmHash64",
-        # Removed in 24.7
-        "partitionId",
     ]
     functions = filter(lambda x: x not in excludes, functions)
 
diff --git a/tests/integration/test_lost_part/test.py b/tests/integration/test_lost_part/test.py
index 5070b3c5b68..5d0ec383a39 100644
--- a/tests/integration/test_lost_part/test.py
+++ b/tests/integration/test_lost_part/test.py
@@ -266,7 +266,7 @@ def test_lost_last_part(start_cluster):
             "ALTER TABLE mt3 UPDATE id = 777 WHERE 1", settings={"mutations_sync": "0"}
         )
 
-        partition_id = node1.query("select distinct _partition_id from mt3 where p = 'x'").strip()
+        partition_id = node1.query("select _partition_id").strip()
         remove_part_from_disk(node1, "mt3", f"{partition_id}_0_0_0")
 
         # other way to detect broken parts

From cef13cfa723508e40d203eff4b185a8ae716c911 Mon Sep 17 00:00:00 2001
From: Robert Schulze <robert@clickhouse.com>
Date: Sat, 13 Jul 2024 20:06:19 +0000
Subject: [PATCH 39/51] Revert "Update
 02415_all_new_functions_must_be_documented.reference"

This reverts commit ee4162f5ec3c34e2e35eec5fca012d75aee84401.
---
 .../02415_all_new_functions_must_be_documented.reference         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/queries/0_stateless/02415_all_new_functions_must_be_documented.reference b/tests/queries/0_stateless/02415_all_new_functions_must_be_documented.reference
index eb5ae5b4f44..a152066a460 100644
--- a/tests/queries/0_stateless/02415_all_new_functions_must_be_documented.reference
+++ b/tests/queries/0_stateless/02415_all_new_functions_must_be_documented.reference
@@ -534,6 +534,7 @@ parseDateTimeInJodaSyntaxOrZero
 parseDateTimeOrNull
 parseDateTimeOrZero
 parseTimeDelta
+partitionId
 path
 pathFull
 pi

From eb9a629868899c144f30a3b5fe19b9832aafc43e Mon Sep 17 00:00:00 2001
From: Robert Schulze <robert@clickhouse.com>
Date: Sat, 13 Jul 2024 20:06:37 +0000
Subject: [PATCH 40/51] Revert "remove partitionID function, update tests and
 remove from documentation"

This reverts commit c3b72386a2f26ad40431eca0c1985b14663b43ca.
---
 .../functions/other-functions.md              | 60 ++++++++++++++++
 src/Functions/partitionId.cpp                 | 71 +++++++++++++++++++
 tests/integration/test_lost_part/test.py      |  2 +-
 .../01748_partition_id_pruning.sql            |  6 +-
 4 files changed, 135 insertions(+), 4 deletions(-)
 create mode 100644 src/Functions/partitionId.cpp

diff --git a/docs/en/sql-reference/functions/other-functions.md b/docs/en/sql-reference/functions/other-functions.md
index 8f9fd9abb0d..68d2c12f25c 100644
--- a/docs/en/sql-reference/functions/other-functions.md
+++ b/docs/en/sql-reference/functions/other-functions.md
@@ -2984,6 +2984,66 @@ Result:
 └─────────┘
 ```
 
+## partitionId
+
+Returns computed [partition](../../engines/table-engines/mergetree-family/custom-partitioning-key.md) IDs of its arguments.
+
+:::note
+This function is slow and should not be called for large amount of rows.
+:::
+
+**Syntax**
+
+```sql
+partitionId(x[, y, ...]);
+```
+
+**Arguments**
+
+- `x` — Column for which to return the partition ID.
+- `y, ...` — Remaining N columns for which to return the partition ID (optional).
+
+**Return Type**
+
+- Partition ID that the row belongs to. [String](../data-types/string.md).
+
+**Example**
+
+Query:
+
+```sql
+DROP TABLE IF EXISTS mt;
+CREATE TABLE mt
+(
+  `i` int,
+  `j` int
+)
+ENGINE = MergeTree
+PARTITION BY i
+ORDER BY j
+SETTINGS index_granularity = 1;
+
+INSERT INTO mt VALUES (1, 1), (1, 2), (1, 3), (2, 4), (2, 5), (2, 6);
+
+SELECT * FROM mt WHERE _partition_id = partitionId(1);
+SELECT * FROM mt WHERE _partition_id = partitionId(2);
+```
+Result:
+
+```response
+   ┌─i─┬─j─┐
+1. │ 1 │ 1 │
+2. │ 1 │ 2 │
+3. │ 1 │ 3 │
+   └───┴───┘
+   ┌─i─┬─j─┐
+1. │ 2 │ 4 │
+2. │ 2 │ 5 │
+3. │ 2 │ 6 │
+   └───┴───┘
+```
+
+
 ## shardNum
 
 Returns the index of a shard which processes a part of data in a distributed query. Indices are started from `1`.
diff --git a/src/Functions/partitionId.cpp b/src/Functions/partitionId.cpp
new file mode 100644
index 00000000000..e2e9038cd8b
--- /dev/null
+++ b/src/Functions/partitionId.cpp
@@ -0,0 +1,71 @@
+#include <memory>
+#include <Columns/ColumnString.h>
+#include <Core/Block.h>
+#include <DataTypes/DataTypeString.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/IFunction.h>
+#include <Storages/MergeTree/MergeTreePartition.h>
+
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+}
+
+
+/** partitionId(x, y, ...) is a function that computes partition ids of arguments.
+  * The function is slow and should not be called for large amount of rows.
+  */
+class FunctionPartitionId : public IFunction
+{
+public:
+    static constexpr auto name = "partitionId";
+
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionPartitionId>(); }
+
+    String getName() const override { return name; }
+
+    bool isVariadic() const override { return true; }
+
+    size_t getNumberOfArguments() const override { return 0; }
+
+    bool isInjective(const ColumnsWithTypeAndName & /*sample_columns*/) const override { return true; }
+
+    bool useDefaultImplementationForNulls() const override { return true; }
+    bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    {
+        if (arguments.empty())
+            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Function {} requires at least one argument.", getName());
+
+        return std::make_shared<DataTypeString>();
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        Block sample_block(arguments);
+        size_t size = arguments.size();
+
+        auto result_column = ColumnString::create();
+        for (size_t j = 0; j < input_rows_count; ++j)
+        {
+            Row row(size);
+            for (size_t i = 0; i < size; ++i)
+                arguments[i].column->get(j, row[i]);
+            MergeTreePartition partition(std::move(row));
+            result_column->insert(partition.getID(sample_block));
+        }
+        return result_column;
+    }
+};
+
+REGISTER_FUNCTION(PartitionId)
+{
+    factory.registerFunction<FunctionPartitionId>();
+}
+
+}
diff --git a/tests/integration/test_lost_part/test.py b/tests/integration/test_lost_part/test.py
index 5d0ec383a39..b8e67551d79 100644
--- a/tests/integration/test_lost_part/test.py
+++ b/tests/integration/test_lost_part/test.py
@@ -266,7 +266,7 @@ def test_lost_last_part(start_cluster):
             "ALTER TABLE mt3 UPDATE id = 777 WHERE 1", settings={"mutations_sync": "0"}
         )
 
-        partition_id = node1.query("select _partition_id").strip()
+        partition_id = node1.query("select partitionId('x')").strip()
         remove_part_from_disk(node1, "mt3", f"{partition_id}_0_0_0")
 
         # other way to detect broken parts
diff --git a/tests/queries/0_stateless/01748_partition_id_pruning.sql b/tests/queries/0_stateless/01748_partition_id_pruning.sql
index 0e942573652..b637528bc6c 100644
--- a/tests/queries/0_stateless/01748_partition_id_pruning.sql
+++ b/tests/queries/0_stateless/01748_partition_id_pruning.sql
@@ -8,17 +8,17 @@ insert into x values (1, 1), (1, 2), (1, 3), (2, 4), (2, 5), (2, 6);
 
 set max_rows_to_read = 3;
 
-select * from x where _partition_id = '1';
+select * from x where _partition_id = partitionId(1);
 
 set max_rows_to_read = 5; -- one row for subquery + subquery
 
-select * from x where _partition_id in (select number + 1 from numbers(1));
+select * from x where _partition_id in (select partitionId(number + 1) from numbers(1));
 
 -- trivial count optimization test
 set max_rows_to_read = 2; -- one row for subquery + subquery itself
 -- TODO: Relax the limits because we might build prepared set twice with _minmax_count_projection
 set max_rows_to_read = 3;
-select count() from x where _partition_id in (select number + 1 from numbers(1));
+select count() from x where _partition_id in (select partitionId(number + 1) from numbers(1));
 
 drop table x;
 

From 2f913f193ca8a08b10800d5b4b9d0b9473db91d1 Mon Sep 17 00:00:00 2001
From: Robert Schulze <robert@clickhouse.com>
Date: Sat, 13 Jul 2024 20:25:58 +0000
Subject: [PATCH 41/51] Fixup docs

---
 .../functions/other-functions.md              | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/docs/en/sql-reference/functions/other-functions.md b/docs/en/sql-reference/functions/other-functions.md
index 68d2c12f25c..cb31d21e1b3 100644
--- a/docs/en/sql-reference/functions/other-functions.md
+++ b/docs/en/sql-reference/functions/other-functions.md
@@ -2986,7 +2986,7 @@ Result:
 
 ## partitionId
 
-Returns computed [partition](../../engines/table-engines/mergetree-family/custom-partitioning-key.md) IDs of its arguments.
+Computes the [partition ID](../../engines/table-engines/mergetree-family/custom-partitioning-key.md).
 
 :::note
 This function is slow and should not be called for large amount of rows.
@@ -3003,44 +3003,44 @@ partitionId(x[, y, ...]);
 - `x` — Column for which to return the partition ID.
 - `y, ...` — Remaining N columns for which to return the partition ID (optional).
 
-**Return Type**
+**Returned Value**
 
-- Partition ID that the row belongs to. [String](../data-types/string.md).
+- Partition ID that the row would belong to. [String](../data-types/string.md).
 
 **Example**
 
 Query:
 
 ```sql
-DROP TABLE IF EXISTS mt;
-CREATE TABLE mt
+DROP TABLE IF EXISTS tab;
+
+CREATE TABLE tab
 (
-  `i` int,
-  `j` int
+  i int,
+  j int
 )
 ENGINE = MergeTree
 PARTITION BY i
-ORDER BY j
-SETTINGS index_granularity = 1;
+ORDER BY tuple();
 
-INSERT INTO mt VALUES (1, 1), (1, 2), (1, 3), (2, 4), (2, 5), (2, 6);
+INSERT INTO tab VALUES (1, 1), (1, 2), (1, 3), (2, 4), (2, 5), (2, 6);
 
-SELECT * FROM mt WHERE _partition_id = partitionId(1);
-SELECT * FROM mt WHERE _partition_id = partitionId(2);
+SELECT i, j, partitionId(i), _partition_id FROM tab ORDER BY i, j;
 ```
+
 Result:
 
 ```response
-   ┌─i─┬─j─┐
-1. │ 1 │ 1 │
-2. │ 1 │ 2 │
-3. │ 1 │ 3 │
-   └───┴───┘
-   ┌─i─┬─j─┐
-1. │ 2 │ 4 │
-2. │ 2 │ 5 │
-3. │ 2 │ 6 │
-   └───┴───┘
+┌─i─┬─j─┬─partitionId(i)─┬─_partition_id─┐
+│ 1 │ 1 │ 1              │ 1             │
+│ 1 │ 2 │ 1              │ 1             │
+│ 1 │ 3 │ 1              │ 1             │
+└───┴───┴────────────────┴───────────────┘
+┌─i─┬─j─┬─partitionId(i)─┬─_partition_id─┐
+│ 2 │ 4 │ 2              │ 2             │
+│ 2 │ 5 │ 2              │ 2             │
+│ 2 │ 6 │ 2              │ 2             │
+└───┴───┴────────────────┴───────────────┘
 ```
 
 

From 6ba7765b8114828b97ac6ca9191de1bb98b8d53d Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@clickhouse.com>
Date: Sat, 13 Jul 2024 23:33:29 +0200
Subject: [PATCH 42/51] Update
 03203_multiif_and_where_2_conditions_old_analyzer_bug.sql

---
 ...3203_multiif_and_where_2_conditions_old_analyzer_bug.sql | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/queries/0_stateless/03203_multiif_and_where_2_conditions_old_analyzer_bug.sql b/tests/queries/0_stateless/03203_multiif_and_where_2_conditions_old_analyzer_bug.sql
index 39d772324bd..c97333f7df4 100644
--- a/tests/queries/0_stateless/03203_multiif_and_where_2_conditions_old_analyzer_bug.sql
+++ b/tests/queries/0_stateless/03203_multiif_and_where_2_conditions_old_analyzer_bug.sql
@@ -1,4 +1,6 @@
-CREATE OR REPLACE TABLE bugcheck1
+DROP TABLE IF EXISTS bugcheck1;
+
+CREATE TABLE bugcheck1
 ENGINE = MergeTree
 ORDER BY tuple()
 AS SELECT
@@ -29,3 +31,5 @@ SELECT *,
 FROM (SELECT column_a, column_b FROM bugcheck1)
 WHERE (condition_1 IN ('yes')) AND (condition_2 in ('true'))
 settings allow_experimental_analyzer=1;
+
+DROP TABLE bugcheck1;

From a90e10c438e58e896482f958ca905e7dc21a9993 Mon Sep 17 00:00:00 2001
From: Shaun Struwig <41984034+Blargian@users.noreply.github.com>
Date: Sat, 13 Jul 2024 22:38:28 +0000
Subject: [PATCH 43/51] add alias partitionI, update tests, and docs

---
 docs/en/sql-reference/functions/other-functions.md     | 10 +++++-----
 src/Functions/partitionId.cpp                          |  1 +
 tests/integration/test_lost_part/test.py               |  2 +-
 .../queries/0_stateless/01748_partition_id_pruning.sql |  6 +++---
 utils/check-style/aspell-ignore/en/aspell-dict.txt     |  1 +
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/docs/en/sql-reference/functions/other-functions.md b/docs/en/sql-reference/functions/other-functions.md
index cb31d21e1b3..260457b3be1 100644
--- a/docs/en/sql-reference/functions/other-functions.md
+++ b/docs/en/sql-reference/functions/other-functions.md
@@ -2984,7 +2984,7 @@ Result:
 └─────────┘
 ```
 
-## partitionId
+## partitionID
 
 Computes the [partition ID](../../engines/table-engines/mergetree-family/custom-partitioning-key.md).
 
@@ -2995,7 +2995,7 @@ This function is slow and should not be called for large amount of rows.
 **Syntax**
 
 ```sql
-partitionId(x[, y, ...]);
+partitionID(x[, y, ...]);
 ```
 
 **Arguments**
@@ -3025,18 +3025,18 @@ ORDER BY tuple();
 
 INSERT INTO tab VALUES (1, 1), (1, 2), (1, 3), (2, 4), (2, 5), (2, 6);
 
-SELECT i, j, partitionId(i), _partition_id FROM tab ORDER BY i, j;
+SELECT i, j, partitionID(i), _partition_id FROM tab ORDER BY i, j;
 ```
 
 Result:
 
 ```response
-┌─i─┬─j─┬─partitionId(i)─┬─_partition_id─┐
+┌─i─┬─j─┬─partitionID(i)─┬─_partition_id─┐
 │ 1 │ 1 │ 1              │ 1             │
 │ 1 │ 2 │ 1              │ 1             │
 │ 1 │ 3 │ 1              │ 1             │
 └───┴───┴────────────────┴───────────────┘
-┌─i─┬─j─┬─partitionId(i)─┬─_partition_id─┐
+┌─i─┬─j─┬─partitionID(i)─┬─_partition_id─┐
 │ 2 │ 4 │ 2              │ 2             │
 │ 2 │ 5 │ 2              │ 2             │
 │ 2 │ 6 │ 2              │ 2             │
diff --git a/src/Functions/partitionId.cpp b/src/Functions/partitionId.cpp
index e2e9038cd8b..00ff3981c88 100644
--- a/src/Functions/partitionId.cpp
+++ b/src/Functions/partitionId.cpp
@@ -66,6 +66,7 @@ public:
 REGISTER_FUNCTION(PartitionId)
 {
     factory.registerFunction<FunctionPartitionId>();
+    factory.registerAlias("partitionID", "partitionId", FunctionFactory::CaseInsensitive);
 }
 
 }
diff --git a/tests/integration/test_lost_part/test.py b/tests/integration/test_lost_part/test.py
index b8e67551d79..c2469d6c524 100644
--- a/tests/integration/test_lost_part/test.py
+++ b/tests/integration/test_lost_part/test.py
@@ -266,7 +266,7 @@ def test_lost_last_part(start_cluster):
             "ALTER TABLE mt3 UPDATE id = 777 WHERE 1", settings={"mutations_sync": "0"}
         )
 
-        partition_id = node1.query("select partitionId('x')").strip()
+        partition_id = node1.query("select partitionID('x')").strip()
         remove_part_from_disk(node1, "mt3", f"{partition_id}_0_0_0")
 
         # other way to detect broken parts
diff --git a/tests/queries/0_stateless/01748_partition_id_pruning.sql b/tests/queries/0_stateless/01748_partition_id_pruning.sql
index b637528bc6c..f492a4a8871 100644
--- a/tests/queries/0_stateless/01748_partition_id_pruning.sql
+++ b/tests/queries/0_stateless/01748_partition_id_pruning.sql
@@ -8,17 +8,17 @@ insert into x values (1, 1), (1, 2), (1, 3), (2, 4), (2, 5), (2, 6);
 
 set max_rows_to_read = 3;
 
-select * from x where _partition_id = partitionId(1);
+select * from x where _partition_id = partitionID(1);
 
 set max_rows_to_read = 5; -- one row for subquery + subquery
 
-select * from x where _partition_id in (select partitionId(number + 1) from numbers(1));
+select * from x where _partition_id in (select partitionID(number + 1) from numbers(1));
 
 -- trivial count optimization test
 set max_rows_to_read = 2; -- one row for subquery + subquery itself
 -- TODO: Relax the limits because we might build prepared set twice with _minmax_count_projection
 set max_rows_to_read = 3;
-select count() from x where _partition_id in (select partitionId(number + 1) from numbers(1));
+select count() from x where _partition_id in (select partitionID(number + 1) from numbers(1));
 
 drop table x;
 
diff --git a/utils/check-style/aspell-ignore/en/aspell-dict.txt b/utils/check-style/aspell-ignore/en/aspell-dict.txt
index 935b08c1b88..e5f06b468a0 100644
--- a/utils/check-style/aspell-ignore/en/aspell-dict.txt
+++ b/utils/check-style/aspell-ignore/en/aspell-dict.txt
@@ -2193,6 +2193,7 @@ parseTimeDelta
 parseable
 parsers
 partitionId
+partitionID
 pathFull
 pclmulqdq
 pcre

From 22611781b0944670b4b33aa65e6c11733b4e1f3e Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Fri, 12 Jul 2024 14:40:40 +0200
Subject: [PATCH 44/51] Fix jemalloc assertion due to non-monotonic
 CLOCK_MONOTONIC_COARSE

Recently one tricky assertion of jemalloc had been discovered [1]:

    Failed assertion: "nstime_compare(&decay->epoch, new_time) <= 0"

  [1]: https://github.com/ClickHouse/ClickHouse/issues/66193

And as it turns out it is really possible for CLOCK_MONOTONIC_COARSE to
go backwards, in a nutshell it can be done with ADJ_FREQUENCY, you can
find example here [2]. And I can't trigger this issue for non-coarse
clocks.

  [2]: https://gist.github.com/azat/7ea7f50ed75591b1af2d675a240ea94c?permalink_comment_id=5119222#gistcomment-5119222

But, jemalloc do not call clock_gettime() that frequently (I've verified
it), so it can use non-coarse version - CLOCK_MONOTONIC

I've also measured the latency of CLOCK_MONOTONIC and
CLOCK_MONOTONIC_COARSE, and it is 20ns vs 4ns per call [3], so make this
change affect performance you need really frequently calls of
clock_gettime.

  [3]: https://gist.github.com/azat/622fa1f9a5d8e7d546ee9d294501961d?permalink_comment_id=5119245#gistcomment-5119245

Interesting, that this bug started to appears only after jemalloc heap
profiler had been enabled by default [4], no clue why (I would believe
more in a more frequent calls to clock_adjtime(ADJ_FREQUENCY), but I
can't verify this)

  [4]: https://github.com/ClickHouse/ClickHouse/pull/65702

To be continued...

Fixes: https://github.com/ClickHouse/ClickHouse/issues/66193
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
---
 contrib/jemalloc-cmake/README                         | 11 +++++++++++
 .../jemalloc/internal/jemalloc_internal_defs.h.in     |  2 +-
 .../jemalloc/internal/jemalloc_internal_defs.h.in     |  2 +-
 .../jemalloc/internal/jemalloc_internal_defs.h.in     |  2 +-
 .../jemalloc/internal/jemalloc_internal_defs.h.in     |  2 +-
 .../jemalloc/internal/jemalloc_internal_defs.h.in     |  2 +-
 .../jemalloc/internal/jemalloc_internal_defs.h.in     |  2 +-
 .../jemalloc/internal/jemalloc_internal_defs.h.in     |  2 +-
 8 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/contrib/jemalloc-cmake/README b/contrib/jemalloc-cmake/README
index 91b58448c1f..89d7c818445 100644
--- a/contrib/jemalloc-cmake/README
+++ b/contrib/jemalloc-cmake/README
@@ -4,3 +4,14 @@ It allows to integrate JEMalloc into CMake project.
 - Added JEMALLOC_CONFIG_MALLOC_CONF substitution
 - Add musl support (USE_MUSL)
 - Also note, that darwin build requires JEMALLOC_PREFIX, while others do not
+- JEMALLOC_HAVE_CLOCK_MONOTONIC_COARSE should be disabled
+
+  CLOCK_MONOTONIC_COARSE can go backwards after clock_adjtime(ADJ_FREQUENCY)
+  Let's disable it for now, and this menas that CLOCK_MONOTONIC will be used,
+  and this, should not be a problem, since:
+  - jemalloc do not call clock_gettime() that frequently
+  - the difference is CLOCK_MONOTONIC 20ns and CLOCK_MONOTONIC_COARSE 4ns
+
+  This can be done with the following command:
+
+      gg JEMALLOC_HAVE_CLOCK_MONOTONIC_COARSE | cut -d: -f1 | xargs sed -i 's@#define JEMALLOC_HAVE_CLOCK_MONOTONIC_COARSE@/* #undef JEMALLOC_HAVE_CLOCK_MONOTONIC_COARSE */@'
diff --git a/contrib/jemalloc-cmake/include_freebsd_ppc64le/jemalloc/internal/jemalloc_internal_defs.h.in b/contrib/jemalloc-cmake/include_freebsd_ppc64le/jemalloc/internal/jemalloc_internal_defs.h.in
index e027ee97d1a..b58d5c1eb8e 100644
--- a/contrib/jemalloc-cmake/include_freebsd_ppc64le/jemalloc/internal/jemalloc_internal_defs.h.in
+++ b/contrib/jemalloc-cmake/include_freebsd_ppc64le/jemalloc/internal/jemalloc_internal_defs.h.in
@@ -96,7 +96,7 @@
 /*
  * Defined if clock_gettime(CLOCK_MONOTONIC_COARSE, ...) is available.
  */
-#define JEMALLOC_HAVE_CLOCK_MONOTONIC_COARSE 
+/* #undef JEMALLOC_HAVE_CLOCK_MONOTONIC_COARSE */ 
 
 /*
  * Defined if clock_gettime(CLOCK_MONOTONIC, ...) is available.
diff --git a/contrib/jemalloc-cmake/include_linux_aarch64/jemalloc/internal/jemalloc_internal_defs.h.in b/contrib/jemalloc-cmake/include_linux_aarch64/jemalloc/internal/jemalloc_internal_defs.h.in
index 597f2d59933..8bfc4b60f3d 100644
--- a/contrib/jemalloc-cmake/include_linux_aarch64/jemalloc/internal/jemalloc_internal_defs.h.in
+++ b/contrib/jemalloc-cmake/include_linux_aarch64/jemalloc/internal/jemalloc_internal_defs.h.in
@@ -98,7 +98,7 @@
 /*
  * Defined if clock_gettime(CLOCK_MONOTONIC_COARSE, ...) is available.
  */
-#define JEMALLOC_HAVE_CLOCK_MONOTONIC_COARSE
+/* #undef JEMALLOC_HAVE_CLOCK_MONOTONIC_COARSE */
 
 /*
  * Defined if clock_gettime(CLOCK_MONOTONIC, ...) is available.
diff --git a/contrib/jemalloc-cmake/include_linux_ppc64le/jemalloc/internal/jemalloc_internal_defs.h.in b/contrib/jemalloc-cmake/include_linux_ppc64le/jemalloc/internal/jemalloc_internal_defs.h.in
index 0a72e71496b..d5197c6127f 100644
--- a/contrib/jemalloc-cmake/include_linux_ppc64le/jemalloc/internal/jemalloc_internal_defs.h.in
+++ b/contrib/jemalloc-cmake/include_linux_ppc64le/jemalloc/internal/jemalloc_internal_defs.h.in
@@ -98,7 +98,7 @@
 /*
  * Defined if clock_gettime(CLOCK_MONOTONIC_COARSE, ...) is available.
  */
-#define JEMALLOC_HAVE_CLOCK_MONOTONIC_COARSE
+/* #undef JEMALLOC_HAVE_CLOCK_MONOTONIC_COARSE */
 
 /*
  * Defined if clock_gettime(CLOCK_MONOTONIC, ...) is available.
diff --git a/contrib/jemalloc-cmake/include_linux_riscv64/jemalloc/internal/jemalloc_internal_defs.h.in b/contrib/jemalloc-cmake/include_linux_riscv64/jemalloc/internal/jemalloc_internal_defs.h.in
index 597f2d59933..8bfc4b60f3d 100644
--- a/contrib/jemalloc-cmake/include_linux_riscv64/jemalloc/internal/jemalloc_internal_defs.h.in
+++ b/contrib/jemalloc-cmake/include_linux_riscv64/jemalloc/internal/jemalloc_internal_defs.h.in
@@ -98,7 +98,7 @@
 /*
  * Defined if clock_gettime(CLOCK_MONOTONIC_COARSE, ...) is available.
  */
-#define JEMALLOC_HAVE_CLOCK_MONOTONIC_COARSE
+/* #undef JEMALLOC_HAVE_CLOCK_MONOTONIC_COARSE */
 
 /*
  * Defined if clock_gettime(CLOCK_MONOTONIC, ...) is available.
diff --git a/contrib/jemalloc-cmake/include_linux_s390x/jemalloc/internal/jemalloc_internal_defs.h.in b/contrib/jemalloc-cmake/include_linux_s390x/jemalloc/internal/jemalloc_internal_defs.h.in
index 531f2bca0c2..b3f3a489a83 100644
--- a/contrib/jemalloc-cmake/include_linux_s390x/jemalloc/internal/jemalloc_internal_defs.h.in
+++ b/contrib/jemalloc-cmake/include_linux_s390x/jemalloc/internal/jemalloc_internal_defs.h.in
@@ -96,7 +96,7 @@
 /*
  * Defined if clock_gettime(CLOCK_MONOTONIC_COARSE, ...) is available.
  */
-#define JEMALLOC_HAVE_CLOCK_MONOTONIC_COARSE 
+/* #undef JEMALLOC_HAVE_CLOCK_MONOTONIC_COARSE */ 
 
 /*
  * Defined if clock_gettime(CLOCK_MONOTONIC, ...) is available.
diff --git a/contrib/jemalloc-cmake/include_linux_x86_64/jemalloc/internal/jemalloc_internal_defs.h.in b/contrib/jemalloc-cmake/include_linux_x86_64/jemalloc/internal/jemalloc_internal_defs.h.in
index d21098a4dcc..cf9acdb0b80 100644
--- a/contrib/jemalloc-cmake/include_linux_x86_64/jemalloc/internal/jemalloc_internal_defs.h.in
+++ b/contrib/jemalloc-cmake/include_linux_x86_64/jemalloc/internal/jemalloc_internal_defs.h.in
@@ -98,7 +98,7 @@
 /*
  * Defined if clock_gettime(CLOCK_MONOTONIC_COARSE, ...) is available.
  */
-#define JEMALLOC_HAVE_CLOCK_MONOTONIC_COARSE
+/* #undef JEMALLOC_HAVE_CLOCK_MONOTONIC_COARSE */
 
 /*
  * Defined if clock_gettime(CLOCK_MONOTONIC, ...) is available.
diff --git a/contrib/jemalloc-cmake/include_linux_x86_64_musl/jemalloc/internal/jemalloc_internal_defs.h.in b/contrib/jemalloc-cmake/include_linux_x86_64_musl/jemalloc/internal/jemalloc_internal_defs.h.in
index e08a2bed2ec..729bd82c2fa 100644
--- a/contrib/jemalloc-cmake/include_linux_x86_64_musl/jemalloc/internal/jemalloc_internal_defs.h.in
+++ b/contrib/jemalloc-cmake/include_linux_x86_64_musl/jemalloc/internal/jemalloc_internal_defs.h.in
@@ -99,7 +99,7 @@
 /*
  * Defined if clock_gettime(CLOCK_MONOTONIC_COARSE, ...) is available.
  */
-#define JEMALLOC_HAVE_CLOCK_MONOTONIC_COARSE
+/* #undef JEMALLOC_HAVE_CLOCK_MONOTONIC_COARSE */
 
 /*
  * Defined if clock_gettime(CLOCK_MONOTONIC, ...) is available.

From 669ce7cd40881a075fe473027e6668d13683c840 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Fri, 12 Jul 2024 15:01:40 +0200
Subject: [PATCH 45/51] Enable jemalloc heap profiler by default for debug
 builds as well

Since the issue with jemalloc assertion is clear, let's revert that
workaround

Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
---
 contrib/jemalloc-cmake/CMakeLists.txt | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/contrib/jemalloc-cmake/CMakeLists.txt b/contrib/jemalloc-cmake/CMakeLists.txt
index 1fbfd29a3bd..191886981c3 100644
--- a/contrib/jemalloc-cmake/CMakeLists.txt
+++ b/contrib/jemalloc-cmake/CMakeLists.txt
@@ -34,11 +34,7 @@ if (OS_LINUX)
     # avoid spurious latencies and additional work associated with
     # MADV_DONTNEED. See
     # https://github.com/ClickHouse/ClickHouse/issues/11121 for motivation.
-    if (CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG")
-        set (JEMALLOC_CONFIG_MALLOC_CONF "percpu_arena:percpu,oversize_threshold:0,muzzy_decay_ms:0,dirty_decay_ms:5000")
-    else()
-        set (JEMALLOC_CONFIG_MALLOC_CONF "percpu_arena:percpu,oversize_threshold:0,muzzy_decay_ms:0,dirty_decay_ms:5000,prof:true,prof_active:false,background_thread:true")
-    endif()
+    set (JEMALLOC_CONFIG_MALLOC_CONF "percpu_arena:percpu,oversize_threshold:0,muzzy_decay_ms:0,dirty_decay_ms:5000,prof:true,prof_active:false,background_thread:true")
 else()
     set (JEMALLOC_CONFIG_MALLOC_CONF "oversize_threshold:0,muzzy_decay_ms:0,dirty_decay_ms:5000")
 endif()

From ad86e3060a907bd3b81c56724cea6df30823716e Mon Sep 17 00:00:00 2001
From: Robert Schulze <robert@clickhouse.com>
Date: Sun, 14 Jul 2024 11:48:13 +0000
Subject: [PATCH 46/51] OpenSSL: Follow-up to #66064

More commits were added to the upstream fix after #66064 has been merged
in ClickHouse. This PR adds these commits to keep things in-sync.
---
 contrib/openssl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/openssl b/contrib/openssl
index ee2bb8513b2..66deddc1e53 160000
--- a/contrib/openssl
+++ b/contrib/openssl
@@ -1 +1 @@
-Subproject commit ee2bb8513b28bf86b35404dd17a0e29305ca9e08
+Subproject commit 66deddc1e53cda8706604a019777259372d1bd62

From fd44c533cfefbb15e9c9aa6663973c4533ebf643 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@clickhouse.com>
Date: Sun, 14 Jul 2024 20:57:02 +0200
Subject: [PATCH 47/51] Add one more revision to ignore

---
 .git-blame-ignore-revs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 06e893fabb3..5088bf90ede 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -13,3 +13,6 @@
 # dbms/ → src/
 # (though it is unlikely that you will see it in blame)
 06446b4f08a142d6f1bc30664c47ded88ab51782
+
+# Applied Black formatter for Python code
+e6f5a3f98b21ba99cf274a9833797889e020a2b3

From 89f8c577e472d0c3709220427c2da1e880eea3ad Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@clickhouse.com>
Date: Mon, 15 Jul 2024 05:34:14 +0200
Subject: [PATCH 48/51] Do not fix anything

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

diff --git a/tests/queries/0_stateless/00719_parallel_ddl_db.sh b/tests/queries/0_stateless/00719_parallel_ddl_db.sh
index ceba24df7e4..ac4e4eae4f2 100755
--- a/tests/queries/0_stateless/00719_parallel_ddl_db.sh
+++ b/tests/queries/0_stateless/00719_parallel_ddl_db.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-DB_SUFFIX=$RANDOM
+DB_SUFFIX=${RANDOM}${RANDOM}${RANDOM}${RANDOM}
 ${CLICKHOUSE_CLIENT} --query "DROP DATABASE IF EXISTS parallel_ddl_${DB_SUFFIX}"
 
 function query()

From cd719bf8fc76370821c6b1d46a226e6784dce055 Mon Sep 17 00:00:00 2001
From: Robert Schulze <robert@clickhouse.com>
Date: Mon, 15 Jul 2024 08:57:11 +0200
Subject: [PATCH 49/51] Make the alias case-sensitive

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

diff --git a/src/Functions/partitionId.cpp b/src/Functions/partitionId.cpp
index 00ff3981c88..dab56f39adc 100644
--- a/src/Functions/partitionId.cpp
+++ b/src/Functions/partitionId.cpp
@@ -66,7 +66,7 @@ public:
 REGISTER_FUNCTION(PartitionId)
 {
     factory.registerFunction<FunctionPartitionId>();
-    factory.registerAlias("partitionID", "partitionId", FunctionFactory::CaseInsensitive);
+    factory.registerAlias("partitionID", "partitionId");
 }
 
 }

From 7ef89f169ba53a73c4645d46d48a2744dfd5a4da Mon Sep 17 00:00:00 2001
From: Max K <maxkaynov@gmail.com>
Date: Mon, 15 Jul 2024 08:59:39 +0200
Subject: [PATCH 50/51] CI: Fix for skipping Builds_2 in PRs' CI

---
 tests/ci/ci_cache.py | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/tests/ci/ci_cache.py b/tests/ci/ci_cache.py
index 5229c754d70..44cdb19c3a1 100644
--- a/tests/ci/ci_cache.py
+++ b/tests/ci/ci_cache.py
@@ -710,6 +710,7 @@ class CiCache:
         """
         remove_from_to_do = []
         required_builds = []
+        has_test_jobs_to_skip = False
         for job_name, job_config in self.jobs_to_do.items():
             if CI.is_test_job(job_name) and job_name != CI.JobNames.BUILD_CHECK:
                 if job_config.reference_job_name:
@@ -723,30 +724,30 @@ class CiCache:
                     job_config=reference_config,
                 ):
                     remove_from_to_do.append(job_name)
+                    has_test_jobs_to_skip = True
                 else:
                     required_builds += (
                         job_config.required_builds if job_config.required_builds else []
                     )
 
-        has_builds_to_do = False
         for job_name, job_config in self.jobs_to_do.items():
             if CI.is_build_job(job_name):
                 if job_name not in required_builds:
                     remove_from_to_do.append(job_name)
-                else:
-                    has_builds_to_do = True
 
-        if not has_builds_to_do:
+        if not required_builds:
             remove_from_to_do.append(CI.JobNames.BUILD_CHECK)
 
-        for job in remove_from_to_do:
-            print(f"Filter job [{job}] - not affected by the change")
-            if job in self.jobs_to_do:
-                del self.jobs_to_do[job]
-            if job in self.jobs_to_wait:
-                del self.jobs_to_wait[job]
-            if job in self.jobs_to_skip:
-                self.jobs_to_skip.remove(job)
+        if has_test_jobs_to_skip:
+            # if there are no test jobs to skip, then we must not skip anything - it's a new CI run with new build digest
+            for job in remove_from_to_do:
+                print(f"Filter job [{job}] - not affected by the change")
+                if job in self.jobs_to_do:
+                    del self.jobs_to_do[job]
+                if job in self.jobs_to_wait:
+                    del self.jobs_to_wait[job]
+                if job in self.jobs_to_skip:
+                    self.jobs_to_skip.remove(job)
 
     def await_pending_jobs(self, is_release: bool, dry_run: bool = False) -> None:
         """

From f311612e91aa195a5074cb104d2bb9845babbc6b Mon Sep 17 00:00:00 2001
From: Max K <maxkaynov@gmail.com>
Date: Mon, 15 Jul 2024 09:59:23 +0200
Subject: [PATCH 51/51] check filter_out_not_affected_jobs in unit test

---
 tests/ci/ci_cache.py       | 30 +++++++++++++++---------------
 tests/ci/test_ci_config.py |  1 +
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/tests/ci/ci_cache.py b/tests/ci/ci_cache.py
index 44cdb19c3a1..417d5dbc262 100644
--- a/tests/ci/ci_cache.py
+++ b/tests/ci/ci_cache.py
@@ -729,25 +729,25 @@ class CiCache:
                     required_builds += (
                         job_config.required_builds if job_config.required_builds else []
                     )
-
-        for job_name, job_config in self.jobs_to_do.items():
-            if CI.is_build_job(job_name):
-                if job_name not in required_builds:
-                    remove_from_to_do.append(job_name)
+        if has_test_jobs_to_skip:
+            # If there are tests to skip, it means build digest has not been changed.
+            # No need to test builds. Let's keep all builds required for test jobs and skip the others
+            for job_name, job_config in self.jobs_to_do.items():
+                if CI.is_build_job(job_name):
+                    if job_name not in required_builds:
+                        remove_from_to_do.append(job_name)
 
         if not required_builds:
             remove_from_to_do.append(CI.JobNames.BUILD_CHECK)
 
-        if has_test_jobs_to_skip:
-            # if there are no test jobs to skip, then we must not skip anything - it's a new CI run with new build digest
-            for job in remove_from_to_do:
-                print(f"Filter job [{job}] - not affected by the change")
-                if job in self.jobs_to_do:
-                    del self.jobs_to_do[job]
-                if job in self.jobs_to_wait:
-                    del self.jobs_to_wait[job]
-                if job in self.jobs_to_skip:
-                    self.jobs_to_skip.remove(job)
+        for job in remove_from_to_do:
+            print(f"Filter job [{job}] - not affected by the change")
+            if job in self.jobs_to_do:
+                del self.jobs_to_do[job]
+            if job in self.jobs_to_wait:
+                del self.jobs_to_wait[job]
+            if job in self.jobs_to_skip:
+                self.jobs_to_skip.remove(job)
 
     def await_pending_jobs(self, is_release: bool, dry_run: bool = False) -> None:
         """
diff --git a/tests/ci/test_ci_config.py b/tests/ci/test_ci_config.py
index e12a67bfc92..c901994affa 100644
--- a/tests/ci/test_ci_config.py
+++ b/tests/ci/test_ci_config.py
@@ -283,6 +283,7 @@ class TestCIConfig(unittest.TestCase):
         ci_cache = CIPY._configure_jobs(
             S3Helper(), pr_info, settings, skip_jobs=False, dry_run=True
         )
+        ci_cache.filter_out_not_affected_jobs()
         actual_jobs_to_do = list(ci_cache.jobs_to_do)
         expected_jobs_to_do = []
         for set_ in settings.ci_sets: