mirrors
/
gotosocial
mirror of
1
Fork 0
Code Issues Releases Activity

[chore] move PopulateAccountStats() nil check often performed into function itself (#3158) 

* move PopulateAccountStats() nil check often performed into function itself

* fix test to take in mind we don't repopulate account stats if not-nil
This commit is contained in:
kim 2024-08-02 12:15:11 +00:00 committed by GitHub
parent 94e87610c4
commit 0f734a2410
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 53 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
internal/db/bundb/account.go
View File

@ -712,11 +712,9 @@ func (a *accountDB) PopulateAccount(ctx context.Context, account *gtsmodel.Accou
} }
} }
if account.Stats == nil { // Get / Create stats for this account (handles case of already set).
// Get / Create stats for this account. if err := a.state.DB.PopulateAccountStats(ctx, account); err != nil {
if err := a.state.DB.PopulateAccountStats(ctx, account); err != nil { errs.Appendf("error populating account stats: %w", err)
errs.Appendf("error populating account stats: %w", err)
}
} }
return errs.Combine() return errs.Combine()
@ -1160,6 +1158,11 @@ func (a *accountDB) UpdateAccountSettings(
} }
func (a *accountDB) PopulateAccountStats(ctx context.Context, account *gtsmodel.Account) error { func (a *accountDB) PopulateAccountStats(ctx context.Context, account *gtsmodel.Account) error {
if account.Stats != nil {
// Already populated!
return nil
}
// Fetch stats from db cache with loader callback. // Fetch stats from db cache with loader callback.
stats, err := a.state.Caches.DB.AccountStats.LoadOne( stats, err := a.state.Caches.DB.AccountStats.LoadOne(
"AccountID", "AccountID",

4
internal/db/bundb/account_test.go
View File

@ -743,6 +743,10 @@ func (suite *AccountTestSuite) TestAccountStatsAll() {
suite.FailNow(err.Error()) suite.FailNow(err.Error())
} }
// Nil out account stats to allow
// db to refetch + regenerate them.
account.Stats = nil
// Get stats for a third time, they // Get stats for a third time, they
// should get regenerated now, but // should get regenerated now, but
// only for local accounts. // only for local accounts.

6
internal/federation/dereferencing/account.go
View File

@ -984,10 +984,8 @@ func (d *Dereferencer) dereferenceAccountStats(
account *gtsmodel.Account, account *gtsmodel.Account,
) error { ) error {
// Ensure we have a stats model for this account. // Ensure we have a stats model for this account.
if account.Stats == nil { if err := d.state.DB.PopulateAccountStats(ctx, account); err != nil {
if err := d.state.DB.PopulateAccountStats(ctx, account); err != nil { return gtserror.Newf("db error getting account stats: %w", err)
return gtserror.Newf("db error getting account stats: %w", err)
}
} }
// We want to update stats by getting remote // We want to update stats by getting remote

8
internal/processing/account/rss.go
View File

@ -70,11 +70,9 @@ func (p *Processor) GetRSSFeedForUsername(ctx context.Context, username string)
} }
// Ensure account stats populated. // Ensure account stats populated.
if account.Stats == nil { if err := p.state.DB.PopulateAccountStats(ctx, account); err != nil {
if err := p.state.DB.PopulateAccountStats(ctx, account); err != nil { err = gtserror.Newf("db error getting account stats %s: %w", username, err)
err = gtserror.Newf("db error getting account stats %s: %w", username, err) return nil, never, gtserror.NewErrorInternalError(err)
return nil, never, gtserror.NewErrorInternalError(err)
}
} }
// LastModified time is needed by callers to check freshness for cacheing. // LastModified time is needed by callers to check freshness for cacheing.

24
internal/processing/fedi/collections.go
View File

@ -70,11 +70,9 @@ func (p *Processor) OutboxGet(
} }
// Ensure we have stats for this account. // Ensure we have stats for this account.
if receivingAcct.Stats == nil { if err := p.state.DB.PopulateAccountStats(ctx, receivingAcct); err != nil {
if err := p.state.DB.PopulateAccountStats(ctx, receivingAcct); err != nil { err := gtserror.Newf("error getting stats for account %s: %w", receivingAcct.ID, err)
err := gtserror.Newf("error getting stats for account %s: %w", receivingAcct.ID, err) return nil, gtserror.NewErrorInternalError(err)
return nil, gtserror.NewErrorInternalError(err)
}
} }
var obj vocab.Type var obj vocab.Type
@ -200,11 +198,9 @@ func (p *Processor) FollowersGet(
} }
// Ensure we have stats for this account. // Ensure we have stats for this account.
if receivingAcct.Stats == nil { if err := p.state.DB.PopulateAccountStats(ctx, receivingAcct); err != nil {
if err := p.state.DB.PopulateAccountStats(ctx, receivingAcct); err != nil { err := gtserror.Newf("error getting stats for account %s: %w", receivingAcct.ID, err)
err := gtserror.Newf("error getting stats for account %s: %w", receivingAcct.ID, err) return nil, gtserror.NewErrorInternalError(err)
return nil, gtserror.NewErrorInternalError(err)
}
} }
var obj vocab.Type var obj vocab.Type
@ -314,11 +310,9 @@ func (p *Processor) FollowingGet(ctx context.Context, requestedUser string, page
} }
// Ensure we have stats for this account. // Ensure we have stats for this account.
if receivingAcct.Stats == nil { if err := p.state.DB.PopulateAccountStats(ctx, receivingAcct); err != nil {
if err := p.state.DB.PopulateAccountStats(ctx, receivingAcct); err != nil { err := gtserror.Newf("error getting stats for account %s: %w", receivingAcct.ID, err)
err := gtserror.Newf("error getting stats for account %s: %w", receivingAcct.ID, err) return nil, gtserror.NewErrorInternalError(err)
return nil, gtserror.NewErrorInternalError(err)
}
} }
var obj vocab.Type var obj vocab.Type

