diff options
author | 2023-05-12 10:15:54 +0100 | |
---|---|---|
committer | 2023-05-12 11:15:54 +0200 | |
commit | 6c9d8e78ebbd81928abab1bbb49a3c4daa7d2a3a (patch) | |
tree | 0bb314c76b87606371283819175eda02026897a9 /internal/db/bundb/relationship_block.go | |
parent | [chore] Prefer JSON errors in API endpoints (#1766) (diff) | |
download | gotosocial-6c9d8e78ebbd81928abab1bbb49a3c4daa7d2a3a.tar.xz |
[feature] status refetch support (#1690)
* revamp http client to not limit requests, instead use sender worker
Signed-off-by: kim <grufwub@gmail.com>
* remove separate sender worker pool, spawn 2*GOMAXPROCS batch senders each time, no need for transport cache sweeping
Signed-off-by: kim <grufwub@gmail.com>
* improve batch senders to keep popping recipients until remote URL found
Signed-off-by: kim <grufwub@gmail.com>
* fix recipient looping issue
Signed-off-by: kim <grufwub@gmail.com>
* 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 <grufwub@gmail.com>
* first draft of status refetching logic
Signed-off-by: kim <grufwub@gmail.com>
* fix testrig to use new federation alloc func signature
Signed-off-by: kim <grufwub@gmail.com>
* fix log format directive
Signed-off-by: kim <grufwub@gmail.com>
* add status fetched_at migration
Signed-off-by: kim <grufwub@gmail.com>
* remove unused / unchecked for error types
Signed-off-by: kim <grufwub@gmail.com>
* add back the used type...
Signed-off-by: kim <grufwub@gmail.com>
* add separate internal getStatus() function for derefThread() that doesn't recurse
Signed-off-by: kim <grufwub@gmail.com>
* improved mention and media attachment error handling
Signed-off-by: kim <grufwub@gmail.com>
* fix log and error format directives
Signed-off-by: kim <grufwub@gmail.com>
* update account deref to match status deref changes
Signed-off-by: kim <grufwub@gmail.com>
* very small code formatting change to make things clearer
Signed-off-by: kim <grufwub@gmail.com>
* add more code comments
Signed-off-by: kim <grufwub@gmail.com>
* improved code commenting
Signed-off-by: kim <grufwub@gmail.com>
* only check for required further derefs if needed
Signed-off-by: kim <grufwub@gmail.com>
* improved cache invalidation
Signed-off-by: kim <grufwub@gmail.com>
* tweak cache restarting to use a (very small) backoff
Signed-off-by: kim <grufwub@gmail.com>
* small readability changes and fixes
Signed-off-by: kim <grufwub@gmail.com>
* fix account sync issues
Signed-off-by: kim <grufwub@gmail.com>
* fix merge conflicts + update account enrichment to accept already-passed accountable
Signed-off-by: kim <grufwub@gmail.com>
* remove secondary function declaration
Signed-off-by: kim <grufwub@gmail.com>
* normalise dereferencer get status / account behaviour, fix remaining tests
Signed-off-by: kim <grufwub@gmail.com>
* fix remaining rebase conflicts, finish commenting code
Signed-off-by: kim <grufwub@gmail.com>
* appease the linter
Signed-off-by: kim <grufwub@gmail.com>
* add source file header
Signed-off-by: kim <grufwub@gmail.com>
* update to use TIMESTAMPTZ column type instead of just TIMESTAMP
Signed-off-by: kim <grufwub@gmail.com>
* don't pass in 'updated_at' to UpdateEmoji()
Signed-off-by: kim <grufwub@gmail.com>
* use new ap.Resolve{Account,Status}able() functions
Signed-off-by: kim <grufwub@gmail.com>
* remove the somewhat confusing rescoping of the same variable names
Signed-off-by: kim <grufwub@gmail.com>
* update migration file name, improved database delete error returns
Signed-off-by: kim <grufwub@gmail.com>
* formatting
Signed-off-by: kim <grufwub@gmail.com>
* improved multi-delete database functions to minimise DB calls
Signed-off-by: kim <grufwub@gmail.com>
* remove unused type
Signed-off-by: kim <grufwub@gmail.com>
* fix delete statements
Signed-off-by: kim <grufwub@gmail.com>
---------
Signed-off-by: kim <grufwub@gmail.com>
Diffstat (limited to 'internal/db/bundb/relationship_block.go')
-rw-r--r-- | internal/db/bundb/relationship_block.go | 90 |
1 files changed, 54 insertions, 36 deletions
diff --git a/internal/db/bundb/relationship_block.go b/internal/db/bundb/relationship_block.go index 9232ea984..fa68a2e97 100644 --- a/internal/db/bundb/relationship_block.go +++ b/internal/db/bundb/relationship_block.go @@ -25,7 +25,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/gtscontext" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" "github.com/uptrace/bun" ) @@ -142,62 +141,65 @@ func (r *relationshipDB) getBlock(ctx context.Context, lookup string, dbQuery fu } func (r *relationshipDB) PutBlock(ctx context.Context, block *gtsmodel.Block) error { - err := r.state.Caches.GTS.Block().Store(block, func() error { + return r.state.Caches.GTS.Block().Store(block, func() error { _, err := r.conn.NewInsert().Model(block).Exec(ctx) return r.conn.ProcessError(err) }) - if err != nil { - return err - } - - // Invalidate block origin account ID cached visibility. - r.state.Caches.Visibility.Invalidate("ItemID", block.AccountID) - r.state.Caches.Visibility.Invalidate("RequesterID", block.AccountID) - - // Invalidate block target account ID cached visibility. - r.state.Caches.Visibility.Invalidate("ItemID", block.TargetAccountID) - r.state.Caches.Visibility.Invalidate("RequesterID", block.TargetAccountID) - - return nil } func (r *relationshipDB) DeleteBlockByID(ctx context.Context, id string) error { - block, err := r.GetBlockByID(gtscontext.SetBarebones(ctx), id) + defer r.state.Caches.GTS.Block().Invalidate("ID", id) + + // Load block into cache before attempting a delete, + // as we need it cached in order to trigger the invalidate + // callback. This in turn invalidates others. + _, err := r.GetBlockByID(gtscontext.SetBarebones(ctx), id) if err != nil { + if errors.Is(err, db.ErrNoEntries) { + // not an issue. + err = nil + } return err } - return r.deleteBlock(ctx, block) + + // Finally delete block from DB. + _, err = r.conn.NewDelete(). + Table("blocks"). + Where("? = ?", bun.Ident("id"), id). + Exec(ctx) + return r.conn.ProcessError(err) } func (r *relationshipDB) DeleteBlockByURI(ctx context.Context, uri string) error { - block, err := r.GetBlockByURI(gtscontext.SetBarebones(ctx), uri) + defer r.state.Caches.GTS.Block().Invalidate("URI", uri) + + // Load block into cache before attempting a delete, + // as we need it cached in order to trigger the invalidate + // callback. This in turn invalidates others. + _, err := r.GetBlockByURI(gtscontext.SetBarebones(ctx), uri) if err != nil { + if errors.Is(err, db.ErrNoEntries) { + // not an issue. + err = nil + } return err } - return r.deleteBlock(ctx, block) -} -func (r *relationshipDB) deleteBlock(ctx context.Context, block *gtsmodel.Block) error { - if _, err := r.conn. - NewDelete(). + // Finally delete block from DB. + _, err = r.conn.NewDelete(). Table("blocks"). - Where("? = ?", bun.Ident("id"), block.ID). - Exec(ctx); err != nil { - return r.conn.ProcessError(err) - } - - // Invalidate block from cache lookups. - r.state.Caches.GTS.Block().Invalidate("ID", block.ID) - - return nil + Where("? = ?", bun.Ident("uri"), uri). + Exec(ctx) + return r.conn.ProcessError(err) } func (r *relationshipDB) DeleteAccountBlocks(ctx context.Context, accountID string) error { var blockIDs []string + // Get full list of IDs. if err := r.conn.NewSelect(). + Column("id"). Table("blocks"). - ColumnExpr("?", bun.Ident("id")). WhereOr("? = ? OR ? = ?", bun.Ident("account_id"), accountID, @@ -208,11 +210,27 @@ func (r *relationshipDB) DeleteAccountBlocks(ctx context.Context, accountID stri return r.conn.ProcessError(err) } + defer func() { + // Invalidate all IDs on return. + for _, id := range blockIDs { + r.state.Caches.GTS.Block().Invalidate("ID", id) + } + }() + + // Load all blocks into cache, this *really* isn't great + // but it is the only way we can ensure we invalidate all + // related caches correctly (e.g. visibility). for _, id := range blockIDs { - if err := r.DeleteBlockByID(ctx, id); err != nil { - log.Errorf(ctx, "error deleting block %q: %v", id, err) + _, err := r.GetBlockByID(ctx, id) + if err != nil && !errors.Is(err, db.ErrNoEntries) { + return err } } - return nil + // Finally delete all from DB. + _, err := r.conn.NewDelete(). + Table("blocks"). + Where("? IN (?)", bun.Ident("id"), bun.In(blockIDs)). + Exec(ctx) + return r.conn.ProcessError(err) } |