From 2e2e059f8a778f62a7825213735d7687398cd9e8 Mon Sep 17 00:00:00 2001 From: "zhenshan.cao" Date: Wed, 4 Nov 2020 15:13:42 +0800 Subject: [PATCH] Add msgheader and change ReqType to MsgType Signed-off-by: zhenshan.cao --- internal/master/collection_task.go | 20 +- internal/master/partition_task.go | 20 +- internal/master/task.go | 2 +- internal/msgstream/msgstream_test.go | 8 +- internal/msgstream/newstream_test.go | 2 +- internal/msgstream/task.go | 6 +- internal/proto/internal_msg.proto | 29 +- internal/proto/internalpb/internal_msg.pb.go | 300 +++++++++---------- internal/proto/internalpb/msg_header.pb.go | 93 ++++++ internal/proto/msg_header.proto | 13 + internal/proxy/manipulation_task.go | 2 +- internal/proxy/proxy_instance.go | 2 +- internal/proxy/proxy_node.go | 2 +- internal/proxy/query_req.go | 4 +- internal/proxy/server.go | 34 +-- internal/proxy/task.go | 6 +- 16 files changed, 308 insertions(+), 235 deletions(-) create mode 100644 internal/proto/internalpb/msg_header.pb.go create mode 100644 internal/proto/msg_header.proto diff --git a/internal/master/collection_task.go b/internal/master/collection_task.go index d98ae2482d..42e62187df 100644 --- a/internal/master/collection_task.go +++ b/internal/master/collection_task.go @@ -44,12 +44,12 @@ type showCollectionsTask struct { } ////////////////////////////////////////////////////////////////////////// -func (t *createCollectionTask) Type() internalpb.ReqType { +func (t *createCollectionTask) Type() internalpb.MsgType { if t.req == nil { log.Printf("null request") return 0 } - return t.req.ReqType + return t.req.MsgType } func (t *createCollectionTask) Ts() (Timestamp, error) { @@ -106,12 +106,12 @@ func (t *createCollectionTask) Execute() error { } ////////////////////////////////////////////////////////////////////////// -func (t *dropCollectionTask) Type() internalpb.ReqType { +func (t *dropCollectionTask) Type() internalpb.MsgType { if t.req == nil { log.Printf("null request") return 0 } - return t.req.ReqType + return t.req.MsgType } func (t *dropCollectionTask) Ts() (Timestamp, error) { @@ -149,12 +149,12 @@ func (t *dropCollectionTask) Execute() error { } ////////////////////////////////////////////////////////////////////////// -func (t *hasCollectionTask) Type() internalpb.ReqType { +func (t *hasCollectionTask) Type() internalpb.MsgType { if t.req == nil { log.Printf("null request") return 0 } - return t.req.ReqType + return t.req.MsgType } func (t *hasCollectionTask) Ts() (Timestamp, error) { @@ -181,12 +181,12 @@ func (t *hasCollectionTask) Execute() error { } ////////////////////////////////////////////////////////////////////////// -func (t *describeCollectionTask) Type() internalpb.ReqType { +func (t *describeCollectionTask) Type() internalpb.MsgType { if t.req == nil { log.Printf("null request") return 0 } - return t.req.ReqType + return t.req.MsgType } func (t *describeCollectionTask) Ts() (Timestamp, error) { @@ -223,12 +223,12 @@ func (t *describeCollectionTask) Execute() error { } ////////////////////////////////////////////////////////////////////////// -func (t *showCollectionsTask) Type() internalpb.ReqType { +func (t *showCollectionsTask) Type() internalpb.MsgType { if t.req == nil { log.Printf("null request") return 0 } - return t.req.ReqType + return t.req.MsgType } func (t *showCollectionsTask) Ts() (Timestamp, error) { diff --git a/internal/master/partition_task.go b/internal/master/partition_task.go index 1e8b9c87e4..9392a77e8a 100644 --- a/internal/master/partition_task.go +++ b/internal/master/partition_task.go @@ -42,12 +42,12 @@ type showPartitionTask struct { } ////////////////////////////////////////////////////////////////////////// -func (t *createPartitionTask) Type() internalpb.ReqType { +func (t *createPartitionTask) Type() internalpb.MsgType { if t.req == nil { log.Printf("null request") return 0 } - return t.req.ReqType + return t.req.MsgType } func (t *createPartitionTask) Ts() (Timestamp, error) { @@ -91,12 +91,12 @@ func (t *createPartitionTask) Execute() error { } ////////////////////////////////////////////////////////////////////////// -func (t *dropPartitionTask) Type() internalpb.ReqType { +func (t *dropPartitionTask) Type() internalpb.MsgType { if t.req == nil { log.Printf("null request") return 0 } - return t.req.ReqType + return t.req.MsgType } func (t *dropPartitionTask) Ts() (Timestamp, error) { @@ -143,12 +143,12 @@ func (t *dropPartitionTask) Execute() error { } ////////////////////////////////////////////////////////////////////////// -func (t *hasPartitionTask) Type() internalpb.ReqType { +func (t *hasPartitionTask) Type() internalpb.MsgType { if t.req == nil { log.Printf("null request") return 0 } - return t.req.ReqType + return t.req.MsgType } func (t *hasPartitionTask) Ts() (Timestamp, error) { @@ -173,12 +173,12 @@ func (t *hasPartitionTask) Execute() error { } ////////////////////////////////////////////////////////////////////////// -func (t *describePartitionTask) Type() internalpb.ReqType { +func (t *describePartitionTask) Type() internalpb.MsgType { if t.req == nil { log.Printf("null request") return 0 } - return t.req.ReqType + return t.req.MsgType } func (t *describePartitionTask) Ts() (Timestamp, error) { @@ -210,12 +210,12 @@ func (t *describePartitionTask) Execute() error { } ////////////////////////////////////////////////////////////////////////// -func (t *showPartitionTask) Type() internalpb.ReqType { +func (t *showPartitionTask) Type() internalpb.MsgType { if t.req == nil { log.Printf("null request") return 0 } - return t.req.ReqType + return t.req.MsgType } func (t *showPartitionTask) Ts() (Timestamp, error) { diff --git a/internal/master/task.go b/internal/master/task.go index dbf0de0692..4656314da9 100644 --- a/internal/master/task.go +++ b/internal/master/task.go @@ -18,7 +18,7 @@ type baseTask struct { } type task interface { - Type() internalpb.ReqType + Type() internalpb.MsgType Ts() (Timestamp, error) Execute() error WaitToFinish(ctx context.Context) error diff --git a/internal/msgstream/msgstream_test.go b/internal/msgstream/msgstream_test.go index 03fd87ebc3..5317f511e2 100644 --- a/internal/msgstream/msgstream_test.go +++ b/internal/msgstream/msgstream_test.go @@ -29,7 +29,7 @@ func getTsMsg(msgType MsgType, reqId int64, hashValue int32) *TsMsg { switch msgType { case KInsert: insertRequest := internalPb.InsertRequest{ - ReqType: internalPb.ReqType_kInsert, + MsgType: internalPb.MsgType_kInsert, ReqId: reqId, CollectionName: "Collection", PartitionTag: "Partition", @@ -45,7 +45,7 @@ func getTsMsg(msgType MsgType, reqId int64, hashValue int32) *TsMsg { tsMsg = insertMsg case KDelete: deleteRequest := internalPb.DeleteRequest{ - ReqType: internalPb.ReqType_kDelete, + MsgType: internalPb.MsgType_kDelete, ReqId: reqId, CollectionName: "Collection", ChannelId: 1, @@ -60,7 +60,7 @@ func getTsMsg(msgType MsgType, reqId int64, hashValue int32) *TsMsg { tsMsg = deleteMsg case KSearch: searchRequest := internalPb.SearchRequest{ - ReqType: internalPb.ReqType_kSearch, + MsgType: internalPb.MsgType_kSearch, ReqId: reqId, ProxyId: 1, Timestamp: 1, @@ -97,7 +97,7 @@ func getTsMsg(msgType MsgType, reqId int64, hashValue int32) *TsMsg { tsMsg = timeSyncMsg case KTimeTick: insertRequest := internalPb.InsertRequest{ - ReqType: internalPb.ReqType_kTimeTick, + MsgType: internalPb.MsgType_kTimeTick, ReqId: reqId, CollectionName: "Collection", PartitionTag: "Partition", diff --git a/internal/msgstream/newstream_test.go b/internal/msgstream/newstream_test.go index 4e0a998e49..8ffa494653 100644 --- a/internal/msgstream/newstream_test.go +++ b/internal/msgstream/newstream_test.go @@ -207,7 +207,7 @@ func TestNewStream_Insert_TimeTick(t *testing.T) { msgPack.Msgs = append(msgPack.Msgs, getTsMsg(KInsert, 1, 1)) insertRequest := internalPb.InsertRequest{ - ReqType: internalPb.ReqType_kTimeTick, + MsgType: internalPb.MsgType_kTimeTick, ReqId: 2, CollectionName: "Collection", PartitionTag: "Partition", diff --git a/internal/msgstream/task.go b/internal/msgstream/task.go index 9c8f4a1164..976b6ead7a 100644 --- a/internal/msgstream/task.go +++ b/internal/msgstream/task.go @@ -67,7 +67,7 @@ func (it InsertTask) EndTs() Timestamp { } func (it InsertTask) Type() MsgType { - if it.ReqType == internalPb.ReqType_kTimeTick { + if it.MsgType == internalPb.MsgType_kTimeTick { return KTimeSync } return KInsert @@ -118,7 +118,7 @@ func (dt DeleteTask) EndTs() Timestamp { } func (dt DeleteTask) Type() MsgType { - if dt.ReqType == internalPb.ReqType_kTimeTick { + if dt.MsgType == internalPb.MsgType_kTimeTick { return KTimeSync } return KDelete @@ -147,7 +147,7 @@ func (st SearchTask) EndTs() Timestamp { } func (st SearchTask) Type() MsgType { - if st.ReqType == internalPb.ReqType_kTimeTick { + if st.MsgType == internalPb.MsgType_kTimeTick { return KTimeSync } return KSearch diff --git a/internal/proto/internal_msg.proto b/internal/proto/internal_msg.proto index e22e2e38f8..93f9521d7f 100644 --- a/internal/proto/internal_msg.proto +++ b/internal/proto/internal_msg.proto @@ -6,7 +6,7 @@ import "common.proto"; import "service_msg.proto"; -enum ReqType { +enum MsgType { kNone = 0; /* Definition Requests: collection */ kCreateCollection = 100; @@ -72,7 +72,7 @@ message TsoResponse { message CreateCollectionRequest { - ReqType req_type = 1; + MsgType msg_type = 1; int64 req_id = 2; uint64 timestamp = 3; int64 proxy_id = 4; @@ -81,7 +81,7 @@ message CreateCollectionRequest { message DropCollectionRequest { - ReqType req_type = 1; + MsgType msg_type = 1; int64 req_id = 2; uint64 timestamp = 3; int64 proxy_id = 4; @@ -90,7 +90,7 @@ message DropCollectionRequest { message HasCollectionRequest { - ReqType req_type = 1; + MsgType msg_type = 1; int64 req_id = 2; uint64 timestamp = 3; int64 proxy_id = 4; @@ -99,7 +99,7 @@ message HasCollectionRequest { message DescribeCollectionRequest { - ReqType req_type = 1; + MsgType msg_type = 1; int64 req_id = 2; uint64 timestamp = 3; int64 proxy_id = 4; @@ -108,7 +108,7 @@ message DescribeCollectionRequest { message ShowCollectionRequest { - ReqType req_type = 1; + MsgType msg_type = 1; int64 req_id = 2; uint64 timestamp = 3; int64 proxy_id = 4; @@ -116,7 +116,7 @@ message ShowCollectionRequest { message CreatePartitionRequest { - ReqType req_type = 1; + MsgType msg_type = 1; int64 req_id = 2; uint64 timestamp = 3; int64 proxy_id = 4; @@ -125,7 +125,7 @@ message CreatePartitionRequest { message DropPartitionRequest { - ReqType req_type = 1; + MsgType msg_type = 1; int64 req_id = 2; uint64 timestamp = 3; int64 proxy_id = 4; @@ -134,7 +134,7 @@ message DropPartitionRequest { message HasPartitionRequest { - ReqType req_type = 1; + MsgType msg_type = 1; int64 req_id = 2; uint64 timestamp = 3; int64 proxy_id = 4; @@ -143,7 +143,7 @@ message HasPartitionRequest { message DescribePartitionRequest { - ReqType req_type = 1; + MsgType msg_type = 1; int64 req_id = 2; uint64 timestamp = 3; int64 proxy_id = 4; @@ -152,7 +152,7 @@ message DescribePartitionRequest { message ShowPartitionRequest { - ReqType req_type = 1; + MsgType msg_type = 1; int64 req_id = 2; uint64 timestamp = 3; int64 proxy_id = 4; @@ -161,7 +161,7 @@ message ShowPartitionRequest { message InsertRequest { - ReqType req_type = 1; + MsgType msg_type = 1; int64 req_id = 2; string collection_name = 3; string partition_tag = 4; @@ -175,7 +175,7 @@ message InsertRequest { message DeleteRequest { - ReqType req_type = 1; + MsgType msg_type = 1; int64 req_id = 2; string collection_name = 3; int64 channel_id = 4; @@ -186,7 +186,7 @@ message DeleteRequest { message SearchRequest { - ReqType req_type = 1; + MsgType msg_type = 1; int64 req_id = 2; int64 proxy_id = 3; uint64 timestamp = 4; @@ -205,7 +205,6 @@ message SearchResult { repeated service.Hits hits = 7; } - message TimeTickMsg { int64 peer_id = 1; uint64 timestamp = 2; diff --git a/internal/proto/internalpb/internal_msg.pb.go b/internal/proto/internalpb/internal_msg.pb.go index 4f4f32b509..19108abf3c 100644 --- a/internal/proto/internalpb/internal_msg.pb.go +++ b/internal/proto/internalpb/internal_msg.pb.go @@ -22,33 +22,33 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package -type ReqType int32 +type MsgType int32 const ( - ReqType_kNone ReqType = 0 + MsgType_kNone MsgType = 0 // Definition Requests: collection - ReqType_kCreateCollection ReqType = 100 - ReqType_kDropCollection ReqType = 101 - ReqType_kHasCollection ReqType = 102 - ReqType_kDescribeCollection ReqType = 103 - ReqType_kShowCollections ReqType = 104 + MsgType_kCreateCollection MsgType = 100 + MsgType_kDropCollection MsgType = 101 + MsgType_kHasCollection MsgType = 102 + MsgType_kDescribeCollection MsgType = 103 + MsgType_kShowCollections MsgType = 104 // Definition Requests: partition - ReqType_kCreatePartition ReqType = 200 - ReqType_kDropPartition ReqType = 201 - ReqType_kHasPartition ReqType = 202 - ReqType_kDescribePartition ReqType = 203 - ReqType_kShowPartitions ReqType = 204 + MsgType_kCreatePartition MsgType = 200 + MsgType_kDropPartition MsgType = 201 + MsgType_kHasPartition MsgType = 202 + MsgType_kDescribePartition MsgType = 203 + MsgType_kShowPartitions MsgType = 204 // Manipulation Requests - ReqType_kInsert ReqType = 400 - ReqType_kDelete ReqType = 401 + MsgType_kInsert MsgType = 400 + MsgType_kDelete MsgType = 401 // Query - ReqType_kSearch ReqType = 500 + MsgType_kSearch MsgType = 500 // System Control - ReqType_kTimeTick ReqType = 1200 - ReqType_kTimeSync ReqType = 1201 + MsgType_kTimeTick MsgType = 1200 + MsgType_kTimeSync MsgType = 1201 ) -var ReqType_name = map[int32]string{ +var MsgType_name = map[int32]string{ 0: "kNone", 100: "kCreateCollection", 101: "kDropCollection", @@ -67,7 +67,7 @@ var ReqType_name = map[int32]string{ 1201: "kTimeSync", } -var ReqType_value = map[string]int32{ +var MsgType_value = map[string]int32{ "kNone": 0, "kCreateCollection": 100, "kDropCollection": 101, @@ -86,11 +86,11 @@ var ReqType_value = map[string]int32{ "kTimeSync": 1201, } -func (x ReqType) String() string { - return proto.EnumName(ReqType_name, int32(x)) +func (x MsgType) String() string { + return proto.EnumName(MsgType_name, int32(x)) } -func (ReqType) EnumDescriptor() ([]byte, []int) { +func (MsgType) EnumDescriptor() ([]byte, []int) { return fileDescriptor_7eb37f6b80b23116, []int{0} } @@ -346,7 +346,7 @@ func (m *TsoResponse) GetCount() uint32 { } type CreateCollectionRequest struct { - ReqType ReqType `protobuf:"varint,1,opt,name=req_type,json=reqType,proto3,enum=milvus.proto.internal.ReqType" json:"req_type,omitempty"` + MsgType MsgType `protobuf:"varint,1,opt,name=msg_type,json=msgType,proto3,enum=milvus.proto.internal.MsgType" json:"msg_type,omitempty"` ReqId int64 `protobuf:"varint,2,opt,name=req_id,json=reqId,proto3" json:"req_id,omitempty"` Timestamp uint64 `protobuf:"varint,3,opt,name=timestamp,proto3" json:"timestamp,omitempty"` ProxyId int64 `protobuf:"varint,4,opt,name=proxy_id,json=proxyId,proto3" json:"proxy_id,omitempty"` @@ -381,11 +381,11 @@ func (m *CreateCollectionRequest) XXX_DiscardUnknown() { var xxx_messageInfo_CreateCollectionRequest proto.InternalMessageInfo -func (m *CreateCollectionRequest) GetReqType() ReqType { +func (m *CreateCollectionRequest) GetMsgType() MsgType { if m != nil { - return m.ReqType + return m.MsgType } - return ReqType_kNone + return MsgType_kNone } func (m *CreateCollectionRequest) GetReqId() int64 { @@ -417,7 +417,7 @@ func (m *CreateCollectionRequest) GetSchema() *commonpb.Blob { } type DropCollectionRequest struct { - ReqType ReqType `protobuf:"varint,1,opt,name=req_type,json=reqType,proto3,enum=milvus.proto.internal.ReqType" json:"req_type,omitempty"` + MsgType MsgType `protobuf:"varint,1,opt,name=msg_type,json=msgType,proto3,enum=milvus.proto.internal.MsgType" json:"msg_type,omitempty"` ReqId int64 `protobuf:"varint,2,opt,name=req_id,json=reqId,proto3" json:"req_id,omitempty"` Timestamp uint64 `protobuf:"varint,3,opt,name=timestamp,proto3" json:"timestamp,omitempty"` ProxyId int64 `protobuf:"varint,4,opt,name=proxy_id,json=proxyId,proto3" json:"proxy_id,omitempty"` @@ -452,11 +452,11 @@ func (m *DropCollectionRequest) XXX_DiscardUnknown() { var xxx_messageInfo_DropCollectionRequest proto.InternalMessageInfo -func (m *DropCollectionRequest) GetReqType() ReqType { +func (m *DropCollectionRequest) GetMsgType() MsgType { if m != nil { - return m.ReqType + return m.MsgType } - return ReqType_kNone + return MsgType_kNone } func (m *DropCollectionRequest) GetReqId() int64 { @@ -488,7 +488,7 @@ func (m *DropCollectionRequest) GetCollectionName() *servicepb.CollectionName { } type HasCollectionRequest struct { - ReqType ReqType `protobuf:"varint,1,opt,name=req_type,json=reqType,proto3,enum=milvus.proto.internal.ReqType" json:"req_type,omitempty"` + MsgType MsgType `protobuf:"varint,1,opt,name=msg_type,json=msgType,proto3,enum=milvus.proto.internal.MsgType" json:"msg_type,omitempty"` ReqId int64 `protobuf:"varint,2,opt,name=req_id,json=reqId,proto3" json:"req_id,omitempty"` Timestamp uint64 `protobuf:"varint,3,opt,name=timestamp,proto3" json:"timestamp,omitempty"` ProxyId int64 `protobuf:"varint,4,opt,name=proxy_id,json=proxyId,proto3" json:"proxy_id,omitempty"` @@ -523,11 +523,11 @@ func (m *HasCollectionRequest) XXX_DiscardUnknown() { var xxx_messageInfo_HasCollectionRequest proto.InternalMessageInfo -func (m *HasCollectionRequest) GetReqType() ReqType { +func (m *HasCollectionRequest) GetMsgType() MsgType { if m != nil { - return m.ReqType + return m.MsgType } - return ReqType_kNone + return MsgType_kNone } func (m *HasCollectionRequest) GetReqId() int64 { @@ -559,7 +559,7 @@ func (m *HasCollectionRequest) GetCollectionName() *servicepb.CollectionName { } type DescribeCollectionRequest struct { - ReqType ReqType `protobuf:"varint,1,opt,name=req_type,json=reqType,proto3,enum=milvus.proto.internal.ReqType" json:"req_type,omitempty"` + MsgType MsgType `protobuf:"varint,1,opt,name=msg_type,json=msgType,proto3,enum=milvus.proto.internal.MsgType" json:"msg_type,omitempty"` ReqId int64 `protobuf:"varint,2,opt,name=req_id,json=reqId,proto3" json:"req_id,omitempty"` Timestamp uint64 `protobuf:"varint,3,opt,name=timestamp,proto3" json:"timestamp,omitempty"` ProxyId int64 `protobuf:"varint,4,opt,name=proxy_id,json=proxyId,proto3" json:"proxy_id,omitempty"` @@ -594,11 +594,11 @@ func (m *DescribeCollectionRequest) XXX_DiscardUnknown() { var xxx_messageInfo_DescribeCollectionRequest proto.InternalMessageInfo -func (m *DescribeCollectionRequest) GetReqType() ReqType { +func (m *DescribeCollectionRequest) GetMsgType() MsgType { if m != nil { - return m.ReqType + return m.MsgType } - return ReqType_kNone + return MsgType_kNone } func (m *DescribeCollectionRequest) GetReqId() int64 { @@ -630,7 +630,7 @@ func (m *DescribeCollectionRequest) GetCollectionName() *servicepb.CollectionNam } type ShowCollectionRequest struct { - ReqType ReqType `protobuf:"varint,1,opt,name=req_type,json=reqType,proto3,enum=milvus.proto.internal.ReqType" json:"req_type,omitempty"` + MsgType MsgType `protobuf:"varint,1,opt,name=msg_type,json=msgType,proto3,enum=milvus.proto.internal.MsgType" json:"msg_type,omitempty"` ReqId int64 `protobuf:"varint,2,opt,name=req_id,json=reqId,proto3" json:"req_id,omitempty"` Timestamp uint64 `protobuf:"varint,3,opt,name=timestamp,proto3" json:"timestamp,omitempty"` ProxyId int64 `protobuf:"varint,4,opt,name=proxy_id,json=proxyId,proto3" json:"proxy_id,omitempty"` @@ -664,11 +664,11 @@ func (m *ShowCollectionRequest) XXX_DiscardUnknown() { var xxx_messageInfo_ShowCollectionRequest proto.InternalMessageInfo -func (m *ShowCollectionRequest) GetReqType() ReqType { +func (m *ShowCollectionRequest) GetMsgType() MsgType { if m != nil { - return m.ReqType + return m.MsgType } - return ReqType_kNone + return MsgType_kNone } func (m *ShowCollectionRequest) GetReqId() int64 { @@ -693,7 +693,7 @@ func (m *ShowCollectionRequest) GetProxyId() int64 { } type CreatePartitionRequest struct { - ReqType ReqType `protobuf:"varint,1,opt,name=req_type,json=reqType,proto3,enum=milvus.proto.internal.ReqType" json:"req_type,omitempty"` + MsgType MsgType `protobuf:"varint,1,opt,name=msg_type,json=msgType,proto3,enum=milvus.proto.internal.MsgType" json:"msg_type,omitempty"` ReqId int64 `protobuf:"varint,2,opt,name=req_id,json=reqId,proto3" json:"req_id,omitempty"` Timestamp uint64 `protobuf:"varint,3,opt,name=timestamp,proto3" json:"timestamp,omitempty"` ProxyId int64 `protobuf:"varint,4,opt,name=proxy_id,json=proxyId,proto3" json:"proxy_id,omitempty"` @@ -728,11 +728,11 @@ func (m *CreatePartitionRequest) XXX_DiscardUnknown() { var xxx_messageInfo_CreatePartitionRequest proto.InternalMessageInfo -func (m *CreatePartitionRequest) GetReqType() ReqType { +func (m *CreatePartitionRequest) GetMsgType() MsgType { if m != nil { - return m.ReqType + return m.MsgType } - return ReqType_kNone + return MsgType_kNone } func (m *CreatePartitionRequest) GetReqId() int64 { @@ -764,7 +764,7 @@ func (m *CreatePartitionRequest) GetPartitionName() *servicepb.PartitionName { } type DropPartitionRequest struct { - ReqType ReqType `protobuf:"varint,1,opt,name=req_type,json=reqType,proto3,enum=milvus.proto.internal.ReqType" json:"req_type,omitempty"` + MsgType MsgType `protobuf:"varint,1,opt,name=msg_type,json=msgType,proto3,enum=milvus.proto.internal.MsgType" json:"msg_type,omitempty"` ReqId int64 `protobuf:"varint,2,opt,name=req_id,json=reqId,proto3" json:"req_id,omitempty"` Timestamp uint64 `protobuf:"varint,3,opt,name=timestamp,proto3" json:"timestamp,omitempty"` ProxyId int64 `protobuf:"varint,4,opt,name=proxy_id,json=proxyId,proto3" json:"proxy_id,omitempty"` @@ -799,11 +799,11 @@ func (m *DropPartitionRequest) XXX_DiscardUnknown() { var xxx_messageInfo_DropPartitionRequest proto.InternalMessageInfo -func (m *DropPartitionRequest) GetReqType() ReqType { +func (m *DropPartitionRequest) GetMsgType() MsgType { if m != nil { - return m.ReqType + return m.MsgType } - return ReqType_kNone + return MsgType_kNone } func (m *DropPartitionRequest) GetReqId() int64 { @@ -835,7 +835,7 @@ func (m *DropPartitionRequest) GetPartitionName() *servicepb.PartitionName { } type HasPartitionRequest struct { - ReqType ReqType `protobuf:"varint,1,opt,name=req_type,json=reqType,proto3,enum=milvus.proto.internal.ReqType" json:"req_type,omitempty"` + MsgType MsgType `protobuf:"varint,1,opt,name=msg_type,json=msgType,proto3,enum=milvus.proto.internal.MsgType" json:"msg_type,omitempty"` ReqId int64 `protobuf:"varint,2,opt,name=req_id,json=reqId,proto3" json:"req_id,omitempty"` Timestamp uint64 `protobuf:"varint,3,opt,name=timestamp,proto3" json:"timestamp,omitempty"` ProxyId int64 `protobuf:"varint,4,opt,name=proxy_id,json=proxyId,proto3" json:"proxy_id,omitempty"` @@ -870,11 +870,11 @@ func (m *HasPartitionRequest) XXX_DiscardUnknown() { var xxx_messageInfo_HasPartitionRequest proto.InternalMessageInfo -func (m *HasPartitionRequest) GetReqType() ReqType { +func (m *HasPartitionRequest) GetMsgType() MsgType { if m != nil { - return m.ReqType + return m.MsgType } - return ReqType_kNone + return MsgType_kNone } func (m *HasPartitionRequest) GetReqId() int64 { @@ -906,7 +906,7 @@ func (m *HasPartitionRequest) GetPartitionName() *servicepb.PartitionName { } type DescribePartitionRequest struct { - ReqType ReqType `protobuf:"varint,1,opt,name=req_type,json=reqType,proto3,enum=milvus.proto.internal.ReqType" json:"req_type,omitempty"` + MsgType MsgType `protobuf:"varint,1,opt,name=msg_type,json=msgType,proto3,enum=milvus.proto.internal.MsgType" json:"msg_type,omitempty"` ReqId int64 `protobuf:"varint,2,opt,name=req_id,json=reqId,proto3" json:"req_id,omitempty"` Timestamp uint64 `protobuf:"varint,3,opt,name=timestamp,proto3" json:"timestamp,omitempty"` ProxyId int64 `protobuf:"varint,4,opt,name=proxy_id,json=proxyId,proto3" json:"proxy_id,omitempty"` @@ -941,11 +941,11 @@ func (m *DescribePartitionRequest) XXX_DiscardUnknown() { var xxx_messageInfo_DescribePartitionRequest proto.InternalMessageInfo -func (m *DescribePartitionRequest) GetReqType() ReqType { +func (m *DescribePartitionRequest) GetMsgType() MsgType { if m != nil { - return m.ReqType + return m.MsgType } - return ReqType_kNone + return MsgType_kNone } func (m *DescribePartitionRequest) GetReqId() int64 { @@ -977,7 +977,7 @@ func (m *DescribePartitionRequest) GetPartitionName() *servicepb.PartitionName { } type ShowPartitionRequest struct { - ReqType ReqType `protobuf:"varint,1,opt,name=req_type,json=reqType,proto3,enum=milvus.proto.internal.ReqType" json:"req_type,omitempty"` + MsgType MsgType `protobuf:"varint,1,opt,name=msg_type,json=msgType,proto3,enum=milvus.proto.internal.MsgType" json:"msg_type,omitempty"` ReqId int64 `protobuf:"varint,2,opt,name=req_id,json=reqId,proto3" json:"req_id,omitempty"` Timestamp uint64 `protobuf:"varint,3,opt,name=timestamp,proto3" json:"timestamp,omitempty"` ProxyId int64 `protobuf:"varint,4,opt,name=proxy_id,json=proxyId,proto3" json:"proxy_id,omitempty"` @@ -1012,11 +1012,11 @@ func (m *ShowPartitionRequest) XXX_DiscardUnknown() { var xxx_messageInfo_ShowPartitionRequest proto.InternalMessageInfo -func (m *ShowPartitionRequest) GetReqType() ReqType { +func (m *ShowPartitionRequest) GetMsgType() MsgType { if m != nil { - return m.ReqType + return m.MsgType } - return ReqType_kNone + return MsgType_kNone } func (m *ShowPartitionRequest) GetReqId() int64 { @@ -1048,7 +1048,7 @@ func (m *ShowPartitionRequest) GetCollectionName() *servicepb.CollectionName { } type InsertRequest struct { - ReqType ReqType `protobuf:"varint,1,opt,name=req_type,json=reqType,proto3,enum=milvus.proto.internal.ReqType" json:"req_type,omitempty"` + MsgType MsgType `protobuf:"varint,1,opt,name=msg_type,json=msgType,proto3,enum=milvus.proto.internal.MsgType" json:"msg_type,omitempty"` ReqId int64 `protobuf:"varint,2,opt,name=req_id,json=reqId,proto3" json:"req_id,omitempty"` CollectionName string `protobuf:"bytes,3,opt,name=collection_name,json=collectionName,proto3" json:"collection_name,omitempty"` PartitionTag string `protobuf:"bytes,4,opt,name=partition_tag,json=partitionTag,proto3" json:"partition_tag,omitempty"` @@ -1088,11 +1088,11 @@ func (m *InsertRequest) XXX_DiscardUnknown() { var xxx_messageInfo_InsertRequest proto.InternalMessageInfo -func (m *InsertRequest) GetReqType() ReqType { +func (m *InsertRequest) GetMsgType() MsgType { if m != nil { - return m.ReqType + return m.MsgType } - return ReqType_kNone + return MsgType_kNone } func (m *InsertRequest) GetReqId() int64 { @@ -1159,7 +1159,7 @@ func (m *InsertRequest) GetRowData() []*commonpb.Blob { } type DeleteRequest struct { - ReqType ReqType `protobuf:"varint,1,opt,name=req_type,json=reqType,proto3,enum=milvus.proto.internal.ReqType" json:"req_type,omitempty"` + MsgType MsgType `protobuf:"varint,1,opt,name=msg_type,json=msgType,proto3,enum=milvus.proto.internal.MsgType" json:"msg_type,omitempty"` ReqId int64 `protobuf:"varint,2,opt,name=req_id,json=reqId,proto3" json:"req_id,omitempty"` CollectionName string `protobuf:"bytes,3,opt,name=collection_name,json=collectionName,proto3" json:"collection_name,omitempty"` ChannelId int64 `protobuf:"varint,4,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` @@ -1196,11 +1196,11 @@ func (m *DeleteRequest) XXX_DiscardUnknown() { var xxx_messageInfo_DeleteRequest proto.InternalMessageInfo -func (m *DeleteRequest) GetReqType() ReqType { +func (m *DeleteRequest) GetMsgType() MsgType { if m != nil { - return m.ReqType + return m.MsgType } - return ReqType_kNone + return MsgType_kNone } func (m *DeleteRequest) GetReqId() int64 { @@ -1246,7 +1246,7 @@ func (m *DeleteRequest) GetPrimaryKeys() []int64 { } type SearchRequest struct { - ReqType ReqType `protobuf:"varint,1,opt,name=req_type,json=reqType,proto3,enum=milvus.proto.internal.ReqType" json:"req_type,omitempty"` + MsgType MsgType `protobuf:"varint,1,opt,name=msg_type,json=msgType,proto3,enum=milvus.proto.internal.MsgType" json:"msg_type,omitempty"` ReqId int64 `protobuf:"varint,2,opt,name=req_id,json=reqId,proto3" json:"req_id,omitempty"` ProxyId int64 `protobuf:"varint,3,opt,name=proxy_id,json=proxyId,proto3" json:"proxy_id,omitempty"` Timestamp uint64 `protobuf:"varint,4,opt,name=timestamp,proto3" json:"timestamp,omitempty"` @@ -1282,11 +1282,11 @@ func (m *SearchRequest) XXX_DiscardUnknown() { var xxx_messageInfo_SearchRequest proto.InternalMessageInfo -func (m *SearchRequest) GetReqType() ReqType { +func (m *SearchRequest) GetMsgType() MsgType { if m != nil { - return m.ReqType + return m.MsgType } - return ReqType_kNone + return MsgType_kNone } func (m *SearchRequest) GetReqId() int64 { @@ -1632,7 +1632,7 @@ func (m *SegmentStatistics) GetNumRows() int64 { } func init() { - proto.RegisterEnum("milvus.proto.internal.ReqType", ReqType_name, ReqType_value) + proto.RegisterEnum("milvus.proto.internal.MsgType", MsgType_name, MsgType_value) proto.RegisterEnum("milvus.proto.internal.PeerRole", PeerRole_name, PeerRole_value) proto.RegisterType((*IdRequest)(nil), "milvus.proto.internal.IdRequest") proto.RegisterType((*IdResponse)(nil), "milvus.proto.internal.IdResponse") @@ -1661,79 +1661,79 @@ func init() { func init() { proto.RegisterFile("internal_msg.proto", fileDescriptor_7eb37f6b80b23116) } var fileDescriptor_7eb37f6b80b23116 = []byte{ - // 1178 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x58, 0x4b, 0x6f, 0x1b, 0xd5, - 0x17, 0xef, 0xf8, 0x19, 0x1f, 0xc7, 0xce, 0xe4, 0x26, 0xf9, 0xc7, 0xed, 0x1f, 0x5a, 0x33, 0x45, - 0x22, 0xaa, 0x84, 0x23, 0x5c, 0x16, 0x74, 0xdb, 0x7a, 0x51, 0x53, 0xb5, 0xaa, 0xc6, 0x11, 0x48, - 0x48, 0x68, 0x34, 0x9e, 0x39, 0xd8, 0x57, 0xf3, 0xb8, 0x93, 0x7b, 0xaf, 0x13, 0x9c, 0x2f, 0xc0, - 0x16, 0xc4, 0x92, 0x1d, 0x9f, 0x00, 0xf6, 0x7c, 0x00, 0x5e, 0x7b, 0xbe, 0x04, 0x08, 0x2a, 0x81, - 0xba, 0x45, 0xf7, 0xce, 0xf8, 0x31, 0xce, 0x83, 0x67, 0x51, 0xa4, 0xec, 0xe6, 0x9c, 0xfb, 0x38, - 0xe7, 0xf7, 0x3b, 0x0f, 0xdf, 0x63, 0x20, 0x34, 0x96, 0xc8, 0x63, 0x37, 0x74, 0x22, 0x31, 0xea, - 0x24, 0x9c, 0x49, 0x46, 0x76, 0x22, 0x1a, 0x1e, 0x4d, 0x44, 0x2a, 0x75, 0x66, 0x1b, 0x6e, 0xac, - 0x7b, 0x2c, 0x8a, 0x58, 0x9c, 0xaa, 0x6f, 0x6c, 0x0a, 0xe4, 0x47, 0xd4, 0xc3, 0xc5, 0x39, 0x8b, - 0x41, 0xad, 0xef, 0xdb, 0x78, 0x38, 0x41, 0x21, 0xc9, 0x2e, 0x54, 0x13, 0x44, 0xee, 0x50, 0xbf, - 0x65, 0xb4, 0x8d, 0xbd, 0xa2, 0x5d, 0x51, 0x62, 0xdf, 0x27, 0x77, 0xa1, 0xc4, 0x59, 0x88, 0xad, - 0x42, 0xdb, 0xd8, 0x6b, 0x76, 0x6f, 0x75, 0xce, 0x34, 0xd6, 0x79, 0x8a, 0xc8, 0x6d, 0x16, 0xa2, - 0xad, 0x37, 0x93, 0x6d, 0x28, 0x7b, 0x6c, 0x12, 0xcb, 0x56, 0xb1, 0x6d, 0xec, 0x35, 0xec, 0x54, - 0xb0, 0x46, 0x00, 0xca, 0xa0, 0x48, 0x58, 0x2c, 0x90, 0xdc, 0x85, 0x8a, 0x90, 0xae, 0x9c, 0x08, - 0x6d, 0xb0, 0xde, 0xfd, 0x7f, 0xfe, 0xea, 0xcc, 0xfb, 0x81, 0xde, 0x62, 0x67, 0x5b, 0x49, 0x13, - 0x0a, 0xd4, 0xd7, 0xbe, 0x14, 0xed, 0x02, 0xf5, 0xcf, 0x31, 0x94, 0x00, 0x1c, 0x08, 0xf6, 0x5f, - 0x42, 0x3b, 0x82, 0xba, 0xb6, 0xf8, 0x4f, 0xb0, 0xbd, 0x04, 0x35, 0x49, 0x23, 0x14, 0xd2, 0x8d, - 0x12, 0xed, 0x53, 0xc9, 0x5e, 0x28, 0xce, 0xb1, 0xfb, 0x83, 0x01, 0xbb, 0x0f, 0x38, 0xba, 0x12, - 0x1f, 0xb0, 0x30, 0x44, 0x4f, 0x52, 0x16, 0xcf, 0x70, 0xdf, 0x83, 0x35, 0x8e, 0x87, 0x8e, 0x9c, - 0x26, 0xa8, 0xdd, 0x68, 0x76, 0x6f, 0x9e, 0x03, 0xd1, 0xc6, 0xc3, 0x83, 0x69, 0x82, 0x76, 0x95, - 0xa7, 0x1f, 0x64, 0x07, 0x2a, 0xea, 0xe8, 0x9c, 0xea, 0x32, 0xc7, 0xc3, 0xbe, 0x9f, 0xf7, 0xb0, - 0xb8, 0xea, 0xe1, 0x75, 0x58, 0x4b, 0x38, 0xfb, 0x70, 0xaa, 0x8e, 0x95, 0xf4, 0xb1, 0xaa, 0x96, - 0xfb, 0x3e, 0x79, 0x03, 0x2a, 0xc2, 0x1b, 0x63, 0xe4, 0xb6, 0xca, 0x9a, 0x8f, 0xeb, 0x67, 0xf2, - 0x71, 0x3f, 0x64, 0x43, 0x3b, 0xdb, 0x68, 0x3d, 0x33, 0x60, 0xa7, 0xc7, 0x59, 0x72, 0xa9, 0x71, - 0x3d, 0x86, 0x0d, 0x6f, 0xee, 0x9f, 0x13, 0xbb, 0x11, 0x66, 0x00, 0x5f, 0xcd, 0x7b, 0x94, 0x15, - 0x5f, 0x67, 0x01, 0xe6, 0x89, 0x1b, 0xa1, 0xdd, 0xf4, 0x72, 0xb2, 0xf5, 0x8b, 0x01, 0xdb, 0x0f, - 0x5d, 0x71, 0x95, 0x20, 0xff, 0x66, 0xc0, 0xf5, 0x1e, 0x0a, 0x8f, 0xd3, 0x21, 0x5e, 0x25, 0xdc, - 0x9f, 0x1b, 0xb0, 0x33, 0x18, 0xb3, 0xe3, 0xcb, 0x8c, 0xd9, 0xfa, 0xd9, 0x80, 0xff, 0xa5, 0xdd, - 0xe5, 0xa9, 0xcb, 0x25, 0xbd, 0xa4, 0x91, 0x79, 0x1b, 0x9a, 0xc9, 0xcc, 0xbd, 0xe5, 0xc0, 0xdc, - 0x3e, 0x3b, 0x30, 0x73, 0x28, 0x3a, 0x2e, 0x8d, 0x64, 0x59, 0xb4, 0x7e, 0x32, 0x60, 0x5b, 0x75, - 0x9d, 0xab, 0x82, 0xf7, 0x47, 0x03, 0xb6, 0x1e, 0xba, 0xe2, 0xaa, 0xc0, 0x7d, 0x66, 0x40, 0x6b, - 0xd6, 0x6d, 0xae, 0x0a, 0x66, 0xf5, 0xa3, 0xa2, 0x3a, 0xcd, 0x65, 0xc6, 0xfb, 0x2f, 0x37, 0xd7, - 0xe7, 0x05, 0x68, 0xf4, 0x63, 0x81, 0x5c, 0xbe, 0x38, 0xac, 0xaf, 0x9d, 0x76, 0x59, 0x21, 0xae, - 0xad, 0x3a, 0x43, 0x6e, 0xc3, 0x22, 0x20, 0x8e, 0x74, 0x47, 0x1a, 0x7b, 0xcd, 0x5e, 0x9f, 0x2b, - 0x0f, 0xdc, 0x11, 0x79, 0x19, 0x40, 0xe0, 0x28, 0xc2, 0x58, 0x2a, 0x43, 0x65, 0x6d, 0xa8, 0x96, - 0x69, 0xfa, 0xbe, 0x5a, 0xf6, 0xc6, 0x6e, 0x1c, 0x63, 0xa8, 0x96, 0x2b, 0xe9, 0x72, 0xa6, 0xe9, - 0xfb, 0x39, 0x66, 0xab, 0x79, 0x66, 0x6f, 0x02, 0xcc, 0x23, 0x20, 0x5a, 0x6b, 0xed, 0xe2, 0x5e, - 0xc9, 0x5e, 0xd2, 0xa8, 0xc7, 0x31, 0x67, 0xc7, 0x0e, 0xf5, 0x45, 0xab, 0xd6, 0x2e, 0xaa, 0xc7, - 0x31, 0x67, 0xc7, 0x7d, 0x5f, 0x90, 0x37, 0x61, 0x4d, 0x2d, 0xf8, 0xae, 0x74, 0x5b, 0xd0, 0x2e, - 0x5e, 0xfc, 0x68, 0x53, 0x77, 0xf4, 0x5c, 0xe9, 0x5a, 0x1f, 0x15, 0xa0, 0xd1, 0xc3, 0x10, 0x25, - 0x5e, 0x02, 0xe6, 0xf3, 0xac, 0x95, 0x2e, 0x62, 0xad, 0x7c, 0x11, 0x6b, 0x95, 0x53, 0xac, 0xbd, - 0x02, 0xeb, 0x09, 0xa7, 0x91, 0xcb, 0xa7, 0x4e, 0x80, 0x53, 0xd1, 0xaa, 0x6a, 0xea, 0xea, 0x99, - 0xee, 0x11, 0x4e, 0x85, 0xf5, 0xdc, 0x80, 0xc6, 0x00, 0x5d, 0xee, 0x8d, 0x5f, 0x1c, 0x13, 0xcb, - 0x08, 0x8a, 0x79, 0x04, 0xb9, 0x52, 0x2c, 0xad, 0x96, 0xe2, 0x1d, 0xd8, 0xe4, 0x28, 0x26, 0xa1, - 0x74, 0x96, 0x08, 0x4a, 0x39, 0xd8, 0x48, 0x17, 0x1e, 0xcc, 0x69, 0xda, 0x87, 0xf2, 0xe1, 0x04, - 0xf9, 0x54, 0xa7, 0xdd, 0x85, 0x59, 0x90, 0xee, 0xb3, 0x3e, 0x2d, 0xc0, 0xfa, 0x0c, 0xb9, 0xba, - 0xea, 0xef, 0x4d, 0x43, 0x7f, 0x1d, 0xb2, 0x05, 0x0d, 0xed, 0x80, 0x13, 0x33, 0x1f, 0x17, 0x11, - 0xaf, 0x6b, 0xe5, 0x13, 0xe6, 0xe3, 0x2a, 0x2d, 0xe5, 0x3f, 0x45, 0x4b, 0xe5, 0x6c, 0x5a, 0x3a, - 0x50, 0x1a, 0x53, 0x99, 0x86, 0xbe, 0xde, 0xbd, 0x71, 0x76, 0x9f, 0x7a, 0x48, 0xa5, 0xb0, 0xf5, - 0x3e, 0xab, 0x07, 0xf5, 0x03, 0x1a, 0xe1, 0x01, 0xf5, 0x82, 0xc7, 0x62, 0x74, 0xfe, 0x50, 0x7a, - 0xe1, 0x14, 0x68, 0x7d, 0x66, 0x40, 0xf5, 0x11, 0x4e, 0xbb, 0x03, 0x1c, 0x69, 0x86, 0x74, 0xe9, - 0x66, 0x37, 0x94, 0x75, 0xe5, 0x92, 0x5b, 0x50, 0x5f, 0xca, 0xcd, 0x8c, 0x3d, 0x58, 0xa4, 0xe6, - 0x1f, 0x77, 0x69, 0x2a, 0x9c, 0x23, 0x37, 0xcc, 0x08, 0x5c, 0xb3, 0xab, 0x54, 0xbc, 0xa3, 0x44, - 0x75, 0xf3, 0xa2, 0x49, 0x89, 0x56, 0x59, 0x27, 0x3d, 0xcc, 0xbb, 0x94, 0xb0, 0xde, 0x07, 0xc8, - 0x9c, 0x53, 0x10, 0x17, 0x11, 0x34, 0x96, 0x23, 0xf8, 0x16, 0x54, 0x03, 0x9c, 0x76, 0x05, 0x8e, - 0x5a, 0x05, 0xcd, 0xdd, 0x79, 0x55, 0x90, 0x5d, 0x65, 0xcf, 0xb6, 0x5b, 0x31, 0x6c, 0x0e, 0x52, - 0x63, 0x2a, 0x57, 0xa8, 0x90, 0xd4, 0x13, 0x2b, 0x9d, 0xd3, 0x58, 0xed, 0x9c, 0xb7, 0xa0, 0x1e, - 0x61, 0xc4, 0xf8, 0xd4, 0x11, 0xf4, 0x04, 0x67, 0x6c, 0xa4, 0xaa, 0x01, 0x3d, 0x41, 0x85, 0x37, - 0x9e, 0x44, 0x0e, 0x67, 0xc7, 0x62, 0x96, 0x50, 0xf1, 0x24, 0xb2, 0xd9, 0xb1, 0xb8, 0xf3, 0x55, - 0x01, 0xaa, 0x59, 0x29, 0x92, 0x1a, 0x94, 0x83, 0x27, 0x2c, 0x46, 0xf3, 0x1a, 0xd9, 0x81, 0xcd, - 0x60, 0x75, 0xe6, 0x36, 0x7d, 0xb2, 0x05, 0x1b, 0x41, 0x7e, 0x60, 0x35, 0x91, 0x10, 0x68, 0x06, - 0xb9, 0x89, 0xce, 0xfc, 0x80, 0xec, 0xc2, 0x56, 0x70, 0x7a, 0xe4, 0x31, 0x47, 0x64, 0x1b, 0xcc, - 0x20, 0x3f, 0x13, 0x08, 0x73, 0x4c, 0x76, 0xc0, 0x0c, 0x56, 0x1e, 0xe1, 0xe6, 0xd7, 0x06, 0xd9, - 0x82, 0x66, 0x90, 0x7b, 0xa9, 0x9a, 0xdf, 0x18, 0x84, 0x40, 0x23, 0x58, 0x7e, 0xce, 0x99, 0xdf, - 0x1a, 0x64, 0x17, 0x48, 0x70, 0xea, 0xcd, 0x63, 0x7e, 0x67, 0x90, 0x6d, 0xd8, 0x08, 0x72, 0x0f, - 0x03, 0x61, 0x7e, 0x6f, 0x90, 0x75, 0xa8, 0x06, 0xe9, 0x6f, 0xa7, 0xf9, 0x71, 0x51, 0x4b, 0x69, - 0x3f, 0x37, 0x3f, 0x49, 0xa5, 0xb4, 0xb2, 0xcd, 0x5f, 0x8b, 0xa4, 0x09, 0xb5, 0x60, 0x96, 0xd2, - 0xe6, 0x17, 0xb5, 0xb9, 0x3c, 0x98, 0xc6, 0x9e, 0xf9, 0x65, 0xed, 0xce, 0x3d, 0x58, 0x9b, 0xfd, - 0x77, 0x42, 0x00, 0x2a, 0x8f, 0x5d, 0x21, 0x91, 0x9b, 0xd7, 0xd4, 0xb7, 0x8d, 0xae, 0x8f, 0xdc, - 0x34, 0xd4, 0xf7, 0xbb, 0x9c, 0x2a, 0x7d, 0x41, 0x51, 0xfc, 0x54, 0x95, 0xb2, 0x59, 0xbc, 0xdf, - 0x7b, 0xef, 0xfe, 0x88, 0xca, 0xf1, 0x64, 0xa8, 0x9a, 0xc3, 0xfe, 0x09, 0x0d, 0x43, 0x7a, 0x22, - 0xd1, 0x1b, 0xef, 0xa7, 0x99, 0xf2, 0xba, 0x4f, 0x85, 0xe4, 0x74, 0x38, 0x91, 0xe8, 0xef, 0xcf, - 0xf2, 0x65, 0x5f, 0xa7, 0xcf, 0x5c, 0x4c, 0x86, 0xc3, 0x8a, 0xd6, 0xdc, 0xfd, 0x3d, 0x00, 0x00, - 0xff, 0xff, 0x82, 0x1f, 0xa0, 0x91, 0x35, 0x13, 0x00, 0x00, + // 1181 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x58, 0x4b, 0x6f, 0x1c, 0xc5, + 0x13, 0xcf, 0xec, 0xd3, 0x5b, 0xeb, 0x5d, 0x8f, 0xdb, 0xf6, 0xdf, 0x9b, 0xfc, 0x21, 0x31, 0x13, + 0x24, 0xac, 0x48, 0xd8, 0xc2, 0xe1, 0x40, 0xae, 0xc9, 0x1e, 0xb2, 0x44, 0x8e, 0xac, 0x59, 0x0b, + 0x24, 0x24, 0x34, 0x9a, 0x9d, 0x29, 0x66, 0x5b, 0xf3, 0xe8, 0x71, 0x77, 0xaf, 0xcd, 0xfa, 0x0b, + 0x70, 0x05, 0x71, 0xe4, 0xc6, 0x27, 0x80, 0x3b, 0x1f, 0x80, 0xd7, 0x9d, 0x2f, 0x01, 0x82, 0x48, + 0xa0, 0x5c, 0x51, 0xf7, 0xcc, 0x3e, 0x66, 0xfd, 0xe0, 0x19, 0x64, 0xc9, 0xb7, 0xa9, 0x9a, 0x9e, + 0xae, 0xfa, 0xfd, 0xea, 0xb1, 0x55, 0x0b, 0x84, 0x26, 0x12, 0x79, 0xe2, 0x46, 0x4e, 0x2c, 0x82, + 0x9d, 0x94, 0x33, 0xc9, 0xc8, 0x46, 0x4c, 0xa3, 0xe3, 0x91, 0xc8, 0xa4, 0x9d, 0xc9, 0x81, 0x5b, + 0xcb, 0x1e, 0x8b, 0x63, 0x96, 0x64, 0xea, 0x5b, 0xab, 0x02, 0xf9, 0x31, 0xf5, 0x70, 0xf6, 0x9d, + 0xc5, 0xa0, 0xd1, 0xf3, 0x6d, 0x3c, 0x1a, 0xa1, 0x90, 0x64, 0x13, 0xea, 0x29, 0x22, 0x77, 0xa8, + 0xdf, 0x31, 0xb6, 0x8c, 0xed, 0xb2, 0x5d, 0x53, 0x62, 0xcf, 0x27, 0xf7, 0xa1, 0xc2, 0x59, 0x84, + 0x9d, 0xd2, 0x96, 0xb1, 0xdd, 0xde, 0xbb, 0xb3, 0x73, 0xae, 0xb1, 0x9d, 0x03, 0x44, 0x6e, 0xb3, + 0x08, 0x6d, 0x7d, 0x98, 0xac, 0x43, 0xd5, 0x63, 0xa3, 0x44, 0x76, 0xca, 0x5b, 0xc6, 0x76, 0xcb, + 0xce, 0x04, 0x2b, 0x00, 0x50, 0x06, 0x45, 0xca, 0x12, 0x81, 0xe4, 0x3e, 0xd4, 0x84, 0x74, 0xe5, + 0x48, 0x68, 0x83, 0xcd, 0xbd, 0xff, 0x17, 0xaf, 0xce, 0xbd, 0xef, 0xeb, 0x23, 0x76, 0x7e, 0x94, + 0xb4, 0xa1, 0x44, 0x7d, 0xed, 0x4b, 0xd9, 0x2e, 0x51, 0xff, 0x02, 0x43, 0x29, 0xc0, 0xa1, 0x60, + 0xff, 0x25, 0xb4, 0x63, 0x68, 0x6a, 0x8b, 0xff, 0x04, 0xdb, 0x4b, 0xd0, 0x90, 0x34, 0x46, 0x21, + 0xdd, 0x38, 0xd5, 0x3e, 0x55, 0xec, 0x99, 0xe2, 0x02, 0xbb, 0x3f, 0x18, 0xb0, 0xf9, 0x88, 0xa3, + 0x2b, 0xf1, 0x11, 0x8b, 0x22, 0xf4, 0x24, 0x65, 0xc9, 0x04, 0xf7, 0x03, 0x58, 0x8a, 0x45, 0xe0, + 0xc8, 0x71, 0x8a, 0xda, 0x8d, 0xf6, 0xde, 0xed, 0x0b, 0x20, 0xee, 0x8b, 0xe0, 0x70, 0x9c, 0xa2, + 0x5d, 0x8f, 0xb3, 0x07, 0xb2, 0x01, 0x35, 0x8e, 0x47, 0xce, 0x94, 0xea, 0x2a, 0xc7, 0xa3, 0x9e, + 0x5f, 0xf4, 0xb0, 0xbc, 0xe8, 0xe1, 0x4d, 0x58, 0x4a, 0x39, 0xfb, 0x70, 0xac, 0x3e, 0xab, 0xe8, + 0xcf, 0xea, 0x5a, 0xee, 0xf9, 0xe4, 0x0d, 0xa8, 0x09, 0x6f, 0x88, 0xb1, 0xdb, 0xa9, 0x6a, 0x3e, + 0x6e, 0x9e, 0xcb, 0xc7, 0xc3, 0x88, 0x0d, 0xec, 0xfc, 0xa0, 0xf5, 0xcc, 0x80, 0x8d, 0x2e, 0x67, + 0xe9, 0x95, 0xc6, 0xb5, 0x0f, 0x2b, 0xde, 0xd4, 0x3f, 0x27, 0x71, 0x63, 0xcc, 0x01, 0xbe, 0x5a, + 0xf4, 0x28, 0x2f, 0xbe, 0x9d, 0x19, 0x98, 0xa7, 0x6e, 0x8c, 0x76, 0xdb, 0x2b, 0xc8, 0xd6, 0x2f, + 0x06, 0xac, 0x3f, 0x76, 0xc5, 0x75, 0x82, 0xfc, 0x9b, 0x01, 0x37, 0xbb, 0x28, 0x3c, 0x4e, 0x07, + 0x78, 0x9d, 0x70, 0x7f, 0x6e, 0xc0, 0x46, 0x7f, 0xc8, 0x4e, 0xae, 0x32, 0x66, 0xeb, 0x67, 0x03, + 0xfe, 0x97, 0x75, 0x97, 0x03, 0x97, 0x4b, 0x7a, 0x45, 0x23, 0xf3, 0x36, 0xb4, 0xd3, 0x89, 0x7b, + 0xf3, 0x81, 0xb9, 0x7b, 0x7e, 0x60, 0xa6, 0x50, 0x74, 0x5c, 0x5a, 0xe9, 0xbc, 0x68, 0xfd, 0x64, + 0xc0, 0xba, 0xea, 0x3a, 0xd7, 0x05, 0xef, 0x8f, 0x06, 0xac, 0x3d, 0x76, 0xc5, 0x75, 0x81, 0xfb, + 0xcc, 0x80, 0xce, 0xa4, 0xdb, 0x5c, 0x17, 0xcc, 0xea, 0x47, 0x45, 0x75, 0x9a, 0xab, 0x8c, 0xf7, + 0x5f, 0x6e, 0xae, 0xcf, 0x4b, 0xd0, 0xea, 0x25, 0x02, 0xb9, 0x7c, 0x71, 0x58, 0x5f, 0x3b, 0xeb, + 0xb2, 0x42, 0xdc, 0x58, 0x74, 0x86, 0xdc, 0x85, 0x59, 0x40, 0x1c, 0xe9, 0x06, 0x1a, 0x7b, 0xc3, + 0x5e, 0x9e, 0x2a, 0x0f, 0xdd, 0x80, 0xbc, 0x0c, 0x20, 0x30, 0x88, 0x31, 0x91, 0xca, 0x50, 0x55, + 0x1b, 0x6a, 0xe4, 0x9a, 0x9e, 0xaf, 0x5e, 0x7b, 0x43, 0x37, 0x49, 0x30, 0x52, 0xaf, 0x6b, 0xd9, + 0xeb, 0x5c, 0xd3, 0xf3, 0x0b, 0xcc, 0xd6, 0x8b, 0xcc, 0xde, 0x06, 0x98, 0x46, 0x40, 0x74, 0x96, + 0xb6, 0xca, 0xdb, 0x15, 0x7b, 0x4e, 0xa3, 0x86, 0x63, 0xce, 0x4e, 0x1c, 0xea, 0x8b, 0x4e, 0x63, + 0xab, 0xac, 0x86, 0x63, 0xce, 0x4e, 0x7a, 0xbe, 0x20, 0x6f, 0xc2, 0x92, 0x7a, 0xe1, 0xbb, 0xd2, + 0xed, 0xc0, 0x56, 0xf9, 0xf2, 0xa1, 0x4d, 0xdd, 0xd1, 0x75, 0xa5, 0x6b, 0x7d, 0x54, 0x82, 0x56, + 0x17, 0x23, 0x94, 0x78, 0x05, 0x98, 0x2f, 0xb2, 0x56, 0xb9, 0x8c, 0xb5, 0xea, 0x65, 0xac, 0xd5, + 0xce, 0xb0, 0xf6, 0x0a, 0x2c, 0xa7, 0x9c, 0xc6, 0x2e, 0x1f, 0x3b, 0x21, 0x8e, 0x45, 0xa7, 0xae, + 0xa9, 0x6b, 0xe6, 0xba, 0x27, 0x38, 0x16, 0xd6, 0x73, 0x03, 0x5a, 0x7d, 0x74, 0xb9, 0x37, 0x7c, + 0x71, 0x4c, 0xcc, 0x23, 0x28, 0x17, 0x11, 0x14, 0x4a, 0xb1, 0xb2, 0x58, 0x8a, 0xf7, 0x60, 0x95, + 0xa3, 0x18, 0x45, 0xd2, 0x99, 0x23, 0x28, 0xe3, 0x60, 0x25, 0x7b, 0xf1, 0x68, 0x4a, 0xd3, 0x2e, + 0x54, 0x8f, 0x46, 0xc8, 0xc7, 0x3a, 0xed, 0x2e, 0xcd, 0x82, 0xec, 0x9c, 0xf5, 0x69, 0x09, 0x96, + 0x27, 0xc8, 0xd5, 0x55, 0x7f, 0x6f, 0x1b, 0xfa, 0xeb, 0x90, 0x2d, 0x68, 0x69, 0x07, 0x9c, 0x84, + 0xf9, 0x38, 0x8b, 0x78, 0x53, 0x2b, 0x9f, 0x32, 0x1f, 0x17, 0x69, 0xa9, 0xfe, 0x29, 0x5a, 0x6a, + 0xe7, 0xd3, 0xb2, 0x03, 0x95, 0x21, 0x95, 0x59, 0xe8, 0x9b, 0x7b, 0xb7, 0xce, 0xef, 0x53, 0x8f, + 0xa9, 0x14, 0xb6, 0x3e, 0x67, 0x75, 0xa1, 0x79, 0x48, 0x63, 0x3c, 0xa4, 0x5e, 0xb8, 0x2f, 0x82, + 0x8b, 0x97, 0xd2, 0x4b, 0xb7, 0x40, 0xeb, 0x33, 0x03, 0xea, 0x4f, 0x70, 0xbc, 0xd7, 0xc7, 0x40, + 0x33, 0xa4, 0x4b, 0x37, 0xbf, 0xa1, 0xaa, 0x2b, 0x97, 0xdc, 0x81, 0xe6, 0x5c, 0x6e, 0xe6, 0xec, + 0xc1, 0x2c, 0x35, 0xff, 0xb8, 0x4b, 0x53, 0xe1, 0x1c, 0xbb, 0x51, 0x4e, 0xe0, 0x92, 0x5d, 0xa7, + 0xe2, 0x1d, 0x25, 0xaa, 0x9b, 0x67, 0x4d, 0x4a, 0x74, 0xaa, 0x3a, 0xe9, 0x61, 0xda, 0xa5, 0x84, + 0xf5, 0x3e, 0x40, 0xee, 0x9c, 0x82, 0x38, 0x8b, 0xa0, 0x31, 0x1f, 0xc1, 0xb7, 0xa0, 0x1e, 0xe2, + 0x78, 0x4f, 0x60, 0xd0, 0x29, 0x69, 0xee, 0x2e, 0xaa, 0x82, 0xfc, 0x2a, 0x7b, 0x72, 0xdc, 0x4a, + 0x60, 0xb5, 0x9f, 0x19, 0x53, 0xb9, 0x42, 0x85, 0xa4, 0x9e, 0x58, 0xe8, 0x9c, 0xc6, 0x62, 0xe7, + 0xbc, 0x03, 0xcd, 0x18, 0x63, 0xc6, 0xc7, 0x8e, 0xa0, 0xa7, 0x38, 0x61, 0x23, 0x53, 0xf5, 0xe9, + 0x29, 0x2a, 0xbc, 0xc9, 0x28, 0x76, 0x38, 0x3b, 0x11, 0x93, 0x84, 0x4a, 0x46, 0xb1, 0xcd, 0x4e, + 0xc4, 0xbd, 0xaf, 0x4a, 0x50, 0xcf, 0x4b, 0x91, 0x34, 0xa0, 0x1a, 0x3e, 0x65, 0x09, 0x9a, 0x37, + 0xc8, 0x06, 0xac, 0x86, 0x8b, 0x3b, 0xb7, 0xe9, 0x93, 0x35, 0x58, 0x09, 0x8b, 0x0b, 0xab, 0x89, + 0x84, 0x40, 0x3b, 0x2c, 0x6c, 0x74, 0xe6, 0x07, 0x64, 0x13, 0xd6, 0xc2, 0xb3, 0x2b, 0x8f, 0x19, + 0x90, 0x75, 0x30, 0xc3, 0xe2, 0x4e, 0x20, 0xcc, 0x21, 0xd9, 0x00, 0x33, 0x5c, 0x18, 0xc2, 0xcd, + 0xaf, 0x0d, 0xb2, 0x06, 0xed, 0xb0, 0x30, 0xa9, 0x9a, 0xdf, 0x18, 0x84, 0x40, 0x2b, 0x9c, 0x1f, + 0xe7, 0xcc, 0x6f, 0x0d, 0xb2, 0x09, 0x24, 0x3c, 0x33, 0xf3, 0x98, 0xdf, 0x19, 0x64, 0x1d, 0x56, + 0xc2, 0xc2, 0x60, 0x20, 0xcc, 0xef, 0x0d, 0xb2, 0x0c, 0xf5, 0x30, 0xfb, 0xed, 0x34, 0x3f, 0x2e, + 0x6b, 0x29, 0xeb, 0xe7, 0xe6, 0x27, 0x99, 0x94, 0x55, 0xb6, 0xf9, 0x6b, 0x99, 0xb4, 0xa1, 0x11, + 0x4e, 0x52, 0xda, 0xfc, 0xa2, 0x31, 0x95, 0xfb, 0xe3, 0xc4, 0x33, 0xbf, 0x6c, 0xdc, 0x7b, 0x00, + 0x4b, 0x93, 0xff, 0x4e, 0x08, 0x40, 0x6d, 0xdf, 0x15, 0x12, 0xb9, 0x79, 0x43, 0x3d, 0xdb, 0xe8, + 0xfa, 0xc8, 0x4d, 0x43, 0x3d, 0xbf, 0xcb, 0xa9, 0xd2, 0x97, 0x14, 0xc5, 0x07, 0xaa, 0x94, 0xcd, + 0xf2, 0xc3, 0xee, 0x7b, 0x0f, 0x03, 0x2a, 0x87, 0xa3, 0x81, 0x6a, 0x0e, 0xbb, 0xa7, 0x34, 0x8a, + 0xe8, 0xa9, 0x44, 0x6f, 0xb8, 0x9b, 0x65, 0xca, 0xeb, 0x3e, 0x15, 0x92, 0xd3, 0xc1, 0x48, 0xa2, + 0xbf, 0x3b, 0xc9, 0x97, 0x5d, 0x9d, 0x3e, 0x53, 0x31, 0x1d, 0x0c, 0x6a, 0x5a, 0x73, 0xff, 0xf7, + 0x00, 0x00, 0x00, 0xff, 0xff, 0x3a, 0x14, 0x7f, 0x35, 0x35, 0x13, 0x00, 0x00, } diff --git a/internal/proto/internalpb/msg_header.pb.go b/internal/proto/internalpb/msg_header.pb.go new file mode 100644 index 0000000000..fc45283ee0 --- /dev/null +++ b/internal/proto/internalpb/msg_header.pb.go @@ -0,0 +1,93 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// source: msg_header.proto + +package internalpb + +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + any "github.com/golang/protobuf/ptypes/any" + math "math" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package + +type MsgHeader struct { + MsgType MsgType `protobuf:"varint,1,opt,name=msg_type,json=msgType,proto3,enum=milvus.proto.internal.MsgType" json:"msg_type,omitempty"` + Message *any.Any `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *MsgHeader) Reset() { *m = MsgHeader{} } +func (m *MsgHeader) String() string { return proto.CompactTextString(m) } +func (*MsgHeader) ProtoMessage() {} +func (*MsgHeader) Descriptor() ([]byte, []int) { + return fileDescriptor_4712536c36da8833, []int{0} +} + +func (m *MsgHeader) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_MsgHeader.Unmarshal(m, b) +} +func (m *MsgHeader) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_MsgHeader.Marshal(b, m, deterministic) +} +func (m *MsgHeader) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgHeader.Merge(m, src) +} +func (m *MsgHeader) XXX_Size() int { + return xxx_messageInfo_MsgHeader.Size(m) +} +func (m *MsgHeader) XXX_DiscardUnknown() { + xxx_messageInfo_MsgHeader.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgHeader proto.InternalMessageInfo + +func (m *MsgHeader) GetMsgType() MsgType { + if m != nil { + return m.MsgType + } + return MsgType_kNone +} + +func (m *MsgHeader) GetMessage() *any.Any { + if m != nil { + return m.Message + } + return nil +} + +func init() { + proto.RegisterType((*MsgHeader)(nil), "milvus.proto.internal.MsgHeader") +} + +func init() { proto.RegisterFile("msg_header.proto", fileDescriptor_4712536c36da8833) } + +var fileDescriptor_4712536c36da8833 = []byte{ + // 222 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x8f, 0x31, 0x4b, 0xc4, 0x40, + 0x10, 0x85, 0xc9, 0x15, 0x9e, 0x46, 0x10, 0x09, 0x0a, 0xe7, 0x15, 0x72, 0x58, 0xa5, 0x71, 0x16, + 0x62, 0x65, 0x69, 0xb0, 0xb0, 0xb9, 0xe6, 0xb0, 0xb2, 0x39, 0xb2, 0x97, 0x71, 0xb2, 0xb0, 0x9b, + 0x0d, 0x3b, 0xbb, 0xc2, 0xe6, 0xd7, 0x8b, 0x59, 0xd6, 0xea, 0xba, 0xf7, 0xcd, 0x1b, 0xe6, 0x63, + 0xca, 0x5b, 0xc3, 0x74, 0x1c, 0xb0, 0xeb, 0xd1, 0xc1, 0xe4, 0xac, 0xb7, 0xd5, 0xbd, 0x51, 0xfa, + 0x27, 0x70, 0x22, 0x50, 0xa3, 0x47, 0x37, 0x76, 0x7a, 0x5b, 0xe5, 0x74, 0x34, 0x4c, 0xa9, 0xdc, + 0x3e, 0x90, 0xb5, 0xa4, 0x51, 0x2c, 0x24, 0xc3, 0xb7, 0xe8, 0xc6, 0x98, 0xaa, 0xa7, 0xb9, 0xbc, + 0xda, 0x33, 0x7d, 0x2c, 0x87, 0xab, 0xd7, 0xf2, 0xf2, 0x4f, 0xe3, 0xe3, 0x84, 0x9b, 0x62, 0x57, + 0xd4, 0x37, 0xcd, 0x23, 0x9c, 0xb5, 0xc0, 0x9e, 0xe9, 0x33, 0x4e, 0x78, 0x58, 0x9b, 0x14, 0xaa, + 0xa6, 0x5c, 0x1b, 0x64, 0xee, 0x08, 0x37, 0xab, 0x5d, 0x51, 0x5f, 0x37, 0x77, 0x90, 0xa4, 0x90, + 0xa5, 0xf0, 0x36, 0xc6, 0x76, 0x55, 0x17, 0x87, 0xbc, 0xd8, 0xbe, 0x7f, 0xb5, 0xa4, 0xfc, 0x10, + 0x24, 0x9c, 0xac, 0x11, 0xb3, 0xd2, 0x5a, 0xcd, 0x1e, 0x4f, 0x83, 0x48, 0xce, 0xe7, 0x5e, 0xb1, + 0x77, 0x4a, 0x06, 0x8f, 0xbd, 0xc8, 0xe6, 0xf4, 0xc3, 0x3f, 0x4e, 0x52, 0x5e, 0x2c, 0x93, 0x97, + 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x87, 0xfd, 0x10, 0x22, 0x01, 0x00, 0x00, +} diff --git a/internal/proto/msg_header.proto b/internal/proto/msg_header.proto new file mode 100644 index 0000000000..39a41a1453 --- /dev/null +++ b/internal/proto/msg_header.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +package milvus.proto.internal; + +option go_package="github.com/zilliztech/milvus-distributed/internal/proto/internalpb"; + +import "internal_msg.proto"; +import "google/protobuf/any.proto"; + +message MsgHeader { + MsgType msg_type = 1; + google.protobuf.Any message = 2[lazy=true]; +} diff --git a/internal/proxy/manipulation_task.go b/internal/proxy/manipulation_task.go index f021b89b9e..e5bea625cf 100644 --- a/internal/proxy/manipulation_task.go +++ b/internal/proxy/manipulation_task.go @@ -22,7 +22,7 @@ func (it *insertTask) PreExecute() error { func (it *insertTask) Execute() error { ts := it.GetTs() insertRequest := internalpb.InsertRequest{ - ReqType: internalpb.ReqType_kInsert, + MsgType: internalpb.MsgType_kInsert, ReqId: it.ReqId, CollectionName: it.rowBatch.CollectionName, PartitionTag: it.rowBatch.PartitionTag, diff --git a/internal/proxy/proxy_instance.go b/internal/proxy/proxy_instance.go index f1a788ac18..5f20c49d85 100644 --- a/internal/proxy/proxy_instance.go +++ b/internal/proxy/proxy_instance.go @@ -52,7 +52,7 @@ func (ins *proxyInstance) restartSchedulerRoutine(bufSize int) error { select { case t := <-ins.taskChan: switch (*t).Type() { - case internalpb.ReqType_kInsert: + case internalpb.MsgType_kInsert: ins.taskSch.DmQueue.Enqueue(t) default: return diff --git a/internal/proxy/proxy_node.go b/internal/proxy/proxy_node.go index de7e2d04b0..0b9d413e38 100644 --- a/internal/proxy/proxy_node.go +++ b/internal/proxy/proxy_node.go @@ -15,7 +15,7 @@ import ( ) type BaseRequest interface { - Type() internalpb.ReqType + Type() internalpb.MsgType PreExecute() commonpb.Status Execute() commonpb.Status PostExecute() commonpb.Status diff --git a/internal/proxy/query_req.go b/internal/proxy/query_req.go index d158f0f239..e8b05d3efb 100644 --- a/internal/proxy/query_req.go +++ b/internal/proxy/query_req.go @@ -19,8 +19,8 @@ type queryReq struct { } // BaseRequest interfaces -func (req *queryReq) Type() internalpb.ReqType { - return req.ReqType +func (req *queryReq) Type() internalpb.MsgType { + return req.MsgType } func (req *queryReq) PreExecute() commonpb.Status { diff --git a/internal/proxy/server.go b/internal/proxy/server.go index 0231133b12..4b2c7dbf2d 100644 --- a/internal/proxy/server.go +++ b/internal/proxy/server.go @@ -145,38 +145,6 @@ func (s *proxyServer) ShowPartitions(ctx context.Context, req *servicepb.Collect }, nil } -func (s *proxyServer) DeleteByID(ctx context.Context, req *pb.DeleteByIDParam) (*commonpb.Status, error) { - log.Printf("delete entites, total = %d", len(req.IdArray)) - mReqMsg := pb.ManipulationReqMsg{ - CollectionName: req.CollectionName, - ReqType: pb.ReqType_kDeleteEntityByID, - ProxyId: s.proxyId, - } - for _, id := range req.IdArray { - mReqMsg.PrimaryKeys = append(mReqMsg.PrimaryKeys, id) - } - if len(mReqMsg.PrimaryKeys) > 1 { - mReq := &manipulationReq{ - stats: make([]commonpb.Status, 1), - msgs: append([]*pb.ManipulationReqMsg{}, &mReqMsg), - proxy: s, - } - if st := mReq.PreExecute(); st.ErrorCode != commonpb.ErrorCode_SUCCESS { - return &st, nil - } - if st := mReq.Execute(); st.ErrorCode != commonpb.ErrorCode_SUCCESS { - return &st, nil - } - if st := mReq.PostExecute(); st.ErrorCode != commonpb.ErrorCode_SUCCESS { - return &st, nil - } - if st := mReq.WaitToFinish(); st.ErrorCode != commonpb.ErrorCode_SUCCESS { - return &st, nil - } - } - return &commonpb.Status{ErrorCode: commonpb.ErrorCode_SUCCESS}, nil -} - func (s *proxyServer) Insert(ctx context.Context, req *servicepb.RowBatch) (*servicepb.IntegerRangeResponse, error) { log.Printf("Insert Entities, total = %d", len(req.RowData)) msgMap := make(map[uint32]*pb.ManipulationReqMsg) @@ -262,7 +230,7 @@ func (s *proxyServer) Insert(ctx context.Context, req *servicepb.RowBatch) (*ser func (s *proxyServer) Search(ctx context.Context, req *servicepb.Query) (*servicepb.QueryResult, error) { qm := &queryReq{ SearchRequest: internalpb.SearchRequest{ - ReqType: internalpb.ReqType_kSearch, + MsgType: internalpb.MsgType_kSearch, ProxyId: s.proxyId, ReqId: s.queryId.Add(1), Timestamp: 0, diff --git a/internal/proxy/task.go b/internal/proxy/task.go index 56f4b1f2d5..3051337a74 100644 --- a/internal/proxy/task.go +++ b/internal/proxy/task.go @@ -9,7 +9,7 @@ import ( type task interface { Id() int64 // return ReqId - Type() internalpb.ReqType + Type() internalpb.MsgType GetTs() typeutil.Timestamp SetTs(ts typeutil.Timestamp) PreExecute() error @@ -20,7 +20,7 @@ type task interface { } type baseTask struct { - ReqType internalpb.ReqType + ReqType internalpb.MsgType ReqId int64 Ts typeutil.Timestamp ProxyId int64 @@ -30,7 +30,7 @@ func (bt *baseTask) Id() int64 { return bt.ReqId } -func (bt *baseTask) Type() internalpb.ReqType { +func (bt *baseTask) Type() internalpb.MsgType { return bt.ReqType }