Repository: incubator-toree Updated Branches: refs/heads/0.1.x c86593fb2 -> 51fa49cb5
Fixed bad method reference in SparkR runner Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/51fa49cb Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/51fa49cb Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/51fa49cb Branch: refs/heads/0.1.x Commit: 51fa49cb5898e0c5b7824f986382436b969cabc7 Parents: c86593f Author: Chip Senkbeil <chip.senkb...@gmail.com> Authored: Thu Feb 16 10:46:33 2017 -0600 Committer: Chip Senkbeil <chip.senkb...@gmail.com> Committed: Thu Feb 16 10:46:33 2017 -0600 ---------------------------------------------------------------------- sparkr-interpreter/src/main/resources/kernelR/sparkr_runner.R | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/51fa49cb/sparkr-interpreter/src/main/resources/kernelR/sparkr_runner.R ---------------------------------------------------------------------- diff --git a/sparkr-interpreter/src/main/resources/kernelR/sparkr_runner.R b/sparkr-interpreter/src/main/resources/kernelR/sparkr_runner.R index fbf2881..a76aa06 100644 --- a/sparkr-interpreter/src/main/resources/kernelR/sparkr_runner.R +++ b/sparkr-interpreter/src/main/resources/kernelR/sparkr_runner.R @@ -30,11 +30,6 @@ script.name <- sub( script.basename <- dirname(script.name) setwd(script.basename) -# TODO: Use this library instead of the forked SparkR once they either -# a) allow us to connect and use an existing Spark Context -# b) allow us to have access to the .sparkREnv to do our own work -# -# and provide access in some form to the methods used to access the JVM # Add the SparkR library to our list .libPaths(c(file.path(Sys.getenv("SPARK_HOME"), "R", "lib"), .libPaths())) library(SparkR) @@ -45,7 +40,7 @@ source("sparkr_runner_utils.R") rm(".sparkRcon", envir = .sparkREnv) sparkR.connect <- function() { - if (connExists(.sparkREnv)) { + if (SparkR:::connExists(.sparkREnv)) { print("Connection to SparkR backend has already been established!") return() }