Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-03 04:04:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

Change the way we implement get_events to be less sucky

Browse source
This commit is contained in:
Erik Johnston 2014-12-09 13:35:26 +00:00
parent 90d022441f
commit aa3f66cf7f
2 changed files with 22 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

34
synapse/storage/_base.py
View file

@ -461,32 +461,18 @@ class SQLBaseStore(object):
**d
)
def _get_events_txn(self, txn, event_ids):
# FIXME (erikj): This should be batched?
sql = "SELECT * FROM events WHERE event_id = ? ORDER BY rowid asc"
event_rows = []
for e_id in event_ids:
c = txn.execute(sql, (e_id,))
event_rows.extend(self.cursor_to_dict(c))
return self._parse_events_txn(txn, event_rows)
def _parse_events(self, rows):
def _get_events(self, event_ids):
return self.runInteraction(
"_parse_events", self._parse_events_txn, rows
"_get_events", self._get_events_txn, event_ids
)
def _parse_events_txn(self, txn, rows):
event_ids = [r["event_id"] for r in rows]
def _get_events_txn(self, txn, event_ids):
events = []
for event_id in event_ids:
for e_id in event_ids:
js = self._simple_select_one_onecol_txn(
txn,
table="event_json",
keyvalues={"event_id": event_id},
keyvalues={"event_id": e_id},
retcol="json",
allow_none=True,
)
@ -516,6 +502,16 @@ class SQLBaseStore(object):
return events
def _parse_events(self, rows):
return self.runInteraction(
"_parse_events", self._parse_events_txn, rows
)
def _parse_events_txn(self, txn, rows):
event_ids = [r["event_id"] for r in rows]
return self._get_events_txn(txn, event_ids)
def _has_been_redacted_txn(self, txn, event):
sql = "SELECT event_id FROM redactions WHERE redacts = ?"
txn.execute(sql, (event.event_id,))