Skip to content

fix(batch): use shuffle aggregation for distinct aggregation #125

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
Feb 7, 2022
Merged

fix(batch): use shuffle aggregation for distinct aggregation #125

Show file tree
Hide file tree
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
12 changes: 12 additions & 0 deletions java/planner/src/main/java/com/risingwave/planner/rules/distributed/agg/TwoPhaseAggRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import java.util.List;
import java.util.stream.Collectors;
import org.apache.calcite.plan.RelOptRule;
import org.apache.calcite.plan.RelOptRuleCall;
import org.apache.calcite.rel.RelNode;
import org.apache.calcite.rel.convert.ConverterRule;
import org.apache.calcite.rex.RexNode;
Expand All @@ -40,6 +41,17 @@ protected TwoPhaseAggRule(Config config) {
super(config);
}

@Override
public boolean matches(RelOptRuleCall call) {
var agg = (RwAggregate) call.rel(0);
for (var aggCall : agg.getAggCallList()) {
if (aggCall.isDistinct()) {
return false;
}
}
return true;
}

@Override
public @Nullable RelNode convert(RelNode rel) {
var agg = (RwAggregate) rel;
Expand Down
3 changes: 2 additions & 1 deletion java/planner/src/main/java/com/risingwave/planner/rules/physical/BatchRuleSets.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import com.risingwave.planner.rel.physical.join.RwBatchHashJoin;
import com.risingwave.planner.rel.physical.join.RwBatchNestedLoopJoin;
import com.risingwave.planner.rel.physical.join.RwBatchSortMergeJoin;
import com.risingwave.planner.rules.distributed.agg.ShuffleAggRule;
import com.risingwave.planner.rules.distributed.agg.SingleLimitRule;
import com.risingwave.planner.rules.distributed.agg.TwoPhaseAggRule;
import com.risingwave.planner.rules.distributed.agg.TwoPhaseLimitRule;
Expand Down Expand Up @@ -163,7 +164,7 @@ private BatchRuleSets() {}
ShuffleJoinRule.INSTANCE,
// FIXME: currently cardinality estimation is inaccurate without enough statistics to
// determine shuffleAgg or 2phaseAgg
// ShuffleAggRule.INSTANCE,
ShuffleAggRule.INSTANCE,
TwoPhaseAggRule.INSTANCE,
TwoPhaseLimitRule.INSTANCE,
SingleLimitRule.INSTANCE);
Expand Down
Loading