diff options
| author | Andrew Or <andrew@databricks.com> | 2016-04-29 20:46:07 -0700 |
|---|---|---|
| committer | Yin Huai <yhuai@databricks.com> | 2016-04-29 20:46:07 -0700 |
| commit | 66773eb8a55bfe6437dd4096c2c55685aca29dcd (patch) | |
| tree | 35e6a60ea8d70b2bc487c607ae605b9df4a05576 /python/pyspark/sql/tests.py | |
| parent | b056e8cb0a7c58c3e4d199af3ee13be50305b747 (diff) | |
| download | spark-66773eb8a55bfe6437dd4096c2c55685aca29dcd.tar.gz spark-66773eb8a55bfe6437dd4096c2c55685aca29dcd.tar.bz2 spark-66773eb8a55bfe6437dd4096c2c55685aca29dcd.zip | |
[SPARK-15012][SQL] Simplify configuration API further
## What changes were proposed in this pull request?
1. Remove all the `spark.setConf` etc. Just expose `spark.conf`
2. Make `spark.conf` take in things set in the core `SparkConf` as well, otherwise users may get confused
This was done for both the Python and Scala APIs.
## How was this patch tested?
`SQLConfSuite`, python tests.
This one fixes the failed tests in #12787
Closes #12787
Author: Andrew Or <andrew@databricks.com>
Author: Yin Huai <yhuai@databricks.com>
Closes #12798 from yhuai/conf-api.
Diffstat (limited to 'python/pyspark/sql/tests.py')
| -rw-r--r-- | python/pyspark/sql/tests.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/python/pyspark/sql/tests.py b/python/pyspark/sql/tests.py index ea98206836..4995b263e1 100644 --- a/python/pyspark/sql/tests.py +++ b/python/pyspark/sql/tests.py @@ -1397,9 +1397,9 @@ class SQLTests(ReusedPySparkTestCase): def test_conf(self): spark = self.sparkSession - spark.setConf("bogo", "sipeo") + spark.conf.set("bogo", "sipeo") self.assertEqual(self.sparkSession.conf.get("bogo"), "sipeo") - spark.setConf("bogo", "ta") + spark.conf.set("bogo", "ta") self.assertEqual(spark.conf.get("bogo"), "ta") self.assertEqual(spark.conf.get("bogo", "not.read"), "ta") self.assertEqual(spark.conf.get("not.set", "ta"), "ta") |