diff options
| author |  kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> | 2024-01-19 12:57:29 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2024-01-19 12:57:29 +0000 |
| commit | 7ec1e1332e7d04e74451acef18b41f389722b698 (patch) | |
| tree | 9c69eca7fc664ab5564279a2e065dfd5c2ddd17b /internal/federation | |
| parent | [chore] chore rationalise http return codes for activitypub handlers (#2540) (diff) | |
| download | gotosocial-7ec1e1332e7d04e74451acef18b41f389722b698.tar.xz | |
[performance] overhaul struct (+ result) caching library for simplicity, performance and multiple-result lookups (#2535)
* rewrite cache library as codeberg.org/gruf/go-structr, implement in gotosocial
* use actual go-structr release version (not just commit hash)
* revert go toolchain changes (damn you go for auto changing this)
* fix go mod woes
* ensure %w is used in calls to errs.Appendf()
* fix error checking
* fix possible panic
* remove unnecessary start/stop functions, move to main Cache{} struct, add note regarding which caches require start/stop
* fix copy-paste artifact... :innocent:
* fix all comment copy-paste artifacts
* remove dropID() function, now we can just use slices.DeleteFunc()
* use util.Deduplicate() instead of collate(), move collate to util
* move orderByIDs() to util package and "generify"
* add a util.DeleteIf() function, use this to delete entries on failed population
* use slices.DeleteFunc() instead of util.DeleteIf() (i had the logic mixed up in my head somehow lol)
* add note about how collate differs from deduplicate
Diffstat (limited to 'internal/federation')
| -rw-r--r-- | internal/federation/dereferencing/announce.go | 10 | ||||
| -rw-r--r-- | internal/federation/federatingdb/announce_test.go | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/internal/federation/dereferencing/announce.go b/internal/federation/dereferencing/announce.go index 8e880dad5..8d082105b 100644 --- a/internal/federation/dereferencing/announce.go +++ b/internal/federation/dereferencing/announce.go @@ -107,19 +107,21 @@ func (d *Dereferencer) EnrichAnnounce( // All good baby. case errors.Is(err, db.ErrAlreadyExists): + uri := boost.URI + // DATA RACE! We likely lost out to another goroutine // in a call to db.Put(Status). Look again in DB by URI. - boost, err = d.state.DB.GetStatusByURI(ctx, boost.URI) + boost, err = d.state.DB.GetStatusByURI(ctx, uri) if err != nil { - err = gtserror.Newf( + return nil, gtserror.Newf( "error getting boost wrapper status %s from database after race: %w", - boost.URI, err, + uri, err, ) } default: // Proper database error. - err = gtserror.Newf("db error inserting status: %w", err) + return nil, gtserror.Newf("db error inserting status: %w", err) } return boost, err diff --git a/internal/federation/federatingdb/announce_test.go b/internal/federation/federatingdb/announce_test.go index d8de2e49c..8dd5ce9da 100644 --- a/internal/federation/federatingdb/announce_test.go +++ b/internal/federation/federatingdb/announce_test.go @@ -79,9 +79,7 @@ func (suite *AnnounceTestSuite) TestAnnounceTwice() { // Insert the boost-of status into the // DB cache to emulate processor handling boost.ID, _ = id.NewULIDFromTime(boost.CreatedAt) - suite.state.Caches.GTS.Status().Store(boost, func() error { - return nil - }) + suite.state.Caches.GTS.Status.Put(boost) // only the URI will be set for the boosted status // because it still needs to be dereferenced |