refactor getBlock/Receipts

iotexproject · Apr 5, 2024 · 8fcd84e · 8fcd84e
1 parent 1bee8d5
commit 8fcd84e
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 58 deletions.
diff --git a/blockchain/filedao/filedao_v2.go b/blockchain/filedao/filedao_v2.go
@@ -37,18 +37,19 @@ var (
 type (
 	// fileDAOv2 handles chain db file after file split activation at v1.1.2
 	fileDAOv2 struct {
-		filename     string
-		header       *FileHeader
-		tip          *FileTip
-		blkBuffer    *stagingBuffer
-		blkCache     cache.LRUCache
-		receiptCache cache.LRUCache
-		kvStore      db.KVStore
-		batch        batch.KVStoreBatch
-		hashStore    db.CountingIndex // store block hash
-		blkStore     db.CountingIndex // store raw blocks
-		sysStore     db.CountingIndex // store transaction log
-		deser        *block.Deserializer
+		filename        string
+		header          *FileHeader
+		tip             *FileTip
+		blkBuffer       *stagingBuffer
+		blkStorePbCache cache.LRUCache
+		blkCache        cache.LRUCache
+		receiptCache    cache.LRUCache
+		kvStore         db.KVStore
+		batch           batch.KVStoreBatch
+		hashStore       db.CountingIndex // store block hash
+		blkStore        db.CountingIndex // store raw blocks
+		sysStore        db.CountingIndex // store transaction log
+		deser           *block.Deserializer
 	}
 )
 
@@ -69,24 +70,26 @@ func newFileDAOv2(bottom uint64, cfg db.Config, deser *block.Deserializer) (*fil
 		tip: &FileTip{
 			Height: bottom - 1,
 		},
-		blkCache:     cache.NewThreadSafeLruCache(64),
-		receiptCache: cache.NewThreadSafeLruCache(64),
-		kvStore:      db.NewBoltDB(cfg),
-		batch:        batch.NewBatch(),
-		deser:        deser,
+		blkStorePbCache: cache.NewThreadSafeLruCache(16),
+		blkCache:        cache.NewThreadSafeLruCache(256),
+		receiptCache:    cache.NewThreadSafeLruCache(256),
+		kvStore:         db.NewBoltDB(cfg),
+		batch:           batch.NewBatch(),
+		deser:           deser,
 	}
 	return &fd, nil
 }
 
 // openFileDAOv2 opens an existing v2 file
 func openFileDAOv2(cfg db.Config, deser *block.Deserializer) *fileDAOv2 {
 	return &fileDAOv2{
-		filename:     cfg.DbPath,
-		blkCache:     cache.NewThreadSafeLruCache(64),
-		receiptCache: cache.NewThreadSafeLruCache(64),
-		kvStore:      db.NewBoltDB(cfg),
-		batch:        batch.NewBatch(),
-		deser:        deser,
+		filename:        cfg.DbPath,
+		blkStorePbCache: cache.NewThreadSafeLruCache(16),
+		blkCache:        cache.NewThreadSafeLruCache(256),
+		receiptCache:    cache.NewThreadSafeLruCache(256),
+		kvStore:         db.NewBoltDB(cfg),
+		batch:           batch.NewBatch(),
+		deser:           deser,
 	}
 }
 

