tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Make store.get_current_state fetch events asyncly

Browse source
This commit is contained in:
Erik Johnston 2015-05-15 15:20:05 +01:00
parent d62dee7eae
commit acb12cc811
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
synapse/storage/events.py
View file

@ -594,7 +594,6 @@ class EventsStore(SQLBaseStore):
], ],
consumeErrors=True consumeErrors=True
) )
logger.debug("gatherResults after")
defer.returnValue({ defer.returnValue({
e.event_id: e e.event_id: e

7
synapse/storage/state.py
View file

@ -159,11 +159,12 @@ class StateStore(SQLBaseStore):
args = (room_id, ) args = (room_id, )
txn.execute(sql, args) txn.execute(sql, args)
results = self.cursor_to_dict(txn) results = txn.fetchall()
return self._parse_events_txn(txn, results) return [r[0] for r in results]
events = yield self.runInteraction("get_current_state", f) event_ids = yield self.runInteraction("get_current_state", f)
events = yield self._get_events(event_ids)
defer.returnValue(events) defer.returnValue(events)