Commit 8fe482d8 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent e042b296
...@@ -40,7 +40,7 @@ type zeo struct { ...@@ -40,7 +40,7 @@ type zeo struct {
srv *zLink srv *zLink
// state we get from server by way of server notifications. // state we get from server by way of server notifications.
mu sync.Mutex mu sync.Mutex
lastTid zodb.Tid lastTid zodb.Tid
...@@ -65,7 +65,7 @@ func (z *zeo) Load(ctx context.Context, xid zodb.Xid) (*mem.Buf, zodb.Tid, error ...@@ -65,7 +65,7 @@ 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) { func (z *zeo) _Load(ctx context.Context, xid zodb.Xid) (*mem.Buf, zodb.Tid, error) {
rpc := z.rpc("loadBefore") rpc := z.rpc("loadBefore")
xres, err := rpc.call(ctx, oidPack(xid.Oid), tidPack(xid.At+1)) // XXX at2Before xres, err := rpc.call(ctx, oidPack(xid.Oid), tidPack(xid.At+1)) // XXX at2Before
if err != nil { if err != nil {
return nil, 0, err return nil, 0, err
} }
......
...@@ -46,9 +46,9 @@ const pktHeaderLen = 4 ...@@ -46,9 +46,9 @@ const pktHeaderLen = 4
// we can speak this protocol versions // we can speak this protocol versions
var protoVersions = []string{ var protoVersions = []string{
"3101", // last in ZEO3 series "3101", // last in ZEO3 series
"4", // no longer call load. "4", // no longer call load.
"5", // current in ZEO5 series. "5", // current in ZEO5 series.
} }
...@@ -187,7 +187,7 @@ func pktDecode(pkb *pktBuf) (msg, error) { ...@@ -187,7 +187,7 @@ func pktDecode(pkb *pktBuf) (msg, error) {
return m, err return m, err
} }
tpkt, ok := xpkt.(pickle.Tuple) // XXX also list? tpkt, ok := xpkt.(pickle.Tuple) // XXX also list?
if !ok { if !ok {
return m, derrf("got %T; expected tuple", xpkt) return m, derrf("got %T; expected tuple", xpkt)
} }
...@@ -249,7 +249,7 @@ func (zl *zLink) _call(ctx context.Context, method string, argv ...interface{}) ...@@ -249,7 +249,7 @@ func (zl *zLink) _call(ctx context.Context, method string, argv ...interface{})
} }
// ok, pkt is ready to go // ok, pkt is ready to go
err = zl.sendPkt(pkb) // XXX ctx cancel err = zl.sendPkt(pkb) // XXX ctx cancel
if err != nil { if err != nil {
return msg{}, err return msg{}, err
} }
...@@ -301,7 +301,7 @@ var pkbPool = sync.Pool{New: func() interface{} { ...@@ -301,7 +301,7 @@ var pkbPool = sync.Pool{New: func() interface{} {
func allocPkb() *pktBuf { func allocPkb() *pktBuf {
pkb := pkbPool.Get().(*pktBuf) pkb := pkbPool.Get().(*pktBuf)
pkb.data = pkb.data[:0] pkb.data = pkb.data[:0]
pkb.Write([]byte("\x00\x00\x00\x00")) // room for header (= pktHeaderLen) pkb.Write([]byte("\x00\x00\x00\x00")) // room for header (= pktHeaderLen)
return pkb return pkb
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment