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

Fix approximate pointrangequery tests #15590

Merged
merged 1 commit into from
Sep 4, 2024

Conversation

harshavamsi
Copy link
Contributor

Description

I noticed while backporting #13788 that some of the tests were flaky due to multiple segments being created and the correctness being harder to evaluate. Making small fixes to address the flakiness of the tests.

Related Issues

Resolves #[Issue number to be closed when this PR is merged]

Check List

  • Functionality includes testing.
  • API changes companion pull request created, if applicable.
  • Public documentation issue/PR created, if applicable.

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.

Signed-off-by: Harsha Vamsi Kalluri <[email protected]>
Copy link
Contributor

github-actions bot commented Sep 3, 2024

✅ Gradle check result for 1fdf9a4: SUCCESS

Copy link

codecov bot commented Sep 3, 2024

Codecov Report

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

Project coverage is 71.90%. Comparing base (738cdd3) to head (1fdf9a4).
Report is 45 commits behind head on main.

Files with missing lines Patch % Lines
...search/approximate/ApproximatePointRangeQuery.java 50.00% 3 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##               main   #15590    +/-   ##
==========================================
  Coverage     71.89%   71.90%            
- Complexity    63791    63882    +91     
==========================================
  Files          5249     5253     +4     
  Lines        298149   298405   +256     
  Branches      43084    43146    +62     
==========================================
+ Hits         214368   214568   +200     
- Misses        66126    66228   +102     
+ Partials      17655    17609    -46     

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

@dblock dblock merged commit 4f57d6a into opensearch-project:main Sep 4, 2024
61 of 64 checks passed
@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:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.x
# Create a new branch
git switch --create backport/backport-15590-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 4f57d6aab21594a5ac20d26abbbba959aba1ab75
# Push it to GitHub
git push --set-upstream origin backport/backport-15590-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.x

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

harshavamsi added a commit to harshavamsi/OpenSearch that referenced this pull request Sep 4, 2024
Signed-off-by: Harsha Vamsi Kalluri <[email protected]>
(cherry picked from commit 4f57d6a)
harshavamsi added a commit to harshavamsi/OpenSearch that referenced this pull request Sep 4, 2024
Signed-off-by: Harsha Vamsi Kalluri <[email protected]>
(cherry picked from commit 4f57d6a)
@mch2
Copy link
Member

mch2 commented Sep 4, 2024

@harshavamsi can you pls help backport this to 2.x

@andrross
Copy link
Member

andrross commented Sep 4, 2024

@harshavamsi It looks like the tests in question here were muted in #15601. Can you make sure those annotations get removed if this is properly fixed?

@harshavamsi
Copy link
Contributor Author

@mch2 this is waiting on the original PR -- #15586 to be backported first, but gradle check is constantly null

harshavamsi added a commit to harshavamsi/OpenSearch that referenced this pull request Sep 4, 2024
Signed-off-by: Harsha Vamsi Kalluri <[email protected]>
(cherry picked from commit 4f57d6a)
@msfroh
Copy link
Collaborator

msfroh commented Sep 4, 2024

Original PR was backported to 2.x. Toggling the backport tag to retrigger auto-backport.

@msfroh msfroh added backport 2.x Backport to 2.x branch and removed backport-failed backport 2.x Backport to 2.x branch labels Sep 4, 2024
opensearch-trigger-bot bot pushed a commit that referenced this pull request Sep 4, 2024
Signed-off-by: Harsha Vamsi Kalluri <[email protected]>
(cherry picked from commit 4f57d6a)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
msfroh pushed a commit that referenced this pull request Sep 4, 2024
(cherry picked from commit 4f57d6a)

Signed-off-by: Harsha Vamsi Kalluri <[email protected]>
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>
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 <[email protected]>
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>
akolarkunnu pushed a commit to akolarkunnu/OpenSearch that referenced this pull request Sep 10, 2024
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 skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants