optimize SimpleShardRouter when route rule is null

Author: hellojavaer

ddal-ddr/src/main/java/org/hellojavaer/ddal/ddr/datasource/manager/rw/DefaultReadWriteDataSourceManager.java

@@ -76,7 +76,7 @@ public class DefaultReadWriteDataSourceManager implements ReadWriteDataSourceMan
     private boolean                                                initialized                                = false;
 
     // cache
-    private Map<String, Set<String>>                               physicalTables                             = null;
+    private volatile Map<String, Set<String>>                      physicalTables                             = null;
 
     private DefaultReadWriteDataSourceManager() {
         this.metaDataChecker = new DefaultMetaDataChecker("mysql");
@@ -569,6 +569,9 @@ private void check(Connection conn, String scName) {
             Set<String> tbNames = physicalTables.get(scName);
             if (tbNames != null && !tbNames.isEmpty()) {
                 metaDataChecker.check(conn, scName, tbNames);
+                if (stdLogger.isInfoEnabled()) {
+                    stdLogger.info("MetaDataCheck - sc:{}, tb:{} meta data checking is passed", scName, tbNames);
+                }
             }
         }
     }

ddal-ddr/src/main/java/org/hellojavaer/ddal/ddr/shard/simple/SimpleShardRouter.java

@@ -86,16 +86,24 @@ public void setRouteRuleBindings(List<SimpleShardRouteRuleBinding> bindings) {
                     putToCache(cache, sb.toString(), b0, true);
                     putToCache(cache, tbName, b0, false);
 
+                    // 构建 逻辑sc+逻辑tb下包含的所有物理表信息
                     final Set<ShardRouteInfo> routeInfos = new LinkedHashSet<>();
-                    if (sdValues != null) {
-                        new RangeExpressionParser(sdValues).visit(new RangeExpressionItemVisitor() {
-
-                            @Override
-                            public void visit(Object val) {
-                                ShardRouteInfo routeInfo = getRouteInfo(b0, scName, tbName, val);
-                                routeInfos.add(routeInfo);
-                            }
-                        });
+                    if (binding.getRule() == null) {// 如果路由规则为空,则使用原表名
+                        ShardRouteInfo routeInfo = new ShardRouteInfo();
+                        routeInfo.setScName(scName);
+                        routeInfo.setTbName(tbName);
+                        routeInfos.add(routeInfo);
+                    } else {
+                        if (sdValues != null) {
+                            new RangeExpressionParser(sdValues).visit(new RangeExpressionItemVisitor() {
+
+                                @Override
+                                public void visit(Object val) {
+                                    ShardRouteInfo routeInfo = getRouteInfo(b0, scName, tbName, val);
+                                    routeInfos.add(routeInfo);
+                                }
+                            });
+                        }
                     }
                     String key = buildQueryKey(scName, tbName);
                     if (routeInfoMap.containsKey(key)) {

ddal-example/ddal-example-example0/src/main/resources/datasource.xml

@@ -31,7 +31,7 @@
             <list>
                 <bean class="org.hellojavaer.ddal.ddr.shard.simple.SimpleShardRouteRuleBinding">
                     <property name="scName" value="base"></property>
-                    <property name="tbName" value="user"></property>
+                    <!--<property name="tbName" value="user"></property>-->
                     <property name="rule" ref="idRule"></property>
                     <property name="sdKey" value="id"></property>
                     <property name="sdValues" value="[0..7]"></property>

ddal-example/ddal-example-example0/src/main/resources/log4j.xml

@@ -15,7 +15,7 @@
 
     <logger name="org.hellojavaer.ddr.ds" additivity="false">
         <!-- if the value of 'value' is 'trace', target datasource will be printed out -->
-        <priority value="error"/>
+        <priority value="info"/>
         <appender-ref ref="console"/>
     </logger>
 

ddal-example/ddal-example-example1/src/main/resources/datasource.xml

@@ -27,7 +27,7 @@
             <list>
                 <bean class="org.hellojavaer.ddal.ddr.shard.simple.SimpleShardRouteRuleBinding">
                     <property name="scName" value="acl"></property>
-                    <property name="tbName" value="role"></property>
+                    <!--<property name="tbName" value="role"></property>-->
                 </bean>
             </list>
         </property>
@@ -45,6 +45,7 @@
     </bean>
     <bean id="dataSourceManager"
           class="org.hellojavaer.ddal.ddr.datasource.manager.rw.DefaultReadWriteDataSourceManager">
+        <property name="shardRouter" ref="shardRouter"/>
         <property name="readOnlyDataSourceMonitorServer">
             <bean class="org.hellojavaer.ddal.ddr.datasource.manager.rw.monitor.mbean.MBeanReadOnlyDataSourceMonitorServer"></bean>
         </property>