diff options
| author | Davies Liu <davies@databricks.com> | 2015-04-08 13:31:45 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@databricks.com> | 2015-04-08 13:31:45 -0700 |
| commit | 6ada4f6f52cf1d992c7ab0c32318790cf08b0a0d (patch) | |
| tree | 495c9bb86bb98de40365538bebcf9144547d8cce /python/pyspark/ml/feature.py | |
| parent | 66159c35010af35098dd1ec75475bb5d4d0fd6ca (diff) | |
| download | spark-6ada4f6f52cf1d992c7ab0c32318790cf08b0a0d.tar.gz spark-6ada4f6f52cf1d992c7ab0c32318790cf08b0a0d.tar.bz2 spark-6ada4f6f52cf1d992c7ab0c32318790cf08b0a0d.zip | |
[SPARK-6781] [SQL] use sqlContext in python shell
Use `sqlContext` in PySpark shell, make it consistent with SQL programming guide. `sqlCtx` is also kept for compatibility.
Author: Davies Liu <davies@databricks.com>
Closes #5425 from davies/sqlCtx and squashes the following commits:
af67340 [Davies Liu] sqlCtx -> sqlContext
15a278f [Davies Liu] use sqlContext in python shell
Diffstat (limited to 'python/pyspark/ml/feature.py')
| -rw-r--r-- | python/pyspark/ml/feature.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/python/pyspark/ml/feature.py b/python/pyspark/ml/feature.py index 433b4fb5d2..1cfcd019df 100644 --- a/python/pyspark/ml/feature.py +++ b/python/pyspark/ml/feature.py @@ -117,9 +117,9 @@ if __name__ == "__main__": # The small batch size here ensures that we see multiple batches, # even in these small test examples: sc = SparkContext("local[2]", "ml.feature tests") - sqlCtx = SQLContext(sc) + sqlContext = SQLContext(sc) globs['sc'] = sc - globs['sqlCtx'] = sqlCtx + globs['sqlContext'] = sqlContext (failure_count, test_count) = doctest.testmod( globs=globs, optionflags=doctest.ELLIPSIS) sc.stop() |