Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Forever310
druid
提交
ea7eaba7
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,发现更多精彩内容 >>
提交
ea7eaba7
编写于
5月 29, 2014
作者:
X
Xavier Léauté
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
require default predicate in ServerInventoryViews
上级
f32aee78
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
14 addition
and
16 deletion
+14
-16
server/src/main/java/io/druid/client/BatchServerInventoryView.java
...c/main/java/io/druid/client/BatchServerInventoryView.java
+3
-5
server/src/main/java/io/druid/client/BatchServerInventoryViewProvider.java
...ava/io/druid/client/BatchServerInventoryViewProvider.java
+3
-1
server/src/main/java/io/druid/client/SingleServerInventoryProvider.java
...n/java/io/druid/client/SingleServerInventoryProvider.java
+3
-1
server/src/main/java/io/druid/client/SingleServerInventoryView.java
.../main/java/io/druid/client/SingleServerInventoryView.java
+4
-8
server/src/test/java/io/druid/client/client/BatchServerInventoryViewTest.java
.../io/druid/client/client/BatchServerInventoryViewTest.java
+1
-1
未找到文件。
server/src/main/java/io/druid/client/BatchServerInventoryView.java
浏览文件 @
ea7eaba7
...
...
@@ -21,6 +21,7 @@ package io.druid.client;
import
com.fasterxml.jackson.core.type.TypeReference
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.google.api.client.repackaged.com.google.common.base.Preconditions
;
import
com.google.common.base.Predicate
;
import
com.google.common.base.Predicates
;
import
com.google.common.collect.MapMaker
;
...
...
@@ -66,11 +67,8 @@ public class BatchServerInventoryView extends ServerInventoryView<Set<DataSegmen
new
TypeReference
<
Set
<
DataSegment
>>(){}
);
if
(
defaultFilter
!=
null
)
{
this
.
defaultFilter
=
defaultFilter
;
}
else
{
this
.
defaultFilter
=
Predicates
.
alwaysTrue
();
}
Preconditions
.
checkNotNull
(
defaultFilter
);
this
.
defaultFilter
=
defaultFilter
;
}
@Override
...
...
server/src/main/java/io/druid/client/BatchServerInventoryViewProvider.java
浏览文件 @
ea7eaba7
...
...
@@ -21,7 +21,9 @@ package io.druid.client;
import
com.fasterxml.jackson.annotation.JacksonInject
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.google.common.base.Predicates
;
import
io.druid.server.initialization.ZkPathsConfig
;
import
io.druid.timeline.DataSegment
;
import
org.apache.curator.framework.CuratorFramework
;
import
javax.validation.constraints.NotNull
;
...
...
@@ -45,6 +47,6 @@ public class BatchServerInventoryViewProvider implements ServerInventoryViewProv
@Override
public
BatchServerInventoryView
get
()
{
return
new
BatchServerInventoryView
(
zkPaths
,
curator
,
jsonMapper
,
null
);
return
new
BatchServerInventoryView
(
zkPaths
,
curator
,
jsonMapper
,
Predicates
.<
DataSegment
>
alwaysTrue
()
);
}
}
server/src/main/java/io/druid/client/SingleServerInventoryProvider.java
浏览文件 @
ea7eaba7
...
...
@@ -21,7 +21,9 @@ package io.druid.client;
import
com.fasterxml.jackson.annotation.JacksonInject
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.google.common.base.Predicates
;
import
io.druid.server.initialization.ZkPathsConfig
;
import
io.druid.timeline.DataSegment
;
import
org.apache.curator.framework.CuratorFramework
;
import
javax.validation.constraints.NotNull
;
...
...
@@ -45,6 +47,6 @@ public class SingleServerInventoryProvider implements ServerInventoryViewProvide
@Override
public
ServerInventoryView
get
()
{
return
new
SingleServerInventoryView
(
zkPaths
,
curator
,
jsonMapper
,
null
);
return
new
SingleServerInventoryView
(
zkPaths
,
curator
,
jsonMapper
,
Predicates
.<
DataSegment
>
alwaysTrue
()
);
}
}
server/src/main/java/io/druid/client/SingleServerInventoryView.java
浏览文件 @
ea7eaba7
...
...
@@ -21,10 +21,10 @@ package io.druid.client;
import
com.fasterxml.jackson.core.type.TypeReference
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.google.api.client.repackaged.com.google.common.base.Preconditions
;
import
com.google.common.base.Predicate
;
import
com.google.common.base.Predicates
;
import
com.google.common.collect.MapMaker
;
import
com.google.common.collect.Sets
;
import
com.google.inject.Inject
;
import
com.metamx.emitter.EmittingLogger
;
import
io.druid.guice.ManageLifecycle
;
...
...
@@ -33,8 +33,6 @@ import io.druid.server.initialization.ZkPathsConfig;
import
io.druid.timeline.DataSegment
;
import
org.apache.curator.framework.CuratorFramework
;
import
java.util.Map
;
import
java.util.Set
;
import
java.util.concurrent.ConcurrentMap
;
import
java.util.concurrent.Executor
;
...
...
@@ -65,11 +63,9 @@ public class SingleServerInventoryView extends ServerInventoryView<DataSegment>
new
TypeReference
<
DataSegment
>(){}
);
if
(
defaultFilter
!=
null
)
{
this
.
defaultFilter
=
defaultFilter
;
}
else
{
this
.
defaultFilter
=
Predicates
.
alwaysTrue
();
}
}
Preconditions
.
checkNotNull
(
defaultFilter
);
this
.
defaultFilter
=
defaultFilter
;
}
@Override
protected
DruidServer
addInnerInventory
(
...
...
server/src/test/java/io/druid/client/client/BatchServerInventoryViewTest.java
浏览文件 @
ea7eaba7
...
...
@@ -146,7 +146,7 @@ public class BatchServerInventoryViewTest
},
cf
,
jsonMapper
,
null
Predicates
.<
DataSegment
>
alwaysTrue
()
);
batchServerInventoryView
.
start
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录