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

Fixed compilation errors after refactoring in core foundation classes #1038

Conversation

martin-gaievski
Copy link
Member

@martin-gaievski martin-gaievski commented Aug 11, 2023

Description

Fixed compilation errors after refactoring in core foundation classes (opensearch-project/OpenSearch#9082)

Check List

  • All tests pass
  • 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.

@martin-gaievski martin-gaievski added skip-changelog Maintenance Add support for new versions of OpenSearch/Dashboards from upstream labels Aug 11, 2023
@naveentatikonda
Copy link
Member

Cool, just now I made the changes to fix these compilation errors and about to raise a PR

@codecov
Copy link

codecov bot commented Aug 11, 2023

Codecov Report

Merging #1038 (8b0f154) into main (0a7fc4e) will decrease coverage by 0.30%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               main    #1038      +/-   ##
============================================
- Coverage     85.33%   85.03%   -0.30%     
+ Complexity     1149     1144       -5     
============================================
  Files           154      154              
  Lines          4692     4692              
  Branches        425      425              
============================================
- Hits           4004     3990      -14     
- Misses          497      509      +12     
- Partials        191      193       +2     
Files Changed Coverage Δ
...ain/java/org/opensearch/knn/index/KNNSettings.java 84.37% <ø> (-2.35%) ⬇️
...rch/knn/index/memory/NativeMemoryLoadStrategy.java 96.49% <ø> (ø)
...main/java/org/opensearch/knn/indices/ModelDao.java 82.67% <ø> (ø)
...main/java/org/opensearch/knn/plugin/KNNPlugin.java 100.00% <ø> (ø)
...arch/knn/plugin/transport/DeleteModelResponse.java 81.48% <ø> (ø)
...n/plugin/transport/DeleteModelTransportAction.java 100.00% <ø> (ø)
...nsearch/knn/plugin/transport/GetModelResponse.java 100.00% <ø> (ø)
.../knn/plugin/transport/GetModelTransportAction.java 100.00% <ø> (ø)
...n/plugin/transport/SearchModelTransportAction.java 75.00% <ø> (ø)
...in/transport/TrainingJobRouterTransportAction.java 80.00% <ø> (ø)
... and 6 more

... and 2 files with indirect coverage changes

@martin-gaievski
Copy link
Member Author

BWC will fail as there are problems with 2.10.0 build

@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-1038-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 74b87e87e9ddb9593712a7443997bda04144b38b
# Push it to GitHub
git push --set-upstream origin backport/backport-1038-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-1038-to-2.x.

martin-gaievski added a commit to martin-gaievski/k-NN that referenced this pull request Aug 16, 2023
martin-gaievski added a commit to martin-gaievski/k-NN that referenced this pull request Aug 16, 2023
…opensearch-project#1038)

Signed-off-by: Martin Gaievski <[email protected]>
(cherry picked from commit 74b87e8)
Signed-off-by: Martin Gaievski <[email protected]>
martin-gaievski added a commit that referenced this pull request Aug 16, 2023
…ndation classes (#1038) (#1048)

* Fixed compilation errors after refactoring in core foundation classes (#1038)

Signed-off-by: Martin Gaievski <[email protected]>

---------

Signed-off-by: Martin Gaievski <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Maintenance Add support for new versions of OpenSearch/Dashboards from upstream skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants