More tests

Author: zsxwing

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalogSuite.scala

@@ -1212,11 +1212,11 @@ class SessionCatalogSuite extends PlanTest {
       new SimpleFunctionRegistry,
       CatalystSqlParser)
     assert(original ne clone)
-    assert(clone.getTempView("copytest1") == Option(tempTable1))
+    assert(clone.getTempView("copytest1") == Some(tempTable1))
 
     // check if clone and original independent
     clone.dropTable(TableIdentifier("copytest1"), ignoreIfNotExists = false, purge = false)
-    assert(original.getTempView("copytest1") == Option(tempTable1))
+    assert(original.getTempView("copytest1") == Some(tempTable1))
 
     val tempTable2 = Range(1, 20, 2, 10)
     original.createTempView("copytest2", tempTable2, overrideIfExists = false)
@@ -1225,14 +1225,15 @@ class SessionCatalogSuite extends PlanTest {
 
   test("clone SessionCatalog - current db") {
     val externalCatalog = newEmptyCatalog()
-    externalCatalog.createDatabase(newDb("copytest1"), true)
-    externalCatalog.createDatabase(newDb("copytest2"), true)
-    externalCatalog.createDatabase(newDb("copytest3"), true)
+    val db1 = "db1"
+    val db2 = "db2"
+    val db3 = "db3"
+
+    externalCatalog.createDatabase(newDb(db1), ignoreIfExists = true)
+    externalCatalog.createDatabase(newDb(db2), ignoreIfExists = true)
+    externalCatalog.createDatabase(newDb(db3), ignoreIfExists = true)
 
     val original = new SessionCatalog(externalCatalog)
-    val tempTable1 = Range(1, 10, 1, 10)
-    val db1 = "copytest1"
-    original.createTempView(db1, tempTable1, overrideIfExists = false)
     original.setCurrentDatabase(db1)
 
     // check if current db copied over
@@ -1245,15 +1246,8 @@ class SessionCatalogSuite extends PlanTest {
     assert(clone.getCurrentDatabase == db1)
 
     // check if clone and original independent
-    val db2 = "copytest2"
-    val tempTable2 = Range(1, 20, 2, 20)
-    clone.createTempView(db2, tempTable2, overrideIfExists = false)
     clone.setCurrentDatabase(db2)
     assert(original.getCurrentDatabase == db1)
-
-    val db3 = "copytest3"
-    val tempTable3 = Range(1, 30, 2, 30)
-    original.createTempView(db3, tempTable3, overrideIfExists = false)
     original.setCurrentDatabase(db3)
     assert(clone.getCurrentDatabase == db2)
   }

sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveSessionCatalogSuite.scala

@@ -17,42 +17,96 @@
 
 package org.apache.spark.sql.hive
 
+import java.net.URI
+
 import org.apache.hadoop.conf.Configuration
 
-import org.apache.spark.SparkFunSuite
-import org.apache.spark.sql.SparkSession
 import org.apache.spark.sql.catalyst.TableIdentifier
 import org.apache.spark.sql.catalyst.analysis.SimpleFunctionRegistry
+import org.apache.spark.sql.catalyst.catalog.CatalogDatabase
 import org.apache.spark.sql.catalyst.parser.CatalystSqlParser
 import org.apache.spark.sql.catalyst.plans.logical.Range
+import org.apache.spark.sql.hive.test.TestHiveSingleton
 import org.apache.spark.sql.internal.SQLConf
+import org.apache.spark.util.Utils
 
-class HiveSessionCatalogSuite extends SparkFunSuite {
+class HiveSessionCatalogSuite extends TestHiveSingleton {
 
   test("clone HiveSessionCatalog") {
-    val hiveSession = SparkSession.builder().master("local").enableHiveSupport().getOrCreate()
-    assert(hiveSession.sessionState.catalog.isInstanceOf[HiveSessionCatalog])
-    val original = hiveSession.sessionState.catalog.asInstanceOf[HiveSessionCatalog]
-
-    val tempTable1 = Range(1, 10, 1, 10)
-    original.createTempView("copytest1", tempTable1, overrideIfExists = false)
-
-    // check if tables copied over
-    val clone = original.newSessionCatalogWith(
-      hiveSession,
-      new SQLConf,
-      new Configuration(),
-      new SimpleFunctionRegistry,
-      CatalystSqlParser)
-    assert(original ne clone)
-    assert(clone.getTempView("copytest1") == Option(tempTable1))
-
-    // check if clone and original independent
-    clone.dropTable(TableIdentifier("copytest1"), ignoreIfNotExists = false, purge = false)
-    assert(original.getTempView("copytest1") == Option(tempTable1))
-
-    val tempTable2 = Range(1, 20, 2, 10)
-    original.createTempView("copytest2", tempTable2, overrideIfExists = false)
-    assert(clone.getTempView("copytest2").isEmpty)
+    val original = spark.sessionState.catalog.asInstanceOf[HiveSessionCatalog]
+
+    val tempTableName1 = "copytest1"
+    val tempTableName2 = "copytest2"
+    try {
+      val tempTable1 = Range(1, 10, 1, 10)
+      original.createTempView(tempTableName1, tempTable1, overrideIfExists = false)
+
+      // check if tables copied over
+      val clone = original.newSessionCatalogWith(
+        spark,
+        new SQLConf,
+        new Configuration(),
+        new SimpleFunctionRegistry,
+        CatalystSqlParser)
+      assert(original ne clone)
+      assert(clone.getTempView(tempTableName1) == Some(tempTable1))
+
+      // check if clone and original independent
+      clone.dropTable(TableIdentifier(tempTableName1), ignoreIfNotExists = false, purge = false)
+      assert(original.getTempView(tempTableName1) == Some(tempTable1))
+
+      val tempTable2 = Range(1, 20, 2, 10)
+      original.createTempView(tempTableName2, tempTable2, overrideIfExists = false)
+      assert(clone.getTempView(tempTableName2).isEmpty)
+    } finally {
+      // Drop the created temp views from the global singleton HiveSession.
+      original.dropTable(TableIdentifier(tempTableName1), ignoreIfNotExists = true, purge = true)
+      original.dropTable(TableIdentifier(tempTableName2), ignoreIfNotExists = true, purge = true)
+    }
+  }
+
+  test("clone SessionCatalog - current db") {
+    val original = spark.sessionState.catalog.asInstanceOf[HiveSessionCatalog]
+    val originalCurrentDatabase = original.getCurrentDatabase
+    val db1 = "db1"
+    val db2 = "db2"
+    val db3 = "db3"
+    try {
+      original.createDatabase(newDb(db1), ignoreIfExists = true)
+      original.createDatabase(newDb(db2), ignoreIfExists = true)
+      original.createDatabase(newDb(db3), ignoreIfExists = true)
+
+      original.setCurrentDatabase(db1)
+
+      // check if tables copied over
+      val clone = original.newSessionCatalogWith(
+        spark,
+        new SQLConf,
+        new Configuration(),
+        new SimpleFunctionRegistry,
+        CatalystSqlParser)
+
+      // check if current db copied over
+      assert(original ne clone)
+      assert(clone.getCurrentDatabase == db1)
+
+      // check if clone and original independent
+      clone.setCurrentDatabase(db2)
+      assert(original.getCurrentDatabase == db1)
+      original.setCurrentDatabase(db3)
+      assert(clone.getCurrentDatabase == db2)
+    } finally {
+      // Drop the created databases from the global singleton HiveSession.
+      original.dropDatabase(db1, ignoreIfNotExists = true, cascade = true)
+      original.dropDatabase(db2, ignoreIfNotExists = true, cascade = true)
+      original.dropDatabase(db3, ignoreIfNotExists = true, cascade = true)
+      original.setCurrentDatabase(originalCurrentDatabase)
+    }
+  }
+
+  def newUriForDatabase(): URI = new URI(Utils.createTempDir().toURI.toString.stripSuffix("/"))
+
+  def newDb(name: String): CatalogDatabase = {
+    CatalogDatabase(name, name + " description", newUriForDatabase(), Map.empty)
   }
 }