flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aljos...@apache.org
Subject [2/3] incubator-flink git commit: Rewrite TPC-H Q3 to use Long instead of Integer
Date Thu, 27 Nov 2014 15:02:43 GMT
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 <aljoscha.krettek@gmail.com>
Authored: Mon Nov 17 09:31:10 2014 +0100
Committer: Aljoscha Krettek <aljoscha.krettek@gmail.com>
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<Integer, Double, Double, String> {
+	public static class Lineitem extends Tuple4<Long, Double, Double, String> {
 
-		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<Integer, String> {
+	public static class Customer extends Tuple2<Long, String> {
 		
-		public Integer getCustKey() { return this.f0; }
+		public Long getCustKey() { return this.f0; }
 		public String getMktsegment() { return this.f1; }
 	}
 
-	public static class Order extends Tuple4<Integer, Integer, String, Integer> {
+	public static class Order extends Tuple4<Long, Long, String, Long> {
 		
-		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<Integer, Double, String, Integer>
{
+	public static class ShippingPriorityItem extends Tuple4<Long, Double, String, Long>
{
 
 		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


Mime
View raw message