Skip to content

ES|QL: Resolve Keep plan added to FORK branches#129754

Merged
ioanatia merged 1 commit intoelastic:mainfrom
ioanatia:fork_fix_projections
Jun 20, 2025
Merged

ES|QL: Resolve Keep plan added to FORK branches#129754
ioanatia merged 1 commit intoelastic:mainfrom
ioanatia:fork_fix_projections

Conversation

@ioanatia
Copy link
Copy Markdown
Member

@ioanatia ioanatia commented Jun 20, 2025 •
edited
Loading

#121950
fixes #129715

In order to align the output of FORK branches, we always add an explicit Keep plan at end of each branch.
However, we never actually resolve the KEEP plans we are adding.
KEEP can be unresolved in case it contains columns with unsupported or conflicting types.

Then we end up skipping validations in the verifier because the KEEP is unresolved:

elasticsearch/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/analysis/Verifier.java

Lines 109 to 113 in b2acda9

plan.forEachDown(p -> {
// if the children are unresolved, so will this node; counting it will only add noise
if (p.childrenResolved() == false) {
return;
}

@ioanatia ioanatia added >non-issue :Analytics/ES|QL AKA ESQL v9.1.0 Team:Search - Relevance The Search organization Search Relevance team labels Jun 20, 2025
ChrisHegarty
ChrisHegarty approved these changes Jun 20, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@ChrisHegarty ChrisHegarty left a comment

Choose a reason for hiding this comment

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

LGTM

tteofili
tteofili approved these changes Jun 20, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@tteofili tteofili left a comment

Choose a reason for hiding this comment

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

good catch, LGTM

luigidellaquila
luigidellaquila approved these changes Jun 20, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@luigidellaquila luigidellaquila left a comment

Choose a reason for hiding this comment

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

LGTM, thanks @ioanatia !

@ioanatia ioanatia marked this pull request as ready for review June 20, 2025 10:47
@elasticsearchmachine elasticsearchmachine added the Team:Analytics Meta label for analytical engine team (ESQL/Aggs/Geo) label Jun 20, 2025
@elasticsearchmachine
Copy link
Copy Markdown
Collaborator

elasticsearchmachine commented Jun 20, 2025

Pinging @elastic/es-analytical-engine (Team:Analytics)

@elasticsearchmachine elasticsearchmachine removed the Team:Search - Relevance The Search organization Search Relevance team label Jun 20, 2025
@ioanatia ioanatia merged commit 0c0bf6b into elastic:main Jun 20, 2025
27 checks passed
@ioanatia ioanatia deleted the fork_fix_projections branch June 20, 2025 11:07
This was referenced Jun 20, 2025
Merged
Closed
kderusso pushed a commit to kderusso/elasticsearch that referenced this pull request Jun 23, 2025
@ioanatia @kderusso
Resolve Keep plan added to FORK branches (elastic#129754)
b78bfc2
mridula-s109 pushed a commit to mridula-s109/elasticsearch that referenced this pull request Jun 25, 2025
@ioanatia @mridula-s109
Resolve Keep plan added to FORK branches (elastic#129754)
920fb38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@luigidellaquila luigidellaquila luigidellaquila approved these changes

@tteofili tteofili tteofili approved these changes

@carlosdelest carlosdelest carlosdelest approved these changes

@ChrisHegarty ChrisHegarty ChrisHegarty approved these changes

Assignees

No one assigned

Labels

:Analytics/ES|QL AKA ESQL >non-issue Team:Analytics Meta label for analytical engine team (ESQL/Aggs/Geo) v9.1.0

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

ES|QL: validation doesn't work after FORK

6 participants

@ioanatia @elasticsearchmachine @luigidellaquila @tteofili @carlosdelest @ChrisHegarty