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

Make not return a deferred _get_event_from_row_txn

This commit is contained in:
Erik Johnston 2015-05-20 13:07:19 +01:00
parent f407cbd2f1
commit ab45e12d31
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
synapse/storage/events.py
View File

@ -723,23 +723,8 @@ class EventsStore(SQLBaseStore):
d = json.loads(js) d = json.loads(js)
internal_metadata = json.loads(internal_metadata) internal_metadata = json.loads(internal_metadata)
def select(txn, *args, **kwargs):
if txn:
return self._simple_select_one_onecol_txn(txn, *args, **kwargs)
else:
return self._simple_select_one_onecol(
*args,
desc="_get_event_from_row", **kwargs
)
def get_event(txn, *args, **kwargs):
if txn:
return self._get_event_txn(txn, *args, **kwargs)
else:
return self.get_event(*args, **kwargs)
if rejected_reason: if rejected_reason:
rejected_reason = yield select( rejected_reason = self._simple_select_one_onecol_txn(
txn, txn,
table="rejections", table="rejections",
keyvalues={"event_id": rejected_reason}, keyvalues={"event_id": rejected_reason},
@ -755,7 +740,7 @@ class EventsStore(SQLBaseStore):
if check_redacted and redacted: if check_redacted and redacted:
ev = prune_event(ev) ev = prune_event(ev)
redaction_id = yield select( redaction_id = self._simple_select_one_onecol_txn(
txn, txn,
table="redactions", table="redactions",
keyvalues={"redacts": ev.event_id}, keyvalues={"redacts": ev.event_id},
@ -765,7 +750,7 @@ class EventsStore(SQLBaseStore):
ev.unsigned["redacted_by"] = redaction_id ev.unsigned["redacted_by"] = redaction_id
# Get the redaction event. # Get the redaction event.
because = yield get_event( because = self._get_event_txn(
txn, txn,
redaction_id, redaction_id,
check_redacted=False check_redacted=False
@ -775,7 +760,7 @@ class EventsStore(SQLBaseStore):
ev.unsigned["redacted_because"] = because ev.unsigned["redacted_because"] = because
if get_prev_content and "replaces_state" in ev.unsigned: if get_prev_content and "replaces_state" in ev.unsigned:
prev = yield get_event( prev = self._get_event_txn(
txn, txn,
ev.unsigned["replaces_state"], ev.unsigned["replaces_state"],
get_prev_content=False, get_prev_content=False,
@ -787,7 +772,7 @@ class EventsStore(SQLBaseStore):
ev.event_id, check_redacted, get_prev_content, ev ev.event_id, check_redacted, get_prev_content, ev
) )
defer.returnValue(ev) return ev
def _parse_events(self, rows): def _parse_events(self, rows):
return self.runInteraction( return self.runInteraction(