fe78b8b6f7
This is a hot fix for the hot fix in fb499be1ac. The changes in that commit did not actually cause the `doctest` module in python to be loaded for the following tests:
- pyspark/broadcast.py
- pyspark/accumulators.py
- pyspark/serializers.py
(@pwendell I might have told you the wrong thing)
Author: Andrew Or <andrewor14@gmail.com>
Closes #1053 from andrewor14/python-test-fix and squashes the following commits:
d2e5401 [Andrew Or] Explain why these tests are handled differently
0bd6fdd [Andrew Or] Fix 3 pyspark tests not being invoked
102 lines
3.2 KiB
Bash
Executable file
102 lines
3.2 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.
|
|
#
|
|
|
|
# Figure out where Spark is installed
|
|
FWDIR="$(cd `dirname $0`/..; pwd)"
|
|
|
|
# Export this as SPARK_HOME
|
|
export SPARK_HOME="$FWDIR"
|
|
|
|
SCALA_VERSION=2.10
|
|
|
|
if [[ "$@" = *--help ]] || [[ "$@" = *-h ]]; then
|
|
echo "Usage: ./bin/pyspark [options]"
|
|
$FWDIR/bin/spark-submit --help 2>&1 | grep -v Usage 1>&2
|
|
exit 0
|
|
fi
|
|
|
|
# Exit if the user hasn't compiled Spark
|
|
if [ ! -f "$FWDIR/RELEASE" ]; then
|
|
# Exit if the user hasn't compiled Spark
|
|
ls "$FWDIR"/assembly/target/scala-$SCALA_VERSION/spark-assembly*hadoop*.jar >& /dev/null
|
|
if [[ $? != 0 ]]; then
|
|
echo "Failed to find Spark assembly in $FWDIR/assembly/target" >&2
|
|
echo "You need to build Spark before running this program" >&2
|
|
exit 1
|
|
fi
|
|
fi
|
|
|
|
. $FWDIR/bin/load-spark-env.sh
|
|
|
|
# Figure out which Python executable to use
|
|
if [[ -z "$PYSPARK_PYTHON" ]]; then
|
|
PYSPARK_PYTHON="python"
|
|
fi
|
|
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.8.1-src.zip:$PYTHONPATH
|
|
|
|
# Load the PySpark shell.py script when ./pyspark is used interactively:
|
|
export OLD_PYTHONSTARTUP=$PYTHONSTARTUP
|
|
export PYTHONSTARTUP=$FWDIR/python/pyspark/shell.py
|
|
|
|
# If IPython options are specified, assume user wants to run IPython
|
|
if [[ -n "$IPYTHON_OPTS" ]]; then
|
|
IPYTHON=1
|
|
fi
|
|
|
|
# Build up arguments list manually to preserve quotes and backslashes.
|
|
# We export Spark submit arguments as an environment variable because shell.py must run as a
|
|
# PYTHONSTARTUP script, which does not take in arguments. This is required for IPython notebooks.
|
|
|
|
PYSPARK_SUBMIT_ARGS=""
|
|
whitespace="[[:space:]]"
|
|
for i in "$@"; do
|
|
if [[ $i =~ \" ]]; then i=$(echo $i | sed 's/\"/\\\"/g'); fi
|
|
if [[ $i =~ $whitespace ]]; then i=\"$i\"; fi
|
|
PYSPARK_SUBMIT_ARGS="$PYSPARK_SUBMIT_ARGS $i"
|
|
done
|
|
export PYSPARK_SUBMIT_ARGS
|
|
|
|
# For pyspark tests
|
|
if [[ -n "$SPARK_TESTING" ]]; then
|
|
if [[ -n "$PYSPARK_DOC_TEST" ]]; then
|
|
exec "$PYSPARK_PYTHON" -m doctest $1
|
|
else
|
|
exec "$PYSPARK_PYTHON" $1
|
|
fi
|
|
exit
|
|
fi
|
|
|
|
# If a python file is provided, directly run spark-submit.
|
|
if [[ "$1" =~ \.py$ ]]; then
|
|
echo -e "\nWARNING: Running python applications through ./bin/pyspark is deprecated as of Spark 1.0." 1>&2
|
|
echo -e "Use ./bin/spark-submit <python file>\n" 1>&2
|
|
exec $FWDIR/bin/spark-submit "$@"
|
|
else
|
|
# Only use ipython if no command line arguments were provided [SPARK-1134]
|
|
if [[ "$IPYTHON" = "1" ]]; then
|
|
exec ipython $IPYTHON_OPTS
|
|
else
|
|
exec "$PYSPARK_PYTHON"
|
|
fi
|
|
fi
|