Skip to content

M
milvus

milvus / milvus
11 个月 前同步成功

通知 261
Star 22476
Fork 2472
M
milvus

体验新版 GitCode，发现更多精彩内容 >>

提交 76d92e73 编写于 作者: Z zhenshan.cao 提交者： yefu.chen
浏览文件
操作

Replace old proto with new proto 

Signed-off-by: Nzhenshan.cao <zhenshan.cao@zilliz.com>
上级 d22c2cd2
展开全部 隐藏空白更改
内联 并排
Showing with 668 addition and 368 deletion
internal/core/src/pb/common.pb.cc
浏览文件 @ 76d92e73
......@@ -249,21 +249,22 @@ const char descriptor_table_protodef_common_2eproto[] PROTOBUF_SECTION_VARIABLE(
"PE\020\027\022\021\n\rOUT_OF_MEMORY\020\030\022\024\n\017DD_REQUEST_RA"
"CE\020\350\007*N\n\nIndexState\022\010\n\004NONE\020\000\022\014\n\010UNISSUE"
"D\020\001\022\016\n\nINPROGRESS\020\002\022\014\n\010FINISHED\020\003\022\n\n\006FAI"
"LED\020\004*\360\003\n\007MsgType\022\t\n\005kNone\020\000\022\025\n\021kCreateC"
"LED\020\004*\245\004\n\007MsgType\022\t\n\005kNone\020\000\022\025\n\021kCreateC"
"ollection\020d\022\023\n\017kDropCollection\020e\022\022\n\016kHas"
"Collection\020f\022\027\n\023kDescribeCollection\020g\022\024\n"
"\020kShowCollections\020h\022\022\n\016kGetSysConfigs\020i\022"
"\025\n\020kCreatePartition\020\310\001\022\023\n\016kDropPartition"
"\020\311\001\022\022\n\rkHasPartition\020\312\001\022\027\n\022kDescribePart"
"ition\020\313\001\022\024\n\017kShowPartitions\020\314\001\022\021\n\014kCreat"
"eIndex\020\254\002\022\023\n\016kDescribeIndex\020\255\002\022\033\n\026kDescr"
"ibeIndexProgress\020\256\002\022\014\n\007kInsert\020\220\003\022\014\n\007kDe"
"lete\020\221\003\022\013\n\006kFlush\020\222\003\022\014\n\007kSearch\020\364\003\022\022\n\rkS"
"earchResult\020\365\003\022\016\n\tkTimeTick\020\260\t\022\024\n\017kQuery"
"NodeStats\020\261\t\022\017\n\nkLoadIndex\020\262\t\022\017\n\nkReques"
"tID\020\263\t\022\020\n\013kRequestTSO\020\264\tBBZ@github.com/z"
"illiztech/milvus-distributed/internal/pr"
"oto/commonpbb\006proto3"
"eIndex\020\254\002\022\023\n\016kDescribeIndex\020\255\002\022\014\n\007kInser"
"t\020\220\003\022\014\n\007kDelete\020\221\003\022\013\n\006kFlush\020\222\003\022\014\n\007kSear"
"ch\020\364\003\022\022\n\rkSearchResult\020\365\003\022\023\n\016kGetIndexSt"
"ate\020\366\003\022\035\n\030kGetCollectionStatistics\020\367\003\022\034\n"
"\027kGetPartitionStatistics\020\370\003\022\016\n\tkTimeTick"
"\020\260\t\022\024\n\017kQueryNodeStats\020\261\t\022\017\n\nkLoadIndex\020"
"\262\t\022\017\n\nkRequestID\020\263\t\022\020\n\013kRequestTSO\020\264\tBBZ"
"@github.com/zilliztech/milvus-distribute"
"d/internal/proto/commonpbb\006proto3"
;
static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_common_2eproto_deps[1] = {
};
......@@ -279,7 +280,7 @@ static ::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase*const descriptor_table_com
static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_common_2eproto_once;
static bool descriptor_table_common_2eproto_initialized = false;
const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_common_2eproto = {
&descriptor_table_common_2eproto_initialized, descriptor_table_protodef_common_2eproto, "common.proto", 1620,
&descriptor_table_common_2eproto_initialized, descriptor_table_protodef_common_2eproto, "common.proto", 1673,
&descriptor_table_common_2eproto_once, descriptor_table_common_2eproto_sccs, descriptor_table_common_2eproto_deps, 7, 0,
schemas, file_default_instances, TableStruct_common_2eproto::offsets,
file_level_metadata_common_2eproto, 7, file_level_enum_descriptors_common_2eproto, file_level_service_descriptors_common_2eproto,
......@@ -364,12 +365,14 @@ bool MsgType_IsValid(int value) {
case 204:
case 300:
case 301:
case 302:
case 400:
case 401:
case 402:
case 500:
case 501:
case 502:
case 503:
case 504:
case 1200:
case 1201:
case 1202:
......
internal/core/src/pb/common.pb.h
浏览文件 @ 76d92e73
......@@ -186,12 +186,14 @@ enum MsgType : int {
kShowPartitions = 204,
kCreateIndex = 300,
kDescribeIndex = 301,
kDescribeIndexProgress = 302,
kInsert = 400,
kDelete = 401,
kFlush = 402,
kSearch = 500,
kSearchResult = 501,
kGetIndexState = 502,
kGetCollectionStatistics = 503,
kGetPartitionStatistics = 504,
kTimeTick = 1200,
kQueryNodeStats = 1201,
kLoadIndex = 1202,
......
internal/master/grpc_service.go
浏览文件 @ 76d92e73
......@@ -3,11 +3,11 @@ package master
import (
"context"
"fmt"
"time"
"github.com/zilliztech/milvus-distributed/internal/proto/commonpb"
"github.com/zilliztech/milvus-distributed/internal/proto/datapb"
"github.com/zilliztech/milvus-distributed/internal/proto/internalpb2"
"github.com/zilliztech/milvus-distributed/internal/proto/masterpb"
"github.com/zilliztech/milvus-distributed/internal/proto/milvuspb"
)
......@@ -468,6 +468,26 @@ func (s *Master) GetIndexState(ctx context.Context, req *milvuspb.IndexStateRequ
return task.resp, nil
}
func (s *Master) GetCollectionStatistics(ctx context.Context, request *milvuspb.CollectionStatsRequest) (*milvuspb.CollectionStatsResponse, error) {
panic("implement me")
}
func (s *Master) GetPartitionStatistics(ctx context.Context, request *milvuspb.PartitionStatsRequest) (*milvuspb.PartitionStatsResponse, error) {
panic("implement me")
}
func (s *Master) GetServiceStates(ctx context.Context, empty *commonpb.Empty) (*internalpb2.ServiceStates, error) {
panic("implement me")
}
func (s *Master) GetTimeTickChannel(ctx context.Context, empty *commonpb.Empty) (*milvuspb.StringResponse, error) {
panic("implement me")
}
func (s *Master) GetStatisticsChannel(ctx context.Context, empty *commonpb.Empty) (*milvuspb.StringResponse, error) {
panic("implement me")
}
func (s *Master) DescribeSegment(ctx context.Context, request *milvuspb.DescribeSegmentRequest) (*milvuspb.DescribeSegmentResponse, error) {
panic("implement me")
}
......
internal/master/index_task.go
浏览文件 @ 76d92e73
......@@ -155,7 +155,7 @@ type getIndexStateTask struct {
}
func (task *getIndexStateTask) Type() commonpb.MsgType {
return commonpb.MsgType_kDescribeIndexProgress
return commonpb.MsgType_kGetIndexState
}
func (task *getIndexStateTask) Ts() (Timestamp, error) {
......
internal/msgstream/msg.go
浏览文件 @ 76d92e73
......@@ -2,7 +2,6 @@ package msgstream
import (
"context"
"fmt"
"github.com/golang/protobuf/proto"
"github.com/zilliztech/milvus-distributed/internal/proto/commonpb"
......@@ -66,11 +65,6 @@ func (it *InsertMsg) Marshal(input TsMsg) ([]byte, error) {
if err != nil {
return nil, err
}
headerMsg := commonpb.MsgHeader{}
err2 := proto.Unmarshal(mb, &headerMsg)
if err2 != nil {
fmt.Println(err2.Error())
}
return mb, nil
}
......@@ -388,13 +382,6 @@ func (cc *CreateCollectionMsg) Marshal(input TsMsg) ([]byte, error) {
if err != nil {
return nil, err
}
headerMsg := commonpb.MsgHeader{}
err2 := proto.Unmarshal(mb, &headerMsg)
if err2 != nil {
fmt.Println(err2.Error())
}
return mb, nil
}
......
internal/msgstream/msgstream.go
浏览文件 @ 76d92e73
......@@ -2,7 +2,6 @@ package msgstream
import (
"context"
"fmt"
"log"
"reflect"
"strconv"
......@@ -234,14 +233,6 @@ func (ms *PulsarMsgStream) Produce(msgPack *MsgPack) error {
}
msg := &pulsar.ProducerMessage{Payload: mb}
if v.Msgs[i].Type() == commonpb.MsgType_kDelete {
headerMsg := commonpb.MsgHeader{}
err := proto.Unmarshal(mb, &headerMsg)
if err != nil {
fmt.Println(err.Error())
}
}
var child opentracing.Span
if v.Msgs[i].Type() == commonpb.MsgType_kInsert ||
......@@ -395,10 +386,7 @@ func (ms *PulsarMsgStream) bufMsgPackToChannel() {
(*ms.consumers[chosen]).AckID(pulsarMsg.ID())
headerMsg := commonpb.MsgHeader{}
payload := pulsarMsg.Payload()
err := proto.Unmarshal(payload, &headerMsg)
//delete2, _ := ms.unmarshal.Unmarshal(payload, commonpb.MsgType_kDelete)
//fmt.Println(delete2)
err := proto.Unmarshal(pulsarMsg.Payload(), &headerMsg)
if err != nil {
log.Printf("Failed to unmarshal message header, error = %v", err)
continue
......
internal/proto/common.proto
浏览文件 @ 76d92e73
......@@ -86,7 +86,6 @@ enum MsgType {
/* Definition Requests: Index */
kCreateIndex = 300;
kDescribeIndex = 301;
kDescribeIndexProgress = 302;
/* Manipulation Requests */
kInsert = 400;
......@@ -96,6 +95,9 @@ enum MsgType {
/* Query */
kSearch = 500;
kSearchResult = 501;
kGetIndexState = 502;
kGetCollectionStatistics = 503;
kGetPartitionStatistics = 504;
/* System Control */
kTimeTick = 1200;
......
internal/proto/commonpb/common.pb.go
浏览文件 @ 76d92e73
......@@ -167,16 +167,18 @@ const (
MsgType_kDescribePartition MsgType = 203
MsgType_kShowPartitions MsgType = 204
// Definition Requests: Index
MsgType_kCreateIndex MsgType = 300
MsgType_kDescribeIndex MsgType = 301
MsgType_kDescribeIndexProgress MsgType = 302
MsgType_kCreateIndex MsgType = 300
MsgType_kDescribeIndex MsgType = 301
// Manipulation Requests
MsgType_kInsert MsgType = 400
MsgType_kDelete MsgType = 401
MsgType_kFlush MsgType = 402
// Query
MsgType_kSearch MsgType = 500
MsgType_kSearchResult MsgType = 501
MsgType_kSearch MsgType = 500
MsgType_kSearchResult MsgType = 501
MsgType_kGetIndexState MsgType = 502
MsgType_kGetCollectionStatistics MsgType = 503
MsgType_kGetPartitionStatistics MsgType = 504
// System Control
MsgType_kTimeTick MsgType = 1200
MsgType_kQueryNodeStats MsgType = 1201
......@@ -200,12 +202,14 @@ var MsgType_name = map[int32]string{
204: "kShowPartitions",
300: "kCreateIndex",
301: "kDescribeIndex",
302: "kDescribeIndexProgress",
400: "kInsert",
401: "kDelete",
402: "kFlush",
500: "kSearch",
501: "kSearchResult",
502: "kGetIndexState",
503: "kGetCollectionStatistics",
504: "kGetPartitionStatistics",
1200: "kTimeTick",
1201: "kQueryNodeStats",
1202: "kLoadIndex",
......@@ -214,31 +218,33 @@ var MsgType_name = map[int32]string{
}
var MsgType_value = map[string]int32{
"kNone": 0,
"kCreateCollection": 100,
"kDropCollection": 101,
"kHasCollection": 102,
"kDescribeCollection": 103,
"kShowCollections": 104,
"kGetSysConfigs": 105,
"kCreatePartition": 200,
"kDropPartition": 201,
"kHasPartition": 202,
"kDescribePartition": 203,
"kShowPartitions": 204,
"kCreateIndex": 300,
"kDescribeIndex": 301,
"kDescribeIndexProgress": 302,
"kInsert": 400,
"kDelete": 401,
"kFlush": 402,
"kSearch": 500,
"kSearchResult": 501,
"kTimeTick": 1200,
"kQueryNodeStats": 1201,
"kLoadIndex": 1202,
"kRequestID": 1203,
"kRequestTSO": 1204,
"kNone": 0,
"kCreateCollection": 100,
"kDropCollection": 101,
"kHasCollection": 102,
"kDescribeCollection": 103,
"kShowCollections": 104,
"kGetSysConfigs": 105,
"kCreatePartition": 200,
"kDropPartition": 201,
"kHasPartition": 202,
"kDescribePartition": 203,
"kShowPartitions": 204,
"kCreateIndex": 300,
"kDescribeIndex": 301,
"kInsert": 400,
"kDelete": 401,
"kFlush": 402,
"kSearch": 500,
"kSearchResult": 501,
"kGetIndexState": 502,
"kGetCollectionStatistics": 503,
"kGetPartitionStatistics": 504,
"kTimeTick": 1200,
"kQueryNodeStats": 1201,
"kLoadIndex": 1202,
"kRequestID": 1203,
"kRequestTSO": 1204,
}
func (x MsgType) String() string {
......@@ -579,70 +585,72 @@ func init() {
func init() { proto.RegisterFile("common.proto", fileDescriptor_555bd8c177793206) }
var fileDescriptor_555bd8c177793206 = []byte{
// 1038 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x54, 0x5b, 0x6f, 0xe3, 0x44,
0x14, 0xde, 0x5c, 0xda, 0xd4, 0x27, 0x69, 0x3a, 0x9d, 0xde, 0x02, 0x5b, 0xa1, 0x2a, 0x4f, 0x55,
0xa5, 0x6d, 0x11, 0x48, 0xf0, 0xb4, 0x12, 0xae, 0x3d, 0x69, 0x47, 0xeb, 0x4b, 0x76, 0xec, 0x2c,
0x5d, 0x5e, 0x2c, 0x27, 0x9e, 0x4d, 0x2c, 0x3b, 0x71, 0xf0, 0x38, 0x0b, 0xd9, 0x5f, 0x01, 0xfb,
0x3b, 0x00, 0x71, 0x7b, 0xe0, 0x27, 0x70, 0xfb, 0x21, 0x3c, 0xf2, 0x00, 0xef, 0x68, 0xec, 0xb8,
0x09, 0x68, 0x79, 0x9b, 0xf3, 0x9d, 0xf9, 0xbe, 0xf9, 0xce, 0x99, 0x99, 0x03, 0xad, 0x51, 0x32,
0x9d, 0x26, 0xb3, 0xcb, 0x79, 0x9a, 0x64, 0x09, 0x3e, 0x98, 0x86, 0xf1, 0xcb, 0x85, 0x28, 0xa2,
0xcb, 0x22, 0xd5, 0x6d, 0xc0, 0x16, 0x99, 0xce, 0xb3, 0x65, 0xd7, 0x83, 0x6d, 0x27, 0xf3, 0xb3,
0x85, 0xc0, 0x8f, 0x01, 0x78, 0x9a, 0x26, 0xa9, 0x37, 0x4a, 0x02, 0xde, 0xa9, 0x9c, 0x55, 0xce,
0xdb, 0xef, 0xbd, 0x73, 0xf9, 0x06, 0xf2, 0x25, 0x91, 0xdb, 0xb4, 0x24, 0xe0, 0x4c, 0xe1, 0xe5,
0x12, 0x1f, 0xc3, 0x76, 0xca, 0x7d, 0x91, 0xcc, 0x3a, 0xd5, 0xb3, 0xca, 0xb9, 0xc2, 0x56, 0x51,
0xf7, 0x03, 0x68, 0x3d, 0xe1, 0xcb, 0x67, 0x7e, 0xbc, 0xe0, 0x7d, 0x3f, 0x4c, 0x31, 0x82, 0x5a,
0xc4, 0x97, 0xb9, 0xbe, 0xc2, 0xe4, 0x12, 0x1f, 0xc2, 0xd6, 0x4b, 0x99, 0x5e, 0x11, 0x8b, 0xa0,
0x7b, 0x0a, 0xf5, 0xeb, 0x38, 0x19, 0xae, 0xb3, 0x92, 0xd1, 0x2a, 0xb3, 0x8f, 0xa0, 0xa1, 0x06,
0x41, 0xca, 0x85, 0xc0, 0x6d, 0xa8, 0x86, 0xf3, 0x95, 0x5e, 0x35, 0x9c, 0x63, 0x0c, 0xf5, 0x79,
0x92, 0x66, 0xb9, 0x5a, 0x8d, 0xe5, 0xeb, 0xee, 0xeb, 0x0a, 0x34, 0x4c, 0x31, 0xbe, 0xf6, 0x05,
0xc7, 0x1f, 0xc2, 0xce, 0x54, 0x8c, 0xbd, 0x6c, 0x39, 0x2f, 0xab, 0x3c, 0x7d, 0x63, 0x95, 0xa6,
0x18, 0xbb, 0xcb, 0x39, 0x67, 0x8d, 0x69, 0xb1, 0x90, 0x4e, 0xa6, 0x62, 0x4c, 0xf5, 0x95, 0x72,
0x11, 0xe0, 0x53, 0x50, 0xb2, 0x70, 0xca, 0x45, 0xe6, 0x4f, 0xe7, 0x9d, 0xda, 0x59, 0xe5, 0xbc,
0xce, 0xd6, 0x00, 0x7e, 0x1b, 0x76, 0x44, 0xb2, 0x48, 0x47, 0x9c, 0xea, 0x9d, 0x7a, 0x4e, 0xbb,
0x8f, 0xbb, 0x8f, 0x41, 0x31, 0xc5, 0xf8, 0x96, 0xfb, 0x01, 0x4f, 0xf1, 0xbb, 0x50, 0x1f, 0xfa,
0xa2, 0x70, 0xd4, 0xfc, 0x7f, 0x47, 0xb2, 0x02, 0x96, 0xef, 0xbc, 0xf8, 0xa9, 0x0e, 0xca, 0xfd,
0x4d, 0xe0, 0x26, 0x34, 0x9c, 0x81, 0xa6, 0x11, 0xc7, 0x41, 0x0f, 0xf0, 0x21, 0xa0, 0x81, 0x45,
0xee, 0xfa, 0x44, 0x73, 0x89, 0xee, 0x11, 0xc6, 0x6c, 0x86, 0x2a, 0x18, 0x43, 0x5b, 0xb3, 0x2d,
0x8b, 0x68, 0xae, 0xd7, 0x53, 0xa9, 0x41, 0x74, 0x54, 0xc5, 0x47, 0xb0, 0xdf, 0x27, 0xcc, 0xa4,
0x8e, 0x43, 0x6d, 0xcb, 0xd3, 0x89, 0x45, 0x89, 0x8e, 0x6a, 0xf8, 0x2d, 0x38, 0xd2, 0x6c, 0xc3,
0x20, 0x9a, 0x2b, 0x61, 0xcb, 0x76, 0x3d, 0x72, 0x47, 0x1d, 0xd7, 0x41, 0x75, 0xa9, 0x4d, 0x0d,
0x83, 0xdc, 0xa8, 0x86, 0xa7, 0xb2, 0x9b, 0x81, 0x49, 0x2c, 0x17, 0x6d, 0x49, 0x9d, 0x12, 0xd5,
0xa9, 0x49, 0x2c, 0x29, 0x87, 0x1a, 0xf8, 0x18, 0x70, 0x09, 0x53, 0x4b, 0x27, 0x77, 0x9e, 0xfb,
0xbc, 0x4f, 0xd0, 0x0e, 0x7e, 0x08, 0x27, 0x25, 0xbe, 0x79, 0x8e, 0x6a, 0x12, 0xa4, 0x60, 0x04,
0xad, 0x32, 0xe9, 0xda, 0xfd, 0x27, 0x08, 0x36, 0xd5, 0x99, 0xfd, 0x31, 0x23, 0x9a, 0xcd, 0x74,
0xd4, 0xdc, 0x84, 0x9f, 0x11, 0xcd, 0xb5, 0x99, 0x47, 0x75, 0xd4, 0x92, 0xe6, 0x4b, 0xd8, 0x21,
0x2a, 0xd3, 0x6e, 0x3d, 0x46, 0x9c, 0x81, 0xe1, 0xa2, 0x5d, 0xd9, 0x82, 0x1e, 0x35, 0x48, 0x5e,
0x51, 0xcf, 0x1e, 0x58, 0x3a, 0x6a, 0xe3, 0x3d, 0x68, 0x9a, 0xc4, 0x55, 0xcb, 0x9e, 0xec, 0xc9,
0xf3, 0x35, 0x55, 0xbb, 0x25, 0x25, 0x82, 0x70, 0x07, 0x0e, 0x35, 0xd5, 0x92, 0x24, 0x8d, 0x11,
0xd5, 0x25, 0x5e, 0xcf, 0x36, 0x74, 0xc2, 0xd0, 0xbe, 0x2c, 0xf0, 0x3f, 0x19, 0x6a, 0x10, 0x84,
0x37, 0x18, 0x3a, 0x31, 0xc8, 0x9a, 0x71, 0xb0, 0xc1, 0x28, 0x33, 0x92, 0x71, 0x28, 0x8b, 0xb9,
0x1e, 0x50, 0x43, 0x5f, 0x35, 0xaa, 0xb8, 0xb4, 0x23, 0xbc, 0x0f, 0xbb, 0x65, 0x31, 0x96, 0x41,
0x1d, 0x17, 0x1d, 0xe3, 0x13, 0x38, 0x28, 0x21, 0x93, 0xb8, 0x8c, 0x6a, 0x45, 0x57, 0x4f, 0xe4,
0x5e, 0x7b, 0xe0, 0x7a, 0x76, 0xcf, 0x33, 0x89, 0x69, 0xb3, 0xe7, 0xa8, 0x83, 0x0f, 0x61, 0x4f,
0xd7, 0x3d, 0x46, 0x9e, 0x0e, 0x88, 0xe3, 0x7a, 0x4c, 0xd5, 0x08, 0xfa, 0xa3, 0x71, 0x61, 0x01,
0xd0, 0x59, 0xc0, 0x3f, 0x97, 0x3f, 0x9f, 0xe3, 0x1d, 0xa8, 0x5b, 0xb6, 0x45, 0xd0, 0x03, 0xdc,
0x82, 0x9d, 0x81, 0x45, 0x1d, 0x67, 0x40, 0x74, 0x54, 0xc1, 0x6d, 0x00, 0x6a, 0xf5, 0x99, 0x7d,
0xc3, 0xe4, 0xab, 0xaa, 0xca, 0x6c, 0x8f, 0x5a, 0xd4, 0xb9, 0xcd, 0x9f, 0x08, 0xc0, 0xf6, 0xaa,
0x3f, 0xf5, 0x8b, 0x3f, 0x6b, 0xf9, 0xf7, 0xca, 0x7f, 0x89, 0x02, 0x5b, 0x91, 0x95, 0xcc, 0x38,
0x7a, 0x20, 0x4b, 0x8a, 0xb4, 0x94, 0xfb, 0x19, 0xd7, 0x92, 0x38, 0xe6, 0xa3, 0x2c, 0x4c, 0x66,
0x28, 0xc0, 0x07, 0xb0, 0x17, 0xe9, 0x69, 0x32, 0xdf, 0x00, 0xb9, 0xbc, 0x99, 0xe8, 0xd6, 0x17,
0x1b, 0xd8, 0x0b, 0x59, 0x68, 0xa4, 0x73, 0x31, 0x4a, 0xc3, 0xe1, 0xa6, 0xc2, 0x58, 0xbe, 0xc1,
0xc8, 0x99, 0x24, 0x9f, 0xad, 0x41, 0x81, 0x26, 0xb9, 0xc4, 0x0d, 0xcf, 0x9c, 0xa5, 0xd0, 0x92,
0xd9, 0x8b, 0x70, 0x2c, 0x50, 0x88, 0x8f, 0x00, 0xad, 0x2c, 0xf4, 0xfd, 0x34, 0x0b, 0x73, 0xfe,
0xcf, 0x15, 0x7c, 0x00, 0xed, 0xdc, 0xc2, 0x1a, 0xfc, 0x45, 0xfe, 0x8f, 0x5d, 0x69, 0x61, 0x8d,
0xfd, 0x5a, 0xc1, 0x27, 0x80, 0xef, 0x2d, 0xac, 0x13, 0xbf, 0x55, 0x64, 0x63, 0x73, 0x0b, 0xf7,
0xa0, 0x40, 0xbf, 0x57, 0xf0, 0x3e, 0xb4, 0x56, 0xc7, 0xe5, 0xfd, 0x45, 0x5f, 0x55, 0x8b, 0xa3,
0x56, 0x0a, 0x05, 0xf8, 0x75, 0x15, 0x3f, 0x84, 0xe3, 0x7f, 0x83, 0xfd, 0x34, 0x19, 0xcb, 0x69,
0x86, 0xbe, 0x91, 0x7d, 0x6e, 0x44, 0x74, 0x26, 0x78, 0x9a, 0xa1, 0x2f, 0x6a, 0x79, 0xa4, 0xf3,
0x98, 0x67, 0x1c, 0x7d, 0x59, 0xc3, 0x4d, 0xd8, 0x8e, 0x7a, 0xf1, 0x42, 0x4c, 0xd0, 0xeb, 0x22,
0xe5, 0x70, 0x3f, 0x1d, 0x4d, 0xd0, 0x5f, 0xb5, 0xdc, 0x7e, 0x11, 0x31, 0x2e, 0x16, 0x71, 0x86,
0xfe, 0xae, 0xe1, 0x36, 0x28, 0x91, 0x1b, 0x4e, 0xb9, 0x1b, 0x8e, 0x22, 0xf4, 0xad, 0x92, 0xbb,
0x7e, 0xba, 0xe0, 0xe9, 0xd2, 0x4a, 0x02, 0x2e, 0x6f, 0x5f, 0xa0, 0xef, 0x14, 0xbc, 0x07, 0x10,
0x19, 0x89, 0x1f, 0x14, 0xf6, 0xbe, 0x2f, 0x00, 0xc6, 0x3f, 0x5d, 0x70, 0x91, 0x51, 0x1d, 0xfd,
0x20, 0xbf, 0x64, 0xb3, 0x04, 0x5c, 0xc7, 0x46, 0x3f, 0x2a, 0xd7, 0xd7, 0x9f, 0x7c, 0x34, 0x0e,
0xb3, 0xc9, 0x62, 0x28, 0x87, 0xd3, 0xd5, 0xab, 0x30, 0x8e, 0xc3, 0x57, 0x19, 0x1f, 0x4d, 0xae,
0x8a, 0xc1, 0xf5, 0x28, 0x08, 0x45, 0x96, 0x86, 0xc3, 0x45, 0xc6, 0x83, 0xab, 0x70, 0x96, 0xf1,
0x74, 0xe6, 0xc7, 0x57, 0xf9, 0x34, 0xbb, 0x2a, 0xa6, 0xd9, 0x7c, 0x38, 0xdc, 0xce, 0xe3, 0xf7,
0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0xbf, 0x87, 0x1d, 0x81, 0xb0, 0x06, 0x00, 0x00,
// 1062 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x54, 0xcb, 0x6e, 0xe3, 0x36,
0x17, 0x1e, 0x5f, 0x12, 0x47, 0xc7, 0x8e, 0xc3, 0x30, 0x37, 0xff, 0x7f, 0xd3, 0x22, 0xf0, 0x2a,
0x08, 0x30, 0x49, 0xd1, 0x02, 0xed, 0x6a, 0x80, 0x3a, 0x12, 0x9d, 0x10, 0x23, 0x4b, 0x1e, 0x4a,
0x9e, 0x66, 0xba, 0x11, 0x64, 0x8b, 0x63, 0x0b, 0x92, 0x2d, 0x57, 0xa4, 0xa7, 0xf5, 0x3c, 0x45,
0x3b, 0xef, 0xd0, 0x5d, 0x0b, 0xf4, 0xb6, 0xe8, 0x23, 0xf4, 0xf6, 0x20, 0x7d, 0x80, 0xde, 0x96,
0x05, 0x25, 0x2b, 0x36, 0x8a, 0xe9, 0x8e, 0xe7, 0xfb, 0x78, 0x3e, 0x9e, 0xef, 0x90, 0x87, 0xd0,
0x18, 0x25, 0xd3, 0x69, 0x32, 0xbb, 0x9c, 0xa7, 0x89, 0x4c, 0xf0, 0xc1, 0x34, 0x8c, 0x5f, 0x2c,
0x44, 0x1e, 0x5d, 0xe6, 0x54, 0xbb, 0x06, 0x5b, 0x64, 0x3a, 0x97, 0xcb, 0xb6, 0x07, 0xdb, 0x8e,
0xf4, 0xe5, 0x42, 0xe0, 0x47, 0x00, 0x3c, 0x4d, 0x93, 0xd4, 0x1b, 0x25, 0x01, 0x6f, 0x95, 0xce,
0x4a, 0xe7, 0xcd, 0x77, 0xde, 0xba, 0x7c, 0x4d, 0xf2, 0x25, 0x51, 0xdb, 0xf4, 0x24, 0xe0, 0x4c,
0xe3, 0xc5, 0x12, 0x1f, 0xc3, 0x76, 0xca, 0x7d, 0x91, 0xcc, 0x5a, 0xe5, 0xb3, 0xd2, 0xb9, 0xc6,
0x56, 0x51, 0xfb, 0x3d, 0x68, 0x3c, 0xe6, 0xcb, 0xa7, 0x7e, 0xbc, 0xe0, 0x7d, 0x3f, 0x4c, 0x31,
0x82, 0x4a, 0xc4, 0x97, 0x99, 0xbe, 0xc6, 0xd4, 0x12, 0x1f, 0xc2, 0xd6, 0x0b, 0x45, 0xaf, 0x12,
0xf3, 0xa0, 0x7d, 0x0a, 0xd5, 0xeb, 0x38, 0x19, 0xae, 0x59, 0x95, 0xd1, 0x28, 0xd8, 0x87, 0x50,
0xeb, 0x04, 0x41, 0xca, 0x85, 0xc0, 0x4d, 0x28, 0x87, 0xf3, 0x95, 0x5e, 0x39, 0x9c, 0x63, 0x0c,
0xd5, 0x79, 0x92, 0xca, 0x4c, 0xad, 0xc2, 0xb2, 0x75, 0xfb, 0x55, 0x09, 0x6a, 0x3d, 0x31, 0xbe,
0xf6, 0x05, 0xc7, 0xef, 0xc3, 0xce, 0x54, 0x8c, 0x3d, 0xb9, 0x9c, 0x17, 0x2e, 0x4f, 0x5f, 0xeb,
0xb2, 0x27, 0xc6, 0xee, 0x72, 0xce, 0x59, 0x6d, 0x9a, 0x2f, 0x54, 0x25, 0x53, 0x31, 0xa6, 0xc6,
0x4a, 0x39, 0x0f, 0xf0, 0x29, 0x68, 0x32, 0x9c, 0x72, 0x21, 0xfd, 0xe9, 0xbc, 0x55, 0x39, 0x2b,
0x9d, 0x57, 0xd9, 0x1a, 0xc0, 0xff, 0x87, 0x1d, 0x91, 0x2c, 0xd2, 0x11, 0xa7, 0x46, 0xab, 0x9a,
0xa5, 0xdd, 0xc7, 0xed, 0x47, 0xa0, 0xf5, 0xc4, 0xf8, 0x96, 0xfb, 0x01, 0x4f, 0xf1, 0xdb, 0x50,
0x1d, 0xfa, 0x22, 0xaf, 0xa8, 0xfe, 0xdf, 0x15, 0x29, 0x07, 0x2c, 0xdb, 0x79, 0xf1, 0x43, 0x15,
0xb4, 0xfb, 0x9b, 0xc0, 0x75, 0xa8, 0x39, 0x03, 0x5d, 0x27, 0x8e, 0x83, 0x1e, 0xe0, 0x43, 0x40,
0x03, 0x8b, 0xdc, 0xf5, 0x89, 0xee, 0x12, 0xc3, 0x23, 0x8c, 0xd9, 0x0c, 0x95, 0x30, 0x86, 0xa6,
0x6e, 0x5b, 0x16, 0xd1, 0x5d, 0xaf, 0xdb, 0xa1, 0x26, 0x31, 0x50, 0x19, 0x1f, 0xc1, 0x7e, 0x9f,
0xb0, 0x1e, 0x75, 0x1c, 0x6a, 0x5b, 0x9e, 0x41, 0x2c, 0x4a, 0x0c, 0x54, 0xc1, 0xff, 0x83, 0x23,
0xdd, 0x36, 0x4d, 0xa2, 0xbb, 0x0a, 0xb6, 0x6c, 0xd7, 0x23, 0x77, 0xd4, 0x71, 0x1d, 0x54, 0x55,
0xda, 0xd4, 0x34, 0xc9, 0x4d, 0xc7, 0xf4, 0x3a, 0xec, 0x66, 0xd0, 0x23, 0x96, 0x8b, 0xb6, 0x94,
0x4e, 0x81, 0x1a, 0xb4, 0x47, 0x2c, 0x25, 0x87, 0x6a, 0xf8, 0x18, 0x70, 0x01, 0x53, 0xcb, 0x20,
0x77, 0x9e, 0xfb, 0xac, 0x4f, 0xd0, 0x0e, 0x7e, 0x03, 0x4e, 0x0a, 0x7c, 0xf3, 0x9c, 0x4e, 0x8f,
0x20, 0x0d, 0x23, 0x68, 0x14, 0xa4, 0x6b, 0xf7, 0x1f, 0x23, 0xd8, 0x54, 0x67, 0xf6, 0x87, 0x8c,
0xe8, 0x36, 0x33, 0x50, 0x7d, 0x13, 0x7e, 0x4a, 0x74, 0xd7, 0x66, 0x1e, 0x35, 0x50, 0x43, 0x15,
0x5f, 0xc0, 0x0e, 0xe9, 0x30, 0xfd, 0xd6, 0x63, 0xc4, 0x19, 0x98, 0x2e, 0xda, 0x55, 0x2d, 0xe8,
0x52, 0x93, 0x64, 0x8e, 0xba, 0xf6, 0xc0, 0x32, 0x50, 0x13, 0xef, 0x41, 0xbd, 0x47, 0xdc, 0x4e,
0xd1, 0x93, 0x3d, 0x75, 0xbe, 0xde, 0xd1, 0x6f, 0x49, 0x81, 0x20, 0xdc, 0x82, 0x43, 0xbd, 0x63,
0xa9, 0x24, 0x9d, 0x91, 0x8e, 0x4b, 0xbc, 0xae, 0x6d, 0x1a, 0x84, 0xa1, 0x7d, 0x65, 0xf0, 0x5f,
0x0c, 0x35, 0x09, 0xc2, 0x1b, 0x19, 0x06, 0x31, 0xc9, 0x3a, 0xe3, 0x60, 0x23, 0xa3, 0x60, 0x54,
0xc6, 0xa1, 0x32, 0x73, 0x3d, 0xa0, 0xa6, 0xb1, 0x6a, 0x54, 0x7e, 0x69, 0x47, 0x78, 0x1f, 0x76,
0x0b, 0x33, 0x96, 0x49, 0x1d, 0x17, 0x1d, 0xe3, 0x13, 0x38, 0x28, 0xa0, 0x1e, 0x71, 0x19, 0xd5,
0xf3, 0xae, 0x9e, 0xa8, 0xbd, 0xf6, 0xc0, 0xf5, 0xec, 0xae, 0xd7, 0x23, 0x3d, 0x9b, 0x3d, 0x43,
0x2d, 0x7c, 0x08, 0x7b, 0x86, 0xe1, 0x31, 0xf2, 0x64, 0x40, 0x1c, 0xd7, 0x63, 0x1d, 0x9d, 0xa0,
0xdf, 0x6a, 0x17, 0x16, 0x00, 0x9d, 0x05, 0xfc, 0x53, 0x35, 0xf9, 0x1c, 0xef, 0x40, 0xd5, 0xb2,
0x2d, 0x82, 0x1e, 0xe0, 0x06, 0xec, 0x0c, 0x2c, 0xea, 0x38, 0x03, 0x62, 0xa0, 0x12, 0x6e, 0x02,
0x50, 0xab, 0xcf, 0xec, 0x1b, 0xa6, 0x5e, 0x55, 0x59, 0xb1, 0x5d, 0x6a, 0x51, 0xe7, 0x36, 0x7b,
0x22, 0x00, 0xdb, 0xab, 0xfe, 0x54, 0x2f, 0xbe, 0xa8, 0x66, 0xe3, 0x95, 0x4d, 0x89, 0x06, 0x5b,
0x91, 0x95, 0xcc, 0x38, 0x7a, 0xa0, 0x2c, 0x45, 0x7a, 0xca, 0x7d, 0xc9, 0xf5, 0x24, 0x8e, 0xf9,
0x48, 0x86, 0xc9, 0x0c, 0x05, 0xf8, 0x00, 0xf6, 0x22, 0x23, 0x4d, 0xe6, 0x1b, 0x20, 0x57, 0x37,
0x13, 0xdd, 0xfa, 0x62, 0x03, 0x7b, 0xae, 0x8c, 0x46, 0x06, 0x17, 0xa3, 0x34, 0x1c, 0x6e, 0x2a,
0x8c, 0xd5, 0x1b, 0x8c, 0x9c, 0x49, 0xf2, 0xc9, 0x1a, 0x14, 0x68, 0x92, 0x49, 0xdc, 0x70, 0xe9,
0x2c, 0x85, 0x9e, 0xcc, 0x9e, 0x87, 0x63, 0x81, 0x42, 0x7c, 0x04, 0x68, 0x55, 0x42, 0xdf, 0x4f,
0x65, 0x98, 0xe5, 0xff, 0x58, 0xc2, 0x07, 0xd0, 0xcc, 0x4a, 0x58, 0x83, 0x3f, 0xa9, 0xf9, 0xd8,
0x55, 0x25, 0xac, 0xb1, 0x9f, 0x4b, 0xf8, 0x04, 0xf0, 0x7d, 0x09, 0x6b, 0xe2, 0x97, 0x92, 0x6a,
0x6c, 0x56, 0xc2, 0x3d, 0x28, 0xd0, 0xaf, 0x25, 0xbc, 0x0f, 0x8d, 0xd5, 0x71, 0x59, 0x7f, 0xd1,
0x97, 0xe5, 0xfc, 0xa8, 0x95, 0x42, 0x0e, 0x7e, 0xa5, 0x5a, 0x59, 0x8b, 0xe8, 0x4c, 0xf0, 0x54,
0xa2, 0xcf, 0x2a, 0x59, 0x64, 0xf0, 0x98, 0x4b, 0x8e, 0x3e, 0xaf, 0xe0, 0x3a, 0x6c, 0x47, 0xdd,
0x78, 0x21, 0x26, 0xe8, 0x55, 0x4e, 0x39, 0xdc, 0x4f, 0x47, 0x13, 0xf4, 0x7b, 0x25, 0xab, 0x30,
0x8f, 0x18, 0x17, 0x8b, 0x58, 0xa2, 0x3f, 0x2a, 0x99, 0xfe, 0x0d, 0x97, 0xeb, 0xfb, 0x44, 0x7f,
0x56, 0xf0, 0x9b, 0xd0, 0x52, 0xe0, 0xba, 0x3f, 0x8a, 0x09, 0x85, 0x0c, 0x47, 0x02, 0xfd, 0x55,
0xc1, 0xa7, 0x70, 0xa2, 0xe8, 0xfb, 0xda, 0x37, 0xd8, 0xbf, 0x2b, 0xb8, 0x09, 0x5a, 0xe4, 0x86,
0x53, 0xee, 0x86, 0xa3, 0x08, 0x7d, 0xad, 0x65, 0x56, 0x9f, 0x2c, 0x78, 0xba, 0xb4, 0x92, 0x80,
0xab, 0xad, 0x02, 0x7d, 0xa3, 0xe1, 0x3d, 0x80, 0xc8, 0x4c, 0xfc, 0x20, 0xf7, 0xf4, 0x6d, 0x0e,
0x30, 0xfe, 0xf1, 0x82, 0x0b, 0x49, 0x0d, 0xf4, 0x9d, 0x9a, 0xe3, 0x7a, 0x01, 0xb8, 0x8e, 0x8d,
0xbe, 0xd7, 0xae, 0xaf, 0x3f, 0xfa, 0x60, 0x1c, 0xca, 0xc9, 0x62, 0xa8, 0x7e, 0xb4, 0xab, 0x97,
0x61, 0x1c, 0x87, 0x2f, 0x25, 0x1f, 0x4d, 0xae, 0xf2, 0xdf, 0xee, 0x61, 0x10, 0x0a, 0x99, 0x86,
0xc3, 0x85, 0xe4, 0xc1, 0x55, 0x38, 0x93, 0x3c, 0x9d, 0xf9, 0xf1, 0x55, 0xf6, 0x05, 0x5e, 0xe5,
0x5f, 0xe0, 0x7c, 0x38, 0xdc, 0xce, 0xe2, 0x77, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0x31, 0x9c,
0x64, 0xd6, 0xe5, 0x06, 0x00, 0x00,
}
internal/proto/master.proto
浏览文件 @ 76d92e73
......@@ -5,6 +5,7 @@ option go_package="github.com/zilliztech/milvus-distributed/internal/proto/maste
import "common.proto";
import "milvus.proto";
import "internal.proto";
import "data_service.proto";
message IDRequest {
......@@ -66,8 +67,7 @@ service MasterService {
*/
rpc DescribeCollection(milvus.DescribeCollectionRequest) returns (milvus.DescribeCollectionResponse) {}
// rpc GetCollectionStatistics(milvus.CollectionStatsRequest) returns (milvus.CollectionStatsResponse) {}
rpc GetCollectionStatistics(milvus.CollectionStatsRequest) returns (milvus.CollectionStatsResponse) {}
/**
* @brief This method is used to list all collections.
......@@ -97,7 +97,7 @@ service MasterService {
*/
rpc HasPartition(milvus.HasPartitionRequest) returns (milvus.BoolResponse) {}
// rpc GetPartitionStatistics(milvus.PartitionStatsRequest) returns (milvus.PartitionStatsResponse) {}
rpc GetPartitionStatistics(milvus.PartitionStatsRequest) returns (milvus.PartitionStatsResponse) {}
/**
* @brief This method is used to show partition information
......@@ -121,4 +121,10 @@ service MasterService {
// todo move to data service
rpc AssignSegmentID(data.AssignSegIDRequest) returns (data.AssignSegIDResponse) {}
rpc GetServiceStates(common.Empty) returns (internal.ServiceStates) {}
rpc GetTimeTickChannel(common.Empty) returns (milvus.StringResponse) {}
rpc GetStatisticsChannel(common.Empty) returns (milvus.StringResponse) {}
}
\ No newline at end of file
internal/proto/milvus.proto
浏览文件 @ 76d92e73
......@@ -32,6 +32,11 @@ message BoolResponse {
bool value = 2;
}
message StringResponse {
common.Status status = 1;
string value = 2;
}
message DescribeCollectionRequest {
common.MsgBase base = 1;
string db_name = 2;
......@@ -62,8 +67,8 @@ message CollectionStatsRequest {
}
message CollectionStatsResponse {
repeated common.KeyValuePair stats = 1;
common.Status status = 2;
common.Status status = 1;
repeated common.KeyValuePair stats = 2;
}
......@@ -73,8 +78,8 @@ message ShowCollectionRequest {
}
message ShowCollectionResponse {
repeated string collection_names = 1;
common.Status status = 2;
common.Status status = 1;
repeated string collection_names = 2;
}
......@@ -122,8 +127,8 @@ message PartitionStatsRequest {
}
message PartitionStatsResponse {
repeated common.KeyValuePair stats = 1;
common.Status status = 2;
common.Status status = 1;
repeated common.KeyValuePair stats = 2;
}
message ShowPartitionRequest {
......@@ -134,9 +139,9 @@ message ShowPartitionRequest {
}
message ShowPartitionResponse {
repeated string partition_names = 1;
repeated int64 partitionIDs = 2;
common.Status status = 3;
common.Status status = 1;
repeated string partition_names = 2;
repeated int64 partitionIDs = 3;
}
message DescribeSegmentRequest {
......@@ -210,9 +215,9 @@ message InsertRequest {
}
message InsertResponse {
int64 rowID_begin = 1;
int64 rowID_end = 2;
common.Status status = 3;
common.Status status = 1;
int64 rowID_begin = 2;
int64 rowID_end = 3;
}
enum PlaceholderType {
......@@ -284,4 +289,6 @@ service MilvusService {
rpc Insert(InsertRequest) returns (InsertResponse) {}
rpc Search(SearchRequest) returns (SearchResults) {}
rpc Flush(FlushRequest) returns (common.Status) {}
rpc GetDdChannel(common.Empty) returns (StringResponse) {}
}
internal/proxynode/grpc_service.go
浏览文件 @ 76d92e73
......@@ -753,7 +753,7 @@ func (p *Proxy) DescribeIndexProgress(ctx context.Context, req *servicepb.Descri
Condition: NewTaskCondition(ctx),
IndexStateRequest: milvuspb.IndexStateRequest{
Base: &commonpb.MsgBase{
MsgType: commonpb.MsgType_kDescribeIndexProgress,
MsgType: commonpb.MsgType_kGetIndexState,
SourceID: Params.ProxyID(),
},
CollectionName: req.CollectionName,
......
internal/util/typeutil/service.go
浏览文件 @ 76d92e73
......@@ -4,10 +4,13 @@ import (
"github.com/zilliztech/milvus-distributed/internal/proto/internalpb2"
)
type Component interface {
type Service interface {
Init()
Start()
Stop()
}
type Component interface {
GetServiceStates() (internalpb2.ServiceStates, error)
GetTimeTickChannel() (string, error)
GetStatisticsChannel() (string, error)
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或