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 core package name to address compilation errors #1122

Conversation

martin-gaievski
Copy link
Member

@martin-gaievski martin-gaievski commented Jul 13, 2023

Description

Fix compilation errors after code refactoring PR. Core PR is marked with "backport 2.x", so similar change may be required in 2.x branch as well.

In this PR it's only changing package name of core classes in import section

Noticed in scope of fixing same for neural-search: opensearch-project/neural-search#219

Check List

  • All tests pass
  • Commits are signed 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 force-pushed the fix-compilation-errors-after-core-change branch 4 times, most recently from 424b311 to 497fe7d Compare July 13, 2023 20:54
@martin-gaievski martin-gaievski force-pushed the fix-compilation-errors-after-core-change branch from 497fe7d to b7e561f Compare July 13, 2023 21:07
@martin-gaievski martin-gaievski marked this pull request as ready for review July 13, 2023 21:23
@codecov
Copy link

codecov bot commented Jul 13, 2023

Codecov Report

Merging #1122 (b7e561f) into main (0e834a8) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##               main    #1122   +/-   ##
=========================================
  Coverage     84.12%   84.12%           
  Complexity     1755     1755           
=========================================
  Files           139      139           
  Lines          6716     6716           
  Branches        669      669           
=========================================
  Hits           5650     5650           
  Misses          769      769           
  Partials        297      297           
Flag Coverage Δ
ml-commons 84.12% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...ction/deploy/TransportDeployModelOnNodeAction.java 97.40% <ø> (ø)
.../opensearch/ml/action/handler/MLSearchHandler.java 86.66% <ø> (ø)
...h/ml/action/models/DeleteModelTransportAction.java 83.09% <ø> (ø)
...arch/ml/action/models/GetModelTransportAction.java 80.00% <ø> (ø)
...arch/ml/action/profile/MLProfileModelResponse.java 100.00% <ø> (ø)
...search/ml/action/profile/MLProfileNodeRequest.java 100.00% <ø> (ø)
...earch/ml/action/profile/MLProfileNodeResponse.java 89.18% <ø> (ø)
...opensearch/ml/action/profile/MLProfileRequest.java 100.00% <ø> (ø)
...pensearch/ml/action/profile/MLProfileResponse.java 94.73% <ø> (ø)
...ch/ml/action/profile/MLProfileTransportAction.java 81.25% <ø> (ø)
... and 33 more

@MaxKsyunz
Copy link
Contributor

Could you please backport this to 2.x?

The core refactor was backported yesterday -- opensearch-project/OpenSearch#8782

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

@MaxKsyunz
Copy link
Contributor

I'm working on backporting this change to 2.x. PR will be up shortly.

MaxKsyunz pushed a commit to MaxKsyunz/ml-commons that referenced this pull request Jul 25, 2023
MaxKsyunz pushed a commit to MaxKsyunz/ml-commons that referenced this pull request Jul 25, 2023
MaxKsyunz pushed a commit to MaxKsyunz/ml-commons that referenced this pull request Jul 25, 2023
ylwu-amzn pushed a commit that referenced this pull request Jul 26, 2023
…1157)

* Fix core package name to address compilation errors (#1122)

Signed-off-by: Martin Gaievski <[email protected]>
(cherry picked from commit 6bfc1d3)

* Empty commit to trigger PR checks.

Signed-off-by: Max Ksyunz <[email protected]>

---------

Signed-off-by: Max Ksyunz <[email protected]>
Co-authored-by: Martin Gaievski <[email protected]>
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.

4 participants