Optimize difflayer

Qitmeer · Oct 21, 2023 · 3e2e2bb · 3e2e2bb
1 parent 8bd7eea
commit 3e2e2bb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/database/chaindb/chaindb_index.go b/database/chaindb/chaindb_index.go
@@ -14,14 +14,14 @@ import (
 
 func (cdb *ChainDB) PutTxIdxEntrys(sblock *types.SerializedBlock, block model.Block) error {
 	if cdb.diff != nil {
-		return cdb.diff.PutTxIdxEntrys(sblock,block)
+		return cdb.diff.PutTxIdxEntrys(sblock, block)
 	}
 	return rawdb.WriteTxLookupEntriesByBlock(cdb.db, sblock, uint64(block.GetID()))
 }
 
 func (cdb *ChainDB) GetTxIdxEntry(id *hash.Hash, verbose bool) (*types.Tx, *hash.Hash, error) {
 	if cdb.diff != nil {
-		return cdb.diff.GetTxIdxEntry(id,verbose)
+		return cdb.diff.GetTxIdxEntry(id, verbose)
 	}
 	if !verbose {
 		blockID := rawdb.ReadTxLookupEntry(cdb.db, id)

diff --git a/database/chaindb/difflayer.go b/database/chaindb/difflayer.go
@@ -8,6 +8,7 @@ import (
 	com "github.com/Qitmeer/qng/database/common"
 	"github.com/Qitmeer/qng/database/rawdb"
 	"github.com/Qitmeer/qng/meerdag"
+	"github.com/Qitmeer/qng/params"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/ethdb"
 	"sync"
@@ -44,12 +45,17 @@ type diffLayer struct {
 }
 
 func (dl *diffLayer) handler() {
-	timer := time.NewTicker(time.Minute)
+	timer := time.NewTicker(params.ActiveNetParams.TargetTimePerBlock)
 out:
 	for {
 		select {
 		case <-timer.C:
-			if dl.memory.Load() >= dl.cache {
+			dl.lock.RLock()
+			bcSize := len(dl.blocks)
+			dl.lock.RUnlock()
+
+			if dl.memory.Load() >= dl.cache ||
+				bcSize >= meerdag.MinBlockDataCache {
 				err := dl.flatten()
 				if err != nil {
 					log.Error(err.Error())