summaryrefslogtreecommitdiff
path: root/internal/db/bundb/bundb.go
diff options
context:
space:
mode:
authorLibravatar tobi <31960611+tsmethurst@users.noreply.github.com>2022-10-08 13:50:48 +0200
committerLibravatar GitHub <noreply@github.com>2022-10-08 13:50:48 +0200
commitaa07750bdb4dacdb1be39d765114915bba3fc29f (patch)
tree30e9e5052f607f8c8e4f7d518559df8706275e0f /internal/db/bundb/bundb.go
parent[performance] cache domains after max retries in transport (#884) (diff)
downloadgotosocial-aa07750bdb4dacdb1be39d765114915bba3fc29f.tar.xz
[chore] Standardize database queries, use `bun.Ident()` properly (#886)
* use bun.Ident for user queries * use bun.Ident for account queries * use bun.Ident for media queries * add DeleteAccount func * remove CaseInsensitive in Where+use Ident ipv Safe * update admin db * update domain, use ident * update emoji, use ident * update instance queries, use bun.Ident * fix media * update mentions, use bun ident * update relationship + tests * use tableexpr * add test follows to bun db test suite * update notifications * updatebyprimarykey => updatebyid * fix session * prefer explicit ID to pk * fix little fucky wucky * remove workaround * use proper db func for attachment selection * update status db * add m2m entries in test rig * fix up timeline * go fmt * fix status put issue * update GetAccountStatuses
Diffstat (limited to 'internal/db/bundb/bundb.go')
-rw-r--r--internal/db/bundb/bundb.go34
1 files changed, 18 insertions, 16 deletions
diff --git a/internal/db/bundb/bundb.go b/internal/db/bundb/bundb.go
index 70a44d4c1..02522e6f7 100644
--- a/internal/db/bundb/bundb.go
+++ b/internal/db/bundb/bundb.go
@@ -159,17 +159,11 @@ func NewBunDBService(ctx context.Context) (db.DB, error) {
return nil, fmt.Errorf("db migration error: %s", err)
}
- // Create DB structs that require ptrs to each other
- accounts := &accountDB{conn: conn, cache: cache.NewAccountCache()}
- status := &statusDB{conn: conn, cache: cache.NewStatusCache()}
- emoji := &emojiDB{conn: conn, cache: cache.NewEmojiCache()}
- timeline := &timelineDB{conn: conn}
-
- // Setup DB cross-referencing
- accounts.status = status
- status.accounts = accounts
- timeline.status = status
+ // Prepare caches required by more than one struct
+ userCache := cache.NewUserCache()
+ accountCache := cache.NewAccountCache()
+ // Prepare other caches
// Prepare mentions cache
// TODO: move into internal/cache
mentionCache := grufcache.New[string, *gtsmodel.Mention]()
@@ -182,22 +176,30 @@ func NewBunDBService(ctx context.Context) (db.DB, error) {
notifCache.SetTTL(time.Minute*5, false)
notifCache.Start(time.Second * 10)
- // Prepare other caches
- blockCache := cache.NewDomainBlockCache()
- userCache := cache.NewUserCache()
+ // Create DB structs that require ptrs to each other
+ accounts := &accountDB{conn: conn, cache: accountCache}
+ status := &statusDB{conn: conn, cache: cache.NewStatusCache()}
+ emoji := &emojiDB{conn: conn, cache: cache.NewEmojiCache()}
+ timeline := &timelineDB{conn: conn}
+
+ // Setup DB cross-referencing
+ accounts.status = status
+ status.accounts = accounts
+ timeline.status = status
ps := &DBService{
Account: accounts,
Admin: &adminDB{
- conn: conn,
- userCache: userCache,
+ conn: conn,
+ userCache: userCache,
+ accountCache: accountCache,
},
Basic: &basicDB{
conn: conn,
},
Domain: &domainDB{
conn: conn,
- cache: blockCache,
+ cache: cache.NewDomainBlockCache(),
},
Emoji: emoji,
Instance: &instanceDB{