This is an automated email from the ASF dual-hosted git repository.

technoboy pushed a commit to branch refactor-worker
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git

commit 1b95314998345202ee07fb35f330c612c4abd482
Merge: 9d89eb0 9f1865b
Author: Tboy <[email protected]>
AuthorDate: Sat Feb 22 15:30:32 2020 +0800

    Merge branch 'refactor-worker' into refactor-worker

 .../dolphinscheduler/server/master/runner/MasterBaseTaskExecThread.java  | 1 -
 1 file changed, 1 deletion(-)

diff --cc 
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterBaseTaskExecThread.java
index 0167839,d704629..7106cc6
--- 
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterBaseTaskExecThread.java
+++ 
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterBaseTaskExecThread.java
@@@ -204,7 -195,35 +204,6 @@@ public class MasterBaseTaskExecThread i
          return false;
      }
  
 -
 -    /**
 -     * taskInstance convert to taskInfo
 -     *
 -     * @param taskInstance taskInstance
 -     * @return taskInfo
 -     */
 -    private TaskExecutionContext convertToTaskInfo(TaskInstance taskInstance){
 -        TaskExecutionContext taskExecutionContext = new 
TaskExecutionContext();
 -        taskExecutionContext.setTaskId(taskInstance.getId());
 -        taskExecutionContext.setTaskName(taskInstance.getName());
 -        taskExecutionContext.setStartTime(taskInstance.getStartTime());
 -        taskExecutionContext.setTaskType(taskInstance.getTaskType());
 -        taskExecutionContext.setExecutePath(getExecLocalPath(taskInstance));
 -        taskExecutionContext.setTaskJson(taskInstance.getTaskJson());
 -        
taskExecutionContext.setProcessInstanceId(taskInstance.getProcessInstance().getId());
 -        
taskExecutionContext.setScheduleTime(taskInstance.getProcessInstance().getScheduleTime());
 -        
taskExecutionContext.setGlobalParams(taskInstance.getProcessInstance().getGlobalParams());
 -        
taskExecutionContext.setExecutorId(taskInstance.getProcessInstance().getExecutorId());
 -        
taskExecutionContext.setCmdTypeIfComplement(taskInstance.getProcessInstance().getCmdTypeIfComplement().getCode());
 -        
taskExecutionContext.setTenantCode(taskInstance.getProcessInstance().getTenantCode());
 -        
taskExecutionContext.setQueue(taskInstance.getProcessInstance().getQueue());
 -        
taskExecutionContext.setProcessDefineId(taskInstance.getProcessDefine().getId());
 -        
taskExecutionContext.setProjectId(taskInstance.getProcessDefine().getProjectId());
 -
 -        return taskExecutionContext;
 -    }
 -
--
      /**
       * get execute local path
       *

Reply via email to