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

Don't needlessly join on state_events

Browse source
This commit is contained in:
Erik Johnston 2015-04-30 13:52:28 +01:00
parent d89a9f7283
commit 2366d28780
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
synapse/storage/room.py
View file

@ -196,14 +196,13 @@ class RoomStore(SQLBaseStore):
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 "
"INNER JOIN state_events as s ON e.event_id = s.event_id "
"WHERE c.room_id = ? "
) % {
"redacted": del_sql,
}
sql += " AND ((s.type = 'm.room.name' AND s.state_key = '')"
sql += " OR s.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,)
results = yield self._execute_and_decode("get_current_state", sql, *args)