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 recent changes in core #1031

Conversation

martin-gaievski
Copy link
Member

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

Description

Fixed compilation errors after changes in core Strings classes (opensearch-project/OpenSearch#9103)

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.

heemin32
heemin32 previously approved these changes Aug 8, 2023
@martin-gaievski martin-gaievski force-pushed the fix-errors-after-refarctorings-in-core branch from 80bf7a9 to 675c393 Compare August 8, 2023 16:06
@codecov
Copy link

codecov bot commented Aug 8, 2023

Codecov Report

Merging #1031 (675c393) into main (0d97aba) will decrease coverage by 0.24%.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##               main    #1031      +/-   ##
============================================
- Coverage     85.33%   85.10%   -0.24%     
+ Complexity     1149     1144       -5     
============================================
  Files           154      154              
  Lines          4692     4692              
  Branches        425      425              
============================================
- Hits           4004     3993      -11     
- Misses          497      506       +9     
- Partials        191      193       +2     
Files Changed Coverage Δ
...opensearch/knn/index/mapper/MethodFieldMapper.java 85.71% <100.00%> (ø)

... and 2 files with indirect coverage changes

@martin-gaievski
Copy link
Member Author

BWC tests will fail now, there is an issue with core 2.10.0 build

@martin-gaievski martin-gaievski added the Maintenance Add support for new versions of OpenSearch/Dashboards from upstream label Aug 8, 2023
@martin-gaievski martin-gaievski merged commit 0a7fc4e into opensearch-project:main Aug 8, 2023
17 of 43 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-1031-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 0a7fc4e3d382c17bcd3537a6d625eec07f23085d
# Push it to GitHub
git push --set-upstream origin backport/backport-1031-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-1031-to-2.x.

smortex pushed a commit to smortex/k-NN that referenced this pull request Aug 9, 2023
martin-gaievski added a commit that referenced this pull request Aug 16, 2023
Signed-off-by: Martin Gaievski <[email protected]>
(cherry picked from commit 0a7fc4e)

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
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.

4 participants