Commit 74e9e143 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 80492be0
...@@ -339,7 +339,7 @@ type Checksum [20]byte ...@@ -339,7 +339,7 @@ type Checksum [20]byte
// PTid is Partition Table identifier. // PTid is Partition Table identifier.
// //
// Zero value means "invalid id" (<-> None in py.PPTID) XXX = nil in msgpack // Zero value means "invalid id" (<-> None in py.PPTID, nil in msgpack)
type PTid uint64 type PTid uint64
// IdTime represents time of identification. // IdTime represents time of identification.
...@@ -482,8 +482,8 @@ type Recovery struct { ...@@ -482,8 +482,8 @@ type Recovery struct {
type AnswerRecovery struct { type AnswerRecovery struct {
PTid PTid
BackupTid zodb.Tid // XXX nil <-> 0 BackupTid zodb.Tid
TruncateTid zodb.Tid // XXX nil <-> 0 TruncateTid zodb.Tid
} }
// Ask the last OID/TID so that a master can initialize its TransactionManager. // Ask the last OID/TID so that a master can initialize its TransactionManager.
......
...@@ -1010,7 +1010,7 @@ func (s *sizerM) genBasic(path string, typ *types.Basic, userType types.Type) { ...@@ -1010,7 +1010,7 @@ func (s *sizerM) genBasic(path string, typ *types.Basic, userType types.Type) {
upath = fmt.Sprintf("%s(%s)", typ.Name(), upath) upath = fmt.Sprintf("%s(%s)", typ.Name(), upath)
} }
// zodb.Tid and zodb.Oid are encoded as [8]bin XXX or nil? // zodb.Tid and zodb.Oid are encoded as [8]bin XXX or nil for INVALID_{TID_OID}
if userType == zodbTid || userType == zodbOid { if userType == zodbTid || userType == zodbOid {
s.size.Add(1+1+8) // mbin8 + 8 + [8]data s.size.Add(1+1+8) // mbin8 + 8 + [8]data
return return
...@@ -1046,7 +1046,7 @@ func (e *encoderM) genBasic(path string, typ *types.Basic, userType types.Type) ...@@ -1046,7 +1046,7 @@ func (e *encoderM) genBasic(path string, typ *types.Basic, userType types.Type)
upath = fmt.Sprintf("%s(%s)", typ.Name(), upath) upath = fmt.Sprintf("%s(%s)", typ.Name(), upath)
} }
// zodb.Tid and zodb.Oid are encoded as [8]bin XXX or nil ? // zodb.Tid and zodb.Oid are encoded as [8]bin XXX or nil
if userType == zodbTid || userType == zodbOid { if userType == zodbTid || userType == zodbOid {
e.emit("data[%v] = byte(msgpack.Bin8)", e.n); e.n++ e.emit("data[%v] = byte(msgpack.Bin8)", e.n); e.n++
e.emit("data[%v] = 8", e.n); e.n++ e.emit("data[%v] = 8", e.n); e.n++
......
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