From d896b9a71f6532f0c0a2a85abd7bf0809cc870b0 Mon Sep 17 00:00:00 2001
From: Neil Williams <neil@reddit.com>
Date: Tue, 7 Aug 2012 10:03:23 -0700
Subject: [PATCH] ZooKeeper: Make reduction of data optional in LiveList.get().

If we need the raw list of objects so that we can know what objects can
be deleted etc. then we'll need to disable the reduction.
---
 r2/r2/lib/zookeeper.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/r2/r2/lib/zookeeper.py b/r2/r2/lib/zookeeper.py
index 7b1a40f3f..4eafdcd2d 100644
--- a/r2/r2/lib/zookeeper.py
+++ b/r2/r2/lib/zookeeper.py
@@ -91,16 +91,20 @@ class LiveList(object):
 
             @client.ChildrenWatch(root)
             def watcher(children):
-                self.data = self._normalize_children(children)
+                self.data = self._normalize_children(children, reduce=True)
 
     def _nodepath(self, item):
         escaped = urllib.quote(str(item), safe=":")
         return os.path.join(self.root, escaped)
 
-    def _normalize_children(self, children):
+    def _normalize_children(self, children, reduce):
         unquoted = (urllib.unquote(c) for c in children)
         mapped = map(self.map_fn, unquoted)
-        return list(self.reduce_fn(mapped))
+
+        if reduce:
+            return list(self.reduce_fn(mapped))
+        else:
+            return list(mapped)
 
     def add(self, item):
         path = self._nodepath(item)
@@ -114,9 +118,9 @@ class LiveList(object):
         except NoNodeException:
             raise ValueError("not in list")
 
-    def get(self):
+    def get(self, reduce=True):
         children = self.client.get_children(self.root)
-        return self._normalize_children(children)
+        return self._normalize_children(children, reduce)
 
     def __iter__(self):
         if not self.is_watching: