Revert "PromQL: assert output() is called on resolved plans in AcrossSeriesAggregate (#145525)"#145597
Merged
alex-spies merged 3 commits intoelastic:mainfrom Apr 2, 2026
Merged
Conversation
elasticsearchmachine
added
needs:triage
felixbarny
added
Team:StorageEngine
:StorageEngine/PromQL
elasticsearchmachine
removed
the
needs:triage
Collaborator
|
Pinging @elastic/es-storage-engine (Team:StorageEngine) |
ioanatia
approved these changes
Apr 2, 2026
alex-spies
approved these changes
Apr 2, 2026
idegtiarenko
reviewed
Apr 2, 2026
| 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 |
Contributor
There was a problem hiding this comment.
Unfortunately, it looks like more mutes were introduced in meanwhile.
Contributor
There was a problem hiding this comment.
Could maybe be solved in a follow-up? I think we'll get more and more mutes until this is in :)
Member
Author
There was a problem hiding this comment.
I've updated a few and will now hold off until this is in, then update the rest.
idegtiarenko
approved these changes
Apr 2, 2026
…SeriesAggregate (elastic#145525)" The assert caused EsqlNodeSubclassTests to fail because those tests call output() on plans with unresolved children by design. Restores the original resolved() guard in the filter instead. Fixes elastic#145581, elastic#145583, elastic#145584, elastic#145585, elastic#145594, elastic#145595, elastic#145601
felixbarny
force-pushed
the
revert-promql-output-assert
branch
from
48dd4cc to
93bfabd
Compare
This was referenced Apr 2, 2026
felixbarny
added a commit
to felixbarny/elasticsearch
that referenced
this pull request
Apr 2, 2026
felixbarny
added a commit
that referenced
this pull request
Apr 2, 2026
mromaios
pushed a commit
to mromaios/elasticsearch
that referenced
this pull request
Apr 9, 2026
…SeriesAggregate (elastic#145525)" (elastic#145597) The assert caused EsqlNodeSubclassTests to fail because those tests call output() on plans with unresolved children by design. Restores the original resolved() guard in the filter instead. Fixes elastic#145581, elastic#145583, elastic#145584, elastic#145585, elastic#145594, elastic#145595, elastic#145601
mromaios
pushed a commit
to mromaios/elasticsearch
that referenced
this pull request
Apr 9, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Reverts #145525 and unmutes the tests that were muted as a consequence.
The assert caused
EsqlNodeSubclassTeststo fail because those tests calloutput()on plans with unresolved children by design (structural tree testing). Restores the originalresolved() == falseguard in the filter.Fixes #145581, #145583, #145584, #145585, #145594, #145595, #145601, #145603, #145604, #145606