ODIn/spark-instrumented-optimizer
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[SPARK-4831] Do not include SPARK_CLASSPATH if empty

Browse source 
My guess for fixing https://issues.apache.org/jira/browse/SPARK-4831.

Author: Daniel Darabos <darabos.daniel@gmail.com>

Closes #3678 from darabos/patch-1 and squashes the following commits:

36e1243 [Daniel Darabos] Do not include SPARK_CLASSPATH if empty.
This commit is contained in:
Daniel Darabos 2014-12-19 19:32:39 -08:00 committed by Andrew Or
parent 1d648123a7
commit 7cb3f54793
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bin/compute-classpath.sh
View file

@ -25,7 +25,11 @@ FWDIR="$(cd "`dirname "$0"`"/..; pwd)"
. "$FWDIR"/bin/load-spark-env.sh . "$FWDIR"/bin/load-spark-env.sh
if [ -n "$SPARK_CLASSPATH" ]; then
CLASSPATH="$SPARK_CLASSPATH:$SPARK_SUBMIT_CLASSPATH" CLASSPATH="$SPARK_CLASSPATH:$SPARK_SUBMIT_CLASSPATH"
else
CLASSPATH="$SPARK_SUBMIT_CLASSPATH"
fi
# Build up classpath # Build up classpath
if [ -n "$SPARK_CONF_DIR" ]; then if [ -n "$SPARK_CONF_DIR" ]; then