Return-Path: X-Original-To: apmail-flink-commits-archive@minotaur.apache.org Delivered-To: apmail-flink-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 26C1510FBD for ; Thu, 27 Nov 2014 15:03:08 +0000 (UTC) Received: (qmail 98096 invoked by uid 500); 27 Nov 2014 15:03:08 -0000 Delivered-To: apmail-flink-commits-archive@flink.apache.org Received: (qmail 98071 invoked by uid 500); 27 Nov 2014 15:03:08 -0000 Mailing-List: contact commits-help@flink.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flink.incubator.apache.org Delivered-To: mailing list commits@flink.incubator.apache.org Received: (qmail 98062 invoked by uid 99); 27 Nov 2014 15:03:08 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Nov 2014 15:03:08 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 27 Nov 2014 15:02:45 +0000 Received: (qmail 97902 invoked by uid 99); 27 Nov 2014 15:02:43 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Nov 2014 15:02:43 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CA0599498CC; Thu, 27 Nov 2014 15:02:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aljoscha@apache.org To: commits@flink.incubator.apache.org Date: Thu, 27 Nov 2014 15:02:43 -0000 Message-Id: In-Reply-To: <431a1fb2f97741329d35f1a62c8b56fe@git.apache.org> References: <431a1fb2f97741329d35f1a62c8b56fe@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] incubator-flink git commit: Rewrite TPC-H Q3 to use Long instead of Integer X-Virus-Checked: Checked by ClamAV on apache.org Rewrite TPC-H Q3 to use Long instead of Integer Both Java and Scala version fixed. Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/1dd8b8d7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/1dd8b8d7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/1dd8b8d7 Branch: refs/heads/master Commit: 1dd8b8d7addce8305389f95c45d11f73fe621d01 Parents: 1a91132 Author: Aljoscha Krettek Authored: Mon Nov 17 09:31:10 2014 +0100 Committer: Aljoscha Krettek Committed: Thu Nov 27 16:01:39 2014 +0100 ---------------------------------------------------------------------- .../examples/java/relational/TPCHQuery3.java | 28 ++++++++++---------- .../examples/scala/relational/TPCHQuery3.scala | 10 +++---- 2 files changed, 19 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/1dd8b8d7/flink-examples/flink-java-examples/src/main/java/org/apache/flink/examples/java/relational/TPCHQuery3.java ---------------------------------------------------------------------- diff --git a/flink-examples/flink-java-examples/src/main/java/org/apache/flink/examples/java/relational/TPCHQuery3.java b/flink-examples/flink-java-examples/src/main/java/org/apache/flink/examples/java/relational/TPCHQuery3.java index c10147c..46161b4 100644 --- a/flink-examples/flink-java-examples/src/main/java/org/apache/flink/examples/java/relational/TPCHQuery3.java +++ b/flink-examples/flink-java-examples/src/main/java/org/apache/flink/examples/java/relational/TPCHQuery3.java @@ -174,47 +174,47 @@ public class TPCHQuery3 { // DATA TYPES // ************************************************************************* - public static class Lineitem extends Tuple4 { + public static class Lineitem extends Tuple4 { - public Integer getOrderkey() { return this.f0; } + public Long getOrderkey() { return this.f0; } public Double getDiscount() { return this.f2; } public Double getExtendedprice() { return this.f1; } public String getShipdate() { return this.f3; } } - public static class Customer extends Tuple2 { + public static class Customer extends Tuple2 { - public Integer getCustKey() { return this.f0; } + public Long getCustKey() { return this.f0; } public String getMktsegment() { return this.f1; } } - public static class Order extends Tuple4 { + public static class Order extends Tuple4 { - public Integer getOrderKey() { return this.f0; } - public Integer getCustKey() { return this.f1; } + public Long getOrderKey() { return this.f0; } + public Long getCustKey() { return this.f1; } public String getOrderdate() { return this.f2; } - public Integer getShippriority() { return this.f3; } + public Long getShippriority() { return this.f3; } } - public static class ShippingPriorityItem extends Tuple4 { + public static class ShippingPriorityItem extends Tuple4 { public ShippingPriorityItem() { } - public ShippingPriorityItem(Integer o_orderkey, Double revenue, - String o_orderdate, Integer o_shippriority) { + public ShippingPriorityItem(Long o_orderkey, Double revenue, + String o_orderdate, Long o_shippriority) { this.f0 = o_orderkey; this.f1 = revenue; this.f2 = o_orderdate; this.f3 = o_shippriority; } - public Integer getOrderkey() { return this.f0; } - public void setOrderkey(Integer orderkey) { this.f0 = orderkey; } + public Long getOrderkey() { return this.f0; } + public void setOrderkey(Long orderkey) { this.f0 = orderkey; } public Double getRevenue() { return this.f1; } public void setRevenue(Double revenue) { this.f1 = revenue; } public String getOrderdate() { return this.f2; } - public Integer getShippriority() { return this.f3; } + public Long getShippriority() { return this.f3; } } // ************************************************************************* http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/1dd8b8d7/flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/relational/TPCHQuery3.scala ---------------------------------------------------------------------- diff --git a/flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/relational/TPCHQuery3.scala b/flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/relational/TPCHQuery3.scala index 6cea953..2229060 100644 --- a/flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/relational/TPCHQuery3.scala +++ b/flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/relational/TPCHQuery3.scala @@ -18,7 +18,7 @@ package org.apache.flink.examples.scala.relational import org.apache.flink.api.scala._ -import org.apache.flink.util.Collector +import org.apache.flink.core.fs.FileSystem.WriteMode import org.apache.flink.api.java.aggregation.Aggregations @@ -117,10 +117,10 @@ object TPCHQuery3 { // USER DATA TYPES // ************************************************************************* - case class Lineitem(orderId: Integer, extdPrice: Double, discount: Double, shipDate: String) - case class Customer(custId: Integer, mktSegment: String) - case class Order(orderId: Integer, custId: Integer, orderDate: String, shipPrio: Integer) - case class ShippedItem(orderId: Integer, revenue: Double, orderDate: String, shipPrio: Integer) + case class Lineitem(orderId: Long, extdPrice: Double, discount: Double, shipDate: String) + case class Order(orderId: Long, custId: Long, orderDate: String, shipPrio: Long) + case class Customer(custId: Long, mktSegment: String) + case class ShippedItem(orderId: Long, revenue: Double, orderDate: String, shipPrio: Long) // ************************************************************************* // UTIL METHODS