for #98 add test case for spring namespace

apache · Sep 1, 2017 · 6857281 · 6857281
1 parent 1e07a10
commit 6857281
Show file tree

Hide file tree

Showing 8 changed files with 139 additions and 7 deletions.
diff --git a/...ng-jdbc-config-spring/src/test/java/com/dangdang/ddframe/rdb/sharding/AllSpringTests.java b/...ng-jdbc-config-spring/src/test/java/com/dangdang/ddframe/rdb/sharding/AllSpringTests.java
@@ -27,7 +27,9 @@
 import com.dangdang.ddframe.rdb.sharding.spring.cases.namespace.WithNamespaceDefaultStrategyTest;
 import com.dangdang.ddframe.rdb.sharding.spring.cases.namespace.WithNamespaceDifferentTablesTest;
 import com.dangdang.ddframe.rdb.sharding.spring.cases.namespace.WithNamespaceForIndicatedDataSourceNamesTest;
-import com.dangdang.ddframe.rdb.sharding.spring.cases.namespace.WithNamespaceForMasterSlaveTest;
+import com.dangdang.ddframe.rdb.sharding.spring.cases.namespace.WithNamespaceForMasterSlaveWithDefaultStrategyTest;
+import com.dangdang.ddframe.rdb.sharding.spring.cases.namespace.WithNamespaceForMasterSlaveWithStrategyRefTest;
+import com.dangdang.ddframe.rdb.sharding.spring.cases.namespace.WithNamespaceForMasterSlaveWithStrategyTypeTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
@@ -44,7 +46,9 @@
         WithoutNamespaceDefaultStrategyTest.class, 
         WithNamespaceDifferentTablesTest.class,
         WithNamespaceForIndicatedDataSourceNamesTest.class,
