diff --git a/pkg/hakeeper/rsm.go b/pkg/hakeeper/rsm.go index 895a340b1a985ed13b79fcf3553ecd52732e659e..238c0d5959539acb7a127e18b9c6f898fc2bf092 100644 --- a/pkg/hakeeper/rsm.go +++ b/pkg/hakeeper/rsm.go @@ -421,44 +421,45 @@ func (s *stateMachine) handleScheduleCommandQuery(uuid string) *pb.CommandBatch func (s *stateMachine) handleClusterDetailsQuery(cfg Config) *pb.ClusterDetails { cfg.Fill() cd := &pb.ClusterDetails{ - CNNodes: make([]pb.CNNode, 0, len(s.state.CNState.Stores)), - DNNodes: make([]pb.DNNode, 0, len(s.state.DNState.Stores)), - LogNodes: make([]pb.LogNode, 0, len(s.state.LogState.Stores)), + CNStores: make([]pb.CNStore, 0, len(s.state.CNState.Stores)), + DNStores: make([]pb.DNStore, 0, len(s.state.DNState.Stores)), + LogStores: make([]pb.LogStore, 0, len(s.state.LogState.Stores)), } for uuid, info := range s.state.CNState.Stores { - n := pb.CNNode{ + n := pb.CNStore{ UUID: uuid, Tick: info.Tick, ServiceAddress: info.ServiceAddress, } - cd.CNNodes = append(cd.CNNodes, n) + cd.CNStores = append(cd.CNStores, n) } for uuid, info := range s.state.DNState.Stores { state := pb.NormalState if cfg.DnStoreExpired(info.Tick, s.state.Tick) { state = pb.TimeoutState } - n := pb.DNNode{ + n := pb.DNStore{ UUID: uuid, Tick: info.Tick, State: state, ServiceAddress: info.ServiceAddress, + Shards: info.Shards, } - cd.DNNodes = append(cd.DNNodes, n) + cd.DNStores = append(cd.DNStores, n) } for uuid, info := range s.state.LogState.Stores { state := pb.NormalState if cfg.LogStoreExpired(info.Tick, s.state.Tick) { state = pb.TimeoutState } - n := pb.LogNode{ + n := pb.LogStore{ UUID: uuid, Tick: info.Tick, State: state, ServiceAddress: info.ServiceAddress, Replicas: info.Replicas, } - cd.LogNodes = append(cd.LogNodes, n) + cd.LogStores = append(cd.LogStores, n) } return cd } diff --git a/pkg/hakeeper/rsm_test.go b/pkg/hakeeper/rsm_test.go index db847e3a7a5eb3b3151ebbb2f7ae12c30d565715..ec71af6bc239d0cb35bd158b06cf9dcd0a7836b3 100644 --- a/pkg/hakeeper/rsm_test.go +++ b/pkg/hakeeper/rsm_test.go @@ -339,6 +339,13 @@ func TestClusterDetailsQuery(t *testing.T) { tsm.state.DNState.Stores["uuid3"] = pb.DNStoreInfo{ Tick: 3, ServiceAddress: "addr3", + + Shards: []pb.DNShardInfo{ + { + ShardID: 2, + ReplicaID: 1, + }, + }, } tsm.state.LogState.Shards[1] = pb.LogShardInfo{ ShardID: 1, @@ -385,14 +392,20 @@ func TestClusterDetailsQuery(t *testing.T) { v, err := tsm.Lookup(&ClusterDetailsQuery{}) require.NoError(t, err) expected := &pb.ClusterDetails{ - DNNodes: []pb.DNNode{ + DNStores: []pb.DNStore{ { UUID: "uuid3", Tick: 3, ServiceAddress: "addr3", + Shards: []pb.DNShardInfo{ + { + ShardID: 2, + ReplicaID: 1, + }, + }, }, }, - CNNodes: []pb.CNNode{ + CNStores: []pb.CNStore{ { UUID: "uuid1", Tick: 1, @@ -404,7 +417,7 @@ func TestClusterDetailsQuery(t *testing.T) { ServiceAddress: "addr2", }, }, - LogNodes: []pb.LogNode{ + LogStores: []pb.LogStore{ { UUID: "store-1", ServiceAddress: "addr-log-1", @@ -447,11 +460,11 @@ func TestClusterDetailsQuery(t *testing.T) { }, } result := v.(*pb.ClusterDetails) - sort.Slice(result.CNNodes, func(i, j int) bool { - return result.CNNodes[i].UUID < result.CNNodes[j].UUID + sort.Slice(result.CNStores, func(i, j int) bool { + return result.CNStores[i].UUID < result.CNStores[j].UUID }) - sort.Slice(result.LogNodes, func(i, j int) bool { - return result.LogNodes[i].UUID < result.LogNodes[j].UUID + sort.Slice(result.LogStores, func(i, j int) bool { + return result.LogStores[i].UUID < result.LogStores[j].UUID }) assert.Equal(t, expected, result) } diff --git a/pkg/logservice/hakeeper_client_test.go b/pkg/logservice/hakeeper_client_test.go index 8d51e91e9f4cab1879a20ee1f40e078550ecf490..9ee39c41450a1ee84298aa2fb2ba53d29276d856 100644 --- a/pkg/logservice/hakeeper_client_test.go +++ b/pkg/logservice/hakeeper_client_test.go @@ -189,16 +189,16 @@ func TestHAKeeperClientSendCNHeartbeat(t *testing.T) { cd, err := c1.GetClusterDetails(ctx) require.NoError(t, err) - cn := pb.CNNode{ + cn := pb.CNStore{ UUID: s.ID(), ServiceAddress: "addr1", } - dn := pb.DNNode{ + dn := pb.DNStore{ UUID: s.ID(), ServiceAddress: "addr2", } - assert.Equal(t, []pb.CNNode{cn}, cd.CNNodes) - assert.Equal(t, []pb.DNNode{dn}, cd.DNNodes) + assert.Equal(t, []pb.CNStore{cn}, cd.CNStores) + assert.Equal(t, []pb.DNStore{dn}, cd.DNStores) } runServiceTest(t, true, true, fn) } diff --git a/pkg/pb/logservice/logservice.pb.go b/pkg/pb/logservice/logservice.pb.go index e6f02de1eab92fa178342aacc2ca8734b7888280..db6484f863ffe71a97ff15cd128fa3aaa77fd84c 100644 --- a/pkg/pb/logservice/logservice.pb.go +++ b/pkg/pb/logservice/logservice.pb.go @@ -375,7 +375,7 @@ func (ServiceType) EnumDescriptor() ([]byte, []int) { return fileDescriptor_fd1040c5381ab5a7, []int{8} } -type CNNode struct { +type CNStore struct { UUID string `protobuf:"bytes,1,opt,name=UUID,proto3" json:"UUID,omitempty"` ServiceAddress string `protobuf:"bytes,2,opt,name=ServiceAddress,proto3" json:"ServiceAddress,omitempty"` Tick uint64 `protobuf:"varint,3,opt,name=Tick,proto3" json:"Tick,omitempty"` @@ -385,18 +385,18 @@ type CNNode struct { XXX_sizecache int32 `json:"-"` } -func (m *CNNode) Reset() { *m = CNNode{} } -func (m *CNNode) String() string { return proto.CompactTextString(m) } -func (*CNNode) ProtoMessage() {} -func (*CNNode) Descriptor() ([]byte, []int) { +func (m *CNStore) Reset() { *m = CNStore{} } +func (m *CNStore) String() string { return proto.CompactTextString(m) } +func (*CNStore) ProtoMessage() {} +func (*CNStore) Descriptor() ([]byte, []int) { return fileDescriptor_fd1040c5381ab5a7, []int{0} } -func (m *CNNode) XXX_Unmarshal(b []byte) error { +func (m *CNStore) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *CNNode) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *CNStore) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_CNNode.Marshal(b, m, deterministic) + return xxx_messageInfo_CNStore.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -406,68 +406,69 @@ func (m *CNNode) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (m *CNNode) XXX_Merge(src proto.Message) { - xxx_messageInfo_CNNode.Merge(m, src) +func (m *CNStore) XXX_Merge(src proto.Message) { + xxx_messageInfo_CNStore.Merge(m, src) } -func (m *CNNode) XXX_Size() int { +func (m *CNStore) XXX_Size() int { return m.Size() } -func (m *CNNode) XXX_DiscardUnknown() { - xxx_messageInfo_CNNode.DiscardUnknown(m) +func (m *CNStore) XXX_DiscardUnknown() { + xxx_messageInfo_CNStore.DiscardUnknown(m) } -var xxx_messageInfo_CNNode proto.InternalMessageInfo +var xxx_messageInfo_CNStore proto.InternalMessageInfo -func (m *CNNode) GetUUID() string { +func (m *CNStore) GetUUID() string { if m != nil { return m.UUID } return "" } -func (m *CNNode) GetServiceAddress() string { +func (m *CNStore) GetServiceAddress() string { if m != nil { return m.ServiceAddress } return "" } -func (m *CNNode) GetTick() uint64 { +func (m *CNStore) GetTick() uint64 { if m != nil { return m.Tick } return 0 } -func (m *CNNode) GetState() NodeState { +func (m *CNStore) GetState() NodeState { if m != nil { return m.State } return NormalState } -type DNNode struct { - UUID string `protobuf:"bytes,1,opt,name=UUID,proto3" json:"UUID,omitempty"` - ServiceAddress string `protobuf:"bytes,2,opt,name=ServiceAddress,proto3" json:"ServiceAddress,omitempty"` - Tick uint64 `protobuf:"varint,3,opt,name=Tick,proto3" json:"Tick,omitempty"` - State NodeState `protobuf:"varint,4,opt,name=State,proto3,enum=logservice.NodeState" json:"State,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` +type DNStore struct { + UUID string `protobuf:"bytes,1,opt,name=UUID,proto3" json:"UUID,omitempty"` + ServiceAddress string `protobuf:"bytes,2,opt,name=ServiceAddress,proto3" json:"ServiceAddress,omitempty"` + Tick uint64 `protobuf:"varint,3,opt,name=Tick,proto3" json:"Tick,omitempty"` + State NodeState `protobuf:"varint,4,opt,name=State,proto3,enum=logservice.NodeState" json:"State,omitempty"` + Shards []DNShardInfo `protobuf:"bytes,5,rep,name=Shards,proto3" json:"Shards"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *DNNode) Reset() { *m = DNNode{} } -func (m *DNNode) String() string { return proto.CompactTextString(m) } -func (*DNNode) ProtoMessage() {} -func (*DNNode) Descriptor() ([]byte, []int) { +func (m *DNStore) Reset() { *m = DNStore{} } +func (m *DNStore) String() string { return proto.CompactTextString(m) } +func (*DNStore) ProtoMessage() {} +func (*DNStore) Descriptor() ([]byte, []int) { return fileDescriptor_fd1040c5381ab5a7, []int{1} } -func (m *DNNode) XXX_Unmarshal(b []byte) error { +func (m *DNStore) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *DNNode) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *DNStore) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_DNNode.Marshal(b, m, deterministic) + return xxx_messageInfo_DNStore.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -477,47 +478,54 @@ func (m *DNNode) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (m *DNNode) XXX_Merge(src proto.Message) { - xxx_messageInfo_DNNode.Merge(m, src) +func (m *DNStore) XXX_Merge(src proto.Message) { + xxx_messageInfo_DNStore.Merge(m, src) } -func (m *DNNode) XXX_Size() int { +func (m *DNStore) XXX_Size() int { return m.Size() } -func (m *DNNode) XXX_DiscardUnknown() { - xxx_messageInfo_DNNode.DiscardUnknown(m) +func (m *DNStore) XXX_DiscardUnknown() { + xxx_messageInfo_DNStore.DiscardUnknown(m) } -var xxx_messageInfo_DNNode proto.InternalMessageInfo +var xxx_messageInfo_DNStore proto.InternalMessageInfo -func (m *DNNode) GetUUID() string { +func (m *DNStore) GetUUID() string { if m != nil { return m.UUID } return "" } -func (m *DNNode) GetServiceAddress() string { +func (m *DNStore) GetServiceAddress() string { if m != nil { return m.ServiceAddress } return "" } -func (m *DNNode) GetTick() uint64 { +func (m *DNStore) GetTick() uint64 { if m != nil { return m.Tick } return 0 } -func (m *DNNode) GetState() NodeState { +func (m *DNStore) GetState() NodeState { if m != nil { return m.State } return NormalState } -type LogNode struct { +func (m *DNStore) GetShards() []DNShardInfo { + if m != nil { + return m.Shards + } + return nil +} + +type LogStore struct { UUID string `protobuf:"bytes,1,opt,name=UUID,proto3" json:"UUID,omitempty"` ServiceAddress string `protobuf:"bytes,2,opt,name=ServiceAddress,proto3" json:"ServiceAddress,omitempty"` Tick uint64 `protobuf:"varint,3,opt,name=Tick,proto3" json:"Tick,omitempty"` @@ -528,18 +536,18 @@ type LogNode struct { XXX_sizecache int32 `json:"-"` } -func (m *LogNode) Reset() { *m = LogNode{} } -func (m *LogNode) String() string { return proto.CompactTextString(m) } -func (*LogNode) ProtoMessage() {} -func (*LogNode) Descriptor() ([]byte, []int) { +func (m *LogStore) Reset() { *m = LogStore{} } +func (m *LogStore) String() string { return proto.CompactTextString(m) } +func (*LogStore) ProtoMessage() {} +func (*LogStore) Descriptor() ([]byte, []int) { return fileDescriptor_fd1040c5381ab5a7, []int{2} } -func (m *LogNode) XXX_Unmarshal(b []byte) error { +func (m *LogStore) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *LogNode) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *LogStore) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_LogNode.Marshal(b, m, deterministic) + return xxx_messageInfo_LogStore.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -549,47 +557,47 @@ func (m *LogNode) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (m *LogNode) XXX_Merge(src proto.Message) { - xxx_messageInfo_LogNode.Merge(m, src) +func (m *LogStore) XXX_Merge(src proto.Message) { + xxx_messageInfo_LogStore.Merge(m, src) } -func (m *LogNode) XXX_Size() int { +func (m *LogStore) XXX_Size() int { return m.Size() } -func (m *LogNode) XXX_DiscardUnknown() { - xxx_messageInfo_LogNode.DiscardUnknown(m) +func (m *LogStore) XXX_DiscardUnknown() { + xxx_messageInfo_LogStore.DiscardUnknown(m) } -var xxx_messageInfo_LogNode proto.InternalMessageInfo +var xxx_messageInfo_LogStore proto.InternalMessageInfo -func (m *LogNode) GetUUID() string { +func (m *LogStore) GetUUID() string { if m != nil { return m.UUID } return "" } -func (m *LogNode) GetServiceAddress() string { +func (m *LogStore) GetServiceAddress() string { if m != nil { return m.ServiceAddress } return "" } -func (m *LogNode) GetTick() uint64 { +func (m *LogStore) GetTick() uint64 { if m != nil { return m.Tick } return 0 } -func (m *LogNode) GetState() NodeState { +func (m *LogStore) GetState() NodeState { if m != nil { return m.State } return NormalState } -func (m *LogNode) GetReplicas() []LogReplicaInfo { +func (m *LogStore) GetReplicas() []LogReplicaInfo { if m != nil { return m.Replicas } @@ -2201,12 +2209,12 @@ func (m *DNState) GetStores() map[string]DNStoreInfo { } type ClusterDetails struct { - DNNodes []DNNode `protobuf:"bytes,1,rep,name=DNNodes,proto3" json:"DNNodes"` - CNNodes []CNNode `protobuf:"bytes,2,rep,name=CNNodes,proto3" json:"CNNodes"` - LogNodes []LogNode `protobuf:"bytes,3,rep,name=LogNodes,proto3" json:"LogNodes"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + DNStores []DNStore `protobuf:"bytes,1,rep,name=DNStores,proto3" json:"DNStores"` + CNStores []CNStore `protobuf:"bytes,2,rep,name=CNStores,proto3" json:"CNStores"` + LogStores []LogStore `protobuf:"bytes,3,rep,name=LogStores,proto3" json:"LogStores"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ClusterDetails) Reset() { *m = ClusterDetails{} } @@ -2242,23 +2250,23 @@ func (m *ClusterDetails) XXX_DiscardUnknown() { var xxx_messageInfo_ClusterDetails proto.InternalMessageInfo -func (m *ClusterDetails) GetDNNodes() []DNNode { +func (m *ClusterDetails) GetDNStores() []DNStore { if m != nil { - return m.DNNodes + return m.DNStores } return nil } -func (m *ClusterDetails) GetCNNodes() []CNNode { +func (m *ClusterDetails) GetCNStores() []CNStore { if m != nil { - return m.CNNodes + return m.CNStores } return nil } -func (m *ClusterDetails) GetLogNodes() []LogNode { +func (m *ClusterDetails) GetLogStores() []LogStore { if m != nil { - return m.LogNodes + return m.LogStores } return nil } @@ -2873,9 +2881,9 @@ func init() { proto.RegisterEnum("logservice.HAKeeperState", HAKeeperState_name, HAKeeperState_value) proto.RegisterEnum("logservice.ConfigChangeType", ConfigChangeType_name, ConfigChangeType_value) proto.RegisterEnum("logservice.ServiceType", ServiceType_name, ServiceType_value) - proto.RegisterType((*CNNode)(nil), "logservice.CNNode") - proto.RegisterType((*DNNode)(nil), "logservice.DNNode") - proto.RegisterType((*LogNode)(nil), "logservice.LogNode") + proto.RegisterType((*CNStore)(nil), "logservice.CNStore") + proto.RegisterType((*DNStore)(nil), "logservice.DNStore") + proto.RegisterType((*LogStore)(nil), "logservice.LogStore") proto.RegisterType((*LogShardInfo)(nil), "logservice.LogShardInfo") proto.RegisterMapType((map[uint64]string)(nil), "logservice.LogShardInfo.ReplicasEntry") proto.RegisterType((*LogReplicaInfo)(nil), "logservice.LogReplicaInfo") @@ -2924,167 +2932,167 @@ func init() { func init() { proto.RegisterFile("logservice.proto", fileDescriptor_fd1040c5381ab5a7) } var fileDescriptor_fd1040c5381ab5a7 = []byte{ - // 2497 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x59, 0x4f, 0x6f, 0x1b, 0xc7, - 0x15, 0xd7, 0x92, 0x14, 0x45, 0x3e, 0x4a, 0xca, 0x6a, 0x24, 0xc5, 0x8c, 0x92, 0xca, 0xea, 0x36, - 0x35, 0x5c, 0x26, 0xa1, 0x00, 0x19, 0x0e, 0xea, 0x56, 0xb1, 0x41, 0x71, 0x69, 0x8b, 0x31, 0xbd, - 0x52, 0x97, 0x54, 0x0f, 0x01, 0x02, 0x75, 0xc5, 0x1d, 0x91, 0x5b, 0x93, 0xbb, 0xec, 0xee, 0x52, - 0xb5, 0x72, 0x6a, 0x0f, 0x2e, 0x50, 0xf4, 0xd0, 0xf6, 0x16, 0x14, 0x45, 0xbf, 0x42, 0x0f, 0xcd, - 0x47, 0xc8, 0x21, 0x47, 0x5f, 0x7a, 0x0d, 0x5a, 0x5f, 0xda, 0x5b, 0xbf, 0x42, 0x31, 0xff, 0x76, - 0x67, 0x48, 0x4a, 0xb2, 0x63, 0x17, 0x6d, 0x6f, 0x9c, 0xf7, 0x6f, 0xde, 0xfc, 0xe6, 0xfd, 0x99, - 0x7d, 0x04, 0x7d, 0x10, 0xf4, 0x22, 0x1c, 0x9e, 0x79, 0x5d, 0x5c, 0x1d, 0x85, 0x41, 0x1c, 0x20, - 0x48, 0x29, 0x1b, 0x1f, 0xf4, 0xbc, 0xb8, 0x3f, 0x3e, 0xa9, 0x76, 0x83, 0xe1, 0x76, 0x2f, 0xe8, - 0x05, 0xdb, 0x54, 0xe4, 0x64, 0x7c, 0x4a, 0x57, 0x74, 0x41, 0x7f, 0x31, 0xd5, 0x8d, 0xe5, 0x21, - 0x8e, 0x1d, 0xd7, 0x89, 0x1d, 0xb6, 0x36, 0x9e, 0x6a, 0x90, 0xaf, 0x5b, 0x56, 0xe0, 0x62, 0x84, - 0x20, 0x77, 0x74, 0xd4, 0x34, 0xcb, 0xda, 0x96, 0x76, 0xb3, 0x68, 0xd3, 0xdf, 0xe8, 0x06, 0x2c, - 0xb7, 0xd9, 0x46, 0x35, 0xd7, 0x0d, 0x71, 0x14, 0x95, 0x33, 0x94, 0x3b, 0x41, 0x25, 0xba, 0x1d, - 0xaf, 0xfb, 0xb8, 0x9c, 0xdd, 0xd2, 0x6e, 0xe6, 0x6c, 0xfa, 0x1b, 0xbd, 0x07, 0xf3, 0xed, 0xd8, - 0x89, 0x71, 0x39, 0xb7, 0xa5, 0xdd, 0x5c, 0xde, 0x59, 0xaf, 0x4a, 0xe7, 0x20, 0x1b, 0x52, 0xa6, - 0xcd, 0x64, 0xa8, 0x1f, 0xe6, 0xff, 0x80, 0x1f, 0x5f, 0x6a, 0xb0, 0xd0, 0x0a, 0x7a, 0xff, 0x75, - 0x47, 0xd0, 0x2e, 0x14, 0x6c, 0x3c, 0x1a, 0x78, 0x5d, 0x27, 0x2a, 0xcf, 0x6f, 0x65, 0x6f, 0x96, - 0x76, 0x36, 0x64, 0xf9, 0x56, 0xd0, 0xe3, 0xec, 0xa6, 0x7f, 0x1a, 0xec, 0xe5, 0xbe, 0xfa, 0xfa, - 0xfa, 0x9c, 0x9d, 0x68, 0x18, 0xff, 0xd2, 0x60, 0xb1, 0x15, 0xf4, 0xda, 0x7d, 0x27, 0x74, 0x89, - 0x00, 0x2a, 0xc3, 0x02, 0x5b, 0xb0, 0xe3, 0xe4, 0x6c, 0xb1, 0x44, 0x7b, 0xd2, 0x46, 0x19, 0xba, - 0xd1, 0x8d, 0x89, 0x8d, 0x12, 0x2b, 0x55, 0x21, 0xd8, 0xf0, 0xe3, 0xf0, 0x3c, 0xdd, 0x0e, 0xad, - 0xc1, 0x7c, 0x63, 0x14, 0x74, 0xfb, 0xfc, 0xb8, 0x6c, 0x81, 0x36, 0xa0, 0xd0, 0xc2, 0x8e, 0x8b, - 0xc3, 0xa6, 0x49, 0x8f, 0x9c, 0xb3, 0x93, 0x35, 0xc5, 0x07, 0x87, 0xc3, 0xf2, 0x3c, 0xc7, 0x07, - 0x87, 0xc3, 0x8d, 0x1f, 0xc2, 0x92, 0xb2, 0x01, 0xd2, 0x21, 0xfb, 0x18, 0x9f, 0x73, 0x87, 0xc9, - 0x4f, 0xb2, 0xd1, 0x99, 0x33, 0x18, 0x63, 0x8e, 0x3a, 0x5b, 0xfc, 0x20, 0xf3, 0x7d, 0xcd, 0x38, - 0x83, 0x65, 0x15, 0x13, 0x74, 0x5f, 0x85, 0x80, 0x9a, 0x29, 0xed, 0x94, 0x2f, 0x3a, 0xdc, 0x5e, - 0x81, 0x60, 0xf8, 0xec, 0xeb, 0xeb, 0x9a, 0xad, 0x42, 0xf7, 0x0e, 0x14, 0x85, 0x59, 0x93, 0xee, - 0x9b, 0xb3, 0x53, 0x82, 0x61, 0x81, 0x5e, 0xb7, 0xda, 0x71, 0x10, 0xe2, 0x7d, 0xec, 0x84, 0xf1, - 0x09, 0x76, 0xe2, 0x57, 0x09, 0x1c, 0xe3, 0xaf, 0x1a, 0xac, 0x90, 0xed, 0xaf, 0xb6, 0xb8, 0x05, - 0x25, 0xdb, 0x39, 0x8d, 0x55, 0x73, 0x32, 0x69, 0xc6, 0x9e, 0xd9, 0x99, 0xc1, 0xfa, 0x2e, 0x2c, - 0x3d, 0x08, 0xa2, 0xc8, 0x1b, 0x09, 0xb1, 0x1c, 0x15, 0x53, 0x89, 0xaf, 0x18, 0x91, 0x0d, 0x28, - 0x99, 0xd6, 0x8b, 0xc4, 0xe3, 0xe5, 0x70, 0x3f, 0xd5, 0x40, 0x37, 0x5f, 0x23, 0xde, 0xe8, 0x36, - 0xe4, 0xe9, 0xce, 0x04, 0x1b, 0x72, 0xa6, 0x6b, 0xf2, 0x99, 0x24, 0x8f, 0xf9, 0x81, 0xb8, 0xb0, - 0xf1, 0xeb, 0x0c, 0x14, 0xec, 0xf6, 0x23, 0x96, 0xab, 0x3a, 0x64, 0x3b, 0x51, 0x20, 0xe2, 0xb4, - 0x13, 0x05, 0x24, 0x4e, 0x9b, 0xbe, 0x8b, 0x9f, 0xf0, 0x03, 0xb0, 0x05, 0xc1, 0xb9, 0x85, 0x9d, - 0x08, 0xef, 0x07, 0x03, 0x96, 0x15, 0x2c, 0x5d, 0x54, 0x22, 0x32, 0x60, 0xb1, 0x13, 0x8e, 0xfd, - 0xae, 0x13, 0x63, 0xb7, 0x15, 0xf9, 0x3c, 0x75, 0x14, 0x1a, 0xfa, 0x18, 0x16, 0x99, 0x92, 0x17, - 0xc5, 0x41, 0x78, 0xce, 0xef, 0x43, 0x49, 0x5c, 0xe1, 0x5d, 0x55, 0x16, 0x64, 0x89, 0xab, 0xe8, - 0x6e, 0xdc, 0x83, 0x95, 0x29, 0x91, 0xab, 0x52, 0x2f, 0x27, 0xa7, 0xde, 0xa7, 0x50, 0xa4, 0x97, - 0xdf, 0x0d, 0x42, 0x97, 0x28, 0x12, 0xa7, 0xb9, 0x22, 0xf1, 0xb5, 0x02, 0xb9, 0xce, 0xf9, 0x88, - 0xe9, 0x2d, 0xef, 0xbc, 0xa9, 0xf8, 0x48, 0x75, 0x08, 0xd7, 0xa6, 0x32, 0xe4, 0x26, 0x4d, 0x27, - 0x76, 0x28, 0x30, 0x8b, 0x36, 0xfd, 0x6d, 0x7c, 0xae, 0x01, 0x50, 0xfb, 0x3f, 0x1b, 0xe3, 0x88, - 0x5e, 0xb6, 0xe5, 0x0c, 0xb1, 0xb8, 0x6c, 0xf2, 0x5b, 0x8e, 0xa6, 0x8c, 0x1a, 0x4d, 0xdc, 0x9d, - 0x6c, 0xea, 0x4e, 0x19, 0x16, 0x1e, 0x39, 0x4f, 0xda, 0xde, 0x67, 0x98, 0x23, 0x2b, 0x96, 0x24, - 0xf2, 0xc4, 0x85, 0x9b, 0xbc, 0x30, 0xa5, 0x04, 0xea, 0x9a, 0xd5, 0x34, 0xcb, 0x79, 0x56, 0xb1, - 0xc8, 0x6f, 0xc3, 0x00, 0xe8, 0x44, 0x81, 0xf0, 0x6c, 0x0d, 0xe6, 0xeb, 0xc1, 0xd8, 0x8f, 0xf9, - 0xe1, 0xd9, 0xc2, 0xf8, 0x5d, 0x16, 0x16, 0x84, 0x04, 0x8d, 0x6d, 0xfa, 0x33, 0x89, 0xfb, 0x94, - 0x80, 0xaa, 0x90, 0x7f, 0x84, 0xe3, 0x7e, 0xe0, 0xce, 0x82, 0x8a, 0x71, 0x28, 0x54, 0x5c, 0x0a, - 0xed, 0xca, 0xb8, 0xd0, 0x23, 0x96, 0x54, 0x9d, 0x94, 0xcb, 0xa3, 0x57, 0xc6, 0xb1, 0x46, 0xcb, - 0x63, 0x92, 0x44, 0x14, 0x8c, 0xd2, 0xce, 0xb7, 0x26, 0xcb, 0xa3, 0x92, 0x69, 0xb6, 0xa2, 0x82, - 0xee, 0x42, 0xa9, 0x6e, 0xa5, 0x16, 0xe6, 0xa9, 0x85, 0x77, 0x64, 0x0b, 0x93, 0xa5, 0xd1, 0x96, - 0x15, 0x88, 0xbe, 0x29, 0xe9, 0xe7, 0xa7, 0xf5, 0xcd, 0x29, 0x7d, 0x49, 0x01, 0x7d, 0x28, 0xc3, - 0x5f, 0x5e, 0x98, 0x06, 0x20, 0xe5, 0xda, 0x92, 0xa4, 0xd1, 0x86, 0x12, 0x05, 0x22, 0x1a, 0x05, - 0x7e, 0x84, 0x2f, 0xa9, 0x45, 0x3c, 0x7a, 0x32, 0x4a, 0xf4, 0xb4, 0x9c, 0x28, 0x4e, 0x63, 0x4a, - 0x2c, 0x8d, 0xdf, 0xe6, 0x48, 0x7d, 0xe4, 0x26, 0x5f, 0xef, 0x45, 0xdf, 0x82, 0x62, 0x23, 0x0c, - 0x83, 0xb0, 0x1e, 0xb8, 0x98, 0x6e, 0x3b, 0xf1, 0x78, 0x48, 0x98, 0x76, 0x2a, 0x47, 0xca, 0x08, - 0x5d, 0x3c, 0xc2, 0x51, 0xe4, 0xf4, 0x30, 0xaf, 0xe9, 0x0a, 0x0d, 0x6d, 0x02, 0x34, 0xa3, 0xfd, - 0xda, 0x43, 0x8c, 0x47, 0x38, 0xa4, 0xf7, 0x57, 0xb0, 0x25, 0x0a, 0xba, 0xa7, 0x00, 0xc5, 0x2f, - 0xe8, 0xda, 0x54, 0x88, 0x31, 0x36, 0x8f, 0x31, 0x05, 0xda, 0x5d, 0x58, 0xac, 0x07, 0xc3, 0xa1, - 0xe3, 0xbb, 0x7b, 0x4e, 0xdc, 0xed, 0xf3, 0x3b, 0x52, 0x7a, 0xb0, 0xcc, 0xb7, 0x15, 0x69, 0x74, - 0x07, 0x4a, 0xf4, 0xd6, 0xf8, 0xf6, 0x85, 0xe9, 0xed, 0x25, 0xb6, 0x2d, 0xcb, 0xa2, 0x3d, 0x58, - 0xae, 0x0f, 0xc6, 0x51, 0x8c, 0x43, 0x13, 0xc7, 0x8e, 0x37, 0x88, 0xca, 0x45, 0xaa, 0xad, 0xb4, - 0x2c, 0x55, 0xc2, 0x9e, 0xd0, 0x40, 0x77, 0xa1, 0x98, 0xbe, 0x1e, 0x80, 0xaa, 0x6f, 0xc9, 0xea, - 0x09, 0xf3, 0x47, 0x63, 0x1c, 0x9e, 0xdb, 0x38, 0x1a, 0x0f, 0x62, 0x3b, 0x55, 0x31, 0x3e, 0xa6, - 0x9d, 0x9c, 0xd5, 0xb8, 0xc4, 0xb1, 0xdb, 0xa4, 0x1a, 0x10, 0x4a, 0x54, 0xd6, 0x68, 0xd1, 0x5e, - 0x9f, 0x82, 0x93, 0x70, 0x39, 0x98, 0x42, 0xd6, 0xf8, 0x8e, 0x02, 0x05, 0x29, 0x35, 0x3f, 0xa6, - 0xc5, 0x98, 0x97, 0x1a, 0xba, 0x30, 0x7e, 0xa3, 0x11, 0xe3, 0xb4, 0x55, 0xce, 0xec, 0x89, 0x17, - 0x97, 0x49, 0xa5, 0xe9, 0x66, 0x27, 0x9a, 0x6e, 0xfa, 0xbc, 0xcb, 0xc9, 0xcf, 0xbb, 0x4d, 0x5a, - 0x7e, 0xd4, 0x7a, 0x29, 0x51, 0x8c, 0x3f, 0x64, 0xc8, 0xe5, 0xfb, 0xa7, 0x5e, 0xaf, 0xde, 0x77, - 0xfc, 0x1e, 0x46, 0xb7, 0x12, 0xef, 0xf8, 0x5b, 0x6c, 0x55, 0xed, 0x05, 0x94, 0x95, 0x1e, 0x9c, - 0x9d, 0x63, 0x17, 0x80, 0xa9, 0x4b, 0x3d, 0x44, 0x2d, 0x31, 0xd2, 0x16, 0x34, 0x6b, 0x24, 0x79, - 0xd4, 0x81, 0xe5, 0xa6, 0xef, 0xc5, 0x9e, 0x33, 0x78, 0x84, 0x87, 0x27, 0x38, 0x14, 0x5d, 0xfe, - 0xfd, 0x8b, 0x2c, 0x54, 0x55, 0x71, 0xd6, 0x2f, 0x27, 0x6c, 0x6c, 0xd4, 0x60, 0x75, 0x86, 0xd8, - 0x4b, 0x3d, 0x57, 0xbf, 0x07, 0x4b, 0xed, 0xfe, 0x38, 0x76, 0x83, 0x9f, 0xfb, 0xb4, 0xc2, 0xd1, - 0xbb, 0x21, 0x3f, 0x92, 0x2b, 0x13, 0x4b, 0xe3, 0x69, 0x06, 0xde, 0x68, 0x77, 0xfb, 0xd8, 0x1d, - 0x0f, 0x30, 0x4f, 0x8f, 0x99, 0xb7, 0xfb, 0x2e, 0x2c, 0xed, 0x05, 0x41, 0x1c, 0xc5, 0xa1, 0x33, - 0x1a, 0x79, 0x7e, 0x8f, 0x6e, 0x5a, 0xb0, 0x55, 0x22, 0xcb, 0xc8, 0xf4, 0xbc, 0xbc, 0x6d, 0x94, - 0x2f, 0xc2, 0xc3, 0x56, 0xaf, 0xf0, 0x0e, 0x94, 0xf8, 0xfb, 0x89, 0x5e, 0x07, 0xfb, 0x90, 0x51, - 0x32, 0x52, 0x62, 0xdb, 0xb2, 0x2c, 0xba, 0x37, 0x71, 0x62, 0xde, 0x2e, 0xde, 0x52, 0x33, 0x4a, - 0x12, 0xb0, 0x55, 0x79, 0xc3, 0x51, 0x6b, 0x49, 0xf2, 0x09, 0xa1, 0xa5, 0x9f, 0x10, 0xe8, 0x23, - 0x28, 0x70, 0x19, 0xf1, 0x31, 0xf3, 0xb6, 0x62, 0x5f, 0x85, 0x51, 0x3c, 0x52, 0x85, 0x8a, 0xd1, - 0x24, 0x0d, 0x8d, 0xe1, 0x4e, 0x1e, 0xa9, 0xe2, 0x23, 0x4e, 0x93, 0x3e, 0xe2, 0x5e, 0xf4, 0x1d, - 0xff, 0x47, 0x0d, 0x16, 0x88, 0x2d, 0xf2, 0x3e, 0xfc, 0x08, 0xf2, 0xd4, 0xa8, 0x48, 0xf9, 0xeb, - 0x93, 0x2d, 0x92, 0x3c, 0xd3, 0x98, 0x04, 0x8d, 0xa4, 0xe4, 0xad, 0x49, 0x49, 0x1b, 0x36, 0x94, - 0x24, 0xa6, 0x1c, 0x66, 0x45, 0x16, 0x66, 0x1f, 0xc8, 0x61, 0x36, 0x51, 0x21, 0xa5, 0xf3, 0xc8, - 0xf1, 0xf7, 0x0b, 0x8d, 0xbe, 0xc7, 0x5f, 0xc7, 0x51, 0xbf, 0xe9, 0x13, 0x9a, 0x20, 0x64, 0xbe, - 0x08, 0x42, 0xe6, 0x7f, 0x16, 0x21, 0x73, 0x36, 0x42, 0x7f, 0xd6, 0x26, 0x5b, 0x08, 0xda, 0x21, - 0x0e, 0x93, 0x2f, 0x75, 0xe1, 0x26, 0x52, 0xed, 0x10, 0x96, 0xa8, 0x5f, 0x5c, 0x90, 0xe8, 0xd4, - 0xb9, 0x4e, 0x66, 0x5a, 0xa7, 0xae, 0xe8, 0x70, 0x41, 0x74, 0x1b, 0x0a, 0x7c, 0x06, 0x21, 0x20, - 0x5d, 0x9d, 0x68, 0x12, 0x92, 0x56, 0x22, 0x6a, 0xfc, 0x4a, 0x83, 0x12, 0xf7, 0x98, 0xde, 0xe9, - 0x1d, 0x28, 0x70, 0xf4, 0x85, 0xbf, 0xd7, 0xaa, 0xc9, 0xf8, 0x87, 0x73, 0x94, 0x6e, 0x93, 0x88, - 0xa3, 0x5d, 0xfa, 0xa4, 0xe7, 0xba, 0xcc, 0xef, 0x72, 0xaa, 0x2b, 0x58, 0x8a, 0x72, 0xaa, 0x60, - 0xfc, 0x5e, 0x83, 0x75, 0x5e, 0x20, 0xb9, 0x3f, 0xe2, 0xd1, 0x79, 0x03, 0x96, 0xad, 0xf1, 0xf0, - 0xe0, 0x34, 0x35, 0xce, 0x02, 0x6e, 0x82, 0x4a, 0x6a, 0x19, 0xa5, 0x24, 0xfe, 0xb3, 0x7e, 0xa5, - 0x12, 0x51, 0x05, 0x74, 0xa1, 0x97, 0x7c, 0x99, 0xb2, 0xe6, 0x35, 0x45, 0x37, 0x9e, 0xf1, 0x89, - 0xc8, 0xa5, 0x11, 0xff, 0xff, 0xf5, 0x49, 0xfd, 0x45, 0x86, 0xc6, 0x09, 0xcb, 0xa0, 0xbb, 0x49, - 0x12, 0xb2, 0xab, 0xde, 0x9a, 0x7a, 0xc8, 0xd3, 0x14, 0xa2, 0x22, 0x6a, 0x0a, 0x31, 0x2c, 0xef, - 0x26, 0x19, 0x98, 0xb9, 0x4c, 0xff, 0xc2, 0x14, 0x6c, 0x43, 0x49, 0x32, 0x3e, 0xa3, 0x17, 0x56, - 0xd5, 0x14, 0xbc, 0x70, 0x0e, 0x23, 0xe5, 0x20, 0x35, 0x7a, 0x69, 0x5e, 0x5f, 0x65, 0x74, 0x56, - 0x62, 0xff, 0x92, 0xbc, 0x4b, 0xfa, 0xb8, 0xfb, 0x18, 0x87, 0x0c, 0xba, 0x59, 0x91, 0x70, 0x4f, - 0x49, 0xa5, 0x99, 0x85, 0x35, 0x65, 0x8b, 0x97, 0xaf, 0x9c, 0x7c, 0xb7, 0x92, 0xe2, 0xc6, 0x5b, - 0xec, 0xea, 0x8c, 0x92, 0x96, 0x16, 0x0b, 0xe6, 0xc9, 0x87, 0xe9, 0x85, 0xf2, 0xef, 0xb1, 0xb5, - 0x59, 0xd7, 0x20, 0x65, 0x3e, 0xd3, 0xdb, 0x16, 0x93, 0xc5, 0x79, 0xda, 0x90, 0x95, 0x9e, 0x2a, - 0x1e, 0xf3, 0xca, 0x98, 0xf3, 0x8b, 0x79, 0xd0, 0x05, 0x23, 0x19, 0x63, 0xcc, 0xc2, 0xe1, 0x4d, - 0xc8, 0x5b, 0xf8, 0x49, 0x9c, 0xbc, 0x18, 0xf9, 0x2a, 0x69, 0xbe, 0x59, 0xa9, 0xf9, 0x6e, 0xab, - 0xf3, 0xcd, 0x2b, 0xbd, 0x40, 0x2e, 0xe8, 0x13, 0x1d, 0x59, 0xa4, 0xc1, 0xce, 0x2c, 0xdd, 0x64, - 0xa2, 0x31, 0xa9, 0x24, 0xc7, 0xe3, 0x94, 0x45, 0xd4, 0x94, 0x6b, 0x59, 0x9e, 0x9a, 0x7f, 0xef, - 0x52, 0xf3, 0x89, 0x34, 0x7b, 0xfd, 0xa5, 0xda, 0xe4, 0x52, 0x79, 0xbb, 0xe6, 0x5f, 0x32, 0xab, - 0x33, 0x3a, 0x79, 0x5a, 0xcd, 0xd9, 0x29, 0xa5, 0x48, 0x28, 0x7c, 0xa3, 0x48, 0x28, 0xbe, 0x44, - 0x24, 0x4c, 0xc4, 0x2d, 0xbc, 0x6c, 0xdc, 0x6e, 0x7c, 0x0a, 0xeb, 0x33, 0xe1, 0x7d, 0xc9, 0xe4, - 0x53, 0xbe, 0xea, 0xa4, 0x8c, 0xde, 0xa5, 0x63, 0xda, 0x0b, 0x2a, 0x45, 0xf1, 0xaa, 0x49, 0x53, - 0x13, 0x4a, 0xf2, 0x84, 0xf7, 0x55, 0xe6, 0xac, 0x7f, 0xca, 0xc0, 0xda, 0xac, 0x0f, 0xb8, 0x4b, - 0xa6, 0x01, 0x87, 0x53, 0x93, 0xf2, 0xea, 0x55, 0x9f, 0x83, 0xea, 0xc4, 0x7c, 0xb2, 0x82, 0xbf, - 0xa6, 0xb9, 0x79, 0xe7, 0xea, 0xb9, 0xf9, 0x65, 0xef, 0x1f, 0x09, 0x51, 0x09, 0xeb, 0xca, 0x4f, - 0x00, 0x8e, 0x46, 0xae, 0x13, 0xb3, 0xd7, 0xfb, 0x35, 0x58, 0x55, 0xa6, 0x94, 0x8c, 0xa5, 0xcf, - 0xa1, 0x75, 0x58, 0x11, 0x93, 0xc9, 0x56, 0xdb, 0xe2, 0x64, 0x0d, 0xad, 0xc2, 0x1b, 0x47, 0x11, - 0x0e, 0xa9, 0x3f, 0x9c, 0x98, 0x41, 0x4b, 0x50, 0xec, 0xb4, 0x0f, 0xf8, 0x32, 0x5b, 0xa9, 0x42, - 0x31, 0xf9, 0xdb, 0x03, 0xbd, 0x01, 0x25, 0x2b, 0x08, 0x87, 0xce, 0x80, 0x2e, 0xf5, 0x39, 0xa4, - 0xc3, 0x62, 0xc7, 0x1b, 0xe2, 0x60, 0x1c, 0x33, 0x8a, 0x56, 0xf9, 0x87, 0x06, 0x90, 0x4e, 0x47, - 0xd0, 0x32, 0x40, 0xa7, 0x7d, 0x70, 0x7c, 0x74, 0x68, 0xd6, 0x3a, 0x0d, 0x7d, 0x0e, 0x01, 0xe4, - 0x6b, 0x87, 0x87, 0x0d, 0xcb, 0xd4, 0x35, 0x54, 0x80, 0x9c, 0xdd, 0xa8, 0x99, 0x7a, 0x06, 0x2d, - 0x42, 0xa1, 0x63, 0x1f, 0x59, 0x75, 0x22, 0x93, 0x25, 0x46, 0x1f, 0x34, 0x3a, 0xc7, 0x09, 0x25, - 0x87, 0x4a, 0xb0, 0x50, 0x3f, 0xb0, 0xac, 0x46, 0xbd, 0xa3, 0xcf, 0x13, 0x93, 0x7c, 0x71, 0x6c, - 0x1f, 0xe8, 0x79, 0xb4, 0x02, 0x4b, 0xad, 0x83, 0x07, 0xc7, 0xfb, 0x8d, 0x9a, 0xdd, 0xd9, 0x6b, - 0xd4, 0x3a, 0xfa, 0x02, 0xb1, 0x50, 0xb7, 0x24, 0x4a, 0x81, 0x50, 0x4c, 0x99, 0x52, 0x44, 0x08, - 0x96, 0xeb, 0xfb, 0x8d, 0xfa, 0xc3, 0xe3, 0xfd, 0xda, 0xc3, 0x46, 0xe3, 0xb0, 0x61, 0xeb, 0x40, - 0x00, 0x24, 0x3b, 0xd7, 0x5b, 0x47, 0xed, 0x4e, 0xc3, 0x3e, 0x36, 0x1b, 0x9d, 0x5a, 0xb3, 0xd5, - 0xd6, 0x4b, 0x44, 0x98, 0x30, 0xda, 0xfb, 0x35, 0xdb, 0x3c, 0x6e, 0x5a, 0xf7, 0x0f, 0xf4, 0xc5, - 0x8a, 0x05, 0x90, 0x8e, 0x46, 0x89, 0x57, 0x04, 0x4b, 0x46, 0xd1, 0xe7, 0xc8, 0x91, 0x9a, 0x7e, - 0x8c, 0x43, 0xdf, 0x19, 0xe8, 0x1a, 0x01, 0x8e, 0xde, 0x4c, 0x82, 0xf2, 0x0a, 0x9f, 0x32, 0xdb, - 0xf8, 0xa7, 0xb8, 0x1b, 0x63, 0x57, 0xcf, 0x56, 0xfe, 0x92, 0x91, 0x26, 0x48, 0xe4, 0xc8, 0x56, - 0x40, 0x97, 0xfa, 0x1c, 0x59, 0x70, 0x98, 0x75, 0x8d, 0x58, 0xae, 0x3b, 0x7e, 0x17, 0x0f, 0xb0, - 0xab, 0x67, 0xc8, 0xc1, 0x9a, 0xfe, 0x99, 0x33, 0xf0, 0x5c, 0x1a, 0xda, 0x7a, 0x96, 0xf8, 0xca, - 0x29, 0x42, 0x27, 0x27, 0xd1, 0x0e, 0x9d, 0xf3, 0x41, 0xe0, 0xb8, 0xfa, 0x3c, 0x7a, 0x13, 0x90, - 0x4a, 0x6b, 0x7b, 0x9f, 0x61, 0x3d, 0x4f, 0xec, 0x27, 0x5e, 0x2d, 0x10, 0x47, 0xa9, 0x61, 0x2b, - 0x88, 0x6d, 0xec, 0xb8, 0xe7, 0x0c, 0xcb, 0xf6, 0x79, 0x14, 0xe3, 0x61, 0x7d, 0x10, 0x44, 0xd8, - 0xd5, 0x8b, 0x34, 0xf0, 0x22, 0xbf, 0x36, 0x08, 0x89, 0x44, 0x32, 0x03, 0xd7, 0x5d, 0x82, 0xca, - 0xc1, 0x38, 0x3e, 0x38, 0xb5, 0xc9, 0x87, 0xa9, 0x4e, 0xba, 0xd7, 0xb2, 0x15, 0xc4, 0x52, 0x90, - 0xea, 0xa7, 0x2c, 0xa8, 0x62, 0x51, 0xe0, 0xf5, 0x1e, 0x5a, 0x03, 0x5d, 0x94, 0x1f, 0x2b, 0x88, - 0xef, 0x07, 0x63, 0xdf, 0xd5, 0xfb, 0x68, 0x1d, 0xf4, 0x83, 0xb8, 0x8f, 0x43, 0xb6, 0x35, 0x43, - 0xe6, 0x9f, 0x0b, 0x95, 0x2f, 0x35, 0x40, 0x42, 0x57, 0x4a, 0x05, 0x12, 0x77, 0x5e, 0xf7, 0xb1, - 0x9c, 0x01, 0xd2, 0x50, 0x33, 0xc9, 0x80, 0x75, 0x58, 0x31, 0xa7, 0xc8, 0x19, 0x02, 0x8d, 0x3c, - 0x43, 0x15, 0xc9, 0x40, 0x5c, 0x7d, 0x80, 0xe3, 0x24, 0xb1, 0x72, 0xe8, 0xad, 0xa9, 0x42, 0xcc, - 0x59, 0xf3, 0xe4, 0xa8, 0x6d, 0xcc, 0xd2, 0x82, 0xd3, 0xf2, 0xa8, 0x0c, 0x6b, 0xea, 0x93, 0x9b, - 0x73, 0x16, 0x2a, 0x9f, 0x6b, 0xb0, 0xa4, 0xb4, 0x5f, 0x92, 0x9c, 0x82, 0x50, 0x0f, 0x31, 0xc5, - 0x73, 0x8e, 0xec, 0x27, 0x88, 0xca, 0xc4, 0x40, 0xd7, 0xd0, 0x77, 0xe1, 0xdb, 0x53, 0x2c, 0xd1, - 0x1c, 0x6c, 0xdc, 0xc5, 0xde, 0x19, 0x8d, 0x97, 0xb7, 0xe1, 0xda, 0x94, 0xd8, 0x7d, 0xc7, 0x23, - 0xc1, 0x94, 0x95, 0xf7, 0xb4, 0xc7, 0xbe, 0x4f, 0x0c, 0xe7, 0x2a, 0x7d, 0xd0, 0x27, 0xc7, 0x37, - 0x04, 0xde, 0x9a, 0xeb, 0xf2, 0xa2, 0xa4, 0xcf, 0x91, 0x28, 0xb1, 0xf1, 0x30, 0x38, 0xc3, 0x82, - 0xa4, 0xd1, 0x28, 0x89, 0x9d, 0x30, 0x16, 0x94, 0x0c, 0x41, 0xaf, 0x1d, 0x07, 0x23, 0x41, 0xc8, - 0x12, 0x2b, 0x0f, 0xbd, 0xc1, 0xe0, 0x93, 0x60, 0x78, 0xe2, 0x61, 0x3d, 0x57, 0x79, 0x5f, 0x19, - 0x5c, 0x10, 0x36, 0x89, 0x03, 0x46, 0xd1, 0xe7, 0x48, 0x65, 0x32, 0x7d, 0xb1, 0xd4, 0xf6, 0x1a, - 0xcf, 0xfe, 0xbe, 0x39, 0xf7, 0xd5, 0xf3, 0x4d, 0xed, 0xd9, 0xf3, 0x4d, 0xed, 0x6f, 0xcf, 0x37, - 0xb5, 0x4f, 0x6e, 0x49, 0x7f, 0xb3, 0x0f, 0x9d, 0x38, 0xf4, 0x9e, 0x04, 0xa1, 0xd7, 0xf3, 0x7c, - 0xb1, 0xf0, 0xf1, 0xf6, 0xe8, 0x71, 0x6f, 0x7b, 0x74, 0xb2, 0x9d, 0x56, 0xd6, 0x93, 0x3c, 0xfd, - 0x8f, 0xfd, 0xd6, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0xf6, 0x37, 0xc0, 0xd7, 0xc2, 0x1f, 0x00, - 0x00, -} - -func (m *CNNode) Marshal() (dAtA []byte, err error) { + // 2499 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x39, 0xcb, 0x6f, 0x1b, 0xc7, + 0xf9, 0x5a, 0x92, 0xe2, 0xe3, 0xa3, 0xc4, 0xac, 0x46, 0x92, 0xcd, 0x28, 0xf9, 0xc9, 0xfa, 0x6d, + 0x53, 0xc3, 0x65, 0x12, 0x09, 0x90, 0xe1, 0x20, 0x6e, 0x15, 0x1b, 0x14, 0x97, 0xb6, 0x18, 0xcb, + 0x2b, 0x75, 0x49, 0xf5, 0x10, 0x20, 0x50, 0x57, 0xdc, 0x11, 0xb9, 0x35, 0xb9, 0xcb, 0xee, 0x2e, + 0x55, 0x2b, 0xa7, 0xf6, 0x90, 0x00, 0x45, 0x0f, 0x6d, 0x6f, 0x41, 0x11, 0xf4, 0x9f, 0x68, 0x0e, + 0xbd, 0xf4, 0xd6, 0x02, 0x39, 0xfa, 0xd2, 0x6b, 0xd0, 0xfa, 0xd2, 0xde, 0xfa, 0x2f, 0x14, 0xf3, + 0xda, 0x9d, 0x21, 0x29, 0xa9, 0x8e, 0x5d, 0x20, 0xbd, 0xed, 0x7c, 0xaf, 0x99, 0xf9, 0xde, 0xf3, + 0x2d, 0xe8, 0x83, 0xa0, 0x17, 0xe1, 0xf0, 0xcc, 0xeb, 0xe2, 0xcd, 0x51, 0x18, 0xc4, 0x01, 0x82, + 0x14, 0xb2, 0xf6, 0x6e, 0xcf, 0x8b, 0xfb, 0xe3, 0x93, 0xcd, 0x6e, 0x30, 0xdc, 0xea, 0x05, 0xbd, + 0x60, 0x8b, 0x92, 0x9c, 0x8c, 0x4f, 0xe9, 0x8a, 0x2e, 0xe8, 0x17, 0x63, 0x5d, 0xab, 0x0c, 0x71, + 0xec, 0xb8, 0x4e, 0xec, 0xb0, 0xb5, 0xf1, 0x99, 0x06, 0x85, 0x86, 0xd5, 0x8e, 0x83, 0x10, 0x23, + 0x04, 0xb9, 0xa3, 0xa3, 0x96, 0x59, 0xd5, 0x36, 0xb4, 0x5b, 0x25, 0x9b, 0x7e, 0xa3, 0x9b, 0x50, + 0x69, 0xb3, 0x9d, 0xea, 0xae, 0x1b, 0xe2, 0x28, 0xaa, 0x66, 0x28, 0x76, 0x02, 0x4a, 0x78, 0x3b, + 0x5e, 0xf7, 0x49, 0x35, 0xbb, 0xa1, 0xdd, 0xca, 0xd9, 0xf4, 0x1b, 0xbd, 0x0d, 0xf3, 0xed, 0xd8, + 0x89, 0x71, 0x35, 0xb7, 0xa1, 0xdd, 0xaa, 0x6c, 0xaf, 0x6e, 0x4a, 0x17, 0xb1, 0x02, 0x17, 0x53, + 0xa4, 0xcd, 0x68, 0x8c, 0x3f, 0x69, 0x50, 0x30, 0xbf, 0x05, 0x07, 0x41, 0x77, 0x20, 0xdf, 0xee, + 0x3b, 0xa1, 0x1b, 0x55, 0xe7, 0x37, 0xb2, 0xb7, 0xca, 0xdb, 0xd7, 0x65, 0x6a, 0xd3, 0xa2, 0xb8, + 0x96, 0x7f, 0x1a, 0xec, 0xe6, 0xbe, 0xfa, 0xfa, 0xc6, 0x9c, 0xcd, 0x89, 0x8d, 0xbf, 0x68, 0x50, + 0xdc, 0x0f, 0x7a, 0xdf, 0x82, 0x0b, 0xec, 0x40, 0xd1, 0xc6, 0xa3, 0x81, 0xd7, 0x75, 0xc4, 0x15, + 0xd6, 0x64, 0xfa, 0xfd, 0xa0, 0xc7, 0xd1, 0xd2, 0x2d, 0x12, 0x0e, 0xe3, 0x5f, 0x1a, 0x2c, 0x90, + 0x7b, 0x88, 0x6b, 0xa2, 0x2a, 0x14, 0xd8, 0x82, 0x5d, 0x27, 0x67, 0x8b, 0x25, 0xda, 0x95, 0x36, + 0xca, 0xd0, 0x8d, 0x6e, 0x4e, 0x6c, 0x94, 0x48, 0xd9, 0x14, 0x84, 0x4d, 0x3f, 0x0e, 0xcf, 0xd3, + 0xed, 0xd0, 0x0a, 0xcc, 0x37, 0x47, 0x41, 0xb7, 0xcf, 0xaf, 0xcb, 0x16, 0x68, 0x0d, 0x8a, 0xfb, + 0xd8, 0x71, 0x71, 0xd8, 0x32, 0xe9, 0x95, 0x73, 0x76, 0xb2, 0xa6, 0xfa, 0xc1, 0xe1, 0xb0, 0x3a, + 0xcf, 0xf5, 0x83, 0xc3, 0xe1, 0xda, 0x0f, 0x60, 0x51, 0xd9, 0x00, 0xe9, 0x90, 0x7d, 0x82, 0xcf, + 0xf9, 0x81, 0xc9, 0x27, 0xd9, 0xe8, 0xcc, 0x19, 0x8c, 0x31, 0xd7, 0x3a, 0x5b, 0x7c, 0x3f, 0xf3, + 0xbe, 0x66, 0x9c, 0x41, 0x45, 0xd5, 0x09, 0x7a, 0xa0, 0xaa, 0x80, 0x8a, 0x29, 0x6f, 0x57, 0x2f, + 0xba, 0xdc, 0x6e, 0x91, 0xe8, 0xf0, 0xd9, 0xd7, 0x37, 0x34, 0x5b, 0x55, 0xdd, 0x9b, 0x50, 0x12, + 0x62, 0x4d, 0xba, 0x6f, 0xce, 0x4e, 0x01, 0x86, 0x05, 0x3a, 0x8f, 0xbc, 0x3d, 0xec, 0x84, 0xf1, + 0x09, 0x76, 0xe2, 0x97, 0x71, 0x1c, 0xe3, 0xaf, 0x1a, 0x2c, 0x09, 0x0f, 0xbc, 0x5c, 0xe2, 0x06, + 0x94, 0x6d, 0xe7, 0x34, 0x56, 0xc5, 0xc9, 0xa0, 0x19, 0x7b, 0x66, 0x67, 0x3a, 0xeb, 0x5b, 0xb0, + 0xf8, 0x30, 0x88, 0x22, 0x6f, 0x24, 0xc8, 0x72, 0x94, 0x4c, 0x05, 0xbe, 0xa4, 0x47, 0x36, 0xa1, + 0x2c, 0x85, 0xdd, 0x25, 0xfe, 0x78, 0xb9, 0xba, 0x3f, 0xd5, 0x40, 0x37, 0x5f, 0xa1, 0xbe, 0xa5, + 0x44, 0x91, 0x7d, 0x91, 0x44, 0xf1, 0xcb, 0x0c, 0x14, 0xed, 0xf6, 0x63, 0x16, 0xab, 0x3a, 0x64, + 0x3b, 0x51, 0x20, 0xfc, 0xb4, 0x13, 0x05, 0xc4, 0x4f, 0x5b, 0xbe, 0x8b, 0x9f, 0xf2, 0x0b, 0xb0, + 0x05, 0xd1, 0xf3, 0x3e, 0x76, 0x22, 0xbc, 0x17, 0x0c, 0x58, 0x54, 0xb0, 0x70, 0x51, 0x81, 0xc8, + 0x80, 0x85, 0x4e, 0x38, 0xf6, 0xbb, 0x4e, 0x8c, 0xdd, 0xfd, 0xc8, 0xe7, 0xa1, 0xa3, 0xc0, 0xd0, + 0x87, 0xb0, 0xc0, 0x98, 0xbc, 0x28, 0x0e, 0xc2, 0x73, 0x6e, 0x0f, 0x25, 0x70, 0xc5, 0xe9, 0x36, + 0x65, 0x42, 0x16, 0xb8, 0x0a, 0xef, 0xda, 0x7d, 0x58, 0x9a, 0x22, 0xb9, 0x2a, 0xf4, 0x72, 0x72, + 0xe8, 0x7d, 0x0c, 0x25, 0x6a, 0xfc, 0x6e, 0x10, 0xba, 0x84, 0x91, 0x1c, 0x9a, 0x33, 0x92, 0xb3, + 0xd6, 0x20, 0xd7, 0x39, 0x1f, 0x31, 0xbe, 0xca, 0xf6, 0x35, 0xe5, 0x8c, 0x94, 0x87, 0x60, 0x6d, + 0x4a, 0x43, 0x2c, 0x69, 0x3a, 0xb1, 0x43, 0x15, 0xb3, 0x60, 0xd3, 0x6f, 0xe3, 0x73, 0x0d, 0x80, + 0xca, 0xff, 0xe9, 0x18, 0x47, 0xd4, 0xd8, 0x96, 0x33, 0xc4, 0xc2, 0xd8, 0xe4, 0x5b, 0xf6, 0xa6, + 0x8c, 0xea, 0x4d, 0xfc, 0x38, 0xd9, 0xf4, 0x38, 0x55, 0x28, 0x3c, 0x76, 0x9e, 0xb6, 0xbd, 0x4f, + 0x30, 0xd7, 0xac, 0x58, 0x12, 0xcf, 0x13, 0x06, 0x37, 0x79, 0x62, 0x4a, 0x01, 0xf4, 0x68, 0x56, + 0xcb, 0xac, 0xe6, 0x59, 0xc6, 0x22, 0xdf, 0x86, 0x01, 0xd0, 0x89, 0x02, 0x71, 0xb2, 0x15, 0x98, + 0x6f, 0x04, 0x63, 0x3f, 0xe6, 0x97, 0x67, 0x0b, 0xe3, 0x37, 0x59, 0x28, 0x08, 0x0a, 0xea, 0xdb, + 0xf4, 0x33, 0xf1, 0xfb, 0x14, 0x80, 0x36, 0x21, 0xff, 0x18, 0xc7, 0xfd, 0xc0, 0x9d, 0xa5, 0x2a, + 0x86, 0xa1, 0xaa, 0xe2, 0x54, 0x68, 0x47, 0xd6, 0x0b, 0xbd, 0x62, 0x59, 0xe5, 0x49, 0xb1, 0xdc, + 0x7b, 0x65, 0x3d, 0xd6, 0x69, 0x7a, 0x4c, 0x82, 0x88, 0x2a, 0xa3, 0xbc, 0xfd, 0x7f, 0x93, 0xe9, + 0x51, 0x89, 0x34, 0x5b, 0x61, 0x41, 0xf7, 0xa0, 0xdc, 0xb0, 0x52, 0x09, 0xf3, 0x54, 0xc2, 0x9b, + 0xb2, 0x84, 0xc9, 0xd4, 0x68, 0xcb, 0x0c, 0x84, 0xdf, 0x94, 0xf8, 0xf3, 0xd3, 0xfc, 0xe6, 0x14, + 0xbf, 0xc4, 0x80, 0xde, 0x93, 0xd5, 0x5f, 0x2d, 0x4c, 0x2b, 0x20, 0xc5, 0xda, 0x12, 0xa5, 0xd1, + 0x86, 0x32, 0x55, 0x44, 0x34, 0x0a, 0xfc, 0x08, 0x5f, 0x92, 0x8b, 0xb8, 0xf7, 0x64, 0x14, 0xef, + 0xd9, 0x77, 0xa2, 0x38, 0xf5, 0x29, 0xb1, 0x34, 0x7e, 0x9d, 0x23, 0xf9, 0x91, 0x8b, 0x7c, 0xb5, + 0x86, 0xbe, 0x0d, 0xa5, 0x66, 0x18, 0x06, 0x61, 0x23, 0x70, 0x31, 0xdd, 0x76, 0xa2, 0x79, 0x48, + 0x90, 0x76, 0x4a, 0x47, 0xd2, 0x08, 0x5d, 0x3c, 0xc6, 0x51, 0xe4, 0xf4, 0x30, 0xcf, 0xe9, 0x0a, + 0x0c, 0xad, 0x03, 0xb4, 0xa2, 0xbd, 0xfa, 0x23, 0x8c, 0x47, 0x38, 0xa4, 0xf6, 0x2b, 0xda, 0x12, + 0x04, 0xdd, 0x57, 0x14, 0xc5, 0x0d, 0x74, 0x7d, 0xca, 0xc5, 0x18, 0x9a, 0xfb, 0x98, 0xa2, 0xda, + 0x1d, 0x58, 0x68, 0x04, 0xc3, 0xa1, 0xe3, 0xbb, 0xbb, 0x4e, 0xdc, 0xed, 0x73, 0x1b, 0x29, 0x35, + 0x58, 0xc6, 0xdb, 0x0a, 0x35, 0xba, 0x0b, 0x65, 0x6a, 0x35, 0xbe, 0x7d, 0x71, 0x7a, 0x7b, 0x09, + 0x6d, 0xcb, 0xb4, 0x68, 0x17, 0x2a, 0x8d, 0xc1, 0x38, 0x8a, 0x71, 0x68, 0xe2, 0xd8, 0xf1, 0x06, + 0x51, 0xb5, 0x44, 0xb9, 0x95, 0x92, 0xa5, 0x52, 0xd8, 0x13, 0x1c, 0xe8, 0x1e, 0x94, 0xd2, 0xee, + 0x01, 0x28, 0xfb, 0x86, 0xcc, 0x9e, 0x20, 0x7f, 0x38, 0xc6, 0xe1, 0xb9, 0x8d, 0xa3, 0xf1, 0x20, + 0xb6, 0x53, 0x16, 0xe3, 0x43, 0x5a, 0xc9, 0x59, 0x8e, 0x4b, 0x0e, 0x76, 0x87, 0x64, 0x03, 0x02, + 0x89, 0xaa, 0x1a, 0x4d, 0xda, 0xab, 0x53, 0xea, 0x24, 0x58, 0xae, 0x4c, 0x41, 0x6b, 0x7c, 0x47, + 0x51, 0x05, 0x49, 0x35, 0x3f, 0xa2, 0xc9, 0x98, 0xa7, 0x1a, 0xba, 0x30, 0x7e, 0xa5, 0x11, 0xe1, + 0xb4, 0x54, 0xce, 0xac, 0x89, 0x17, 0xa7, 0x49, 0xa5, 0xe8, 0x66, 0x27, 0x8a, 0x6e, 0xda, 0xde, + 0xe5, 0xe4, 0xf6, 0x6e, 0x9d, 0xa6, 0x1f, 0x35, 0x5f, 0x4a, 0x10, 0xe3, 0x77, 0x19, 0x62, 0x7c, + 0xff, 0xd4, 0xeb, 0x35, 0xfa, 0x8e, 0xdf, 0xc3, 0xe8, 0x76, 0x72, 0x3a, 0xde, 0x8b, 0x2d, 0xab, + 0xb5, 0x80, 0xa2, 0xd2, 0x8b, 0xb3, 0x7b, 0xec, 0x00, 0x30, 0x76, 0xa9, 0x86, 0xa8, 0x29, 0x46, + 0xda, 0x82, 0x46, 0x8d, 0x44, 0x8f, 0x3a, 0x50, 0x69, 0xf9, 0x5e, 0xec, 0x39, 0x83, 0xc7, 0x78, + 0x78, 0x82, 0x43, 0x51, 0xe5, 0xdf, 0xb9, 0x48, 0xc2, 0xa6, 0x4a, 0xce, 0xea, 0xe5, 0x84, 0x8c, + 0xb5, 0x3a, 0x2c, 0xcf, 0x20, 0x7b, 0xa1, 0x76, 0xf5, 0x7b, 0xb0, 0xd8, 0xee, 0x8f, 0x63, 0x37, + 0xf8, 0x99, 0xcf, 0x1e, 0x1b, 0xc4, 0x36, 0xe4, 0x23, 0x31, 0x99, 0x58, 0x1a, 0x9f, 0x66, 0xe0, + 0xb5, 0x76, 0xb7, 0x8f, 0xdd, 0xf1, 0x00, 0xf3, 0xf0, 0x98, 0x69, 0xdd, 0xb7, 0x60, 0x71, 0x37, + 0x08, 0xe2, 0x28, 0x0e, 0x9d, 0xd1, 0xc8, 0xf3, 0x7b, 0x74, 0xd3, 0xa2, 0xad, 0x02, 0x59, 0x44, + 0xa6, 0xf7, 0xe5, 0x65, 0xa3, 0x7a, 0x91, 0x3e, 0x6c, 0xd5, 0x84, 0x77, 0xa1, 0xcc, 0xfb, 0x27, + 0x6a, 0x0e, 0xf6, 0x90, 0x51, 0x22, 0x52, 0x42, 0xdb, 0x32, 0x2d, 0xba, 0x3f, 0x71, 0x63, 0x5e, + 0x2e, 0x5e, 0x57, 0x23, 0x4a, 0x22, 0xb0, 0x55, 0x7a, 0xc3, 0x51, 0x73, 0x49, 0xf2, 0x84, 0xd0, + 0xd2, 0x27, 0x04, 0xfa, 0x00, 0x8a, 0x9c, 0x46, 0x3c, 0x66, 0xde, 0x50, 0xe4, 0xab, 0x6a, 0x14, + 0x4d, 0xaa, 0x60, 0x31, 0x5a, 0xa4, 0xa0, 0x31, 0xbd, 0x93, 0x26, 0x55, 0x3c, 0xe2, 0x34, 0xe9, + 0x11, 0xf7, 0x9f, 0xf6, 0xf1, 0x5f, 0xf0, 0x27, 0x39, 0xe9, 0x0f, 0x3f, 0x80, 0x3c, 0x15, 0x2a, + 0x42, 0xfe, 0xc6, 0x64, 0x89, 0x24, 0x6d, 0x1a, 0xa3, 0xa0, 0x9e, 0x94, 0xf4, 0x9a, 0x14, 0xb4, + 0x66, 0x43, 0x59, 0x42, 0xca, 0x6e, 0x56, 0x62, 0x6e, 0xf6, 0xae, 0xec, 0x66, 0x13, 0x19, 0x52, + 0xba, 0x8f, 0xec, 0x7f, 0x3f, 0xd7, 0x68, 0x3f, 0xfe, 0x2a, 0xae, 0xfa, 0x4d, 0x5b, 0xe8, 0x2f, + 0xf8, 0xac, 0xe0, 0x4a, 0x0d, 0x99, 0xff, 0x5d, 0x0d, 0x99, 0xb3, 0x35, 0xf4, 0x47, 0x6d, 0xb2, + 0x84, 0xa0, 0x3b, 0x50, 0xe4, 0xc4, 0xe2, 0x9c, 0xcb, 0x33, 0x04, 0x09, 0xaf, 0x12, 0xa4, 0x84, + 0xad, 0x21, 0xd8, 0x32, 0xd3, 0x6c, 0x0d, 0x95, 0x4d, 0x90, 0xa2, 0xf7, 0x69, 0x5b, 0xcd, 0xf9, + 0x98, 0x66, 0x57, 0x66, 0x75, 0x67, 0x9c, 0x31, 0x25, 0x36, 0x3e, 0xd3, 0xa0, 0xcc, 0x8f, 0x4e, + 0x8d, 0x7b, 0x97, 0x9e, 0x9b, 0x99, 0x48, 0xe3, 0x26, 0x4a, 0x26, 0x48, 0x1c, 0xa3, 0x94, 0x9d, + 0x84, 0x1c, 0xed, 0xb0, 0x43, 0x30, 0x5e, 0x76, 0xf8, 0x6a, 0xca, 0x2b, 0x50, 0x0a, 0x73, 0xca, + 0x60, 0xfc, 0x56, 0x83, 0x55, 0x9e, 0x29, 0xf9, 0x79, 0x44, 0xf7, 0x79, 0x13, 0x2a, 0xd6, 0x78, + 0x78, 0x70, 0x9a, 0x0a, 0x67, 0x9e, 0x37, 0x01, 0x25, 0x49, 0x8d, 0x42, 0x92, 0xf3, 0xb3, 0xc2, + 0xa5, 0x02, 0x51, 0x0d, 0x74, 0xc1, 0x97, 0x3c, 0x51, 0x59, 0x15, 0x9b, 0x82, 0x1b, 0xcf, 0xf8, + 0x68, 0xe4, 0x52, 0xd7, 0xff, 0xdf, 0x7a, 0x5b, 0x7f, 0x99, 0xe1, 0x53, 0x2b, 0x12, 0x4a, 0xf7, + 0x92, 0x68, 0x64, 0xa6, 0xde, 0x98, 0xf2, 0x19, 0x1a, 0x4b, 0x94, 0x44, 0x8d, 0x25, 0xa6, 0xcb, + 0x7b, 0x49, 0x28, 0x66, 0x2e, 0xe3, 0xbf, 0x30, 0x16, 0xdb, 0x50, 0x96, 0x84, 0xcf, 0x28, 0x8a, + 0x9b, 0x6a, 0x2c, 0x5e, 0x38, 0x90, 0x91, 0x82, 0x91, 0x0a, 0xbd, 0x34, 0xc0, 0xaf, 0x12, 0x3a, + 0x2b, 0xc2, 0x7f, 0x41, 0x1a, 0x94, 0x3e, 0xee, 0x3e, 0xc1, 0x21, 0x53, 0xdd, 0x2c, 0x4f, 0xb8, + 0xaf, 0x84, 0xd2, 0xcc, 0x0c, 0x9b, 0xa2, 0x45, 0x0b, 0x2c, 0x07, 0xdf, 0xed, 0x24, 0xcb, 0xf1, + 0x5a, 0xbb, 0x3c, 0x23, 0xb7, 0x89, 0xae, 0x47, 0xe4, 0xc3, 0xf7, 0x52, 0x83, 0xf2, 0x87, 0xd9, + 0xca, 0x2c, 0x33, 0x08, 0x4f, 0x48, 0x8c, 0xbf, 0x25, 0x46, 0x8c, 0xf3, 0xb4, 0x32, 0x2b, 0xc5, + 0x55, 0x74, 0xf5, 0xca, 0xc0, 0xf6, 0xcb, 0x79, 0xd0, 0x05, 0x22, 0x99, 0x67, 0xcc, 0xd2, 0xc3, + 0x35, 0xc8, 0x5b, 0xf8, 0x69, 0x9c, 0xb4, 0x8e, 0x7c, 0x95, 0x54, 0xe1, 0xac, 0x54, 0x85, 0xb7, + 0xd4, 0x41, 0xe7, 0x95, 0xa7, 0x40, 0x2e, 0xe8, 0x13, 0xa5, 0x59, 0x84, 0xc1, 0xf6, 0x2c, 0xde, + 0x64, 0xb4, 0x31, 0xc9, 0x24, 0xfb, 0xe3, 0x94, 0x44, 0xd4, 0x92, 0x73, 0x59, 0x9e, 0x8a, 0x7f, + 0xfb, 0x52, 0xf1, 0x09, 0x35, 0x6b, 0x03, 0x53, 0x6e, 0x62, 0x54, 0x5e, 0xb7, 0xf9, 0x93, 0x66, + 0x79, 0x46, 0x49, 0x17, 0x46, 0x15, 0x6d, 0x80, 0xe4, 0x09, 0xc5, 0x6f, 0xe4, 0x09, 0xa5, 0x17, + 0xf0, 0x84, 0x09, 0xbf, 0x85, 0x17, 0xf5, 0xdb, 0xb5, 0x8f, 0x61, 0x75, 0xa6, 0x7a, 0x5f, 0x30, + 0xf8, 0x94, 0xe7, 0x9d, 0x14, 0xd1, 0x3b, 0x74, 0x5e, 0x7b, 0x41, 0xa6, 0x28, 0x5d, 0x35, 0x72, + 0x6a, 0x41, 0x59, 0x1e, 0xf5, 0xbe, 0xcc, 0xc0, 0xf5, 0xf7, 0x19, 0x58, 0x99, 0xf5, 0x92, 0xbb, + 0x64, 0x2c, 0x70, 0x38, 0x35, 0x32, 0xdf, 0xbc, 0xea, 0x5d, 0xa8, 0x8e, 0xce, 0x27, 0x33, 0xf8, + 0x2b, 0x1a, 0xa0, 0x77, 0xae, 0x1e, 0xa0, 0x5f, 0xd6, 0x08, 0x49, 0x1a, 0x95, 0x74, 0x5d, 0xfb, + 0x31, 0xc0, 0xd1, 0xc8, 0x75, 0x62, 0xd6, 0xc6, 0x5f, 0x87, 0x65, 0x65, 0x5c, 0xc9, 0x50, 0xfa, + 0x1c, 0x5a, 0x85, 0x25, 0x31, 0xa2, 0xdc, 0x6f, 0x5b, 0x1c, 0xac, 0xa1, 0x65, 0x78, 0xed, 0x28, + 0xc2, 0x21, 0x3d, 0x0f, 0x07, 0x66, 0xd0, 0x22, 0x94, 0x3a, 0xed, 0x03, 0xbe, 0xcc, 0xd6, 0x36, + 0xa1, 0x94, 0xfc, 0xff, 0x40, 0xaf, 0x41, 0xd9, 0x0a, 0xc2, 0xa1, 0x33, 0xa0, 0x4b, 0x7d, 0x0e, + 0xe9, 0xb0, 0xd0, 0xf1, 0x86, 0x38, 0x18, 0xc7, 0x0c, 0xa2, 0xd5, 0xfe, 0xa1, 0x01, 0xa4, 0x63, + 0x12, 0x54, 0x01, 0xe8, 0xb4, 0x0f, 0x8e, 0x8f, 0x0e, 0xcd, 0x7a, 0xa7, 0xa9, 0xcf, 0x21, 0x80, + 0x7c, 0xfd, 0xf0, 0xb0, 0x69, 0x99, 0xba, 0x86, 0x8a, 0x90, 0xb3, 0x9b, 0x75, 0x53, 0xcf, 0xa0, + 0x05, 0x28, 0x76, 0xec, 0x23, 0xab, 0x41, 0x68, 0xb2, 0x44, 0xe8, 0xc3, 0x66, 0xe7, 0x38, 0x81, + 0xe4, 0x50, 0x19, 0x0a, 0x8d, 0x03, 0xcb, 0x6a, 0x36, 0x3a, 0xfa, 0x3c, 0x11, 0xc9, 0x17, 0xc7, + 0xf6, 0x81, 0x9e, 0x47, 0x4b, 0xb0, 0xb8, 0x7f, 0xf0, 0xf0, 0x78, 0xaf, 0x59, 0xb7, 0x3b, 0xbb, + 0xcd, 0x7a, 0x47, 0x2f, 0x10, 0x09, 0x0d, 0x4b, 0x82, 0x14, 0x09, 0xc4, 0x94, 0x21, 0x25, 0x84, + 0xa0, 0xd2, 0xd8, 0x6b, 0x36, 0x1e, 0x1d, 0xef, 0xd5, 0x1f, 0x35, 0x9b, 0x87, 0x4d, 0x5b, 0x07, + 0xa2, 0x40, 0xb2, 0x73, 0x63, 0xff, 0xa8, 0xdd, 0x69, 0xda, 0xc7, 0x66, 0xb3, 0x53, 0x6f, 0xed, + 0xb7, 0xf5, 0x32, 0x21, 0x26, 0x88, 0xf6, 0x5e, 0xdd, 0x36, 0x8f, 0x5b, 0xd6, 0x83, 0x03, 0x7d, + 0xa1, 0x66, 0x01, 0xa4, 0x33, 0x52, 0x72, 0x2a, 0xa2, 0x4b, 0x06, 0xd1, 0xe7, 0xc8, 0x95, 0x5a, + 0x7e, 0x8c, 0x43, 0xdf, 0x19, 0xe8, 0x1a, 0x51, 0x1c, 0xb5, 0x4c, 0xa2, 0xe5, 0x25, 0x3e, 0x6e, + 0xb6, 0xf1, 0x4f, 0x70, 0x37, 0xc6, 0xae, 0x9e, 0xad, 0xfd, 0x21, 0x23, 0x8d, 0x92, 0xc8, 0x95, + 0xad, 0x80, 0x2e, 0xf5, 0x39, 0xb2, 0xe0, 0x6a, 0xd6, 0x35, 0x22, 0xb9, 0xe1, 0xf8, 0x5d, 0x3c, + 0xc0, 0xae, 0x9e, 0x21, 0x17, 0x6b, 0xf9, 0x67, 0xce, 0xc0, 0x73, 0xa9, 0x6b, 0xeb, 0x59, 0x72, + 0x56, 0x0e, 0x11, 0x3c, 0x39, 0x09, 0x76, 0xe8, 0x9c, 0x0f, 0x02, 0xc7, 0xd5, 0xe7, 0xd1, 0x35, + 0x40, 0x2a, 0xac, 0xed, 0x7d, 0x82, 0xf5, 0x3c, 0x91, 0x9f, 0x9c, 0xaa, 0x40, 0x0e, 0x4a, 0x05, + 0x5b, 0x41, 0x6c, 0x63, 0xc7, 0x3d, 0x67, 0xba, 0x6c, 0x9f, 0x47, 0x31, 0x1e, 0x36, 0x06, 0x41, + 0x84, 0x5d, 0xbd, 0x44, 0x1d, 0x2f, 0xf2, 0xeb, 0x83, 0x90, 0x50, 0x24, 0xc3, 0x70, 0xdd, 0x25, + 0x5a, 0x39, 0x18, 0xc7, 0x07, 0xa7, 0x36, 0x79, 0xa1, 0xea, 0xa4, 0x7a, 0x55, 0xac, 0x20, 0x96, + 0x9c, 0x54, 0x3f, 0x65, 0x4e, 0x15, 0x8b, 0x04, 0xaf, 0xf7, 0xd0, 0x0a, 0xe8, 0x22, 0xfd, 0x58, + 0x41, 0xfc, 0x20, 0x18, 0xfb, 0xae, 0xde, 0x47, 0xab, 0xa0, 0x1f, 0xc4, 0x7d, 0x1c, 0xb2, 0xad, + 0x99, 0x66, 0xfe, 0x59, 0xa8, 0xfd, 0x59, 0x03, 0x24, 0x78, 0xa5, 0x50, 0x20, 0x7e, 0xe7, 0x75, + 0x9f, 0xc8, 0x11, 0x20, 0x4d, 0x37, 0x93, 0x08, 0x58, 0x85, 0x25, 0x73, 0x0a, 0x9c, 0x21, 0xaa, + 0x91, 0x87, 0xa9, 0x22, 0x18, 0xc8, 0x51, 0x1f, 0xe2, 0x38, 0x09, 0xac, 0x1c, 0x7a, 0x7d, 0x2a, + 0x11, 0x73, 0xd4, 0x3c, 0xb9, 0x6a, 0x1b, 0xb3, 0xb0, 0xe0, 0xb0, 0x3c, 0xaa, 0xc2, 0x8a, 0xda, + 0x72, 0x73, 0x4c, 0xa1, 0xf6, 0xb9, 0x06, 0x8b, 0x4a, 0xf9, 0x25, 0xc1, 0x29, 0x00, 0x8d, 0x10, + 0x53, 0x7d, 0xce, 0x91, 0xfd, 0x04, 0x50, 0x19, 0x1d, 0xe8, 0x1a, 0xfa, 0x2e, 0xfc, 0xff, 0x14, + 0x4a, 0x14, 0x07, 0x1b, 0x77, 0xb1, 0x77, 0x46, 0xfd, 0xe5, 0x0d, 0xb8, 0x3e, 0x45, 0xf6, 0xc0, + 0xf1, 0x88, 0x33, 0x65, 0xe5, 0x3d, 0xed, 0xb1, 0xef, 0x13, 0xc1, 0xb9, 0x5a, 0x1f, 0xf4, 0xc9, + 0x39, 0x0e, 0x51, 0x6f, 0xdd, 0x75, 0x79, 0x52, 0xd2, 0xe7, 0x88, 0x97, 0xd8, 0x78, 0x18, 0x9c, + 0x61, 0x01, 0xd2, 0xa8, 0x97, 0xc4, 0x4e, 0x18, 0x0b, 0x48, 0x86, 0x68, 0xaf, 0x1d, 0x07, 0x23, + 0x01, 0xc8, 0x12, 0x29, 0x8f, 0xbc, 0xc1, 0xe0, 0xa3, 0x60, 0x78, 0xe2, 0x61, 0x3d, 0x57, 0x7b, + 0x47, 0x99, 0x60, 0x10, 0x34, 0xf1, 0x03, 0x06, 0xd1, 0xe7, 0x48, 0x66, 0x32, 0x7d, 0xb1, 0xd4, + 0x76, 0x9b, 0xcf, 0xfe, 0xbe, 0x3e, 0xf7, 0xd5, 0xf3, 0x75, 0xed, 0xd9, 0xf3, 0x75, 0xed, 0x6f, + 0xcf, 0xd7, 0xb5, 0x8f, 0x6e, 0x4b, 0x7f, 0xea, 0x87, 0x4e, 0x1c, 0x7a, 0x4f, 0x83, 0xd0, 0xeb, + 0x79, 0xbe, 0x58, 0xf8, 0x78, 0x6b, 0xf4, 0xa4, 0xb7, 0x35, 0x3a, 0xd9, 0x4a, 0x33, 0xeb, 0x49, + 0x9e, 0xfe, 0xa6, 0xbf, 0xfd, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0xbb, 0xc9, 0x6c, 0x74, 0x05, + 0x20, 0x00, 0x00, +} + +func (m *CNStore) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3094,12 +3102,12 @@ func (m *CNNode) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *CNNode) MarshalTo(dAtA []byte) (int, error) { +func (m *CNStore) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *CNNode) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *CNStore) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -3135,7 +3143,7 @@ func (m *CNNode) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *DNNode) Marshal() (dAtA []byte, err error) { +func (m *DNStore) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3145,12 +3153,12 @@ func (m *DNNode) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *DNNode) MarshalTo(dAtA []byte) (int, error) { +func (m *DNStore) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *DNNode) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *DNStore) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -3159,6 +3167,20 @@ func (m *DNNode) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } + if len(m.Shards) > 0 { + for iNdEx := len(m.Shards) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Shards[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintLogservice(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x2a + } + } if m.State != 0 { i = encodeVarintLogservice(dAtA, i, uint64(m.State)) i-- @@ -3186,7 +3208,7 @@ func (m *DNNode) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *LogNode) Marshal() (dAtA []byte, err error) { +func (m *LogStore) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3196,12 +3218,12 @@ func (m *LogNode) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *LogNode) MarshalTo(dAtA []byte) (int, error) { +func (m *LogStore) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *LogNode) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *LogStore) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -4567,10 +4589,10 @@ func (m *ClusterDetails) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - if len(m.LogNodes) > 0 { - for iNdEx := len(m.LogNodes) - 1; iNdEx >= 0; iNdEx-- { + if len(m.LogStores) > 0 { + for iNdEx := len(m.LogStores) - 1; iNdEx >= 0; iNdEx-- { { - size, err := m.LogNodes[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + size, err := m.LogStores[iNdEx].MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -4581,10 +4603,10 @@ func (m *ClusterDetails) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x1a } } - if len(m.CNNodes) > 0 { - for iNdEx := len(m.CNNodes) - 1; iNdEx >= 0; iNdEx-- { + if len(m.CNStores) > 0 { + for iNdEx := len(m.CNStores) - 1; iNdEx >= 0; iNdEx-- { { - size, err := m.CNNodes[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + size, err := m.CNStores[iNdEx].MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -4595,10 +4617,10 @@ func (m *ClusterDetails) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x12 } } - if len(m.DNNodes) > 0 { - for iNdEx := len(m.DNNodes) - 1; iNdEx >= 0; iNdEx-- { + if len(m.DNStores) > 0 { + for iNdEx := len(m.DNStores) - 1; iNdEx >= 0; iNdEx-- { { - size, err := m.DNNodes[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + size, err := m.DNStores[iNdEx].MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -5165,7 +5187,7 @@ func encodeVarintLogservice(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } -func (m *CNNode) Size() (n int) { +func (m *CNStore) Size() (n int) { if m == nil { return 0 } @@ -5191,7 +5213,7 @@ func (m *CNNode) Size() (n int) { return n } -func (m *DNNode) Size() (n int) { +func (m *DNStore) Size() (n int) { if m == nil { return 0 } @@ -5211,13 +5233,19 @@ func (m *DNNode) Size() (n int) { if m.State != 0 { n += 1 + sovLogservice(uint64(m.State)) } + if len(m.Shards) > 0 { + for _, e := range m.Shards { + l = e.Size() + n += 1 + l + sovLogservice(uint64(l)) + } + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } return n } -func (m *LogNode) Size() (n int) { +func (m *LogStore) Size() (n int) { if m == nil { return 0 } @@ -5844,20 +5872,20 @@ func (m *ClusterDetails) Size() (n int) { } var l int _ = l - if len(m.DNNodes) > 0 { - for _, e := range m.DNNodes { + if len(m.DNStores) > 0 { + for _, e := range m.DNStores { l = e.Size() n += 1 + l + sovLogservice(uint64(l)) } } - if len(m.CNNodes) > 0 { - for _, e := range m.CNNodes { + if len(m.CNStores) > 0 { + for _, e := range m.CNStores { l = e.Size() n += 1 + l + sovLogservice(uint64(l)) } } - if len(m.LogNodes) > 0 { - for _, e := range m.LogNodes { + if len(m.LogStores) > 0 { + for _, e := range m.LogStores { l = e.Size() n += 1 + l + sovLogservice(uint64(l)) } @@ -6108,7 +6136,7 @@ func sovLogservice(x uint64) (n int) { func sozLogservice(x uint64) (n int) { return sovLogservice(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } -func (m *CNNode) Unmarshal(dAtA []byte) error { +func (m *CNStore) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -6131,10 +6159,10 @@ func (m *CNNode) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: CNNode: wiretype end group for non-group") + return fmt.Errorf("proto: CNStore: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: CNNode: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: CNStore: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -6261,7 +6289,7 @@ func (m *CNNode) Unmarshal(dAtA []byte) error { } return nil } -func (m *DNNode) Unmarshal(dAtA []byte) error { +func (m *DNStore) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -6284,10 +6312,10 @@ func (m *DNNode) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: DNNode: wiretype end group for non-group") + return fmt.Errorf("proto: DNStore: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: DNNode: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: DNStore: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -6392,6 +6420,40 @@ func (m *DNNode) Unmarshal(dAtA []byte) error { break } } + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Shards", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowLogservice + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthLogservice + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthLogservice + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Shards = append(m.Shards, DNShardInfo{}) + if err := m.Shards[len(m.Shards)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipLogservice(dAtA[iNdEx:]) @@ -6414,7 +6476,7 @@ func (m *DNNode) Unmarshal(dAtA []byte) error { } return nil } -func (m *LogNode) Unmarshal(dAtA []byte) error { +func (m *LogStore) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -6437,10 +6499,10 @@ func (m *LogNode) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: LogNode: wiretype end group for non-group") + return fmt.Errorf("proto: LogStore: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: LogNode: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: LogStore: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -10358,7 +10420,7 @@ func (m *ClusterDetails) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DNNodes", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field DNStores", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -10385,14 +10447,14 @@ func (m *ClusterDetails) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.DNNodes = append(m.DNNodes, DNNode{}) - if err := m.DNNodes[len(m.DNNodes)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.DNStores = append(m.DNStores, DNStore{}) + if err := m.DNStores[len(m.DNStores)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CNNodes", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field CNStores", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -10419,14 +10481,14 @@ func (m *ClusterDetails) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.CNNodes = append(m.CNNodes, CNNode{}) - if err := m.CNNodes[len(m.CNNodes)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.CNStores = append(m.CNStores, CNStore{}) + if err := m.CNStores[len(m.CNStores)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LogNodes", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field LogStores", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -10453,8 +10515,8 @@ func (m *ClusterDetails) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.LogNodes = append(m.LogNodes, LogNode{}) - if err := m.LogNodes[len(m.LogNodes)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.LogStores = append(m.LogStores, LogStore{}) + if err := m.LogStores[len(m.LogStores)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/pkg/pb/plan/plan.pb.go b/pkg/pb/plan/plan.pb.go index 8cd90b318bd970c2c994a9f9359e9fa1693679c0..3e8e4bc7d09bc5526b373087e2e074eabad80994 100644 --- a/pkg/pb/plan/plan.pb.go +++ b/pkg/pb/plan/plan.pb.go @@ -747,6 +747,7 @@ func (m *Type) GetScale() int32 { type Const struct { Isnull bool `protobuf:"varint,1,opt,name=isnull,proto3" json:"isnull,omitempty"` // Types that are valid to be assigned to Value: + // // *Const_Ival // *Const_Dval // *Const_Sval @@ -1561,6 +1562,7 @@ func (m *Function) GetArgs() []*Expr { type Expr struct { Typ *Type `protobuf:"bytes,1,opt,name=typ,proto3" json:"typ,omitempty"` // Types that are valid to be assigned to Expr: + // // *Expr_C // *Expr_P // *Expr_V @@ -2353,6 +2355,7 @@ func (m *TableDef) GetName2ColIndex() map[string]int32 { type TableDef_DefType struct { // Types that are valid to be assigned to Def: + // // *TableDef_DefType_Pk // *TableDef_DefType_Idx // *TableDef_DefType_Properties @@ -3422,9 +3425,10 @@ func (m *Query) GetHeadings() []string { } type TransationControl struct { - //TransationControl type + // TransationControl type TclType TransationControl_TclType `protobuf:"varint,1,opt,name=tcl_type,json=tclType,proto3,enum=plan.TransationControl_TclType" json:"tcl_type,omitempty"` // Types that are valid to be assigned to Action: + // // *TransationControl_Begin // *TransationControl_Commit // *TransationControl_Rollback @@ -3674,6 +3678,7 @@ func (m *TransationRollback) GetCompletionType() TransationCompletionType { type Plan struct { // Types that are valid to be assigned to Plan: + // // *Plan_Query // *Plan_Tcl // *Plan_Ddl @@ -3934,9 +3939,10 @@ func (m *Column) GetColumn() []*Expr { } type DataControl struct { - //DataDefinition type + // DataDefinition type DclType DataControl_DclType `protobuf:"varint,1,opt,name=dcl_type,json=dclType,proto3,enum=plan.DataControl_DclType" json:"dcl_type,omitempty"` // Types that are valid to be assigned to Control: + // // *DataControl_SetVariables // *DataControl_Prepare // *DataControl_Execute @@ -4057,13 +4063,14 @@ func (*DataControl) XXX_OneofWrappers() []interface{} { } type DataDefinition struct { - //DataDefinition type + // DataDefinition type DdlType DataDefinition_DdlType `protobuf:"varint,1,opt,name=ddl_type,json=ddlType,proto3,enum=plan.DataDefinition_DdlType" json:"ddl_type,omitempty"` - //other show statement we will rewrite to a select statement - //then we will get a Query - //eg: 'show databases' will rewrite to 'select md.datname as `Database` from mo_database md' + // other show statement we will rewrite to a select statement + // then we will get a Query + // eg: 'show databases' will rewrite to 'select md.datname as `Database` from mo_database md' Query *Query `protobuf:"bytes,2,opt,name=query,proto3" json:"query,omitempty"` // Types that are valid to be assigned to Definition: + // // *DataDefinition_CreateDatabase // *DataDefinition_AlterDatabase // *DataDefinition_DropDatabase diff --git a/pkg/vm/engine/txn/engine.go b/pkg/vm/engine/txn/engine.go index 77ec4ca32d962f712a007dc3b8c41fe7bc6b681c..a75d14973a13e4016bd91b800a90dd402057d67c 100644 --- a/pkg/vm/engine/txn/engine.go +++ b/pkg/vm/engine/txn/engine.go @@ -141,11 +141,11 @@ func (e *Engine) Nodes() (engine.Nodes, error) { } var nodes engine.Nodes - for _, node := range clusterDetails.CNNodes { + for _, store := range clusterDetails.CNStores { nodes = append(nodes, engine.Node{ Mcpu: 1, - Id: node.UUID, - Addr: node.ServiceAddress, + Id: store.UUID, + Addr: store.ServiceAddress, }) } diff --git a/pkg/vm/engine/txn/shard.go b/pkg/vm/engine/txn/shard.go index f6c44cd979e21174d69495eeb2de33715e0ac7ca..f41f76bf67b5208ed9f0e30eb2322d2e2c605467 100644 --- a/pkg/vm/engine/txn/shard.go +++ b/pkg/vm/engine/txn/shard.go @@ -24,9 +24,9 @@ import ( type Shard = metadata.DNShard type ShardPolicy interface { - Vector(vec *vector.Vector, nodes []logservicepb.DNNode) ([]*ShardedVector, error) - Batch(batch *batch.Batch, nodes []logservicepb.DNNode) ([]*ShardedBatch, error) - Nodes(nodes []logservicepb.DNNode) ([]Shard, error) + Vector(vec *vector.Vector, nodes []logservicepb.DNStore) ([]*ShardedVector, error) + Batch(batch *batch.Batch, nodes []logservicepb.DNStore) ([]*ShardedBatch, error) + Stores(stores []logservicepb.DNStore) ([]Shard, error) } type ShardedVector struct { @@ -44,7 +44,7 @@ func (e *Engine) allNodesShards() ([]Shard, error) { if err != nil { return nil, err } - return e.shardPolicy.Nodes(clusterDetails.DNNodes) + return e.shardPolicy.Stores(clusterDetails.DNStores) } func (e *Engine) firstNodeShard() ([]Shard, error) { @@ -52,7 +52,7 @@ func (e *Engine) firstNodeShard() ([]Shard, error) { if err != nil { return nil, err } - return e.shardPolicy.Nodes(clusterDetails.DNNodes[:1]) + return e.shardPolicy.Stores(clusterDetails.DNStores[:1]) } func thisShard(shard Shard) func() ([]Shard, error) { diff --git a/pkg/vm/engine/txn/table.go b/pkg/vm/engine/txn/table.go index 2660d541721dc3a75c0c46ec139218bb0cf71e34..2c13e4b2a2b4c8f4b955512b389eff3890492797 100644 --- a/pkg/vm/engine/txn/table.go +++ b/pkg/vm/engine/txn/table.go @@ -87,7 +87,7 @@ func (t *Table) Delete(ctx context.Context, vec *vector.Vector, _ string) error } shards, err := t.engine.shardPolicy.Vector( vec, - clusterDetails.DNNodes, + clusterDetails.DNStores, ) if err != nil { return err @@ -147,7 +147,7 @@ func (t *Table) Ranges(ctx context.Context) ([][]byte, error) { if err != nil { return nil, err } - nodes := clusterDetails.DNNodes + nodes := clusterDetails.DNStores shards := make([][]byte, 0, len(nodes)) for _, node := range nodes { shards = append(shards, []byte(node.UUID)) @@ -209,7 +209,7 @@ func (t *Table) Update(ctx context.Context, data *batch.Batch) error { shards, err := t.engine.shardPolicy.Batch( data, - clusterDetails.DNNodes, + clusterDetails.DNStores, ) if err != nil { return err @@ -244,7 +244,7 @@ func (t *Table) Write(ctx context.Context, data *batch.Batch) error { shards, err := t.engine.shardPolicy.Batch( data, - clusterDetails.DNNodes, + clusterDetails.DNStores, ) if err != nil { return err diff --git a/pkg/vm/engine/txn/table_reader.go b/pkg/vm/engine/txn/table_reader.go index f01d78c0570e1d0c746205043e80aa2c8a5d291f..5b08b29607c92a54c389534e94cb4ec370b469ec 100644 --- a/pkg/vm/engine/txn/table_reader.go +++ b/pkg/vm/engine/txn/table_reader.go @@ -52,22 +52,22 @@ func (t *Table) NewReader( } readers = make([]engine.Reader, parallel) - nodes := clusterDetails.DNNodes + stores := clusterDetails.DNStores if len(shards) > 0 { uuidSet := make(map[string]bool) for _, shard := range shards { uuidSet[string(shard)] = true } - filteredNodes := nodes[:0] - for _, node := range nodes { + filteredNodes := stores[:0] + for _, node := range stores { if uuidSet[node.UUID] { filteredNodes = append(filteredNodes, node) } } - nodes = filteredNodes + stores = filteredNodes } - dnShards, err := t.engine.shardPolicy.Nodes(nodes) + dnShards, err := t.engine.shardPolicy.Stores(stores) if err != nil { return nil, err } diff --git a/pkg/vm/engine/txn/test/env.go b/pkg/vm/engine/txn/test/env.go index 6028fcd69f1472fbbed37c0f00a84d9470ea6128..633cca543dbdb689ffce0f1e5651197f4c0b36c5 100644 --- a/pkg/vm/engine/txn/test/env.go +++ b/pkg/vm/engine/txn/test/env.go @@ -72,7 +72,7 @@ func newEnv(ctx context.Context) (*testEnv, error) { env, func() (details logservicepb.ClusterDetails, err error) { for _, node := range env.nodes { - details.DNNodes = append(details.DNNodes, node.info) + details.DNStores = append(details.DNStores, node.info) } return }, diff --git a/pkg/vm/engine/txn/test/node.go b/pkg/vm/engine/txn/test/node.go index 91b2836863cc4cc940728d4e6e6a969b5a8e2e69..fd383e7bb903f00ca6290e2dcf2f6635612fc322 100644 --- a/pkg/vm/engine/txn/test/node.go +++ b/pkg/vm/engine/txn/test/node.go @@ -28,7 +28,7 @@ import ( ) type Node struct { - info logservicepb.DNNode + info logservicepb.DNStore // one node, one shard, one service service service.TxnService shard metadata.DNShard @@ -52,7 +52,7 @@ func (t *testEnv) NewNode(id uint64) *Node { panic(err) } - nodeInfo := logservicepb.DNNode{ + nodeInfo := logservicepb.DNStore{ UUID: uuid.NewString(), ServiceAddress: shard.Address, State: logservicepb.NormalState, diff --git a/pkg/vm/engine/txn/test/shard.go b/pkg/vm/engine/txn/test/shard.go index 0845c1fbdb7060a77c5d7dd6e7fc47c2de4c26d4..c764cdef19d85ec5fbcc379266dd0d251d369fba 100644 --- a/pkg/vm/engine/txn/test/shard.go +++ b/pkg/vm/engine/txn/test/shard.go @@ -23,7 +23,7 @@ import ( var _ txnengine.ShardPolicy = new(testEnv) -func (t *testEnv) Batch(batch *batch.Batch, nodes []logservicepb.DNNode) (shards []*txnengine.ShardedBatch, err error) { +func (t *testEnv) Batch(batch *batch.Batch, nodes []logservicepb.DNStore) (shards []*txnengine.ShardedBatch, err error) { shards = append(shards, &txnengine.ShardedBatch{ Shard: t.nodes[0].shard, Batch: batch, @@ -31,7 +31,7 @@ func (t *testEnv) Batch(batch *batch.Batch, nodes []logservicepb.DNNode) (shards return } -func (t *testEnv) Vector(vec *vector.Vector, nodes []logservicepb.DNNode) (shards []*txnengine.ShardedVector, err error) { +func (t *testEnv) Vector(vec *vector.Vector, nodes []logservicepb.DNStore) (shards []*txnengine.ShardedVector, err error) { shards = append(shards, &txnengine.ShardedVector{ Shard: t.nodes[0].shard, Vector: vec, @@ -39,7 +39,7 @@ func (t *testEnv) Vector(vec *vector.Vector, nodes []logservicepb.DNNode) (shard return } -func (t *testEnv) Nodes(nodes []logservicepb.DNNode) (shards []txnengine.Shard, err error) { +func (t *testEnv) Stores(nodes []logservicepb.DNStore) (shards []txnengine.Shard, err error) { for _, node := range nodes { for _, n := range t.nodes { if n.info.UUID == node.UUID { diff --git a/proto/logservice.proto b/proto/logservice.proto index 7df34cd75e39290c26a05b97b8f8c747ccfdd89b..f36d715b193139949c40fa212cec0c9f04e3e699 100644 --- a/proto/logservice.proto +++ b/proto/logservice.proto @@ -35,21 +35,23 @@ enum NodeState { TimeoutState = 1; } -message CNNode { +message CNStore { string UUID = 1; string ServiceAddress = 2; uint64 Tick = 3; NodeState State = 4; } -message DNNode { +message DNStore { string UUID = 1; string ServiceAddress = 2; uint64 Tick = 3; NodeState State = 4; + + repeated DNShardInfo Shards = 5 [(gogoproto.nullable) = false]; } -message LogNode { +message LogStore { string UUID = 1; string ServiceAddress = 2; uint64 Tick = 3; @@ -346,9 +348,9 @@ message DNState { } message ClusterDetails { - repeated DNNode DNNodes = 1 [(gogoproto.nullable) = false]; - repeated CNNode CNNodes = 2 [(gogoproto.nullable) = false]; - repeated LogNode LogNodes = 3 [(gogoproto.nullable) = false]; + repeated DNStore DNStores = 1 [(gogoproto.nullable) = false]; + repeated CNStore CNStores = 2 [(gogoproto.nullable) = false]; + repeated LogStore LogStores = 3 [(gogoproto.nullable) = false]; } // ClusterInfo provides a global view of all shards in the cluster. It