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 XContent, MediaTypeRegistry, CircuitBreaker, ByteSizeValue etc breaking changes coming from core. #1014

Merged
merged 1 commit into from
Aug 1, 2023

Conversation

navneet1v
Copy link
Collaborator

@navneet1v navneet1v commented Aug 1, 2023

Description

Fixed XContent, MediaTypeRegistry, CircuitBreaker, ByteSizeValue etc breaking changes coming from core.

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.

@navneet1v navneet1v added enhancement Maintenance Add support for new versions of OpenSearch/Dashboards from upstream labels Aug 1, 2023
@navneet1v navneet1v changed the title Enabled the IVF algorithm to work with Filters of K-NN Query and fixed XContent and MediaTypeRegistry breaking changes. Fixed XContent, MediaTypeRegistry, CircuitBreaker, ByteSizeValue etc breaking changes coming from core. Aug 1, 2023
@codecov
Copy link

codecov bot commented Aug 1, 2023

Codecov Report

Merging #1014 (111f496) into main (84509fb) will not change coverage.
The diff coverage is 100.00%.

@@            Coverage Diff            @@
##               main    #1014   +/-   ##
=========================================
  Coverage     85.13%   85.13%           
  Complexity     1141     1141           
=========================================
  Files           154      154           
  Lines          4683     4683           
  Branches        423      423           
=========================================
  Hits           3987     3987           
  Misses          504      504           
  Partials        192      192           
Files Changed Coverage Δ
...ain/java/org/opensearch/knn/index/KNNSettings.java 84.37% <ø> (ø)
.../opensearch/knn/index/KNNVectorIndexFieldData.java 100.00% <ø> (ø)
...index/codec/KNN80Codec/KNN80DocValuesConsumer.java 88.69% <100.00%> (ø)

@navneet1v navneet1v merged commit 3aedd94 into opensearch-project:main Aug 1, 2023
16 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-1014-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 3aedd94897b6772af7ea754671f4c32a4d09ee9c
# Push it to GitHub
git push --set-upstream origin backport/backport-1014-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-1014-to-2.x.

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