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 /docs | |
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 'docs')
-rw-r--r-- | docs/ml-guide.md | 2 | ||||
-rw-r--r-- | docs/sql-programming-guide.md | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/ml-guide.md b/docs/ml-guide.md index c08c76d226..771a07183e 100644 --- a/docs/ml-guide.md +++ b/docs/ml-guide.md @@ -493,7 +493,7 @@ from pyspark.ml.feature import HashingTF, Tokenizer from pyspark.sql import Row, SQLContext sc = SparkContext(appName="SimpleTextClassificationPipeline") -sqlCtx = SQLContext(sc) +sqlContext = SQLContext(sc) # Prepare training documents, which are labeled. LabeledDocument = Row("id", "text", "label") diff --git a/docs/sql-programming-guide.md b/docs/sql-programming-guide.md index 4441d6a000..663f656883 100644 --- a/docs/sql-programming-guide.md +++ b/docs/sql-programming-guide.md @@ -1642,7 +1642,7 @@ moved into the udf object in `SQLContext`. <div data-lang="scala" markdown="1"> {% highlight java %} -sqlCtx.udf.register("strLen", (s: String) => s.length()) +sqlContext.udf.register("strLen", (s: String) => s.length()) {% endhighlight %} </div> @@ -1650,7 +1650,7 @@ sqlCtx.udf.register("strLen", (s: String) => s.length()) <div data-lang="java" markdown="1"> {% highlight java %} -sqlCtx.udf().register("strLen", (String s) -> { s.length(); }); +sqlContext.udf().register("strLen", (String s) -> { s.length(); }); {% endhighlight %} </div> |