add prune kvmvcc

plugin/consensus/tendermint/types/round_state.go

@@ -117,9 +117,9 @@ type RoundState struct {
 // RoundStateMessage ...
 func (rs *RoundState) RoundStateMessage() *tmtypes.NewRoundStepMsg {
 	return &tmtypes.NewRoundStepMsg{
-		Height:                rs.Height,
-		Round:                 int32(rs.Round),
-		Step:                  int32(rs.Step),
+		Height: rs.Height,
+		Round:  int32(rs.Round),
+		Step:   int32(rs.Step),
 		SecondsSinceStartTime: int32(time.Since(rs.StartTime).Seconds()),
 		LastCommitRound:       int32(rs.LastCommit.Round()),
 	}

plugin/dapp/cert/authority/tools/cryptogen/generator/utils/certutils.go

@@ -73,9 +73,9 @@ func ParseX509CertificateToSm2(x509Cert *x509.Certificate) *sm2.Certificate {
 		UnknownExtKeyUsage: x509Cert.UnknownExtKeyUsage,
 
 		BasicConstraintsValid: x509Cert.BasicConstraintsValid,
-		IsCA:                  x509Cert.IsCA,
-		MaxPathLen:            x509Cert.MaxPathLen,
-		MaxPathLenZero:        x509Cert.MaxPathLenZero,
+		IsCA:           x509Cert.IsCA,
+		MaxPathLen:     x509Cert.MaxPathLen,
+		MaxPathLenZero: x509Cert.MaxPathLenZero,
 
 		SubjectKeyId:   x509Cert.SubjectKeyId,
 		AuthorityKeyId: x509Cert.AuthorityKeyId,
@@ -136,9 +136,9 @@ func ParseSm2CertificateToX509(sm2Cert *sm2.Certificate) *x509.Certificate {
 		UnknownExtKeyUsage: sm2Cert.UnknownExtKeyUsage,
 
 		BasicConstraintsValid: sm2Cert.BasicConstraintsValid,
-		IsCA:                  sm2Cert.IsCA,
-		MaxPathLen:            sm2Cert.MaxPathLen,
-		MaxPathLenZero:        sm2Cert.MaxPathLenZero,
+		IsCA:           sm2Cert.IsCA,
+		MaxPathLen:     sm2Cert.MaxPathLen,
+		MaxPathLenZero: sm2Cert.MaxPathLenZero,
 
 		SubjectKeyId:   sm2Cert.SubjectKeyId,
 		AuthorityKeyId: sm2Cert.AuthorityKeyId,

plugin/store/kvmvccmavl/kvmvcc_mavl_test.go

@@ -13,14 +13,15 @@ import (
 
 	"fmt"
 
+	"bytes"
+
 	"github.com/33cn/chain33/account"
 	"github.com/33cn/chain33/common"
+	dbm "github.com/33cn/chain33/common/db"
 	drivers "github.com/33cn/chain33/system/store"
 	"github.com/33cn/chain33/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	dbm "github.com/33cn/chain33/common/db"
-	"bytes"
 )
 
 const MaxKeylenth int = 64
@@ -541,7 +542,6 @@ func TestDelMavlData(t *testing.T) {
 	require.NoError(t, err)
 }
 
-
 func TestPruning(t *testing.T) {
 	dir, err := ioutil.TempDir("", "example")
 	assert.Nil(t, err)
@@ -551,7 +551,6 @@ func TestPruning(t *testing.T) {
 	store := New(storeCfg, nil).(*KVmMavlStore)
 	assert.NotNil(t, store)
 
-
 	kvmvccStore := NewKVMVCC(&subKVMVCCConfig{}, store.GetDB())
 
 	SetPruneHeight(10)
@@ -596,10 +595,10 @@ func TestPruning(t *testing.T) {
 	//check
 	getDatas := &types.StoreGet{
 		StateHash: drivers.EmptyRoot[:],
-		Keys: keys,
+		Keys:      keys,
 	}
 
-	for i := 0; i < len(hashes); i++  {
+	for i := 0; i < len(hashes); i++ {
 		getDatas.StateHash = hashes[i]
 		values := store.Get(getDatas)
 		value = fmt.Sprintf("vv%d", i)

plugin/store/kvmvccmavl/kvmvccdb.go

@@ -5,23 +5,24 @@
 package kvmvccmavl
 
 import (
+	"bytes"
+	"fmt"
+	"strconv"
+	"sync/atomic"
+
 	"github.com/33cn/chain33/common"
 	dbm "github.com/33cn/chain33/common/db"
 	"github.com/33cn/chain33/queue"
 	"github.com/33cn/chain33/types"
 	"github.com/golang/protobuf/proto"
-	"sync/atomic"
-	"fmt"
-	"strconv"
-	"bytes"
 )
 
 const (
-	pruningStateStart      = 1
-	pruningStateEnd        = 0
-	onceScanCount          = 10000 // 单次扫描数目
-	onceCount              = 1000  // 容器长度
-	LevelPruningHeight     = 100 * 10000
+	pruningStateStart  = 1
+	pruningStateEnd    = 0
+	onceScanCount      = 10000 // 单次扫描数目
+	onceCount          = 1000  // 容器长度
+	levelPruningHeight = 100 * 10000
 )
 
 var (
@@ -29,28 +30,28 @@ var (
 	// 是否开启裁剪
 	enablePrune bool
 	// 每个10000裁剪一次
-	pruneHeight    = 10000
-	pruningState     int32
+	pruneHeight  = 10000
+	pruningState int32
 )
 
 var (
 	//同common/db中的mvcc相关的定义保持一致
 	mvccPrefix = []byte(".-mvcc-.")
-    mvccMeta = append(mvccPrefix, []byte("m.")...)
-    mvccData = append(mvccPrefix, []byte("d.")...)
-    mvccLast = append(mvccPrefix, []byte("l.")...)
-    mvccMetaVersion = append(mvccMeta, []byte("version.")...)
-    mvccMetaVersionKeyList = append(mvccMeta, []byte("versionkl.")...)
+	//mvccMeta               = append(mvccPrefix, []byte("m.")...)
+	mvccData = append(mvccPrefix, []byte("d.")...)
+	//mvccLast               = append(mvccPrefix, []byte("l.")...)
+	//mvccMetaVersion        = append(mvccMeta, []byte("version.")...)
+	//mvccMetaVersionKeyList = append(mvccMeta, []byte("versionkl.")...)
 )
 
 // 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
+	db              dbm.DB
+	mvcc            dbm.MVCC
+	kvsetmap        map[string][]*types.KeyValue
+	enableMVCCIter  bool
+	enableMavlPrune bool
+	pruneHeight     int32
 }
 
 // NewKVMVCC construct KVMVCCStore module
@@ -62,10 +63,10 @@ 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}
+			true, sub.EnableMavlPrune, sub.PruneHeight}
 	} else {
 		kvs = &KVMVCCStore{db, dbm.NewMVCC(db), make(map[string][]*types.KeyValue),
-		false, sub.EnableMavlPrune, sub.PruneHeight}
+			false, sub.EnableMavlPrune, sub.PruneHeight}
 	}
 	EnablePrune(sub.EnableMavlPrune)
 	SetPruneHeight(int(sub.PruneHeight))
@@ -280,8 +281,8 @@ func calcHash(datas proto.Message) []byte {
 	return common.Sha256(b)
 }
 
+/*裁剪-------------------------------------------*/
 
-//裁剪-------------------------------------------
 // EnablePrune 使能裁剪
 func EnablePrune(enable bool) {
 	enablePrune = enable
@@ -324,10 +325,10 @@ func pruningFirst(db dbm.DB, curHeight int64) {
 			continue
 		}
 
-		if curHeight < int64(height) + LevelPruningHeight &&
-			curHeight >= int64(height) + int64(pruneHeight) {
-				mp[string(key)] = append(mp[string(key)], height)
-				count++
+		if curHeight < int64(height)+levelPruningHeight &&
+			curHeight >= int64(height)+int64(pruneHeight) {
+			mp[string(key)] = append(mp[string(key)], height)
+			count++
 		}
 		if len(mp) >= onceCount-1 || count > onceScanCount {
 			deleteOldKV(mp, curHeight, batch)
@@ -349,8 +350,8 @@ func deleteOldKV(mp map[string][]int64, curHeight int64, batch dbm.Batch) {
 	batch.Reset()
 	for key, vals := range mp {
 		if len(vals) > 1 && vals[1] != vals[0] { //防止相同高度时候出现的误删除
-			for _, val := range vals[1:] {       //从第二个开始判断
-				if curHeight >= val + int64(pruneHeight) {
+			for _, val := range vals[1:] { //从第二个开始判断
+				if curHeight >= val+int64(pruneHeight) {
 					batch.Delete(genKeyVersion([]byte(key), val)) // 删除老版本key
 					if batch.ValueSize() > batchDataSize {
 						batch.Write()
@@ -376,7 +377,7 @@ func getKeyVersion(vsnKey []byte) ([]byte, int64, error) {
 	if !bytes.Contains(vsnKey, mvccData) {
 		return nil, 0, types.ErrSize
 	}
-	if len(vsnKey) < len(mvccData) + 1 + 20  {
+	if len(vsnKey) < len(mvccData)+1+20 {
 		return nil, 0, types.ErrSize
 	}
 	sLen := vsnKey[len(vsnKey)-20:]
@@ -400,4 +401,4 @@ func isPruning() bool {
 
 func setPruning(state int32) {
 	atomic.StoreInt32(&pruningState, state)
-}
+}
\ No newline at end of file