diff options
author | Andrew Or <andrewor14@gmail.com> | 2014-05-16 22:36:23 -0700 |
---|---|---|
committer | Patrick Wendell <pwendell@gmail.com> | 2014-05-16 22:36:23 -0700 |
commit | cf6cbe9f76c3b322a968c836d039fc5b70d4ce43 (patch) | |
tree | 7f1269166db1364d6f9393bd65d830a9948ce884 /examples/src/main/python/wordcount.py | |
parent | 4b8ec6fcfd7a7ef0857d5b21917183c181301c95 (diff) | |
download | spark-cf6cbe9f76c3b322a968c836d039fc5b70d4ce43.tar.gz spark-cf6cbe9f76c3b322a968c836d039fc5b70d4ce43.tar.bz2 spark-cf6cbe9f76c3b322a968c836d039fc5b70d4ce43.zip |
[SPARK-1824] Remove <master> from Python examples
A recent PR (#552) fixed this for all Scala / Java examples. We need to do it for python too.
Note that this blocks on #799, which makes `bin/pyspark` go through Spark submit. With only the changes in this PR, the only way to run these examples is through Spark submit. Once #799 goes in, you can use `bin/pyspark` to run them too. For example,
```
bin/pyspark examples/src/main/python/pi.py 100 --master local-cluster[4,1,512]
```
Author: Andrew Or <andrewor14@gmail.com>
Closes #802 from andrewor14/python-examples and squashes the following commits:
cf50b9f [Andrew Or] De-indent python comments (minor)
50f80b1 [Andrew Or] Remove pyFiles from SparkContext construction
c362f69 [Andrew Or] Update docs to use spark-submit for python applications
7072c6a [Andrew Or] Merge branch 'master' of github.com:apache/spark into python-examples
427a5f0 [Andrew Or] Update docs
d32072c [Andrew Or] Remove <master> from examples + update usages
Diffstat (limited to 'examples/src/main/python/wordcount.py')
-rwxr-xr-x | examples/src/main/python/wordcount.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/src/main/python/wordcount.py b/examples/src/main/python/wordcount.py index b9139b9d76..dcc095fdd0 100755 --- a/examples/src/main/python/wordcount.py +++ b/examples/src/main/python/wordcount.py @@ -22,11 +22,11 @@ from pyspark import SparkContext if __name__ == "__main__": - if len(sys.argv) < 3: - print >> sys.stderr, "Usage: wordcount <master> <file>" + if len(sys.argv) != 2: + print >> sys.stderr, "Usage: wordcount <file>" exit(-1) - sc = SparkContext(sys.argv[1], "PythonWordCount") - lines = sc.textFile(sys.argv[2], 1) + sc = SparkContext(appName="PythonWordCount") + lines = sc.textFile(sys.argv[1], 1) counts = lines.flatMap(lambda x: x.split(' ')) \ .map(lambda x: (x, 1)) \ .reduceByKey(add) |