Refactor test to use SQLTestUtils

Author: JoshRosen

sql/core/src/test/scala/org/apache/spark/sql/execution/PlannerSuite.scala

@@ -23,14 +23,18 @@ import org.apache.spark.sql.catalyst.plans._
 import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan
 import org.apache.spark.sql.execution.joins.{BroadcastHashJoin, ShuffledHashJoin}
 import org.apache.spark.sql.functions._
+import org.apache.spark.sql.test.{SQLTestUtils, TestSQLContext}
 import org.apache.spark.sql.test.TestSQLContext._
 import org.apache.spark.sql.test.TestSQLContext.implicits._
 import org.apache.spark.sql.test.TestSQLContext.planner._
 import org.apache.spark.sql.types._
-import org.apache.spark.sql.{Row, SQLConf, execution}
+import org.apache.spark.sql.{SQLContext, Row, SQLConf, execution}
 
 
-class PlannerSuite extends SparkFunSuite {
+class PlannerSuite extends SparkFunSuite with SQLTestUtils {
+
+  override def sqlContext: SQLContext = TestSQLContext
+
   private def testPartialAggregationPlan(query: LogicalPlan): Unit = {
     val plannedOption = HashAggregation(query).headOption.orElse(Aggregation(query).headOption)
     val planned =
@@ -159,40 +163,43 @@ class PlannerSuite extends SparkFunSuite {
   }
 
   test("PartitioningCollection") {
-    // First, we disable broadcast join.
-    val origThreshold = conf.autoBroadcastJoinThreshold
-    setConf(SQLConf.AUTO_BROADCASTJOIN_THRESHOLD, 0)
-
-    testData.registerTempTable("normal")
-    testData.limit(10).registerTempTable("small")
-    testData.limit(3).registerTempTable("tiny")
-    var numExchanges = sql(
-      """
-        |SELECT *
-        |FROM
-        |  normal JOIN small ON (normal.key = small.key)
-        |  JOIN tiny ON (small.key = tiny.key)
-      """.stripMargin).queryExecution.executedPlan.collect {
-      case exchange: Exchange => exchange
-    }.length
-
-    assert(numExchanges === 3)
-
-    numExchanges = sql(
-      """
-        |SELECT *
-        |FROM
-        |  normal JOIN small ON (normal.key = small.key)
-        |  JOIN tiny ON (normal.key = tiny.key)
-      """.stripMargin).queryExecution.executedPlan.collect {
-      case exchange: Exchange => exchange
-    }.length
-
-    assert(numExchanges === 3)
-
-    setConf(SQLConf.AUTO_BROADCASTJOIN_THRESHOLD, origThreshold)
-    dropTempTable("normal")
-    dropTempTable("small")
-    dropTempTable("tiny")
+    withTempTable("normal", "small", "tiny") {
+      testData.registerTempTable("normal")
+      testData.limit(10).registerTempTable("small")
+      testData.limit(3).registerTempTable("tiny")
+
+      // Disable broadcast join
+      withSQLConf(SQLConf.AUTO_BROADCASTJOIN_THRESHOLD.key -> "-1") {
+        {
+          val numExchanges = sql(
+            """
+              |SELECT *
+              |FROM
+              |  normal JOIN small ON (normal.key = small.key)
+              |  JOIN tiny ON (small.key = tiny.key)
+            """.stripMargin
+          ).queryExecution.executedPlan.collect {
+            case exchange: Exchange => exchange
+          }.length
+          assert(numExchanges === 3)
+        }
+
+        {
+          // This second query joins on different keys:
+          val numExchanges = sql(
+            """
+              |SELECT *
+              |FROM
+              |  normal JOIN small ON (normal.key = small.key)
+              |  JOIN tiny ON (normal.key = tiny.key)
+            """.stripMargin
+          ).queryExecution.executedPlan.collect {
+            case exchange: Exchange => exchange
+          }.length
+          assert(numExchanges === 3)
+        }
+
+      }
+    }
   }
 }