Skip to content

N
neoppod
Commit 61308d4a authored by Kirill Smelkov's avatar Kirill Smelkov
Browse files
Options

.

parent c0a8161c
Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 82 deletions
go/neo/proto-marshal.go
View file @ 61308d4a
...@@ -565,20 +565,20 @@ overflow: ...@@ -565,20 +565,20 @@ overflow:
return 0, ErrDecodeOverflow return 0, ErrDecodeOverflow
} }
// 16. X_PartitionTable // 16. AskPartitionTable
func (_ *X_PartitionTable) NEOMsgCode() uint16 { func (_ *AskPartitionTable) NEOMsgCode() uint16 {
return 16 return 16
} }
func (p *X_PartitionTable) NEOMsgEncodedLen() int { func (p *AskPartitionTable) NEOMsgEncodedLen() int {
return 0 return 0
} }
func (p *X_PartitionTable) NEOMsgEncode(data []byte) { func (p *AskPartitionTable) NEOMsgEncode(data []byte) {
} }
func (p *X_PartitionTable) NEOMsgDecode(data []byte) (int, error) { func (p *AskPartitionTable) NEOMsgDecode(data []byte) (int, error) {
return 0, nil return 0, nil
} }
...@@ -742,17 +742,17 @@ overflow: ...@@ -742,17 +742,17 @@ overflow:
return 0, ErrDecodeOverflow return 0, ErrDecodeOverflow
} }
// 19. PartitionChanges // 19. NotifyPartitionChanges
func (_ *PartitionChanges) NEOMsgCode() uint16 { func (_ *NotifyPartitionChanges) NEOMsgCode() uint16 {
return 19 return 19
} }
func (p *PartitionChanges) NEOMsgEncodedLen() int { func (p *NotifyPartitionChanges) NEOMsgEncodedLen() int {
return 12 + len(p.CellList)*12 return 12 + len(p.CellList)*12
} }
func (p *PartitionChanges) NEOMsgEncode(data []byte) { func (p *NotifyPartitionChanges) NEOMsgEncode(data []byte) {
binary.BigEndian.PutUint64(data[0:], uint64(p.PTid)) binary.BigEndian.PutUint64(data[0:], uint64(p.PTid))
{ {
l := uint32(len(p.CellList)) l := uint32(len(p.CellList))
...@@ -761,14 +761,14 @@ func (p *PartitionChanges) NEOMsgEncode(data []byte) { ...@@ -761,14 +761,14 @@ func (p *PartitionChanges) NEOMsgEncode(data []byte) {
for i := 0; uint32(i) < l; i++ { for i := 0; uint32(i) < l; i++ {
a := &p.CellList[i] a := &p.CellList[i]
binary.BigEndian.PutUint32(data[0:], (*a).Offset) binary.BigEndian.PutUint32(data[0:], (*a).Offset)
binary.BigEndian.PutUint32(data[4:], uint32(int32((*a).NodeUUID))) binary.BigEndian.PutUint32(data[4:], uint32(int32((*a).CellInfo.NodeUUID)))
binary.BigEndian.PutUint32(data[8:], uint32(int32((*a).CellState))) binary.BigEndian.PutUint32(data[8:], uint32(int32((*a).CellInfo.CellState)))
data = data[12:] data = data[12:]
} }
} }
} }
func (p *PartitionChanges) NEOMsgDecode(data []byte) (int, error) { func (p *NotifyPartitionChanges) NEOMsgDecode(data []byte) (int, error) {
var nread uint32 var nread uint32
if uint32(len(data)) < 12 { if uint32(len(data)) < 12 {
goto overflow goto overflow
...@@ -782,15 +782,14 @@ func (p *PartitionChanges) NEOMsgDecode(data []byte) (int, error) { ...@@ -782,15 +782,14 @@ func (p *PartitionChanges) NEOMsgDecode(data []byte) (int, error) {
} }
nread += l * 12 nread += l * 12
p.CellList = make([]struct { p.CellList = make([]struct {
Offset uint32 Offset uint32
NodeUUID NodeUUID CellInfo CellInfo
CellState CellState
}, l) }, l)
for i := 0; uint32(i) < l; i++ { for i := 0; uint32(i) < l; i++ {
a := &p.CellList[i] a := &p.CellList[i]
(*a).Offset = binary.BigEndian.Uint32(data[0:]) (*a).Offset = binary.BigEndian.Uint32(data[0:])
(*a).NodeUUID = NodeUUID(int32(binary.BigEndian.Uint32(data[4:]))) (*a).CellInfo.NodeUUID = NodeUUID(int32(binary.BigEndian.Uint32(data[4:])))
(*a).CellState = CellState(int32(binary.BigEndian.Uint32(data[8:]))) (*a).CellInfo.CellState = CellState(int32(binary.BigEndian.Uint32(data[8:])))
data = data[12:] data = data[12:]
} }
} }
...@@ -2983,21 +2982,38 @@ overflow: ...@@ -2983,21 +2982,38 @@ overflow:
return 0, ErrDecodeOverflow return 0, ErrDecodeOverflow
} }
// 75. X_ClusterState // 75. AskClusterState
func (_ *X_ClusterState) NEOMsgCode() uint16 { func (_ *AskClusterState) NEOMsgCode() uint16 {
return 75 return 75
} }
func (p *X_ClusterState) NEOMsgEncodedLen() int { func (p *AskClusterState) NEOMsgEncodedLen() int {
return 0
}
func (p *AskClusterState) NEOMsgEncode(data []byte) {
}
func (p *AskClusterState) NEOMsgDecode(data []byte) (int, error) {
return 0, nil
}
// 76. AnswerClusterState
func (_ *AnswerClusterState) NEOMsgCode() uint16 {
return 76
}
func (p *AnswerClusterState) NEOMsgEncodedLen() int {
return 4 return 4
} }
func (p *X_ClusterState) NEOMsgEncode(data []byte) { func (p *AnswerClusterState) NEOMsgEncode(data []byte) {
binary.BigEndian.PutUint32(data[0:], uint32(int32(p.State))) binary.BigEndian.PutUint32(data[0:], uint32(int32(p.State)))
} }
func (p *X_ClusterState) NEOMsgDecode(data []byte) (int, error) { func (p *AnswerClusterState) NEOMsgDecode(data []byte) (int, error) {
if uint32(len(data)) < 4 { if uint32(len(data)) < 4 {
goto overflow goto overflow
} }
...@@ -3008,10 +3024,10 @@ overflow: ...@@ -3008,10 +3024,10 @@ overflow:
return 0, ErrDecodeOverflow return 0, ErrDecodeOverflow
} }
// 76. ObjectUndoSerial // 77. ObjectUndoSerial
func (_ *ObjectUndoSerial) NEOMsgCode() uint16 { func (_ *ObjectUndoSerial) NEOMsgCode() uint16 {
return 76 return 77
} }
func (p *ObjectUndoSerial) NEOMsgEncodedLen() int { func (p *ObjectUndoSerial) NEOMsgEncodedLen() int {
...@@ -3062,10 +3078,10 @@ overflow: ...@@ -3062,10 +3078,10 @@ overflow:
return 0, ErrDecodeOverflow return 0, ErrDecodeOverflow
} }
// 77. AnswerObjectUndoSerial // 78. AnswerObjectUndoSerial
func (_ *AnswerObjectUndoSerial) NEOMsgCode() uint16 { func (_ *AnswerObjectUndoSerial) NEOMsgCode() uint16 {
return 77 return 78
} }
func (p *AnswerObjectUndoSerial) NEOMsgEncodedLen() int { func (p *AnswerObjectUndoSerial) NEOMsgEncodedLen() int {
...@@ -3130,10 +3146,10 @@ overflow: ...@@ -3130,10 +3146,10 @@ overflow:
return 0, ErrDecodeOverflow return 0, ErrDecodeOverflow
} }
// 78. CheckCurrentSerial // 79. CheckCurrentSerial
func (_ *CheckCurrentSerial) NEOMsgCode() uint16 { func (_ *CheckCurrentSerial) NEOMsgCode() uint16 {
return 78 return 79
} }
func (p *CheckCurrentSerial) NEOMsgEncodedLen() int { func (p *CheckCurrentSerial) NEOMsgEncodedLen() int {
...@@ -3159,10 +3175,10 @@ overflow: ...@@ -3159,10 +3175,10 @@ overflow:
return 0, ErrDecodeOverflow return 0, ErrDecodeOverflow
} }
// 79. Pack // 80. Pack
func (_ *Pack) NEOMsgCode() uint16 { func (_ *Pack) NEOMsgCode() uint16 {
return 79 return 80
} }
func (p *Pack) NEOMsgEncodedLen() int { func (p *Pack) NEOMsgEncodedLen() int {
...@@ -3184,10 +3200,10 @@ overflow: ...@@ -3184,10 +3200,10 @@ overflow:
return 0, ErrDecodeOverflow return 0, ErrDecodeOverflow
} }
// 80. AnswerPack // 81. AnswerPack
func (_ *AnswerPack) NEOMsgCode() uint16 { func (_ *AnswerPack) NEOMsgCode() uint16 {
return 80 return 81
} }
func (p *AnswerPack) NEOMsgEncodedLen() int { func (p *AnswerPack) NEOMsgEncodedLen() int {
...@@ -3209,10 +3225,10 @@ overflow: ...@@ -3209,10 +3225,10 @@ overflow:
return 0, ErrDecodeOverflow return 0, ErrDecodeOverflow
} }
// 81. CheckReplicas // 82. CheckReplicas
func (_ *CheckReplicas) NEOMsgCode() uint16 { func (_ *CheckReplicas) NEOMsgCode() uint16 {
return 81 return 82
} }
func (p *CheckReplicas) NEOMsgEncodedLen() int { func (p *CheckReplicas) NEOMsgEncodedLen() int {
...@@ -3267,10 +3283,10 @@ overflow: ...@@ -3267,10 +3283,10 @@ overflow:
return 0, ErrDecodeOverflow return 0, ErrDecodeOverflow
} }
// 82. CheckPartition // 83. CheckPartition
func (_ *CheckPartition) NEOMsgCode() uint16 { func (_ *CheckPartition) NEOMsgCode() uint16 {
return 82 return 83
} }
func (p *CheckPartition) NEOMsgEncodedLen() int { func (p *CheckPartition) NEOMsgEncodedLen() int {
...@@ -3333,10 +3349,10 @@ overflow: ...@@ -3333,10 +3349,10 @@ overflow:
return 0, ErrDecodeOverflow return 0, ErrDecodeOverflow
} }
// 83. CheckTIDRange // 84. CheckTIDRange
func (_ *CheckTIDRange) NEOMsgCode() uint16 { func (_ *CheckTIDRange) NEOMsgCode() uint16 {
return 83 return 84
} }
func (p *CheckTIDRange) NEOMsgEncodedLen() int { func (p *CheckTIDRange) NEOMsgEncodedLen() int {
...@@ -3364,10 +3380,10 @@ overflow: ...@@ -3364,10 +3380,10 @@ overflow:
return 0, ErrDecodeOverflow return 0, ErrDecodeOverflow
} }
// 84. AnswerCheckTIDRange // 85. AnswerCheckTIDRange
func (_ *AnswerCheckTIDRange) NEOMsgCode() uint16 { func (_ *AnswerCheckTIDRange) NEOMsgCode() uint16 {
return 84 return 85
} }
func (p *AnswerCheckTIDRange) NEOMsgEncodedLen() int { func (p *AnswerCheckTIDRange) NEOMsgEncodedLen() int {
...@@ -3393,10 +3409,10 @@ overflow: ...@@ -3393,10 +3409,10 @@ overflow:
return 0, ErrDecodeOverflow return 0, ErrDecodeOverflow
} }
// 85. CheckSerialRange // 86. CheckSerialRange
func (_ *CheckSerialRange) NEOMsgCode() uint16 { func (_ *CheckSerialRange) NEOMsgCode() uint16 {
return 85 return 86
} }
func (p *CheckSerialRange) NEOMsgEncodedLen() int { func (p *CheckSerialRange) NEOMsgEncodedLen() int {
...@@ -3426,10 +3442,10 @@ overflow: ...@@ -3426,10 +3442,10 @@ overflow:
return 0, ErrDecodeOverflow return 0, ErrDecodeOverflow
} }
// 86. AnswerCheckSerialRange // 87. AnswerCheckSerialRange
func (_ *AnswerCheckSerialRange) NEOMsgCode() uint16 { func (_ *AnswerCheckSerialRange) NEOMsgCode() uint16 {
return 86 return 87
} }
func (p *AnswerCheckSerialRange) NEOMsgEncodedLen() int { func (p *AnswerCheckSerialRange) NEOMsgEncodedLen() int {
...@@ -3459,10 +3475,10 @@ overflow: ...@@ -3459,10 +3475,10 @@ overflow:
return 0, ErrDecodeOverflow return 0, ErrDecodeOverflow
} }
// 87. PartitionCorrupted // 88. PartitionCorrupted
func (_ *PartitionCorrupted) NEOMsgCode() uint16 { func (_ *PartitionCorrupted) NEOMsgCode() uint16 {
return 87 return 88
} }
func (p *PartitionCorrupted) NEOMsgEncodedLen() int { func (p *PartitionCorrupted) NEOMsgEncodedLen() int {
...@@ -3509,10 +3525,10 @@ overflow: ...@@ -3509,10 +3525,10 @@ overflow:
return 0, ErrDecodeOverflow return 0, ErrDecodeOverflow
} }
// 88. LastTransaction // 89. LastTransaction
func (_ *LastTransaction) NEOMsgCode() uint16 { func (_ *LastTransaction) NEOMsgCode() uint16 {
return 88 return 89
} }
func (p *LastTransaction) NEOMsgEncodedLen() int { func (p *LastTransaction) NEOMsgEncodedLen() int {
...@@ -3526,10 +3542,10 @@ func (p *LastTransaction) NEOMsgDecode(data []byte) (int, error) { ...@@ -3526,10 +3542,10 @@ func (p *LastTransaction) NEOMsgDecode(data []byte) (int, error) {
return 0, nil return 0, nil
} }
// 89. AnswerLastTransaction // 90. AnswerLastTransaction
func (_ *AnswerLastTransaction) NEOMsgCode() uint16 { func (_ *AnswerLastTransaction) NEOMsgCode() uint16 {
return 89 return 90
} }
func (p *AnswerLastTransaction) NEOMsgEncodedLen() int { func (p *AnswerLastTransaction) NEOMsgEncodedLen() int {
...@@ -3551,10 +3567,10 @@ overflow: ...@@ -3551,10 +3567,10 @@ overflow:
return 0, ErrDecodeOverflow return 0, ErrDecodeOverflow
} }
// 90. NotifyReady // 91. NotifyReady
func (_ *NotifyReady) NEOMsgCode() uint16 { func (_ *NotifyReady) NEOMsgCode() uint16 {
return 90 return 91
} }
func (p *NotifyReady) NEOMsgEncodedLen() int { func (p *NotifyReady) NEOMsgEncodedLen() int {
...@@ -3586,10 +3602,10 @@ var msgTypeRegistry = map[uint16]reflect.Type{ ...@@ -3586,10 +3602,10 @@ var msgTypeRegistry = map[uint16]reflect.Type{
13: reflect.TypeOf(AnswerRecovery{}), 13: reflect.TypeOf(AnswerRecovery{}),
14: reflect.TypeOf(LastIDs{}), 14: reflect.TypeOf(LastIDs{}),
15: reflect.TypeOf(AnswerLastIDs{}), 15: reflect.TypeOf(AnswerLastIDs{}),
16: reflect.TypeOf(X_PartitionTable{}), 16: reflect.TypeOf(AskPartitionTable{}),
17: reflect.TypeOf(AnswerPartitionTable{}), 17: reflect.TypeOf(AnswerPartitionTable{}),
18: reflect.TypeOf(NotifyPartitionTable{}), 18: reflect.TypeOf(NotifyPartitionTable{}),
19: reflect.TypeOf(PartitionChanges{}), 19: reflect.TypeOf(NotifyPartitionChanges{}),
20: reflect.TypeOf(StartOperation{}), 20: reflect.TypeOf(StartOperation{}),
21: reflect.TypeOf(StopOperation{}), 21: reflect.TypeOf(StopOperation{}),
22: reflect.TypeOf(UnfinishedTransactions{}), 22: reflect.TypeOf(UnfinishedTransactions{}),
...@@ -3645,20 +3661,21 @@ var msgTypeRegistry = map[uint16]reflect.Type{ ...@@ -3645,20 +3661,21 @@ var msgTypeRegistry = map[uint16]reflect.Type{
72: reflect.TypeOf(Repair{}), 72: reflect.TypeOf(Repair{}),
73: reflect.TypeOf(RepairOne{}), 73: reflect.TypeOf(RepairOne{}),
74: reflect.TypeOf(ClusterInformation{}), 74: reflect.TypeOf(ClusterInformation{}),
75: reflect.TypeOf(X_ClusterState{}), 75: reflect.TypeOf(AskClusterState{}),
76: reflect.TypeOf(ObjectUndoSerial{}), 76: reflect.TypeOf(AnswerClusterState{}),
77: reflect.TypeOf(AnswerObjectUndoSerial{}), 77: reflect.TypeOf(ObjectUndoSerial{}),
78: reflect.TypeOf(CheckCurrentSerial{}), 78: reflect.TypeOf(AnswerObjectUndoSerial{}),
79: reflect.TypeOf(Pack{}), 79: reflect.TypeOf(CheckCurrentSerial{}),
80: reflect.TypeOf(AnswerPack{}), 80: reflect.TypeOf(Pack{}),
81: reflect.TypeOf(CheckReplicas{}), 81: reflect.TypeOf(AnswerPack{}),
82: reflect.TypeOf(CheckPartition{}), 82: reflect.TypeOf(CheckReplicas{}),
83: reflect.TypeOf(CheckTIDRange{}), 83: reflect.TypeOf(CheckPartition{}),
84: reflect.TypeOf(AnswerCheckTIDRange{}), 84: reflect.TypeOf(CheckTIDRange{}),
85: reflect.TypeOf(CheckSerialRange{}), 85: reflect.TypeOf(AnswerCheckTIDRange{}),
86: reflect.TypeOf(AnswerCheckSerialRange{}), 86: reflect.TypeOf(CheckSerialRange{}),
87: reflect.TypeOf(PartitionCorrupted{}), 87: reflect.TypeOf(AnswerCheckSerialRange{}),
88: reflect.TypeOf(LastTransaction{}), 88: reflect.TypeOf(PartitionCorrupted{}),
89: reflect.TypeOf(AnswerLastTransaction{}), 89: reflect.TypeOf(LastTransaction{}),
90: reflect.TypeOf(NotifyReady{}), 90: reflect.TypeOf(AnswerLastTransaction{}),
91: reflect.TypeOf(NotifyReady{}),
} }
go/neo/proto.go
View file @ 61308d4a
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
package neo package neo
// protocol definition // protocol definition
// TODO regroup messages definitions to stay more close to 1 communication topic
// TODO document protocol itself better (who sends who what with which semantic)
// NOTE for some packets it is possible to decode raw packet -> go version from // NOTE for some packets it is possible to decode raw packet -> go version from
// PktBuf in place. E.g. for GetObject. // PktBuf in place. E.g. for GetObject.
...@@ -240,7 +242,7 @@ type CellInfo struct { ...@@ -240,7 +242,7 @@ type CellInfo struct {
} }
type RowInfo struct { type RowInfo struct {
Offset uint32 // PNumber Offset uint32 // PNumber XXX -> Pid
CellList []CellInfo CellList []CellInfo
} }
...@@ -320,8 +322,7 @@ type AnswerLastIDs struct { ...@@ -320,8 +322,7 @@ type AnswerLastIDs struct {
// Ask the full partition table. PM -> S. // Ask the full partition table. PM -> S.
// Answer rows in a partition table. S -> PM. // Answer rows in a partition table. S -> PM.
// XXX overlap with PartitionTable struct type AskPartitionTable struct {
type X_PartitionTable struct {
} }
type AnswerPartitionTable struct { type AnswerPartitionTable struct {
...@@ -330,7 +331,7 @@ type AnswerPartitionTable struct { ...@@ -330,7 +331,7 @@ type AnswerPartitionTable struct {
} }
// Send rows in a partition table to update other nodes. PM -> S, C. // Send whole partition table to update other nodes. PM -> S, C.
type NotifyPartitionTable struct { type NotifyPartitionTable struct {
PTid PTid
RowList []RowInfo RowList []RowInfo
...@@ -338,13 +339,11 @@ type NotifyPartitionTable struct { ...@@ -338,13 +339,11 @@ type NotifyPartitionTable struct {
// Notify a subset of a partition table. This is used to notify changes. // Notify a subset of a partition table. This is used to notify changes.
// PM -> S, C. // PM -> S, C.
type PartitionChanges struct { type NotifyPartitionChanges struct {
PTid PTid
CellList []struct { CellList []struct {
// XXX does below correlate with Cell inside top-level CellList ? Offset uint32 // PNumber XXX -> Pid
Offset uint32 // PNumber CellInfo CellInfo
NodeUUID NodeUUID
CellState CellState
} }
} }
...@@ -365,7 +364,7 @@ type StopOperation struct { ...@@ -365,7 +364,7 @@ type StopOperation struct {
// Answer unfinished transactions PM -> S. // Answer unfinished transactions PM -> S.
type UnfinishedTransactions struct { type UnfinishedTransactions struct {
RowList []struct{ RowList []struct{
Offset uint32 // PNumber Offset uint32 // PNumber XXX -> Pid
} }
} }
...@@ -726,7 +725,10 @@ type ClusterInformation struct { ...@@ -726,7 +725,10 @@ type ClusterInformation struct {
// Ask state of the cluster // Ask state of the cluster
// Answer state of the cluster // Answer state of the cluster
type X_ClusterState struct { // XXX conflicts with ClusterState enum type AskClusterState struct {
}
type AnswerClusterState struct {
State ClusterState State ClusterState
} }
......
neo/lib/protocol.py
View file @ 61308d4a
...@@ -684,7 +684,7 @@ class RequestIdentification(Packet): ...@@ -684,7 +684,7 @@ class RequestIdentification(Packet):
PFNodeType, PFNodeType,
PUUID('my_uuid'), PUUID('my_uuid'),
PNumber('num_partitions'), # XXX why here, not in pt updates ? PNumber('num_partitions'), # XXX why here, not in pt updates ?
PNumber('num_replicas'), # XXX ---- // ---- PNumber('num_replicas'), # XXX -> because current neo/py cannot change Npt at runtime
PUUID('your_uuid'), PUUID('your_uuid'),
) )
......
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