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

Upgrade Lucene Codec to Lucene99 + Upgrade to Gradle 8.5 #800

Merged
merged 5 commits into from
Jan 13, 2024

Conversation

jowg-amazon
Copy link
Collaborator

@jowg-amazon jowg-amazon commented Jan 12, 2024

Description

This PR includes the following changes:

  • Add new codec that wraps Lucene Codec 99 and make it default

  • Fix import statements for Lucene Codec 95

  • Change CorrelationCode990 and CorrelationCodec950 constructor to type PerFieldKnnVectorsFormat to abstract the field type.

  • Upgrades to gradle 8.5

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • 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.

reta and others added 2 commits January 12, 2024 13:08
Signed-off-by: Andriy Redko <[email protected]>
Copy link

codecov bot commented Jan 12, 2024

Codecov Report

Attention: 5 lines in your changes are missing coverage. Please review.

Comparison is base (0ad91cc) 24.73% compared to head (e0d775b) 24.78%.
Report is 2 commits behind head on main.

Files Patch % Lines
...rrelation/index/codec/CorrelationCodecVersion.java 75.00% 2 Missing ⚠️
...lation990/PerFieldCorrelationVectorsFormat990.java 50.00% 2 Missing ⚠️
...ndex/codec/correlation990/CorrelationCodec990.java 85.71% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               main     #800      +/-   ##
============================================
+ Coverage     24.73%   24.78%   +0.05%     
- Complexity     1023     1027       +4     
============================================
  Files           275      277       +2     
  Lines         12695    12709      +14     
  Branches       1400     1400              
============================================
+ Hits           3140     3150      +10     
- Misses         9290     9294       +4     
  Partials        265      265              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@eirsep
Copy link
Member

eirsep commented Jan 12, 2024

why do we need both old and new codec? what was the previous code being used?

@eirsep
Copy link
Member

eirsep commented Jan 13, 2024

are there any backward compatibility issues when customer upgrades from a version with previous codec to this?

@jowg-amazon
Copy link
Collaborator Author

Asked @sbcd90 yesterday about keeping the old codec and he said it would be good to keep. K-nn keeps their old codecs for backwards compatibility which is why I kept both old and new codec. Don't know how to test this as we don't have a BWC workflow set up yet.

@sbcd90 sbcd90 merged commit 988377a into opensearch-project:main Jan 13, 2024
14 of 18 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-800-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 988377a5f26cb7eedf13cb075a8e9624c29b78a8
# Push it to GitHub
git push --set-upstream origin backport/backport-800-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-800-to-2.x.

opensearch-trigger-bot bot pushed a commit that referenced this pull request Jan 16, 2024
Signed-off-by: Joanne Wang <[email protected]>
Co-authored-by: Andriy Redko <[email protected]>
(cherry picked from commit 988377a)
@jowg-amazon jowg-amazon changed the title Upgrade Lucene Codec to Lucene99 Upgrade Lucene Codec to Lucene99 + Upgrade to Gradle 8.5 Jan 16, 2024
jowg-amazon added a commit that referenced this pull request Jan 16, 2024
Signed-off-by: Joanne Wang <[email protected]>
Co-authored-by: Andriy Redko <[email protected]>
(cherry picked from commit 988377a)

Co-authored-by: Joanne Wang <[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