Spark-7435[R]: updated patch for review comments

R/pkg/R/DataFrame.R

@@ -147,46 +147,47 @@ setMethod("isLocal",
             callJMethod(x@sdf, "isLocal")
           })
 
-#' show
+#' showDF
 #'
 #' Print the first numRows rows of a DataFrame
 #'
 #' @param x A SparkSQL DataFrame
 #' @param numRows The number of rows to print. Defaults to 20.
 #'
-#' @rdname show
+#' @rdname showDF
 #' @export
 #' @examples
 #'\dontrun{
 #' sc <- sparkR.init()
 #' sqlCtx <- sparkRSQL.init(sc)
 #' path <- "path/to/file.json"
 #' df <- jsonFile(sqlCtx, path)
-#' show(df)
+#' showDF(df)
 #'}
-setMethod("show",
+setMethod("showDF",
           signature(x = "DataFrame"),
           function(x, numRows = 20) {
-            callJMethod(x@sdf, "showString", numToInt(numRows))
+            s <- callJMethod(x@sdf, "showString", numToInt(numRows))
+            cat(s)
           })
 
-#' showDF
+#' show
 #'
 #' Print the DataFrame column names and types
 #'
 #' @param x A SparkSQL DataFrame
 #'
-#' @rdname showDF
+#' @rdname show
 #' @export
 #' @examples
 #'\dontrun{
 #' sc <- sparkR.init()
 #' sqlCtx <- sparkRSQL.init(sc)
 #' path <- "path/to/file.json"
 #' df <- jsonFile(sqlCtx, path)
-#' showDF
+#' show
 #'}
-setMethod("showDF", "DataFrame",
+setMethod("show", "DataFrame",
           function(object) {
             cols <- lapply(dtypes(object), function(l) {
               paste(l, collapse = ":")

R/pkg/inst/tests/test_sparkSQL.R

@@ -639,9 +639,10 @@ test_that("toJSON() returns an RDD of the correct values", {
   expect_equal(collect(testRDD)[[1]], mockLines[1])
 })
 
-test_that("show()", {
+test_that("showDF()", {
   df <- jsonFile(sqlCtx, jsonPath)
-  expect_output(show(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()", {