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

Fix test.

Browse Source
This commit is contained in:
Nikolai Kochetov 2018-09-07 23:23:28 +03:00
parent 76f47ed6ba
commit 8311c23d83
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dbms/src/Interpreters/ExpressionAnalyzer.cpp
View File

@ -207,8 +207,7 @@ ExpressionAnalyzer::ExpressionAnalyzer(
source_columns.swap(physical_columns);
else
{
physical_columns.insert(physical_columns.end(), source_columns.begin(), source_columns.end());
source_columns.swap(physical_columns);
source_columns.insert(source_columns.end(), physical_columns.begin(), physical_columns.end());
removeDuplicateColumns(source_columns);
}
}

2
dbms/src/Storages/MergeTree/MergeTreeBlockInputStream.cpp
View File

@ -77,8 +77,8 @@ MergeTreeBlockInputStream::MergeTreeBlockInputStream(
}
}
injectVirtualColumns(header);
executePrewhereActions(header, prewhere_info);
injectVirtualColumns(header);
ordered_names = getHeader().getNames();
}

2
dbms/src/Storages/MergeTree/MergeTreeThreadBlockInputStream.cpp
View File

@ -42,8 +42,8 @@ MergeTreeThreadBlockInputStream::MergeTreeThreadBlockInputStream(
Block MergeTreeThreadBlockInputStream::getHeader() const
{
auto res = pool->getHeader();
injectVirtualColumns(res);
executePrewhereActions(res, prewhere_info);
injectVirtualColumns(res);
return res;
}