dbms: SplittingAggregator: development [#METR-2944].

This commit is contained in:
Alexey Milovidov 2013-11-03 21:50:58 +00:00
parent d98f41ba3d
commit 2bfefa24ba

View File

@ -506,13 +506,14 @@ void InterpreterSelectQuery::executeAggregation(BlockInputStreams & streams, Exp
settings.max_threads, settings.limits.max_rows_to_group_by, settings.limits.group_by_overflow_mode), settings.asynchronous);
streams.resize(1);
/* stream = maybeAsynchronous(
(key_names.empty()
? new ParallelAggregatingBlockInputStream(streams, key_names, aggregates, query.group_by_with_totals, separate_totals,
settings.max_threads, settings.limits.max_rows_to_group_by, settings.limits.group_by_overflow_mode)
: new SplittingAggregatingBlockInputStream(
new UnionBlockInputStream(streams, settings.max_threads), key_names, aggregates, settings.max_threads)),
settings.asynchronous);
/* if (key_names.empty())
stream = maybeAsynchronous(
new ParallelAggregatingBlockInputStream(streams, key_names, aggregates, query.group_by_with_totals, separate_totals,
settings.max_threads, settings.limits.max_rows_to_group_by, settings.limits.group_by_overflow_mode), settings.asynchronous);
else
stream = maybeAsynchronous(
new SplittingAggregatingBlockInputStream(
new UnionBlockInputStream(streams, settings.max_threads), key_names, aggregates, settings.max_threads), settings.asynchronous);
streams.resize(1);*/
}