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

Make path a bit clearer

Browse source
This commit is contained in:
Neil Alexander 2020-10-21 14:33:45 +01:00
parent 61f457c4d9
commit 33540fe84b
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -251,13 +251,12 @@ func (u *latestEventsUpdater) calculateLatest(
newEvent *gomatrixserverlib.Event, newEvent *gomatrixserverlib.Event,
newStateAndRef types.StateAtEventAndReference, newStateAndRef types.StateAtEventAndReference,
) error { ) error {
// 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 in our current
// forward extremities reference. // set of forward extremities.
existingIDs := make(map[string]*types.StateAtEventAndReference) existingRefs := make(map[string]*types.StateAtEventAndReference)
existingPrevs := make(map[string]struct{})
existingNIDs := make([]types.EventNID, len(oldLatest)) existingNIDs := make([]types.EventNID, len(oldLatest))
for i, old := range oldLatest { for i, old := range oldLatest {
existingIDs[old.EventID] = &oldLatest[i] existingRefs[old.EventID] = &oldLatest[i]
existingNIDs[i] = old.EventNID existingNIDs[i] = old.EventNID
} }
@ -270,6 +269,7 @@ func (u *latestEventsUpdater) calculateLatest(
// Make a list of all of the prev events as referenced by all of // Make a list of all of the prev events as referenced by all of
// the current forward extremities. // the current forward extremities.
existingPrevs := make(map[string]struct{})
for _, old := range events { for _, old := range events {
for _, prevEventID := range old.PrevEventIDs() { for _, prevEventID := range old.PrevEventIDs() {
existingPrevs[prevEventID] = struct{}{} existingPrevs[prevEventID] = struct{}{}
@ -298,7 +298,7 @@ func (u *latestEventsUpdater) calculateLatest(
// If our new event references them then they are no longer good // If our new event references them then they are no longer good
// candidates. // candidates.
for _, prevEventID := range newEvent.PrevEventIDs() { for _, prevEventID := range newEvent.PrevEventIDs() {
delete(existingIDs, prevEventID) delete(existingRefs, prevEventID)
} }
// Ensure that we don't add any candidate forward extremities from // Ensure that we don't add any candidate forward extremities from
@ -306,11 +306,11 @@ func (u *latestEventsUpdater) calculateLatest(
// forward extremities. This shouldn't happen but guards against // forward extremities. This shouldn't happen but guards against
// the possibility anyway. // the possibility anyway.
for prevEventID := range existingPrevs { for prevEventID := range existingPrevs {
delete(existingIDs, prevEventID) delete(existingRefs, prevEventID)
} }
// Then re-add any old extremities that are still valid after all. // Then re-add any old extremities that are still valid after all.
for _, old := range existingIDs { for _, old := range existingRefs {
newLatest = append(newLatest, *old) newLatest = append(newLatest, *old)
} }