Merge pull request #2 from apache/dev

更新本地的dev
4 years ago · 7f8d060dca
7 changed files with 43 additions and 27 deletions
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/WorkerGroupService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/WorkerGroupService.java
@ -16,15 +16,12 @@
 */
 package org.apache.dolphinscheduler.api.service;

-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.dolphinscheduler.api.enums.Status;
 import org.apache.dolphinscheduler.api.utils.PageInfo;
 import org.apache.dolphinscheduler.common.Constants;
 import org.apache.dolphinscheduler.common.utils.CollectionUtils;
 import org.apache.dolphinscheduler.common.utils.DateUtils;
 import org.apache.dolphinscheduler.common.utils.StringUtils;
-import org.apache.dolphinscheduler.dao.entity.AccessToken;
 import org.apache.dolphinscheduler.dao.entity.User;
 import org.apache.dolphinscheduler.dao.entity.WorkerGroup;
 import org.apache.dolphinscheduler.dao.mapper.ProcessInstanceMapper;
@ -149,8 +146,8 @@ public class WorkerGroupService extends BaseService {
                if (isPaging){
                    wg.setIpList(childrenNodes);
                    String registeredIpValue = zookeeperCachedOperator.get(workerGroupPath + "/" + childrenNodes.get(0));
-                    wg.setCreateTime(DateUtils.stringToDate(registeredIpValue.split(",")[3]));
-                    wg.setUpdateTime(DateUtils.stringToDate(registeredIpValue.split(",")[4]));
+                    wg.setCreateTime(DateUtils.stringToDate(registeredIpValue.split(",")[6]));
+                    wg.setUpdateTime(DateUtils.stringToDate(registeredIpValue.split(",")[7]));
                }
                workerGroups.add(wg);
            }
--- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/WorkerGroupServiceTest.java
+++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/WorkerGroupServiceTest.java
@ -79,7 +79,7 @@ public class WorkerGroupServiceTest {

        Mockito.when(zookeeperCachedOperator.getChildrenKeys(workerPath + "/default")).thenReturn(defaultIpList);

-        Mockito.when(zookeeperCachedOperator.get(workerPath + "/default" + "/" + defaultIpList.get(0))).thenReturn("0.02,0.23,0.03,2020-05-08 11:24:14,2020-05-08 14:22:24");
+        Mockito.when(zookeeperCachedOperator.get(workerPath + "/default" + "/" + defaultIpList.get(0))).thenReturn("0.01,0.17,0.03,25.83,8.0,1.0,2020-07-21 11:17:59,2020-07-21 14:39:20,0,13238");
    }

    /**
@ -115,4 +115,4 @@ public class WorkerGroupServiceTest {
        return processInstances;
    }

-}
+}
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/DagHelper.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/DagHelper.java
@ -98,14 +98,16 @@ public class DagHelper {
                List<TaskNode> childNodeList = new ArrayList<>();
                if (startNode == null) {
                    logger.error("start node name [{}] is not in task node list [{}] ",
-                        startNodeName,
-                        taskNodeList
+                            startNodeName,
+                            taskNodeList
                    );
                    continue;
                } else if (TaskDependType.TASK_POST == taskDependType) {
-                    childNodeList = getFlowNodeListPost(startNode, taskNodeList);
+                    List<String> visitedNodeNameList = new ArrayList<>();
+                    childNodeList = getFlowNodeListPost(startNode, taskNodeList, visitedNodeNameList);
                } else if (TaskDependType.TASK_PRE == taskDependType) {
-                    childNodeList = getFlowNodeListPre(startNode, recoveryNodeNameList, taskNodeList);
+                    List<String> visitedNodeNameList = new ArrayList<>();
+                    childNodeList = getFlowNodeListPre(startNode, recoveryNodeNameList, taskNodeList, visitedNodeNameList);
                } else {
                    childNodeList.add(startNode);
                }
@ -128,14 +130,19 @@ public class DagHelper {
     * @param taskNodeList taskNodeList
     * @return task node list
     */
