mirror of
https://github.com/element-hq/synapse
synced 2024-08-20 01:30:20 +00:00
Fix up get_current_state and get_room_name_and_aliases queries to parse events in transaction
This commit is contained in:
parent
69d4063651
commit
f383d5a801
2 changed files with 30 additions and 32 deletions
|
@ -188,26 +188,21 @@ class RoomStore(SQLBaseStore):
|
|||
|
||||
@defer.inlineCallbacks
|
||||
def get_room_name_and_aliases(self, room_id):
|
||||
del_sql = (
|
||||
"SELECT event_id FROM redactions WHERE redacts = e.event_id "
|
||||
"LIMIT 1"
|
||||
def f(txn):
|
||||
sql = (
|
||||
"SELECT event_id FROM events current_state_events "
|
||||
"WHERE room_id = ? "
|
||||
)
|
||||
|
||||
sql = (
|
||||
"SELECT e.*, (%(redacted)s) AS redacted FROM events as e "
|
||||
"INNER JOIN current_state_events as c ON e.event_id = c.event_id "
|
||||
"WHERE c.room_id = ? "
|
||||
) % {
|
||||
"redacted": del_sql,
|
||||
}
|
||||
sql += " AND ((type = 'm.room.name' AND state_key = '')"
|
||||
sql += " OR type = 'm.room.aliases')"
|
||||
|
||||
sql += " AND ((c.type = 'm.room.name' AND c.state_key = '')"
|
||||
sql += " OR c.type = 'm.room.aliases')"
|
||||
args = (room_id,)
|
||||
txn.execute(sql, (room_id,))
|
||||
results = self.cursor_to_dict(txn)
|
||||
|
||||
results = yield self._execute_and_decode("get_current_state", sql, *args)
|
||||
return self._parse_events_txn(txn, results)
|
||||
|
||||
events = yield self._parse_events(results)
|
||||
events = yield self.runInteraction("get_room_name_and_aliases", f)
|
||||
|
||||
name = None
|
||||
aliases = []
|
||||
|
|
|
@ -128,9 +128,9 @@ class StateStore(SQLBaseStore):
|
|||
|
||||
@defer.inlineCallbacks
|
||||
def get_current_state(self, room_id, event_type=None, state_key=""):
|
||||
def f(txn):
|
||||
sql = (
|
||||
"SELECT e.*, r.event_id FROM events as e"
|
||||
" LEFT JOIN redactions as r ON r.redacts = e.event_id"
|
||||
"SELECT e.event_id FROM events as e"
|
||||
" INNER JOIN current_state_events as c ON e.event_id = c.event_id"
|
||||
" WHERE c.room_id = ? "
|
||||
)
|
||||
|
@ -144,9 +144,12 @@ class StateStore(SQLBaseStore):
|
|||
else:
|
||||
args = (room_id, )
|
||||
|
||||
results = yield self._execute_and_decode("get_current_state", sql, *args)
|
||||
txn.execute(sql, args)
|
||||
results = self.cursor_to_dict(txn)
|
||||
|
||||
events = yield self._parse_events(results)
|
||||
return self._parse_events_txn(results)
|
||||
|
||||
events = self.runInteraction("get_current_state", f)
|
||||
defer.returnValue(events)
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue