summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-15 16:45:35 +0100
committerErik Johnston <erik@matrix.org>2015-05-15 16:45:35 +0100
commit6c74fd62a0b2292b4fce9d59ea9790685e256e0a (patch)
tree51e8b0a15edd278adb6918aaedb7dd59618ff2cf /synapse/storage
parentinit j (diff)
downloadsynapse-6c74fd62a0b2292b4fce9d59ea9790685e256e0a.tar.xz
Revert limiting of fetching, it didn't help perf.
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/events.py11
1 files changed, 2 insertions, 9 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py
index f21364606d..98a5663932 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -505,15 +505,8 @@ class EventsStore(SQLBaseStore):
         while True:
             try:
                 with self._event_fetch_lock:
-                    tot = 0
-                    j = 0
-                    for j, lst in enumerate(self._event_fetch_list):
-                        if tot > 200:
-                            break
-                        tot += len(lst[0])
-
-                    event_list = self._event_fetch_list[:j+1]
-                    self._event_fetch_list = self._event_fetch_list[j+1:]
+                    event_list = self._event_fetch_list
+                    self._event_fetch_list = []
 
                     if not event_list:
                         if self.database_engine.single_threaded or i > 3: