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/postgres/events_table.go | |
| 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/postgres/events_table.go')
| -rw-r--r-- | roomserver/storage/postgres/events_table.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/roomserver/storage/postgres/events_table.go b/roomserver/storage/postgres/events_table.go index ece1d9e3..c136f039 100644 --- a/roomserver/storage/postgres/events_table.go +++ b/roomserver/storage/postgres/events_table.go @@ -74,7 +74,7 @@ const insertEventSQL = "" + "INSERT INTO roomserver_events AS e (room_nid, event_type_nid, event_state_key_nid, event_id, reference_sha256, auth_event_nids, depth, is_rejected)" + " VALUES ($1, $2, $3, $4, $5, $6, $7, $8)" + " ON CONFLICT ON CONSTRAINT roomserver_event_id_unique DO UPDATE" + - " SET is_rejected = $8 WHERE e.is_rejected = FALSE" + + " SET is_rejected = $8 WHERE e.event_id = $4 AND e.is_rejected = FALSE" + " RETURNING event_nid, state_snapshot_nid" const selectEventSQL = "" + @@ -192,7 +192,8 @@ func (s *eventStatements) InsertEvent( ) (types.EventNID, types.StateSnapshotNID, error) { var eventNID int64 var stateNID int64 - err := s.insertEventStmt.QueryRowContext( + stmt := sqlutil.TxStmt(txn, s.insertEventStmt) + err := stmt.QueryRowContext( ctx, int64(roomNID), int64(eventTypeNID), int64(eventStateKeyNID), eventID, referenceSHA256, eventNIDsAsArray(authEventNIDs), depth, isRejected, |