diff options
author | Yin Huai <yhuai@databricks.com> | 2016-06-16 17:06:24 -0700 |
---|---|---|
committer | Shixiong Zhu <shixiong@databricks.com> | 2016-06-16 17:06:24 -0700 |
commit | d9c6628c47de547dc537310e3c775c7f3e0e4a12 (patch) | |
tree | 44d897bb65296bb52bdee0a3f306bbf224740c53 /examples | |
parent | 62d2fa5e996d428caaea005041b17ec115473762 (diff) | |
download | spark-d9c6628c47de547dc537310e3c775c7f3e0e4a12.tar.gz spark-d9c6628c47de547dc537310e3c775c7f3e0e4a12.tar.bz2 spark-d9c6628c47de547dc537310e3c775c7f3e0e4a12.zip |
[SPARK-15991] SparkContext.hadoopConfiguration should be always the base of hadoop conf created by SessionState
## What changes were proposed in this pull request?
Before this patch, after a SparkSession has been created, hadoop conf set directly to SparkContext.hadoopConfiguration will not affect the hadoop conf created by SessionState. This patch makes the change to always use SparkContext.hadoopConfiguration as the base.
This patch also changes the behavior of hive-site.xml support added in https://github.com/apache/spark/pull/12689/. With this patch, we will load hive-site.xml to SparkContext.hadoopConfiguration.
## How was this patch tested?
New test in SparkSessionBuilderSuite.
Author: Yin Huai <yhuai@databricks.com>
Closes #13711 from yhuai/SPARK-15991.
Diffstat (limited to 'examples')
0 files changed, 0 insertions, 0 deletions