Fixed exception in Hybrid Query for one shard and multiple node #396
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
martin-gaievski
added
backport 2.x
martin-gaievski
force-pushed
the
fix-case-one-shard-many-nodes
branch
from
ec4ca62
to
10b4c00
Compare
Codecov Report
@@ Coverage Diff @@
## main #396 +/- ##
============================================
- Coverage 84.63% 84.56% -0.07%
- Complexity 445 449 +4
============================================
Files 38 38
Lines 1334 1348 +14
Branches 199 201 +2
============================================
+ Hits 1129 1140 +11
- Misses 119 120 +1
- Partials 86 88 +2
|
Signed-off-by: Martin Gaievski <gaievski@amazon.com>
martin-gaievski
force-pushed
the
fix-case-one-shard-many-nodes
branch
from
10b4c00
to
b2d6c38
Compare
martin-gaievski
requested review from
heemin32,
navneet1v,
VijayanB,
vamshin,
jmazanec15,
naveentatikonda,
junqiu-lei,
sean-zheng-amazon,
model-collapse,
wujunshen,
zane-neo,
ylwu-amzn and
jngz-es
as code owners
martin-gaievski
commented
Oct 6, 2023
| @@ -179,4 +179,117 @@ public void testFetchResults_whenOneShardAndQueryAndFetchResultsPresent_thenDoNo | |||
| TestUtils.assertQueryResultScores(querySearchResults); | |||
| TestUtils.assertFetchResultScores(fetchSearchResult, 4); | |||
| } | |||
|
|
|||
| public void testFetchResults_whenOneShardAndMultipleNodes_thenDoNormalizationCombination() { | |||
There was a problem hiding this comment.
this test case would fail with old code
There was a problem hiding this comment.
Thanks for adding a negative case.
heemin32
approved these changes
Oct 6, 2023
src/main/java/org/opensearch/neuralsearch/processor/NormalizationProcessorWorkflow.java
Outdated
Show resolved
Hide resolved
src/main/java/org/opensearch/neuralsearch/processor/NormalizationProcessorWorkflow.java
Outdated
Show resolved
Hide resolved
navneet1v
approved these changes
Oct 6, 2023
Signed-off-by: Martin Gaievski <gaievski@amazon.com>
navneet1v
approved these changes
Oct 6, 2023
martin-gaievski
merged commit 8e98167
into
opensearch-project:main
14 of 16 checks passed
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
Oct 6, 2023
* Use list of original doc ids for fetch results Signed-off-by: Martin Gaievski <gaievski@amazon.com> (cherry picked from commit 8e98167)
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
Oct 6, 2023
* Use list of original doc ids for fetch results Signed-off-by: Martin Gaievski <gaievski@amazon.com> (cherry picked from commit 8e98167)
martin-gaievski
added a commit
that referenced
this pull request
Oct 6, 2023
martin-gaievski
added a commit
that referenced
this pull request
Oct 6, 2023
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
Fixed case when there is one shard and multiple nodes. In such case Fetch phase all results have doc ids as "-1", and it's not possible to merge them with query results using doc id. Result is a runtime exception in search request.
To fix te problem we're storing doc ids before the normalization and combination is done, and them use docs ids to merge with fetch phase results.
Issues Resolved
#393
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.