You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by fh...@apache.org on 2017/05/17 13:24:41 UTC

[3/3] flink git commit: [FLINK-6598] [table] Remove unused parameter from DataStreamGroupAggregate.

[FLINK-6598] [table] Remove unused parameter from DataStreamGroupAggregate.

This closes #3922.


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

Branch: refs/heads/master
Commit: 64d3ce8dd15917b44b0a2329e6f82343edee3c92
Parents: b6afc06
Author: sunjincheng121 <su...@gmail.com>
Authored: Tue May 16 19:08:11 2017 +0800
Committer: Fabian Hueske <fh...@apache.org>
Committed: Wed May 17 15:24:23 2017 +0200

----------------------------------------------------------------------
 .../table/plan/nodes/datastream/DataStreamGroupAggregate.scala    | 3 ---
 .../plan/rules/datastream/DataStreamGroupAggregateRule.scala      | 1 -
 2 files changed, 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/64d3ce8d/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamGroupAggregate.scala
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamGroupAggregate.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamGroupAggregate.scala
index 5fe3c85..33bb8cc 100644
--- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamGroupAggregate.scala
+++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamGroupAggregate.scala
@@ -42,7 +42,6 @@ import org.slf4j.LoggerFactory
   * @param traitSet        Trait set of the RelNode
   * @param inputNode       The input RelNode of aggregation
   * @param namedAggregates List of calls to aggregate functions and their output field names
-  * @param rowRelDataType  The type of the rows of the RelNode
   * @param inputSchema     The type of the rows consumed by this RelNode
   * @param schema          The type of the rows emitted by this RelNode
   * @param groupings       The position (in the input Row) of the grouping keys
@@ -52,7 +51,6 @@ class DataStreamGroupAggregate(
     traitSet: RelTraitSet,
     inputNode: RelNode,
     namedAggregates: Seq[CalcitePair[AggregateCall, String]],
-    rowRelDataType: RelDataType,
     schema: RowSchema,
     inputSchema: RowSchema,
     groupings: Array[Int])
@@ -78,7 +76,6 @@ class DataStreamGroupAggregate(
       traitSet,
       inputs.get(0),
       namedAggregates,
-      getRowType,
       schema,
       inputSchema,
       groupings)

http://git-wip-us.apache.org/repos/asf/flink/blob/64d3ce8d/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamGroupAggregateRule.scala
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamGroupAggregateRule.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamGroupAggregateRule.scala
index fd7619c..0b8e411 100644
--- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamGroupAggregateRule.scala
+++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamGroupAggregateRule.scala
@@ -68,7 +68,6 @@ class DataStreamGroupAggregateRule
       traitSet,
       convInput,
       agg.getNamedAggCalls,
-      rel.getRowType,
       new RowSchema(rel.getRowType),
       new RowSchema(agg.getInput.getRowType),
       agg.getGroupSet.toArray)