Support recording index resolution results on IndicesRequest#134783
Merged
elasticsearchmachine merged 12 commits intoelastic:mainfrom Sep 19, 2025
Merged
Support recording index resolution results on IndicesRequest#134783elasticsearchmachine merged 12 commits intoelastic:mainfrom
IndicesRequest#134783elasticsearchmachine merged 12 commits intoelastic:mainfrom
Conversation
…icsearch into cps-index-expressions-model
ReplacedIndexExpressions modelResolvedIndexExpressions model
ResolvedIndexExpressions modelIndicesRequest
IndicesRequestIndicesRequest
Collaborator
|
Pinging @elastic/es-security (Team:Security) |
ywangd
approved these changes
Sep 19, 2025
server/src/main/java/org/elasticsearch/action/ResolvedIndexExpression.java
Show resolved
Hide resolved
|
|
||
| /** | ||
| * Record the results of index resolution. See {@link ResolvedIndexExpressions} for details. | ||
| * Note: this method does not replace {@link #indices(String...)}. {@link #indices(String...)} must still be called to update |
Member
There was a problem hiding this comment.
Nothing to do for this PR. But could you please remind me what the long term vision is for this new method and the existing indices(String ...indices) method? Did we align that the new one could eventually replace the existing one and as an interim the default implementation could call something like indices(expressions.getAllLocalIndices())? Or maybe something else? My memory is hazy on this one.
Contributor
Author
There was a problem hiding this comment.
My current plan for the interim is to maintain the methods separately and keep them independent. However, I'll still play around with the option of making a call like indices(expressions.getAllLocalIndices()) under the hood in the next PR where I plug this into the indices resolver.
Long term, the plan is to consolidate the two methods (replace indices(...)). That's a bigger refactor but seems very worthwhile since it'll move us closer to having structured info about index resources as opposed to opaque strings.
server/src/main/java/org/elasticsearch/action/ResolvedIndexExpressions.java
Show resolved
Hide resolved
elasticsearchmachine
pushed a commit
that referenced
this pull request
Sep 24, 2025
This PR extends index resolution logic to capture the resolution mapping from original to resolution result via `ResolvedIndexExpressions` (introduced in #134783). This lets consumers such as cross-project search that require full resolution context to access it via the `IndicesRequest.Replaceable` interface. To maximize code re-use, the PR updates the existing `resolveIndexAbstractions` method to always return a `ResolvedIndexExpressions` instance. The result is only recorded on the request if a boolean flag is set to avoid unnecessary memory overhead in contexts where storing the expressions is not necessary. In a (much bigger) future refactor, we plan to move away from storing a raw indices list and always use `ResolvedIndexExpressions` as the source of truth for indices resources accessed by a request. Once that's complete, we will move to _always_ storing the full resolution result. This PR does not include the following, which we'll address in immediate follow ups: - Integrate the change into the wider implementation of cross-project search index expressions rewriting and error handling - Store resolution for `_all` index expression handling - Record full authorization exceptions on authorization failures - Record resolution for remote expressions (e.g., `p:logs -> p1:logs`) Relates: ES-12690
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
4 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.
This PR introduces
ResolvedIndexExpressionandResolvedIndexExpressionsclasses to capture context about index resolution (local results, exceptions, and unresolved remote expressions).IndicesRequest.Replaceablenow provides optional methods to set and retrieve resolved index expressions, enabling requests to carry richer resolution metadata alongside the existingindices(...)API.Follow up work will plug this class into
IndicesAndAliasesResolver.This change is motivated by the requirements around error handling for cross-project search where error handling is performed post local index resolution in some cases.
Closes: ES-12688