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

[fix](Nereids) fix four phase aggregation compute wrong result (#36131)

Browse Source 
cherry pick from #36128
This commit is contained in:
924060929
2024-06-11 20:40:18 +08:00
committed by GitHub
parent d2a6911791
commit acbfcf7ad9
3 changed files with 75 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
fe/fe-core/src/main/java/org/apache/doris/nereids/rules/implementation/AggregateStrategies.java
View File

@ -360,6 +360,12 @@ public class AggregateStrategies implements ImplementationRuleFactory {
.addAll(agg.getDistinctArguments())
.build().size() > agg.getGroupByExpressions().size()
)
.when(agg -> {
if (agg.getDistinctArguments().size() == 1) {
return true;
}
return couldConvertToMulti(agg);
})
.thenApplyMulti(ctx -> {
Function<List<Expression>, RequireProperties> secondPhaseRequireGroupByAndDistinctHash =
groupByAndDistinct -> RequireProperties.of(
@ -1808,6 +1814,8 @@ public class AggregateStrategies implements ImplementationRuleFactory {
bufferToBufferParam, false, logicalAgg.getLogicalProperties(),
secondPhaseRequire, anyLocalAgg);
boolean shouldDistinctAfterPhase2 = distinctArguments.size() > 1;
// phase 3
AggregateParam distinctLocalParam = new AggregateParam(
AggPhase.DISTINCT_LOCAL, AggMode.INPUT_TO_BUFFER, couldBanned);
@ -1826,11 +1834,25 @@ public class AggregateStrategies implements ImplementationRuleFactory {
|| aggregateFunction.getDistinctArguments().size() == 1,
"cannot process more than one child in aggregate distinct function: "
+ aggregateFunction);
AggregateFunction nonDistinct = aggregateFunction
.withDistinctAndChildren(false, ImmutableList.copyOf(aggChild));
AggregateExpression nonDistinctAggExpr = new AggregateExpression(nonDistinct,
distinctLocalParam, aggregateFunction);
return nonDistinctAggExpr;
AggregateFunction newDistinct;
if (shouldDistinctAfterPhase2) {
// we use aggregate function to process distinct,
// so need to change to multi distinct function
newDistinct = tryConvertToMultiDistinct(
aggregateFunction.withDistinctAndChildren(
true, ImmutableList.copyOf(aggChild))
);
} else {
// we use group by to process distinct,
// so no distinct param in the aggregate function
newDistinct = aggregateFunction.withDistinctAndChildren(
false, ImmutableList.copyOf(aggChild));
}
AggregateExpression newDistinctAggExpr = new AggregateExpression(
newDistinct, distinctLocalParam, newDistinct);
return newDistinctAggExpr;
} else {
needUpdateSlot.add(aggregateFunction);
Alias alias = nonDistinctAggFunctionToAliasPhase2.get(expr);
@ -1867,11 +1889,19 @@ public class AggregateStrategies implements ImplementationRuleFactory {
|| aggregateFunction.getDistinctArguments().size() == 1,
"cannot process more than one child in aggregate distinct function: "
+ aggregateFunction);
AggregateFunction nonDistinct = aggregateFunction
.withDistinctAndChildren(false, ImmutableList.copyOf(aggChild));
AggregateFunction newDistinct;
if (shouldDistinctAfterPhase2) {
newDistinct = tryConvertToMultiDistinct(
aggregateFunction.withDistinctAndChildren(
true, ImmutableList.copyOf(aggChild))
);
} else {
newDistinct = aggregateFunction
.withDistinctAndChildren(false, ImmutableList.copyOf(aggChild));
}
int idx = logicalAgg.getOutputExpressions().indexOf(outputExpr);
Alias localDistinctAlias = (Alias) (localDistinctOutput.get(idx));
return new AggregateExpression(nonDistinct,
return new AggregateExpression(newDistinct,
distinctGlobalParam, localDistinctAlias.toSlot());
} else {
Alias alias = nonDistinctAggFunctionToAliasPhase3.get(expr);