From d6de8d2a6f9e17279a772e4137e3bf53359a85b7 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Wed, 3 Aug 2022 16:35:22 +0100 Subject: [PATCH] Clean up --- roomserver/internal/input/input.go | 7 +++---- roomserver/storage/shared/storage.go | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/roomserver/internal/input/input.go b/roomserver/internal/input/input.go index a6f5585f9..7771f3a33 100644 --- a/roomserver/internal/input/input.go +++ b/roomserver/internal/input/input.go @@ -60,10 +60,9 @@ import ( // per-room durable consumers will only progress through the stream // as events are processed. // -// A BC * -> positions of each consumer (* = ephemeral) -// ⌄ ⌄⌄ ⌄ -// -// ABAABCAABCAA -> newest (letter = subject for each message) +// > A BC * -> positions of each consumer (* = ephemeral) +// > ⌄ ⌄⌄ ⌄ +// > ABAABCAABCAA -> newest (letter = subject for each message) // // In this example, A is still processing an event but has two // pending events to process afterwards. Both B and C are caught diff --git a/roomserver/storage/shared/storage.go b/roomserver/storage/shared/storage.go index c33013773..0c13cb572 100644 --- a/roomserver/storage/shared/storage.go +++ b/roomserver/storage/shared/storage.go @@ -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) { roomInfo, ok := d.Cache.GetRoomInfo(roomID) if ok && roomInfo != nil { - // The data that's in the cache is not stubby, so return it. + // Return the cache entry. return roomInfo, nil } // At this point we either don't have an entry in the cache, or