Don't hit cache twice in RoomNIDExcludingStubs

This commit is contained in:
Neil Alexander 2020-08-25 11:48:10 +01:00
parent 5d2e6abff9
commit 63c0b4c336
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944

View file

@ -209,13 +209,9 @@ func (d *Database) RoomNID(ctx context.Context, roomID string) (types.RoomNID, e
}
func (d *Database) RoomNIDExcludingStubs(ctx context.Context, roomID string) (roomNID types.RoomNID, err error) {
if nid, ok := d.Cache.GetRoomServerRoomNID(roomID); ok {
roomNID = nid
} else {
roomNID, err = d.RoomNID(ctx, roomID)
if err != nil {
return
}
roomNID, err = d.RoomNID(ctx, roomID)
if err != nil {
return
}
latestEvents, _, err := d.RoomsTable.SelectLatestEventNIDs(ctx, nil, roomNID)
if err != nil {