Skip to content

(#1536) Refactor OpenSearchQueryRequest and move includes to builder#1937

Merged
Yury-Fridlyand merged 4 commits into
opensearch-project:mainfrom
Bit-Quill:integ-refactor-OpenSearchQueryRequest-includes-1536
Aug 9, 2023
Merged

(#1536) Refactor OpenSearchQueryRequest and move includes to builder#1937
Yury-Fridlyand merged 4 commits into
opensearch-project:mainfrom
Bit-Quill:integ-refactor-OpenSearchQueryRequest-includes-1536

Conversation

@acarbonetto
Copy link
Copy Markdown
Collaborator

@acarbonetto acarbonetto commented Aug 4, 2023

Description

Refactor OpenSearchScrollRequest and OpenSearchQueryRequest to check for includes list in the OpenSearchRequestBuilder so that the logic to create the list is consolidated.

Issues Resolved

Fixes #1536

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc added
  • Commits are signed per the DCO using --signoff

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.

…ludes to builder (#320)

* opensearch-project#1536: Refactor OpenSearchQueryRequest and move incldues to builder

Signed-off-by: acarbonetto <andrewc@bitquilltech.com>

* opensearch-project#1536: Checkstyle fixes

Signed-off-by: acarbonetto <andrewc@bitquilltech.com>

* opensearch-project#1536: Checkstyle fixes

Signed-off-by: acarbonetto <andrewc@bitquilltech.com>

---------

Signed-off-by: acarbonetto <andrewc@bitquilltech.com>
@acarbonetto acarbonetto force-pushed the integ-refactor-OpenSearchQueryRequest-includes-1536 branch from 41944d4 to 33d0991 Compare August 4, 2023 20:31
@codecov
Copy link
Copy Markdown

codecov Bot commented Aug 4, 2023

Codecov Report

Merging #1937 (3411e3e) into main (88f36bd) will not change coverage.
The diff coverage is 100.00%.

@@            Coverage Diff            @@
##               main    #1937   +/-   ##
=========================================
  Coverage     97.42%   97.42%           
+ Complexity     4647     4646    -1     
=========================================
  Files           408      408           
  Lines         11526    11526           
  Branches        839      837    -2     
=========================================
  Hits          11229    11229           
  Misses          290      290           
  Partials          7        7           
Flag Coverage Δ
sql-engine 97.42% <100.00%> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Changed Coverage Δ
...arch/sql/opensearch/request/OpenSearchRequest.java 100.00% <ø> (ø)
...sql/opensearch/request/OpenSearchQueryRequest.java 100.00% <100.00%> (ø)
...l/opensearch/request/OpenSearchRequestBuilder.java 100.00% <100.00%> (ø)
...ql/opensearch/request/OpenSearchScrollRequest.java 100.00% <100.00%> (ø)

Yury-Fridlyand
Yury-Fridlyand previously approved these changes Aug 5, 2023
@MitchellGale
Copy link
Copy Markdown
Contributor

Please run spotless apply.

MaxKsyunz
MaxKsyunz previously approved these changes Aug 9, 2023
@MaxKsyunz MaxKsyunz self-requested a review August 9, 2023 06:25
Copy link
Copy Markdown
Collaborator

@MaxKsyunz MaxKsyunz left a comment

Choose a reason for hiding this comment

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

Could looks good but CI is failing -- spotless check is failing.

…SearchQueryRequest-includes-1536

Signed-off-by: acarbonetto <andrewc@bitquilltech.com>
Signed-off-by: acarbonetto <andrewc@bitquilltech.com>
@acarbonetto acarbonetto dismissed stale reviews from MaxKsyunz and Yury-Fridlyand via b39824b August 9, 2023 15:56
…SearchQueryRequest-includes-1536

Signed-off-by: acarbonetto <andrewc@bitquilltech.com>
@Yury-Fridlyand Yury-Fridlyand merged commit 7d23e0f into opensearch-project:main Aug 9, 2023
@Yury-Fridlyand Yury-Fridlyand deleted the integ-refactor-OpenSearchQueryRequest-includes-1536 branch August 9, 2023 22:09
opensearch-trigger-bot Bot pushed a commit that referenced this pull request Aug 9, 2023
…1937)

* #1536: Refactor OpenSearchQueryRequest and move includes to builder (#320)

* #1536: Refactor OpenSearchQueryRequest and move incldues to builder

Signed-off-by: acarbonetto <andrewc@bitquilltech.com>

* #1536: Checkstyle fixes

Signed-off-by: acarbonetto <andrewc@bitquilltech.com>

* #1536: Checkstyle fixes

Signed-off-by: acarbonetto <andrewc@bitquilltech.com>

---------

Signed-off-by: acarbonetto <andrewc@bitquilltech.com>

* #1536: Spotless Apply

Signed-off-by: acarbonetto <andrewc@bitquilltech.com>

---------

Signed-off-by: acarbonetto <andrewc@bitquilltech.com>
(cherry picked from commit 7d23e0f)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
GumpacG pushed a commit that referenced this pull request Aug 10, 2023
…1937) (#1948)

* #1536: Refactor OpenSearchQueryRequest and move includes to builder (#320)

* #1536: Refactor OpenSearchQueryRequest and move incldues to builder



* #1536: Checkstyle fixes



* #1536: Checkstyle fixes



---------



* #1536: Spotless Apply



---------


(cherry picked from commit 7d23e0f)

Signed-off-by: acarbonetto <andrewc@bitquilltech.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
MitchellGale pushed a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Aug 14, 2023
…cludes to builder (opensearch-project#1937)

* opensearch-project#1536: Refactor OpenSearchQueryRequest and move includes to builder (#320)

* opensearch-project#1536: Refactor OpenSearchQueryRequest and move incldues to builder

Signed-off-by: acarbonetto <andrewc@bitquilltech.com>

* opensearch-project#1536: Checkstyle fixes

Signed-off-by: acarbonetto <andrewc@bitquilltech.com>

* opensearch-project#1536: Checkstyle fixes

Signed-off-by: acarbonetto <andrewc@bitquilltech.com>

---------

Signed-off-by: acarbonetto <andrewc@bitquilltech.com>

* opensearch-project#1536: Spotless Apply

Signed-off-by: acarbonetto <andrewc@bitquilltech.com>

---------

Signed-off-by: acarbonetto <andrewc@bitquilltech.com>
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
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.

[Enhancement] Refactor OpenSearchQueryRequest and OpenSearchScrollRequest so that we pass in includes list from query

6 participants