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

Fix up get_current_state and get_room_name_and_aliases queries to parse events in transaction

Browse source
This commit is contained in:
Erik Johnston 2015-04-30 17:12:52 +01:00
parent 69d4063651
commit f383d5a801
2 changed files with 30 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

35
synapse/storage/state.py
View file

@ -128,25 +128,28 @@ class StateStore(SQLBaseStore):
@defer.inlineCallbacks
def get_current_state(self, room_id, event_type=None, state_key=""):
sql = (
"SELECT e.*, r.event_id FROM events as e"
" LEFT JOIN redactions as r ON r.redacts = e.event_id"
" INNER JOIN current_state_events as c ON e.event_id = c.event_id"
" WHERE c.room_id = ? "
)
def f(txn):
sql = (
"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 = ? "
)
if event_type and state_key is not None:
sql += " AND c.type = ? AND c.state_key = ? "
args = (room_id, event_type, state_key)
elif event_type:
sql += " AND c.type = ?"
args = (room_id, event_type)
else:
args = (room_id, )
if event_type and state_key is not None:
sql += " AND c.type = ? AND c.state_key = ? "
args = (room_id, event_type, state_key)
elif event_type:
sql += " AND c.type = ?"
args = (room_id, event_type)
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)