Skip to content

Commit 508c422

Browse files
committed
Remove defense check
Signed-off-by: Yuanchun Shen <yuanchu@amazon.com>
1 parent 8f5e585 commit 508c422

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
@@ -1000,16 +1000,15 @@ private Pair<List<RexNode>, List<AggCall>> aggregateWithTrimming(
10001000
// because that Mapping only works for RexNode, but we need both AggCall and RexNode list.
10011001
Pair<List<RexNode>, List<AggCall>> reResolved =
10021002
resolveAttributesForAggregation(groupExprList, aggExprList, context);
1003-
List<String> names = getGroupKeyNamesAfterAggregation(reResolved.getLeft());
1003+
1004+
List<String> intendedGroupKeyAliases = getGroupKeyNamesAfterAggregation(reResolved.getLeft());
10041005
context.relBuilder.aggregate(
10051006
context.relBuilder.groupKey(reResolved.getLeft()), reResolved.getRight());
10061007
// During aggregation, Calcite projects both input dependencies and output group-by fields.
10071008
// When names conflict, Calcite adds numeric suffixes (e.g., "value0").
10081009
// Apply explicit renaming to restore the intended aliases.
1009-
if (names.size() == reResolved.getLeft().size()) {
1010-
// Defense check: if any group-by key is not aliased, do not rename
1011-
context.relBuilder.rename(names);
1012-
}
1010+
context.relBuilder.rename(intendedGroupKeyAliases);
1011+
10131012
return Pair.of(reResolved.getLeft(), reResolved.getRight());
10141013
}
10151014

0 commit comments

Comments
 (0)