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 20A63200B63 for ; Mon, 15 Aug 2016 09:28:35 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 1F3C7160AA7; Mon, 15 Aug 2016 07:28:35 +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 6806B160A6C for ; Mon, 15 Aug 2016 09:28:34 +0200 (CEST) Received: (qmail 58679 invoked by uid 500); 15 Aug 2016 07:28:33 -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 58670 invoked by uid 99); 15 Aug 2016 07:28:33 -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; Mon, 15 Aug 2016 07:28:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 76D96E055E; Mon, 15 Aug 2016 07:28:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: twalthr@apache.org To: commits@flink.apache.org Message-Id: <9951e22417a4452eb27338cd2b696ed9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: flink git commit: [FLINK-4385] [table] Union on Timestamp fields does not work Date: Mon, 15 Aug 2016 07:28:33 +0000 (UTC) archived-at: Mon, 15 Aug 2016 07:28:35 -0000 Repository: flink Updated Branches: refs/heads/master 79cc30f3d -> 83c4b9707 [FLINK-4385] [table] Union on Timestamp fields does not work This closes #2362. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/83c4b970 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/83c4b970 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/83c4b970 Branch: refs/heads/master Commit: 83c4b9707dd24425391bd5759f12878ad2f19175 Parents: 79cc30f Author: Jark Wu Authored: Fri Aug 12 17:48:23 2016 +0800 Committer: twalthr Committed: Mon Aug 15 09:27:14 2016 +0200 ---------------------------------------------------------------------- .../apache/flink/api/table/plan/nodes/dataset/DataSetRel.scala | 5 ++++- .../org/apache/flink/api/table/typeutils/IntervalTypeInfo.scala | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/83c4b970/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetRel.scala ---------------------------------------------------------------------- diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetRel.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetRel.scala index 08e0c41..9ce1580 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetRel.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetRel.scala @@ -62,7 +62,10 @@ trait DataSetRel extends RelNode with FlinkRel { case SqlTypeName.VARCHAR => s + 12 case SqlTypeName.CHAR => s + 1 case SqlTypeName.DECIMAL => s + 12 - case _ => throw new TableException("Unsupported data type encountered") + case SqlTypeName.INTERVAL_DAY_TIME => s + 8 + case SqlTypeName.INTERVAL_YEAR_MONTH => s + 4 + case SqlTypeName.TIME | SqlTypeName.TIMESTAMP | SqlTypeName.DATE => s + 12 + case _ => throw TableException(s"Unsupported data type encountered: $t") } } http://git-wip-us.apache.org/repos/asf/flink/blob/83c4b970/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/IntervalTypeInfo.scala ---------------------------------------------------------------------- diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/IntervalTypeInfo.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/IntervalTypeInfo.scala index 85524fb..bf5cb58 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/IntervalTypeInfo.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/IntervalTypeInfo.scala @@ -97,7 +97,7 @@ object IntervalTypeInfo { ascendingOrder: java.lang.Boolean) : TypeComparator[X] = { try { - val constructor = comparatorClass.getConstructor(classOf[java.lang.Boolean]) + val constructor = comparatorClass.getConstructor(java.lang.Boolean.TYPE) constructor.newInstance(ascendingOrder) } catch { case e: Exception =>