[FLINK-9935] [table] Fix incorrect group field access in batch window…

… combiner.
Pance · Jul 26, 2018 · 63e84ad · 63e84ad
1 parent 0f9b96f
commit 63e84ad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/...s/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateUtil.scala b/...s/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateUtil.scala
@@ -586,7 +586,7 @@ object AggregateUtil {
  isDistinctAggs,
  isStateBackedDataViews = false,
  partialResults = true,
- groupings,
+ groupings.indices.toArray,
  Some(aggregates.indices.map(_ + groupings.length).toArray),
  outputType.getFieldCount,
  needRetract,

diff --git a/...k-table/src/test/scala/org/apache/flink/table/runtime/batch/table/GroupWindowITCase.scala b/...k-table/src/test/scala/org/apache/flink/table/runtime/batch/table/GroupWindowITCase.scala
@@ -97,6 +97,7 @@ class GroupWindowITCase(
  val table = env
  .fromCollection(data)
  .toTable(tEnv, 'long, 'int, 'double, 'float, 'bigdec, 'string)
+ .select('int, 'long, 'string) // keep this select to enforce that the 'string key comes last
 
  val windowedTable = table
  .window(Tumble over 5.milli on 'long as 'w)
@@ -271,6 +272,7 @@ class GroupWindowITCase(
  val table = env
  .fromCollection(data)
  .toTable(tEnv, 'long, 'int, 'double, 'float, 'bigdec, 'string)
+ .select('int, 'long, 'string) // keep this select to enforce that the 'string key comes last
 
  val windowedTable = table
  .window(Slide over 10.milli every 5.milli on 'long as 'w)