remove GetStorageMultiDBStoreIfNeeded

Author: zhangchiqing

cmd/access/node_builder/access_node_builder.go

@@ -581,11 +581,8 @@ func (builder *FlowAccessNodeBuilder) BuildExecutionSyncComponents() *FlowAccess
 			return stateSyncCommands.NewReadExecutionDataCommand(builder.ExecutionDataStore)
 		}).
 		Module("transactions and collections storage", func(node *cmd.NodeConfig) error {
-
-			dbStore := cmd.GetStorageMultiDBStoreIfNeeded(node)
-
-			transactions := store.NewTransactions(node.Metrics.Cache, dbStore)
-			collections := store.NewCollections(dbStore, transactions)
+			transactions := store.NewTransactions(node.Metrics.Cache, node.ProtocolDB)
+			collections := store.NewCollections(node.ProtocolDB, transactions)
 			builder.transactions = transactions
 			builder.collections = collections
 
@@ -854,8 +851,7 @@ func (builder *FlowAccessNodeBuilder) BuildExecutionSyncComponents() *FlowAccess
 				return nil
 			}).
 			Module("transaction results storage", func(node *cmd.NodeConfig) error {
-				dbStore := cmd.GetStorageMultiDBStoreIfNeeded(node)
-				builder.lightTransactionResults = store.NewLightTransactionResults(node.Metrics.Cache, dbStore, bstorage.DefaultCacheSize)
+				builder.lightTransactionResults = store.NewLightTransactionResults(node.Metrics.Cache, node.ProtocolDB, bstorage.DefaultCacheSize)
 				return nil
 			}).
 			DependableComponent("execution data indexer", func(node *cmd.NodeConfig) (module.ReadyDoneAware, error) {
@@ -1828,8 +1824,7 @@ func (builder *FlowAccessNodeBuilder) Build() (cmd.Node, error) {
 			return nil
 		}).
 		Module("events storage", func(node *cmd.NodeConfig) error {
-			dbStore := cmd.GetStorageMultiDBStoreIfNeeded(node)
-			builder.events = store.NewEvents(node.Metrics.Cache, dbStore)
+			builder.events = store.NewEvents(node.Metrics.Cache, node.ProtocolDB)
 			return nil
 		}).
 		Module("reporter", func(node *cmd.NodeConfig) error {
@@ -1865,8 +1860,7 @@ func (builder *FlowAccessNodeBuilder) Build() (cmd.Node, error) {
 		}).
 		Module("transaction result error messages storage", func(node *cmd.NodeConfig) error {
 			if builder.storeTxResultErrorMessages {
-				dbStore := cmd.GetStorageMultiDBStoreIfNeeded(node)
-				builder.transactionResultErrorMessages = store.NewTransactionResultErrorMessages(node.Metrics.Cache, dbStore, bstorage.DefaultCacheSize)
+				builder.transactionResultErrorMessages = store.NewTransactionResultErrorMessages(node.Metrics.Cache, node.ProtocolDB, bstorage.DefaultCacheSize)
 			}
 
 			return nil

cmd/consensus/main.go

@@ -392,12 +392,10 @@ func main() {
 			rawMempool := stdmap.NewIncorporatedResultSeals(sealLimit)
 			multipleReceiptsFilterMempool := consensusMempools.NewIncorporatedResultSeals(rawMempool, node.Storage.Receipts)
 
-			dbStore := cmd.GetStorageMultiDBStoreIfNeeded(node)
-
 			seals, err = consensusMempools.NewExecStateForkSuppressor(
 				multipleReceiptsFilterMempool,
 				consensusMempools.LogForkAndCrash(node.Logger),
-				dbStore,
+				node.ProtocolDB,
 				node.Logger,
 			)
 			if err != nil {

cmd/utils.go

@@ -22,10 +22,6 @@ import (
 	"github.com/onflow/flow-go/network/p2p/translator"
 	"github.com/onflow/flow-go/network/p2p/unicast/protocols"
 	"github.com/onflow/flow-go/state/protocol/inmem"
-	"github.com/onflow/flow-go/storage"
-	"github.com/onflow/flow-go/storage/dbops"
-	"github.com/onflow/flow-go/storage/operation"
-	"github.com/onflow/flow-go/storage/operation/badgerimpl"
 	"github.com/onflow/flow-go/utils/io"
 )
 
@@ -173,21 +169,3 @@ func CreatePublicIDTranslatorAndIdentifierProvider(
 
 	return idTranslator, factory, nil
 }
-
-// GetStorageMultiDBStoreIfNeeded returns either a single-DB store or
-// a multi-DB store when node.DBOps is pebble-batch.
-// When this function returns a multi-DB store, the store has:
-// - primary read-and-write-store: node.ProtocolDB (Pebble)
-// - secondary read-only store: node.DB (BadgerDB).
-func GetStorageMultiDBStoreIfNeeded(node *NodeConfig) storage.DB {
-	dbStore := node.ProtocolDB
-
-	if dbops.IsPebbleBatch(node.DBOps) {
-		// Create multiDBStore with node.ProtocolDB as primary read-and-write-store,
-		// and node.DB as secondary read-only store.
-		badgerDB := badgerimpl.ToDB(node.DB)
-		dbStore = operation.NewMultiDBStore(node.ProtocolDB, badgerDB)
-	}
-
-	return dbStore
-}