Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport-2.x] Enabled the efficient filtering support for Faiss Engine. #960

Merged
merged 3 commits into from
Jul 10, 2023

Conversation

navneet1v
Copy link
Collaborator

@navneet1v navneet1v commented Jul 10, 2023

Description

Enabled the efficient filtering support for Faiss Engine. This is a backport of: #936, #942 , #951

Issues Resolved

#903

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed as per the DCO using --signoff

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.

…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 <navneev@amazon.com>
@codecov
Copy link

codecov bot commented Jul 10, 2023

Codecov Report

Merging #960 (50f15b3) into 2.x (f11f1f1) will decrease coverage by 0.09%.
The diff coverage is 84.82%.

@@             Coverage Diff              @@
##                2.x     #960      +/-   ##
============================================
- Coverage     85.13%   85.05%   -0.09%     
- Complexity     1088     1116      +28     
============================================
  Files           152      152              
  Lines          4414     4530     +116     
  Branches        392      409      +17     
============================================
+ Hits           3758     3853      +95     
- Misses          479      492      +13     
- Partials        177      185       +8     
Impacted Files Coverage Δ
...xception/DeleteModelWhenInTrainStateException.java 100.00% <ø> (ø)
...main/java/org/opensearch/knn/jni/FaissService.java 85.71% <ø> (ø)
...search/knn/plugin/rest/RestDeleteModelHandler.java 77.77% <0.00%> (ø)
...pensearch/knn/plugin/rest/RestGetModelHandler.java 77.77% <0.00%> (ø)
...earch/knn/plugin/transport/DeleteModelRequest.java 84.61% <0.00%> (ø)
...java/org/opensearch/knn/index/query/KNNScorer.java 55.00% <28.57%> (-14.24%) ⬇️
...rg/opensearch/knn/index/query/KNNQueryBuilder.java 84.31% <66.66%> (+0.10%) ⬆️
...java/org/opensearch/knn/index/query/KNNWeight.java 86.75% <86.20%> (-2.72%) ⬇️
...rg/opensearch/knn/index/query/KNNQueryFactory.java 90.47% <94.11%> (+0.47%) ⬆️
.../java/org/opensearch/knn/index/query/KNNQuery.java 91.42% <100.00%> (+8.09%) ⬆️
... and 7 more

... and 1 file with indirect coverage changes

@navneet1v
Copy link
Collaborator Author

Tests which are failing: Secure Cluster tests, Windows tests, mac-os tests.

@navneet1v navneet1v merged commit 50a30c6 into opensearch-project:2.x Jul 10, 2023
51 of 58 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants