Skip to content

Revert "PromQL: assert output() is called on resolved plans in AcrossSeriesAggregate (#145525)" #145597

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
alex-spies merged 3 commits into from
Apr 2, 2026
Merged

Revert "PromQL: assert output() is called on resolved plans in AcrossSeriesAggregate (#145525)" #145597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
93bfabd
Revert "PromQL: assert output() is called on resolved plans in Across…
felixbarny Apr 2, 2026
af005d4
Merge remote-tracking branch 'origin/main' into revert-promql-output-…
felixbarny Apr 2, 2026
9bd4f58
Merge branch 'main' into revert-promql-output-assert
felixbarny Apr 2, 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
30 changes: 0 additions & 30 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,18 +404,6 @@ tests:
- class: org.elasticsearch.xpack.sql.qa.jdbc.single_node.SingleNodeJdbcResultSetIT
method: testGettingValidLongWithoutCasting
issue: https://github.com/elastic/elasticsearch/issues/145580
- class: org.elasticsearch.xpack.esql.tree.EsqlNodeSubclassTests
method: testReplaceChildren {class org.elasticsearch.xpack.esql.plan.physical.MergeExec}
issue: https://github.com/elastic/elasticsearch/issues/145581
- class: org.elasticsearch.xpack.esql.tree.EsqlNodeSubclassTests
method: testReplaceChildren {class org.elasticsearch.xpack.esql.plan.logical.Filter}
issue: https://github.com/elastic/elasticsearch/issues/145583
- class: org.elasticsearch.xpack.esql.tree.EsqlNodeSubclassTests
method: testTransform {class org.elasticsearch.xpack.esql.plan.physical.ExchangeSinkExec}
issue: https://github.com/elastic/elasticsearch/issues/145584
- class: org.elasticsearch.xpack.esql.tree.EsqlNodeSubclassTests
method: testTransform {class org.elasticsearch.xpack.esql.plan.physical.ExchangeExec}
issue: https://github.com/elastic/elasticsearch/issues/145585
Copy link
Copy Markdown
Contributor

@idegtiarenko idegtiarenko Apr 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately, it looks like more mutes were introduced in meanwhile.

Copy link
Copy Markdown
Contributor

@alex-spies alex-spies Apr 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could maybe be solved in a follow-up? I think we'll get more and more mutes until this is in :)

Copy link
Copy Markdown
Member Author

@felixbarny felixbarny Apr 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've updated a few and will now hold off until this is in, then update the rest.

- class: org.elasticsearch.xpack.esql.CsvTests
method: test {csv-spec:stats_percentile.percentileOfLong}
issue: https://github.com/elastic/elasticsearch/issues/145589
Expand All @@ -425,27 +413,9 @@ tests:
- class: org.elasticsearch.xpack.sql.qa.jdbc.single_node.SingleNodeJdbcFetchSizeIT
method: testScrollWithDatetimeAndTimezoneParam
issue: https://github.com/elastic/elasticsearch/issues/145592
- class: org.elasticsearch.xpack.esql.tree.EsqlNodeSubclassTests
method: testReplaceChildren {class org.elasticsearch.xpack.esql.plan.logical.join.InlineJoin}
issue: https://github.com/elastic/elasticsearch/issues/145594
- class: org.elasticsearch.xpack.esql.tree.EsqlNodeSubclassTests
method: testTransform {class org.elasticsearch.xpack.esql.plan.logical.Dissect}
issue: https://github.com/elastic/elasticsearch/issues/145595
- class: org.elasticsearch.xpack.esql.plan.logical.CommandLicenseTests
method: testLicenseCheck
issue: https://github.com/elastic/elasticsearch/issues/145600
- class: org.elasticsearch.xpack.esql.tree.EsqlNodeSubclassTests
method: testTransform {class org.elasticsearch.xpack.esql.plan.logical.local.ResolvingProject}
issue: https://github.com/elastic/elasticsearch/issues/145601
- class: org.elasticsearch.xpack.esql.tree.EsqlNodeSubclassTests
method: testReplaceChildren {class org.elasticsearch.xpack.esql.plan.logical.promql.PromqlCommand}
issue: https://github.com/elastic/elasticsearch/issues/145603
- class: org.elasticsearch.xpack.esql.tree.EsqlNodeSubclassTests
method: testReplaceChildren {class org.elasticsearch.xpack.esql.plan.logical.local.ResolvingProject}
issue: https://github.com/elastic/elasticsearch/issues/145604
- class: org.elasticsearch.xpack.esql.tree.EsqlNodeSubclassTests
method: testTransform {class org.elasticsearch.xpack.esql.plan.physical.MergeExec}
issue: https://github.com/elastic/elasticsearch/issues/145606
- class: org.elasticsearch.indices.IndexingMemoryControllerIT
method: testDeletesAloneCanTriggerRefresh
issue: https://github.com/elastic/elasticsearch/issues/145609
Expand Down
3 changes: 1 addition & 2 deletions ...src/main/java/org/elasticsearch/xpack/esql/plan/logical/promql/AcrossSeriesAggregate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,7 @@ public List<Attribute> output() {
if (grouping == Grouping.WITHOUT) {
return List.of(timeseriesAttribute);
}
assert expressionsResolved() : "output() called on unresolved plan";
return groupings.stream().filter(a -> a.dataType() != DataType.NULL).toList();
return groupings.stream().filter(a -> a.resolved() == false || a.dataType() != DataType.NULL).toList();
}

@Override
Expand Down
Loading