Fixing build.

programs/disks/CommandCopy.cpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "ICommand.h"
+#include <Interpreters/Context.h>
 
 namespace DB
 {

programs/disks/CommandLink.cpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "ICommand.h"
+#include <Interpreters/Context.h>
 
 namespace DB
 {

programs/disks/CommandList.cpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "ICommand.h"
+#include <Interpreters/Context.h>
 
 namespace DB
 {

programs/disks/CommandListDisks.cpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "ICommand.h"
+#include <Interpreters/Context.h>
 
 namespace DB
 {

programs/disks/CommandMove.cpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "ICommand.h"
+#include <Interpreters/Context.h>
 
 namespace DB
 {

programs/disks/CommandRead.cpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "ICommand.h"
+#include <Interpreters/Context.h>
 
 namespace DB
 {

programs/disks/CommandRemove.cpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "ICommand.h"
+#include <Interpreters/Context.h>
 
 namespace DB
 {

programs/disks/CommandWrite.cpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "ICommand.h"
+#include <Interpreters/Context.h>
 
 namespace DB
 {

src/Access/DiskAccessStorage.cpp

@@ -15,6 +15,7 @@
 #include <Poco/JSON/Stringifier.h>
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/range/adaptor/map.hpp>
+#include <base/range.h>
 #include <filesystem>
 #include <fstream>
 

src/AggregateFunctions/parseAggregateFunctionParameters.h

@@ -8,6 +8,8 @@
 namespace DB
 {
 
+struct Array;
+
 Array getAggregateFunctionParametersArray(
     const ASTPtr & expression_list,
     const std::string & error_context,

src/Backups/registerBackupEnginesFileAndDisk.cpp

@@ -7,6 +7,7 @@
 #include <IO/Archives/hasRegisteredArchiveFileExtension.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <filesystem>
+#include <Interpreters/Context.h>
 
 
 namespace DB

src/Common/ShellCommand.h

@@ -3,6 +3,7 @@
 #include <memory>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/WriteBufferFromFile.h>
+#include <unordered_map>
 
 
 namespace DB

src/Coordination/CoordinationSettings.cpp

@@ -1,5 +1,5 @@
 #include <Coordination/CoordinationSettings.h>
-#include <Core/Settings.h>
+//#include <Core/Settings.h>
 #include <Common/logger_useful.h>
 #include <filesystem>
 #include <Coordination/Defines.h>

src/Coordination/KeeperServer.cpp

@@ -21,6 +21,7 @@
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Poco/Util/Application.h>
 #include <Common/ZooKeeper/ZooKeeperIO.h>
+#include <Common/Stopwatch.h>
 
 namespace DB
 {

src/Disks/DiskEncrypted.cpp

@@ -8,6 +8,8 @@
 #include <IO/ReadBufferFromString.h>
 #include <IO/WriteBufferFromEncryptedFile.h>
 #include <boost/algorithm/hex.hpp>
+#include <Common/quoteString.h>
+#include <Common/typeid_cast.h>
 
 
 namespace DB

src/Disks/IDisk.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <Interpreters/Context_fwd.h>
-#include <Interpreters/Context.h>
 #include <Core/Defines.h>
 #include <base/types.h>
 #include <Common/CurrentMetrics.h>
@@ -41,6 +40,10 @@ namespace ErrorCodes
     extern const int NOT_IMPLEMENTED;
 }
 
+class IDisk;
+using DiskPtr = std::shared_ptr<IDisk>;
+using DisksMap = std::map<String, DiskPtr>;
+
 class IReservation;
 using ReservationPtr = std::unique_ptr<IReservation>;
 using Reservations = std::vector<ReservationPtr>;
@@ -363,7 +366,6 @@ private:
     std::unique_ptr<Executor> executor;
 };
 
-using DiskPtr = std::shared_ptr<IDisk>;
 using Disks = std::vector<DiskPtr>;
 
 /**

src/Disks/IO/CachedReadBufferFromRemoteFS.cpp

@@ -6,6 +6,7 @@
 #include <Common/assert_cast.h>
 #include <Common/hex.h>
 #include <Common/getRandomASCIIString.h>
+#include <Interpreters/Context.h>
 
 
 namespace ProfileEvents

src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h

@@ -10,6 +10,7 @@
 #include <Disks/IO/WriteIndirectBufferFromRemoteFS.h>
 #include <Disks/ObjectStorages/IObjectStorage.h>
 #include <Common/getRandomASCIIString.h>
+#include <Common/MultiVersion.h>
 
 
 namespace DB

src/Disks/ObjectStorages/AzureBlobStorage/registerDiskAzureBlobStorage.cpp

@@ -12,6 +12,7 @@
 #include <Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageAuth.h>
 #include <Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h>
 #include <Disks/ObjectStorages/MetadataStorageFromDisk.h>
+#include <Interpreters/Context.h>
 
 namespace DB
 {

src/Disks/ObjectStorages/DiskObjectStorage.cpp

@@ -18,6 +18,7 @@
 #include <Disks/ObjectStorages/DiskObjectStorageTransaction.h>
 #include <Disks/FakeDiskTransaction.h>
 #include <Poco/Util/AbstractConfiguration.h>
+#include <Interpreters/Context.h>
 
 namespace DB
 {

src/Disks/ObjectStorages/DiskObjectStorageCommon.cpp

@@ -3,6 +3,7 @@
 #include <Common/FileCacheFactory.h>
 #include <Common/IFileCache.h>
 #include <Common/FileCacheSettings.h>
+#include <Interpreters/Context.h>
 
 namespace DB
 {

src/Disks/ObjectStorages/FakeMetadataStorageFromDisk.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <Disks/IDisk.h>
 #include <Disks/ObjectStorages/IMetadataStorage.h>
 #include <Disks/ObjectStorages/MetadataFromDiskTransactionState.h>
 #include <Disks/ObjectStorages/MetadataStorageFromDiskTransactionOperations.h>

src/Disks/ObjectStorages/IObjectStorage.cpp

@@ -2,6 +2,7 @@
 #include <Disks/IO/ThreadPoolRemoteFSReader.h>
 #include <IO/WriteBufferFromFileBase.h>
 #include <IO/copyData.h>
+#include <Interpreters/Context.h>
 
 namespace DB
 {

src/Disks/ObjectStorages/IObjectStorage.h

@@ -7,6 +7,7 @@
 #include <optional>
 
 #include <Poco/Timestamp.h>
+#include <Poco/Util/AbstractConfiguration.h>
 #include <Core/Defines.h>
 #include <Common/Exception.h>
 #include <IO/ReadSettings.h>

src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp

@@ -28,6 +28,7 @@
 #include <Common/FileCacheFactory.h>
 #include <Common/getRandomASCIIString.h>
 #include <Common/logger_useful.h>
+#include <Common/MultiVersion.h>
 
 namespace DB
 {

src/Disks/ObjectStorages/S3/S3ObjectStorage.h

@@ -11,6 +11,7 @@
 #include <aws/s3/model/HeadObjectResult.h>
 #include <aws/s3/model/ListObjectsV2Result.h>
 #include <Storages/StorageS3Settings.h>
+#include <Common/MultiVersion.h>
 
 
 namespace DB

src/IO/ReadBufferFromFileDescriptor.cpp

@@ -10,6 +10,7 @@
 #include <IO/Progress.h>
 #include <Common/filesystemHelpers.h>
 #include <sys/stat.h>
+#include <Interpreters/Context.h>
 
 
 #ifdef HAS_RESERVED_IDENTIFIER

src/IO/ReadBufferFromFileDescriptor.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <IO/ReadBufferFromFileBase.h>
-#include <Interpreters/Context.h>
+#include <Interpreters/Context_fwd.h>
 
 #include <unistd.h>
 

src/Parsers/IAST.h

@@ -5,7 +5,6 @@
 #include <Parsers/IdentifierQuotingStyle.h>
 #include <Common/Exception.h>
 #include <Common/TypePromotion.h>
-#include <Core/Settings.h>
 #include <IO/WriteBufferFromString.h>
 
 #include <algorithm>
@@ -26,7 +25,7 @@ namespace ErrorCodes
 using IdentifierNameSet = std::set<String>;
 
 class WriteBuffer;
-
+using Strings = std::vector<String>;
 
 /** Element of the syntax tree (hereinafter - directed acyclic graph with elements of semantics)
   */

src/Parsers/MySQL/ASTDeclareOption.h

@@ -3,6 +3,7 @@
 #include <Parsers/IAST.h>
 #include <Parsers/IParserBase.h>
 #include <Parsers/CommonParsers.h>
+#include <unordered_map>
 
 namespace DB
 {

src/Processors/Formats/Impl/ArrowBufferedStreams.cpp

@@ -13,6 +13,7 @@
 #include <arrow/buffer.h>
 #include <arrow/io/memory.h>
 #include <arrow/result.h>
+#include <Core/Settings.h>
 
 #include <sys/stat.h>
 

src/Processors/QueryPlan/ReadFromMergeTree.cpp

@@ -7,6 +7,7 @@
 #include <IO/Operators.h>
 #include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/TreeRewriter.h>
+#include <Interpreters/Context.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTSelectQuery.h>

src/Processors/QueryPlan/ReadFromMergeTree.h

@@ -1,6 +1,7 @@
 #pragma once
 #include <Processors/QueryPlan/ISourceStep.h>
 #include <Storages/MergeTree/RangesInDataPart.h>
+#include <Storages/MergeTree/RequestResponse.h>
 
 namespace DB
 {
@@ -9,6 +10,8 @@ using PartitionIdToMaxBlock = std::unordered_map<String, Int64>;
 
 class Pipe;
 
+using MergeTreeReadTaskCallback = std::function<std::optional<PartitionReadResponse>(PartitionReadRequest)>;
+
 struct MergeTreeDataSelectSamplingData
 {
     bool use_sampling = false;

src/Processors/TTL/TTLAggregationAlgorithm.cpp

@@ -1,4 +1,5 @@
 #include <Processors/TTL/TTLAggregationAlgorithm.h>
+#include <Interpreters/Context.h>
 
 namespace DB
 {

src/QueryPipeline/RemoteInserter.cpp

@@ -7,6 +7,7 @@
 #include <Common/CurrentThread.h>
 #include <Interpreters/InternalTextLogsQueue.h>
 #include <IO/ConnectionTimeouts.h>
+#include <Core/Settings.h>
 
 
 namespace DB

src/Server/KeeperTCPHandler.h

@@ -9,7 +9,6 @@
 #include <Common/MultiVersion.h>
 #include "IServer.h"
 #include <Common/Stopwatch.h>
-#include <Interpreters/Context.h>
 #include <Common/ZooKeeper/ZooKeeperCommon.h>
 #include <Common/ZooKeeper/ZooKeeperConstants.h>
 #include <Common/ConcurrentBoundedQueue.h>

src/Storages/MergeTree/BackgroundJobsAssignee.cpp

@@ -2,6 +2,7 @@
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/randomSeed.h>
+#include <Interpreters/Context.h>
 #include <pcg_random.hpp>
 #include <random>
 

src/Storages/MergeTree/IMergeTreeReader.cpp

@@ -4,6 +4,7 @@
 #include <Compression/CachedCompressedReadBuffer.h>
 #include <Columns/ColumnArray.h>
 #include <Interpreters/inplaceBlockConversions.h>
+#include <Interpreters/Context.h>
 #include <Storages/MergeTree/IMergeTreeReader.h>
 #include <Common/typeid_cast.h>
 

src/Storages/MergeTree/MergePlainMergeTreeTask.h

@@ -4,6 +4,7 @@
 #include <Storages/MergeTree/MergeTask.h>
 #include <Storages/MutationCommands.h>
 #include <Storages/MergeTree/MergeMutateSelectedEntry.h>
+#include <Interpreters/MergeTreeTransactionHolder.h>
 
 namespace DB
 {

src/Storages/MergeTree/MergeTreeData.h

@@ -56,6 +56,9 @@ struct ZeroCopyLock;
 class IBackupEntry;
 using BackupEntries = std::vector<std::pair<String, std::shared_ptr<const IBackupEntry>>>;
 
+class MergeTreeTransaction;
+using MergeTreeTransactionPtr = std::shared_ptr<MergeTreeTransaction>;
+
 /// Auxiliary struct holding information about the future merged or mutated part.
 struct EmergingPartInfo
 {

src/Storages/MergeTree/MergeTreePartition.cpp

@@ -2,6 +2,7 @@
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <Storages/MergeTree/IMergeTreeDataPart.h>
 #include <IO/HashingWriteBuffer.h>
+#include <Interpreters/Context.h>
 #include <Common/FieldVisitors.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeTuple.h>

src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp

@@ -6,6 +6,7 @@
 #include <IO/MemoryReadWriteBuffer.h>
 #include <IO/ReadHelpers.h>
 #include <IO/copyData.h>
+#include <Interpreters/Context.h>
 #include <Poco/JSON/JSON.h>
 #include <Poco/JSON/Object.h>
 #include <Poco/JSON/Stringifier.h>

src/Storages/ReadInOrderOptimizer.cpp

@@ -6,6 +6,7 @@
 #include <Interpreters/replaceAliasColumnsInQuery.h>
 #include <Functions/IFunction.h>
 #include <Interpreters/TableJoin.h>
+#include <Interpreters/Context.h>
 #include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTFunction.h>
 

src/Storages/System/StorageSystemParts.cpp

@@ -13,6 +13,7 @@
 #include <Parsers/queryToString.h>
 #include <Common/hex.h>
 #include <Interpreters/TransactionVersionMetadata.h>
+#include <Interpreters/Context.h>
 
 namespace DB
 {