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

[Vectorized] Support both distinct and order by of group_concat (#11278)

Browse Source 
Co-authored-by: lihaopeng <lihaopeng@baidu.com>
This commit is contained in:
HappenLee
2022-07-29 09:11:34 +08:00
committed by GitHub
parent 91424a4a4e
commit bac280e803
6 changed files with 81 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
fe/fe-core/src/main/java/org/apache/doris/analysis/AggregateInfo.java
View File

@ -327,6 +327,13 @@ public final class AggregateInfo extends AggregateInfoBase {
// TODO: Deal with constant exprs more generally, instead of special-casing
// group_concat().
expr0Children.add(distinctAggExprs.get(0).getChild(0).ignoreImplicitCast());
FunctionCallExpr distinctExpr = distinctAggExprs.get(0);
if (!distinctExpr.getOrderByElements().isEmpty()) {
for (int i = distinctExpr.getChildren().size() - distinctExpr.getOrderByElements().size();
i < distinctExpr.getChildren().size(); i++) {
expr0Children.add(distinctAggExprs.get(0).getChild(i));
}
}
} else {
for (Expr expr : distinctAggExprs.get(0).getChildren()) {
expr0Children.add(expr.ignoreImplicitCast());
@ -592,10 +599,17 @@ public final class AggregateInfo extends AggregateInfoBase {
// tuple reference is correct.
exprList.add(new SlotRef(inputDesc.getSlots().get(origGroupingExprs.size())));
// Check if user provided a custom separator
if (inputExpr.getChildren().size() == 2) {
if (inputExpr.getChildren().size() - inputExpr.getOrderByElements().size() == 2) {
exprList.add(inputExpr.getChild(1));
}
aggExpr = new FunctionCallExpr(inputExpr.getFnName(), exprList);
if (!inputExpr.getOrderByElements().isEmpty()) {
for (int i = 0; i < inputExpr.getOrderByElements().size(); i++) {
inputExpr.getOrderByElements().get(i).setExpr(
new SlotRef(inputDesc.getSlots().get(origGroupingExprs.size() + i + 1)));
}
}
aggExpr = new FunctionCallExpr(inputExpr.getFnName(), exprList, inputExpr.getOrderByElements());
} else {
// SUM(DISTINCT <expr>) -> SUM(<last grouping slot>);
// (MIN(DISTINCT ...) and MAX(DISTINCT ...) have their DISTINCT turned
@ -658,7 +672,7 @@ public final class AggregateInfo extends AggregateInfoBase {
// If we are counting distinct params of group_concat, we cannot include the custom
// separator since it is not a distinct param.
if (distinctAggExprs.get(0).getFnName().getFunction().equalsIgnoreCase("group_concat")) {
numDistinctParams = 1;
numDistinctParams = 1 + distinctAggExprs.get(0).getOrderByElements().size();
}
int numOrigGroupingExprs = inputAggInfo.getGroupingExprs().size() - numDistinctParams;
Preconditions.checkState(

9
fe/fe-core/src/main/java/org/apache/doris/analysis/FunctionCallExpr.java
View File

@ -148,6 +148,11 @@ public class FunctionCallExpr extends Expr {
this(fnName, new FunctionParams(false, params));
}
public FunctionCallExpr(FunctionName fnName, List<Expr> params, List<OrderByElement> orderByElements)
throws AnalysisException {
this(fnName, new FunctionParams(false, params), orderByElements);
}
public FunctionCallExpr(String fnName, FunctionParams params) {
this(new FunctionName(fnName), params, false);
}
@ -168,10 +173,6 @@ public class FunctionCallExpr extends Expr {
fnName.getFunction().toLowerCase())) {
throw new AnalysisException(
"ORDER BY not support for the function:" + fnName.getFunction().toLowerCase());
} else if (params.isDistinct()) {
throw new AnalysisException(
"ORDER BY not support for the distinct, support in the furture:"
+ fnName.getFunction().toLowerCase());
}
}
setChildren();