You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2020/09/24 11:07:00 UTC
[shardingsphere] branch master updated: Rename
PrimaryReplicaReplication in code - part 4 (#7589)
This is an automated email from the ASF dual-hosted git repository.
panjuan 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 82b1b9d Rename PrimaryReplicaReplication in code - part 4 (#7589)
82b1b9d is described below
commit 82b1b9d51cbceeb283573a80c684a98091fa43d7
Author: Liang Zhang <te...@163.com>
AuthorDate: Thu Sep 24 19:06:37 2020 +0800
Rename PrimaryReplicaReplication in code - part 4 (#7589)
* Rename ShardingType
* Rename ShardingType
* Rename master-slave to primary-replica-replication
* Refactor HintManager
* Rename HintSetPrimaryOnlyCommand
* Refactor HintShowStatusExecutor
* Refactor ShardingCTLHintBackendHandlerTest
* Refactor ReplicaLoadBalanceAlgorithm
* Refactor test cases
* Refactor test cases
* Refactor integrate test cases
* Refactor integrate test cases
---
.../shardingsphere/example/type/ShardingType.java | 6 +-
.../raw/jdbc/JavaConfigurationExampleMain.java | 6 +-
.../raw/jdbc/YamlConfigurationExampleMain.java | 8 +--
.../GovernanceRepositoryConfigurationUtil.java | 4 +-
.../governance/spring/namespace/ExampleMain.java | 6 +-
...=> application-primary-replica-replication.xml} | 0
...=> application-primary-replica-replication.xml} | 0
.../raw/jdbc/JavaConfigurationExampleMain.java | 2 +-
.../example/hint/raw/jdbc/ExampleMain.java | 10 +--
.../example/hint/raw/jdbc/HintType.java | 2 +-
...int-master-only.yaml => hint-primary-only.yaml} | 0
.../raw/jdbc/JavaConfigurationExampleMain.java | 4 +-
.../raw/jdbc/YamlConfigurationExampleMain.java | 2 +-
.../table/raw/jdbc/factory/DataSourceFactory.java | 2 +-
.../raw/jdbc/factory/YamlDataSourceFactory.java | 4 +-
...mary-replica-replication-shadow-databases.yaml} | 0
.../shadow/table/spring/namespace/ExampleMain.java | 2 +-
...imary-replica-replication-shadow-databases.xml} | 0
.../raw/jdbc/JavaConfigurationExampleMain.java | 6 +-
.../jdbc/JavaRangeConfigurationExampleMain.java | 6 +-
.../raw/jdbc/YamlConfigurationExampleMain.java | 6 +-
.../jdbc/YamlRangeConfigurationExampleMain.java | 6 +-
.../raw/jdbc/factory/DataSourceFactory.java | 4 +-
.../raw/jdbc/factory/RangeDataSourceFactory.java | 4 +-
.../raw/jdbc/factory/YamlDataSourceFactory.java | 8 +--
.../jdbc/factory/YamlRangeDataSourceFactory.java | 8 +--
...slave.yaml => primary-replica-replication.yaml} | 0
...harding-primary-replica-replication-range.yaml} | 0
...l => sharding-primary-replica-replication.yaml} | 0
.../sharding/spring/namespace/jpa/ExampleMain.java | 4 +-
...=> application-primary-replica-replication.xml} | 0
...ation-sharding-primary-replica-replication.xml} | 0
.../spring/namespace/mybatis/ExampleMain.java | 4 +-
...=> application-primary-replica-replication.xml} | 0
...ation-sharding-primary-replica-replication.xml} | 0
.../example/proxy/hint/ExampleMain.java | 10 +--
.../example/proxy/hint/HintType.java | 2 +-
...int-master-only.yaml => hint-primary-only.yaml} | 0
.../spi/ReplicaLoadBalanceAlgorithm.java | 6 +-
.../RandomReplicaLoadBalanceAlgorithm.java | 4 +-
.../RoundRobinReplicaLoadBalanceAlgorithm.java | 6 +-
.../PrimaryReplicaReplicationDataSourceRule.java | 2 +-
.../PrimaryReplicaReplicationDataSourceRouter.java | 6 +-
.../governance/core/config/ConfigCenter.java | 10 +--
.../listener/ConfigurationListenerManagerTest.java | 2 +-
.../core/facade/GovernanceFacadeTest.java | 2 +-
.../DataSourceStateChangedListenerTest.java | 2 +-
.../listener/RegistryListenerManagerTest.java | 2 +-
.../shardingsphere/infra/hint/HintManager.java | 16 ++---
.../shardingsphere/infra/hint/HintManagerTest.java | 16 ++---
.../shardingsphere/infra/rule/DataNodesTest.java | 6 +-
.../shardingsphere/infra/route/DataNodeRouter.java | 2 +-
.../dbtest/engine/dml/AdditionalDMLIT.java | 28 ++++----
.../dbtest/engine/dml/BatchDMLIT.java | 8 +--
.../dbtest/engine/dml/GeneralDMLIT.java | 6 +-
.../batch_insert_for_order.xml | 0
.../batch_insert_with_generate_key_column.xml | 0
.../batch_insert_without_generate_key_column.xml | 0
.../delete_with_alias.xml | 0
.../delete_with_sharding_value.xml | 0
.../delete_without_sharding_value.xml | 0
.../insert_for_order_1.xml | 0
.../insert_for_order_1_2.xml | 0
.../insert_for_order_2.xml | 0
.../insert_multiple_values_for_order_1_2.xml | 0
.../insert_on_duplicate_key_update.xml | 0
.../insert_with_generate_key_column.xml | 0
.../insert_with_now_function.xml | 0
.../insert_without_generate_key_column.xml | 0
.../update.xml | 0
.../update_with_column_equal_column.xml | 0
.../update_without_condition.xml | 0
.../batch_insert_for_order.xml | 0
.../batch_insert_with_generate_key_column.xml | 0
.../batch_insert_without_generate_key_column.xml | 0
.../delete_with_alias.xml | 0
.../delete_with_sharding_value.xml | 0
.../delete_without_sharding_value.xml | 0
.../insert_for_order_1.xml | 0
.../insert_for_order_1_2.xml | 0
.../insert_for_order_2.xml | 0
.../insert_multiple_values_for_order_1_2.xml | 0
.../insert_on_duplicate_key_update.xml | 0
.../insert_with_generate_key_column.xml | 0
.../insert_with_now_function.xml | 0
.../insert_without_generate_key_column.xml | 0
.../update.xml | 0
.../update_with_column_equal_column.xml | 0
.../update_without_condition.xml | 0
.../postgresql/select_count_tilde_concat.xml | 0
.../select_alias_as_keyword.xml | 0
.../select_alias_as_single_quote_string.xml | 0
.../select_avg.xml | 0
.../select_between_with_single_table.xml | 0
.../select_comparison_symbol_with_single_table.xml | 0
.../select_count.xml | 0
.../select_count_like_concat.xml | 0
.../select_count_with_binding_tables.xml | 0
.../select_count_with_sub.xml | 0
.../select_count_with_sub_with_whitespace.xml | 0
.../select_distinct_function.xml | 0
.../select_distinct_with_avg.xml | 0
.../select_distinct_with_count.xml | 0
.../select_distinct_with_count_calculation.xml | 0
.../select_distinct_with_count_group_by.xml | 0
.../select_distinct_with_count_sum.xml | 0
.../select_distinct_with_multi_column.xml | 0
...distinct_with_multi_column_without_order_by.xml | 0
.../select_distinct_with_owner_column.xml | 0
...distinct_with_owner_column_without_order_by.xml | 0
.../select_distinct_with_owner_star.xml | 0
...t_distinct_with_owner_star_without_order_by.xml | 0
.../select_distinct_with_single_column.xml | 0
...istinct_with_single_column_without_order_by.xml | 0
.../select_distinct_with_single_count_group_by.xml | 0
.../select_distinct_with_star.xml | 0
.../select_distinct_with_sum.xml | 0
.../select_equal_with_single_table.xml | 0
.../select_for_update.xml | 0
.../select_full_route_with_binding_tables.xml | 0
.../select_group_by_with_avg.xml | 0
.../select_group_by_with_count.xml | 0
...ect_group_by_with_count_without_column_name.xml | 0
.../select_group_by_with_date_function.xml | 0
.../select_group_by_with_key_word_alias.xml | 0
.../select_group_by_with_keyword_alias.xml | 0
.../select_group_by_with_limit.xml | 0
.../select_group_by_with_max.xml | 0
.../select_group_by_with_min.xml | 0
.../select_group_by_with_order_by_and_limit.xml | 0
.../select_group_by_with_order_by_desc.xml | 0
.../select_group_by_with_sum.xml | 0
.../select_group_by_without_grouped_column.xml | 0
.../select_in_with_same_sharding_column.xml | 0
.../select_in_with_single_table.xml | 0
.../select_inner_join.xml | 0
.../select_max.xml | 0
.../select_min.xml | 0
.../select_not_equal_with_single_table.xml | 0
.../select_not_in_with_single_table.xml | 0
.../select_or_mix_and_for_complex_pattern.xml | 0
.../select_or_mix_and_for_simple_pattern.xml | 0
...r_mix_and_with_binding_and_broadcast_tables.xml | 0
.../select_or_mix_and_with_binding_tables.xml | 0
.../select_or_with_different_sharding_columns.xml | 0
.../select_or_with_none_sharding_columns.xml | 0
.../select_or_with_same_sharding_columns.xml | 0
.../select_order_by_asc_and_index_desc.xml | 0
.../select_order_by_desc_and_index_asc.xml | 0
.../select_order_by_with_alias_star_alias_name.xml | 0
.../select_order_by_with_date.xml | 0
.../select_order_by_with_multiple_stars.xml | 0
.../select_order_by_with_ordered_column.xml | 0
.../select_order_by_with_star_no_table_alias.xml | 0
.../select_order_by_with_star_table_alias.xml | 0
.../select_order_by_with_table_star_table_name.xml | 0
...order_by_with_table_star_without_table_name.xml | 0
..._pagination_with_diff_group_by_and_order_by.xml | 0
...elect_pagination_with_group_by_and_order_by.xml | 0
.../select_pagination_with_offset.xml | 0
.../select_pagination_with_offset_and_limit.xml | 0
...select_pagination_with_offset_and_row_count.xml | 0
.../select_pagination_with_offset_fetch.xml | 0
.../select_pagination_with_row_count.xml | 0
...select_pagination_with_row_number_and_limit.xml | 0
...elect_pagination_with_row_number_not_at_end.xml | 0
.../select_pagination_with_top_and_limit.xml | 0
.../select_sharding_route_with_binding_tables.xml | 0
.../select_sharding_route_with_broadcast_table.xml | 0
.../select_sub_query_with_group_by.xml | 0
.../select_sub_query_with_multiple_tables.xml | 0
.../select_sub_query_with_order_by.xml | 0
.../select_sum.xml | 0
.../select_with_case_expression.xml | 0
.../select_with_date_function.xml | 0
.../select_with_expression.xml | 0
.../select_with_force_index_join.xml | 0
...tem_alias_match_order_by_and_group_by_items.xml | 0
.../select_with_regexp.xml | 0
.../mysql/select_avg.xml | 0
.../mysql/select_group_by_with_avg.xml | 0
.../postgresql/select_avg.xml | 0
.../postgresql/select_count_tilde_concat.xml | 0
.../postgresql/select_group_by_with_avg.xml | 0
.../select_alias_as_keyword.xml | 0
.../select_alias_as_single_quote_string.xml | 0
.../select_avg.xml | 0
.../select_between_with_single_table.xml | 0
.../select_comparison_symbol_with_single_table.xml | 0
.../select_count.xml | 0
.../select_count_like_concat.xml | 0
.../select_count_with_binding_tables.xml | 0
.../select_count_with_sub.xml | 0
.../select_count_with_sub_with_whitespace.xml | 0
.../select_distinct_function.xml | 0
.../select_distinct_with_avg.xml | 0
.../select_distinct_with_count.xml | 0
.../select_distinct_with_count_calculation.xml | 0
.../select_distinct_with_count_group_by.xml | 0
.../select_distinct_with_count_sum.xml | 0
.../select_distinct_with_multi_column.xml | 0
...distinct_with_multi_column_without_order_by.xml | 0
.../select_distinct_with_owner_column.xml | 0
...distinct_with_owner_column_without_order_by.xml | 0
.../select_distinct_with_owner_star.xml | 0
...t_distinct_with_owner_star_without_order_by.xml | 0
.../select_distinct_with_single_column.xml | 0
...istinct_with_single_column_without_order_by.xml | 0
.../select_distinct_with_single_count_group_by.xml | 0
.../select_distinct_with_star.xml | 0
.../select_distinct_with_sum.xml | 0
.../select_equal_with_single_table.xml | 0
.../select_for_update.xml | 0
.../select_full_route_with_binding_tables.xml | 0
.../select_group_by_with_avg.xml | 0
.../select_group_by_with_count.xml | 0
...ect_group_by_with_count_without_column_name.xml | 0
.../select_group_by_with_key_word_alias.xml | 0
.../select_group_by_with_keyword_alias.xml | 0
.../select_group_by_with_limit.xml | 0
.../select_group_by_with_max.xml | 0
.../select_group_by_with_min.xml | 0
.../select_group_by_with_order_by_and_limit.xml | 0
.../select_group_by_with_order_by_desc.xml | 0
.../select_group_by_with_sum.xml | 0
.../select_group_by_without_grouped_column.xml | 0
.../select_in_with_same_sharding_column.xml | 0
.../select_in_with_single_table.xml | 0
.../select_inner_join.xml | 0
.../select_max.xml | 0
.../select_min.xml | 0
.../select_not_equal_with_single_table.xml | 0
.../select_not_in_with_single_table.xml | 0
.../select_or_mix_and_for_complex_pattern.xml | 0
.../select_or_mix_and_for_simple_pattern.xml | 0
...r_mix_and_with_binding_and_broadcast_tables.xml | 0
.../select_or_mix_and_with_binding_tables.xml | 0
.../select_or_with_different_sharding_columns.xml | 0
.../select_or_with_none_sharding_columns.xml | 0
.../select_or_with_same_sharding_columns.xml | 0
.../select_order_by_asc_and_index_desc.xml | 0
.../select_order_by_desc_and_index_asc.xml | 0
.../select_order_by_with_alias_star_alias_name.xml | 0
.../select_order_by_with_date.xml | 0
.../select_order_by_with_multiple_stars.xml | 0
.../select_order_by_with_ordered_column.xml | 0
.../select_order_by_with_star_no_table_alias.xml | 0
.../select_order_by_with_star_table_alias.xml | 0
.../select_order_by_with_table_star_table_name.xml | 0
...order_by_with_table_star_without_table_name.xml | 0
..._pagination_with_diff_group_by_and_order_by.xml | 0
...elect_pagination_with_group_by_and_order_by.xml | 0
.../select_pagination_with_offset.xml | 0
.../select_pagination_with_offset_and_limit.xml | 0
...select_pagination_with_offset_and_row_count.xml | 0
.../select_pagination_with_offset_fetch.xml | 0
.../select_pagination_with_row_count.xml | 0
...select_pagination_with_row_number_and_limit.xml | 0
...elect_pagination_with_row_number_not_at_end.xml | 0
.../select_pagination_with_top_and_limit.xml | 0
.../select_sharding_route_with_binding_tables.xml | 0
.../select_sharding_route_with_broadcast_table.xml | 0
.../select_sub_query_with_group_by.xml | 0
.../select_sub_query_with_multiple_tables.xml | 0
.../select_sub_query_with_order_by.xml | 0
.../select_sum.xml | 0
.../select_with_case_expression.xml | 0
.../select_with_date_function.xml | 0
.../select_with_expression.xml | 0
.../select_with_force_index_join.xml | 0
...tem_alias_match_order_by_and_group_by_items.xml | 0
.../select_with_regexp.xml | 0
.../src/test/resources/integrate/env.properties | 4 +-
.../authority.xml | 0
.../dataset.xml | 0
.../schema.xml | 0
.../sharding-rule.yaml | 0
.../authority.xml | 0
.../dataset.xml | 0
.../schema.xml | 0
.../sharding-rule.yaml | 0
.../connection/ShardingSphereConnectionTest.java | 8 +--
...gBootRegistryPrimaryReplicaReplicationTest.java | 2 +-
...egistry-primary-replica-replication.properties} | 0
.../text/sctl/hint/ShardingCTLHintParser.java | 14 ++--
.../hint/internal/HintCommandExecutorFactory.java | 8 +--
...Command.java => HintSetPrimaryOnlyCommand.java} | 8 +--
...ecutor.java => HintSetPrimaryOnlyExecutor.java} | 12 ++--
.../internal/executor/HintShowStatusExecutor.java | 8 +--
.../hint/ShardingCTLHintBackendHandlerTest.java | 77 +++++++++++-----------
.../text/sctl/hint/ShardingCTLHintParserTest.java | 12 ++--
.../internal/HintCommandExecutorFactoryTest.java | 12 ++--
.../proxy/config/ProxyConfigurationLoaderTest.java | 6 +-
293 files changed, 210 insertions(+), 211 deletions(-)
diff --git a/examples/example-core/config-utility/src/main/java/org/apache/shardingsphere/example/type/ShardingType.java b/examples/example-core/config-utility/src/main/java/org/apache/shardingsphere/example/type/ShardingType.java
index d233477..63000ca 100644
--- a/examples/example-core/config-utility/src/main/java/org/apache/shardingsphere/example/type/ShardingType.java
+++ b/examples/example-core/config-utility/src/main/java/org/apache/shardingsphere/example/type/ShardingType.java
@@ -29,11 +29,11 @@ public enum ShardingType {
ENCRYPT_SHADOW,
- MASTER_SLAVE,
+ PRIMARY_REPLICA_REPLICATION,
- MASTER_SLAVE_SHADOW,
+ PRIMARY_REPLICA_REPLICATION_SHADOW,
- SHARDING_MASTER_SLAVE,
+ SHARDING_PRIMARY_REPLICA_REPLICATION,
ENCRYPT,
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 4d86194..655acce 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
@@ -39,14 +39,14 @@ import javax.sql.DataSource;
import java.sql.SQLException;
/*
- * 1. Please make sure master-slave data sync on MySQL is running correctly. Otherwise this example will query empty data from slave.
+ * 1. Please make sure primary-replication-replica data sync on MySQL is running correctly. Otherwise this example will query empty data from replica.
* 2. Please make sure sharding-governance-center-zookeeper-curator in your pom if registryCenterType = RegistryCenterType.ZOOKEEPER.
* 3. Please make sure sharding-governance-center-nacos in your pom if registryCenterType = RegistryCenterType.NACOS.
*/
public final class JavaConfigurationExampleMain {
private static ShardingType shardingType = ShardingType.SHARDING_DATABASES_AND_TABLES;
-// private static ShardingType shardingType = ShardingType.MASTER_SLAVE;
+// private static ShardingType shardingType = ShardingType.PRIMARY_REPLICA_REPLICATION;
// private static ShardingType shardingType = ShardingType.ENCRYPT;
// private static ShardingType shardingType = ShardingType.SHADOW;
@@ -73,7 +73,7 @@ public final class JavaConfigurationExampleMain {
configuration = loadConfigFromRegCenter
? new CloudShardingDatabasesAndTablesConfiguration(governanceConfig) : new LocalShardingDatabasesAndTablesConfiguration(governanceConfig);
break;
- case MASTER_SLAVE:
+ case PRIMARY_REPLICA_REPLICATION:
configuration = loadConfigFromRegCenter ? new CloudPrimaryReplicaReplicationConfiguration(governanceConfig) : new LocalPrimaryReplicaReplicationConfiguration(governanceConfig);
break;
case ENCRYPT:
diff --git a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/YamlConfigurationExampleMain.java b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/YamlConfigurationExampleMain.java
index 2f0644f..f41f8ae 100644
--- a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/YamlConfigurationExampleMain.java
+++ b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/YamlConfigurationExampleMain.java
@@ -31,14 +31,14 @@ import java.io.IOException;
import java.sql.SQLException;
/*
- * 1. Please make sure master-slave data sync on MySQL is running correctly. Otherwise this example will query empty data from slave.
+ * 1. Please make sure primary-replica-replication data sync on MySQL is running correctly. Otherwise this example will query empty data from replica.
* 2. Please make sure sharding-governance-center-zookeeper-curator in your pom if registryCenterType = RegistryCenterType.ZOOKEEPER.
* 3. Please make sure sharding-governance-center-nacos in your pom if registryCenterType = RegistryCenterType.NACOS.
*/
public final class YamlConfigurationExampleMain {
private static ShardingType shardingType = ShardingType.SHARDING_DATABASES_AND_TABLES;
-// private static ShardingType shardingType = ShardingType.MASTER_SLAVE;
+// private static ShardingType shardingType = ShardingType.PRIMARY_REPLICA_REPLICATION;
// private static ShardingType shardingType = ShardingType.ENCRYPT;
// private static ShardingType shardingType = ShardingType.SHADOW;
@@ -63,8 +63,8 @@ public final class YamlConfigurationExampleMain {
case SHARDING_DATABASES_AND_TABLES:
yamlFilePath = String.format("/META-INF/%s/%s/sharding-databases-tables.yaml", registryCenterType.name().toLowerCase(), loadConfigFromRegCenter ? "cloud" : "local");
return YamlGovernanceShardingSphereDataSourceFactory.createDataSource(getFile(yamlFilePath));
- case MASTER_SLAVE:
- yamlFilePath = String.format("/META-INF/%s/%s/master-slave.yaml", registryCenterType.name().toLowerCase(), loadConfigFromRegCenter ? "cloud" : "local");
+ case PRIMARY_REPLICA_REPLICATION:
+ yamlFilePath = String.format("/META-INF/%s/%s/primary-replica-replication.yaml", registryCenterType.name().toLowerCase(), loadConfigFromRegCenter ? "cloud" : "local");
return YamlGovernanceShardingSphereDataSourceFactory.createDataSource(getFile(yamlFilePath));
case ENCRYPT:
yamlFilePath = String.format("/META-INF/%s/%s/encrypt.yaml", registryCenterType.name().toLowerCase(), loadConfigFromRegCenter ? "cloud" : "local");
diff --git a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/GovernanceRepositoryConfigurationUtil.java b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/GovernanceRepositoryConfigurationUtil.java
index 35adca5..170ea5c 100644
--- a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/GovernanceRepositoryConfigurationUtil.java
+++ b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/GovernanceRepositoryConfigurationUtil.java
@@ -34,7 +34,7 @@ public final class GovernanceRepositoryConfigurationUtil {
switch (shardingType) {
case SHARDING_DATABASES_AND_TABLES:
return new GovernanceConfiguration("governance-sharding-data-source", governanceCenterConfig, overwrite);
- case MASTER_SLAVE:
+ case PRIMARY_REPLICA_REPLICATION:
return new GovernanceConfiguration("governance-ms-data-source", governanceCenterConfig, overwrite);
case ENCRYPT:
return new GovernanceConfiguration("governance-encrypt-data-source", governanceCenterConfig, overwrite);
@@ -55,7 +55,7 @@ public final class GovernanceRepositoryConfigurationUtil {
switch (shardingType) {
case SHARDING_DATABASES_AND_TABLES:
return new GovernanceConfiguration("governance-zookeeper-sharding-data-source", zookeeperConfig, nacosConfig, overwrite);
- case MASTER_SLAVE:
+ case PRIMARY_REPLICA_REPLICATION:
return new GovernanceConfiguration("governance-zookeeper-ms-data-source", zookeeperConfig, nacosConfig, overwrite);
case ENCRYPT:
return new GovernanceConfiguration("governance-zookeeper-encrypt-data-source", zookeeperConfig, nacosConfig, overwrite);
diff --git a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/java/org/apache/shardingsphere/example/governance/spring/namespace/ExampleMain.java b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/java/org/apache/shardingsphere/example/governance/spring/namespace/ExampleMain.java
index d60d12f..b5f519d 100644
--- a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/java/org/apache/shardingsphere/example/governance/spring/namespace/ExampleMain.java
+++ b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/java/org/apache/shardingsphere/example/governance/spring/namespace/ExampleMain.java
@@ -29,7 +29,7 @@ import java.sql.SQLException;
public final class ExampleMain {
private static ShardingType shardingType = ShardingType.SHARDING_DATABASES_AND_TABLES;
-// private static ShardingType shardingType = ShardingType.MASTER_SLAVE;
+// private static ShardingType shardingType = ShardingType.PRIMARY_REPLICA_REPLICATION;
// private static ShardingType shardingType = ShardingType.ENCRYPT;
// private static ShardingType shardingType = ShardingType.SHADOW;
@@ -49,8 +49,8 @@ public final class ExampleMain {
switch (shardingType) {
case SHARDING_DATABASES_AND_TABLES:
return String.format("META-INF/%s/%s/application-sharding-databases-tables.xml", registryCenterType.name().toLowerCase(), loadConfigFromRegCenter ? "cloud" : "local");
- case MASTER_SLAVE:
- return String.format("META-INF/%s/%s/application-master-slave.xml", registryCenterType.name().toLowerCase(), loadConfigFromRegCenter ? "cloud" : "local");
+ case PRIMARY_REPLICA_REPLICATION:
+ return String.format("META-INF/%s/%s/application-primary-replica-replication.xml", registryCenterType.name().toLowerCase(), loadConfigFromRegCenter ? "cloud" : "local");
case ENCRYPT:
return String.format("META-INF/%s/%s/application-encrypt.xml", registryCenterType.name().toLowerCase(), loadConfigFromRegCenter ? "cloud" : "local");
case SHADOW:
diff --git a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/nacos/cloud/application-master-slave.xml b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/nacos/cloud/application-primary-replica-replication.xml
similarity index 100%
rename from examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/nacos/cloud/application-master-slave.xml
rename to examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/nacos/cloud/application-primary-replica-replication.xml
diff --git a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/nacos/local/application-master-slave.xml b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/nacos/local/application-primary-replica-replication.xml
similarity index 100%
rename from examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/nacos/local/application-master-slave.xml
rename to examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/nacos/local/application-primary-replica-replication.xml
diff --git a/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt/table/raw/jdbc/JavaConfigurationExampleMain.java b/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt/table/raw/jdbc/JavaConfigurationExampleMain.java
index 99ca68f..4ba2302 100644
--- a/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt/table/raw/jdbc/JavaConfigurationExampleMain.java
+++ b/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt/table/raw/jdbc/JavaConfigurationExampleMain.java
@@ -16,7 +16,7 @@
*/
/*
- * Please make sure master-slave data sync on MySQL is running correctly. Otherwise this example will query empty data from slave.
+ * Please make sure primary-replica-replication data sync on MySQL is running correctly. Otherwise this example will query empty data from replica.
*/
package org.apache.shardingsphere.example.encrypt.table.raw.jdbc;
diff --git a/examples/shardingsphere-jdbc-example/other-feature-example/hint-example/hint-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/hint/raw/jdbc/ExampleMain.java b/examples/shardingsphere-jdbc-example/other-feature-example/hint-example/hint-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/hint/raw/jdbc/ExampleMain.java
index 4a1a29a..6831354 100644
--- a/examples/shardingsphere-jdbc-example/other-feature-example/hint-example/hint-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/hint/raw/jdbc/ExampleMain.java
+++ b/examples/shardingsphere-jdbc-example/other-feature-example/hint-example/hint-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/hint/raw/jdbc/ExampleMain.java
@@ -33,7 +33,7 @@ public final class ExampleMain {
private static final HintType TYPE = HintType.DATABASE_TABLES;
// private static final HintType TYPE = HintType.DATABASE_ONLY;
-// private static final HintType TYPE = HintType.MASTER_ONLY;
+// private static final HintType TYPE = HintType.PRIMARY_ONLY;
public static void main(final String[] args) throws SQLException, IOException {
DataSource dataSource = getDataSource();
@@ -49,8 +49,8 @@ public final class ExampleMain {
return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/hint-databases-tables.yaml"));
case DATABASE_ONLY:
return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/hint-databases-only.yaml"));
- case MASTER_ONLY:
- return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/hint-master-only.yaml"));
+ case PRIMARY_ONLY:
+ return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/hint-primary-only.yaml"));
default:
throw new UnsupportedOperationException("unsupported type");
}
@@ -85,8 +85,8 @@ public final class ExampleMain {
case DATABASE_ONLY:
hintManager.setDatabaseShardingValue(1L);
return;
- case MASTER_ONLY:
- hintManager.setMasterRouteOnly();
+ case PRIMARY_ONLY:
+ hintManager.setPrimaryRouteOnly();
return;
default:
throw new UnsupportedOperationException("unsupported type");
diff --git a/examples/shardingsphere-jdbc-example/other-feature-example/hint-example/hint-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/hint/raw/jdbc/HintType.java b/examples/shardingsphere-jdbc-example/other-feature-example/hint-example/hint-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/hint/raw/jdbc/HintType.java
index 596c95d..fc1c04f 100644
--- a/examples/shardingsphere-jdbc-example/other-feature-example/hint-example/hint-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/hint/raw/jdbc/HintType.java
+++ b/examples/shardingsphere-jdbc-example/other-feature-example/hint-example/hint-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/hint/raw/jdbc/HintType.java
@@ -19,5 +19,5 @@ package org.apache.shardingsphere.example.hint.raw.jdbc;
public enum HintType {
- DATABASE_ONLY, DATABASE_TABLES, MASTER_ONLY
+ DATABASE_ONLY, DATABASE_TABLES, PRIMARY_ONLY
}
diff --git a/examples/shardingsphere-jdbc-example/other-feature-example/hint-example/hint-raw-jdbc-example/src/main/resources/META-INF/hint-master-only.yaml b/examples/shardingsphere-jdbc-example/other-feature-example/hint-example/hint-raw-jdbc-example/src/main/resources/META-INF/hint-primary-only.yaml
similarity index 100%
rename from examples/shardingsphere-jdbc-example/other-feature-example/hint-example/hint-raw-jdbc-example/src/main/resources/META-INF/hint-master-only.yaml
rename to examples/shardingsphere-jdbc-example/other-feature-example/hint-example/hint-raw-jdbc-example/src/main/resources/META-INF/hint-primary-only.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/JavaConfigurationExampleMain.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/JavaConfigurationExampleMain.java
index 729fa5b..32d8326 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/JavaConfigurationExampleMain.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/JavaConfigurationExampleMain.java
@@ -16,7 +16,7 @@
*/
/*
- * Please make sure master-slave data sync on MySQL is running correctly. Otherwise this example will query empty data from slave.
+ * Please make sure primary-replica-replication data sync on MySQL is running correctly. Otherwise this example will query empty data from replica.
*/
package org.apache.shardingsphere.example.shadow.table.raw.jdbc;
@@ -34,7 +34,7 @@ import java.sql.SQLException;
public final class JavaConfigurationExampleMain {
private static ShardingType shardingType = ShardingType.SHADOW;
-// private static ShardingType shardingType = ShardingType.MASTER_SLAVE_SHADOW;
+// private static ShardingType shardingType = ShardingType.PRIMARY_REPLICA_REPLICATION_SHADOW;
// private static ShardingType shardingType = ShardingType.ENCRYPT_SHADOW;
// private static ShardingType shardingType = ShardingType.SHARDING_SHADOW_DATABASES;
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/YamlConfigurationExampleMain.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/YamlConfigurationExampleMain.java
index 5da8b59..3025774 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/YamlConfigurationExampleMain.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/YamlConfigurationExampleMain.java
@@ -31,7 +31,7 @@ import java.sql.SQLException;
public final class YamlConfigurationExampleMain {
private static ShardingType shardingType = ShardingType.SHADOW;
-// private static ShardingType shardingType = ShardingType.MASTER_SLAVE_SHADOW;
+// private static ShardingType shardingType = ShardingType.PRIMARY_REPLICA_REPLICATION_SHADOW;
// private static ShardingType shardingType = ShardingType.ENCRYPT_SHADOW;
// private static ShardingType shardingType = ShardingType.SHARDING_SHADOW_DATABASES;
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 25d8f7e..cbad7d5 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
@@ -36,7 +36,7 @@ public final class DataSourceFactory {
return new ShardingShadowDatabasesConfiguration().getDataSource();
case ENCRYPT_SHADOW:
return new EncryptShadowDatabasesConfiguration().getDataSource();
- case MASTER_SLAVE_SHADOW:
+ case PRIMARY_REPLICA_REPLICATION_SHADOW:
return new PrimaryReplicaReplicationShadowDatabasesConfiguration().getDataSource();
default:
throw new UnsupportedOperationException(shardingType.name());
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/YamlDataSourceFactory.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/YamlDataSourceFactory.java
index 5066244..9393951 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/YamlDataSourceFactory.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/YamlDataSourceFactory.java
@@ -35,8 +35,8 @@ public final class YamlDataSourceFactory {
return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/shadow-databases.yaml"));
case ENCRYPT_SHADOW:
return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/encrypt-shadow-databases.yaml"));
- case MASTER_SLAVE_SHADOW:
- return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/master-slave-shadow-databases.yaml"));
+ case PRIMARY_REPLICA_REPLICATION_SHADOW:
+ return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/primary-replica-replication-shadow-databases.yaml"));
default:
throw new UnsupportedOperationException(shardingType.name());
}
diff --git a/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/resources/META-INF/master-slave-shadow-databases.yaml b/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/resources/META-INF/primary-replica-replication-shadow-databases.yaml
similarity index 100%
rename from examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/resources/META-INF/master-slave-shadow-databases.yaml
rename to examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/resources/META-INF/primary-replica-replication-shadow-databases.yaml
diff --git a/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-example/src/main/java/org/apache/shardingsphere/example/shadow/table/spring/namespace/ExampleMain.java b/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-example/src/main/java/org/apache/shardingsphere/example/shadow/table/spring/namespace/ExampleMain.java
index 00333c3..052f515 100644
--- a/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-example/src/main/java/org/apache/shardingsphere/example/shadow/table/spring/namespace/ExampleMain.java
+++ b/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-example/src/main/java/org/apache/shardingsphere/example/shadow/table/spring/namespace/ExampleMain.java
@@ -28,7 +28,7 @@ public final class ExampleMain {
private static final String CONFIG_FILE = "META-INF/application-shadow-databases.xml";
// private static final String CONFIG_FILE = "META-INF/application-sharding-shadow-databases.xml";
-// private static final String CONFIG_FILE = "META-INF/application-master-slave-shadow-databases.xml";
+// private static final String CONFIG_FILE = "META-INF/application-primary-replica-replication-shadow-databases.xml";
// private static final String CONFIG_FILE = "META-INF/application-encrypt-shadow-databases.xml";
public static void main(final String[] args) throws SQLException {
diff --git a/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-example/src/main/resources/META-INF/application-master-slave-shadow-databases.xml b/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-example/src/main/resources/META-INF/application-primary-replica-replication-shadow-databases.xml
similarity index 100%
rename from examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-example/src/main/resources/META-INF/application-master-slave-shadow-databases.xml
rename to examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-spring-namespace-example/src/main/resources/META-INF/application-primary-replica-replication-shadow-databases.xml
diff --git a/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/JavaConfigurationExampleMain.java b/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/JavaConfigurationExampleMain.java
index 9dbfd08..dbf8dfc 100644
--- a/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/JavaConfigurationExampleMain.java
+++ b/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/JavaConfigurationExampleMain.java
@@ -27,15 +27,15 @@ import javax.sql.DataSource;
import java.sql.SQLException;
/*
- * Please make sure master-slave data sync on MySQL is running correctly. Otherwise this example will query empty data from slave.
+ * Please make sure primary-replica-replication data sync on MySQL is running correctly. Otherwise this example will query empty data from replica.
*/
public final class JavaConfigurationExampleMain {
private static ShardingType shardingType = ShardingType.SHARDING_DATABASES;
// private static ShardingType shardingType = ShardingType.SHARDING_TABLES;
// private static ShardingType shardingType = ShardingType.SHARDING_DATABASES_AND_TABLES;
-// private static ShardingType shardingType = ShardingType.MASTER_SLAVE;
-// private static ShardingType shardingType = ShardingType.SHARDING_MASTER_SLAVE;
+// private static ShardingType shardingType = ShardingType.PRIMARY_REPLICA_REPLICATION;
+// private static ShardingType shardingType = ShardingType.SHARDING_PRIMARY_REPLICA_REPLICATION;
public static void main(final String[] args) throws SQLException {
DataSource dataSource = DataSourceFactory.newInstance(shardingType);
diff --git a/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/JavaRangeConfigurationExampleMain.java b/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/JavaRangeConfigurationExampleMain.java
index d9d59ce..acda2a2 100644
--- a/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/JavaRangeConfigurationExampleMain.java
+++ b/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/JavaRangeConfigurationExampleMain.java
@@ -30,15 +30,15 @@ import javax.sql.DataSource;
import java.sql.SQLException;
/*
- * Please make sure master-slave data sync on MySQL is running correctly. Otherwise this example will query empty data from slave.
+ * Please make sure primary-replica-replication data sync on MySQL is running correctly. Otherwise this example will query empty data from replica.
*/
public final class JavaRangeConfigurationExampleMain {
private static ShardingType shardingType = ShardingType.SHARDING_DATABASES;
// private static ShardingType shardingType = ShardingType.SHARDING_TABLES;
// private static ShardingType shardingType = ShardingType.SHARDING_DATABASES_AND_TABLES;
-// private static ShardingType shardingType = ShardingType.MASTER_SLAVE;
-// private static ShardingType shardingType = ShardingType.SHARDING_MASTER_SLAVE;
+// private static ShardingType shardingType = ShardingType.PRIMARY_REPLICA_REPLICATION;
+// private static ShardingType shardingType = ShardingType.SHARDING_PRIMARY_REPLICA_REPLICATION;
public static void main(final String[] args) throws SQLException {
DataSource dataSource = RangeDataSourceFactory.newInstance(shardingType);
diff --git a/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/YamlConfigurationExampleMain.java b/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/YamlConfigurationExampleMain.java
index 6579cd6..ec702df 100644
--- a/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/YamlConfigurationExampleMain.java
+++ b/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/YamlConfigurationExampleMain.java
@@ -28,15 +28,15 @@ import java.io.IOException;
import java.sql.SQLException;
/*
- * Please make sure master-slave data sync on MySQL is running correctly. Otherwise this example will query empty data from slave.
+ * Please make sure primary-replica-replication data sync on MySQL is running correctly. Otherwise this example will query empty data from replica.
*/
public final class YamlConfigurationExampleMain {
private static ShardingType shardingType = ShardingType.SHARDING_DATABASES;
// private static ShardingType shardingType = ShardingType.SHARDING_TABLES;
// private static ShardingType shardingType = ShardingType.SHARDING_DATABASES_AND_TABLES;
-// private static ShardingType shardingType = ShardingType.MASTER_SLAVE;
-// private static ShardingType shardingType = ShardingType.SHARDING_MASTER_SLAVE;
+// private static ShardingType shardingType = ShardingType.PRIMARY_REPLICA_REPLICATION;
+// private static ShardingType shardingType = ShardingType.SHARDING_PRIMARY_REPLICA_REPLICATION;
public static void main(final String[] args) throws SQLException, IOException {
DataSource dataSource = YamlDataSourceFactory.newInstance(shardingType);
diff --git a/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/YamlRangeConfigurationExampleMain.java b/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/YamlRangeConfigurationExampleMain.java
index a42b9f9..f3ee9bf 100644
--- a/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/YamlRangeConfigurationExampleMain.java
+++ b/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/YamlRangeConfigurationExampleMain.java
@@ -28,15 +28,15 @@ import java.io.IOException;
import java.sql.SQLException;
/*
- * Please make sure master-slave data sync on MySQL is running correctly. Otherwise this example will query empty data from slave.
+ * Please make sure primary-replica-replication data sync on MySQL is running correctly. Otherwise this example will query empty data from replica.
*/
public final class YamlRangeConfigurationExampleMain {
private static ShardingType shardingType = ShardingType.SHARDING_DATABASES;
// private static ShardingType shardingType = ShardingType.SHARDING_TABLES;
// private static ShardingType shardingType = ShardingType.SHARDING_DATABASES_AND_TABLES;
-// private static ShardingType shardingType = ShardingType.MASTER_SLAVE;
-// private static ShardingType shardingType = ShardingType.SHARDING_MASTER_SLAVE;
+// private static ShardingType shardingType = ShardingType.PRIMARY_REPLICA_REPLICATION;
+// private static ShardingType shardingType = ShardingType.SHARDING_PRIMARY_REPLICA_REPLICATION;
public static void main(final String[] args) throws SQLException, IOException {
DataSource dataSource = YamlRangeDataSourceFactory.newInstance(shardingType);
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 26df6a1..a503ea0 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
@@ -37,9 +37,9 @@ public final class DataSourceFactory {
return new ShardingTablesConfigurationPrecise().getDataSource();
case SHARDING_DATABASES_AND_TABLES:
return new ShardingDatabasesAndTablesConfigurationPrecise().getDataSource();
- case MASTER_SLAVE:
+ case PRIMARY_REPLICA_REPLICATION:
return new PrimaryReplicaReplicationConfiguration().getDataSource();
- case SHARDING_MASTER_SLAVE:
+ case SHARDING_PRIMARY_REPLICA_REPLICATION:
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 e30edc2..3d86707 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
@@ -37,9 +37,9 @@ public final class RangeDataSourceFactory {
return new ShardingTablesConfigurationRange().getDataSource();
case SHARDING_DATABASES_AND_TABLES:
return new ShardingDatabasesAndTablesConfigurationRange().getDataSource();
- case MASTER_SLAVE:
+ case PRIMARY_REPLICA_REPLICATION:
return new PrimaryReplicaReplicationConfiguration().getDataSource();
- case SHARDING_MASTER_SLAVE:
+ case SHARDING_PRIMARY_REPLICA_REPLICATION:
return new ShardingPrimaryReplicaReplicationConfigurationRange().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/YamlDataSourceFactory.java b/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/YamlDataSourceFactory.java
index 6c03dac..09cf1fc 100644
--- a/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/YamlDataSourceFactory.java
+++ b/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/YamlDataSourceFactory.java
@@ -35,10 +35,10 @@ public final class YamlDataSourceFactory {
return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/sharding-tables.yaml"));
case SHARDING_DATABASES_AND_TABLES:
return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/sharding-databases-tables.yaml"));
- case MASTER_SLAVE:
- return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/master-slave.yaml"));
- case SHARDING_MASTER_SLAVE:
- return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/sharding-master-slave.yaml"));
+ case PRIMARY_REPLICA_REPLICATION:
+ return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/primary-replica-replication.yaml"));
+ case SHARDING_PRIMARY_REPLICA_REPLICATION:
+ return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/sharding-primary-replica-replication.yaml"));
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/YamlRangeDataSourceFactory.java b/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/YamlRangeDataSourceFactory.java
index 7d13845..8eff4ec 100644
--- a/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/YamlRangeDataSourceFactory.java
+++ b/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/YamlRangeDataSourceFactory.java
@@ -35,10 +35,10 @@ public final class YamlRangeDataSourceFactory {
return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/sharding-tables-range.yaml"));
case SHARDING_DATABASES_AND_TABLES:
return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/sharding-databases-tables-range.yaml"));
- case MASTER_SLAVE:
- return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/master-slave.yaml"));
- case SHARDING_MASTER_SLAVE:
- return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/sharding-master-slave-range.yaml"));
+ case PRIMARY_REPLICA_REPLICATION:
+ return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/primary-replica-replication.yaml"));
+ case SHARDING_PRIMARY_REPLICA_REPLICATION:
+ return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/sharding-primary-replica-replication-range.yaml"));
default:
throw new UnsupportedOperationException(shardingType.name());
}
diff --git a/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/master-slave.yaml b/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/primary-replica-replication.yaml
similarity index 100%
rename from examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/master-slave.yaml
rename to examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/primary-replica-replication.yaml
diff --git a/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-master-slave-range.yaml b/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-primary-replica-replication-range.yaml
similarity index 100%
rename from examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-master-slave-range.yaml
rename to examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-primary-replica-replication-range.yaml
diff --git a/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-master-slave.yaml b/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-primary-replica-replication.yaml
similarity index 100%
rename from examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-master-slave.yaml
rename to examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-primary-replica-replication.yaml
diff --git a/examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-jpa-example/src/main/java/org/apache/shardingsphere/example/sharding/spring/namespace/jpa/ExampleMain.java b/examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-jpa-example/src/main/java/org/apache/shardingsphere/example/sharding/spring/namespace/jpa/ExampleMain.java
index 362e037..e701d06 100644
--- a/examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-jpa-example/src/main/java/org/apache/shardingsphere/example/sharding/spring/namespace/jpa/ExampleMain.java
+++ b/examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-jpa-example/src/main/java/org/apache/shardingsphere/example/sharding/spring/namespace/jpa/ExampleMain.java
@@ -29,8 +29,8 @@ public final class ExampleMain {
private static final String CONFIG_FILE = "META-INF/application-sharding-databases.xml";
// private static final String CONFIG_FILE = "META-INF/application-sharding-tables.xml";
// private static final String CONFIG_FILE = "META-INF/application-sharding-databases-tables.xml";
-// private static final String CONFIG_FILE = "META-INF/application-master-slave.xml";
-// private static final String CONFIG_FILE = "META-INF/application-sharding-master-slave.xml";
+// private static final String CONFIG_FILE = "META-INF/application-primary-replica-replication.xml";
+// private static final String CONFIG_FILE = "META-INF/application-sharding-primary-replica-replication.xml";
public static void main(final String[] args) throws SQLException {
try (ConfigurableApplicationContext applicationContext = new ClassPathXmlApplicationContext(CONFIG_FILE)) {
diff --git a/examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-master-slave.xml b/examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-primary-replica-replication.xml
similarity index 100%
rename from examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-master-slave.xml
rename to examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-primary-replica-replication.xml
diff --git a/examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-master-slave.xml b/examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-primary-replica-replication.xml
similarity index 100%
rename from examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-master-slave.xml
rename to examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-primary-replica-replication.xml
diff --git a/examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/java/org/apache/shardingsphere/example/sharding/spring/namespace/mybatis/ExampleMain.java b/examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/java/org/apache/shardingsphere/example/sharding/spring/namespace/mybatis/ExampleMain.java
index b58f43f..d7683da 100644
--- a/examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/java/org/apache/shardingsphere/example/sharding/spring/namespace/mybatis/ExampleMain.java
+++ b/examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/java/org/apache/shardingsphere/example/sharding/spring/namespace/mybatis/ExampleMain.java
@@ -29,8 +29,8 @@ public final class ExampleMain {
private static final String CONFIG_FILE = "META-INF/application-sharding-databases.xml";
// private static final String CONFIG_FILE = "META-INF/application-sharding-tables.xml";
// private static final String CONFIG_FILE = "META-INF/application-sharding-databases-tables.xml";
-// private static final String CONFIG_FILE = "META-INF/application-master-slave.xml";
-// private static final String CONFIG_FILE = "META-INF/application-sharding-master-slave.xml";
+// private static final String CONFIG_FILE = "META-INF/application-primary-replica-replication.xml";
+// private static final String CONFIG_FILE = "META-INF/application-sharding-primary-replica-replication.xml";
public static void main(final String[] args) throws SQLException {
try (ConfigurableApplicationContext applicationContext = new ClassPathXmlApplicationContext(CONFIG_FILE)) {
diff --git a/examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-master-slave.xml b/examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-primary-replica-replication.xml
similarity index 100%
rename from examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-master-slave.xml
rename to examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-primary-replica-replication.xml
diff --git a/examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-master-slave.xml b/examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-primary-replica-replication.xml
similarity index 100%
rename from examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-master-slave.xml
rename to examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-primary-replica-replication.xml
diff --git a/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/java/org/apache/shardingsphere/example/proxy/hint/ExampleMain.java b/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/java/org/apache/shardingsphere/example/proxy/hint/ExampleMain.java
index d33b840..bec2a16 100644
--- a/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/java/org/apache/shardingsphere/example/proxy/hint/ExampleMain.java
+++ b/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/java/org/apache/shardingsphere/example/proxy/hint/ExampleMain.java
@@ -32,7 +32,7 @@ public final class ExampleMain {
private static final HintType TYPE = HintType.DATABASE_TABLES;
// private static final HintType TYPE = HintType.DATABASE_ONLY;
-// private static final HintType TYPE = HintType.MASTER_ONLY;
+// private static final HintType TYPE = HintType.PRIMARY_ONLY;
public static void main(final String[] args) throws SQLException, IOException {
DataSource dataSource = getDataSource();
@@ -48,8 +48,8 @@ public final class ExampleMain {
return YamlDataSourceFactory.createDataSource(getFile("/META-INF/hint-databases-tables.yaml"));
case DATABASE_ONLY:
return YamlDataSourceFactory.createDataSource(getFile("/META-INF/hint-databases-only.yaml"));
- case MASTER_ONLY:
- return YamlDataSourceFactory.createDataSource(getFile("/META-INF/hint-master-only.yaml"));
+ case PRIMARY_ONLY:
+ return YamlDataSourceFactory.createDataSource(getFile("/META-INF/hint-primary-only.yaml"));
default:
throw new UnsupportedOperationException("unsupported type");
}
@@ -83,8 +83,8 @@ public final class ExampleMain {
case DATABASE_ONLY:
statement.execute("sctl:hint set DatabaseShardingValue=1");
return;
- case MASTER_ONLY:
- statement.execute("sctl:hint set MASTER_ONLY=true");
+ case PRIMARY_ONLY:
+ statement.execute("sctl:hint set PRIMARY_ONLY=true");
return;
default:
throw new UnsupportedOperationException("unsupported type");
diff --git a/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/java/org/apache/shardingsphere/example/proxy/hint/HintType.java b/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/java/org/apache/shardingsphere/example/proxy/hint/HintType.java
index 9c6a40e..0d5ca49 100644
--- a/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/java/org/apache/shardingsphere/example/proxy/hint/HintType.java
+++ b/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/java/org/apache/shardingsphere/example/proxy/hint/HintType.java
@@ -19,5 +19,5 @@ package org.apache.shardingsphere.example.proxy.hint;
public enum HintType {
- DATABASE_ONLY, DATABASE_TABLES, MASTER_ONLY
+ DATABASE_ONLY, DATABASE_TABLES, PRIMARY_ONLY
}
diff --git a/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/META-INF/hint-master-only.yaml b/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/META-INF/hint-primary-only.yaml
similarity index 100%
rename from examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/META-INF/hint-master-only.yaml
rename to examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/META-INF/hint-primary-only.yaml
diff --git a/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-api/src/main/java/org/apache/shardingsphere/replication/primaryreplica/spi/ReplicaLoadBalanceAlgorithm.java b/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-api/src/main/java/org/apache/shardingsphere/replication/primaryreplica/spi/ReplicaLoadBalanceAlgorithm.java
index 9b0897d..0345cd0 100644
--- a/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-api/src/main/java/org/apache/shardingsphere/replication/primaryreplica/spi/ReplicaLoadBalanceAlgorithm.java
+++ b/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-api/src/main/java/org/apache/shardingsphere/replication/primaryreplica/spi/ReplicaLoadBalanceAlgorithm.java
@@ -30,9 +30,9 @@ public interface ReplicaLoadBalanceAlgorithm extends ShardingSphereAlgorithm {
* Get data source.
*
* @param name primary-replica replication logic data source name
- * @param masterDataSourceName name of primary data sources
- * @param slaveDataSourceNames names of replica data sources
+ * @param primaryDataSourceName name of primary data sources
+ * @param replicaDataSourceNames names of replica data sources
* @return name of selected data source
*/
- String getDataSource(String name, String masterDataSourceName, List<String> slaveDataSourceNames);
+ String getDataSource(String name, String primaryDataSourceName, List<String> replicaDataSourceNames);
}
diff --git a/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/main/java/org/apache/shardingsphere/replication/primaryreplica/algorithm/RandomReplicaLoadBalanceAlgorithm.java b/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/main/java/org/apache/shardingsphere/replication/primaryreplica/algorithm/RandomReplicaLoadBalanceAlgorithm.java
index 7a41ef8..b7126a7 100644
--- a/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/main/java/org/apache/shardingsphere/replication/primaryreplica/algorithm/RandomReplicaLoadBalanceAlgorithm.java
+++ b/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/main/java/org/apache/shardingsphere/replication/primaryreplica/algorithm/RandomReplicaLoadBalanceAlgorithm.java
@@ -35,8 +35,8 @@ public final class RandomReplicaLoadBalanceAlgorithm implements ReplicaLoadBalan
private Properties props = new Properties();
@Override
- public String getDataSource(final String name, final String masterDataSourceName, final List<String> slaveDataSourceNames) {
- return slaveDataSourceNames.get(ThreadLocalRandom.current().nextInt(slaveDataSourceNames.size()));
+ public String getDataSource(final String name, final String primaryDataSourceName, final List<String> replicaDataSourceNames) {
+ return replicaDataSourceNames.get(ThreadLocalRandom.current().nextInt(replicaDataSourceNames.size()));
}
@Override
diff --git a/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/main/java/org/apache/shardingsphere/replication/primaryreplica/algorithm/RoundRobinReplicaLoadBalanceAlgorithm.java b/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/main/java/org/apache/shardingsphere/replication/primaryreplica/algorithm/RoundRobinReplicaLoadBalanceAlgorithm.java
index 8c5b877..eb26fef 100644
--- a/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/main/java/org/apache/shardingsphere/replication/primaryreplica/algorithm/RoundRobinReplicaLoadBalanceAlgorithm.java
+++ b/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/main/java/org/apache/shardingsphere/replication/primaryreplica/algorithm/RoundRobinReplicaLoadBalanceAlgorithm.java
@@ -38,11 +38,11 @@ public final class RoundRobinReplicaLoadBalanceAlgorithm implements ReplicaLoadB
private Properties props = new Properties();
@Override
- public String getDataSource(final String name, final String masterDataSourceName, final List<String> slaveDataSourceNames) {
+ public String getDataSource(final String name, final String primaryDataSourceName, final List<String> replicaDataSourceNames) {
AtomicInteger count = COUNTS.containsKey(name) ? COUNTS.get(name) : new AtomicInteger(0);
COUNTS.putIfAbsent(name, count);
- count.compareAndSet(slaveDataSourceNames.size(), 0);
- return slaveDataSourceNames.get(Math.abs(count.getAndIncrement()) % slaveDataSourceNames.size());
+ count.compareAndSet(replicaDataSourceNames.size(), 0);
+ return replicaDataSourceNames.get(Math.abs(count.getAndIncrement()) % replicaDataSourceNames.size());
}
@Override
diff --git a/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/main/java/org/apache/shardingsphere/replication/primaryreplica/rule/PrimaryReplicaReplicationDataSourceRule.java b/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/main/java/org/apache/shardingsphere/replication/primaryreplica/rule/PrimaryReplicaReplicationDataSourceRule.java
index 7b16f77..5b255e4 100644
--- a/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/main/java/org/apache/shardingsphere/replication/primaryreplica/rule/PrimaryReplicaReplicationDataSourceRule.java
+++ b/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/main/java/org/apache/shardingsphere/replication/primaryreplica/rule/PrimaryReplicaReplicationDataSourceRule.java
@@ -66,7 +66,7 @@ public final class PrimaryReplicaReplicationDataSourceRule {
/**
* Get replica data source names.
*
- * @return available slave data source names
+ * @return available replica data source names
*/
public List<String> getReplicaDataSourceNames() {
return replicaDataSourceNames.stream().filter(each -> !disabledDataSourceNames.contains(each)).collect(Collectors.toList());
diff --git a/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-route/src/main/java/org/apache/shardingsphere/replication/primaryreplica/route/engine/impl/PrimaryReplicaReplicationDataSourceRouter.java b/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-route/src/main/java/org/apache/shardingsphere/replication/primaryreplica/route/engine/impl/PrimaryReplicaReplicationData [...]
index 4b28e68..39edc56 100644
--- a/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-route/src/main/java/org/apache/shardingsphere/replication/primaryreplica/route/engine/impl/PrimaryReplicaReplicationDataSourceRouter.java
+++ b/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-route/src/main/java/org/apache/shardingsphere/replication/primaryreplica/route/engine/impl/PrimaryReplicaReplicationDataSourceRouter.java
@@ -41,15 +41,15 @@ public final class PrimaryReplicaReplicationDataSourceRouter {
* @return data source name
*/
public String route(final SQLStatement sqlStatement) {
- if (isMasterRoute(sqlStatement)) {
+ if (isPrimaryRoute(sqlStatement)) {
PrimaryVisitedManager.setPrimaryVisited();
return rule.getPrimaryDataSourceName();
}
return rule.getLoadBalancer().getDataSource(rule.getName(), rule.getPrimaryDataSourceName(), new ArrayList<>(rule.getReplicaDataSourceNames()));
}
- private boolean isMasterRoute(final SQLStatement sqlStatement) {
- return containsLockSegment(sqlStatement) || !(sqlStatement instanceof SelectStatement) || PrimaryVisitedManager.getPrimaryVisited() || HintManager.isMasterRouteOnly();
+ private boolean isPrimaryRoute(final SQLStatement sqlStatement) {
+ return containsLockSegment(sqlStatement) || !(sqlStatement instanceof SelectStatement) || PrimaryVisitedManager.getPrimaryVisited() || HintManager.isPrimaryRouteOnly();
}
private boolean containsLockSegment(final SQLStatement sqlStatement) {
diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/main/java/org/apache/shardingsphere/governance/core/config/ConfigCenter.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/main/java/org/apache/shardingsphere/governance/core/config/ConfigCenter.java
index 54ed652..3cb634c 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/main/java/org/apache/shardingsphere/governance/core/config/ConfigCenter.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/main/java/org/apache/shardingsphere/governance/core/config/ConfigCenter.java
@@ -154,9 +154,9 @@ public final class ConfigCenter {
Preconditions.checkState(null != dataSourceConfigurations && !dataSourceConfigurations.isEmpty(), "No available data source in `%s` for governance.", schemaName);
Map<String, YamlDataSourceConfiguration> yamlDataSourceConfigurations = dataSourceConfigurations.entrySet().stream()
.collect(Collectors.toMap(Entry::getKey, entry -> new DataSourceConfigurationYamlSwapper().swapToYamlConfiguration(entry.getValue())));
- YamlDataSourceConfigurationWrap yamlDataSourceConfigurationWrap = new YamlDataSourceConfigurationWrap();
- yamlDataSourceConfigurationWrap.setDataSources(yamlDataSourceConfigurations);
- repository.persist(node.getDataSourcePath(schemaName), YamlEngine.marshal(yamlDataSourceConfigurationWrap));
+ YamlDataSourceConfigurationWrap yamlDataSourceConfigWrap = new YamlDataSourceConfigurationWrap();
+ yamlDataSourceConfigWrap.setDataSources(yamlDataSourceConfigurations);
+ repository.persist(node.getDataSourcePath(schemaName), YamlEngine.marshal(yamlDataSourceConfigWrap));
}
private void persistRuleConfigurations(final String schemaName, final Collection<RuleConfiguration> ruleConfigurations, final boolean isOverwrite) {
@@ -181,7 +181,7 @@ public final class ConfigCenter {
} else if (each instanceof AlgorithmProvidedPrimaryReplicaReplicationRuleConfiguration) {
AlgorithmProvidedPrimaryReplicaReplicationRuleConfiguration config = (AlgorithmProvidedPrimaryReplicaReplicationRuleConfiguration) each;
config.getDataSources().forEach(group -> Preconditions.checkState(
- !group.getPrimaryDataSourceName().isEmpty(), "No available master-slave rule configuration in `%s` for governance.", schemaName));
+ !group.getPrimaryDataSourceName().isEmpty(), "No available primary-replica-replication rule configuration in `%s` for governance.", schemaName));
configurations.add(each);
} else if (each instanceof AlgorithmProvidedEncryptRuleConfiguration) {
AlgorithmProvidedEncryptRuleConfiguration config = (AlgorithmProvidedEncryptRuleConfiguration) each;
@@ -190,7 +190,7 @@ public final class ConfigCenter {
} else if (each instanceof PrimaryReplicaReplicationRuleConfiguration) {
PrimaryReplicaReplicationRuleConfiguration config = (PrimaryReplicaReplicationRuleConfiguration) each;
config.getDataSources().forEach(group -> Preconditions.checkState(
- !group.getPrimaryDataSourceName().isEmpty(), "No available master-slave rule configuration in `%s` for governance.", schemaName));
+ !group.getPrimaryDataSourceName().isEmpty(), "No available primary-replica-replication rule configuration in `%s` for governance.", schemaName));
configurations.add(each);
} else if (each instanceof EncryptRuleConfiguration) {
EncryptRuleConfiguration config = (EncryptRuleConfiguration) each;
diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/java/org/apache/shardingsphere/governance/core/config/listener/ConfigurationListenerManagerTest.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/java/org/apache/shardingsphere/governance/core/config/listener/ConfigurationListenerManagerTest.java
index 90045de..7c8dc3c 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/java/org/apache/shardingsphere/governance/core/config/listener/ConfigurationListenerManagerTest.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/java/org/apache/shardingsphere/governance/core/config/listener/ConfigurationListenerManagerTest.java
@@ -47,7 +47,7 @@ public final class ConfigurationListenerManagerTest {
@Test
public void assertInitListeners() {
- ConfigurationListenerManager actual = new ConfigurationListenerManager(configurationRepository, Arrays.asList("sharding_db", "masterslave_db"));
+ ConfigurationListenerManager actual = new ConfigurationListenerManager(configurationRepository, Arrays.asList("sharding_db", "primary_replica_replication_db"));
setField(actual, "schemaChangedListener", schemaChangedListener);
setField(actual, "propertiesChangedListener", propertiesChangedListener);
setField(actual, "authenticationChangedListener", authenticationChangedListener);
diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-facade/src/test/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacadeTest.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-facade/src/test/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacadeTest.java
index 0790d70..6af055f 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-facade/src/test/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacadeTest.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-facade/src/test/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacadeTest.java
@@ -63,7 +63,7 @@ public final class GovernanceFacadeTest {
@Before
public void setUp() {
GovernanceConfiguration governanceConfiguration = new GovernanceConfiguration("test_name", new GovernanceCenterConfiguration("ALL", "127.0.0.1", new Properties()), false);
- governanceFacade.init(governanceConfiguration, Arrays.asList("sharding_db", "masterslave_db"));
+ governanceFacade.init(governanceConfiguration, Arrays.asList("sharding_db", "primary_replica_replication_db"));
FieldUtil.setField(governanceFacade, "repositoryFacade", repositoryFacade);
FieldUtil.setField(governanceFacade, "configCenter", configCenter);
FieldUtil.setField(governanceFacade, "registryCenter", registryCenter);
diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-registry/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/DataSourceStateChangedListenerTest.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-registry/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/DataSourceStateChangedListenerTest.java
index 2f9a0c2..a9597d9 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-registry/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/DataSourceStateChangedListenerTest.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-registry/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/DataSourceStateChangedListenerTest.java
@@ -46,7 +46,7 @@ public final class DataSourceStateChangedListenerTest {
@Before
public void setUp() {
- dataSourceStateChangedListener = new DataSourceStateChangedListener(registryRepository, Arrays.asList("sharding_db", "masterslave_db", "encrypt_db"));
+ dataSourceStateChangedListener = new DataSourceStateChangedListener(registryRepository, Arrays.asList("sharding_db", "primary_replica_replication_db", "encrypt_db"));
}
@Test
diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-registry/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/RegistryListenerManagerTest.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-registry/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/RegistryListenerManagerTest.java
index a43cacc..f017f6d 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-registry/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/RegistryListenerManagerTest.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-registry/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/RegistryListenerManagerTest.java
@@ -43,7 +43,7 @@ public final class RegistryListenerManagerTest {
@Test
public void assertInitListeners() {
- RegistryListenerManager actual = new RegistryListenerManager(registryRepository, Arrays.asList("sharding_db", "masterslave_db", "encrypt_db"));
+ RegistryListenerManager actual = new RegistryListenerManager(registryRepository, Arrays.asList("sharding_db", "primary_replica_replication_db", "encrypt_db"));
FieldUtil.setField(actual, "instanceStateChangedListener", instanceStateChangedListener);
FieldUtil.setField(actual, "dataSourceStateChangedListener", dataSourceStateChangedListener);
actual.initListeners();
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/hint/HintManager.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/hint/HintManager.java
index ab4c14f..8a3857f 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/hint/HintManager.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/hint/HintManager.java
@@ -40,7 +40,7 @@ public final class HintManager implements AutoCloseable {
private boolean databaseShardingOnly;
- private boolean masterRouteOnly;
+ private boolean primaryRouteOnly;
/**
* Get a new instance for {@code HintManager}.
@@ -139,19 +139,19 @@ public final class HintManager implements AutoCloseable {
}
/**
- * Set database operation force route to master database only.
+ * Set database operation force route to primary database only.
*/
- public void setMasterRouteOnly() {
- masterRouteOnly = true;
+ public void setPrimaryRouteOnly() {
+ primaryRouteOnly = true;
}
/**
- * Judge whether route to master database only or not.
+ * Judge whether route to primary database only or not.
*
- * @return route to master database only or not
+ * @return route to primary database only or not
*/
- public static boolean isMasterRouteOnly() {
- return null != HINT_MANAGER_HOLDER.get() && HINT_MANAGER_HOLDER.get().masterRouteOnly;
+ public static boolean isPrimaryRouteOnly() {
+ return null != HINT_MANAGER_HOLDER.get() && HINT_MANAGER_HOLDER.get().primaryRouteOnly;
}
/**
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/hint/HintManagerTest.java b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/hint/HintManagerTest.java
index fda6a38..d9c6a61 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/hint/HintManagerTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/hint/HintManagerTest.java
@@ -136,26 +136,26 @@ public final class HintManagerTest {
}
@Test
- public void assertSetMasterRouteOnly() {
+ public void assertSetPrimaryRouteOnly() {
try (HintManager hintManager = HintManager.getInstance()) {
- hintManager.setMasterRouteOnly();
- assertTrue(HintManager.isMasterRouteOnly());
+ hintManager.setPrimaryRouteOnly();
+ assertTrue(HintManager.isPrimaryRouteOnly());
}
}
@Test
- public void assertIsMasterRouteOnly() {
+ public void assertIsPrimaryRouteOnly() {
try (HintManager hintManager = HintManager.getInstance()) {
- hintManager.setMasterRouteOnly();
- assertTrue(HintManager.isMasterRouteOnly());
+ hintManager.setPrimaryRouteOnly();
+ assertTrue(HintManager.isPrimaryRouteOnly());
}
}
@Test
- public void assertIsMasterRouteOnlyWithoutSet() {
+ public void assertIsPrimaryRouteOnlyWithoutSet() {
HintManager hintManager = HintManager.getInstance();
hintManager.close();
- assertFalse(HintManager.isMasterRouteOnly());
+ assertFalse(HintManager.isPrimaryRouteOnly());
}
@Test
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/rule/DataNodesTest.java b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/rule/DataNodesTest.java
index 1c2bd98..7fa5a8b 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/rule/DataNodesTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/rule/DataNodesTest.java
@@ -43,11 +43,11 @@ public final class DataNodesTest {
private final String logicTableName2 = "dept";
- private final Collection<String> dataSourceNames1 = Arrays.asList("master_db_1", "master_db_2", "slave_db_1", "slave_db_2");
+ private final Collection<String> dataSourceNames1 = Arrays.asList("primary_db_1", "primary_db_2", "replica_db_1", "replica_db_2");
- private final Collection<String> dataSourceNames2 = Arrays.asList("master_db_3", "slave_db_3");
+ private final Collection<String> dataSourceNames2 = Arrays.asList("primary_db_3", "replica_db_3");
- private final String logicDataSourceName = "master_db_1";
+ private final String logicDataSourceName = "primary_db_1";
private final Collection<String> replicaDataSourceNames = Arrays.asList("route_db_1", "route_db_2");
diff --git a/shardingsphere-infra/shardingsphere-infra-route/src/main/java/org/apache/shardingsphere/infra/route/DataNodeRouter.java b/shardingsphere-infra/shardingsphere-infra-route/src/main/java/org/apache/shardingsphere/infra/route/DataNodeRouter.java
index 957233a..3c68366 100644
--- a/shardingsphere-infra/shardingsphere-infra-route/src/main/java/org/apache/shardingsphere/infra/route/DataNodeRouter.java
+++ b/shardingsphere-infra/shardingsphere-infra-route/src/main/java/org/apache/shardingsphere/infra/route/DataNodeRouter.java
@@ -97,7 +97,7 @@ public final class DataNodeRouter {
try {
SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(metaData.getRuleSchemaMetaData().getSchemaMetaData(), parameters, sqlStatement);
return new RouteContext(sqlStatementContext, parameters, new RouteResult());
- // TODO should pass parameters for master-slave
+ // TODO should pass parameters for primary-replica-replication
} catch (final IndexOutOfBoundsException ex) {
return new RouteContext(new CommonSQLStatementContext<>(sqlStatement), parameters, new RouteResult());
}
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/dbtest/engine/dml/AdditionalDMLIT.java b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/dbtest/engine/dml/AdditionalDMLIT.java
index ce6d77d..c9b81dd 100644
--- a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/dbtest/engine/dml/AdditionalDMLIT.java
+++ b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/dbtest/engine/dml/AdditionalDMLIT.java
@@ -56,8 +56,8 @@ public final class AdditionalDMLIT extends BaseDMLIT {
@Test
public void executeUpdateWithAutoGeneratedKeys() throws JAXBException, IOException, SQLException, ParseException {
- // TODO fix masterslave
- if ("masterslave".equals(getRuleType())) {
+ // TODO fix primary_replica_replication
+ if ("primary_replica_replication".equals(getRuleType())) {
return;
}
int actualUpdateCount;
@@ -84,8 +84,8 @@ public final class AdditionalDMLIT extends BaseDMLIT {
@Test
public void assertExecuteUpdateWithColumnIndexes() throws JAXBException, IOException, SQLException, ParseException {
- // TODO fix masterslave
- if ("PostgreSQL".equals(getDatabaseType().getName()) || "masterslave".equals(getRuleType())) {
+ // TODO fix primary_replica_replication
+ if ("PostgreSQL".equals(getDatabaseType().getName()) || "primary_replica_replication".equals(getRuleType())) {
return;
}
int actualUpdateCount;
@@ -112,8 +112,8 @@ public final class AdditionalDMLIT extends BaseDMLIT {
@Test
public void assertExecuteUpdateWithColumnNames() throws JAXBException, IOException, SQLException, ParseException {
- // TODO fix masterslave
- if ("PostgreSQL".equals(getDatabaseType().getName()) || "masterslave".equals(getRuleType())) {
+ // TODO fix primary_replica_replication
+ if ("PostgreSQL".equals(getDatabaseType().getName()) || "primary_replica_replication".equals(getRuleType())) {
return;
}
int actualUpdateCount;
@@ -140,8 +140,8 @@ public final class AdditionalDMLIT extends BaseDMLIT {
@Test
public void assertExecuteWithoutAutoGeneratedKeys() throws JAXBException, IOException, SQLException, ParseException {
- // TODO fix masterslave
- if ("masterslave".equals(getRuleType())) {
+ // TODO fix primary_replica_replication
+ if ("primary_replica_replication".equals(getRuleType())) {
return;
}
int actualUpdateCount;
@@ -170,8 +170,8 @@ public final class AdditionalDMLIT extends BaseDMLIT {
@Test
public void assertExecuteWithAutoGeneratedKeys() throws JAXBException, IOException, SQLException, ParseException {
- // TODO fix masterslave
- if ("masterslave".equals(getRuleType())) {
+ // TODO fix primary_replica_replication
+ if ("primary_replica_replication".equals(getRuleType())) {
return;
}
int actualUpdateCount;
@@ -202,8 +202,8 @@ public final class AdditionalDMLIT extends BaseDMLIT {
@Test
public void assertExecuteWithColumnIndexes() throws JAXBException, IOException, SQLException, ParseException {
- // TODO fix masterslave
- if ("PostgreSQL".equals(getDatabaseType().getName()) || "masterslave".equals(getRuleType())) {
+ // TODO fix primary_replica_replication
+ if ("PostgreSQL".equals(getDatabaseType().getName()) || "primary_replica_replication".equals(getRuleType())) {
return;
}
int actualUpdateCount;
@@ -232,8 +232,8 @@ public final class AdditionalDMLIT extends BaseDMLIT {
@Test
public void assertExecuteWithColumnNames() throws JAXBException, IOException, SQLException, ParseException {
- // TODO fix masterslave
- if ("PostgreSQL".equals(getDatabaseType().getName()) || "masterslave".equals(getRuleType())) {
+ // TODO fix primary_replica_replication
+ if ("PostgreSQL".equals(getDatabaseType().getName()) || "primary_replica_replication".equals(getRuleType())) {
return;
}
int actualUpdateCount;
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/dbtest/engine/dml/BatchDMLIT.java b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/dbtest/engine/dml/BatchDMLIT.java
index 0bf593c..0398289 100644
--- a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/dbtest/engine/dml/BatchDMLIT.java
+++ b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/dbtest/engine/dml/BatchDMLIT.java
@@ -55,8 +55,8 @@ public final class BatchDMLIT extends BatchIT {
@Test
public void assertExecuteBatch() throws JAXBException, IOException, SQLException, ParseException {
- // TODO fix masterslave
- if ("masterslave".equals(getRuleType())) {
+ // TODO fix primary_replica_replication
+ if ("primary_replica_replication".equals(getRuleType())) {
return;
}
// TODO fix shadow
@@ -88,8 +88,8 @@ public final class BatchDMLIT extends BatchIT {
@Test
public void assertClearBatch() throws SQLException, ParseException {
- // TODO fix masterslave
- if ("masterslave".equals(getRuleType())) {
+ // TODO fix primary_replica_replication
+ if ("primary_replica_replication".equals(getRuleType())) {
return;
}
// TODO fix shadow
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/dbtest/engine/dml/GeneralDMLIT.java b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/dbtest/engine/dml/GeneralDMLIT.java
index df507e1..14f445d 100644
--- a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/dbtest/engine/dml/GeneralDMLIT.java
+++ b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/dbtest/engine/dml/GeneralDMLIT.java
@@ -59,7 +59,7 @@ public final class GeneralDMLIT extends BaseDMLIT {
@Test
public void assertExecuteUpdate() throws JAXBException, IOException, SQLException, ParseException {
// TODO fix primary-replica-replication
- if ("masterslave".equals(getRuleType())) {
+ if ("primary_replica_replication".equals(getRuleType())) {
return;
}
// TODO fix shadow
@@ -96,8 +96,8 @@ public final class GeneralDMLIT extends BaseDMLIT {
@Test
public void assertExecute() throws JAXBException, IOException, SQLException, ParseException {
- // TODO fix masterslave
- if ("masterslave".equals(getRuleType())) {
+ // TODO fix primary_replica_replication
+ if ("primary_replica_replication".equals(getRuleType())) {
return;
}
// TODO fix shadow
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_masterslave/batch_insert_for_order.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_primary_replica_replication/batch_insert_for_order.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_masterslave/batch_insert_for_order.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_primary_replica_replication/batch_insert_for_order.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_masterslave/batch_insert_with_generate_key_column.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_primary_replica_replication/batch_insert_with_generate_key_column.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_masterslave/batch_insert_with_generate_key_column.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_primary_replica_replication/batch_insert_with_generate_key_column.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_masterslave/batch_insert_without_generate_key_column.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_primary_replica_replication/batch_insert_without_generate_key_column.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_masterslave/batch_insert_without_generate_key_column.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_primary_replica_replication/batch_insert_without_generate_key_column.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_masterslave/delete_with_alias.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_primary_replica_replication/delete_with_alias.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_masterslave/delete_with_alias.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_primary_replica_replication/delete_with_alias.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_masterslave/delete_with_sharding_value.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_primary_replica_replication/delete_with_sharding_value.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_masterslave/delete_with_sharding_value.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_primary_replica_replication/delete_with_sharding_value.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_masterslave/delete_without_sharding_value.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_primary_replica_replication/delete_without_sharding_value.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_masterslave/delete_without_sharding_value.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_primary_replica_replication/delete_without_sharding_value.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_masterslave/insert_for_order_1.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_primary_replica_replication/insert_for_order_1.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_masterslave/insert_for_order_1.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_primary_replica_replication/insert_for_order_1.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_masterslave/insert_for_order_1_2.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_primary_replica_replication/insert_for_order_1_2.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_masterslave/insert_for_order_1_2.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_primary_replica_replication/insert_for_order_1_2.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_masterslave/insert_for_order_2.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_primary_replica_replication/insert_for_order_2.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_masterslave/insert_for_order_2.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_primary_replica_replication/insert_for_order_2.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_masterslave/insert_multiple_values_for_order_1_2.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_primary_replica_replication/insert_multiple_values_for_order_1_2.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_masterslave/insert_multiple_values_for_order_1_2.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_primary_replica_replication/insert_multiple_values_for_order_1_2.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_masterslave/insert_on_duplicate_key_update.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_primary_replica_replication/insert_on_duplicate_key_update.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_masterslave/insert_on_duplicate_key_update.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_primary_replica_replication/insert_on_duplicate_key_update.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_masterslave/insert_with_generate_key_column.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_primary_replica_replication/insert_with_generate_key_column.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_masterslave/insert_with_generate_key_column.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_primary_replica_replication/insert_with_generate_key_column.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_masterslave/insert_with_now_function.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_primary_replica_replication/insert_with_now_function.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_masterslave/insert_with_now_function.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_primary_replica_replication/insert_with_now_function.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_masterslave/insert_without_generate_key_column.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_primary_replica_replication/insert_without_generate_key_column.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_masterslave/insert_without_generate_key_column.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_primary_replica_replication/insert_without_generate_key_column.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_masterslave/update.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_primary_replica_replication/update.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_masterslave/update.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_primary_replica_replication/update.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_masterslave/update_with_column_equal_column.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_primary_replica_replication/update_with_column_equal_column.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_masterslave/update_with_column_equal_column.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_primary_replica_replication/update_with_column_equal_column.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/masterslave/update_without_condition.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_primary_replica_replication/update_without_condition.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/masterslave/update_without_condition.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_primary_replica_replication/update_without_condition.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/masterslave/batch_insert_for_order.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/primary_replica_replication/batch_insert_for_order.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/masterslave/batch_insert_for_order.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/primary_replica_replication/batch_insert_for_order.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/masterslave/batch_insert_with_generate_key_column.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/primary_replica_replication/batch_insert_with_generate_key_column.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/masterslave/batch_insert_with_generate_key_column.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/primary_replica_replication/batch_insert_with_generate_key_column.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/masterslave/batch_insert_without_generate_key_column.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/primary_replica_replication/batch_insert_without_generate_key_column.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/masterslave/batch_insert_without_generate_key_column.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/primary_replica_replication/batch_insert_without_generate_key_column.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/masterslave/delete_with_alias.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/primary_replica_replication/delete_with_alias.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/masterslave/delete_with_alias.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/primary_replica_replication/delete_with_alias.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/masterslave/delete_with_sharding_value.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/primary_replica_replication/delete_with_sharding_value.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/masterslave/delete_with_sharding_value.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/primary_replica_replication/delete_with_sharding_value.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/masterslave/delete_without_sharding_value.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/primary_replica_replication/delete_without_sharding_value.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/masterslave/delete_without_sharding_value.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/primary_replica_replication/delete_without_sharding_value.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/masterslave/insert_for_order_1.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/primary_replica_replication/insert_for_order_1.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/masterslave/insert_for_order_1.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/primary_replica_replication/insert_for_order_1.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/masterslave/insert_for_order_1_2.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/primary_replica_replication/insert_for_order_1_2.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/masterslave/insert_for_order_1_2.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/primary_replica_replication/insert_for_order_1_2.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/masterslave/insert_for_order_2.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/primary_replica_replication/insert_for_order_2.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/masterslave/insert_for_order_2.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/primary_replica_replication/insert_for_order_2.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/masterslave/insert_multiple_values_for_order_1_2.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/primary_replica_replication/insert_multiple_values_for_order_1_2.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/masterslave/insert_multiple_values_for_order_1_2.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/primary_replica_replication/insert_multiple_values_for_order_1_2.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/masterslave/insert_on_duplicate_key_update.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/primary_replica_replication/insert_on_duplicate_key_update.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/masterslave/insert_on_duplicate_key_update.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/primary_replica_replication/insert_on_duplicate_key_update.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/masterslave/insert_with_generate_key_column.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/primary_replica_replication/insert_with_generate_key_column.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/masterslave/insert_with_generate_key_column.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/primary_replica_replication/insert_with_generate_key_column.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/masterslave/insert_with_now_function.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/primary_replica_replication/insert_with_now_function.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/masterslave/insert_with_now_function.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/primary_replica_replication/insert_with_now_function.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/masterslave/insert_without_generate_key_column.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/primary_replica_replication/insert_without_generate_key_column.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/masterslave/insert_without_generate_key_column.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/primary_replica_replication/insert_without_generate_key_column.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/masterslave/update.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/primary_replica_replication/update.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/masterslave/update.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/primary_replica_replication/update.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/masterslave/update_with_column_equal_column.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/primary_replica_replication/update_with_column_equal_column.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/masterslave/update_with_column_equal_column.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/primary_replica_replication/update_with_column_equal_column.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_masterslave/update_without_condition.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/primary_replica_replication/update_without_condition.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/dbtbl_with_masterslave/update_without_condition.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dataset/primary_replica_replication/update_without_condition.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/postgresql/select_count_tilde_concat.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/postgresql/select_count_tilde_concat.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/postgresql/select_count_tilde_concat.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/postgresql/select_count_tilde_concat.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_alias_as_keyword.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_alias_as_keyword.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_alias_as_keyword.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_alias_as_keyword.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_alias_as_single_quote_string.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_alias_as_single_quote_string.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_alias_as_single_quote_string.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_alias_as_single_quote_string.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_avg.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_avg.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_avg.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_avg.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_between_with_single_table.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_between_with_single_table.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_between_with_single_table.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_between_with_single_table.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_comparison_symbol_with_single_table.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_comparison_symbol_with_single_table.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_comparison_symbol_with_single_table.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_comparison_symbol_with_single_table.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_count.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_count.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_count.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_count.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_count_like_concat.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_count_like_concat.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_count_like_concat.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_count_like_concat.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_count_with_binding_tables.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_count_with_binding_tables.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_count_with_binding_tables.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_count_with_binding_tables.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_count_with_sub.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_count_with_sub.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_count_with_sub.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_count_with_sub.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_count_with_sub_with_whitespace.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_count_with_sub_with_whitespace.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_count_with_sub_with_whitespace.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_count_with_sub_with_whitespace.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_distinct_function.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_distinct_function.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_distinct_function.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_distinct_function.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_distinct_with_avg.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_distinct_with_avg.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_distinct_with_avg.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_distinct_with_avg.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_distinct_with_count.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_distinct_with_count.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_distinct_with_count.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_distinct_with_count.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_distinct_with_count_calculation.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_distinct_with_count_calculation.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_distinct_with_count_calculation.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_distinct_with_count_calculation.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_distinct_with_count_group_by.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_distinct_with_count_group_by.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_distinct_with_count_group_by.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_distinct_with_count_group_by.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_distinct_with_count_sum.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_distinct_with_count_sum.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_distinct_with_count_sum.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_distinct_with_count_sum.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_distinct_with_multi_column.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_distinct_with_multi_column.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_distinct_with_multi_column.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_distinct_with_multi_column.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_distinct_with_multi_column_without_order_by.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_distinct_with_multi_column_without_order_by.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_distinct_with_multi_column_without_order_by.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_distinct_with_multi_column_without_order_by.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_distinct_with_owner_column.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_distinct_with_owner_column.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_distinct_with_owner_column.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_distinct_with_owner_column.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_distinct_with_owner_column_without_order_by.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_distinct_with_owner_column_without_order_by.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_distinct_with_owner_column_without_order_by.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_distinct_with_owner_column_without_order_by.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_distinct_with_owner_star.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_distinct_with_owner_star.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_distinct_with_owner_star.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_distinct_with_owner_star.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_distinct_with_owner_star_without_order_by.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_distinct_with_owner_star_without_order_by.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_distinct_with_owner_star_without_order_by.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_distinct_with_owner_star_without_order_by.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_distinct_with_single_column.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_distinct_with_single_column.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_distinct_with_single_column.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_distinct_with_single_column.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_distinct_with_single_column_without_order_by.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_distinct_with_single_column_without_order_by.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_distinct_with_single_column_without_order_by.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_distinct_with_single_column_without_order_by.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_distinct_with_single_count_group_by.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_distinct_with_single_count_group_by.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_distinct_with_single_count_group_by.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_distinct_with_single_count_group_by.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_distinct_with_star.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_distinct_with_star.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_distinct_with_star.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_distinct_with_star.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_distinct_with_sum.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_distinct_with_sum.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_distinct_with_sum.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_distinct_with_sum.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_equal_with_single_table.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_equal_with_single_table.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_equal_with_single_table.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_equal_with_single_table.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_for_update.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_for_update.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_for_update.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_for_update.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_full_route_with_binding_tables.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_full_route_with_binding_tables.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_full_route_with_binding_tables.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_full_route_with_binding_tables.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_group_by_with_avg.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_group_by_with_avg.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_group_by_with_avg.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_group_by_with_avg.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_group_by_with_count.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_group_by_with_count.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_group_by_with_count.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_group_by_with_count.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_group_by_with_count_without_column_name.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_group_by_with_count_without_column_name.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_group_by_with_count_without_column_name.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_group_by_with_count_without_column_name.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_group_by_with_date_function.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_group_by_with_date_function.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_group_by_with_date_function.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_group_by_with_date_function.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_group_by_with_key_word_alias.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_group_by_with_key_word_alias.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_group_by_with_key_word_alias.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_group_by_with_key_word_alias.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_group_by_with_keyword_alias.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_group_by_with_keyword_alias.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_group_by_with_keyword_alias.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_group_by_with_keyword_alias.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_group_by_with_limit.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_group_by_with_limit.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_group_by_with_limit.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_group_by_with_limit.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_group_by_with_max.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_group_by_with_max.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_group_by_with_max.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_group_by_with_max.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_group_by_with_min.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_group_by_with_min.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_group_by_with_min.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_group_by_with_min.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_group_by_with_order_by_and_limit.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_group_by_with_order_by_and_limit.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_group_by_with_order_by_and_limit.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_group_by_with_order_by_and_limit.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_group_by_with_order_by_desc.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_group_by_with_order_by_desc.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_group_by_with_order_by_desc.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_group_by_with_order_by_desc.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_group_by_with_sum.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_group_by_with_sum.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_group_by_with_sum.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_group_by_with_sum.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_group_by_without_grouped_column.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_group_by_without_grouped_column.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_group_by_without_grouped_column.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_group_by_without_grouped_column.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_in_with_same_sharding_column.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_in_with_same_sharding_column.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_in_with_same_sharding_column.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_in_with_same_sharding_column.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_in_with_single_table.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_in_with_single_table.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_in_with_single_table.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_in_with_single_table.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_inner_join.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_inner_join.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_inner_join.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_inner_join.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_max.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_max.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_max.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_max.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_min.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_min.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_min.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_min.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_not_equal_with_single_table.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_not_equal_with_single_table.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_not_equal_with_single_table.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_not_equal_with_single_table.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_not_in_with_single_table.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_not_in_with_single_table.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_not_in_with_single_table.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_not_in_with_single_table.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_or_mix_and_for_complex_pattern.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_or_mix_and_for_complex_pattern.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_or_mix_and_for_complex_pattern.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_or_mix_and_for_complex_pattern.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_or_mix_and_for_simple_pattern.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_or_mix_and_for_simple_pattern.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_or_mix_and_for_simple_pattern.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_or_mix_and_for_simple_pattern.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_or_mix_and_with_binding_and_broadcast_tables.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_or_mix_and_with_binding_and_broadcast_tables.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_or_mix_and_with_binding_and_broadcast_tables.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_or_mix_and_with_binding_and_broadcast_tables.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_or_mix_and_with_binding_tables.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_or_mix_and_with_binding_tables.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_or_mix_and_with_binding_tables.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_or_mix_and_with_binding_tables.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_or_with_different_sharding_columns.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_or_with_different_sharding_columns.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_or_with_different_sharding_columns.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_or_with_different_sharding_columns.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_or_with_none_sharding_columns.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_or_with_none_sharding_columns.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_or_with_none_sharding_columns.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_or_with_none_sharding_columns.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_or_with_same_sharding_columns.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_or_with_same_sharding_columns.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_or_with_same_sharding_columns.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_or_with_same_sharding_columns.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_order_by_asc_and_index_desc.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_order_by_asc_and_index_desc.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_order_by_asc_and_index_desc.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_order_by_asc_and_index_desc.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_order_by_desc_and_index_asc.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_order_by_desc_and_index_asc.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_order_by_desc_and_index_asc.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_order_by_desc_and_index_asc.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_order_by_with_alias_star_alias_name.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_order_by_with_alias_star_alias_name.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_order_by_with_alias_star_alias_name.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_order_by_with_alias_star_alias_name.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_order_by_with_date.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_order_by_with_date.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_order_by_with_date.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_order_by_with_date.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_order_by_with_multiple_stars.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_order_by_with_multiple_stars.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_order_by_with_multiple_stars.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_order_by_with_multiple_stars.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_order_by_with_ordered_column.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_order_by_with_ordered_column.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_order_by_with_ordered_column.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_order_by_with_ordered_column.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_order_by_with_star_no_table_alias.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_order_by_with_star_no_table_alias.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_order_by_with_star_no_table_alias.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_order_by_with_star_no_table_alias.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_order_by_with_star_table_alias.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_order_by_with_star_table_alias.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_order_by_with_star_table_alias.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_order_by_with_star_table_alias.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_order_by_with_table_star_table_name.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_order_by_with_table_star_table_name.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_order_by_with_table_star_table_name.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_order_by_with_table_star_table_name.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_order_by_with_table_star_without_table_name.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_order_by_with_table_star_without_table_name.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_order_by_with_table_star_without_table_name.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_order_by_with_table_star_without_table_name.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_pagination_with_diff_group_by_and_order_by.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_pagination_with_diff_group_by_and_order_by.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_pagination_with_diff_group_by_and_order_by.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_pagination_with_diff_group_by_and_order_by.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_pagination_with_group_by_and_order_by.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_pagination_with_group_by_and_order_by.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_pagination_with_group_by_and_order_by.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_pagination_with_group_by_and_order_by.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_pagination_with_offset.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_pagination_with_offset.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_pagination_with_offset.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_pagination_with_offset.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_pagination_with_offset_and_limit.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_pagination_with_offset_and_limit.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_pagination_with_offset_and_limit.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_pagination_with_offset_and_limit.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_pagination_with_offset_and_row_count.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_pagination_with_offset_and_row_count.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_pagination_with_offset_and_row_count.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_pagination_with_offset_and_row_count.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_pagination_with_offset_fetch.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_pagination_with_offset_fetch.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_pagination_with_offset_fetch.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_pagination_with_offset_fetch.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_pagination_with_row_count.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_pagination_with_row_count.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_pagination_with_row_count.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_pagination_with_row_count.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_pagination_with_row_number_and_limit.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_pagination_with_row_number_and_limit.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_pagination_with_row_number_and_limit.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_pagination_with_row_number_and_limit.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_pagination_with_row_number_not_at_end.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_pagination_with_row_number_not_at_end.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_pagination_with_row_number_not_at_end.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_pagination_with_row_number_not_at_end.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_pagination_with_top_and_limit.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_pagination_with_top_and_limit.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_pagination_with_top_and_limit.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_pagination_with_top_and_limit.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_sharding_route_with_binding_tables.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_sharding_route_with_binding_tables.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_sharding_route_with_binding_tables.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_sharding_route_with_binding_tables.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_sharding_route_with_broadcast_table.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_sharding_route_with_broadcast_table.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_sharding_route_with_broadcast_table.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_sharding_route_with_broadcast_table.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_sub_query_with_group_by.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_sub_query_with_group_by.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_sub_query_with_group_by.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_sub_query_with_group_by.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_sub_query_with_multiple_tables.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_sub_query_with_multiple_tables.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_sub_query_with_multiple_tables.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_sub_query_with_multiple_tables.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_sub_query_with_order_by.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_sub_query_with_order_by.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_sub_query_with_order_by.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_sub_query_with_order_by.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_sum.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_sum.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_sum.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_sum.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_with_case_expression.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_with_case_expression.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_with_case_expression.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_with_case_expression.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_with_date_function.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_with_date_function.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_with_date_function.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_with_date_function.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_with_expression.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_with_expression.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_with_expression.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_with_expression.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_with_force_index_join.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_with_force_index_join.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_with_force_index_join.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_with_force_index_join.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_with_item_alias_match_order_by_and_group_by_items.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_with_item_alias_match_order_by_and_group_by_items.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_with_item_alias_match_order_by_and_group_by_items.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_with_item_alias_match_order_by_and_group_by_items.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_with_regexp.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_with_regexp.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_with_regexp.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_primary_replica_replication/select_with_regexp.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/mysql/select_avg.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/mysql/select_avg.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/mysql/select_avg.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/mysql/select_avg.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/mysql/select_group_by_with_avg.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/mysql/select_group_by_with_avg.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/mysql/select_group_by_with_avg.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/mysql/select_group_by_with_avg.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/postgresql/select_avg.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/postgresql/select_avg.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/postgresql/select_avg.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/postgresql/select_avg.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/postgresql/select_count_tilde_concat.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/postgresql/select_count_tilde_concat.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/postgresql/select_count_tilde_concat.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/postgresql/select_count_tilde_concat.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/postgresql/select_group_by_with_avg.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/postgresql/select_group_by_with_avg.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/postgresql/select_group_by_with_avg.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/postgresql/select_group_by_with_avg.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_alias_as_keyword.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_alias_as_keyword.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_alias_as_keyword.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_alias_as_keyword.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_alias_as_single_quote_string.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_alias_as_single_quote_string.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_alias_as_single_quote_string.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_alias_as_single_quote_string.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_avg.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_avg.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_avg.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_avg.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_between_with_single_table.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_between_with_single_table.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_between_with_single_table.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_between_with_single_table.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_comparison_symbol_with_single_table.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_comparison_symbol_with_single_table.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_comparison_symbol_with_single_table.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_comparison_symbol_with_single_table.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_count.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_count.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_count.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_count.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_count_like_concat.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_count_like_concat.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_count_like_concat.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_count_like_concat.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_count_with_binding_tables.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_count_with_binding_tables.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_count_with_binding_tables.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_count_with_binding_tables.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_count_with_sub.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_count_with_sub.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_count_with_sub.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_count_with_sub.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_count_with_sub_with_whitespace.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_count_with_sub_with_whitespace.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_count_with_sub_with_whitespace.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_count_with_sub_with_whitespace.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_distinct_function.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_distinct_function.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_distinct_function.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_distinct_function.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_distinct_with_avg.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_distinct_with_avg.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_distinct_with_avg.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_distinct_with_avg.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_distinct_with_count.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_distinct_with_count.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_distinct_with_count.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_distinct_with_count.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_distinct_with_count_calculation.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_distinct_with_count_calculation.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_distinct_with_count_calculation.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_distinct_with_count_calculation.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_distinct_with_count_group_by.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_distinct_with_count_group_by.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_distinct_with_count_group_by.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_distinct_with_count_group_by.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_distinct_with_count_sum.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_distinct_with_count_sum.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_distinct_with_count_sum.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_distinct_with_count_sum.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_distinct_with_multi_column.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_distinct_with_multi_column.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_distinct_with_multi_column.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_distinct_with_multi_column.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_distinct_with_multi_column_without_order_by.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_distinct_with_multi_column_without_order_by.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_distinct_with_multi_column_without_order_by.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_distinct_with_multi_column_without_order_by.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_distinct_with_owner_column.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_distinct_with_owner_column.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_distinct_with_owner_column.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_distinct_with_owner_column.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_distinct_with_owner_column_without_order_by.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_distinct_with_owner_column_without_order_by.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_distinct_with_owner_column_without_order_by.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_distinct_with_owner_column_without_order_by.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_distinct_with_owner_star.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_distinct_with_owner_star.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_distinct_with_owner_star.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_distinct_with_owner_star.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_distinct_with_owner_star_without_order_by.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_distinct_with_owner_star_without_order_by.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_distinct_with_owner_star_without_order_by.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_distinct_with_owner_star_without_order_by.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_distinct_with_single_column.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_distinct_with_single_column.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_distinct_with_single_column.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_distinct_with_single_column.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_distinct_with_single_column_without_order_by.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_distinct_with_single_column_without_order_by.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_distinct_with_single_column_without_order_by.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_distinct_with_single_column_without_order_by.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_distinct_with_single_count_group_by.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_distinct_with_single_count_group_by.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_distinct_with_single_count_group_by.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_distinct_with_single_count_group_by.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_distinct_with_star.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_distinct_with_star.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_distinct_with_star.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_distinct_with_star.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_distinct_with_sum.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_distinct_with_sum.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_distinct_with_sum.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_distinct_with_sum.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_equal_with_single_table.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_equal_with_single_table.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_equal_with_single_table.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_equal_with_single_table.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_for_update.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_for_update.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_for_update.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_for_update.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_full_route_with_binding_tables.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_full_route_with_binding_tables.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_full_route_with_binding_tables.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_full_route_with_binding_tables.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_group_by_with_avg.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_group_by_with_avg.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_group_by_with_avg.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_group_by_with_avg.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_group_by_with_count.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_group_by_with_count.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_group_by_with_count.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_group_by_with_count.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_group_by_with_count_without_column_name.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_group_by_with_count_without_column_name.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_group_by_with_count_without_column_name.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_group_by_with_count_without_column_name.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_group_by_with_key_word_alias.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_group_by_with_key_word_alias.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_group_by_with_key_word_alias.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_group_by_with_key_word_alias.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_group_by_with_keyword_alias.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_group_by_with_keyword_alias.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_group_by_with_keyword_alias.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_group_by_with_keyword_alias.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_group_by_with_limit.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_group_by_with_limit.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_group_by_with_limit.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_group_by_with_limit.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_group_by_with_max.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_group_by_with_max.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_group_by_with_max.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_group_by_with_max.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_group_by_with_min.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_group_by_with_min.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_group_by_with_min.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_group_by_with_min.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_group_by_with_order_by_and_limit.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_group_by_with_order_by_and_limit.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_group_by_with_order_by_and_limit.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_group_by_with_order_by_and_limit.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_group_by_with_order_by_desc.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_group_by_with_order_by_desc.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_group_by_with_order_by_desc.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_group_by_with_order_by_desc.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_group_by_with_sum.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_group_by_with_sum.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_group_by_with_sum.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_group_by_with_sum.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_group_by_without_grouped_column.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_group_by_without_grouped_column.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_group_by_without_grouped_column.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_group_by_without_grouped_column.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_in_with_same_sharding_column.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_in_with_same_sharding_column.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_in_with_same_sharding_column.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_in_with_same_sharding_column.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_in_with_single_table.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_in_with_single_table.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_in_with_single_table.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_in_with_single_table.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_inner_join.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_inner_join.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_inner_join.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_inner_join.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_max.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_max.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_max.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_max.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_min.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_min.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_min.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_min.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_not_equal_with_single_table.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_not_equal_with_single_table.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_not_equal_with_single_table.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_not_equal_with_single_table.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_not_in_with_single_table.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_not_in_with_single_table.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_not_in_with_single_table.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_not_in_with_single_table.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_or_mix_and_for_complex_pattern.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_or_mix_and_for_complex_pattern.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_or_mix_and_for_complex_pattern.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_or_mix_and_for_complex_pattern.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_or_mix_and_for_simple_pattern.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_or_mix_and_for_simple_pattern.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_or_mix_and_for_simple_pattern.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_or_mix_and_for_simple_pattern.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_or_mix_and_with_binding_and_broadcast_tables.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_or_mix_and_with_binding_and_broadcast_tables.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_or_mix_and_with_binding_and_broadcast_tables.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_or_mix_and_with_binding_and_broadcast_tables.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_or_mix_and_with_binding_tables.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_or_mix_and_with_binding_tables.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_or_mix_and_with_binding_tables.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_or_mix_and_with_binding_tables.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_or_with_different_sharding_columns.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_or_with_different_sharding_columns.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_or_with_different_sharding_columns.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_or_with_different_sharding_columns.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_or_with_none_sharding_columns.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_or_with_none_sharding_columns.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_or_with_none_sharding_columns.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_or_with_none_sharding_columns.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_or_with_same_sharding_columns.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_or_with_same_sharding_columns.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_or_with_same_sharding_columns.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_or_with_same_sharding_columns.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_order_by_asc_and_index_desc.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_order_by_asc_and_index_desc.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_order_by_asc_and_index_desc.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_order_by_asc_and_index_desc.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_order_by_desc_and_index_asc.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_order_by_desc_and_index_asc.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_order_by_desc_and_index_asc.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_order_by_desc_and_index_asc.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_order_by_with_alias_star_alias_name.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_order_by_with_alias_star_alias_name.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_order_by_with_alias_star_alias_name.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_order_by_with_alias_star_alias_name.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_order_by_with_date.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_order_by_with_date.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_order_by_with_date.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_order_by_with_date.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_order_by_with_multiple_stars.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_order_by_with_multiple_stars.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_order_by_with_multiple_stars.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_order_by_with_multiple_stars.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_order_by_with_ordered_column.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_order_by_with_ordered_column.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_order_by_with_ordered_column.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_order_by_with_ordered_column.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_order_by_with_star_no_table_alias.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_order_by_with_star_no_table_alias.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_order_by_with_star_no_table_alias.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_order_by_with_star_no_table_alias.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_order_by_with_star_table_alias.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_order_by_with_star_table_alias.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_order_by_with_star_table_alias.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_order_by_with_star_table_alias.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_order_by_with_table_star_table_name.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_order_by_with_table_star_table_name.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_order_by_with_table_star_table_name.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_order_by_with_table_star_table_name.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_order_by_with_table_star_without_table_name.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_order_by_with_table_star_without_table_name.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_order_by_with_table_star_without_table_name.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_order_by_with_table_star_without_table_name.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_pagination_with_diff_group_by_and_order_by.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_pagination_with_diff_group_by_and_order_by.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_pagination_with_diff_group_by_and_order_by.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_pagination_with_diff_group_by_and_order_by.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_pagination_with_group_by_and_order_by.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_pagination_with_group_by_and_order_by.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_pagination_with_group_by_and_order_by.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_pagination_with_group_by_and_order_by.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_pagination_with_offset.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_pagination_with_offset.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_pagination_with_offset.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_pagination_with_offset.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_pagination_with_offset_and_limit.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_pagination_with_offset_and_limit.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_pagination_with_offset_and_limit.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_pagination_with_offset_and_limit.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_pagination_with_offset_and_row_count.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_pagination_with_offset_and_row_count.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_pagination_with_offset_and_row_count.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_pagination_with_offset_and_row_count.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_pagination_with_offset_fetch.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_pagination_with_offset_fetch.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_pagination_with_offset_fetch.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_pagination_with_offset_fetch.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_pagination_with_row_count.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_pagination_with_row_count.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_pagination_with_row_count.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_pagination_with_row_count.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_pagination_with_row_number_and_limit.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_pagination_with_row_number_and_limit.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_pagination_with_row_number_and_limit.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_pagination_with_row_number_and_limit.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_pagination_with_row_number_not_at_end.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_pagination_with_row_number_not_at_end.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_pagination_with_row_number_not_at_end.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_pagination_with_row_number_not_at_end.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_pagination_with_top_and_limit.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_pagination_with_top_and_limit.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_pagination_with_top_and_limit.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_pagination_with_top_and_limit.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_sharding_route_with_binding_tables.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_sharding_route_with_binding_tables.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_sharding_route_with_binding_tables.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_sharding_route_with_binding_tables.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_sharding_route_with_broadcast_table.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_sharding_route_with_broadcast_table.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_sharding_route_with_broadcast_table.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_sharding_route_with_broadcast_table.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_sub_query_with_group_by.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_sub_query_with_group_by.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_sub_query_with_group_by.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_sub_query_with_group_by.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_sub_query_with_multiple_tables.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_sub_query_with_multiple_tables.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_sub_query_with_multiple_tables.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_sub_query_with_multiple_tables.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_sub_query_with_order_by.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_sub_query_with_order_by.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_sub_query_with_order_by.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_sub_query_with_order_by.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_sum.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_sum.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_sum.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_sum.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_with_case_expression.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_with_case_expression.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_with_case_expression.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_with_case_expression.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_with_date_function.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_with_date_function.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_with_date_function.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_with_date_function.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_with_expression.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_with_expression.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_with_expression.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_with_expression.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_with_force_index_join.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_with_force_index_join.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_with_force_index_join.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_with_force_index_join.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_with_item_alias_match_order_by_and_group_by_items.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_with_item_alias_match_order_by_and_group_by_items.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_with_item_alias_match_order_by_and_group_by_items.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_with_item_alias_match_order_by_and_group_by_items.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_with_regexp.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_with_regexp.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_with_regexp.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/primary_replica_replication/select_with_regexp.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env.properties b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env.properties
index e1fc000..41d5800 100644
--- a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env.properties
+++ b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env.properties
@@ -16,8 +16,8 @@
#
run.additional.cases=false
-#rule.types=db,tbl,dbtbl_with_masterslave,masterslave,shadow
-rule.types=db,tbl,dbtbl_with_masterslave,masterslave
+#rule.types=db,tbl,dbtbl_with_primary_replica_replication,primary_replica_replication,shadow
+rule.types=db,tbl,dbtbl_with_primary_replica_replication,primary_replica_replication
#databases=H2,MySQL,Oracle,SQLServer,PostgreSQL
databases=H2
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/dbtbl_with_masterslave/authority.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/dbtbl_with_primary_replica_replication/authority.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/dbtbl_with_masterslave/authority.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/dbtbl_with_primary_replica_replication/authority.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/dbtbl_with_masterslave/dataset.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/dbtbl_with_primary_replica_replication/dataset.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/dbtbl_with_masterslave/dataset.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/dbtbl_with_primary_replica_replication/dataset.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/dbtbl_with_masterslave/schema.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/dbtbl_with_primary_replica_replication/schema.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/dbtbl_with_masterslave/schema.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/dbtbl_with_primary_replica_replication/schema.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/dbtbl_with_masterslave/sharding-rule.yaml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/dbtbl_with_primary_replica_replication/sharding-rule.yaml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/dbtbl_with_masterslave/sharding-rule.yaml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/dbtbl_with_primary_replica_replication/sharding-rule.yaml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/masterslave/authority.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/primary_replica_replication/authority.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/masterslave/authority.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/primary_replica_replication/authority.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/masterslave/dataset.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/primary_replica_replication/dataset.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/masterslave/dataset.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/primary_replica_replication/dataset.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/masterslave/schema.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/primary_replica_replication/schema.xml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/masterslave/schema.xml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/primary_replica_replication/schema.xml
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/masterslave/sharding-rule.yaml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/primary_replica_replication/sharding-rule.yaml
similarity index 100%
rename from shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/masterslave/sharding-rule.yaml
rename to shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/primary_replica_replication/sharding-rule.yaml
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnectionTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnectionTest.java
index 172d999..45fc3c2 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnectionTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnectionTest.java
@@ -63,11 +63,11 @@ public final class ShardingSphereConnectionTest {
@BeforeClass
public static void init() throws SQLException {
- DataSource masterDataSource = mockDataSource();
- DataSource slaveDataSource = mockDataSource();
+ DataSource primaryDataSource = mockDataSource();
+ DataSource replicaDataSource = mockDataSource();
dataSourceMap = new HashMap<>(2, 1);
- dataSourceMap.put("test_primary_ds", masterDataSource);
- dataSourceMap.put("test_replica_ds", slaveDataSource);
+ dataSourceMap.put("test_primary_ds", primaryDataSource);
+ dataSourceMap.put("test_replica_ds", replicaDataSource);
}
private static DataSource mockDataSource() throws SQLException {
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/governance/type/GovernanceSpringBootRegistryPrimaryReplicaReplicationTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/governance/type/Governa [...]
index 0103a7c..b9910dc 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/governance/type/GovernanceSpringBootRegistryPrimaryReplicaReplicationTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/governance/type/GovernanceSpringBootRegistryPrimaryReplicaReplicationTest.java
@@ -45,7 +45,7 @@ import static org.junit.Assert.assertTrue;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = GovernanceSpringBootRegistryPrimaryReplicaReplicationTest.class)
@SpringBootApplication
-@ActiveProfiles("registry-masterslave")
+@ActiveProfiles("registry-primary-replica-replication")
public class GovernanceSpringBootRegistryPrimaryReplicaReplicationTest {
private static final String DATA_SOURCE_FILE = "yaml/primary-replica-replication-databases.yaml";
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/resources/application-registry-masterslave.properties b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/resources/application-registry-primary-replica-replication.properties
similarity index 100%
rename from shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/resources/application-registry-masterslave.properties
rename to shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/resources/application-registry-primary-replica-replication.properties
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/ShardingCTLHintParser.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/ShardingCTLHintParser.java
index d125295..bde1a06 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/ShardingCTLHintParser.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/ShardingCTLHintParser.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.H
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.HintClearCommand;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.HintErrorParameterCommand;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.HintSetDatabaseShardingValueCommand;
-import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.HintSetMasterOnlyCommand;
+import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.HintSetPrimaryOnlyCommand;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.HintShowStatusCommand;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.HintShowTableStatusCommand;
@@ -36,7 +36,7 @@ import java.util.regex.Pattern;
*/
public final class ShardingCTLHintParser implements ShardingCTLParser<ShardingCTLHintStatement> {
- private final String setMasterOnlyRegex = "sctl:hint\\s+set\\s+MASTER_ONLY=(true|false)\\s*$";
+ private final String setPrimaryOnlyRegex = "sctl:hint\\s+set\\s+PRIMARY_ONLY=(true|false)\\s*$";
private final String setDatabaseShardingValueRegex = "sctl:hint\\s+set\\s+DatabaseShardingValue=(\\S*)";
@@ -52,7 +52,7 @@ public final class ShardingCTLHintParser implements ShardingCTLParser<ShardingCT
private final String errorParameterRegex = "sctl:hint\\s+.*";
- private final Matcher setMasterOnlyMatcher;
+ private final Matcher setPrimaryOnlyMatcher;
private final Matcher setDatabaseShardingValueMatcher;
@@ -69,7 +69,7 @@ public final class ShardingCTLHintParser implements ShardingCTLParser<ShardingCT
private final Matcher errorParameterMatcher;
public ShardingCTLHintParser(final String sql) {
- setMasterOnlyMatcher = Pattern.compile(setMasterOnlyRegex, Pattern.CASE_INSENSITIVE).matcher(sql);
+ setPrimaryOnlyMatcher = Pattern.compile(setPrimaryOnlyRegex, Pattern.CASE_INSENSITIVE).matcher(sql);
setDatabaseShardingValueMatcher = Pattern.compile(setDatabaseShardingValueRegex, Pattern.CASE_INSENSITIVE).matcher(sql);
addDatabaseShardingValueMatcher = Pattern.compile(addDatabaseShardingValueRegex, Pattern.CASE_INSENSITIVE).matcher(sql);
addTableShardingValueMatcher = Pattern.compile(addTableShardingValueRegex, Pattern.CASE_INSENSITIVE).matcher(sql);
@@ -96,9 +96,9 @@ public final class ShardingCTLHintParser implements ShardingCTLParser<ShardingCT
}
private Optional<ShardingCTLHintStatement> parseUpdateShardingCTLHintStatement() {
- if (setMasterOnlyMatcher.find()) {
- boolean masterOnly = Boolean.parseBoolean(setMasterOnlyMatcher.group(1).toUpperCase());
- return Optional.of(new ShardingCTLHintStatement(new HintSetMasterOnlyCommand(masterOnly)));
+ if (setPrimaryOnlyMatcher.find()) {
+ boolean primaryOnly = Boolean.parseBoolean(setPrimaryOnlyMatcher.group(1).toUpperCase());
+ return Optional.of(new ShardingCTLHintStatement(new HintSetPrimaryOnlyCommand(primaryOnly)));
}
if (setDatabaseShardingValueMatcher.find()) {
String shardingValue = setDatabaseShardingValueMatcher.group(1);
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/HintCommandExecutorFactory.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/HintCommandExecutorFactory.java
index 052ad60..84e891a 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/HintCommandExecutorFactory.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/HintCommandExecutorFactory.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.H
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.HintAddTableShardingValueCommand;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.HintClearCommand;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.HintSetDatabaseShardingValueCommand;
-import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.HintSetMasterOnlyCommand;
+import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.HintSetPrimaryOnlyCommand;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.HintShowStatusCommand;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.HintShowTableStatusCommand;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.executor.HintAddDatabaseShardingValueExecutor;
@@ -32,7 +32,7 @@ import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.executor.
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.executor.HintClearExecutor;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.executor.HintErrorParameterExecutor;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.executor.HintSetDatabaseShardingValueExecutor;
-import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.executor.HintSetMasterOnlyExecutor;
+import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.executor.HintSetPrimaryOnlyExecutor;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.executor.HintShowStatusExecutor;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.executor.HintShowTableStatusExecutor;
@@ -51,8 +51,8 @@ public final class HintCommandExecutorFactory {
* @return hint command executor
*/
public static HintCommandExecutor newInstance(final HintCommand hintCommand, final BackendConnection backendConnection, final String sql) {
- if (hintCommand instanceof HintSetMasterOnlyCommand) {
- return new HintSetMasterOnlyExecutor();
+ if (hintCommand instanceof HintSetPrimaryOnlyCommand) {
+ return new HintSetPrimaryOnlyExecutor();
}
if (hintCommand instanceof HintSetDatabaseShardingValueCommand) {
return new HintSetDatabaseShardingValueExecutor();
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/command/HintSetMasterOnlyCommand.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/command/HintSetPrimaryOnlyCommand.java
similarity index 84%
rename from shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/command/HintSetMasterOnlyCommand.java
rename to shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/command/HintSetPrimaryOnlyCommand.java
index fa8b8c0..8591b4b 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/command/HintSetMasterOnlyCommand.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/command/HintSetPrimaryOnlyCommand.java
@@ -22,15 +22,15 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.HintCommand;
/**
- * Hint set master database only command.
+ * Hint set primary database only command.
*
* <p>
- * example: sctl:hint set MASTER_ONLY=true.
+ * example: sctl:hint set PRIMARY_ONLY=true.
* </p>
*/
@RequiredArgsConstructor
@Getter
-public final class HintSetMasterOnlyCommand implements HintCommand {
+public final class HintSetPrimaryOnlyCommand implements HintCommand {
- private final boolean masterOnly;
+ private final boolean primaryOnly;
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintSetMasterOnlyExecutor.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintSetPrimaryOnlyExecutor.java
similarity index 77%
rename from shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintSetMasterOnlyExecutor.java
rename to shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintSetPrimaryOnlyExecutor.java
index 8eb41f9..1200325 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintSetMasterOnlyExecutor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintSetPrimaryOnlyExecutor.java
@@ -20,17 +20,17 @@ package org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.executor
import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.HintManagerHolder;
-import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.HintSetMasterOnlyCommand;
+import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.HintSetPrimaryOnlyCommand;
/**
- * Hint set master database only command executor.
+ * Hint set primary database only command executor.
*/
-public final class HintSetMasterOnlyExecutor extends AbstractHintUpdateExecutor<HintSetMasterOnlyCommand> {
+public final class HintSetPrimaryOnlyExecutor extends AbstractHintUpdateExecutor<HintSetPrimaryOnlyCommand> {
@Override
- public BackendResponse execute(final HintSetMasterOnlyCommand command) {
- if (command.isMasterOnly()) {
- HintManagerHolder.get().setMasterRouteOnly();
+ public BackendResponse execute(final HintSetPrimaryOnlyCommand command) {
+ if (command.isPrimaryOnly()) {
+ HintManagerHolder.get().setPrimaryRouteOnly();
}
return new UpdateResponse();
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintShowStatusExecutor.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintShowStatusExecutor.java
index 4227a50..ea029ed 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintShowStatusExecutor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintShowStatusExecutor.java
@@ -37,7 +37,7 @@ public final class HintShowStatusExecutor extends AbstractHintQueryExecutor<Hint
@Override
protected List<QueryHeader> createQueryHeaders() {
List<QueryHeader> result = new ArrayList<>(2);
- result.add(new QueryHeader("", "", "master_only", "", 5, Types.CHAR, 0, false, false, false, false));
+ result.add(new QueryHeader("", "", "primary_only", "", 5, Types.CHAR, 0, false, false, false, false));
result.add(new QueryHeader("", "", "sharding_type", "", 255, Types.CHAR, 0, false, false, false, false));
return result;
}
@@ -45,13 +45,13 @@ public final class HintShowStatusExecutor extends AbstractHintQueryExecutor<Hint
@Override
protected MergedResult createMergedResult() {
HintShardingType shardingType = HintManager.isDatabaseShardingOnly() ? HintShardingType.DATABASES_ONLY : HintShardingType.DATABASES_TABLES;
- List<Object> row = createRow(HintManager.isMasterRouteOnly(), shardingType);
+ List<Object> row = createRow(HintManager.isPrimaryRouteOnly(), shardingType);
return new MultipleLocalDataMergedResult(Collections.singletonList(row));
}
- private List<Object> createRow(final boolean masterOnly, final HintShardingType shardingType) {
+ private List<Object> createRow(final boolean primaryOnly, final HintShardingType shardingType) {
List<Object> result = new ArrayList<>(2);
- result.add(String.valueOf(masterOnly).toLowerCase());
+ result.add(String.valueOf(primaryOnly).toLowerCase());
result.add(String.valueOf(shardingType).toLowerCase());
return result;
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/ShardingCTLHintBackendHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/ShardingCTLHintBackendHandlerTest.java
index e96faad..a4d71ab 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/ShardingCTLHintBackendHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/ShardingCTLHintBackendHandlerTest.java
@@ -91,20 +91,20 @@ public final class ShardingCTLHintBackendHandlerTest {
}
@Test
- public void assertSetMasterOnly() {
+ public void assertSetPrimaryOnly() {
clearThreadLocal();
- String sql = "sctl:hint set master_only=true ";
- ShardingCTLHintBackendHandler shardingCTLHintBackendHandler = new ShardingCTLHintBackendHandler(sql, backendConnection);
- assertThat(shardingCTLHintBackendHandler.execute(), instanceOf(UpdateResponse.class));
- assertTrue(HintManager.isMasterRouteOnly());
+ String sql = "sctl:hint set primary_only=true ";
+ ShardingCTLHintBackendHandler hintBackendHandler = new ShardingCTLHintBackendHandler(sql, backendConnection);
+ assertThat(hintBackendHandler.execute(), instanceOf(UpdateResponse.class));
+ assertTrue(HintManager.isPrimaryRouteOnly());
}
@Test
public void assertSetDatabaseShardingValueTable() {
clearThreadLocal();
String sql = "sctl:hint set databaseShardingValue=100";
- ShardingCTLHintBackendHandler shardingCTLHintBackendHandler = new ShardingCTLHintBackendHandler(sql, backendConnection);
- assertThat(shardingCTLHintBackendHandler.execute(), instanceOf(UpdateResponse.class));
+ ShardingCTLHintBackendHandler hintBackendHandler = new ShardingCTLHintBackendHandler(sql, backendConnection);
+ assertThat(hintBackendHandler.execute(), instanceOf(UpdateResponse.class));
assertThat(HintManager.getDatabaseShardingValues().iterator().next().toString(), is("100"));
}
@@ -112,8 +112,8 @@ public final class ShardingCTLHintBackendHandlerTest {
public void assertAddDatabaseShardingValue() {
clearThreadLocal();
String sql = "sctl:hint addDatabaseShardingValue user=100 ";
- ShardingCTLHintBackendHandler shardingCTLHintBackendHandler = new ShardingCTLHintBackendHandler(sql, backendConnection);
- assertThat(shardingCTLHintBackendHandler.execute(), instanceOf(UpdateResponse.class));
+ ShardingCTLHintBackendHandler hintBackendHandler = new ShardingCTLHintBackendHandler(sql, backendConnection);
+ assertThat(hintBackendHandler.execute(), instanceOf(UpdateResponse.class));
assertThat(HintManager.getDatabaseShardingValues("user").iterator().next().toString(), is("100"));
}
@@ -121,8 +121,8 @@ public final class ShardingCTLHintBackendHandlerTest {
public void assertAddTableShardingValue() {
clearThreadLocal();
String sql = "sctl:hint addTableShardingValue user=100 ";
- ShardingCTLHintBackendHandler shardingCTLHintBackendHandler = new ShardingCTLHintBackendHandler(sql, backendConnection);
- assertThat(shardingCTLHintBackendHandler.execute(), instanceOf(UpdateResponse.class));
+ ShardingCTLHintBackendHandler hintBackendHandler = new ShardingCTLHintBackendHandler(sql, backendConnection);
+ assertThat(hintBackendHandler.execute(), instanceOf(UpdateResponse.class));
assertThat(HintManager.getTableShardingValues("user").iterator().next().toString(), is("100"));
}
@@ -130,8 +130,8 @@ public final class ShardingCTLHintBackendHandlerTest {
public void assertClear() {
clearThreadLocal();
String sql = "sctl:hint clear ";
- ShardingCTLHintBackendHandler shardingCTLHintBackendHandler = new ShardingCTLHintBackendHandler(sql, backendConnection);
- assertThat(shardingCTLHintBackendHandler.execute(), instanceOf(UpdateResponse.class));
+ ShardingCTLHintBackendHandler hintBackendHandler = new ShardingCTLHintBackendHandler(sql, backendConnection);
+ assertThat(hintBackendHandler.execute(), instanceOf(UpdateResponse.class));
assertThat(HintManager.getInstance(), instanceOf(HintManager.class));
HintManager.clear();
}
@@ -140,29 +140,29 @@ public final class ShardingCTLHintBackendHandlerTest {
public void assertShowStatus() throws SQLException {
clearThreadLocal();
String sql = "sctl:hint show status";
- ShardingCTLHintBackendHandler defaultShardingCTLHintBackendHandler = new ShardingCTLHintBackendHandler(sql, backendConnection);
- BackendResponse backendResponse = defaultShardingCTLHintBackendHandler.execute();
+ ShardingCTLHintBackendHandler defaultHintBackendHandler = new ShardingCTLHintBackendHandler(sql, backendConnection);
+ BackendResponse backendResponse = defaultHintBackendHandler.execute();
assertThat(backendResponse, instanceOf(QueryResponse.class));
- assertThat(((QueryResponse) backendResponse).getQueryHeaders().get(0).getColumnLabel(), is("master_only"));
+ assertThat(((QueryResponse) backendResponse).getQueryHeaders().get(0).getColumnLabel(), is("primary_only"));
assertThat(((QueryResponse) backendResponse).getQueryHeaders().get(1).getColumnLabel(), is("sharding_type"));
- assertTrue(defaultShardingCTLHintBackendHandler.next());
- QueryData defaultQueryData = defaultShardingCTLHintBackendHandler.getQueryData();
+ assertTrue(defaultHintBackendHandler.next());
+ QueryData defaultQueryData = defaultHintBackendHandler.getQueryData();
assertThat(defaultQueryData.getColumnTypes().get(0), is(Types.CHAR));
assertThat(defaultQueryData.getColumnTypes().get(1), is(Types.CHAR));
assertThat(defaultQueryData.getData().get(0).toString(), is("false"));
assertThat(defaultQueryData.getData().get(1).toString(), is("databases_tables"));
- assertFalse(defaultShardingCTLHintBackendHandler.next());
- String setMasterOnlySQL = "sctl:hint set master_only=true";
+ assertFalse(defaultHintBackendHandler.next());
+ String setPrimaryOnlySQL = "sctl:hint set primary_only=true";
String setDatabaseOnlySQL = "sctl:hint set DatabaseShardingValue=100";
- new ShardingCTLHintBackendHandler(setMasterOnlySQL, backendConnection).execute();
+ new ShardingCTLHintBackendHandler(setPrimaryOnlySQL, backendConnection).execute();
new ShardingCTLHintBackendHandler(setDatabaseOnlySQL, backendConnection).execute();
- ShardingCTLHintBackendHandler updateShardingCTLHintBackendHandler = new ShardingCTLHintBackendHandler(sql, backendConnection);
- updateShardingCTLHintBackendHandler.execute();
- assertTrue(updateShardingCTLHintBackendHandler.next());
- QueryData updateQueryData = updateShardingCTLHintBackendHandler.getQueryData();
+ ShardingCTLHintBackendHandler updateHintBackendHandler = new ShardingCTLHintBackendHandler(sql, backendConnection);
+ updateHintBackendHandler.execute();
+ assertTrue(updateHintBackendHandler.next());
+ QueryData updateQueryData = updateHintBackendHandler.getQueryData();
assertThat(updateQueryData.getData().get(0).toString(), is("true"));
assertThat(updateQueryData.getData().get(1).toString(), is("databases_only"));
- assertFalse(updateShardingCTLHintBackendHandler.next());
+ assertFalse(updateHintBackendHandler.next());
}
@Test
@@ -177,41 +177,40 @@ public final class ShardingCTLHintBackendHandlerTest {
schemaContexts.set(ProxyContext.getInstance(),
new StandardSchemaContexts(getSchemaContextMap(), new Authentication(), new ConfigurationProperties(props), new MySQLDatabaseType()));
String sql = "sctl:hint show table status";
- ShardingCTLHintBackendHandler defaultShardingCTLHintBackendHandler = new ShardingCTLHintBackendHandler(sql, backendConnection);
- BackendResponse backendResponse = defaultShardingCTLHintBackendHandler.execute();
+ ShardingCTLHintBackendHandler defaultHintBackendHandler = new ShardingCTLHintBackendHandler(sql, backendConnection);
+ BackendResponse backendResponse = defaultHintBackendHandler.execute();
assertThat(backendResponse, instanceOf(QueryResponse.class));
assertThat(((QueryResponse) backendResponse).getQueryHeaders().get(0).getColumnLabel(), is("table_name"));
assertThat(((QueryResponse) backendResponse).getQueryHeaders().get(1).getColumnLabel(), is("database_sharding_values"));
assertThat(((QueryResponse) backendResponse).getQueryHeaders().get(2).getColumnLabel(), is("table_sharding_values"));
- assertTrue(defaultShardingCTLHintBackendHandler.next());
- QueryData defaultQueryData = defaultShardingCTLHintBackendHandler.getQueryData();
+ assertTrue(defaultHintBackendHandler.next());
+ QueryData defaultQueryData = defaultHintBackendHandler.getQueryData();
assertThat(defaultQueryData.getData().get(0).toString(), is("user"));
assertThat(defaultQueryData.getData().get(1).toString(), is(""));
assertThat(defaultQueryData.getData().get(2).toString(), is(""));
- assertFalse(defaultShardingCTLHintBackendHandler.next());
+ assertFalse(defaultHintBackendHandler.next());
String addDatabaseShardingValueSQL = "sctl:hint addDatabaseshardingvalue user=100";
String addTableShardingValueSQL1 = "sctl:hint addTableshardingvalue user=200";
String addTableShardingValueSQL2 = "sctl:hint addTableshardingvalue user=300";
new ShardingCTLHintBackendHandler(addDatabaseShardingValueSQL, backendConnection).execute();
new ShardingCTLHintBackendHandler(addTableShardingValueSQL1, backendConnection).execute();
new ShardingCTLHintBackendHandler(addTableShardingValueSQL2, backendConnection).execute();
- ShardingCTLHintBackendHandler updateShardingCTLHintBackendHandler = new ShardingCTLHintBackendHandler(sql, backendConnection);
- updateShardingCTLHintBackendHandler.execute();
- assertTrue(updateShardingCTLHintBackendHandler.next());
- QueryData updateQueryData = updateShardingCTLHintBackendHandler.getQueryData();
+ ShardingCTLHintBackendHandler updateHintBackendHandler = new ShardingCTLHintBackendHandler(sql, backendConnection);
+ updateHintBackendHandler.execute();
+ assertTrue(updateHintBackendHandler.next());
+ QueryData updateQueryData = updateHintBackendHandler.getQueryData();
assertThat(updateQueryData.getData().get(0).toString(), is("user"));
assertThat(updateQueryData.getData().get(1).toString(), is("100"));
assertThat(updateQueryData.getData().get(2).toString(), is("200,300"));
- assertFalse(updateShardingCTLHintBackendHandler.next());
+ assertFalse(updateHintBackendHandler.next());
}
private Map<String, SchemaContext> getSchemaContextMap() {
SchemaContext result = mock(SchemaContext.class);
ShardingSphereSchema shardingSphereSchema = mock(ShardingSphereSchema.class);
when(result.getSchema()).thenReturn(shardingSphereSchema);
- when(shardingSphereSchema.getMetaData()).thenReturn(
- new ShardingSphereMetaData(mock(DataSourceMetaDatas.class), new RuleSchemaMetaData(new SchemaMetaData(ImmutableMap.of("user", mock(TableMetaData.class))), Collections.emptyMap()),
- "sharding_db"));
+ when(shardingSphereSchema.getMetaData()).thenReturn(new ShardingSphereMetaData(mock(DataSourceMetaDatas.class),
+ new RuleSchemaMetaData(new SchemaMetaData(ImmutableMap.of("user", mock(TableMetaData.class))), Collections.emptyMap()), "sharding_db"));
return Collections.singletonMap("schema", result);
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/ShardingCTLHintParserTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/ShardingCTLHintParserTest.java
index fbdb165..fd04cbb 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/ShardingCTLHintParserTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/ShardingCTLHintParserTest.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.H
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.HintClearCommand;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.HintErrorParameterCommand;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.HintSetDatabaseShardingValueCommand;
-import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.HintSetMasterOnlyCommand;
+import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.HintSetPrimaryOnlyCommand;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.HintShowStatusCommand;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.HintShowTableStatusCommand;
import org.junit.Test;
@@ -38,16 +38,16 @@ import static org.junit.Assert.assertTrue;
public final class ShardingCTLHintParserTest {
@Test
- public void assertValidSetMasterOnlySQL() {
- String sql = "sctl:hint set master_only=true ";
+ public void assertValidSetPrimaryOnlySQL() {
+ String sql = "sctl:hint set primary_only=true ";
Optional<ShardingCTLHintStatement> actual = new ShardingCTLHintParser(sql).doParse();
assertTrue(actual.isPresent());
- assertTrue(((HintSetMasterOnlyCommand) actual.get().getHintCommand()).isMasterOnly());
+ assertTrue(((HintSetPrimaryOnlyCommand) actual.get().getHintCommand()).isPrimaryOnly());
}
@Test
- public void assertInValidSetMasterOnlySQL() {
- String sql = "sctl:hint set master_only1=true ";
+ public void assertInValidSetPrimaryOnlySQL() {
+ String sql = "sctl:hint set primary_only1=true ";
Optional<ShardingCTLHintStatement> actual = new ShardingCTLHintParser(sql).doParse();
assertTrue(actual.isPresent());
assertThat(actual.get().getHintCommand(), instanceOf(HintErrorParameterCommand.class));
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/HintCommandExecutorFactoryTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/HintCommandExecutorFactoryTest.java
index f68bdf3..7e2236f 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/HintCommandExecutorFactoryTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/HintCommandExecutorFactoryTest.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.H
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.HintClearCommand;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.HintErrorParameterCommand;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.HintSetDatabaseShardingValueCommand;
-import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.HintSetMasterOnlyCommand;
+import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.HintSetPrimaryOnlyCommand;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.HintShowStatusCommand;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.HintShowTableStatusCommand;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.executor.HintAddDatabaseShardingValueExecutor;
@@ -31,7 +31,7 @@ import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.executor.
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.executor.HintClearExecutor;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.executor.HintErrorParameterExecutor;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.executor.HintSetDatabaseShardingValueExecutor;
-import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.executor.HintSetMasterOnlyExecutor;
+import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.executor.HintSetPrimaryOnlyExecutor;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.executor.HintShowStatusExecutor;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.executor.HintShowTableStatusExecutor;
import org.junit.Test;
@@ -50,10 +50,10 @@ public final class HintCommandExecutorFactoryTest {
private BackendConnection backendConnection;
@Test
- public void assertHintSetMasterOnlyExecutor() {
- String sql = "sctl:hint set master_only=false";
- HintCommand hintCommand = mock(HintSetMasterOnlyCommand.class);
- assertThat(HintCommandExecutorFactory.newInstance(hintCommand, backendConnection, sql), instanceOf(HintSetMasterOnlyExecutor.class));
+ public void assertHintSetPrimaryOnlyExecutor() {
+ String sql = "sctl:hint set primary_only=false";
+ HintCommand hintCommand = mock(HintSetPrimaryOnlyCommand.class);
+ assertThat(HintCommandExecutorFactory.newInstance(hintCommand, backendConnection, sql), instanceOf(HintSetPrimaryOnlyExecutor.class));
}
@Test
diff --git a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/ProxyConfigurationLoaderTest.java b/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/ProxyConfigurationLoaderTest.java
index 6a3f161..2e52a0f 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/ProxyConfigurationLoaderTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/ProxyConfigurationLoaderTest.java
@@ -96,9 +96,9 @@ public final class ProxyConfigurationLoaderTest {
assertThat(actual.getName(), is("pr_ds"));
assertThat(actual.getPrimaryDataSourceName(), is("primary_ds"));
assertThat(actual.getReplicaDataSourceNames().size(), is(2));
- Iterator<String> slaveDataSourceNames = actual.getReplicaDataSourceNames().iterator();
- assertThat(slaveDataSourceNames.next(), is("replica_ds_0"));
- assertThat(slaveDataSourceNames.next(), is("replica_ds_1"));
+ Iterator<String> replicaDataSourceNames = actual.getReplicaDataSourceNames().iterator();
+ assertThat(replicaDataSourceNames.next(), is("replica_ds_0"));
+ assertThat(replicaDataSourceNames.next(), is("replica_ds_1"));
}
private void assertEncryptRuleConfiguration(final YamlProxyRuleConfiguration actual) {