diff options
| author | Hossein Falaki <falaki@gmail.com> | 2014-01-07 15:22:42 -0800 |
|---|---|---|
| committer | Hossein Falaki <falaki@gmail.com> | 2014-01-07 15:22:42 -0800 |
| commit | 3a8beb46cb53cf6807f39cca54b1efdbbc303f41 (patch) | |
| tree | 609e141e3b34212c5d171e593dab803aaafdd7aa /python | |
| parent | 754f5300a1e0a214b62cbd6db2398dea4dfbceb4 (diff) | |
| parent | 7d5fa175ca9cd2260c7bcd18c201bc087d4f62c3 (diff) | |
| download | spark-3a8beb46cb53cf6807f39cca54b1efdbbc303f41.tar.gz spark-3a8beb46cb53cf6807f39cca54b1efdbbc303f41.tar.bz2 spark-3a8beb46cb53cf6807f39cca54b1efdbbc303f41.zip | |
Merge branch 'master' into MatrixFactorizationModel-fix
Diffstat (limited to 'python')
| -rw-r--r-- | python/lib/py4j-0.8.1-src.zip | bin | 0 -> 37662 bytes | |||
| -rw-r--r-- | python/lib/py4j0.7.egg | bin | 191756 -> 0 bytes | |||
| -rw-r--r-- | python/pyspark/__init__.py | 2 | ||||
| -rw-r--r-- | python/pyspark/java_gateway.py | 2 | ||||
| -rw-r--r-- | python/pyspark/shell.py | 2 | ||||
| -rwxr-xr-x | python/run-tests | 2 |
6 files changed, 4 insertions, 4 deletions
diff --git a/python/lib/py4j-0.8.1-src.zip b/python/lib/py4j-0.8.1-src.zip Binary files differnew file mode 100644 index 0000000000..2069a328d1 --- /dev/null +++ b/python/lib/py4j-0.8.1-src.zip diff --git a/python/lib/py4j0.7.egg b/python/lib/py4j0.7.egg Binary files differdeleted file mode 100644 index f8a339d8ee..0000000000 --- a/python/lib/py4j0.7.egg +++ /dev/null diff --git a/python/pyspark/__init__.py b/python/pyspark/__init__.py index 2b2c3a061a..a51d5af79b 100644 --- a/python/pyspark/__init__.py +++ b/python/pyspark/__init__.py @@ -40,7 +40,7 @@ Public classes: import sys import os -sys.path.insert(0, os.path.join(os.environ["SPARK_HOME"], "python/lib/py4j0.7.egg")) +sys.path.insert(0, os.path.join(os.environ["SPARK_HOME"], "python/lib/py4j-0.8.1-src.zip")) from pyspark.conf import SparkConf 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)) } |