[SPARK-15367] [SQL] Add refreshTable back

sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala

@@ -294,6 +294,18 @@ class SQLContext private[sql](
     sparkSession.catalog.clearCache()
   }
 
+  /**
+   * Invalidate and refresh all the cached the metadata of the given table. For performance reasons,
+   * Spark SQL or the external data source library it uses might cache certain metadata about a
+   * table, such as the location of blocks. When those change outside of Spark SQL, users should
+   * call this function to invalidate the cache.
+   *
+   * @since 1.3.0
+   */
+  def refreshTable(tableName: String): Unit = {
+    sparkSession.catalog.refreshTable(tableName)
+  }
+
   // scalastyle:off
   // Disable style checker so "implicits" object can start with lowercase i
   /**

sql/core/src/main/scala/org/apache/spark/sql/catalog/Catalog.scala

@@ -211,4 +211,14 @@ abstract class Catalog {
    */
   def clearCache(): Unit
 
+  /**
+   * Invalidate and refresh all the cached the metadata of the given table. For performance reasons,
+   * Spark SQL or the external data source library it uses might cache certain metadata about a
+   * table, such as the location of blocks. When those change outside of Spark SQL, users should
+   * call this function to invalidate the cache.
+   *
+   * @since 2.0.0
+   */
+  def refreshTable(tableName: String): Unit
+
 }

sql/core/src/main/scala/org/apache/spark/sql/internal/CatalogImpl.scala

@@ -345,6 +345,17 @@ class CatalogImpl(sparkSession: SparkSession) extends Catalog {
     sparkSession.cacheManager.lookupCachedData(qName).nonEmpty
   }
 
+  /**
+   * Refresh the cache entry for a metastore table, if any.
+   *
+   * @group cachemgmt
+   * @since 2.0.0
+   */
+  override def refreshTable(tableName: String): Unit = {
+    val tableIdent = sparkSession.sessionState.sqlParser.parseTableIdentifier(tableName)
+    sessionCatalog.refreshTable(tableIdent)
+  }
+
 }
 
 

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

@@ -622,7 +622,7 @@ class MetastoreDataSourcesSuite extends QueryTest with SQLTestUtils with TestHiv
         .mode(SaveMode.Append)
         .saveAsTable("arrayInParquet")
 
-      sessionState.refreshTable("arrayInParquet")
+      refreshTable("arrayInParquet")
 
       checkAnswer(
         sql("SELECT a FROM arrayInParquet"),
@@ -681,7 +681,7 @@ class MetastoreDataSourcesSuite extends QueryTest with SQLTestUtils with TestHiv
         .mode(SaveMode.Append)
         .saveAsTable("mapInParquet")
 
-      sessionState.refreshTable("mapInParquet")
+      refreshTable("mapInParquet")
 
       checkAnswer(
         sql("SELECT a FROM mapInParquet"),

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

@@ -202,7 +202,8 @@ class MultiDatabaseSuite extends QueryTest with SQLTestUtils with TestHiveSingle
 
         activateDatabase(db) {
           sql(
-            s"""CREATE EXTERNAL TABLE t (id BIGINT)
+            s"""
+               |CREATE EXTERNAL TABLE t (id BIGINT)
                |PARTITIONED BY (p INT)
                |STORED AS PARQUET
                |LOCATION '$path'
@@ -217,7 +218,7 @@ class MultiDatabaseSuite extends QueryTest with SQLTestUtils with TestHiveSingle
 
           df.write.parquet(s"$path/p=2")
           sql("ALTER TABLE t ADD PARTITION (p=2)")
-          hiveContext.sessionState.refreshTable("t")
+          hiveContext.refreshTable("t")
           checkAnswer(
             spark.table("t"),
             df.withColumn("p", lit(1)).union(df.withColumn("p", lit(2))))
@@ -234,11 +235,12 @@ class MultiDatabaseSuite extends QueryTest with SQLTestUtils with TestHiveSingle
         val path = dir.getCanonicalPath
 
         sql(
-          s"""CREATE EXTERNAL TABLE $db.t (id BIGINT)
-               |PARTITIONED BY (p INT)
-               |STORED AS PARQUET
-               |LOCATION '$path'
-             """.stripMargin)
+          s"""
+             |CREATE EXTERNAL TABLE $db.t (id BIGINT)
+             |PARTITIONED BY (p INT)
+             |STORED AS PARQUET
+             |LOCATION '$path'
+           """.stripMargin)
 
         checkAnswer(spark.table(s"$db.t"), spark.emptyDataFrame)
 
@@ -249,7 +251,7 @@ class MultiDatabaseSuite extends QueryTest with SQLTestUtils with TestHiveSingle
 
         df.write.parquet(s"$path/p=2")
         sql(s"ALTER TABLE $db.t ADD PARTITION (p=2)")
-        hiveContext.sessionState.refreshTable(s"$db.t")
+        hiveContext.refreshTable(s"$db.t")
         checkAnswer(
           spark.table(s"$db.t"),
           df.withColumn("p", lit(1)).union(df.withColumn("p", lit(2))))
@@ -279,11 +281,11 @@ class MultiDatabaseSuite extends QueryTest with SQLTestUtils with TestHiveSingle
         val message = intercept[AnalysisException] {
           sql(
             s"""
-            |CREATE TABLE `d:b`.`t:a` (a int)
-            |USING parquet
-            |OPTIONS (
-            |  path '$path'
-            |)
+               |CREATE TABLE `d:b`.`t:a` (a int)
+               |USING parquet
+               |OPTIONS (
+               |  path '$path'
+               |)
             """.stripMargin)
         }.getMessage
         assert(message.contains("is not a valid name for metastore"))
@@ -293,12 +295,12 @@ class MultiDatabaseSuite extends QueryTest with SQLTestUtils with TestHiveSingle
         val message = intercept[AnalysisException] {
           sql(
             s"""
-              |CREATE TABLE `d:b`.`table` (a int)
-              |USING parquet
-              |OPTIONS (
-              |  path '$path'
-              |)
-              """.stripMargin)
+               |CREATE TABLE `d:b`.`table` (a int)
+               |USING parquet
+               |OPTIONS (
+               |  path '$path'
+               |)
+             """.stripMargin)
         }.getMessage
         assert(message.contains("is not a valid name for metastore"))
       }