You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sh...@apache.org on 2015/05/12 06:04:55 UTC
spark git commit: [SPARK-7435] [SPARKR] Make DataFrame.show()
consistent with that of Scala and pySpark
Repository: spark
Updated Branches:
refs/heads/master 028ad4bd2 -> b94a93371
[SPARK-7435] [SPARKR] Make DataFrame.show() consistent with that of Scala and pySpark
Author: Joshi <re...@gmail.com>
Author: Rekha Joshi <re...@gmail.com>
Closes #5989 from rekhajoshm/fix/SPARK-7435 and squashes the following commits:
cfc9e02 [Joshi] Spark-7435[R]: updated patch for review comments
62becc1 [Joshi] SPARK-7435: Update to DataFrame
e3677c9 [Rekha Joshi] Merge pull request #1 from apache/master
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/b94a9337
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/b94a9337
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/b94a9337
Branch: refs/heads/master
Commit: b94a93371cf219a88edee7677d22f1eaefc1ea5b
Parents: 028ad4b
Author: Joshi <re...@gmail.com>
Authored: Mon May 11 21:02:34 2015 -0700
Committer: Shivaram Venkataraman <sh...@cs.berkeley.edu>
Committed: Mon May 11 21:04:32 2015 -0700
----------------------------------------------------------------------
R/pkg/R/DataFrame.R | 7 ++++---
R/pkg/inst/tests/test_sparkSQL.R | 3 ++-
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/b94a9337/R/pkg/R/DataFrame.R
----------------------------------------------------------------------
diff --git a/R/pkg/R/DataFrame.R b/R/pkg/R/DataFrame.R
index 8a9d2dd..2705817 100644
--- a/R/pkg/R/DataFrame.R
+++ b/R/pkg/R/DataFrame.R
@@ -150,7 +150,7 @@ setMethod("isLocal",
callJMethod(x@sdf, "isLocal")
})
-#' ShowDF
+#' showDF
#'
#' Print the first numRows rows of a DataFrame
#'
@@ -170,7 +170,8 @@ setMethod("isLocal",
setMethod("showDF",
signature(x = "DataFrame"),
function(x, numRows = 20) {
- callJMethod(x@sdf, "showString", numToInt(numRows))
+ s <- callJMethod(x@sdf, "showString", numToInt(numRows))
+ cat(s)
})
#' show
@@ -187,7 +188,7 @@ setMethod("showDF",
#' sqlCtx <- sparkRSQL.init(sc)
#' path <- "path/to/file.json"
#' df <- jsonFile(sqlCtx, path)
-#' show(df)
+#' df
#'}
setMethod("show", "DataFrame",
function(object) {
http://git-wip-us.apache.org/repos/asf/spark/blob/b94a9337/R/pkg/inst/tests/test_sparkSQL.R
----------------------------------------------------------------------
diff --git a/R/pkg/inst/tests/test_sparkSQL.R b/R/pkg/inst/tests/test_sparkSQL.R
index dbb535e..99c2883 100644
--- a/R/pkg/inst/tests/test_sparkSQL.R
+++ b/R/pkg/inst/tests/test_sparkSQL.R
@@ -653,7 +653,8 @@ test_that("toJSON() returns an RDD of the correct values", {
test_that("showDF()", {
df <- jsonFile(sqlCtx, jsonPath)
- expect_output(showDF(df), "+----+-------+\n| age| name|\n+----+-------+\n|null|Michael|\n| 30| Andy|\n| 19| Justin|\n+----+-------+\n")
+ s <- capture.output(showDF(df))
+ expect_output(s , "+----+-------+\n| age| name|\n+----+-------+\n|null|Michael|\n| 30| Andy|\n| 19| Justin|\n+----+-------+\n")
})
test_that("isLocal()", {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org