Skip to content

backport sorted BytesRef to TermInSet #17714 to 2.x#17916

Merged
jainankitk merged 3 commits intoopensearch-project:2.xfrom
mkhludnev:backport/backport-17714-to-2.x
Apr 21, 2025
Merged

backport sorted BytesRef to TermInSet #17714 to 2.x#17916
jainankitk merged 3 commits intoopensearch-project:2.xfrom
mkhludnev:backport/backport-17714-to-2.x

Conversation

@mkhludnev
Copy link
Copy Markdown
Contributor

@mkhludnev mkhludnev commented Apr 12, 2025

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.

mkhludnev and others added 3 commits April 12, 2025 12:42
@mkhludnev
Pass in order terms as sorted to TermInSetQuery() (opensearch-project…
3130b1d 
…#17714)

* pass in order terms as sorted to TermInSetQuery()

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>

* slightly more elegant solution

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>

* Attempting mocking TermInSetQ constructor.

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>

* Handle ids as well.

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>

* forbidden api

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>

* make unnecessary method slow but correct.

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>

* make unnecessary method slow but correct.

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>

* Polish test coverage

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>

* CHANGELOG.md

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>

* assertThrows

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>

* spotlessApply

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>

* coverage tests and refactoring

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>

* javadoc

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>

* javadoc

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>

* mark nocommit

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>

* one more nocommit test

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>

* forbidden api

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>

* no commit for out of line tests

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>

* Review

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>

---------

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>
Signed-off-by: Mikhail Khludnev <mkhludnev@users.noreply.github.com>
@mkhludnev
Fix test
dfa6b38 
Signed-off-by: Mikhail Khludnev <mkhl@apache.org>
@mkhludnev
Fix BytesRefsCollectionBuilderTests.testBuildSortedNotSorted
46bbb92 
Followup for opensearch-project#17714: Remove redundant tests (opensearch-project#17902)
* Remove redundant tests

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>

* Fix empty collection test

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>

---------

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>
@mkhludnev
Copy link
Copy Markdown
Contributor Author

mkhludnev commented Apr 12, 2025

this also includes backporting #17902 fix

@mkhludnev
Copy link
Copy Markdown
Contributor Author

mkhludnev commented Apr 12, 2025

@jainankitk you are welcome

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 12, 2025

❌ Gradle check result for 46bbb92: 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?

@mkhludnev mkhludnev mentioned this pull request Apr 12, 2025
Merged
2 tasks
@mkhludnev
Copy link
Copy Markdown
Contributor Author

mkhludnev commented Apr 15, 2025

@jainankitk may you consider for merging this backport? Please!

@mkhludnev
Copy link
Copy Markdown
Contributor Author

mkhludnev commented Apr 21, 2025

Please backport.

@jainankitk
Copy link
Copy Markdown
Contributor

jainankitk commented Apr 21, 2025

@jainankitk may you consider for merging this backport? Please!

Sorry, missed this earlier. Approved now, will retry the gradle check

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 21, 2025

❕ Gradle check result for 46bbb92: UNSTABLE

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 21, 2025 •
edited
Loading

Codecov Report

Attention: Patch coverage is 98.41270% with 1 line in your changes missing coverage. Please review.

Project coverage is 71.95%. Comparing base (03b7d62) to head (46bbb92).
Report is 5 commits behind head on 2.x.

Files with missing lines Patch % Lines
...earch/index/mapper/BytesRefsCollectionBuilder.java 97.50% 1 Missing ⚠️
Additional details and impacted files 
@@             Coverage Diff              @@
##                2.x   #17916      +/-   ##
============================================
- Coverage     71.99%   71.95%   -0.04%     
+ Complexity    66114    66081      -33     
============================================
  Files          5348     5352       +4     
  Lines        307550   307683     +133     
  Branches      44906    44919      +13     
============================================
- Hits         221409   221394      -15     
- Misses        67714    67859     +145     
- Partials      18427    18430       +3

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@jainankitk jainankitk merged commit 6f42e8b into opensearch-project:2.x Apr 21, 2025
68 checks passed
@mkhludnev
Copy link
Copy Markdown
Contributor Author

mkhludnev commented Apr 21, 2025

Is it worth to add into terms_query documentation advice about pre-sorting terms?

@jainankitk
Copy link
Copy Markdown
Contributor

jainankitk commented Apr 21, 2025

Is it worth to add into terms_query documentation advice about pre-sorting terms?

Yes, we can call this out in the documentation explicitly. Probably needs to go here - https://docs.opensearch.org/docs/latest/query-dsl/term/terms-set/ ?

@mkhludnev
Copy link
Copy Markdown
Contributor Author

mkhludnev commented Apr 22, 2025

Yes, we can call this out in the documentation explicitly. Probably needs to go here - https://docs.opensearch.org/docs/latest/query-dsl/term/terms-set/ ?

In DSL it's terms, not terms_set. Here, we go opensearch-project/documentation-website#9677

ref: #17714

@opensearch-ci-bot opensearch-ci-bot mentioned this pull request May 2, 2025
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jainankitk jainankitk jainankitk approved these changes

@anasalkouz anasalkouz Awaiting requested review from anasalkouz

@andrross andrross Awaiting requested review from andrross andrross is a code owner

@ashking94 ashking94 Awaiting requested review from ashking94 ashking94 is a code owner

@Bukhtawar Bukhtawar Awaiting requested review from Bukhtawar Bukhtawar is a code owner

@CEHENKLE CEHENKLE Awaiting requested review from CEHENKLE

@cwperks cwperks Awaiting requested review from cwperks cwperks is a code owner

@dbwiddis dbwiddis Awaiting requested review from dbwiddis dbwiddis is a code owner

@gbbafna gbbafna Awaiting requested review from gbbafna gbbafna is a code owner

@jed326 jed326 Awaiting requested review from jed326 jed326 is a code owner

@kotwanikunal kotwanikunal Awaiting requested review from kotwanikunal kotwanikunal is a code owner

@mch2 mch2 Awaiting requested review from mch2 mch2 is a code owner

@msfroh msfroh Awaiting requested review from msfroh msfroh is a code owner

@nknize nknize Awaiting requested review from nknize

@owaiskazi19 owaiskazi19 Awaiting requested review from owaiskazi19 owaiskazi19 is a code owner

@reta reta Awaiting requested review from reta reta is a code owner

@Rishikesh1159 Rishikesh1159 Awaiting requested review from Rishikesh1159

@sachinpkale sachinpkale Awaiting requested review from sachinpkale sachinpkale is a code owner

@saratvemulapalli saratvemulapalli Awaiting requested review from saratvemulapalli saratvemulapalli is a code owner

@shwetathareja shwetathareja Awaiting requested review from shwetathareja shwetathareja is a code owner

@sohami sohami Awaiting requested review from sohami sohami is a code owner

@VachaShah VachaShah Awaiting requested review from VachaShah

@linuxpi linuxpi Awaiting requested review from linuxpi linuxpi is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@mkhludnev @jainankitk