mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-25 07:43:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Tweaks

Browse source
This commit is contained in:
Neil Alexander 2020-10-21 14:27:27 +01:00
parent e066b8152f
commit 414d974cf5
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
roomserver/internal/input/input_latest_events.go
View file

@ -254,7 +254,7 @@ func (u *latestEventsUpdater) calculateLatest(
// First of all, get a list of all of the events that our current // First of all, get a list of all of the events that our current
// forward extremities reference. // forward extremities reference.
existingIDs := make(map[string]*types.StateAtEventAndReference) existingIDs := make(map[string]*types.StateAtEventAndReference)
existingRefMap := make(map[string]struct{}) existingPrevs := make(map[string]struct{})
existingNIDs := []types.EventNID{} existingNIDs := []types.EventNID{}
for i, old := range oldLatest { for i, old := range oldLatest {
existingIDs[old.EventID] = &oldLatest[i] existingIDs[old.EventID] = &oldLatest[i]
@ -267,20 +267,24 @@ func (u *latestEventsUpdater) calculateLatest(
if err != nil { if err != nil {
return fmt.Errorf("u.api.DB.Events: %w", err) return fmt.Errorf("u.api.DB.Events: %w", err)
} }
// Make a list of all of the prev events as referenced by all of
// the current forward extremities.
for _, old := range events { for _, old := range events {
for _, prevEventID := range old.PrevEventIDs() { for _, prevEventID := range old.PrevEventIDs() {
existingRefMap[prevEventID] = struct{}{} existingPrevs[prevEventID] = struct{}{}
} }
} }
// If the "new" event is already referenced by a forward extremity // If the "new" event is already referenced by a forward extremity
// then do nothing - it's not a candidate to be a new extremity. // then do nothing - it's not a candidate to be a new extremity if
if _, ok := existingRefMap[newEvent.EventID()]; ok { // it has been referenced.
if _, ok := existingPrevs[newEvent.EventID()]; ok {
return nil return nil
} }
// If the "new" event is already a forward extremity then do nothing // If the "new" event is already a forward extremity then stop, as
// either - we won't add it twice. // nothing changes.
for _, event := range events { for _, event := range events {
if event.EventID() == newEvent.EventID() { if event.EventID() == newEvent.EventID() {
return nil return nil
@ -291,11 +295,21 @@ func (u *latestEventsUpdater) calculateLatest(
newLatest := []types.StateAtEventAndReference{newStateAndRef} newLatest := []types.StateAtEventAndReference{newStateAndRef}
// Then run through and see if the other extremities are still valid. // Then run through and see if the other extremities are still valid.
// If our new event references them then they are no longer good
// candidates.
for _, prevEventID := range newEvent.PrevEventIDs() { for _, prevEventID := range newEvent.PrevEventIDs() {
delete(existingIDs, prevEventID) delete(existingIDs, prevEventID)
} }
// Then re-add any old extremities that are still valid. // Ensure that we don't add any candidate forward extremities from
// the old set that are, themselves, referenced by the old set of
// forward extremities. This shouldn't happen but guards against
// the possibility anyway.
for prevEventID := range existingPrevs {
delete(existingIDs, prevEventID)
}
// Then re-add any old extremities that are still valid after all.
for _, old := range existingIDs { for _, old := range existingIDs {
newLatest = append(newLatest, *old) newLatest = append(newLatest, *old)
} }