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

fix pipeline

Browse Source
This commit is contained in:
CurtizJ 2019-07-25 14:00:14 +03:00
parent f5b93eb991
commit b1cc019bd4
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1068,13 +1068,14 @@ void InterpreterSelectQuery::executeImpl(TPipeline & pipeline, const BlockInputS
* - therefore, we merge the sorted streams from remote servers. * - therefore, we merge the sorted streams from remote servers.
*/ */
if (!query_info.sorting_info) // Otherwise we have executed them while reading
executeExpression(pipeline, expressions.before_order);
if (!expressions.first_stage && !expressions.need_aggregate && !(query.group_by_with_totals && !aggregate_final)) if (!expressions.first_stage && !expressions.need_aggregate && !(query.group_by_with_totals && !aggregate_final))
executeMergeSorted(pipeline); executeMergeSorted(pipeline);
else /// Otherwise, just sort. else /// Otherwise, just sort.
{
if (!query_info.sorting_info) // Otherwise we have executed them while reading
executeExpression(pipeline, expressions.before_order);
executeOrder(pipeline, query_info.sorting_info); executeOrder(pipeline, query_info.sorting_info);
}
} }
/** Optimization - if there are several sources and there is LIMIT, then first apply the preliminary LIMIT, /** Optimization - if there are several sources and there is LIMIT, then first apply the preliminary LIMIT,