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/status.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/status.go')
| -rw-r--r-- | internal/db/bundb/status.go | 62 |
1 files changed, 30 insertions, 32 deletions
diff --git a/internal/db/bundb/status.go b/internal/db/bundb/status.go index d0befd52f..5340b63cd 100644 --- a/internal/db/bundb/status.go +++ b/internal/db/bundb/status.go @@ -54,15 +54,8 @@ func (s *statusDB) GetStatusesByIDs(ctx context.Context, ids []string) ([]*gtsmo statuses, err := s.state.Caches.DB.Status.LoadIDs("ID", ids, func(uncached []string) ([]*gtsmodel.Status, error) { - // Avoid querying - // if none uncached. - count := len(uncached) - if count == 0 { - return nil, nil - } - // Preallocate expected length of uncached statuses. - statuses := make([]*gtsmodel.Status, 0, count) + statuses := make([]*gtsmodel.Status, 0, len(uncached)) // Perform database query scanning // the remaining (uncached) status IDs. @@ -486,24 +479,13 @@ func (s *statusDB) UpdateStatus(ctx context.Context, status *gtsmodel.Status, co } func (s *statusDB) DeleteStatusByID(ctx context.Context, id string) error { - // 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 := s.GetStatusByID( - gtscontext.SetBarebones(ctx), - id, - ) - if err != nil && !errors.Is(err, db.ErrNoEntries) { - // NOTE: even if db.ErrNoEntries is returned, we - // still run the below transaction to ensure related - // objects are appropriately deleted. - return err - } - - // On return ensure status invalidated from cache. - defer s.state.Caches.DB.Status.Invalidate("ID", id) + // Gather necessary fields from + // deleted for cache invaliation. + var deleted gtsmodel.Status + deleted.ID = id - return s.db.RunInTx(ctx, nil, func(ctx context.Context, tx bun.Tx) error { + // Delete status from database and any related links in a transaction. + if err := s.db.RunInTx(ctx, nil, func(ctx context.Context, tx bun.Tx) error { // delete links between this status and any emojis it uses if _, err := tx. NewDelete(). @@ -524,26 +506,42 @@ func (s *statusDB) DeleteStatusByID(ctx context.Context, id string) error { // Delete links between this status // and any threads it was a part of. - _, err = tx. + if _, err := tx. NewDelete(). TableExpr("? AS ?", bun.Ident("thread_to_statuses"), bun.Ident("thread_to_status")). Where("? = ?", bun.Ident("thread_to_status.status_id"), id). - Exec(ctx) - if err != nil { + Exec(ctx); err != nil { return err } // delete the status itself if _, err := tx. NewDelete(). - TableExpr("? AS ?", bun.Ident("statuses"), bun.Ident("status")). - Where("? = ?", bun.Ident("status.id"), id). - Exec(ctx); err != nil { + Model(&deleted). + Where("? = ?", bun.Ident("id"), id). + Returning("?, ?, ?, ?, ?", + bun.Ident("account_id"), + bun.Ident("boost_of_id"), + bun.Ident("in_reply_to_id"), + bun.Ident("attachments"), + bun.Ident("poll_id"), + ). + Exec(ctx); err != nil && + !errors.Is(err, db.ErrNoEntries) { return err } return nil - }) + }); err != nil { + return err + } + + // Invalidate cached status by its ID, manually + // call the invalidate hook in case not cached. + s.state.Caches.DB.Status.Invalidate("ID", id) + s.state.Caches.OnInvalidateStatus(&deleted) + + return nil } func (s *statusDB) GetStatusesUsingEmoji(ctx context.Context, emojiID string) ([]*gtsmodel.Status, error) { |
