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
faed2bcc
Commit
faed2bcc
authored
Apr 12, 2019
by
liuyuhang
Committed by
vipwzw
Apr 19, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add resease global memTree when reach a height
parent
4bbd8262
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
50 additions
and
36 deletions
+50
-36
kvmvcc_mavl.go
plugin/store/kvmvccmavl/kvmvcc_mavl.go
+3
-0
tree.go
vendor/github.com/33cn/chain33/system/store/mavl/db/tree.go
+47
-36
No files found.
plugin/store/kvmvccmavl/kvmvcc_mavl.go
View file @
faed2bcc
...
...
@@ -21,6 +21,7 @@ import (
drivers
"github.com/33cn/chain33/system/store"
"github.com/33cn/chain33/types"
"github.com/hashicorp/golang-lru"
"github.com/33cn/chain33/system/store/mavl/db"
)
var
(
...
...
@@ -197,6 +198,8 @@ func (kvmMavls *KVmMavlStore) MemSet(datas *types.StoreSet, sync bool) ([]byte,
}
// 删除Mavl数据
if
datas
.
Height
>
delMavlDataHeight
&&
!
isDelMavlData
&&
!
isDelMavling
()
{
// 达到该高度时候,将全局的memTree以及tkCloseCache释放掉
mavl
.
ReleaseGlobalMem
()
wg
.
Add
(
1
)
go
DelMavl
(
kvmMavls
.
GetDB
())
}
...
...
vendor/github.com/33cn/chain33/system/store/mavl/db/tree.go
View file @
faed2bcc
...
...
@@ -66,6 +66,15 @@ func EnableMemVal(enable bool) {
enableMemVal
=
enable
}
func
ReleaseGlobalMem
()
{
if
memTree
!=
nil
{
memTree
=
nil
}
if
tkCloseCache
!=
nil
{
tkCloseCache
=
nil
}
}
type
memNode
struct
{
data
[][]
byte
//顺序为lefthash, righthash, key, value
Height
int32
...
...
@@ -542,43 +551,45 @@ func (ndb *nodeDB) SaveNode(t *Tree, node *Node) {
}
func
getNodeMemTree
(
hash
[]
byte
)
(
*
Node
,
error
)
{
if
memTree
==
nil
&&
tkCloseCache
==
nil
{
return
nil
,
ErrNodeNotExist
if
memTree
!=
nil
{
elem
,
ok
:=
memTree
.
Get
(
uintkey
(
farm
.
Hash64
(
hash
)))
if
ok
{
sn
:=
elem
.
(
*
memNode
)
node
:=
&
Node
{
height
:
sn
.
Height
,
size
:
sn
.
Size
,
hash
:
hash
,
persisted
:
true
,
}
node
.
leftHash
=
sn
.
data
[
0
]
node
.
rightHash
=
sn
.
data
[
1
]
node
.
key
=
sn
.
data
[
2
]
if
len
(
sn
.
data
)
==
4
{
node
.
value
=
sn
.
data
[
3
]
}
return
node
,
nil
}
}
elem
,
ok
:=
memTree
.
Get
(
uintkey
(
farm
.
Hash64
(
hash
)))
if
ok
{
sn
:=
elem
.
(
*
memNode
)
node
:=
&
Node
{
height
:
sn
.
Height
,
size
:
sn
.
Size
,
hash
:
hash
,
persisted
:
true
,
}
node
.
leftHash
=
sn
.
data
[
0
]
node
.
rightHash
=
sn
.
data
[
1
]
node
.
key
=
sn
.
data
[
2
]
if
len
(
sn
.
data
)
==
4
{
node
.
value
=
sn
.
data
[
3
]
}
return
node
,
nil
}
// 从tkCloseCache缓存中获取
elem
,
ok
=
tkCloseCache
.
Get
(
uintkey
(
farm
.
Hash64
(
hash
)))
if
ok
{
sn
:=
elem
.
(
*
memNode
)
node
:=
&
Node
{
height
:
sn
.
Height
,
size
:
sn
.
Size
,
hash
:
hash
,
persisted
:
true
,
}
node
.
leftHash
=
sn
.
data
[
0
]
node
.
rightHash
=
sn
.
data
[
1
]
node
.
key
=
sn
.
data
[
2
]
if
len
(
sn
.
data
)
==
4
{
node
.
value
=
sn
.
data
[
3
]
}
return
node
,
nil
if
tkCloseCache
!=
nil
{
// 从tkCloseCache缓存中获取
elem
,
ok
:=
tkCloseCache
.
Get
(
uintkey
(
farm
.
Hash64
(
hash
)))
if
ok
{
sn
:=
elem
.
(
*
memNode
)
node
:=
&
Node
{
height
:
sn
.
Height
,
size
:
sn
.
Size
,
hash
:
hash
,
persisted
:
true
,
}
node
.
leftHash
=
sn
.
data
[
0
]
node
.
rightHash
=
sn
.
data
[
1
]
node
.
key
=
sn
.
data
[
2
]
if
len
(
sn
.
data
)
==
4
{
node
.
value
=
sn
.
data
[
3
]
}
return
node
,
nil
}
}
return
nil
,
ErrNodeNotExist
}
...
...
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