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
9f5828d8
Commit
9f5828d8
authored
Jun 25, 2019
by
liuyuhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modify mult del mavl method
parent
314762f8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
50 additions
and
46 deletions
+50
-46
kvmvcc_mavl.go
plugin/store/kvmvccmavl/kvmvcc_mavl.go
+38
-41
kvmvcc_mavl_test.go
plugin/store/kvmvccmavl/kvmvcc_mavl_test.go
+12
-5
No files found.
plugin/store/kvmvccmavl/kvmvcc_mavl.go
View file @
9f5828d8
...
...
@@ -356,39 +356,49 @@ func DelMavl(db dbm.DB) {
defer
wg
.
Done
()
setDelMavl
(
delMavlStateStart
)
defer
setDelMavl
(
delMavlStateEnd
)
isDel
:=
delMavlData
(
db
)
if
isDel
{
isDelMavlData
=
true
kmlog
.
Info
(
"DelMavl success"
)
prefix
:=
""
loop
:=
false
for
{
kmlog
.
Debug
(
"start once del mavl"
)
loop
,
prefix
=
delMavlData
(
db
,
prefix
)
if
!
loop
{
break
}
kmlog
.
Debug
(
"end once del mavl"
)
time
.
Sleep
(
time
.
Second
*
1
)
}
}
func
delMavlData
(
db
dbm
.
DB
)
bool
{
it
:=
db
.
Iterator
(
nil
,
nil
,
tru
e
)
func
delMavlData
(
db
dbm
.
DB
,
prefix
string
)
(
bool
,
string
)
{
it
:=
db
.
Iterator
(
[]
byte
(
prefix
),
types
.
EmptyValue
,
fals
e
)
defer
it
.
Close
()
batch
:=
db
.
NewBatch
(
tru
e
)
batch
:=
db
.
NewBatch
(
fals
e
)
count
:=
0
const
onceCount
=
20
0
const
onceCount
=
5
0
for
it
.
Rewind
();
it
.
Valid
();
it
.
Next
()
{
if
quit
{
return
false
return
false
,
""
}
if
!
bytes
.
HasPrefix
(
it
.
Key
(),
mvccPrefix
)
{
// 将非mvcc的mavl数据全部删除
batch
.
Delete
(
it
.
Key
())
if
batch
.
ValueSize
()
>
batchDataSize
{
dbm
.
MustWrite
(
batch
)
batch
.
Reset
()
time
.
Sleep
(
time
.
Millisecond
*
100
)
count
++
}
}
if
count
>
onceCount
{
return
false
if
it
.
Next
()
{
return
true
,
string
(
it
.
Key
())
}
return
true
,
""
}
}
batch
.
Set
(
genDelMavlKey
(
mvccPrefix
),
[]
byte
(
""
))
dbm
.
MustWrite
(
batch
)
return
true
isDelMavlData
=
true
kmlog
.
Info
(
"DelMavl success"
)
return
false
,
""
}
func
genDelMavlKey
(
prefix
[]
byte
)
[]
byte
{
...
...
@@ -429,35 +439,23 @@ func deletePrunedMavl(db dbm.DB) {
defer
wg
.
Done
()
setDelPrunedMavl
(
delPrunedMavlStarting
)
defer
setDelPrunedMavl
(
delPruneMavlEnd
)
for
{
loop
:=
deletePrunedMavlData
(
db
,
hashNodePrefix
)
if
!
loop
{
break
}
}
for
{
loop
:=
deletePrunedMavlData
(
db
,
leafNodePrefix
)
if
!
loop
{
break
}
}
for
{
loop
:=
deletePrunedMavlData
(
db
,
leafKeyCountPrefix
)
if
!
loop
{
break
}
}
for
{
loop
:=
deletePrunedMavlData
(
db
,
oldLeafKeyCountPrefix
)
if
!
loop
{
break
prefixS
:=
[]
string
{
hashNodePrefix
,
leafNodePrefix
,
leafKeyCountPrefix
,
oldLeafKeyCountPrefix
}
for
_
,
str
:=
range
prefixS
{
for
{
stat
:=
deletePrunedMavlData
(
db
,
str
)
if
stat
==
0
{
return
}
else
if
stat
==
1
{
break
}
else
{
time
.
Sleep
(
time
.
Millisecond
*
100
)
}
}
}
}
func
deletePrunedMavlData
(
db
dbm
.
DB
,
prefix
string
)
(
loop
bool
)
{
it
:=
db
.
Iterator
([]
byte
(
prefix
),
nil
,
tru
e
)
func
deletePrunedMavlData
(
db
dbm
.
DB
,
prefix
string
)
(
status
int
)
{
it
:=
db
.
Iterator
([]
byte
(
prefix
),
nil
,
fals
e
)
defer
it
.
Close
()
count
:=
0
const
onceCount
=
200
...
...
@@ -465,20 +463,19 @@ func deletePrunedMavlData(db dbm.DB, prefix string) (loop bool) {
batch
:=
db
.
NewBatch
(
false
)
for
it
.
Next
();
it
.
Valid
();
it
.
Next
()
{
//第一个不做删除
if
quit
{
return
false
return
0
// quit
}
batch
.
Delete
(
it
.
Key
())
if
batch
.
ValueSize
()
>
batchDataSize
{
dbm
.
MustWrite
(
batch
)
batch
.
Reset
()
time
.
Sleep
(
time
.
Millisecond
*
100
)
count
++
}
if
count
>
onceCount
{
return
true
return
2
//loop
}
}
dbm
.
MustWrite
(
batch
)
}
return
false
return
1
// this prefix Iterator over
}
plugin/store/kvmvccmavl/kvmvcc_mavl_test.go
View file @
9f5828d8
...
...
@@ -573,7 +573,14 @@ func TestDelMavlData(t *testing.T) {
db
.
Set
([]
byte
(
"key22"
),
[]
byte
(
"value22"
))
quit
=
false
delMavlData
(
db
)
prefix
:=
""
loop
:=
false
for
{
loop
,
prefix
=
delMavlData
(
db
,
prefix
)
if
!
loop
{
break
}
}
v
,
err
:=
db
.
Get
([]
byte
(
mvccPrefix
))
require
.
NoError
(
t
,
err
)
...
...
@@ -748,15 +755,15 @@ func TestDeletePrunedMavl(t *testing.T) {
require
.
Equal
(
t
,
v1
,
[]
byte
(
"v1"
))
//测试再加入一条数据,即两条时候
store
.
GetDB
()
.
Set
([]
byte
(
fmt
.
Sprintln
(
hashNodePrefix
,
"
456"
)),
[]
byte
(
"v2
"
))
store
.
GetDB
()
.
Set
([]
byte
(
fmt
.
Sprintln
(
hashNodePrefix
,
"
123"
)),
[]
byte
(
"v1
"
))
deletePrunedMavlData
(
store
.
GetDB
(),
hashNodePrefix
)
v1
,
err
=
store
.
GetDB
()
.
Get
([]
byte
(
fmt
.
Sprintln
(
hashNodePrefix
,
"
123
"
)))
v1
,
err
=
store
.
GetDB
()
.
Get
([]
byte
(
fmt
.
Sprintln
(
hashNodePrefix
,
"
456
"
)))
require
.
Error
(
t
,
err
)
require
.
Equal
(
t
,
v1
,
[]
uint8
([]
byte
(
nil
)))
v2
,
err
:=
store
.
GetDB
()
.
Get
([]
byte
(
fmt
.
Sprintln
(
hashNodePrefix
,
"
456
"
)))
v2
,
err
:=
store
.
GetDB
()
.
Get
([]
byte
(
fmt
.
Sprintln
(
hashNodePrefix
,
"
123
"
)))
require
.
NoError
(
t
,
err
)
require
.
Equal
(
t
,
v2
,
[]
byte
(
"v
2
"
))
require
.
Equal
(
t
,
v2
,
[]
byte
(
"v
1
"
))
wg
.
Add
(
1
)
go
deletePrunedMavl
(
store
.
GetDB
())
...
...
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