modify kvmvccmal global config

plugin/store/kvmvccmavl/kvmvcc_mavl_test.go

@@ -610,10 +610,7 @@ func TestPruning(t *testing.T) {
 	store := New(storeCfg, nil, nil).(*KVmMavlStore)
 	assert.NotNil(t, store)
 
-	kvmvccStore := NewKVMVCC(&subKVMVCCConfig{}, store.GetDB())
-
-	SetPruneHeight(10)
-	defer SetPruneHeight(0)
+	kvmvccStore := NewKVMVCC(&subKVMVCCConfig{PruneHeight:10}, store.GetDB())
 
 	var kv []*types.KeyValue
 	var key string
@@ -649,7 +646,7 @@ func TestPruning(t *testing.T) {
 		hashes = append(hashes, hash)
 	}
 
-	pruningMVCC(store.GetDB(), 99)
+	pruningMVCC(store.GetDB(), 99, &KVMCCCConfig{PruneHeight:10})
 
 	//check
 	getDatas := &types.StoreGet{

plugin/store/kvmvccmavl/kvmvccdb.go

@@ -25,13 +25,10 @@ const (
 	onceScanCount      = 10000 // 单次扫描数目
 	onceCount          = 1000  // 容器长度
 	levelPruningHeight = 100 * 10000
+	defaultPruneHeight  = 10000 // 每个10000裁剪一次
 )
 
 var (
-	// 是否开启裁剪
-	enablePrune bool
-	// 每个10000裁剪一次
-	pruneHeight  = 10000
 	pruningState int32
 	batch        dbm.Batch
 )
@@ -46,33 +43,41 @@ var (
 	//mvccMetaVersionKeyList = append(mvccMeta, []byte("versionkl.")...)
 )
 
+type KVMCCCConfig struct {
+	EnableMVCCIter  bool
+	EnableMavlPrune bool
+	PruneHeight     int32
+}
+
 // KVMVCCStore provide kvmvcc store interface implementation
 type KVMVCCStore struct {
 	db              dbm.DB
 	mvcc            dbm.MVCC
 	kvsetmap        map[string][]*types.KeyValue
-	enableMVCCIter  bool
-	enableMavlPrune bool
-	pruneHeight     int32
 	sync            bool
+	kvmvccCfg       *KVMCCCConfig
 }
 
 // NewKVMVCC construct KVMVCCStore module
 func NewKVMVCC(sub *subKVMVCCConfig, db dbm.DB) *KVMVCCStore {
 	var kvs *KVMVCCStore
-	enable := false
-	if sub != nil {
-		enable = sub.EnableMVCCIter
+	if sub == nil {
+		panic("sub is nil memory")
+	}
+	if sub.PruneHeight == 0 {
+		sub.PruneHeight = defaultPruneHeight
+	}
+	kvmvccCfg := &KVMCCCConfig{
+		EnableMVCCIter: sub.EnableMVCCIter,
+		EnableMavlPrune: sub.EnableMavlPrune,
+		PruneHeight: sub.PruneHeight,
+
 	}
-	if enable {
-		kvs = &KVMVCCStore{db, dbm.NewMVCCIter(db), make(map[string][]*types.KeyValue),
-			true, sub.EnableMavlPrune, sub.PruneHeight, false}
+	if kvmvccCfg.EnableMVCCIter {
+		kvs = &KVMVCCStore{db, dbm.NewMVCCIter(db), make(map[string][]*types.KeyValue),false, kvmvccCfg}
 	} else {
-		kvs = &KVMVCCStore{db, dbm.NewMVCC(db), make(map[string][]*types.KeyValue),
-			false, sub.EnableMavlPrune, sub.PruneHeight, false}
+		kvs = &KVMVCCStore{db, dbm.NewMVCC(db), make(map[string][]*types.KeyValue),false, kvmvccCfg}
 	}
-	EnablePrune(sub.EnableMavlPrune)
-	SetPruneHeight(int(sub.PruneHeight))
 	return kvs
 }
 
@@ -137,12 +142,12 @@ func (mvccs *KVMVCCStore) MemSet(datas *types.StoreSet, hash []byte, sync bool)
 	mvccs.kvsetmap[string(hash)] = kvset
 	mvccs.sync = sync
 	// 进行裁剪
-	if enablePrune && !isPruning() &&
-		pruneHeight != 0 &&
-		datas.Height%int64(pruneHeight) == 0 &&
-		datas.Height/int64(pruneHeight) > 1 {
+	if mvccs.kvmvccCfg != nil && mvccs.kvmvccCfg.EnableMavlPrune &&
+		!isPruning() && mvccs.kvmvccCfg.PruneHeight != 0 &&
+		datas.Height%int64(mvccs.kvmvccCfg.PruneHeight) == 0 &&
+		datas.Height/int64(mvccs.kvmvccCfg.PruneHeight) > 1 {
 		wg.Add(1)
-		go pruning(mvccs.db, datas.Height)
+		go pruning(mvccs.db, datas.Height, mvccs.kvmvccCfg)
 	}
 	return hash, nil
 }
@@ -205,7 +210,7 @@ func (mvccs *KVMVCCStore) Rollback(req *types.ReqHash) ([]byte, error) {
 
 // IterateRangeByStateHash travel with Prefix by StateHash  to get the latest version kvs.
 func (mvccs *KVMVCCStore) IterateRangeByStateHash(statehash []byte, start []byte, end []byte, ascending bool, fn func(key, value []byte) bool) {
-	if !mvccs.enableMVCCIter {
+	if !mvccs.kvmvccCfg.EnableMVCCIter {
 		panic("call IterateRangeByStateHash when disable mvcc iter")
 	}
 	//按照kv最新值来进行遍历处理，要求statehash必须是最新区块的statehash，否则不支持该接口
@@ -339,31 +344,21 @@ func calcHash(datas proto.Message) []byte {
 
 /*裁剪-------------------------------------------*/
 
-// EnablePrune 使能裁剪
-func EnablePrune(enable bool) {
-	enablePrune = enable
-}
-
-// SetPruneHeight 设置每次裁剪高度
-func SetPruneHeight(height int) {
-	pruneHeight = height
-}
-
-func pruning(db dbm.DB, height int64) {
+func pruning(db dbm.DB, height int64, KVmvccCfg *KVMCCCConfig) {
 	defer wg.Done()
-	pruningMVCC(db, height)
+	pruningMVCC(db, height, KVmvccCfg)
 }
 
-func pruningMVCC(db dbm.DB, height int64) {
+func pruningMVCC(db dbm.DB, height int64, KVmvccCfg *KVMCCCConfig) {
 	setPruning(pruningStateStart)
 	defer setPruning(pruningStateEnd)
 	start := time.Now()
-	pruningFirst(db, height)
+	pruningFirst(db, height, KVmvccCfg)
 	end := time.Now()
 	kmlog.Debug("pruningMVCC", "height", height, "cost", end.Sub(start))
 }
 
-func pruningFirst(db dbm.DB, curHeight int64) {
+func pruningFirst(db dbm.DB, curHeight int64, KVmvccCfg *KVMCCCConfig) {
 	it := db.Iterator(mvccData, nil, true)
 	defer it.Close()
 
@@ -385,24 +380,24 @@ func pruningFirst(db dbm.DB, curHeight int64) {
 		}
 
 		if curHeight < height+levelPruningHeight &&
-			curHeight >= height+int64(pruneHeight) {
+			curHeight >= height+int64(KVmvccCfg.PruneHeight) {
 			mp[string(key)] = append(mp[string(key)], height)
 			count++
 		}
 		if len(mp) >= onceCount-1 || count > onceScanCount {
-			deleteOldKV(mp, curHeight, batch)
+			deleteOldKV(mp, curHeight, batch, KVmvccCfg)
 			mp = nil
 			count = 0
 		}
 	}
 	if len(mp) > 0 {
-		deleteOldKV(mp, curHeight, batch)
+		deleteOldKV(mp, curHeight, batch, KVmvccCfg)
 		mp = nil
 		_ = mp
 	}
 }
 
-func deleteOldKV(mp map[string][]int64, curHeight int64, batch dbm.Batch) {
+func deleteOldKV(mp map[string][]int64, curHeight int64, batch dbm.Batch, KVmvccCfg *KVMCCCConfig) {
 	if len(mp) == 0 {
 		return
 	}
@@ -410,7 +405,7 @@ func deleteOldKV(mp map[string][]int64, curHeight int64, batch dbm.Batch) {
 	for key, vals := range mp {
 		if len(vals) > 1 && vals[1] != vals[0] { //防止相同高度时候出现的误删除
 			for _, val := range vals[1:] { //从第二个开始判断
-				if curHeight >= val+int64(pruneHeight) {
+				if curHeight >= val+int64(KVmvccCfg.PruneHeight) {
 					batch.Delete(genKeyVersion([]byte(key), val)) // 删除老版本key
 					if batch.ValueSize() > batchDataSize {
 						dbm.MustWrite(batch)

plugin/store/kvmvccmavl/mavl.go

@@ -24,12 +24,9 @@ const (
 
 // MavlStore mavl store struct
 type MavlStore struct {
-	db               dbm.DB
-	trees            *sync.Map
-	enableMavlPrefix bool
-	enableMVCC       bool
-	enableMavlPrune  bool
-	pruneHeight      int32
+	db      dbm.DB
+	trees   *sync.Map
+	treeCfg *mavl.TreeConfig
 }
 
 // NewMavl new mavl store module
@@ -44,14 +41,21 @@ func NewMavl(sub *subMavlConfig, db dbm.DB) *MavlStore {
 		subcfg.EnableMemVal = sub.EnableMemVal
 		subcfg.TkCloseCacheLen = sub.TkCloseCacheLen
 	}
-	mavls := &MavlStore{db, &sync.Map{}, subcfg.EnableMavlPrefix, subcfg.EnableMVCC, subcfg.EnableMavlPrune, subcfg.PruneHeight}
-	mavl.EnableMavlPrefix(subcfg.EnableMavlPrefix)
-	mavl.EnableMVCC(subcfg.EnableMVCC)
-	mavl.EnablePrune(subcfg.EnableMavlPrune)
-	mavl.SetPruneHeight(int(subcfg.PruneHeight))
-	mavl.EnableMemTree(subcfg.EnableMemTree)
-	mavl.EnableMemVal(subcfg.EnableMemVal)
-	mavl.TkCloseCacheLen(subcfg.TkCloseCacheLen)
+
+	// 开启裁剪需要同时开启前缀树
+	if subcfg.EnableMavlPrune {
+		subcfg.EnableMavlPrefix = subcfg.EnableMavlPrune
+	}
+	treeCfg := &mavl.TreeConfig{
+		EnableMavlPrefix: subcfg.EnableMavlPrefix,
+		EnableMVCC:       subcfg.EnableMVCC,
+		EnableMavlPrune:  subcfg.EnableMavlPrune,
+		PruneHeight:      subcfg.PruneHeight,
+		EnableMemTree:    subcfg.EnableMemTree,
+		EnableMemVal:     subcfg.EnableMemVal,
+		TkCloseCacheLen:  subcfg.TkCloseCacheLen,
+	}
+	mavls := &MavlStore{db, &sync.Map{}, treeCfg}
 	return mavls
 }
 
@@ -63,7 +67,7 @@ func (mavls *MavlStore) Close() {
 
 // Set set k v to mavl store db; sync is true represent write sync
 func (mavls *MavlStore) Set(datas *types.StoreSet, sync bool) ([]byte, error) {
-	return mavl.SetKVPair(mavls.db, datas, sync)
+	return mavl.SetKVPair(mavls.db, datas, sync, mavls.treeCfg)
 }
 
 // Get get values by keys
@@ -75,7 +79,7 @@ func (mavls *MavlStore) Get(datas *types.StoreGet) [][]byte {
 	if data, ok := mavls.trees.Load(search); ok {
 		tree = data.(*mavl.Tree)
 	} else {
-		tree = mavl.NewTree(mavls.db, true)
+		tree = mavl.NewTree(mavls.db, true, mavls.treeCfg)
 		//get接口也应该传入高度
 		//tree.SetBlockHeight(datas.Height)
 		err = tree.Load(datas.StateHash)
@@ -103,7 +107,7 @@ func (mavls *MavlStore) MemSet(datas *types.StoreSet, sync bool) ([]byte, error)
 		mavls.trees.Store(string(datas.StateHash), nil)
 		return datas.StateHash, nil
 	}
-	tree := mavl.NewTree(mavls.db, sync)
+	tree := mavl.NewTree(mavls.db, sync, mavls.treeCfg)
 	tree.SetBlockHeight(datas.Height)
 	err := tree.Load(datas.StateHash)
 	if err != nil {
@@ -127,7 +131,7 @@ func (mavls *MavlStore) MemSetUpgrade(datas *types.StoreSet, sync bool) ([]byte,
 		kmlog.Info("store mavl memset,use preStateHash as stateHash for kvset is null")
 		return datas.StateHash, nil
 	}
-	tree := mavl.NewTree(mavls.db, sync)
+	tree := mavl.NewTree(mavls.db, sync, mavls.treeCfg)
 	tree.SetBlockHeight(datas.Height)
 	err := tree.Load(datas.StateHash)
 	if err != nil {
@@ -182,7 +186,7 @@ func (mavls *MavlStore) Rollback(req *types.ReqHash) ([]byte, error) {
 
 // IterateRangeByStateHash 迭代实现功能； statehash：当前状态hash, start：开始查找的key, end: 结束的key, ascending：升序，降序, fn 迭代回调函数
 func (mavls *MavlStore) IterateRangeByStateHash(statehash []byte, start []byte, end []byte, ascending bool, fn func(key, value []byte) bool) {
-	mavl.IterateRangeByStateHash(mavls.db, statehash, start, end, ascending, fn)
+	mavl.IterateRangeByStateHash(mavls.db, statehash, start, end, ascending, mavls.treeCfg, fn)
 }
 
 // ProcEvent not support message