Github user fhueske commented on a diff in the pull request:
https://github.com/apache/flink/pull/2792#discussion_r88659144
--- Diff:
flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/datastream/DataStreamAggregate.scala
---
@@ -135,50 +128,123 @@ class DataStreamAggregate(
namedProperties)
val prepareOpName = s"prepare select: ($aggString)"
- val mappedInput = inputDS
- .map(aggregateResult._1)
- .name(prepareOpName)
-
- val groupReduceFunction = aggregateResult._2
- val rowTypeInfo = new RowTypeInfo(fieldTypes)
-
- val result = {
- // grouped / keyed aggregation
- if (groupingKeys.length > 0) {
- val aggOpName = s"groupBy: (${groupingToString(inputType,
grouping)}), " +
- s"window: ($window), " +
- s"select: ($aggString)"
- val aggregateFunction =
- createWindowAggregationFunction(window, namedProperties,
groupReduceFunction)
-
- val keyedStream = mappedInput.keyBy(groupingKeys: _*)
-
- val windowedStream = createKeyedWindowedStream(window, keyedStream)
- .asInstanceOf[WindowedStream[Row, Tuple, DataStreamWindow]]
-
- windowedStream
- .apply(aggregateFunction)
- .returns(rowTypeInfo)
- .name(aggOpName)
- .asInstanceOf[DataStream[Any]]
+ val keyedAggOpName = s"groupBy: (${groupingToString(inputType,
grouping)}), " +
+ s"window: ($window), " +
+ s"select: ($aggString)"
+ val nonKeyedAggOpName = s"window: ($window), select: ($aggString)"
+
+ val (aggFieldIndexes, aggregates) =
+ AggregateUtil.transformToAggregateFunctions(
+ namedAggregates.map(_.getKey), inputType, grouping.length)
+
+ val result: DataStream[Any] = {
+ // check whether all aggregates support partial aggregate
+ if (aggregates.forall(_.supportPartial)){
+ // do Incremental Aggregation
+ // add grouping fields, position keys in the input, and input type
+ val (mapFunction,
+ reduceFunction,
+ groupingOffsetMapping,
+ aggOffsetMapping,
+ intermediateRowArity) =
AggregateUtil.createOperatorFunctionsForIncrementalAggregates(
+ namedAggregates,
+ inputType,
+ getRowType,
+ grouping,
+ aggregates,
+ aggFieldIndexes)
+
+ val mappedInput = inputDS
+ .map(mapFunction)
+ .name(prepareOpName)
+
+ // grouped / keyed aggregation
+ if (groupingKeys.length > 0) {
+
+ val winFunction =
+ createWindowIncrementalAggregationFunction(
+ aggregates,
+ groupingOffsetMapping,
+ aggOffsetMapping,
+ getRowType.getFieldCount,
+ intermediateRowArity,
+ window,
+ namedProperties)
+
+ val keyedStream = mappedInput.keyBy(groupingKeys: _*)
+ val windowedStream = createKeyedWindowedStream(window,
keyedStream)
+ .asInstanceOf[WindowedStream[Row, Tuple, DataStreamWindow]]
+
+ windowedStream
+ .apply(reduceFunction, winFunction)
+ .returns(rowTypeInfo)
+ .name(keyedAggOpName)
+ .asInstanceOf[DataStream[Any]]
+ }
+ // global / non-keyed aggregation
+ else {
+ val winFunction =
+ createAllWindowIncrementalAggregationFunction(
+ aggregates,
+ groupingOffsetMapping,
+ aggOffsetMapping,
+ getRowType.getFieldCount,
+ intermediateRowArity,
+ window,
+ namedProperties)
+
+ val windowedStream = createNonKeyedWindowedStream(window,
mappedInput)
+ .asInstanceOf[AllWindowedStream[Row, DataStreamWindow]]
+ windowedStream
+ .apply(reduceFunction, winFunction)
+ .returns(rowTypeInfo)
+ .name(nonKeyedAggOpName)
+ .asInstanceOf[DataStream[Any]]
+ }
}
- // global / non-keyed aggregation
else {
- val aggOpName = s"window: ($window), select: ($aggString)"
- val aggregateFunction =
- createAllWindowAggregationFunction(window, namedProperties,
groupReduceFunction)
-
- val windowedStream = createNonKeyedWindowedStream(window,
mappedInput)
- .asInstanceOf[AllWindowedStream[Row, DataStreamWindow]]
-
- windowedStream
- .apply(aggregateFunction)
- .returns(rowTypeInfo)
- .name(aggOpName)
- .asInstanceOf[DataStream[Any]]
+ // do non-Incremental Aggregation
+ // add grouping fields, position keys in the input, and input type
+ val (mapFunction, groupReduceFunction) =
AggregateUtil.createOperatorFunctionsForAggregates(
--- End diff --
Separate into `createPrepareMapFunction()` and
`createAggregateGroupReduceFunction()`.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
