diff options
| author | Andrew Or <andrew@databricks.com> | 2016-04-29 16:41:13 -0700 |
|---|---|---|
| committer | Andrew Or <andrew@databricks.com> | 2016-04-29 16:41:13 -0700 |
| commit | d33e3d572ed7143f151f9c96fd08407f8de340f4 (patch) | |
| tree | 6edbedd9e76ad883c9e9992f95cf3590cb4c1955 /python/pyspark/sql/context.py | |
| parent | 4ae9fe091c2cb8388c581093d62d3deaef40993e (diff) | |
| download | spark-d33e3d572ed7143f151f9c96fd08407f8de340f4.tar.gz spark-d33e3d572ed7143f151f9c96fd08407f8de340f4.tar.bz2 spark-d33e3d572ed7143f151f9c96fd08407f8de340f4.zip | |
[SPARK-14988][PYTHON] SparkSession API follow-ups
## What changes were proposed in this pull request?
Addresses comments in #12765.
## How was this patch tested?
Python tests.
Author: Andrew Or <andrew@databricks.com>
Closes #12784 from andrewor14/python-followup.
Diffstat (limited to 'python/pyspark/sql/context.py')
| -rw-r--r-- | python/pyspark/sql/context.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/python/pyspark/sql/context.py b/python/pyspark/sql/context.py index 94856c245b..417d719c35 100644 --- a/python/pyspark/sql/context.py +++ b/python/pyspark/sql/context.py @@ -127,10 +127,10 @@ class SQLContext(object): >>> sqlContext.getConf("spark.sql.shuffle.partitions") u'200' - >>> sqlContext.getConf("spark.sql.shuffle.partitions", "10") + >>> sqlContext.getConf("spark.sql.shuffle.partitions", u"10") u'10' - >>> sqlContext.setConf("spark.sql.shuffle.partitions", "50") - >>> sqlContext.getConf("spark.sql.shuffle.partitions", "10") + >>> sqlContext.setConf("spark.sql.shuffle.partitions", u"50") + >>> sqlContext.getConf("spark.sql.shuffle.partitions", u"10") u'50' """ return self.sparkSession.getConf(key, defaultValue) @@ -301,7 +301,7 @@ class SQLContext(object): >>> sqlContext.registerDataFrameAsTable(df, "table1") """ - self.sparkSession.catalog.registerDataFrameAsTable(df, tableName) + self.sparkSession.catalog.registerTable(df, tableName) @since(1.6) def dropTempTable(self, tableName): |