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
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
neoppod
Commits
25e04547
Commit
25e04547
authored
Feb 18, 2019
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
go/zodb/btree: Draft support for PyGetState
Tests pending.
parent
ac3e20cc
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
116 additions
and
6 deletions
+116
-6
go/zodb/btree/btree.go.in
go/zodb/btree/btree.go.in
+38
-2
go/zodb/btree/btree_test.go
go/zodb/btree/btree_test.go
+2
-0
go/zodb/btree/ziobtree.go
go/zodb/btree/ziobtree.go
+38
-2
go/zodb/btree/zlobtree.go
go/zodb/btree/zlobtree.go
+38
-2
No files found.
go/zodb/btree/btree.go.in
View file @
25e04547
...
@@ -379,7 +379,18 @@ func (b *bucketState) DropState() {
...
@@ -379,7 +379,18 @@ func (b *bucketState) DropState() {
// PyGetState implements zodb.PyStateful to get bucket data as pystate.
// PyGetState implements zodb.PyStateful to get bucket data as pystate.
func (b *bucketState) PyGetState() interface{} {
func (b *bucketState) PyGetState() interface{} {
panic("TODO")
// XXX assert len(b.keys) == len(b.values) ?
t := make(pickle.Tuple, 0, 2*len(b.keys))
for i := range b.keys {
t = append(t, b.keys[i], b.values[i])
}
t = pickle.Tuple{t}
if b.next != nil {
t = append(t, b.next)
}
return t
}
}
// PySetState implements zodb.PyStateful to set bucket data from pystate.
// PySetState implements zodb.PyStateful to set bucket data from pystate.
...
@@ -479,7 +490,32 @@ func (t *btreeState) DropState() {
...
@@ -479,7 +490,32 @@ func (t *btreeState) DropState() {
// PyGetState implements zodb.PyStateful to get btree data as pystate.
// PyGetState implements zodb.PyStateful to get btree data as pystate.
func (bt *btreeState) PyGetState() interface{} {
func (bt *btreeState) PyGetState() interface{} {
panic("TODO")
// empty btree
if len(bt.data) == 0 {
// XXX assert .firstbucket = nil ?
return pickle.None{}
}
// btree with 1 child bucket without oid
if len(bt.data) == 1 {
bucket, ok := bt.data[0].child.(*Bucket)
if ok && bucket.POid() == zodb.InvalidOid {
return pickle.Tuple{pickle.Tuple{((*bucketState)(bucket)).PyGetState()}}
}
}
// regular btree
t := make(pickle.Tuple, 0, 2*len(bt.data)-1)
for i, entry := range bt.data {
// key[0] is unused and not saved
if i > 0 {
t = append(t, entry.key)
}
t = append(t, entry.child)
}
t = pickle.Tuple{t}
t = append(t, bt.firstbucket)
return t
}
}
// PySetState implements zodb.PyStateful to set btree data from pystate.
// PySetState implements zodb.PyStateful to set btree data from pystate.
...
...
go/zodb/btree/btree_test.go
View file @
25e04547
...
@@ -252,6 +252,8 @@ func TestBTree(t *testing.T) {
...
@@ -252,6 +252,8 @@ func TestBTree(t *testing.T) {
return
firstbucket
return
firstbucket
}
}
// XXX verify PyGetState <-> PySetState is the same.
// XXX verify Entryv ?
// XXX verify Entryv ?
// XXX verify FirstBucket / Next ?
// XXX verify FirstBucket / Next ?
...
...
go/zodb/btree/ziobtree.go
View file @
25e04547
...
@@ -381,7 +381,18 @@ func (b *iobucketState) DropState() {
...
@@ -381,7 +381,18 @@ func (b *iobucketState) DropState() {
// PyGetState implements zodb.PyStateful to get bucket data as pystate.
// PyGetState implements zodb.PyStateful to get bucket data as pystate.
func
(
b
*
iobucketState
)
PyGetState
()
interface
{}
{
func
(
b
*
iobucketState
)
PyGetState
()
interface
{}
{
panic
(
"TODO"
)
// XXX assert len(b.keys) == len(b.values) ?
t
:=
make
(
pickle
.
Tuple
,
0
,
2
*
len
(
b
.
keys
))
for
i
:=
range
b
.
keys
{
t
=
append
(
t
,
b
.
keys
[
i
],
b
.
values
[
i
])
}
t
=
pickle
.
Tuple
{
t
}
if
b
.
next
!=
nil
{
t
=
append
(
t
,
b
.
next
)
}
return
t
}
}
// PySetState implements zodb.PyStateful to set bucket data from pystate.
// PySetState implements zodb.PyStateful to set bucket data from pystate.
...
@@ -481,7 +492,32 @@ func (t *iobtreeState) DropState() {
...
@@ -481,7 +492,32 @@ func (t *iobtreeState) DropState() {
// PyGetState implements zodb.PyStateful to get btree data as pystate.
// PyGetState implements zodb.PyStateful to get btree data as pystate.
func
(
bt
*
iobtreeState
)
PyGetState
()
interface
{}
{
func
(
bt
*
iobtreeState
)
PyGetState
()
interface
{}
{
panic
(
"TODO"
)
// empty btree
if
len
(
bt
.
data
)
==
0
{
// XXX assert .firstbucket = nil ?
return
pickle
.
None
{}
}
// btree with 1 child bucket without oid
if
len
(
bt
.
data
)
==
1
{
bucket
,
ok
:=
bt
.
data
[
0
]
.
child
.
(
*
IOBucket
)
if
ok
&&
bucket
.
POid
()
==
zodb
.
InvalidOid
{
return
pickle
.
Tuple
{
pickle
.
Tuple
{((
*
iobucketState
)(
bucket
))
.
PyGetState
()}}
}
}
// regular btree
t
:=
make
(
pickle
.
Tuple
,
0
,
2
*
len
(
bt
.
data
)
-
1
)
for
i
,
entry
:=
range
bt
.
data
{
// key[0] is unused and not saved
if
i
>
0
{
t
=
append
(
t
,
entry
.
key
)
}
t
=
append
(
t
,
entry
.
child
)
}
t
=
pickle
.
Tuple
{
t
}
t
=
append
(
t
,
bt
.
firstbucket
)
return
t
}
}
// PySetState implements zodb.PyStateful to set btree data from pystate.
// PySetState implements zodb.PyStateful to set btree data from pystate.
...
...
go/zodb/btree/zlobtree.go
View file @
25e04547
...
@@ -381,7 +381,18 @@ func (b *lobucketState) DropState() {
...
@@ -381,7 +381,18 @@ func (b *lobucketState) DropState() {
// PyGetState implements zodb.PyStateful to get bucket data as pystate.
// PyGetState implements zodb.PyStateful to get bucket data as pystate.
func
(
b
*
lobucketState
)
PyGetState
()
interface
{}
{
func
(
b
*
lobucketState
)
PyGetState
()
interface
{}
{
panic
(
"TODO"
)
// XXX assert len(b.keys) == len(b.values) ?
t
:=
make
(
pickle
.
Tuple
,
0
,
2
*
len
(
b
.
keys
))
for
i
:=
range
b
.
keys
{
t
=
append
(
t
,
b
.
keys
[
i
],
b
.
values
[
i
])
}
t
=
pickle
.
Tuple
{
t
}
if
b
.
next
!=
nil
{
t
=
append
(
t
,
b
.
next
)
}
return
t
}
}
// PySetState implements zodb.PyStateful to set bucket data from pystate.
// PySetState implements zodb.PyStateful to set bucket data from pystate.
...
@@ -481,7 +492,32 @@ func (t *lobtreeState) DropState() {
...
@@ -481,7 +492,32 @@ func (t *lobtreeState) DropState() {
// PyGetState implements zodb.PyStateful to get btree data as pystate.
// PyGetState implements zodb.PyStateful to get btree data as pystate.
func
(
bt
*
lobtreeState
)
PyGetState
()
interface
{}
{
func
(
bt
*
lobtreeState
)
PyGetState
()
interface
{}
{
panic
(
"TODO"
)
// empty btree
if
len
(
bt
.
data
)
==
0
{
// XXX assert .firstbucket = nil ?
return
pickle
.
None
{}
}
// btree with 1 child bucket without oid
if
len
(
bt
.
data
)
==
1
{
bucket
,
ok
:=
bt
.
data
[
0
]
.
child
.
(
*
LOBucket
)
if
ok
&&
bucket
.
POid
()
==
zodb
.
InvalidOid
{
return
pickle
.
Tuple
{
pickle
.
Tuple
{((
*
lobucketState
)(
bucket
))
.
PyGetState
()}}
}
}
// regular btree
t
:=
make
(
pickle
.
Tuple
,
0
,
2
*
len
(
bt
.
data
)
-
1
)
for
i
,
entry
:=
range
bt
.
data
{
// key[0] is unused and not saved
if
i
>
0
{
t
=
append
(
t
,
entry
.
key
)
}
t
=
append
(
t
,
entry
.
child
)
}
t
=
pickle
.
Tuple
{
t
}
t
=
append
(
t
,
bt
.
firstbucket
)
return
t
}
}
// PySetState implements zodb.PyStateful to set btree data from pystate.
// PySetState implements zodb.PyStateful to set btree data from pystate.
...
...
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