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

Add tags to the emr jobs created based on the query. #2150

Merged

Conversation

vmmusings
Copy link
Member

@vmmusings vmmusings commented Sep 26, 2023

Description

  • Added support to extract indexName, tableName and datasourceName in Async Queries.
  • Added tags to emr jobs submitted and changed jobName as per the query.
  • Added datasource Authorization.
  • Removed hardcoded my_glue datasource from earlier queries.
  • Throwing unsupported exceptions in case of queries with no datasource and also for Async Requests with PPL Language and other datasource connectors.

Issues Resolved

[List any issues this PR will resolve]

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.

@vmmusings vmmusings self-assigned this Sep 26, 2023
@vmmusings vmmusings added the enhancement New feature or request label Sep 26, 2023
@codecov
Copy link

codecov bot commented Sep 26, 2023

Codecov Report

Merging #2150 (cb0ad4e) into feature/job-apis (be82714) will decrease coverage by 0.03%.
The diff coverage is 92.85%.

@@                  Coverage Diff                   @@
##             feature/job-apis    #2150      +/-   ##
======================================================
- Coverage               96.59%   96.56%   -0.03%     
- Complexity               4700     4717      +17     
======================================================
  Files                     433      436       +3     
  Lines                   12405    12535     +130     
  Branches                  844      858      +14     
======================================================
+ Hits                    11983    12105     +122     
- Misses                    413      420       +7     
- Partials                    9       10       +1     
Flag Coverage Δ
sql-engine 96.56% <92.85%> (-0.03%) ⬇️

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

Files Coverage Δ
...park/asyncquery/AsyncQueryExecutorServiceImpl.java 100.00% <100.00%> (ø)
...h/sql/spark/client/EmrServerlessClientImplEMR.java 100.00% <100.00%> (ø)
...rch/sql/spark/dispatcher/SparkQueryDispatcher.java 100.00% <100.00%> (ø)
.../org/opensearch/sql/spark/utils/SQLQueryUtils.java 100.00% <100.00%> (ø)
...park/dispatcher/model/FullyQualifiedTableName.java 92.30% <92.30%> (ø)
.../sql/spark/rest/model/CreateAsyncQueryRequest.java 0.00% <0.00%> (ø)
.../org/opensearch/sql/spark/rest/model/LangType.java 54.54% <54.54%> (ø)

@vmmusings vmmusings force-pushed the feature/job-apis branch 3 times, most recently from 542da7d to 075c9d3 Compare September 26, 2023 03:20
@vmmusings vmmusings marked this pull request as ready for review September 26, 2023 03:20
@vmmusings vmmusings force-pushed the feature/job-apis branch 2 times, most recently from 03ab1e6 to cf661a8 Compare September 26, 2023 06:26
@vmmusings vmmusings changed the title Add tags to the emr jobs based on the query. Add tags to the emr jobs created based on the query. Sep 26, 2023
@vmmusings vmmusings force-pushed the feature/job-apis branch 2 times, most recently from 6f6d125 to d281e07 Compare September 27, 2023 00:34
@penghuo penghuo added Flint v2.11.0 Issues targeting release v2.11.0 labels Sep 27, 2023
@dai-chen
Copy link
Collaborator

Could you add missing Javadoc for new main interface?

@vmmusings
Copy link
Member Author

Could you add missing Javadoc for new main interface?

Addressed.

@vmmusings vmmusings merged commit e3c4ee6 into opensearch-project:feature/job-apis Sep 27, 2023
15 of 19 checks passed
vmmusings added a commit that referenced this pull request Sep 27, 2023
* Glue datasource support (#2055)

Signed-off-by: Vamsi Manohar <[email protected]>

* Initial commit of new job APIs (#2050)

Signed-off-by: Vamsi Manohar <[email protected]>

* Create Job API (#2070)

* Create Job API

Signed-off-by: Vamsi Manohar <[email protected]>

* Refactor to Async Query API

Signed-off-by: Vamsi Manohar <[email protected]>

---------

Signed-off-by: Vamsi Manohar <[email protected]>

* Cancel Job API (#2126)

Signed-off-by: Vamsi Manohar <[email protected]>

* Add tags to the emr jobs based on the query types (#2150)

Signed-off-by: Vamsi Manohar <[email protected]>

---------

Signed-off-by: Vamsi Manohar <[email protected]>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Sep 27, 2023
* Glue datasource support (#2055)

Signed-off-by: Vamsi Manohar <[email protected]>

* Initial commit of new job APIs (#2050)

Signed-off-by: Vamsi Manohar <[email protected]>

* Create Job API (#2070)

* Create Job API

Signed-off-by: Vamsi Manohar <[email protected]>

* Refactor to Async Query API

Signed-off-by: Vamsi Manohar <[email protected]>

---------

Signed-off-by: Vamsi Manohar <[email protected]>

* Cancel Job API (#2126)

Signed-off-by: Vamsi Manohar <[email protected]>

* Add tags to the emr jobs based on the query types (#2150)

Signed-off-by: Vamsi Manohar <[email protected]>

---------

Signed-off-by: Vamsi Manohar <[email protected]>
(cherry picked from commit ae10857)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
vmmusings pushed a commit that referenced this pull request Sep 27, 2023
* Glue datasource support (#2055)



* Initial commit of new job APIs (#2050)



* Create Job API (#2070)

* Create Job API



* Refactor to Async Query API



---------



* Cancel Job API (#2126)



* Add tags to the emr jobs based on the query types (#2150)



---------


(cherry picked from commit ae10857)

Signed-off-by: Vamsi Manohar <[email protected]>
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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request Flint v2.11.0 Issues targeting release v2.11.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants