From 7ec1e1332e7d04e74451acef18b41f389722b698 Mon Sep 17 00:00:00 2001
From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com>
Date: Fri, 19 Jan 2024 12:57:29 +0000
Subject: [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
---
 internal/db/bundb/marker.go | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'internal/db/bundb/marker.go')

diff --git a/internal/db/bundb/marker.go b/internal/db/bundb/marker.go
index 5d365e08a..b1dedb4f1 100644
--- a/internal/db/bundb/marker.go
+++ b/internal/db/bundb/marker.go
@@ -39,8 +39,8 @@ type markerDB struct {
 */
 
 func (m *markerDB) GetMarker(ctx context.Context, accountID string, name gtsmodel.MarkerName) (*gtsmodel.Marker, error) {
-	marker, err := m.state.Caches.GTS.Marker().Load(
-		"AccountID.Name",
+	marker, err := m.state.Caches.GTS.Marker.LoadOne(
+		"AccountID,Name",
 		func() (*gtsmodel.Marker, error) {
 			var marker gtsmodel.Marker
 
@@ -52,9 +52,7 @@ func (m *markerDB) GetMarker(ctx context.Context, accountID string, name gtsmode
 			}
 
 			return &marker, nil
-		},
-		accountID,
-		name,
+		}, accountID, name,
 	)
 	if err != nil {
 		return nil, err // already processed
@@ -74,7 +72,7 @@ func (m *markerDB) UpdateMarker(ctx context.Context, marker *gtsmodel.Marker) er
 		marker.Version = prevMarker.Version + 1
 	}
 
-	return m.state.Caches.GTS.Marker().Store(marker, func() error {
+	return m.state.Caches.GTS.Marker.Store(marker, func() error {
 		if prevMarker == nil {
 			if _, err := m.db.NewInsert().
 				Model(marker).
-- 
cgit v1.2.3