rename a conf name

windpiger · windpiger · commit 825c0ade864e · 2017-02-20T22:51:47.000+08:00
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala b/sql/core/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala
@@ -673,8 +673,8 @@ object SQLConf {
       .createWithDefault(TimeZone.getDefault().getID())
 
   // for test
-  val HIVE_CREATETABLE_DEFAULTDB_USEWAREHOUSE_PATH =
-  buildConf("spark.hive.createTable.defaultDB.location.useWarehousePath")
+  val TEST_HIVE_CREATETABLE_DEFAULTDB_USEWAREHOUSE_PATH =
+  buildConf("spark.hive.test.createTable.defaultDB.location.useWarehousePath")
     .doc("Enables test case to use warehouse path instead of db location when " +
       "create table in default database.")
     .booleanConf
diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveExternalCatalog.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveExternalCatalog.scala
@@ -410,7 +410,7 @@ private[spark] class HiveExternalCatalog(conf: SparkConf, hadoopConf: Configurat
   // if the database is default, the value of WAREHOUSE_PATH in conf returned
   private def defaultTablePath(tableIdent: TableIdentifier): String = {
     val dbLocation = if (tableIdent.database.get == SessionCatalog.DEFAULT_DATABASE
-      || conf.get(SQLConf.HIVE_CREATETABLE_DEFAULTDB_USEWAREHOUSE_PATH)) {
+      || conf.get(SQLConf.TEST_HIVE_CREATETABLE_DEFAULTDB_USEWAREHOUSE_PATH)) {
       conf.get(WAREHOUSE_PATH)
     } else {
       getDatabase(tableIdent.database.get).locationUri
diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveDDLSuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveDDLSuite.scala
@@ -1592,7 +1592,7 @@ class HiveDDLSuite
     withTable("t") {
       withTempDir { dir =>
         spark.sparkContext.conf
-          .set(SQLConf.HIVE_CREATETABLE_DEFAULTDB_USEWAREHOUSE_PATH.key, "true")
+          .set(SQLConf.TEST_HIVE_CREATETABLE_DEFAULTDB_USEWAREHOUSE_PATH.key, "true")
 
         spark.sql(s"CREATE DATABASE default_test LOCATION '$dir'" )
         val db = spark.sessionState.catalog.getDatabaseMetadata("default_test")
@@ -1606,7 +1606,7 @@ class HiveDDLSuite
 
         // clear
         spark.sparkContext.conf
-          .remove(SQLConf.HIVE_CREATETABLE_DEFAULTDB_USEWAREHOUSE_PATH.key)
+          .remove(SQLConf.TEST_HIVE_CREATETABLE_DEFAULTDB_USEWAREHOUSE_PATH.key)
         spark.sql("DROP TABLE t")
         spark.sql("DROP DATABASE default_test")
         spark.sql("USE DEFAULT")
@@ -1624,8 +1624,6 @@ class HiveDDLSuite
         assert(table.location.stripSuffix("/") == s"${db.locationUri.stripSuffix("/")}/t" )
 
         // clear
-        spark.sparkContext.conf
-          .remove(SQLConf.HIVE_CREATETABLE_DEFAULTDB_USEWAREHOUSE_PATH.key)
         spark.sql("DROP TABLE t")
         spark.sql("DROP DATABASE test_not_default")
         spark.sql("USE DEFAULT")
