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.

Sign up for GitHub

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

Jump to bottom

[Backport 2.11] Implement patch API for datasources #2329

Merged
merged 1 commit into from
Oct 19, 2023
Merged

[Backport 2.11] Implement patch API for datasources #2329

merged 1 commit into from
Oct 19, 2023

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport f835112 from #2273.

@github-actions
Implement patch API for datasources (#2273)
70ecae8 
* Implement patch API for datasources

Signed-off-by: Derek Ho <[email protected]>

* Change patch implementation to Map

Signed-off-by: Derek Ho <[email protected]>

* Fix up, everything complete except unit test

Signed-off-by: Derek Ho <[email protected]>

* Revise PR to use existing functions

Signed-off-by: Derek Ho <[email protected]>

* Remove unused utility function

Signed-off-by: Derek Ho <[email protected]>

* Add tests

Signed-off-by: Derek Ho <[email protected]>

* Add back line

Signed-off-by: Derek Ho <[email protected]>

* fix build issue

Signed-off-by: Derek Ho <[email protected]>

* Fix tests and add in rst

Signed-off-by: Derek Ho <[email protected]>

* Register patch

Signed-off-by: Derek Ho <[email protected]>

* Add imports

Signed-off-by: Derek Ho <[email protected]>

* Patch

Signed-off-by: Derek Ho <[email protected]>

* Fix integration test

Signed-off-by: Derek Ho <[email protected]>

* Update IT

Signed-off-by: Derek Ho <[email protected]>

* Add tests

Signed-off-by: Derek Ho <[email protected]>

* Fix test

Signed-off-by: Derek Ho <[email protected]>

* Fix tests and increase code cov

Signed-off-by: Derek Ho <[email protected]>

* Add more coverage to impl

Signed-off-by: Derek Ho <[email protected]>

* Fix test and jacoco passing

Signed-off-by: Derek Ho <[email protected]>

* Test fix

Signed-off-by: Derek Ho <[email protected]>

* Add docs

Signed-off-by: Derek Ho <[email protected]>

---------

Signed-off-by: Derek Ho <[email protected]>
(cherry picked from commit f835112)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@codecov
Copy link

codecov bot commented Oct 18, 2023 •
edited
Loading

Codecov Report

Merging #2329 (70ecae8) into 2.11 (3d1a376) will decrease coverage by 0.19%.
The diff coverage is 72.81%.

@@             Coverage Diff              @@
##               2.11    #2329      +/-   ##
============================================
- Coverage     96.73%   96.55%   -0.19%     
- Complexity     4876     4899      +23     
============================================
  Files           455      458       +3     
  Lines         13370    13473     +103     
  Branches        899      906       +7     
============================================
+ Hits          12934    13009      +75     
- Misses          422      449      +27     
- Partials         14       15       +1
Flag Coverage Δ
sql-engine 96.55% <72.81%> (-0.19%) ⬇️

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

Files Coverage Δ
...sql/datasources/service/DataSourceServiceImpl.java 100.00% <100.00%> (ø)
...rces/transport/TransportPatchDataSourceAction.java 100.00% <100.00%> (ø)
...rch/sql/datasources/utils/XContentParserUtils.java 98.90% <97.50%> (-1.10%) ⬇️
...model/transport/PatchDataSourceActionResponse.java 0.00% <0.00%> (ø)
.../model/transport/PatchDataSourceActionRequest.java 21.42% <21.42%> (ø)
...ql/datasources/rest/RestDataSourceQueryAction.java 0.00% <0.00%> (ø)

@vmmusings vmmusings merged commit 4c151fe into 2.11 Oct 19, 2023
32 of 34 checks passed
@github-actions github-actions bot deleted the backport/backport-2273-to-2.11 branch October 19, 2023 00:15
mengweieric added a commit to mengweieric/sql that referenced this pull request Nov 8, 2023
@mengweieric
Revert "Implement patch API for datasources (opensearch-project#2273) (…
55409eb 
…opensearch-project#2329)"

This reverts commit 4c151fe.

Signed-off-by: Eric <[email protected]>
mengweieric added a commit to mengweieric/sql that referenced this pull request Nov 8, 2023
@mengweieric
Revert "Implement patch API for datasources (opensearch-project#2273) (…
8420495 
…opensearch-project#2329)"

This reverts commit 4c151fe.

Signed-off-by: Eric <[email protected]>
vmmusings added a commit to mengweieric/sql that referenced this pull request Nov 13, 2023
@vmmusings
Revert "Implement patch API for datasources (opensearch-project#2273) (…
ab12221 
…opensearch-project#2329)"

This reverts commit 4c151fe.
vmmusings added a commit that referenced this pull request Nov 13, 2023
@mengweieric @vmmusings
Revert commits back to after 2.11 release (#2427)
62d3940 
* Revert "Add more metrics and handle emr exception message (#2422) (#2426)"

This reverts commit b57f7cc.

* Revert "Block settings in sql query settings API and add more unit tests (#2407) (#2412)"

This reverts commit 3024737.

* Revert "Added session, statement, emrjob metrics to sql stats api (#2398) (#2400)"

This reverts commit 6e17ae6.

* Revert "Redefine Drop Index as logical delete (#2386) (#2397)"

This reverts commit e939bb6.

* Revert "add concurrent limit on datasource and sessions (#2390) (#2395)"

This reverts commit deb3ccf.

* Revert "Add Flint Index Purging Logic (#2372) (#2389)"

This reverts commit dd48b9b.

* Revert "Refactoring for tags usage in test files and also added explicit denly list setting. (#2383) (#2385)"

This reverts commit 37e010f.

* Revert "Enable session by default (#2373) (#2375)"

This reverts commit 7d95e4c.

* Revert "Create new session if client provided session is invalid (#2368) (#2371)"

This reverts commit 5ab7858.

* Revert "Add where clause support in create statement (#2366) (#2370)"

This reverts commit b620a56.

* Revert "create new session if current session not ready (#2363) (#2365)"

This reverts commit 5d07281.

* Revert "Handle Describe,Refresh and Show Queries Properly (#2357) (#2362)"

This reverts commit 16e2f30.

* Revert "Add Session limitation (#2354) (#2359)"

This reverts commit 0f334f8.

* Revert "Bug Fix, support cancel query in running state (#2351) (#2353)"

This reverts commit 9a40591.

* Revert "Fix bug, using basic instead of basicauth (#2342) (#2355)"

This reverts commit e4827a5.

* Revert "Add missing tags and MV support (#2336) (#2346)"

This reverts commit 8791bb0.

* Revert "[Backport 2.x] deprecated job-metadata-index (#2340) (#2343)"

This reverts commit bea432c.

* Revert "Integration with REPL Spark job (#2327) (#2338)"

This reverts commit 58a5ae5.

* Revert "Implement patch API for datasources (#2273) (#2329)"

This reverts commit 4c151fe.

* Revert "Add sessionId parameters for create async query API (#2312) (#2324)"

This reverts commit 3d1a376.

* Revert "Add Statement (#2294) (#2318) (#2319)"

This reverts commit b3c2e94.

* Revert "Upgrade json (#2307) (#2314)"

This reverts commit 6c65bb4.

* Revert "Minor Refactoring (#2308) (#2317)"

This reverts commit 051cc4f.

* Revert "add InteractiveSession and SessionManager (#2290) (#2293) (#2315)"

This reverts commit 6ac197b.

---------

Co-authored-by: Vamsi Manohar <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vmmusings vmmusings vmmusings approved these changes

@ps48 ps48 ps48 approved these changes

@pjfitzgibbons pjfitzgibbons Awaiting requested review from pjfitzgibbons

@kavithacm kavithacm Awaiting requested review from kavithacm kavithacm is a code owner

@derek-ho derek-ho Awaiting requested review from derek-ho derek-ho is a code owner

@joshuali925 joshuali925 Awaiting requested review from joshuali925 joshuali925 is a code owner

@dai-chen dai-chen Awaiting requested review from dai-chen dai-chen is a code owner

@YANG-DB YANG-DB Awaiting requested review from YANG-DB YANG-DB is a code owner

@rupal-bq rupal-bq Awaiting requested review from rupal-bq

@mengweieric mengweieric Awaiting requested review from mengweieric mengweieric is a code owner

@Swiddis Swiddis Awaiting requested review from Swiddis Swiddis is a code owner

@penghuo penghuo Awaiting requested review from penghuo penghuo is a code owner

@seankao-az seankao-az Awaiting requested review from seankao-az seankao-az is a code owner

@MaxKsyunz MaxKsyunz Awaiting requested review from MaxKsyunz MaxKsyunz is a code owner

@Yury-Fridlyand Yury-Fridlyand Awaiting requested review from Yury-Fridlyand Yury-Fridlyand is a code owner

@anirudha anirudha Awaiting requested review from anirudha anirudha is a code owner

@forestmvey forestmvey Awaiting requested review from forestmvey forestmvey is a code owner

@acarbonetto acarbonetto Awaiting requested review from acarbonetto acarbonetto is a code owner

@GumpacG GumpacG Awaiting requested review from GumpacG GumpacG is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ps48 @vmmusings