remove caching. That cache need a lot of rework

streamingfast · Sep 20, 2023 · 78d202c · 78d202c
1 parent 2f425fb
commit 78d202c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/accountresolver/processor_test.go b/accountresolver/processor_test.go
@@ -71,7 +71,7 @@ func Test_ExtendTableLookupInCompiledInstruction(t *testing.T) {
 	err = p.ProcessBlock(context.Background(), solBlock)
 	require.NoError(t, err)
 
-	accounts, err := resolver.Resolve(context.Background(), 185_914_862, tableLookupAccount)
+	accounts, _, err := resolver.Resolve(context.Background(), 185_914_862, tableLookupAccount)
 	require.Equal(t, expectedCreatedAccounts, accounts)
 }
 
@@ -150,7 +150,7 @@ func Test_ExtendTableLookup_In_InnerInstructions(t *testing.T) {
 	err = p.ProcessBlock(context.Background(), solBlock)
 	require.NoError(t, err)
 
-	accounts, err := resolver.Resolve(context.Background(), 157_564_921, tableLookupAccount)
+	accounts, _, err := resolver.Resolve(context.Background(), 157_564_921, tableLookupAccount)
 	require.Equal(t, expectedCreatedAccounts, accounts)
 }
 
@@ -238,7 +238,7 @@ func Test_ExtendTableLookup_By_AnotherAddressTableLookup_Containing_AddressLooku
 	require.Equal(t, 3, len(accounts))
 	require.Equal(t, accounts[2], AddressTableLookupAccountProgram)
 
-	accounts, err = resolver.Resolve(context.Background(), 185_914_862, tableLookupAddressToExtend)
+	accounts, _, err = resolver.Resolve(context.Background(), 185_914_862, tableLookupAddressToExtend)
 	require.Equal(t, expectedCreatedAccounts, accounts)
 }
 
@@ -324,6 +324,6 @@ func Test_ExtendTableLookup_By_AnotherAddressTableLookup_Containing_ExtendableTa
 	err = p.ProcessBlock(context.Background(), solBlock)
 	require.NoError(t, err)
 
-	accounts, err := resolver.Resolve(context.Background(), 185_914_862, tableAccountToExtend)
+	accounts, _, err := resolver.Resolve(context.Background(), 185_914_862, tableAccountToExtend)
 	require.Equal(t, expectedCreatedAccounts, accounts)
 }
diff --git a/accountresolver/resolver.go b/accountresolver/resolver.go
@@ -58,22 +58,22 @@ func (r *KVDBAccountsResolver) Extend(ctx context.Context, blockNum uint64, trxH
 		return fmt.Errorf("flushing extended accounts for key %q: %w", key, err)
 	}
 
-	r.cache[key.base58()] = append([]*cacheItem{{
-		blockNum: blockNum,
-		accounts: extendedAccount,
-	}}, r.cache[key.base58()]...)
+	//r.cache[key.base58()] = append([]*cacheItem{{
+	//	blockNum: blockNum,
+	//	accounts: extendedAccount,
+	//}}, r.cache[key.base58()]...)
 
 	return nil
 }
 
 func (r *KVDBAccountsResolver) Resolve(ctx context.Context, atBlockNum uint64, key Account) (Accounts, bool, error) {
-	if cacheItems, ok := r.cache[key.base58()]; ok {
-		for _, cacheItem := range cacheItems {
-			if cacheItem.blockNum <= atBlockNum {
-				return cacheItem.accounts, true, nil
-			}
-		}
-	}
+	//if cacheItems, ok := r.cache[key.base58()]; ok {
+	//	for _, cacheItem := range cacheItems {
+	//		if cacheItem.blockNum <= atBlockNum {
+	//			return cacheItem.accounts, true, nil
+	//		}
+	//	}
+	//}
 
 	keyBytes := Keys.tableLookupPrefix(key)
 	iter := r.store.Prefix(ctx, keyBytes, store.Unlimited)

diff --git a/accountresolver/resolver_test.go b/accountresolver/resolver_test.go
@@ -29,7 +29,7 @@ func TestKVDBAccountsResolver_Extended(t *testing.T) {
 	err = resolver.store.FlushPuts(context.Background())
 	require.NoError(t, err)
 
-	accounts, err := resolver.Resolve(context.Background(), 1, accountFromBase58(t, a1))
+	accounts, _, err := resolver.Resolve(context.Background(), 1, accountFromBase58(t, a1))
 	require.NoError(t, err)
 	require.Equal(t, 2, len(accounts))
 	require.Equal(t, accountFromBase58(t, a2), accounts[0])
@@ -40,20 +40,20 @@ func TestKVDBAccountsResolver_Extended(t *testing.T) {
 	err = resolver.store.FlushPuts(context.Background())
 	require.NoError(t, err)
 
-	accounts, err = resolver.Resolve(context.Background(), 1, accountFromBase58(t, a1))
+	accounts, _, err = resolver.Resolve(context.Background(), 1, accountFromBase58(t, a1))
 	require.NoError(t, err)
 	require.Equal(t, 2, len(accounts))
 	require.Equal(t, accountFromBase58(t, a2), accounts[0])
 	require.Equal(t, accountFromBase58(t, a3), accounts[1])
 
-	accounts, err = resolver.Resolve(context.Background(), 100, accountFromBase58(t, a1))
+	accounts, _, err = resolver.Resolve(context.Background(), 100, accountFromBase58(t, a1))
 	require.NoError(t, err)
 	require.Equal(t, 3, len(accounts))
 	require.Equal(t, accountFromBase58(t, a2), accounts[0])
 	require.Equal(t, accountFromBase58(t, a3), accounts[1])
 	require.Equal(t, accountFromBase58(t, a4), accounts[2])
 
-	accounts, err = resolver.Resolve(context.Background(), 1000, accountFromBase58(t, a1))
+	accounts, _, err = resolver.Resolve(context.Background(), 1000, accountFromBase58(t, a1))
 	require.NoError(t, err)
 	require.Equal(t, 3, len(accounts))
 	require.Equal(t, accountFromBase58(t, a2), accounts[0])
@@ -116,7 +116,7 @@ func Test_Extend_Multiple_Accounts_Same_Block(t *testing.T) {
 	err = resolver.store.FlushPuts(context.Background())
 	require.NoError(t, err)
 
-	accounts, err := resolver.Resolve(context.Background(), 1, accountFromBase58(t, a1))
+	accounts, _, err := resolver.Resolve(context.Background(), 1, accountFromBase58(t, a1))
 	require.NoError(t, err)
 	require.Equal(t, 2, len(accounts))
 	require.Equal(t, accountFromBase58(t, a2), accounts[0])
@@ -134,7 +134,7 @@ func Test_Extend_Multiple_Accounts_Same_Block(t *testing.T) {
 	err = resolver.store.FlushPuts(context.Background())
 	require.NoError(t, err)
 
-	accounts, err = resolver.Resolve(context.Background(), 1, accountFromBase58(t, a1))
+	accounts, _, err = resolver.Resolve(context.Background(), 1, accountFromBase58(t, a1))
 	require.NoError(t, err)
 	require.Equal(t, 4, len(accounts))
 	require.Equal(t, accountFromBase58(t, a2), accounts[0])