From de6e3e5f2a8ea639d76e310a11cb9bc093fef3a9 Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Tue, 28 Mar 2023 14:03:14 +0100 Subject: [performance] refactoring + add fave / follow / request / visibility caching (#1607) * refactor visibility checking, add caching for visibility * invalidate visibility cache items on account / status deletes * fix requester ID passed to visibility cache nil ptr * de-interface caches, fix home / public timeline caching + visibility * finish adding code comments for visibility filter * fix angry goconst linter warnings * actually finish adding filter visibility code comments for timeline functions * move home timeline status author check to after visibility * remove now-unused code * add more code comments * add TODO code comment, update printed cache start names * update printed cache names on stop * start adding separate follow(request) delete db functions, add specific visibility cache tests * add relationship type caching * fix getting local account follows / followed-bys, other small codebase improvements * simplify invalidation using cache hooks, add more GetAccountBy___() functions * fix boosting to return 404 if not boostable but no error (to not leak status ID) * remove dead code * improved placement of cache invalidation * update license headers * add example follow, follow-request config entries * add example visibility cache configuration to config file * use specific PutFollowRequest() instead of just Put() * add tests for all GetAccountBy() * add GetBlockBy() tests * update block to check primitive fields * update and finish adding Get{Account,Block,Follow,FollowRequest}By() tests * fix copy-pasted code * update envparsing test * whitespace * fix bun struct tag * add license header to gtscontext * fix old license header * improved error creation to not use fmt.Errorf() when not needed * fix various rebase conflicts, fix account test * remove commented-out code, fix-up mention caching * fix mention select bun statement * ensure mention target account populated, pass in context to customrenderer logging * remove more uncommented code, fix typeutil test * add statusfave database model caching * add status fave cache configuration * add status fave cache example config * woops, catch missed error. nice catch linter! * add back testrig panic on nil db * update example configuration to match defaults, slight tweak to cache configuration defaults * update envparsing test with new defaults * fetch followingget to use the follow target account * use accounnt.IsLocal() instead of empty domain check * use constants for the cache visibility type check * use bun.In() for notification type restriction in db query * include replies when fetching PublicTimeline() (to account for single-author threads in Visibility{}.StatusPublicTimelineable()) * use bun query building for nested select statements to ensure working with postgres * update public timeline future status checks to match visibility filter * same as previous, for home timeline * update public timeline tests to dynamically check for appropriate statuses * migrate accounts to allow unique constraint on public_key * provide minimal account with publicKey --------- Signed-off-by: kim Co-authored-by: tsmethurst --- internal/processing/account/delete.go | 53 +++++++++++------------------------ 1 file changed, 16 insertions(+), 37 deletions(-) (limited to 'internal/processing/account/delete.go') diff --git a/internal/processing/account/delete.go b/internal/processing/account/delete.go index 9c59e1b99..f3dfecc7b 100644 --- a/internal/processing/account/delete.go +++ b/internal/processing/account/delete.go @@ -150,25 +150,25 @@ func (p *Processor) deleteUserAndTokensForAccount(ctx context.Context, account * // - Follow requests created by account. func (p *Processor) deleteAccountFollows(ctx context.Context, account *gtsmodel.Account) error { // Delete follows targeting this account. - followedBy, err := p.state.DB.GetFollows(ctx, "", account.ID) + followedBy, err := p.state.DB.GetAccountFollowers(ctx, account.ID) if err != nil && !errors.Is(err, db.ErrNoEntries) { return fmt.Errorf("deleteAccountFollows: db error getting follows targeting account %s: %w", account.ID, err) } for _, follow := range followedBy { - if _, err := p.state.DB.Unfollow(ctx, follow.AccountID, account.ID); err != nil { + if err := p.state.DB.DeleteFollowByID(ctx, follow.ID); err != nil { return fmt.Errorf("deleteAccountFollows: db error unfollowing account followedBy: %w", err) } } // Delete follow requests targeting this account. - followRequestedBy, err := p.state.DB.GetFollowRequests(ctx, "", account.ID) + followRequestedBy, err := p.state.DB.GetAccountFollowRequests(ctx, account.ID) if err != nil && !errors.Is(err, db.ErrNoEntries) { return fmt.Errorf("deleteAccountFollows: db error getting follow requests targeting account %s: %w", account.ID, err) } for _, followRequest := range followRequestedBy { - if _, err := p.state.DB.UnfollowRequest(ctx, followRequest.AccountID, account.ID); err != nil { + if err := p.state.DB.DeleteFollowRequestByID(ctx, followRequest.ID); err != nil { return fmt.Errorf("deleteAccountFollows: db error unfollowing account followRequestedBy: %w", err) } } @@ -183,7 +183,7 @@ func (p *Processor) deleteAccountFollows(ctx context.Context, account *gtsmodel. ) // Delete follows originating from this account. - following, err := p.state.DB.GetFollows(ctx, account.ID, "") + following, err := p.state.DB.GetAccountFollows(ctx, account.ID) if err != nil && !errors.Is(err, db.ErrNoEntries) { return fmt.Errorf("deleteAccountFollows: db error getting follows owned by account %s: %w", account.ID, err) } @@ -191,15 +191,9 @@ func (p *Processor) deleteAccountFollows(ctx context.Context, account *gtsmodel. // For each follow owned by this account, unfollow // and process side effects (noop if remote account). for _, follow := range following { - if uri, err := p.state.DB.Unfollow(ctx, account.ID, follow.TargetAccountID); err != nil { + if err := p.state.DB.DeleteFollowByID(ctx, follow.ID); err != nil { return fmt.Errorf("deleteAccountFollows: db error unfollowing account: %w", err) - } else if uri == "" { - // There was no follow after all. - // Some race condition? Skip. - log.WithContext(ctx).WithField("follow", follow).Warn("Unfollow did not return uri, likely race condition") - continue } - if msg := unfollowSideEffects(ctx, account, follow); msg != nil { // There was a side effect to process. msgs = append(msgs, *msg) @@ -207,7 +201,7 @@ func (p *Processor) deleteAccountFollows(ctx context.Context, account *gtsmodel. } // Delete follow requests originating from this account. - followRequesting, err := p.state.DB.GetFollowRequests(ctx, account.ID, "") + followRequesting, err := p.state.DB.GetAccountFollowRequesting(ctx, account.ID) if err != nil && !errors.Is(err, db.ErrNoEntries) { return fmt.Errorf("deleteAccountFollows: db error getting follow requests owned by account %s: %w", account.ID, err) } @@ -215,23 +209,15 @@ func (p *Processor) deleteAccountFollows(ctx context.Context, account *gtsmodel. // For each follow owned by this account, unfollow // and process side effects (noop if remote account). for _, followRequest := range followRequesting { - uri, err := p.state.DB.UnfollowRequest(ctx, account.ID, followRequest.TargetAccountID) - if err != nil { - return fmt.Errorf("deleteAccountFollows: db error unfollowRequesting account: %w", err) - } - - if uri == "" { - // There was no follow request after all. - // Some race condition? Skip. - log.WithContext(ctx).WithField("followRequest", followRequest).Warn("UnfollowRequest did not return uri, likely race condition") - continue + if err := p.state.DB.DeleteFollowRequestByID(ctx, followRequest.ID); err != nil { + return fmt.Errorf("deleteAccountFollows: db error unfollowingRequesting account: %w", err) } // Dummy out a follow so our side effects func // has something to work with. This follow will // never enter the db, it's just for convenience. follow := >smodel.Follow{ - URI: uri, + URI: followRequest.URI, AccountID: followRequest.AccountID, Account: followRequest.Account, TargetAccountID: followRequest.TargetAccountID, @@ -284,16 +270,9 @@ func (p *Processor) unfollowSideEffectsFunc(deletedAccount *gtsmodel.Account) fu } func (p *Processor) deleteAccountBlocks(ctx context.Context, account *gtsmodel.Account) error { - // Delete blocks created by this account. - if err := p.state.DB.DeleteBlocksByOriginAccountID(ctx, account.ID); err != nil { - return fmt.Errorf("deleteAccountBlocks: db error deleting blocks created by account %s: %w", account.ID, err) + if err := p.state.DB.DeleteAccountBlocks(ctx, account.ID); err != nil { + return fmt.Errorf("deleteAccountBlocks: db error deleting account blocks for %s: %w", account.ID, err) } - - // Delete blocks targeting this account. - if err := p.state.DB.DeleteBlocksByTargetAccountID(ctx, account.ID); err != nil { - return fmt.Errorf("deleteAccountBlocks: db error deleting blocks targeting account %s: %w", account.ID, err) - } - return nil } @@ -386,13 +365,13 @@ statusLoop: } func (p *Processor) deleteAccountNotifications(ctx context.Context, account *gtsmodel.Account) error { - // Delete all notifications targeting given account. - if err := p.state.DB.DeleteNotifications(ctx, account.ID, ""); err != nil && !errors.Is(err, db.ErrNoEntries) { + // Delete all notifications of all types targeting given account. + if err := p.state.DB.DeleteNotifications(ctx, nil, account.ID, ""); err != nil && !errors.Is(err, db.ErrNoEntries) { return err } - // Delete all notifications originating from given account. - if err := p.state.DB.DeleteNotifications(ctx, "", account.ID); err != nil && !errors.Is(err, db.ErrNoEntries) { + // Delete all notifications of all types originating from given account. + if err := p.state.DB.DeleteNotifications(ctx, nil, "", account.ID); err != nil && !errors.Is(err, db.ErrNoEntries) { return err } -- cgit v1.2.3