ignore table or view not found error

apache · Jan 12, 2021 · 712b079 · 712b079
1 parent 708adc4
commit 712b079
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/internal/CatalogImpl.scala b/sql/core/src/main/scala/org/apache/spark/sql/internal/CatalogImpl.scala
@@ -395,9 +395,14 @@ class CatalogImpl(sparkSession: SparkSession) extends Catalog {
    * @since 2.0.0
    */
   override def dropTempView(viewName: String): Boolean = {
-    sparkSession.sessionState.catalog.getTempView(viewName).exists { _ =>
-      sparkSession.sharedState.cacheManager.uncacheQuery(
-        sparkSession.table(viewName), cascade = false)
+    sparkSession.sessionState.catalog.getTempView(viewName).exists { viewDef =>
+      try {
+        val plan = sparkSession.sessionState.executePlan(viewDef)
+        sparkSession.sharedState.cacheManager.uncacheQuery(
+          sparkSession, plan.analyzed, cascade = false)
+      } catch {
+        case NonFatal(_) => // ignore
+      }
       sessionCatalog.dropTempView(viewName)
     }
   }
@@ -411,11 +416,14 @@ class CatalogImpl(sparkSession: SparkSession) extends Catalog {
    * @since 2.1.0
    */
   override def dropGlobalTempView(viewName: String): Boolean = {
-    sparkSession.sessionState.catalog.getGlobalTempView(viewName).exists { _ =>
-      val db = sparkSession.sessionState.conf.getConf(StaticSQLConf.GLOBAL_TEMP_DATABASE)
-      val ident = TableIdentifier(viewName, Some(db))
-      sparkSession.sharedState.cacheManager.uncacheQuery(
-        sparkSession.table(ident), cascade = false)
+    sparkSession.sessionState.catalog.getGlobalTempView(viewName).exists { viewDef =>
+      try {
+        val plan = sparkSession.sessionState.executePlan(viewDef)
+        sparkSession.sharedState.cacheManager.uncacheQuery(
+          sparkSession, plan.analyzed, cascade = false)
+      } catch {
+        case NonFatal(_) => // ignore
+      }
       sessionCatalog.dropGlobalTempView(viewName)
     }
   }