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

dbms: fixed error with IN [#METR-14678].

Browse Source
This commit is contained in:
Alexey Milovidov 2015-01-22 23:56:40 +03:00
parent d4de29beb2
commit d7e8251ad2
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -774,8 +774,7 @@ void InterpreterSelectQuery::executeMergeAggregated(BlockInputStreams & streams,
return;
/// Склеим несколько источников в один
streams[0] = new UnionBlockInputStream(streams, settings.max_threads);
streams.resize(1);
executeUnion(streams);
/// Теперь объединим агрегированные блоки
Names key_names;
@ -798,11 +797,7 @@ void InterpreterSelectQuery::executeHaving(BlockInputStreams & streams, Expressi
void InterpreterSelectQuery::executeTotalsAndHaving(BlockInputStreams & streams, bool has_having,
ExpressionActionsPtr expression, bool overflow_row)
{
if (streams.size() > 1)
{
streams[0] = new UnionBlockInputStream(streams, settings.max_threads);
streams.resize(1);
}
executeUnion(streams);
Names key_names;
AggregateDescriptions aggregates;
@ -878,11 +873,7 @@ void InterpreterSelectQuery::executeOrder(BlockInputStreams & streams)
BlockInputStreamPtr & stream = streams[0];
/// Если потоков несколько, то объединяем их в один
if (streams.size() > 1)
{
stream = new UnionBlockInputStream(streams, settings.max_threads);
streams.resize(1);
}
executeUnion(streams);
/// Сливаем сортированные блоки.
stream = new MergeSortingBlockInputStream(
@ -996,6 +987,7 @@ void InterpreterSelectQuery::executeSubqueriesInSetsAndJoins(BlockInputStreams &
for (auto & elem : subqueries_for_sets)
elem.second.table.reset();
executeUnion(streams);
streams[0] = new CreatingSetsBlockInputStream(streams[0], subqueries_for_sets, settings.limits);
}