From 2b21b8397925104e4cdebc8f3290df9d15b54328 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Tue, 2 May 2023 13:35:11 +0200
Subject: [PATCH] Reduce inter-header dependencies

Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
---
 src/Functions/FunctionHelpers.h                  | 2 +-
 src/Functions/IFunction.cpp                      | 1 +
 src/Interpreters/AggregationCommon.h             | 1 -
 src/Interpreters/Context.h                       | 3 ---
 src/Planner/PlannerActionsVisitor.h              | 2 --
 src/Planner/PlannerContext.h                     | 2 --
 src/Storages/MarkCache.h                         | 1 +
 src/Storages/MergeTree/MergeTreeReaderStream.cpp | 1 +
 8 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/Functions/FunctionHelpers.h b/src/Functions/FunctionHelpers.h
index 18a4e584080..77affe8488d 100644
--- a/src/Functions/FunctionHelpers.h
+++ b/src/Functions/FunctionHelpers.h
@@ -7,8 +7,8 @@
 #include <Columns/IColumn.h>
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnConst.h>
-#include <Core/Block.h>
 #include <Core/ColumnNumbers.h>
+#include <Core/ColumnsWithTypeAndName.h>
 #include <Core/callOnTypeIndex.h>
 
 
diff --git a/src/Functions/IFunction.cpp b/src/Functions/IFunction.cpp
index e7f6c521238..7563135f21f 100644
--- a/src/Functions/IFunction.cpp
+++ b/src/Functions/IFunction.cpp
@@ -3,6 +3,7 @@
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
 #include <Common/SipHash.h>
+#include <Core/Block.h>
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnTuple.h>
diff --git a/src/Interpreters/AggregationCommon.h b/src/Interpreters/AggregationCommon.h
index 2e6da40ff1f..7ba9011f18b 100644
--- a/src/Interpreters/AggregationCommon.h
+++ b/src/Interpreters/AggregationCommon.h
@@ -3,7 +3,6 @@
 #include <array>
 
 #include <Common/SipHash.h>
-#include <Common/HashTable/Hash.h>
 #include <Common/memcpySmall.h>
 #include <Common/assert_cast.h>
 #include <Core/Defines.h>
diff --git a/src/Interpreters/Context.h b/src/Interpreters/Context.h
index 36a6a8e6f49..371a9d18171 100644
--- a/src/Interpreters/Context.h
+++ b/src/Interpreters/Context.h
@@ -7,7 +7,6 @@
 #include <Common/RemoteHostFilter.h>
 #include <Common/ThreadPool_fwd.h>
 #include <Common/Throttler_fwd.h>
-#include <Core/Block.h>
 #include <Core/NamesAndTypes.h>
 #include <Core/Settings.h>
 #include <Core/UUID.h>
@@ -25,12 +24,10 @@
 #include "config.h"
 
 #include <boost/container/flat_set.hpp>
-#include <exception>
 #include <functional>
 #include <memory>
 #include <mutex>
 #include <optional>
-#include <thread>
 
 
 namespace Poco::Net { class IPAddress; }
diff --git a/src/Planner/PlannerActionsVisitor.h b/src/Planner/PlannerActionsVisitor.h
index 2a1c166bfc7..8506c309171 100644
--- a/src/Planner/PlannerActionsVisitor.h
+++ b/src/Planner/PlannerActionsVisitor.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <Common/HashTable/Hash.h>
-
 #include <Core/Names.h>
 #include <Core/NamesAndTypes.h>
 
diff --git a/src/Planner/PlannerContext.h b/src/Planner/PlannerContext.h
index ccc4ab43638..4199c863033 100644
--- a/src/Planner/PlannerContext.h
+++ b/src/Planner/PlannerContext.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <Common/HashTable/Hash.h>
-
 #include <Core/Names.h>
 #include <Core/NamesAndTypes.h>
 
diff --git a/src/Storages/MarkCache.h b/src/Storages/MarkCache.h
index 2b286ebb1e8..0f4af57fc8e 100644
--- a/src/Storages/MarkCache.h
+++ b/src/Storages/MarkCache.h
@@ -5,6 +5,7 @@
 #include <Common/CacheBase.h>
 #include <Common/ProfileEvents.h>
 #include <Common/SipHash.h>
+#include <Common/HashTable/Hash.h>
 #include <Interpreters/AggregationCommon.h>
 #include <Formats/MarkInCompressedFile.h>
 
diff --git a/src/Storages/MergeTree/MergeTreeReaderStream.cpp b/src/Storages/MergeTree/MergeTreeReaderStream.cpp
index cdca5aa1247..e4aa0ffa4f4 100644
--- a/src/Storages/MergeTree/MergeTreeReaderStream.cpp
+++ b/src/Storages/MergeTree/MergeTreeReaderStream.cpp
@@ -2,6 +2,7 @@
 #include <Compression/CachedCompressedReadBuffer.h>
 
 #include <base/getThreadId.h>
+#include <base/range.h>
 #include <utility>