diff options
author | Patrick Wendell <pwendell@gmail.com> | 2014-01-03 11:24:35 -0800 |
---|---|---|
committer | Patrick Wendell <pwendell@gmail.com> | 2014-01-03 11:24:35 -0800 |
commit | 4ae101ff38f4cd107e54d97d9493ecd4a0c3a633 (patch) | |
tree | 482f769888453dd577711792e435ad6ad63b01d7 /python | |
parent | 30b9db0abedbef7afa06a927a011147cfeca2a70 (diff) | |
parent | 9ae382c363202eac8ef0b8e0fe1a7eab3de545b1 (diff) | |
download | spark-4ae101ff38f4cd107e54d97d9493ecd4a0c3a633.tar.gz spark-4ae101ff38f4cd107e54d97d9493ecd4a0c3a633.tar.bz2 spark-4ae101ff38f4cd107e54d97d9493ecd4a0c3a633.zip |
Merge pull request #317 from ScrapCodes/spark-915-segregate-scripts
Spark-915 segregate scripts
Diffstat (limited to 'python')
-rw-r--r-- | python/pyspark/java_gateway.py | 2 | ||||
-rw-r--r-- | python/pyspark/shell.py | 2 | ||||
-rwxr-xr-x | python/run-tests | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/python/pyspark/java_gateway.py b/python/pyspark/java_gateway.py index d8ca9fce00..c15add5237 100644 --- a/python/pyspark/java_gateway.py +++ b/python/pyspark/java_gateway.py @@ -31,7 +31,7 @@ def launch_gateway(): # Launch the Py4j gateway using Spark's run command so that we pick up the # proper classpath and SPARK_MEM settings from spark-env.sh on_windows = platform.system() == "Windows" - script = "spark-class.cmd" if on_windows else "spark-class" + script = "./bin/spark-class.cmd" if on_windows else "./bin/spark-class" command = [os.path.join(SPARK_HOME, script), "py4j.GatewayServer", "--die-on-broken-pipe", "0"] if not on_windows: diff --git a/python/pyspark/shell.py b/python/pyspark/shell.py index ef07eb437b..1602227a27 100644 --- a/python/pyspark/shell.py +++ b/python/pyspark/shell.py @@ -47,7 +47,7 @@ print "Spark context available as sc." if add_files != None: print "Adding files: [%s]" % ", ".join(add_files) -# The ./pyspark script stores the old PYTHONSTARTUP value in OLD_PYTHONSTARTUP, +# The ./bin/pyspark script stores the old PYTHONSTARTUP value in OLD_PYTHONSTARTUP, # which allows us to execute the user's PYTHONSTARTUP file: _pythonstartup = os.environ.get('OLD_PYTHONSTARTUP') if _pythonstartup and os.path.isfile(_pythonstartup): diff --git a/python/run-tests b/python/run-tests index 4b71fff7c1..feba97cee0 100755 --- a/python/run-tests +++ b/python/run-tests @@ -29,7 +29,7 @@ FAILED=0 rm -f unit-tests.log function run_test() { - SPARK_TESTING=0 $FWDIR/pyspark $1 2>&1 | tee -a unit-tests.log + SPARK_TESTING=0 $FWDIR/bin/pyspark $1 2>&1 | tee -a unit-tests.log FAILED=$((PIPESTATUS[0]||$FAILED)) } |