diff options
author | 2024-09-16 16:46:09 +0000 | |
---|---|---|
committer | 2024-09-16 16:46:09 +0000 | |
commit | 84279f6a6a0201c90a6747fe8b82c38d5b4e49e2 (patch) | |
tree | 6c777c7ed4888d990533117d7e63376bcc23a3fb /internal/db/bundb/relationship_block.go | |
parent | [chore] Refactor federatingDB.Undo, avoid 500 errors on Undo Like (#3310) (diff) | |
download | gotosocial-84279f6a6a0201c90a6747fe8b82c38d5b4e49e2.tar.xz |
[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
Diffstat (limited to 'internal/db/bundb/relationship_block.go')
-rw-r--r-- | internal/db/bundb/relationship_block.go | 136 |
1 files changed, 64 insertions, 72 deletions
diff --git a/internal/db/bundb/relationship_block.go b/internal/db/bundb/relationship_block.go index 4093bad07..9738970e5 100644 --- a/internal/db/bundb/relationship_block.go +++ b/internal/db/bundb/relationship_block.go @@ -105,15 +105,8 @@ func (r *relationshipDB) GetBlocksByIDs(ctx context.Context, ids []string) ([]*g blocks, err := r.state.Caches.DB.Block.LoadIDs("ID", ids, func(uncached []string) ([]*gtsmodel.Block, error) { - // Avoid querying - // if none uncached. - count := len(uncached) - if count == 0 { - return nil, nil - } - // Preallocate expected length of uncached blocks. - blocks := make([]*gtsmodel.Block, 0, count) + blocks := make([]*gtsmodel.Block, 0, len(uncached)) // Perform database query scanning // the remaining (uncached) IDs. @@ -222,94 +215,93 @@ func (r *relationshipDB) PutBlock(ctx context.Context, block *gtsmodel.Block) er } func (r *relationshipDB) DeleteBlockByID(ctx context.Context, id string) error { - // 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 - } + // Gather necessary fields from + // deleted for cache invaliation. + var deleted gtsmodel.Block + + // Delete block with given ID, + // returning the deleted models. + if _, err := r.db.NewDelete(). + Model(&deleted). + Where("? = ?", bun.Ident("id"), id). + Returning("?, ?", + bun.Ident("account_id"), + bun.Ident("target_account_id"), + ). + Exec(ctx); err != nil && + !errors.Is(err, db.ErrNoEntries) { return err } - // Drop this now-cached block on return after delete. - defer r.state.Caches.DB.Block.Invalidate("ID", id) + // Invalidate cached block with ID, manually + // call invalidate hook in case not cached. + r.state.Caches.DB.Block.Invalidate("ID", id) + r.state.Caches.OnInvalidateBlock(&deleted) - // Finally delete block from DB. - _, err = r.db.NewDelete(). - Table("blocks"). - Where("? = ?", bun.Ident("id"), id). - Exec(ctx) - return err + return nil } func (r *relationshipDB) DeleteBlockByURI(ctx context.Context, uri string) error { - // 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 - } + // Gather necessary fields from + // deleted for cache invaliation. + var deleted gtsmodel.Block + + // Delete block with given URI, + // returning the deleted models. + if _, err := r.db.NewDelete(). + Model(&deleted). + Where("? = ?", bun.Ident("uri"), uri). + Returning("?, ?", + bun.Ident("account_id"), + bun.Ident("target_account_id"), + ). + Exec(ctx); err != nil && + !errors.Is(err, db.ErrNoEntries) { return err } - // Drop this now-cached block on return after delete. - defer r.state.Caches.DB.Block.Invalidate("URI", uri) + // Invalidate cached block with URI, manually + // call invalidate hook in case not cached. + r.state.Caches.DB.Block.Invalidate("URI", uri) + r.state.Caches.OnInvalidateBlock(&deleted) - // Finally delete block from DB. - _, err = r.db.NewDelete(). - Table("blocks"). - Where("? = ?", bun.Ident("uri"), uri). - Exec(ctx) - return err + return nil } func (r *relationshipDB) DeleteAccountBlocks(ctx context.Context, accountID string) error { - var blockIDs []string - - // Get full list of IDs. - if err := r.db.NewSelect(). - Column("id"). - Table("blocks"). + // Gather necessary fields from + // deleted for cache invaliation. + var deleted []*gtsmodel.Block + + // Delete all blocks either from + // account, or targeting account, + // returning the deleted models. + if _, err := r.db.NewDelete(). + Model(&deleted). WhereOr("? = ? OR ? = ?", bun.Ident("account_id"), accountID, bun.Ident("target_account_id"), accountID, ). - Scan(ctx, &blockIDs); err != nil { + Returning("?, ?", + bun.Ident("account_id"), + bun.Ident("target_account_id"), + ). + Exec(ctx); err != nil && + !errors.Is(err, db.ErrNoEntries) { return err } - if len(blockIDs) == 0 { - // Nothing - // to delete. - return nil - } - - defer func() { - // Invalidate all account's incoming / outoing blocks on return. - r.state.Caches.DB.Block.Invalidate("AccountID", accountID) - r.state.Caches.DB.Block.Invalidate("TargetAccountID", accountID) - }() + // Invalidate all account's incoming / outoing blocks. + r.state.Caches.DB.Block.Invalidate("AccountID", accountID) + r.state.Caches.DB.Block.Invalidate("TargetAccountID", accountID) - // 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). - _, err := r.GetAccountBlocks(ctx, accountID, nil) - if err != nil && !errors.Is(err, db.ErrNoEntries) { - return err + // In case not all blocks were in + // cache, manually call invalidate hooks. + for _, block := range deleted { + r.state.Caches.OnInvalidateBlock(block) } - // Finally delete all from DB. - _, err = r.db.NewDelete(). - Table("blocks"). - Where("? IN (?)", bun.Ident("id"), bun.In(blockIDs)). - Exec(ctx) - return err + return nil } |