diff options
| author | Masayoshi TSUZUKI <tsudukim@oss.nttdata.co.jp> | 2014-12-19 19:19:53 -0800 |
|---|---|---|
| committer | Andrew Or <andrew@databricks.com> | 2014-12-19 19:22:42 -0800 |
| commit | 8d932475e6759e869c16ce6cac203a2e56558716 (patch) | |
| tree | aab671a7f8a14c7e9ea3b48b4e0c0fe697124a32 /bin/spark-shell2.cmd | |
| parent | c25c669d95293ce7f72f2758d6737fabd0d4390a (diff) | |
| download | spark-8d932475e6759e869c16ce6cac203a2e56558716.tar.gz spark-8d932475e6759e869c16ce6cac203a2e56558716.tar.bz2 spark-8d932475e6759e869c16ce6cac203a2e56558716.zip | |
[SPARK-3060] spark-shell.cmd doesn't accept application options in Windows OS
Added equivalent module as utils.sh and modified spark-shell2.cmd to use it to parse options.
Now we can use application options.
ex) `bin\spark-shell.cmd --master spark://master:7077 -i path\to\script.txt`
Author: Masayoshi TSUZUKI <tsudukim@oss.nttdata.co.jp>
Closes #3350 from tsudukim/feature/SPARK-3060 and squashes the following commits:
4551e56 [Masayoshi TSUZUKI] Modified too long line which defines the submission options to pass findstr command.
3a11361 [Masayoshi TSUZUKI] [SPARK-3060] spark-shell.cmd doesn't accept application options in Windows OS
Diffstat (limited to 'bin/spark-shell2.cmd')
| -rw-r--r-- | bin/spark-shell2.cmd | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/bin/spark-shell2.cmd b/bin/spark-shell2.cmd index 2ee60b4e2a..1d1a40da31 100644 --- a/bin/spark-shell2.cmd +++ b/bin/spark-shell2.cmd @@ -19,4 +19,23 @@ rem set SPARK_HOME=%~dp0.. -cmd /V /E /C %SPARK_HOME%\bin\spark-submit.cmd --class org.apache.spark.repl.Main %* spark-shell +echo "%*" | findstr " --help -h" >nul +if %ERRORLEVEL% equ 0 ( + call :usage + exit /b 0 +) + +call %SPARK_HOME%\bin\windows-utils.cmd %* +if %ERRORLEVEL% equ 1 ( + call :usage + exit /b 1 +) + +cmd /V /E /C %SPARK_HOME%\bin\spark-submit.cmd --class org.apache.spark.repl.Main %SUBMISSION_OPTS% spark-shell %APPLICATION_OPTS% + +exit /b 0 + +:usage +echo "Usage: .\bin\spark-shell.cmd [options]" >&2 +%SPARK_HOME%\bin\spark-submit --help 2>&1 | findstr /V "Usage" 1>&2 +exit /b 0 |