mirror of
https://mau.dev/maunium/synapse.git
synced 2024-10-16 21:38:58 +02:00
Merge pull request #6154 from matrix-org/erikj/fix_appservice_pagination
Fix appservice room list pagination
This commit is contained in:
commit
dca7e32d3d
2 changed files with 19 additions and 18 deletions
1
changelog.d/6154.misc
Normal file
1
changelog.d/6154.misc
Normal file
|
@ -0,0 +1 @@
|
||||||
|
Improve performance of the public room list directory.
|
|
@ -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)
|
||||||
|
|
Loading…
Reference in a new issue