Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
DolphinScheduler
提交
584ad1cd
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,发现更多精彩内容 >>
未验证
提交
584ad1cd
编写于
1月 12, 2022
作者:
W
Wenjun Ruan
提交者:
GitHub
1月 12, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix global params cannot transport into sub_process (#7969)
上级
7b1744ba
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
16 addition
and
13 deletion
+16
-13
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
...ache/dolphinscheduler/service/process/ProcessService.java
+16
-13
未找到文件。
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
浏览文件 @
584ad1cd
...
...
@@ -17,6 +17,7 @@
package
org.apache.dolphinscheduler.service.process
;
import
static
java
.
util
.
stream
.
Collectors
.
toSet
;
import
static
org
.
apache
.
dolphinscheduler
.
common
.
Constants
.
CMDPARAM_COMPLEMENT_DATA_END_DATE
;
import
static
org
.
apache
.
dolphinscheduler
.
common
.
Constants
.
CMDPARAM_COMPLEMENT_DATA_START_DATE
;
import
static
org
.
apache
.
dolphinscheduler
.
common
.
Constants
.
CMD_PARAM_EMPTY_SUB_PROCESS
;
...
...
@@ -27,8 +28,6 @@ import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_SUB_PROCESS
import
static
org
.
apache
.
dolphinscheduler
.
common
.
Constants
.
CMD_PARAM_SUB_PROCESS_PARENT_INSTANCE_ID
;
import
static
org
.
apache
.
dolphinscheduler
.
common
.
Constants
.
LOCAL_PARAMS
;
import
static
java
.
util
.
stream
.
Collectors
.
toSet
;
import
org.apache.dolphinscheduler.common.Constants
;
import
org.apache.dolphinscheduler.common.enums.AuthorizationType
;
import
org.apache.dolphinscheduler.common.enums.CommandType
;
...
...
@@ -1002,17 +1001,21 @@ public class ProcessService {
*/
private
String
joinGlobalParams
(
String
parentGlobalParams
,
String
subGlobalParams
)
{
List
<
Property
>
parentPropertyList
=
JSONUtils
.
toList
(
parentGlobalParams
,
Property
.
class
);
List
<
Property
>
subPropertyList
=
JSONUtils
.
toList
(
subGlobalParams
,
Property
.
class
);
Map
<
String
,
String
>
subMap
=
subPropertyList
.
stream
().
collect
(
Collectors
.
toMap
(
Property:
:
getProp
,
Property:
:
getValue
));
for
(
Property
parent
:
parentPropertyList
)
{
if
(!
subMap
.
containsKey
(
parent
.
getProp
()))
{
subPropertyList
.
add
(
parent
);
}
}
return
JSONUtils
.
toJsonString
(
subPropertyList
);
// Since JSONUtils.toList return unmodified list, we need to creat a new List here.
List
<
Property
>
parentParams
=
Lists
.
newArrayList
(
JSONUtils
.
toList
(
parentGlobalParams
,
Property
.
class
));
List
<
Property
>
subParams
=
JSONUtils
.
toList
(
subGlobalParams
,
Property
.
class
);
Set
<
String
>
parentParamKeys
=
parentParams
.
stream
().
map
(
Property:
:
getProp
).
collect
(
toSet
());
// We will combine the params of parent workflow and sub workflow
// If the params are defined in both, we will use parent's params to override the sub workflow(ISSUE-7962)
// todo: Do we need to consider the other attribute of Property?
// e.g. the subProp's type is not equals with parent, or subProp's direct is not equals with parent
// It's suggested to add node name in property, this kind of problem can be solved.
List
<
Property
>
extraSubParams
=
subParams
.
stream
()
.
filter
(
subProp
->
!
parentParamKeys
.
contains
(
subProp
.
getProp
())).
collect
(
Collectors
.
toList
());
parentParams
.
addAll
(
extraSubParams
);
return
JSONUtils
.
toJsonString
(
parentParams
);
}
/**
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录