From 6e0d9c749e7ef0067a6cd7ae9d21e8b599e32d54 Mon Sep 17 00:00:00 2001 From: Ken Takagiwa Date: Tue, 15 Jul 2014 17:19:20 -0700 Subject: [PATCH] modify dstream.py to fix indent error --- python/pyspark/streaming/dstream.py | 2 +- .../org/apache/spark/streaming/api/python/PythonDStream.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python/pyspark/streaming/dstream.py b/python/pyspark/streaming/dstream.py index b422b147d11e1..a512517f6e437 100644 --- a/python/pyspark/streaming/dstream.py +++ b/python/pyspark/streaming/dstream.py @@ -172,7 +172,7 @@ def _mergeCombiners(iterator): return shuffled.mapPartitions(_mergeCombiners) - def partitionBy(self, numPartitions, partitionFunc=None): + def partitionBy(self, numPartitions, partitionFunc=None): """ Return a copy of the DStream partitioned using the specified partitioner. diff --git a/streaming/src/main/scala/org/apache/spark/streaming/api/python/PythonDStream.scala b/streaming/src/main/scala/org/apache/spark/streaming/api/python/PythonDStream.scala index fe67250604d8e..389136f9e21a0 100644 --- a/streaming/src/main/scala/org/apache/spark/streaming/api/python/PythonDStream.scala +++ b/streaming/src/main/scala/org/apache/spark/streaming/api/python/PythonDStream.scala @@ -91,7 +91,7 @@ class PythonDStream[T: ClassTag]( tempFileStream.close() // This value has to be passed from python - val pythonExec = new ProcessBuilder().environment().get("PYSPARK_PYTHON") + //val pythonExec = new ProcessBuilder().environment().get("PYSPARK_PYTHON") val sparkHome = new ProcessBuilder().environment().get("SPARK_HOME") //val pb = new ProcessBuilder(Seq(pythonExec, sparkHome + "/python/pyspark/streaming/pyprint.py", tempFile.getAbsolutePath())) // why this fails to compile??? //absolute path to the python script is needed to change because we do not use pysparkstreaming