kaslo/synapse
1
0
Fork 0
Code Wiki Activity

Merge pull request #6154 from matrix-org/erikj/fix_appservice_pagination

Browse Source
This commit is contained in:
Andrew Morgan
2020-02-26 12:13:06 +00:00
parent 4d48fbaa52 dca7e32d3d
commit bebf75666a
2 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1 @@
Improve performance of the public room list directory.

36
synapse/storage/room.py
View File

@@ -153,6 +153,24 @@ class RoomWorkerStore(SQLBaseStore):
where_clauses = []
query_args = []
if network_tuple:
if network_tuple.appservice_id:
published_sql = """
SELECT room_id from appservice_room_list
WHERE appservice_id = ? AND network_id = ?
"""
query_args.append(network_tuple.appservice_id)
query_args.append(network_tuple.network_id)
else:
published_sql = """
SELECT room_id FROM rooms WHERE is_public
"""
else:
published_sql = """
SELECT room_id FROM rooms WHERE is_public
UNION SELECT room_id from appservice_room_list
"""
# Work out the bounds if we're given them, these bounds look slightly
# odd, but are designed to help query planner use indices by pulling
# out a common bound.
@@ -194,24 +212,6 @@ class RoomWorkerStore(SQLBaseStore):
)
query_args += [search_term, search_term, search_term]
if network_tuple:
if network_tuple.appservice_id:
published_sql = """
SELECT room_id from appservice_room_list
WHERE appservice_id = ? AND network_id = ?
"""
query_args.append(network_tuple.appservice_id)
query_args.append(network_tuple.network_id)
else:
published_sql = """
SELECT room_id FROM rooms WHERE is_public
"""
else:
published_sql = """
SELECT room_id FROM rooms WHERE is_public
UNION SELECT room_id from appservice_room_list
"""
where_clause = ""
if where_clauses:
where_clause = " AND " + " AND ".join(where_clauses)