Skip to content

N
neoppod
Commit 9e4dd249 authored by Levin Zimmermann's avatar Levin Zimmermann
Browse files
Options

fixup! proto/msgpack: Fix encoding INVALID_{TID,OID}

parent 37dd83e9
Hide whitespace changes
Inline Side-by-side
Showing with 116 additions and 116 deletions
go/neo/proto/protogen.go
View file @ 9e4dd249
......@@ -1011,8 +1011,8 @@ func (e *encoderM) genBasic(path string, typ *types.Basic, userType types.Type)
// zodb.Tid and zodb.Oid are encoded as [8]bin or nil
if userType == zodbTid || userType == zodbOid {
e.emit("if %s == %v {", path, INVALID_ID) // INVALID_{TID,OID} =>
e.emit("data[%v] = msgpack.Nil", e.n) // mnil
e.emit("if %s == %v {", path, INVALID_ID) // INVALID_{TID,OID} =>
e.emit("data[%v] = byte(msgpack.Nil)", e.n) // mnil
e.emit("data = data[%v:]", e.n + 1)
e.emit("} else {")
e.emit("data[%v] = byte(msgpack.Bin8)", e.n); e.n++
......
go/neo/proto/zproto-marshal.go
View file @ 9e4dd249
......@@ -1406,7 +1406,7 @@ func (p *AnswerRecovery) neoMsgEncodeM(data []byte) {
data = data[1+n:]
}
if p.BackupTid == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -1415,7 +1415,7 @@ func (p *AnswerRecovery) neoMsgEncodeM(data []byte) {
data = data[10:]
}
if p.TruncateTid == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -1562,7 +1562,7 @@ func (p *AnswerLastIDs) neoMsgEncodedLenM() int {
func (p *AnswerLastIDs) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 2)
if p.LastOid == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -1571,7 +1571,7 @@ func (p *AnswerLastIDs) neoMsgEncodeM(data []byte) {
data = data[11:]
}
if p.LastTid == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -2667,7 +2667,7 @@ func (p *AnswerUnfinishedTransactions) neoMsgEncodedLenM() int {
func (p *AnswerUnfinishedTransactions) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 2)
if p.MaxTID == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -2683,7 +2683,7 @@ func (p *AnswerUnfinishedTransactions) neoMsgEncodeM(data []byte) {
a := &p.TidList[i]
data[0] = byte(msgpack.FixArray_4 | 1)
if (*a).UnfinishedTID == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -2875,7 +2875,7 @@ func (p *AnswerLockedTransactions) neoMsgEncodeM(data []byte) {
sort.Slice(keyv, func(i, j int) bool { return keyv[i] < keyv[j] })
for _, key := range keyv {
if key == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -2884,7 +2884,7 @@ func (p *AnswerLockedTransactions) neoMsgEncodeM(data []byte) {
data = data[10:]
}
if p.TidDict[key] == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -2987,7 +2987,7 @@ func (p *FinalTID) neoMsgEncodedLenM() int {
func (p *FinalTID) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 1)
if p.TTID == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -3062,7 +3062,7 @@ func (p *AnswerFinalTID) neoMsgEncodedLenM() int {
func (p *AnswerFinalTID) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 1)
if p.Tid == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -3144,7 +3144,7 @@ func (p *ValidateTransaction) neoMsgEncodedLenM() int {
func (p *ValidateTransaction) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 2)
if p.TTID == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -3153,7 +3153,7 @@ func (p *ValidateTransaction) neoMsgEncodeM(data []byte) {
data = data[11:]
}
if p.Tid == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -3235,7 +3235,7 @@ func (p *BeginTransaction) neoMsgEncodedLenM() int {
func (p *BeginTransaction) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 1)
if p.Tid == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -3310,7 +3310,7 @@ func (p *AnswerBeginTransaction) neoMsgEncodedLenM() int {
func (p *AnswerBeginTransaction) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 1)
if p.Tid == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -3414,7 +3414,7 @@ func (p *FailedVote) neoMsgEncodedLenM() int {
func (p *FailedVote) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 2)
if p.Tid == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -3573,7 +3573,7 @@ func (p *FinishTransaction) neoMsgEncodedLenM() int {
func (p *FinishTransaction) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 3)
if p.Tid == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -3588,7 +3588,7 @@ func (p *FinishTransaction) neoMsgEncodeM(data []byte) {
for i := 0; i < l; i++ {
a := &p.OIDList[i]
if (*a) == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -3605,7 +3605,7 @@ func (p *FinishTransaction) neoMsgEncodeM(data []byte) {
for i := 0; i < l; i++ {
a := &p.CheckedList[i]
if (*a) == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -3739,7 +3739,7 @@ func (p *AnswerTransactionFinished) neoMsgEncodedLenM() int {
func (p *AnswerTransactionFinished) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 2)
if p.TTid == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -3748,7 +3748,7 @@ func (p *AnswerTransactionFinished) neoMsgEncodeM(data []byte) {
data = data[11:]
}
if p.Tid == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -3837,7 +3837,7 @@ func (p *LockInformation) neoMsgEncodedLenM() int {
func (p *LockInformation) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 2)
if p.Ttid == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -3846,7 +3846,7 @@ func (p *LockInformation) neoMsgEncodeM(data []byte) {
data = data[11:]
}
if p.Tid == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -3928,7 +3928,7 @@ func (p *AnswerInformationLocked) neoMsgEncodedLenM() int {
func (p *AnswerInformationLocked) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 1)
if p.Ttid == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -4028,7 +4028,7 @@ func (p *InvalidateObjects) neoMsgEncodedLenM() int {
func (p *InvalidateObjects) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 2)
if p.Tid == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -4043,7 +4043,7 @@ func (p *InvalidateObjects) neoMsgEncodeM(data []byte) {
for i := 0; i < l; i++ {
a := &p.OidList[i]
if (*a) == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -4146,7 +4146,7 @@ func (p *NotifyUnlockInformation) neoMsgEncodedLenM() int {
func (p *NotifyUnlockInformation) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 1)
if p.TTID == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -4311,7 +4311,7 @@ func (p *AnswerNewOIDs) neoMsgEncodeM(data []byte) {
for i := 0; i < l; i++ {
a := &p.OidList[i]
if (*a) == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -4413,7 +4413,7 @@ func (p *NotifyDeadlock) neoMsgEncodedLenM() int {
func (p *NotifyDeadlock) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 2)
if p.TTid == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -4422,7 +4422,7 @@ func (p *NotifyDeadlock) neoMsgEncodeM(data []byte) {
data = data[11:]
}
if p.LockingTid == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -4511,7 +4511,7 @@ func (p *RebaseTransaction) neoMsgEncodedLenM() int {
func (p *RebaseTransaction) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 2)
if p.TTid == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -4520,7 +4520,7 @@ func (p *RebaseTransaction) neoMsgEncodeM(data []byte) {
data = data[11:]
}
if p.LockingTid == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -4625,7 +4625,7 @@ func (p *AnswerRebaseTransaction) neoMsgEncodeM(data []byte) {
for i := 0; i < l; i++ {
a := &p.OidList[i]
if (*a) == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -4727,7 +4727,7 @@ func (p *RebaseObject) neoMsgEncodedLenM() int {
func (p *RebaseObject) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 2)
if p.TTid == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -4736,7 +4736,7 @@ func (p *RebaseObject) neoMsgEncodeM(data []byte) {
data = data[11:]
}
if p.Oid == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -4848,7 +4848,7 @@ func (p *AnswerRebaseObject) neoMsgEncodedLenM() int {
func (p *AnswerRebaseObject) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 5)
if p.Serial == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -4857,7 +4857,7 @@ func (p *AnswerRebaseObject) neoMsgEncodeM(data []byte) {
data = data[11:]
}
if p.ConflictSerial == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -5021,7 +5021,7 @@ func (p *StoreObject) neoMsgEncodedLenM() int {
func (p *StoreObject) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 7)
if p.Oid == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -5030,7 +5030,7 @@ func (p *StoreObject) neoMsgEncodeM(data []byte) {
data = data[11:]
}
if p.Serial == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -5050,7 +5050,7 @@ func (p *StoreObject) neoMsgEncodeM(data []byte) {
data = data[l:]
}
if p.DataSerial == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -5059,7 +5059,7 @@ func (p *StoreObject) neoMsgEncodeM(data []byte) {
data = data[10:]
}
if p.Tid == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -5185,7 +5185,7 @@ func (p *AnswerStoreObject) neoMsgEncodedLenM() int {
func (p *AnswerStoreObject) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 1)
if p.Conflict == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -5289,7 +5289,7 @@ func (p *AbortTransaction) neoMsgEncodedLenM() int {
func (p *AbortTransaction) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 2)
if p.Tid == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -5475,7 +5475,7 @@ func (p *StoreTransaction) neoMsgEncodedLenM() int {
func (p *StoreTransaction) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 5)
if p.Tid == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -5511,7 +5511,7 @@ func (p *StoreTransaction) neoMsgEncodeM(data []byte) {
for i := 0; i < l; i++ {
a := &p.OidList[i]
if (*a) == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -5686,7 +5686,7 @@ func (p *VoteTransaction) neoMsgEncodedLenM() int {
func (p *VoteTransaction) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 1)
if p.Tid == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -5820,7 +5820,7 @@ func (p *GetObject) neoMsgEncodedLenM() int {
func (p *GetObject) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 3)
if p.Oid == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -5829,7 +5829,7 @@ func (p *GetObject) neoMsgEncodeM(data []byte) {
data = data[11:]
}
if p.At == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -5838,7 +5838,7 @@ func (p *GetObject) neoMsgEncodeM(data []byte) {
data = data[10:]
}
if p.Before == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -5971,7 +5971,7 @@ func (p *AnswerObject) neoMsgEncodedLenM() int {
func (p *AnswerObject) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 7)
if p.Oid == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -5980,7 +5980,7 @@ func (p *AnswerObject) neoMsgEncodeM(data []byte) {
data = data[11:]
}
if p.Serial == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -5989,7 +5989,7 @@ func (p *AnswerObject) neoMsgEncodeM(data []byte) {
data = data[10:]
}
if p.NextSerial == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -6009,7 +6009,7 @@ func (p *AnswerObject) neoMsgEncodeM(data []byte) {
data = data[l:]
}
if p.DataSerial == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -6255,7 +6255,7 @@ func (p *AnswerTIDs) neoMsgEncodeM(data []byte) {
for i := 0; i < l; i++ {
a := &p.TIDList[i]
if (*a) == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -6350,7 +6350,7 @@ func (p *TransactionInformation) neoMsgEncodedLenM() int {
func (p *TransactionInformation) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 1)
if p.Tid == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -6503,7 +6503,7 @@ func (p *AnswerTransactionInformation) neoMsgEncodedLenM() int {
func (p *AnswerTransactionInformation) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 6)
if p.Tid == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -6540,7 +6540,7 @@ func (p *AnswerTransactionInformation) neoMsgEncodeM(data []byte) {
for i := 0; i < l; i++ {
a := &p.OidList[i]
if (*a) == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -6686,7 +6686,7 @@ func (p *ObjectHistory) neoMsgEncodedLenM() int {
func (p *ObjectHistory) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 3)
if p.Oid == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -6828,7 +6828,7 @@ func (p *AnswerObjectHistory) neoMsgEncodedLenM() int {
func (p *AnswerObjectHistory) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 2)
if p.Oid == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -6844,7 +6844,7 @@ func (p *AnswerObjectHistory) neoMsgEncodeM(data []byte) {
a := &p.HistoryList[i]
data[0] = byte(msgpack.FixArray_4 | 2)
if (*a).Serial == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -8788,7 +8788,7 @@ func (p *ObjectUndoSerial) neoMsgEncodedLenM() int {
func (p *ObjectUndoSerial) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 4)
if p.Tid == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -8797,7 +8797,7 @@ func (p *ObjectUndoSerial) neoMsgEncodeM(data []byte) {
data = data[11:]
}
if p.LTID == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -8806,7 +8806,7 @@ func (p *ObjectUndoSerial) neoMsgEncodeM(data []byte) {
data = data[10:]
}
if p.UndoneTID == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -8821,7 +8821,7 @@ func (p *ObjectUndoSerial) neoMsgEncodeM(data []byte) {
for i := 0; i < l; i++ {
a := &p.OidList[i]
if (*a) == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -8986,7 +8986,7 @@ func (p *AnswerObjectUndoSerial) neoMsgEncodeM(data []byte) {
sort.Slice(keyv, func(i, j int) bool { return keyv[i] < keyv[j] })
for _, key := range keyv {
if key == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -8996,7 +8996,7 @@ func (p *AnswerObjectUndoSerial) neoMsgEncodeM(data []byte) {
}
data[0] = byte(msgpack.FixArray_4 | 3)
if p.ObjectTIDDict[key].CurrentSerial == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -9005,7 +9005,7 @@ func (p *AnswerObjectUndoSerial) neoMsgEncodeM(data []byte) {
data = data[11:]
}
if p.ObjectTIDDict[key].UndoSerial == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -9157,7 +9157,7 @@ func (p *AskTIDsFrom) neoMsgEncodedLenM() int {
func (p *AskTIDsFrom) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 4)
if p.MinTID == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -9166,7 +9166,7 @@ func (p *AskTIDsFrom) neoMsgEncodeM(data []byte) {
data = data[11:]
}
if p.MaxTID == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -9299,7 +9299,7 @@ func (p *AnswerTIDsFrom) neoMsgEncodeM(data []byte) {
for i := 0; i < l; i++ {
a := &p.TidList[i]
if (*a) == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -9394,7 +9394,7 @@ func (p *Pack) neoMsgEncodedLenM() int {
func (p *Pack) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 1)
if p.Tid == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -9593,7 +9593,7 @@ func (p *CheckReplicas) neoMsgEncodeM(data []byte) {
}
}
if p.MinTID == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -9602,7 +9602,7 @@ func (p *CheckReplicas) neoMsgEncodeM(data []byte) {
data = data[10:]
}
if p.MaxTID == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -9785,7 +9785,7 @@ func (p *CheckPartition) neoMsgEncodeM(data []byte) {
data = data[0+n:]
}
if p.MinTID == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -9794,7 +9794,7 @@ func (p *CheckPartition) neoMsgEncodeM(data []byte) {
data = data[10:]
}
if p.MaxTID == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -9961,7 +9961,7 @@ func (p *CheckTIDRange) neoMsgEncodeM(data []byte) {
data = data[0+n:]
}
if p.MinTID == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -9970,7 +9970,7 @@ func (p *CheckTIDRange) neoMsgEncodeM(data []byte) {
data = data[10:]
}
if p.MaxTID == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -10085,7 +10085,7 @@ func (p *AnswerCheckTIDRange) neoMsgEncodeM(data []byte) {
data[1] = 20
copy(data[2:], p.Checksum[:])
if p.MaxTID == 18446744073709551615 {
data[22] = msgpack.Nil
data[22] = byte(msgpack.Nil)
data = data[23:]
} else {
data[22] = byte(msgpack.Bin8)
......@@ -10206,7 +10206,7 @@ func (p *CheckSerialRange) neoMsgEncodeM(data []byte) {
data = data[0+n:]
}
if p.MinTID == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -10215,7 +10215,7 @@ func (p *CheckSerialRange) neoMsgEncodeM(data []byte) {
data = data[10:]
}
if p.MaxTID == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -10224,7 +10224,7 @@ func (p *CheckSerialRange) neoMsgEncodeM(data []byte) {
data = data[10:]
}
if p.MinOID == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -10355,7 +10355,7 @@ func (p *AnswerCheckSerialRange) neoMsgEncodeM(data []byte) {
data[1] = 20
copy(data[2:], p.TidChecksum[:])
if p.MaxTID == 18446744073709551615 {
data[22] = msgpack.Nil
data[22] = byte(msgpack.Nil)
data = data[23:]
} else {
data[22] = byte(msgpack.Bin8)
......@@ -10367,7 +10367,7 @@ func (p *AnswerCheckSerialRange) neoMsgEncodeM(data []byte) {
data[1] = 20
copy(data[2:], p.OidChecksum[:])
if p.MaxOID == 18446744073709551615 {
data[22] = msgpack.Nil
data[22] = byte(msgpack.Nil)
data = data[23:]
} else {
data[22] = byte(msgpack.Bin8)
......@@ -10696,7 +10696,7 @@ func (p *AnswerLastTransaction) neoMsgEncodedLenM() int {
func (p *AnswerLastTransaction) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 1)
if p.Tid == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -10785,7 +10785,7 @@ func (p *CheckCurrentSerial) neoMsgEncodedLenM() int {
func (p *CheckCurrentSerial) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 3)
if p.Tid == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -10794,7 +10794,7 @@ func (p *CheckCurrentSerial) neoMsgEncodeM(data []byte) {
data = data[11:]
}
if p.Oid == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -10803,7 +10803,7 @@ func (p *CheckCurrentSerial) neoMsgEncodeM(data []byte) {
data = data[10:]
}
if p.Serial == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -10893,7 +10893,7 @@ func (p *AnswerCheckCurrentSerial) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 1)
data[1] = byte(msgpack.FixArray_4 | 1)
if p.AnswerStoreObject.Conflict == 18446744073709551615 {
data[2] = msgpack.Nil
data[2] = byte(msgpack.Nil)
data = data[3:]
} else {
data[2] = byte(msgpack.Bin8)
......@@ -10985,7 +10985,7 @@ func (p *NotifyTransactionFinished) neoMsgEncodedLenM() int {
func (p *NotifyTransactionFinished) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 2)
if p.TTID == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -10994,7 +10994,7 @@ func (p *NotifyTransactionFinished) neoMsgEncodeM(data []byte) {
data = data[11:]
}
if p.MaxTID == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -11145,7 +11145,7 @@ func (p *Replicate) neoMsgEncodedLenM() int {
func (p *Replicate) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 3)
if p.Tid == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -11298,7 +11298,7 @@ func (p *ReplicationDone) neoMsgEncodeM(data []byte) {
data = data[1+n:]
}
if p.Tid == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -11430,7 +11430,7 @@ func (p *FetchTransactions) neoMsgEncodeM(data []byte) {
data = data[0+n:]
}
if p.MinTid == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -11439,7 +11439,7 @@ func (p *FetchTransactions) neoMsgEncodeM(data []byte) {
data = data[10:]
}
if p.MaxTid == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -11454,7 +11454,7 @@ func (p *FetchTransactions) neoMsgEncodeM(data []byte) {
for i := 0; i < l; i++ {
a := &p.TxnKnownList[i]
if (*a) == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -11617,7 +11617,7 @@ func (p *AnswerFetchTransactions) neoMsgEncodedLenM() int {
func (p *AnswerFetchTransactions) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 3)
if p.PackTid == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -11626,7 +11626,7 @@ func (p *AnswerFetchTransactions) neoMsgEncodeM(data []byte) {
data = data[11:]
}
if p.NextTid == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -11641,7 +11641,7 @@ func (p *AnswerFetchTransactions) neoMsgEncodeM(data []byte) {
for i := 0; i < l; i++ {
a := &p.TxnDeleteList[i]
if (*a) == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -11843,7 +11843,7 @@ func (p *FetchObjects) neoMsgEncodeM(data []byte) {
data = data[0+n:]
}
if p.MinTid == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -11852,7 +11852,7 @@ func (p *FetchObjects) neoMsgEncodeM(data []byte) {
data = data[10:]
}
if p.MaxTid == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -11861,7 +11861,7 @@ func (p *FetchObjects) neoMsgEncodeM(data []byte) {
data = data[10:]
}
if p.MinOid == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -11880,7 +11880,7 @@ func (p *FetchObjects) neoMsgEncodeM(data []byte) {
sort.Slice(keyv, func(i, j int) bool { return keyv[i] < keyv[j] })
for _, key := range keyv {
if key == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -11895,7 +11895,7 @@ func (p *FetchObjects) neoMsgEncodeM(data []byte) {
for i := 0; i < l; i++ {
a := &p.ObjKnownDict[key][i]
if (*a) == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -12142,7 +12142,7 @@ func (p *AnswerFetchObjects) neoMsgEncodedLenM() int {
func (p *AnswerFetchObjects) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 4)
if p.PackTid == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -12151,7 +12151,7 @@ func (p *AnswerFetchObjects) neoMsgEncodeM(data []byte) {
data = data[11:]
}
if p.NextTid == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -12160,7 +12160,7 @@ func (p *AnswerFetchObjects) neoMsgEncodeM(data []byte) {
data = data[10:]
}
if p.NextOid == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -12179,7 +12179,7 @@ func (p *AnswerFetchObjects) neoMsgEncodeM(data []byte) {
sort.Slice(keyv, func(i, j int) bool { return keyv[i] < keyv[j] })
for _, key := range keyv {
if key == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -12194,7 +12194,7 @@ func (p *AnswerFetchObjects) neoMsgEncodeM(data []byte) {
for i := 0; i < l; i++ {
a := &p.ObjDeleteDict[key][i]
if (*a) == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -12425,7 +12425,7 @@ func (p *AddTransaction) neoMsgEncodedLenM() int {
func (p *AddTransaction) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 7)
if p.Tid == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -12456,7 +12456,7 @@ func (p *AddTransaction) neoMsgEncodeM(data []byte) {
}
data[0] = byte(msgpack.Bool(p.Packed))
if p.TTid == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -12471,7 +12471,7 @@ func (p *AddTransaction) neoMsgEncodeM(data []byte) {
for i := 0; i < l; i++ {
a := &p.OidList[i]
if (*a) == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -12657,7 +12657,7 @@ func (p *AddObject) neoMsgEncodedLenM() int {
func (p *AddObject) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 6)
if p.Oid == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......@@ -12666,7 +12666,7 @@ func (p *AddObject) neoMsgEncodeM(data []byte) {
data = data[11:]
}
if p.Serial == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -12686,7 +12686,7 @@ func (p *AddObject) neoMsgEncodeM(data []byte) {
data = data[l:]
}
if p.DataSerial == 18446744073709551615 {
data[0] = msgpack.Nil
data[0] = byte(msgpack.Nil)
data = data[1:]
} else {
data[0] = byte(msgpack.Bin8)
......@@ -12805,7 +12805,7 @@ func (p *Truncate) neoMsgEncodedLenM() int {
func (p *Truncate) neoMsgEncodeM(data []byte) {
data[0] = byte(msgpack.FixArray_4 | 1)
if p.Tid == 18446744073709551615 {
data[1] = msgpack.Nil
data[1] = byte(msgpack.Nil)
data = data[2:]
} else {
data[1] = byte(msgpack.Bin8)
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7