diff options
author | 2024-09-16 16:46:09 +0000 | |
---|---|---|
committer | 2024-09-16 16:46:09 +0000 | |
commit | 84279f6a6a0201c90a6747fe8b82c38d5b4e49e2 (patch) | |
tree | 6c777c7ed4888d990533117d7e63376bcc23a3fb /internal/db/bundb/report.go | |
parent | [chore] Refactor federatingDB.Undo, avoid 500 errors on Undo Like (#3310) (diff) | |
download | gotosocial-84279f6a6a0201c90a6747fe8b82c38d5b4e49e2.tar.xz |
[performance] cache more database calls, reduce required database calls overall (#3290)
* improvements to caching for lists and relationship to accounts / follows
* fix nil panic in AddToList()
* ensure list related caches are correctly invalidated
* ensure returned ID lists are ordered correctly
* bump go-structr to v0.8.9 (returns early if zero uncached keys to be loaded)
* remove zero checks in uncached key load functions (go-structr now handles this)
* fix issues after rebase on upstream/main
* update the expected return order of CSV exports (since list entries are now down by entry creation date)
* rename some funcs, allow deleting list entries for multiple follow IDs at a time, fix up more tests
* use returning statements on delete to get cache invalidation info
* fixes to recent database delete changes
* fix broken list entries delete sql
* remove unused db function
* update remainder of delete functions to behave in similar way, some other small tweaks
* fix delete user sql, allow returning on err no entries
* uncomment + fix list database tests
* update remaining list tests
* update envparsing test
* add comments to each specific key being invalidated
* add more cache invalidation explanatory comments
* whoops; actually delete poll votes from database in the DeletePollByID() func
* remove added but-commented-out field
* improved comment regarding paging being disabled
* make cache invalidation comments match what's actually happening
* fix up delete query comments to match what is happening
* rename function to read a bit better
* don't use ErrNoEntries on delete when not needed (it's only needed for a RETURNING call)
* update function name in test
* move list exclusivity check to AFTER eligibility check. use log.Panic() instead of panic()
* use the poll_id column in poll_votes for selecting votes in poll ID
* fix function name
Diffstat (limited to 'internal/db/bundb/report.go')
-rw-r--r-- | internal/db/bundb/report.go | 49 |
1 files changed, 20 insertions, 29 deletions
diff --git a/internal/db/bundb/report.go b/internal/db/bundb/report.go index d2096a78a..582584988 100644 --- a/internal/db/bundb/report.go +++ b/internal/db/bundb/report.go @@ -248,45 +248,36 @@ func (r *reportDB) PutReport(ctx context.Context, report *gtsmodel.Report) error }) } -func (r *reportDB) UpdateReport(ctx context.Context, report *gtsmodel.Report, columns ...string) (*gtsmodel.Report, error) { +func (r *reportDB) UpdateReport(ctx context.Context, report *gtsmodel.Report, columns ...string) error { // Update the report's last-updated report.UpdatedAt = time.Now() if len(columns) != 0 { columns = append(columns, "updated_at") } - if _, err := r.db. - NewUpdate(). - Model(report). - Where("? = ?", bun.Ident("report.id"), report.ID). - Column(columns...). - Exec(ctx); err != nil { - return nil, err - } - - r.state.Caches.DB.Report.Invalidate("ID", report.ID) - return report, nil + return r.state.Caches.DB.Report.Store(report, func() error { + _, err := r.db. + NewUpdate(). + Model(report). + Where("? = ?", bun.Ident("report.id"), report.ID). + Column(columns...). + Exec(ctx) + return err + }) } func (r *reportDB) DeleteReportByID(ctx context.Context, id string) error { - defer r.state.Caches.DB.Report.Invalidate("ID", id) - - // Load status into cache before attempting a delete, - // as we need it cached in order to trigger the invalidate - // callback. This in turn invalidates others. - _, err := r.GetReportByID(gtscontext.SetBarebones(ctx), id) - if err != nil { - if errors.Is(err, db.ErrNoEntries) { - // not an issue. - err = nil - } + // Delete the report from DB. + if _, err := r.db.NewDelete(). + TableExpr("? AS ?", bun.Ident("reports"), bun.Ident("report")). + Where("? = ?", bun.Ident("report.id"), id). + Exec(ctx); err != nil && + !errors.Is(err, db.ErrNoEntries) { return err } - // Finally delete report from DB. - _, err = r.db.NewDelete(). - TableExpr("? AS ?", bun.Ident("reports"), bun.Ident("report")). - Where("? = ?", bun.Ident("report.id"), id). - Exec(ctx) - return err + // Invalidate any cached report model by ID. + r.state.Caches.DB.Report.Invalidate("ID", id) + + return nil } |