Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Forever310
druid
提交
346cf0e0
D
druid
项目概览
Forever310
/
druid
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
druid
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
346cf0e0
编写于
11月 14, 2013
作者:
F
fjy
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix out of order in urls for hadoop classpath
上级
d935e1b4
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
11 addition
and
12 deletion
+11
-12
indexing-service/src/main/java/io/druid/indexing/common/task/HadoopIndexTask.java
...n/java/io/druid/indexing/common/task/HadoopIndexTask.java
+6
-6
services/src/main/java/io/druid/cli/CliHadoopIndexer.java
services/src/main/java/io/druid/cli/CliHadoopIndexer.java
+5
-6
未找到文件。
indexing-service/src/main/java/io/druid/indexing/common/task/HadoopIndexTask.java
浏览文件 @
346cf0e0
...
@@ -23,7 +23,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
...
@@ -23,7 +23,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.fasterxml.jackson.annotation.JsonProperty
;
import
com.fasterxml.jackson.annotation.JsonProperty
;
import
com.fasterxml.jackson.core.type.TypeReference
;
import
com.fasterxml.jackson.core.type.TypeReference
;
import
com.google.api.client.util.
Se
ts
;
import
com.google.api.client.util.
Lis
ts
;
import
com.google.common.base.Joiner
;
import
com.google.common.base.Joiner
;
import
com.google.common.base.Preconditions
;
import
com.google.common.base.Preconditions
;
import
com.google.common.collect.ImmutableSet
;
import
com.google.common.collect.ImmutableSet
;
...
@@ -50,7 +50,6 @@ import java.net.URL;
...
@@ -50,7 +50,6 @@ import java.net.URL;
import
java.net.URLClassLoader
;
import
java.net.URLClassLoader
;
import
java.util.Arrays
;
import
java.util.Arrays
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Set
;
public
class
HadoopIndexTask
extends
AbstractTask
public
class
HadoopIndexTask
extends
AbstractTask
{
{
...
@@ -131,7 +130,7 @@ public class HadoopIndexTask extends AbstractTask
...
@@ -131,7 +130,7 @@ public class HadoopIndexTask extends AbstractTask
aetherClient
,
hadoopCoordinates
aetherClient
,
hadoopCoordinates
);
);
final
Set
<
URL
>
extensionURLs
=
Sets
.
newHashSe
t
();
final
List
<
URL
>
extensionURLs
=
Lists
.
newArrayLis
t
();
for
(
String
coordinate
:
extensionsConfig
.
getCoordinates
())
{
for
(
String
coordinate
:
extensionsConfig
.
getCoordinates
())
{
final
ClassLoader
coordinateLoader
=
Initialization
.
getClassLoaderForCoordinates
(
final
ClassLoader
coordinateLoader
=
Initialization
.
getClassLoaderForCoordinates
(
aetherClient
,
coordinate
aetherClient
,
coordinate
...
@@ -139,17 +138,18 @@ public class HadoopIndexTask extends AbstractTask
...
@@ -139,17 +138,18 @@ public class HadoopIndexTask extends AbstractTask
extensionURLs
.
addAll
(
Arrays
.
asList
(((
URLClassLoader
)
coordinateLoader
).
getURLs
()));
extensionURLs
.
addAll
(
Arrays
.
asList
(((
URLClassLoader
)
coordinateLoader
).
getURLs
()));
}
}
final
Set
<
URL
>
nonHadoopURLs
=
Sets
.
newHashSe
t
();
final
List
<
URL
>
nonHadoopURLs
=
Lists
.
newArrayLis
t
();
nonHadoopURLs
.
addAll
(
Arrays
.
asList
(((
URLClassLoader
)
HadoopIndexTask
.
class
.
getClassLoader
()).
getURLs
()));
nonHadoopURLs
.
addAll
(
Arrays
.
asList
(((
URLClassLoader
)
HadoopIndexTask
.
class
.
getClassLoader
()).
getURLs
()));
final
Set
<
URL
>
driverURLs
=
Sets
.
newHashSe
t
();
final
List
<
URL
>
driverURLs
=
Lists
.
newArrayLis
t
();
driverURLs
.
addAll
(
nonHadoopURLs
);
driverURLs
.
addAll
(
nonHadoopURLs
);
// put hadoop dependencies last to avoid jets3t & apache.httpcore version conflicts
driverURLs
.
addAll
(
Arrays
.
asList
(((
URLClassLoader
)
hadoopLoader
).
getURLs
()));
driverURLs
.
addAll
(
Arrays
.
asList
(((
URLClassLoader
)
hadoopLoader
).
getURLs
()));
final
URLClassLoader
loader
=
new
URLClassLoader
(
driverURLs
.
toArray
(
new
URL
[
driverURLs
.
size
()]),
null
);
final
URLClassLoader
loader
=
new
URLClassLoader
(
driverURLs
.
toArray
(
new
URL
[
driverURLs
.
size
()]),
null
);
Thread
.
currentThread
().
setContextClassLoader
(
loader
);
Thread
.
currentThread
().
setContextClassLoader
(
loader
);
final
Set
<
URL
>
jobUrls
=
Sets
.
newHashSe
t
();
final
List
<
URL
>
jobUrls
=
Lists
.
newArrayLis
t
();
jobUrls
.
addAll
(
nonHadoopURLs
);
jobUrls
.
addAll
(
nonHadoopURLs
);
jobUrls
.
addAll
(
extensionURLs
);
jobUrls
.
addAll
(
extensionURLs
);
...
...
services/src/main/java/io/druid/cli/CliHadoopIndexer.java
浏览文件 @
346cf0e0
...
@@ -19,7 +19,6 @@
...
@@ -19,7 +19,6 @@
package
io.druid.cli
;
package
io.druid.cli
;
import
com.google.api.client.util.Sets
;
import
com.google.common.base.Joiner
;
import
com.google.common.base.Joiner
;
import
com.google.common.collect.Lists
;
import
com.google.common.collect.Lists
;
import
com.google.inject.Inject
;
import
com.google.inject.Inject
;
...
@@ -37,7 +36,6 @@ import java.net.URL;
...
@@ -37,7 +36,6 @@ import java.net.URL;
import
java.net.URLClassLoader
;
import
java.net.URLClassLoader
;
import
java.util.Arrays
;
import
java.util.Arrays
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Set
;
/**
/**
*/
*/
...
@@ -69,7 +67,7 @@ public class CliHadoopIndexer implements Runnable
...
@@ -69,7 +67,7 @@ public class CliHadoopIndexer implements Runnable
aetherClient
,
hadoopCoordinates
aetherClient
,
hadoopCoordinates
);
);
final
Set
<
URL
>
extensionURLs
=
Sets
.
newHashSe
t
();
final
List
<
URL
>
extensionURLs
=
Lists
.
newArrayLis
t
();
for
(
String
coordinate
:
extensionsConfig
.
getCoordinates
())
{
for
(
String
coordinate
:
extensionsConfig
.
getCoordinates
())
{
final
ClassLoader
coordinateLoader
=
Initialization
.
getClassLoaderForCoordinates
(
final
ClassLoader
coordinateLoader
=
Initialization
.
getClassLoaderForCoordinates
(
aetherClient
,
coordinate
aetherClient
,
coordinate
...
@@ -77,17 +75,18 @@ public class CliHadoopIndexer implements Runnable
...
@@ -77,17 +75,18 @@ public class CliHadoopIndexer implements Runnable
extensionURLs
.
addAll
(
Arrays
.
asList
(((
URLClassLoader
)
coordinateLoader
).
getURLs
()));
extensionURLs
.
addAll
(
Arrays
.
asList
(((
URLClassLoader
)
coordinateLoader
).
getURLs
()));
}
}
final
Set
<
URL
>
nonHadoopURLs
=
Sets
.
newHashSe
t
();
final
List
<
URL
>
nonHadoopURLs
=
Lists
.
newArrayLis
t
();
nonHadoopURLs
.
addAll
(
Arrays
.
asList
(((
URLClassLoader
)
CliHadoopIndexer
.
class
.
getClassLoader
()).
getURLs
()));
nonHadoopURLs
.
addAll
(
Arrays
.
asList
(((
URLClassLoader
)
CliHadoopIndexer
.
class
.
getClassLoader
()).
getURLs
()));
final
Set
<
URL
>
driverURLs
=
Sets
.
newHashSe
t
();
final
List
<
URL
>
driverURLs
=
Lists
.
newArrayLis
t
();
driverURLs
.
addAll
(
nonHadoopURLs
);
driverURLs
.
addAll
(
nonHadoopURLs
);
// put hadoop dependencies last to avoid jets3t & apache.httpcore version conflicts
driverURLs
.
addAll
(
Arrays
.
asList
(((
URLClassLoader
)
hadoopLoader
).
getURLs
()));
driverURLs
.
addAll
(
Arrays
.
asList
(((
URLClassLoader
)
hadoopLoader
).
getURLs
()));
final
URLClassLoader
loader
=
new
URLClassLoader
(
driverURLs
.
toArray
(
new
URL
[
driverURLs
.
size
()]),
null
);
final
URLClassLoader
loader
=
new
URLClassLoader
(
driverURLs
.
toArray
(
new
URL
[
driverURLs
.
size
()]),
null
);
Thread
.
currentThread
().
setContextClassLoader
(
loader
);
Thread
.
currentThread
().
setContextClassLoader
(
loader
);
final
Set
<
URL
>
jobUrls
=
Sets
.
newHashSe
t
();
final
List
<
URL
>
jobUrls
=
Lists
.
newArrayLis
t
();
jobUrls
.
addAll
(
nonHadoopURLs
);
jobUrls
.
addAll
(
nonHadoopURLs
);
jobUrls
.
addAll
(
extensionURLs
);
jobUrls
.
addAll
(
extensionURLs
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录