Merge branch 'master' of git@github.com:klbostee/dumbo

src/python/dumbo.py

@@ -461,20 +461,31 @@ def sumsreducer(key, values):
 
 
 def statsmapper(key, value):
-    yield (key, (1, value, value**2))
+    yield (key, (1, value, value**2, value, value))
 
 
 def statsreducer(key, values):
     columns = izip(*values)
     s0 = sum(columns.next())
-    column = columns.next()
-    (s1, minimum, maximum) = (sum(column), min(column), max(column))
+    s1 = sum(columns.next())
     s2 = sum(columns.next())
+    minimum = min(columns.next())
+    maximum = max(columns.next())
     mean = float(s1) / s0
     std = sqrt(s0 * s2 - s1**2) / s0
     yield (key, (mean, std, minimum, maximum))
 
 
+def statscombiner(key, values):
+    columns = izip(*values)
+    s0 = sum(columns.next())
+    s1 = sum(columns.next())
+    s2 = sum(columns.next())
+    minimum = min(columns.next())
+    maximum = max(columns.next())
+    yield (key, (s0, s1, s2, minimum, maximum))
+
+
 def incrcounter(group, counter, amount):
     print >> sys.stderr, 'reporter:counter:%s,%s,%s' % (group, counter, amount)
 

src/python/setup.py

@@ -1,7 +1,7 @@
 from distutils.core import setup
 
 setup(name='dumbo',
-      version='0.20.19',
+      version='0.20.20',
       py_modules=['dumbo'],
       author='Klaas Bosteels',
       author_email='klaas@last.fm',