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

Bump to Lucene99 #11421

Merged
merged 29 commits into from
Jan 10, 2024
Merged

Bump to Lucene99 #11421

merged 29 commits into from
Jan 10, 2024

Conversation

mch2
Copy link
Member

@mch2 mch2 commented Nov 30, 2023

Description

Bump Lucene to Version 9.9.1

Related Issues

Resolves #11414

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.

@github-actions github-actions bot added dependencies Pull requests that update a dependency file enhancement Enhancement or improvement to existing feature or request v2.13.0 Issues and PRs related to version 2.13.0 v3.0.0 Issues and PRs related to version 3.0.0 labels Nov 30, 2023
Copy link
Contributor

github-actions bot commented Nov 30, 2023

Compatibility status:

Checks if related components are compatible with change 9024bdb

Incompatible components

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

Skipped components

Compatible components

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

Copy link
Contributor

❌ Gradle check result for 26f9fc6: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Copy link
Collaborator

@msfroh msfroh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gashutos -- I suspect you know more about the pruning logic than any of us. Can you confirm that we're doing this properly?

Thanks!

@gashutos
Copy link
Contributor

gashutos commented Dec 1, 2023

@gashutos -- I suspect you know more about the pruning logic than any of us. Can you confirm that we're doing this properly?

Thanks!

@msfroh @mch2 Changes look correct to me. We need to address filterPruning helper in comparatorSource as @msfroh suggested.
Very surprising that small change in Lucene is introducing API breaks (compile time). Could have been better

Copy link
Contributor

github-actions bot commented Dec 4, 2023

❌ Gradle check result for 98b3098: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@mch2
Copy link
Member Author

mch2 commented Dec 4, 2023

@gashutos @msfroh Thanks for the review here, latest revision handles the comparatorSource changes .

Still working through some unit failures, theres a break in some concurrent search related tests that mocked a now final IndexSearcher#getSlices.

Copy link
Contributor

github-actions bot commented Dec 4, 2023

❌ Gradle check result for 6a97ffa: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Copy link
Contributor

@gashutos gashutos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good !

Copy link
Contributor

github-actions bot commented Dec 6, 2023

❌ Gradle check result for 1c3d186: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Copy link
Contributor

github-actions bot commented Dec 6, 2023

❌ Gradle check result for 63b75f8: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Copy link
Contributor

github-actions bot commented Dec 6, 2023

❌ Gradle check result for 286514d: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Signed-off-by: Marc Handalian <[email protected]>
Updates to support interface change to FieldComparatorSource to use Pruning enum instead of enableSkipping boolean.

Signed-off-by: Marc Handalian <[email protected]>
Signed-off-by: Marc Handalian <[email protected]>
Signed-off-by: Marc Handalian <[email protected]>
Signed-off-by: Marc Handalian <[email protected]>
Signed-off-by: Marc Handalian <[email protected]>
Signed-off-by: Marc Handalian <[email protected]>
…TestCase method of the same name

Signed-off-by: Marc Handalian <[email protected]>
@reta
Copy link
Collaborator

reta commented Jan 3, 2024

Thanks a lot for doing that @mch2 !

@reta
Copy link
Collaborator

reta commented Jan 3, 2024

@msfroh could you please look at this change as well? (Lucene 9.9.1 update) thank you

Copy link
Contributor

github-actions bot commented Jan 9, 2024

❌ Gradle check result for 0185041: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Copy link
Contributor

github-actions bot commented Jan 9, 2024

❌ Gradle check result for 0185041:

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Copy link
Contributor

github-actions bot commented Jan 9, 2024

❌ Gradle check result for 9024bdb:

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@mch2
Copy link
Member Author

mch2 commented Jan 9, 2024

check seems to be having issues - latest run finished with Finished: UNSTABLE but did not report as such. re-firing

Copy link
Contributor

✅ Gradle check result for 9024bdb: SUCCESS

@msfroh msfroh merged commit 4a42150 into opensearch-project:main Jan 10, 2024
28 checks passed
@msfroh msfroh added the backport 2.x Backport to 2.x branch label Jan 10, 2024
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.x
# Create a new branch
git switch --create backport/backport-11421-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 4a42150ba0cbf10022797c038f35faaea2f548f6
# Push it to GitHub
git push --set-upstream origin backport/backport-11421-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-11421-to-2.x.

@reta reta added v2.12.0 Issues and PRs related to version 2.12.0 and removed v2.13.0 Issues and PRs related to version 2.13.0 labels Jan 10, 2024
mch2 added a commit to mch2/OpenSearch that referenced this pull request Jan 10, 2024
Upgraded Lucene dependency to 9.9.1.

---------

Signed-off-by: Marc Handalian <[email protected]>
Signed-off-by: Marc Handalian <[email protected]>
(cherry picked from commit 4a42150)
Signed-off-by: Marc Handalian <[email protected]>
@mch2 mch2 mentioned this pull request Jan 10, 2024
8 tasks
@mch2 mch2 deleted the Lucene99 branch January 10, 2024 06:25
mch2 added a commit that referenced this pull request Jan 10, 2024
* Bump to Lucene99 (#11421)

Upgraded Lucene dependency to 9.9.1.

---------

Signed-off-by: Marc Handalian <[email protected]>
Signed-off-by: Marc Handalian <[email protected]>
(cherry picked from commit 4a42150)
Signed-off-by: Marc Handalian <[email protected]>

* update deprecated CodecService constructor only in 2.x

Signed-off-by: Marc Handalian <[email protected]>

* Remove unused emptyReader method in Lucene.java

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 <[email protected]>

* Fix Version for 2.12.0 to correctly point to Lucene 9.9.1

Signed-off-by: Marc Handalian <[email protected]>

---------

Signed-off-by: Marc Handalian <[email protected]>
Signed-off-by: Marc Handalian <[email protected]>
rayshrey pushed a commit to rayshrey/OpenSearch that referenced this pull request Mar 18, 2024
Upgraded Lucene dependency to 9.9.1.

---------

Signed-off-by: Marc Handalian <[email protected]>
Signed-off-by: Marc Handalian <[email protected]>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
Upgraded Lucene dependency to 9.9.1.

---------

Signed-off-by: Marc Handalian <[email protected]>
Signed-off-by: Marc Handalian <[email protected]>
Signed-off-by: Shivansh Arora <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch backport-failed dependencies Pull requests that update a dependency file enhancement Enhancement or improvement to existing feature or request v2.12.0 Issues and PRs related to version 2.12.0 v3.0.0 Issues and PRs related to version 3.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[FEATURE] Move to Apache Lucene 9.9.0
8 participants