6b86aa0b52
### What changes were proposed in this pull request?
This PR upgrade Py4J from 0.10.9 to 0.10.9.1 that contains some bug fixes and improvements.
It contains one bug fix (4152353ac1).
### Why are the changes needed?
To leverage fixes from the upstream in Py4J.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Jenkins build and GitHub Actions will test it out.
Closes #31009 from HyukjinKwon/SPARK-33984.
Authored-by: HyukjinKwon <gurwls223@apache.org>
Signed-off-by: Dongjoon Hyun <dhyun@apple.com>
69 lines
2.6 KiB
Bash
Executable file
69 lines
2.6 KiB
Bash
Executable file
#!/usr/bin/env bash
|
|
|
|
#
|
|
# Licensed to the Apache Software Foundation (ASF) under one or more
|
|
# contributor license agreements. See the NOTICE file distributed with
|
|
# this work for additional information regarding copyright ownership.
|
|
# The ASF licenses this file to You under the Apache License, Version 2.0
|
|
# (the "License"); you may not use this file except in compliance with
|
|
# the License. You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
#
|
|
|
|
if [ -z "${SPARK_HOME}" ]; then
|
|
source "$(dirname "$0")"/find-spark-home
|
|
fi
|
|
|
|
source "${SPARK_HOME}"/bin/load-spark-env.sh
|
|
export _SPARK_CMD_USAGE="Usage: ./bin/pyspark [options]"
|
|
|
|
# In Spark 2.0, IPYTHON and IPYTHON_OPTS are removed and pyspark fails to launch if either option
|
|
# is set in the user's environment. Instead, users should set PYSPARK_DRIVER_PYTHON=ipython
|
|
# to use IPython and set PYSPARK_DRIVER_PYTHON_OPTS to pass options when starting the Python driver
|
|
# (e.g. PYSPARK_DRIVER_PYTHON_OPTS='notebook'). This supports full customization of the IPython
|
|
# and executor Python executables.
|
|
|
|
# Fail noisily if removed options are set
|
|
if [[ -n "$IPYTHON" || -n "$IPYTHON_OPTS" ]]; then
|
|
echo "Error in pyspark startup:"
|
|
echo "IPYTHON and IPYTHON_OPTS are removed in Spark 2.0+. Remove these from the environment and set PYSPARK_DRIVER_PYTHON and PYSPARK_DRIVER_PYTHON_OPTS instead."
|
|
exit 1
|
|
fi
|
|
|
|
# Default to standard python3 interpreter unless told otherwise
|
|
if [[ -z "$PYSPARK_PYTHON" ]]; then
|
|
PYSPARK_PYTHON=python3
|
|
fi
|
|
if [[ -z "$PYSPARK_DRIVER_PYTHON" ]]; then
|
|
PYSPARK_DRIVER_PYTHON=$PYSPARK_PYTHON
|
|
fi
|
|
export PYSPARK_PYTHON
|
|
export PYSPARK_DRIVER_PYTHON
|
|
export PYSPARK_DRIVER_PYTHON_OPTS
|
|
|
|
# Add the PySpark classes to the Python path:
|
|
export PYTHONPATH="${SPARK_HOME}/python/:$PYTHONPATH"
|
|
export PYTHONPATH="${SPARK_HOME}/python/lib/py4j-0.10.9.1-src.zip:$PYTHONPATH"
|
|
|
|
# Load the PySpark shell.py script when ./pyspark is used interactively:
|
|
export OLD_PYTHONSTARTUP="$PYTHONSTARTUP"
|
|
export PYTHONSTARTUP="${SPARK_HOME}/python/pyspark/shell.py"
|
|
|
|
# For pyspark tests
|
|
if [[ -n "$SPARK_TESTING" ]]; then
|
|
unset YARN_CONF_DIR
|
|
unset HADOOP_CONF_DIR
|
|
export PYTHONHASHSEED=0
|
|
exec "$PYSPARK_DRIVER_PYTHON" -m "$@"
|
|
exit
|
|
fi
|
|
|
|
exec "${SPARK_HOME}"/bin/spark-submit pyspark-shell-main --name "PySparkShell" "$@"
|