diff options
| author | Erik Johnston <erikj@jki.re> | 2016-09-15 15:48:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-15 15:48:53 +0100 |
| commit | ea6dc356b08f76988c5616290750bdd85758627c (patch) | |
| tree | 018742ba107f80e11636a630b2e2fadc13b8b226 /synapse/storage | |
| parent | Merge pull request #1124 from matrix-org/erikj/enable_state_caching_workers (diff) | |
| parent | Change get_pos_of_last_change to return upper bound (diff) | |
| download | synapse-ea6dc356b08f76988c5616290750bdd85758627c.tar.xz | |
Merge pull request #1125 from matrix-org/erikj/public_room_cache
Change get_pos_of_last_change to return upper bound
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/event_federation.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/storage/event_federation.py b/synapse/storage/event_federation.py index 97d0c26475..59b4cf1e53 100644 --- a/synapse/storage/event_federation.py +++ b/synapse/storage/event_federation.py @@ -347,9 +347,8 @@ class EventFederationStore(SQLBaseStore): def get_forward_extremeties_for_room(self, room_id, stream_ordering): # We want to make the cache more effective, so we clamp to the last # change before the given ordering. - last_change = self._events_stream_cache.get_pos_of_last_change(room_id) - if last_change: - stream_ordering = min(last_change, stream_ordering) + last_change = self._events_stream_cache.get_max_pos_of_last_change(room_id) + stream_ordering = min(last_change, stream_ordering) return self._get_forward_extremeties_for_room(room_id, stream_ordering) |