You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2021/02/23 12:38:15 UTC
[shardingsphere] branch master updated: Remove props of YAML data
source configuration for jdbc (#9478)
This is an automated email from the ASF dual-hosted git repository.
zhangyonglun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 4ccdc59 Remove props of YAML data source configuration for jdbc (#9478)
4ccdc59 is described below
commit 4ccdc59739bb2baf2f6041d2de68451a60bfdd14
Author: Haoran Meng <me...@gmail.com>
AuthorDate: Tue Feb 23 20:37:43 2021 +0800
Remove props of YAML data source configuration for jdbc (#9478)
* Remove props of YAML data source configuration for jdbc
* Remove props of YAML data source configuration for jdbc
---
.../resources/yaml/encrypt/query-with-cipher.yaml | 9 ++--
.../resources/yaml/encrypt/query-with-plain.yaml | 9 ++--
.../src/test/resources/yaml/ha-rule.yaml | 54 ++++++++++------------
.../test/resources/yaml/replica-query-rule.yaml | 54 ++++++++++------------
.../src/test/resources/yaml/shadow-rule.yaml | 18 ++++----
.../src/test/resources/yaml/sharding-rule.yaml | 27 +++++------
.../test/resources/yaml/mix/query-with-cipher.yaml | 9 ++--
.../test/resources/yaml/mix/query-with-plain.yaml | 9 ++--
.../resources/yaml/sharding/sharding-rule.yaml | 9 ++--
.../governance/core/config/ConfigCenter.java | 11 ++---
.../metadata/DataSourceChangedListener.java | 3 +-
.../yaml/config/YamlConfigurationConverter.java | 4 +-
.../config/YamlDataSourceConfigurationWrap.java | 3 +-
.../yaml/configCenter/data-source-init-sql.yaml | 30 ++++++------
.../resources/yaml/configCenter/data-source.yaml | 18 ++++----
.../src/test/resources/yaml/data-source.yaml | 7 ++-
.../yaml/config/YamlRootRuleConfigurations.java | 2 +-
.../YamlDataSourceConfigurationSwapper.java | 49 +++++++++++++++++++-
.../configWithReplicaQueryDataSourceWithProps.yaml | 33 ++++++-------
...nfigWithReplicaQueryDataSourceWithoutProps.yaml | 33 ++++++-------
.../sharding/configWithDataSourceWithProps.yaml | 22 ++++-----
.../sharding/configWithDataSourceWithoutProps.yaml | 22 ++++-----
.../configWithDataSourceWithProps.yaml | 44 ++++++++----------
.../configWithDataSourceWithoutProps.yaml | 44 ++++++++----------
.../configWithDataSourceWithoutRules.yaml | 44 ++++++++----------
.../src/test/resources/yaml/unit/sharding.yaml | 18 ++++----
.../src/test/resources/yaml/data-source.yaml | 9 ++--
.../resources/yaml/replica-query-databases.yaml | 27 +++++------
.../test/resources/yaml/sharding-databases.yaml | 27 +++++------
.../reg_center/config_center/data-sources.yaml | 38 ++++++++-------
.../config_sharding_sphere_jdbc_source.yaml | 7 ++-
.../config_sharding_sphere_jdbc_target.yaml | 14 +++---
32 files changed, 345 insertions(+), 362 deletions(-)
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/src/test/resources/yaml/encrypt/query-with-cipher.yaml b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/src/test/resources/yaml/encrypt/query-with-cipher.yaml
index 8cc6e15..2e087ff 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/src/test/resources/yaml/encrypt/query-with-cipher.yaml
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/src/test/resources/yaml/encrypt/query-with-cipher.yaml
@@ -18,11 +18,10 @@
dataSources:
encrypt_ds:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- props:
- driverClassName: org.h2.Driver
- jdbcUrl: jdbc:h2:mem:ds_encrypt;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
+ driverClassName: org.h2.Driver
+ jdbcUrl: jdbc:h2:mem:ds_encrypt;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
rules:
- !ENCRYPT
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/src/test/resources/yaml/encrypt/query-with-plain.yaml b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/src/test/resources/yaml/encrypt/query-with-plain.yaml
index 54a05cb..4f5c283 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/src/test/resources/yaml/encrypt/query-with-plain.yaml
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/src/test/resources/yaml/encrypt/query-with-plain.yaml
@@ -18,11 +18,10 @@
dataSources:
encrypt_ds:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- props:
- driverClassName: org.h2.Driver
- jdbcUrl: jdbc:h2:mem:ds_encrypt;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
+ driverClassName: org.h2.Driver
+ jdbcUrl: jdbc:h2:mem:ds_encrypt;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
rules:
- !ENCRYPT
diff --git a/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-common/src/test/resources/yaml/ha-rule.yaml b/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-common/src/test/resources/yaml/ha-rule.yaml
index 6fccd9a..9b5240d 100644
--- a/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-common/src/test/resources/yaml/ha-rule.yaml
+++ b/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-common/src/test/resources/yaml/ha-rule.yaml
@@ -18,46 +18,40 @@
dataSources:
primary_ds_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- props:
- driverClassName: org.h2.Driver
- jdbcUrl: jdbc:h2:mem:primary_ds;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
+ driverClassName: org.h2.Driver
+ jdbcUrl: jdbc:h2:mem:primary_ds;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
primary_ds_0_replica_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- props:
- driverClassName: org.h2.Driver
- jdbcUrl: jdbc:h2:mem:replica_ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
+ driverClassName: org.h2.Driver
+ jdbcUrl: jdbc:h2:mem:replica_ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
primary_ds_0_replica_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- props:
- driverClassName: org.h2.Driver
- jdbcUrl: jdbc:h2:mem:replica_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
+ driverClassName: org.h2.Driver
+ jdbcUrl: jdbc:h2:mem:replica_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
primary_ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- props:
- driverClassName: org.h2.Driver
- jdbcUrl: jdbc:h2:mem:primary_ds;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
+ driverClassName: org.h2.Driver
+ jdbcUrl: jdbc:h2:mem:primary_ds;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
primary_ds_1_replica_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- props:
- driverClassName: org.h2.Driver
- jdbcUrl: jdbc:h2:mem:replica_ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
+ driverClassName: org.h2.Driver
+ jdbcUrl: jdbc:h2:mem:replica_ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
primary_ds_1_replica_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- props:
- driverClassName: org.h2.Driver
- jdbcUrl: jdbc:h2:mem:replica_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
+ driverClassName: org.h2.Driver
+ jdbcUrl: jdbc:h2:mem:replica_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
rules:
- !HA
diff --git a/shardingsphere-features/shardingsphere-replica-query/shardingsphere-replica-query-common/src/test/resources/yaml/replica-query-rule.yaml b/shardingsphere-features/shardingsphere-replica-query/shardingsphere-replica-query-common/src/test/resources/yaml/replica-query-rule.yaml
index ca738b5..5bc5826 100644
--- a/shardingsphere-features/shardingsphere-replica-query/shardingsphere-replica-query-common/src/test/resources/yaml/replica-query-rule.yaml
+++ b/shardingsphere-features/shardingsphere-replica-query/shardingsphere-replica-query-common/src/test/resources/yaml/replica-query-rule.yaml
@@ -18,46 +18,40 @@
dataSources:
primary_ds_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- props:
- driverClassName: org.h2.Driver
- jdbcUrl: jdbc:h2:mem:primary_ds;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
+ driverClassName: org.h2.Driver
+ jdbcUrl: jdbc:h2:mem:primary_ds;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
primary_ds_0_replica_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- props:
- driverClassName: org.h2.Driver
- jdbcUrl: jdbc:h2:mem:replica_ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
+ driverClassName: org.h2.Driver
+ jdbcUrl: jdbc:h2:mem:replica_ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
primary_ds_0_replica_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- props:
- driverClassName: org.h2.Driver
- jdbcUrl: jdbc:h2:mem:replica_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
+ driverClassName: org.h2.Driver
+ jdbcUrl: jdbc:h2:mem:replica_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
primary_ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- props:
- driverClassName: org.h2.Driver
- jdbcUrl: jdbc:h2:mem:primary_ds;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
+ driverClassName: org.h2.Driver
+ jdbcUrl: jdbc:h2:mem:primary_ds;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
primary_ds_1_replica_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- props:
- driverClassName: org.h2.Driver
- jdbcUrl: jdbc:h2:mem:replica_ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
+ driverClassName: org.h2.Driver
+ jdbcUrl: jdbc:h2:mem:replica_ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
primary_ds_1_replica_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- props:
- driverClassName: org.h2.Driver
- jdbcUrl: jdbc:h2:mem:replica_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
+ driverClassName: org.h2.Driver
+ jdbcUrl: jdbc:h2:mem:replica_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
rules:
- !REPLICA_QUERY
diff --git a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-common/src/test/resources/yaml/shadow-rule.yaml b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-common/src/test/resources/yaml/shadow-rule.yaml
index 99faf87..8c32546 100644
--- a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-common/src/test/resources/yaml/shadow-rule.yaml
+++ b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-common/src/test/resources/yaml/shadow-rule.yaml
@@ -18,18 +18,16 @@
dataSources:
ds:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- props:
- driverClassName: org.h2.Driver
- jdbcUrl: jdbc:h2:mem:primary_ds;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
+ driverClassName: org.h2.Driver
+ jdbcUrl: jdbc:h2:mem:primary_ds;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
shadow_ds:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- props:
- driverClassName: org.h2.Driver
- jdbcUrl: jdbc:h2:mem:replica_ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
+ driverClassName: org.h2.Driver
+ jdbcUrl: jdbc:h2:mem:replica_ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
rules:
- !SHADOW
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/resources/yaml/sharding-rule.yaml b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/resources/yaml/sharding-rule.yaml
index ad305b4..0201ec6 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/resources/yaml/sharding-rule.yaml
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/resources/yaml/sharding-rule.yaml
@@ -18,25 +18,22 @@
dataSources:
ds_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- props:
- driverClassName: org.h2.Driver
- jdbcUrl: jdbc:h2:mem:primary_ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
+ driverClassName: org.h2.Driver
+ jdbcUrl: jdbc:h2:mem:primary_ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- props:
- driverClassName: org.h2.Driver
- jdbcUrl: jdbc:h2:mem:primary_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
+ driverClassName: org.h2.Driver
+ jdbcUrl: jdbc:h2:mem:primary_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
default_ds:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- props:
- driverClassName: org.h2.Driver
- jdbcUrl: jdbc:h2:mem:default_ds;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
+ driverClassName: org.h2.Driver
+ jdbcUrl: jdbc:h2:mem:default_ds;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
rules:
- !SHARDING
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/resources/yaml/mix/query-with-cipher.yaml b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/resources/yaml/mix/query-with-cipher.yaml
index 3759904..a48dd3e 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/resources/yaml/mix/query-with-cipher.yaml
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/resources/yaml/mix/query-with-cipher.yaml
@@ -18,11 +18,10 @@
dataSources:
db:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- props:
- driverClassName: org.h2.Driver
- jdbcUrl: jdbc:h2:mem:db;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
+ driverClassName: org.h2.Driver
+ jdbcUrl: jdbc:h2:mem:db;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
rules:
- !SHARDING
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/resources/yaml/mix/query-with-plain.yaml b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/resources/yaml/mix/query-with-plain.yaml
index 9a7184d..2f81ee9 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/resources/yaml/mix/query-with-plain.yaml
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/resources/yaml/mix/query-with-plain.yaml
@@ -18,11 +18,10 @@
dataSources:
db:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- props:
- driverClassName: org.h2.Driver
- jdbcUrl: jdbc:h2:mem:db;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
+ driverClassName: org.h2.Driver
+ jdbcUrl: jdbc:h2:mem:db;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
rules:
- !SHARDING
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/resources/yaml/sharding/sharding-rule.yaml b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/resources/yaml/sharding/sharding-rule.yaml
index 3bcbb12..b1dd488 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/resources/yaml/sharding/sharding-rule.yaml
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/resources/yaml/sharding/sharding-rule.yaml
@@ -18,11 +18,10 @@
dataSources:
db:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- props:
- driverClassName: org.h2.Driver
- jdbcUrl: jdbc:h2:mem:db;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
+ driverClassName: org.h2.Driver
+ jdbcUrl: jdbc:h2:mem:db;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
rules:
- !SHARDING
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/config/ConfigCenter.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/config/ConfigCenter.java
index d602b29..bc20f11 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/config/ConfigCenter.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/config/ConfigCenter.java
@@ -31,19 +31,18 @@ import org.apache.shardingsphere.governance.core.event.model.rule.RuleConfigurat
import org.apache.shardingsphere.governance.core.event.model.rule.RuleConfigurationsAlteredEvent;
import org.apache.shardingsphere.governance.core.event.model.rule.SwitchRuleConfigurationEvent;
import org.apache.shardingsphere.governance.core.event.model.scaling.StartScalingEvent;
-import org.apache.shardingsphere.infra.metadata.schema.refresher.event.SchemaAlteredEvent;
import org.apache.shardingsphere.governance.core.yaml.config.YamlConfigurationConverter;
-import org.apache.shardingsphere.infra.yaml.config.YamlDataSourceConfiguration;
import org.apache.shardingsphere.governance.core.yaml.config.YamlDataSourceConfigurationWrap;
import org.apache.shardingsphere.governance.core.yaml.config.schema.YamlSchema;
import org.apache.shardingsphere.governance.core.yaml.swapper.SchemaYamlSwapper;
import org.apache.shardingsphere.governance.repository.api.ConfigurationRepository;
-import org.apache.shardingsphere.infra.metadata.auth.model.user.ShardingSphereUser;
-import org.apache.shardingsphere.infra.metadata.auth.builtin.yaml.swapper.UserRuleYamlSwapper;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
import org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
import org.apache.shardingsphere.infra.eventbus.ShardingSphereEventBus;
+import org.apache.shardingsphere.infra.metadata.auth.builtin.yaml.swapper.UserRuleYamlSwapper;
+import org.apache.shardingsphere.infra.metadata.auth.model.user.ShardingSphereUser;
import org.apache.shardingsphere.infra.metadata.schema.ShardingSphereSchema;
+import org.apache.shardingsphere.infra.metadata.schema.refresher.event.SchemaAlteredEvent;
import org.apache.shardingsphere.infra.yaml.config.YamlRootRuleConfigurations;
import org.apache.shardingsphere.infra.yaml.engine.YamlEngine;
import org.apache.shardingsphere.infra.yaml.swapper.YamlDataSourceConfigurationSwapper;
@@ -232,8 +231,8 @@ public final class ConfigCenter {
}
private YamlDataSourceConfigurationWrap createYamlDataSourceConfigurationWrap(final Map<String, DataSourceConfiguration> dataSourceConfigurations) {
- Map<String, YamlDataSourceConfiguration> yamlDataSourceConfigurations = dataSourceConfigurations.entrySet().stream().collect(Collectors.toMap(Entry::getKey,
- entry -> new YamlDataSourceConfigurationSwapper().swapToYamlConfiguration(entry.getValue()), (oldValue, currentValue) -> oldValue, LinkedHashMap::new));
+ Map<String, Map<String, Object>> yamlDataSourceConfigurations = dataSourceConfigurations.entrySet().stream().collect(Collectors.toMap(Entry::getKey,
+ entry -> new YamlDataSourceConfigurationSwapper().swapToMap(entry.getValue()), (oldValue, currentValue) -> oldValue, LinkedHashMap::new));
YamlDataSourceConfigurationWrap result = new YamlDataSourceConfigurationWrap();
result.setDataSources(yamlDataSourceConfigurations);
return result;
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/config/listener/metadata/DataSourceChangedListener.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/config/listener/metadata/DataSourceChangedListener.java
index 867229c..f126421 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/config/listener/metadata/DataSourceChangedListener.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/config/listener/metadata/DataSourceChangedListener.java
@@ -65,6 +65,7 @@ public final class DataSourceChangedListener extends PostGovernanceRepositoryEve
YamlDataSourceConfigurationWrap result = YamlEngine.unmarshal(event.getValue(), YamlDataSourceConfigurationWrap.class);
Preconditions.checkState(null != result && !result.getDataSources().isEmpty(), "No available data sources to load for governance.");
return new DataSourceChangedEvent(schemaName, result.getDataSources().entrySet().stream()
- .collect(Collectors.toMap(Entry::getKey, entry -> new YamlDataSourceConfigurationSwapper().swapToObject(entry.getValue()), (oldValue, currentValue) -> oldValue, LinkedHashMap::new)));
+ .collect(Collectors.toMap(Entry::getKey, entry -> new YamlDataSourceConfigurationSwapper()
+ .swapToObjectFromMap(entry.getValue()), (oldValue, currentValue) -> oldValue, LinkedHashMap::new)));
}
}
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/yaml/config/YamlConfigurationConverter.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/yaml/config/YamlConfigurationConverter.java
index c306479..74e6b98 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/yaml/config/YamlConfigurationConverter.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/yaml/config/YamlConfigurationConverter.java
@@ -62,7 +62,7 @@ public final class YamlConfigurationConverter {
return new LinkedHashMap<>();
}
return result.getDataSources().entrySet().stream().collect(Collectors.toMap(Entry::getKey, entry -> new YamlDataSourceConfigurationSwapper()
- .swapToObject(entry.getValue()), (oldValue, currentValue) -> oldValue, LinkedHashMap::new));
+ .swapToObjectFromMap(entry.getValue()), (oldValue, currentValue) -> oldValue, LinkedHashMap::new));
}
/**
@@ -82,7 +82,7 @@ public final class YamlConfigurationConverter {
* @return data sources
*/
public static Map<String, DataSource> convertDataSources(final Map<String, YamlDataSourceConfiguration> yamlDataSources) {
- return new YamlDataSourceConfigurationSwapper().swapToDataSources(yamlDataSources);
+ return new YamlDataSourceConfigurationSwapper().swapToDataSourcesFromYaml(yamlDataSources);
}
/**
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/yaml/config/YamlDataSourceConfigurationWrap.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/yaml/config/YamlDataSourceConfigurationWrap.java
index 8daa1ae..be4b320 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/yaml/config/YamlDataSourceConfigurationWrap.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/yaml/config/YamlDataSourceConfigurationWrap.java
@@ -20,7 +20,6 @@ package org.apache.shardingsphere.governance.core.yaml.config;
import lombok.Getter;
import lombok.Setter;
import org.apache.shardingsphere.infra.yaml.config.YamlConfiguration;
-import org.apache.shardingsphere.infra.yaml.config.YamlDataSourceConfiguration;
import java.util.Map;
@@ -31,5 +30,5 @@ import java.util.Map;
@Setter
public final class YamlDataSourceConfigurationWrap implements YamlConfiguration {
- private Map<String, YamlDataSourceConfiguration> dataSources;
+ private Map<String, Map<String, Object>> dataSources;
}
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/test/resources/yaml/configCenter/data-source-init-sql.yaml b/shardingsphere-governance/shardingsphere-governance-core/src/test/resources/yaml/configCenter/data-source-init-sql.yaml
index 6b1692f..1abaeb5 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/test/resources/yaml/configCenter/data-source-init-sql.yaml
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/test/resources/yaml/configCenter/data-source-init-sql.yaml
@@ -17,21 +17,19 @@
dataSources:
ds_0:
dataSourceClassName: org.apache.shardingsphere.governance.core.config.MockDataSource
- props:
- driverClassName: com.mysql.jdbc.Driver
- url: jdbc:mysql://localhost:3306/ds_0
- username: root
- password: root
- connectionInitSqls:
- - set names utf8mb4;
- - set names utf8;
- ds_1:
- dataSourceClassName: org.apache.shardingsphere.governance.core.config.MockDataSource
- props:
- driverClassName: com.mysql.jdbc.Driver
- url: jdbc:mysql://localhost:3306/ds_1
- username: root
- password: root
- connectionInitSqls:
+ driverClassName: com.mysql.jdbc.Driver
+ url: jdbc:mysql://localhost:3306/ds_0
+ username: root
+ password: root
+ connectionInitSqls:
- set names utf8mb4;
- set names utf8;
+ ds_1:
+ dataSourceClassName: org.apache.shardingsphere.governance.core.config.MockDataSource
+ driverClassName: com.mysql.jdbc.Driver
+ url: jdbc:mysql://localhost:3306/ds_1
+ username: root
+ password: root
+ connectionInitSqls:
+ - set names utf8mb4;
+ - set names utf8;
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/test/resources/yaml/configCenter/data-source.yaml b/shardingsphere-governance/shardingsphere-governance-core/src/test/resources/yaml/configCenter/data-source.yaml
index 5eb1319..6367618 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/test/resources/yaml/configCenter/data-source.yaml
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/test/resources/yaml/configCenter/data-source.yaml
@@ -17,15 +17,13 @@
dataSources:
ds_0:
dataSourceClassName: org.apache.shardingsphere.governance.core.config.MockDataSource
- props:
- driverClassName: com.mysql.jdbc.Driver
- url: jdbc:mysql://localhost:3306/ds_0
- username: root
- password: root
+ driverClassName: com.mysql.jdbc.Driver
+ url: jdbc:mysql://localhost:3306/ds_0
+ username: root
+ password: root
ds_1:
dataSourceClassName: org.apache.shardingsphere.governance.core.config.MockDataSource
- props:
- driverClassName: com.mysql.jdbc.Driver
- url: jdbc:mysql://localhost:3306/ds_1
- username: root
- password: root
+ driverClassName: com.mysql.jdbc.Driver
+ url: jdbc:mysql://localhost:3306/ds_1
+ username: root
+ password: root
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/test/resources/yaml/data-source.yaml b/shardingsphere-governance/shardingsphere-governance-core/src/test/resources/yaml/data-source.yaml
index 79cd08f..652edc4 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/test/resources/yaml/data-source.yaml
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/test/resources/yaml/data-source.yaml
@@ -17,7 +17,6 @@
dataSources:
primary_ds:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- props:
- url: jdbc:mysql://localhost:3306/demo_primary_ds
- username: root
- password: null
+ url: jdbc:mysql://localhost:3306/demo_primary_ds
+ username: root
+ password: null
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/YamlRootRuleConfigurations.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/YamlRootRuleConfigurations.java
index 0f485d1..d8680c9 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/YamlRootRuleConfigurations.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/YamlRootRuleConfigurations.java
@@ -33,7 +33,7 @@ import java.util.Properties;
@Setter
public class YamlRootRuleConfigurations implements YamlConfiguration {
- private Map<String, YamlDataSourceConfiguration> dataSources = new HashMap<>();
+ private Map<String, Map<String, Object>> dataSources = new HashMap<>();
private Collection<YamlRuleConfiguration> rules = new LinkedList<>();
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/swapper/YamlDataSourceConfigurationSwapper.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/swapper/YamlDataSourceConfigurationSwapper.java
index 96bf6bc..faee485 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/swapper/YamlDataSourceConfigurationSwapper.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/swapper/YamlDataSourceConfigurationSwapper.java
@@ -17,12 +17,16 @@
package org.apache.shardingsphere.infra.yaml.swapper;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Strings;
import org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
import org.apache.shardingsphere.infra.config.datasource.DataSourceConverter;
import org.apache.shardingsphere.infra.yaml.config.YamlDataSourceConfiguration;
import javax.sql.DataSource;
+import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -30,6 +34,8 @@ import java.util.stream.Collectors;
*/
public final class YamlDataSourceConfigurationSwapper implements YamlConfigurationSwapper<YamlDataSourceConfiguration, DataSourceConfiguration> {
+ private static final String YAML_DATA_SOURCE_CLASS_NAME = "dataSourceClassName";
+
@Override
public YamlDataSourceConfiguration swapToYamlConfiguration(final DataSourceConfiguration config) {
YamlDataSourceConfiguration result = new YamlDataSourceConfiguration();
@@ -47,13 +53,54 @@ public final class YamlDataSourceConfigurationSwapper implements YamlConfigurati
/**
* Swap to data sources from YAML data sources.
+ *
+ * @param yamlDataSources YAML data sources map
+ * @return data sources
+ */
+ public Map<String, DataSource> swapToDataSources(final Map<String, Map<String, Object>> yamlDataSources) {
+ Map<String, DataSourceConfiguration> dataSourceConfigMap = yamlDataSources.entrySet().stream()
+ .collect(Collectors.toMap(Map.Entry::getKey, entry -> swapToObjectFromMap(entry.getValue())));
+ return DataSourceConverter.getDataSourceMap(dataSourceConfigMap);
+ }
+
+ /**
+ * Swap to data source configuration from map.
*
+ * @param yamlConfig yaml config map
+ * @return data source configuration
+ */
+ public DataSourceConfiguration swapToObjectFromMap(final Map<String, Object> yamlConfig) {
+ String dataSourceClassName = Objects.isNull(yamlConfig.get(YAML_DATA_SOURCE_CLASS_NAME)) ? "" : yamlConfig.get(YAML_DATA_SOURCE_CLASS_NAME).toString();
+ Preconditions.checkState(!Strings.isNullOrEmpty(dataSourceClassName), String.format("%s can not be null", YAML_DATA_SOURCE_CLASS_NAME));
+ Map<String, Object> newDataSourceMap = new HashMap<>(yamlConfig);
+ newDataSourceMap.remove(YAML_DATA_SOURCE_CLASS_NAME);
+ DataSourceConfiguration result = new DataSourceConfiguration(dataSourceClassName);
+ result.getProps().putAll(newDataSourceMap);
+ return result;
+ }
+
+ /**
+ * Swap to data sources from YAML data sources.
+ *
* @param yamlDataSources YAML data sources
* @return data sources
*/
- public Map<String, DataSource> swapToDataSources(final Map<String, YamlDataSourceConfiguration> yamlDataSources) {
+ public Map<String, DataSource> swapToDataSourcesFromYaml(final Map<String, YamlDataSourceConfiguration> yamlDataSources) {
Map<String, DataSourceConfiguration> dataSourceConfigMap = yamlDataSources.entrySet().stream()
.collect(Collectors.toMap(Map.Entry::getKey, entry -> swapToObject(entry.getValue())));
return DataSourceConverter.getDataSourceMap(dataSourceConfigMap);
}
+
+ /**
+ * Swap to map from data source configuration.
+ *
+ * @param config data source configuration
+ * @return data source map
+ */
+ public Map<String, Object> swapToMap(final DataSourceConfiguration config) {
+ Map<String, Object> result = new HashMap<>();
+ result.putAll(config.getProps());
+ result.put(YAML_DATA_SOURCE_CLASS_NAME, config.getDataSourceClassName());
+ return result;
+ }
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/replica_query/configWithReplicaQueryDataSourceWithProps.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/replica_query/configWithReplicaQueryDataSourceWithProps.yaml
index 1a013d1..2166874 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/replica_query/configWithReplicaQueryDataSourceWithProps.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/replica_query/configWithReplicaQueryDataSourceWithProps.yaml
@@ -18,28 +18,25 @@
dataSources:
db_primary:
dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource
- props:
- driverClassName: org.h2.Driver
- url: jdbc:h2:mem:db_primary;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
- maxTotal: 100
+ driverClassName: org.h2.Driver
+ url: jdbc:h2:mem:db_primary;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
+ maxTotal: 100
replica_ds_0:
dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource
- props:
- driverClassName: org.h2.Driver
- url: jdbc:h2:mem:replica_ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
- maxTotal: 100
+ driverClassName: org.h2.Driver
+ url: jdbc:h2:mem:replica_ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
+ maxTotal: 100
replica_ds_1:
dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource
- props:
- driverClassName: org.h2.Driver
- url: jdbc:h2:mem:replica_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
- maxTotal: 100
+ driverClassName: org.h2.Driver
+ url: jdbc:h2:mem:replica_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
+ maxTotal: 100
rules:
- !REPLICA_QUERY
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/replica_query/configWithReplicaQueryDataSourceWithoutProps.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/replica_query/configWithReplicaQueryDataSourceWithoutProps.yaml
index 182b621..9d2d033 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/replica_query/configWithReplicaQueryDataSourceWithoutProps.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/replica_query/configWithReplicaQueryDataSourceWithoutProps.yaml
@@ -18,28 +18,25 @@
dataSources:
db_primary:
dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource
- props:
- driverClassName: org.h2.Driver
- url: jdbc:h2:mem:db_primary;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
- maxTotal: 100
+ driverClassName: org.h2.Driver
+ url: jdbc:h2:mem:db_primary;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
+ maxTotal: 100
replica_ds_0:
dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource
- props:
- driverClassName: org.h2.Driver
- url: jdbc:h2:mem:replica_ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
- maxTotal: 100
+ driverClassName: org.h2.Driver
+ url: jdbc:h2:mem:replica_ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
+ maxTotal: 100
replica_ds_1:
dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource
- props:
- driverClassName: org.h2.Driver
- url: jdbc:h2:mem:replica_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
- maxTotal: 100
+ driverClassName: org.h2.Driver
+ url: jdbc:h2:mem:replica_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
+ maxTotal: 100
rules:
- !REPLICA_QUERY
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml
index 4f65a5c..c0837e0 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml
@@ -18,20 +18,18 @@
dataSources:
db0:
dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource
- props:
- driverClassName: org.h2.Driver
- url: jdbc:h2:mem:db0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
- maxTotal: 100
+ driverClassName: org.h2.Driver
+ url: jdbc:h2:mem:db0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
+ maxTotal: 100
db1:
dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource
- props:
- driverClassName: org.h2.Driver
- url: jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
- maxTotal: 100
+ driverClassName: org.h2.Driver
+ url: jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
+ maxTotal: 100
rules:
- !SHARDING
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml
index 10fc0b0..c6e7281 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml
@@ -18,20 +18,18 @@
dataSources:
db0:
dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource
- props:
- driverClassName: org.h2.Driver
- url: jdbc:h2:mem:db0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
- maxTotal: 100
+ driverClassName: org.h2.Driver
+ url: jdbc:h2:mem:db0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
+ maxTotal: 100
db1:
dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource
- props:
- driverClassName: org.h2.Driver
- url: jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
- maxTotal: 100
+ driverClassName: org.h2.Driver
+ url: jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
+ maxTotal: 100
rules:
- !SHARDING
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_replica_query/configWithDataSourceWithProps.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_replica_query/configWithDataSourceWithProps.yaml
index 17a1bca..a7317cc 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_replica_query/configWithDataSourceWithProps.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_replica_query/configWithDataSourceWithProps.yaml
@@ -18,36 +18,32 @@
dataSources:
primary_ds_0:
dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource
- props:
- driverClassName: org.h2.Driver
- url: jdbc:h2:mem:primary_ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
- maxTotal: 100
+ driverClassName: org.h2.Driver
+ url: jdbc:h2:mem:primary_ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
+ maxTotal: 100
primary_ds_1:
dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource
- props:
- driverClassName: org.h2.Driver
- url: jdbc:h2:mem:primary_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
- maxTotal: 100
+ driverClassName: org.h2.Driver
+ url: jdbc:h2:mem:primary_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
+ maxTotal: 100
replica_ds_0:
dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource
- props:
- driverClassName: org.h2.Driver
- url: jdbc:h2:mem:replica_ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
- maxTotal: 100
+ driverClassName: org.h2.Driver
+ url: jdbc:h2:mem:replica_ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
+ maxTotal: 100
replica_ds_1:
dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource
- props:
- driverClassName: org.h2.Driver
- url: jdbc:h2:mem:replica_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
- maxTotal: 100
+ driverClassName: org.h2.Driver
+ url: jdbc:h2:mem:replica_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
+ maxTotal: 100
rules:
- !SHARDING
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_replica_query/configWithDataSourceWithoutProps.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_replica_query/configWithDataSourceWithoutProps.yaml
index 2e64c2e..c0144a9 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_replica_query/configWithDataSourceWithoutProps.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_replica_query/configWithDataSourceWithoutProps.yaml
@@ -18,36 +18,32 @@
dataSources:
primary_ds_0:
dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource
- props:
- driverClassName: org.h2.Driver
- url: jdbc:h2:mem:primary_ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
- maxTotal: 100
+ driverClassName: org.h2.Driver
+ url: jdbc:h2:mem:primary_ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
+ maxTotal: 100
primary_ds_1:
dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource
- props:
- driverClassName: org.h2.Driver
- url: jdbc:h2:mem:primary_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
- maxTotal: 100
+ driverClassName: org.h2.Driver
+ url: jdbc:h2:mem:primary_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
+ maxTotal: 100
replica_ds_0:
dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource
- props:
- driverClassName: org.h2.Driver
- url: jdbc:h2:mem:replica_ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
- maxTotal: 100
+ driverClassName: org.h2.Driver
+ url: jdbc:h2:mem:replica_ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
+ maxTotal: 100
replica_ds_1:
dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource
- props:
- driverClassName: org.h2.Driver
- url: jdbc:h2:mem:replica_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
- maxTotal: 100
+ driverClassName: org.h2.Driver
+ url: jdbc:h2:mem:replica_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
+ maxTotal: 100
rules:
- !SHARDING
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_replica_query/configWithDataSourceWithoutRules.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_replica_query/configWithDataSourceWithoutRules.yaml
index 47f910f..56cadce 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_replica_query/configWithDataSourceWithoutRules.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_replica_query/configWithDataSourceWithoutRules.yaml
@@ -18,36 +18,32 @@
dataSources:
primary_ds_0:
dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource
- props:
- driverClassName: org.h2.Driver
- url: jdbc:h2:mem:primary_ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
- maxTotal: 100
+ driverClassName: org.h2.Driver
+ url: jdbc:h2:mem:primary_ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
+ maxTotal: 100
primary_ds_1:
dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource
- props:
- driverClassName: org.h2.Driver
- url: jdbc:h2:mem:primary_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
- maxTotal: 100
+ driverClassName: org.h2.Driver
+ url: jdbc:h2:mem:primary_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
+ maxTotal: 100
replica_ds_0:
dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource
- props:
- driverClassName: org.h2.Driver
- url: jdbc:h2:mem:replica_ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
- maxTotal: 100
+ driverClassName: org.h2.Driver
+ url: jdbc:h2:mem:replica_ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
+ maxTotal: 100
replica_ds_1:
dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource
- props:
- driverClassName: org.h2.Driver
- url: jdbc:h2:mem:replica_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
- maxTotal: 100
+ driverClassName: org.h2.Driver
+ url: jdbc:h2:mem:replica_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
+ maxTotal: 100
governance:
name: test_sharding_ms_registry_name
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/unit/sharding.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/unit/sharding.yaml
index d0ccee7..3ef6f1f 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/unit/sharding.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/unit/sharding.yaml
@@ -28,18 +28,16 @@ governance:
dataSources:
primary_ds:
dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource
- props:
- driverClassName: org.h2.Driver
- url: jdbc:h2:mem:primary_ds;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
+ driverClassName: org.h2.Driver
+ url: jdbc:h2:mem:primary_ds;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
replica_ds:
dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource
- props:
- driverClassName: org.h2.Driver
- url: jdbc:h2:mem:replica_ds;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
+ driverClassName: org.h2.Driver
+ url: jdbc:h2:mem:replica_ds;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ username: sa
+ password:
rules:
- !SHARDING
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/resources/yaml/data-source.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/resources/yaml/data-source.yaml
index 1d63947..daeaeca 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/resources/yaml/data-source.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/resources/yaml/data-source.yaml
@@ -17,8 +17,7 @@
dataSources:
dataSource:
dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource
- props:
- url: jdbc:h2:mem:ds;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- maxTotal: 100
- password: ''
- username: sa
+ url: jdbc:h2:mem:ds;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ maxTotal: 100
+ password: ''
+ username: sa
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/resources/yaml/replica-query-databases.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/resources/yaml/replica-query-databases.yaml
index 2619ff3..835ebc8 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/resources/yaml/replica-query-databases.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/resources/yaml/replica-query-databases.yaml
@@ -17,22 +17,19 @@
dataSources:
primary_ds:
dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource
- props:
- url: jdbc:h2:mem:primary_ds;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- maxTotal: 16
- password:
- username: sa
+ url: jdbc:h2:mem:primary_ds;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ maxTotal: 16
+ password:
+ username: sa
replica_ds_0:
dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource
- props:
- url: jdbc:h2:mem:demo_replica_ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- maxTotal: 16
- password:
- username: sa
+ url: jdbc:h2:mem:demo_replica_ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ maxTotal: 16
+ password:
+ username: sa
replica_ds_1:
dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource
- props:
- url: jdbc:h2:mem:demo_replica_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- maxTotal: 16
- password:
- username: sa
\ No newline at end of file
+ url: jdbc:h2:mem:demo_replica_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ maxTotal: 16
+ password:
+ username: sa
\ No newline at end of file
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/resources/yaml/sharding-databases.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/resources/yaml/sharding-databases.yaml
index 9613afd..0dd31b1 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/resources/yaml/sharding-databases.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/resources/yaml/sharding-databases.yaml
@@ -17,23 +17,20 @@
dataSources:
ds:
dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource
- props:
- url: jdbc:h2:mem:ds;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- maxTotal: 16
- password: ''
- username: sa
+ url: jdbc:h2:mem:ds;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ maxTotal: 16
+ password: ''
+ username: sa
ds_0:
dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource
- props:
- url: jdbc:h2:mem:ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- maxTotal: 16
- password: ''
- username: sa
+ url: jdbc:h2:mem:ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ maxTotal: 16
+ password: ''
+ username: sa
ds_1:
dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource
- props:
- url: jdbc:h2:mem:ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- maxTotal: 16
- password: ''
- username: sa
+ url: jdbc:h2:mem:ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ maxTotal: 16
+ password: ''
+ username: sa
diff --git a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/reg_center/config_center/data-sources.yaml b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/reg_center/config_center/data-sources.yaml
index 9905b80..920d4e0 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/reg_center/config_center/data-sources.yaml
+++ b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/reg_center/config_center/data-sources.yaml
@@ -18,25 +18,23 @@
dataSources:
ds_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- props:
- jdbcUrl: jdbc:fixturedb:xxx
- username: root
- password: pwd
- connectionTimeout: 1000
- idleTimeout: 2000
- maxLifetime: 4000
- maxPoolSize: 20
- minPoolSize: 10
- readOnly: true
+ jdbcUrl: jdbc:fixturedb:xxx
+ username: root
+ password: pwd
+ connectionTimeout: 1000
+ idleTimeout: 2000
+ maxLifetime: 4000
+ maxPoolSize: 20
+ minPoolSize: 10
+ readOnly: true
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- props:
- jdbcUrl: jdbc:fixturedb:xxx
- username: root
- password: pwd
- connectionTimeout: 1000
- idleTimeout: 2000
- maxLifetime: 4000
- maxPoolSize: 20
- minPoolSize: 10
- readOnly: true
+ jdbcUrl: jdbc:fixturedb:xxx
+ username: root
+ password: pwd
+ connectionTimeout: 1000
+ idleTimeout: 2000
+ maxLifetime: 4000
+ maxPoolSize: 20
+ minPoolSize: 10
+ readOnly: true
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/resources/config_sharding_sphere_jdbc_source.yaml b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/resources/config_sharding_sphere_jdbc_source.yaml
index f2150b8..e4f7af4 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/resources/config_sharding_sphere_jdbc_source.yaml
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/resources/config_sharding_sphere_jdbc_source.yaml
@@ -14,10 +14,9 @@
dataSources:
ds_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- props:
- jdbcUrl: jdbc:h2:mem:test_ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL
- username: root
- password: root
+ jdbcUrl: jdbc:h2:mem:test_ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL
+ username: root
+ password: root
rules:
- !SHARDING
defaultDatabaseStrategy:
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/resources/config_sharding_sphere_jdbc_target.yaml b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/resources/config_sharding_sphere_jdbc_target.yaml
index 9e8bc97..6f11ea6 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/resources/config_sharding_sphere_jdbc_target.yaml
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/resources/config_sharding_sphere_jdbc_target.yaml
@@ -14,16 +14,14 @@
dataSources:
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- props:
- jdbcUrl: jdbc:h2:mem:test_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL
- username: root
- password: root
+ jdbcUrl: jdbc:h2:mem:test_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL
+ username: root
+ password: root
ds_2:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- props:
- jdbcUrl: jdbc:h2:mem:test_ds_2;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL
- username: root
- password: root
+ jdbcUrl: jdbc:h2:mem:test_ds_2;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL
+ username: root
+ password: root
rules:
- !SHARDING
defaultDatabaseStrategy: