fix #80

apache · May 23, 2016 · 5f4b92d · 5f4b92d
1 parent 4695545
commit 5f4b92d
Show file tree

Hide file tree

Showing 36 changed files with 196 additions and 85 deletions.
diff --git a/...rc/main/java/com/dangdang/ddframe/rdb/sharding/config/common/api/ShardingRuleBuilder.java b/...rc/main/java/com/dangdang/ddframe/rdb/sharding/config/common/api/ShardingRuleBuilder.java
@@ -90,7 +90,8 @@ public ShardingRule build() {
 
     private DataSourceRule buildDataSourceRule() {
         Preconditions.checkArgument(!shardingRuleConfig.getDataSource().isEmpty() || MapUtils.isNotEmpty(externalDataSourceMap), "Sharding JDBC: No data source config");
-        return !shardingRuleConfig.getDataSource().isEmpty() ? new DataSourceRule(shardingRuleConfig.getDataSource()) : new DataSourceRule(externalDataSourceMap);
+        return shardingRuleConfig.getDataSource().isEmpty() ? new DataSourceRule(externalDataSourceMap, shardingRuleConfig.getDefaultDataSourceName())
+                : new DataSourceRule(shardingRuleConfig.getDataSource(), shardingRuleConfig.getDefaultDataSourceName());
     }
 
     private Collection<TableRule> buildTableRules(final DataSourceRule dataSourceRule) {

diff --git a/...n/java/com/dangdang/ddframe/rdb/sharding/config/common/api/config/ShardingRuleConfig.java b/...n/java/com/dangdang/ddframe/rdb/sharding/config/common/api/config/ShardingRuleConfig.java
@@ -37,6 +37,8 @@ public class ShardingRuleConfig {
 
     private Map<String, DataSource> dataSource = new HashMap<>();
 
+    private String defaultDataSourceName;
+
     private Map<String, TableRuleConfig> tables = new HashMap<>();
 
     private List<BindingTableRuleConfig> bindingTables = new ArrayList<>();

diff --git a/...est/java/com/dangdang/ddframe/rdb/sharding/config/common/api/ShardingRuleBuilderTest.java b/...est/java/com/dangdang/ddframe/rdb/sharding/config/common/api/ShardingRuleBuilderTest.java
@@ -49,6 +49,7 @@ public void testAll() {
         assertThat(shardingRule.getTableRules().size(), is(3));
         assertThat(shardingRule.getBindingTableRules().size(), is(1));
         assertThat(Arrays.asList(shardingRule.getTableRules().toArray()), hasItems(shardingRule.getBindingTableRules().iterator().next().getTableRules().toArray()));
+        assertThat(shardingRule.getDataSourceRule().getDefaultDataSourceName(), is("db0"));
     }
 
     @Test

diff --git a/...-jdbc-config-parent/sharding-jdbc-config-common/src/test/resources/config/config-all.yaml b/...-jdbc-config-parent/sharding-jdbc-config-common/src/test/resources/config/config-all.yaml
@@ -12,6 +12,8 @@ dataSource:
     password: 
     maxActive: 100
 
+defaultDataSourceName: db0
+
 tables:
   config:
     actualTables: config_${0..1}

diff --git a/...db/sharding/spring/namespace/constants/ShardingJdbcDataSourceBeanDefinitionParserTag.java b/...db/sharding/spring/namespace/constants/ShardingJdbcDataSourceBeanDefinitionParserTag.java
@@ -34,6 +34,8 @@ public final class ShardingJdbcDataSourceBeanDefinitionParserTag {
 
     public static final String DATA_SOURCES_TAG = "data-sources";
 
+    public static final String DEFAULT_DATA_SOURCE_TAG = "default-data-source";
+
     public static final String TABLE_RULES_TAG = "table-rules";
 
     public static final String TABLE_RULE_TAG = "table-rule";

diff --git a/...rame/rdb/sharding/spring/namespace/parser/ShardingJdbcDataSourceBeanDefinitionParser.java b/...rame/rdb/sharding/spring/namespace/parser/ShardingJdbcDataSourceBeanDefinitionParser.java
@@ -17,11 +17,6 @@
 
 package com.dangdang.ddframe.rdb.sharding.spring.namespace.parser;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
 import com.dangdang.ddframe.rdb.sharding.config.common.api.config.BindingTableRuleConfig;
 import com.dangdang.ddframe.rdb.sharding.config.common.api.config.ShardingRuleConfig;
 import com.dangdang.ddframe.rdb.sharding.config.common.api.config.TableRuleConfig;
@@ -39,6 +34,11 @@
 import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
 /**
  * 基于Spring命名空间的数据源解析器.
  * 
@@ -60,6 +60,7 @@ private BeanDefinition parseShardingRuleConfig(final Element element, final Pars
         Element shardingRuleElement = DomUtils.getChildElementByTagName(element, ShardingJdbcDataSourceBeanDefinitionParserTag.SHARDING_RULE_CONFIG_TAG);
         BeanDefinitionBuilder factory = BeanDefinitionBuilder.rootBeanDefinition(ShardingRuleConfig.class);
         factory.addPropertyValue("dataSource", parseDataSources(shardingRuleElement, parserContext));
+        parseDefaultDataSource(factory, shardingRuleElement);
         factory.addPropertyValue("tables", parseTableRulesConfig(shardingRuleElement));
         factory.addPropertyValue("bindingTables", parseBindingTablesConfig(shardingRuleElement));
         factory.addPropertyValue("defaultDatabaseStrategy", parseDefaultDatabaseStrategyConfig(shardingRuleElement));
@@ -76,6 +77,13 @@ private Map<String, BeanDefinition> parseDataSources(final Element element, fina
         return result;
     }
 
+    private void parseDefaultDataSource(final BeanDefinitionBuilder factory, final Element element) {
+        String defaultDataSource = element.getAttribute(ShardingJdbcDataSourceBeanDefinitionParserTag.DEFAULT_DATA_SOURCE_TAG);
+        if (!Strings.isNullOrEmpty(defaultDataSource)) {
+            factory.addPropertyValue("defaultDataSourceName", defaultDataSource);
+        }
+    }
+
     private Map<String, BeanDefinition> parseTableRulesConfig(final Element element) {
         Element tableRulesElement = DomUtils.getChildElementByTagName(element, ShardingJdbcDataSourceBeanDefinitionParserTag.TABLE_RULES_TAG);
         List<Element> tableRuleElements = DomUtils.getChildElementsByTagName(tableRulesElement, ShardingJdbcDataSourceBeanDefinitionParserTag.TABLE_RULE_TAG);

diff --git a/...c-config-parent/sharding-jdbc-config-spring/src/main/resources/META-INF/namespace/rdb.xsd b/...c-config-parent/sharding-jdbc-config-spring/src/main/resources/META-INF/namespace/rdb.xsd
@@ -24,6 +24,7 @@
                 <xsd:element ref="default-table-strategy" minOccurs="0" maxOccurs="1"/>
             </xsd:sequence>
             <xsd:attribute name="data-sources" type="xsd:string" use="required" />
+            <xsd:attribute name="default-data-source" type="xsd:string" use="optional" />
         </xsd:complexType>
     </xsd:element>
     <xsd:element name="table-rules">

diff --git a/...g/ddframe/rdb/sharding/spring/AbstractShardingBothDataBasesAndTablesSpringDBUnitTest.java b/...g/ddframe/rdb/sharding/spring/AbstractShardingBothDataBasesAndTablesSpringDBUnitTest.java
@@ -38,6 +38,7 @@ public void testWithAllPlaceholders() throws SQLException {
     private void insertData() throws SQLException {
         String orderSql = "INSERT INTO `t_order` (`order_id`, `user_id`, `status`) VALUES (?, ?, ?)";
         String orderItemSql = "INSERT INTO `t_order_item` (`order_item_id`, `order_id`, `user_id`, `status`) VALUES (?, ?, ?, ?)";
+        String configSql = "INSERT INTO `t_config` (`id`, `status`) VALUES (?, ?)";
         for (int orderId = 1; orderId <= 4; orderId++) {
             for (int userId = 1; userId <= 2; userId++) {
                 try (Connection connection = getShardingDataSource().getConnection()) {
@@ -63,6 +64,13 @@ private void insertData() throws SQLException {
                     preparedStatement.setString(4, "insert");
                     preparedStatement.execute();
                     preparedStatement.close();
+
+
+                    preparedStatement = connection.prepareStatement(configSql);
+                    preparedStatement.setInt(1,  new Long(System.nanoTime()).intValue());
+                    preparedStatement.setString(2, "insert");
+                    preparedStatement.execute();
+                    preparedStatement.close();
                 }
             }
         }
@@ -91,4 +99,27 @@ private void selectData() throws SQLException {
             preparedStatement.close();
         }
     }
+
+//    private void selectDefaultData() throws SQLException {
+//        String sql = "SELECT * FROM `t_config`";
+//        try (Connection connection = getShardingDataSource().getConnection()) {
+//            PreparedStatement preparedStatement = connection.prepareStatement(sql);
+//            preparedStatement.setInt(1, 1);
+//            preparedStatement.setInt(2, 1);
+//            preparedStatement.setInt(3, 1);
+//            ResultSet resultSet = preparedStatement.executeQuery();
+//            int count = 0;
+//            while (resultSet.next()) {
+//                if (0 == count) {
+//                    assertThat(resultSet.getInt(1), is(1));
+//                    assertThat(resultSet.getInt(2), is(5));
+//                } else if (1 == count) {
+//                    assertThat(resultSet.getInt(1), is(1));
+//                    assertThat(resultSet.getInt(2), is(1));
+//                }
+//                count++;
+//            }
+//            preparedStatement.close();
+//        }
+//    }
 }
diff --git a/...c-config-spring/src/test/resources/META-INF/rdb/namespace/withNamespaceAlgorithmClass.xml b/...c-config-spring/src/test/resources/META-INF/rdb/namespace/withNamespaceAlgorithmClass.xml
@@ -31,7 +31,7 @@
     <rdb:strategy id="tableStrategy" sharding-columns="order_id" algorithm-class="com.dangdang.ddframe.rdb.sharding.spring.algorithm.SingleKeyModuloTableShardingAlgorithm"/>
 
     <rdb:data-source id="shardingDataSource">
-        <rdb:sharding-rule data-sources="dbtbl_0,dbtbl_1">
+        <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}" database-strategy="databaseStrategy" table-strategy="tableStrategy"/>
                 <rdb:table-rule logic-table="t_order_item" actual-tables="t_order_item_${0..3}" database-strategy="databaseStrategy" table-strategy="tableStrategy"/>

diff --git a/...-spring/src/test/resources/META-INF/rdb/namespace/withNamespaceAlgorithmClassAndProps.xml b/...-spring/src/test/resources/META-INF/rdb/namespace/withNamespaceAlgorithmClassAndProps.xml
@@ -31,7 +31,7 @@
     <rdb:strategy id="tableStrategy" sharding-columns="order_id" algorithm-class="com.dangdang.ddframe.rdb.sharding.spring.algorithm.SingleKeyModuloTableShardingAlgorithm"/>
 
     <rdb:data-source id="shardingDataSource">
-        <rdb:sharding-rule data-sources="dbtbl_0,dbtbl_1">
+        <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}" database-strategy="databaseStrategy" table-strategy="tableStrategy"/>
                 <rdb:table-rule logic-table="t_order_item" actual-tables="t_order_item_${0..3}" database-strategy="databaseStrategy" table-strategy="tableStrategy"/>

diff --git a/...fig-spring/src/test/resources/META-INF/rdb/namespace/withNamespaceAlgorithmExpression.xml b/...fig-spring/src/test/resources/META-INF/rdb/namespace/withNamespaceAlgorithmExpression.xml
@@ -16,7 +16,7 @@
     <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">
+        <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}" database-strategy="databaseStrategy" table-strategy="orderTableStrategy"/>
                 <rdb:table-rule logic-table="t_order_item" actual-tables="t_order_item_${0..3}" database-strategy="databaseStrategy"  table-strategy="orderItemTableStrategy"/>

diff --git a/.../src/test/resources/META-INF/rdb/namespace/withNamespaceAlgorithmExpressionForDynamic.xml b/.../src/test/resources/META-INF/rdb/namespace/withNamespaceAlgorithmExpressionForDynamic.xml
@@ -16,7 +16,7 @@
     <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">
+        <rdb:sharding-rule data-sources="dbtbl_0,dbtbl_1" default-data-source="dbtbl_0">
             <rdb:table-rules>
                 <rdb:table-rule logic-table="t_order" dynamic="true" database-strategy="databaseStrategy" table-strategy="orderTableStrategy"/>
                 <rdb:table-rule logic-table="t_order_item" dynamic="true" database-strategy="databaseStrategy"  table-strategy="orderItemTableStrategy"/>

diff --git a/...bc-config-spring/src/test/resources/META-INF/rdb/namespace/withNamespaceBindingTables.xml b/...bc-config-spring/src/test/resources/META-INF/rdb/namespace/withNamespaceBindingTables.xml
@@ -14,7 +14,7 @@
     <rdb:strategy id="tableStrategy" sharding-columns="order_id" algorithm-class="com.dangdang.ddframe.rdb.sharding.spring.algorithm.SingleKeyModuloTableShardingAlgorithm"/>
 
     <rdb:data-source id="shardingDatasource">
-        <rdb:sharding-rule data-sources="dbtbl_0,dbtbl_1">
+        <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,t_order_1,t_order_2,t_order_3" database-strategy="databaseStrategy" table-strategy="tableStrategy"/>
                 <rdb:table-rule logic-table="t_order_item" actual-tables="t_order_item_0,t_order_item_1,t_order_item_2,t_order_item_3" database-strategy="databaseStrategy" table-strategy="tableStrategy"/>

diff --git a/...-config-spring/src/test/resources/META-INF/rdb/namespace/withNamespaceDefaultStrategy.xml b/...-config-spring/src/test/resources/META-INF/rdb/namespace/withNamespaceDefaultStrategy.xml
@@ -10,7 +10,7 @@
     <import resource="../datasource/dataSource.xml" />
 
     <rdb:data-source id="shardingDataSource">
-        <rdb:sharding-rule data-sources="dbtbl_0,dbtbl_1">
+        <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,t_order_1,t_order_2,t_order_3"/>
                 <rdb:table-rule logic-table="t_order_item" actual-tables="t_order_item_0,t_order_item_1,t_order_item_2,t_order_item_3"/>

diff --git a/...-config-spring/src/test/resources/META-INF/rdb/namespace/withNamespaceDifferentTables.xml b/...-config-spring/src/test/resources/META-INF/rdb/namespace/withNamespaceDifferentTables.xml
@@ -16,7 +16,7 @@
     <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">
+        <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="dbtbl_0.t_order_${0..3}, dbtbl_1.t_order_${0..3}" database-strategy="databaseStrategy" table-strategy="orderTableStrategy"/>
                 <rdb:table-rule logic-table="t_order_item" actual-tables="t_order_item_${0..3}" database-strategy="databaseStrategy"  table-strategy="orderItemTableStrategy"/>

diff --git a/...g-parent/sharding-jdbc-config-spring/src/test/resources/META-INF/rdb/withoutNamespace.xml b/...g-parent/sharding-jdbc-config-spring/src/test/resources/META-INF/rdb/withoutNamespace.xml
@@ -8,12 +8,13 @@
     <import resource="datasource/dataSource.xml" />
 
     <bean id="dataSourceRule" class="com.dangdang.ddframe.rdb.sharding.api.rule.DataSourceRule">
-        <constructor-arg>
+        <constructor-arg index="0">
             <map>
                 <entry key="dbtbl_0" value-ref="dbtbl_0"/>
                 <entry key="dbtbl_1" value-ref="dbtbl_1"/>
             </map>
         </constructor-arg>
+        <constructor-arg index="1" value="dbtbl_0" />
     </bean>
 
     <bean id="orderTableRule" class="com.dangdang.ddframe.rdb.sharding.api.rule.TableRule">

diff --git a/...ng-jdbc-config-spring/src/test/resources/META-INF/rdb/withoutNamespaceStrategyOutside.xml b/...ng-jdbc-config-spring/src/test/resources/META-INF/rdb/withoutNamespaceStrategyOutside.xml
@@ -13,6 +13,7 @@
                 <entry key="dbtbl_1" value-ref="dbtbl_1"/>
             </map>
         </constructor-arg>
+        <constructor-arg index="1" value="dbtbl_0" />
     </bean>
 
     <bean id="orderTableRule" class="com.dangdang.ddframe.rdb.sharding.api.rule.TableRule">

diff --git a/...ding-jdbc-config-parent/sharding-jdbc-config-spring/src/test/resources/schema/dbtbl_1.sql b/...ding-jdbc-config-parent/sharding-jdbc-config-spring/src/test/resources/schema/dbtbl_1.sql
@@ -17,4 +17,3 @@ CREATE TABLE `t_order_item_0` (`order_item_id` INT NOT NULL, `order_id` INT NOT
 CREATE TABLE `t_order_item_1` (`order_item_id` INT NOT NULL, `order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_item_id`));
 CREATE TABLE `t_order_item_2` (`order_item_id` INT NOT NULL, `order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_item_id`));
 CREATE TABLE `t_order_item_3` (`order_item_id` INT NOT NULL, `order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_item_id`));
-CREATE TABLE `t_config` (`id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`id`));
diff --git a/...ing-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/api/ShardingDataSource.java b/...ing-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/api/ShardingDataSource.java
@@ -28,7 +28,7 @@
  * 已废弃, 请使用ShardingDataSourceFactory创建数据源. 未来版本中将删除此类.
  * </p>
  * 
- * @deprecated 
+ * @deprecated 已废弃, 请使用ShardingDataSourceFactory创建数据源. 未来版本中将删除此类.
  * @author zhangliang
  */
 @Deprecated

diff --git a/...ng-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/api/rule/DataSourceRule.java b/...ng-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/api/rule/DataSourceRule.java
@@ -17,12 +17,14 @@
 
 package com.dangdang.ddframe.rdb.sharding.api.rule;
 
-import java.util.Collection;
-import java.util.Map;
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Strings;
+import lombok.Getter;
 
 import javax.sql.DataSource;
-
-import com.google.common.base.Preconditions;
+import java.util.Collection;
+import java.util.Map;
 
 /**
  * 数据源配置对象.
@@ -33,9 +35,26 @@ public final class DataSourceRule {
 
     private final Map<String, DataSource> dataSourceMap;
 
+    @Getter
+    private final String defaultDataSourceName;
+
     public DataSourceRule(final Map<String, DataSource> dataSourceMap) {
+        this(dataSourceMap, null);
+    }
+
+    public DataSourceRule(final Map<String, DataSource> dataSourceMap, final String defaultDataSourceName) {
         Preconditions.checkState(!dataSourceMap.isEmpty(), "Must have one data source at least.");
         this.dataSourceMap = dataSourceMap;
+        if (1 == dataSourceMap.size()) {
+            this.defaultDataSourceName = dataSourceMap.entrySet().iterator().next().getKey();
+            return;
+        }
+        if (Strings.isNullOrEmpty(defaultDataSourceName)) {
+            this.defaultDataSourceName = null;
+            return;
+        }
+        Preconditions.checkState(dataSourceMap.containsKey(defaultDataSourceName), "Data source rule must include default data source.");
+        this.defaultDataSourceName = defaultDataSourceName;
     }
 
     /**
@@ -48,6 +67,15 @@ public DataSource getDataSource(final String name) {
         return dataSourceMap.get(name);
     }
 
+    /**
+     * 获取默认数据源实例.
+     *
+     * @return 默认数据源实例
+     */
+    public Optional<DataSource> getDefaultDataSource() {
+        return Optional.fromNullable(dataSourceMap.get(defaultDataSourceName));
+    }
+
     /**
      * 获取所有数据源名称.
      * 

diff --git a/...ding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/api/rule/ShardingRule.java b/...ding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/api/rule/ShardingRule.java
@@ -58,7 +58,7 @@ public final class ShardingRule {
      * 
      * <p>未来将改为private权限, 不在对外公开, 不建议使用非Spring命名空间的配置.</p>
      * 
-     * @deprecated
+     * @deprecated 未来将改为private权限, 不在对外公开, 不建议使用非Spring命名空间的配置.
      */
     @Deprecated
     public ShardingRule(

diff --git a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/api/rule/TableRule.java b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/api/rule/TableRule.java
@@ -56,7 +56,7 @@ public final class TableRule {
      *
      * <p>未来将改为private权限, 不在对外公开, 不建议使用非Spring命名空间的配置.</p>
      *
-     * @deprecated
+     * @deprecated 未来将改为private权限, 不在对外公开, 不建议使用非Spring命名空间的配置.
      */
     @Deprecated
     public TableRule(final String logicTable, final boolean dynamic, final List<String> actualTables, final DataSourceRule dataSourceRule,