summaryrefslogtreecommitdiff
path: root/internal/db/bundb/relationship_follow_req.go
diff options
context:
space:
mode:
authorLibravatar kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com>2024-09-16 16:46:09 +0000
committerLibravatar GitHub <noreply@github.com>2024-09-16 16:46:09 +0000
commit84279f6a6a0201c90a6747fe8b82c38d5b4e49e2 (patch)
tree6c777c7ed4888d990533117d7e63376bcc23a3fb /internal/db/bundb/relationship_follow_req.go
parent[chore] Refactor federatingDB.Undo, avoid 500 errors on Undo Like (#3310) (diff)
downloadgotosocial-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_follow_req.go')
-rw-r--r--internal/db/bundb/relationship_follow_req.go190
1 files changed, 95 insertions, 95 deletions
diff --git a/internal/db/bundb/relationship_follow_req.go b/internal/db/bundb/relationship_follow_req.go
index 2e058fbbb..fc0ca5c0a 100644
--- a/internal/db/bundb/relationship_follow_req.go
+++ b/internal/db/bundb/relationship_follow_req.go
@@ -81,15 +81,8 @@ func (r *relationshipDB) GetFollowRequestsByIDs(ctx context.Context, ids []strin
follows, err := r.state.Caches.DB.FollowRequest.LoadIDs("ID",
ids,
func(uncached []string) ([]*gtsmodel.FollowRequest, error) {
- // Avoid querying
- // if none uncached.
- count := len(uncached)
- if count == 0 {
- return nil, nil
- }
-
// Preallocate expected length of uncached followReqs.
- follows := make([]*gtsmodel.FollowRequest, 0, count)
+ follows := make([]*gtsmodel.FollowRequest, 0, len(uncached))
// Perform database query scanning
// the remaining (uncached) IDs.
@@ -293,124 +286,131 @@ func (r *relationshipDB) RejectFollowRequest(ctx context.Context, sourceAccountI
}, targetAccountID, sourceAccountID)
}
-func (r *relationshipDB) DeleteFollowRequest(ctx context.Context, sourceAccountID string, targetAccountID string) error {
- // Load followreq into cache before attempting a delete,
- // as we need it cached in order to trigger the invalidate
- // callback. This in turn invalidates others.
- follow, err := r.GetFollowRequest(
- gtscontext.SetBarebones(ctx),
- sourceAccountID,
- targetAccountID,
- )
- if err != nil {
- if errors.Is(err, db.ErrNoEntries) {
- // Already gone.
- return nil
- }
+func (r *relationshipDB) DeleteFollowRequest(
+ ctx context.Context,
+ sourceAccountID string,
+ targetAccountID string,
+) error {
+
+ // Gather necessary fields from
+ // deleted for cache invaliation.
+ var deleted gtsmodel.FollowRequest
+ deleted.AccountID = sourceAccountID
+ deleted.TargetAccountID = targetAccountID
+
+ // Delete all follow reqs either
+ // from account, or targeting account,
+ // returning the deleted models.
+ if _, err := r.db.NewDelete().
+ Model(&deleted).
+ Where("? = ?", bun.Ident("account_id"), sourceAccountID).
+ Where("? = ?", bun.Ident("target_account_id"), targetAccountID).
+ Returning("?", bun.Ident("id")).
+ Exec(ctx); err != nil &&
+ !errors.Is(err, db.ErrNoEntries) {
return err
}
- // Drop this now-cached follow request on return after delete.
- defer r.state.Caches.DB.FollowRequest.Invalidate("AccountID,TargetAccountID", sourceAccountID, targetAccountID)
+ // Invalidate cached follow with source / target account IDs,
+ // manually calling invalidate hook in case it isn't cached.
+ r.state.Caches.DB.FollowRequest.Invalidate("AccountID,TargetAccountID",
+ sourceAccountID, targetAccountID)
+ r.state.Caches.OnInvalidateFollowRequest(&deleted)
- // Finally delete followreq from DB.
- _, err = r.db.NewDelete().
- Table("follow_requests").
- Where("? = ?", bun.Ident("id"), follow.ID).
- Exec(ctx)
- return err
+ return nil
}
func (r *relationshipDB) DeleteFollowRequestByID(ctx context.Context, id string) error {
- // Load followreq 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.GetFollowRequestByID(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.FollowRequest
+ deleted.ID = id
+
+ // Delete follow with given URI,
+ // 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 follow request on return after delete.
- defer r.state.Caches.DB.FollowRequest.Invalidate("ID", id)
+ // Invalidate cached follow with URI, manually
+ // call invalidate hook in case not cached.
+ r.state.Caches.DB.FollowRequest.Invalidate("ID", id)
+ r.state.Caches.OnInvalidateFollowRequest(&deleted)
- // Finally delete followreq from DB.
- _, err = r.db.NewDelete().
- Table("follow_requests").
- Where("? = ?", bun.Ident("id"), id).
- Exec(ctx)
- return err
+ return nil
}
func (r *relationshipDB) DeleteFollowRequestByURI(ctx context.Context, uri string) error {
- // Load followreq 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.GetFollowRequestByURI(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.FollowRequest
+
+ // Delete follow with given URI,
+ // returning the deleted models.
+ if _, err := r.db.NewDelete().
+ Model(&deleted).
+ Where("? = ?", bun.Ident("uri"), uri).
+ Returning("?, ?, ?",
+ bun.Ident("id"),
+ bun.Ident("account_id"),
+ bun.Ident("target_account_id"),
+ ).
+ Exec(ctx); err != nil &&
+ !errors.Is(err, db.ErrNoEntries) {
return err
}
- // Drop this now-cached follow request on return after delete.
- defer r.state.Caches.DB.FollowRequest.Invalidate("URI", uri)
+ // Invalidate cached follow with URI, manually
+ // call invalidate hook in case not cached.
+ r.state.Caches.DB.FollowRequest.Invalidate("URI", uri)
+ r.state.Caches.OnInvalidateFollowRequest(&deleted)
- // Finally delete followreq from DB.
- _, err = r.db.NewDelete().
- Table("follow_requests").
- Where("? = ?", bun.Ident("uri"), uri).
- Exec(ctx)
- return err
+ return nil
}
func (r *relationshipDB) DeleteAccountFollowRequests(ctx context.Context, accountID string) error {
- var followReqIDs []string
-
- // Get full list of IDs.
- if _, err := r.db.
- NewSelect().
- Column("id").
- Table("follow_requests").
+ // Gather necessary fields from
+ // deleted for cache invaliation.
+ var deleted []*gtsmodel.FollowRequest
+
+ // Delete all follows 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,
).
- Exec(ctx, &followReqIDs); err != nil {
+ Returning("?, ?, ?",
+ bun.Ident("id"),
+ bun.Ident("account_id"),
+ bun.Ident("target_account_id"),
+ ).
+ Exec(ctx); err != nil &&
+ !errors.Is(err, db.ErrNoEntries) {
return err
}
- if len(followReqIDs) == 0 {
- // Nothing
- // to delete.
- return nil
- }
+ // Invalidate all account's incoming / outoing follows requests.
+ r.state.Caches.DB.FollowRequest.Invalidate("AccountID", accountID)
+ r.state.Caches.DB.FollowRequest.Invalidate("TargetAccountID", accountID)
- defer func() {
- // Invalidate all account's incoming / outoing follow requests on return.
- r.state.Caches.DB.FollowRequest.Invalidate("AccountID", accountID)
- r.state.Caches.DB.FollowRequest.Invalidate("TargetAccountID", accountID)
- }()
-
- // Load all followreqs 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.GetAccountFollowRequests(ctx, accountID, nil)
- if err != nil && !errors.Is(err, db.ErrNoEntries) {
- return err
+ // In case not all follow were in
+ // cache, manually call invalidate hooks.
+ for _, followReq := range deleted {
+ r.state.Caches.OnInvalidateFollowRequest(followReq)
}
- // Finally delete all from DB.
- _, err = r.db.NewDelete().
- Table("follow_requests").
- Where("? IN (?)", bun.Ident("id"), bun.In(followReqIDs)).
- Exec(ctx)
- return err
+ return nil
}