Skip to content

Commit 9dcc2c5

Browse files
committed
Remove defense check
Signed-off-by: Yuanchun Shen <yuanchu@amazon.com>
1 parent 56d6033 commit 9dcc2c5

1 file changed

Lines changed: 4 additions & 5 deletions

File tree

core/src/main/java/org/opensearch/sql/calcite/CalciteRelNodeVisitor.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -997,16 +997,15 @@ private Pair<List<RexNode>, List<AggCall>> aggregateWithTrimming(
997997
// because that Mapping only works for RexNode, but we need both AggCall and RexNode list.
998998
Pair<List<RexNode>, List<AggCall>> reResolved =
999999
resolveAttributesForAggregation(groupExprList, aggExprList, context);
1000-
List<String> names = getGroupKeyNamesAfterAggregation(reResolved.getLeft());
1000+
1001+
List<String> intendedGroupKeyAliases = getGroupKeyNamesAfterAggregation(reResolved.getLeft());
10011002
context.relBuilder.aggregate(
10021003
context.relBuilder.groupKey(reResolved.getLeft()), reResolved.getRight());
10031004
// During aggregation, Calcite projects both input dependencies and output group-by fields.
10041005
// When names conflict, Calcite adds numeric suffixes (e.g., "value0").
10051006
// Apply explicit renaming to restore the intended aliases.
1006-
if (names.size() == reResolved.getLeft().size()) {
1007-
// Defense check: if any group-by key is not aliased, do not rename
1008-
context.relBuilder.rename(names);
1009-
}
1007+
context.relBuilder.rename(intendedGroupKeyAliases);
1008+
10101009
return Pair.of(reResolved.getLeft(), reResolved.getRight());
10111010
}
10121011

0 commit comments

Comments
 (0)