Merge remote-tracking branch 'upstream/dev-db' into dev-db (#951)

* update english documents * refactor zk client * update documents * update zkclient * update zkclient * update documents * add architecture-design * change i18n * update i18n * update english documents * add architecture-design * update english documents * update en-US documents * add architecture-design * update demo site * add mybatis plus model * modify mybatisplus * modify mybatisplus * change interface by mybatisplus * add unit test * refactor dao interface. * add unit test for dao... * add unit test for dao... * add unit test for dao... * Merge remote-tracking branch 'upstream/dev-db' into dev-db # Conflicts: # dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml # dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml # escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml # escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml # escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java * Merge remote-tracking branch 'upstream/dev-db' into dev-db # Conflicts: # dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml # dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml # escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml # escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml # escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java * Merge remote-tracking branch 'upstream/dev-db' into dev-db # Conflicts: # dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml # dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml # dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
5 years ago · b725a958e1
9 changed files with 56 additions and 54 deletions
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskInstanceService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskInstanceService.java
@ -119,6 +119,11 @@ public class TaskInstanceService extends BaseService {
            add(Constants.CLASS);
            add("taskJson");
        }};
+        List<TaskInstance> taskInstanceList = taskInstanceIPage.getRecords();
+        for(TaskInstance taskInstance : taskInstanceList){
+            taskInstance.setDuration(DateUtils.differSec(taskInstance.getStartTime(),
+                    taskInstance.getEndTime()));
+        }
        pageInfo.setTotalCount((int)taskInstanceIPage.getTotal());
        pageInfo.setLists(CollectionUtils.getListByExclusion(taskInstanceIPage.getRecords(),exclusionSet));
        result.put(Constants.DATA_LIST, pageInfo);
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java
@ -16,6 +16,7 @@
 */
 package org.apache.dolphinscheduler.dao.entity;

+import com.baomidou.mybatisplus.annotation.TableField;
 import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
 import org.apache.dolphinscheduler.common.enums.Flag;
 import org.apache.dolphinscheduler.common.enums.Priority;
