thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-04 13:32:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes previous changes 2

Browse Source
This commit is contained in:
Dmitry 2020-05-14 16:56:17 +03:00
parent 84be0fe847
commit 3221c7de85
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Interpreters/InterpreterSelectQuery.cpp
View File

@ -959,7 +959,11 @@ void InterpreterSelectQuery::executeImpl(TPipeline & pipeline, const BlockInputS
executeWhere(pipeline, expressions.before_where, expressions.remove_where_filter); executeWhere(pipeline, expressions.before_where, expressions.remove_where_filter);
if (expressions.need_aggregate) if (expressions.need_aggregate)
{
executeAggregation(pipeline, expressions.before_aggregation, aggregate_overflow_row, aggregate_final, query_info.input_order_info); executeAggregation(pipeline, expressions.before_aggregation, aggregate_overflow_row, aggregate_final, query_info.input_order_info);
/// We need to reset input order info, so that executeOrder can't use it
query_info.input_order_info.reset();
}
else else
{ {
executeExpression(pipeline, expressions.before_order_and_select); executeExpression(pipeline, expressions.before_order_and_select);