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

Fixing main branch build due to backward incompatible changes added in OpenSearch core #981

Merged
merged 1 commit into from
Jul 13, 2023

Conversation

navneet1v
Copy link
Collaborator

Description

Fixing main branch build due to backward incompatible changes added in OpenSeach core via PR: opensearch-project/OpenSearch#8157

Issues Resolved

NA

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed as per the DCO using --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.

@codecov
Copy link

codecov bot commented Jul 13, 2023

Codecov Report

Merging #981 (d46285e) into main (54a75c1) will decrease coverage by 0.24%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               main     #981      +/-   ##
============================================
- Coverage     85.37%   85.13%   -0.24%     
+ Complexity     1146     1141       -5     
============================================
  Files           154      154              
  Lines          4683     4683              
  Branches        423      423              
============================================
- Hits           3998     3987      -11     
- Misses          495      504       +9     
- Partials        190      192       +2     
Impacted Files Coverage Δ
...xception/DeleteModelWhenInTrainStateException.java 100.00% <ø> (ø)
...ava/org/opensearch/knn/index/KNNMethodContext.java 92.50% <ø> (ø)
...g/opensearch/knn/index/MethodComponentContext.java 91.13% <ø> (ø)
...rg/opensearch/knn/index/query/KNNQueryBuilder.java 84.21% <ø> (ø)
...rc/main/java/org/opensearch/knn/indices/Model.java 83.92% <ø> (ø)
...ava/org/opensearch/knn/indices/ModelGraveyard.java 88.50% <ø> (ø)
...java/org/opensearch/knn/indices/ModelMetadata.java 97.19% <ø> (ø)
...in/java/org/opensearch/knn/indices/ModelState.java 89.47% <ø> (ø)
...main/java/org/opensearch/knn/plugin/KNNPlugin.java 100.00% <ø> (ø)
...ensearch/knn/plugin/rest/RestKNNWarmupHandler.java 100.00% <ø> (ø)
... and 40 more

... and 2 files with indirect coverage changes

Copy link
Member

@vamshin vamshin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thanks

@navneet1v navneet1v merged commit 98b6218 into opensearch-project:main Jul 13, 2023
13 of 37 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

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-981-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 98b62183c878cc0334453ebc6947cb9424991658
# Push it to GitHub
git push --set-upstream origin backport/backport-981-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 base branch is 2.x and the compare/head branch is backport/backport-981-to-2.x.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Infrastructure Changes to infrastructure, testing, CI/CD, pipelines, etc. skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants