Skip to content

[SPARK-12158] [SparkR] [SQL] Fix 'sample' functions that break R unit test cases #10160

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

Closed
gatorsmile wants to merge 7 commits into from
Closed

[SPARK-12158] [SparkR] [SQL] Fix 'sample' functions that break R unit test cases #10160

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ec77010
add sample functions with seeds
gatorsmile Dec 5, 2015
2ab89e8
combine two variants
gatorsmile Dec 6, 2015
34d0118
added a test case
gatorsmile Dec 7, 2015
4337c35
simplified the impl of sample_frac
gatorsmile Dec 7, 2015
a78109e
simplified the impl of sample_frac.
gatorsmile Dec 7, 2015
ad3ea31
Merge remote-tracking branch 'upstream/master' into sampleR
gatorsmile Dec 7, 2015
493b368
added a new parm into the comment
gatorsmile Dec 7, 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
16 changes: 10 additions & 6 deletions R/pkg/R/DataFrame.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,13 +677,17 @@ setMethod("unique",
#' collect(sample(df, TRUE, 0.5))
#'}
setMethod("sample",
# TODO : Figure out how to send integer as java.lang.Long to JVM so
# we can send seed as an argument through callJMethod
signature(x = "DataFrame", withReplacement = "logical",
Copy link
Contributor

@sun-rui sun-rui Dec 7, 2015

Choose a reason for hiding this comment

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

don't delete this comment. move it close to as.integer(seed). This is a known limitation of serde now.

Copy link
Member Author

@gatorsmile gatorsmile Dec 7, 2015

Choose a reason for hiding this comment

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

True. Added it back.

fraction = "numeric"),
function(x, withReplacement, fraction) {
function(x, withReplacement, fraction, seed) {
Copy link
Contributor

@shivaram shivaram Dec 7, 2015

Choose a reason for hiding this comment

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

@felixcheung Shouldn't we document this param in the roxygen doc above ? Otherwise how would anybody know we support a seed ?

Copy link
Member

@felixcheung felixcheung Dec 7, 2015

Choose a reason for hiding this comment

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

yes we should add a @param seed above, thanks for catching it

if (fraction < 0.0) stop(cat("Negative fraction value:", fraction))
sdf <- callJMethod(x@sdf, "sample", withReplacement, fraction)
if (!missing(seed)) {
# TODO : Figure out how to send integer as java.lang.Long to JVM so
# we can send seed as an argument through callJMethod
sdf <- callJMethod(x@sdf, "sample", withReplacement, fraction, as.integer(seed))
} else {
sdf <- callJMethod(x@sdf, "sample", withReplacement, fraction)
}
dataFrame(sdf)
})

Expand All @@ -692,8 +696,8 @@ setMethod("sample",
setMethod("sample_frac",
signature(x = "DataFrame", withReplacement = "logical",
fraction = "numeric"),
function(x, withReplacement, fraction) {
sample(x, withReplacement, fraction)
function(x, withReplacement, fraction, seed) {
sample(x, withReplacement, fraction, as.integer(seed))
Copy link
Contributor

@sun-rui sun-rui Dec 7, 2015

Choose a reason for hiding this comment

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

2 space ident. directly pass seed is ok instead of as.integer(seed)?

Copy link
Member Author

@gatorsmile gatorsmile Dec 7, 2015

Choose a reason for hiding this comment

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

Yeah, done! This is my first time to read and write R. : ) Thank you!

})

#' nrow
Expand Down
4 changes: 4 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 @@ -705,6 +705,10 @@ test_that("sample on a DataFrame", {
sampled2 <- sample(df, FALSE, 0.1, 0) # set seed for predictable result
expect_true(count(sampled2) < 3)

count1 <- count(sample(df, FALSE, 0.1, 0))
count2 <- count(sample(df, FALSE, 0.1, 0))
expect_equal(count1, count2)

# Also test sample_frac
sampled3 <- sample_frac(df, FALSE, 0.1, 0) # set seed for predictable result
expect_true(count(sampled3) < 3)
Expand Down