Commit 56835167 authored by Kirill Smelkov's avatar Kirill Smelkov

go/neo/proto: AnswerPartitionList += NumReplicas

This corresponds to NEO/py commit 21190ee7 (Make 'neoctl print pt'
report the number of replicas).
parent 0d75e144
...@@ -801,6 +801,7 @@ type PartitionList struct { ...@@ -801,6 +801,7 @@ type PartitionList struct {
type AnswerPartitionList struct { type AnswerPartitionList struct {
PTid PTid
NumReplicas uint32 // PNumber
RowList []RowInfo RowList []RowInfo
} }
......
...@@ -2379,15 +2379,16 @@ func (p *AnswerPartitionList) NEOMsgEncodedLen() int { ...@@ -2379,15 +2379,16 @@ func (p *AnswerPartitionList) NEOMsgEncodedLen() int {
a := &p.RowList[i] a := &p.RowList[i]
size += len((*a).CellList) * 5 size += len((*a).CellList) * 5
} }
return 12 + len(p.RowList)*4 + size return 16 + len(p.RowList)*4 + size
} }
func (p *AnswerPartitionList) NEOMsgEncode(data []byte) { func (p *AnswerPartitionList) NEOMsgEncode(data []byte) {
binary.BigEndian.PutUint64(data[0:], uint64(p.PTid)) binary.BigEndian.PutUint64(data[0:], uint64(p.PTid))
binary.BigEndian.PutUint32(data[8:], p.NumReplicas)
{ {
l := uint32(len(p.RowList)) l := uint32(len(p.RowList))
binary.BigEndian.PutUint32(data[8:], l) binary.BigEndian.PutUint32(data[12:], l)
data = data[12:] data = data[16:]
for i := 0; uint32(i) < l; i++ { for i := 0; uint32(i) < l; i++ {
a := &p.RowList[i] a := &p.RowList[i]
{ {
...@@ -2408,13 +2409,14 @@ func (p *AnswerPartitionList) NEOMsgEncode(data []byte) { ...@@ -2408,13 +2409,14 @@ func (p *AnswerPartitionList) NEOMsgEncode(data []byte) {
func (p *AnswerPartitionList) NEOMsgDecode(data []byte) (int, error) { func (p *AnswerPartitionList) NEOMsgDecode(data []byte) (int, error) {
var nread uint64 var nread uint64
if len(data) < 12 { if len(data) < 16 {
goto overflow goto overflow
} }
p.PTid = PTid(binary.BigEndian.Uint64(data[0 : 0+8])) p.PTid = PTid(binary.BigEndian.Uint64(data[0 : 0+8]))
p.NumReplicas = binary.BigEndian.Uint32(data[8 : 8+4])
{ {
l := binary.BigEndian.Uint32(data[8 : 8+4]) l := binary.BigEndian.Uint32(data[12 : 12+4])
data = data[12:] data = data[16:]
p.RowList = make([]RowInfo, l) p.RowList = make([]RowInfo, l)
for i := 0; uint32(i) < l; i++ { for i := 0; uint32(i) < l; i++ {
a := &p.RowList[i] a := &p.RowList[i]
...@@ -2439,7 +2441,7 @@ func (p *AnswerPartitionList) NEOMsgDecode(data []byte) (int, error) { ...@@ -2439,7 +2441,7 @@ func (p *AnswerPartitionList) NEOMsgDecode(data []byte) (int, error) {
} }
nread += uint64(l) * 4 nread += uint64(l) * 4
} }
return 12 + int(nread), nil return 16 + int(nread), nil
overflow: overflow:
return 0, ErrDecodeOverflow return 0, ErrDecodeOverflow
......
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