You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by me...@apache.org on 2020/09/24 08:24:05 UTC
[shardingsphere] branch master updated: Rename
PrimaryReplicaReplication in code - part 3 (#7585)
This is an automated email from the ASF dual-hosted git repository.
menghaoran 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 8b00277 Rename PrimaryReplicaReplication in code - part 3 (#7585)
8b00277 is described below
commit 8b00277213ce493e8771a3681486d592514892e1
Author: Liang Zhang <te...@163.com>
AuthorDate: Thu Sep 24 16:23:47 2020 +0800
Rename PrimaryReplicaReplication in code - part 3 (#7585)
---
.../raw/jdbc/JavaConfigurationExampleMain.java | 14 +++++++-------
...CloudPrimaryReplicaReplicationConfiguration.java} | 10 +++++-----
...LocalPrimaryReplicaReplicationConfiguration.java} | 14 +++++++-------
...rdingPrimaryReplicaReplicationConfiguration.java} | 20 ++++++++++----------
...r-slave.yaml => primary-replica-replication.yaml} | 0
...r-slave.yaml => primary-replica-replication.yaml} | 0
...r-slave.yaml => primary-replica-replication.yaml} | 0
...r-slave.yaml => primary-replica-replication.yaml} | 0
...licaReplicationShadowDatabasesConfiguration.java} | 2 +-
.../table/raw/jdbc/factory/DataSourceFactory.java | 4 ++--
...a => PrimaryReplicaReplicationConfiguration.java} | 10 +++++-----
...imaryReplicaReplicationConfigurationPrecise.java} | 9 +++++----
...PrimaryReplicaReplicationConfigurationRange.java} | 15 ++++++++-------
.../sharding/raw/jdbc/factory/DataSourceFactory.java | 8 ++++----
.../raw/jdbc/factory/RangeDataSourceFactory.java | 8 ++++----
15 files changed, 58 insertions(+), 56 deletions(-)
diff --git a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/JavaConfigurationExampleMain.java b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/JavaConfigurationExampleMain.java
index 19a2487..4d86194 100644
--- a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/JavaConfigurationExampleMain.java
+++ b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/JavaConfigurationExampleMain.java
@@ -24,11 +24,11 @@ import org.apache.shardingsphere.example.core.api.service.ExampleService;
import org.apache.shardingsphere.example.core.jdbc.service.OrderServiceImpl;
import org.apache.shardingsphere.example.governance.raw.jdbc.config.GovernanceRepositoryConfigurationUtil;
import org.apache.shardingsphere.example.governance.raw.jdbc.config.cloud.CloudEncryptConfiguration;
-import org.apache.shardingsphere.example.governance.raw.jdbc.config.cloud.CloudMasterSlaveConfiguration;
+import org.apache.shardingsphere.example.governance.raw.jdbc.config.cloud.CloudPrimaryReplicaReplicationConfiguration;
import org.apache.shardingsphere.example.governance.raw.jdbc.config.cloud.CloudShadowConfiguration;
import org.apache.shardingsphere.example.governance.raw.jdbc.config.cloud.CloudShardingDatabasesAndTablesConfiguration;
import org.apache.shardingsphere.example.governance.raw.jdbc.config.local.LocalEncryptConfiguration;
-import org.apache.shardingsphere.example.governance.raw.jdbc.config.local.LocalMasterSlaveConfiguration;
+import org.apache.shardingsphere.example.governance.raw.jdbc.config.local.LocalPrimaryReplicaReplicationConfiguration;
import org.apache.shardingsphere.example.governance.raw.jdbc.config.local.LocalShadowConfiguration;
import org.apache.shardingsphere.example.governance.raw.jdbc.config.local.LocalShardingDatabasesAndTablesConfiguration;
import org.apache.shardingsphere.example.type.RegistryCenterType;
@@ -66,21 +66,21 @@ public final class JavaConfigurationExampleMain {
}
private static DataSource getDataSource(final ShardingType shardingType, final boolean loadConfigFromRegCenter) throws SQLException {
- GovernanceConfiguration governanceConfiguration = getGovernanceConfiguration(registryCenterType, shardingType);
+ GovernanceConfiguration governanceConfig = getGovernanceConfiguration(registryCenterType, shardingType);
ExampleConfiguration configuration;
switch (shardingType) {
case SHARDING_DATABASES_AND_TABLES:
configuration = loadConfigFromRegCenter
- ? new CloudShardingDatabasesAndTablesConfiguration(governanceConfiguration) : new LocalShardingDatabasesAndTablesConfiguration(governanceConfiguration);
+ ? new CloudShardingDatabasesAndTablesConfiguration(governanceConfig) : new LocalShardingDatabasesAndTablesConfiguration(governanceConfig);
break;
case MASTER_SLAVE:
- configuration = loadConfigFromRegCenter ? new CloudMasterSlaveConfiguration(governanceConfiguration) : new LocalMasterSlaveConfiguration(governanceConfiguration);
+ configuration = loadConfigFromRegCenter ? new CloudPrimaryReplicaReplicationConfiguration(governanceConfig) : new LocalPrimaryReplicaReplicationConfiguration(governanceConfig);
break;
case ENCRYPT:
- configuration = loadConfigFromRegCenter ? new CloudEncryptConfiguration(governanceConfiguration) : new LocalEncryptConfiguration(governanceConfiguration);
+ configuration = loadConfigFromRegCenter ? new CloudEncryptConfiguration(governanceConfig) : new LocalEncryptConfiguration(governanceConfig);
break;
case SHADOW:
- configuration = loadConfigFromRegCenter ? new CloudShadowConfiguration(governanceConfiguration) : new LocalShadowConfiguration(governanceConfiguration);
+ configuration = loadConfigFromRegCenter ? new CloudShadowConfiguration(governanceConfig) : new LocalShadowConfiguration(governanceConfig);
break;
default:
throw new UnsupportedOperationException(shardingType.name());
diff --git a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/cloud/CloudMasterSlaveConfiguration.java b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/cloud/CloudPrimaryReplicaReplicationConfiguration.java
similarity index 79%
rename from examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/cloud/CloudMasterSlaveConfiguration.java
rename to examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/cloud/CloudPrimaryReplicaReplicationConfiguration.java
index 98b66e8..81720f4 100644
--- a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/cloud/CloudMasterSlaveConfiguration.java
+++ b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/cloud/CloudPrimaryReplicaReplicationConfiguration.java
@@ -24,16 +24,16 @@ import org.apache.shardingsphere.governance.repository.api.config.GovernanceConf
import javax.sql.DataSource;
import java.sql.SQLException;
-public final class CloudMasterSlaveConfiguration implements ExampleConfiguration {
+public final class CloudPrimaryReplicaReplicationConfiguration implements ExampleConfiguration {
- private final GovernanceConfiguration governanceConfiguration;
+ private final GovernanceConfiguration governanceConfig;
- public CloudMasterSlaveConfiguration(final GovernanceConfiguration governanceConfiguration) {
- this.governanceConfiguration = governanceConfiguration;
+ public CloudPrimaryReplicaReplicationConfiguration(final GovernanceConfiguration governanceConfig) {
+ this.governanceConfig = governanceConfig;
}
@Override
public DataSource getDataSource() throws SQLException {
- return GovernanceShardingSphereDataSourceFactory.createDataSource(governanceConfiguration);
+ return GovernanceShardingSphereDataSourceFactory.createDataSource(governanceConfig);
}
}
diff --git a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/local/LocalMasterSlaveConfiguration.java b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/local/LocalPrimaryReplicaReplicationConfiguration.java
similarity index 77%
rename from examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/local/LocalMasterSlaveConfiguration.java
rename to examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/local/LocalPrimaryReplicaReplicationConfiguration.java
index db89cd2..069e282 100644
--- a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/local/LocalMasterSlaveConfiguration.java
+++ b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/local/LocalPrimaryReplicaReplicationConfiguration.java
@@ -32,20 +32,20 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-public final class LocalMasterSlaveConfiguration implements ExampleConfiguration {
+public final class LocalPrimaryReplicaReplicationConfiguration implements ExampleConfiguration {
- private final GovernanceConfiguration governanceConfiguration;
+ private final GovernanceConfiguration governanceConfig;
- public LocalMasterSlaveConfiguration(final GovernanceConfiguration governanceConfiguration) {
- this.governanceConfiguration = governanceConfiguration;
+ public LocalPrimaryReplicaReplicationConfiguration(final GovernanceConfiguration governanceConfig) {
+ this.governanceConfig = governanceConfig;
}
@Override
public DataSource getDataSource() throws SQLException {
- PrimaryReplicaReplicationDataSourceRuleConfiguration dataSourceConfiguration = new PrimaryReplicaReplicationDataSourceRuleConfiguration(
+ PrimaryReplicaReplicationDataSourceRuleConfiguration dataSourceConfig = new PrimaryReplicaReplicationDataSourceRuleConfiguration(
"demo_primary_replica_ds", "demo_primary_ds", Arrays.asList("demo_replica_ds_0", "demo_replica_ds_1"), null);
- PrimaryReplicaReplicationRuleConfiguration masterSlaveRuleConfig = new PrimaryReplicaReplicationRuleConfiguration(Collections.singleton(dataSourceConfiguration), Collections.emptyMap());
- return GovernanceShardingSphereDataSourceFactory.createDataSource(createDataSourceMap(), Collections.singleton(masterSlaveRuleConfig), new Properties(), governanceConfiguration);
+ PrimaryReplicaReplicationRuleConfiguration ruleConfig = new PrimaryReplicaReplicationRuleConfiguration(Collections.singleton(dataSourceConfig), Collections.emptyMap());
+ return GovernanceShardingSphereDataSourceFactory.createDataSource(createDataSourceMap(), Collections.singleton(ruleConfig), new Properties(), governanceConfig);
}
private Map<String, DataSource> createDataSourceMap() {
diff --git a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/local/LocalShardingMasterSlaveConfiguration.java b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/local/LocalShardingPrimaryReplicaReplicationConfiguration.java
similarity index 88%
rename from examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/local/LocalShardingMasterSlaveConfiguration.java
rename to examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/local/LocalShardingPrimaryReplicaReplicationConfiguration.java
index 36eeecb..d1ecebc 100644
--- a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/local/LocalShardingMasterSlaveConfiguration.java
+++ b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/local/LocalShardingPrimaryReplicaReplicationConfiguration.java
@@ -40,20 +40,20 @@ import java.util.LinkedList;
import java.util.Map;
import java.util.Properties;
-public final class LocalShardingMasterSlaveConfiguration implements ExampleConfiguration {
+public final class LocalShardingPrimaryReplicaReplicationConfiguration implements ExampleConfiguration {
- private final GovernanceConfiguration governanceConfiguration;
+ private final GovernanceConfiguration governanceConfig;
- public LocalShardingMasterSlaveConfiguration(final GovernanceConfiguration governanceConfiguration) {
- this.governanceConfiguration = governanceConfiguration;
+ public LocalShardingPrimaryReplicaReplicationConfiguration(final GovernanceConfiguration governanceConfig) {
+ this.governanceConfig = governanceConfig;
}
@Override
public DataSource getDataSource() throws SQLException {
- Collection<RuleConfiguration> configurations = new LinkedList<>();
- configurations.add(getShardingRuleConfiguration());
- configurations.add(getMasterSlaveRuleConfiguration());
- return GovernanceShardingSphereDataSourceFactory.createDataSource(createDataSourceMap(), configurations, new Properties(), governanceConfiguration);
+ Collection<RuleConfiguration> configs = new LinkedList<>();
+ configs.add(getShardingRuleConfiguration());
+ configs.add(getPrimaryReplicaReplicationRuleConfiguration());
+ return GovernanceShardingSphereDataSourceFactory.createDataSource(createDataSourceMap(), configs, new Properties(), governanceConfig);
}
private ShardingRuleConfiguration getShardingRuleConfiguration() {
@@ -84,7 +84,7 @@ public final class LocalShardingMasterSlaveConfiguration implements ExampleConfi
return new KeyGenerateStrategyConfiguration("order_id", "snowflake");
}
- private PrimaryReplicaReplicationRuleConfiguration getMasterSlaveRuleConfiguration() {
+ private PrimaryReplicaReplicationRuleConfiguration getPrimaryReplicaReplicationRuleConfiguration() {
PrimaryReplicaReplicationDataSourceRuleConfiguration dataSourceConfiguration1 = new PrimaryReplicaReplicationDataSourceRuleConfiguration(
"ds_0", "demo_primary_ds_0", Arrays.asList("demo_primary_ds_0_replica_0", "demo_primary_ds_0_replica_1"), null);
PrimaryReplicaReplicationDataSourceRuleConfiguration dataSourceConfiguration2 = new PrimaryReplicaReplicationDataSourceRuleConfiguration(
@@ -99,7 +99,7 @@ public final class LocalShardingMasterSlaveConfiguration implements ExampleConfi
}
private Map<String, DataSource> createDataSourceMap() {
- Map<String, DataSource> result = new HashMap<>();
+ Map<String, DataSource> result = new HashMap<>(6, 1);
result.put("demo_primary_ds_0", DataSourceUtil.createDataSource("demo_primary_ds_0"));
result.put("demo_primary_ds_0_replica_0", DataSourceUtil.createDataSource("demo_primary_ds_0_replica_0"));
result.put("demo_primary_ds_0_replica_1", DataSourceUtil.createDataSource("demo_primary_ds_0_replica_1"));
diff --git a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/resources/META-INF/nacos/cloud/master-slave.yaml b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/resources/META-INF/nacos/cloud/primary-replica-replication.yaml
similarity index 100%
rename from examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/resources/META-INF/nacos/cloud/master-slave.yaml
rename to examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/resources/META-INF/nacos/cloud/primary-replica-replication.yaml
diff --git a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/resources/META-INF/nacos/local/master-slave.yaml b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/resources/META-INF/nacos/local/primary-replica-replication.yaml
similarity index 100%
rename from examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/resources/META-INF/nacos/local/master-slave.yaml
rename to examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/resources/META-INF/nacos/local/primary-replica-replication.yaml
diff --git a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/master-slave.yaml b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/primary-replica-replication.yaml
similarity index 100%
rename from examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/master-slave.yaml
rename to examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/primary-replica-replication.yaml
diff --git a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/master-slave.yaml b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/primary-replica-replication.yaml
similarity index 100%
rename from examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/master-slave.yaml
rename to examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/primary-replica-replication.yaml
diff --git a/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/table/raw/jdbc/config/MasterSlaveShadowDatabasesConfiguration.java b/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/table/raw/jdbc/config/PrimaryReplicaReplicationShadowDatabasesConfiguration.java
similarity index 96%
rename from examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/table/raw/jdbc/config/MasterSlaveShadowDatabasesConfiguration.java
rename to examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/table/raw/jdbc/config/PrimaryReplicaReplicationShadowDatabasesConfiguration.java
index d0547b6..dfa9959 100644
--- a/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/table/raw/jdbc/config/MasterSlaveShadowDatabasesConfiguration.java
+++ b/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/table/raw/jdbc/config/PrimaryReplicaReplicationShadowDatabasesConfiguration.java
@@ -31,7 +31,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-public final class MasterSlaveShadowDatabasesConfiguration implements ExampleConfiguration {
+public final class PrimaryReplicaReplicationShadowDatabasesConfiguration implements ExampleConfiguration {
@Override
public DataSource getDataSource() throws SQLException {
diff --git a/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/table/raw/jdbc/factory/DataSourceFactory.java b/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/table/raw/jdbc/factory/DataSourceFactory.java
index 50253d6..25d8f7e 100644
--- a/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/table/raw/jdbc/factory/DataSourceFactory.java
+++ b/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/table/raw/jdbc/factory/DataSourceFactory.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.example.shadow.table.raw.jdbc.factory;
import org.apache.shardingsphere.example.shadow.table.raw.jdbc.config.EncryptShadowDatabasesConfiguration;
-import org.apache.shardingsphere.example.shadow.table.raw.jdbc.config.MasterSlaveShadowDatabasesConfiguration;
+import org.apache.shardingsphere.example.shadow.table.raw.jdbc.config.PrimaryReplicaReplicationShadowDatabasesConfiguration;
import org.apache.shardingsphere.example.shadow.table.raw.jdbc.config.ShadowDatabasesConfiguration;
import org.apache.shardingsphere.example.shadow.table.raw.jdbc.config.ShardingShadowDatabasesConfiguration;
import org.apache.shardingsphere.example.type.ShardingType;
@@ -37,7 +37,7 @@ public final class DataSourceFactory {
case ENCRYPT_SHADOW:
return new EncryptShadowDatabasesConfiguration().getDataSource();
case MASTER_SLAVE_SHADOW:
- return new MasterSlaveShadowDatabasesConfiguration().getDataSource();
+ return new PrimaryReplicaReplicationShadowDatabasesConfiguration().getDataSource();
default:
throw new UnsupportedOperationException(shardingType.name());
}
diff --git a/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/MasterSlaveConfiguration.java b/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/PrimaryReplicaReplicationConfiguration.java
similarity index 81%
rename from examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/MasterSlaveConfiguration.java
rename to examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/PrimaryReplicaReplicationConfiguration.java
index 0049c6b..19f0c82 100644
--- a/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/MasterSlaveConfiguration.java
+++ b/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/PrimaryReplicaReplicationConfiguration.java
@@ -31,18 +31,18 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-public final class MasterSlaveConfiguration implements ExampleConfiguration {
+public final class PrimaryReplicaReplicationConfiguration implements ExampleConfiguration {
@Override
public DataSource getDataSource() throws SQLException {
- PrimaryReplicaReplicationDataSourceRuleConfiguration dataSourceConfiguration = new PrimaryReplicaReplicationDataSourceRuleConfiguration(
+ PrimaryReplicaReplicationDataSourceRuleConfiguration dataSourceConfig = new PrimaryReplicaReplicationDataSourceRuleConfiguration(
"demo_primary_replica_ds", "demo_primary_ds", Arrays.asList("demo_replica_ds_0", "demo_replica_ds_1"), null);
- PrimaryReplicaReplicationRuleConfiguration masterSlaveRuleConfig = new PrimaryReplicaReplicationRuleConfiguration(Collections.singleton(dataSourceConfiguration), Collections.emptyMap());
- return ShardingSphereDataSourceFactory.createDataSource(createDataSourceMap(), Collections.singleton(masterSlaveRuleConfig), new Properties());
+ PrimaryReplicaReplicationRuleConfiguration ruleConfig = new PrimaryReplicaReplicationRuleConfiguration(Collections.singleton(dataSourceConfig), Collections.emptyMap());
+ return ShardingSphereDataSourceFactory.createDataSource(createDataSourceMap(), Collections.singleton(ruleConfig), new Properties());
}
private Map<String, DataSource> createDataSourceMap() {
- Map<String, DataSource> result = new HashMap<>();
+ Map<String, DataSource> result = new HashMap<>(3, 1);
result.put("demo_primary_ds", DataSourceUtil.createDataSource("demo_primary_ds"));
result.put("demo_replica_ds_0", DataSourceUtil.createDataSource("demo_replica_ds_0"));
result.put("demo_replica_ds_1", DataSourceUtil.createDataSource("demo_replica_ds_1"));
diff --git a/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingMasterSlaveConfigurationRange.java b/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingPrimaryReplicaReplicationConfigurationPrecise.java
similarity index 93%
rename from examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingMasterSlaveConfigurationRange.java
rename to examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingPrimaryReplicaReplicationConfigurationPrecise.java
index c86dda2..4f4e75d 100644
--- a/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingMasterSlaveConfigurationRange.java
+++ b/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingPrimaryReplicaReplicationConfigurationPrecise.java
@@ -36,15 +36,16 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-public final class ShardingMasterSlaveConfigurationRange implements ExampleConfiguration {
+public final class ShardingPrimaryReplicaReplicationConfigurationPrecise implements ExampleConfiguration {
@Override
public DataSource getDataSource() throws SQLException {
- return ShardingSphereDataSourceFactory.createDataSource(createDataSourceMap(), Arrays.asList(createShardingRuleConfiguration(), createMasterSlaveRuleConfiguration()), new Properties());
+ return ShardingSphereDataSourceFactory.createDataSource(
+ createDataSourceMap(), Arrays.asList(createShardingRuleConfiguration(), createPrimaryReplicaReplicationRuleConfiguration()), new Properties());
}
private static Map<String, DataSource> createDataSourceMap() {
- Map<String, DataSource> result = new HashMap<>();
+ Map<String, DataSource> result = new HashMap<>(6, 1);
result.put("demo_primary_ds_0", DataSourceUtil.createDataSource("demo_primary_ds_0"));
result.put("demo_primary_ds_0_replica_0", DataSourceUtil.createDataSource("demo_primary_ds_0_replica_0"));
result.put("demo_primary_ds_0_replica_1", DataSourceUtil.createDataSource("demo_primary_ds_0_replica_1"));
@@ -80,7 +81,7 @@ public final class ShardingMasterSlaveConfigurationRange implements ExampleConfi
return result;
}
- private static PrimaryReplicaReplicationRuleConfiguration createMasterSlaveRuleConfiguration() {
+ private static PrimaryReplicaReplicationRuleConfiguration createPrimaryReplicaReplicationRuleConfiguration() {
PrimaryReplicaReplicationDataSourceRuleConfiguration dataSourceConfiguration1 = new PrimaryReplicaReplicationDataSourceRuleConfiguration(
"ds_0", "demo_primary_ds_0", Arrays.asList("demo_primary_ds_0_replica_0", "demo_primary_ds_0_replica_1"), null);
PrimaryReplicaReplicationDataSourceRuleConfiguration dataSourceConfiguration2 = new PrimaryReplicaReplicationDataSourceRuleConfiguration(
diff --git a/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingMasterSlaveConfigurationPrecise.java b/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingPrimaryReplicaReplicationConfigurationRange.java
similarity index 89%
rename from examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingMasterSlaveConfigurationPrecise.java
rename to examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingPrimaryReplicaReplicationConfigurationRange.java
index c30fd1c..e8edb0b 100644
--- a/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingMasterSlaveConfigurationPrecise.java
+++ b/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingPrimaryReplicaReplicationConfigurationRange.java
@@ -36,15 +36,16 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-public final class ShardingMasterSlaveConfigurationPrecise implements ExampleConfiguration {
+public final class ShardingPrimaryReplicaReplicationConfigurationRange implements ExampleConfiguration {
@Override
public DataSource getDataSource() throws SQLException {
- return ShardingSphereDataSourceFactory.createDataSource(createDataSourceMap(), Arrays.asList(createShardingRuleConfiguration(), createMasterSlaveRuleConfiguration()), new Properties());
+ return ShardingSphereDataSourceFactory.createDataSource(
+ createDataSourceMap(), Arrays.asList(createShardingRuleConfiguration(), createPrimaryReplicaReplicationRuleConfiguration()), new Properties());
}
private static Map<String, DataSource> createDataSourceMap() {
- Map<String, DataSource> result = new HashMap<>();
+ Map<String, DataSource> result = new HashMap<>(6, 1);
result.put("demo_primary_ds_0", DataSourceUtil.createDataSource("demo_primary_ds_0"));
result.put("demo_primary_ds_0_replica_0", DataSourceUtil.createDataSource("demo_primary_ds_0_replica_0"));
result.put("demo_primary_ds_0_replica_1", DataSourceUtil.createDataSource("demo_primary_ds_0_replica_1"));
@@ -80,12 +81,12 @@ public final class ShardingMasterSlaveConfigurationPrecise implements ExampleCon
return result;
}
- private static PrimaryReplicaReplicationRuleConfiguration createMasterSlaveRuleConfiguration() {
- PrimaryReplicaReplicationDataSourceRuleConfiguration dataSourceConfiguration1 = new PrimaryReplicaReplicationDataSourceRuleConfiguration(
+ private static PrimaryReplicaReplicationRuleConfiguration createPrimaryReplicaReplicationRuleConfiguration() {
+ PrimaryReplicaReplicationDataSourceRuleConfiguration dataSourceConfig1 = new PrimaryReplicaReplicationDataSourceRuleConfiguration(
"ds_0", "demo_primary_ds_0", Arrays.asList("demo_primary_ds_0_replica_0", "demo_primary_ds_0_replica_1"), null);
- PrimaryReplicaReplicationDataSourceRuleConfiguration dataSourceConfiguration2 = new PrimaryReplicaReplicationDataSourceRuleConfiguration(
+ PrimaryReplicaReplicationDataSourceRuleConfiguration dataSourceConfig2 = new PrimaryReplicaReplicationDataSourceRuleConfiguration(
"ds_1", "demo_primary_ds_1", Arrays.asList("demo_primary_ds_1_replica_0", "demo_primary_ds_1_replica_1"), null);
- return new PrimaryReplicaReplicationRuleConfiguration(Arrays.asList(dataSourceConfiguration1, dataSourceConfiguration2), Collections.emptyMap());
+ return new PrimaryReplicaReplicationRuleConfiguration(Arrays.asList(dataSourceConfig1, dataSourceConfig2), Collections.emptyMap());
}
private static Properties getProperties() {
diff --git a/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/DataSourceFactory.java b/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/DataSourceFactory.java
index 662b441..26df6a1 100644
--- a/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/DataSourceFactory.java
+++ b/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/DataSourceFactory.java
@@ -17,10 +17,10 @@
package org.apache.shardingsphere.example.sharding.raw.jdbc.factory;
-import org.apache.shardingsphere.example.sharding.raw.jdbc.config.MasterSlaveConfiguration;
+import org.apache.shardingsphere.example.sharding.raw.jdbc.config.PrimaryReplicaReplicationConfiguration;
import org.apache.shardingsphere.example.sharding.raw.jdbc.config.ShardingDatabasesAndTablesConfigurationPrecise;
import org.apache.shardingsphere.example.sharding.raw.jdbc.config.ShardingDatabasesConfigurationPrecise;
-import org.apache.shardingsphere.example.sharding.raw.jdbc.config.ShardingMasterSlaveConfigurationPrecise;
+import org.apache.shardingsphere.example.sharding.raw.jdbc.config.ShardingPrimaryReplicaReplicationConfigurationPrecise;
import org.apache.shardingsphere.example.sharding.raw.jdbc.config.ShardingTablesConfigurationPrecise;
import org.apache.shardingsphere.example.type.ShardingType;
@@ -38,9 +38,9 @@ public final class DataSourceFactory {
case SHARDING_DATABASES_AND_TABLES:
return new ShardingDatabasesAndTablesConfigurationPrecise().getDataSource();
case MASTER_SLAVE:
- return new MasterSlaveConfiguration().getDataSource();
+ return new PrimaryReplicaReplicationConfiguration().getDataSource();
case SHARDING_MASTER_SLAVE:
- return new ShardingMasterSlaveConfigurationPrecise().getDataSource();
+ return new ShardingPrimaryReplicaReplicationConfigurationPrecise().getDataSource();
default:
throw new UnsupportedOperationException(shardingType.name());
}
diff --git a/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/RangeDataSourceFactory.java b/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/RangeDataSourceFactory.java
index 0552479..e30edc2 100644
--- a/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/RangeDataSourceFactory.java
+++ b/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/RangeDataSourceFactory.java
@@ -17,10 +17,10 @@
package org.apache.shardingsphere.example.sharding.raw.jdbc.factory;
-import org.apache.shardingsphere.example.sharding.raw.jdbc.config.MasterSlaveConfiguration;
+import org.apache.shardingsphere.example.sharding.raw.jdbc.config.PrimaryReplicaReplicationConfiguration;
import org.apache.shardingsphere.example.sharding.raw.jdbc.config.ShardingDatabasesAndTablesConfigurationRange;
import org.apache.shardingsphere.example.sharding.raw.jdbc.config.ShardingDatabasesConfigurationRange;
-import org.apache.shardingsphere.example.sharding.raw.jdbc.config.ShardingMasterSlaveConfigurationRange;
+import org.apache.shardingsphere.example.sharding.raw.jdbc.config.ShardingPrimaryReplicaReplicationConfigurationRange;
import org.apache.shardingsphere.example.sharding.raw.jdbc.config.ShardingTablesConfigurationRange;
import org.apache.shardingsphere.example.type.ShardingType;
@@ -38,9 +38,9 @@ public final class RangeDataSourceFactory {
case SHARDING_DATABASES_AND_TABLES:
return new ShardingDatabasesAndTablesConfigurationRange().getDataSource();
case MASTER_SLAVE:
- return new MasterSlaveConfiguration().getDataSource();
+ return new PrimaryReplicaReplicationConfiguration().getDataSource();
case SHARDING_MASTER_SLAVE:
- return new ShardingMasterSlaveConfigurationRange().getDataSource();
+ return new ShardingPrimaryReplicaReplicationConfigurationRange().getDataSource();
default:
throw new UnsupportedOperationException(shardingType.name());
}