From ec4c9bef47ea6daec80476e2e37e9171451b3e6e Mon Sep 17 00:00:00 2001
From: smarthi <smarthi@apache.org>
Date: Tue, 12 Jul 2016 20:47:53 -0400
Subject: [PATCH] [FLINK-4179] [table] Update TPCHQuery3Table example

This closes #2232.
---
 .../examples/scala/TPCHQuery3Table.scala      | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/TPCHQuery3Table.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/TPCHQuery3Table.scala
index 56f32bd836e..776f2fbba8b 100644
--- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/TPCHQuery3Table.scala
+++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/TPCHQuery3Table.scala
@@ -76,15 +76,14 @@ object TPCHQuery3Table {
     }
 
     // set filter date
-    val dateFormat = new _root_.java.text.SimpleDateFormat("yyyy-MM-dd")
-    val date = dateFormat.parse("1995-03-12")
-    
+    val date = java.sql.Date.valueOf("1995-03-12")
+
     // get execution environment
     val env = ExecutionEnvironment.getExecutionEnvironment
     val tEnv = TableEnvironment.getTableEnvironment(env)
 
     val lineitems = getLineitemDataSet(env)
-      .filter( l => dateFormat.parse(l.shipDate).after(date) ).toTable(tEnv)
+      .filter( l => java.sql.Date.valueOf(l.shipDate).after(date) ).toTable(tEnv)
       .as('id, 'extdPrice, 'discount, 'shipDate)
 
     val customers = getCustomerDataSet(env).toTable(tEnv)
@@ -92,7 +91,7 @@ object TPCHQuery3Table {
       .filter( 'mktSegment === "AUTOMOBILE" )
 
     val orders = getOrdersDataSet(env)
-      .filter( o => dateFormat.parse(o.orderDate).before(date) ).toTable(tEnv)
+      .filter( o => java.sql.Date.valueOf(o.orderDate).before(date) ).toTable(tEnv)
       .as('orderId, 'custId, 'orderDate, 'shipPrio)
 
     val items =
@@ -130,10 +129,10 @@ object TPCHQuery3Table {
   //     UTIL METHODS
   // *************************************************************************
   
-  private var lineitemPath: String = null
-  private var customerPath: String = null
-  private var ordersPath: String = null
-  private var outputPath: String = null
+  private var lineitemPath: String = _
+  private var customerPath: String = _
+  private var ordersPath: String = _
+  private var outputPath: String = _
 
   private def parseParameters(args: Array[String]): Boolean = {
     if (args.length == 4) {
@@ -147,7 +146,7 @@ object TPCHQuery3Table {
           " Due to legal restrictions, we can not ship generated data.\n" +
           " You can find the TPC-H data generator at http://www.tpc.org/tpch/.\n" +
           " Usage: TPCHQuery3 <lineitem-csv path> <customer-csv path>" + 
-                             "<orders-csv path> <result path>");
+                             "<orders-csv path> <result path>")
       false
     }
   }
-- 
GitLab