Skip to content

[Calcite] Make containsNestedAggregator tolerate flat-leaf schemas #5423

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
ahkcs merged 2 commits into from
May 8, 2026
+17 −2
Merged

[Calcite] Make containsNestedAggregator tolerate flat-leaf schemas #5423

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
772be11
[Calcite] Make containsNestedAggregator tolerate flat-leaf schemas
mch2 May 8, 2026
ba80518
fix spotless
mch2 May 8, 2026
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
19 changes: 17 additions & 2 deletions core/src/main/java/org/opensearch/sql/calcite/CalciteRelNodeVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1538,10 +1538,25 @@ private Pair<List<RexNode>, List<AggCall>> aggregateWithTrimming(
* count(a.b)] returns true.
*/
private boolean containsNestedAggregator(RelBuilder relBuilder, List<RexInputRef> aggCallRefs) {
// For each aggregator argument, take the part of its column name before the first dot
// (e.g. "city" from "city.location.latitude") and check whether that's a top-level
// ARRAY column — the marker for an OpenSearch `nested` field.
//
// The classic path always exposes a top-level column for object/nested parents. The
// analytics-engine path emits only the flat leaves ("city.name", "city.location.latitude")
// because parent placeholder types (MAP<VARCHAR, ANY>) can't round-trip through Substrait.
// RelDataType.getField returns null when the column doesn't exist — for analytics-engine,
// that null just means "not nested," which is the right answer.
RelDataType rowType = relBuilder.peek().getRowType();
return aggCallRefs.stream()
.map(r -> relBuilder.peek().getRowType().getFieldNames().get(r.getIndex()))
.map(r -> rowType.getFieldNames().get(r.getIndex()))
.map(name -> org.apache.commons.lang3.StringUtils.substringBefore(name, "."))
.anyMatch(root -> relBuilder.field(root).getType().getSqlTypeName() == SqlTypeName.ARRAY);
.anyMatch(
root -> {
RelDataTypeField field =
rowType.getField(root, /* caseSensitive= */ true, /* elideRecord= */ false);
return field != null && field.getType().getSqlTypeName() == SqlTypeName.ARRAY;
});
}

/**
Expand Down
Loading