[CALCITE-932] Fix muddled columns when RelFieldTrimmer is applied to Aggregate
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/d50c46a1 Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/d50c46a1 Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/d50c46a1 Branch: refs/heads/branch-release Commit: d50c46a1a970c6bad47f31c1dfc56a14146c37f3 Parents: 5ed5ef4 Author: Jesus Camacho Rodriguez <[email protected]> Authored: Thu Oct 22 11:03:00 2015 -0700 Committer: Jesus Camacho Rodriguez <[email protected]> Committed: Thu Oct 22 11:03:00 2015 -0700 ---------------------------------------------------------------------- core/src/main/java/org/apache/calcite/sql2rel/RelFieldTrimmer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/calcite/blob/d50c46a1/core/src/main/java/org/apache/calcite/sql2rel/RelFieldTrimmer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/sql2rel/RelFieldTrimmer.java b/core/src/main/java/org/apache/calcite/sql2rel/RelFieldTrimmer.java index f7e6b35..2f0218b 100644 --- a/core/src/main/java/org/apache/calcite/sql2rel/RelFieldTrimmer.java +++ b/core/src/main/java/org/apache/calcite/sql2rel/RelFieldTrimmer.java @@ -824,7 +824,7 @@ public class RelFieldTrimmer implements ReflectiveVisitor { RelBuilder.AggCall newAggCall = relBuilder.aggregateCall(aggCall.getAggregation(), aggCall.isDistinct(), filterArg, aggCall.name, args); - mapping.set(groupCount + indicatorCount + newAggCallList.size(), j); + mapping.set(j, groupCount + indicatorCount + newAggCallList.size()); newAggCallList.add(newAggCall); } ++j;
