Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
12 changes: 10 additions & 2 deletions R/pkg/inst/tests/testthat/test_basic.R
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@
context("basic tests for CRAN")

test_that("create DataFrame from list or data.frame", {
sparkR.session(master = sparkRTestMaster, enableHiveSupport = FALSE)
r_tmp_dir <- tempdir()
tmp_arg <- paste("-Djava.io.tmpdir=", r_tmp_dir, sep = "")
Copy link
Member

Choose a reason for hiding this comment

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

nit: paste0

sparkR.session(master = sparkRTestMaster, enableHiveSupport = FALSE,
sparkConfig = list(spark.driver.extraJavaOptions = tmp_arg,
spark.executor.extraJavaOptions = tmp_arg))

i <- 4
df <- createDataFrame(data.frame(dummy = 1:i))
Expand Down Expand Up @@ -49,7 +53,11 @@ test_that("create DataFrame from list or data.frame", {
})

test_that("spark.glm and predict", {
sparkR.session(master = sparkRTestMaster, enableHiveSupport = FALSE)
r_tmp_dir <- tempdir()
tmp_arg <- paste("-Djava.io.tmpdir=", r_tmp_dir, sep = "")
sparkR.session(master = sparkRTestMaster, enableHiveSupport = FALSE,
sparkConfig = list(spark.driver.extraJavaOptions = tmp_arg,
spark.executor.extraJavaOptions = tmp_arg))

training <- suppressWarnings(createDataFrame(iris))
# gaussian family
Expand Down
4 changes: 4 additions & 0 deletions R/pkg/tests/run-all.R
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ sparkRFilesBefore <- list.files(path = sparkRDir, all.files = TRUE)
sparkRTestMaster <- "local[1]"
if (identical(Sys.getenv("NOT_CRAN"), "true")) {
sparkRTestMaster <- ""
} else {
# Disable hsperfdata on CRAN
old_java_opt <- Sys.getenv("_JAVA_OPTIONS")
Sys.setenv("_JAVA_OPTIONS"=paste("-XX:-UsePerfData", old_java_opt, sep=" "))
Copy link
Member

Choose a reason for hiding this comment

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

I think perhaps it'd better to set spark.driver.extraJavaOptions and spark.executor.extraJavaOptions (use a variable to store its value, as in sparkRTestMaster, or like in vignettes, sparkSessionConfig)

btw, I think the convention is camelCase variables :)

Copy link
Member

Choose a reason for hiding this comment

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

also sep=" " is the default

Copy link
Member

Choose a reason for hiding this comment

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

space between variable/value
"_JAVA_OPTIONS" = paste("-XX:-UsePerfData", old_java_opt, sep = " "
we should have a lintr rule that detects this at one point..

}

test_package("SparkR")
Expand Down
8 changes: 7 additions & 1 deletion R/pkg/vignettes/sparkr-vignettes.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ opts_hooks$set(eval = function(options) {
}
options
})
r_tmp_dir <- tempdir()
tmp_arg <- paste("-Djava.io.tmpdir=", r_tmp_dir, sep = "")
sparkSessionConfig <- list(spark.driver.extraJavaOptions = tmp_arg,
spark.executor.extraJavaOptions = tmp_arg)
old_java_opt <- Sys.getenv("_JAVA_OPTIONS")
new_java_opt <- Sys.setenv("_JAVA_OPTIONS"=paste("-XX:-UsePerfData", old_java_opt, sep = " "))
Copy link
Member

Choose a reason for hiding this comment

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

don't need new_java_opt?

```

## Overview
Expand All @@ -57,7 +63,7 @@ We use default settings in which it runs in local mode. It auto downloads Spark

```{r, include=FALSE}
install.spark()
sparkR.session(master = "local[1]")
sparkR.session(master = "local[1]", sparkConfig = sparkSessionConfig, enableHiveSupport = FALSE)
Copy link
Member

Choose a reason for hiding this comment

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

hmm, good catch on enableHiveSupport I think this should be fine

```
```{r, eval=FALSE}
sparkR.session()
Expand Down