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

With only GlobalAggregation in request causes unnecessary wrapping with MultiCollector #8125

Merged
merged 1 commit into from
Jun 17, 2023

Conversation

sohami
Copy link
Collaborator

@sohami sohami commented Jun 16, 2023

Description

Avoid adding redundant multi collector wrapper when only global agg is present in the search request

Related Issues

Resolves #8097

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)

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.

@sohami sohami force-pushed the issue-issue-8097 branch from a2ce220 to 28a9f20 Compare June 16, 2023 22:17
@sohami
Copy link
Collaborator Author

sohami commented Jun 16, 2023

@reta Tagging you for the review

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.search.backpressure.SearchBackpressureIT.testSearchTaskCancellationWithHighCpu

@codecov
Copy link

codecov bot commented Jun 16, 2023

Codecov Report

Merging #8125 (28a9f20) into main (4228075) will decrease coverage by 0.07%.
The diff coverage is 88.88%.

@@             Coverage Diff              @@
##               main    #8125      +/-   ##
============================================
- Coverage     70.98%   70.92%   -0.07%     
+ Complexity    56714    56612     -102     
============================================
  Files          4722     4722              
  Lines        267608   267608              
  Branches      39216    39216              
============================================
- Hits         189962   189792     -170     
- Misses        61589    61789     +200     
+ Partials      16057    16027      -30     
Impacted Files Coverage Δ
...n/java/org/opensearch/search/query/QueryPhase.java 78.80% <88.88%> (ø)

... and 456 files with indirect coverage changes

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.remotestore.SegmentReplicationUsingRemoteStoreIT.testPrimaryStopped_ReplicaPromoted

@reta
Copy link
Collaborator

reta commented Jun 17, 2023

@reta Tagging you for the review

Thanks @sohami !

@reta reta merged commit 90678c2 into opensearch-project:main Jun 17, 2023
@reta reta added the backport 2.x Backport to 2.x branch label Jun 17, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

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
pushd ../.worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-8125-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 90678c2d76ed1c31aebc85a23fe5be12f6e81417
# Push it to GitHub
git push --set-upstream origin backport/backport-8125-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-8125-to-2.x.

@reta
Copy link
Collaborator

reta commented Jun 17, 2023

sorry, @sohami, 2.x needs manual backport ...

@sohami
Copy link
Collaborator Author

sohami commented Jun 17, 2023

Will manually backport the changes

sohami added a commit to sohami/OpenSearch that referenced this pull request Jun 17, 2023
@sohami
Copy link
Collaborator Author

sohami commented Jun 17, 2023

@reta Backport PR: #8129 Thanks for the review!

reta pushed a commit that referenced this pull request Jun 17, 2023
gaiksaya pushed a commit to gaiksaya/OpenSearch that referenced this pull request Jun 26, 2023
imRishN pushed a commit to imRishN/OpenSearch that referenced this pull request Jun 27, 2023
…th MultiCollector (opensearch-project#8125)

Signed-off-by: Sorabh Hamirwasia <[email protected]>
Signed-off-by: Rishab Nahata <[email protected]>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
…th MultiCollector (opensearch-project#8125)

Signed-off-by: Sorabh Hamirwasia <[email protected]>
Signed-off-by: Shivansh Arora <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug] With only GlobalAggregation in request causes unnecessary wrapping with MultiCollector
2 participants