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

fixed substitution launch condition [#CONV-6778]

Browse Source
This commit is contained in:
Vyacheslav Alipov 2013-05-07 13:42:48 +00:00
parent c2d5749128
commit 897f03017e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dbms/src/Interpreters/InterpreterSelectQuery.cpp
View File

@ -164,7 +164,9 @@ BlockInputStreamPtr InterpreterSelectQuery::execute()
if (need_aggregate)
executeAggregation(streams, expression);
executeOriginalColumnNameSubstitution(streams, expression);
/// Подставим оригинальные имена столбцов, если запрос шел из distributed таблицы
if (settings.sign_rewrite && to_stage == QueryProcessingStage::WithMergeableState)
executeOriginalColumnNameSubstitution(streams, expression);
}
else if (from_stage <= QueryProcessingStage::WithMergeableState && to_stage > QueryProcessingStage::WithMergeableState)
{
@ -585,8 +587,6 @@ BlockInputStreamPtr InterpreterSelectQuery::executeAndFormat(WriteBuffer & buf)
void InterpreterSelectQuery::executeOriginalColumnNameSubstitution(BlockInputStreams & streams, ExpressionPtr & expression)
{
if (!settings.sign_rewrite)
return;
for (BlockInputStreams::iterator it = streams.begin(); it != streams.end(); ++it)
{
BlockInputStreamPtr & stream = *it;