Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
yanghaoyuan.sh
DolphinScheduler
提交
4ebf923d
DolphinScheduler
项目概览
yanghaoyuan.sh
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
1
Star
0
Fork
0
代码
文件
提交
分支
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,发现更多精彩内容 >>
未验证
提交
4ebf923d
编写于
4月 24, 2020
作者:
D
dailidong
提交者:
GitHub
4月 24, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' into dev
上级
25636b37
733e8bcb
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
23 addition
and
21 deletion
+23
-21
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/consumer/TaskPriorityQueueConsumer.java
...ler/server/master/consumer/TaskPriorityQueueConsumer.java
+23
-21
未找到文件。
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/consumer/TaskPriorityQueueConsumer.java
浏览文件 @
4ebf923d
...
...
@@ -48,13 +48,13 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.stereotype.Component
;
import
javax.annotation.PostConstruct
;
import
java.util.
HashSe
t
;
import
java.util.
ArrayLis
t
;
import
java.util.List
;
import
java.util.Set
;
import
java.util.stream.Collectors
;
import
java.util.stream.Stream
;
import
static
org
.
apache
.
dolphinscheduler
.
common
.
Constants
.
*
;
import
static
org
.
apache
.
dolphinscheduler
.
common
.
Constants
.
SLEEP_TIME_MILLIS
;
/**
* TaskUpdateQueue consumer
...
...
@@ -328,36 +328,38 @@ public class TaskPriorityQueueConsumer extends Thread{
return
false
;
}
/**
*
create project resource files
*
get resource full name list
*/
private
List
<
String
>
getResourceFullNames
(
TaskNode
taskNode
){
Set
<
Integer
>
resourceIdsSet
=
new
HashSet
<>();
private
List
<
String
>
getResourceFullNames
(
TaskNode
taskNode
)
{
List
<
String
>
resourceFullNameList
=
new
ArrayList
<>();
AbstractParameters
baseParam
=
TaskParametersUtils
.
getParameters
(
taskNode
.
getType
(),
taskNode
.
getParams
());
if
(
baseParam
!=
null
)
{
List
<
ResourceInfo
>
projectResourceFiles
=
baseParam
.
getResourceFilesList
();
if
(
projectResourceFiles
!=
null
)
{
Stream
<
Integer
>
resourceInfotream
=
projectResourceFiles
.
stream
().
map
(
resourceInfo
->
resourceInfo
.
getId
());
resourceIdsSet
.
addAll
(
resourceInfotream
.
collect
(
Collectors
.
toSet
()));
}
}
// filter the resources that the resource id equals 0
Set
<
ResourceInfo
>
oldVersionResources
=
projectResourceFiles
.
stream
().
filter
(
t
->
t
.
getId
()
==
0
).
collect
(
Collectors
.
toSet
());
if
(
CollectionUtils
.
isNotEmpty
(
oldVersionResources
))
{
resourceFullNameList
.
addAll
(
oldVersionResources
.
stream
().
map
(
resource
->
resource
.
getRes
()).
collect
(
Collectors
.
toSet
()));
}
if
(
CollectionUtils
.
isEmpty
(
resourceIdsSet
)){
return
null
;
}
Integer
[]
resourceIds
=
resourceIdsSet
.
toArray
(
new
Integer
[
resourceIdsSet
.
size
()]);
// get the resource id in order to get the resource names in batch
Stream
<
Integer
>
resourceIdStream
=
projectResourceFiles
.
stream
().
map
(
resourceInfo
->
resourceInfo
.
getId
());
Set
<
Integer
>
resourceIdsSet
=
resourceIdStream
.
collect
(
Collectors
.
toSet
());
List
<
Resource
>
resources
=
processService
.
listResourceByIds
(
resourceIds
);
if
(
CollectionUtils
.
isNotEmpty
(
resourceIdsSet
))
{
Integer
[]
resourceIds
=
resourceIdsSet
.
toArray
(
new
Integer
[
resourceIdsSet
.
size
()]);
List
<
String
>
resourceFullNames
=
resources
.
stream
()
.
map
(
resourceInfo
->
resourceInfo
.
getFullName
())
.
collect
(
Collectors
.
toList
());
List
<
Resource
>
resources
=
processService
.
listResourceByIds
(
resourceIds
);
resourceFullNameList
.
addAll
(
resources
.
stream
()
.
map
(
resourceInfo
->
resourceInfo
.
getFullName
())
.
collect
(
Collectors
.
toList
()));
}
}
}
return
resourceFullName
s
;
return
resourceFullName
List
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录