[Feature] Enable sorting and search_after features in hybrid search #827
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
…#801) (opensearch-project#806) Signed-off-by: Martin Gaievski <[email protected]> Co-authored-by: Martin Gaievski <[email protected]>
* Normalization Phase for Sorting Signed-off-by: Varun Jain <[email protected]> * Fixing compile test issue Signed-off-by: Varun Jain <[email protected]> * Optimize code Signed-off-by: Varun Jain <[email protected]> * Add method description Signed-off-by: Varun Jain <[email protected]> * [Part 1] Collector for Sorting Results (opensearch-project#797) * HybridSearchSortUtil class Signed-off-by: Varun Jain <[email protected]> * Add Integ Tests Signed-off-by: Varun Jain <[email protected]> * Add Sorting Integ tests Signed-off-by: Varun Jain <[email protected]> * Add integ test for Sorting Signed-off-by: Varun Jain <[email protected]> * Refactoring normalization processor workflow Signed-off-by: Varun Jain <[email protected]> * Fix Unit Tests Signed-off-by: Varun Jain <[email protected]> * Refactoring Signed-off-by: Varun Jain <[email protected]> * Refactoring Signed-off-by: Varun Jain <[email protected]> * Address Martin Comments Signed-off-by: Varun Jain <[email protected]> * Optimising Normalization Signed-off-by: Varun Jain <[email protected]> * Address Martin Comments Signed-off-by: Varun Jain <[email protected]> * Address Martin Comments Signed-off-by: Varun Jain <[email protected]> * Addressing Martin Comments Signed-off-by: Varun Jain <[email protected]> * Addressing Vijay comments Signed-off-by: Varun Jain <[email protected]> * Address Vijay Comments Signed-off-by: Varun Jain <[email protected]> --------- Signed-off-by: Varun Jain <[email protected]>
… (opensearch-project#810) * Increment BWC version * Append 2.16.0-SNAPSHOTn in restart upgrade tests --------- Signed-off-by: Varun Jain <[email protected]>
…#808) * Cherry picking Concurrent Segment Search Bug Commit Signed-off-by: Varun Jain <[email protected]> * Fix Concurrent Segment Search Bug in Sorting Signed-off-by: Varun Jain <[email protected]> * Functional Interface Signed-off-by: Varun Jain <[email protected]> * Addressing Martin Comments Signed-off-by: Varun Jain <[email protected]> * Removing comments Signed-off-by: Varun Jain <[email protected]> * Addressing Martin Comments Signed-off-by: Varun Jain <[email protected]> * Addressing Martin Comments Signed-off-by: Varun Jain <[email protected]> * Addressing Martin commnents Signed-off-by: Varun Jain <[email protected]> * Address Martin Comments Signed-off-by: Varun Jain <[email protected]> * Address Martin Comments Signed-off-by: Varun Jain <[email protected]> --------- Signed-off-by: Varun Jain <[email protected]> Co-authored-by: Martin Gaievski <[email protected]>
* Adds method_parameters in neural search query to support ef_search (opensearch-project#787) (opensearch-project#814) Signed-off-by: Tejas Shah <[email protected]> * Add BWC for batch ingestion (opensearch-project#769) * Add BWC for batch ingestion Signed-off-by: Liyun Xiu <[email protected]> * Update Changelog Signed-off-by: Liyun Xiu <[email protected]> * Fix spotlessLicenseCheck Signed-off-by: Liyun Xiu <[email protected]> * Fix comments Signed-off-by: Liyun Xiu <[email protected]> * Reuse the same code Signed-off-by: Liyun Xiu <[email protected]> * Rename some functions Signed-off-by: Liyun Xiu <[email protected]> * Rename a function Signed-off-by: Liyun Xiu <[email protected]> * Minor change to trigger rebuild Signed-off-by: Liyun Xiu <[email protected]> --------- Signed-off-by: Liyun Xiu <[email protected]> * Neural sparse query two-phase search processor's bwc test (opensearch-project#777) * Poc of pipeline Signed-off-by: conggguan <[email protected]> * Complete some settings for two phase pipeline. Signed-off-by: conggguan <[email protected]> * Change the implement of two-phase from QueryBuilderVistor to custom process funciton. Signed-off-by: conggguan <[email protected]> * Add It and fix some bug on the state of multy same neuralsparsequerybuilder. Signed-off-by: conggguan <[email protected]> * Simplify some logic, and correct some format. Signed-off-by: conggguan <[email protected]> * Optimize some format. Signed-off-by: conggguan <[email protected]> * Add some test case. Signed-off-by: conggguan <[email protected]> * Optimize some logic for zhichao-aws's comments. Signed-off-by: conggguan <[email protected]> * Optimize a line without application. Signed-off-by: conggguan <[email protected]> * Add some comments, remove some redundant lines, fix some format. Signed-off-by: conggguan <[email protected]> * Remove a redundant null check, fix a if format. Signed-off-by: conggguan <[email protected]> * Fix a typo for a comment, camelcase format for some variable. Signed-off-by: conggguan <[email protected]> * Add some comments to illustrate the influence of the modify on 2-phase search pipeline to neural sparse query builder. Signed-off-by: conggguan <[email protected]> * Add restart and rolling upgrade bwc test for neural sparse two phase processor. Signed-off-by: conggguan <[email protected]> * Spotless on qa. Signed-off-by: conggguan <[email protected]> * Update change log for two-phase BWC test. Signed-off-by: conggguan <[email protected]> * Remove redundant lines of two-phase BWC test. Signed-off-by: conggguan <[email protected]> * Add changelog. Signed-off-by: conggguan <[email protected]> * Add the PR link and number for the CHANGELOG.md. Signed-off-by: conggguan <[email protected]> * [Fix] NeuralSparseTwoPhaseProcessorIT created wrong ingest pipeline, fix it to correct API. Signed-off-by: conggguan <[email protected]> --------- Signed-off-by: conggguan <[email protected]> Signed-off-by: conggguan <[email protected]> * Enable '.' for nested field in text embedding processor (opensearch-project#811) * Added nested structure for text embed processor mapping Signed-off-by: Martin Gaievski <[email protected]> * Fix linux build CI error due to action runner env upgrade node 20 (opensearch-project#821) * Fix linux build CI error due to action runner env upgrade node 20 Signed-off-by: Varun Jain <[email protected]> * Fix linux build on additional integ tests Signed-off-by: Varun Jain <[email protected]> --------- Signed-off-by: Varun Jain <[email protected]> --------- Signed-off-by: Tejas Shah <[email protected]> Signed-off-by: Liyun Xiu <[email protected]> Signed-off-by: conggguan <[email protected]> Signed-off-by: conggguan <[email protected]> Signed-off-by: Martin Gaievski <[email protected]> Signed-off-by: Varun Jain <[email protected]> Co-authored-by: Tejas Shah <[email protected]> Co-authored-by: Liyun Xiu <[email protected]> Co-authored-by: conggguan <[email protected]> Co-authored-by: Martin Gaievski <[email protected]>
Signed-off-by: Varun Jain <[email protected]>
Signed-off-by: Varun Jain <[email protected]>
vibrantvarun
changed the title
vibrantvarun
added
the
backport 2.x
vibrantvarun
requested review from
heemin32,
navneet1v,
VijayanB,
vamshin,
jmazanec15,
naveentatikonda,
junqiu-lei,
martin-gaievski,
sean-zheng-amazon,
model-collapse,
zane-neo,
ylwu-amzn,
jngz-es and
zhichao-aws
as code owners
vibrantvarun
added
Enhancements
martin-gaievski
approved these changes
Jul 9, 2024
vibrantvarun
added
Enhancements
navneet1v
approved these changes
Jul 9, 2024
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
Jul 9, 2024
…827) * Fix jdk version for CI test secure cluster action (#801) (#806) Signed-off-by: Martin Gaievski <[email protected]> Co-authored-by: Martin Gaievski <[email protected]> * [Part 1] Collector for Sorting Results (#797) * [Part 2] Normalization Phase for Sorting (#802) * Normalization Phase for Sorting Signed-off-by: Varun Jain <[email protected]> * Fixing compile test issue Signed-off-by: Varun Jain <[email protected]> * Optimize code Signed-off-by: Varun Jain <[email protected]> * Add method description Signed-off-by: Varun Jain <[email protected]> * [Part 1] Collector for Sorting Results (#797) * HybridSearchSortUtil class Signed-off-by: Varun Jain <[email protected]> * Add Integ Tests Signed-off-by: Varun Jain <[email protected]> * Add Sorting Integ tests Signed-off-by: Varun Jain <[email protected]> * Add integ test for Sorting Signed-off-by: Varun Jain <[email protected]> * Refactoring normalization processor workflow Signed-off-by: Varun Jain <[email protected]> * Fix Unit Tests Signed-off-by: Varun Jain <[email protected]> * Refactoring Signed-off-by: Varun Jain <[email protected]> * Refactoring Signed-off-by: Varun Jain <[email protected]> * Address Martin Comments Signed-off-by: Varun Jain <[email protected]> * Optimising Normalization Signed-off-by: Varun Jain <[email protected]> * Address Martin Comments Signed-off-by: Varun Jain <[email protected]> * Address Martin Comments Signed-off-by: Varun Jain <[email protected]> * Addressing Martin Comments Signed-off-by: Varun Jain <[email protected]> * Addressing Vijay comments Signed-off-by: Varun Jain <[email protected]> * Address Vijay Comments Signed-off-by: Varun Jain <[email protected]> --------- Signed-off-by: Varun Jain <[email protected]> * Update bwc workflow to include 2.16.0-SNAPSHOT (#809) (#810) * Increment BWC version * Append 2.16.0-SNAPSHOTn in restart upgrade tests --------- Signed-off-by: Varun Jain <[email protected]> * [Part 3] Concurrent segment search bug in Sorting (#808) * Cherry picking Concurrent Segment Search Bug Commit Signed-off-by: Varun Jain <[email protected]> * Fix Concurrent Segment Search Bug in Sorting Signed-off-by: Varun Jain <[email protected]> * Functional Interface Signed-off-by: Varun Jain <[email protected]> * Addressing Martin Comments Signed-off-by: Varun Jain <[email protected]> * Removing comments Signed-off-by: Varun Jain <[email protected]> * Addressing Martin Comments Signed-off-by: Varun Jain <[email protected]> * Addressing Martin Comments Signed-off-by: Varun Jain <[email protected]> * Addressing Martin commnents Signed-off-by: Varun Jain <[email protected]> * Address Martin Comments Signed-off-by: Varun Jain <[email protected]> * Address Martin Comments Signed-off-by: Varun Jain <[email protected]> --------- Signed-off-by: Varun Jain <[email protected]> Co-authored-by: Martin Gaievski <[email protected]> * Rebasing with main (#826) * Adds method_parameters in neural search query to support ef_search (#787) (#814) Signed-off-by: Tejas Shah <[email protected]> * Add BWC for batch ingestion (#769) * Add BWC for batch ingestion Signed-off-by: Liyun Xiu <[email protected]> * Update Changelog Signed-off-by: Liyun Xiu <[email protected]> * Fix spotlessLicenseCheck Signed-off-by: Liyun Xiu <[email protected]> * Fix comments Signed-off-by: Liyun Xiu <[email protected]> * Reuse the same code Signed-off-by: Liyun Xiu <[email protected]> * Rename some functions Signed-off-by: Liyun Xiu <[email protected]> * Rename a function Signed-off-by: Liyun Xiu <[email protected]> * Minor change to trigger rebuild Signed-off-by: Liyun Xiu <[email protected]> --------- Signed-off-by: Liyun Xiu <[email protected]> * Neural sparse query two-phase search processor's bwc test (#777) * Poc of pipeline Signed-off-by: conggguan <[email protected]> * Complete some settings for two phase pipeline. Signed-off-by: conggguan <[email protected]> * Change the implement of two-phase from QueryBuilderVistor to custom process funciton. Signed-off-by: conggguan <[email protected]> * Add It and fix some bug on the state of multy same neuralsparsequerybuilder. Signed-off-by: conggguan <[email protected]> * Simplify some logic, and correct some format. Signed-off-by: conggguan <[email protected]> * Optimize some format. Signed-off-by: conggguan <[email protected]> * Add some test case. Signed-off-by: conggguan <[email protected]> * Optimize some logic for zhichao-aws's comments. Signed-off-by: conggguan <[email protected]> * Optimize a line without application. Signed-off-by: conggguan <[email protected]> * Add some comments, remove some redundant lines, fix some format. Signed-off-by: conggguan <[email protected]> * Remove a redundant null check, fix a if format. Signed-off-by: conggguan <[email protected]> * Fix a typo for a comment, camelcase format for some variable. Signed-off-by: conggguan <[email protected]> * Add some comments to illustrate the influence of the modify on 2-phase search pipeline to neural sparse query builder. Signed-off-by: conggguan <[email protected]> * Add restart and rolling upgrade bwc test for neural sparse two phase processor. Signed-off-by: conggguan <[email protected]> * Spotless on qa. Signed-off-by: conggguan <[email protected]> * Update change log for two-phase BWC test. Signed-off-by: conggguan <[email protected]> * Remove redundant lines of two-phase BWC test. Signed-off-by: conggguan <[email protected]> * Add changelog. Signed-off-by: conggguan <[email protected]> * Add the PR link and number for the CHANGELOG.md. Signed-off-by: conggguan <[email protected]> * [Fix] NeuralSparseTwoPhaseProcessorIT created wrong ingest pipeline, fix it to correct API. Signed-off-by: conggguan <[email protected]> --------- Signed-off-by: conggguan <[email protected]> Signed-off-by: conggguan <[email protected]> * Enable '.' for nested field in text embedding processor (#811) * Added nested structure for text embed processor mapping Signed-off-by: Martin Gaievski <[email protected]> * Fix linux build CI error due to action runner env upgrade node 20 (#821) * Fix linux build CI error due to action runner env upgrade node 20 Signed-off-by: Varun Jain <[email protected]> * Fix linux build on additional integ tests Signed-off-by: Varun Jain <[email protected]> --------- Signed-off-by: Varun Jain <[email protected]> --------- Signed-off-by: Tejas Shah <[email protected]> Signed-off-by: Liyun Xiu <[email protected]> Signed-off-by: conggguan <[email protected]> Signed-off-by: conggguan <[email protected]> Signed-off-by: Martin Gaievski <[email protected]> Signed-off-by: Varun Jain <[email protected]> Co-authored-by: Tejas Shah <[email protected]> Co-authored-by: Liyun Xiu <[email protected]> Co-authored-by: conggguan <[email protected]> Co-authored-by: Martin Gaievski <[email protected]> * Add changelog Signed-off-by: Varun Jain <[email protected]> --------- Signed-off-by: Martin Gaievski <[email protected]> Signed-off-by: Varun Jain <[email protected]> Signed-off-by: Tejas Shah <[email protected]> Signed-off-by: Liyun Xiu <[email protected]> Signed-off-by: conggguan <[email protected]> Signed-off-by: conggguan <[email protected]> Co-authored-by: Martin Gaievski <[email protected]> Co-authored-by: Tejas Shah <[email protected]> Co-authored-by: Liyun Xiu <[email protected]> Co-authored-by: conggguan <[email protected]> (cherry picked from commit d22e1b8)
vibrantvarun
added a commit
that referenced
this pull request
Jul 9, 2024
…827) (#829) * Fix jdk version for CI test secure cluster action (#801) (#806) Signed-off-by: Martin Gaievski <[email protected]> Co-authored-by: Martin Gaievski <[email protected]> * [Part 1] Collector for Sorting Results (#797) * [Part 2] Normalization Phase for Sorting (#802) * Normalization Phase for Sorting Signed-off-by: Varun Jain <[email protected]> * Fixing compile test issue Signed-off-by: Varun Jain <[email protected]> * Optimize code Signed-off-by: Varun Jain <[email protected]> * Add method description Signed-off-by: Varun Jain <[email protected]> * [Part 1] Collector for Sorting Results (#797) * HybridSearchSortUtil class Signed-off-by: Varun Jain <[email protected]> * Add Integ Tests Signed-off-by: Varun Jain <[email protected]> * Add Sorting Integ tests Signed-off-by: Varun Jain <[email protected]> * Add integ test for Sorting Signed-off-by: Varun Jain <[email protected]> * Refactoring normalization processor workflow Signed-off-by: Varun Jain <[email protected]> * Fix Unit Tests Signed-off-by: Varun Jain <[email protected]> * Refactoring Signed-off-by: Varun Jain <[email protected]> * Refactoring Signed-off-by: Varun Jain <[email protected]> * Address Martin Comments Signed-off-by: Varun Jain <[email protected]> * Optimising Normalization Signed-off-by: Varun Jain <[email protected]> * Address Martin Comments Signed-off-by: Varun Jain <[email protected]> * Address Martin Comments Signed-off-by: Varun Jain <[email protected]> * Addressing Martin Comments Signed-off-by: Varun Jain <[email protected]> * Addressing Vijay comments Signed-off-by: Varun Jain <[email protected]> * Address Vijay Comments Signed-off-by: Varun Jain <[email protected]> --------- Signed-off-by: Varun Jain <[email protected]> * Update bwc workflow to include 2.16.0-SNAPSHOT (#809) (#810) * Increment BWC version * Append 2.16.0-SNAPSHOTn in restart upgrade tests --------- Signed-off-by: Varun Jain <[email protected]> * [Part 3] Concurrent segment search bug in Sorting (#808) * Cherry picking Concurrent Segment Search Bug Commit Signed-off-by: Varun Jain <[email protected]> * Fix Concurrent Segment Search Bug in Sorting Signed-off-by: Varun Jain <[email protected]> * Functional Interface Signed-off-by: Varun Jain <[email protected]> * Addressing Martin Comments Signed-off-by: Varun Jain <[email protected]> * Removing comments Signed-off-by: Varun Jain <[email protected]> * Addressing Martin Comments Signed-off-by: Varun Jain <[email protected]> * Addressing Martin Comments Signed-off-by: Varun Jain <[email protected]> * Addressing Martin commnents Signed-off-by: Varun Jain <[email protected]> * Address Martin Comments Signed-off-by: Varun Jain <[email protected]> * Address Martin Comments Signed-off-by: Varun Jain <[email protected]> --------- Signed-off-by: Varun Jain <[email protected]> Co-authored-by: Martin Gaievski <[email protected]> * Rebasing with main (#826) * Adds method_parameters in neural search query to support ef_search (#787) (#814) Signed-off-by: Tejas Shah <[email protected]> * Add BWC for batch ingestion (#769) * Add BWC for batch ingestion Signed-off-by: Liyun Xiu <[email protected]> * Update Changelog Signed-off-by: Liyun Xiu <[email protected]> * Fix spotlessLicenseCheck Signed-off-by: Liyun Xiu <[email protected]> * Fix comments Signed-off-by: Liyun Xiu <[email protected]> * Reuse the same code Signed-off-by: Liyun Xiu <[email protected]> * Rename some functions Signed-off-by: Liyun Xiu <[email protected]> * Rename a function Signed-off-by: Liyun Xiu <[email protected]> * Minor change to trigger rebuild Signed-off-by: Liyun Xiu <[email protected]> --------- Signed-off-by: Liyun Xiu <[email protected]> * Neural sparse query two-phase search processor's bwc test (#777) * Poc of pipeline Signed-off-by: conggguan <[email protected]> * Complete some settings for two phase pipeline. Signed-off-by: conggguan <[email protected]> * Change the implement of two-phase from QueryBuilderVistor to custom process funciton. Signed-off-by: conggguan <[email protected]> * Add It and fix some bug on the state of multy same neuralsparsequerybuilder. Signed-off-by: conggguan <[email protected]> * Simplify some logic, and correct some format. Signed-off-by: conggguan <[email protected]> * Optimize some format. Signed-off-by: conggguan <[email protected]> * Add some test case. Signed-off-by: conggguan <[email protected]> * Optimize some logic for zhichao-aws's comments. Signed-off-by: conggguan <[email protected]> * Optimize a line without application. Signed-off-by: conggguan <[email protected]> * Add some comments, remove some redundant lines, fix some format. Signed-off-by: conggguan <[email protected]> * Remove a redundant null check, fix a if format. Signed-off-by: conggguan <[email protected]> * Fix a typo for a comment, camelcase format for some variable. Signed-off-by: conggguan <[email protected]> * Add some comments to illustrate the influence of the modify on 2-phase search pipeline to neural sparse query builder. Signed-off-by: conggguan <[email protected]> * Add restart and rolling upgrade bwc test for neural sparse two phase processor. Signed-off-by: conggguan <[email protected]> * Spotless on qa. Signed-off-by: conggguan <[email protected]> * Update change log for two-phase BWC test. Signed-off-by: conggguan <[email protected]> * Remove redundant lines of two-phase BWC test. Signed-off-by: conggguan <[email protected]> * Add changelog. Signed-off-by: conggguan <[email protected]> * Add the PR link and number for the CHANGELOG.md. Signed-off-by: conggguan <[email protected]> * [Fix] NeuralSparseTwoPhaseProcessorIT created wrong ingest pipeline, fix it to correct API. Signed-off-by: conggguan <[email protected]> --------- Signed-off-by: conggguan <[email protected]> Signed-off-by: conggguan <[email protected]> * Enable '.' for nested field in text embedding processor (#811) * Added nested structure for text embed processor mapping Signed-off-by: Martin Gaievski <[email protected]> * Fix linux build CI error due to action runner env upgrade node 20 (#821) * Fix linux build CI error due to action runner env upgrade node 20 Signed-off-by: Varun Jain <[email protected]> * Fix linux build on additional integ tests Signed-off-by: Varun Jain <[email protected]> --------- Signed-off-by: Varun Jain <[email protected]> --------- Signed-off-by: Tejas Shah <[email protected]> Signed-off-by: Liyun Xiu <[email protected]> Signed-off-by: conggguan <[email protected]> Signed-off-by: conggguan <[email protected]> Signed-off-by: Martin Gaievski <[email protected]> Signed-off-by: Varun Jain <[email protected]> Co-authored-by: Tejas Shah <[email protected]> Co-authored-by: Liyun Xiu <[email protected]> Co-authored-by: conggguan <[email protected]> Co-authored-by: Martin Gaievski <[email protected]> * Add changelog Signed-off-by: Varun Jain <[email protected]> --------- Signed-off-by: Martin Gaievski <[email protected]> Signed-off-by: Varun Jain <[email protected]> Signed-off-by: Tejas Shah <[email protected]> Signed-off-by: Liyun Xiu <[email protected]> Signed-off-by: conggguan <[email protected]> Signed-off-by: conggguan <[email protected]> Co-authored-by: Martin Gaievski <[email protected]> Co-authored-by: Tejas Shah <[email protected]> Co-authored-by: Liyun Xiu <[email protected]> Co-authored-by: conggguan <[email protected]> (cherry picked from commit d22e1b8) Co-authored-by: Varun Jain <[email protected]>
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
This PR contains code to enable sorting and search_after features in hybrid search. Moreover, this PR is a cherry-pick of below 3 merged and approved commits from feature branch.
#797
#802
#808
Issues Resolved
#507
#742
#741
#828
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.