Feature/ln 2018 08 27 mutil route

src/main/java/io/mycat/config/loader/xml/XMLRuleLoader.java

@@ -133,30 +133,39 @@ private void loadTableRules(Element root) throws SQLSyntaxErrorException {
 					throw new ConfigException("table rule " + name
 							+ " duplicated!");
 				}
-				//获取rule标签
-				NodeList ruleNodes = e.getElementsByTagName("rule");
-				int length = ruleNodes.getLength();
-				if (length > 1) {
-					throw new ConfigException("only one rule can defined :"
-							+ name);
-				}
-				//目前只处理第一个，未来可能有多列复合逻辑需求
-				//RuleConfig是保存着rule与function对应关系的对象
-				RuleConfig rule = loadRule((Element) ruleNodes.item(0));
-				String funName = rule.getFunctionName();
-				//判断function是否存在，获取function
-				AbstractPartitionAlgorithm func = functions.get(funName);
-				if (func == null) {
-					throw new ConfigException("can't find function of name :"
-							+ funName);
-				}
-				rule.setRuleAlgorithm(func);
+				RuleConfig rule = loadRuleConfig(e,"rule");
+				RuleConfig subTableRule = loadRuleConfig(e,"subTableRule");
 				//保存到tableRules
-				tableRules.put(name, new TableRuleConfig(name, rule));
+				tableRules.put(name, new TableRuleConfig(name, rule,subTableRule));
 			}
 		}
 	}
 