diff --git a/blockchain/filedao/filedao_v2_util.go b/blockchain/filedao/filedao_v2_util.go
@@ -8,6 +8,8 @@ package filedao
 import (
 	"github.com/pkg/errors"
 
+	"github.com/iotexproject/iotex-proto/golang/iotextypes"
+
 	"github.com/iotexproject/iotex-core/action"
 	"github.com/iotexproject/iotex-core/blockchain/block"
 	"github.com/iotexproject/iotex-core/db"
@@ -175,7 +177,6 @@ func (fd *fileDAOv2) getBlock(height uint64) (*block.Block, error) {
 	if !fd.ContainsHeight(height) {
 		return nil, db.ErrNotExist
 	}
-
 	// check whether block in staging buffer or not
 	storeKey := blockStoreKey(height, fd.header)
 	if storeKey >= fd.blkStore.Size() {
@@ -185,30 +186,16 @@ func (fd *fileDAOv2) getBlock(height uint64) (*block.Block, error) {
 		}
 		return blkStore.Block, nil
 	}
-
 	// check whether block in read cache or not
 	if value, ok := fd.blkCache.Get(height); ok {
-		blk := value.(*block.Block)
-		return blk, nil
-	}
-
-	value, err := fd.blkStore.Get(storeKey)
-	if err != nil {
-		return nil, err
+		return value.(*block.Block), nil
 	}
-	value, err = decompBytes(value, fd.header.Compressor)
+	// read from storage DB
+	blockStore, err := fd.getBlockStore(height)
 	if err != nil {
 		return nil, err
 	}
-	pbStores, err := block.DeserializeBlockStoresPb(value)
-	if err != nil {
-		return nil, err
-	}
-	if len(pbStores.BlockStores) != int(fd.header.BlockStoreSize) {
-		return nil, ErrDataCorruption
-	}
-
-	blk, err := fd.deser.BlockFromBlockStoreProto(pbStores.BlockStores[stagingKey(height, fd.header)])
+	blk, err := fd.deser.BlockFromBlockStoreProto(blockStore)
 	if err != nil {
 		return nil, err
 	}
@@ -221,7 +208,6 @@ func (fd *fileDAOv2) getReceipt(height uint64) ([]*action.Receipt, error) {
 	if !fd.ContainsHeight(height) {
 		return nil, db.ErrNotExist
 	}
-
 	// check whether block in staging buffer or not
 	storeKey := blockStoreKey(height, fd.header)
 	if storeKey >= fd.blkStore.Size() {
@@ -231,13 +217,32 @@ func (fd *fileDAOv2) getReceipt(height uint64) ([]*action.Receipt, error) {
 		}
 		return blkStore.Receipts, nil
 	}
-
-	// check whether block in read cache or not
+	// check whether receipts in read cache or not
 	if value, ok := fd.receiptCache.Get(height); ok {
-		receipts := value.([]*action.Receipt)
-		return receipts, nil
+		return value.([]*action.Receipt), nil
+	}
+	// read from storage DB
+	blockStore, err := fd.getBlockStore(height)
+	if err != nil {
+		return nil, err
+	}
+	receipts, err := fd.deser.ReceiptsFromBlockStoreProto(blockStore)
+	if err != nil {
+		return nil, err
 	}
+	// add to read cache
+	fd.receiptCache.Add(height, receipts)
+	return receipts, nil
+}
 
+func (fd *fileDAOv2) getBlockStore(height uint64) (*iotextypes.BlockStore, error) {
+	// check whether blockStore in read cache or not
+	storeKey := blockStoreKey(height, fd.header)
+	if value, ok := fd.blkStorePbCache.Get(storeKey); ok {
+		pbInfos := value.(*iotextypes.BlockStores)
+		return pbInfos.BlockStores[stagingKey(height, fd.header)], nil
+	}
+	// read from storage DB
 	value, err := fd.blkStore.Get(storeKey)
 	if err != nil {
 		return nil, err
@@ -253,12 +258,7 @@ func (fd *fileDAOv2) getReceipt(height uint64) ([]*action.Receipt, error) {
 	if len(pbStores.BlockStores) != int(fd.header.BlockStoreSize) {
 		return nil, ErrDataCorruption
 	}
-
-	receipts, err := fd.deser.ReceiptsFromBlockStoreProto(pbStores.BlockStores[stagingKey(height, fd.header)])
-	if err != nil {
-		return nil, err
-	}
 	// add to read cache
-	fd.receiptCache.Add(height, receipts)
-	return receipts, nil
+	fd.blkStorePbCache.Add(storeKey, pbStores)
+	return pbStores.BlockStores[stagingKey(height, fd.header)], nil
 }
diff --git a/blockchain/filedao/testing.go b/blockchain/filedao/testing.go
@@ -66,10 +66,12 @@ func newFileDAOv2InMem(bottom uint64) (*fileDAOv2, error) {
 		tip: &FileTip{
 			Height: bottom - 1,
 		},
-		blkCache: cache.NewThreadSafeLruCache(16),
-		kvStore:  db.NewMemKVStore(),
-		batch:    batch.NewBatch(),
-		deser:    block.NewDeserializer(_defaultEVMNetworkID),
+		blkStorePbCache: cache.NewThreadSafeLruCache(16),
+		blkCache:        cache.NewThreadSafeLruCache(256),
+		receiptCache:    cache.NewThreadSafeLruCache(256),
+		kvStore:         db.NewMemKVStore(),
+		batch:           batch.NewBatch(),
+		deser:           block.NewDeserializer(_defaultEVMNetworkID),
 	}
 	return &fd, nil
 }