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 approximate pointrangequery tests #15704

Merged
merged 1 commit into from
Sep 4, 2024

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport 4f57d6a from #15590.

Signed-off-by: Harsha Vamsi Kalluri <harshavamsi096@gmail.com>
(cherry picked from commit 4f57d6a)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Copy link
Contributor

github-actions bot commented Sep 4, 2024

✅ Gradle check result for 96e284b: SUCCESS

Copy link

codecov bot commented Sep 4, 2024

Codecov Report

Attention: Patch coverage is 50.00000% with 4 lines in your changes missing coverage. Please review.

Project coverage is 71.76%. Comparing base (3ddb199) to head (96e284b).
Report is 2 commits behind head on 2.x.

Files with missing lines Patch % Lines
...search/approximate/ApproximatePointRangeQuery.java 50.00% 3 Missing and 1 partial ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##                2.x   #15704      +/-   ##
============================================
+ Coverage     71.68%   71.76%   +0.08%     
- Complexity    64300    64344      +44     
============================================
  Files          5255     5255              
  Lines        300776   300779       +3     
  Branches      43811    43812       +1     
============================================
+ Hits         215597   215847     +250     
+ Misses        67181    66908     -273     
- Partials      17998    18024      +26     

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

@msfroh msfroh merged commit 017f7d4 into 2.x Sep 4, 2024
60 of 62 checks passed
@opensearch-trigger-bot
Copy link
Contributor Author

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

Then, create a pull request where the base branch is 2.17 and the compare/head branch is backport/backport-15704-to-2.17.

@msfroh
Copy link
Collaborator

msfroh commented Sep 4, 2024

Whoops! Forgot to merge the commit that introduced the test before triggering the backport for the test fix.

Removing / readding the backport 2.17 tag...

opensearch-trigger-bot bot pushed a commit that referenced this pull request Sep 4, 2024
(cherry picked from commit 4f57d6a)

Signed-off-by: Harsha Vamsi Kalluri <harshavamsi096@gmail.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 017f7d4)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@andrross andrross deleted the backport/backport-15590-to-2.x branch October 17, 2024 21:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant