From f3788e3c7881de25c7d699bb9940b3cbd4dc3682 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 17 Dec 2014 23:37:08 +0000
Subject: Test some ideas that might help performance a bit

---
 synapse/storage/state.py | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'synapse/storage/state.py')

diff --git a/synapse/storage/state.py b/synapse/storage/state.py
index afe3e5edea..ab80909712 100644
--- a/synapse/storage/state.py
+++ b/synapse/storage/state.py
@@ -62,14 +62,7 @@ class StateStore(SQLBaseStore):
                     keyvalues={"state_group": group},
                     retcol="event_id",
                 )
-                state = []
-                for state_id in state_ids:
-                    s = self._get_events_txn(
-                        txn,
-                        [state_id],
-                    )
-                    if s:
-                        state.extend(s)
+                state = self._get_events_txn(txn, state_ids)
 
                 res[group] = state
 
-- 
cgit 1.4.1


From 753126b8ccb56dc6539ce95758f3e87fe181064d Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 6 Jan 2015 11:18:12 +0000
Subject: Add some debug logging

---
 synapse/storage/state.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'synapse/storage/state.py')

diff --git a/synapse/storage/state.py b/synapse/storage/state.py
index ab80909712..9aeb0b4063 100644
--- a/synapse/storage/state.py
+++ b/synapse/storage/state.py
@@ -15,6 +15,10 @@
 
 from ._base import SQLBaseStore
 
+import logging
+
+logger = logging.getLogger(__name__)
+
 
 class StateStore(SQLBaseStore):
     """ Keeps track of the state at a given event.
@@ -54,6 +58,8 @@ class StateStore(SQLBaseStore):
                 if group:
                     groups.add(group)
 
+            logger.debug("Got groups: %s", groups)
+
             res = {}
             for group in groups:
                 state_ids = self._simple_select_onecol_txn(
@@ -62,6 +68,12 @@ class StateStore(SQLBaseStore):
                     keyvalues={"state_group": group},
                     retcol="event_id",
                 )
+
+                logger.debug(
+                    "Got %d events for group %s",
+                    len(state_ids), group
+                )
+
                 state = self._get_events_txn(txn, state_ids)
 
                 res[group] = state
-- 
cgit 1.4.1


From 12819d5082ac73adc309428770c9270ba378c6e2 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 6 Jan 2015 13:12:30 +0000
Subject: Remove debug lines

---
 synapse/storage/state.py | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'synapse/storage/state.py')

diff --git a/synapse/storage/state.py b/synapse/storage/state.py
index 9aeb0b4063..fd6f1e3b00 100644
--- a/synapse/storage/state.py
+++ b/synapse/storage/state.py
@@ -58,8 +58,6 @@ class StateStore(SQLBaseStore):
                 if group:
                     groups.add(group)
 
-            logger.debug("Got groups: %s", groups)
-
             res = {}
             for group in groups:
                 state_ids = self._simple_select_onecol_txn(
@@ -69,11 +67,6 @@ class StateStore(SQLBaseStore):
                     retcol="event_id",
                 )
 
-                logger.debug(
-                    "Got %d events for group %s",
-                    len(state_ids), group
-                )
-
                 state = self._get_events_txn(txn, state_ids)
 
                 res[group] = state
-- 
cgit 1.4.1