diff options
| author |  kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> | 2021-09-01 10:08:21 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2021-09-01 11:08:21 +0200 |
| commit | 7d193de25fbccc00923d6d791d6d4e0d2d5d498e (patch) | |
| tree | da993d91aeaccc07c2fff461067325fbe89bba73 /internal/federation/dereferencing/thread.go | |
| parent | Add SQLite support, fix un-thread-safe DB caches, small performance f… (#172) (diff) | |
| download | gotosocial-7d193de25fbccc00923d6d791d6d4e0d2d5d498e.tar.xz | |
Improve GetRemoteStatus and db.GetStatus() logic (#174)
* only fetch status parents / children if explicity requested when dereferencing
Signed-off-by: kim (grufwub) <grufwub@gmail.com>
* Remove recursive DB GetStatus logic, don't fetch parent unless requested
Signed-off-by: kim (grufwub) <grufwub@gmail.com>
* StatusCache copies status so there are no thread-safety issues with modified status objects
Signed-off-by: kim (grufwub) <grufwub@gmail.com>
* remove sqlite test files
Signed-off-by: kim (grufwub) <grufwub@gmail.com>
* fix bugs introduced by previous commit
Signed-off-by: kim (grufwub) <grufwub@gmail.com>
* fix not continue on error in loop
Signed-off-by: kim (grufwub) <grufwub@gmail.com>
* use our own RunInTx implementation (possible fix for nested tx error)
Signed-off-by: kim (grufwub) <grufwub@gmail.com>
* fix cast statement to work with SQLite
Signed-off-by: kim (grufwub) <grufwub@gmail.com>
* be less strict about valid status in cache
Signed-off-by: kim (grufwub) <grufwub@gmail.com>
* add cache=shared ALWAYS for SQLite db instances
Signed-off-by: kim (grufwub) <grufwub@gmail.com>
* Fix EnrichRemoteAccount when updating account fails
Signed-off-by: kim (grufwub) <grufwub@gmail.com>
* add nolint tag
Signed-off-by: kim (grufwub) <grufwub@gmail.com>
* ensure file: prefixes the filename in sqlite addr
Signed-off-by: kim (grufwub) <grufwub@gmail.com>
* add an account cache, add status author account from db
Signed-off-by: kim (grufwub) <grufwub@gmail.com>
* Fix incompatible SQLite query
Signed-off-by: kim (grufwub) <grufwub@gmail.com>
* *actually* use the new getAccount() function in accountsDB
Signed-off-by: kim (grufwub) <grufwub@gmail.com>
* update cache tests to use test suite
Signed-off-by: kim (grufwub) <grufwub@gmail.com>
* add RelationshipTestSuite, add tests for methods with changed SQL
Signed-off-by: kim (grufwub) <grufwub@gmail.com>
Diffstat (limited to 'internal/federation/dereferencing/thread.go')
| -rw-r--r-- | internal/federation/dereferencing/thread.go | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/internal/federation/dereferencing/thread.go b/internal/federation/dereferencing/thread.go index f9dd9aa09..af16c01b2 100644 --- a/internal/federation/dereferencing/thread.go +++ b/internal/federation/dereferencing/thread.go @@ -49,7 +49,7 @@ func (d *deref) DereferenceThread(ctx context.Context, username string, statusIR } // first make sure we have this status in our db - _, statusable, _, err := d.GetRemoteStatus(ctx, username, statusIRI, true) + _, statusable, _, err := d.GetRemoteStatus(ctx, username, statusIRI, true, false, false) if err != nil { return fmt.Errorf("DereferenceThread: error getting status with id %s: %s", statusIRI.String(), err) } @@ -104,7 +104,7 @@ func (d *deref) iterateAncestors(ctx context.Context, username string, statusIRI // If we reach here, we're looking at a remote status -- make sure we have it in our db by calling GetRemoteStatus // We call it with refresh to true because we want the statusable representation to parse inReplyTo from. - status, statusable, _, err := d.GetRemoteStatus(ctx, username, &statusIRI, true) + _, statusable, _, err := d.GetRemoteStatus(ctx, username, &statusIRI, true, false, false) if err != nil { l.Debugf("error getting remote status: %s", err) return nil @@ -116,18 +116,6 @@ func (d *deref) iterateAncestors(ctx context.Context, username string, statusIRI return nil } - // get the ancestor status into our database if we don't have it yet - if _, _, _, err := d.GetRemoteStatus(ctx, username, inReplyTo, false); err != nil { - l.Debugf("error getting remote status: %s", err) - return nil - } - - // now enrich the current status, since we should have the ancestor in the db - if _, err := d.EnrichRemoteStatus(ctx, username, status); err != nil { - l.Debugf("error enriching remote status: %s", err) - return nil - } - // now move up to the next ancestor return d.iterateAncestors(ctx, username, *inReplyTo) } @@ -226,7 +214,7 @@ pageLoop: foundReplies = foundReplies + 1 // get the remote statusable and put it in the db - _, statusable, new, err := d.GetRemoteStatus(ctx, username, itemURI, false) + _, statusable, new, err := d.GetRemoteStatus(ctx, username, itemURI, false, false, false) if new && err == nil && statusable != nil { // now iterate descendants of *that* status if err := d.iterateDescendants(ctx, username, *itemURI, statusable); err != nil { |