[9.2] Replace remote Enrich hack with proper handling of remote Enrich (#134967)#136901
Merged
elasticsearchmachine merged 2 commits intoelastic:9.2from Oct 21, 2025
Merged
Conversation
…stic#134967) - The remote Enrich hack and the verification workaround that it necessitates are removed - Limit with remote Enrich is handled by duplicating the limits around Enrich - TopN with remote Enrich is handled by duplicating around Enrich and adjusting projections - Introduced `CardinalityPreserving` interface to mark nodes that preserve cardinality - Introduced the capability to run optimizations only on coordinator plan (`CoordinatorOnly` interface) - Added post-optimizer check that ensures remote Enrich is not moved to the coordinator plan (cherry picked from commit fd6e962) # Conflicts: # x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/LogicalVerifier.java # x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/PhysicalVerifier.java # x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/PostOptimizationPhasePlanVerifier.java # x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/PushDownAndCombineLimits.java
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
2 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.
Backport
This will backport the following commits from
mainto9.2:Questions ?
Please refer to the Backport tool documentation