hiveTableFilePath -> hiveDefaultTableFilePath

Author: scwf

sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveMetastoreCatalog.scala

@@ -175,7 +175,7 @@ private[hive] class HiveMetastoreCatalog(hive: HiveContext) extends Catalog with
     }
   }
 
-  def hiveTableFilePath(tableName: String): String = synchronized {
+  def hiveDefaultTableFilePath(tableName: String): String = synchronized {
     val (databaseName, tblName) = getDBAndTableName(tableName.split("\\."))
     val db = client.getDatabase(databaseName)
 

sql/hive/src/main/scala/org/apache/spark/sql/hive/execution/commands.scala

@@ -127,7 +127,7 @@ case class CreateMetastoreDataSource(
       if (!options.contains("path") && managedIfNoPath) {
         isExternal = false
         options +
-          ("path" -> hiveContext.catalog.hiveTableFilePath(tableIdents))
+          ("path" -> hiveContext.catalog.hiveDefaultTableFilePath(tableIdents))
       } else {
         options
       }
@@ -160,7 +160,7 @@ case class CreateMetastoreDataSourceAsSelect(
       if (!options.contains("path")) {
         isExternal = false
         options +
-          ("path" -> hiveContext.catalog.hiveTableFilePath(tableName))
+          ("path" -> hiveContext.catalog.hiveDefaultTableFilePath(tableName))
       } else {
         options
       }

sql/hive/src/test/java/org/apache/spark/sql/hive/JavaMetastoreDataSourcesSuite.java

@@ -70,7 +70,7 @@ public void setUp() throws IOException {
     if (path.exists()) {
       path.delete();
     }
-    hiveManagedPath = new Path(sqlContext.catalog().hiveTableFilePath("javaSavedTable"));
+    hiveManagedPath = new Path(sqlContext.catalog().hiveDefaultTableFilePath("javaSavedTable"));
     fs = hiveManagedPath.getFileSystem(sc.hadoopConfiguration());
     if (fs.exists(hiveManagedPath)){
       fs.delete(hiveManagedPath, true);

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

@@ -441,7 +441,7 @@ class MetastoreDataSourcesSuite extends QueryTest with BeforeAndAfterEach {
         |)
       """.stripMargin)
 
-    val expectedPath = catalog.hiveTableFilePath("ctasJsonTable")
+    val expectedPath = catalog.hiveDefaultTableFilePath("ctasJsonTable")
     val filesystemPath = new Path(expectedPath)
     val fs = filesystemPath.getFileSystem(sparkContext.hadoopConfiguration)
     if (fs.exists(filesystemPath)) fs.delete(filesystemPath, true)
@@ -559,7 +559,7 @@ class MetastoreDataSourcesSuite extends QueryTest with BeforeAndAfterEach {
     // Drop table will also delete the data.
     sql("DROP TABLE savedJsonTable")
     intercept[InvalidInputException] {
-      jsonFile(catalog.hiveTableFilePath("savedJsonTable"))
+      jsonFile(catalog.hiveDefaultTableFilePath("savedJsonTable"))
     }
 
     // Create an external table by specifying the path.
@@ -775,7 +775,7 @@ class MetastoreDataSourcesSuite extends QueryTest with BeforeAndAfterEach {
     tbl.setProperty("spark.sql.sources.schema", schema.json)
     tbl.setProperty("EXTERNAL", "FALSE")
     tbl.setTableType(TableType.MANAGED_TABLE)
-    tbl.setSerdeParam("path", catalog.hiveTableFilePath(tableName))
+    tbl.setSerdeParam("path", catalog.hiveDefaultTableFilePath(tableName))
     catalog.synchronized {
       catalog.client.createTable(tbl)
     }