mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-16 10:33:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make Sytest happy again

Browse source
This commit is contained in:
Till Faelligen 2023-04-26 11:08:48 +02:00
parent 2fcb6dfbec
commit 1c04196d74
No known key found for this signature in database
GPG key ID: ACCDC9606D472758
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -669,13 +669,17 @@ func (d *Database) GetOrCreateRoomInfo(ctx context.Context, event *gomatrixserve
if roomVersion, err = extractRoomVersionFromCreateEvent(event); err != nil { if roomVersion, err = extractRoomVersionFromCreateEvent(event); err != nil {
return nil, fmt.Errorf("extractRoomVersionFromCreateEvent: %w", err) return nil, fmt.Errorf("extractRoomVersionFromCreateEvent: %w", err)
} }
if roomVersion == "" {
rv, ok := d.Cache.GetRoomVersion(event.RoomID()) roomNID, nidOK := d.Cache.GetRoomServerRoomNID(event.RoomID())
if ok { cachedRoomVersion, versionOK := d.Cache.GetRoomVersion(event.RoomID())
roomVersion = rv // if we found both, the roomNID and version in our cache, no need to query the database
} if nidOK && versionOK {
return &types.RoomInfo{
RoomNID: roomNID,
RoomVersion: cachedRoomVersion,
}, nil
} }
var roomNID types.RoomNID
err = d.Writer.Do(d.DB, nil, func(txn *sql.Tx) error { err = d.Writer.Do(d.DB, nil, func(txn *sql.Tx) error {
roomNID, err = d.assignRoomNID(ctx, txn, event.RoomID(), roomVersion) roomNID, err = d.assignRoomNID(ctx, txn, event.RoomID(), roomVersion)
if err != nil { if err != nil {