mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-21 04:53:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

Delete relay entries and json in a single transaction

Browse source
This commit is contained in:
Devon Hudson 2023-01-17 15:38:04 -07:00
parent c476e71ec3
commit d440223e04
No known key found for this signature in database
GPG key ID: CD06B18E77F6A628
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
relayapi/storage/shared/storage.go
View file

@ -90,22 +90,19 @@ func (d *Database) CleanTransactions(
} }
err := d.Writer.Do(d.DB, nil, func(txn *sql.Tx) error { err := d.Writer.Do(d.DB, nil, func(txn *sql.Tx) error {
err := d.RelayQueue.DeleteQueueEntries(ctx, txn, userID.Domain(), nids) deleteEntryErr := d.RelayQueue.DeleteQueueEntries(ctx, txn, userID.Domain(), nids)
return err deleteJSONErr := d.RelayQueueJSON.DeleteQueueJSON(ctx, txn, nids)
})
if err != nil {
return fmt.Errorf("d.deleteQueueEntries: %w", err)
}
err = d.Writer.Do(d.DB, nil, func(txn *sql.Tx) error { if deleteEntryErr != nil {
dbErr := d.RelayQueueJSON.DeleteQueueJSON(ctx, txn, nids) return fmt.Errorf("d.deleteQueueEntries: %w", deleteEntryErr)
return dbErr }
if deleteJSONErr != nil {
return fmt.Errorf("d.deleteQueueJSON: %w", deleteJSONErr)
}
return nil
}) })
if err != nil {
return fmt.Errorf("d.deleteQueueJSON: %w", err)
}
return nil return err
} }
func (d *Database) GetTransaction( func (d *Database) GetTransaction(