Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-22 08:14:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Split out _get_event_from_row back into defer and _txn version

Browse Source
This commit is contained in:
Erik Johnston 2015-05-20 13:00:57 +01:00
parent 165eb2dbe6
commit 227f8ef031
1 changed files with 57 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
synapse/storage/events.py
View File

@ -592,7 +592,6 @@ class EventsStore(SQLBaseStore):
res = yield defer.gatherResults( res = yield defer.gatherResults(
[ [
self._get_event_from_row( self._get_event_from_row(
None,
row["internal_metadata"], row["json"], row["redacts"], row["internal_metadata"], row["json"], row["redacts"],
check_redacted=check_redacted, check_redacted=check_redacted,
get_prev_content=get_prev_content, get_prev_content=get_prev_content,
@ -647,13 +646,13 @@ class EventsStore(SQLBaseStore):
rows[:] = [r for r in rows if not r["rejects"]] rows[:] = [r for r in rows if not r["rejects"]]
res = [ res = [
unwrap_deferred(self._get_event_from_row( self._get_event_from_row_txn(
txn, txn,
row["internal_metadata"], row["json"], row["redacts"], row["internal_metadata"], row["json"], row["redacts"],
check_redacted=check_redacted, check_redacted=check_redacted,
get_prev_content=get_prev_content, get_prev_content=get_prev_content,
rejected_reason=row["rejects"], rejected_reason=row["rejects"],
)) )
for row in rows for row in rows
] ]
@ -663,17 +662,64 @@ class EventsStore(SQLBaseStore):
} }
@defer.inlineCallbacks @defer.inlineCallbacks
def _get_event_from_row(self, txn, internal_metadata, js, redacted, def _get_event_from_row(self, internal_metadata, js, redacted,
check_redacted=True, get_prev_content=False, check_redacted=True, get_prev_content=False,
rejected_reason=None): rejected_reason=None):
"""This is called when we have a row from the database that we want to d = json.loads(js)
convert into an event. Depending on the given options it may do more internal_metadata = json.loads(internal_metadata)
database ops to fill in extra information (e.g. previous content or
rejection reason.)
`txn` may be None, and if so this creates new transactions for each if rejected_reason:
database op. rejected_reason = yield self._simple_select_one_onecol(
""" table="rejections",
keyvalues={"event_id": rejected_reason},
retcol="reason",
desc="_get_event_from_row",
)
ev = FrozenEvent(
d,
internal_metadata_dict=internal_metadata,
rejected_reason=rejected_reason,
)
if check_redacted and redacted:
ev = prune_event(ev)
redaction_id = yield self._simple_select_one_onecol(
table="redactions",
keyvalues={"redacts": ev.event_id},
retcol="event_id",
desc="_get_event_from_row",
)
ev.unsigned["redacted_by"] = redaction_id
# Get the redaction event.
because = yield self.get_event(
redaction_id,
check_redacted=False
)
if because:
ev.unsigned["redacted_because"] = because
if get_prev_content and "replaces_state" in ev.unsigned:
prev = yield self.get_event(
ev.unsigned["replaces_state"],
get_prev_content=False,
)
if prev:
ev.unsigned["prev_content"] = prev.get_dict()["content"]
self._get_event_cache.prefill(
ev.event_id, check_redacted, get_prev_content, ev
)
defer.returnValue(ev)
def _get_event_from_row_txn(self, txn, internal_metadata, js, redacted,
check_redacted=True, get_prev_content=False,
rejected_reason=None):
d = json.loads(js) d = json.loads(js)
internal_metadata = json.loads(internal_metadata) internal_metadata = json.loads(internal_metadata)