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
d09b80f2
Commit
d09b80f2
authored
Jul 13, 2020
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
1c39bd22
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
+9
-2
go/zodb/storage/zeo/proto.go
go/zodb/storage/zeo/proto.go
+2
-2
go/zodb/storage/zeo/zrpc.go
go/zodb/storage/zeo/zrpc.go
+7
-0
No files found.
go/zodb/storage/zeo/proto.go
View file @
d09b80f2
...
...
@@ -271,8 +271,8 @@ func (e encoding) Tuple(t tuple) interface{} {
case
'M'
:
// msgpack: -> leave as tuple
// However shamaton/msgpack encodes tuple(nil) as nil, not empty tuple
// so nil -> tuple{}
// However shamaton/msgpack encodes tuple(nil) as nil, not empty tuple
,
// so nil -> tuple{}
.
if
t
==
nil
{
t
=
tuple
{}
}
...
...
go/zodb/storage/zeo/zrpc.go
View file @
d09b80f2
...
...
@@ -92,6 +92,10 @@ func (zl *zLink) start() {
// XXX it would be better for zLink to instead provide .Recv() to receive
// peer's requests and then serve is just loop over Recv and decide what to do
// with messages.
//
// XXX -> Serve(notifyTab, serveTab) error
// XXX err = nil on normal zlink.Close
// XXX err != nil on zlink.shutdown(err)
func
(
zl
*
zLink
)
StartServe
(
notifyTab
map
[
string
]
func
(
interface
{})
error
,
serveTab
map
[
string
]
func
(
context
.
Context
,
interface
{})
interface
{},
...
...
@@ -126,6 +130,8 @@ func (zl *zLink) shutdown(err error) {
// XXX if err != nil -> watchq <- zodb.EventError{err}
// XXX close watcher
// XXX -> notifyTab.shutdown?
// XXX -> go Serve() -> err -> watchq? <- yes
})
}
...
...
@@ -279,6 +285,7 @@ func (zl *zLink) Call(ctx context.Context, method string, argv ...interface{}) (
return
reply
,
nil
}
// reply sends reply to a call received with msgid.
func
(
zl
*
zLink
)
reply
(
msgid
int64
,
res
interface
{})
(
err
error
)
{
defer
func
()
{
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