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

Comments

Browse source
This commit is contained in:
Mark Haines 2017-05-30 13:18:00 +01:00
parent c53e3123cc
commit 1baa6fe4d1
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/github.com/matrix-org/dendrite/roomserver/state/state.go
View file

@ -345,6 +345,12 @@ func loadStateAfterEventsForNumericTuples(
return nil, err return nil, err
} }
if prevState.IsStateEvent() { if prevState.IsStateEvent() {
// The result is current the state before the requested event.
// We want the state after the requested event.
// If the requested event was a state event then we need to
// update that key in the result.
// If the requested event wasn't a state event then the state after
// it is the same as the state before it.
for i := range result { for i := range result {
if result[i].StateKeyTuple == prevState.StateKeyTuple { if result[i].StateKeyTuple == prevState.StateKeyTuple {
result[i] = prevState.StateEntry result[i] = prevState.StateEntry
@ -357,12 +363,12 @@ func loadStateAfterEventsForNumericTuples(
// Slow path for more that one event. // Slow path for more that one event.
// Load the entire state so that we can do conflict resolution if we need to. // Load the entire state so that we can do conflict resolution if we need to.
// TODO: The are some optimistations we could do here: // TODO: The are some optimistations we could do here:
// 1) We only need to do conflict resolution if the is a conflict in the // 1) We only need to do conflict resolution if there is a conflict in the
// requested tuples so we might try loading just those tuples and then // requested tuples so we might try loading just those tuples and then
// checking for conflicts. // checking for conflicts.
// 2) When there is a conflict we still only need to load the state // 2) When there is a conflict we still only need to load the state
// needed to do conflict resolution which would save us having to load // needed to do conflict resolution which would save us having to load
// the full state. // the full state.
// TODO: Add metrics for this as it could take a long time for big rooms // TODO: Add metrics for this as it could take a long time for big rooms
// with large conflicts. // with large conflicts.