You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by te...@apache.org on 2020/12/29 02:56:51 UTC
[shardingsphere-elasticjob] branch master updated: Register
existing DataSource instance into registry (#1795)
This is an automated email from the ASF dual-hosted git repository.
technoboy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob.git
The following commit(s) were added to refs/heads/master by this push:
new 3d12e9d Register existing DataSource instance into registry (#1795)
3d12e9d is described below
commit 3d12e9d4bf688ad61f4e29364cbe0a9543288cdb
Author: 吴伟杰 <wu...@apache.org>
AuthorDate: Tue Dec 29 10:56:42 2020 +0800
Register existing DataSource instance into registry (#1795)
---
.../elasticjob/tracing/rdb/datasource/DataSourceRegistry.java | 4 ++++
.../tracing/rdb/datasource/DataSourceTracingStorageConverter.java | 4 +++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceRegistry.java b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceRegistry.java
index 00a8266..1102486 100644
--- a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceRegistry.java
+++ b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceRegistry.java
@@ -51,6 +51,10 @@ public final class DataSourceRegistry {
return instance;
}
+ void registerDataSource(final DataSourceConfiguration configuration, final DataSource dataSource) {
+ dataSources.putIfAbsent(configuration, dataSource);
+ }
+
/**
* Get {@link DataSource} by {@link TracingStorageConfiguration}.
*
diff --git a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceTracingStorageConverter.java b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceTracingStorageConverter.java
index 0349a4a..40475c1 100644
--- a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceTracingStorageConverter.java
+++ b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceTracingStorageConverter.java
@@ -40,7 +40,9 @@ public final class DataSourceTracingStorageConverter implements TracingStorageCo
log.error(ex.getLocalizedMessage(), ex);
throw new TracingStorageUnavailableException(ex);
}
- return DataSourceConfiguration.getDataSourceConfiguration(dataSource);
+ DataSourceConfiguration result = DataSourceConfiguration.getDataSourceConfiguration(dataSource);
+ DataSourceRegistry.getInstance().registerDataSource(result, dataSource);
+ return result;
}
@Override