From 933f3f0bb5c6d611b50764d83c7282716cfb668f Mon Sep 17 00:00:00 2001
From: Jean-Yves Stephan <jstephan@databricks.com>
Date: Tue, 21 Jul 2015 13:26:50 -0700
Subject: [PATCH] Removed queryOutputLocation parameter

---
 src/main/scala/com/databricks/spark/sql/perf/query.scala  | 8 +++-----
 .../com/databricks/spark/sql/perf/runBenchmarks.scala     | 3 +--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/main/scala/com/databricks/spark/sql/perf/query.scala b/src/main/scala/com/databricks/spark/sql/perf/query.scala
index c593ada..5828805 100644
--- a/src/main/scala/com/databricks/spark/sql/perf/query.scala
+++ b/src/main/scala/com/databricks/spark/sql/perf/query.scala
@@ -50,7 +50,7 @@ case class QueryForTest(
     (endTime - startTime).toDouble / 1000000
   }
 
-  def benchmark(description: String = "", queryOutputLocation: Option[String]) = {
+  def benchmark(description: String = "") = {
     try {
       sparkContext.setJobDescription(s"Query: ${query.name}, $description")
       val dataFrame = sqlContext.sql(query.sqlText)
@@ -77,7 +77,7 @@ case class QueryForTest(
       val executionTime = query.executionMode match {
         case CollectResults => benchmarkMs { dataFrame.rdd.collect() }
         case ForeachResults => benchmarkMs { dataFrame.rdd.foreach { row => Unit } }
-        case WriteParquet(location) => benchmarkMs { dataFrame.saveAsParquetFile(s"$location/${query.name}.parquet") }
+        case WriteParquet(location) => benchmarkMs { dataFrame.saveAsParquetFile(s"$location/$name.parquet") }
       }
 
       val joinTypes = dataFrame.queryExecution.executedPlan.collect {
@@ -90,9 +90,7 @@ case class QueryForTest(
           tableIdentifier.last
         }
       }
-
-      queryOutputLocation.foreach(dir => dataFrame.saveAsParquetFile(s"$dir/$name.parquet"))
-
+      
       BenchmarkResult(
         name = query.name,
         joinTypes = joinTypes,
diff --git a/src/main/scala/com/databricks/spark/sql/perf/runBenchmarks.scala b/src/main/scala/com/databricks/spark/sql/perf/runBenchmarks.scala
index 72130f9..878d609 100644
--- a/src/main/scala/com/databricks/spark/sql/perf/runBenchmarks.scala
+++ b/src/main/scala/com/databricks/spark/sql/perf/runBenchmarks.scala
@@ -196,7 +196,6 @@ abstract class Dataset(
   def runExperiment(
       queries: Seq[Query],
       resultsLocation: String,
-      queryOutputLocation: Option[String] = None,
       includeBreakdown: Boolean = false,
       iterations: Int = 3,
       variations: Seq[Variation[_]] = Seq(Variation("StandardRun", Seq("")) { _ => {} }),
@@ -239,7 +238,7 @@ abstract class Dataset(
                 currentMessages += s"Running query ${q.name} $setup"
 
                 currentQuery = q.name
-                val singleResult = try q.benchmark(setup, queryOutputLocation) :: Nil catch {
+                val singleResult = try q.benchmark(setup) :: Nil catch {
                   case e: Exception =>
                     currentMessages += s"Failed to run query ${q.name}: $e"
                     Nil