Repository: spark
Updated Branches:
refs/heads/master ae6570ec2 -> 721e8b5f3
[SPARK-10904] [SPARKR] Fix to support `select(df, c("col1", "col2"))`
The fix is to coerce `c("a", "b")` into a list such that it could be serialized to call JVM with.
Author: felixcheung <fe...@hotmail.com>
Closes #8961 from felixcheung/rselect.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/721e8b5f
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/721e8b5f
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/721e8b5f
Branch: refs/heads/master
Commit: 721e8b5f35b230ff426c1757a9bdc1399fb19afa
Parents: ae6570e
Author: felixcheung <fe...@hotmail.com>
Authored: Sat Oct 3 22:42:36 2015 -0700
Committer: Shivaram Venkataraman <sh...@cs.berkeley.edu>
Committed: Sat Oct 3 22:42:36 2015 -0700
----------------------------------------------------------------------
R/pkg/R/DataFrame.R | 18 +++++++++++++-----
R/pkg/inst/tests/test_sparkSQL.R | 9 ++++++++-
2 files changed, 21 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/721e8b5f/R/pkg/R/DataFrame.R
----------------------------------------------------------------------
diff --git a/R/pkg/R/DataFrame.R b/R/pkg/R/DataFrame.R
index 65e368c..14aea92 100644
--- a/R/pkg/R/DataFrame.R
+++ b/R/pkg/R/DataFrame.R
@@ -1075,12 +1075,20 @@ setMethod("subset", signature(x = "DataFrame"),
#' select(df, c("col1", "col2"))
#' select(df, list(df$name, df$age + 1))
#' # Similar to R data frames columns can also be selected using `$`
-#' df$age
+#' df[,df$age]
#' }
setMethod("select", signature(x = "DataFrame", col = "character"),
function(x, col, ...) {
- sdf <- callJMethod(x@sdf, "select", col, list(...))
- dataFrame(sdf)
+ if (length(col) > 1) {
+ if (length(list(...)) > 0) {
+ stop("To select multiple columns, use a character vector or list for col")
+ }
+
+ select(x, as.list(col))
+ } else {
+ sdf <- callJMethod(x@sdf, "select", col, list(...))
+ dataFrame(sdf)
+ }
})
#' @rdname select
@@ -1853,13 +1861,13 @@ setMethod("crosstab",
#' This function downloads the contents of a DataFrame into an R's data.frame.
#' Since data.frames are held in memory, ensure that you have enough memory
#' in your system to accommodate the contents.
-#'
+#'
#' @title Download data from a DataFrame into a data.frame
#' @param x a DataFrame
#' @return a data.frame
#' @rdname as.data.frame
#' @examples \dontrun{
-#'
+#'
#' irisDF <- createDataFrame(sqlContext, iris)
#' df <- as.data.frame(irisDF[irisDF$Species == "setosa", ])
#' }
http://git-wip-us.apache.org/repos/asf/spark/blob/721e8b5f/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 8f85eec..faf42b7 100644
--- a/R/pkg/inst/tests/test_sparkSQL.R
+++ b/R/pkg/inst/tests/test_sparkSQL.R
@@ -673,6 +673,13 @@ test_that("select with column", {
expect_equal(columns(df3), c("x"))
expect_equal(count(df3), 3)
expect_equal(collect(select(df3, "x"))[[1, 1]], "x")
+
+ df4 <- select(df, c("name", "age"))
+ expect_equal(columns(df4), c("name", "age"))
+ expect_equal(count(df4), 3)
+
+ expect_error(select(df, c("name", "age"), "name"),
+ "To select multiple columns, use a character vector or list for col")
})
test_that("subsetting", {
@@ -1336,4 +1343,4 @@ test_that("Method as.data.frame as a synonym for collect()", {
unlink(parquetPath)
unlink(jsonPath)
-unlink(jsonPathNa)
\ No newline at end of file
+unlink(jsonPathNa)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org