diff options
| author | Cheng Lian <lian@databricks.com> | 2015-02-10 02:28:47 -0800 |
|---|---|---|
| committer | Cheng Lian <lian@databricks.com> | 2015-02-10 02:29:18 -0800 |
| commit | d6f31e0c72f69076e71c9d32d2aac13c44b20b22 (patch) | |
| tree | 0c33e2cf62871a19fa2f56b88d1a280b928df0e5 /sql | |
| parent | 4cfc02531a08c833a44043b183d36cd14d2c7611 (diff) | |
| download | spark-d6f31e0c72f69076e71c9d32d2aac13c44b20b22.tar.gz spark-d6f31e0c72f69076e71c9d32d2aac13c44b20b22.tar.bz2 spark-d6f31e0c72f69076e71c9d32d2aac13c44b20b22.zip | |
[SPARK-5700] [SQL] [Build] Bumps jets3t to 0.9.3 for hadoop-2.3 and hadoop-2.4 profiles
This is a follow-up PR for #4454 and #4484. JetS3t 0.9.2 contains a log4j.properties file inside the artifact and breaks our tests (see SPARK-5696). This is fixed in 0.9.3.
This PR also reverts hotfix changes introduced in #4484. The reason is that asking users to configure HiveThriftServer2 logging configurations in hive-log4j.properties can be unintuitive.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/apache/spark/4499)
<!-- Reviewable:end -->
Author: Cheng Lian <lian@databricks.com>
Closes #4499 from liancheng/spark-5700 and squashes the following commits:
4f020c7 [Cheng Lian] Bumps jets3t to 0.9.3 for hadoop-2.3 and hadoop-2.4 profiles
(cherry picked from commit ba667935f8670293f10b8bbe1e317b28d00f9875)
Signed-off-by: Cheng Lian <lian@databricks.com>
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2.scala | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2.scala b/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2.scala index 525777aa45..6e07df18b0 100644 --- a/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2.scala +++ b/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2.scala @@ -18,7 +18,6 @@ package org.apache.spark.sql.hive.thriftserver import org.apache.commons.logging.LogFactory -import org.apache.hadoop.hive.common.LogUtils import org.apache.hadoop.hive.conf.HiveConf import org.apache.hadoop.hive.conf.HiveConf.ConfVars import org.apache.hive.service.cli.thrift.{ThriftBinaryCLIService, ThriftHttpCLIService} @@ -55,8 +54,6 @@ object HiveThriftServer2 extends Logging { System.exit(-1) } - LogUtils.initHiveLog4j() - logInfo("Starting SparkContext") SparkSQLEnv.init() |