Unverified Commit 0dca8d88 authored by xingchun-chen's avatar xingchun-chen Committed by GitHub
Browse files

Merge branch 'dev' into dev-merge

parents e343ee0e ad28c651

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ResourcesController.java

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ public class ResourcesController extends BaseController { 
    private UdfFuncService udfFuncService;



    /**

     * create resource

     * create directory

     *

     * @param loginUser login user

     * @param alias alias

dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/consumer/TaskPriorityQueueConsumerTest.java

+9 −15
Original line number Diff line number Diff line
@@ -76,9 +76,9 @@ public class TaskPriorityQueueConsumerTest { 
        tenant.setCreateTime(new Date());

        tenant.setUpdateTime(new Date());



        Mockito.when(processService.getTenantForProcess(1,2)).thenReturn(tenant);

        Mockito.doReturn(tenant).when(processService).getTenantForProcess(1,2);



        Mockito.when(processService.queryUserQueueByProcessInstanceId(1)).thenReturn("default");

        Mockito.doReturn("default").when(processService).queryUserQueueByProcessInstanceId(1);

    }
@@ -105,7 +105,7 @@ public class TaskPriorityQueueConsumerTest { 
        processDefinition.setProjectId(1);

        taskInstance.setProcessDefine(processDefinition);



        Mockito.when(processService.getTaskInstanceDetailByTaskId(1)).thenReturn(taskInstance);

        Mockito.doReturn(taskInstance).when(processService).getTaskInstanceDetailByTaskId(1);

        taskPriorityQueue.put("2_1_2_1_default");



        Thread.sleep(10000);
@@ -134,8 +134,7 @@ public class TaskPriorityQueueConsumerTest { 
        processDefinition.setUserId(2);

        processDefinition.setProjectId(1);

        taskInstance.setProcessDefine(processDefinition);



        Mockito.when(processService.getTaskInstanceDetailByTaskId(1)).thenReturn(taskInstance);

        Mockito.doReturn(taskInstance).when(processService).getTaskInstanceDetailByTaskId(1);

        taskPriorityQueue.put("2_1_2_1_default");



        DataSource dataSource = new DataSource();
@@ -147,7 +146,7 @@ public class TaskPriorityQueueConsumerTest { 
        dataSource.setCreateTime(new Date());

        dataSource.setUpdateTime(new Date());



        Mockito.when(processService.findDataSourceById(1)).thenReturn(dataSource);

        Mockito.doReturn(dataSource).when(processService).findDataSourceById(1);



        Thread.sleep(10000);

    }
@@ -175,8 +174,7 @@ public class TaskPriorityQueueConsumerTest { 
        processDefinition.setUserId(2);

        processDefinition.setProjectId(1);

        taskInstance.setProcessDefine(processDefinition);



        Mockito.when(processService.getTaskInstanceDetailByTaskId(1)).thenReturn(taskInstance);

        Mockito.doReturn(taskInstance).when(processService).getTaskInstanceDetailByTaskId(1);

        taskPriorityQueue.put("2_1_2_1_default");
@@ -189,9 +187,7 @@ public class TaskPriorityQueueConsumerTest { 
        dataSource.setConnectionParams("{\"address\":\"jdbc:mysql://192.168.221.185:3306\",\"database\":\"dolphinscheduler_qiaozhanwei\",\"jdbcUrl\":\"jdbc:mysql://192.168.221.185:3306/dolphinscheduler_qiaozhanwei\",\"user\":\"root\",\"password\":\"root@123\"}");

        dataSource.setCreateTime(new Date());

        dataSource.setUpdateTime(new Date());



        Mockito.when(processService.findDataSourceById(80)).thenReturn(dataSource);



        Mockito.doReturn(dataSource).when(processService).findDataSourceById(80);

        Thread.sleep(10000);

    }
@@ -218,12 +214,10 @@ public class TaskPriorityQueueConsumerTest { 
        processDefinition.setUserId(2);

        processDefinition.setProjectId(1);

        taskInstance.setProcessDefine(processDefinition);



        Mockito.when(processService.getTaskInstanceDetailByTaskId(1)).thenReturn(taskInstance);

        Mockito.doReturn(taskInstance).when(processService).getTaskInstanceDetailByTaskId(1);

        taskPriorityQueue.put("2_1_2_1_default");







        DataSource dataSource = new DataSource();

        dataSource.setId(1);

        dataSource.setName("datax");
@@ -251,7 +245,7 @@ public class TaskPriorityQueueConsumerTest { 
        taskInstance.setExecutorId(2);





        Mockito.when( processService.findTaskInstanceById(1)).thenReturn(taskInstance);

        Mockito.doReturn(taskInstance).when(processService).findTaskInstanceById(1);



        taskPriorityQueueConsumer.taskInstanceIsFinalState(1);

    }

sql/dolphinscheduler_mysql.sql

+1 −1
Original line number Diff line number Diff line
@@ -815,4 +815,4 @@ INSERT INTO `t_ds_relation_user_alertgroup` VALUES ('1', '1', '1', '2018-11-29 1 
-- ----------------------------

-- Records of t_ds_user

-- ----------------------------

INSERT INTO `t_ds_user` VALUES ('1', 'admin', '7ad2410b2f4c074479a8937a28a22b8f', '0', 'xxx@qq.com', 'xx', '0', '2018-03-27 15:48:50', '2018-10-24 17:40:22', null);
 
INSERT INTO `t_ds_user` VALUES ('1', 'admin', '7ad2410b2f4c074479a8937a28a22b8f', '0', 'xxx@qq.com', 'xx', '0', '2018-03-27 15:48:50', '2018-10-24 17:40:22', null,1);