Repository: spark Updated Branches: refs/heads/branch-1.4 d3d5f2ab2 -> de49916ab
[SPARK-8894] [SPARKR] [DOC] Example code errors in SparkR documentation. Author: Sun Rui <rui....@intel.com> Closes #7287 from sun-rui/SPARK-8894 and squashes the following commits: da63898 [Sun Rui] [SPARK-8894][SPARKR][DOC] Example code errors in SparkR documentation. (cherry picked from commit bf02e377168f39459d5c216e939097ae5705f573) Signed-off-by: Shivaram Venkataraman <shiva...@cs.berkeley.edu> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/de49916a Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/de49916a Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/de49916a Branch: refs/heads/branch-1.4 Commit: de49916ab61a88566a352a6af02319e44d92930f Parents: d3d5f2a Author: Sun Rui <rui....@intel.com> Authored: Wed Jul 8 09:48:16 2015 -0700 Committer: Shivaram Venkataraman <shiva...@cs.berkeley.edu> Committed: Wed Jul 8 09:48:29 2015 -0700 ---------------------------------------------------------------------- docs/sparkr.md | 2 +- docs/sql-programming-guide.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/de49916a/docs/sparkr.md ---------------------------------------------------------------------- diff --git a/docs/sparkr.md b/docs/sparkr.md index 095ea43..1197c0d 100644 --- a/docs/sparkr.md +++ b/docs/sparkr.md @@ -116,7 +116,7 @@ sql(hiveContext, "CREATE TABLE IF NOT EXISTS src (key INT, value STRING)") sql(hiveContext, "LOAD DATA LOCAL INPATH 'examples/src/main/resources/kv1.txt' INTO TABLE src") # Queries can be expressed in HiveQL. -results <- hiveContext.sql("FROM src SELECT key, value") +results <- sql(hiveContext, "FROM src SELECT key, value") # results is now a DataFrame head(results) http://git-wip-us.apache.org/repos/asf/spark/blob/de49916a/docs/sql-programming-guide.md ---------------------------------------------------------------------- diff --git a/docs/sql-programming-guide.md b/docs/sql-programming-guide.md index 572c678..9c689e9 100644 --- a/docs/sql-programming-guide.md +++ b/docs/sql-programming-guide.md @@ -1518,7 +1518,7 @@ sql(sqlContext, "CREATE TABLE IF NOT EXISTS src (key INT, value STRING)") sql(sqlContext, "LOAD DATA LOCAL INPATH 'examples/src/main/resources/kv1.txt' INTO TABLE src") # Queries can be expressed in HiveQL. -results = sqlContext.sql("FROM src SELECT key, value").collect() +results <- collect(sql(sqlContext, "FROM src SELECT key, value")) {% endhighlight %} --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
