@@ -99,7 +99,7 @@ class MultiMapper(object): def __init__(self): self._mappers = [] - self.opts = [("addpath", "yes")] + self.opts = [("addpath", "iter")] def itermappers(self): for pattern, mapper in self._mappers: @@ -143,9 +143,23 @@ class JoinReducer(object): def __call__(self, key, values): if key.isprimary: - self.primary(key.body, values) + output = self.primary(key.body, values) + if output: + for k, v in output: + jk = copy(key) + jk.body = k + yield jk, v else: for k, v in self.secondary(key.body, values): jk = copy(key) jk.body = k yield jk, v + + def primary(self, key, values): + for value in values: + yield key, value + + def secondary(self, key, values): + for value in values: + yield key, value + dumbo/lib.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages setup( name = 'dumbo', - version = '0.21.13', + version = '0.21.14', author = 'Klaas Bosteels', author_email = 'klaas@last.fm', license = 'Apache Software License (ASF)', setup.py 050a6ace81b49140e57d43b12561f342c9be599d fec8493302d755c3b4e58f7c9de3d5ca172c4a90 Klaas Bosteels klaas.bosteels@gmail.com http://github.com/klbostee/dumbo/commit/cde6182aee72383957406fff65d36723fe8c8f18 cde6182aee72383957406fff65d36723fe8c8f18 2009-05-18T05:31:14-07:00 2009-05-18T05:31:14-07:00 Merge branch 'master' of git@github.com:klbostee/dumbo 73b57df8ef808faf8c37c70897d93b35765cd269 Klaas Bosteels klaas.bosteels@gmail.com