From 6c9d8e78ebbd81928abab1bbb49a3c4daa7d2a3a Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Fri, 12 May 2023 10:15:54 +0100 Subject: [feature] status refetch support (#1690) * revamp http client to not limit requests, instead use sender worker Signed-off-by: kim * remove separate sender worker pool, spawn 2*GOMAXPROCS batch senders each time, no need for transport cache sweeping Signed-off-by: kim * improve batch senders to keep popping recipients until remote URL found Signed-off-by: kim * fix recipient looping issue Signed-off-by: kim * move request id ctx key to gtscontext, finish filling out more code comments, add basic support for not logging client IP Signed-off-by: kim * first draft of status refetching logic Signed-off-by: kim * fix testrig to use new federation alloc func signature Signed-off-by: kim * fix log format directive Signed-off-by: kim * add status fetched_at migration Signed-off-by: kim * remove unused / unchecked for error types Signed-off-by: kim * add back the used type... Signed-off-by: kim * add separate internal getStatus() function for derefThread() that doesn't recurse Signed-off-by: kim * improved mention and media attachment error handling Signed-off-by: kim * fix log and error format directives Signed-off-by: kim * update account deref to match status deref changes Signed-off-by: kim * very small code formatting change to make things clearer Signed-off-by: kim * add more code comments Signed-off-by: kim * improved code commenting Signed-off-by: kim * only check for required further derefs if needed Signed-off-by: kim * improved cache invalidation Signed-off-by: kim * tweak cache restarting to use a (very small) backoff Signed-off-by: kim * small readability changes and fixes Signed-off-by: kim * fix account sync issues Signed-off-by: kim * fix merge conflicts + update account enrichment to accept already-passed accountable Signed-off-by: kim * remove secondary function declaration Signed-off-by: kim * normalise dereferencer get status / account behaviour, fix remaining tests Signed-off-by: kim * fix remaining rebase conflicts, finish commenting code Signed-off-by: kim * appease the linter Signed-off-by: kim * add source file header Signed-off-by: kim * update to use TIMESTAMPTZ column type instead of just TIMESTAMP Signed-off-by: kim * don't pass in 'updated_at' to UpdateEmoji() Signed-off-by: kim * use new ap.Resolve{Account,Status}able() functions Signed-off-by: kim * remove the somewhat confusing rescoping of the same variable names Signed-off-by: kim * update migration file name, improved database delete error returns Signed-off-by: kim * formatting Signed-off-by: kim * improved multi-delete database functions to minimise DB calls Signed-off-by: kim * remove unused type Signed-off-by: kim * fix delete statements Signed-off-by: kim --------- Signed-off-by: kim --- internal/db/bundb/user.go | 50 ++++++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 22 deletions(-) (limited to 'internal/db/bundb/user.go') diff --git a/internal/db/bundb/user.go b/internal/db/bundb/user.go index b5dae1573..c2ea5a67d 100644 --- a/internal/db/bundb/user.go +++ b/internal/db/bundb/user.go @@ -19,9 +19,11 @@ package bundb import ( "context" + "errors" "time" "github.com/superseriousbusiness/gotosocial/internal/db" + "github.com/superseriousbusiness/gotosocial/internal/gtscontext" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/uptrace/bun" @@ -155,32 +157,36 @@ func (u *userDB) UpdateUser(ctx context.Context, user *gtsmodel.User, columns .. columns = append(columns, "updated_at") } - // Update the user in DB - _, err := u.conn. - NewUpdate(). - Model(user). - Where("? = ?", bun.Ident("user.id"), user.ID). - Column(columns...). - Exec(ctx) - if err != nil { + return u.state.Caches.GTS.User().Store(user, func() error { + _, err := u.conn. + NewUpdate(). + Model(user). + Where("? = ?", bun.Ident("user.id"), user.ID). + Column(columns...). + Exec(ctx) return u.conn.ProcessError(err) - } - - // Invalidate user from cache - u.state.Caches.GTS.User().Invalidate("ID", user.ID) - return nil + }) } func (u *userDB) DeleteUserByID(ctx context.Context, userID string) db.Error { - if _, err := u.conn. - NewDelete(). - TableExpr("? AS ?", bun.Ident("users"), bun.Ident("user")). - Where("? = ?", bun.Ident("user.id"), userID). - Exec(ctx); err != nil { - return u.conn.ProcessError(err) + defer u.state.Caches.GTS.User().Invalidate("ID", userID) + + // Load user into cache before attempting a delete, + // as we need it cached in order to trigger the invalidate + // callback. This in turn invalidates others. + _, err := u.GetUserByID(gtscontext.SetBarebones(ctx), userID) + if err != nil { + if errors.Is(err, db.ErrNoEntries) { + // not an issue. + err = nil + } + return err } - // Invalidate user from cache - u.state.Caches.GTS.User().Invalidate("ID", userID) - return nil + // Finally delete user from DB. + _, err = u.conn.NewDelete(). + TableExpr("? AS ?", bun.Ident("users"), bun.Ident("user")). + Where("? = ?", bun.Ident("user.id"), userID). + Exec(ctx) + return u.conn.ProcessError(err) } -- cgit v1.2.3