summaryrefslogtreecommitdiff
path: root/internal/db/bundb/timeline.go
diff options
context:
space:
mode:
authorLibravatar kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com>2024-01-19 12:57:29 +0000
committerLibravatar GitHub <noreply@github.com>2024-01-19 12:57:29 +0000
commit7ec1e1332e7d04e74451acef18b41f389722b698 (patch)
tree9c69eca7fc664ab5564279a2e065dfd5c2ddd17b /internal/db/bundb/timeline.go
parent[chore] chore rationalise http return codes for activitypub handlers (#2540) (diff)
downloadgotosocial-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/db/bundb/timeline.go')
-rw-r--r--internal/db/bundb/timeline.go84
1 files changed, 16 insertions, 68 deletions
diff --git a/internal/db/bundb/timeline.go b/internal/db/bundb/timeline.go
index 4af17fb7f..f2ba2a9d1 100644
--- a/internal/db/bundb/timeline.go
+++ b/internal/db/bundb/timeline.go
@@ -29,7 +29,6 @@ import (
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
"github.com/superseriousbusiness/gotosocial/internal/id"
- "github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/state"
"github.com/uptrace/bun"
)
@@ -155,20 +154,8 @@ func (t *timelineDB) GetHomeTimeline(ctx context.Context, accountID string, maxI
}
}
- statuses := make([]*gtsmodel.Status, 0, len(statusIDs))
- for _, id := range statusIDs {
- // Fetch status from db for ID
- status, err := t.state.DB.GetStatusByID(ctx, id)
- if err != nil {
- log.Errorf(ctx, "error fetching status %q: %v", id, err)
- continue
- }
-
- // Append status to slice
- statuses = append(statuses, status)
- }
-
- return statuses, nil
+ // Return status IDs loaded from cache + db.
+ return t.state.DB.GetStatusesByIDs(ctx, statusIDs)
}
func (t *timelineDB) GetPublicTimeline(ctx context.Context, maxID string, sinceID string, minID string, limit int, local bool) ([]*gtsmodel.Status, error) {
@@ -256,20 +243,8 @@ func (t *timelineDB) GetPublicTimeline(ctx context.Context, maxID string, sinceI
}
}
- statuses := make([]*gtsmodel.Status, 0, len(statusIDs))
- for _, id := range statusIDs {
- // Fetch status from db for ID
- status, err := t.state.DB.GetStatusByID(ctx, id)
- if err != nil {
- log.Errorf(ctx, "error fetching status %q: %v", id, err)
- continue
- }
-
- // Append status to slice
- statuses = append(statuses, status)
- }
-
- return statuses, nil
+ // Return status IDs loaded from cache + db.
+ return t.state.DB.GetStatusesByIDs(ctx, statusIDs)
}
// TODO optimize this query and the logic here, because it's slow as balls -- it takes like a literal second to return with a limit of 20!
@@ -323,18 +298,15 @@ func (t *timelineDB) GetFavedTimeline(ctx context.Context, accountID string, max
}
})
- statuses := make([]*gtsmodel.Status, 0, len(faves))
-
- for _, fave := range faves {
- // Fetch status from db for corresponding favourite
- status, err := t.state.DB.GetStatusByID(ctx, fave.StatusID)
- if err != nil {
- log.Errorf(ctx, "error fetching status for fave %q: %v", fave.ID, err)
- continue
- }
+ // Convert fave IDs to status IDs.
+ statusIDs := make([]string, len(faves))
+ for i, fave := range faves {
+ statusIDs[i] = fave.StatusID
+ }
- // Append status to slice
- statuses = append(statuses, status)
+ statuses, err := t.state.DB.GetStatusesByIDs(ctx, statusIDs)
+ if err != nil {
+ return nil, "", "", err
}
nextMaxID := faves[len(faves)-1].ID
@@ -453,20 +425,8 @@ func (t *timelineDB) GetListTimeline(
}
}
- statuses := make([]*gtsmodel.Status, 0, len(statusIDs))
- for _, id := range statusIDs {
- // Fetch status from db for ID
- status, err := t.state.DB.GetStatusByID(ctx, id)
- if err != nil {
- log.Errorf(ctx, "error fetching status %q: %v", id, err)
- continue
- }
-
- // Append status to slice
- statuses = append(statuses, status)
- }
-
- return statuses, nil
+ // Return status IDs loaded from cache + db.
+ return t.state.DB.GetStatusesByIDs(ctx, statusIDs)
}
func (t *timelineDB) GetTagTimeline(
@@ -561,18 +521,6 @@ func (t *timelineDB) GetTagTimeline(
}
}
- statuses := make([]*gtsmodel.Status, 0, len(statusIDs))
- for _, id := range statusIDs {
- // Fetch status from db for ID
- status, err := t.state.DB.GetStatusByID(ctx, id)
- if err != nil {
- log.Errorf(ctx, "error fetching status %q: %v", id, err)
- continue
- }
-
- // Append status to slice
- statuses = append(statuses, status)
- }
-
- return statuses, nil
+ // Return status IDs loaded from cache + db.
+ return t.state.DB.GetStatusesByIDs(ctx, statusIDs)
}