diff options
| author | Zongheng Yang <zongheng.y@gmail.com> | 2014-07-03 17:37:53 -0700 |
|---|---|---|
| committer | Michael Armbrust <michael@databricks.com> | 2014-07-03 17:37:53 -0700 |
| commit | d4c30cd9918e18dde2a52909e36eaef6eb5996ab (patch) | |
| tree | 11ffdf4f00dba9c47cd4c4f6a5aa075651b09000 /sql/core/src/main | |
| parent | 731f683b1bd8abbb83030b6bae14876658bbf098 (diff) | |
| download | spark-d4c30cd9918e18dde2a52909e36eaef6eb5996ab.tar.gz spark-d4c30cd9918e18dde2a52909e36eaef6eb5996ab.tar.bz2 spark-d4c30cd9918e18dde2a52909e36eaef6eb5996ab.zip | |
[HOTFIX] Synchronize on SQLContext.settings in tests.
Let's see if this fixes the ongoing series of test failures in a master build machine (https://amplab.cs.berkeley.edu/jenkins/job/Spark-Master-SBT-pre-YARN/SPARK_HADOOP_VERSION=1.0.4,label=centos/81/).
pwendell marmbrus
Author: Zongheng Yang <zongheng.y@gmail.com>
Closes #1277 from concretevitamin/test-fix and squashes the following commits:
28c88bd [Zongheng Yang] Synchronize on SQLContext.settings in tests.
Diffstat (limited to 'sql/core/src/main')
| -rw-r--r-- | sql/core/src/main/scala/org/apache/spark/sql/SQLConf.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/SQLConf.scala b/sql/core/src/main/scala/org/apache/spark/sql/SQLConf.scala index 2fe7f94663..3b5abab969 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/SQLConf.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/SQLConf.scala @@ -50,7 +50,7 @@ trait SQLConf { /** ********************** SQLConf functionality methods ************ */ @transient - private val settings = java.util.Collections.synchronizedMap( + protected[sql] val settings = java.util.Collections.synchronizedMap( new java.util.HashMap[String, String]()) def set(props: Properties): Unit = { |