Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
neoppod
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Levin Zimmermann
neoppod
Commits
a7b82699
Commit
a7b82699
authored
Oct 04, 2021
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
c5a0b724
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
138 additions
and
67 deletions
+138
-67
go/zodb/btree/btree.go.in
go/zodb/btree/btree.go.in
+44
-21
go/zodb/btree/btree_test.go
go/zodb/btree/btree_test.go
+2
-4
go/zodb/btree/testdata/gen-testdata
go/zodb/btree/testdata/gen-testdata
+2
-0
go/zodb/btree/ziobtree.go
go/zodb/btree/ziobtree.go
+44
-21
go/zodb/btree/zlobtree.go
go/zodb/btree/zlobtree.go
+44
-21
go/zodb/btree/ztestdata_expect_test.go
go/zodb/btree/ztestdata_expect_test.go
+2
-0
No files found.
go/zodb/btree/btree.go.in
View file @
a7b82699
...
...
@@ -138,7 +138,7 @@ func (e *BucketEntry) Key() KEY { return e.key }
func (e *BucketEntry) Value() interface{} { return e.value }
// Entryv returns entries of a Bucket node.
func (b *Bucket) Entryv() []BucketEntry {
func (b *Bucket) Entryv()
/*readonly*/
[]BucketEntry {
ev := make([]BucketEntry, len(b.keys))
for i, k := range b.keys {
ev[i] = BucketEntry{k, b.values[i]}
...
...
@@ -272,26 +272,40 @@ func (t *BTree) MinKey(ctx context.Context) (_ KEY, ok bool, err error) {
// VMinKey is like MinKey but also calls visit while traversing the tree.
//
// Visit is called with node being activated.
func (t *BTree) VMinKey(ctx context.Context, visit func(node Node)) (_ KEY, ok bool, err error) {
func (t *BTree) VMinKey(ctx context.Context, visit func(node Node
, keycov KeyRange
)) (_ KEY, ok bool, err error) {
defer xerr.Contextf(&err, "btree(%s): minkey", t.POid())
err = t.PActivate(ctx)
if err != nil {
return 0, false, err
}
keycov := KeyRange{Lo: _KeyMin, Hi_: _KeyMax}
if visit != nil {
visit(t)
}
if len(t.data) == 0 {
// empty btree
t.PDeactivate()
return 0, false, nil
visit(t, keycov)
}
// NOTE -> can also use t.firstbucket
for {
l := len(t.data)
if l == 0 {
// empty btree (top, or in leaf)
t.PDeactivate()
return 0, false, nil
}
child := t.data[0].child
// shorten global keycov by local hi) for this child
hi_ := _KeyMax
if 1 < l {
hi_ = t.data[1].key
}
if hi_ != _KeyMax {
hi_--
}
// keycov.Lo stays -∞
keycov.Hi_ = kmin(keycov.Hi_, hi_)
t.PDeactivate()
err = child.PActivate(ctx)
if err != nil {
...
...
@@ -299,7 +313,7 @@ func (t *BTree) VMinKey(ctx context.Context, visit func(node Node)) (_ KEY, ok b
}
if visit != nil {
visit(child)
visit(child
, keycov
)
}
// XXX verify child keys are in valid range according to parent
...
...
@@ -327,27 +341,36 @@ func (t *BTree) MaxKey(ctx context.Context) (_ KEY, _ bool, err error) {
// VMaxKey is like MaxKey but also calls visit while traversing the tree.
//
// Visit is called with node being activated.
func (t *BTree) VMaxKey(ctx context.Context, visit func(node Node)) (_ KEY, _ bool, err error) {
func (t *BTree) VMaxKey(ctx context.Context, visit func(node Node
, keycov KeyRange
)) (_ KEY, _ bool, err error) {
defer xerr.Contextf(&err, "btree(%s): maxkey", t.POid())
err = t.PActivate(ctx)
if err != nil {
return 0, false, err
}
keycov := KeyRange{Lo: _KeyMin, Hi_: _KeyMax}
if visit != nil {
visit(t)
}
l := len(t.data)
if l == 0 {
// empty btree
t.PDeactivate()
return 0, false, nil
visit(t, keycov)
}
for {
// FIXME need to refresh l
l := len(t.data)
if l == 0 {
// empty btree (top, or in leaf)
t.PDeactivate()
return 0, false, nil
}
child := t.data[l-1].child
// shorten global keycov by local [lo for this chile
lo := _KeyMin
if l-1 > 0 {
lo = t.data[l-1].key
}
keycov.Lo = kmax(keycov.Lo, lo)
// keycov.Hi_ stays ∞
t.PDeactivate()
err = child.PActivate(ctx)
if err != nil {
...
...
@@ -355,7 +378,7 @@ func (t *BTree) VMaxKey(ctx context.Context, visit func(node Node)) (_ KEY, _ bo
}
if visit != nil {
visit(child)
visit(child
, keycov
)
}
// XXX verify child keys are in valid range according to parent
...
...
go/zodb/btree/btree_test.go
View file @
a7b82699
...
...
@@ -289,9 +289,8 @@ func TestBTree(t *testing.T) {
}
}
/* XXX reenable
visitMinOK := Bvdict[kmin]
visitMaxOK := Bvdict[kmax]
visitMinOK
:=
Bvdict
[
Bv_kmin
]
visitMaxOK
:=
Bvdict
[
Bv_kmax
]
visitMin
:=
[]
tVisit
{}
visitMax
:=
[]
tVisit
{}
_
,
_
,
err
=
Bv
.
VMinKey
(
ctx
,
func
(
node
LONode
,
keycov
LKeyRange
)
{
...
...
@@ -307,5 +306,4 @@ func TestBTree(t *testing.T) {
if
!
reflect
.
DeepEqual
(
visitMax
,
visitMaxOK
)
{
t
.
Errorf
(
"VMaxKey(): visit:
\n
have: %v
\n
want: %v"
,
visitMax
,
visitMaxOK
)
}
*/
}
go/zodb/btree/testdata/gen-testdata
View file @
a7b82699
...
...
@@ -108,6 +108,8 @@ def main2():
emit
(
"const B3_maxkey = %d"
%
B3
.
maxKey
())
emit
(
"
\
n
const Bv_oid = %s"
%
u64
(
Bv
.
_p_oid
))
emit
(
"const Bv_kmin = %d"
%
Bv
.
minKey
())
emit
(
"const Bv_kmax = %d"
%
Bv
.
maxKey
())
emit
(
"var Bvdict = map[int64][]tVisit{"
)
noo
=
"_LKeyMin"
oo
=
"_LKeyMax"
...
...
go/zodb/btree/ziobtree.go
View file @
a7b82699
...
...
@@ -140,7 +140,7 @@ func (e *IOBucketEntry) Key() int32 { return e.key }
func
(
e
*
IOBucketEntry
)
Value
()
interface
{}
{
return
e
.
value
}
// Entryv returns entries of a IOBucket node.
func
(
b
*
IOBucket
)
Entryv
()
[]
IOBucketEntry
{
func
(
b
*
IOBucket
)
Entryv
()
/*readonly*/
[]
IOBucketEntry
{
ev
:=
make
([]
IOBucketEntry
,
len
(
b
.
keys
))
for
i
,
k
:=
range
b
.
keys
{
ev
[
i
]
=
IOBucketEntry
{
k
,
b
.
values
[
i
]}
...
...
@@ -274,26 +274,40 @@ func (t *IOBTree) MinKey(ctx context.Context) (_ int32, ok bool, err error) {
// VMinKey is like MinKey but also calls visit while traversing the tree.
//
// Visit is called with node being activated.
func
(
t
*
IOBTree
)
VMinKey
(
ctx
context
.
Context
,
visit
func
(
node
IONode
))
(
_
int32
,
ok
bool
,
err
error
)
{
func
(
t
*
IOBTree
)
VMinKey
(
ctx
context
.
Context
,
visit
func
(
node
IONode
,
keycov
IKeyRange
))
(
_
int32
,
ok
bool
,
err
error
)
{
defer
xerr
.
Contextf
(
&
err
,
"btree(%s): minkey"
,
t
.
POid
())
err
=
t
.
PActivate
(
ctx
)
if
err
!=
nil
{
return
0
,
false
,
err
}
keycov
:=
IKeyRange
{
Lo
:
_IKeyMin
,
Hi_
:
_IKeyMax
}
if
visit
!=
nil
{
visit
(
t
)
}
if
len
(
t
.
data
)
==
0
{
// empty btree
t
.
PDeactivate
()
return
0
,
false
,
nil
visit
(
t
,
keycov
)
}
// NOTE -> can also use t.firstbucket
for
{
l
:=
len
(
t
.
data
)
if
l
==
0
{
// empty btree (top, or in leaf)
t
.
PDeactivate
()
return
0
,
false
,
nil
}
child
:=
t
.
data
[
0
]
.
child
// shorten global keycov by local hi) for this child
hi_
:=
_IKeyMax
if
1
<
l
{
hi_
=
t
.
data
[
1
]
.
key
}
if
hi_
!=
_IKeyMax
{
hi_
--
}
// keycov.Lo stays -∞
keycov
.
Hi_
=
ikmin
(
keycov
.
Hi_
,
hi_
)
t
.
PDeactivate
()
err
=
child
.
PActivate
(
ctx
)
if
err
!=
nil
{
...
...
@@ -301,7 +315,7 @@ func (t *IOBTree) VMinKey(ctx context.Context, visit func(node IONode)) (_ int32
}
if
visit
!=
nil
{
visit
(
child
)
visit
(
child
,
keycov
)
}
// XXX verify child keys are in valid range according to parent
...
...
@@ -329,27 +343,36 @@ func (t *IOBTree) MaxKey(ctx context.Context) (_ int32, _ bool, err error) {
// VMaxKey is like MaxKey but also calls visit while traversing the tree.
//
// Visit is called with node being activated.
func
(
t
*
IOBTree
)
VMaxKey
(
ctx
context
.
Context
,
visit
func
(
node
IONode
))
(
_
int32
,
_
bool
,
err
error
)
{
func
(
t
*
IOBTree
)
VMaxKey
(
ctx
context
.
Context
,
visit
func
(
node
IONode
,
keycov
IKeyRange
))
(
_
int32
,
_
bool
,
err
error
)
{
defer
xerr
.
Contextf
(
&
err
,
"btree(%s): maxkey"
,
t
.
POid
())
err
=
t
.
PActivate
(
ctx
)
if
err
!=
nil
{
return
0
,
false
,
err
}
keycov
:=
IKeyRange
{
Lo
:
_IKeyMin
,
Hi_
:
_IKeyMax
}
if
visit
!=
nil
{
visit
(
t
)
}
l
:=
len
(
t
.
data
)
if
l
==
0
{
// empty btree
t
.
PDeactivate
()
return
0
,
false
,
nil
visit
(
t
,
keycov
)
}
for
{
// FIXME need to refresh l
l
:=
len
(
t
.
data
)
if
l
==
0
{
// empty btree (top, or in leaf)
t
.
PDeactivate
()
return
0
,
false
,
nil
}
child
:=
t
.
data
[
l
-
1
]
.
child
// shorten global keycov by local [lo for this chile
lo
:=
_IKeyMin
if
l
-
1
>
0
{
lo
=
t
.
data
[
l
-
1
]
.
key
}
keycov
.
Lo
=
ikmax
(
keycov
.
Lo
,
lo
)
// keycov.Hi_ stays ∞
t
.
PDeactivate
()
err
=
child
.
PActivate
(
ctx
)
if
err
!=
nil
{
...
...
@@ -357,7 +380,7 @@ func (t *IOBTree) VMaxKey(ctx context.Context, visit func(node IONode)) (_ int32
}
if
visit
!=
nil
{
visit
(
child
)
visit
(
child
,
keycov
)
}
// XXX verify child keys are in valid range according to parent
...
...
go/zodb/btree/zlobtree.go
View file @
a7b82699
...
...
@@ -140,7 +140,7 @@ func (e *LOBucketEntry) Key() int64 { return e.key }
func
(
e
*
LOBucketEntry
)
Value
()
interface
{}
{
return
e
.
value
}
// Entryv returns entries of a LOBucket node.
func
(
b
*
LOBucket
)
Entryv
()
[]
LOBucketEntry
{
func
(
b
*
LOBucket
)
Entryv
()
/*readonly*/
[]
LOBucketEntry
{
ev
:=
make
([]
LOBucketEntry
,
len
(
b
.
keys
))
for
i
,
k
:=
range
b
.
keys
{
ev
[
i
]
=
LOBucketEntry
{
k
,
b
.
values
[
i
]}
...
...
@@ -274,26 +274,40 @@ func (t *LOBTree) MinKey(ctx context.Context) (_ int64, ok bool, err error) {
// VMinKey is like MinKey but also calls visit while traversing the tree.
//
// Visit is called with node being activated.
func
(
t
*
LOBTree
)
VMinKey
(
ctx
context
.
Context
,
visit
func
(
node
LONode
))
(
_
int64
,
ok
bool
,
err
error
)
{
func
(
t
*
LOBTree
)
VMinKey
(
ctx
context
.
Context
,
visit
func
(
node
LONode
,
keycov
LKeyRange
))
(
_
int64
,
ok
bool
,
err
error
)
{
defer
xerr
.
Contextf
(
&
err
,
"btree(%s): minkey"
,
t
.
POid
())
err
=
t
.
PActivate
(
ctx
)
if
err
!=
nil
{
return
0
,
false
,
err
}
keycov
:=
LKeyRange
{
Lo
:
_LKeyMin
,
Hi_
:
_LKeyMax
}
if
visit
!=
nil
{
visit
(
t
)
}
if
len
(
t
.
data
)
==
0
{
// empty btree
t
.
PDeactivate
()
return
0
,
false
,
nil
visit
(
t
,
keycov
)
}
// NOTE -> can also use t.firstbucket
for
{
l
:=
len
(
t
.
data
)
if
l
==
0
{
// empty btree (top, or in leaf)
t
.
PDeactivate
()
return
0
,
false
,
nil
}
child
:=
t
.
data
[
0
]
.
child
// shorten global keycov by local hi) for this child
hi_
:=
_LKeyMax
if
1
<
l
{
hi_
=
t
.
data
[
1
]
.
key
}
if
hi_
!=
_LKeyMax
{
hi_
--
}
// keycov.Lo stays -∞
keycov
.
Hi_
=
lkmin
(
keycov
.
Hi_
,
hi_
)
t
.
PDeactivate
()
err
=
child
.
PActivate
(
ctx
)
if
err
!=
nil
{
...
...
@@ -301,7 +315,7 @@ func (t *LOBTree) VMinKey(ctx context.Context, visit func(node LONode)) (_ int64
}
if
visit
!=
nil
{
visit
(
child
)
visit
(
child
,
keycov
)
}
// XXX verify child keys are in valid range according to parent
...
...
@@ -329,27 +343,36 @@ func (t *LOBTree) MaxKey(ctx context.Context) (_ int64, _ bool, err error) {
// VMaxKey is like MaxKey but also calls visit while traversing the tree.
//
// Visit is called with node being activated.
func
(
t
*
LOBTree
)
VMaxKey
(
ctx
context
.
Context
,
visit
func
(
node
LONode
))
(
_
int64
,
_
bool
,
err
error
)
{
func
(
t
*
LOBTree
)
VMaxKey
(
ctx
context
.
Context
,
visit
func
(
node
LONode
,
keycov
LKeyRange
))
(
_
int64
,
_
bool
,
err
error
)
{
defer
xerr
.
Contextf
(
&
err
,
"btree(%s): maxkey"
,
t
.
POid
())
err
=
t
.
PActivate
(
ctx
)
if
err
!=
nil
{
return
0
,
false
,
err
}
keycov
:=
LKeyRange
{
Lo
:
_LKeyMin
,
Hi_
:
_LKeyMax
}
if
visit
!=
nil
{
visit
(
t
)
}
l
:=
len
(
t
.
data
)
if
l
==
0
{
// empty btree
t
.
PDeactivate
()
return
0
,
false
,
nil
visit
(
t
,
keycov
)
}
for
{
// FIXME need to refresh l
l
:=
len
(
t
.
data
)
if
l
==
0
{
// empty btree (top, or in leaf)
t
.
PDeactivate
()
return
0
,
false
,
nil
}
child
:=
t
.
data
[
l
-
1
]
.
child
// shorten global keycov by local [lo for this chile
lo
:=
_LKeyMin
if
l
-
1
>
0
{
lo
=
t
.
data
[
l
-
1
]
.
key
}
keycov
.
Lo
=
lkmax
(
keycov
.
Lo
,
lo
)
// keycov.Hi_ stays ∞
t
.
PDeactivate
()
err
=
child
.
PActivate
(
ctx
)
if
err
!=
nil
{
...
...
@@ -357,7 +380,7 @@ func (t *LOBTree) VMaxKey(ctx context.Context, visit func(node LONode)) (_ int64
}
if
visit
!=
nil
{
visit
(
child
)
visit
(
child
,
keycov
)
}
// XXX verify child keys are in valid range according to parent
...
...
go/zodb/btree/ztestdata_expect_test.go
View file @
a7b82699
...
...
@@ -15,6 +15,8 @@ const B3_oid = 6
const
B3_maxkey
=
9999
const
Bv_oid
=
2
const
Bv_kmin
=
1
const
Bv_kmax
=
9
var
Bvdict
=
map
[
int64
][]
tVisit
{
1
:
[]
tVisit
{{
2
,
LKeyRange
{
_LKeyMin
,
_LKeyMax
}},
{
342
,
LKeyRange
{
_LKeyMin
,
3
}},
{
344
,
LKeyRange
{
_LKeyMin
,
1
}}},
2
:
[]
tVisit
{{
2
,
LKeyRange
{
_LKeyMin
,
_LKeyMax
}},
{
342
,
LKeyRange
{
_LKeyMin
,
3
}},
{
349
,
LKeyRange
{
2
,
3
}}},
...
...
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