Update

Author: yhuai

sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala

@@ -156,8 +156,13 @@ private[hive] object SparkSQLCLIDriver extends Logging {
     // Execute -i init files (always in silent mode)
     cli.processInitFiles(sessionState)
 
-    // Respect the configurations from the command line and .hiverc for backward-compatible
-    SparkSQLEnv.applyOverridedConf(sessionState)
+    // Respect the configurations set by --hiveconf from the command line
+    // (based on Hive's CliDriver).
+    val it = sessionState.getOverriddenConfigurations.entrySet().iterator()
+    while (it.hasNext) {
+      val kv = it.next()
+      SparkSQLEnv.sqlContext.setConf(kv.getKey, kv.getValue)
+    }
 
     if (sessionState.execString != null) {
       System.exit(cli.processLine(sessionState.execString))

sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLEnv.scala

@@ -19,7 +19,7 @@ package org.apache.spark.sql.hive.thriftserver
 
 import java.io.PrintStream
 
-import org.apache.hadoop.hive.ql.session.SessionState
+import scala.collection.JavaConverters._
 
 import org.apache.spark.{SparkConf, SparkContext}
 import org.apache.spark.internal.Logging
@@ -66,14 +66,6 @@ private[hive] object SparkSQLEnv extends Logging {
     }
   }
 
-  def applyOverridedConf(ss: SessionState): Unit = {
-    val it = ss.getOverriddenConfigurations.entrySet().iterator()
-    while (it.hasNext) {
-      val kv = it.next()
-      SparkSQLEnv.sqlContext.setConf(kv.getKey, kv.getValue)
-    }
-  }
-
   /** Cleans up and shuts down the Spark SQL environments. */
   def stop() {
     logDebug("Shutting down Spark SQL Environment")