diff options
author | 2024-09-16 16:46:09 +0000 | |
---|---|---|
committer | 2024-09-16 16:46:09 +0000 | |
commit | 84279f6a6a0201c90a6747fe8b82c38d5b4e49e2 (patch) | |
tree | 6c777c7ed4888d990533117d7e63376bcc23a3fb /internal/processing/list/util.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/processing/list/util.go')
-rw-r--r-- | internal/processing/list/util.go | 46 |
1 files changed, 15 insertions, 31 deletions
diff --git a/internal/processing/list/util.go b/internal/processing/list/util.go index c5b1e5081..74d148704 100644 --- a/internal/processing/list/util.go +++ b/internal/processing/list/util.go @@ -33,18 +33,25 @@ import ( // appropriate errors so caller doesn't need to bother. func (p *Processor) getList(ctx context.Context, accountID string, listID string) (*gtsmodel.List, gtserror.WithCode) { list, err := p.state.DB.GetListByID(ctx, listID) - if err != nil { - if errors.Is(err, db.ErrNoEntries) { - // List doesn't seem to exist. - return nil, gtserror.NewErrorNotFound(err) - } - // Real database error. + if err != nil && !errors.Is(err, db.ErrNoEntries) { + err := gtserror.Newf("db error getting list: %w", err) return nil, gtserror.NewErrorInternalError(err) } + if list == nil { + const text = "list not found" + return nil, gtserror.NewErrorNotFound( + errors.New(text), + text, + ) + } + if list.AccountID != accountID { - err = fmt.Errorf("list with id %s does not belong to account %s", list.ID, accountID) - return nil, gtserror.NewErrorNotFound(err) + const text = "list not found" + return nil, gtserror.NewErrorNotFound( + errors.New("list does not belong to account"), + text, + ) } return list, nil @@ -60,26 +67,3 @@ func (p *Processor) apiList(ctx context.Context, list *gtsmodel.List) (*apimodel return apiList, nil } - -// isInList check if thisID is equal to the result of thatID -// for any entry in the given list. -// -// Will return the id of the listEntry if true, empty if false, -// or an error if the result of thatID returns an error. -func isInList( - list *gtsmodel.List, - thisID string, - getThatID func(listEntry *gtsmodel.ListEntry) (string, error), -) (string, error) { - for _, listEntry := range list.ListEntries { - thatID, err := getThatID(listEntry) - if err != nil { - return "", err - } - - if thisID == thatID { - return listEntry.ID, nil - } - } - return "", nil -} |