reload the conf after reset

Author: gatorsmile

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

@@ -61,12 +61,8 @@ private[hive] class HiveSessionState(sparkSession: SparkSession)
    *    set in the SQLConf *as well as* in the HiveConf.
    */
   lazy val hiveconf: HiveConf = {
-    val c = executionHive.conf
-    conf.setConf(c.getAllProperties)
-    // scalastyle:off println
-    println("conf.hiveMetastoreWarehouse: " + conf.hiveMetastoreWarehouse)
-    // scalastyle:on println
-    c
+    loadHiveConfToSQLConf()
+    executionHive.conf
   }
 
   setDefaultOverrideConfs()
@@ -147,6 +143,13 @@ private[hive] class HiveSessionState(sparkSession: SparkSession)
     setConf(ConfVars.HIVE_SUPPORT_SQL11_RESERVED_KEYWORDS.varname, "false")
   }
 
+  /**
+   * Load all the params in HiveConf into SQLConf.
+   */
+  def loadHiveConfToSQLConf(): Unit = {
+    conf.setConf(executionHive.conf.getAllProperties)
+  }
+
   override def setConf(key: String, value: String): Unit = {
     super.setConf(key, value)
     executionHive.runSqlHive(s"SET $key=$value")

sql/hive/src/main/scala/org/apache/spark/sql/hive/test/TestHive.scala

@@ -450,6 +450,7 @@ private[hive] class TestHiveSparkSession(
       TestHiveContext.hiveClientConfigurations(
         sessionState.hiveconf, warehousePath, scratchDirPath, metastoreTemporaryConf)
           .foreach { case (k, v) => sessionState.metadataHive.runSqlHive(s"SET $k=$v") }
+      sessionState.loadHiveConfToSQLConf()
       sessionState.setDefaultOverrideConfs()
 
       sessionState.catalog.setCurrentDatabase("default")

sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala

@@ -1177,6 +1177,7 @@ class HiveQuerySuite extends HiveComparisonTest with BeforeAndAfter {
     }
 
     conf.clear()
+    TestHive.reset()
   }
 
   test("current_database with multiple sessions") {