Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 2.x] add hybrid search with rescore IT (#1066) #1073

Merged

Conversation

will-hwang
Copy link
Contributor

@will-hwang will-hwang commented Jan 8, 2025

Backport 97cf25c from #1066

@will-hwang will-hwang force-pushed the backport/backport-1066-to-2.x branch from 1c98376 to b3b1eb6 Compare January 8, 2025 19:43
@will-hwang will-hwang changed the title add hybrid search with rescore IT (#1066) [Backport 2.x] add hybrid search with rescore IT (#1066) Jan 8, 2025
@will-hwang will-hwang closed this Jan 8, 2025
@will-hwang will-hwang reopened this Jan 8, 2025
@will-hwang will-hwang closed this Jan 8, 2025
@will-hwang will-hwang reopened this Jan 8, 2025
@@ -65,58 +65,6 @@ task testAgainstOldCluster(type: StandaloneRestIntegTestTask) {
systemProperty 'tests.plugin_bwc_version', ext.neural_search_bwc_version
systemProperty 'tests.skip_delete_model_index', 'true'

//Excluding MultiModalSearchIT, HybridSearchIT, NeuralSparseSearchIT, NeuralQueryEnricherProcessorIT tests from neural search version 2.9 and 2.10
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we need all those checks in 2.x branch, don't remove them. 2.x rolling upgrade is running against all previous 2.x and latest 1.x

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

addressed in the newest commit

will-hwang and others added 4 commits January 8, 2025 14:35
* add hybrid search with rescore IT

Signed-off-by: will-hwang <[email protected]>

* remove rescore in hybrid search IT

Signed-off-by: will-hwang <[email protected]>

* remove previous version checks in build file

Signed-off-by: will-hwang <[email protected]>

* removing version checks only in rolling upgrade tests

Signed-off-by: will-hwang <[email protected]>

* remove newly added tests in restart test

Signed-off-by: will-hwang <[email protected]>

* Revert "remove newly added tests in restart test"

This reverts commit 0987831.

Signed-off-by: will-hwang <[email protected]>

---------

Signed-off-by: will-hwang <[email protected]>
(cherry picked from commit 97cf25c)
Signed-off-by: will-hwang <[email protected]>
@will-hwang will-hwang force-pushed the backport/backport-1066-to-2.x branch from 8359a1b to 94e1120 Compare January 8, 2025 22:35
@heemin32
Copy link
Collaborator

heemin32 commented Jan 8, 2025

Please update the PR description similar to other backport PRs.

@will-hwang will-hwang closed this Jan 9, 2025
@will-hwang will-hwang reopened this Jan 9, 2025
@heemin32 heemin32 merged commit 4ac75c8 into opensearch-project:2.x Jan 9, 2025
69 of 105 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants