database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[SQL] Remove order by for subquery in set opertion clause (#3806)

Browse Source 
implemnets #3803 
Support disable some unmeaningful order by clause.
The default limit of 65535 will not be disabled because of it is added at plannode,
after we support spill to disk we can move this limit to analyze.
This commit is contained in:
yangzhg
2020-07-02 13:56:53 +08:00
committed by GitHub
parent d3d835844f
commit 707d03cbde
2 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
fe/src/main/java/org/apache/doris/analysis/QueryStmt.java
View File

@ -285,27 +285,26 @@ public abstract class QueryStmt extends StatementBase {
}
sortInfo = new SortInfo(orderingExprs, isAscOrder, nullsFirstParams);
// order by w/o limit and offset in inline views, union operands and insert statements
// order by w/o limit and offset in inline views, set operands and insert statements
// are ignored.
// TODO chenhao, open this when we don't limit rows subquery returns by SortNode.
/*if (!hasLimit() && !hasOffset() && !analyzer.isRootAnalyzer()) {
* evaluateOrderBy = false;
* // Return a warning that the order by was ignored.
* StringBuilder strBuilder = new StringBuilder();
* strBuilder.append("Ignoring ORDER BY clause without LIMIT or OFFSET: ");
* strBuilder.append("ORDER BY ");
* strBuilder.append(orderByElements.get(0).toSql());
* for (int i = 1; i < orderByElements.size(); ++i) {
* strBuilder.append(", ").append(orderByElements.get(i).toSql());
* }
* strBuilder.append(".\nAn ORDER BY appearing in a view, subquery, union operand, ");
* strBuilder.append("or an insert/ctas statement has no effect on the query result ");
* strBuilder.append("unless a LIMIT and/or OFFSET is used in conjunction ");
* strBuilder.append("with the ORDER BY.");
* } else {
*/
evaluateOrderBy = true;
//}
if (!hasLimit() && !hasOffset() && !analyzer.isRootAnalyzer()) {
evaluateOrderBy = false;
// Return a warning that the order by was ignored.
StringBuilder strBuilder = new StringBuilder();
strBuilder.append("Ignoring ORDER BY clause without LIMIT or OFFSET: ");
strBuilder.append("ORDER BY ");
strBuilder.append(orderByElements.get(0).toSql());
for (int i = 1; i < orderByElements.size(); ++i) {
strBuilder.append(", ").append(orderByElements.get(i).toSql());
}
strBuilder.append(".\nAn ORDER BY appearing in a view, subquery, union operand, ");
strBuilder.append("or an insert/ctas statement has no effect on the query result ");
strBuilder.append("unless a LIMIT and/or OFFSET is used in conjunction ");
strBuilder.append("with the ORDER BY.");
LOG.info(strBuilder.toString());
} else {
evaluateOrderBy = true;
}
}
/**

4
fe/src/main/java/org/apache/doris/planner/SingleNodePlanner.java
View File

@ -2105,7 +2105,9 @@ public class SingleNodePlanner {
private List<Expr> getBoundPredicates(Analyzer analyzer, TupleDescriptor tupleDesc) {
final List<TupleId> tupleIds = Lists.newArrayList();
tupleIds.add(tupleDesc.getId());
if (tupleDesc != null) {
tupleIds.add(tupleDesc.getId());
}
return analyzer.getUnassignedConjuncts(tupleIds);
}
}