From bb233179d06325b481fe0e2a903a55c547529f06 Mon Sep 17 00:00:00 2001
From: shaoxuan-wang <wshaoxuan@gmail.com>
Date: Fri, 24 Feb 2017 11:57:44 +0800
Subject: [PATCH] [FLINK-5899] [table] Fix the bug in EventTimeTumblingWindow
 for non-partialMerge aggregate

---
 .../apache/flink/table/runtime/aggregate/AggregateUtil.scala  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateUtil.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateUtil.scala
index 034ff9e34447a..cd473eecfdc53 100644
--- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateUtil.scala
+++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateUtil.scala
@@ -212,14 +212,14 @@ object AggregateUtil {
         else {
           // for non-incremental aggregations
           new DataSetTumbleTimeWindowAggReduceGroupFunction(
-            intermediateRowArity - 1,
+            intermediateRowArity,
             asLong(size),
             startPos,
             endPos,
             aggregates,
             groupingOffsetMapping,
             aggOffsetMapping,
-            intermediateRowArity,
+            intermediateRowArity + 1, // the additional field is used to store the time attribute
             outputType.getFieldCount)
         }
       case EventTimeTumblingGroupWindow(_, _, size) =>