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

Fixed error #1947

Browse Source
This commit is contained in:
Alexey Milovidov 2018-03-01 09:07:04 +03:00
parent b9c8c04d4b
commit 15dc5da190
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/src/DataStreams/IBlockInputStream.cpp
View File

@ -68,7 +68,7 @@ void IBlockInputStream::dumpTree(std::ostream & ostr, size_t indent, size_t mult
ostr << String(indent, ' ') << getName(); ostr << String(indent, ' ') << getName();
if (multiplier > 1) if (multiplier > 1)
ostr << " × " << multiplier; ostr << " × " << multiplier;
// ostr << ": " << getHeader().dumpStructure(); ostr << ": " << getHeader().dumpStructure();
ostr << std::endl; ostr << std::endl;
++indent; ++indent;

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

@ -286,9 +286,12 @@ InterpreterSelectQuery::AnalysisResult InterpreterSelectQuery::analyzeExpression
res.before_order_and_select = chain.getLastActions(); res.before_order_and_select = chain.getLastActions();
chain.addStep(); chain.addStep();
query_analyzer->appendLimitBy(chain, !res.second_stage); if (query_analyzer->appendLimitBy(chain, !res.second_stage))
{
res.has_limit_by = true;
res.before_limit_by = chain.getLastActions(); res.before_limit_by = chain.getLastActions();
chain.addStep(); chain.addStep();
}
query_analyzer->appendProjectResult(chain); query_analyzer->appendProjectResult(chain);
res.final_projection = chain.getLastActions(); res.final_projection = chain.getLastActions();
@ -438,7 +441,7 @@ void InterpreterSelectQuery::executeImpl(Pipeline & pipeline, const BlockInputSt
/** 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,
* limiting the number of rows in each up to `offset + limit`. * limiting the number of rows in each up to `offset + limit`.
*/ */
if (query.limit_length && pipeline.hasMoreThanOneStream() && !query.distinct && !query.limit_by_expression_list && !settings.extremes) if (query.limit_length && pipeline.hasMoreThanOneStream() && !query.distinct && !expressions.has_limit_by && !settings.extremes)
{ {
executePreLimit(pipeline); executePreLimit(pipeline);
} }
@ -460,7 +463,7 @@ void InterpreterSelectQuery::executeImpl(Pipeline & pipeline, const BlockInputSt
if (need_second_distinct_pass) if (need_second_distinct_pass)
executeDistinct(pipeline, false, expressions.selected_columns); executeDistinct(pipeline, false, expressions.selected_columns);
if (query.limit_by_expression_list) if (expressions.has_limit_by)
{ {
executeExpression(pipeline, expressions.before_limit_by); executeExpression(pipeline, expressions.before_limit_by);
executeLimitBy(pipeline); executeLimitBy(pipeline);

1
dbms/src/Interpreters/InterpreterSelectQuery.h
View File

@ -118,6 +118,7 @@ private:
bool need_aggregate = false; bool need_aggregate = false;
bool has_having = false; bool has_having = false;
bool has_order_by = false; bool has_order_by = false;
bool has_limit_by = false;
ExpressionActionsPtr before_join; /// including JOIN ExpressionActionsPtr before_join; /// including JOIN
ExpressionActionsPtr before_where; ExpressionActionsPtr before_where;