Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
DolphinScheduler
提交
784b3550
DolphinScheduler
项目概览
apache
/
DolphinScheduler
上一次同步 接近 2 年
通知
707
Star
9572
Fork
3514
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
DolphinScheduler
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
784b3550
编写于
4月 18, 2021
作者:
W
wen-hemin
提交者:
GitHub
4月 18, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: The instance page DAG does not display bug (#5298)
Co-authored-by:
N
wen-hemin
<
wenhemin@apache.com
>
上级
0166aebf
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
7 addition
and
6 deletion
+7
-6
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java
...cheduler/api/service/impl/ProcessInstanceServiceImpl.java
+3
-0
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java
...g/apache/dolphinscheduler/dao/entity/ProcessInstance.java
+2
-0
dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml
...che/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml
+1
-1
sql/dolphinscheduler_mysql.sql
sql/dolphinscheduler_mysql.sql
+0
-2
sql/dolphinscheduler_postgre.sql
sql/dolphinscheduler_postgre.sql
+1
-3
未找到文件。
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java
浏览文件 @
784b3550
...
...
@@ -209,6 +209,9 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce
putMsg
(
result
,
Status
.
PROCESS_DEFINE_NOT_EXIST
,
processId
);
}
else
{
processInstance
.
setWarningGroupId
(
processDefinition
.
getWarningGroupId
());
processInstance
.
setConnects
(
processDefinition
.
getConnects
());
processInstance
.
setLocations
(
processDefinition
.
getLocations
());
ProcessData
processData
=
processService
.
genProcessData
(
processDefinition
);
processInstance
.
setProcessInstanceJson
(
JSONUtils
.
toJsonString
(
processData
));
result
.
put
(
DATA_LIST
,
processInstance
);
...
...
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java
浏览文件 @
784b3550
...
...
@@ -188,11 +188,13 @@ public class ProcessInstance {
/**
* task locations for web
*/
@TableField
(
exist
=
false
)
private
String
locations
;
/**
* task connects for web
*/
@TableField
(
exist
=
false
)
private
String
connects
;
/**
...
...
dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml
浏览文件 @
784b3550
...
...
@@ -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,
locations, connects,
update_time, is_sub_process, executor_id, history_cmd,
process_instance_priority, worker_group, timeout, tenant_id, var_pool
</sql>
<select
id=
"queryDetailById"
resultType=
"org.apache.dolphinscheduler.dao.entity.ProcessInstance"
>
...
...
sql/dolphinscheduler_mysql.sql
浏览文件 @
784b3550
...
...
@@ -601,8 +601,6 @@ 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'
,
...
...
sql/dolphinscheduler_postgre.sql
浏览文件 @
784b3550
...
...
@@ -482,8 +482,6 @@ CREATE TABLE t_ds_process_instance (
update_time
timestamp
NULL
,
is_sub_process
int
DEFAULT
'0'
,
executor_id
int
NOT
NULL
,
locations
text
,
connects
text
,
history_cmd
text
,
dependence_schedule_times
text
,
process_instance_priority
int
DEFAULT
NULL
,
...
...
@@ -938,4 +936,4 @@ CREATE TABLE t_ds_alert_plugin_instance (
update_time
timestamp
NULL
,
instance_name
varchar
(
200
)
NULL
,
CONSTRAINT
t_ds_alert_plugin_instance_pk
PRIMARY
KEY
(
id
)
);
\ No newline at end of file
);
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录