diff options
author | Patrick Cloke <clokep@users.noreply.github.com> | 2023-01-09 08:43:50 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-09 08:43:50 -0500 |
commit | 7e582a25f8f350df29d7d83ca902bdb522d1bbaf (patch) | |
tree | a624e48b4fbe68dd1dc5c138ce34b82d57d0f3da /synapse/api | |
parent | Disable sending confirmation email when 3pid is disabled #14682 (#14725) (diff) | |
download | synapse-7e582a25f8f350df29d7d83ca902bdb522d1bbaf.tar.xz |
Improve /sync performance of when passing filters with empty arrays. (#14786)
This has two related changes: * It enables fast-path processing for an empty filter (`[]`) which was previously only used for wildcard not-filters (`["*"]`). * It special cases a `/sync` filter with no-rooms to skip all room processing, previously we would partially skip processing, but would generally still calculate intermediate values for each room which were then unused. Future changes might consider further optimizations: * Skip calculating per-room account data when all rooms are filtered (currently this is thrown away). * Make similar improvements to other endpoints which support filters.
Diffstat (limited to 'synapse/api')
-rw-r--r-- | synapse/api/filtering.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/synapse/api/filtering.py b/synapse/api/filtering.py index a9888381b4..2b5af264b4 100644 --- a/synapse/api/filtering.py +++ b/synapse/api/filtering.py @@ -283,6 +283,9 @@ class FilterCollection: await self._room_filter.filter(events) ) + def blocks_all_rooms(self) -> bool: + return self._room_filter.filters_all_rooms() + def blocks_all_presence(self) -> bool: return ( self._presence_filter.filters_all_types() @@ -351,13 +354,13 @@ class Filter: self.not_rel_types = filter_json.get("org.matrix.msc3874.not_rel_types", []) def filters_all_types(self) -> bool: - return "*" in self.not_types + return self.types == [] or "*" in self.not_types def filters_all_senders(self) -> bool: - return "*" in self.not_senders + return self.senders == [] or "*" in self.not_senders def filters_all_rooms(self) -> bool: - return "*" in self.not_rooms + return self.rooms == [] or "*" in self.not_rooms def _check(self, event: FilterEvent) -> bool: """Checks whether the filter matches the given event. @@ -450,8 +453,8 @@ class Filter: if any(map(match_func, disallowed_values)): return False - # Other the event does not match at least one of the allowed values, - # reject it. + # Otherwise if the event does not match at least one of the allowed + # values, reject it. allowed_values = getattr(self, name) if allowed_values is not None: if not any(map(match_func, allowed_values)): |