Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
neo
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Kirill Smelkov
neo
Commits
57d9037e
Commit
57d9037e
authored
Jul 07, 2020
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
722d6744
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
2 deletions
+6
-2
go/internal/xtesting/xtesting.go
go/internal/xtesting/xtesting.go
+3
-1
go/zodb/storage/zeo/zeo.go
go/zodb/storage/zeo/zeo.go
+3
-0
go/zodb/storage/zeo/zrpc.go
go/zodb/storage/zeo/zrpc.go
+0
-1
No files found.
go/internal/xtesting/xtesting.go
View file @
57d9037e
...
@@ -177,7 +177,7 @@ func LoadDB(zurl string) (_ []Txn, err error) {
...
@@ -177,7 +177,7 @@ func LoadDB(zurl string) (_ []Txn, err error) {
}
}
return
nil
,
err
return
nil
,
err
}
}
txn
:=
&
Txn
{
Header
:
&
zodb
.
TxnInfo
{
txn
:=
Txn
{
Header
:
&
zodb
.
TxnInfo
{
// clone (txni stays valid only until next iteration)
// clone (txni stays valid only until next iteration)
Tid
:
txni
.
Tid
,
Tid
:
txni
.
Tid
,
Status
:
txni
.
Status
,
Status
:
txni
.
Status
,
...
@@ -203,6 +203,8 @@ func LoadDB(zurl string) (_ []Txn, err error) {
...
@@ -203,6 +203,8 @@ func LoadDB(zurl string) (_ []Txn, err error) {
DataTidHint
:
datai
.
DataTidHint
,
DataTidHint
:
datai
.
DataTidHint
,
})
})
}
}
txnv
=
append
(
txnv
,
txn
)
}
}
return
txnv
,
nil
return
txnv
,
nil
...
...
go/zodb/storage/zeo/zeo.go
View file @
57d9037e
...
@@ -52,6 +52,7 @@ type zeo struct {
...
@@ -52,6 +52,7 @@ type zeo struct {
}
}
// Sync implements zodb.IStorageDriver.
func
(
z
*
zeo
)
Sync
(
ctx
context
.
Context
)
(
head
zodb
.
Tid
,
err
error
)
{
func
(
z
*
zeo
)
Sync
(
ctx
context
.
Context
)
(
head
zodb
.
Tid
,
err
error
)
{
defer
func
()
{
defer
func
()
{
if
err
!=
nil
{
if
err
!=
nil
{
...
@@ -73,6 +74,7 @@ func (z *zeo) Sync(ctx context.Context) (head zodb.Tid, err error) {
...
@@ -73,6 +74,7 @@ func (z *zeo) Sync(ctx context.Context) (head zodb.Tid, err error) {
return
head
,
nil
return
head
,
nil
}
}
// Load implements zodb.IStorageDriver.
func
(
z
*
zeo
)
Load
(
ctx
context
.
Context
,
xid
zodb
.
Xid
)
(
*
mem
.
Buf
,
zodb
.
Tid
,
error
)
{
func
(
z
*
zeo
)
Load
(
ctx
context
.
Context
,
xid
zodb
.
Xid
)
(
*
mem
.
Buf
,
zodb
.
Tid
,
error
)
{
// defer func() ...
// defer func() ...
buf
,
serial
,
err
:=
z
.
_Load
(
ctx
,
xid
)
buf
,
serial
,
err
:=
z
.
_Load
(
ctx
,
xid
)
...
@@ -106,6 +108,7 @@ func (z *zeo) _Load(ctx context.Context, xid zodb.Xid) (*mem.Buf, zodb.Tid, erro
...
@@ -106,6 +108,7 @@ func (z *zeo) _Load(ctx context.Context, xid zodb.Xid) (*mem.Buf, zodb.Tid, erro
return
&
mem
.
Buf
{
Data
:
mem
.
Bytes
(
data
)},
serial
,
nil
return
&
mem
.
Buf
{
Data
:
mem
.
Bytes
(
data
)},
serial
,
nil
}
}
// Iterates implements zodb.IStorageDriver.
func
(
z
*
zeo
)
Iterate
(
ctx
context
.
Context
,
tidMin
,
tidMax
zodb
.
Tid
)
zodb
.
ITxnIterator
{
func
(
z
*
zeo
)
Iterate
(
ctx
context
.
Context
,
tidMin
,
tidMax
zodb
.
Tid
)
zodb
.
ITxnIterator
{
panic
(
"TODO"
)
panic
(
"TODO"
)
}
}
...
...
go/zodb/storage/zeo/zrpc.go
View file @
57d9037e
...
@@ -141,7 +141,6 @@ func (zl *zLink) serveRecv() {
...
@@ -141,7 +141,6 @@ func (zl *zLink) serveRecv() {
// serveRecv1 handles 1 incoming packet.
// serveRecv1 handles 1 incoming packet.
func
(
zl
*
zLink
)
serveRecv1
(
pkb
*
pktBuf
)
error
{
func
(
zl
*
zLink
)
serveRecv1
(
pkb
*
pktBuf
)
error
{
fmt
.
Printf
(
"RXgo: %q
\n
"
,
pkb
.
Payload
())
// decode packet
// decode packet
m
,
err
:=
zl
.
pktDecode
(
pkb
)
m
,
err
:=
zl
.
pktDecode
(
pkb
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
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