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] Fix runtime exceptions in hybrid query for case when sub-query scorer return TwoPhase iterator that is incompatible with DISI iterator #628

Conversation

martin-gaievski
Copy link
Member

Manual backport c9cdcc1 from #624

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.

… return TwoPhase iterator that is incompatible with DISI iterator (opensearch-project#624)

* Adding two phase iterator

Signed-off-by: Martin Gaievski <gaievski@amazon.com>
(cherry picked from commit c9cdcc1)
Copy link

codecov bot commented Mar 11, 2024

Codecov Report

Attention: Patch coverage is 70.19231% with 93 lines in your changes are missing coverage. Please review.

Project coverage is 83.37%. Comparing base (d54fdce) to head (98faf91).

Files Patch % Lines
...ensearch/neuralsearch/query/HybridQueryScorer.java 63.91% 27 Missing and 8 partials ⚠️
...ralsearch/search/query/HybridCollectorManager.java 77.77% 8 Missing and 12 partials ⚠️
...ensearch/neuralsearch/query/HybridQueryWeight.java 61.76% 10 Missing and 3 partials ⚠️
...euralsearch/search/HybridTopScoreDocCollector.java 54.16% 6 Missing and 5 partials ⚠️
...arch/query/HybridScoreBlockBoundaryPropagator.java 78.78% 4 Missing and 3 partials ⚠️
...earch/search/query/HybridAggregationProcessor.java 70.83% 5 Missing and 2 partials ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##                2.x     #628      +/-   ##
============================================
- Coverage     85.15%   83.37%   -1.78%     
- Complexity      617      658      +41     
============================================
  Files            48       51       +3     
  Lines          1859     2069     +210     
  Branches        286      333      +47     
============================================
+ Hits           1583     1725     +142     
- Misses          146      196      +50     
- Partials        130      148      +18     

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

@vibrantvarun
Copy link
Member

Couple of checks are failing

@martin-gaievski martin-gaievski merged commit 6a68b94 into opensearch-project:2.x Mar 11, 2024
83 of 85 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