Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
plugin
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
link33
plugin
Commits
66826aa4
Commit
66826aa4
authored
Jan 23, 2019
by
liuyuhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add test
parent
db64ffcb
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
35 deletions
+14
-35
kvmvccMavl.go
plugin/store/kvmvccMavl/kvmvccMavl.go
+12
-31
kvmvccdb.go
plugin/store/kvmvccMavl/kvmvccdb.go
+2
-4
kvmvccdb_test.go
plugin/store/kvmvccMavl/kvmvccdb_test.go
+0
-0
mavl_test.go
plugin/store/kvmvccMavl/mavl_test.go
+0
-0
No files found.
plugin/store/kvmvccMavl/kvmvccMavl.go
View file @
66826aa4
...
...
@@ -10,10 +10,7 @@ import (
"github.com/33cn/chain33/queue"
drivers
"github.com/33cn/chain33/system/store"
"github.com/33cn/chain33/types"
"github.com/33cn/chain33/system/store/mavl"
"github.com/33cn/plugin/plugin/store/kvmvcc"
"github.com/hashicorp/golang-lru"
"encoding/json"
"errors"
)
...
...
@@ -41,8 +38,8 @@ func init() {
// KVMVCCMavlStore provide kvmvcc and mavl store interface implementation
type
KVMVCCMavlStore
struct
{
*
drivers
.
BaseStore
*
kvmvccdb
.
KVMVCCStore
*
mavl
.
Store
*
KVMVCCStore
*
Mavl
Store
cance
*
lru
.
Cache
}
...
...
@@ -81,29 +78,13 @@ func New(cfg *types.Store, sub []byte) queue.Module {
subMavlcfg
.
EnableMavlPrune
=
subcfg
.
EnableMavlPrune
subMavlcfg
.
PruneHeight
=
subcfg
.
PruneHeight
}
mvcVal
,
_
:=
json
.
Marshal
(
&
subKVMVCCcfg
)
mavlVal
,
_
:=
json
.
Marshal
(
&
subMavlcfg
)
cance
,
err
:=
lru
.
New
(
1024
)
if
err
!=
nil
{
panic
(
"new KVMVCCMavlStore fail"
)
}
mvccCfg
:=
&
types
.
Store
{}
mvccCfg
.
Name
=
"kvmvcc"
mvccCfg
.
Driver
=
cfg
.
Driver
mvccCfg
.
DbPath
=
cfg
.
DbPath
+
"/kvmvcc"
mvccCfg
.
DbCache
=
cfg
.
DbCache
mvccCfg
.
LocalDBVersion
=
cfg
.
LocalDBVersion
mavlCfg
:=
&
types
.
Store
{}
mavlCfg
.
Name
=
"mavl"
mavlCfg
.
Driver
=
cfg
.
Driver
mavlCfg
.
DbPath
=
cfg
.
DbPath
+
"/mavl"
mavlCfg
.
DbCache
=
cfg
.
DbCache
mavlCfg
.
LocalDBVersion
=
cfg
.
LocalDBVersion
kvms
=
&
KVMVCCMavlStore
{
bs
,
kvmvccdb
.
New
(
mvccCfg
,
mvcVal
)
.
(
*
kvmvccdb
.
KVMVCCStore
),
mavl
.
New
(
mavlCfg
,
mavlVal
)
.
(
*
mavl
.
Store
),
cance
}
kvms
=
&
KVMVCCMavlStore
{
bs
,
NewKVMVCC
(
cfg
,
&
subKVMVCCcfg
,
bs
.
GetDB
()),
NewMavl
(
cfg
,
&
subMavlcfg
,
bs
.
GetDB
()),
cance
}
bs
.
SetChild
(
kvms
)
return
kvms
}
...
...
@@ -112,7 +93,7 @@ func New(cfg *types.Store, sub []byte) queue.Module {
func
(
kvmMavls
*
KVMVCCMavlStore
)
Close
()
{
kvmMavls
.
BaseStore
.
Close
()
kvmMavls
.
KVMVCCStore
.
Close
()
kvmMavls
.
Store
.
Close
()
kvmMavls
.
Mavl
Store
.
Close
()
kmlog
.
Info
(
"store kvdb closed"
)
}
...
...
@@ -120,7 +101,7 @@ func (kvmMavls *KVMVCCMavlStore) Close() {
func
(
kvmMavls
*
KVMVCCMavlStore
)
Set
(
datas
*
types
.
StoreSet
,
sync
bool
)
([]
byte
,
error
)
{
// 这里后续需要考虑分叉回退
if
datas
.
Height
<
kvmvccMavlFork
{
hash
,
err
:=
kvmMavls
.
Store
.
Set
(
datas
,
sync
)
hash
,
err
:=
kvmMavls
.
Mavl
Store
.
Set
(
datas
,
sync
)
if
err
!=
nil
{
return
hash
,
err
}
...
...
@@ -145,7 +126,7 @@ func (kvmMavls *KVMVCCMavlStore) Set(datas *types.StoreSet, sync bool) ([]byte,
func
(
kvmMavls
*
KVMVCCMavlStore
)
Get
(
datas
*
types
.
StoreGet
)
[][]
byte
{
if
value
,
ok
:=
kvmMavls
.
cance
.
Get
(
string
(
datas
.
StateHash
));
ok
{
if
value
.
(
int64
)
<
kvmvccMavlFork
{
return
kvmMavls
.
Store
.
Get
(
datas
)
return
kvmMavls
.
Mavl
Store
.
Get
(
datas
)
}
return
kvmMavls
.
KVMVCCStore
.
Get
(
datas
)
}
...
...
@@ -156,7 +137,7 @@ func (kvmMavls *KVMVCCMavlStore) Get(datas *types.StoreGet) [][]byte {
func
(
kvmMavls
*
KVMVCCMavlStore
)
MemSet
(
datas
*
types
.
StoreSet
,
sync
bool
)
([]
byte
,
error
)
{
// 这里后续需要考虑分叉回退
if
datas
.
Height
<
kvmvccMavlFork
{
hash
,
err
:=
kvmMavls
.
Store
.
MemSet
(
datas
,
sync
)
hash
,
err
:=
kvmMavls
.
Mavl
Store
.
MemSet
(
datas
,
sync
)
if
err
!=
nil
{
return
hash
,
err
}
...
...
@@ -181,7 +162,7 @@ func (kvmMavls *KVMVCCMavlStore) MemSet(datas *types.StoreSet, sync bool) ([]byt
func
(
kvmMavls
*
KVMVCCMavlStore
)
Commit
(
req
*
types
.
ReqHash
)
([]
byte
,
error
)
{
if
value
,
ok
:=
kvmMavls
.
cance
.
Get
(
string
(
req
.
Hash
));
ok
{
if
value
.
(
int64
)
<
kvmvccMavlFork
{
hash
,
err
:=
kvmMavls
.
Store
.
Commit
(
req
)
hash
,
err
:=
kvmMavls
.
Mavl
Store
.
Commit
(
req
)
if
err
!=
nil
{
return
hash
,
err
}
...
...
@@ -200,7 +181,7 @@ func (kvmMavls *KVMVCCMavlStore) Commit(req *types.ReqHash) ([]byte, error) {
func
(
kvmMavls
*
KVMVCCMavlStore
)
Rollback
(
req
*
types
.
ReqHash
)
([]
byte
,
error
)
{
if
value
,
ok
:=
kvmMavls
.
cance
.
Get
(
string
(
req
.
Hash
));
ok
{
if
value
.
(
int64
)
<
kvmvccMavlFork
{
hash
,
err
:=
kvmMavls
.
Store
.
Rollback
(
req
)
hash
,
err
:=
kvmMavls
.
Mavl
Store
.
Rollback
(
req
)
if
err
!=
nil
{
return
hash
,
err
}
...
...
@@ -219,7 +200,7 @@ func (kvmMavls *KVMVCCMavlStore) Rollback(req *types.ReqHash) ([]byte, error) {
func
(
kvmMavls
*
KVMVCCMavlStore
)
IterateRangeByStateHash
(
statehash
[]
byte
,
start
[]
byte
,
end
[]
byte
,
ascending
bool
,
fn
func
(
key
,
value
[]
byte
)
bool
)
{
if
value
,
ok
:=
kvmMavls
.
cance
.
Get
(
string
(
statehash
));
ok
{
if
value
.
(
int64
)
<
kvmvccMavlFork
{
kvmMavls
.
Store
.
IterateRangeByStateHash
(
statehash
,
start
,
end
,
ascending
,
fn
)
kvmMavls
.
Mavl
Store
.
IterateRangeByStateHash
(
statehash
,
start
,
end
,
ascending
,
fn
)
}
kvmMavls
.
KVMVCCStore
.
IterateRangeByStateHash
(
statehash
,
start
,
end
,
ascending
,
fn
)
}
...
...
@@ -235,7 +216,7 @@ func (kvmMavls *KVMVCCMavlStore) ProcEvent(msg queue.Message) {
func
(
kvmMavls
*
KVMVCCMavlStore
)
Del
(
req
*
types
.
StoreDel
)
([]
byte
,
error
)
{
// 这里后续需要考虑分叉回退
if
req
.
Height
<
kvmvccMavlFork
{
hash
,
err
:=
kvmMavls
.
Store
.
Del
(
req
)
hash
,
err
:=
kvmMavls
.
Mavl
Store
.
Del
(
req
)
if
err
!=
nil
{
return
hash
,
err
}
...
...
plugin/store/kvmvccMavl/kvmvccdb.go
View file @
66826aa4
...
...
@@ -8,7 +8,6 @@ import (
"github.com/33cn/chain33/common"
dbm
"github.com/33cn/chain33/common/db"
"github.com/33cn/chain33/queue"
drivers
"github.com/33cn/chain33/system/store"
"github.com/33cn/chain33/types"
"github.com/golang/protobuf/proto"
)
...
...
@@ -28,16 +27,15 @@ type KVMVCCStore struct {
// NewKVMVCC construct KVMVCCStore module
func
NewKVMVCC
(
cfg
*
types
.
Store
,
sub
*
subKVMVCCConfig
,
db
dbm
.
DB
)
*
KVMVCCStore
{
bs
:=
drivers
.
NewBaseStore
(
cfg
)
var
kvs
*
KVMVCCStore
enable
:=
false
if
sub
!=
nil
{
enable
=
sub
.
EnableMVCCIter
}
if
enable
{
kvs
=
&
KVMVCCStore
{
db
,
dbm
.
NewMVCCIter
(
bs
.
GetDB
()
),
make
(
map
[
string
][]
*
types
.
KeyValue
),
true
}
kvs
=
&
KVMVCCStore
{
db
,
dbm
.
NewMVCCIter
(
db
),
make
(
map
[
string
][]
*
types
.
KeyValue
),
true
}
}
else
{
kvs
=
&
KVMVCCStore
{
db
,
dbm
.
NewMVCC
(
bs
.
GetDB
()
),
make
(
map
[
string
][]
*
types
.
KeyValue
),
false
}
kvs
=
&
KVMVCCStore
{
db
,
dbm
.
NewMVCC
(
db
),
make
(
map
[
string
][]
*
types
.
KeyValue
),
false
}
}
return
kvs
}
...
...
plugin/store/kvmvccMavl/kvmvccdb_test.go
deleted
100644 → 0
View file @
db64ffcb
This diff is collapsed.
Click to expand it.
plugin/store/kvmvccMavl/mavl_test.go
deleted
100644 → 0
View file @
db64ffcb
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment