From 172ae79f8de929fe2db1b19a9e77ba524785413b Mon Sep 17 00:00:00 2001
From: Andrew Or <andrew@databricks.com>
Date: Mon, 16 Nov 2015 17:46:53 -0800
Subject: [PATCH] Introduce small integration point with Spark perf

This allows us to report Spark perf results in the same format as SQL benchmark results. marmbrus

Author: Andrew Or <andrew@databricks.com>

Closes #30 from andrewor14/spark-perf.
---
 .../scala/com/databricks/spark/sql/perf/Benchmark.scala  | 9 +++++++--
 .../scala/com/databricks/spark/sql/perf/results.scala    | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/scala/com/databricks/spark/sql/perf/Benchmark.scala b/src/main/scala/com/databricks/spark/sql/perf/Benchmark.scala
index 4aa8b2e..1e8d297 100644
--- a/src/main/scala/com/databricks/spark/sql/perf/Benchmark.scala
+++ b/src/main/scala/com/databricks/spark/sql/perf/Benchmark.scala
@@ -392,9 +392,14 @@ abstract class Benchmark(
 
     // Benchmark run by calculating the sum of the hash value of all rows. This is used to check
     // query results.
-    case object HashResults extends ExecutionMode  {
+    case object HashResults extends ExecutionMode {
       override def toString: String = "hash"
     }
+
+    // Results from Spark perf
+    case object SparkPerfResults extends ExecutionMode {
+      override def toString: String = "sparkPerf"
+    }
   }
 
   /** Factory object for benchmark queries. */
@@ -555,4 +560,4 @@ abstract class Benchmark(
       new Query(name, buildDataFrame, description, sqlText, ExecutionMode.HashResults)
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/scala/com/databricks/spark/sql/perf/results.scala b/src/main/scala/com/databricks/spark/sql/perf/results.scala
index 8cf4708..e902109 100644
--- a/src/main/scala/com/databricks/spark/sql/perf/results.scala
+++ b/src/main/scala/com/databricks/spark/sql/perf/results.scala
@@ -42,7 +42,7 @@ case class ExperimentRun(
 case class BenchmarkConfiguration(
     sparkVersion: String = org.apache.spark.SPARK_VERSION,
     sqlConf: Map[String, String],
-    sparkConf: Map[String,String],
+    sparkConf: Map[String, String],
     defaultParallelism: Int)
 
 /**
@@ -93,4 +93,4 @@ case class BreakdownResult(
     executionTime: Double,
     delta: Double)
 
-case class Failure(className: String, message: String)
\ No newline at end of file
+case class Failure(className: String, message: String)