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 the backward incompatible changes coming from core in ScoreScript class and index.store.hybrid.mmap.extensions settings #1056

Merged
merged 1 commit into from
Aug 23, 2023

Conversation

navneet1v
Copy link
Collaborator

Fixing the backward incompatible changes coming from core in ScoreScript class and index.store.hybrid.mmap.extensions setting

Description

The change includes:

  1. Fixing the backward incompatible changes in ScoreScript class. [Feature] Expose term frequency in Painless script score context OpenSearch#9081
  2. index.store.hybrid.mmap.extensions settings is deprecated. Hence it is adding warnings and failing the unit tests. Added a workaround which is already added in the 2.x branch. This will ensure that main is unblocked. Will work on fixing this deprecated settings in future PRs.

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.

…ipt class and index.store.hybrid.mmap.extensions setting

Signed-off-by: Navneet Verma <[email protected]>
@navneet1v
Copy link
Collaborator Author

Merging the changes as of now. the integ tests are failing. Working on fixing that too.

@navneet1v navneet1v merged commit 3df8308 into main Aug 23, 2023
@navneet1v navneet1v deleted the main-fix branch August 23, 2023 21:36
@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-1056-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 3df8308bbe7ce6559b559f32920c31a6b0ae3f20
# Push it to GitHub
git push --set-upstream origin backport/backport-1056-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-1056-to-2.x.

navneet1v added a commit to navneet1v/k-NN that referenced this pull request Aug 24, 2023
navneet1v added a commit to navneet1v/k-NN that referenced this pull request Aug 24, 2023
navneet1v added a commit that referenced this pull request Aug 25, 2023
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.

3 participants