diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2016-12-20 12:14:08 +0000 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2016-12-20 12:14:08 +0000 |
| commit | 2998fa57b0b74b1c8483416cbf7c210292712550 (patch) | |
| tree | 71635309dabff5abecb70c120fa1b878979a586f | |
| parent | Bump version and changelog (diff) | |
| parent | uncommitted changes on matrix.org (diff) | |
| download | synapse-hotfixes-v0.18.5.tar.xz | |
merge uncommitted changes from matrix.org into hotfixes-v0.18.5 github/hotfixes-v0.18.5 hotfixes-v0.18.5
| -rw-r--r-- | synapse/handlers/room_list.py | 12 | ||||
| -rw-r--r-- | synapse/storage/event_push_actions.py | 4 | ||||
| -rw-r--r-- | synapse/storage/search.py | 2 |
3 files changed, 8 insertions, 10 deletions
diff --git a/synapse/handlers/room_list.py b/synapse/handlers/room_list.py index 667223df0c..242e646e5c 100644 --- a/synapse/handlers/room_list.py +++ b/synapse/handlers/room_list.py @@ -42,7 +42,7 @@ EMTPY_THIRD_PARTY_ID = ThirdPartyInstanceID(None, None) class RoomListHandler(BaseHandler): def __init__(self, hs): super(RoomListHandler, self).__init__(hs) - self.response_cache = ResponseCache(hs) + self.response_cache = ResponseCache(hs, timeout_ms=10 * 60 * 1000) self.remote_response_cache = ResponseCache(hs, timeout_ms=30 * 1000) def get_local_public_room_list(self, limit=None, since_token=None, @@ -62,20 +62,18 @@ class RoomListHandler(BaseHandler): appservice and network id to use an appservice specific one. Setting to None returns all public rooms across all lists. """ - if search_filter or (network_tuple and network_tuple.appservice_id is not None): + if search_filter: # We explicitly don't bother caching searches or requests for # appservice specific lists. return self._get_public_room_list( limit, since_token, search_filter, network_tuple=network_tuple, ) - result = self.response_cache.get((limit, since_token)) + result = self.response_cache.get((limit, since_token, network_tuple)) if not result: result = self.response_cache.set( - (limit, since_token), - self._get_public_room_list( - limit, since_token, network_tuple=network_tuple - ) + (limit, since_token, network_tuple), + self._get_public_room_list(limit, since_token, network_tuple=network_tuple) ) return result diff --git a/synapse/storage/event_push_actions.py b/synapse/storage/event_push_actions.py index 7de3e8c58c..1874737674 100644 --- a/synapse/storage/event_push_actions.py +++ b/synapse/storage/event_push_actions.py @@ -101,11 +101,11 @@ class EventPushActionsStore(SQLBaseStore): # notif=1 sql = ( "SELECT count(*)" - " FROM event_push_actions ea" + " FROM (SELECT * FROM event_push_actions" " WHERE" " user_id = ?" " AND room_id = ?" - " AND %s" + " AND %s LIMIT 100) as ea" ) % (lower_bound(token, self.database_engine, inclusive=False),) txn.execute(sql, (user_id, room_id)) diff --git a/synapse/storage/search.py b/synapse/storage/search.py index 8f2b3c4435..17c6c55714 100644 --- a/synapse/storage/search.py +++ b/synapse/storage/search.py @@ -600,7 +600,7 @@ def _parse_query(database_engine, search_term): results = re.findall(r"([\w\-]+)", search_term, re.UNICODE) if isinstance(database_engine, PostgresEngine): - return " & ".join(result + ":*" for result in results) + return " & ".join(result for result in results) elif isinstance(database_engine, Sqlite3Engine): return " & ".join(result + "*" for result in results) else: |