From dc4ba6cd813d91622032508e6696b6f56fb19bd9 Mon Sep 17 00:00:00 2001 From: Felix Cheung Date: Sun, 11 Nov 2018 10:30:11 -0800 Subject: [PATCH 1/5] fix --- R/pkg/vignettes/sparkr-vignettes.Rmd | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/R/pkg/vignettes/sparkr-vignettes.Rmd b/R/pkg/vignettes/sparkr-vignettes.Rmd index 7d924efa9d4bb..9d6c8e372e272 100644 --- a/R/pkg/vignettes/sparkr-vignettes.Rmd +++ b/R/pkg/vignettes/sparkr-vignettes.Rmd @@ -57,6 +57,18 @@ First, let's load and attach the package. library(SparkR) ``` +```{r, include=FALSE} +# disable eval if java version not supported +enable_eval <- tryCatch(is.numeric(SparkR:::checkJavaVersion()), + error = function(e) { FALSE }, + warning = function(e) { FALSE }) + +opts_hooks$set(eval = function(options) { + options$eval = enable_eval + options +}) +``` + `SparkSession` is the entry point into SparkR which connects your R program to a Spark cluster. You can create a `SparkSession` using `sparkR.session` and pass in options such as the application name, any Spark packages depended on, etc. We use default settings in which it runs in local mode. It auto downloads Spark package in the background if no previous installation is found. For more details about setup, see [Spark Session](#SetupSparkSession). From 612b594f89937760a410d7fb7a0f29e805062e77 Mon Sep 17 00:00:00 2001 From: Felix Cheung Date: Sun, 11 Nov 2018 10:40:56 -0800 Subject: [PATCH 2/5] update --- R/pkg/vignettes/sparkr-vignettes.Rmd | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/R/pkg/vignettes/sparkr-vignettes.Rmd b/R/pkg/vignettes/sparkr-vignettes.Rmd index 9d6c8e372e272..76aa89661675f 100644 --- a/R/pkg/vignettes/sparkr-vignettes.Rmd +++ b/R/pkg/vignettes/sparkr-vignettes.Rmd @@ -59,12 +59,14 @@ library(SparkR) ```{r, include=FALSE} # disable eval if java version not supported -enable_eval <- tryCatch(is.numeric(SparkR:::checkJavaVersion()), - error = function(e) { FALSE }, - warning = function(e) { FALSE }) +override_eval <- tryCatch(!is.numeric(SparkR:::checkJavaVersion()), + error = function(e) { TRUE }, + warning = function(e) { TRUE }) opts_hooks$set(eval = function(options) { - options$eval = enable_eval + if (override_eval) { + options$eval = FALSE + } options }) ``` From 63e3b6f000de2bb1bd58078da79e3acad24a126b Mon Sep 17 00:00:00 2001 From: Felix Cheung Date: Sun, 11 Nov 2018 11:44:38 -0800 Subject: [PATCH 3/5] avoid overwrite windows set hook --- R/pkg/vignettes/sparkr-vignettes.Rmd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/R/pkg/vignettes/sparkr-vignettes.Rmd b/R/pkg/vignettes/sparkr-vignettes.Rmd index 76aa89661675f..f80b45b4f36a8 100644 --- a/R/pkg/vignettes/sparkr-vignettes.Rmd +++ b/R/pkg/vignettes/sparkr-vignettes.Rmd @@ -63,12 +63,12 @@ override_eval <- tryCatch(!is.numeric(SparkR:::checkJavaVersion()), error = function(e) { TRUE }, warning = function(e) { TRUE }) -opts_hooks$set(eval = function(options) { - if (override_eval) { +if (override_eval) { + opts_hooks$set(eval = function(options) { options$eval = FALSE - } - options -}) + options + }) +} ``` `SparkSession` is the entry point into SparkR which connects your R program to a Spark cluster. You can create a `SparkSession` using `sparkR.session` and pass in options such as the application name, any Spark packages depended on, etc. From 385eb3f03485ea212c1f3a17b6a114db21e25e35 Mon Sep 17 00:00:00 2001 From: Felix Cheung Date: Sun, 11 Nov 2018 15:07:37 -0800 Subject: [PATCH 4/5] test --- R/pkg/vignettes/sparkr-vignettes.Rmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/pkg/vignettes/sparkr-vignettes.Rmd b/R/pkg/vignettes/sparkr-vignettes.Rmd index f80b45b4f36a8..de561125c166e 100644 --- a/R/pkg/vignettes/sparkr-vignettes.Rmd +++ b/R/pkg/vignettes/sparkr-vignettes.Rmd @@ -59,7 +59,7 @@ library(SparkR) ```{r, include=FALSE} # disable eval if java version not supported -override_eval <- tryCatch(!is.numeric(SparkR:::checkJavaVersion()), +override_eval <- tryCatch(stop("test"), error = function(e) { TRUE }, warning = function(e) { TRUE }) From 6dd4329ed214c73aac9d1725769aaaca306a7c91 Mon Sep 17 00:00:00 2001 From: Felix Cheung Date: Sun, 11 Nov 2018 15:18:32 -0800 Subject: [PATCH 5/5] undo test --- R/pkg/vignettes/sparkr-vignettes.Rmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/pkg/vignettes/sparkr-vignettes.Rmd b/R/pkg/vignettes/sparkr-vignettes.Rmd index de561125c166e..f80b45b4f36a8 100644 --- a/R/pkg/vignettes/sparkr-vignettes.Rmd +++ b/R/pkg/vignettes/sparkr-vignettes.Rmd @@ -59,7 +59,7 @@ library(SparkR) ```{r, include=FALSE} # disable eval if java version not supported -override_eval <- tryCatch(stop("test"), +override_eval <- tryCatch(!is.numeric(SparkR:::checkJavaVersion()), error = function(e) { TRUE }, warning = function(e) { TRUE })