Repository: spark Updated Branches: refs/heads/master 962e9bcf9 -> 8f13cd4cc
[SPARK-12707][SPARK SUBMIT] Remove submit python/R scripts through py⦠â¦spark/sparkR Author: Jeff Zhang <zjf...@apache.org> Closes #10658 from zjffdu/SPARK-12707. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/8f13cd4c Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/8f13cd4c Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/8f13cd4c Branch: refs/heads/master Commit: 8f13cd4cc8dcf638b178774418669a2e247d0652 Parents: 962e9bc Author: Jeff Zhang <zjf...@apache.org> Authored: Wed Jan 13 23:50:08 2016 -0800 Committer: Reynold Xin <r...@databricks.com> Committed: Wed Jan 13 23:50:08 2016 -0800 ---------------------------------------------------------------------- .../spark/launcher/SparkSubmitCommandBuilder.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/8f13cd4c/launcher/src/main/java/org/apache/spark/launcher/SparkSubmitCommandBuilder.java ---------------------------------------------------------------------- diff --git a/launcher/src/main/java/org/apache/spark/launcher/SparkSubmitCommandBuilder.java b/launcher/src/main/java/org/apache/spark/launcher/SparkSubmitCommandBuilder.java index a95f0f1..269c89c 100644 --- a/launcher/src/main/java/org/apache/spark/launcher/SparkSubmitCommandBuilder.java +++ b/launcher/src/main/java/org/apache/spark/launcher/SparkSubmitCommandBuilder.java @@ -231,11 +231,9 @@ class SparkSubmitCommandBuilder extends AbstractCommandBuilder { // the pyspark command line, then run it using spark-submit. if (!appArgs.isEmpty() && appArgs.get(0).endsWith(".py")) { System.err.println( - "WARNING: Running python applications through 'pyspark' is deprecated as of Spark 1.0.\n" + + "Running python applications through 'pyspark' is not supported as of Spark 2.0.\n" + "Use ./bin/spark-submit <python file>"); - appResource = appArgs.get(0); - appArgs.remove(0); - return buildCommand(env); + System.exit(-1); } checkArgument(appArgs.isEmpty(), "pyspark does not support any application options."); @@ -258,9 +256,10 @@ class SparkSubmitCommandBuilder extends AbstractCommandBuilder { private List<String> buildSparkRCommand(Map<String, String> env) throws IOException { if (!appArgs.isEmpty() && appArgs.get(0).endsWith(".R")) { - appResource = appArgs.get(0); - appArgs.remove(0); - return buildCommand(env); + System.err.println( + "Running R applications through 'sparkR' is not supported as of Spark 2.0.\n" + + "Use ./bin/spark-submit <R file>"); + System.exit(-1); } // When launching the SparkR shell, store the spark-submit arguments in the SPARKR_SUBMIT_ARGS // env variable. --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
