2014-10-14 21:50:14 -04:00
|
|
|
@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
|
|
|
|
|
[SPARK-22495] Fix setup of SPARK_HOME variable on Windows
## What changes were proposed in this pull request?
Fixing the way how `SPARK_HOME` is resolved on Windows. While the previous version was working with the built release download, the set of directories changed slightly for the PySpark `pip` or `conda` install. This has been reflected in Linux files in `bin` but not for Windows `cmd` files.
First fix improves the way how the `jars` directory is found, as this was stoping Windows version of `pip/conda` install from working; JARs were not found by on Session/Context setup.
Second fix is adding `find-spark-home.cmd` script, which uses `find_spark_home.py` script, as the Linux version, to resolve `SPARK_HOME`. It is based on `find-spark-home` bash script, though, some operations are done in different order due to the `cmd` script language limitations. If environment variable is set, the Python script `find_spark_home.py` will not be run. The process can fail if Python is not installed, but it will mostly use this way if PySpark is installed via `pip/conda`, thus, there is some Python in the system.
## How was this patch tested?
Tested on local installation.
Author: Jakub Nowacki <j.s.nowacki@gmail.com>
Closes #19370 from jsnowacki/fix_spark_cmds.
2017-11-22 22:47:38 -05:00
|
|
|
rem Figure out where the Spark framework is installed
|
|
|
|
call "%~dp0find-spark-home.cmd"
|
|
|
|
|
2015-06-05 08:32:00 -04:00
|
|
|
set _SPARK_CMD_USAGE=Usage: .\bin\spark-shell.cmd [options]
|
2014-12-19 22:19:53 -05:00
|
|
|
|
2015-03-11 04:03:01 -04:00
|
|
|
rem SPARK-4161: scala does not assume use of the java classpath,
|
|
|
|
rem so we need to add the "-Dscala.usejavacp=true" flag manually. We
|
|
|
|
rem do this specifically for the Spark shell because the scala REPL
|
|
|
|
rem has its own class loader, and any additional classpath specified
|
|
|
|
rem through spark.driver.extraClassPath is not automatically propagated.
|
|
|
|
if "x%SPARK_SUBMIT_OPTS%"=="x" (
|
|
|
|
set SPARK_SUBMIT_OPTS=-Dscala.usejavacp=true
|
|
|
|
goto run_shell
|
|
|
|
)
|
|
|
|
set SPARK_SUBMIT_OPTS="%SPARK_SUBMIT_OPTS% -Dscala.usejavacp=true"
|
|
|
|
|
|
|
|
:run_shell
|
2016-02-10 04:54:22 -05:00
|
|
|
"%SPARK_HOME%\bin\spark-submit2.cmd" --class org.apache.spark.repl.Main --name "Spark shell" %*
|