diff options
| author | Neil Alexander <neilalexander@users.noreply.github.com> | 2022-02-10 09:30:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-10 09:30:16 +0000 |
| commit | 37cbe263ce89681b0aeb7fef30e05d6125df162f (patch) | |
| tree | 0f256b413bdd01d80474b51c1da1de71b8f8c41c /roomserver/storage/shared | |
| parent | aa5c3b88dea207410461820ee480b002d185aa54 (diff) | |
Fix transaction issues in events table in PSQL (#2165)
* Revert "Revert "Fix storage bug in PSQL events table""
This reverts commit cf447dd52a0015c2c5b10813ed11e59a3712607e.
* Membership updater to use updater
* Fix membership updater to use transactions properly
Diffstat (limited to 'roomserver/storage/shared')
| -rw-r--r-- | roomserver/storage/shared/membership_updater.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/roomserver/storage/shared/membership_updater.go b/roomserver/storage/shared/membership_updater.go index f1f589a3..66ac2f5b 100644 --- a/roomserver/storage/shared/membership_updater.go +++ b/roomserver/storage/shared/membership_updater.go @@ -136,7 +136,7 @@ func (u *MembershipUpdater) SetToJoin(senderUserID string, eventID string, isUpd } // Look up the NID of the new join event - nIDs, err := u.d.EventNIDs(u.ctx, []string{eventID}) + nIDs, err := u.d.eventNIDs(u.ctx, u.txn, []string{eventID}) if err != nil { return fmt.Errorf("u.d.EventNIDs: %w", err) } @@ -170,7 +170,7 @@ func (u *MembershipUpdater) SetToLeave(senderUserID string, eventID string) ([]s } // Look up the NID of the new leave event - nIDs, err := u.d.EventNIDs(u.ctx, []string{eventID}) + nIDs, err := u.d.eventNIDs(u.ctx, u.txn, []string{eventID}) if err != nil { return fmt.Errorf("u.d.EventNIDs: %w", err) } @@ -196,7 +196,7 @@ func (u *MembershipUpdater) SetToKnock(event *gomatrixserverlib.Event) (bool, er } if u.membership != tables.MembershipStateKnock { // Look up the NID of the new knock event - nIDs, err := u.d.EventNIDs(u.ctx, []string{event.EventID()}) + nIDs, err := u.d.eventNIDs(u.ctx, u.txn, []string{event.EventID()}) if err != nil { return fmt.Errorf("u.d.EventNIDs: %w", err) } |