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

fix tests

Browse Source
This commit is contained in:
Anton Popov 2022-01-28 17:23:51 +03:00
parent 90b74c2aeb
commit fa883f2ac3
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Interpreters/InterpreterSelectQuery.cpp
View File

@ -567,6 +567,9 @@ InterpreterSelectQuery::InterpreterSelectQuery(
analysis_result.required_columns = required_columns; analysis_result.required_columns = required_columns;
} }
if (query_info.projection)
storage_snapshot->addProjection(query_info.projection->desc);
/// Blocks used in expression analysis contains size 1 const columns for constant folding and /// Blocks used in expression analysis contains size 1 const columns for constant folding and
/// null non-const columns to avoid useless memory allocations. However, a valid block sample /// null non-const columns to avoid useless memory allocations. However, a valid block sample
/// requires all columns to be of size 0, thus we need to sanitize the block here. /// requires all columns to be of size 0, thus we need to sanitize the block here.
@ -614,19 +617,13 @@ Block InterpreterSelectQuery::getSampleBlockImpl()
query_info.has_window = query_analyzer->hasWindow(); query_info.has_window = query_analyzer->hasWindow();
if (storage && !options.only_analyze) if (storage && !options.only_analyze)
{ {
from_stage = storage->getQueryProcessingStage(context, options.to_stage, storage_snapshot, query_info);
if (query_info.projection)
storage_snapshot->addProjection(query_info.projection->desc);
auto & query = getSelectQuery(); auto & query = getSelectQuery();
query_analyzer->makeSetsForIndex(query.where()); query_analyzer->makeSetsForIndex(query.where());
query_analyzer->makeSetsForIndex(query.prewhere()); query_analyzer->makeSetsForIndex(query.prewhere());
query_info.sets = query_analyzer->getPreparedSets(); query_info.sets = query_analyzer->getPreparedSets();
}
if (storage && !options.only_analyze)
from_stage = storage->getQueryProcessingStage(context, options.to_stage, storage_snapshot, query_info); from_stage = storage->getQueryProcessingStage(context, options.to_stage, storage_snapshot, query_info);
}
/// Do I need to perform the first part of the pipeline? /// Do I need to perform the first part of the pipeline?
/// Running on remote servers during distributed processing or if query is not distributed. /// Running on remote servers during distributed processing or if query is not distributed.