flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fhue...@apache.org
Subject [1/3] flink git commit: [FLINK-5899] [table] Fix translation of batch event-time tumbling windows with non-partial aggregation functions.
Date Fri, 24 Feb 2017 16:31:46 GMT
Repository: flink
Updated Branches:
  refs/heads/master 2437da6e5 -> 0a97cd29a


[FLINK-5899] [table] Fix translation of batch event-time tumbling windows with non-partial
aggregation functions.

This closes #3405.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/0a97cd29
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/0a97cd29
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/0a97cd29

Branch: refs/heads/master
Commit: 0a97cd29ae461955162944d150dd21d67b4cb0df
Parents: a755de2
Author: shaoxuan-wang <wshaoxuan@gmail.com>
Authored: Fri Feb 24 11:57:44 2017 +0800
Committer: Fabian Hueske <fhueske@apache.org>
Committed: Fri Feb 24 17:12:42 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/flink/blob/0a97cd29/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateUtil.scala
----------------------------------------------------------------------
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 034ff9e..cd473ee 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) =>


Mime
View raw message