thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 00:22:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
kssenii 2021-11-10 13:16:39 +03:00
parent 60ed991c2c
commit f4f0bd8b5c
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/Storages/StorageMerge.cpp
View File

@ -180,6 +180,24 @@ QueryProcessingStage::Enum StorageMerge::getQueryProcessingStage(
} }
SelectQueryInfo StorageMerge::getModifiedQueryInfo(const SelectQueryInfo & query_info, ContextPtr modified_context, const StorageID & storage_id) const
{
SelectQueryInfo modified_query_info = query_info;
modified_query_info.query = query_info.query->clone();
/// Original query could contain JOIN but we need only the first joined table and its columns.
auto & modified_select = modified_query_info.query->as<ASTSelectQuery &>();
TreeRewriterResult new_analyzer_res = *modified_query_info.syntax_analyzer_result;
removeJoin(modified_select, new_analyzer_res, modified_context);
modified_query_info.syntax_analyzer_result = std::make_shared<TreeRewriterResult>(std::move(new_analyzer_res));
VirtualColumnUtils::rewriteEntityInAst(modified_query_info.query, "_table", storage_id.table_name);
VirtualColumnUtils::rewriteEntityInAst(modified_query_info.query, "_database", storage_id.database_name);
return modified_query_info;
}
Pipe StorageMerge::read( Pipe StorageMerge::read(
const Names & column_names, const Names & column_names,
const StorageMetadataPtr & metadata_snapshot, const StorageMetadataPtr & metadata_snapshot,
@ -222,10 +240,12 @@ Pipe StorageMerge::read(
= getSelectedTables(local_context, query_info.query, has_database_virtual_column, has_table_virtual_column); = getSelectedTables(local_context, query_info.query, has_database_virtual_column, has_table_virtual_column);
if (selected_tables.empty()) if (selected_tables.empty())
{
auto modified_query_info = getModifiedQueryInfo(query_info, modified_context, getStorageID());
/// FIXME: do we support sampling in this case? /// FIXME: do we support sampling in this case?
return createSources( return createSources(
{}, {},
query_info, modified_query_info,
processed_stage, processed_stage,
max_block_size, max_block_size,
header, header,
@ -236,6 +256,7 @@ Pipe StorageMerge::read(
0, 0,
has_database_virtual_column, has_database_virtual_column,
has_table_virtual_column); has_table_virtual_column);
}
size_t tables_count = selected_tables.size(); size_t tables_count = selected_tables.size();
Float64 num_streams_multiplier Float64 num_streams_multiplier
@ -282,18 +303,7 @@ Pipe StorageMerge::read(
auto storage_metadata_snapshot = storage->getInMemoryMetadataPtr(); auto storage_metadata_snapshot = storage->getInMemoryMetadataPtr();
auto storage_columns = storage_metadata_snapshot->getColumns(); auto storage_columns = storage_metadata_snapshot->getColumns();
SelectQueryInfo modified_query_info = query_info; auto modified_query_info = getModifiedQueryInfo(query_info, modified_context, storage->getStorageID());
modified_query_info.query = query_info.query->clone();
/// Original query could contain JOIN but we need only the first joined table and its columns.
auto & modified_select = modified_query_info.query->as<ASTSelectQuery &>();
TreeRewriterResult new_analyzer_res = *modified_query_info.syntax_analyzer_result;
removeJoin(modified_select, new_analyzer_res, modified_context);
modified_query_info.syntax_analyzer_result = std::make_shared<TreeRewriterResult>(std::move(new_analyzer_res));
auto storage_id = storage->getStorageID();
VirtualColumnUtils::rewriteEntityInAst(modified_query_info.query, "_table", storage_id.table_name);
VirtualColumnUtils::rewriteEntityInAst(modified_query_info.query, "_database", storage_id.database_name);
auto syntax_result = TreeRewriter(local_context).analyzeSelect(modified_query_info.query, TreeRewriterResult({}, storage, storage_metadata_snapshot)); auto syntax_result = TreeRewriter(local_context).analyzeSelect(modified_query_info.query, TreeRewriterResult({}, storage, storage_metadata_snapshot));
Names column_names_as_aliases; Names column_names_as_aliases;

3
src/Storages/StorageMerge.h
View File

@ -129,6 +129,9 @@ protected:
const Block & header, const StorageMetadataPtr & metadata_snapshot, const Aliases & aliases, const Block & header, const StorageMetadataPtr & metadata_snapshot, const Aliases & aliases,
ContextPtr context, ASTPtr & query, ContextPtr context, ASTPtr & query,
Pipe & pipe, QueryProcessingStage::Enum processed_stage); Pipe & pipe, QueryProcessingStage::Enum processed_stage);
SelectQueryInfo getModifiedQueryInfo(
const SelectQueryInfo & query_info, ContextPtr modified_context, const StorageID & storage_id) const;
}; };
} }