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/10/02 01:35:03 UTC
git commit: [SPARK-3729][SQL] Do all hive session state
initialization in lazy val
Repository: spark
Updated Branches:
refs/heads/master 4e79970d3 -> 45e058ca4
[SPARK-3729][SQL] Do all hive session state initialization in lazy val
This change avoids a NPE during context initialization when settings are present.
Author: Michael Armbrust <mi...@databricks.com>
Closes #2583 from marmbrus/configNPE and squashes the following commits:
da2ec57 [Michael Armbrust] Do all hive session state initilialization in lazy val
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/45e058ca
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/45e058ca
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/45e058ca
Branch: refs/heads/master
Commit: 45e058ca4babbe3cef6524b6a0f48b466a5139bf
Parents: 4e79970
Author: Michael Armbrust <mi...@databricks.com>
Authored: Wed Oct 1 16:30:28 2014 -0700
Committer: Michael Armbrust <mi...@databricks.com>
Committed: Wed Oct 1 16:30:28 2014 -0700
----------------------------------------------------------------------
.../main/scala/org/apache/spark/sql/hive/HiveContext.scala | 8 ++++----
.../src/main/scala/org/apache/spark/sql/hive/TestHive.scala | 4 +++-
2 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/45e058ca/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala
----------------------------------------------------------------------
diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala
index 20ebe49..fdb5690 100644
--- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala
+++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala
@@ -231,12 +231,13 @@ class HiveContext(sc: SparkContext) extends SQLContext(sc) {
@transient protected[hive] lazy val sessionState = {
val ss = new SessionState(hiveconf)
setConf(hiveconf.getAllProperties) // Have SQLConf pick up the initial set of HiveConf.
+ SessionState.start(ss)
+ ss.err = new PrintStream(outputBuffer, true, "UTF-8")
+ ss.out = new PrintStream(outputBuffer, true, "UTF-8")
+
ss
}
- sessionState.err = new PrintStream(outputBuffer, true, "UTF-8")
- sessionState.out = new PrintStream(outputBuffer, true, "UTF-8")
-
override def setConf(key: String, value: String): Unit = {
super.setConf(key, value)
runSqlHive(s"SET $key=$value")
@@ -273,7 +274,6 @@ class HiveContext(sc: SparkContext) extends SQLContext(sc) {
results
}
- SessionState.start(sessionState)
/**
* Execute the command using Hive and return the results as a sequence. Each element
http://git-wip-us.apache.org/repos/asf/spark/blob/45e058ca/sql/hive/src/main/scala/org/apache/spark/sql/hive/TestHive.scala
----------------------------------------------------------------------
diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/TestHive.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/TestHive.scala
index 70fb152..4a999b9 100644
--- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/TestHive.scala
+++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/TestHive.scala
@@ -40,8 +40,10 @@ import org.apache.spark.sql.SQLConf
/* Implicit conversions */
import scala.collection.JavaConversions._
+// SPARK-3729: Test key required to check for initialization errors with config.
object TestHive
- extends TestHiveContext(new SparkContext("local[2]", "TestSQLContext", new SparkConf()))
+ extends TestHiveContext(
+ new SparkContext("local[2]", "TestSQLContext", new SparkConf().set("spark.sql.test", "")))
/**
* A locally running test instance of Spark's Hive execution engine.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org