Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-18 08:24:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fix appservice room list pagination
This commit is contained in:
Erik Johnston 2019-10-02 16:50:32 +01:00 committed by GitHub
commit dca7e32d3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 18 deletions
Show Stats 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

@ -150,6 +150,24 @@ class RoomWorkerStore(SQLBaseStore):
where_clauses = [] where_clauses = []
query_args = [] 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 # 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 # odd, but are designed to help query planner use indices by pulling
# out a common bound. # out a common bound.
@ -191,24 +209,6 @@ class RoomWorkerStore(SQLBaseStore):
) )
query_args += [search_term, search_term, search_term] 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 = "" where_clause = ""
if where_clauses: if where_clauses:
where_clause = " AND " + " AND ".join(where_clauses) where_clause = " AND " + " AND ".join(where_clauses)