[incubator-dolphinscheduler] branch json_split updated: [Feature][JsonSplit] When create the process instance, save the field "locations" and "connects" (#5248)

[wenhemin]

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

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


The following commit(s) were added to refs/heads/json_split by this push:
     new 556c371  [Feature][JsonSplit] When create the process instance, save 
the field "locations" and "connects" (#5248)
556c371 is described below

commit 556c37155b289fb06f24c7b65ec42d7d416a984c
Author: wen-hemin <39549317+wen-he...@users.noreply.github.com>
AuthorDate: Sat Apr 10 18:38:10 2021 +0800

    [Feature][JsonSplit] When create the process instance, save the field 
"locations" and "connects" (#5248)
    
    * fix: dag show bugs
    
    * fix: code format
    
    * fix: code format
    
    * fix: code format
    
    * fix: When create the process instance, save the field "locations" and 
"connects"
    
    Co-authored-by: wen-hemin <wenhe...@apache.com>
---
 .../java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java  | 2 --
 .../org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml  | 4 ++--
 sql/dolphinscheduler_mysql.sql                                        | 4 +++-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java
 
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java
index 2cc69f7..83ecadf 100644
--- 
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java
+++ 
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java
@@ -195,13 +195,11 @@ public class ProcessInstance {
     /**
      * task locations for web
      */
-    @TableField(exist = false)
     private String locations;
 
     /**
      * task connects for web
      */
-    @TableField(exist = false)
     private String connects;
 
     /**
diff --git 
a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml
 
b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml
index 7344f8e..9bcb7d4 100644
--- 
a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml
+++ 
b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml
@@ -22,7 +22,7 @@
         id, name, process_definition_version, process_definition_code, state, 
recovery, start_time, end_time, run_times,host,
         command_type, command_param, task_depend_type, max_try_times, 
failure_strategy, warning_type,
         warning_group_id, schedule_time, command_start_time, global_params, 
flag,
-        update_time, is_sub_process, executor_id, history_cmd,
+        update_time, is_sub_process, executor_id, history_cmd, locations, 
connects,
         process_instance_priority, worker_group, timeout, tenant_id, var_pool
     </sql>
     <select id="queryDetailById" 
resultType="org.apache.dolphinscheduler.dao.entity.ProcessInstance">
@@ -223,4 +223,4 @@
         set global_params = #{globalParams}
         where id = #{id}
     </update>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/sql/dolphinscheduler_mysql.sql b/sql/dolphinscheduler_mysql.sql
index ded1038..c4dac3b 100644
--- a/sql/dolphinscheduler_mysql.sql
+++ b/sql/dolphinscheduler_mysql.sql
@@ -601,6 +601,8 @@ CREATE TABLE `t_ds_process_instance` (
   `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE 
CURRENT_TIMESTAMP,
   `is_sub_process` int(11) DEFAULT '0' COMMENT 'flag, whether the process is 
sub process',
   `executor_id` int(11) NOT NULL COMMENT 'executor id',
+  `locations` text COMMENT 'Node location information',
+  `connects` text COMMENT 'Node connection information',
   `history_cmd` text COMMENT 'history commands of process instance operation',
   `process_instance_priority` int(11) DEFAULT NULL COMMENT 'process instance 
priority. 0 Highest,1 High,2 Medium,3 Low,4 Lowest',
   `worker_group` varchar(64) DEFAULT NULL COMMENT 'worker group id',
@@ -990,4 +992,4 @@ CREATE TABLE `t_ds_alert_plugin_instance` (
   `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE 
CURRENT_TIMESTAMP,
   `instance_name` varchar(200) DEFAULT NULL COMMENT 'alert instance name',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
\ No newline at end of file
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;