Repository: spark Updated Branches: refs/heads/master 0451b0014 -> fab710a91
[SPARK-11414][SPARKR] Forgot to update usage of 'spark.sparkr.r.command' in RRDD in the PR for SPARK-10971. Author: Sun Rui <rui....@intel.com> Closes #9368 from sun-rui/SPARK-11414. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/fab710a9 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/fab710a9 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/fab710a9 Branch: refs/heads/master Commit: fab710a9171932f01ac81d100db8523dbd314925 Parents: 0451b00 Author: Sun Rui <rui....@intel.com> Authored: Fri Oct 30 10:51:11 2015 -0700 Committer: Shivaram Venkataraman <shiva...@cs.berkeley.edu> Committed: Fri Oct 30 10:51:11 2015 -0700 ---------------------------------------------------------------------- core/src/main/scala/org/apache/spark/api/r/RRDD.scala | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/fab710a9/core/src/main/scala/org/apache/spark/api/r/RRDD.scala ---------------------------------------------------------------------- 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 index 9d5bbb5..6b418e9 100644 --- a/core/src/main/scala/org/apache/spark/api/r/RRDD.scala +++ b/core/src/main/scala/org/apache/spark/api/r/RRDD.scala @@ -392,7 +392,12 @@ private[r] object RRDD { } private def createRProcess(port: Int, script: String): BufferedStreamThread = { - val rCommand = SparkEnv.get.conf.get("spark.sparkr.r.command", "Rscript") + // "spark.sparkr.r.command" is deprecated and replaced by "spark.r.command", + // but kept here for backward compatibility. + val sparkConf = SparkEnv.get.conf + var rCommand = sparkConf.get("spark.sparkr.r.command", "Rscript") + rCommand = sparkConf.get("spark.r.command", rCommand) + val rOptions = "--vanilla" val rLibDir = RUtils.sparkRPackagePath(isDriver = false) val rExecScript = rLibDir + "/SparkR/worker/" + script --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org