diff options
| author | Matei Zaharia <matei.zaharia@gmail.com> | 2013-08-12 21:02:39 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei.zaharia@gmail.com> | 2013-08-12 21:02:39 -0700 |
| commit | d3525babeee713cf386e0c013f352ab767993623 (patch) | |
| tree | 56f34920658d9e70c60aa1f6eb60126b783ee392 /python/pyspark | |
| parent | 9e02da27630435e66c3bd431fa5dc6494ea1bbfb (diff) | |
| parent | 8fd5c7bc00b1104e4282959ec95b699955ded976 (diff) | |
| download | spark-d3525babeee713cf386e0c013f352ab767993623.tar.gz spark-d3525babeee713cf386e0c013f352ab767993623.tar.bz2 spark-d3525babeee713cf386e0c013f352ab767993623.zip | |
Merge pull request #813 from AndreSchumacher/add_files_pyspark
Implementing SPARK-865: Add the equivalent of ADD_JARS to PySpark
Diffstat (limited to 'python/pyspark')
| -rw-r--r-- | python/pyspark/shell.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/python/pyspark/shell.py b/python/pyspark/shell.py index cc8cd9e3c4..9b4b4e78cb 100644 --- a/python/pyspark/shell.py +++ b/python/pyspark/shell.py @@ -24,10 +24,15 @@ import os import pyspark from pyspark.context import SparkContext +# this is the equivalent of ADD_JARS +add_files = os.environ.get("ADD_FILES").split(',') if os.environ.get("ADD_FILES") != None else None -sc = SparkContext(os.environ.get("MASTER", "local"), "PySparkShell") +sc = SparkContext(os.environ.get("MASTER", "local"), "PySparkShell", pyFiles=add_files) print "Spark context avaiable as sc." +if add_files != None: + print "Adding files: [%s]" % ", ".join(add_files) + # The ./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') |