From 685ed9e4883e3ccae36fb1b9e73f43edbcb0e228 Mon Sep 17 00:00:00 2001 From: Josh Rosen Date: Fri, 19 Feb 2016 13:01:23 -0800 Subject: [PATCH] Add TPCDS(sqlContext) constructor for backwards-compatibility This patch adds additional constructors to `TPCDS` to maintain backwards-compatibility with code which calls `new TPCDS(anExistingSqlContext)`. This constructor was removed in #47. The motivation for backwards-compatibility here is to simplify the gradual roll-out of an updated spark-sql-perf library to some existing jobs which share the same notebook. Author: Josh Rosen Closes #52 from JoshRosen/backwards-compatible-tpcds-constructor. --- .../scala/com/databricks/spark/sql/perf/tpcds/TPCDS.scala | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/scala/com/databricks/spark/sql/perf/tpcds/TPCDS.scala b/src/main/scala/com/databricks/spark/sql/perf/tpcds/TPCDS.scala index 85ab4f8..64c6a6a 100644 --- a/src/main/scala/com/databricks/spark/sql/perf/tpcds/TPCDS.scala +++ b/src/main/scala/com/databricks/spark/sql/perf/tpcds/TPCDS.scala @@ -19,19 +19,23 @@ package com.databricks.spark.sql.perf.tpcds import scala.collection.mutable import com.databricks.spark.sql.perf._ +import org.apache.spark.SparkContext import org.apache.spark.sql.SQLContext /** * TPC-DS benchmark's dataset. + * * @param sqlContext An existing SQLContext. */ -class TPCDS - extends Benchmark +class TPCDS(@transient sqlContext: SQLContext) + extends Benchmark(sqlContext) with ImpalaKitQueries with SimpleQueries with Tpcds_1_4_Queries with Serializable { + def this() = this(SQLContext.getOrCreate(SparkContext.getOrCreate())) + /* def setupBroadcast(skipTables: Seq[String] = Seq("store_sales", "customer")) = { val skipExpr = skipTables.map(t => !('tableName === t)).reduceLeft[Column](_ && _)