Skip to content

[ES|QL] Allow single fork branch#136805

Merged
pmpailis merged 10 commits into
elastic:mainfrom
pmpailis:allow_single_fork_branch
Oct 21, 2025
Merged

[ES|QL] Allow single fork branch#136805
pmpailis merged 10 commits into
elastic:mainfrom
pmpailis:allow_single_fork_branch

Conversation

@pmpailis
Copy link
Copy Markdown
Contributor

@pmpailis pmpailis commented Oct 20, 2025 •
edited
Loading

Removing the requirement for > 2 fork branches. So a query like

            FROM test
            | WHERE id > 2
            | FORK
               ( WHERE content:"fox" )
            """

will now be allowed, and only fork1 will be added to the result set.

Closes #135825

@pmpailis pmpailis added >enhancement :Search Relevance/ES|QL Search functionality in ES|QL labels Oct 20, 2025
@elasticsearchmachine
Copy link
Copy Markdown
Collaborator

elasticsearchmachine commented Oct 20, 2025

Hi @pmpailis, I've created a changelog YAML for you.

@pmpailis
Copy link
Copy Markdown
Contributor Author

pmpailis commented Oct 20, 2025

@ioanatia went through the documentation but could not find any specific references to the >= 2 branches limitation that needed to be updated.

@pmpailis pmpailis marked this pull request as ready for review October 20, 2025 13:41
@elasticsearchmachine elasticsearchmachine added the Team:Search Relevance Meta label for the Search Relevance team in Elasticsearch label Oct 20, 2025
@elasticsearchmachine
Copy link
Copy Markdown
Collaborator

elasticsearchmachine commented Oct 20, 2025

Pinging @elastic/es-search-relevance (Team:Search Relevance)

ioanatia
ioanatia approved these changes Oct 20, 2025
View reviewed changes
Comment thread x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/parser/StatementParserTests.java
expectError("FROM foo* | FORK (LIMIT 10)", "line 1:13: Fork requires at least 2 branches");
expectError("FROM foo* | FORK (SORT a)", "line 1:13: Fork requires at least 2 branches");
expectError("FROM foo* | FORK (WHERE x>1 | LIMIT 5)", "line 1:13: Fork requires at least 2 branches");
expectError("FROM foo* | WHERE x>1 | FORK (WHERE a:\"baz\")", "Fork requires at least 2 branches");
Copy link
Copy Markdown
Member

@ioanatia ioanatia Oct 20, 2025

Choose a reason for hiding this comment

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

can we get a test for FORK with no branches? I think the grammar does not support it, but I don't think I added a test for that.

Copy link
Copy Markdown
Contributor Author

@pmpailis pmpailis Oct 20, 2025

Choose a reason for hiding this comment

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

Updated in a8ce7b9. I've also added a test in FuseIT to consume the result of a single-branched FORK. Let me know if you see any issues :)

@ioanatia
Copy link
Copy Markdown
Member

ioanatia commented Oct 20, 2025

also thought a bit more about the discussion we had around doing an optimization, like in the LogicalPlanBuilder when a single FORK branch is being used, to not even use the FORK logical plan, but have a "linear" plan.
You had a good intuition that we do have certain limitations for FORK, for example we only allow a single FORK command per query. If we do this optimization, we break this limitation which could be surprising for users.
So just removing the validation for now, with no optimizations, makes sense to me 👍

@pmpailis
Copy link
Copy Markdown
Contributor Author

pmpailis commented Oct 21, 2025

Thanks for reviewing this (again) @ioanatia !

@pmpailis pmpailis merged commit c3cc3d1 into elastic:main Oct 21, 2025
34 checks passed
chrisparrinello pushed a commit to chrisparrinello/elasticsearch that referenced this pull request Oct 24, 2025
@pmpailis @chrisparrinello
[ES|QL] Allow single fork branch (elastic#136805)
8c7d656
fzowl pushed a commit to voyage-ai/elasticsearch that referenced this pull request Nov 3, 2025
@pmpailis @fzowl
[ES|QL] Allow single fork branch (elastic#136805)
2f99cd3
@pmpailis pmpailis deleted the allow_single_fork_branch branch January 16, 2026 13:21
@sddonne sddonne mentioned this pull request May 5, 2026
Merged
sddonne added a commit to elastic/kibana that referenced this pull request May 6, 2026
@sddonne
[ES|QL] FORK now can be run on only one branch (#267712)
c743a2f 
## Summary
After elastic/elasticsearch#136805, FORK can be
run using a single branch.

Removed the "Must include at least two branches" validation.
<img width="1144" height="360" alt="image"
src="https://github.com/user-attachments/assets/2ce81fec-51d6-46c5-b562-8f068ab5ee40"
/>

The pipe is now suggested after the first branch.
kibanamachine added a commit to elastic/kibana that referenced this pull request May 6, 2026
@kibanamachine @sddonne
[9.4] [ES|QL] FORK now can be run on only one branch (#267712) (#267890)
7ea8d66 
# Backport

This will backport the following commits from `main` to `9.4`:
- [[ES|QL] FORK now can be run on only one branch
(#267712)](#267712)

<!--- Backport version: 9.6.6 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sorenlouv/backport)

<!--BACKPORT [{"author":{"name":"Sebastian Delle
Donne","email":"sebastian.delledonne@elastic.co"},"sourceCommit":{"committedDate":"2026-05-06T07:15:08Z","message":"[ES|QL]
FORK now can be run on only one branch (#267712)\n\n## Summary\nAfter
elastic/elasticsearch#136805, FORK can be\nrun
using a single branch.\n\nRemoved the \"Must include at least two
branches\" validation.\n<img width=\"1144\" height=\"360\"
alt=\"image\"\nsrc=\"https://github.com/user-attachments/assets/2ce81fec-51d6-46c5-b562-8f068ab5ee40\"\n/>\n\nThe
pipe is now suggested after the first
branch.","sha":"c743a2f1d6cece659b7547272c747c9914f21620","branchLabelMapping":{"^v9.5.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Feature:ES|QL","Team:ESQL","backport:version","v9.3.0","v9.4.0","v9.5.0"],"title":"[ES|QL]
FORK now can be run on only one
branch","number":267712,"url":"https://github.com/elastic/kibana/pull/267712","mergeCommit":{"message":"[ES|QL]
FORK now can be run on only one branch (#267712)\n\n## Summary\nAfter
elastic/elasticsearch#136805, FORK can be\nrun
using a single branch.\n\nRemoved the \"Must include at least two
branches\" validation.\n<img width=\"1144\" height=\"360\"
alt=\"image\"\nsrc=\"https://github.com/user-attachments/assets/2ce81fec-51d6-46c5-b562-8f068ab5ee40\"\n/>\n\nThe
pipe is now suggested after the first
branch.","sha":"c743a2f1d6cece659b7547272c747c9914f21620"}},"sourceBranch":"main","suggestedTargetBranches":["9.3","9.4"],"targetPullRequestStates":[{"branch":"9.3","label":"v9.3.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.4","label":"v9.4.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v9.5.0","branchLabelMappingKey":"^v9.5.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/267712","number":267712,"mergeCommit":{"message":"[ES|QL]
FORK now can be run on only one branch (#267712)\n\n## Summary\nAfter
elastic/elasticsearch#136805, FORK can be\nrun
using a single branch.\n\nRemoved the \"Must include at least two
branches\" validation.\n<img width=\"1144\" height=\"360\"
alt=\"image\"\nsrc=\"https://github.com/user-attachments/assets/2ce81fec-51d6-46c5-b562-8f068ab5ee40\"\n/>\n\nThe
pipe is now suggested after the first
branch.","sha":"c743a2f1d6cece659b7547272c747c9914f21620"}}]}]
BACKPORT-->

Co-authored-by: Sebastian Delle Donne <sebastian.delledonne@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ioanatia ioanatia ioanatia approved these changes

Assignees

No one assigned

Labels

>enhancement :Search Relevance/ES|QL Search functionality in ES|QL Team:Search Relevance Meta label for the Search Relevance team in Elasticsearch v9.3.0

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

ES|QL: Allow a single FORK branch

3 participants

@pmpailis @elasticsearchmachine @ioanatia