@ -65,6 +66,7 @@ public class TaskInstance {
    /**
     * process instance name
     */
+    @TableField(exist = false)
    private String processInstanceName;

    /**
@ -119,19 +121,16 @@ public class TaskInstance {
     */
    private Flag alertFlag;

-    /**
-     * run flag
-     */
-    private Flag runFlag;
-
    /**
     * process instance
     */
+    @TableField(exist = false)
    private ProcessInstance processInstance;

    /**
     * process definition
     */
+    @TableField(exist = false)
    private ProcessDefinition processDefine;

    /**
@ -152,12 +151,14 @@ public class TaskInstance {
    /**
     * dependency
     */
+    @TableField(exist = false)
    private String dependency;

    /**
     * duration
     * @return
     */
+    @TableField(exist = false)
    private Long duration;

    /**
@ -180,12 +181,14 @@ public class TaskInstance {
    /**
     * process intance priority
     */
+    @TableField(exist = false)
    private Priority processInstancePriority;

    /**
     * dependent state
     * @return
     */
+    @TableField(exist = false)
    private String dependentResult;


@ -390,14 +393,6 @@ public class TaskInstance {
        this.processInstanceName = processInstanceName;
    }

-    public Flag getRunFlag() {
-        return runFlag;
-    }
-
-    public void setRunFlag(Flag runFlag) {
-        this.runFlag = runFlag;
-    }
-
    public Long getDuration() {
        return duration;
    }
@ -492,7 +487,7 @@ public class TaskInstance {
                ", logPath='" + logPath + '\'' +
                ", retryTimes=" + retryTimes +
                ", alertFlag=" + alertFlag +
-                ", runFlag=" + runFlag +
+                ", flag=" + flag +
                ", processInstance=" + processInstance +
                ", processDefine=" + processDefine +
                ", pid=" + pid +
--- a/dolphinscheduler-dao/src/main/resources/application.yml
+++ b/dolphinscheduler-dao/src/main/resources/application.yml
@ -5,8 +5,8 @@ spring:
 #    driver-class-name:  com.mysql.jdbc.Driver
    url: jdbc:postgresql://192.168.220.154:5432/escheduler
 #    url: jdbc:mysql://192.168.220.188:3306/escheduler_new?useUnicode=true&characterEncoding=UTF-8
-    username: xx
-    password: xx
+    username: root
+    password: root@123
 #    platform:
    continue-on-error: true

--- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/DataSourceUserMapper.xml
+++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/DataSourceUserMapper.xml
@ -2,12 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="org.apache.dolphinscheduler.dao.mapper.DataSourceUserMapper">
    <delete id="deleteByUserId">
-        delete from t_ds_datasource_user
+        delete from t_ds_relation_datasource_user
        where user_id = #{userId}

    </delete>
    <delete id="deleteByDatasourceId">
-        delete from t_ds_datasource_user
+        delete from t_ds_relation_datasource_user
        where datasource_id = #{datasourceId}
    </delete>
 </mapper>
--- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapMapper.xml
+++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapMapper.xml
@ -20,7 +20,7 @@
    </select>
    <select id="querySubIdListByParentId" resultType="java.lang.Integer">
        select process_instance_id
-        from t_ds_process_instance_map
+        from t_ds_relation_process_instance
        where parent_process_instance_id = #{parentInstanceId}
    </select>
 </mapper>
--- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
+++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
@ -3,28 +3,28 @@
 <mapper namespace="org.apache.dolphinscheduler.dao.mapper.ProjectMapper">
    <select id="queryDetailById" resultType="org.apache.dolphinscheduler.dao.entity.Project">
        select p.*,u.user_name as user_name
-        from t_escheduler_project p
-        join t_escheduler_user u on p.user_id = u.id
+        from t_ds_project p
+        join t_ds_user u on p.user_id = u.id
        where p.id = #{projectId}
    </select>
    <select id="queryByName" resultType="org.apache.dolphinscheduler.dao.entity.Project">
        select p.*,u.user_name as user_name
-        from t_escheduler_project p
-        join t_escheduler_user u on p.user_id = u.id
+        from t_ds_project p
+        join t_ds_user u on p.user_id = u.id
        where p.name = #{projectName}
        limit 1
    </select>
    <select id="queryProjectListPaging" resultType="org.apache.dolphinscheduler.dao.entity.Project">
        select p.*,u.user_name as user_name,
-        (SELECT COUNT(*) FROM t_escheduler_process_definition AS def WHERE def.project_id = p.id) AS def_count,
-        (SELECT COUNT(*) FROM t_escheduler_process_definition def, t_escheduler_process_instance inst WHERE def.id = inst.process_definition_id AND def.project_id = p.id AND inst.state=1 ) as inst_running_count
-        from t_escheduler_project p
-        join t_escheduler_user u on u.id=p.user_id
+        (SELECT COUNT(*) FROM t_ds_process_definition AS def WHERE def.project_id = p.id) AS def_count,
+        (SELECT COUNT(*) FROM t_ds_process_definition def, t_ds_process_instance inst WHERE def.id = inst.process_definition_id AND def.project_id = p.id AND inst.state=1 ) as inst_running_count
+        from t_ds_project p
+        join t_ds_user u on u.id=p.user_id
        where 1=1
        <if test="userId != 0">
            and p.id in
-            (select project_id from t_escheduler_relation_project_user  where user_id=#{userId}
-            union select id as project_id  from t_escheduler_project where user_id=#{userId})
+            (select project_id from t_ds_relation_project_user  where user_id=#{userId}
+            union select id as project_id  from t_ds_project where user_id=#{userId}
            )
        </if>
        <if test="searchName!=null and searchName != ''">
@ -34,17 +34,17 @@
    </select>
    <select id="queryAuthedProjectListByUserId" resultType="org.apache.dolphinscheduler.dao.entity.Project">
        select p.*
-        from t_escheduler_project p,t_escheduler_relation_project_user rel
+        from t_ds_project p,t_ds_relation_project_user rel
        where p.id = rel.project_id and rel.user_id= #{userId}
    </select>
    <select id="queryProjectExceptUserId" resultType="org.apache.dolphinscheduler.dao.entity.Project">
        select *
-        from t_escheduler_project
+        from t_ds_project
        where user_id <![CDATA[ <> ]]> #{userId}
    </select>
    <select id="queryProjectCreatedByUser" resultType="org.apache.dolphinscheduler.dao.entity.Project">
        select *
-        from t_escheduler_project
+        from t_ds_project
        where user_id = #{userId}
    </select>

--- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
+++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
@ -3,7 +3,7 @@
 <mapper namespace="org.apache.dolphinscheduler.dao.mapper.ResourceMapper">
    <select id="queryResourceList" resultType="org.apache.dolphinscheduler.dao.entity.Resource">
        select *
-        from t_escheduler_resources
+        from t_ds_resources
        where 1= 1
        <if test="alias != null and alias != ''">
            and alias = #{alias}
@ -17,21 +17,21 @@
    </select>
    <select id="queryResourceListAuthored" resultType="org.apache.dolphinscheduler.dao.entity.Resource">
        select *
-        from t_escheduler_resources
+        from t_ds_resources
        where 1 = 1
        <if test="type != -1">
            and type=#{type}
        </if>
-        and id in (select resources_id from  t_escheduler_relation_resources_user where user_id=#{userId}
-                  union select id as resources_id  from t_escheduler_resources where user_id=#{userId})
+        and id in (select resources_id from  t_ds_relation_resources_user where user_id=#{userId}
+                  union select id as resources_id  from t_ds_resources where user_id=#{userId})
    </select>
    <select id="queryResourcePaging" resultType="org.apache.dolphinscheduler.dao.entity.Resource">
        select *
-        from t_escheduler_resources
+        from t_ds_resources
        where type=#{type}
        <if test="userId != 0">
-            and id in (select resources_id from  t_escheduler_relation_resources_user where user_id=#{userId}
-            union select id as resources_id  from t_escheduler_resources where user_id=#{userId})
+            and id in (select resources_id from  t_ds_relation_resources_user where user_id=#{userId}
+            union select id as resources_id  from t_ds_resources where user_id=#{userId})
        </if>
        <if test="searchVal != null and searchVal != ''">
            and  alias like concat('%', #{searchVal}, '%')
@ -40,17 +40,17 @@
    </select>
    <select id="queryAuthorizedResourceList" resultType="org.apache.dolphinscheduler.dao.entity.Resource">
        select r.*
-        from  t_escheduler_resources r,t_escheduler_relation_resources_user rel
+        from  t_ds_resources r,t_ds_relation_resources_user rel
        where r.id = rel.resources_id AND rel.user_id = #{userId}
    </select>
    <select id="queryResourceExceptUserId" resultType="org.apache.dolphinscheduler.dao.entity.Resource">
        select *
-        from  t_escheduler_resources
+        from  t_ds_resources
        where user_id <![CDATA[ <> ]]> #{userId}
    </select>
    <select id="queryTenantCodeByResourceName" resultType="java.lang.String">
        select tenant_code
-        from t_escheduler_tenant t, t_escheduler_user u, t_escheduler_resources res
+        from t_ds_tenant t, t_ds_user u, t_ds_resources res
        where t.id = u.tenant_id and u.id = res.user_id and res.type=0
        and res.alias= #{resName}
    </select>
--- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
+++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="org.apache.dolphinscheduler.dao.mapper.TaskInstanceMapper">
    <update id="setFailoverByHostAndStateArray">
-        update t_escheduler_task_instance
+        update t_ds_task_instance
        set state = #{destStatus}
        where host = #{host}
        and state in
@ -12,21 +12,21 @@
    </update>
    <select id="queryTaskByProcessIdAndState" resultType="java.lang.Integer">
        select id
-        from t_escheduler_task_instance
+        from t_ds_task_instance
        WHERE  process_instance_id = #{processInstanceId}
        and state = #{state}
        and flag = 1
    </select>
    <select id="findValidTaskListByProcessId" resultType="org.apache.dolphinscheduler.dao.entity.TaskInstance">
        select *
-        from t_escheduler_task_instance
+        from t_ds_task_instance
        WHERE  process_instance_id = #{processInstanceId}
        and flag = #{flag}
        order by start_time desc
    </select>
    <select id="queryByHostAndStatus" resultType="org.apache.dolphinscheduler.dao.entity.TaskInstance">
        select *
-        from t_escheduler_task_instance
+        from t_ds_task_instance
        where 1 = 1
        <if test="host != null and host != ''">
            and host = #{host}
@ -40,9 +40,9 @@
    </select>
    <select id="countTaskInstanceStateByUser" resultType="org.apache.dolphinscheduler.dao.entity.ExecuteStatusCount">
        select  state, count(0) as count
-        from t_escheduler_task_instance t
-        left join t_escheduler_process_definition  d on d.id=t.process_definition_id
-        left join t_escheduler_project p on p.id=d.project_id
+        from t_ds_task_instance t
+        left join t_ds_process_definition  d on d.id=t.process_definition_id
+        left join t_ds_project p on p.id=d.project_id
        where 1=1
        <if test="projectIds != null and projectIds != ''">
            and d.project_id in
@ -58,14 +58,15 @@
    </select>
    <select id="queryByInstanceIdAndName" resultType="org.apache.dolphinscheduler.dao.entity.TaskInstance">
        select  *
-        from t_escheduler_task_instance
+        from t_ds_task_instance
        where process_instance_id = #{processInstanceId}
        and name = #{name}
        and flag = 1
+        limit 1
    </select>
    <select id="countTask" resultType="java.lang.Integer">
        select count(1) as count
-        from t_escheduler_task_instance task,t_escheduler_process_definition process
+        from t_ds_task_instance task,t_ds_process_definition process
        where task.process_definition_id=process.id
        <if test="projectIds != null and projectIds.length != 0">
            and process.project_id in
@ -82,9 +83,9 @@
    </select>
    <select id="queryTaskInstanceListPaging" resultType="org.apache.dolphinscheduler.dao.entity.TaskInstance">
        select instance.*,process.name as process_instance_name
-        from t_escheduler_task_instance instance
-        join t_escheduler_process_definition define ON instance.process_definition_id = define.id
-        join  t_escheduler_process_instance process on process.id=instance.process_instance_id
+        from t_ds_task_instance instance
+        join t_ds_process_definition define ON instance.process_definition_id = define.id
+        join  t_ds_process_instance process on process.id=instance.process_instance_id
        where define.project_id = #{projectId}
        <if test="startTime != null">
            and instance.start_time > #{startTime} and instance.start_time <![CDATA[ <=]]> #{endTime}
--- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/DataSourceUserMapperTest.java
+++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/DataSourceUserMapperTest.java
@ -44,6 +44,7 @@ public class DataSourceUserMapperTest {
        dataSourceUser.setPerm(7);
        dataSourceUser.setUpdateTime(new Date());
        dataSourceUser.setCreateTime(new Date());
+        dataSourceUserMapper.insert(dataSourceUser);
        return dataSourceUser;
    }