-    private static List<TaskNode> getFlowNodeListPost(TaskNode startNode, List<TaskNode> taskNodeList) {
+    private static List<TaskNode> getFlowNodeListPost(TaskNode startNode, List<TaskNode> taskNodeList, List<String> visitedNodeNameList) {
        List<TaskNode> resultList = new ArrayList<>();
        for (TaskNode taskNode : taskNodeList) {
            List<String> depList = taskNode.getDepList();
-            if (null != depList && null != startNode && depList.contains(startNode.getName())) {
-                resultList.addAll(getFlowNodeListPost(taskNode, taskNodeList));
+            if (null != depList && null != startNode && depList.contains(startNode.getName()) && !visitedNodeNameList.contains(taskNode.getName())) {
+                resultList.addAll(getFlowNodeListPost(taskNode, taskNodeList, visitedNodeNameList));
            }
        }
+        // why add (startNode != null) condition? for SonarCloud Quality Gate passed
+        if (null != startNode) {
+            visitedNodeNameList.add(startNode.getName());
+        }
+
        resultList.add(startNode);
        return resultList;
    }
@ -148,7 +155,7 @@ public class DagHelper {
     * @param taskNodeList taskNodeList
     * @return task node list
     */
-    private static List<TaskNode> getFlowNodeListPre(TaskNode startNode, List<String> recoveryNodeNameList, List<TaskNode> taskNodeList) {
+    private static List<TaskNode> getFlowNodeListPre(TaskNode startNode, List<String> recoveryNodeNameList, List<TaskNode> taskNodeList, List<String> visitedNodeNameList) {

        List<TaskNode> resultList = new ArrayList<>();

@ -158,16 +165,23 @@ public class DagHelper {
            resultList.add(startNode);
        }
        if (CollectionUtils.isEmpty(depList)) {
+            if (null != startNode) {
+                visitedNodeNameList.add(startNode.getName());
+            }
            return resultList;
        }
        for (String depNodeName : depList) {
            TaskNode start = findNodeByName(taskNodeList, depNodeName);
            if (recoveryNodeNameList.contains(depNodeName)) {
                resultList.add(start);
-            } else {
-                resultList.addAll(getFlowNodeListPre(start, recoveryNodeNameList, taskNodeList));
+            } else if (!visitedNodeNameList.contains(depNodeName)) {
+                resultList.addAll(getFlowNodeListPre(start, recoveryNodeNameList, taskNodeList, visitedNodeNameList));
            }
        }
+        // why add (startNode != null) condition? for SonarCloud Quality Gate passed
+        if (null != startNode) {
+            visitedNodeNameList.add(startNode.getName());
+        }
        return resultList;
    }

@ -369,7 +383,7 @@ public class DagHelper {
     */
    public static boolean haveConditionsAfterNode(String parentNodeName,
                                                  DAG<String, TaskNode, TaskNodeRelation> dag
-                                            ){
+    ){
        boolean result = false;
        Set<String> subsequentNodes = dag.getSubsequentNodes(parentNodeName);
        if(CollectionUtils.isEmpty(subsequentNodes)){
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
@ -560,9 +560,9 @@ svg path:hover {
  }
 }

-.ans-drawer.ans-drawer-right {
-  width: 628px;
-  left: auto;
+.ans-modal-box.ans-drawer.ans-drawer-right.dagMask.mask {
+    width: 628px;
+    left: auto;
 }


--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
@ -538,6 +538,7 @@
          eventModel.remove()
        }
        eventModel = this.$drawer({
+          className: 'dagMask',
          render (h) {
            return h(mFormLineModel,{
              on: {
@ -610,6 +611,7 @@
          closable: false,
          direction: 'right',
          escClose: true,
+          className: 'dagMask',
          render: h => h(mFormModel, {
            on: {
              addTaskInfo ({ item, fromThis }) {
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formLineModel.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formLineModel.vue
@ -77,6 +77,9 @@
            })
        },
        ok() {
+          if($(`#${this.id}`).prev().attr('class')==='jtk-overlay') {
+            $(`#${this.id}`).prev().empty()
+          }
          $(`#${this.id}`).text(this.labelName)
            this.$emit('addLineInfo', {
              item: {
@ -92,12 +95,11 @@
      
    },
    created () {
-        let connects = this.store.state.dag.connects
-        connects.filter( item => {
-            if(item.endPointSourceId===this.sourceId && item.endPointTargetId===this.targetId) {
-                this.labelName =  item.label
-            }
-        });
+      if($(`#${this.id}`).prev().attr('class').indexOf('jtk-overlay')!==-1) {
+        this.labelName = $(`#${this.id}`).prev().text()
+      } else {
+        this.labelName = $(`#${this.id}`).text()
+      }
    },
    mounted () {
      
--- a/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
+++ b/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
@ -255,6 +255,7 @@ export default {
        syncDefine: state.syncDefine
      }, res => {
        resolve(res)
+        state.isEditDag = false
      }).catch(e => {
        reject(e)
      })