Allow zero for rescore_vector.oversample to indicate by-passing oversample and rescoring#125599
Merged
elasticsearchmachine merged 6 commits intoelastic:mainfrom Mar 26, 2025
Conversation
…ample and rescoring
elasticsearchmachine
added
the
Team:Search Relevance
Collaborator
|
Pinging @elastic/es-search-relevance (Team:Search Relevance) |
Collaborator
|
Hi @benwtrent, I've created a changelog YAML for you. |
…tor-zero-oversample
tteofili
approved these changes
Mar 26, 2025
| if (oversampleValue == 0 && indexVersion.before(RESCORE_PARAMS_ALLOW_ZERO_TO_QUANTIZED_VECTORS)) { | ||
| throw new IllegalArgumentException("oversample must be greater than 1"); | ||
| } | ||
| if (oversampleValue < 1) { |
Contributor
There was a problem hiding this comment.
I feel that I'm missing something obvious here, but 0 is now a valid value for oversampleValue in new index versions, right?
Member
Author
There was a problem hiding this comment.
yeah, let me verify I am capturing this accurately in tests. I might have removed an else if accidentally.
| ); | ||
|
|
||
| Query query = fieldType.createKnnQuery(VectorData.fromFloats(new float[] { 1, 4, 10 }), 10, 100, 0f, null, null, null); | ||
| assertTrue(query instanceof ESKnnFloatVectorQuery); |
Member
There was a problem hiding this comment.
I think we need to check that the query parameters do not include rescoring when 0 is used in the query. Also, we should probably check that we can't set 0 for previous index versions
carlosdelest
approved these changes
Mar 26, 2025
Member
carlosdelest
left a comment
carlosdelest
left a comment
There was a problem hiding this comment.
LGTM - Some comments on testing for your consideration
...spec/src/yamlRestTest/resources/rest-api-spec/test/search.vectors/41_knn_search_bbq_hnsw.yml
Show resolved
Hide resolved
...mlRestTest/resources/rest-api-spec/test/search.vectors/41_knn_search_half_byte_quantized.yml
Show resolved
Hide resolved
server/src/test/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldTypeTests.java
Show resolved
Hide resolved
benwtrent
added
the
auto-merge-without-approval
omricohenn
pushed a commit
to omricohenn/elasticsearch
that referenced
this pull request
Mar 28, 2025
…ample and rescoring (elastic#125599) This allows a `rescore_vector: {oversample: 0}` to indicate bypassing oversampling and rescoring. This is useful for: - Updating a quantized mapping to turn off automatic rescoring - Bypassing oversampling at query time in an ad-hoc manner if its on by default in the mapping closes: elastic#125157
Member
Author
💚 All backports created successfully
Questions ?Please refer to the Backport tool documentation |
benwtrent
added a commit
to benwtrent/elasticsearch
that referenced
this pull request
May 2, 2025
benwtrent
added a commit
to benwtrent/elasticsearch
that referenced
this pull request
May 5, 2025
benwtrent
added a commit
to benwtrent/elasticsearch
that referenced
this pull request
May 5, 2025
benwtrent
added a commit
that referenced
this pull request
May 5, 2025
benwtrent
added a commit
to benwtrent/elasticsearch
that referenced
this pull request
May 5, 2025
blocks: elastic#127662 This adds bwc versions for elastic#125599
elasticsearchmachine
pushed a commit
that referenced
this pull request
May 5, 2025
…g oversample and rescoring (#125599) (#127662) * Allow zero for rescore_vector.oversample to indicate by-passing oversample and rescoring (#125599) This allows a `rescore_vector: {oversample: 0}` to indicate bypassing oversampling and rescoring. This is useful for: - Updating a quantized mapping to turn off automatic rescoring - Bypassing oversampling at query time in an ad-hoc manner if its on by default in the mapping closes: #125157 (cherry picked from commit 009a86a) * Adding versions for bwc for #125599 (#127663) blocks: #127662 This adds bwc versions for #125599 * fixing versioning for merge
ywangd
pushed a commit
to ywangd/elasticsearch
that referenced
this pull request
May 9, 2025
blocks: elastic#127662 This adds bwc versions for elastic#125599
jfreden
pushed a commit
to jfreden/elasticsearch
that referenced
this pull request
May 12, 2025
blocks: elastic#127662 This adds bwc versions for elastic#125599
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
6 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 allows a
rescore_vector: {oversample: 0}to indicate bypassing oversampling and rescoring.This is useful for:
closes: #125157