Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Turn off preemptive transactions

This commit is contained in:
Erik Johnston 2015-05-14 14:51:06 +01:00
parent f4d58deba1
commit 7f4105a5c9
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
synapse/storage/events.py
View File

@ -420,23 +420,13 @@ class EventsStore(SQLBaseStore):
if e_id in event_map and event_map[e_id] if e_id in event_map and event_map[e_id]
]) ])
if not txn: missing_events = yield self._fetch_events(
missing_events = yield self.runInteraction( txn,
"_get_events", missing_events_ids,
self._fetch_events_txn, check_redacted=check_redacted,
missing_events_ids, get_prev_content=get_prev_content,
check_redacted=check_redacted, allow_rejected=allow_rejected,
get_prev_content=get_prev_content, )
allow_rejected=allow_rejected,
)
else:
missing_events = yield self._fetch_events(
txn,
missing_events_ids,
check_redacted=check_redacted,
get_prev_content=get_prev_content,
allow_rejected=allow_rejected,
)
event_map.update(missing_events) event_map.update(missing_events)