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

Remove unnecessary txn, add txns around setting up updaters

Browse source
This commit is contained in:
Neil Alexander 2020-08-19 17:54:15 +01:00
parent b4e0697e0f
commit bd0fc7824c
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -179,22 +179,19 @@ func (d *Database) RoomNIDExcludingStubs(ctx context.Context, roomID string) (ro
func (d *Database) LatestEventIDs( func (d *Database) LatestEventIDs(
ctx context.Context, roomNID types.RoomNID, ctx context.Context, roomNID types.RoomNID,
) (references []gomatrixserverlib.EventReference, currentStateSnapshotNID types.StateSnapshotNID, depth int64, err error) { ) (references []gomatrixserverlib.EventReference, currentStateSnapshotNID types.StateSnapshotNID, depth int64, err error) {
err = sqlutil.WithTransaction(d.DB, func(txn *sql.Tx) error { var eventNIDs []types.EventNID
var eventNIDs []types.EventNID eventNIDs, currentStateSnapshotNID, err = d.RoomsTable.SelectLatestEventNIDs(ctx, nil, roomNID)
eventNIDs, currentStateSnapshotNID, err = d.RoomsTable.SelectLatestEventNIDs(ctx, txn, roomNID) if err != nil {
if err != nil { return
return err }
} references, err = d.EventsTable.BulkSelectEventReference(ctx, nil, eventNIDs)
references, err = d.EventsTable.BulkSelectEventReference(ctx, txn, eventNIDs) if err != nil {
if err != nil { return
return err }
} depth, err = d.EventsTable.SelectMaxEventDepth(ctx, nil, eventNIDs)
depth, err = d.EventsTable.SelectMaxEventDepth(ctx, txn, eventNIDs) if err != nil {
if err != nil { return
return err }
}
return nil
})
return return
} }
@ -351,7 +348,12 @@ func (d *Database) MembershipUpdater(
if err != nil { if err != nil {
return nil, err return nil, err
} }
return NewMembershipUpdater(ctx, d, txn, roomID, targetUserID, targetLocal, roomVersion) var updater *MembershipUpdater
_ = d.Writer.Do(d.DB, txn, func(txn *sql.Tx) error {
updater, err = NewMembershipUpdater(ctx, d, txn, roomID, targetUserID, targetLocal, roomVersion)
return nil
})
return updater, err
} }
func (d *Database) GetLatestEventsForUpdate( func (d *Database) GetLatestEventsForUpdate(
@ -361,7 +363,12 @@ func (d *Database) GetLatestEventsForUpdate(
if err != nil { if err != nil {
return nil, err return nil, err
} }
return NewLatestEventsUpdater(ctx, d, txn, roomNID) var updater *LatestEventsUpdater
_ = d.Writer.Do(d.DB, txn, func(txn *sql.Tx) error {
updater, err = NewLatestEventsUpdater(ctx, d, txn, roomNID)
return nil
})
return updater, err
} }
// nolint:gocyclo // nolint:gocyclo