Skip to content

Conversation

@ruanwenjun
Copy link
Member

@ruanwenjun ruanwenjun commented Jul 24, 2023

Purpose of the pull request

At before discuss, we are plan to remove datasource pool in SQL task.

This PR will introduce AdHocDataSourceClient, which will not use connection pool, and keep the PooledDataSourceClient which might be useful in some query task.

Brief change log

  • Add AdHocDataSourceClient as the default datasource client.
  • Rename old CommonDatasourceClient to BasePooledDataSourceClient

Verify this pull request

This pull request is code cleanup without any test coverage.

(or)

This pull request is already covered by existing tests, such as (please describe tests).

(or)

This change added tests and can be verified as follows:

(or)

If your pull request contain incompatible change, you should also add it to docs/docs/en/guide/upgrede/incompatible.md

@ruanwenjun ruanwenjun added 3.2.0 for 3.2.0 version improvement make more easy to user or prompt friendly labels Jul 24, 2023
@ruanwenjun ruanwenjun added this to the 3.1.8 milestone Jul 24, 2023
@ruanwenjun ruanwenjun added the 3.1.x for 3.1.x version label Jul 24, 2023
@mergeable mergeable bot removed improvement make more easy to user or prompt friendly 3.1.x for 3.1.x version 3.2.0 for 3.2.0 version labels Jul 24, 2023
@ruanwenjun ruanwenjun force-pushed the dev_wenjun_suportIpv6 branch 8 times, most recently from b732318 to 9b0250d Compare July 25, 2023 01:31
@codecov-commenter
Copy link

codecov-commenter commented Jul 25, 2023

Codecov Report

Merging #14631 (6baa99a) into dev (4a80e3a) will increase coverage by 0.02%.
The diff coverage is 4.45%.

❗ Current head 6baa99a differs from pull request most recent head 9ea58c4. Consider uploading reports for the commit 9ea58c4 to get more accurate results

@@             Coverage Diff              @@
##                dev   #14631      +/-   ##
============================================
+ Coverage     38.52%   38.54%   +0.02%     
- Complexity     4579     4583       +4     
============================================
  Files          1260     1279      +19     
  Lines         43814    43781      -33     
  Branches       4841     4836       -5     
============================================
- Hits          16878    16876       -2     
+ Misses        25061    25032      -29     
+ Partials       1875     1873       -2     
Files Changed Coverage Δ
...tasource/api/client/BaseAdHocDataSourceClient.java 0.00% <0.00%> (ø)
...atasource/api/plugin/DataSourceClientProvider.java 0.00% <0.00%> (ø)
...datasource/api/plugin/DataSourcePluginManager.java 0.00% <0.00%> (ø)
...source/api/plugin/DataSourceProcessorProvider.java 0.00% <0.00%> (ø)
...atasource/api/provider/JDBCDataSourceProvider.java 0.00% <ø> (ø)
...duler/plugin/datasource/api/utils/CommonUtils.java 55.55% <ø> (ø)
...r/plugin/datasource/api/utils/DataSourceUtils.java 0.00% <0.00%> (ø)
...datasource/athena/AthenaAdHocDataSourceClient.java 0.00% <ø> (ø)
...gin/datasource/athena/AthenaDataSourceChannel.java 0.00% <0.00%> (ø)
...atasource/athena/AthenaPooledDataSourceClient.java 0.00% <0.00%> (ø)
... and 60 more

... and 5 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@zhongjiajie
Copy link
Member

zhongjiajie commented Jul 25, 2023

related: #14626 and #14193, cc @zhuangchong

@ruanwenjun ruanwenjun force-pushed the dev_wenjun_suportIpv6 branch 4 times, most recently from 010962d to 4adec54 Compare July 25, 2023 07:00
@ruanwenjun ruanwenjun force-pushed the dev_wenjun_suportIpv6 branch 2 times, most recently from 694cf4a to 9d8ecf0 Compare July 25, 2023 07:46
@ruanwenjun ruanwenjun added 3.1.x for 3.1.x version 3.2.0 for 3.2.0 version labels Jul 25, 2023
@ruanwenjun ruanwenjun force-pushed the dev_wenjun_suportIpv6 branch 5 times, most recently from 9ea58c4 to ae25da7 Compare July 25, 2023 11:02
caishunfeng
caishunfeng previously approved these changes Jul 25, 2023
Copy link
Contributor

@caishunfeng caishunfeng left a comment

Choose a reason for hiding this comment

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

LGTM overall 👍

@ruanwenjun ruanwenjun force-pushed the dev_wenjun_suportIpv6 branch from f9cd0d6 to 08561fe Compare July 25, 2023 14:07
@sonarqubecloud
Copy link

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 23 Code Smells

3.6% 3.6% Coverage
0.0% 0.0% Duplication

idea Catch issues before they fail your Quality Gate with our IDE extension sonarlint SonarLint

Copy link
Contributor

@caishunfeng caishunfeng left a comment

Choose a reason for hiding this comment

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

+1

@caishunfeng caishunfeng merged commit 4aab0b2 into apache:dev Jul 26, 2023
@ruanwenjun ruanwenjun deleted the dev_wenjun_suportIpv6 branch July 26, 2023 01:28
zhuangchong added a commit to zhuangchong/incubator-dolphinscheduler that referenced this pull request Jul 28, 2023
@zhuangchong zhuangchong removed this from the 3.1.8 milestone Aug 2, 2023
zhongjiajie pushed a commit that referenced this pull request Aug 30, 2023
* Use AdHoc datasource client in sqlTask

* Add method in DataSourceChannel to create PooledDataSourceClient and AdHocDataSourceClient

(cherry picked from commit 4aab0b2)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants