Skip to content

Ensure deterministic order of aggregates #25948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 6, 2025
Merged

Ensure deterministic order of aggregates #25948

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .../src/main/java/io/trino/sql/planner/iterative/rule/PushPartialAggregationThroughJoin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
package io.trino.sql.planner.iterative.rule;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Streams;
import io.trino.Session;
Expand All @@ -36,7 +37,6 @@
import io.trino.sql.planner.plan.ProjectNode;
import org.assertj.core.util.VisibleForTesting;

import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -328,7 +328,7 @@ private PlanNode replaceJoin(

private PlanNode toIntermediateAggregation(AggregationNode partialAggregation, PlanNode source, Context context)
{
Map<Symbol, AggregationNode.Aggregation> intermediateAggregation = new HashMap<>();
ImmutableMap.Builder<Symbol, Aggregation> intermediateAggregation = ImmutableMap.builder();
for (Map.Entry<Symbol, AggregationNode.Aggregation> entry : partialAggregation.getAggregations().entrySet()) {
AggregationNode.Aggregation aggregation = entry.getValue();
ResolvedFunction resolvedFunction = aggregation.getResolvedFunction();
Expand All @@ -353,7 +353,7 @@ private PlanNode toIntermediateAggregation(AggregationNode partialAggregation, P
return new AggregationNode(
context.getIdAllocator().getNextId(),
source,
intermediateAggregation,
intermediateAggregation.buildOrThrow(),
partialAggregation.getGroupingSets(),
// preGroupedSymbols reflect properties of the input. Splitting the aggregation and pushing partial aggregation
// through the join may or may not preserve these properties. Hence, it is safest to drop preGroupedSymbols here.
Expand Down