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 build errors after refactoring of Strings class in core #904

Conversation

martin-gaievski
Copy link
Member

Description

Fix imports after some refactoring in core under this PR opensearch-project/OpenSearch#7508

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 changed the title Fix imports after refactoring of Strings class in core Fix build errors after refactoring of Strings class in core May 19, 2023
@martin-gaievski martin-gaievski force-pushed the fix-after-breaking-change-in-core branch from fe56dcf to 9e40af4 Compare May 19, 2023 02:10
@martin-gaievski martin-gaievski marked this pull request as ready for review May 19, 2023 02:10
@martin-gaievski
Copy link
Member Author

Core PR has 2.8 label, adding backport 2.x to this one

@martin-gaievski martin-gaievski force-pushed the fix-after-breaking-change-in-core branch from 9e40af4 to 3dde4cd Compare May 19, 2023 16:21
heemin32
heemin32 previously approved these changes May 19, 2023
@@ -6,6 +6,7 @@
package org.opensearch.knn.index.query;

import lombok.extern.log4j.Log4j2;
import org.opensearch.core.Strings;
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is this correct package?

Copy link
Member Author

Choose a reason for hiding this comment

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

fixed it, tried because of a failing integ tests, it appears that previous package was correct and instead recent core changes are not yet published for intg-test-zip artifact

@martin-gaievski
Copy link
Member Author

Integ tests are failing now, core change with refactoring of Strings class not yet published for iinteg-test-zip artifact

@martin-gaievski martin-gaievski merged commit 1b7baf6 into opensearch-project:main May 19, 2023
@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-904-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 1b7baf6df7dd3a96ff2f307d03afdb1fc9aca7f0
# Push it to GitHub
git push --set-upstream origin backport/backport-904-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-904-to-2.x.

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