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/cache/cache.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'internal/cache/cache.go') diff --git a/internal/cache/cache.go b/internal/cache/cache.go index 8291dec5a..09e505ff5 100644 --- a/internal/cache/cache.go +++ b/internal/cache/cache.go @@ -62,7 +62,6 @@ func (c *Caches) Init() { log.Infof(nil, "init: %p", c) c.initAccount() - c.initAccountIDsFollowingTag() c.initAccountNote() c.initAccountSettings() c.initAccountStats() @@ -84,11 +83,13 @@ func (c *Caches) Init() { c.initFollowIDs() c.initFollowRequest() c.initFollowRequestIDs() + c.initFollowingTagIDs() c.initInReplyToIDs() c.initInstance() c.initInteractionRequest() c.initList() - c.initListEntry() + c.initListIDs() + c.initListedIDs() c.initMarker() c.initMedia() c.initMention() @@ -105,7 +106,6 @@ func (c *Caches) Init() { c.initStatusFave() c.initStatusFaveIDs() c.initTag() - c.initTagIDsFollowedByAccount() c.initThreadMute() c.initToken() c.initTombstone() @@ -148,7 +148,6 @@ func (c *Caches) Stop() { // significant overhead to all cache writes. func (c *Caches) Sweep(threshold float64) { c.DB.Account.Trim(threshold) - c.DB.AccountIDsFollowingTag.Trim(threshold) c.DB.AccountNote.Trim(threshold) c.DB.AccountSettings.Trim(threshold) c.DB.AccountStats.Trim(threshold) @@ -168,11 +167,13 @@ func (c *Caches) Sweep(threshold float64) { c.DB.FollowIDs.Trim(threshold) c.DB.FollowRequest.Trim(threshold) c.DB.FollowRequestIDs.Trim(threshold) + c.DB.FollowingTagIDs.Trim(threshold) c.DB.InReplyToIDs.Trim(threshold) c.DB.Instance.Trim(threshold) c.DB.InteractionRequest.Trim(threshold) c.DB.List.Trim(threshold) - c.DB.ListEntry.Trim(threshold) + c.DB.ListIDs.Trim(threshold) + c.DB.ListedIDs.Trim(threshold) c.DB.Marker.Trim(threshold) c.DB.Media.Trim(threshold) c.DB.Mention.Trim(threshold) @@ -189,7 +190,6 @@ func (c *Caches) Sweep(threshold float64) { c.DB.StatusFave.Trim(threshold) c.DB.StatusFaveIDs.Trim(threshold) c.DB.Tag.Trim(threshold) - c.DB.TagIDsFollowedByAccount.Trim(threshold) c.DB.ThreadMute.Trim(threshold) c.DB.Token.Trim(threshold) c.DB.Tombstone.Trim(threshold) -- cgit v1.2.3