diff options
| author | Jinfeng Ni <jni@maprtech.com> | 2014-07-28 14:11:17 -0700 |
|---|---|---|
| committer | Jacques Nadeau <jacques@apache.org> | 2014-07-29 08:36:27 -0700 |
| commit | 686a282c93f3412ca4f977a4c32c44264f8b9a23 (patch) | |
| tree | d16ee07eba29039c2be04dc158ed849674c36032 /exec/java-exec/src/main | |
| parent | 91b33f98501cab8081f9cf2dce74418b4a018019 (diff) | |
DRILL-1212: Propagate trait in 2 phase aggregation rule, to avoid adding unnecessary exchange operator.
Diffstat (limited to 'exec/java-exec/src/main')
| -rw-r--r-- | exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashAggPrule.java | 2 | ||||
| -rw-r--r-- | exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/StreamAggPrule.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashAggPrule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashAggPrule.java index 4d42f6643..471e165e2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashAggPrule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashAggPrule.java @@ -117,7 +117,7 @@ public class HashAggPrule extends AggPruleBase { new HashToRandomExchangePrel(phase1Agg.getCluster(), phase1Agg.getTraitSet().plus(Prel.DRILL_PHYSICAL).plus(distOnAllKeys), phase1Agg, ImmutableList.copyOf(getDistributionField(aggregate, true))); - HashAggPrel phase2Agg = new HashAggPrel(aggregate.getCluster(), traits, exch, + HashAggPrel phase2Agg = new HashAggPrel(aggregate.getCluster(), exch.getTraitSet(), exch, aggregate.getGroupSet(), phase1Agg.getPhase2AggCalls(), OperatorPhase.PHASE_2of2); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/StreamAggPrule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/StreamAggPrule.java index 4191184f1..b5b036492 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/StreamAggPrule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/StreamAggPrule.java @@ -145,7 +145,7 @@ public class StreamAggPrule extends AggPruleBase { collation, numEndPoints); - return new StreamAggPrel(aggregate.getCluster(), traits, exch, + return new StreamAggPrel(aggregate.getCluster(), exch.getTraitSet(), exch, aggregate.getGroupSet(), phase1Agg.getPhase2AggCalls(), OperatorPhase.PHASE_2of2); |