Intercept filters to knn queries#138457
Merged
dimitris-athanasiou merged 7 commits intoelastic:mainfrom Nov 27, 2025
Merged
Conversation
`knn` queries can have filter queries. Those filters may contain semantic queries (e.g. `knn`, `sparse_vector`, or `match` queries targetting `semantic_text` fields). We also need to intercept those in order to perform inference for their `query` field during the coordinator node rewrite. This commit achieves this with the following changes: - `SemanticKnnVectorQueryRewriteInterceptor` attempts to rewrite filter queries. This means we rely on a rewrite cycle to attempt to intercept every query down the tree of each filter query. - `InterceptedInferenceQueryBuilder` now has a `customCoordinatorNodeRewrite` method that subclasses can implement to implement additional rewriting logic needed, e.g. rewrite inner queries. - `InterceptedInferenceKnnVectorQueryBuilder` implements `customCoordinatorNodeRewrite` so that the filter queries are rewritten. This commit fixes the exceptions throws in elastic#138410. However, searches that contain semantic text queries as filters to a semantic text knn query will return `0` hits due to another issue that is captured in elastic#138184. Closes elastic#138410
dimitris-athanasiou
added
>bug
:SearchOrg/Relevance
elasticsearchmachine
added
the
Team:Search - Relevance
Collaborator
|
Pinging @elastic/search-relevance (Team:Search - Relevance) |
Collaborator
|
Hi @dimitris-athanasiou, I've created a changelog YAML for you. |
dimitris-athanasiou
requested review from
Mikep86
and removed request for
a team
Mikep86
reviewed
Nov 25, 2025
Contributor
Mikep86
left a comment
Mikep86
left a comment
There was a problem hiding this comment.
Nice work 🙌 ! Looks like all the pieces are there, just a bit of adjustment & cleanup left.
...ava/org/elasticsearch/xpack/inference/queries/InterceptedInferenceKnnVectorQueryBuilder.java
Outdated
Show resolved
Hide resolved
...rc/main/java/org/elasticsearch/xpack/inference/queries/InterceptedInferenceQueryBuilder.java
Outdated
Show resolved
Hide resolved
...rc/main/java/org/elasticsearch/xpack/inference/queries/InterceptedInferenceQueryBuilder.java
Outdated
Show resolved
Hide resolved
...java/org/elasticsearch/xpack/inference/queries/SemanticKnnVectorQueryRewriteInterceptor.java
Outdated
Show resolved
Hide resolved
...rg/elasticsearch/xpack/inference/queries/InterceptedInferenceKnnVectorQueryBuilderTests.java
Outdated
Show resolved
Hide resolved
...rg/elasticsearch/xpack/inference/queries/InterceptedInferenceKnnVectorQueryBuilderTests.java
Outdated
Show resolved
Hide resolved
...rg/elasticsearch/xpack/inference/queries/InterceptedInferenceKnnVectorQueryBuilderTests.java
Show resolved
Hide resolved
...n/inference/src/yamlRestTest/resources/rest-api-spec/test/inference/47_semantic_text_knn.yml
Outdated
Show resolved
Hide resolved
...n/inference/src/yamlRestTest/resources/rest-api-spec/test/inference/47_semantic_text_knn.yml
Show resolved
Hide resolved
Contributor
Author
Mikep86
reviewed
Nov 26, 2025
Contributor
Mikep86
left a comment
Mikep86
left a comment
There was a problem hiding this comment.
This is very close to ready 🚀 . I found a couple more adjustments to make before we finalize this.
...rc/main/java/org/elasticsearch/xpack/inference/queries/InterceptedInferenceQueryBuilder.java
Outdated
Show resolved
Hide resolved
.../elasticsearch/xpack/inference/queries/AbstractInterceptedInferenceQueryBuilderTestCase.java
Show resolved
Hide resolved
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
3 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.
knnqueries can have filter queries. Those filters may contain semantic queries (e.g.knn,sparse_vector, ormatchqueries targettingsemantic_textfields). We also need to intercept those in order to perform inference for theirqueryfield during the coordinator node rewrite.This commit achieves this with the following changes:
SemanticKnnVectorQueryRewriteInterceptorattempts to rewrite filter queries. This means we rely on a rewrite cycle to attempt to intercept every query down the tree of each filter query.InterceptedInferenceQueryBuildernow has acustomCoordinatorNodeRewritemethod that subclasses can implement to implement additional rewriting logic needed, e.g. rewrite inner queries.InterceptedInferenceKnnVectorQueryBuilderimplementscustomCoordinatorNodeRewriteso that the filter queries are rewritten.This commit fixes the exceptions throws in #138410. However, searches that contain semantic text queries as filters to a semantic text knn query will return
0hits due to another issue that is captured in #138184.Closes #138410