You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2014/09/26 21:06:09 UTC
git commit: [SPARK-3393] [SQL] Align the log4j configuration for
Spark & SparkSQLCLI
Repository: spark
Updated Branches:
refs/heads/master 0ec2d2e8f -> 7364fa5a1
[SPARK-3393] [SQL] Align the log4j configuration for Spark & SparkSQLCLI
User may be confused for the HQL logging & configurations, we'd better provide a default templates.
Both files are copied from Hive.
Author: Cheng Hao <ha...@intel.com>
Closes #2263 from chenghao-intel/hive_template and squashes the following commits:
53bffa9 [Cheng Hao] Remove the hive-log4j.properties initialization
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/7364fa5a
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/7364fa5a
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/7364fa5a
Branch: refs/heads/master
Commit: 7364fa5a176da69e425bca0e3e137ee73275c78c
Parents: 0ec2d2e
Author: Cheng Hao <ha...@intel.com>
Authored: Fri Sep 26 12:06:01 2014 -0700
Committer: Michael Armbrust <mi...@databricks.com>
Committed: Fri Sep 26 12:06:01 2014 -0700
----------------------------------------------------------------------
.../sql/hive/thriftserver/SparkSQLCLIDriver.scala | 17 -----------------
1 file changed, 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/7364fa5a/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala
----------------------------------------------------------------------
diff --git a/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala b/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala
index b092f42..7ba4564 100755
--- a/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala
+++ b/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala
@@ -73,18 +73,6 @@ private[hive] object SparkSQLCLIDriver {
System.exit(1)
}
- // NOTE: It is critical to do this here so that log4j is reinitialized
- // before any of the other core hive classes are loaded
- var logInitFailed = false
- var logInitDetailMessage: String = null
- try {
- logInitDetailMessage = LogUtils.initHiveLog4j()
- } catch {
- case e: LogInitializationException =>
- logInitFailed = true
- logInitDetailMessage = e.getMessage
- }
-
val sessionState = new CliSessionState(new HiveConf(classOf[SessionState]))
sessionState.in = System.in
@@ -100,11 +88,6 @@ private[hive] object SparkSQLCLIDriver {
System.exit(2)
}
- if (!sessionState.getIsSilent) {
- if (logInitFailed) System.err.println(logInitDetailMessage)
- else SessionState.getConsole.printInfo(logInitDetailMessage)
- }
-
// Set all properties specified via command line.
val conf: HiveConf = sessionState.getConf
sessionState.cmdProperties.entrySet().foreach { item: java.util.Map.Entry[Object, Object] =>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org