You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by me...@apache.org on 2020/09/24 12:03:59 UTC
[shardingsphere] branch master updated: Refactor xml (#7591)
This is an automated email from the ASF dual-hosted git repository.
menghaoran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 9a81af0 Refactor xml (#7591)
9a81af0 is described below
commit 9a81af02ad9e3a8761e9e9c3af4cf5a3c66b9fb6
Author: Liang Zhang <te...@163.com>
AuthorDate: Thu Sep 24 20:03:30 2020 +0800
Refactor xml (#7591)
---
.../application-primary-replica-replication.xml | 12 +++---
.../application-primary-replica-replication.xml | 45 ++++++++++-----------
...=> application-primary-replica-replication.xml} | 12 +++---
...=> application-primary-replica-replication.xml} | 21 ++++------
.../application-primary-replica-replication.xml | 6 +--
.../application-primary-replica-replication.xml | 28 ++++++-------
...cation-sharding-primary-replica-replication.xml | 46 +++++++++++-----------
.../cases/dml/dml-integrate-test-cases.xml | 4 +-
.../cases/dql/dql-integrate-test-cases.xml | 2 +-
.../dataset.xml | 2 +-
.../env/primary_replica_replication/dataset.xml | 2 +-
...ding-primary-replica-replication-namespace.xml} | 8 ++--
...ding-primary-replica-replication-governance.xml | 7 ++--
13 files changed, 92 insertions(+), 103 deletions(-)
diff --git a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/nacos/cloud/application-primary-replica-replication.xml b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/nacos/cloud/application-primary-replica-replication.xml
index 79053f3..61451b8 100644
--- a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/nacos/cloud/application-primary-replica-replication.xml
+++ b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/nacos/cloud/application-primary-replica-replication.xml
@@ -32,20 +32,20 @@
<import resource="classpath*:META-INF/nacos/registry-center.xml" />
<context:component-scan base-package="org.apache.shardingsphere.example.core.mybatis" />
- <governance:data-source id="masterSlaveDataSource" reg-center-ref="regCenter" data-source-names="" rule-refs=""/>
+ <governance:data-source id="primaryReplicaReplicationDataSource" reg-center-ref="regCenter" data-source-names="" rule-refs="" />
<bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
- <property name="dataSource" ref="masterSlaveDataSource" />
+ <property name="dataSource" ref="primaryReplicaReplicationDataSource" />
</bean>
<tx:annotation-driven />
<bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
- <property name="dataSource" ref="masterSlaveDataSource"/>
- <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml"/>
+ <property name="dataSource" ref="primaryReplicaReplicationDataSource" />
+ <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml" />
</bean>
<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
- <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository"/>
- <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"/>
+ <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository" />
+ <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory" />
</bean>
</beans>
diff --git a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/nacos/local/application-primary-replica-replication.xml b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/nacos/local/application-primary-replica-replication.xml
index 4140e47..21c9f6a 100644
--- a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/nacos/local/application-primary-replica-replication.xml
+++ b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/nacos/local/application-primary-replica-replication.xml
@@ -20,7 +20,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:tx="http://www.springframework.org/schema/tx"
- xmlns:shardingsphere="http://shardingsphere.apache.org/schema/shardingsphere/datasource"
xmlns:primary-replica-replication="http://shardingsphere.apache.org/schema/shardingsphere/primary-replica-replication"
xmlns:governance="http://shardingsphere.apache.org/schema/shardingsphere/governance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
@@ -29,8 +28,6 @@
http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/tx
http://www.springframework.org/schema/tx/spring-tx.xsd
- http://shardingsphere.apache.org/schema/shardingsphere/datasource
- http://shardingsphere.apache.org/schema/shardingsphere/datasource/datasource.xsd
http://shardingsphere.apache.org/schema/shardingsphere/primary-replica-replication
http://shardingsphere.apache.org/schema/shardingsphere/primary-replica-replication/primary-replica-replication.xsd
http://shardingsphere.apache.org/schema/shardingsphere/governance
@@ -40,48 +37,46 @@
<context:component-scan base-package="org.apache.shardingsphere.example.core.mybatis" />
<bean id="demo_primary_ds" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
- <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
- <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_primary_ds"/>
- <property name="username" value="root"/>
- <property name="password" value=""/>
+ <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+ <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_primary_ds" />
+ <property name="username" value="root" />
+ <property name="password" value="" />
</bean>
<bean id="demo_replica_ds_0" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
- <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
- <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_replica_ds_0"/>
- <property name="username" value="root"/>
- <property name="password" value=""/>
+ <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+ <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_replica_ds_0" />
+ <property name="username" value="root" />
+ <property name="password" value="" />
</bean>
<bean id="demo_replica_ds_1" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
- <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
- <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_replica_ds_1"/>
- <property name="username" value="root"/>
- <property name="password" value=""/>
+ <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+ <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_replica_ds_1" />
+ <property name="username" value="root" />
+ <property name="password" value="" />
</bean>
<primary-replica-replication:load-balance-algorithm id="randomStrategy" type="RANDOM" />
-
- <primary-replica-replication:rule id="masterSlaveRule">
+
+ <primary-replica-replication:rule id="primaryReplicaReplicationRule">
<primary-replica-replication:data-source-rule id="demo_ds" primary-data-source-name="demo_primary_ds" replica-data-source-names="demo_replica_ds_0, demo_replica_ds_1" load-balance-algorithm-ref="randomStrategy" />
</primary-replica-replication:rule>
- <shardingsphere:data-source id="realMasterSlaveDataSource" data-source-names="demo_primary_ds, demo_replica_ds_0, demo_replica_ds_1" rule-refs="masterSlaveRule" />
-
- <governance:data-source id="masterSlaveDataSource" data-source-ref="realMasterSlaveDataSource" reg-center-ref="regCenter" config-center-ref="confCenter" />
+ <governance:data-source id="primaryReplicaReplicationDataSource" data-source-names="demo_primary_ds, demo_replica_ds_0, demo_replica_ds_1" rule-refs="primaryReplicaReplicationRule" reg-center-ref="regCenter" config-center-ref="confCenter" />
<bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
- <property name="dataSource" ref="masterSlaveDataSource" />
+ <property name="dataSource" ref="primaryReplicaReplicationDataSource" />
</bean>
<tx:annotation-driven />
<bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
- <property name="dataSource" ref="masterSlaveDataSource"/>
- <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml"/>
+ <property name="dataSource" ref="primaryReplicaReplicationDataSource" />
+ <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml" />
</bean>
<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
- <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository"/>
- <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"/>
+ <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository" />
+ <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory" />
</bean>
</beans>
diff --git a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/cloud/application-master-slave.xml b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/cloud/application-primary-replica-replication.xml
similarity index 88%
rename from examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/cloud/application-master-slave.xml
rename to examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/cloud/application-primary-replica-replication.xml
index 4c52b57..78926db 100644
--- a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/cloud/application-master-slave.xml
+++ b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/cloud/application-primary-replica-replication.xml
@@ -32,20 +32,20 @@
<context:component-scan base-package="org.apache.shardingsphere.example.core.mybatis" />
<import resource="classpath*:META-INF/zookeeper/registry-center.xml" />
- <governance:data-source id="masterSlaveDataSource" reg-center-ref="regCenter" />
+ <governance:data-source id="primaryReplicaReplicationDataSource" reg-center-ref="regCenter" />
<bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
- <property name="dataSource" ref="masterSlaveDataSource" />
+ <property name="dataSource" ref="primaryReplicaReplicationDataSource" />
</bean>
<tx:annotation-driven />
<bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
- <property name="dataSource" ref="masterSlaveDataSource"/>
- <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml"/>
+ <property name="dataSource" ref="primaryReplicaReplicationDataSource" />
+ <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml" />
</bean>
<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
- <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository"/>
- <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"/>
+ <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository" />
+ <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory" />
</bean>
</beans>
diff --git a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/local/application-master-slave.xml b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/local/application-primary-replica-replication.xml
similarity index 83%
rename from examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/local/application-master-slave.xml
rename to examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/local/application-primary-replica-replication.xml
index bef826e..5aa194c 100644
--- a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/local/application-master-slave.xml
+++ b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/local/application-primary-replica-replication.xml
@@ -20,7 +20,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:tx="http://www.springframework.org/schema/tx"
- xmlns:shardingsphere="http://shardingsphere.apache.org/schema/shardingsphere/datasource"
xmlns:primary-replica-replication="http://shardingsphere.apache.org/schema/shardingsphere/primary-replica-replication"
xmlns:governance="http://shardingsphere.apache.org/schema/shardingsphere/governance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
@@ -29,8 +28,6 @@
http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/tx
http://www.springframework.org/schema/tx/spring-tx.xsd
- http://shardingsphere.apache.org/schema/shardingsphere/datasource
- http://shardingsphere.apache.org/schema/shardingsphere/datasource/datasource.xsd
http://shardingsphere.apache.org/schema/shardingsphere/primary-replica-replication
http://shardingsphere.apache.org/schema/shardingsphere/primary-replica-replication/primary-replica-replication.xsd
http://shardingsphere.apache.org/schema/shardingsphere/governance
@@ -61,27 +58,25 @@
</bean>
<primary-replica-replication:load-balance-algorithm id="randomStrategy" type="RANDOM" />
-
- <primary-replica-replication:rule id="masterSlaveRule">
+
+ <primary-replica-replication:rule id="primaryReplicaReplicationRule">
<primary-replica-replication:data-source-rule id="demo_ds" primary-data-source-name="demo_primary_ds" replica-data-source-names="demo_replica_ds_0, demo_replica_ds_1" load-balance-algorithm-ref="randomStrategy" />
</primary-replica-replication:rule>
- <shardingsphere:data-source id="realMasterSlaveDataSource" data-source-names="demo_primary_ds, demo_replica_ds_0, demo_replica_ds_1" rule-refs="masterSlaveRule" />
-
- <governance:data-source id="masterSlaveDataSource" data-source-ref="realMasterSlaveDataSource" reg-center-ref="regCenter" />
+ <governance:data-source id="primaryReplicaReplicationDataSource" data-source-names="demo_primary_ds, demo_replica_ds_0, demo_replica_ds_1" rule-refs="primaryReplicaReplicationRule" reg-center-ref="regCenter" />
<bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
- <property name="dataSource" ref="masterSlaveDataSource" />
+ <property name="dataSource" ref="primaryReplicaReplicationDataSource" />
</bean>
<tx:annotation-driven />
<bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
- <property name="dataSource" ref="masterSlaveDataSource"/>
- <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml"/>
+ <property name="dataSource" ref="primaryReplicaReplicationDataSource" />
+ <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml" />
</bean>
<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
- <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository"/>
- <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"/>
+ <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository" />
+ <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory" />
</bean>
</beans>
diff --git a/examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-primary-replica-replication.xml b/examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-primary-replica-replication.xml
index 4210d10..6369e3f 100644
--- a/examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-primary-replica-replication.xml
+++ b/examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-primary-replica-replication.xml
@@ -36,9 +36,9 @@
">
<context:annotation-config />
<context:component-scan base-package="org.apache.shardingsphere.example.core.jpa"/>
-
+
<bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
- <property name="dataSource" ref="masterSlaveDataSource" />
+ <property name="dataSource" ref="primaryReplicaReplicationDataSource" />
<property name="jpaVendorAdapter">
<bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter" p:database="MYSQL" />
</property>
@@ -81,5 +81,5 @@
<primary-replica-replication:data-source-rule id="demo_ds" primary-data-source-name="demo_primary_ds" replica-data-source-names="demo_replica_ds_0, demo_replica_ds_1" load-balance-algorithm-ref="randomStrategy" />
</primary-replica-replication:rule>
- <shardingsphere:data-source id="masterSlaveDataSource" data-source-names="demo_primary_ds, demo_replica_ds_0, demo_replica_ds_1" rule-refs="primaryReplicaReplicationRule" />
+ <shardingsphere:data-source id="primaryReplicaReplicationDataSource" data-source-names="demo_primary_ds, demo_replica_ds_0, demo_replica_ds_1" rule-refs="primaryReplicaReplicationRule" />
</beans>
diff --git a/examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-primary-replica-replication.xml b/examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-primary-replica-replication.xml
index 1deb24b..568b852 100644
--- a/examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-primary-replica-replication.xml
+++ b/examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-primary-replica-replication.xml
@@ -36,17 +36,17 @@
<context:component-scan base-package="org.apache.shardingsphere.example.core.mybatis" />
<bean id="demo_primary_ds" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
- <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
- <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_primary_ds?useSSL=false&useUnicode=true&characterEncoding=UTF-8"/>
- <property name="username" value="root"/>
- <property name="password" value=""/>
+ <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+ <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_primary_ds?useSSL=false&useUnicode=true&characterEncoding=UTF-8" />
+ <property name="username" value="root" />
+ <property name="password" value="" />
</bean>
<bean id="demo_replica_ds_0" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
<property name="driverClassName" value="com.mysql.jdbc.Driver"/>
- <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_replica_ds_0?useSSL=false&useUnicode=true&characterEncoding=UTF-8"/>
- <property name="username" value="root"/>
- <property name="password" value=""/>
+ <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_replica_ds_0?useSSL=false&useUnicode=true&characterEncoding=UTF-8" />
+ <property name="username" value="root" />
+ <property name="password" value="" />
</bean>
<bean id="demo_replica_ds_1" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
@@ -58,24 +58,24 @@
<primary-replica-replication:load-balance-algorithm id="randomStrategy" type="RANDOM" />
- <primary-replica-replication:rule id="masterSlaveRule">
+ <primary-replica-replication:rule id="primaryReplicaReplicationRule">
<primary-replica-replication:data-source-rule id="demo_ds" primary-data-source-name="demo_primary_ds" replica-data-source-names="demo_replica_ds_0, demo_replica_ds_1" load-balance-algorithm-ref="randomStrategy" />
</primary-replica-replication:rule>
- <shardingsphere:data-source id="masterSlaveDataSource" data-source-names="demo_primary_ds, demo_replica_ds_0, demo_replica_ds_1" rule-refs="masterSlaveRule" />
+ <shardingsphere:data-source id="primaryReplicaReplicationDataSource" data-source-names="demo_primary_ds, demo_replica_ds_0, demo_replica_ds_1" rule-refs="primaryReplicaReplicationRule" />
<bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
- <property name="dataSource" ref="masterSlaveDataSource" />
+ <property name="dataSource" ref="primaryReplicaReplicationDataSource" />
</bean>
<tx:annotation-driven />
<bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
- <property name="dataSource" ref="masterSlaveDataSource"/>
- <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml"/>
+ <property name="dataSource" ref="primaryReplicaReplicationDataSource" />
+ <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml" />
</bean>
<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
- <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository"/>
- <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"/>
+ <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository" />
+ <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory" />
</bean>
</beans>
diff --git a/examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-primary-replica-replication.xml b/examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-primary-replica-replication.xml
index 314381f..98b6417 100644
--- a/examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-primary-replica-replication.xml
+++ b/examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-primary-replica-replication.xml
@@ -39,45 +39,45 @@
<context:component-scan base-package="org.apache.shardingsphere.example.core.mybatis" />
<bean id="demo_primary_ds_0" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
- <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
- <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_primary_ds_0?useSSL=false&useUnicode=true&characterEncoding=UTF-8"/>
- <property name="username" value="root"/>
- <property name="password" value=""/>
+ <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+ <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_primary_ds_0?useSSL=false&useUnicode=true&characterEncoding=UTF-8" />
+ <property name="username" value="root" />
+ <property name="password" value="" />
</bean>
<bean id="demo_primary_ds_0_replica_0" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
- <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
- <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_primary_ds_0_replica_0?useSSL=false&useUnicode=true&characterEncoding=UTF-8"/>
- <property name="username" value="root"/>
- <property name="password" value=""/>
+ <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+ <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_primary_ds_0_replica_0?useSSL=false&useUnicode=true&characterEncoding=UTF-8" />
+ <property name="username" value="root" />
+ <property name="password" value="" />
</bean>
<bean id="demo_primary_ds_0_replica_1" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
<property name="driverClassName" value="com.mysql.jdbc.Driver"/>
- <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_primary_ds_0_replica_1?useSSL=false&useUnicode=true&characterEncoding=UTF-8"/>
- <property name="username" value="root"/>
- <property name="password" value=""/>
+ <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_primary_ds_0_replica_1?useSSL=false&useUnicode=true&characterEncoding=UTF-8" />
+ <property name="username" value="root" />
+ <property name="password" value="" />
</bean>
<bean id="demo_primary_ds_1" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
- <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
- <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_primary_ds_1?useSSL=false&useUnicode=true&characterEncoding=UTF-8"/>
- <property name="username" value="root"/>
- <property name="password" value=""/>
+ <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+ <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_primary_ds_1?useSSL=false&useUnicode=true&characterEncoding=UTF-8" />
+ <property name="username" value="root" />
+ <property name="password" value="" />
</bean>
<bean id="demo_primary_ds_1_replica_0" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
<property name="driverClassName" value="com.mysql.jdbc.Driver"/>
- <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_primary_ds_1_replica_0?useSSL=false&useUnicode=true&characterEncoding=UTF-8"/>
- <property name="username" value="root"/>
- <property name="password" value=""/>
+ <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_primary_ds_1_replica_0?useSSL=false&useUnicode=true&characterEncoding=UTF-8" />
+ <property name="username" value="root" />
+ <property name="password" value="" />
</bean>
<bean id="demo_primary_ds_1_replica_1" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
<property name="driverClassName" value="com.mysql.jdbc.Driver"/>
- <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_primary_ds_1_replica_1?useSSL=false&useUnicode=true&characterEncoding=UTF-8"/>
- <property name="username" value="root"/>
- <property name="password" value=""/>
+ <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_primary_ds_1_replica_1?useSSL=false&useUnicode=true&characterEncoding=UTF-8" />
+ <property name="username" value="root" />
+ <property name="password" value="" />
</bean>
<sharding:standard-strategy id="databaseStrategy" sharding-column="user_id" algorithm-ref="inlineDatabaseStrategyAlgorithm" />
@@ -123,12 +123,12 @@
<sharding:broadcast-table-rule table="t_address"/>
</sharding:broadcast-table-rules>
</sharding:rule>
- <primary-replica-replication:rule id="masterSlaveRule">
+ <primary-replica-replication:rule id="primaryReplicaReplicationRule">
<primary-replica-replication:data-source-rule id="demo_pr_ds_0" primary-data-source-name="demo_primary_ds_0" replica-data-source-names="demo_primary_ds_0_replica_0, demo_primary_ds_0_replica_1" load-balance-algorithm-ref="randomStrategy" />
<primary-replica-replication:data-source-rule id="demo_pr_ds_1" primary-data-source-name="demo_primary_ds_1" replica-data-source-names="demo_primary_ds_1_replica_0, demo_primary_ds_1_replica_1" load-balance-algorithm-ref="randomStrategy" />
</primary-replica-replication:rule>
- <shardingsphere:data-source id="shardingDataSource" data-source-names="demo_primary_ds_0,demo_primary_ds_0_replica_0,demo_primary_ds_0_replica_1,demo_primary_ds_1,demo_primary_ds_1_replica_0,demo_primary_ds_1_replica_1" rule-refs="shardingRule, masterSlaveRule">
+ <shardingsphere:data-source id="shardingDataSource" data-source-names="demo_primary_ds_0,demo_primary_ds_0_replica_0,demo_primary_ds_0_replica_1,demo_primary_ds_1,demo_primary_ds_1_replica_0,demo_primary_ds_1_replica_1" rule-refs="shardingRule, primaryReplicaReplicationRule">
<props>
<prop key="sql-show">false</prop>
</props>
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dml-integrate-test-cases.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dml-integrate-test-cases.xml
index da4f8b1..e8e8b52 100644
--- a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dml-integrate-test-cases.xml
+++ b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dml/dml-integrate-test-cases.xml
@@ -86,7 +86,7 @@
</dml-test-case>
<dml-test-case sql="INSERT INTO t_order_item values(?, ?, 'insert', '2017-08-08')">
- <assertion sharding-rule-type="dbtbl_with_master_slave" parameters="1:int, 1:int" expected-data-file="insert_with_generate_key_column.xml" />
+ <assertion sharding-rule-type="dbtbl_with_primary_replica_replication" parameters="1:int, 1:int" expected-data-file="insert_with_generate_key_column.xml" />
<!-- TODO add gen column on create table -->
<!--<assertion parameters="1:int, 1:int" expected-data-file="insert_with_generate_key_column.xml" />-->
</dml-test-case>
@@ -116,7 +116,7 @@
</dml-test-case>
<!--<dml-test-case sql="INSERT INTO t_order_item(order_id, user_id, status, creation_date) values (?, ?, 'insert', '2017-08-08'), (?, ?, 'insert', '2017-08-08')">-->
- <!--<assertion sharding-rule-type="dbtbl_with_master_slave" parameters="1:int, 1:int, 2:int, 2:int" expected-data-file="batch_insert_without_generate_key_column.xml" />-->
+ <!--<assertion sharding-rule-type="dbtbl_with_primary_replica_replication" parameters="1:int, 1:int, 2:int, 2:int" expected-data-file="batch_insert_without_generate_key_column.xml" />-->
<!--<!– TODO add gen column on create table –>-->
<!--<!–<assertion parameters="1:int, 1:int, 2:int, 2:int" expected-data-file="batch_insert_without_generate_key_column.xml" />–>-->
<!--</dml-test-case>-->
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dql-integrate-test-cases.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dql-integrate-test-cases.xml
index 141bf25..bb653ee 100644
--- a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dql-integrate-test-cases.xml
+++ b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dql-integrate-test-cases.xml
@@ -227,7 +227,7 @@
</dql-test-case>
<!--<dql-test-case sql="SELECT date_format(creation_date, '%%y-%%m-%%d') as creation_date, count(*) as c_number FROM `t_order_item` WHERE order_id in (?, ?) GROUP BY date_format(creation_date, '%%y-%%m-%%d')" db-types="MySQL">-->
- <!--<assertion sharding-rule-type="dbtbl_with_master_slave" parameters="1000:int, 1100:int" expected-data-file="select_group_by_with_date_function.xml" />-->
+ <!--<assertion sharding-rule-type="dbtbl_with_primary_replica_replication" parameters="1000:int, 1100:int" expected-data-file="select_group_by_with_date_function.xml" />-->
<!--</dql-test-case>-->
<dql-test-case sql="SELECT * FROM t_order WHERE order_id = ? OR order_id = ?">
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/dbtbl_with_primary_replica_replication/dataset.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/dbtbl_with_primary_replica_replication/dataset.xml
index 7fdba92..6ca101f 100644
--- a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/dbtbl_with_primary_replica_replication/dataset.xml
+++ b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/dbtbl_with_primary_replica_replication/dataset.xml
@@ -360,7 +360,7 @@
<row data-node="primary_ds_7.key_word" values="1, init" />
<row data-node="primary_ds_8.key_word" values="1, init" />
<row data-node="primary_ds_9.key_word" values="1, init" />
- <row data-node="primary_ds_0.t_global" values="1, global_master" />
+ <row data-node="primary_ds_0.t_global" values="1, global_primary" />
<row data-node="replica_ds_0.t_order_0" values="1000, 10, init_replica" />
<row data-node="replica_ds_0.t_order_1" values="1001, 10, init_replica" />
<row data-node="replica_ds_0.t_order_2" values="1002, 10, init_replica" />
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/primary_replica_replication/dataset.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/primary_replica_replication/dataset.xml
index 0e07552..6390fad 100644
--- a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/primary_replica_replication/dataset.xml
+++ b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/primary_replica_replication/dataset.xml
@@ -162,7 +162,7 @@
<row data-node="primary_ds.t_order_item" values="290102, 2901, 29, init, 2017-08-08" />
<row data-node="primary_ds.t_broadcast_table" values="1, init" />
<row data-node="primary_ds.key_word" values="1, init" />
- <row data-node="primary_ds.t_global" values="1, global_master" />
+ <row data-node="primary_ds.t_global" values="1, global_primary" />
<row data-node="replica_0.t_order" values="1000, 10, init_replica" />
<row data-node="replica_0.t_order" values="1001, 10, init_replica" />
<row data-node="replica_0.t_order" values="1100, 11, init_replica" />
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/META-INF/rdb/namespace/sharding-master-slave-namespace.xml b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/META-INF/rdb/namespace/sharding-primary-replica-replication-namespace.xml
similarity index 90%
rename from shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/META-INF/rdb/namespace/sharding-master-slave-namespace.xml
rename to shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/META-INF/rdb/namespace/sharding-primary-replica-replication-namespace.xml
index 97619aa..1157c6c 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/META-INF/rdb/namespace/sharding-master-slave-namespace.xml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/META-INF/rdb/namespace/sharding-primary-replica-replication-namespace.xml
@@ -50,22 +50,22 @@
<sharding:key-generate-strategy id="keyGenerateStrategy" column="order_id" algorithm-ref="incrementAlgorithm" />
<primary-replica-replication:load-balance-algorithm id="randomLoadBalanceAlgorithm" type="RANDOM" />
- <sharding:rule id="masterSlaveShardingDataSourceByDefaultStrategyShardingRule" default-key-generate-strategy-ref="keyGenerateStrategy">
+ <sharding:rule id="primaryReplicaReplicationShardingDataSourceByDefaultStrategyShardingRule" default-key-generate-strategy-ref="keyGenerateStrategy">
<sharding:table-rules>
<sharding:table-rule logic-table="t_order" actual-data-nodes="dbtbl_${0..1}.t_order_${0..3}" database-strategy-ref="standardStrategy" table-strategy-ref="inlineStrategy" key-generate-strategy-ref="keyGenerateStrategy" />
</sharding:table-rules>
</sharding:rule>
- <primary-replica-replication:rule id="masterSlaveShardingDataSourceByDefaultStrategyMasterSlaveRule">
+ <primary-replica-replication:rule id="primaryReplicaReplicationShardingDataSourceByDefaultStrategy">
<primary-replica-replication:data-source-rule id="dbtbl_0" primary-data-source-name="dbtbl_primary_0" replica-data-source-names="dbtbl_0_replica_0,dbtbl_0_replica_1"/>
<primary-replica-replication:data-source-rule id="dbtbl_1" primary-data-source-name="dbtbl_primary_1" replica-data-source-names="dbtbl_1_replica_0,dbtbl_1_replica_1"/>
</primary-replica-replication:rule>
- <sharding:rule id="masterSlaveShardingDataSourceByUserStrategyShardingRule" default-key-generate-strategy-ref="keyGenerateStrategy">
+ <sharding:rule id="primaryReplicaReplicationShardingDataSourceByUserStrategyShardingRule" default-key-generate-strategy-ref="keyGenerateStrategy">
<sharding:table-rules>
<sharding:table-rule logic-table="t_order" actual-data-nodes="dbtbl_${0..1}.t_order_${0..3}" database-strategy-ref="standardStrategy" table-strategy-ref="inlineStrategy" key-generate-strategy-ref="keyGenerateStrategy" />
</sharding:table-rules>
</sharding:rule>
- <primary-replica-replication:rule id="masterSlaveShardingDataSourceByUserStrategyMasterSlaveRule">
+ <primary-replica-replication:rule id="primaryReplicaReplicationShardingDataSourceByUserStrategy">
<primary-replica-replication:data-source-rule id="dbtbl_0" primary-data-source-name="dbtbl_primary_0" replica-data-source-names="dbtbl_0_replica_0,dbtbl_0_replica_1" load-balance-algorithm-ref="randomLoadBalanceAlgorithm"/>
<primary-replica-replication:data-source-rule id="dbtbl_1" primary-data-source-name="dbtbl_primary_1" replica-data-source-names="dbtbl_1_replica_0,dbtbl_1_replica_1" load-balance-algorithm-ref="randomLoadBalanceAlgorithm"/>
</primary-replica-replication:rule>
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/META-INF/rdb/sharding-primary-replica-replication-governance.xml b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/META-INF/rdb/sharding-primary-replica-replication-governance.xml
index 27505cb..5916a9c 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/META-INF/rdb/sharding-primary-replica-replication-governance.xml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/META-INF/rdb/sharding-primary-replica-replication-governance.xml
@@ -24,7 +24,7 @@
http://shardingsphere.apache.org/schema/shardingsphere/governance
http://shardingsphere.apache.org/schema/shardingsphere/governance/governance.xsd
">
- <import resource="namespace/sharding-master-slave-namespace.xml" />
+ <import resource="namespace/sharding-primary-replica-replication-namespace.xml" />
<governance:reg-center id="regCenter" type="TestRegistry" server-lists="localhost:3181">
<props>
@@ -32,7 +32,6 @@
<prop key="operation-timeout-milliseconds">1000</prop>
</props>
</governance:reg-center>
-
- <governance:data-source id="dataSourceByDefaultStrategyGovernance" data-source-names="dbtbl_primary_0,dbtbl_0_replica_0,dbtbl_0_replica_1,dbtbl_primary_1,dbtbl_1_replica_0,dbtbl_1_replica_1" rule-refs="masterSlaveShardingDataSourceByDefaultStrategyShardingRule, masterSlaveShardingDataSourceByDefaultStrategyMasterSlaveRule" reg-center-ref="regCenter" />
- <governance:data-source id="dataSourceByUserStrategyGovernance" data-source-names="dbtbl_primary_0,dbtbl_0_replica_0,dbtbl_0_replica_1,dbtbl_primary_1,dbtbl_1_replica_0,dbtbl_1_replica_1" rule-refs="masterSlaveShardingDataSourceByUserStrategyShardingRule, masterSlaveShardingDataSourceByUserStrategyMasterSlaveRule" reg-center-ref="regCenter" />
+ <governance:data-source id="dataSourceByDefaultStrategyGovernance" data-source-names="dbtbl_primary_0,dbtbl_0_replica_0,dbtbl_0_replica_1,dbtbl_primary_1,dbtbl_1_replica_0,dbtbl_1_replica_1" rule-refs="primaryReplicaReplicationShardingDataSourceByDefaultStrategyShardingRule, primaryReplicaReplicationShardingDataSourceByDefaultStrategy" reg-center-ref="regCenter" />
+ <governance:data-source id="dataSourceByUserStrategyGovernance" data-source-names="dbtbl_primary_0,dbtbl_0_replica_0,dbtbl_0_replica_1,dbtbl_primary_1,dbtbl_1_replica_0,dbtbl_1_replica_1" rule-refs="primaryReplicaReplicationShardingDataSourceByUserStrategyShardingRule, primaryReplicaReplicationShardingDataSourceByUserStrategy" reg-center-ref="regCenter" />
</beans>