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

Breaking change OpenSearch main project - Action movement #1958

Merged

Conversation

MitchellGale
Copy link
Contributor

Description

Breaking change by OpenSearch. New location for some functions, so libraries updated respectively.
opensearch-project/OpenSearch#9082

Issues Resolved

#1953

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.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
@codecov
Copy link

codecov bot commented Aug 11, 2023

Codecov Report

Merging #1958 (8b0f8df) into main (7d23e0f) will increase coverage by 0.00%.
Report is 3 commits behind head on main.
The diff coverage is n/a.

@@            Coverage Diff            @@
##               main    #1958   +/-   ##
=========================================
  Coverage     97.51%   97.51%           
  Complexity     4657     4657           
=========================================
  Files           408      408           
  Lines         11930    11933    +3     
  Branches        830      829    -1     
=========================================
+ Hits          11633    11637    +4     
+ Misses          290      289    -1     
  Partials          7        7           
Flag Coverage Δ
sql-engine 97.51% <ø> (+<0.01%) ⬆️

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

Files Changed Coverage Δ
...odel/transport/CreateDataSourceActionResponse.java 0.00% <ø> (ø)
...odel/transport/DeleteDataSourceActionResponse.java 0.00% <ø> (ø)
...s/model/transport/GetDataSourceActionResponse.java 0.00% <ø> (ø)
...odel/transport/UpdateDataSourceActionResponse.java 0.00% <ø> (ø)
...ql/datasources/rest/RestDataSourceQueryAction.java 0.00% <ø> (ø)
...s/storage/OpenSearchDataSourceMetadataStorage.java 98.75% <ø> (+<0.01%) ⬆️
...ces/transport/TransportCreateDataSourceAction.java 100.00% <ø> (ø)
...ces/transport/TransportDeleteDataSourceAction.java 100.00% <ø> (ø)
...ources/transport/TransportGetDataSourceAction.java 100.00% <ø> (ø)
...ces/transport/TransportUpdateDataSourceAction.java 100.00% <ø> (ø)
... and 1 more

... and 15 files with indirect coverage changes

@Yury-Fridlyand
Copy link
Collaborator

Why CI fails?

…earchDataSourceMetadataStorageTest.java

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
…CheckScriptContents QueryPlannerTest.java SparkResponseTest.java

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
@MitchellGale
Copy link
Contributor Author

Why CI fails?

Fixed now - was missing a few updates.

@GumpacG GumpacG merged commit 245c4f8 into opensearch-project:main Aug 14, 2023
MitchellGale added a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Aug 14, 2023
…-project#1958)

* fixing breaking change before ML fix.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* More fixes for core breaking change.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* spotless apply.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* Remove d L at end of actionGet int

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* Adding missed import updates for ElasticDefaultRestExecutor and OpenSearchDataSourceMetadataStorageTest.java

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* Adding missed import updates for SparkResponse.java

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* Adding missed import updates for BindingTupleQueryPlannerExecuteTest CheckScriptContents QueryPlannerTest.java SparkResponseTest.java

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

---------

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
@Yury-Fridlyand Yury-Fridlyand deleted the dev/fix_breakingChange_getAction branch August 15, 2023 17:51
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

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/sql/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/sql/backport-2.x
# Create a new branch
git switch --create backport/backport-1958-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 245c4f86bbc5b301051f0dcfc239458752267786
# Push it to GitHub
git push --set-upstream origin backport/backport-1958-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/sql/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-1958-to-2.x.

MitchellGale added a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Aug 15, 2023
…-project#1958)

* fixing breaking change before ML fix.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* More fixes for core breaking change.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* spotless apply.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* Remove d L at end of actionGet int

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* Adding missed import updates for ElasticDefaultRestExecutor and OpenSearchDataSourceMetadataStorageTest.java

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* Adding missed import updates for SparkResponse.java

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* Adding missed import updates for BindingTupleQueryPlannerExecuteTest CheckScriptContents QueryPlannerTest.java SparkResponseTest.java

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

---------

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

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/sql/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/sql/backport-2.x
# Create a new branch
git switch --create backport/backport-1958-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 245c4f86bbc5b301051f0dcfc239458752267786
# Push it to GitHub
git push --set-upstream origin backport/backport-1958-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/sql/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-1958-to-2.x.

Yury-Fridlyand pushed a commit that referenced this pull request Aug 15, 2023
)

* fixing breaking change before ML fix.



* More fixes for core breaking change.



* spotless apply.



* Remove d L at end of actionGet int



* Adding missed import updates for ElasticDefaultRestExecutor and OpenSearchDataSourceMetadataStorageTest.java



* Adding missed import updates for SparkResponse.java



* Adding missed import updates for BindingTupleQueryPlannerExecuteTest CheckScriptContents QueryPlannerTest.java SparkResponseTest.java



---------

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.

5 participants