add spark.sparkr.r.command config parameter

msannell · msannell · commit 7eac1427392b · 2015-06-01T12:14:33.000-07:00
diff --git a/core/src/main/scala/org/apache/spark/api/r/RRDD.scala b/core/src/main/scala/org/apache/spark/api/r/RRDD.scala
@@ -388,7 +388,7 @@ private[r] object RRDD {
   }
 
   private def createRProcess(rLibDir: String, port: Int, script: String): BufferedStreamThread = {
-    val rCommand = "Rscript"
+    val rCommand = SparkEnv.get.conf.get("spark.sparkr.r.command", "Rscript")
     val rOptions = "--vanilla"
     val rExecScript = rLibDir + "/SparkR/worker/" + script
     val pb = new ProcessBuilder(List(rCommand, rOptions, rExecScript))

Original file line number	Diff line number	Diff line change
`@@ -388,7 +388,7 @@ private[r] object RRDD {`
`388`	`388`	`}`
`389`	`389`
`390`	`390`	`private def createRProcess(rLibDir: String, port: Int, script: String): BufferedStreamThread = {`
`391`		`- val rCommand = "Rscript"`
	`391`	`+ val rCommand = SparkEnv.get.conf.get("spark.sparkr.r.command", "Rscript")`
`392`	`392`	`val rOptions = "--vanilla"`
`393`	`393`	`val rExecScript = rLibDir + "/SparkR/worker/" + script`
`394`	`394`	`val pb = new ProcessBuilder(List(rCommand, rOptions, rExecScript))`