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 2016/04/20 04:57:05 UTC
spark git commit: [SPARK-13905][SPARKR] Change signature of
as.data.frame() to be consistent with the R base package.
Repository: spark
Updated Branches:
refs/heads/master 4514aebd1 -> 8eedf0b55
[SPARK-13905][SPARKR] Change signature of as.data.frame() to be consistent with the R base package.
## What changes were proposed in this pull request?
Change the signature of as.data.frame() to be consistent with that in the R base package to meet R user's convention.
## How was this patch tested?
dev/lint-r
SparkR unit tests
Author: Sun Rui <ru...@intel.com>
Closes #11811 from sun-rui/SPARK-13905.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/8eedf0b5
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/8eedf0b5
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/8eedf0b5
Branch: refs/heads/master
Commit: 8eedf0b553180d0e958b0fb49bc2fee81658495c
Parents: 4514aeb
Author: Sun Rui <ru...@intel.com>
Authored: Tue Apr 19 19:57:03 2016 -0700
Committer: Shivaram Venkataraman <sh...@cs.berkeley.edu>
Committed: Tue Apr 19 19:57:03 2016 -0700
----------------------------------------------------------------------
R/pkg/R/DataFrame.R | 8 ++------
R/pkg/R/generics.R | 5 ++++-
R/pkg/inst/tests/testthat/test_context.R | 2 +-
R/pkg/inst/tests/testthat/test_sparkSQL.R | 3 +++
4 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/8eedf0b5/R/pkg/R/DataFrame.R
----------------------------------------------------------------------
diff --git a/R/pkg/R/DataFrame.R b/R/pkg/R/DataFrame.R
index ddb056f..95e2eb2 100644
--- a/R/pkg/R/DataFrame.R
+++ b/R/pkg/R/DataFrame.R
@@ -2296,12 +2296,8 @@ setMethod("fillna",
#' }
setMethod("as.data.frame",
signature(x = "DataFrame"),
- function(x, ...) {
- # Check if additional parameters have been passed
- if (length(list(...)) > 0) {
- stop(paste("Unused argument(s): ", paste(list(...), collapse = ", ")))
- }
- collect(x)
+ function(x, row.names = NULL, optional = FALSE, ...) {
+ as.data.frame(collect(x), row.names, optional, ...)
})
#' The specified DataFrame is attached to the R search path. This means that
http://git-wip-us.apache.org/repos/asf/spark/blob/8eedf0b5/R/pkg/R/generics.R
----------------------------------------------------------------------
diff --git a/R/pkg/R/generics.R b/R/pkg/R/generics.R
index 4ef05d5..a71be55 100644
--- a/R/pkg/R/generics.R
+++ b/R/pkg/R/generics.R
@@ -397,7 +397,10 @@ setGeneric("arrange", function(x, col, ...) { standardGeneric("arrange") })
#' @rdname as.data.frame
#' @export
-setGeneric("as.data.frame")
+setGeneric("as.data.frame",
+ function(x, row.names = NULL, optional = FALSE, ...) {
+ standardGeneric("as.data.frame")
+ })
#' @rdname attach
#' @export
http://git-wip-us.apache.org/repos/asf/spark/blob/8eedf0b5/R/pkg/inst/tests/testthat/test_context.R
----------------------------------------------------------------------
diff --git a/R/pkg/inst/tests/testthat/test_context.R b/R/pkg/inst/tests/testthat/test_context.R
index 6e06c97..9f51161 100644
--- a/R/pkg/inst/tests/testthat/test_context.R
+++ b/R/pkg/inst/tests/testthat/test_context.R
@@ -26,7 +26,7 @@ test_that("Check masked functions", {
maskedBySparkR <- masked[funcSparkROrEmpty]
namesOfMasked <- c("describe", "cov", "filter", "lag", "na.omit", "predict", "sd", "var",
"colnames", "colnames<-", "intersect", "rank", "rbind", "sample", "subset",
- "summary", "transform", "drop", "window")
+ "summary", "transform", "drop", "window", "as.data.frame")
expect_equal(length(maskedBySparkR), length(namesOfMasked))
expect_equal(sort(maskedBySparkR), sort(namesOfMasked))
# above are those reported as masked when `library(SparkR)`
http://git-wip-us.apache.org/repos/asf/spark/blob/8eedf0b5/R/pkg/inst/tests/testthat/test_sparkSQL.R
----------------------------------------------------------------------
diff --git a/R/pkg/inst/tests/testthat/test_sparkSQL.R b/R/pkg/inst/tests/testthat/test_sparkSQL.R
index d747d4f..2f65484 100644
--- a/R/pkg/inst/tests/testthat/test_sparkSQL.R
+++ b/R/pkg/inst/tests/testthat/test_sparkSQL.R
@@ -1863,6 +1863,9 @@ test_that("Method as.data.frame as a synonym for collect()", {
expect_equal(as.data.frame(irisDF), collect(irisDF))
irisDF2 <- irisDF[irisDF$Species == "setosa", ]
expect_equal(as.data.frame(irisDF2), collect(irisDF2))
+
+ # Make sure as.data.frame in the R base package is not covered
+ expect_that(as.data.frame(c(1, 2)), not(throws_error()))
})
test_that("attach() on a DataFrame", {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org