Use Suppliers To Get Inference Results In Semantic Queries#136720
Merged
Mikep86 merged 22 commits intoelastic:mainfrom Oct 21, 2025
Merged
Use Suppliers To Get Inference Results In Semantic Queries#136720Mikep86 merged 22 commits intoelastic:mainfrom
Mikep86 merged 22 commits intoelastic:mainfrom
Conversation
Mikep86
added
>bug
auto-backport
elasticsearchmachine
added
v9.3.0
Team:Search - Relevance
Collaborator
|
Pinging @elastic/search-relevance (Team:Search - Relevance) |
Collaborator
|
Hi @Mikep86, I've created a changelog YAML for you. |
markjhoy
reviewed
Oct 16, 2025
...rnalClusterTest/java/org/elasticsearch/xpack/inference/integration/IntegrationTestUtils.java
Outdated
Show resolved
Hide resolved
markjhoy
reviewed
Oct 16, 2025
...nce/src/main/java/org/elasticsearch/xpack/inference/queries/InferenceResultsMapSupplier.java
Outdated
Show resolved
Hide resolved
...rc/main/java/org/elasticsearch/xpack/inference/queries/InterceptedInferenceQueryBuilder.java
Show resolved
Hide resolved
...nce/src/main/java/org/elasticsearch/xpack/inference/queries/InferenceResultsMapSupplier.java
Outdated
Show resolved
Hide resolved
Contributor
Author
|
@elasticmachine update branch |
benwtrent
reviewed
Oct 20, 2025
Member
benwtrent
left a comment
benwtrent
left a comment
There was a problem hiding this comment.
I still don't fully understand why all clusters need to know about all the inference ids. Why wouldn't the rewrites happen fully on the remote clusters, period?
That is a bigger question, shouldn't block this PR. But this logic is absurdly complicated, and suspect has more sneaky bugs that await us.
.../inference/src/main/java/org/elasticsearch/xpack/inference/queries/SemanticQueryBuilder.java
Outdated
Show resolved
Hide resolved
.../inference/src/main/java/org/elasticsearch/xpack/inference/queries/SemanticQueryBuilder.java
Outdated
Show resolved
Hide resolved
Contributor
Author
|
@elasticmachine update branch |
kderusso
reviewed
Oct 20, 2025
.../inference/src/main/java/org/elasticsearch/xpack/inference/queries/SemanticQueryBuilder.java
Show resolved
Hide resolved
...rnalClusterTest/java/org/elasticsearch/xpack/inference/integration/IntegrationTestUtils.java
Show resolved
Hide resolved
kderusso
approved these changes
Oct 20, 2025
benwtrent
reviewed
Oct 20, 2025
Member
benwtrent
left a comment
benwtrent
left a comment
There was a problem hiding this comment.
I think this is OK I haven't reviewed deeply, I will defer to searchorg folks here.
Collaborator
💔 Backport failed
You can use sqren/backport to manually backport by running |
Contributor
Author
💚 All backports created successfully
Questions ?Please refer to the Backport tool documentation |
elasticsearchmachine
pushed a commit
that referenced
this pull request
Oct 21, 2025
chrisparrinello
pushed a commit
to chrisparrinello/elasticsearch
that referenced
this pull request
Oct 24, 2025
fzowl
pushed a commit
to voyage-ai/elasticsearch
that referenced
this pull request
Nov 3, 2025
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
7 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.
Updates the
semanticquery and the semantic query rewrite interceptors to use suppliers when building the inference results map.This fixes #136621, which was caused by changes made in #134956. In particular, gating inference action registration on
queryRewriteContext.hasAsyncActions() == falsecaused problems when a query contained many clauses with asemanticor intercepted query. ThehasAsyncActionscheck would only allow onesemantic/intercepted query to register inference action(s) per rewrite iteration. If the query contained more than 16 clauses withsemanticor intercepted queries, the rewrite rounds would be exhausted.This is fixed through the usage of suppliers, which removes the need for the
queryRewriteContext.hasAsyncActions() == falsecheck and allows allsemantic/intercepted queries to register inference actions(s) in the same rewrite round.This PR also refactors some of the util methods used in
inferenceplugin integration tests into a common location.