From 84279f6a6a0201c90a6747fe8b82c38d5b4e49e2 Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Mon, 16 Sep 2024 16:46:09 +0000 Subject: [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 --- internal/db/list.go | 53 +++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) (limited to 'internal/db/list.go') diff --git a/internal/db/list.go b/internal/db/list.go index a57f0ed23..4ce0ff988 100644 --- a/internal/db/list.go +++ b/internal/db/list.go @@ -21,6 +21,7 @@ import ( "context" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "github.com/superseriousbusiness/gotosocial/internal/paging" ) type List interface { @@ -30,11 +31,29 @@ type List interface { // GetListsByIDs fetches all lists with the provided IDs. GetListsByIDs(ctx context.Context, ids []string) ([]*gtsmodel.List, error) - // GetListsForAccountID gets all lists owned by the given accountID. - GetListsForAccountID(ctx context.Context, accountID string) ([]*gtsmodel.List, error) + // GetListsByAccountID gets all lists owned by the given accountID. + GetListsByAccountID(ctx context.Context, accountID string) ([]*gtsmodel.List, error) - // CountListsForAccountID counts the number of lists owned by the given accountID. - CountListsForAccountID(ctx context.Context, accountID string) (int, error) + // CountListsByAccountID counts the number of lists owned by the given accountID. + CountListsByAccountID(ctx context.Context, accountID string) (int, error) + + // GetListsContainingFollowID gets all lists that contain the given follow with ID. + GetListsContainingFollowID(ctx context.Context, followID string) ([]*gtsmodel.List, error) + + // GetFollowIDsInList returns all the follow IDs contained within given list ID. + GetFollowIDsInList(ctx context.Context, listID string, page *paging.Page) ([]string, error) + + // GetFollowsInList returns all the follows contained within given list ID. + GetFollowsInList(ctx context.Context, listID string, page *paging.Page) ([]*gtsmodel.Follow, error) + + // GetAccountIDsInList return all the account IDs (follow targets) contained within given list ID. + GetAccountIDsInList(ctx context.Context, listID string, page *paging.Page) ([]string, error) + + // GetAccountsInList return all the accounts (follow targets) contained within given list ID. + GetAccountsInList(ctx context.Context, listID string, page *paging.Page) ([]*gtsmodel.Account, error) + + // IsAccountInListID returns whether given account with ID is in the list with ID. + IsAccountInList(ctx context.Context, listID string, accountID string) (bool, error) // PopulateList ensures that the list's struct fields are populated. PopulateList(ctx context.Context, list *gtsmodel.List) error @@ -49,31 +68,13 @@ type List interface { // DeleteListByID deletes one list with the given ID. DeleteListByID(ctx context.Context, id string) error - // GetListEntryByID gets one list entry with the given ID. - GetListEntryByID(ctx context.Context, id string) (*gtsmodel.ListEntry, error) - - // GetListEntriesyIDs fetches all list entries with the provided IDs. - GetListEntriesByIDs(ctx context.Context, ids []string) ([]*gtsmodel.ListEntry, error) - - // GetListEntries gets list entries from the given listID, using the given parameters. - GetListEntries(ctx context.Context, listID string, maxID string, sinceID string, minID string, limit int) ([]*gtsmodel.ListEntry, error) - - // GetListEntriesForFollowID returns all listEntries that pertain to the given followID. - GetListEntriesForFollowID(ctx context.Context, followID string) ([]*gtsmodel.ListEntry, error) - - // PopulateListEntry ensures that the listEntry's struct fields are populated. - PopulateListEntry(ctx context.Context, listEntry *gtsmodel.ListEntry) error - // PutListEntries inserts a slice of listEntries into the database. // It uses a transaction to ensure no partial updates. PutListEntries(ctx context.Context, listEntries []*gtsmodel.ListEntry) error - // DeleteListEntry deletes one list entry with the given id. - DeleteListEntry(ctx context.Context, id string) error - - // DeleteListEntryForFollowID deletes all list entries with the given followID. - DeleteListEntriesForFollowID(ctx context.Context, followID string) error + // DeleteListEntry deletes the list entry with given list ID and follow ID. + DeleteListEntry(ctx context.Context, listID string, followID string) error - // ListIncludesAccount returns true if the given listID includes the given accountID. - ListIncludesAccount(ctx context.Context, listID string, accountID string) (bool, error) + // DeleteAllListEntryByFollow deletes all list entries with the given followIDs. + DeleteAllListEntriesByFollows(ctx context.Context, followIDs ...string) error } -- cgit v1.2.3