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

Rename QueryPhase actors like Suggest, Rescore to be processors rather than phase #8025

Merged
merged 1 commit into from
Jun 14, 2023

Conversation

sohami
Copy link
Collaborator

@sohami sohami commented Jun 12, 2023

Description

Renamed SuggestPhase and RescorePhase to SuggestProcessor and RescoreProcessor to be consistent with AggregationProcessor

Related Issues

#7854

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
Copy link
Collaborator Author

sohami commented Jun 12, 2023

@reta Tagging you for review. Do we need ChangeLog update for this minor refactoring ?

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

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

@codecov
Copy link

codecov bot commented Jun 12, 2023

Codecov Report

Merging #8025 (b339bd8) into main (8c74932) will increase coverage by 0.08%.
The diff coverage is 71.42%.

@@             Coverage Diff              @@
##               main    #8025      +/-   ##
============================================
+ Coverage     70.89%   70.98%   +0.08%     
- Complexity    56602    56642      +40     
============================================
  Files          4721     4721              
  Lines        267471   267471              
  Branches      39211    39211              
============================================
+ Hits         189634   189865     +231     
+ Misses        61840    61581     -259     
- Partials      15997    16025      +28     
Impacted Files Coverage Δ
...n/java/org/opensearch/search/query/QueryPhase.java 78.14% <60.00%> (-0.67%) ⬇️
...rg/opensearch/search/rescore/RescoreProcessor.java 4.34% <100.00%> (ø)
...rg/opensearch/search/suggest/SuggestProcessor.java 14.28% <100.00%> (ø)

... and 494 files with indirect coverage changes

@reta
Copy link
Collaborator

reta commented Jun 13, 2023

@reta Tagging you for review. Do we need ChangeLog update for this minor refactoring ?

Thanks @sohami , we probably should add one, it is code change

@sohami
Copy link
Collaborator Author

sohami commented Jun 13, 2023

@reta Tagging you for review. Do we need ChangeLog update for this minor refactoring ?

Thanks @sohami , we probably should add one, it is code change

Ya I was looking into this where it mentions for code refactoring it is not necessary. However, if you think we need one I can add it.

…r than phase

Signed-off-by: Sorabh Hamirwasia <sohami.apache@gmail.com>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

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

@reta reta merged commit cc0f344 into opensearch-project:main Jun 14, 2023
@reta reta added the backport 2.x Backport to 2.x branch label Jun 14, 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-8025-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 cc0f344b1f34e56a203c212ab74f92fa8093e38e
# Push it to GitHub
git push --set-upstream origin backport/backport-8025-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-8025-to-2.x.

@reta
Copy link
Collaborator

reta commented Jun 14, 2023

hehe @sohami mind backporting manually please?

sohami added a commit to sohami/OpenSearch that referenced this pull request Jun 14, 2023
…r than phase (opensearch-project#8025)

Signed-off-by: Sorabh Hamirwasia <sohami.apache@gmail.com>
@sohami
Copy link
Collaborator Author

sohami commented Jun 14, 2023

hehe @sohami mind backporting manually please?

Create #8067 for backport. There was conflict in CHANGELOG.md file

reta pushed a commit that referenced this pull request Jun 14, 2023
…r than phase (#8025) (#8067)

Signed-off-by: Sorabh Hamirwasia <sohami.apache@gmail.com>
gaiksaya pushed a commit to gaiksaya/OpenSearch that referenced this pull request Jun 15, 2023
…r than phase (opensearch-project#8025)

Signed-off-by: Sorabh Hamirwasia <sohami.apache@gmail.com>
@sohami
Copy link
Collaborator Author

sohami commented Jun 15, 2023

closes #7854

gaiksaya pushed a commit to gaiksaya/OpenSearch that referenced this pull request Jun 26, 2023
…r than phase (opensearch-project#8025) (opensearch-project#8067)

Signed-off-by: Sorabh Hamirwasia <sohami.apache@gmail.com>
imRishN pushed a commit to imRishN/OpenSearch that referenced this pull request Jun 27, 2023
…r than phase (opensearch-project#8025)

Signed-off-by: Sorabh Hamirwasia <sohami.apache@gmail.com>
Signed-off-by: Rishab Nahata <rnnahata@amazon.com>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
…r than phase (opensearch-project#8025)

Signed-off-by: Sorabh Hamirwasia <sohami.apache@gmail.com>
Signed-off-by: Shivansh Arora <hishiv@amazon.com>
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.

2 participants