add Independent enable kvmvcc prune

chain33.toml

@@ -171,6 +171,7 @@ enableMVCCIter=true
 enableMavlPrefix=false
 enableMVCC=false
 enableMavlPrune=false
+enableMVCCPrune=false
 pruneHeight=10000
 # 是否使能mavl数据载入内存
 enableMemTree=true

plugin/store/kvmvccmavl/kvmvcc_mavl.go

@@ -74,7 +74,7 @@ type KVmMavlStore struct {
 
 type subKVMVCCConfig struct {
 	EnableMVCCIter  bool  `json:"enableMVCCIter"`
-	EnableMavlPrune bool  `json:"enableMavlPrune"`
+	EnableMVCCPrune bool  `json:"enableMVCCPrune"`
 	PruneHeight     int32 `json:"pruneHeight"`
 }
 
@@ -96,6 +96,7 @@ type subConfig struct {
 	EnableMavlPrefix bool  `json:"enableMavlPrefix"`
 	EnableMVCC       bool  `json:"enableMVCC"`
 	EnableMavlPrune  bool  `json:"enableMavlPrune"`
+	EnableMVCCPrune  bool  `json:"enableMVCCPrune"`
 	PruneHeight      int32 `json:"pruneHeight"`
 	// 是否使能内存树
 	EnableMemTree bool `json:"enableMemTree"`
@@ -114,7 +115,7 @@ func New(cfg *types.Store, sub []byte) queue.Module {
 	if sub != nil {
 		types.MustDecode(sub, &subcfg)
 		subKVMVCCcfg.EnableMVCCIter = subcfg.EnableMVCCIter
-		subKVMVCCcfg.EnableMavlPrune = subcfg.EnableMavlPrune
+		subKVMVCCcfg.EnableMVCCPrune = subcfg.EnableMVCCPrune
 		subKVMVCCcfg.PruneHeight = subcfg.PruneHeight
 
 		subMavlcfg.EnableMavlPrefix = subcfg.EnableMavlPrefix

plugin/store/kvmvccmavl/kvmvccdb.go

@@ -52,7 +52,7 @@ type KVMVCCStore struct {
 	mvcc            dbm.MVCC
 	kvsetmap        map[string][]*types.KeyValue
 	enableMVCCIter  bool
-	enableMavlPrune bool
+	enableMVCCPrune bool
 	pruneHeight     int32
 	sync            bool
 }
@@ -66,12 +66,12 @@ func NewKVMVCC(sub *subKVMVCCConfig, db dbm.DB) *KVMVCCStore {
 	}
 	if enable {
 		kvs = &KVMVCCStore{db, dbm.NewMVCCIter(db), make(map[string][]*types.KeyValue),
-			true, sub.EnableMavlPrune, sub.PruneHeight, false}
+			true, sub.EnableMVCCPrune, sub.PruneHeight, false}
 	} else {
 		kvs = &KVMVCCStore{db, dbm.NewMVCC(db), make(map[string][]*types.KeyValue),
-			false, sub.EnableMavlPrune, sub.PruneHeight, false}
+			false, sub.EnableMVCCPrune, sub.PruneHeight, false}
 	}
-	EnablePrune(sub.EnableMavlPrune)
+	EnablePrune(sub.EnableMVCCPrune)
 	SetPruneHeight(int(sub.PruneHeight))
 	return kvs
 }