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

this will never have worked due to the query being split up into separate queries.

Browse source
This commit is contained in:
Matthew Hodgson 2018-09-04 23:14:33 +01:00
parent a6cf7d9d9a
commit 7afd63cdfc
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
synapse/storage/state.py
View file

@ -189,12 +189,8 @@ class StateGroupWorkerStore(EventsWorkerStore, SQLBaseStore):
if include_other_types: if include_other_types:
unique_types = set(filtered_types) unique_types = set(filtered_types)
clause_to_args.append( sql += " AND type <> ? " * len(unique_types)
( additional_args = list(unique_types)
"AND type <> ? " * len(unique_types),
list(unique_types)
)
)
else: else:
# If types is None we fetch all the state, and so just use an # If types is None we fetch all the state, and so just use an
# empty where clause with no extra args. # empty where clause with no extra args.
@ -202,6 +198,7 @@ class StateGroupWorkerStore(EventsWorkerStore, SQLBaseStore):
for where_clause, where_args in clause_to_args: for where_clause, where_args in clause_to_args:
args = [room_id] args = [room_id]
args.extend(where_args) args.extend(where_args)
args.extend(additional_args)
txn.execute(sql % (where_clause,), args) txn.execute(sql % (where_clause,), args)
for row in txn: for row in txn:
typ, state_key, event_id = row typ, state_key, event_id = row