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 SearchExtBuilders to SearchResponse #9625

Merged
merged 5 commits into from
Aug 30, 2023

Conversation

austintlee
Copy link
Contributor

Description

Backport #9379 to 2.x

Related Issues

Resolves #[Issue number to be closed when this PR is merged]

Check List

  • [x ] New functionality includes testing.
    • [x ] All tests pass
  • [x ] New functionality has been documented.
    • [x ] New functionality has javadoc added
  • [x ] Commits are signed per the DCO using --signoff
  • [x ] Commit changes are listed out in CHANGELOG.md file (See: Changelog)

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.

austintlee and others added 4 commits August 15, 2023 12:47
Signed-off-by: Austin Lee <austin@aryn.ai>
* 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)
@github-actions
Copy link
Contributor

Compatibility status:

Checks if related components are compatible with change 025cee9

Incompatible components

Incompatible components: [https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/performance-analyzer.git]

Skipped components

Compatible components

Compatible 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/anomaly-detection.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/reporting.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/performance-analyzer-rca.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/security-analytics.git]

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.cluster.allocation.AwarenessAllocationIT.testThreeZoneOneReplicaWithForceZoneValueAndLoadAwareness

@codecov
Copy link

codecov bot commented Aug 29, 2023

Codecov Report

Merging #9625 (adb3e01) into 2.x (945c4b5) will increase coverage by 0.10%.
The diff coverage is 78.50%.

@@             Coverage Diff              @@
##                2.x    #9625      +/-   ##
============================================
+ Coverage     70.74%   70.84%   +0.10%     
- Complexity    57629    57757     +128     
============================================
  Files          4769     4770       +1     
  Lines        272600   272705     +105     
  Branches      40132    40147      +15     
============================================
+ Hits         192853   193206     +353     
+ Misses        63281    63021     -260     
- Partials      16466    16478      +12     
Files Changed Coverage Δ
...a/org/opensearch/action/search/SearchResponse.java 88.42% <70.00%> (-1.21%) ⬇️
...org/opensearch/search/GenericSearchExtBuilder.java 73.84% <73.84%> (ø)
...ensearch/action/search/SearchResponseSections.java 97.43% <100.00%> (+1.13%) ⬆️
...search/search/internal/InternalSearchResponse.java 100.00% <100.00%> (ø)

... and 459 files with indirect coverage changes

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
@github-actions
Copy link
Contributor

Compatibility status:

Checks if related components are compatible with change adb3e01

Incompatible components

Incompatible components: [https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/performance-analyzer.git]

Skipped components

Compatible components

Compatible components: [https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/security-analytics.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/k-nn.git, https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/reporting.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/performance-analyzer-rca.git]

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.action.admin.cluster.node.tasks.ResourceAwareTasksTests.testTaskResourceTrackingDuringTaskCancellation

@kotwanikunal kotwanikunal changed the title Backport/backport 9379 to 2.x [Backport 2.x] Add SearchExtBuilders to SearchResponse Aug 30, 2023
@reta reta merged commit 12299c6 into opensearch-project:2.x Aug 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants