mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-21 12:14:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix bug #2926

Browse source
This commit is contained in:
Matthew Hodgson 2018-03-13 17:52:52 +00:00
parent 95cb401ae0
commit 1b1c137771
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
synapse/storage/state.py
View file

@ -240,6 +240,10 @@ class StateGroupWorkerStore(SQLBaseStore):
( (
"AND type = ? AND state_key = ?", "AND type = ? AND state_key = ?",
(etype, state_key) (etype, state_key)
) if state_key is not None else
(
"AND type = ?",
(etype)
) )
for etype, state_key in types for etype, state_key in types
] ]
@ -259,10 +263,19 @@ class StateGroupWorkerStore(SQLBaseStore):
key = (typ, state_key) key = (typ, state_key)
results[group][key] = event_id results[group][key] = event_id
else: else:
where_args = []
if types is not None: if types is not None:
where_clause = "AND (%s)" % ( where_clause = "AND ("
" OR ".join(["(type = ? AND state_key = ?)"] * len(types)), for typ in types:
) if typ[1] is None:
where_clause += "(type = ?)"
where_args.extend(typ[0])
else:
where_clause += "(type = ? AND state_key = ?)"
where_args.extend([typ[0], typ[1]])
if typ != types[-1]:
where_clause += " OR "
where_clause += ")"
else: else:
where_clause = "" where_clause = ""
@ -279,7 +292,7 @@ class StateGroupWorkerStore(SQLBaseStore):
# after we finish deduping state, which requires this func) # after we finish deduping state, which requires this func)
args = [next_group] args = [next_group]
if types: if types:
args.extend(i for typ in types for i in typ) args.extend(where_args)
txn.execute( txn.execute(
"SELECT type, state_key, event_id FROM state_groups_state" "SELECT type, state_key, event_id FROM state_groups_state"