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

Add integration and unit tests for missing RRF coverage #997

Conversation

ryanbogan
Copy link
Member

@ryanbogan ryanbogan commented Nov 21, 2024

Description

This PR adds a successful end to end integration test using RRF, as well as unit tests for the RRFProcessor class, which was the last remaining RRF class without tests.

Check List

  • New functionality includes testing.
  • New functionality has been documented.
  • API changes companion pull request created.
  • Commits are signed per the DCO using --signoff.
  • Public documentation issue/PR created.

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.

Johnsonisaacn and others added 2 commits November 19, 2024 13:53
…pensearch-project#874)


* initial commit of RRF

Signed-off-by: Isaac Johnson <[email protected]>

Co-authored-by: Varun Jain <[email protected]>
Signed-off-by: Martin Gaievski <[email protected]>
…pensearch-project#874)

* initial commit of RRF

Signed-off-by: Isaac Johnson <[email protected]>

Co-authored-by: Varun Jain <[email protected]>
Signed-off-by: Martin Gaievski <[email protected]>
@ryanbogan ryanbogan mentioned this pull request Nov 21, 2024
5 tasks
@peterzhuamazon
Copy link
Member

Please rebase to see the codecov comments.

Thanks.

Copy link

codecov bot commented Nov 24, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 80.59%. Comparing base (29fafd6) to head (71b1d76).
Report is 1 commits behind head on feature/rrf-score-normalization-v2.

Additional details and impacted files
@@                           Coverage Diff                            @@
##             feature/rrf-score-normalization-v2     #997      +/-   ##
========================================================================
+ Coverage                                 79.80%   80.59%   +0.79%     
- Complexity                                 1027     1043      +16     
========================================================================
  Files                                        83       83              
  Lines                                      3536     3536              
  Branches                                    592      592              
========================================================================
+ Hits                                       2822     2850      +28     
+ Misses                                      465      434      -31     
- Partials                                    249      252       +3     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@martin-gaievski
Copy link
Member

@ryanbogan I've rebased on latest main out of curiosity, code coverage report/bot works. Please make sure to pull latest changes before making any edits locally.

@ryanbogan ryanbogan requested a review from minalsha as a code owner November 25, 2024 17:17
@ryanbogan ryanbogan changed the title RRF tests Add integration and unit tests for missing RRF coverage Nov 25, 2024
@martin-gaievski martin-gaievski force-pushed the feature/rrf-score-normalization-v2 branch from a957fd3 to 29fafd6 Compare November 26, 2024 01:16
This reverts commit 2c00025.

Signed-off-by: Ryan Bogan <[email protected]>
@martin-gaievski
Copy link
Member

Code looks good to me. Just one ask - can you please add the BWC test, similar to what is there for normalization https://github.com/opensearch-project/neural-search/blob/main/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchIT.java and https://github.com/opensearch-project/neural-search/blob/main/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchIT.java

As discussed offline, let's hold off on BWC tests, we can do it after RRF is merged to main from feature branch, otherwise it will keep failing for 2.19 to main/3.0

@martin-gaievski martin-gaievski merged commit c64f09b into opensearch-project:feature/rrf-score-normalization-v2 Dec 3, 2024
40 checks passed
@ryanbogan ryanbogan deleted the rrf_tests branch December 3, 2024 17:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants