diff options
| author | Joshi <rekhajoshm@gmail.com> | 2015-05-11 21:02:34 -0700 |
|---|---|---|
| committer | Shivaram Venkataraman <shivaram@cs.berkeley.edu> | 2015-05-11 21:04:32 -0700 |
| commit | b94a93371cf219a88edee7677d22f1eaefc1ea5b (patch) | |
| tree | 539143605e2d819f0a553469a386d178ea86c097 /R/pkg | |
| parent | 028ad4bd29106747089bb9a863e9a8dee738770e (diff) | |
| download | spark-b94a93371cf219a88edee7677d22f1eaefc1ea5b.tar.gz spark-b94a93371cf219a88edee7677d22f1eaefc1ea5b.tar.bz2 spark-b94a93371cf219a88edee7677d22f1eaefc1ea5b.zip | |
[SPARK-7435] [SPARKR] Make DataFrame.show() consistent with that of Scala and pySpark
Author: Joshi <rekhajoshm@gmail.com>
Author: Rekha Joshi <rekhajoshm@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
Diffstat (limited to 'R/pkg')
| -rw-r--r-- | R/pkg/R/DataFrame.R | 7 | ||||
| -rw-r--r-- | R/pkg/inst/tests/test_sparkSQL.R | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/R/pkg/R/DataFrame.R b/R/pkg/R/DataFrame.R index 8a9d2dd45c..2705817531 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) { diff --git a/R/pkg/inst/tests/test_sparkSQL.R b/R/pkg/inst/tests/test_sparkSQL.R index dbb535e245..99c28830c6 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()", { |