Skip to content

Commit

Permalink
[SPARK-22597][SQL] Add spark-sql cmd script for Windows users
Browse files Browse the repository at this point in the history
## What changes were proposed in this pull request?

This PR proposes to add cmd scripts so that Windows users can also run `spark-sql` script.

## How was this patch tested?

Manually tested on Windows.

**Before**

```cmd
C:\...\spark>.\bin\spark-sql
'.\bin\spark-sql' is not recognized as an internal or external command,
operable program or batch file.

C:\...\spark>.\bin\spark-sql.cmd
'.\bin\spark-sql.cmd' is not recognized as an internal or external command,
operable program or batch file.
```

**After**

```cmd
C:\...\spark>.\bin\spark-sql
...
spark-sql> SELECT 'Hello World !!';
...
Hello World !!
```

Author: hyukjinkwon <[email protected]>

Closes apache#19808 from HyukjinKwon/spark-sql-cmd.
  • Loading branch information
HyukjinKwon authored and cloud-fan committed Nov 24, 2017
1 parent efd0036 commit a1877f4
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 4 deletions.
2 changes: 1 addition & 1 deletion bin/find-spark-home.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ if not "x%PYSPARK_PYTHON%"=="x" (
)

rem If there is python installed, trying to use the root dir as SPARK_HOME
where %PYTHON_RUNNER% > nul 2>$1
where %PYTHON_RUNNER% > nul 2>&1
if %ERRORLEVEL% neq 0 (
if not exist %PYTHON_RUNNER% (
if "x%SPARK_HOME%"=="x" (
Expand Down
2 changes: 1 addition & 1 deletion bin/run-example.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ rem
rem Figure out where the Spark framework is installed
call "%~dp0find-spark-home.cmd"

set _SPARK_CMD_USAGE=Usage: ./bin/run-example [options] example-class [example args]
set _SPARK_CMD_USAGE=Usage: .\bin\run-example [options] example-class [example args]

rem The outermost quotes are used to prevent Windows command line parse error
rem when there are some quotes in parameters, see SPARK-21877.
Expand Down
25 changes: 25 additions & 0 deletions bin/spark-sql.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
@echo off

rem
rem Licensed to the Apache Software Foundation (ASF) under one or more
rem contributor license agreements. See the NOTICE file distributed with
rem this work for additional information regarding copyright ownership.
rem The ASF licenses this file to You under the Apache License, Version 2.0
rem (the "License"); you may not use this file except in compliance with
rem the License. You may obtain a copy of the License at
rem
rem http://www.apache.org/licenses/LICENSE-2.0
rem
rem Unless required by applicable law or agreed to in writing, software
rem distributed under the License is distributed on an "AS IS" BASIS,
rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
rem See the License for the specific language governing permissions and
rem limitations under the License.
rem

rem This is the entry point for running SparkSQL. To avoid polluting the
rem environment, it just launches a new cmd to do the real work.

rem The outermost quotes are used to prevent Windows command line parse error
rem when there are some quotes in parameters, see SPARK-21877.
cmd /V /E /C ""%~dp0spark-sql2.cmd" %*"
25 changes: 25 additions & 0 deletions bin/spark-sql2.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
@echo off

rem
rem Licensed to the Apache Software Foundation (ASF) under one or more
rem contributor license agreements. See the NOTICE file distributed with
rem this work for additional information regarding copyright ownership.
rem The ASF licenses this file to You under the Apache License, Version 2.0
rem (the "License"); you may not use this file except in compliance with
rem the License. You may obtain a copy of the License at
rem
rem http://www.apache.org/licenses/LICENSE-2.0
rem
rem Unless required by applicable law or agreed to in writing, software
rem distributed under the License is distributed on an "AS IS" BASIS,
rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
rem See the License for the specific language governing permissions and
rem limitations under the License.
rem

rem Figure out where the Spark framework is installed
call "%~dp0find-spark-home.cmd"

set _SPARK_CMD_USAGE=Usage: .\bin\spark-sql [options] [cli option]

call "%SPARK_HOME%\bin\spark-submit2.cmd" --class org.apache.spark.sql.hive.thriftserver.SparkSQLCLIDriver %*
3 changes: 1 addition & 2 deletions bin/sparkR2.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,5 @@ rem Figure out where the Spark framework is installed
call "%~dp0find-spark-home.cmd"

call "%SPARK_HOME%\bin\load-spark-env.cmd"


set _SPARK_CMD_USAGE=Usage: .\bin\sparkR [options]
call "%SPARK_HOME%\bin\spark-submit2.cmd" sparkr-shell-main %*

0 comments on commit a1877f4

Please sign in to comment.