pass in order terms as sorted to TermInSetQuery()#17714
pass in order terms as sorted to TermInSetQuery()#17714jainankitk merged 20 commits intoopensearch-project:mainfrom
Conversation
|
❌ Gradle check result for aa495eb: 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 thanks for adding this change! This looks right, but |
|
❌ Gradle check result for 4aba2a0: 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? |
|
❌ Gradle check result for 5808ce4: 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? |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #17714 +/- ##
============================================
+ Coverage 72.29% 72.42% +0.13%
- Complexity 65900 66031 +131
============================================
Files 5350 5351 +1
Lines 306185 306229 +44
Branches 44373 44374 +1
============================================
+ Hits 221347 221789 +442
+ Misses 66670 66306 -364
+ Partials 18168 18134 -34 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
|
❌ Gradle check result for ec7707c: 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? |
|
one more optimization in Lucene 10.3 apache/lucene#14425 |
jainankitk
left a comment
There was a problem hiding this comment.
Thanks @mkhludnev for fixing this issue. Few comments to help improve the readability
server/src/main/java/org/opensearch/index/mapper/BytesRefsCollectionBuilder.java
Outdated
Show resolved
Hide resolved
server/src/main/java/org/opensearch/index/mapper/BytesRefsCollectionBuilder.java
Outdated
Show resolved
Hide resolved
server/src/main/java/org/opensearch/index/mapper/BytesRefsCollectionBuilder.java
Outdated
Show resolved
Hide resolved
server/src/main/java/org/opensearch/index/mapper/BytesRefsCollectionBuilder.java
Outdated
Show resolved
Hide resolved
server/src/main/java/org/opensearch/index/mapper/BytesRefsCollectionBuilder.java
Outdated
Show resolved
Hide resolved
|
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/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-17714-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 032f4095cf797059e718d74fd2d337d95f8a09a9
# Push it to GitHub
git push --set-upstream origin backport/backport-17714-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.xThen, create a pull request where the |
|
@jainankitk thanks for merging this. Let's remove these redundant test #17902 (pardon, my intent wasn't clear), and then I'll proceed with backporting. |
…#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>
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>
|
backport pr #17916 |
…#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> Signed-off-by: Sriram Ganesh <srignsh22@gmail.com>
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> Signed-off-by: Sriram Ganesh <srignsh22@gmail.com>
* Pass in order terms as sorted to TermInSetQuery() (#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> * Fix test Signed-off-by: Mikhail Khludnev <mkhl@apache.org> * Fix BytesRefsCollectionBuilderTests.testBuildSortedNotSorted Followup for #17714: Remove redundant tests (#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> --------- Signed-off-by: Mikhail Khludnev <mkhl@apache.org> Signed-off-by: Mikhail Khludnev <mkhludnev@users.noreply.github.com>
…#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> Signed-off-by: Harsh Kothari <techarsh@amazon.com>
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> Signed-off-by: Harsh Kothari <techarsh@amazon.com>
…#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> Signed-off-by: Harsh Kothari <techarsh@amazon.com>
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> Signed-off-by: Harsh Kothari <techarsh@amazon.com>
Pass in-order terms as Sorted into TermInSet
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.
spin off from discussion https://forum.opensearch.org/t/avoid-re-sorting-when-initializing-terminsetquery/23865