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/shell.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/shell.py')
| -rw-r--r-- | python/pyspark/shell.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/python/pyspark/shell.py b/python/pyspark/shell.py index 1a02fece9c..81aa970a32 100644 --- a/python/pyspark/shell.py +++ b/python/pyspark/shell.py @@ -53,9 +53,9 @@ atexit.register(lambda: sc.stop()) try: # Try to access HiveConf, it will raise exception if Hive is not added sc._jvm.org.apache.hadoop.hive.conf.HiveConf() - sqlCtx = HiveContext(sc) + sqlCtx = sqlContext = HiveContext(sc) except py4j.protocol.Py4JError: - sqlCtx = SQLContext(sc) + sqlCtx = sqlContext = SQLContext(sc) print("""Welcome to ____ __ @@ -68,7 +68,7 @@ print("Using Python version %s (%s, %s)" % ( platform.python_version(), platform.python_build()[0], platform.python_build()[1])) -print("SparkContext available as sc, %s available as sqlCtx." % sqlCtx.__class__.__name__) +print("SparkContext available as sc, %s available as sqlContext." % sqlContext.__class__.__name__) if add_files is not None: print("Warning: ADD_FILES environment variable is deprecated, use --py-files argument instead") |