Skip to content

[9.1] fix(semantic highlighter): add vector similarity queries and bbq_disk support (#138140)#138555

Merged
mromaios merged 8 commits intoelastic:9.1from
mromaios:backport/9.1/pr-138140
Nov 25, 2025
Merged

[9.1] fix(semantic highlighter): add vector similarity queries and bbq_disk support (#138140)#138555
mromaios merged 8 commits intoelastic:9.1from
mromaios:backport/9.1/pr-138140

Conversation

@mromaios
Copy link
Contributor

Backport

This will backport the following commits from main to 9.1:

Questions ?

Please refer to the Backport tool documentation

… support (elastic#138140)

(cherry picked from commit 8603933)

# Conflicts:
#	x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/InferenceFeatures.java
#	x-pack/plugin/inference/src/yamlRestTest/resources/rest-api-spec/test/inference/90_semantic_text_highlighter.yml
} else if (query instanceof DenseVectorQuery.Floats floatsQuery) {
queries.add(fieldType.createExactKnnQuery(VectorData.fromFloats(floatsQuery.getQuery()), null));
queries.add(fieldType.createExactKnnQuery(VectorData.fromFloats(floatsQuery.getQuery()), similarity));
} else if (query instanceof IVFKnnFloatVectorQuery ivfQuery) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💭 We probably don't need these here as bbq_disk is supported from 9.2

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed

@mromaios mromaios self-assigned this Nov 25, 2025
@mromaios mromaios marked this pull request as ready for review November 25, 2025 09:45
@mromaios mromaios requested a review from a team November 25, 2025 09:45
Copy link
Member

@kderusso kderusso left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mromaios Can we please figure out what's going on with the tests in this branch? Thanks!

@mromaios mromaios merged commit d9dc935 into elastic:9.1 Nov 25, 2025
35 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

3 participants