[dolphinscheduler] branch dev updated: [feat] Support set execute type to pydolphinscheduler (#12871)

[zhongjiajie]

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

zhongjiajie pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new 87a88e3662 [feat] Support set execute type to pydolphinscheduler 
(#12871)
87a88e3662 is described below

commit 87a88e36627017607c73cfc66a92be08d1da22ee
Author: Jay Chung <zhongjiajie...@gmail.com>
AuthorDate: Sat Nov 12 10:31:08 2022 +0800

    [feat] Support set execute type to pydolphinscheduler (#12871)
    
    Up to now, we can only submit workflow with parallel mode. this patch give 
users ability specific execute type to workflow
---
 .../org/apache/dolphinscheduler/api/python/PythonGateway.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git 
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/python/PythonGateway.java
 
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/python/PythonGateway.java
index f812b51e5c..95a7dde6b0 100644
--- 
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/python/PythonGateway.java
+++ 
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/python/PythonGateway.java
@@ -245,12 +245,13 @@ public class PythonGateway {
                                                 String taskRelationJson,
                                                 String taskDefinitionJson,
                                                 String otherParamsJson,
-                                                ProcessExecutionTypeEnum 
executionType) {
+                                                String executionType) {
         User user = usersService.queryUser(userName);
         Project project = projectMapper.queryByName(projectName);
         long projectCode = project.getCode();
 
         ProcessDefinition processDefinition = getProcessDefinition(user, 
projectCode, name);
+        ProcessExecutionTypeEnum executionTypeEnum = 
ProcessExecutionTypeEnum.valueOf(executionType);
         long processDefinitionCode;
         // create or update process definition
         if (processDefinition != null) {
@@ -258,13 +259,15 @@ public class PythonGateway {
             // make sure process definition offline which could edit
             processDefinitionService.releaseProcessDefinition(user, 
projectCode, processDefinitionCode,
                     ReleaseState.OFFLINE);
-            Map<String, Object> result = 
processDefinitionService.updateProcessDefinition(user, projectCode, name,
+            processDefinitionService.updateProcessDefinition(user, 
projectCode, name,
                     processDefinitionCode, description, globalParams,
-                    null, timeout, tenantCode, taskRelationJson, 
taskDefinitionJson, otherParamsJson, executionType);
+                    null, timeout, tenantCode, taskRelationJson, 
taskDefinitionJson, otherParamsJson,
+                    executionTypeEnum);
         } else {
             Map<String, Object> result = 
processDefinitionService.createProcessDefinition(user, projectCode, name,
                     description, globalParams,
-                    null, timeout, tenantCode, taskRelationJson, 
taskDefinitionJson, otherParamsJson, executionType);
+                    null, timeout, tenantCode, taskRelationJson, 
taskDefinitionJson, otherParamsJson,
+                    executionTypeEnum);
             processDefinition = (ProcessDefinition) 
result.get(Constants.DATA_LIST);
             processDefinitionCode = processDefinition.getCode();
         }