fix.

gatorsmile · gatorsmile · commit 4976215fa16f · 2017-05-08T21:49:47.000-07:00
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalog.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalog.scala
@@ -1251,9 +1251,10 @@ class SessionCatalog(
         dropTempFunction(func.funcName, ignoreIfNotExists = false)
       }
     }
-    tempTables.clear()
+    clearTempTables()
     globalTempViewManager.clear()
     functionRegistry.clear()
+    tableRelationCache.invalidateAll()
     // restore built-in functions
     FunctionRegistry.builtin.listFunction().foreach { f =>
       val expressionInfo = FunctionRegistry.builtin.lookupFunction(f)
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/test/SharedSQLContext.scala b/sql/core/src/test/scala/org/apache/spark/sql/test/SharedSQLContext.scala
@@ -74,6 +74,7 @@ trait SharedSQLContext extends SQLTestUtils with BeforeAndAfterEach with Eventua
   protected override def afterAll(): Unit = {
     super.afterAll()
     if (_spark != null) {
+      _spark.sessionState.catalog.reset()
       _spark.stop()
       _spark = null
     }
diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/test/TestHive.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/test/TestHive.scala
@@ -488,14 +488,9 @@ private[hive] class TestHiveSparkSession(
 
       sharedState.cacheManager.clearCache()
       loadedTables.clear()
-      sessionState.catalog.clearTempTables()
-      sessionState.catalog.tableRelationCache.invalidateAll()
-
+      sessionState.catalog.reset()
       metadataHive.reset()
 
-      FunctionRegistry.getFunctionNames.asScala.filterNot(originalUDFs.contains(_)).
-        foreach { udfName => FunctionRegistry.unregisterTemporaryUDF(udfName) }
-
       // HDFS root scratch dir requires the write all (733) permission. For each connecting user,
       // an HDFS scratch dir: ${hive.exec.scratchdir}/<username> is created, with
       // ${hive.scratch.dir.permission}. To resolve the permission issue, the simplest way is to

Original file line number	Diff line number	Diff line change
`@@ -1251,9 +1251,10 @@ class SessionCatalog(`
`1251`	`1251`	`dropTempFunction(func.funcName, ignoreIfNotExists = false)`
`1252`	`1252`	`}`
`1253`	`1253`	`}`
`1254`		`- tempTables.clear()`
	`1254`	`+ clearTempTables()`
`1255`	`1255`	`globalTempViewManager.clear()`
`1256`	`1256`	`functionRegistry.clear()`
	`1257`	`+ tableRelationCache.invalidateAll()`
`1257`	`1258`	`// restore built-in functions`
`1258`	`1259`	`FunctionRegistry.builtin.listFunction().foreach { f =>`
`1259`	`1260`	`val expressionInfo = FunctionRegistry.builtin.lookupFunction(f)`
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ trait SharedSQLContext extends SQLTestUtils with BeforeAndAfterEach with Eventua`
`74`	`74`	`protected override def afterAll(): Unit = {`
`75`	`75`	`super.afterAll()`
`76`	`76`	`if (_spark != null) {`
	`77`	`+ _spark.sessionState.catalog.reset()`
`77`	`78`	`_spark.stop()`
`78`	`79`	`_spark = null`
`79`	`80`	`}`