CPS: Copy existing resolved index expressions when constructing a new SearchRequest from an existing one#139596
Merged
pawankartik-elastic merged 5 commits intoelastic:mainfrom Dec 18, 2025
Conversation
`SearchRequest` from an existing one
elasticsearchmachine
added
v9.3.0
serverless-linked
pawankartik-elastic
changed the title
SearchRequest from an existing oneSearchRequest from an existing one
pawankartik-elastic
added
>bug
Team:Search Foundations
Collaborator
|
Pinging @elastic/es-search-foundations (Team:Search Foundations) |
Collaborator
|
Hi @pawankartik-elastic, I've created a changelog YAML for you. |
smalyshev
approved these changes
Dec 16, 2025
smalyshev
reviewed
Dec 16, 2025
| this.waitForCheckpointsTimeout = searchRequest.waitForCheckpointsTimeout; | ||
| this.forceSyntheticSource = searchRequest.forceSyntheticSource; | ||
| this.projectRouting = searchRequest.projectRouting; | ||
| this.resolvedIndexExpressions = searchRequest.resolvedIndexExpressions; |
Contributor
There was a problem hiding this comment.
I'd add a quick unit test for this ctor just to ensure when we refactor it next time this aspect is not lost.
szybia
added a commit
to szybia/elasticsearch
that referenced
this pull request
Dec 19, 2025
* upstream/main: (253 commits) Adds ST_SIMPLIFY geo spatial function (elastic#136309) Take control of max clause count verification in Lucene searcher (elastic#139752) [ML] Unmute Inference Test (elastic#139765) Parameterize the vector operation benchmark tests (elastic#139735) Fix node reduction pushdown tests for release tests (elastic#139548) Fix flakiness in TSDataGenerationHelper (elastic#139759) CPS: Copy existing resolved index expressions when constructing a new `SearchRequest` from an existing one (elastic#139596) Add release notes for v9.1.9 release (elastic#139674) Add lucene query for wildcards on high cardinality keyword fields. (elastic#139746) Suppress Tika entitlement warnings from AWT (elastic#139711) Check field storage when synthetic source is enabled, in tests (elastic#139715) Refactor VectorSimilarityType to know about its corresponding Function (elastic#139678) Merge fixes from patch branch back into main (elastic#139721) Define native bulk operations for vector square distance (elastic#139198) Use LongUpDownCounter for Linked Project Error Metrics (elastic#139657) ESQL: Add javadoc that explains version-aware planning (elastic#139706) Add helper to pick node for reindex relocation (elastic#139081) Fix auth serialization randomized version test (elastic#139182) ES|QL - Add parsing, preanalysis and analysis timing information to profile (elastic#139540) Mute org.elasticsearch.persistent.ClusterPersistentTasksCustomMetadataTests testMinVersionSerialization elastic#139741 ...
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.
When a search request hits
TransportSearchActionand goes throughRewriteable#rewriteAndFetch(), we get back a newly rewritten "search request" via a listener that we pass. Underneath, the rewritten search request is constructed from the original one. Because this happens after the Security Action Filter runs, the new search request's index expressions are not resolved and staynull, and neither are the previously resolved index expressions copied onto the new request correctly. This PR fixes it by copying over the older computed info about the resolved expressions.The linked Serverless PR contains a test case that triggers a rewrite. I've explicitly checked that the rewrite occurs within
TSAbefore the search is executed and that without this fix, the rewritten request's resolved expressions arenull. Without this fix, the said test fails.