Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SPARK-8431][SparkR] Add in operator to DataFrame Column in SparkR #6941

Closed
wants to merge 4 commits into from
Closed

[SPARK-8431][SparkR] Add in operator to DataFrame Column in SparkR #6941

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c196173
[SPARK-8431][SparkR] Add in operator to DataFrame Column in SparkR
yu-iskw Jun 22, 2015
6e37936
Modify a variable name
yu-iskw Jun 22, 2015
f4309a7
Make a `setMethod` for `%in%` be independent
yu-iskw Jun 22, 2015
1f64423
Modify the comment
yu-iskw Jun 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions R/pkg/R/column.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,16 @@ createOperator <- function(op) {
})
}

createInOperator <- function(op) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually we don't need the createInOperator function -- You can just add the setMethod below after cast etc.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see. I will modify soon. Thanks.

setMethod("%in%",
signature(x = "Column"),
function(x, table) {
table <- listToSeq(as.list(table))
jc <- callJMethod(x@jc, "in", table)
return(column(jc))
})
}

createColumnFunction1 <- function(name) {
setMethod(name,
signature(x = "Column"),
Expand Down Expand Up @@ -139,6 +149,7 @@ createBinaryMathfunctions <- function(name) {
}

createMethods <- function() {
createInOperator()
for (op in names(operators)) {
createOperator(op)
}
Expand Down
10 changes: 10 additions & 0 deletions R/pkg/inst/tests/test_sparkSQL.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,6 +693,16 @@ test_that("filter() on a DataFrame", {
filtered2 <- where(df, df$name != "Michael")
expect_true(count(filtered2) == 2)
expect_true(collect(filtered2)$age[2] == 19)

# test suites for %in%
filtered3 <- filter(df, "age in (19)")
expect_equal(count(filtered3), 1)
filtered4 <- filter(df, "age in (19, 30)")
expect_equal(count(filtered4), 2)
filtered5 <- where(df, df$age %in% c(19))
expect_equal(count(filtered5), 1)
filtered6 <- where(df, df$age %in% c(19, 30))
expect_equal(count(filtered6), 2)
})

test_that("join() on a DataFrame", {
Expand Down