OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove duplication

pull/1144/head
Erik Johnston 2016-09-27 09:27:54 +01:00
parent 13122e5e24
commit 4974147aa3
1 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
synapse/storage/state.py
View File

@ -386,15 +386,16 @@ class StateStore(SQLBaseStore):
# each (type, state_key). However, that was terribly slow
# without the right indicies (which we can't add until
# after we finish deduping state, which requires this func)
if types is not None:
args = [next_group] + [i for typ in types for i in typ]
args = [next_group]
if types:
args.extend(i for typ in types for i in typ)
txn.execute(
"SELECT type, state_key, event_id FROM state_groups_state"
" WHERE state_group = ? %s" % (where_clause,),
args
)
rows = txn.fetchall()
results[group].update({
(typ, state_key): event_id
for typ, state_key, event_id in rows
@ -403,21 +404,8 @@ class StateStore(SQLBaseStore):
# If the lengths match then we must have all the types,
# so no need to go walk further down the tree.
if len(results[group]) == len(types):
if types is not None and len(results[group]) == len(types):
break
else:
txn.execute(
"SELECT type, state_key, event_id FROM state_groups_state"
" WHERE state_group = ?",
(next_group,)
)
rows = txn.fetchall()
results[group].update({
(typ, state_key): event_id
for typ, state_key, event_id in rows
if (typ, state_key) not in results[group]
})
next_group = self._simple_select_one_onecol_txn(
txn,