-
Notifications
You must be signed in to change notification settings - Fork 65
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
Fixed incorrect document order for nested aggregations in hybrid query #956
Fixed incorrect document order for nested aggregations in hybrid query #956
Conversation
8126196
to
e232396
Compare
@@ -3,6 +3,8 @@ | |||
|
|||
Compatible with OpenSearch 2.18.0 | |||
|
|||
### Bug Fixes | |||
- Fixed incorrect document order for nested aggregations in hybrid query ([#956](https://github.com/opensearch-project/neural-search/pull/956)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
put in release notes file directly because notes were pulled from CHANGELOG for 2.18 release
7b2fa98
to
2f7ec2f
Compare
Signed-off-by: Martin Gaievski <gaievski@amazon.com>
2f7ec2f
to
1ac4d8c
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. Thanks
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-956-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 0df59c6ec8733b86f6c8537b1fabe37c21721242
# Push it to GitHub
git push --set-upstream origin backport/backport-956-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x Then, create a pull request where the |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.18 2.18
# Navigate to the new working tree
cd .worktrees/backport-2.18
# Create a new branch
git switch --create backport/backport-956-to-2.18
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 0df59c6ec8733b86f6c8537b1fabe37c21721242
# Push it to GitHub
git push --set-upstream origin backport/backport-956-to-2.18
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.18 Then, create a pull request where the |
Signed-off-by: Martin Gaievski <gaievski@amazon.com> (cherry picked from commit 0df59c6)
Signed-off-by: Martin Gaievski <gaievski@amazon.com> (cherry picked from commit 0df59c6) Signed-off-by: Martin Gaievski <gaievski@amazon.com>
Signed-off-by: Martin Gaievski <gaievski@amazon.com> (cherry picked from commit 0df59c6)
Description
Fixed logic for getting scorers for sub-queries of hybrid query. Today we're getting document ids and scorers from a pre-sorted collection of doc iterators, but that does not work for deeply nested aggregations because that order can change dynamically.
I have added an integ test for this scenario, it will for 2.15.
Related Issues
#955
Check List
--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.