From 7d193de25fbccc00923d6d791d6d4e0d2d5d498e Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Wed, 1 Sep 2021 10:08:21 +0100 Subject: Improve GetRemoteStatus and db.GetStatus() logic (#174) * only fetch status parents / children if explicity requested when dereferencing Signed-off-by: kim (grufwub) * Remove recursive DB GetStatus logic, don't fetch parent unless requested Signed-off-by: kim (grufwub) * StatusCache copies status so there are no thread-safety issues with modified status objects Signed-off-by: kim (grufwub) * remove sqlite test files Signed-off-by: kim (grufwub) * fix bugs introduced by previous commit Signed-off-by: kim (grufwub) * fix not continue on error in loop Signed-off-by: kim (grufwub) * use our own RunInTx implementation (possible fix for nested tx error) Signed-off-by: kim (grufwub) * fix cast statement to work with SQLite Signed-off-by: kim (grufwub) * be less strict about valid status in cache Signed-off-by: kim (grufwub) * add cache=shared ALWAYS for SQLite db instances Signed-off-by: kim (grufwub) * Fix EnrichRemoteAccount when updating account fails Signed-off-by: kim (grufwub) * add nolint tag Signed-off-by: kim (grufwub) * ensure file: prefixes the filename in sqlite addr Signed-off-by: kim (grufwub) * add an account cache, add status author account from db Signed-off-by: kim (grufwub) * Fix incompatible SQLite query Signed-off-by: kim (grufwub) * *actually* use the new getAccount() function in accountsDB Signed-off-by: kim (grufwub) * update cache tests to use test suite Signed-off-by: kim (grufwub) * add RelationshipTestSuite, add tests for methods with changed SQL Signed-off-by: kim (grufwub) --- internal/cache/account_test.go | 63 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 internal/cache/account_test.go (limited to 'internal/cache/account_test.go') diff --git a/internal/cache/account_test.go b/internal/cache/account_test.go new file mode 100644 index 000000000..f84ad2261 --- /dev/null +++ b/internal/cache/account_test.go @@ -0,0 +1,63 @@ +package cache_test + +import ( + "testing" + + "github.com/stretchr/testify/suite" + "github.com/superseriousbusiness/gotosocial/internal/cache" + "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "github.com/superseriousbusiness/gotosocial/testrig" +) + +type AccountCacheTestSuite struct { + suite.Suite + data map[string]*gtsmodel.Account + cache *cache.AccountCache +} + +func (suite *AccountCacheTestSuite) SetupSuite() { + suite.data = testrig.NewTestAccounts() +} + +func (suite *AccountCacheTestSuite) SetupTest() { + suite.cache = cache.NewAccountCache() +} + +func (suite *AccountCacheTestSuite) TearDownTest() { + suite.data = nil + suite.cache = nil +} + +func (suite *AccountCacheTestSuite) TestAccountCache() { + for _, account := range suite.data { + // Place in the cache + suite.cache.Put(account) + } + + for _, account := range suite.data { + var ok bool + var check *gtsmodel.Account + + // Check we can retrieve + check, ok = suite.cache.GetByID(account.ID) + if !ok && !accountIs(account, check) { + suite.Fail("Failed to fetch expected account with ID: %s", account.ID) + } + check, ok = suite.cache.GetByURI(account.URI) + if account.URI != "" && !ok && !accountIs(account, check) { + suite.Fail("Failed to fetch expected account with URI: %s", account.URI) + } + check, ok = suite.cache.GetByURL(account.URL) + if account.URL != "" && !ok && !accountIs(account, check) { + suite.Fail("Failed to fetch expected account with URL: %s", account.URL) + } + } +} + +func TestAccountCache(t *testing.T) { + suite.Run(t, &AccountCacheTestSuite{}) +} + +func accountIs(account1, account2 *gtsmodel.Account) bool { + return account1.ID == account2.ID && account1.URI == account2.URI && account1.URL == account2.URL +} -- cgit v1.2.3