ODIn/spark-instrumented-optimizer
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[SPARK-8063] [SPARKR] Spark master URL conflict between MASTER env variable and --master command line option.

Browse source 
Author: Sun Rui <rui.sun@intel.com>

Closes #6605 from sun-rui/SPARK-8063 and squashes the following commits:

51ca48b [Sun Rui] [SPARK-8063][SPARKR] Spark master URL conflict between MASTER env variable and --master command line option.

(cherry picked from commit 708c63bbbe)
Signed-off-by: Shivaram Venkataraman <shivaram@cs.berkeley.edu>
This commit is contained in:
Sun Rui 2015-06-03 11:56:35 -07:00 committed by Shivaram Venkataraman
parent 0a1dad6cd4
commit f67a27d026
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
R/pkg/inst/profile/shell.R
View file

@ -24,7 +24,7 @@
old <- getOption("defaultPackages")
options(defaultPackages = c(old, "SparkR"))
sc <- SparkR::sparkR.init(Sys.getenv("MASTER", unset = ""))
sc <- SparkR::sparkR.init()
assign("sc", sc, envir=.GlobalEnv)
sqlContext <- SparkR::sparkRSQL.init(sc)
assign("sqlContext", sqlContext, envir=.GlobalEnv)