From a24bc5b2dc3a5d81cdfbe7be367dbb461d85b999 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 23 May 2016 18:33:51 +0100 Subject: Add GET /notifications API --- synapse/storage/receipts.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'synapse/storage/receipts.py') diff --git a/synapse/storage/receipts.py b/synapse/storage/receipts.py index f1774f0e44..d147a60602 100644 --- a/synapse/storage/receipts.py +++ b/synapse/storage/receipts.py @@ -74,6 +74,31 @@ class ReceiptsStore(SQLBaseStore): defer.returnValue({row["room_id"]: row["event_id"] for row in rows}) + @defer.inlineCallbacks + def get_receipts_for_user_with_orderings(self, user_id, receipt_type): + def f(txn): + sql = ( + "SELECT rl.room_id, rl.event_id," + " e.topological_ordering, e.stream_ordering" + " FROM receipts_linearized rl," + " events e" + " WHERE rl.room_id = e.room_id" + " AND rl.event_id = e.event_id" + " AND user_id = ?" + ) + txn.execute(sql, (user_id,)) + return txn.fetchall() + rows = yield self.runInteraction( + "get_receipts_for_user_with_orderings", f + ) + defer.returnValue({ + row[0]: { + "event_id": row[1], + "topological_ordering": row[2], + "stream_ordering": row[3], + } for row in rows + }) + @defer.inlineCallbacks def get_linearized_receipts_for_rooms(self, room_ids, to_key, from_key=None): """Get receipts for multiple rooms for sending to clients. -- cgit 1.5.1 From 1e4217c90c730e8dc18e2f8ce11c15f498ad7909 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 18 Aug 2016 17:53:44 +0100 Subject: Explicit join --- synapse/storage/receipts.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'synapse/storage/receipts.py') diff --git a/synapse/storage/receipts.py b/synapse/storage/receipts.py index cb4e04a679..2c1df0e2b9 100644 --- a/synapse/storage/receipts.py +++ b/synapse/storage/receipts.py @@ -100,8 +100,8 @@ class ReceiptsStore(SQLBaseStore): sql = ( "SELECT rl.room_id, rl.event_id," " e.topological_ordering, e.stream_ordering" - " FROM receipts_linearized rl," - " events e" + " FROM receipts_linearized AS rl" + " INNER JOIN events AS e USING (room_id, event_id)" " WHERE rl.room_id = e.room_id" " AND rl.event_id = e.event_id" " AND user_id = ?" -- cgit 1.5.1