milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update the proto of master 

Signed-off-by: rain <boyan.wang@zilliz.com>
pull/4973/head^2
rain 2020-09-16 11:46:52 +08:00 committed by yefu.chen
parent 032f89e534
commit fa6e228a91
7 changed files with 1527 additions and 289 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
pkg/master/grpc/master/master.pb.go
View File

@ -112,6 +112,7 @@ type Segment struct {
ChannelEnd int32 `protobuf:"varint,5,opt,name=channel_end,json=channelEnd,proto3" json:"channel_end,omitempty"`
OpenTimestamp uint64 `protobuf:"varint,6,opt,name=open_timestamp,json=openTimestamp,proto3" json:"open_timestamp,omitempty"`
CloseTimestamp uint64 `protobuf:"varint,7,opt,name=close_timestamp,json=closeTimestamp,proto3" json:"close_timestamp,omitempty"`
CollectionName string `protobuf:"bytes,8,opt,name=collection_name,json=collectionName,proto3" json:"collection_name,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@ -191,6 +192,13 @@ func (m *Segment) GetCloseTimestamp() uint64 {
return 0
}
func (m *Segment) GetCollectionName() string {
if m != nil {
return m.CollectionName
}
return ""
}
type SegmentStat struct {
SegmentId uint64 `protobuf:"varint,1,opt,name=segment_id,json=segmentId,proto3" json:"segment_id,omitempty"`
MemorySize uint64 `protobuf:"varint,2,opt,name=memory_size,json=memorySize,proto3" json:"memory_size,omitempty"`
@ -257,35 +265,36 @@ func init() {
}
var fileDescriptor_64c7f42561e95429 = []byte{
// 447 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xcf, 0x6e, 0xd3, 0x40,
0x10, 0xc6, 0x89, 0x93, 0xb8, 0x64, 0xf2, 0x07, 0xb4, 0x70, 0xb0, 0x2a, 0xa1, 0x5a, 0xa9, 0x2a,
0x22, 0x21, 0xd9, 0xa5, 0x1c, 0x38, 0x22, 0x51, 0x71, 0xe8, 0xa1, 0x17, 0x3b, 0x27, 0x2e, 0xd6,
0xc6, 0x1e, 0x39, 0x2b, 0xbc, 0xeb, 0x95, 0x77, 0x52, 0x89, 0x3c, 0x01, 0x4f, 0xc6, 0x73, 0x21,
0x8f, 0x9d, 0x34, 0x05, 0xa4, 0x9e, 0x76, 0xfd, 0xf9, 0xb7, 0x33, 0x3b, 0xdf, 0x7e, 0x70, 0x69,
0x7f, 0x94, 0xb1, 0x96, 0x8e, 0xb0, 0x89, 0xcb, 0xc6, 0xe6, 0x87, 0x7d, 0xb7, 0x44, 0xb6, 0xa9,
0xa9, 0x16, 0x2f, 0xbb, 0x2f, 0xbb, 0x39, 0xbf, 0xfa, 0x07, 0x47, 0xe7, 0x64, 0x89, 0x87, 0xb5,
0x3b, 0xb0, 0xfc, 0x3d, 0x00, 0xb8, 0xad, 0xab, 0x0a, 0x73, 0x52, 0xb5, 0x11, 0x0b, 0xf0, 0x54,
0x11, 0x0c, 0xc2, 0xc1, 0x6a, 0x94, 0x78, 0xaa, 0x10, 0x02, 0x46, 0x46, 0x6a, 0x0c, 0xbc, 0x70,
0xb0, 0x9a, 0x24, 0xbc, 0x17, 0x1f, 0xc0, 0x77, 0xf9, 0x16, 0xb5, 0x0c, 0x86, 0xe1, 0x60, 0x35,
0xbd, 0x79, 0x13, 0x69, 0x55, 0x3d, 0xec, 0x5c, 0xd4, 0xb6, 0x89, 0x52, 0xfe, 0x95, 0xf4, 0x88,
0xb8, 0x80, 0x69, 0xde, 0xa0, 0x24, 0xcc, 0x48, 0x69, 0x0c, 0x46, 0x5c, 0x19, 0x3a, 0x69, 0xad,
0x34, 0xb6, 0x80, 0xc3, 0x52, 0xa3, 0xa1, 0x4c, 0x15, 0x2e, 0x18, 0x87, 0xc3, 0x16, 0xe8, 0xa5,
0xbb, 0xc2, 0x89, 0x2b, 0x58, 0x58, 0xd9, 0x90, 0x6a, 0xef, 0x97, 0x91, 0x2c, 0x5d, 0xe0, 0x87,
0xc3, 0xd5, 0x24, 0x99, 0x1f, 0xd5, 0xb5, 0x2c, 0xdd, 0xf2, 0x97, 0x07, 0x67, 0x69, 0x77, 0x4a,
0xbc, 0x03, 0x78, 0xac, 0xd9, 0x4f, 0x33, 0x39, 0x96, 0x14, 0x97, 0x30, 0xcf, 0x8f, 0x23, 0xb7,
0x84, 0xc7, 0xc4, 0xec, 0x51, 0xec, 0xa0, 0x27, 0x6d, 0x79, 0xd8, 0x49, 0x32, 0x3b, 0xed, 0xca,
0x95, 0xb6, 0xd2, 0x18, 0xac, 0x32, 0x47, 0xb2, 0x21, 0x9e, 0x6f, 0x9c, 0xcc, 0x7a, 0x31, 0x6d,
0x35, 0xb6, 0xa0, 0x87, 0xd0, 0x14, 0xc1, 0x98, 0x11, 0xe8, 0xa5, 0x6f, 0xa6, 0x68, 0x27, 0xac,
0x2d, 0x1a, 0x76, 0xc8, 0x91, 0xd4, 0x36, 0xf0, 0xf9, 0x42, 0xf3, 0x56, 0x5d, 0x1f, 0x44, 0xf1,
0x1e, 0x5e, 0xe5, 0x55, 0xed, 0xf0, 0x84, 0x3b, 0x63, 0x6e, 0xc1, 0xf2, 0x11, 0x5c, 0x1a, 0x98,
0xf6, 0x4e, 0xa4, 0x24, 0x9f, 0x75, 0xe3, 0x02, 0xa6, 0x1a, 0x75, 0xdd, 0xfc, 0xcc, 0x9c, 0xda,
0x63, 0xef, 0x05, 0x74, 0x52, 0xaa, 0xf6, 0x78, 0x02, 0x34, 0x92, 0x90, 0x7d, 0xf0, 0x0e, 0x40,
0x22, 0x09, 0x6f, 0xee, 0xc0, 0xbf, 0xe7, 0xa0, 0x89, 0x2f, 0xf0, 0xfa, 0x96, 0x9f, 0xf6, 0x24,
0x52, 0x6f, 0x9f, 0xc4, 0xe3, 0x5e, 0x5a, 0xab, 0x4c, 0x79, 0xfe, 0x57, 0x68, 0x48, 0xd2, 0xce,
0x2d, 0x5f, 0x7c, 0xfd, 0xf8, 0x3d, 0x2e, 0x15, 0x6d, 0x77, 0x9b, 0x28, 0xaf, 0x75, 0x9c, 0xef,
0xdd, 0xf5, 0xf5, 0xe7, 0xd8, 0xed, 0x1e, 0x2a, 0xa5, 0xe3, 0xff, 0xe7, 0x7f, 0xe3, 0x73, 0x90,
0x3f, 0xfd, 0x09, 0x00, 0x00, 0xff, 0xff, 0xf9, 0x1d, 0xf9, 0x37, 0x20, 0x03, 0x00, 0x00,
// 460 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0xcd, 0x6e, 0xd3, 0x40,
0x10, 0x80, 0xb1, 0x93, 0xb8, 0xcd, 0xe4, 0x07, 0xb4, 0x70, 0xb0, 0x2a, 0xa1, 0x5a, 0xa9, 0x2a,
0x22, 0x21, 0xd9, 0xa5, 0x1c, 0x38, 0x22, 0x51, 0x71, 0xe8, 0xa1, 0x1c, 0xec, 0x9c, 0xb8, 0x58,
0x1b, 0x7b, 0xe4, 0xac, 0xf0, 0xae, 0x57, 0xde, 0x4d, 0x24, 0xf2, 0x56, 0xbc, 0x04, 0xcf, 0x85,
0x3c, 0x76, 0x12, 0x07, 0x90, 0x7a, 0xda, 0xf5, 0xe7, 0x6f, 0x67, 0x67, 0xc6, 0x63, 0xb8, 0xd1,
0x3f, 0x8a, 0x48, 0x72, 0x63, 0xb1, 0x8e, 0x8a, 0x5a, 0x67, 0x87, 0x7d, 0xbb, 0x84, 0xba, 0xae,
0x6c, 0xc5, 0x2e, 0xdb, 0x27, 0xbd, 0xbe, 0xba, 0xfd, 0x47, 0x47, 0x63, 0x78, 0x81, 0x87, 0xb5,
0x3d, 0xb0, 0xf8, 0xed, 0x00, 0x3c, 0x54, 0x65, 0x89, 0x99, 0x15, 0x95, 0x62, 0x73, 0x70, 0x45,
0xee, 0x3b, 0x81, 0xb3, 0x1c, 0xc6, 0xae, 0xc8, 0x19, 0x83, 0xa1, 0xe2, 0x12, 0x7d, 0x37, 0x70,
0x96, 0xe3, 0x98, 0xf6, 0xec, 0x3d, 0x78, 0x26, 0xdb, 0xa0, 0xe4, 0xfe, 0x20, 0x70, 0x96, 0x93,
0xfb, 0xd7, 0xa1, 0x14, 0xe5, 0x6e, 0x6b, 0xc2, 0xe6, 0x9a, 0x30, 0xa1, 0x57, 0x71, 0xa7, 0xb0,
0x6b, 0x98, 0x64, 0x35, 0x72, 0x8b, 0xa9, 0x15, 0x12, 0xfd, 0x21, 0x45, 0x86, 0x16, 0xad, 0x84,
0xc4, 0x46, 0x30, 0x58, 0x48, 0x54, 0x36, 0x15, 0xb9, 0xf1, 0x47, 0xc1, 0xa0, 0x11, 0x3a, 0xf4,
0x98, 0x1b, 0x76, 0x0b, 0x73, 0xcd, 0x6b, 0x2b, 0x9a, 0xfc, 0x52, 0xcb, 0x0b, 0xe3, 0x7b, 0xc1,
0x60, 0x39, 0x8e, 0x67, 0x47, 0xba, 0xe2, 0x85, 0x59, 0xfc, 0x72, 0xe1, 0x22, 0x69, 0x4f, 0xb1,
0xb7, 0x00, 0xa7, 0x98, 0x5d, 0x35, 0xe3, 0x63, 0x48, 0x76, 0x03, 0xb3, 0xec, 0x58, 0x72, 0x63,
0xb8, 0x64, 0x4c, 0x4f, 0xb0, 0x95, 0xce, 0xae, 0xa5, 0x62, 0xc7, 0xf1, 0xb4, 0x7f, 0x2b, 0x45,
0xda, 0x70, 0xa5, 0xb0, 0x4c, 0x8d, 0xe5, 0xb5, 0xa5, 0xfa, 0x46, 0xf1, 0xb4, 0x83, 0x49, 0xc3,
0xa8, 0x05, 0x9d, 0x84, 0x2a, 0xf7, 0x47, 0xa4, 0x40, 0x87, 0xbe, 0xaa, 0xbc, 0xa9, 0xb0, 0xd2,
0xa8, 0xa8, 0x43, 0xc6, 0x72, 0xa9, 0x7d, 0x8f, 0x12, 0x9a, 0x35, 0x74, 0x75, 0x80, 0xec, 0x1d,
0xbc, 0xcc, 0xca, 0xca, 0x60, 0xcf, 0xbb, 0x20, 0x6f, 0x4e, 0xf8, 0x5c, 0x3c, 0xd5, 0x47, 0xdf,
0xef, 0x92, 0x92, 0x9f, 0x9f, 0xf0, 0x37, 0x2e, 0x71, 0xa1, 0x60, 0xd2, 0xb5, 0x2c, 0xb1, 0xfc,
0xd9, 0xb6, 0x5d, 0xc3, 0x44, 0xa2, 0xac, 0xea, 0x9f, 0xa9, 0x11, 0x7b, 0xec, 0x9a, 0x06, 0x2d,
0x4a, 0xc4, 0x1e, 0x7b, 0x42, 0xcd, 0x2d, 0x52, 0xc3, 0xdc, 0x83, 0x10, 0x73, 0x8b, 0xf7, 0x8f,
0xe0, 0x3d, 0xd1, 0x44, 0xb2, 0xcf, 0xf0, 0xea, 0x81, 0x66, 0xa0, 0x37, 0x7b, 0x6f, 0xce, 0xe6,
0xe8, 0x89, 0x6b, 0x2d, 0x54, 0x71, 0xf5, 0xd7, 0x74, 0x59, 0x6e, 0xb7, 0x66, 0xf1, 0xe2, 0xcb,
0x87, 0xef, 0x51, 0x21, 0xec, 0x66, 0xbb, 0x0e, 0xb3, 0x4a, 0x46, 0xd9, 0xde, 0xdc, 0xdd, 0x7d,
0x8a, 0xcc, 0x76, 0x57, 0x0a, 0x19, 0xfd, 0xff, 0x47, 0x59, 0x7b, 0x34, 0xf1, 0x1f, 0xff, 0x04,
0x00, 0x00, 0xff, 0xff, 0xbf, 0xc7, 0x75, 0x3f, 0x49, 0x03, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.

1
pkg/master/grpc/master/master.proto
View File

@ -23,6 +23,7 @@ message Segment {
int32 channel_end=5;
uint64 open_timestamp=6;
uint64 close_timestamp=7;
string collection_name=8;
}
message SegmentStat {

1740
pkg/master/grpc/message/message.pb.go
View File

File diff suppressed because it is too large Load Diff

4
pkg/master/mock/segment.go
View File

@ -42,12 +42,14 @@ type Segment struct {
ChannelEnd int `json:"channel_end"`
OpenTimeStamp uint64 `json:"open_timestamp"`
CloseTimeStamp uint64 `json:"close_timestamp"`
CollectionName string `json:"collection_name"`
}
func NewSegment(id uuid.UUID, collectioID uuid.UUID, ptag string, chStart int, chEnd int, openTime time.Time, closeTime time.Time) Segment {
func NewSegment(id uuid.UUID, collectioID uuid.UUID, cName string, ptag string, chStart int, chEnd int, openTime time.Time, closeTime time.Time) Segment {
return Segment{
SegmentID: uint64(id.ID()),
CollectionID: uint64(id.ID()),
CollectionName: cName,
PartitionTag: ptag,
ChannelStart: chStart,
ChannelEnd: chEnd,

1
pkg/master/mock/segment_test.go
View File

@ -32,6 +32,7 @@ func TestSegmentMarshal(t *testing.T) {
var Ts = Segment{
SegmentID: uint64(101111),
CollectionID: uint64(12010101),
CollectionName: "collection-test",
PartitionTag: "default",
ChannelStart: 1,
ChannelEnd: 100,

2
pkg/master/server.go
View File

@ -129,7 +129,7 @@ func CollectionController(ch chan *messagepb.Mapping) {
time.Now(), fieldMetas, []uuid.UUID{sID},
[]string{"default"})
cm := mock.GrpcMarshal(&c)
s := mock.NewSegment(sID, cID, "default", 0, 100, time.Now(), time.Unix(1<<36-1, 0))
s := mock.NewSegment(sID, cID, collection.CollectionName, "default", 0, 100, time.Now(), time.Unix(1<<36-1, 0))
collectionData, _ := mock.Collection2JSON(*cm)
segmentData, err := mock.Segment2JSON(s)
if err != nil {

1
proto/master.proto
View File

@ -23,6 +23,7 @@ message Segment {
int32 channel_end=5;
uint64 open_timestamp=6;
uint64 close_timestamp=7;
string collection_name=8;
}
message SegmentStat {