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

Merge pull request #5713 from matrix-org/erikj/use_cache_for_filtered_state 

Delegate to cached version when using get_filtered_current_state_ids
pull/5725/head
Erik Johnston 2019-07-19 16:30:49 +01:00 committed by GitHub
parent 5c07c97c09 dd2851d576
commit d7bd9651bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/5713.misc Normal file
View File

@ -0,0 +1 @@
Improve caching when fetching `get_filtered_current_state_ids`.

8
synapse/storage/state.py
View File

@ -510,6 +510,12 @@ class StateGroupWorkerStore(EventsWorkerStore, SQLBaseStore):
event ID. event ID.
""" """
where_clause, where_args = state_filter.make_sql_filter_clause()
if not where_clause:
# We delegate to the cached version
return self.get_current_state_ids(room_id)
def _get_filtered_current_state_ids_txn(txn): def _get_filtered_current_state_ids_txn(txn):
results = {} results = {}
sql = """ sql = """
@ -517,8 +523,6 @@ class StateGroupWorkerStore(EventsWorkerStore, SQLBaseStore):
WHERE room_id = ? WHERE room_id = ?
""" """
where_clause, where_args = state_filter.make_sql_filter_clause()
if where_clause: if where_clause:
sql += " AND (%s)" % (where_clause,) sql += " AND (%s)" % (where_clause,)