Narcasserun commented on code in PR #10526:
URL: https://github.com/apache/dolphinscheduler/pull/10526#discussion_r903190691
##########
dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/plugin/DataSourceClientManager.java:
##########
@@ -46,34 +47,38 @@ public class DataSourceClientProvider {
.build();
private DataSourcePluginManager dataSourcePluginManager;
- private DataSourceClientProvider() {
+ private DataSourceClientManager() {
initDataSourcePlugin();
}
private static class DataSourceClientProviderHolder {
- private static final DataSourceClientProvider INSTANCE = new
DataSourceClientProvider();
+ private static final DataSourceClientManager INSTANCE = new
DataSourceClientManager();
}
- public static DataSourceClientProvider getInstance() {
+ public static DataSourceClientManager getInstance() {
return DataSourceClientProviderHolder.INSTANCE;
}
- public Connection getConnection(DbType dbType, ConnectionParam
connectionParam) throws ExecutionException {
+ public DataSourceClient getDataSource(DbType dbType, ConnectionParam
connectionParam) {
BaseConnectionParam baseConnectionParam = (BaseConnectionParam)
connectionParam;
String datasourceUniqueId =
DataSourceUtils.getDatasourceUniqueId(baseConnectionParam, dbType);
logger.info("getConnection datasourceUniqueId {}", datasourceUniqueId);
- DataSourceClient dataSourceClient =
uniqueId2dataSourceClientCache.get(datasourceUniqueId, () -> {
- Map<String, DataSourceChannel> dataSourceChannelMap =
dataSourcePluginManager.getDataSourceChannelMap();
- DataSourceChannel dataSourceChannel =
dataSourceChannelMap.get(dbType.getDescp());
- if (null == dataSourceChannel) {
- throw new RuntimeException(String.format("datasource plugin
'%s' is not found", dbType.getDescp()));
- }
- return
dataSourceChannel.createDataSourceClient(baseConnectionParam, dbType);
- });
- return dataSourceClient.getConnection();
+ try {
+ return uniqueId2dataSourceClientCache.get(datasourceUniqueId, ()
-> {
+ Map<String, DataSourceChannel> dataSourceChannelMap =
dataSourcePluginManager.getDataSourceChannelMap();
+ DataSourceChannel dataSourceChannel =
dataSourceChannelMap.get(dbType.getDescp());
+ if (null == dataSourceChannel) {
+ throw
DataSourceException.getInstance(String.format("datasource plugin '%s' is not
found", dbType.getDescp()));
Review Comment:
They seem to achieve the same
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
