address comments

cloud-fan · cloud-fan · commit b48e4ae67526 · 2016-09-18T15:30:19.000+08:00
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
@@ -284,10 +284,8 @@ class CatalogImpl(sparkSession: SparkSession) extends Catalog {
    * @since 2.0.0
    */
   override def dropTempView(viewName: String): Unit = {
-    val maybeTempView = sparkSession.sessionState.catalog.getTempView(viewName)
-    if (maybeTempView.isDefined) {
-      val view = SubqueryAlias(viewName, maybeTempView.get, Some(TableIdentifier(viewName)))
-      sparkSession.sharedState.cacheManager.uncacheQuery(Dataset.ofRows(sparkSession, view))
+    sparkSession.sessionState.catalog.getTempView(viewName).foreach { tempView =>
+      sparkSession.sharedState.cacheManager.uncacheQuery(Dataset.ofRows(sparkSession, tempView))
       sessionCatalog.dropTempView(viewName)
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -284,10 +284,8 @@ class CatalogImpl(sparkSession: SparkSession) extends Catalog {`
`284`	`284`	`* @since 2.0.0`
`285`	`285`	`*/`
`286`	`286`	`override def dropTempView(viewName: String): Unit = {`
`287`		`- val maybeTempView = sparkSession.sessionState.catalog.getTempView(viewName)`
`288`		`- if (maybeTempView.isDefined) {`
`289`		`- val view = SubqueryAlias(viewName, maybeTempView.get, Some(TableIdentifier(viewName)))`
`290`		`- sparkSession.sharedState.cacheManager.uncacheQuery(Dataset.ofRows(sparkSession, view))`
	`287`	`+ sparkSession.sessionState.catalog.getTempView(viewName).foreach { tempView =>`
	`288`	`+ sparkSession.sharedState.cacheManager.uncacheQuery(Dataset.ofRows(sparkSession, tempView))`
`291`	`289`	`sessionCatalog.dropTempView(viewName)`
`292`	`290`	`}`
`293`	`291`	`}`