Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Forever310
druid
提交
9a371f34
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,发现更多精彩内容 >>
提交
9a371f34
编写于
8月 08, 2014
作者:
F
fjy
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #674 from metamx/fix-arbitrary-granularity
fix missing queryGranularity in ArbitraryGranularitySpec
上级
68827ff8
3826b1d9
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
19 addition
and
8 deletion
+19
-8
server/src/main/java/io/druid/segment/indexing/granularity/ArbitraryGranularitySpec.java
...egment/indexing/granularity/ArbitraryGranularitySpec.java
+11
-3
server/src/main/java/io/druid/segment/indexing/granularity/UniformGranularitySpec.java
.../segment/indexing/granularity/UniformGranularitySpec.java
+1
-1
server/src/test/java/io/druid/segment/indexing/granularity/ArbitraryGranularityTest.java
...egment/indexing/granularity/ArbitraryGranularityTest.java
+7
-4
未找到文件。
server/src/main/java/io/druid/segment/indexing/granularity/ArbitraryGranularitySpec.java
浏览文件 @
9a371f34
...
...
@@ -21,6 +21,7 @@ package io.druid.segment.indexing.granularity;
import
com.fasterxml.jackson.annotation.JsonCreator
;
import
com.fasterxml.jackson.annotation.JsonProperty
;
import
com.google.api.client.util.Lists
;
import
com.google.common.base.Optional
;
import
com.google.common.collect.Iterators
;
import
com.google.common.collect.PeekingIterator
;
...
...
@@ -38,13 +39,16 @@ import java.util.TreeSet;
public
class
ArbitraryGranularitySpec
implements
GranularitySpec
{
private
final
TreeSet
<
Interval
>
intervals
;
private
final
QueryGranularity
queryGranularity
;
@JsonCreator
public
ArbitraryGranularitySpec
(
@JsonProperty
(
"queryGranularity"
)
QueryGranularity
queryGranularity
,
@JsonProperty
(
"intervals"
)
List
<
Interval
>
inputIntervals
)
{
intervals
=
Sets
.
newTreeSet
(
Comparators
.
intervalsByStartThenEnd
());
this
.
queryGranularity
=
queryGranularity
;
this
.
intervals
=
Sets
.
newTreeSet
(
Comparators
.
intervalsByStartThenEnd
());
// Insert all intervals
for
(
final
Interval
inputInterval
:
inputIntervals
)
{
...
...
@@ -98,14 +102,18 @@ public class ArbitraryGranularitySpec implements GranularitySpec
}
@Override
@JsonProperty
(
"queryGranularity"
)
public
QueryGranularity
getQueryGranularity
()
{
throw
new
UnsupportedOperationException
()
;
return
queryGranularity
;
}
@Override
public
GranularitySpec
withQueryGranularity
(
QueryGranularity
queryGranularity
)
{
throw
new
UnsupportedOperationException
();
return
new
ArbitraryGranularitySpec
(
queryGranularity
,
Lists
.
newArrayList
(
intervals
)
);
}
}
server/src/main/java/io/druid/segment/indexing/granularity/UniformGranularitySpec.java
浏览文件 @
9a371f34
...
...
@@ -68,7 +68,7 @@ public class UniformGranularitySpec implements GranularitySpec
Iterables
.
addAll
(
granularIntervals
,
this
.
segmentGranularity
.
getIterable
(
inputInterval
));
}
this
.
inputIntervals
=
ImmutableList
.
copyOf
(
inputIntervals
);
this
.
wrappedSpec
=
new
ArbitraryGranularitySpec
(
granularIntervals
);
this
.
wrappedSpec
=
new
ArbitraryGranularitySpec
(
queryGranularity
,
granularIntervals
);
}
else
{
this
.
inputIntervals
=
null
;
this
.
wrappedSpec
=
null
;
...
...
server/src/test/java/io/druid/segment/indexing/granularity/ArbitraryGranularityTest.java
浏览文件 @
9a371f34
...
...
@@ -23,6 +23,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import
com.google.common.base.Optional
;
import
com.google.common.base.Throwables
;
import
com.google.common.collect.Lists
;
import
io.druid.granularity.QueryGranularity
;
import
io.druid.jackson.DefaultObjectMapper
;
import
org.joda.time.DateTime
;
import
org.joda.time.Interval
;
...
...
@@ -38,7 +39,9 @@ public class ArbitraryGranularityTest
@Test
public
void
testSimple
()
{
final
GranularitySpec
spec
=
new
ArbitraryGranularitySpec
(
Lists
.
newArrayList
(
final
GranularitySpec
spec
=
new
ArbitraryGranularitySpec
(
QueryGranularity
.
NONE
,
Lists
.
newArrayList
(
new
Interval
(
"2012-01-08T00Z/2012-01-11T00Z"
),
new
Interval
(
"2012-02-01T00Z/2012-03-01T00Z"
),
new
Interval
(
"2012-01-07T00Z/2012-01-08T00Z"
),
...
...
@@ -111,7 +114,7 @@ public class ArbitraryGranularityTest
boolean
thrown
=
false
;
try
{
final
GranularitySpec
spec
=
new
ArbitraryGranularitySpec
(
intervals
);
final
GranularitySpec
spec
=
new
ArbitraryGranularitySpec
(
QueryGranularity
.
NONE
,
intervals
);
}
catch
(
IllegalArgumentException
e
)
{
thrown
=
true
;
}
...
...
@@ -129,7 +132,7 @@ public class ArbitraryGranularityTest
boolean
thrown
=
false
;
try
{
final
GranularitySpec
spec
=
new
ArbitraryGranularitySpec
(
intervals
);
final
GranularitySpec
spec
=
new
ArbitraryGranularitySpec
(
QueryGranularity
.
NONE
,
intervals
);
}
catch
(
IllegalArgumentException
e
)
{
thrown
=
true
;
}
...
...
@@ -140,7 +143,7 @@ public class ArbitraryGranularityTest
@Test
public
void
testJson
()
{
final
GranularitySpec
spec
=
new
ArbitraryGranularitySpec
(
Lists
.
newArrayList
(
final
GranularitySpec
spec
=
new
ArbitraryGranularitySpec
(
QueryGranularity
.
NONE
,
Lists
.
newArrayList
(
new
Interval
(
"2012-01-08T00Z/2012-01-11T00Z"
),
new
Interval
(
"2012-02-01T00Z/2012-03-01T00Z"
),
new
Interval
(
"2012-01-07T00Z/2012-01-08T00Z"
),
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录