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

Turn off preemptive transactions

Browse source
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 not txn:
missing_events = yield self.runInteraction(
"_get_events",
self._fetch_events_txn,
missing_events_ids,
check_redacted=check_redacted,
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,
)
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)