-        WithNamespaceForMasterSlaveTest.class,
+        WithNamespaceForMasterSlaveWithDefaultStrategyTest.class,
+        WithNamespaceForMasterSlaveWithStrategyRefTest.class,
+        WithNamespaceForMasterSlaveWithStrategyTypeTest.class,
         GenerateKeyDBUnitTest.class
     })
 public class AllSpringTests {

diff --git a/...b/sharding/spring/cases/namespace/WithNamespaceForMasterSlaveWithDefaultStrategyTest.java b/...b/sharding/spring/cases/namespace/WithNamespaceForMasterSlaveWithDefaultStrategyTest.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 1999-2015 dangdang.com.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * </p>
+ */
+
+package com.dangdang.ddframe.rdb.sharding.spring.cases.namespace;
+
+import com.dangdang.ddframe.rdb.sharding.spring.AbstractShardingBothDataBasesAndTablesSpringDBUnitTest;
+import org.springframework.test.context.ContextConfiguration;
+
+import java.util.Arrays;
+import java.util.List;
+
+@ContextConfiguration(locations = "classpath:META-INF/rdb/namespace/withNamespaceForMasterSlaveWithDefaultStrategy.xml")
+public final class WithNamespaceForMasterSlaveWithDefaultStrategyTest extends AbstractShardingBothDataBasesAndTablesSpringDBUnitTest {
+
+    @Override
+    protected List<String> getSchemaFiles() {
+        return Arrays.asList("schema/dbtbl_0_master.sql", "schema/dbtbl_0_slave_0.sql", "schema/dbtbl_0_slave_1.sql",
+                "schema/dbtbl_1_master.sql", "schema/dbtbl_1_slave_0.sql", "schema/dbtbl_1_slave_1.sql");
+    }
+}
diff --git a/...pace/WithNamespaceForMasterSlaveTest.java → ...aceForMasterSlaveWithStrategyRefTest.java b/...pace/WithNamespaceForMasterSlaveTest.java → ...aceForMasterSlaveWithStrategyRefTest.java
@@ -23,8 +23,8 @@
 import java.util.Arrays;
 import java.util.List;
 
-@ContextConfiguration(locations = "classpath:META-INF/rdb/namespace/withNamespaceForMasterSlave.xml")
-public final class WithNamespaceForMasterSlaveTest extends AbstractShardingBothDataBasesAndTablesSpringDBUnitTest {
+@ContextConfiguration(locations = "classpath:META-INF/rdb/namespace/withNamespaceForMasterSlaveWithStrategyRef.xml")
+public final class WithNamespaceForMasterSlaveWithStrategyRefTest extends AbstractShardingBothDataBasesAndTablesSpringDBUnitTest {
 
     @Override
     protected List<String> getSchemaFiles() {

diff --git a/.../rdb/sharding/spring/cases/namespace/WithNamespaceForMasterSlaveWithStrategyTypeTest.java b/.../rdb/sharding/spring/cases/namespace/WithNamespaceForMasterSlaveWithStrategyTypeTest.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 1999-2015 dangdang.com.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * </p>
+ */
+
+package com.dangdang.ddframe.rdb.sharding.spring.cases.namespace;
+
+import com.dangdang.ddframe.rdb.sharding.spring.AbstractShardingBothDataBasesAndTablesSpringDBUnitTest;
+import org.springframework.test.context.ContextConfiguration;
+
+import java.util.Arrays;
+import java.util.List;
+
+@ContextConfiguration(locations = "classpath:META-INF/rdb/namespace/withNamespaceForMasterSlaveWithStrategyType.xml")
+public final class WithNamespaceForMasterSlaveWithStrategyTypeTest extends AbstractShardingBothDataBasesAndTablesSpringDBUnitTest {
+
+    @Override
+    protected List<String> getSchemaFiles() {
+        return Arrays.asList("schema/dbtbl_0_master.sql", "schema/dbtbl_0_slave_0.sql", "schema/dbtbl_0_slave_1.sql",
+                "schema/dbtbl_1_master.sql", "schema/dbtbl_1_slave_0.sql", "schema/dbtbl_1_slave_1.sql");
+    }
+}
diff --git a/...namespace/withNamespaceForMasterSlave.xml → ...paceForMasterSlaveWithDefaultStrategy.xml b/...namespace/withNamespaceForMasterSlave.xml → ...paceForMasterSlaveWithDefaultStrategy.xml
diff --git a/.../src/test/resources/META-INF/rdb/namespace/withNamespaceForMasterSlaveWithStrategyRef.xml b/.../src/test/resources/META-INF/rdb/namespace/withNamespaceForMasterSlaveWithStrategyRef.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:rdb="http://www.dangdang.com/schema/ddframe/rdb"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans 
+                        http://www.springframework.org/schema/beans/spring-beans.xsd 
+                        http://www.dangdang.com/schema/ddframe/rdb 
+                        http://www.dangdang.com/schema/ddframe/rdb/rdb.xsd 
+                        ">
+    <import resource="../datasource/masterSlaveDataSource.xml" />
+
+    <bean id="randomStrategy" class="com.dangdang.ddframe.rdb.sharding.api.strategy.slave.RandomMasterSlaveLoadBalanceStrategy" />
+
+    <rdb:master-slave-data-source id="dbtbl_0" master-data-source-ref="dbtbl_0_master" slave-data-sources-ref="dbtbl_0_slave_0, dbtbl_0_slave_1" strategy-ref="randomStrategy" />
+    <rdb:master-slave-data-source id="dbtbl_1" master-data-source-ref="dbtbl_1_master" slave-data-sources-ref="dbtbl_1_slave_0, dbtbl_1_slave_1" strategy-ref="randomStrategy" />
+
+    <rdb:strategy id="databaseStrategy" sharding-columns="user_id" algorithm-expression="dbtbl_${user_id.longValue() % 2}"/>
+
+    <rdb:strategy id="orderTableStrategy" sharding-columns="order_id" algorithm-expression="t_order_${order_id.longValue() % 4}"/>
+
+    <rdb:strategy id="orderItemTableStrategy" sharding-columns="order_id" algorithm-expression="t_order_item_${order_id.longValue() % 4}"/>
+
+    <rdb:data-source id="shardingDataSource">
+        <rdb:sharding-rule data-sources="dbtbl_0,dbtbl_1" default-data-source="dbtbl_0">
+            <rdb:table-rules>
+                <rdb:table-rule logic-table="t_order" actual-tables="t_order_${0..3}, t_order_${0..3}" data-source-names="dbtbl_0, dbtbl_1" database-strategy="databaseStrategy" table-strategy="orderTableStrategy"/>
+                <rdb:table-rule logic-table="t_order_item" actual-tables="t_order_item_${0..3}" data-source-names="dbtbl_${0..1}" database-strategy="databaseStrategy"  table-strategy="orderItemTableStrategy"/>
+            </rdb:table-rules>
+        </rdb:sharding-rule>
+    </rdb:data-source>
+</beans>
diff --git a/...src/test/resources/META-INF/rdb/namespace/withNamespaceForMasterSlaveWithStrategyType.xml b/...src/test/resources/META-INF/rdb/namespace/withNamespaceForMasterSlaveWithStrategyType.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:rdb="http://www.dangdang.com/schema/ddframe/rdb"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans 
+                        http://www.springframework.org/schema/beans/spring-beans.xsd 
+                        http://www.dangdang.com/schema/ddframe/rdb 
+                        http://www.dangdang.com/schema/ddframe/rdb/rdb.xsd 
+                        ">
+    <import resource="../datasource/masterSlaveDataSource.xml" />
+
+    <rdb:master-slave-data-source id="dbtbl_0" master-data-source-ref="dbtbl_0_master" slave-data-sources-ref="dbtbl_0_slave_0, dbtbl_0_slave_1" strategy-type="RANDOM" />
+    <rdb:master-slave-data-source id="dbtbl_1" master-data-source-ref="dbtbl_1_master" slave-data-sources-ref="dbtbl_1_slave_0, dbtbl_1_slave_1" strategy-type="RANDOM" />
+
+    <rdb:strategy id="databaseStrategy" sharding-columns="user_id" algorithm-expression="dbtbl_${user_id.longValue() % 2}"/>
+
+    <rdb:strategy id="orderTableStrategy" sharding-columns="order_id" algorithm-expression="t_order_${order_id.longValue() % 4}"/>
+
+    <rdb:strategy id="orderItemTableStrategy" sharding-columns="order_id" algorithm-expression="t_order_item_${order_id.longValue() % 4}"/>
+
+    <rdb:data-source id="shardingDataSource">
+        <rdb:sharding-rule data-sources="dbtbl_0,dbtbl_1" default-data-source="dbtbl_0">
+            <rdb:table-rules>
+                <rdb:table-rule logic-table="t_order" actual-tables="t_order_${0..3}, t_order_${0..3}" data-source-names="dbtbl_0, dbtbl_1" database-strategy="databaseStrategy" table-strategy="orderTableStrategy"/>
+                <rdb:table-rule logic-table="t_order_item" actual-tables="t_order_item_${0..3}" data-source-names="dbtbl_${0..1}" database-strategy="databaseStrategy"  table-strategy="orderItemTableStrategy"/>
+            </rdb:table-rules>
+        </rdb:sharding-rule>
+    </rdb:data-source>
+</beans>
diff --git a/.../dangdang/ddframe/rdb/sharding/api/strategy/slave/MasterSlaveLoadBalanceStrategyType.java b/.../dangdang/ddframe/rdb/sharding/api/strategy/slave/MasterSlaveLoadBalanceStrategyType.java
@@ -29,8 +29,8 @@
 @Getter
 public enum MasterSlaveLoadBalanceStrategyType {
 
-    RoundRobin(new RoundRobinMasterSlaveLoadBalanceStrategy()),
-    Random(new RandomMasterSlaveLoadBalanceStrategy());
+    ROUND_ROBIN(new RoundRobinMasterSlaveLoadBalanceStrategy()),
+    RANDOM(new RandomMasterSlaveLoadBalanceStrategy());
 
     private final MasterSlaveLoadBalanceStrategy strategy;
 
@@ -40,6 +40,6 @@ public enum MasterSlaveLoadBalanceStrategyType {
      * @return default master-slave database load-balance strategy type
      */
     public static MasterSlaveLoadBalanceStrategyType getDefaultStrategyType() {
-        return RoundRobin;
+        return ROUND_ROBIN;
     }
 }