diff options
| author | Sean Owen <sowen@cloudera.com> | 2016-08-24 20:04:09 +0100 |
|---|---|---|
| committer | Sean Owen <sowen@cloudera.com> | 2016-08-24 20:04:09 +0100 |
| commit | 0b3a4be92ca6b38eef32ea5ca240d9f91f68aa65 (patch) | |
| tree | fceae4d22e14f83548bd505535cd67e71b030b3d /bin | |
| parent | 2fbdb606392631b1dff88ec86f388cc2559c28f5 (diff) | |
| download | spark-0b3a4be92ca6b38eef32ea5ca240d9f91f68aa65.tar.gz spark-0b3a4be92ca6b38eef32ea5ca240d9f91f68aa65.tar.bz2 spark-0b3a4be92ca6b38eef32ea5ca240d9f91f68aa65.zip | |
[SPARK-16781][PYSPARK] java launched by PySpark as gateway may not be the same java used in the spark environment
## What changes were proposed in this pull request?
Update to py4j 0.10.3 to enable JAVA_HOME support
## How was this patch tested?
Pyspark tests
Author: Sean Owen <sowen@cloudera.com>
Closes #14748 from srowen/SPARK-16781.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/pyspark | 2 | ||||
| -rw-r--r-- | bin/pyspark2.cmd | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bin/pyspark b/bin/pyspark index a0d7e22e8a..7590309b44 100755 --- a/bin/pyspark +++ b/bin/pyspark @@ -57,7 +57,7 @@ export PYSPARK_PYTHON # Add the PySpark classes to the Python path: export PYTHONPATH="${SPARK_HOME}/python/:$PYTHONPATH" -export PYTHONPATH="${SPARK_HOME}/python/lib/py4j-0.10.1-src.zip:$PYTHONPATH" +export PYTHONPATH="${SPARK_HOME}/python/lib/py4j-0.10.3-src.zip:$PYTHONPATH" # Load the PySpark shell.py script when ./pyspark is used interactively: export OLD_PYTHONSTARTUP="$PYTHONSTARTUP" diff --git a/bin/pyspark2.cmd b/bin/pyspark2.cmd index 3e2ff100fb..1217a4f2f9 100644 --- a/bin/pyspark2.cmd +++ b/bin/pyspark2.cmd @@ -30,7 +30,7 @@ if "x%PYSPARK_DRIVER_PYTHON%"=="x" ( ) set PYTHONPATH=%SPARK_HOME%\python;%PYTHONPATH% -set PYTHONPATH=%SPARK_HOME%\python\lib\py4j-0.10.1-src.zip;%PYTHONPATH% +set PYTHONPATH=%SPARK_HOME%\python\lib\py4j-0.10.3-src.zip;%PYTHONPATH% set OLD_PYTHONSTARTUP=%PYTHONSTARTUP% set PYTHONSTARTUP=%SPARK_HOME%\python\pyspark\shell.py |