Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 5BCE2200C6F for ; Tue, 9 May 2017 18:51:01 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5A5E9160BB6; Tue, 9 May 2017 16:51:01 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A1168160B9A for ; Tue, 9 May 2017 18:51:00 +0200 (CEST) Received: (qmail 9706 invoked by uid 500); 9 May 2017 16:50:54 -0000 Mailing-List: contact commits-help@flink.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flink.apache.org Delivered-To: mailing list commits@flink.apache.org Received: (qmail 9562 invoked by uid 99); 9 May 2017 16:50:54 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 May 2017 16:50:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9F1EEE0FE7; Tue, 9 May 2017 16:50:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: fhueske@apache.org To: commits@flink.apache.org Date: Tue, 09 May 2017 16:50:56 -0000 Message-Id: In-Reply-To: <4d6be8b7d0f549f9ba20c04ad7cc2711@git.apache.org> References: <4d6be8b7d0f549f9ba20c04ad7cc2711@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/4] flink git commit: [FLINK-6486] [table] Pass RowTypeInfo to CodeGenerator instead of CRowTypeInfo. archived-at: Tue, 09 May 2017 16:51:01 -0000 [FLINK-6486] [table] Pass RowTypeInfo to CodeGenerator instead of CRowTypeInfo. This closes #3850. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/b5ddbe5c Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/b5ddbe5c Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/b5ddbe5c Branch: refs/heads/master Commit: b5ddbe5c360003b210a1212e54e6c50b8af538fa Parents: e2cb221 Author: Hequn Cheng Authored: Mon May 8 20:55:51 2017 +0800 Committer: Fabian Hueske Committed: Tue May 9 18:50:20 2017 +0200 ---------------------------------------------------------------------- .../table/plan/nodes/datastream/DataStreamGroupAggregate.scala | 2 +- .../plan/nodes/datastream/DataStreamGroupWindowAggregate.scala | 2 +- .../table/plan/nodes/datastream/DataStreamOverAggregate.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/b5ddbe5c/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 18f1fc8..506c0cb 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 @@ -115,7 +115,7 @@ class DataStreamGroupAggregate( val generator = new CodeGenerator( tableEnv.getConfig, false, - inputDS.getType) + inputSchema.physicalTypeInfo) val aggString = aggregationToString( inputSchema.logicalType, http://git-wip-us.apache.org/repos/asf/flink/blob/b5ddbe5c/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamGroupWindowAggregate.scala ---------------------------------------------------------------------- diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamGroupWindowAggregate.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamGroupWindowAggregate.scala index c38e5af..ef207b0 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamGroupWindowAggregate.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamGroupWindowAggregate.scala @@ -142,7 +142,7 @@ class DataStreamGroupWindowAggregate( val generator = new CodeGenerator( tableEnv.getConfig, false, - inputDS.getType) + inputSchema.physicalTypeInfo) val needMerge = window match { case SessionGroupWindow(_, _, _) => true http://git-wip-us.apache.org/repos/asf/flink/blob/b5ddbe5c/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamOverAggregate.scala ---------------------------------------------------------------------- diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamOverAggregate.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamOverAggregate.scala index e823cd6..4061242 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamOverAggregate.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamOverAggregate.scala @@ -116,7 +116,7 @@ class DataStreamOverAggregate( val generator = new CodeGenerator( tableEnv.getConfig, false, - inputDS.getType) + inputSchema.physicalTypeInfo) val timeType = schema.logicalType .getFieldList