Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Forever310
druid
提交
df2465eb
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,发现更多精彩内容 >>
提交
df2465eb
编写于
8月 29, 2013
作者:
C
cheddar
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1) Add unit test for groupBy query with dimension that doesn't exist
2) Fix group by query to work with new unit test, fixes #232
上级
91c160ba
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
40 addition
and
4 deletion
+40
-4
server/src/main/java/com/metamx/druid/query/group/GroupByQueryEngine.java
...java/com/metamx/druid/query/group/GroupByQueryEngine.java
+5
-4
server/src/test/java/com/metamx/druid/query/group/GroupByQueryRunnerTest.java
.../com/metamx/druid/query/group/GroupByQueryRunnerTest.java
+35
-0
未找到文件。
server/src/main/java/com/metamx/druid/query/group/GroupByQueryEngine.java
浏览文件 @
df2465eb
...
...
@@ -50,6 +50,7 @@ import org.joda.time.Interval;
import
javax.annotation.Nullable
;
import
java.nio.ByteBuffer
;
import
java.util.ArrayList
;
import
java.util.Iterator
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -276,7 +277,7 @@ public class GroupByQueryEngine
private
final
List
<
DimensionSpec
>
dimensionSpecs
;
private
final
List
<
DimensionSelector
>
dimensions
;
private
final
String
[]
dimNames
;
private
final
ArrayList
<
String
>
dimNames
;
private
final
List
<
AggregatorFactory
>
aggregatorSpecs
;
private
final
BufferAggregator
[]
aggregators
;
private
final
String
[]
metricNames
;
...
...
@@ -295,14 +296,14 @@ public class GroupByQueryEngine
delegate
=
Iterators
.
emptyIterator
();
dimensionSpecs
=
query
.
getDimensions
();
dimensions
=
Lists
.
newArrayListWithExpectedSize
(
dimensionSpecs
.
size
());
dimNames
=
new
String
[
dimensionSpecs
.
size
()]
;
dimNames
=
Lists
.
newArrayListWithExpectedSize
(
dimensionSpecs
.
size
())
;
for
(
int
i
=
0
;
i
<
dimensionSpecs
.
size
();
++
i
)
{
final
DimensionSpec
dimSpec
=
dimensionSpecs
.
get
(
i
);
final
DimensionSelector
selector
=
cursor
.
makeDimensionSelector
(
dimSpec
.
getDimension
());
if
(
selector
!=
null
)
{
dimensions
.
add
(
selector
);
dimNames
.
add
(
dimSpec
.
getOutputName
());
}
dimNames
[
i
]
=
dimSpec
.
getOutputName
();
}
aggregatorSpecs
=
query
.
getAggregatorSpecs
();
...
...
@@ -378,7 +379,7 @@ public class GroupByQueryEngine
ByteBuffer
keyBuffer
=
input
.
getKey
().
duplicate
();
for
(
int
i
=
0
;
i
<
dimensions
.
size
();
++
i
)
{
theEvent
.
put
(
dimNames
[
i
]
,
dimensions
.
get
(
i
).
lookupName
(
keyBuffer
.
getInt
()));
theEvent
.
put
(
dimNames
.
get
(
i
)
,
dimensions
.
get
(
i
).
lookupName
(
keyBuffer
.
getInt
()));
}
int
position
=
input
.
getValue
();
...
...
server/src/test/java/com/metamx/druid/query/group/GroupByQueryRunnerTest.java
浏览文件 @
df2465eb
...
...
@@ -695,6 +695,41 @@ public class GroupByQueryRunnerTest
TestHelper
.
assertExpectedObjects
(
expectedResults
,
mergeRunner
.
run
(
query
),
"no-limit"
);
}
@Test
public
void
testGroupByWithNonexistantDimension
()
throws
Exception
{
GroupByQuery
.
Builder
builder
=
GroupByQuery
.
builder
()
.
setDataSource
(
QueryRunnerTestHelper
.
dataSource
)
.
setInterval
(
"2011-04-02/2011-04-04"
)
.
addDimension
(
"billy"
)
.
addDimension
(
"quality"
)
.
setAggregatorSpecs
(
Arrays
.<
AggregatorFactory
>
asList
(
QueryRunnerTestHelper
.
rowsCount
)
)
.
setGranularity
(
new
PeriodGranularity
(
new
Period
(
"P1M"
),
null
,
null
));
final
GroupByQuery
query
=
builder
.
build
();
List
<
Row
>
expectedResults
=
Arrays
.
asList
(
createExpectedRow
(
"2011-04-01"
,
"quality"
,
"automotive"
,
"rows"
,
2L
),
createExpectedRow
(
"2011-04-01"
,
"quality"
,
"business"
,
"rows"
,
2L
),
createExpectedRow
(
"2011-04-01"
,
"quality"
,
"entertainment"
,
"rows"
,
2L
),
createExpectedRow
(
"2011-04-01"
,
"quality"
,
"health"
,
"rows"
,
2L
),
createExpectedRow
(
"2011-04-01"
,
"quality"
,
"mezzanine"
,
"rows"
,
6L
),
createExpectedRow
(
"2011-04-01"
,
"quality"
,
"news"
,
"rows"
,
2L
),
createExpectedRow
(
"2011-04-01"
,
"quality"
,
"premium"
,
"rows"
,
6L
),
createExpectedRow
(
"2011-04-01"
,
"quality"
,
"technology"
,
"rows"
,
2L
),
createExpectedRow
(
"2011-04-01"
,
"quality"
,
"travel"
,
"rows"
,
2L
)
);
TestHelper
.
assertExpectedObjects
(
expectedResults
,
runner
.
run
(
query
),
"normal"
);
QueryRunner
<
Row
>
mergeRunner
=
new
GroupByQueryQueryToolChest
().
mergeResults
(
runner
);
TestHelper
.
assertExpectedObjects
(
expectedResults
,
mergeRunner
.
run
(
query
),
"no-limit"
);
}
private
Row
createExpectedRow
(
final
String
timestamp
,
Object
...
vals
)
{
return
createExpectedRow
(
new
DateTime
(
timestamp
),
vals
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录