提交 d757f323 编写于 作者: A Alexander Kuzmenkov

Remove some redundant includes to speed up build

上级 e11790f6
...@@ -590,7 +590,7 @@ public: ...@@ -590,7 +590,7 @@ public:
void insertResultInto(AggregateDataPtr place, IColumn & to, Arena *) const override void insertResultInto(AggregateDataPtr place, IColumn & to, Arena *) const override
{ {
const_cast<Data &>(this->data(place)).sort(); this->data(place).sort();
assert_cast<ColumnUInt64 &>(to).getData().push_back(count(place)); assert_cast<ColumnUInt64 &>(to).getData().push_back(count(place));
} }
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
#include <Columns/IColumnUnique.h> #include <Columns/IColumnUnique.h>
#include <Common/typeid_cast.h> #include <Common/typeid_cast.h>
#include <Common/assert_cast.h> #include <Common/assert_cast.h>
#include <AggregateFunctions/AggregateFunctionCount.h>
#include "ColumnsNumber.h" #include "ColumnsNumber.h"
......
#pragma once #pragma once
#include <Columns/IColumn.h> #include <Columns/IColumn.h>
#include <Columns/ColumnNullable.h>
#include <Common/assert_cast.h> #include <Common/assert_cast.h>
#include <Common/HashTable/HashTableKeyHolder.h> #include <Common/HashTable/HashTableKeyHolder.h>
#include <Interpreters/AggregationCommon.h> #include <Interpreters/AggregationCommon.h>
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include <DataTypes/DataTypeFactory.h> #include <DataTypes/DataTypeFactory.h>
#include <DataTypes/DataTypeLowCardinality.h> #include <DataTypes/DataTypeLowCardinality.h>
#include <DataTypes/DataTypeNullable.h> #include <DataTypes/DataTypeNullable.h>
#include <DataTypes/DataTypesNumber.h>
#include <DataTypes/DataTypeDate.h> #include <DataTypes/DataTypeDate.h>
#include <DataTypes/DataTypeDateTime.h> #include <DataTypes/DataTypeDateTime.h>
#include <Parsers/IAST.h> #include <Parsers/IAST.h>
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include <Parsers/DumpASTNode.h> #include <Parsers/DumpASTNode.h>
#include <DataTypes/DataTypeNullable.h> #include <DataTypes/DataTypeNullable.h>
#include <DataTypes/DataTypesNumber.h>
#include <Columns/IColumn.h> #include <Columns/IColumn.h>
#include <Interpreters/ExpressionAnalyzer.h> #include <Interpreters/ExpressionAnalyzer.h>
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <DataStreams/SizeLimits.h> #include <DataStreams/SizeLimits.h>
#include <DataStreams/IBlockStream_fwd.h> #include <DataStreams/IBlockStream_fwd.h>
#include <Core/Block.h>
namespace DB namespace DB
{ {
......
...@@ -12,6 +12,7 @@ namespace DB ...@@ -12,6 +12,7 @@ namespace DB
class Block; class Block;
struct ExtraBlock; struct ExtraBlock;
using ExtraBlockPtr = std::shared_ptr<ExtraBlock>;
class IJoin class IJoin
{ {
......
...@@ -16,6 +16,8 @@ class Context; ...@@ -16,6 +16,8 @@ class Context;
class ASTCreateQuery; class ASTCreateQuery;
class ASTExpressionList; class ASTExpressionList;
class ASTConstraintDeclaration; class ASTConstraintDeclaration;
class IDatabase;
using DatabasePtr = std::shared_ptr<IDatabase>;
/** Allows to create new table or database, /** Allows to create new table or database,
......
...@@ -9,6 +9,7 @@ namespace DB ...@@ -9,6 +9,7 @@ namespace DB
class Context; class Context;
class AccessRightsElements; class AccessRightsElements;
class DDLGuard;
/// To avoid deadlocks, we must acquire locks for tables in same order in any different RENAMES. /// To avoid deadlocks, we must acquire locks for tables in same order in any different RENAMES.
struct UniqueTableName struct UniqueTableName
......
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
#include <Access/AccessFlags.h> #include <Access/AccessFlags.h>
#include <AggregateFunctions/AggregateFunctionCount.h>
#include <Interpreters/ApplyWithAliasVisitor.h> #include <Interpreters/ApplyWithAliasVisitor.h>
#include <Interpreters/ApplyWithSubqueryVisitor.h> #include <Interpreters/ApplyWithSubqueryVisitor.h>
#include <Interpreters/InterpreterSelectQuery.h> #include <Interpreters/InterpreterSelectQuery.h>
......
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
#include <Common/assert_cast.h> #include <Common/assert_cast.h>
#include <Interpreters/Context.h> #include <Interpreters/Context.h>
#include <Interpreters/InterpreterCreateQuery.h> #include <Interpreters/InterpreterCreateQuery.h>
#include <Interpreters/ExpressionAnalyzer.h>
#include <Interpreters/TreeRewriter.h>
#include <Storages/IStorage.h> #include <Storages/IStorage.h>
namespace DB namespace DB
......
#include <Interpreters/TextLog.h> #include <Interpreters/TextLog.h>
#include <DataTypes/DataTypeEnum.h>
#include <DataTypes/DataTypesNumber.h> #include <Common/ClickHouseRevision.h>
#include <DataTypes/DataTypeDate.h>
#include <DataTypes/DataTypeDateTime.h> #include <DataTypes/DataTypeDateTime.h>
#include <DataTypes/DataTypeDateTime64.h> #include <DataTypes/DataTypeDateTime64.h>
#include <DataTypes/DataTypeDate.h> #include <DataTypes/DataTypeEnum.h>
#include <DataTypes/DataTypeLowCardinality.h>
#include <DataTypes/DataTypeString.h> #include <DataTypes/DataTypeString.h>
#include <Common/ClickHouseRevision.h> #include <DataTypes/DataTypesNumber.h>
#include <array> #include <array>
namespace DB namespace DB
......
#include <Storages/ConstraintsDescription.h> #include <Storages/ConstraintsDescription.h>
#include <Interpreters/ExpressionAnalyzer.h>
#include <Interpreters/TreeRewriter.h>
#include <Parsers/formatAST.h> #include <Parsers/formatAST.h>
#include <Parsers/ParserCreateQuery.h> #include <Parsers/ParserCreateQuery.h>
#include <Parsers/parseQuery.h> #include <Parsers/parseQuery.h>
......
#pragma once #pragma once
#include <Parsers/ASTConstraintDeclaration.h> #include <Parsers/ASTConstraintDeclaration.h>
#include <Interpreters/ExpressionAnalyzer.h> #include <Interpreters/ExpressionActions.h>
namespace DB namespace DB
{ {
......
...@@ -35,6 +35,7 @@ limitations under the License. */ ...@@ -35,6 +35,7 @@ limitations under the License. */
#include <Parsers/ASTSubquery.h> #include <Parsers/ASTSubquery.h>
#include <Parsers/queryToString.h> #include <Parsers/queryToString.h>
#include <Interpreters/DatabaseAndTableWithAlias.h> #include <Interpreters/DatabaseAndTableWithAlias.h>
#include <Interpreters/DatabaseCatalog.h>
#include <Interpreters/getTableExpressions.h> #include <Interpreters/getTableExpressions.h>
#include <Interpreters/AddDefaultDatabaseVisitor.h> #include <Interpreters/AddDefaultDatabaseVisitor.h>
#include <Access/AccessFlags.h> #include <Access/AccessFlags.h>
...@@ -303,6 +304,11 @@ Block StorageLiveView::getHeader() const ...@@ -303,6 +304,11 @@ Block StorageLiveView::getHeader() const
return sample_block; return sample_block;
} }
StoragePtr StorageLiveView::getParentStorage() const
{
return DatabaseCatalog::instance().getTable(select_table_id, global_context);
}
ASTPtr StorageLiveView::getInnerBlocksQuery() ASTPtr StorageLiveView::getInnerBlocksQuery()
{ {
std::lock_guard lock(sample_block_lock); std::lock_guard lock(sample_block_lock);
......
...@@ -57,7 +57,7 @@ public: ...@@ -57,7 +57,7 @@ public:
{ {
return getStorageID().table_name + "_blocks"; return getStorageID().table_name + "_blocks";
} }
StoragePtr getParentStorage() const { return DatabaseCatalog::instance().getTable(select_table_id, global_context); } StoragePtr getParentStorage() const;
ASTPtr getInnerQuery() const { return inner_query->clone(); } ASTPtr getInnerQuery() const { return inner_query->clone(); }
ASTPtr getInnerSubQuery() const ASTPtr getInnerSubQuery() const
......
...@@ -43,6 +43,7 @@ struct JobAndPool; ...@@ -43,6 +43,7 @@ struct JobAndPool;
class ExpressionActions; class ExpressionActions;
using ExpressionActionsPtr = std::shared_ptr<ExpressionActions>; using ExpressionActionsPtr = std::shared_ptr<ExpressionActions>;
using ManyExpressionActions = std::vector<ExpressionActionsPtr>;
namespace ErrorCodes namespace ErrorCodes
{ {
......
#include <Storages/ReadInOrderOptimizer.h> #include <Storages/ReadInOrderOptimizer.h>
#include <Functions/IFunction.h>
#include <Interpreters/TableJoin.h>
#include <Interpreters/TreeRewriter.h>
#include <Storages/MergeTree/MergeTreeData.h> #include <Storages/MergeTree/MergeTreeData.h>
#include <Storages/MergeTree/StorageFromMergeTreeDataPart.h> #include <Storages/MergeTree/StorageFromMergeTreeDataPart.h>
#include <Interpreters/TableJoin.h>
#include <Functions/IFunction.h>
namespace DB namespace DB
{ {
......
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
#include <Core/Settings.h> #include <Core/Settings.h>
#include <Interpreters/Context.h> #include <Interpreters/Context.h>
#include <Interpreters/ExpressionAnalyzer.h>
#include <Interpreters/TreeRewriter.h>
#include <Parsers/ASTFunction.h> #include <Parsers/ASTFunction.h>
#include <Parsers/ASTSelectQuery.h> #include <Parsers/ASTSelectQuery.h>
...@@ -19,6 +21,8 @@ ...@@ -19,6 +21,8 @@
#include <Processors/Pipe.h> #include <Processors/Pipe.h>
#include <Processors/Transforms/FilterTransform.h> #include <Processors/Transforms/FilterTransform.h>
#include <Storages/SelectQueryInfo.h>
namespace DB namespace DB
{ {
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include <DataTypes/DataTypesNumber.h> #include <DataTypes/DataTypesNumber.h>
#include <Storages/System/StorageSystemDistributionQueue.h> #include <Storages/System/StorageSystemDistributionQueue.h>
#include <Storages/Distributed/DirectoryMonitor.h> #include <Storages/Distributed/DirectoryMonitor.h>
#include <Storages/SelectQueryInfo.h>
#include <Storages/StorageDistributed.h> #include <Storages/StorageDistributed.h>
#include <Storages/VirtualColumnUtils.h> #include <Storages/VirtualColumnUtils.h>
#include <Access/ContextAccess.h> #include <Access/ContextAccess.h>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include <DataTypes/DataTypeDateTime.h> #include <DataTypes/DataTypeDateTime.h>
#include <DataTypes/DataTypeNullable.h> #include <DataTypes/DataTypeNullable.h>
#include <Storages/System/StorageSystemTables.h> #include <Storages/System/StorageSystemTables.h>
#include <Storages/SelectQueryInfo.h>
#include <Storages/VirtualColumnUtils.h> #include <Storages/VirtualColumnUtils.h>
#include <Databases/IDatabase.h> #include <Databases/IDatabase.h>
#include <Access/ContextAccess.h> #include <Access/ContextAccess.h>
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#include <DataTypes/DataTypesNumber.h> #include <DataTypes/DataTypesNumber.h>
#include <DataTypes/DataTypeDateTime.h> #include <DataTypes/DataTypeDateTime.h>
#include <Storages/System/StorageSystemZooKeeper.h> #include <Storages/System/StorageSystemZooKeeper.h>
#include <Storages/SelectQueryInfo.h>
#include <Parsers/ASTSelectQuery.h> #include <Parsers/ASTSelectQuery.h>
#include <Parsers/ASTIdentifier.h> #include <Parsers/ASTIdentifier.h>
#include <Parsers/ASTLiteral.h> #include <Parsers/ASTLiteral.h>
......
#pragma once #pragma once
#include <Databases/IDatabase.h> #include <Databases/IDatabase.h>
#include <Interpreters/DatabaseCatalog.h>
namespace DB namespace DB
{ {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册