16
internal/processing/status/pin.go
View File

@ -92,11 +92,9 @@ func (p *Processor) PinCreate(ctx context.Context, requestingAccount *gtsmodel.A
} }
// Ensure account stats populated. // Ensure account stats populated.
if requestingAccount.Stats == nil { if err := p.state.DB.PopulateAccountStats(ctx, requestingAccount); err != nil {
if err := p.state.DB.PopulateAccountStats(ctx, requestingAccount); err != nil { err = gtserror.Newf("db error getting account stats: %w", err)
err = gtserror.Newf("db error getting account stats: %w", err) return nil, gtserror.NewErrorInternalError(err)
return nil, gtserror.NewErrorInternalError(err)
}
} }
pinnedCount := *requestingAccount.Stats.StatusesPinnedCount pinnedCount := *requestingAccount.Stats.StatusesPinnedCount
@ -157,11 +155,9 @@ func (p *Processor) PinRemove(ctx context.Context, requestingAccount *gtsmodel.A
} }
// Ensure account stats populated. // Ensure account stats populated.
if requestingAccount.Stats == nil { if err := p.state.DB.PopulateAccountStats(ctx, requestingAccount); err != nil {
if err := p.state.DB.PopulateAccountStats(ctx, requestingAccount); err != nil { err = gtserror.Newf("db error getting account stats: %w", err)
err = gtserror.Newf("db error getting account stats: %w", err) return nil, gtserror.NewErrorInternalError(err)
return nil, gtserror.NewErrorInternalError(err)
}
} }
targetStatus.PinnedAt = time.Time{} targetStatus.PinnedAt = time.Time{}

48
internal/processing/workers/util.go
View File

