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

Close the txn at the right time

Browse source
This commit is contained in:
Kegan Dougal 2020-05-27 18:24:37 +01:00
parent 8183be2e75
commit 4ccac6957b
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
roomserver/storage/shared/membership_updater.go
View file

@ -43,17 +43,16 @@ func NewMembershipUpdater(
return nil, err return nil, err
} }
if !useTxns {
txn.Commit() // nolint: errcheck
txn = nil
}
updater, err := d.membershipUpdaterTxn(ctx, txn, roomNID, targetUserNID, targetLocal) updater, err := d.membershipUpdaterTxn(ctx, txn, roomNID, targetUserNID, targetLocal)
if err != nil { if err != nil {
return nil, err return nil, err
} }
succeeded = true succeeded = true
if !useTxns {
txn.Commit() // nolint: errcheck
updater.transaction.txn = nil
}
return updater, nil return updater, nil
} }
@ -63,7 +62,7 @@ func (d *Database) membershipUpdaterTxn(
roomNID types.RoomNID, roomNID types.RoomNID,
targetUserNID types.EventStateKeyNID, targetUserNID types.EventStateKeyNID,
targetLocal bool, targetLocal bool,
) (types.MembershipUpdater, error) { ) (*membershipUpdater, error) {
if err := d.MembershipTable.InsertMembership(ctx, txn, roomNID, targetUserNID, targetLocal); err != nil { if err := d.MembershipTable.InsertMembership(ctx, txn, roomNID, targetUserNID, targetLocal); err != nil {
return nil, err return nil, err