Skip to content

[Backport 2.x] Bump to Lucene99#11832

Merged
mch2 merged 4 commits intoopensearch-project:2.xfrom
mch2:2.x
Jan 10, 2024
Merged

[Backport 2.x] Bump to Lucene99#11832
mch2 merged 4 commits intoopensearch-project:2.xfrom
mch2:2.x

Conversation

@mch2
Copy link
Copy Markdown
Member

@mch2 mch2 commented Jan 10, 2024

Description

Manual backport of #11421.
This PR contains two additional commits to fix merge conflicts with 2.x.

The first commit is a small codec bump in CodecService for a deprecated ctor not in main. The second is to remove an unused method in Lucene.java to provide a LeafReader that contains conflicts with 99.

Related Issues

N/A

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Failing checks are inspected and point to the corresponding known issue(s) (See: Troubleshooting Failing Builds)
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)
  • Public documentation issue/PR created

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.

mch2 and others added 3 commits January 9, 2024 22:01
Upgraded Lucene dependency to 9.9.1.

---------

Signed-off-by: Marc Handalian <marc.handalian@gmail.com>
Signed-off-by: Marc Handalian <handalm@amazon.com>
(cherry picked from commit 4a42150)
Signed-off-by: Marc Handalian <marc.handalian@gmail.com>
Signed-off-by: Marc Handalian <marc.handalian@gmail.com>
This method has a conflict inside leafReader's getMetaData as the constructor
to LeafMetaData has changed.  However this method is never invoked so removing it.

Signed-off-by: Marc Handalian <marc.handalian@gmail.com>
@github-actions

This comment was marked as outdated.

Signed-off-by: Marc Handalian <marc.handalian@gmail.com>
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Jan 10, 2024

Compatibility status:

Checks if related components are compatible with change c7f74e3

Incompatible components

Incompatible components: [https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/custom-codecs.git, https://github.com/opensearch-project/k-nn.git]

Skipped components

Compatible components

Compatible components: [https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/reporting.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/performance-analyzer-rca.git, https://github.com/opensearch-project/performance-analyzer.git]

@github-actions
Copy link
Copy Markdown
Contributor

✅ Gradle check result for c7f74e3: SUCCESS

@codecov
Copy link
Copy Markdown

codecov bot commented Jan 10, 2024

Codecov Report

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

Comparison is base (334636f) 71.12% compared to head (c7f74e3) 71.03%.
Report is 1 commits behind head on 2.x.

Files Patch % Lines
.../java/org/opensearch/index/codec/CodecService.java 66.66% 2 Missing ⚠️
...org/opensearch/index/fielddata/IndexFieldData.java 33.33% 1 Missing and 1 partial ⚠️
...eldcomparator/HalfFloatValuesComparatorSource.java 0.00% 1 Missing ⚠️
...comparator/UnsignedLongValuesComparatorSource.java 0.00% 1 Missing ⚠️
...opensearch/index/mapper/CompletionFieldMapper.java 0.00% 1 Missing ⚠️
.../index/search/comparators/HalfFloatComparator.java 0.00% 1 Missing ⚠️
...dex/search/comparators/UnsignedLongComparator.java 0.00% 1 Missing ⚠️
...opensearch/search/sort/GeoDistanceSortBuilder.java 0.00% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##                2.x   #11832      +/-   ##
============================================
- Coverage     71.12%   71.03%   -0.10%     
+ Complexity    59351    59319      -32     
============================================
  Files          4889     4889              
  Lines        279804   279780      -24     
  Branches      41028    41023       -5     
============================================
- Hits         199004   198734     -270     
- Misses        63941    64141     +200     
- Partials      16859    16905      +46     

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

@reta reta added the v2.12.0 Issues and PRs related to version 2.12.0 label Jan 10, 2024
@mch2 mch2 merged commit de26624 into opensearch-project:2.x Jan 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

v2.12.0 Issues and PRs related to version 2.12.0

Projects

Status: No status

Development

Successfully merging this pull request may close these issues.

2 participants