@ -257,10 +257,8 @@ func (u *utils) incrementStatusesCount(
defer unlock() defer unlock()
// Populate stats. // Populate stats.
if account.Stats == nil { if err := u.state.DB.PopulateAccountStats(ctx, account); err != nil {
if err := u.state.DB.PopulateAccountStats(ctx, account); err != nil { return gtserror.Newf("db error getting account stats: %w", err)
return gtserror.Newf("db error getting account stats: %w", err)
}
} }
// Update stats by incrementing status // Update stats by incrementing status
@ -288,10 +286,8 @@ func (u *utils) decrementStatusesCount(
defer unlock() defer unlock()
// Populate stats. // Populate stats.
if account.Stats == nil { if err := u.state.DB.PopulateAccountStats(ctx, account); err != nil {
if err := u.state.DB.PopulateAccountStats(ctx, account); err != nil { return gtserror.Newf("db error getting account stats: %w", err)
return gtserror.Newf("db error getting account stats: %w", err)
}
} }
// Update stats by decrementing // Update stats by decrementing
@ -322,10 +318,8 @@ func (u *utils) incrementFollowersCount(
defer unlock() defer unlock()
// Populate stats. // Populate stats.
if account.Stats == nil { if err := u.state.DB.PopulateAccountStats(ctx, account); err != nil {
if err := u.state.DB.PopulateAccountStats(ctx, account); err != nil { return gtserror.Newf("db error getting account stats: %w", err)
return gtserror.Newf("db error getting account stats: %w", err)
}
} }
// Update stats by incrementing followers // Update stats by incrementing followers
@ -351,10 +345,8 @@ func (u *utils) decrementFollowersCount(
defer unlock() defer unlock()
// Populate stats. // Populate stats.
if account.Stats == nil { if err := u.state.DB.PopulateAccountStats(ctx, account); err != nil {
if err := u.state.DB.PopulateAccountStats(ctx, account); err != nil { return gtserror.Newf("db error getting account stats: %w", err)
return gtserror.Newf("db error getting account stats: %w", err)
}
} }
// Update stats by decrementing // Update stats by decrementing
@ -385,10 +377,8 @@ func (u *utils) incrementFollowingCount(
defer unlock() defer unlock()
// Populate stats. // Populate stats.
if account.Stats == nil { if err := u.state.DB.PopulateAccountStats(ctx, account); err != nil {
if err := u.state.DB.PopulateAccountStats(ctx, account); err != nil { return gtserror.Newf("db error getting account stats: %w", err)
return gtserror.Newf("db error getting account stats: %w", err)
}
} }
// Update stats by incrementing // Update stats by incrementing
@ -414,10 +404,8 @@ func (u *utils) decrementFollowingCount(
defer unlock() defer unlock()
// Populate stats. // Populate stats.
if account.Stats == nil { if err := u.state.DB.PopulateAccountStats(ctx, account); err != nil {
if err := u.state.DB.PopulateAccountStats(ctx, account); err != nil { return gtserror.Newf("db error getting account stats: %w", err)
return gtserror.Newf("db error getting account stats: %w", err)
}
} }
// Update stats by decrementing // Update stats by decrementing
@ -448,10 +436,8 @@ func (u *utils) incrementFollowRequestsCount(
defer unlock() defer unlock()
// Populate stats. // Populate stats.
if account.Stats == nil { if err := u.state.DB.PopulateAccountStats(ctx, account); err != nil {
if err := u.state.DB.PopulateAccountStats(ctx, account); err != nil { return gtserror.Newf("db error getting account stats: %w", err)
return gtserror.Newf("db error getting account stats: %w", err)
}
} }
// Update stats by incrementing // Update stats by incrementing
@ -477,10 +463,8 @@ func (u *utils) decrementFollowRequestsCount(
defer unlock() defer unlock()
// Populate stats. // Populate stats.
if account.Stats == nil { if err := u.state.DB.PopulateAccountStats(ctx, account); err != nil {
if err := u.state.DB.PopulateAccountStats(ctx, account); err != nil { return gtserror.Newf("db error getting account stats: %w", err)
return gtserror.Newf("db error getting account stats: %w", err)
}
} }
// Update stats by decrementing // Update stats by decrementing

12
internal/typeutils/internaltofrontend.go
View File

@ -113,13 +113,11 @@ func (c *Converter) AccountToAPIAccountSensitive(ctx context.Context, a *gtsmode
} }
// Ensure account stats populated. // Ensure account stats populated.
if a.Stats == nil { if err := c.state.DB.PopulateAccountStats(ctx, a); err != nil {
if err := c.state.DB.PopulateAccountStats(ctx, a); err != nil { return nil, gtserror.Newf(
return nil, gtserror.Newf( "error getting stats for account %s: %w",
"error getting stats for account %s: %w", a.ID, err,
a.ID, err, )
)
}
} }
// Populate the account's role permissions bitmap and highlightedness from its public role. // Populate the account's role permissions bitmap and highlightedness from its public role.