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/text/goldmark_extension.go | 12 ++++++------ internal/text/replace.go | 31 +++++++++++++++++-------------- 2 files changed, 23 insertions(+), 20 deletions(-) (limited to 'internal/text') diff --git a/internal/text/goldmark_extension.go b/internal/text/goldmark_extension.go index 23ac1169d..a12c618dc 100644 --- a/internal/text/goldmark_extension.go +++ b/internal/text/goldmark_extension.go @@ -240,7 +240,7 @@ func (r *customRenderer) renderMention(w mdutil.BufWriter, source []byte, node a n, ok := node.(*mention) // this function is only registered for kindMention if !ok { - log.Panic(nil, "type assertion failed") + log.Panic(r.ctx, "type assertion failed") } text := string(n.Segment.Value(source)) @@ -248,7 +248,7 @@ func (r *customRenderer) renderMention(w mdutil.BufWriter, source []byte, node a // we don't have much recourse if this fails if _, err := w.WriteString(html); err != nil { - log.Errorf(nil, "error writing HTML: %s", err) + log.Errorf(r.ctx, "error writing HTML: %s", err) } return ast.WalkSkipChildren, nil } @@ -260,7 +260,7 @@ func (r *customRenderer) renderHashtag(w mdutil.BufWriter, source []byte, node a n, ok := node.(*hashtag) // this function is only registered for kindHashtag if !ok { - log.Panic(nil, "type assertion failed") + log.Panic(r.ctx, "type assertion failed") } text := string(n.Segment.Value(source)) @@ -269,7 +269,7 @@ func (r *customRenderer) renderHashtag(w mdutil.BufWriter, source []byte, node a _, err := w.WriteString(html) // we don't have much recourse if this fails if err != nil { - log.Errorf(nil, "error writing HTML: %s", err) + log.Errorf(r.ctx, "error writing HTML: %s", err) } return ast.WalkSkipChildren, nil } @@ -282,7 +282,7 @@ func (r *customRenderer) renderEmoji(w mdutil.BufWriter, source []byte, node ast n, ok := node.(*emoji) // this function is only registered for kindEmoji if !ok { - log.Panic(nil, "type assertion failed") + log.Panic(r.ctx, "type assertion failed") } text := string(n.Segment.Value(source)) shortcode := text[1 : len(text)-1] @@ -307,7 +307,7 @@ func (r *customRenderer) renderEmoji(w mdutil.BufWriter, source []byte, node ast // we don't have much recourse if this fails if _, err := w.WriteString(text); err != nil { - log.Errorf(nil, "error writing HTML: %s", err) + log.Errorf(r.ctx, "error writing HTML: %s", err) } return ast.WalkSkipChildren, nil } diff --git a/internal/text/replace.go b/internal/text/replace.go index 3c6586e92..e8e02454e 100644 --- a/internal/text/replace.go +++ b/internal/text/replace.go @@ -22,6 +22,7 @@ import ( "strings" "github.com/superseriousbusiness/gotosocial/internal/db" + "github.com/superseriousbusiness/gotosocial/internal/gtscontext" "github.com/superseriousbusiness/gotosocial/internal/log" "github.com/superseriousbusiness/gotosocial/internal/util" "golang.org/x/text/unicode/norm" @@ -37,15 +38,15 @@ const ( // replaceMention takes a string in the form @username@domain.com or @localusername func (r *customRenderer) replaceMention(text string) string { - menchie, err := r.parseMention(r.ctx, text, r.accountID, r.statusID) + mention, err := r.parseMention(r.ctx, text, r.accountID, r.statusID) if err != nil { - log.Errorf(nil, "error parsing mention %s from status: %s", text, err) + log.Errorf(r.ctx, "error parsing mention %s from status: %s", text, err) return text } if r.statusID != "" { - if err := r.f.db.Put(r.ctx, menchie); err != nil { - log.Errorf(nil, "error putting mention in db: %s", err) + if err := r.f.db.PutMention(r.ctx, mention); err != nil { + log.Errorf(r.ctx, "error putting mention in db: %s", err) return text } } @@ -53,27 +54,29 @@ func (r *customRenderer) replaceMention(text string) string { // only append if it's not been listed yet listed := false for _, m := range r.result.Mentions { - if menchie.ID == m.ID { + if mention.ID == m.ID { listed = true break } } if !listed { - r.result.Mentions = append(r.result.Mentions, menchie) + r.result.Mentions = append(r.result.Mentions, mention) } - // make sure we have an account attached to this mention - if menchie.TargetAccount == nil { - a, err := r.f.db.GetAccountByID(r.ctx, menchie.TargetAccountID) + if mention.TargetAccount == nil { + // Fetch mention target account if not yet populated. + mention.TargetAccount, err = r.f.db.GetAccountByID( + gtscontext.SetBarebones(r.ctx), + mention.TargetAccountID, + ) if err != nil { - log.Errorf(nil, "error getting account with id %s from the db: %s", menchie.TargetAccountID, err) + log.Errorf(r.ctx, "error populating mention target account: %v", err) return text } - menchie.TargetAccount = a } // The mention's target is our target - targetAccount := menchie.TargetAccount + targetAccount := mention.TargetAccount var b strings.Builder @@ -105,7 +108,7 @@ func (r *customRenderer) replaceHashtag(text string) string { tag, err := r.f.db.TagStringToTag(r.ctx, normalized, r.accountID) if err != nil { - log.Errorf(nil, "error generating hashtags from status: %s", err) + log.Errorf(r.ctx, "error generating hashtags from status: %s", err) return text } @@ -121,7 +124,7 @@ func (r *customRenderer) replaceHashtag(text string) string { err = r.f.db.Put(r.ctx, tag) if err != nil { if !errors.Is(err, db.ErrAlreadyExists) { - log.Errorf(nil, "error putting tags in db: %s", err) + log.Errorf(r.ctx, "error putting tags in db: %s", err) return text } } -- cgit v1.2.3