Merge pull request #2357 from PanternBao/impove-er-11

atk-1489:improve er left join global

Author: LUAgam

dble_checkstyle_suppression.xml

@@ -23,5 +23,6 @@
     <suppress checks=".*" files="BTraceCostTime.java"/>
     <suppress checks="CyclomaticComplexity" files="CreateTableParserImp.java"/>
     <suppress checks="CyclomaticComplexity" files="XMLSchemaLoader.java"/>
+    <suppress checks="CyclomaticComplexity" files="GlobalTableProcessor.java"/>
 
 </suppressions>

src/main/java/com/actiontech/dble/plan/optimizer/ERJoinChooser.java

@@ -8,12 +8,12 @@
 import com.actiontech.dble.DbleServer;
 import com.actiontech.dble.config.model.ERTable;
 import com.actiontech.dble.plan.NamedField;
-import com.actiontech.dble.plan.node.PlanNode;
 import com.actiontech.dble.plan.common.item.Item;
 import com.actiontech.dble.plan.common.item.ItemField;
 import com.actiontech.dble.plan.common.item.function.ItemFunc;
 import com.actiontech.dble.plan.common.item.function.operator.cmpfunc.ItemFuncEqual;
 import com.actiontech.dble.plan.node.JoinNode;
+import com.actiontech.dble.plan.node.PlanNode;
 import com.actiontech.dble.plan.node.TableNode;
 import com.actiontech.dble.plan.util.FilterUtils;
 import com.actiontech.dble.plan.util.PlanUtil;
@@ -77,7 +77,7 @@ public JoinNode optimize() {
      * left join's ER is different from inner join's
      * ex:t1,t2 ,if t1 left join t2 on
      * t1.id=t2.id can be pushed
-     * < we cna't change left join's structure>
+     * < we can't change left join's structure>
      *
      * @return
      */
@@ -130,7 +130,7 @@ else if (!PlanUtil.isERNode(child) && child.type() != PlanNode.PlanNodeType.TABL
     /* ------------------- left join optimizer end -------------------- */
 
     /**
-     * inner join's ER, rebuild inner joi's unit
+     * inner join's ER, rebuild inner join's unit
      *
      * @return
      */
@@ -390,7 +390,8 @@ private void initInnerJoinUnits(JoinNode node) {
     private boolean isUnit(PlanNode node) {
         if (isGlobalTree(node))
             return true;
-        else return node.type() != PlanNode.PlanNodeType.JOIN || node.isWithSubQuery() || !((JoinNode) node).isInnerJoin();
+        else
+            return node.type() != PlanNode.PlanNodeType.JOIN || node.isWithSubQuery() || !((JoinNode) node).isInnerJoin();
     }
 
     /**

src/main/java/com/actiontech/dble/plan/optimizer/GlobalTableProcessor.java

@@ -47,8 +47,7 @@ private static boolean initGlobalStatus(PlanNode tn) {
         if (PlanUtil.isERNode(tn)) {
             // treat er join as an un global table
             tn.setUnGlobalTableCount(1);
-            Set<String> newSet = new HashSet<>();
-            newSet.addAll(tn.getReferedTableNodes().get(0).getNoshardNode());
+            Set<String> newSet = new HashSet<>(tn.getReferedTableNodes().get(0).getNoshardNode());
             tn.setNoshardNode(newSet);
         } else {
             int unGlobalCount = calcUnGlobalCount(tn);
@@ -76,7 +75,9 @@ private static boolean initGlobalStatus(PlanNode tn) {
                     if (left.getUnGlobalTableCount() == 0) { // left node is global,left join will not push down
                         tn.setNoshardNode(null);
                         status = false;
-                    } else if (left.type() == PlanNode.PlanNodeType.TABLE || PlanUtil.isERNode(left)) {
+                    } else if (left.type() == PlanNode.PlanNodeType.TABLE ||
+                            PlanUtil.isERNode(left) ||
+                            left.getNoshardNode() != null && left.getNoshardNode().size() > 0) {
                         if (!isGlobalTableBigEnough(jn)) {
                             tn.setNoshardNode(null);
                             status = false;