Added Integration Tests and Unit test for Efficient Filtering for Faiss Engine #934
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
navneet1v
requested review from
heemin32,
VijayanB,
vamshin,
jmazanec15,
naveentatikonda,
junqiu-lei and
martin-gaievski
as code owners
|
|
||
| addKnnDocWithAttributes( | ||
| DOC_ID, | ||
| new float[] { 6.0f, 7.9f, 3.1f }, |
There was a problem hiding this comment.
we can generate vector values using random, seems we're not testing exact doc ids in result. This way it's easy to generate more docs and then vary between ann and exact searches
There was a problem hiding this comment.
We can use random generator. But I don't see any point of using random generator. Atleast this way we know what we are ingesting and in future we can compare scores also.
There was a problem hiding this comment.
we can have both exact vector values and random generated, first can be used in case we're checking score values and second one in cases when we do need more massive corpus. I think we doing random generation for other test in k-NN. Although not a blocker for this PR.
| @@ -280,4 +293,106 @@ public void testEndToEnd_fromModel() throws IOException, InterruptedException { | |||
| assertEquals(numDocs - i - 1, Integer.parseInt(results.get(i).getDocId())); | |||
| } | |||
| } | |||
|
|
|||
| @SneakyThrows | |||
| public void testQueryWithFilter_withDifferentCombination_thenSuccess() { | |||
There was a problem hiding this comment.
Should we add different tests for exact and ann searchers? I on a fence if we need it in IT as we already have unit test for this and it might be too low level for IT.
There was a problem hiding this comment.
No we should have integration tests. Even when we have Unit tests. The reason why I am combining both is, the setup for the tests are same. Hence I combined them at 1 place. Given that we already have so many integration tests and setting up each integration tests add more time. Hence, using a single setup.
jmazanec15
reviewed
Jun 13, 2023
| @@ -44,6 +49,14 @@ | |||
|
|
|||
| public class FaissIT extends KNNRestTestCase { | |||
|
|
|||
| private static final String INDEX_NAME = "test-index-1"; | |||
| private static final String FIELD_NAME = "test-field-1"; | |||
| private static final String DOC_ID = "doc1"; | |||
There was a problem hiding this comment.
nit: DOC_ID_1 for consistency
| final List<KNNResult> knnResultsKLimitsFilterResult = parseSearchResponse(responseBodyKLimitsFilterResult, FIELD_NAME); | ||
|
|
||
| assertEquals(expectedDocIdsKLimitsFilterResult.size(), knnResultsKLimitsFilterResult.size()); | ||
| assertTrue( |
There was a problem hiding this comment.
Dup of 313 - should we just make this its own statement?
martin-gaievski
approved these changes
Jun 13, 2023
…ss Engine Signed-off-by: Navneet Verma <[email protected]>
navneet1v
force-pushed
the
feature/faiss-filtering
branch
from
1bde71e to
ffcbd77
Compare
jmazanec15
approved these changes
Jun 13, 2023
navneet1v
added a commit
to navneet1v/k-NN
that referenced
this pull request
Jun 14, 2023
…ss Engine (opensearch-project#934) Signed-off-by: Navneet Verma <[email protected]>
5 tasks
navneet1v
added a commit
to navneet1v/k-NN
that referenced
this pull request
Jun 14, 2023
…ss Engine (opensearch-project#934) Signed-off-by: Navneet Verma <[email protected]>
navneet1v
added a commit
to navneet1v/k-NN
that referenced
this pull request
Jun 14, 2023
…es include * Enabled the efficient filtering support for Faiss Engine (opensearch-project#907) * Fixed the ef_search default value for faiss HNSW with filters and updated the perf-tool to include Faiss HNSW tests (opensearch-project#926) * Added exact search for cases when filteredIds < k to improve the recall for exact search (opensearch-project#928) * Improved Exact Search to return only K results and added client side latency metric for query Benchmarks (opensearch-project#933) * Added Integration Tests and Unit test for Efficient Filtering for Faiss Engine (opensearch-project#934) Signed-off-by: Navneet Verma <[email protected]>
navneet1v
added a commit
to navneet1v/k-NN
that referenced
this pull request
Jun 14, 2023
…es include * Enabled the efficient filtering support for Faiss Engine (opensearch-project#907) * Fixed the ef_search default value for faiss HNSW with filters and updated the perf-tool to include Faiss HNSW tests (opensearch-project#926) * Added exact search for cases when filteredIds < k to improve the recall for exact search (opensearch-project#928) * Improved Exact Search to return only K results and added client side latency metric for query Benchmarks (opensearch-project#933) * Added Integration Tests and Unit test for Efficient Filtering for Faiss Engine (opensearch-project#934) Signed-off-by: Navneet Verma <[email protected]>
navneet1v
added a commit
to navneet1v/k-NN
that referenced
this pull request
Jun 14, 2023
…es include * Enabled the efficient filtering support for Faiss Engine (opensearch-project#907) * Fixed the ef_search default value for faiss HNSW with filters and updated the perf-tool to include Faiss HNSW tests (opensearch-project#926) * Added exact search for cases when filteredIds < k to improve the recall for exact search (opensearch-project#928) * Improved Exact Search to return only K results and added client side latency metric for query Benchmarks (opensearch-project#933) * Added Integration Tests and Unit test for Efficient Filtering for Faiss Engine (opensearch-project#934) Signed-off-by: Navneet Verma <[email protected]>
navneet1v
added a commit
to navneet1v/k-NN
that referenced
this pull request
Jun 14, 2023
…es include * Enabled the efficient filtering support for Faiss Engine (opensearch-project#907) * Fixed the ef_search default value for faiss HNSW with filters and updated the perf-tool to include Faiss HNSW tests (opensearch-project#926) * Added exact search for cases when filteredIds < k to improve the recall for exact search (opensearch-project#928) * Improved Exact Search to return only K results and added client side latency metric for query Benchmarks (opensearch-project#933) * Added Integration Tests and Unit test for Efficient Filtering for Faiss Engine (opensearch-project#934) Signed-off-by: Navneet Verma <[email protected]>
navneet1v
added a commit
that referenced
this pull request
Jun 14, 2023
…es include (#936) * Enabled the efficient filtering support for Faiss Engine (#907) * Fixed the ef_search default value for faiss HNSW with filters and updated the perf-tool to include Faiss HNSW tests (#926) * Added exact search for cases when filteredIds < k to improve the recall for exact search (#928) * Improved Exact Search to return only K results and added client side latency metric for query Benchmarks (#933) * Added Integration Tests and Unit test for Efficient Filtering for Faiss Engine (#934) Signed-off-by: Navneet Verma <[email protected]>
navneet1v
added a commit
to navneet1v/k-NN
that referenced
this pull request
Jun 14, 2023
…es include (opensearch-project#936) * Enabled the efficient filtering support for Faiss Engine (opensearch-project#907) * Fixed the ef_search default value for faiss HNSW with filters and updated the perf-tool to include Faiss HNSW tests (opensearch-project#926) * Added exact search for cases when filteredIds < k to improve the recall for exact search (opensearch-project#928) * Improved Exact Search to return only K results and added client side latency metric for query Benchmarks (opensearch-project#933) * Added Integration Tests and Unit test for Efficient Filtering for Faiss Engine (opensearch-project#934) Signed-off-by: Navneet Verma <[email protected]>
navneet1v
added a commit
to navneet1v/k-NN
that referenced
this pull request
Jul 10, 2023
…es include (opensearch-project#936) * Enabled the efficient filtering support for Faiss Engine (opensearch-project#907) * Fixed the ef_search default value for faiss HNSW with filters and updated the perf-tool to include Faiss HNSW tests (opensearch-project#926) * Added exact search for cases when filteredIds < k to improve the recall for exact search (opensearch-project#928) * Improved Exact Search to return only K results and added client side latency metric for query Benchmarks (opensearch-project#933) * Added Integration Tests and Unit test for Efficient Filtering for Faiss Engine (opensearch-project#934) Signed-off-by: Navneet Verma <[email protected]>
navneet1v
added a commit
that referenced
this pull request
Jul 10, 2023
…es include (#936) * Enabled the efficient filtering support for Faiss Engine (#907) * Fixed the ef_search default value for faiss HNSW with filters and updated the perf-tool to include Faiss HNSW tests (#926) * Added exact search for cases when filteredIds < k to improve the recall for exact search (#928) * Improved Exact Search to return only K results and added client side latency metric for query Benchmarks (#933) * Added Integration Tests and Unit test for Efficient Filtering for Faiss Engine (#934) Signed-off-by: Navneet Verma <[email protected]>
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
-> Added Integration Tests and Unit test for Efficient Filtering for Faiss Engine.
-> Removed some TODOs and fixed an edge case in the code which failed during Unit tests.
Issues Resolved
#903
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.