-
Notifications
You must be signed in to change notification settings - Fork 72
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
Reworked feature flag usage for Hybrid search feature #246
Reworked feature flag usage for Hybrid search feature #246
Conversation
Signed-off-by: Martin Gaievski <[email protected]>
systemProperty('neural_search_hybrid_search_enabled', 'true') | ||
// search pipelines | ||
systemProperty('opensearch.experimental.feature.search_pipeline.enabled', 'true') | ||
systemProperty('plugins.ml_commons.hybrid_search_enabled', 'true') |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we need this to have hybrid search always enabled in testing, otherwise we need to set flag explicitly every time
/** | ||
* Abstracts combination of scores based on arithmetic mean method | ||
*/ | ||
@ToString(onlyExplicitlyIncluded = true) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
adding toString to have nicer info in the log, same for all other similar toString annotations
Codecov Report
@@ Coverage Diff @@
## main #246 +/- ##
============================================
+ Coverage 86.23% 86.29% +0.05%
- Complexity 337 340 +3
============================================
Files 28 29 +1
Lines 981 992 +11
Branches 153 153
============================================
+ Hits 846 856 +10
- Misses 69 70 +1
Partials 66 66
|
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-246-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 5819df61c6ce7d155463f8fcc0ffb4fd4ac3080d
# Push it to GitHub
git push --set-upstream origin backport/backport-246-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x Then, create a pull request where the |
Signed-off-by: Martin Gaievski <[email protected]> (cherry picked from commit 5819df6)
Signed-off-by: Martin Gaievski <[email protected]> (cherry picked from commit 5819df6)
Description
Reworked feature flag to a plugin setting. Previous approach is failing with below error when feature is set in opensearch.yml, which supposed to be the main way of enabling hybrid search for customers:
Added more logging statements for easier debugging.
Issues Resolved
#123
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.