Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
249dfb13
J
jenkins
项目概览
xxadev
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jenkins
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
249dfb13
编写于
2月 17, 2017
作者:
Y
Yoann Dubreuil
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[JENKINS-42141] Fix performance issue in code merging Tool installer list
上级
0c991dec
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
12 addition
and
30 deletion
+12
-30
core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java
.../src/main/java/hudson/tools/DownloadFromUrlInstaller.java
+12
-30
未找到文件。
core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java
浏览文件 @
249dfb13
...
...
@@ -10,6 +10,7 @@ import net.sf.json.JSONObject;
import
java.io.IOException
;
import
java.util.Arrays
;
import
java.util.Collections
;
import
java.util.HashSet
;
import
java.util.LinkedList
;
import
java.util.List
;
import
java.net.URL
;
...
...
@@ -169,42 +170,23 @@ public abstract class DownloadFromUrlInstaller extends ToolInstaller {
return
false
;
}
/**
* Merge a list of ToolInstallerList and removes duplicate tool installers (ie having the same id)
* @param jsonList the list of ToolInstallerList to merge
* @return the merged ToolInstallerList wrapped in a JSONObject
*/
private
JSONObject
reduce
(
List
<
JSONObject
>
jsonList
)
{
List
<
ToolInstallerEntry
>
reducedToolEntries
=
new
LinkedList
<>();
//collect all tool installers objects from the multiple json objects
HashSet
<
String
>
processedIds
=
new
HashSet
<
String
>();
for
(
JSONObject
jsonToolList
:
jsonList
)
{
ToolInstallerList
toolInstallerList
=
(
ToolInstallerList
)
JSONObject
.
toBean
(
jsonToolList
,
ToolInstallerList
.
class
);
reducedToolEntries
.
addAll
(
Arrays
.
asList
(
toolInstallerList
.
list
));
}
while
(
Downloadable
.
hasDuplicates
(
reducedToolEntries
,
"id"
))
{
List
<
ToolInstallerEntry
>
tmpToolInstallerEntries
=
new
LinkedList
<>();
//we need to skip the processed entries
boolean
processed
[]
=
new
boolean
[
reducedToolEntries
.
size
()];
for
(
int
i
=
0
;
i
<
reducedToolEntries
.
size
();
i
++)
{
if
(
processed
[
i
]
==
true
)
{
continue
;
}
ToolInstallerEntry
data1
=
reducedToolEntries
.
get
(
i
);
boolean
hasDuplicate
=
false
;
for
(
int
j
=
i
+
1
;
j
<
reducedToolEntries
.
size
();
j
++)
{
ToolInstallerEntry
data2
=
reducedToolEntries
.
get
(
j
);
//if we found a duplicate we choose the first one
if
(
data1
.
id
.
equals
(
data2
.
id
))
{
hasDuplicate
=
true
;
processed
[
j
]
=
true
;
tmpToolInstallerEntries
.
add
(
data1
);
//after the first duplicate has been found we break the loop since the duplicates are
//processed two by two
break
;
}
}
//if no duplicate has been found we just insert the entry in the tmp list
if
(!
hasDuplicate
)
{
tmpToolInstallerEntries
.
add
(
data1
);
for
(
ToolInstallerEntry
entry
:
toolInstallerList
.
list
)
{
// being able to add the id into the processedIds set means this tool has not been processed before
if
(
processedIds
.
add
(
entry
.
id
))
{
reducedToolEntries
.
add
(
entry
);
}
}
reducedToolEntries
=
tmpToolInstallerEntries
;
}
ToolInstallerList
toolInstallerList
=
new
ToolInstallerList
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录