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

Fix prewhere.

Browse Source
This commit is contained in:
Nikolai Kochetov 2021-04-22 14:26:17 +03:00 committed by Amos Bird
parent 3d36fb57eb
commit 427f444ba4
No known key found for this signature in database
GPG Key ID: 80D430DCBECFEDB4
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
View File

@ -205,9 +205,31 @@ QueryPlanPtr MergeTreeDataSelectExecutor::read(
const auto & given_select = query_info.query->as<const ASTSelectQuery &>(); const auto & given_select = query_info.query->as<const ASTSelectQuery &>();
if (!projection_parts.empty()) if (!projection_parts.empty())
{ {
auto projection_names = query_info.projection_names;
if (query_info.prewhere_info)
{
const auto prewhere_columns =
(query_info.prewhere_info->alias_actions ?
query_info.prewhere_info->alias_actions :
(query_info.prewhere_info->row_level_filter ?
query_info.prewhere_info->row_level_filter :
query_info.prewhere_info->prewhere_actions))->getRequiredColumns();
NameSet added_column(projection_names.begin(), projection_names.end());
for (const auto & col : prewhere_columns)
{
if (added_column.count(col) == 0)
{
added_column.insert(col);
projection_names.push_back(col);
}
}
}
auto plan = readFromParts( auto plan = readFromParts(
std::move(projection_parts), std::move(projection_parts),
query_info.projection_names, // raw columns without key transformation projection_names, // raw columns without key transformation
query_info.aggregate_projection->metadata, query_info.aggregate_projection->metadata,
query_info, query_info,
context, context,
@ -222,7 +244,7 @@ QueryPlanPtr MergeTreeDataSelectExecutor::read(
{ {
// If `key_actions` is not empty, transform input blocks by adding needed columns // If `key_actions` is not empty, transform input blocks by adding needed columns
// originated from key columns. We already project the block at the end, using // originated from key columns. We already project the block at the end, using
// projection_block, so we can just add more colunms here without worrying // projection_block, so we can just add more columns here without worrying
if (!query_info.key_actions.func_map.empty()) if (!query_info.key_actions.func_map.empty())
{ {
ASTPtr expr = std::make_shared<ASTExpressionList>(); ASTPtr expr = std::make_shared<ASTExpressionList>();