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 EMR client to spark connector #1846

Merged
merged 1 commit into from
Jul 11, 2023

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport 392a720 from #1790

* Create Spark Connector

Signed-off-by: Vamsi Manohar <reddyvam@amazon.com>

* Add spark client and engine

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Remove vars

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Spark connector draft

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* nit

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Fix checkstyle errors

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* nit

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Fix license header

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Add spark storage test

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Update comments

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Fix checkstyle in comments

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Update tests

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Add emr client

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Set default values for flint args

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Validate emr auth type

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Add default constants for flint

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Update unit tests

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Address PR comments

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* tests draft

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Refactor class name

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Rename classes and update tests

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Update scan operator test

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Address PR comment

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Fix Connection pool shut down issue

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Update emr unit tests

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Update doc and tests

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* nit

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Update EMR clinet impl tests

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Address PR comments

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Make spark & flint jars configurable

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Address comments

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Add spark application id in logs

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* nit

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Delete result when not required

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

---------

Signed-off-by: Vamsi Manohar <reddyvam@amazon.com>
Signed-off-by: Rupal Mahajan <maharup@amazon.com>
Co-authored-by: Vamsi Manohar <reddyvam@amazon.com>
(cherry picked from commit 392a720)
@codecov
Copy link

codecov bot commented Jul 11, 2023

Codecov Report

Merging #1846 (0140e37) into 2.x (98ca9f8) will increase coverage by 0.04%.
The diff coverage is 99.55%.

@@             Coverage Diff              @@
##                2.x    #1846      +/-   ##
============================================
+ Coverage     97.39%   97.43%   +0.04%     
- Complexity     4522     4601      +79     
============================================
  Files           394      401       +7     
  Lines         11156    11378     +222     
  Branches        809      842      +33     
============================================
+ Hits          10865    11086     +221     
- Misses          284      285       +1     
  Partials          7        7              
Flag Coverage Δ
sql-engine 97.43% <99.55%> (+0.04%) ⬆️

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

Impacted Files Coverage Δ
...earch/sql/spark/data/constants/SparkConstants.java 0.00% <0.00%> (ø)
...org/opensearch/sql/spark/client/EmrClientImpl.java 100.00% <100.00%> (ø)
...esponse/DefaultSparkSqlFunctionResponseHandle.java 100.00% <100.00%> (ø)
...nctions/scan/SparkSqlFunctionTableScanBuilder.java 100.00% <100.00%> (ø)
...ctions/scan/SparkSqlFunctionTableScanOperator.java 100.00% <100.00%> (ø)
...a/org/opensearch/sql/spark/helper/FlintHelper.java 100.00% <100.00%> (ø)
...g/opensearch/sql/spark/response/SparkResponse.java 100.00% <100.00%> (ø)
...va/org/opensearch/sql/spark/storage/SparkScan.java 100.00% <100.00%> (ø)
...nsearch/sql/spark/storage/SparkStorageFactory.java 100.00% <100.00%> (ø)
...a/org/opensearch/sql/spark/storage/SparkTable.java 100.00% <100.00%> (ø)

@penghuo penghuo merged commit 50e611e into 2.x Jul 11, 2023
@github-actions github-actions bot deleted the backport/backport-1790-to-2.x branch July 11, 2023 18:03
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.

2 participants