[Backport 2.x] Lucene Based k-NN search support - merge feature branch #486
Conversation
This file contains 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
Adds lucene as another k-NN engine that can be used. Adds one supported method to the engine, "hnsw", with parameters "ef_construction" and "m". In addition, adds some layers of abstraction to reduce code depuplication. Signed-off-by: John Mazanec <jmazane@amazon.com> (cherry picked from commit 7a76d11)
…project#454) Adds support for Lucene's KnnVectorQuery type in KNNQueryBuilder. KNNQueryBuilder logic was enhanced to detect when an engine does not need to use KNNQuery type and build the Lucene KnnVectorQuery instead. Signed-off-by: John Mazanec <jmazane@amazon.com> (cherry picked from commit 67a1bce)
…h-project#456) * Add field mapper and per field format Signed-off-by: Martin Gaievski <gaievski@amazon.com> (cherry picked from commit 1fb8047)
…-project#458) * Refactor per field format to a class, add tests Signed-off-by: Martin Gaievski <gaievski@amazon.com> (cherry picked from commit 77d3b2e)
Signed-off-by: Martin Gaievski <gaievski@amazon.com> (cherry picked from commit 39a07dd)
Adds query integration tests for the lucene engine. Moves spacetype to lucene vectorsimilarityfunction translation to SpaceType enum for testability. Makes fields in KNNMethodContext non-null. Signed-off-by: John Mazanec <jmazane@amazon.com> (cherry picked from commit 37bdc74)
…rch-project#483) Signed-off-by: Martin Gaievski <gaievski@amazon.com> (cherry picked from commit 8624725)
martin-gaievski
added
Enhancements
Signed-off-by: Martin Gaievski <gaievski@amazon.com>
Codecov Report
@@ Coverage Diff @@
## 2.x #486 +/- ##
============================================
- Coverage 84.09% 84.06% -0.04%
- Complexity 979 1019 +40
============================================
Files 140 146 +6
Lines 4031 4186 +155
Branches 362 373 +11
============================================
+ Hits 3390 3519 +129
- Misses 475 491 +16
- Partials 166 176 +10
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
martin-gaievski
commented
Aug 3, 2022
| for (int j = 0; j < k; j++) { | ||
| float[] primitiveArray = Floats.toArray(Arrays.stream(knnResults.get(j).getVector()).collect(Collectors.toList())); | ||
| float distance = TestUtils.computeDistFromSpaceType(spaceType, primitiveArray, queryVector); | ||
| float rawScore = VECTOR_SIMILARITY_TO_SCORE.get(spaceType.getVectorSimilarityFunction()).apply(distance); |
There was a problem hiding this comment.
this change is required to address breaking change in Lucene 9.3. Method convertToScore
existis in Lucene 9.2 but has been removed in Lucene 9.3
junqiu-lei
approved these changes
Aug 3, 2022
naveentatikonda
approved these changes
Aug 3, 2022
junqiu-lei
added
Features
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Backport of #485 to 2.x, need to do it manually as CI bot cannot do multiple individual commits.
Issues Resolved
#380
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.