Update DlsFlsFilterLeafReader to reflect Apache Lucene 10 APIs changes#5123
Merged
willyborankin merged 4 commits intoFeb 25, 2025
Merged
Conversation
Signed-off-by: Andriy Redko <drreta@gmail.com>
reta
commented
Feb 23, 2025
reta
commented
Feb 23, 2025
Collaborator
Author
|
Blocked by #5122 |
cwperks
approved these changes
Feb 24, 2025
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #5123 +/- ##
==========================================
+ Coverage 71.67% 71.72% +0.04%
==========================================
Files 335 335
Lines 22747 22748 +1
Branches 3598 3599 +1
==========================================
+ Hits 16303 16315 +12
+ Misses 4646 4634 -12
- Partials 1798 1799 +1
|
shikharj05
approved these changes
Feb 24, 2025
willyborankin
approved these changes
Feb 25, 2025
Contributor
|
The backport to 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/security/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/security/backport-2.x
# Create a new branch
git switch --create backport/backport-5123-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 25dcefd7d6989456e9156e914dd46ed53a928978
# Push it to GitHub
git push --set-upstream origin backport/backport-5123-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security/backport-2.xThen, create a pull request where the |
Collaborator
|
Hi @reta, could you please create a manual backport when you get a chance? |
Collaborator
Author
This is for 3.0.0 only, no need to backport, thanks @willyborankin |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Update
DlsFlsFilterLeafReaderto reflect Apache Lucene 10 APIs changes in theFilterTermsEnumIssues Resolved
Follow up on #5053 and concretely this workaround https://github.com/opensearch-project/security/pull/5053/files#r1950155753
Is this a backport? If so, please add backport PR # and/or commits #, and remove
backport-failedlabel from the original PR.Do these changes introduce new permission(s) to be displayed in the static dropdown on the front-end? If so, please open a draft PR in the security dashboards plugin and link the draft PR here
Testing
[Please provide details of testing done: unit testing, integration testing and manual testing]
Check List
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.