Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
doujutun3207
flink
提交
05088b4a
F
flink
项目概览
doujutun3207
/
flink
与 Fork 源项目一致
从无法访问的项目Fork
通知
24
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
flink
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
05088b4a
编写于
4月 25, 2017
作者:
X
xccui
提交者:
twalthr
4月 25, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FLINK-6368] [table] Grouping keys in stream aggregations have wrong order
This closes #3768.
上级
bc6409d6
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
30 addition
and
4 deletion
+30
-4
flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamAggregate.scala
...ink/table/plan/nodes/datastream/DataStreamAggregate.scala
+3
-4
flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/datastream/DataStreamAggregateITCase.scala
.../table/runtime/datastream/DataStreamAggregateITCase.scala
+27
-0
未找到文件。
flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamAggregate.scala
浏览文件 @
05088b4a
...
@@ -101,7 +101,6 @@ class DataStreamAggregate(
...
@@ -101,7 +101,6 @@ class DataStreamAggregate(
override
def
translateToPlan
(
tableEnv
:
StreamTableEnvironment
)
:
DataStream
[
Row
]
=
{
override
def
translateToPlan
(
tableEnv
:
StreamTableEnvironment
)
:
DataStream
[
Row
]
=
{
val
groupingKeys
=
grouping
.
indices
.
toArray
val
inputDS
=
input
.
asInstanceOf
[
DataStreamRel
].
translateToPlan
(
tableEnv
)
val
inputDS
=
input
.
asInstanceOf
[
DataStreamRel
].
translateToPlan
(
tableEnv
)
val
rowTypeInfo
=
FlinkTypeFactory
.
toInternalRowTypeInfo
(
getRowType
)
val
rowTypeInfo
=
FlinkTypeFactory
.
toInternalRowTypeInfo
(
getRowType
)
...
@@ -124,15 +123,15 @@ class DataStreamAggregate(
...
@@ -124,15 +123,15 @@ class DataStreamAggregate(
inputDS
.
getType
)
inputDS
.
getType
)
// grouped / keyed aggregation
// grouped / keyed aggregation
if
(
grouping
Keys
.
length
>
0
)
{
if
(
grouping
.
length
>
0
)
{
val
windowFunction
=
AggregateUtil
.
createAggregationGroupWindowFunction
(
val
windowFunction
=
AggregateUtil
.
createAggregationGroupWindowFunction
(
window
,
window
,
grouping
Keys
.
length
,
grouping
.
length
,
namedAggregates
.
size
,
namedAggregates
.
size
,
rowRelDataType
.
getFieldCount
,
rowRelDataType
.
getFieldCount
,
namedProperties
)
namedProperties
)
val
keyedStream
=
inputDS
.
keyBy
(
grouping
Keys
:
_
*
)
val
keyedStream
=
inputDS
.
keyBy
(
grouping
:
_
*
)
val
windowedStream
=
val
windowedStream
=
createKeyedWindowedStream
(
window
,
keyedStream
)
createKeyedWindowedStream
(
window
,
keyedStream
)
.
asInstanceOf
[
WindowedStream
[
Row
,
Tuple
,
DataStreamWindow
]]
.
asInstanceOf
[
WindowedStream
[
Row
,
Tuple
,
DataStreamWindow
]]
...
...
flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/datastream/DataStreamAggregateITCase.scala
浏览文件 @
05088b4a
...
@@ -213,6 +213,33 @@ class DataStreamAggregateITCase extends StreamingMultipleProgramsTestBase {
...
@@ -213,6 +213,33 @@ class DataStreamAggregateITCase extends StreamingMultipleProgramsTestBase {
"Hi,1,1970-01-01 00:00:00.0,1970-01-01 00:00:00.003"
)
"Hi,1,1970-01-01 00:00:00.0,1970-01-01 00:00:00.003"
)
assertEquals
(
expected
.
sorted
,
StreamITCase
.
testResults
.
sorted
)
assertEquals
(
expected
.
sorted
,
StreamITCase
.
testResults
.
sorted
)
}
}
@Test
def
testEventTimeGroupWindowWithoutExplicitTimeField
()
:
Unit
=
{
val
env
=
StreamExecutionEnvironment
.
getExecutionEnvironment
env
.
setStreamTimeCharacteristic
(
TimeCharacteristic
.
EventTime
)
val
tEnv
=
TableEnvironment
.
getTableEnvironment
(
env
)
StreamITCase
.
testResults
=
mutable
.
MutableList
()
val
stream
=
env
.
fromCollection
(
data
)
.
assignTimestampsAndWatermarks
(
new
TimestampWithEqualWatermark
())
.
map
(
t
=>
(
t
.
_2
,
t
.
_6
))
val
table
=
stream
.
toTable
(
tEnv
,
'int
,
'string
)
val
windowedTable
=
table
.
window
(
Slide
over
3.
milli
every
10.
milli
on
'rowtime
as
'w
)
.
groupBy
(
'w
,
'string
)
.
select
(
'string
,
'int
.
count
,
'w
.
start
,
'w
.
end
)
val
results
=
windowedTable
.
toDataStream
[
Row
]
results
.
addSink
(
new
StreamITCase
.
StringSink
)
env
.
execute
()
val
expected
=
Seq
(
"Hallo,1,1970-01-01 00:00:00.0,1970-01-01 00:00:00.003"
,
"Hi,1,1970-01-01 00:00:00.0,1970-01-01 00:00:00.003"
)
assertEquals
(
expected
.
sorted
,
StreamITCase
.
testResults
.
sorted
)
}
}
}
object
DataStreamAggregateITCase
{
object
DataStreamAggregateITCase
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录