+	private RuleConfig loadRuleConfig(Element e,String tagName) throws SQLSyntaxErrorException {
+		//获取rule标签
+		NodeList ruleNodes = e.getElementsByTagName(tagName);
+		int length = ruleNodes.getLength();
+		if(length == 0){
+			return null;
+		}
+		if (length > 1) {
+			throw new ConfigException("only one "+tagName+" can defined :"
+					+  e.getAttribute("name"));
+		}
+		//目前只处理第一个，未来可能有多列复合逻辑需求
+		//RuleConfig是保存着rule与function对应关系的对象
+		RuleConfig rule = loadRule((Element) ruleNodes.item(0));
+		String funName = rule.getFunctionName();
+		//判断function是否存在，获取function
+		AbstractPartitionAlgorithm func = functions.get(funName);
+		if (func == null) {
+			throw new ConfigException("can't find function of name :"
+					+ funName);
+		}
+		rule.setRuleAlgorithm(func);
+		return rule;
+	}
+
 	private RuleConfig loadRule(Element element) throws SQLSyntaxErrorException {
 		//读取columns
 		Element columnsEle = ConfigUtil.loadElement(element, "columns");

src/main/java/io/mycat/config/loader/xml/XMLSchemaLoader.java

@@ -387,7 +387,7 @@ private Map<String, TableConfig> loadTables(Element node) {
 				TableConfig table = new TableConfig(tableName, primaryKey,
 						autoIncrement, needAddLimit, tableType, dataNode,
 						getDbType(dataNode),
-						(tableRuleConfig != null) ? tableRuleConfig.getRule() : null,
+						tableRuleConfig ,
 						ruleRequired, null, false, null, null,subTables);
 
 				checkDataNodeExists(table.getDataNodes());

src/main/java/io/mycat/config/loader/zkprocess/entity/rule/tablerule/SubTableRule.java

@@ -0,0 +1,31 @@
+package io.mycat.config.loader.zkprocess.entity.rule.tablerule;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * @author liunan  by 2018/8/29
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "subTableRule", propOrder = { "columns", "algorithm" })
+public class SubTableRule {
+    protected String columns;
+    protected String algorithm;
+
+    public String getColumns() {
+        return columns;
+    }
+
+    public void setColumns(String columns) {
+        this.columns = columns;
+    }
+
+    public String getAlgorithm() {
+        return algorithm;
+    }
+
+    public void setAlgorithm(String algorithm) {
+        this.algorithm = algorithm;
+    }
+}

src/main/java/io/mycat/config/loader/zkprocess/entity/rule/tablerule/TableRule.java

@@ -30,10 +30,12 @@ public class TableRule implements Named {
 
     @XmlElement(required = true, name = "rule")
     protected Rule rule;
+
+    @XmlElement(required = false, name = "subTableRule")
+    protected SubTableRule subTableRule;
 
     @XmlAttribute(required = true)
     protected String name;
-
     public Rule getRule() {
         return rule;
     }
@@ -52,15 +54,22 @@ public TableRule setName(String name) {
         return this;
     }
 
+    public SubTableRule getSubTableRule() {
+        return subTableRule;
+    }
+
+    public void setSubTableRule(
+            SubTableRule subTableRule) {
+        this.subTableRule = subTableRule;
+    }
+
     @Override
-    public String toString() {
-        StringBuilder builder = new StringBuilder();
-        builder.append("TableRule [rule=");
-        builder.append(rule);
-        builder.append(", name=");
-        builder.append(name);
-        builder.append("]");
-        return builder.toString();
+    public String  toString() {
+        final StringBuffer sb = new StringBuffer("TableRule{");
+        sb.append("rule=").append(rule);
+        sb.append(", subTableRule=").append(subTableRule);
+        sb.append(", name='").append(name).append('\'');
+        sb.append('}');
+        return sb.toString();
     }
-
 }

src/main/java/io/mycat/config/model/SchemaConfig.java

@@ -25,6 +25,7 @@
 
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Map;
 import java.util.Random;
 import java.util.Set;
@@ -56,6 +57,10 @@ public class SchemaConfig {
 	private final String[] allDataNodeStrArr;
 
 	private  Map<String,String> dataNodeDbTypeMap=new HashMap<>();
+	/**
+	 * 是否为多级路由
+	 */
+	private boolean isMutilRoute ;
 
 	public SchemaConfig(String name, String dataNode,
 			Map<String, TableConfig> tables, int defaultMaxLimit,
@@ -81,8 +86,20 @@ public SchemaConfig(String name, String dataNode,
 		} else {
 			this.allDataNodeStrArr = null;
 		}
+
+		isMutilRoute = this.hasMutilRoute();
 	}
 
+	//table中有一个存在mutilRoute就算有多级路由
+	private boolean hasMutilRoute(){
+		Iterator<TableConfig> it = this.tables.values().iterator();
+		while (it.hasNext()){
+			if(it.next().isMutilRoute()){
+				return true;
+			}
+		}
+		return false;
+	}
 	public String getDefaultDataNodeDbType()
 	{
 		return defaultDataNodeDbType;
@@ -215,4 +232,7 @@ private static boolean isEmpty(String str) {
 		return ((str == null) || (str.length() == 0));
 	}
 
+	public boolean isMutilRoute() {
+		return isMutilRoute;
+	}
 }

src/main/java/io/mycat/config/model/TableConfig.java

@@ -24,10 +24,8 @@
 package io.mycat.config.model;
 
 import java.util.*;
-import java.util.concurrent.locks.ReentrantLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import com.alibaba.druid.sql.ast.SQLDataType;
 import com.alibaba.druid.sql.ast.statement.SQLTableElement;
 import io.mycat.config.model.rule.RuleConfig;
 import io.mycat.util.SplitUtil;
@@ -63,10 +61,13 @@ public class TableConfig {
 	private volatile String tableStructureSQL;
 	private volatile Map<String,List<String>> dataNodeTableStructureSQLMap;
 	private ReentrantReadWriteLock reentrantReadWriteLock = new ReentrantReadWriteLock(false);
-
+	//mutileRoute
+	private final boolean isMutilRoute;
+	private final RuleConfig subTableRule;
+	private final String subPartitionColumn;
 
 	public TableConfig(String name, String primaryKey, boolean autoIncrement,boolean needAddLimit, int tableType,
-			String dataNode,Set<String> dbType, RuleConfig rule, boolean ruleRequired,
+			String dataNode,Set<String> dbType, io.mycat.config.model.rule.TableRuleConfig tableRuleConfig, boolean ruleRequired,
 			TableConfig parentTC, boolean isChildTable, String joinKey,
 			String parentKey,String subTables) {
 		if (name == null) {
@@ -79,7 +80,7 @@ public TableConfig(String name, String primaryKey, boolean autoIncrement,boolean
 		this.needAddLimit=needAddLimit;
 		this.tableType = tableType;
 		this.dbTypes=dbType;
-		if (ruleRequired && rule == null) {
+		if (ruleRequired && tableRuleConfig == null) {
 			throw new IllegalArgumentException("ruleRequired but rule is null");
 		}
 
@@ -107,8 +108,11 @@ public TableConfig(String name, String primaryKey, boolean autoIncrement,boolean
 			this.distTables = new ArrayList<String>();
 		}	
 
-		this.rule = rule;
+		this.rule = tableRuleConfig.getRule();
+		this.subTableRule = tableRuleConfig.getSubTableRule();
+		this.isMutilRoute = subTableRule != null; //有subTableRule时,认是多级路由
 		this.partitionColumn = (rule == null) ? null : rule.getColumn();
+		this.subPartitionColumn = isMutilRoute ? subTableRule.getColumn() : null ;
 		partionKeyIsPrimaryKey=(partitionColumn==null)?primaryKey==null:partitionColumn.equals(primaryKey);
 		this.ruleRequired = ruleRequired;
 		this.childTable = isChildTable;
@@ -264,7 +268,7 @@ public ArrayList<String> getDistTables() {
 	}
 
 	public boolean isDistTable(){
-		if(this.distTables!=null && !this.distTables.isEmpty() ){
+		if(this.distTables!=null && !this.distTables.isEmpty() && !isMutilRoute){
 			return true;
 		}
 		return false;
@@ -302,4 +306,16 @@ public Map<String, List<String>> getDataNodeTableStructureSQLMap() {
 	public void setDataNodeTableStructureSQLMap(Map<String, List<String>> dataNodeTableStructureSQLMap) {
 		this.dataNodeTableStructureSQLMap = dataNodeTableStructureSQLMap;
 	}
+
+	public boolean isMutilRoute() {
+		return isMutilRoute;
+	}
+
+	public RuleConfig getSubTableRule() {
+		return subTableRule;
+	}
+
+	public String getSubPartitionColumn() {
+		return subPartitionColumn;
+	}
 }

src/main/java/io/mycat/config/model/rule/TableRuleConfig.java

@@ -32,7 +32,22 @@ public class TableRuleConfig implements Serializable {
     private  String name;
     private final RuleConfig rule;
 
-    public TableRuleConfig(String name, RuleConfig rule) {
+    private final RuleConfig subTableRule;
+
+//    public TableRuleConfig(String name, RuleConfig rule) {
+//        if (name == null) {
+//            throw new IllegalArgumentException("name is null");
+//        }
+//        this.name = name;
+//        if (rule == null) {
+//            throw new IllegalArgumentException("no rule is found");
+//        }
+//        this.rule =rule;
+//        this.subTableRule = null;
+//    }
+
+    public TableRuleConfig(String name, RuleConfig rule,
+            RuleConfig subTableRule) {
         if (name == null) {
             throw new IllegalArgumentException("name is null");
         }
@@ -41,6 +56,7 @@ public TableRuleConfig(String name, RuleConfig rule) {
             throw new IllegalArgumentException("no rule is found");
         }
         this.rule =rule;
+        this.subTableRule = subTableRule;
     }
 
     public String getName() {
@@ -58,4 +74,7 @@ public RuleConfig getRule() {
         return rule;
     }
 
+    public RuleConfig getSubTableRule() {
+        return subTableRule;
+    }
 }

src/main/java/io/mycat/route/RouteResultset.java

@@ -80,6 +80,7 @@ public final class RouteResultset implements Serializable {
 
     private boolean selectForUpdate;
 
+    private boolean isMutilRoute;
     public boolean isSelectForUpdate() {
         return selectForUpdate;
     }
@@ -426,7 +427,15 @@ public boolean isDistTable(){
 		return false;
 	}
 
-	@Override
+    public boolean isMutilRoute() {
+        return isMutilRoute;
+    }
+
+    public void setMutilRoute(boolean mutilRoute) {
+        isMutilRoute = mutilRoute;
+    }
+
+    @Override
     public String toString() {
         StringBuilder s = new StringBuilder();
         s.append(statement).append(", route={");