[ES|QL] Make numberOfChannels consistent with layout map by removing duplicated ChannelSet #125636
Conversation
This file contains 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
|
Hi @fang-xing-esql, I've created a changelog YAML for you. |
|
Look more self contained than #125636 |
|
Pinging @elastic/es-analytical-engine (Team:Analytics) |
elasticsearchmachine
added
the
Team:Analytics
alex-spies
approved these changes
Mar 26, 2025
There was a problem hiding this comment.
I think we can merge this, but should immediately work on a long-term fix.
Attribute ids should not have duplicates in layouts to begin with. The layout should reflect what pages passed through the corresponding operators actually look like - discarding a duplicate attribute means we act as if the block was just not there and this can lead to wrong blocks being passed to operators.
| /** | ||
| * Create null alias with new id in ReplaceMissingFieldWithNull when there is lookup join with multiple batches. | ||
| */ | ||
| REPLACE_MISSING_FIELD_WITH_NULL_NEW_ALIAS_ID_FOR_JOIN_AND_MULTIPLE_BATCHES; |
There was a problem hiding this comment.
Maybe the name should reflect the current fix more clearly.
|
When we merge this, let's make sure this gets backported as generously as #125462 was planned to. |
fang-xing-esql
added
the
auto-backport
💔 Backport failed
You can use sqren/backport to manually backport by running |
fang-xing-esql
added a commit
to fang-xing-esql/Elasticsearch
that referenced
this pull request
Mar 26, 2025
…duplicated ChannelSet (elastic#125636) * make numberOfChannels consistent with layout (cherry picked from commit 80125a4) # Conflicts: # x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/RestEsqlTestCase.java # x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java
💚 All backports created successfully
Questions ?Please refer to the Backport tool documentation |
fang-xing-esql
added a commit
to fang-xing-esql/Elasticsearch
that referenced
this pull request
Mar 26, 2025
…duplicated ChannelSet (elastic#125636) * make numberOfChannels consistent with layout (cherry picked from commit 80125a4) # Conflicts: # x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/RestEsqlTestCase.java # x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java
elasticsearchmachine
pushed a commit
that referenced
this pull request
Mar 26, 2025
…duplicated ChannelSet (#125636) (#125720) * make numberOfChannels consistent with layout (cherry picked from commit 80125a4) # Conflicts: # x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/RestEsqlTestCase.java # x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java
elasticsearchmachine
pushed a commit
that referenced
this pull request
Mar 26, 2025
…duplicated ChannelSet (#125636) (#125721) * make numberOfChannels consistent with layout (cherry picked from commit 80125a4) # Conflicts: # x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/RestEsqlTestCase.java # x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java
mark-vieira
pushed a commit
to mark-vieira/elasticsearch
that referenced
this pull request
Mar 26, 2025
…duplicated ChannelSet (elastic#125636) (elastic#125720) * make numberOfChannels consistent with layout (cherry picked from commit 80125a4) # Conflicts: # x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/RestEsqlTestCase.java # x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java
omricohenn
pushed a commit
to omricohenn/elasticsearch
that referenced
this pull request
Mar 28, 2025
…duplicated ChannelSet (elastic#125636) * make numberOfChannels consistent with layout
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Resolves: #121754
This is another option to solve this bug, if duplicated
ChannelSetare expected to be added to the layout or it is not avoidable.This NullPointerException happens in Layout.Builder.build(), when there is null ChannelSet in Layout.Builder.channels.
A null ChannelSet could be added in Layout.Builder.channels by Layout.inverse(), if the numberOfChannels > the # of items in the layout map. `
When there are multiple batches of data node executions with lookup join and sort in the query, LocalExecutionPlanner.planEval could potentially append duplicated ChannelSet - duplicated NameId and data type, to the list of ChannelSet in Layout.Builder, which causes numberOfChannels > the # of items in the layout map when build() is called and a DefaultLayout is created.