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

Clean up

Browse source
This commit is contained in:
Neil Alexander 2022-08-03 16:35:22 +01:00
parent 18ddda3832
commit d6de8d2a6f
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
roomserver/internal/input/input.go
View file

@ -60,10 +60,9 @@ import (
// per-room durable consumers will only progress through the stream // per-room durable consumers will only progress through the stream
// as events are processed. // as events are processed.
// //
// A BC * -> positions of each consumer (* = ephemeral) // > A BC * -> positions of each consumer (* = ephemeral)
// ⌄ ⌄⌄ ⌄ // > ⌄ ⌄⌄ ⌄
// // > ABAABCAABCAA -> newest (letter = subject for each message)
// ABAABCAABCAA -> newest (letter = subject for each message)
// //
// In this example, A is still processing an event but has two // In this example, A is still processing an event but has two
// pending events to process afterwards. Both B and C are caught // pending events to process afterwards. Both B and C are caught

2
roomserver/storage/shared/storage.go
View file

@ -158,7 +158,7 @@ func (d *Database) RoomInfo(ctx context.Context, roomID string) (*types.RoomInfo
func (d *Database) roomInfo(ctx context.Context, txn *sql.Tx, roomID string) (*types.RoomInfo, error) { func (d *Database) roomInfo(ctx context.Context, txn *sql.Tx, roomID string) (*types.RoomInfo, error) {
roomInfo, ok := d.Cache.GetRoomInfo(roomID) roomInfo, ok := d.Cache.GetRoomInfo(roomID)
if ok && roomInfo != nil { if ok && roomInfo != nil {
// The data that's in the cache is not stubby, so return it. // Return the cache entry.
return roomInfo, nil return roomInfo, nil
} }
// At this point we either don't have an entry in the cache, or // At this point we either don't have an entry in the cache, or