switch resultitr to resultiterable

python/pyspark/join.py

@@ -31,7 +31,7 @@
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 """
 
-from pyspark.resultitr import ResultItr
+from pyspark.resultiterable import ResultIterable
 
 def _do_python_join(rdd, other, numPartitions, dispatch):
     vs = rdd.map(lambda (k, v): (k, (1, v)))
@@ -89,5 +89,5 @@ def dispatch(seq):
                 vbuf.append(v)
             elif n == 2:
                 wbuf.append(v)
-        return (ResultItr(vbuf), ResultItr(wbuf))
-    return vs.union(ws).groupByKey(numPartitions).mapValues(lambda x : dispatch(x.__iter__()))
+        return (ResultIterable(vbuf), ResultIterable(wbuf))
+    return vs.union(ws).groupByKey(numPartitions).mapValues(dispatch)

python/pyspark/rdd.py

@@ -38,7 +38,7 @@
 from pyspark.statcounter import StatCounter
 from pyspark.rddsampler import RDDSampler
 from pyspark.storagelevel import StorageLevel
-from pyspark.resultitr import ResultItr
+from pyspark.resultiterable import ResultIterable
 
 from py4j.java_collections import ListConverter, MapConverter
 
@@ -1134,7 +1134,7 @@ def mergeCombiners(a, b):
             return a + b
 
         return self.combineByKey(createCombiner, mergeValue, mergeCombiners,
-                numPartitions).mapValues(lambda x: ResultItr(x))
+                numPartitions).mapValues(lambda x: ResultIterable(x))
 
     # TODO: add tests
     def flatMapValues(self, f):

python/pyspark/resultitr.py → python/pyspark/resultiterable.py

@@ -15,11 +15,11 @@
 # limitations under the License.
 #
 
-__all__ = ["ResultItr"]
+__all__ = ["ResultIterable"]
 
 import collections
 
-class ResultItr(collections.Iterable):
+class ResultIterable(collections.Iterator):
     """
     A special result iterable. This is used because the standard iterator can not be pickled
     """