hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2024-12-29 08:18:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

More aggressive event caching

Browse source
This commit is contained in:
Neil Alexander 2021-06-29 13:28:29 +01:00
parent e2b6a90d90
commit 7c03546a9e
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
federationapi/routing/send.go
View file

@ -985,6 +985,12 @@ func (t *txnReq) getMissingEvents(ctx context.Context, e *gomatrixserverlib.Even
// For now, we do not allow Case B, so reject the event. // For now, we do not allow Case B, so reject the event.
logger.Infof("get_missing_events returned %d events", len(missingResp.Events)) logger.Infof("get_missing_events returned %d events", len(missingResp.Events))
// Make sure events from the missingResp are using the cache - missing events
// will be added and duplicates will be removed.
for i, ev := range missingResp.Events {
missingResp.Events[i] = t.cacheAndReturn(ev.Headered(roomVersion)).Unwrap()
}
// topologically sort and sanity check that we are making forward progress // topologically sort and sanity check that we are making forward progress
newEvents = gomatrixserverlib.ReverseTopologicalOrdering(missingResp.Events, gomatrixserverlib.TopologicalOrderByPrevEvents) newEvents = gomatrixserverlib.ReverseTopologicalOrdering(missingResp.Events, gomatrixserverlib.TopologicalOrderByPrevEvents)
shouldHaveSomeEventIDs := e.PrevEventIDs() shouldHaveSomeEventIDs := e.PrevEventIDs()
@ -1023,6 +1029,13 @@ func (t *txnReq) lookupMissingStateViaState(ctx context.Context, roomID, eventID
if err := state.Check(ctx, t.keys, nil); err != nil { if err := state.Check(ctx, t.keys, nil); err != nil {
return nil, err return nil, err
} }
// Cache the results of this state lookup.
for _, ev := range state.AuthEvents {
t.cacheAndReturn(ev.Headered(roomVersion))
}
for _, ev := range state.StateEvents {
t.cacheAndReturn(ev.Headered(roomVersion))
}
return &state, nil return &state, nil
} }
@ -1222,6 +1235,7 @@ func (t *txnReq) lookupEvent(ctx context.Context, roomVersion gomatrixserverlib.
return nil, verifySigError{event.EventID(), err} return nil, verifySigError{event.EventID(), err}
} }
h := event.Headered(roomVersion) h := event.Headered(roomVersion)
t.cacheAndReturn(h)
t.newEventsMutex.Lock() t.newEventsMutex.Lock()
t.newEvents[h.EventID()] = true t.newEvents[h.EventID()] = true
t.newEventsMutex.Unlock() t.newEventsMutex.Unlock()