Remove superfluous call to get_state_at when we already have an event for that stream position

pull/600/head
Erik Johnston 2016-02-22 13:54:46 +00:00
parent 60bec24083
commit 9e696bd6a3
1 changed files with 12 additions and 4 deletions

View File

@ -845,16 +845,20 @@ class SyncHandler(BaseHandler):
# TODO(mjark) Check for new redactions in the state events.
with Measure(self.clock, "compute_state_delta"):
current_state = yield self.get_state_at(
room_id, stream_position=now_token
)
if full_state:
if batch:
current_state = yield self.store.get_state_for_event(
batch.events[-1].event_id
)
state = yield self.store.get_state_for_event(
batch.events[0].event_id
)
else:
current_state = yield self.get_state_at(
room_id, stream_position=now_token
)
state = current_state
timeline_state = {
@ -873,6 +877,10 @@ class SyncHandler(BaseHandler):
room_id, stream_position=since_token
)
current_state = yield self.store.get_state_for_event(
batch.events[-1].event_id
)
state_at_timeline_start = yield self.store.get_state_for_event(
batch.events[0].event_id
)