summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-08-17 09:50:50 +0100
committerErik Johnston <erik@matrix.org>2015-08-17 09:50:50 +0100
commit47abebfd6d0ea56d7ac7a565f359992fde323177 (patch)
treec15bcfaa54bd0bee128aa9de7cacfd860f22c67c /synapse/storage
parentFix bug where we were leaking None into state event lists (diff)
downloadsynapse-47abebfd6d0ea56d7ac7a565f359992fde323177.tar.xz
Add batched version of store.get_presence_state
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/presence.py20
1 files changed, 19 insertions, 1 deletions
diff --git a/synapse/storage/presence.py b/synapse/storage/presence.py
index 4f91a2b87c..f351b76a70 100644
--- a/synapse/storage/presence.py
+++ b/synapse/storage/presence.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 from ._base import SQLBaseStore
-from synapse.util.caches.descriptors import cached
+from synapse.util.caches.descriptors import cached, cachedList
 
 from twisted.internet import defer
 
@@ -36,6 +36,7 @@ class PresenceStore(SQLBaseStore):
             desc="has_presence_state",
         )
 
+    @cached()
     def get_presence_state(self, user_localpart):
         return self._simple_select_one(
             table="presence",
@@ -44,6 +45,23 @@ class PresenceStore(SQLBaseStore):
             desc="get_presence_state",
         )
 
+    @cachedList(get_presence_state.cache, list_name="user_localparts")
+    def get_presence_states(self, user_localparts):
+        def f(txn):
+            results = {}
+            for user_localpart in user_localparts:
+                results[user_localpart] = self._simple_select_one_txn(
+                    txn,
+                    table="presence",
+                    keyvalues={"user_id": user_localpart},
+                    retcols=["state", "status_msg", "mtime"],
+                    desc="get_presence_state",
+                )
+
+            return results
+
+        return self.runInteraction("get_presence_states", f)
+
     def set_presence_state(self, user_localpart, new_state):
         return self._simple_update_one(
             table="presence",