[Backport main manually][bug fix] Fix async actions are left in neural_sparse query (#438) #479
Conversation
This file contains 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
…ch-project#438) * add serialization and deserialization Signed-off-by: zhichao-aws <zhichaog@amazon.com> * hash, equals. + UT Signed-off-by: zhichao-aws <zhichaog@amazon.com> * tidy Signed-off-by: zhichao-aws <zhichaog@amazon.com> * add test Signed-off-by: zhichao-aws <zhichaog@amazon.com> --------- Signed-off-by: zhichao-aws <zhichaog@amazon.com> (cherry picked from commit 51e6c00)
zhichao-aws
requested review from
heemin32,
navneet1v,
VijayanB,
vamshin,
jmazanec15,
naveentatikonda,
junqiu-lei,
martin-gaievski,
sean-zheng-amazon,
model-collapse,
wujunshen,
zane-neo,
ylwu-amzn and
jngz-es
as code owners
|
The automatic backport workflow failed, create backport manually. Failure reason: in 2.x pr there are max_token_score related changes, but in main we don't have max_token_score. Delete those lines. |
Signed-off-by: zhichao-aws <zhichaog@amazon.com>
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## main #479 +/- ##
============================================
+ Coverage 84.37% 84.38% +0.01%
- Complexity 498 506 +8
============================================
Files 40 40
Lines 1491 1505 +14
Branches 228 234 +6
============================================
+ Hits 1258 1270 +12
Misses 133 133
- Partials 100 102 +2 ☔ View full report in Codecov by Sentry. |
|
@zhichao-aws please update the changelog. |
Signed-off-by: zhichao-aws <zhichaog@amazon.com>
Done |
zane-neo
approved these changes
Nov 3, 2023
|
@navneet1v @martin-gaievski Need one more approve, could you please help review this? |
VijayanB
reviewed
Nov 9, 2023
src/main/java/org/opensearch/neuralsearch/query/NeuralSparseQueryBuilder.java
Outdated
Show resolved
Hide resolved
martin-gaievski
approved these changes
Nov 16, 2023
krishy91
pushed a commit
to krishy91/neural-search
that referenced
this pull request
Dec 20, 2023
…l_sparse query (opensearch-project#438) (opensearch-project#479) * [bug fix] Fix async actions are left in neural_sparse query (opensearch-project#438) * add serialization and deserialization Signed-off-by: zhichao-aws <zhichaog@amazon.com> * hash, equals. + UT Signed-off-by: zhichao-aws <zhichaog@amazon.com> * tidy Signed-off-by: zhichao-aws <zhichaog@amazon.com> * add test Signed-off-by: zhichao-aws <zhichaog@amazon.com> --------- Signed-off-by: zhichao-aws <zhichaog@amazon.com> (cherry picked from commit 51e6c00) * rm max_token_score Signed-off-by: zhichao-aws <zhichaog@amazon.com> * add changelog Signed-off-by: zhichao-aws <zhichaog@amazon.com> * tidy Signed-off-by: zhichao-aws <zhichaog@amazon.com> --------- Signed-off-by: zhichao-aws <zhichaog@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de>
krishy91
pushed a commit
to krishy91/neural-search
that referenced
this pull request
Jan 4, 2024
…l_sparse query (opensearch-project#438) (opensearch-project#479) * [bug fix] Fix async actions are left in neural_sparse query (opensearch-project#438) * add serialization and deserialization Signed-off-by: zhichao-aws <zhichaog@amazon.com> * hash, equals. + UT Signed-off-by: zhichao-aws <zhichaog@amazon.com> * tidy Signed-off-by: zhichao-aws <zhichaog@amazon.com> * add test Signed-off-by: zhichao-aws <zhichaog@amazon.com> --------- Signed-off-by: zhichao-aws <zhichaog@amazon.com> (cherry picked from commit 51e6c00) * rm max_token_score Signed-off-by: zhichao-aws <zhichaog@amazon.com> * add changelog Signed-off-by: zhichao-aws <zhichaog@amazon.com> * tidy Signed-off-by: zhichao-aws <zhichaog@amazon.com> --------- Signed-off-by: zhichao-aws <zhichaog@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de>
zane-neo
pushed a commit
that referenced
this pull request
Mar 1, 2024
* Handle case with nested list of objects Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * fix validateEmbeddingsFieldValues Method Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * spotless formatting Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Onboard jenkins prod docker images on github actions (#483) Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Update dependency org.json:json to v20231013 (#481) Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * [Backport main manually][bug fix] Fix async actions are left in neural_sparse query (#438) (#479) * [bug fix] Fix async actions are left in neural_sparse query (#438) * add serialization and deserialization Signed-off-by: zhichao-aws <zhichaog@amazon.com> * hash, equals. + UT Signed-off-by: zhichao-aws <zhichaog@amazon.com> * tidy Signed-off-by: zhichao-aws <zhichaog@amazon.com> * add test Signed-off-by: zhichao-aws <zhichaog@amazon.com> --------- Signed-off-by: zhichao-aws <zhichaog@amazon.com> (cherry picked from commit 51e6c00) * rm max_token_score Signed-off-by: zhichao-aws <zhichaog@amazon.com> * add changelog Signed-off-by: zhichao-aws <zhichaog@amazon.com> * tidy Signed-off-by: zhichao-aws <zhichaog@amazon.com> --------- Signed-off-by: zhichao-aws <zhichaog@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Fixed exception for case when Hybrid query being wrapped into bool query (#490) * Adding null check for case when hybrid query wrapped into bool query Signed-off-by: Martin Gaievski <gaievski@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Fixed Hybrid query for cases when it's wrapped into other compound queries (#498) * Fixed nested field case Signed-off-by: Martin Gaievski <gaievski@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Added the github action to copy the attached issues label to PR. (#504) Signed-off-by: Navneet Verma <navneev@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Added support for jdk-21 (#500) * Added support for jdk-21 Signed-off-by: Martin Gaievski <gaievski@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Add unit tests + small fixes Signed-off-by: krishy91 <crgkc.r@gmail.com> * fix indentation Signed-off-by: krishy91 <crgkc.r@gmail.com> * remove unused code + add 2nd level nesting test Signed-off-by: krishy91 <crgkc.r@gmail.com> * add integration test for list of nested objects Signed-off-by: krishy91 <crgkc.r@gmail.com> --------- Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Signed-off-by: zhichao-aws <zhichaog@amazon.com> Signed-off-by: Martin Gaievski <gaievski@amazon.com> Signed-off-by: Navneet Verma <navneev@amazon.com> Signed-off-by: krishy91 <crgkc.r@gmail.com> Co-authored-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> Co-authored-by: Peter Zhu <zhujiaxi@amazon.com> Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> Co-authored-by: zhichao-aws <zhichaog@amazon.com> Co-authored-by: Martin Gaievski <gaievski@amazon.com> Co-authored-by: Navneet Verma <navneev@amazon.com>
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
Mar 1, 2024
* Handle case with nested list of objects Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * fix validateEmbeddingsFieldValues Method Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * spotless formatting Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Onboard jenkins prod docker images on github actions (#483) Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Update dependency org.json:json to v20231013 (#481) Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * [Backport main manually][bug fix] Fix async actions are left in neural_sparse query (#438) (#479) * [bug fix] Fix async actions are left in neural_sparse query (#438) * add serialization and deserialization Signed-off-by: zhichao-aws <zhichaog@amazon.com> * hash, equals. + UT Signed-off-by: zhichao-aws <zhichaog@amazon.com> * tidy Signed-off-by: zhichao-aws <zhichaog@amazon.com> * add test Signed-off-by: zhichao-aws <zhichaog@amazon.com> --------- Signed-off-by: zhichao-aws <zhichaog@amazon.com> (cherry picked from commit 51e6c00) * rm max_token_score Signed-off-by: zhichao-aws <zhichaog@amazon.com> * add changelog Signed-off-by: zhichao-aws <zhichaog@amazon.com> * tidy Signed-off-by: zhichao-aws <zhichaog@amazon.com> --------- Signed-off-by: zhichao-aws <zhichaog@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Fixed exception for case when Hybrid query being wrapped into bool query (#490) * Adding null check for case when hybrid query wrapped into bool query Signed-off-by: Martin Gaievski <gaievski@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Fixed Hybrid query for cases when it's wrapped into other compound queries (#498) * Fixed nested field case Signed-off-by: Martin Gaievski <gaievski@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Added the github action to copy the attached issues label to PR. (#504) Signed-off-by: Navneet Verma <navneev@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Added support for jdk-21 (#500) * Added support for jdk-21 Signed-off-by: Martin Gaievski <gaievski@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Add unit tests + small fixes Signed-off-by: krishy91 <crgkc.r@gmail.com> * fix indentation Signed-off-by: krishy91 <crgkc.r@gmail.com> * remove unused code + add 2nd level nesting test Signed-off-by: krishy91 <crgkc.r@gmail.com> * add integration test for list of nested objects Signed-off-by: krishy91 <crgkc.r@gmail.com> --------- Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Signed-off-by: zhichao-aws <zhichaog@amazon.com> Signed-off-by: Martin Gaievski <gaievski@amazon.com> Signed-off-by: Navneet Verma <navneev@amazon.com> Signed-off-by: krishy91 <crgkc.r@gmail.com> Co-authored-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> Co-authored-by: Peter Zhu <zhujiaxi@amazon.com> Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> Co-authored-by: zhichao-aws <zhichaog@amazon.com> Co-authored-by: Martin Gaievski <gaievski@amazon.com> Co-authored-by: Navneet Verma <navneev@amazon.com> (cherry picked from commit ea49d3c)
vibrantvarun
pushed a commit
that referenced
this pull request
Mar 5, 2024
* Handle case with nested list of objects Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * fix validateEmbeddingsFieldValues Method Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * spotless formatting Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Onboard jenkins prod docker images on github actions (#483) Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Update dependency org.json:json to v20231013 (#481) Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * [Backport main manually][bug fix] Fix async actions are left in neural_sparse query (#438) (#479) * [bug fix] Fix async actions are left in neural_sparse query (#438) * add serialization and deserialization Signed-off-by: zhichao-aws <zhichaog@amazon.com> * hash, equals. + UT Signed-off-by: zhichao-aws <zhichaog@amazon.com> * tidy Signed-off-by: zhichao-aws <zhichaog@amazon.com> * add test Signed-off-by: zhichao-aws <zhichaog@amazon.com> --------- Signed-off-by: zhichao-aws <zhichaog@amazon.com> (cherry picked from commit 51e6c00) * rm max_token_score Signed-off-by: zhichao-aws <zhichaog@amazon.com> * add changelog Signed-off-by: zhichao-aws <zhichaog@amazon.com> * tidy Signed-off-by: zhichao-aws <zhichaog@amazon.com> --------- Signed-off-by: zhichao-aws <zhichaog@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Fixed exception for case when Hybrid query being wrapped into bool query (#490) * Adding null check for case when hybrid query wrapped into bool query Signed-off-by: Martin Gaievski <gaievski@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Fixed Hybrid query for cases when it's wrapped into other compound queries (#498) * Fixed nested field case Signed-off-by: Martin Gaievski <gaievski@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Added the github action to copy the attached issues label to PR. (#504) Signed-off-by: Navneet Verma <navneev@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Added support for jdk-21 (#500) * Added support for jdk-21 Signed-off-by: Martin Gaievski <gaievski@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Add unit tests + small fixes Signed-off-by: krishy91 <crgkc.r@gmail.com> * fix indentation Signed-off-by: krishy91 <crgkc.r@gmail.com> * remove unused code + add 2nd level nesting test Signed-off-by: krishy91 <crgkc.r@gmail.com> * add integration test for list of nested objects Signed-off-by: krishy91 <crgkc.r@gmail.com> --------- Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Signed-off-by: zhichao-aws <zhichaog@amazon.com> Signed-off-by: Martin Gaievski <gaievski@amazon.com> Signed-off-by: Navneet Verma <navneev@amazon.com> Signed-off-by: krishy91 <crgkc.r@gmail.com> Co-authored-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> Co-authored-by: Peter Zhu <zhujiaxi@amazon.com> Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> Co-authored-by: zhichao-aws <zhichaog@amazon.com> Co-authored-by: Martin Gaievski <gaievski@amazon.com> Co-authored-by: Navneet Verma <navneev@amazon.com> (cherry picked from commit ea49d3c) Co-authored-by: Gopala-Krishna Char <crgkc.r@gmail.com>
yuye-aws
pushed a commit
to yuye-aws/neural-search
that referenced
this pull request
Mar 8, 2024
* Handle case with nested list of objects Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * fix validateEmbeddingsFieldValues Method Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * spotless formatting Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Onboard jenkins prod docker images on github actions (opensearch-project#483) Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Update dependency org.json:json to v20231013 (opensearch-project#481) Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * [Backport main manually][bug fix] Fix async actions are left in neural_sparse query (opensearch-project#438) (opensearch-project#479) * [bug fix] Fix async actions are left in neural_sparse query (opensearch-project#438) * add serialization and deserialization Signed-off-by: zhichao-aws <zhichaog@amazon.com> * hash, equals. + UT Signed-off-by: zhichao-aws <zhichaog@amazon.com> * tidy Signed-off-by: zhichao-aws <zhichaog@amazon.com> * add test Signed-off-by: zhichao-aws <zhichaog@amazon.com> --------- Signed-off-by: zhichao-aws <zhichaog@amazon.com> (cherry picked from commit 51e6c00) * rm max_token_score Signed-off-by: zhichao-aws <zhichaog@amazon.com> * add changelog Signed-off-by: zhichao-aws <zhichaog@amazon.com> * tidy Signed-off-by: zhichao-aws <zhichaog@amazon.com> --------- Signed-off-by: zhichao-aws <zhichaog@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Fixed exception for case when Hybrid query being wrapped into bool query (opensearch-project#490) * Adding null check for case when hybrid query wrapped into bool query Signed-off-by: Martin Gaievski <gaievski@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Fixed Hybrid query for cases when it's wrapped into other compound queries (opensearch-project#498) * Fixed nested field case Signed-off-by: Martin Gaievski <gaievski@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Added the github action to copy the attached issues label to PR. (opensearch-project#504) Signed-off-by: Navneet Verma <navneev@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Added support for jdk-21 (opensearch-project#500) * Added support for jdk-21 Signed-off-by: Martin Gaievski <gaievski@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Add unit tests + small fixes Signed-off-by: krishy91 <crgkc.r@gmail.com> * fix indentation Signed-off-by: krishy91 <crgkc.r@gmail.com> * remove unused code + add 2nd level nesting test Signed-off-by: krishy91 <crgkc.r@gmail.com> * add integration test for list of nested objects Signed-off-by: krishy91 <crgkc.r@gmail.com> --------- Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Signed-off-by: zhichao-aws <zhichaog@amazon.com> Signed-off-by: Martin Gaievski <gaievski@amazon.com> Signed-off-by: Navneet Verma <navneev@amazon.com> Signed-off-by: krishy91 <crgkc.r@gmail.com> Co-authored-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> Co-authored-by: Peter Zhu <zhujiaxi@amazon.com> Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> Co-authored-by: zhichao-aws <zhichaog@amazon.com> Co-authored-by: Martin Gaievski <gaievski@amazon.com> Co-authored-by: Navneet Verma <navneev@amazon.com> Signed-off-by: yuye-aws <yuyezhu@amazon.com>
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
Backport #438 manually
cherry picked from commit 51e6c00
Issues Resolved
[List any issues this PR will resolve]
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.