-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
Add SearchExtBuilders to SearchResponse #9379
Conversation
…](opensearch-project#9328) Signed-off-by: Austin Lee <austin@aryn.ai>
Also, somewhat related to #6794. |
Compatibility status:Checks if related components are compatible with change 4871e25 Incompatible componentsIncompatible components: [https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/security-analytics.git] Skipped componentsCompatible componentsCompatible components: [https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/reporting.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/performance-analyzer.git, https://github.com/opensearch-project/opensearch-oci-object-storage.git, https://github.com/opensearch-project/performance-analyzer-rca.git] |
Gradle Check (Jenkins) Run Completed with:
|
Codecov Report
@@ Coverage Diff @@
## main #9379 +/- ##
============================================
+ Coverage 70.40% 70.77% +0.37%
- Complexity 56861 57177 +316
============================================
Files 4781 4782 +1
Lines 271231 271332 +101
Branches 39599 39614 +15
============================================
+ Hits 190947 192039 +1092
+ Misses 63974 62979 -995
- Partials 16310 16314 +4
|
server/src/main/java/org/opensearch/action/search/SearchResponse.java
Outdated
Show resolved
Hide resolved
…archExtBuilders. Signed-off-by: Austin Lee <austin@aryn.ai>
@austintlee I see a large number of failing tests that are not flaky, seems to be related to the change? Could you please take a look? |
@reta I started to go through the failing ones. I am not able to repro (the first two I picked both passed locally). I do have one issue with running the BWC tests as they require a dependency that is not available for my Mac machine (darwin-arm64). I will need to find a Linux box to repro.
|
Let me help you out |
This one passed locally:
Not sure if this is known to be flaky. If there is a list of known flaky tests, I can also cross check. |
This one passed as well:
|
I am going to try the instructions given in opensearch-project/k-NN#580 to build that missing dependency locally. |
@austintlee please rebase with |
Does "Sync fork" on Github accomplish the same? |
I don't think so, you will sync |
Gradle Check (Jenkins) Run Completed with:
|
Down to one failure and this one does fail consistently locally as well.
|
It passes in my IDE (Intellij)... |
Gradle Check (Jenkins) Run Completed with:
|
Compatibility status:Checks if related components are compatible with change 8c88507 Incompatible componentsIncompatible components: [https://github.com/opensearch-project/cross-cluster-replication.git] Skipped componentsCompatible componentsCompatible components: [https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/reporting.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/performance-analyzer.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/performance-analyzer-rca.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/opensearch-oci-object-storage.git] |
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-9379-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 60787b869cb800eab53417e87a6399ed680de060
# Push it to GitHub
git push --set-upstream origin backport/backport-9379-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.x Then, create a pull request where the |
@austintlee could you please send manual backport to |
I'm on it! |
* Add SearchExtBuilders to SearchResponse. [Issue opensearch-project#9328](opensearch-project#9328) Signed-off-by: Austin Lee <austin@aryn.ai> * Keep SearchResponse immutable, add a constructor to take a List of SearchExtBuilders. Signed-off-by: Austin Lee <austin@aryn.ai> * Fix spotlessJavaCheck findings. Signed-off-by: Austin Lee <austin@aryn.ai> * Move SearchExtBuilders into SearchResponseSections, fix indenting in SearchRequest. Signed-off-by: Austin Lee <austin@aryn.ai> * Updated changelog (mixed minor formatting issues), added version checks on serialization/deserialization, added a Builder for making copies of SearchResponse easier. Signed-off-by: Austin Lee <austin@aryn.ai> * Add GenericSearchExtBuilder as a catch-all for SearchExtBuilders not registered in xcontent registry. Signed-off-by: Austin Lee <austin@aryn.ai> * Simplify GenericSearchExtBuilder using a single Object member. Signed-off-by: Austin Lee <austin@aryn.ai> * Address additional review comments. Signed-off-by: Austin Lee <austin@aryn.ai> * Add Javadocs. Signed-off-by: Austin Lee <austin@aryn.ai> --------- Signed-off-by: Austin Lee <austin@aryn.ai> (cherry picked from commit 60787b8)
* Add SearchExtBuilders to SearchResponse. Signed-off-by: Austin Lee <austin@aryn.ai> * Add SearchExtBuilders to SearchResponse (#9379) * Add SearchExtBuilders to SearchResponse. [Issue #9328](#9328) Signed-off-by: Austin Lee <austin@aryn.ai> * Keep SearchResponse immutable, add a constructor to take a List of SearchExtBuilders. Signed-off-by: Austin Lee <austin@aryn.ai> * Fix spotlessJavaCheck findings. Signed-off-by: Austin Lee <austin@aryn.ai> * Move SearchExtBuilders into SearchResponseSections, fix indenting in SearchRequest. Signed-off-by: Austin Lee <austin@aryn.ai> * Updated changelog (mixed minor formatting issues), added version checks on serialization/deserialization, added a Builder for making copies of SearchResponse easier. Signed-off-by: Austin Lee <austin@aryn.ai> * Add GenericSearchExtBuilder as a catch-all for SearchExtBuilders not registered in xcontent registry. Signed-off-by: Austin Lee <austin@aryn.ai> * Simplify GenericSearchExtBuilder using a single Object member. Signed-off-by: Austin Lee <austin@aryn.ai> * Address additional review comments. Signed-off-by: Austin Lee <austin@aryn.ai> * Add Javadocs. Signed-off-by: Austin Lee <austin@aryn.ai> --------- Signed-off-by: Austin Lee <austin@aryn.ai> (cherry picked from commit 60787b8) * Update SearchExtBuilder support version check to work on 2.x line. Signed-off-by: Austin Lee <austin@aryn.ai> --------- Signed-off-by: Austin Lee <austin@aryn.ai> Signed-off-by: Andriy Redko <andriy.redko@aiven.io> Co-authored-by: Andriy Redko <andriy.redko@aiven.io>
* Add SearchExtBuilders to SearchResponse. [Issue opensearch-project#9328](opensearch-project#9328) Signed-off-by: Austin Lee <austin@aryn.ai> * Keep SearchResponse immutable, add a constructor to take a List of SearchExtBuilders. Signed-off-by: Austin Lee <austin@aryn.ai> * Fix spotlessJavaCheck findings. Signed-off-by: Austin Lee <austin@aryn.ai> * Move SearchExtBuilders into SearchResponseSections, fix indenting in SearchRequest. Signed-off-by: Austin Lee <austin@aryn.ai> * Updated changelog (mixed minor formatting issues), added version checks on serialization/deserialization, added a Builder for making copies of SearchResponse easier. Signed-off-by: Austin Lee <austin@aryn.ai> * Add GenericSearchExtBuilder as a catch-all for SearchExtBuilders not registered in xcontent registry. Signed-off-by: Austin Lee <austin@aryn.ai> * Simplify GenericSearchExtBuilder using a single Object member. Signed-off-by: Austin Lee <austin@aryn.ai> * Address additional review comments. Signed-off-by: Austin Lee <austin@aryn.ai> * Add Javadocs. Signed-off-by: Austin Lee <austin@aryn.ai> --------- Signed-off-by: Austin Lee <austin@aryn.ai> Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>
* Add SearchExtBuilders to SearchResponse. [Issue opensearch-project#9328](opensearch-project#9328) Signed-off-by: Austin Lee <austin@aryn.ai> * Keep SearchResponse immutable, add a constructor to take a List of SearchExtBuilders. Signed-off-by: Austin Lee <austin@aryn.ai> * Fix spotlessJavaCheck findings. Signed-off-by: Austin Lee <austin@aryn.ai> * Move SearchExtBuilders into SearchResponseSections, fix indenting in SearchRequest. Signed-off-by: Austin Lee <austin@aryn.ai> * Updated changelog (mixed minor formatting issues), added version checks on serialization/deserialization, added a Builder for making copies of SearchResponse easier. Signed-off-by: Austin Lee <austin@aryn.ai> * Add GenericSearchExtBuilder as a catch-all for SearchExtBuilders not registered in xcontent registry. Signed-off-by: Austin Lee <austin@aryn.ai> * Simplify GenericSearchExtBuilder using a single Object member. Signed-off-by: Austin Lee <austin@aryn.ai> * Address additional review comments. Signed-off-by: Austin Lee <austin@aryn.ai> * Add Javadocs. Signed-off-by: Austin Lee <austin@aryn.ai> --------- Signed-off-by: Austin Lee <austin@aryn.ai> Signed-off-by: Ivan Brusic <ivan.brusic@flocksafety.com>
* Add SearchExtBuilders to SearchResponse. [Issue opensearch-project#9328](opensearch-project#9328) Signed-off-by: Austin Lee <austin@aryn.ai> * Keep SearchResponse immutable, add a constructor to take a List of SearchExtBuilders. Signed-off-by: Austin Lee <austin@aryn.ai> * Fix spotlessJavaCheck findings. Signed-off-by: Austin Lee <austin@aryn.ai> * Move SearchExtBuilders into SearchResponseSections, fix indenting in SearchRequest. Signed-off-by: Austin Lee <austin@aryn.ai> * Updated changelog (mixed minor formatting issues), added version checks on serialization/deserialization, added a Builder for making copies of SearchResponse easier. Signed-off-by: Austin Lee <austin@aryn.ai> * Add GenericSearchExtBuilder as a catch-all for SearchExtBuilders not registered in xcontent registry. Signed-off-by: Austin Lee <austin@aryn.ai> * Simplify GenericSearchExtBuilder using a single Object member. Signed-off-by: Austin Lee <austin@aryn.ai> * Address additional review comments. Signed-off-by: Austin Lee <austin@aryn.ai> * Add Javadocs. Signed-off-by: Austin Lee <austin@aryn.ai> --------- Signed-off-by: Austin Lee <austin@aryn.ai> Signed-off-by: Shivansh Arora <hishiv@amazon.com>
Description
Adds support for SearchExtBuilders to SearchResponse so that search processors can include "ext" sections in the response with information specific to individual processors.
Related Issues
#9328
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.