From a12b184e02f76acf86321ad532593822ff56da70 Mon Sep 17 00:00:00 2001 From: xige-16 Date: Sat, 6 Feb 2021 17:37:10 +0800 Subject: [PATCH] Add field schema to LoadCollection and LoadPartition photo Signed-off-by: xige-16 --- internal/proto/query_service.proto | 3 + internal/proto/querypb/query_service.pb.go | 214 ++++++++++-------- .../flow_graph_msg_stream_input_nodes.go | 17 +- 3 files changed, 125 insertions(+), 109 deletions(-) diff --git a/internal/proto/query_service.proto b/internal/proto/query_service.proto index aeba557f58..a89235a308 100644 --- a/internal/proto/query_service.proto +++ b/internal/proto/query_service.proto @@ -8,6 +8,7 @@ import "common.proto"; import "milvus.proto"; import "internal.proto"; import "data_service.proto"; +import "schema.proto"; message RegisterNodeRequest { common.MsgBase base = 1; @@ -33,6 +34,7 @@ message LoadCollectionRequest { common.MsgBase base = 1; int64 dbID = 2; int64 collectionID = 3; + schema.CollectionSchema schema = 4; } message ReleaseCollectionRequest { @@ -84,6 +86,7 @@ message LoadPartitionRequest { int64 dbID = 2; int64 collectionID = 3; repeated int64 partitionIDs = 4; + schema.CollectionSchema schema = 5; } message ReleasePartitionRequest { diff --git a/internal/proto/querypb/query_service.pb.go b/internal/proto/querypb/query_service.pb.go index 833984a93a..c9dd91866a 100644 --- a/internal/proto/querypb/query_service.pb.go +++ b/internal/proto/querypb/query_service.pb.go @@ -11,6 +11,7 @@ import ( datapb "github.com/zilliztech/milvus-distributed/internal/proto/datapb" internalpb2 "github.com/zilliztech/milvus-distributed/internal/proto/internalpb2" milvuspb "github.com/zilliztech/milvus-distributed/internal/proto/milvuspb" + schemapb "github.com/zilliztech/milvus-distributed/internal/proto/schemapb" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -257,12 +258,13 @@ func (m *ShowCollectionResponse) GetCollectionIDs() []int64 { } type LoadCollectionRequest struct { - Base *commonpb.MsgBase `protobuf:"bytes,1,opt,name=base,proto3" json:"base,omitempty"` - DbID int64 `protobuf:"varint,2,opt,name=dbID,proto3" json:"dbID,omitempty"` - CollectionID int64 `protobuf:"varint,3,opt,name=collectionID,proto3" json:"collectionID,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Base *commonpb.MsgBase `protobuf:"bytes,1,opt,name=base,proto3" json:"base,omitempty"` + DbID int64 `protobuf:"varint,2,opt,name=dbID,proto3" json:"dbID,omitempty"` + CollectionID int64 `protobuf:"varint,3,opt,name=collectionID,proto3" json:"collectionID,omitempty"` + Schema *schemapb.CollectionSchema `protobuf:"bytes,4,opt,name=schema,proto3" json:"schema,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *LoadCollectionRequest) Reset() { *m = LoadCollectionRequest{} } @@ -311,6 +313,13 @@ func (m *LoadCollectionRequest) GetCollectionID() int64 { return 0 } +func (m *LoadCollectionRequest) GetSchema() *schemapb.CollectionSchema { + if m != nil { + return m.Schema + } + return nil +} + type ReleaseCollectionRequest struct { Base *commonpb.MsgBase `protobuf:"bytes,1,opt,name=base,proto3" json:"base,omitempty"` DbID int64 `protobuf:"varint,2,opt,name=dbID,proto3" json:"dbID,omitempty"` @@ -626,13 +635,14 @@ func (m *PartitionStatesResponse) GetPartitionDescriptions() []*PartitionStates } type LoadPartitionRequest struct { - Base *commonpb.MsgBase `protobuf:"bytes,1,opt,name=base,proto3" json:"base,omitempty"` - DbID int64 `protobuf:"varint,2,opt,name=dbID,proto3" json:"dbID,omitempty"` - CollectionID int64 `protobuf:"varint,3,opt,name=collectionID,proto3" json:"collectionID,omitempty"` - PartitionIDs []int64 `protobuf:"varint,4,rep,packed,name=partitionIDs,proto3" json:"partitionIDs,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Base *commonpb.MsgBase `protobuf:"bytes,1,opt,name=base,proto3" json:"base,omitempty"` + DbID int64 `protobuf:"varint,2,opt,name=dbID,proto3" json:"dbID,omitempty"` + CollectionID int64 `protobuf:"varint,3,opt,name=collectionID,proto3" json:"collectionID,omitempty"` + PartitionIDs []int64 `protobuf:"varint,4,rep,packed,name=partitionIDs,proto3" json:"partitionIDs,omitempty"` + Schema *schemapb.CollectionSchema `protobuf:"bytes,5,opt,name=schema,proto3" json:"schema,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *LoadPartitionRequest) Reset() { *m = LoadPartitionRequest{} } @@ -688,6 +698,13 @@ func (m *LoadPartitionRequest) GetPartitionIDs() []int64 { return nil } +func (m *LoadPartitionRequest) GetSchema() *schemapb.CollectionSchema { + if m != nil { + return m.Schema + } + return nil +} + type ReleasePartitionRequest struct { Base *commonpb.MsgBase `protobuf:"bytes,1,opt,name=base,proto3" json:"base,omitempty"` DbID int64 `protobuf:"varint,2,opt,name=dbID,proto3" json:"dbID,omitempty"` @@ -1395,90 +1412,93 @@ func init() { func init() { proto.RegisterFile("query_service.proto", fileDescriptor_5fcb6756dc1afb8d) } var fileDescriptor_5fcb6756dc1afb8d = []byte{ - // 1324 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0x5f, 0x73, 0xdb, 0x44, - 0x10, 0xb7, 0x6c, 0xc7, 0xa9, 0x37, 0xae, 0xed, 0x5e, 0xfe, 0x19, 0x51, 0x4a, 0x39, 0xa0, 0x4d, - 0x5b, 0x70, 0x98, 0x74, 0x60, 0x78, 0x82, 0x69, 0xe3, 0x4e, 0xc6, 0x0c, 0x0d, 0x41, 0x4e, 0xa7, - 0x43, 0xa0, 0x63, 0x64, 0xe9, 0xe2, 0x5c, 0x6b, 0x49, 0xae, 0xee, 0x9c, 0x34, 0x79, 0x01, 0x66, - 0x78, 0x64, 0xe0, 0x33, 0x30, 0x30, 0xc0, 0xf0, 0x81, 0x78, 0xe1, 0x05, 0xbe, 0x09, 0xa3, 0x93, - 0xac, 0x48, 0xf2, 0x39, 0x72, 0xea, 0xa6, 0xe1, 0x4d, 0x77, 0xda, 0xdb, 0xdf, 0xee, 0x6f, 0xf7, - 0xf6, 0x76, 0x61, 0xfe, 0xe9, 0x80, 0xb8, 0x87, 0x6d, 0x46, 0xdc, 0x7d, 0x6a, 0x90, 0x7a, 0xdf, - 0x75, 0xb8, 0x83, 0x90, 0x45, 0x7b, 0xfb, 0x03, 0xe6, 0xaf, 0xea, 0x42, 0x42, 0x2d, 0x19, 0x8e, - 0x65, 0x39, 0xb6, 0xbf, 0xa7, 0x96, 0xa2, 0x12, 0x6a, 0x99, 0xda, 0x9c, 0xb8, 0xb6, 0xde, 0x0b, - 0xd6, 0xc8, 0xd4, 0xb9, 0x1e, 0xd7, 0x89, 0xbf, 0x81, 0x79, 0x8d, 0x74, 0x29, 0xe3, 0xc4, 0xdd, - 0x74, 0x4c, 0xa2, 0x91, 0xa7, 0x03, 0xc2, 0x38, 0x7a, 0x0f, 0xf2, 0x1d, 0x9d, 0x91, 0x9a, 0x72, - 0x55, 0x59, 0x99, 0x5b, 0xbb, 0x5c, 0x8f, 0x21, 0x07, 0x90, 0xf7, 0x59, 0xf7, 0xae, 0xce, 0x88, - 0x26, 0x24, 0xd1, 0x07, 0x30, 0xab, 0x9b, 0xa6, 0x4b, 0x18, 0xab, 0x65, 0x4f, 0x38, 0x74, 0xc7, - 0x97, 0xd1, 0x86, 0xc2, 0xf8, 0x27, 0x05, 0x16, 0xe2, 0x16, 0xb0, 0xbe, 0x63, 0x33, 0x82, 0x6e, - 0x43, 0x81, 0x71, 0x9d, 0x0f, 0x58, 0x60, 0xc4, 0xab, 0x52, 0x7d, 0x2d, 0x21, 0xa2, 0x05, 0xa2, - 0xe8, 0x2e, 0xcc, 0x51, 0x9b, 0xf2, 0x76, 0x5f, 0x77, 0x75, 0x6b, 0x68, 0xc9, 0x1b, 0xf1, 0x93, - 0x21, 0x2b, 0x4d, 0x9b, 0xf2, 0x2d, 0x21, 0xa8, 0x01, 0x0d, 0xbf, 0xf1, 0x23, 0x58, 0x6c, 0xed, - 0x39, 0x07, 0xeb, 0x4e, 0xaf, 0x47, 0x0c, 0x4e, 0x1d, 0xfb, 0xf9, 0x49, 0x41, 0x90, 0x37, 0x3b, - 0xcd, 0x86, 0xb0, 0x23, 0xa7, 0x89, 0x6f, 0xcc, 0x60, 0x29, 0xa9, 0x7e, 0x1a, 0x8f, 0xdf, 0x82, - 0x8b, 0x46, 0xa8, 0xaa, 0xd9, 0xf0, 0x7c, 0xce, 0xad, 0xe4, 0xb4, 0xf8, 0x26, 0xfe, 0x4e, 0x81, - 0xc5, 0x4f, 0x1d, 0xdd, 0x3c, 0x23, 0xa7, 0x10, 0x86, 0x52, 0x14, 0xb0, 0x96, 0x13, 0xff, 0x62, - 0x7b, 0xf8, 0x7b, 0x05, 0x6a, 0x1a, 0xe9, 0x11, 0x9d, 0x91, 0xf3, 0x34, 0xe3, 0x5b, 0x05, 0x16, - 0xbc, 0x00, 0x6c, 0xe9, 0x2e, 0xa7, 0xe7, 0x63, 0x42, 0xdf, 0xcf, 0xb0, 0x88, 0x05, 0xd3, 0x64, - 0x00, 0x86, 0x52, 0x7f, 0xa8, 0xe9, 0x38, 0x01, 0x62, 0x7b, 0xd8, 0x82, 0x4a, 0x88, 0xe6, 0x1d, - 0x27, 0x0c, 0x5d, 0x85, 0xb9, 0x88, 0x88, 0x00, 0xcc, 0x69, 0xd1, 0x2d, 0xf4, 0x21, 0xcc, 0x78, - 0x10, 0x44, 0xf8, 0x57, 0x5e, 0xc3, 0xf5, 0xd1, 0xfa, 0x53, 0x8f, 0x6b, 0xd5, 0xfc, 0x03, 0xf8, - 0x37, 0x05, 0x96, 0x12, 0x78, 0x2f, 0x9d, 0xe5, 0x11, 0x5e, 0xf2, 0x12, 0x5e, 0xfe, 0x54, 0x60, - 0x79, 0xc4, 0xd0, 0x69, 0x82, 0xb1, 0x03, 0x4b, 0x21, 0x40, 0xdb, 0x24, 0xcc, 0x70, 0x69, 0xdf, - 0xfb, 0xf6, 0xc3, 0x32, 0xb7, 0xf6, 0x66, 0x3a, 0x89, 0x4c, 0x5b, 0x0c, 0x55, 0x34, 0x22, 0x1a, - 0xf0, 0xaf, 0x0a, 0x2c, 0x78, 0x97, 0xf8, 0xfc, 0x32, 0x77, 0x22, 0x4e, 0x7f, 0x57, 0x60, 0x39, - 0xb8, 0xe7, 0xff, 0x73, 0x4b, 0x7f, 0x56, 0x40, 0x5d, 0x77, 0x89, 0xce, 0xc9, 0xe7, 0x5e, 0x1c, - 0xd6, 0xf7, 0x74, 0xdb, 0x26, 0xbd, 0xe9, 0x12, 0xe0, 0x3a, 0x54, 0x5c, 0xdf, 0xd9, 0xb6, 0xe1, - 0xeb, 0x13, 0xa6, 0x17, 0xb5, 0x72, 0xb0, 0x1d, 0xa0, 0xa0, 0xb7, 0xa1, 0xec, 0x12, 0x36, 0xe8, - 0x1d, 0xcb, 0xe5, 0x84, 0xdc, 0x45, 0x7f, 0x37, 0x10, 0xc3, 0xbf, 0x28, 0xb0, 0x7c, 0xc7, 0x34, - 0xa3, 0x06, 0x4e, 0x71, 0x97, 0x6e, 0xc1, 0xa5, 0x84, 0x75, 0x01, 0xb5, 0x45, 0xad, 0x1a, 0xb7, - 0xaf, 0xd9, 0x40, 0x37, 0xa0, 0x1a, 0xb7, 0x30, 0xa0, 0xba, 0xa8, 0x55, 0x62, 0x36, 0x36, 0x1b, - 0xf8, 0x6f, 0x05, 0x54, 0x8d, 0x58, 0xce, 0x3e, 0x91, 0x1a, 0xfa, 0x5c, 0x4c, 0x0e, 0xbd, 0xcb, - 0x4e, 0xe7, 0x5d, 0xee, 0x14, 0xde, 0xe5, 0xe5, 0xde, 0x3d, 0x86, 0xa5, 0x87, 0x3a, 0x37, 0xf6, - 0x1a, 0xd6, 0xf4, 0x11, 0xb8, 0x02, 0x10, 0xe2, 0xf9, 0x45, 0xa1, 0xa8, 0x45, 0x76, 0xf0, 0x1f, - 0x59, 0x40, 0xde, 0x25, 0x6f, 0x91, 0xae, 0x45, 0x6c, 0xfe, 0xf2, 0x2f, 0x4e, 0xe2, 0x5d, 0xc8, - 0x8f, 0xbe, 0x0b, 0x57, 0x00, 0x98, 0x6f, 0x9d, 0xe7, 0xc2, 0x8c, 0xb8, 0x58, 0x91, 0x1d, 0xa4, - 0xc2, 0x85, 0x5d, 0x4a, 0x7a, 0xa6, 0xf7, 0xb7, 0x20, 0xfe, 0x86, 0x6b, 0xf4, 0x09, 0x94, 0x03, - 0xc9, 0xb6, 0x78, 0x2a, 0x58, 0x6d, 0x56, 0x56, 0x17, 0xbd, 0x4e, 0xb5, 0x1e, 0x50, 0x20, 0x8a, - 0x62, 0xd3, 0xde, 0x75, 0xb4, 0x8b, 0x2c, 0xb2, 0xc3, 0xf0, 0xbf, 0x0a, 0x2c, 0x06, 0x85, 0xe6, - 0xdc, 0xd8, 0x9a, 0xa0, 0xcc, 0x4c, 0xc3, 0x17, 0xfe, 0x51, 0x81, 0xe5, 0x75, 0xc7, 0xea, 0x3b, - 0x76, 0xe8, 0xf7, 0x74, 0xf5, 0xe9, 0x23, 0xff, 0x10, 0x19, 0x36, 0xc7, 0xd7, 0xc6, 0x34, 0xc7, - 0x49, 0xd0, 0xe0, 0x14, 0xfe, 0x47, 0x81, 0xb9, 0x80, 0x6d, 0x2f, 0x26, 0xe8, 0x32, 0x14, 0x43, - 0x57, 0x82, 0x26, 0xe2, 0x78, 0x63, 0x84, 0xc2, 0x6c, 0x7a, 0xc2, 0xe5, 0x46, 0x13, 0xee, 0x15, - 0xb8, 0x60, 0x11, 0xab, 0xcd, 0xe8, 0x11, 0x09, 0xf2, 0x71, 0xd6, 0x22, 0x56, 0x8b, 0x1e, 0x11, - 0xef, 0x97, 0x3d, 0xb0, 0xda, 0xae, 0x73, 0xe0, 0x31, 0x2b, 0x7e, 0xd9, 0x03, 0x4b, 0x73, 0x0e, - 0x18, 0x7a, 0x0d, 0x80, 0xda, 0x26, 0x79, 0xd6, 0xb6, 0x75, 0x8b, 0xd4, 0x0a, 0xe2, 0x6a, 0x17, - 0xc5, 0xce, 0xa6, 0x6e, 0x11, 0x54, 0x83, 0x59, 0xb1, 0x68, 0x36, 0x6a, 0xb3, 0xfe, 0xc1, 0x60, - 0x89, 0x77, 0x01, 0x45, 0x3c, 0x9c, 0xea, 0xaa, 0x47, 0xe2, 0x9e, 0x4d, 0xc6, 0xdd, 0x6b, 0xca, - 0xe7, 0x63, 0x40, 0xd3, 0xc4, 0xf5, 0x7d, 0x98, 0xa1, 0xf6, 0xae, 0x33, 0xec, 0x33, 0x5e, 0x97, - 0xf5, 0x19, 0x51, 0x30, 0x5f, 0xfa, 0xe6, 0x11, 0x94, 0xe3, 0xdd, 0x07, 0x2a, 0xc1, 0x85, 0x4d, - 0x87, 0xdf, 0x7b, 0x46, 0x19, 0xaf, 0x66, 0x50, 0x19, 0x60, 0xd3, 0xe1, 0x5b, 0x2e, 0x61, 0xc4, - 0xe6, 0x55, 0x05, 0x01, 0x14, 0x3e, 0xb3, 0x1b, 0x94, 0x3d, 0xa9, 0x66, 0xd1, 0x7c, 0xd0, 0x54, - 0xea, 0xbd, 0xa6, 0x7d, 0x9f, 0x58, 0x8e, 0x7b, 0x58, 0xcd, 0x79, 0xc7, 0xc3, 0x55, 0x1e, 0x55, - 0xa1, 0x14, 0x8a, 0x6c, 0x6c, 0x3d, 0xa8, 0xce, 0xa0, 0x22, 0xcc, 0xf8, 0x9f, 0x85, 0xb5, 0x1f, - 0x00, 0x4a, 0xe2, 0xb9, 0x68, 0xf9, 0x23, 0x29, 0x32, 0xa0, 0x14, 0x1d, 0x05, 0xd1, 0x75, 0x99, - 0x13, 0x92, 0x71, 0x55, 0x5d, 0x49, 0x17, 0xf4, 0xb9, 0xc5, 0x19, 0xf4, 0x18, 0x2a, 0xf1, 0xf9, - 0x8b, 0xa1, 0x1b, 0x52, 0xb2, 0x64, 0x33, 0xa0, 0x7a, 0x73, 0x12, 0xd1, 0x10, 0xab, 0x0b, 0xe5, - 0x58, 0xa3, 0xcf, 0xd0, 0xca, 0xb8, 0xf3, 0xc9, 0x56, 0x49, 0xbd, 0x31, 0x81, 0x64, 0x08, 0xf4, - 0x05, 0x94, 0x63, 0x9d, 0xe1, 0x18, 0x20, 0x59, 0xf7, 0xa8, 0x9e, 0x94, 0x5e, 0x38, 0x83, 0xda, - 0x70, 0x29, 0xd9, 0xcd, 0x31, 0x74, 0x4b, 0x4e, 0xb8, 0xb4, 0xe9, 0x4b, 0x03, 0xd8, 0xf1, 0x6d, - 0x3f, 0x26, 0x50, 0x1e, 0x0f, 0xe9, 0xf8, 0x9a, 0xa6, 0xfb, 0xeb, 0xd0, 0xf8, 0x88, 0xfa, 0x77, - 0x4e, 0x30, 0xfe, 0xd4, 0x08, 0x1d, 0x40, 0xa3, 0x2d, 0x24, 0x52, 0xa5, 0x87, 0xee, 0x59, 0x7d, - 0x7e, 0xa8, 0xd6, 0x65, 0xf0, 0xe3, 0xdb, 0x50, 0x9c, 0x41, 0x0f, 0x01, 0x6d, 0x10, 0xbe, 0x4d, - 0x2d, 0xb2, 0x4d, 0x8d, 0x27, 0x93, 0x60, 0x24, 0x9e, 0xd3, 0x60, 0xd1, 0xe2, 0x2e, 0xb5, 0xbb, - 0xb1, 0xb4, 0x59, 0xd8, 0x20, 0xa2, 0xc2, 0x53, 0xc6, 0xa9, 0xc1, 0x5e, 0xa0, 0x6a, 0x47, 0xd8, - 0x9c, 0x1c, 0x3a, 0x6f, 0x4e, 0x32, 0xfe, 0x04, 0xc4, 0xdf, 0x9a, 0x48, 0x36, 0x04, 0xdc, 0x11, - 0x80, 0x89, 0x67, 0xeb, 0x44, 0x4f, 0x26, 0x7c, 0xfa, 0x70, 0x06, 0x19, 0x50, 0xf6, 0x78, 0x8a, - 0x3c, 0x7b, 0xd7, 0xd2, 0xea, 0x6b, 0xe0, 0xc4, 0xf5, 0x54, 0xb9, 0xa1, 0x03, 0x6b, 0x7f, 0x15, - 0xa0, 0x28, 0x12, 0x40, 0xd4, 0xbe, 0x33, 0x8b, 0xf9, 0x36, 0x54, 0x82, 0x98, 0xbf, 0xc8, 0x70, - 0xb7, 0x4f, 0xcd, 0xbe, 0x34, 0xbc, 0x63, 0x5a, 0x1d, 0x9c, 0x41, 0x8f, 0xa0, 0x92, 0x18, 0x83, - 0xe4, 0x45, 0x68, 0xcc, 0xac, 0x94, 0x76, 0x8d, 0x0d, 0x40, 0xa3, 0xf3, 0x0b, 0xaa, 0xcb, 0x2b, - 0xc5, 0xb8, 0x39, 0x27, 0x0d, 0xe4, 0x2b, 0xa8, 0x24, 0xe6, 0x08, 0xf9, 0x85, 0x90, 0x0f, 0x1b, - 0x69, 0xda, 0x1f, 0x40, 0x29, 0x32, 0x38, 0x30, 0x79, 0x8a, 0x8e, 0x8e, 0x16, 0x69, 0x6a, 0xbf, - 0x84, 0x4a, 0xbc, 0xc9, 0x1e, 0xf3, 0x5e, 0x4a, 0x3b, 0xf1, 0x74, 0xda, 0xcf, 0xfe, 0x62, 0xdd, - 0xbd, 0xb3, 0xf3, 0x71, 0x97, 0xf2, 0xbd, 0x41, 0xc7, 0x83, 0x5f, 0x3d, 0xa2, 0xbd, 0x1e, 0x3d, - 0xe2, 0xc4, 0xd8, 0x5b, 0xf5, 0x35, 0xbc, 0x6b, 0x52, 0xc6, 0x5d, 0xda, 0x19, 0x70, 0x62, 0xae, - 0x0e, 0x8b, 0xc0, 0xaa, 0x50, 0xbb, 0x2a, 0xd4, 0xf6, 0x3b, 0x9d, 0x82, 0x58, 0xde, 0xfe, 0x2f, - 0x00, 0x00, 0xff, 0xff, 0x36, 0xce, 0x45, 0x9b, 0x98, 0x17, 0x00, 0x00, + // 1368 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0xdd, 0x8e, 0xdb, 0xc4, + 0x17, 0x5f, 0x6f, 0xb2, 0xd9, 0xe6, 0x6c, 0x9a, 0xa4, 0xb3, 0x5f, 0xf9, 0xfb, 0x5f, 0x4a, 0x19, + 0x68, 0xbb, 0x6d, 0x21, 0x8b, 0xb6, 0x02, 0x71, 0x03, 0xa8, 0xdd, 0x54, 0x55, 0x10, 0x5d, 0x16, + 0xa7, 0x55, 0xc5, 0x42, 0x15, 0x1c, 0x7b, 0x36, 0x99, 0x36, 0xb6, 0x53, 0xcf, 0xa4, 0x1f, 0x7b, + 0x03, 0x48, 0x5c, 0x22, 0x78, 0x06, 0x84, 0x04, 0x88, 0xa7, 0xe0, 0x29, 0xb8, 0xe1, 0x06, 0xc4, + 0x8b, 0x20, 0x8f, 0x27, 0x5e, 0xdb, 0x99, 0xac, 0xd3, 0xa6, 0xed, 0x72, 0xe7, 0x39, 0x3e, 0xe7, + 0xfc, 0xce, 0xd7, 0x9c, 0x39, 0x07, 0x96, 0x1f, 0x0c, 0x89, 0xff, 0xa4, 0xcd, 0x88, 0xff, 0x90, + 0x5a, 0xa4, 0x3e, 0xf0, 0x3d, 0xee, 0x21, 0xe4, 0xd0, 0xfe, 0xc3, 0x21, 0x0b, 0x4f, 0x75, 0xc1, + 0xa1, 0x97, 0x2c, 0xcf, 0x71, 0x3c, 0x37, 0xa4, 0xe9, 0xa5, 0x38, 0x87, 0x5e, 0xa6, 0x2e, 0x27, + 0xbe, 0x6b, 0xf6, 0xe5, 0x19, 0xd9, 0x26, 0x37, 0x93, 0x3a, 0xf5, 0x12, 0xb3, 0x7a, 0xc4, 0x31, + 0xc3, 0x13, 0xfe, 0x0a, 0x96, 0x0d, 0xd2, 0xa5, 0x8c, 0x13, 0x7f, 0xc7, 0xb3, 0x89, 0x41, 0x1e, + 0x0c, 0x09, 0xe3, 0xe8, 0x6d, 0xc8, 0x77, 0x4c, 0x46, 0x6a, 0xda, 0x59, 0x6d, 0x63, 0x69, 0xeb, + 0x74, 0x3d, 0x61, 0x87, 0x34, 0xe0, 0x26, 0xeb, 0x5e, 0x33, 0x19, 0x31, 0x04, 0x27, 0x7a, 0x17, + 0x16, 0x4d, 0xdb, 0xf6, 0x09, 0x63, 0xb5, 0xf9, 0x23, 0x84, 0xae, 0x86, 0x3c, 0xc6, 0x88, 0x19, + 0xff, 0xa0, 0xc1, 0x4a, 0xd2, 0x02, 0x36, 0xf0, 0x5c, 0x46, 0xd0, 0x15, 0x28, 0x30, 0x6e, 0xf2, + 0x21, 0x93, 0x46, 0xfc, 0x5f, 0xa9, 0xaf, 0x25, 0x58, 0x0c, 0xc9, 0x8a, 0xae, 0xc1, 0x12, 0x75, + 0x29, 0x6f, 0x0f, 0x4c, 0xdf, 0x74, 0x46, 0x96, 0xbc, 0x96, 0x94, 0x8c, 0x62, 0xd4, 0x74, 0x29, + 0xdf, 0x15, 0x8c, 0x06, 0xd0, 0xe8, 0x1b, 0xdf, 0x85, 0xd5, 0x56, 0xcf, 0x7b, 0xb4, 0xed, 0xf5, + 0xfb, 0xc4, 0xe2, 0xd4, 0x73, 0x9f, 0x3d, 0x28, 0x08, 0xf2, 0x76, 0xa7, 0xd9, 0x10, 0x76, 0xe4, + 0x0c, 0xf1, 0x8d, 0x19, 0xac, 0xa5, 0xd5, 0xcf, 0xe2, 0xf1, 0x1b, 0x70, 0xd2, 0x8a, 0x54, 0x35, + 0x1b, 0x81, 0xcf, 0xb9, 0x8d, 0x9c, 0x91, 0x24, 0xe2, 0xdf, 0x35, 0x58, 0xfd, 0xd8, 0x33, 0xed, + 0x17, 0xe4, 0x14, 0xc2, 0x50, 0x8a, 0x03, 0xd6, 0x72, 0xe2, 0x5f, 0x82, 0x86, 0xde, 0x87, 0x42, + 0x58, 0x7a, 0xb5, 0xbc, 0xc0, 0x3a, 0x97, 0xc4, 0x92, 0x65, 0x79, 0x68, 0x61, 0x4b, 0x10, 0x0c, + 0x29, 0x84, 0xbf, 0xd5, 0xa0, 0x66, 0x90, 0x3e, 0x31, 0x19, 0x39, 0x46, 0x2f, 0xf0, 0xd7, 0x1a, + 0xac, 0x04, 0xf9, 0xdb, 0x35, 0x7d, 0x4e, 0x8f, 0xc7, 0x84, 0x41, 0x58, 0xa0, 0x31, 0x0b, 0x66, + 0x29, 0x20, 0x0c, 0xa5, 0xc1, 0x48, 0xd3, 0x61, 0xfd, 0x24, 0x68, 0xd8, 0x81, 0x4a, 0x84, 0x16, + 0x88, 0x13, 0x86, 0xce, 0xc2, 0x52, 0x8c, 0x45, 0x00, 0xe6, 0x8c, 0x38, 0x09, 0xbd, 0x07, 0x0b, + 0x01, 0x04, 0x11, 0xfe, 0x95, 0xb7, 0x70, 0x7d, 0xbc, 0x99, 0xd5, 0x93, 0x5a, 0x8d, 0x50, 0x00, + 0xff, 0xac, 0xc1, 0x5a, 0x0a, 0xef, 0xe5, 0x97, 0x6b, 0x3a, 0x2e, 0x79, 0x45, 0x5c, 0x7e, 0xd3, + 0x60, 0x7d, 0xcc, 0xd0, 0x59, 0x92, 0xb1, 0x07, 0x6b, 0x11, 0x40, 0xdb, 0x26, 0xcc, 0xf2, 0xe9, + 0x20, 0xf8, 0x0e, 0xd3, 0xb2, 0xb4, 0xf5, 0x7a, 0x76, 0x10, 0x99, 0xb1, 0x1a, 0xa9, 0x68, 0xc4, + 0x34, 0xe0, 0x7f, 0x34, 0x58, 0x09, 0x7a, 0xc0, 0xf1, 0x55, 0xee, 0x34, 0x31, 0x8d, 0xb5, 0x89, + 0x85, 0x67, 0x69, 0x13, 0xbf, 0x68, 0xb0, 0x2e, 0xdb, 0xc4, 0x7f, 0xdb, 0x51, 0xfc, 0xa3, 0x06, + 0xfa, 0xb6, 0x4f, 0x4c, 0x4e, 0x3e, 0x0d, 0xd2, 0xb8, 0xdd, 0x33, 0x5d, 0x97, 0xf4, 0x67, 0xab, + 0x9f, 0x0b, 0x50, 0xf1, 0x43, 0x67, 0xdb, 0x56, 0xa8, 0x4f, 0x98, 0x5e, 0x34, 0xca, 0x92, 0x2c, + 0x51, 0xd0, 0x39, 0x28, 0xfb, 0x84, 0x0d, 0xfb, 0x87, 0x7c, 0x39, 0xc1, 0x77, 0x32, 0xa4, 0x4a, + 0x36, 0xfc, 0x93, 0x06, 0xeb, 0x57, 0x6d, 0x3b, 0x6e, 0xe0, 0x0c, 0x57, 0xf1, 0x32, 0x9c, 0x4a, + 0x59, 0x27, 0x43, 0x5b, 0x34, 0xaa, 0x49, 0xfb, 0x9a, 0x0d, 0x74, 0x11, 0xaa, 0x49, 0x0b, 0x65, + 0xa8, 0x8b, 0x46, 0x25, 0x61, 0x63, 0xb3, 0x81, 0xff, 0xd4, 0x40, 0x37, 0x88, 0xe3, 0x3d, 0x24, + 0x4a, 0x43, 0x9f, 0x29, 0x92, 0x23, 0xef, 0xe6, 0x67, 0xf3, 0x2e, 0xf7, 0x14, 0xde, 0xe5, 0xd5, + 0xde, 0xdd, 0x83, 0xb5, 0x3b, 0x26, 0xb7, 0x7a, 0x0d, 0x67, 0xf6, 0x0c, 0x9c, 0x01, 0x88, 0xf0, + 0xc2, 0x9e, 0x52, 0x34, 0x62, 0x14, 0xfc, 0xeb, 0x3c, 0xa0, 0xa0, 0x47, 0xb4, 0x48, 0xd7, 0x21, + 0x2e, 0x7f, 0xf9, 0x17, 0x27, 0xf5, 0xac, 0xe4, 0xc7, 0x9f, 0x95, 0x33, 0x00, 0x2c, 0xb4, 0x2e, + 0x70, 0x61, 0x41, 0x5c, 0xac, 0x18, 0x05, 0xe9, 0x70, 0x62, 0x9f, 0x92, 0xbe, 0x1d, 0xfc, 0x2d, + 0x88, 0xbf, 0xd1, 0x19, 0x7d, 0x04, 0x65, 0xc9, 0xd9, 0x16, 0x2f, 0x0d, 0xab, 0x2d, 0xaa, 0xda, + 0x6a, 0x30, 0x35, 0xd7, 0x65, 0x08, 0x44, 0x4f, 0x6d, 0xba, 0xfb, 0x9e, 0x71, 0x92, 0xc5, 0x28, + 0x0c, 0xff, 0xad, 0xc1, 0xaa, 0x6c, 0x34, 0xc7, 0x16, 0xad, 0x69, 0xfa, 0xe9, 0x0c, 0xf1, 0xc2, + 0xdf, 0x6b, 0xb0, 0xbe, 0xed, 0x39, 0x03, 0xcf, 0x8d, 0xfc, 0x9e, 0xad, 0x3f, 0x7d, 0x10, 0x0a, + 0x91, 0xd1, 0x68, 0x7e, 0x7e, 0xc2, 0x68, 0x9e, 0x06, 0x95, 0x52, 0xf8, 0x2f, 0x0d, 0x96, 0x64, + 0xb4, 0x83, 0x9c, 0xa0, 0xd3, 0x50, 0x8c, 0x5c, 0x91, 0x33, 0xc8, 0x21, 0x61, 0x2c, 0x84, 0xf3, + 0xd9, 0x05, 0x97, 0x1b, 0x2f, 0xb8, 0xff, 0xc1, 0x09, 0x87, 0x38, 0x6d, 0x46, 0x0f, 0x88, 0xac, + 0xc7, 0x45, 0x87, 0x38, 0x2d, 0x7a, 0x40, 0x82, 0x5f, 0xee, 0xd0, 0x69, 0xfb, 0xde, 0x23, 0x26, + 0x5e, 0xab, 0x9c, 0xb1, 0xe8, 0x0e, 0x1d, 0xc3, 0x7b, 0xc4, 0xd0, 0x2b, 0x00, 0xd4, 0xb5, 0xc9, + 0xe3, 0xb6, 0x6b, 0x3a, 0xa4, 0x56, 0x10, 0x57, 0xbb, 0x28, 0x28, 0x3b, 0xa6, 0x43, 0x50, 0x0d, + 0x16, 0xc5, 0xa1, 0xd9, 0xa8, 0x2d, 0x86, 0x82, 0xf2, 0x88, 0xf7, 0x01, 0xc5, 0x3c, 0x9c, 0xe9, + 0xaa, 0xc7, 0xf2, 0x3e, 0x9f, 0xce, 0x3b, 0xfe, 0x46, 0x83, 0xe5, 0x04, 0xd0, 0x2c, 0x79, 0x7d, + 0x07, 0x16, 0xa8, 0xbb, 0xef, 0x8d, 0xc6, 0x94, 0x57, 0x55, 0x63, 0x4a, 0x1c, 0x2c, 0xe4, 0xbe, + 0x74, 0x00, 0xe5, 0xe4, 0xf0, 0x82, 0x4a, 0x70, 0x62, 0xc7, 0xe3, 0xd7, 0x1f, 0x53, 0xc6, 0xab, + 0x73, 0xa8, 0x0c, 0xb0, 0xe3, 0xf1, 0x5d, 0x9f, 0x30, 0xe2, 0xf2, 0xaa, 0x86, 0x00, 0x0a, 0x9f, + 0xb8, 0x0d, 0xca, 0xee, 0x57, 0xe7, 0xd1, 0xb2, 0x9c, 0x49, 0xcd, 0x7e, 0xd3, 0xbd, 0x49, 0x1c, + 0xcf, 0x7f, 0x52, 0xcd, 0x05, 0xe2, 0xd1, 0x29, 0x8f, 0xaa, 0x50, 0x8a, 0x58, 0x6e, 0xec, 0xde, + 0xae, 0x2e, 0xa0, 0x22, 0x2c, 0x84, 0x9f, 0x85, 0xad, 0xef, 0x00, 0x4a, 0xe2, 0xb9, 0x68, 0x85, + 0xeb, 0x31, 0xb2, 0xa0, 0x14, 0x5f, 0x44, 0xd1, 0x05, 0x95, 0x13, 0x8a, 0x65, 0x59, 0xdf, 0xc8, + 0x66, 0x0c, 0x63, 0x8b, 0xe7, 0xd0, 0x3d, 0xa8, 0x24, 0xb7, 0x3f, 0x86, 0x2e, 0x2a, 0x83, 0xa5, + 0xda, 0x40, 0xf5, 0x4b, 0xd3, 0xb0, 0x46, 0x58, 0x5d, 0x28, 0x27, 0xf6, 0x04, 0x86, 0x36, 0x26, + 0xc9, 0xa7, 0x47, 0x25, 0xfd, 0xe2, 0x14, 0x9c, 0x11, 0xd0, 0x67, 0x50, 0x4e, 0x0c, 0x96, 0x13, + 0x80, 0x54, 0xc3, 0xa7, 0x7e, 0x54, 0x79, 0xe1, 0x39, 0xd4, 0x86, 0x53, 0xe9, 0x69, 0x8e, 0xa1, + 0xcb, 0xea, 0x80, 0x2b, 0x87, 0xbe, 0x2c, 0x80, 0xbd, 0xd0, 0xf6, 0xc3, 0x00, 0xaa, 0xf3, 0xa1, + 0x5c, 0x9e, 0xb3, 0x74, 0x7f, 0x19, 0x19, 0x1f, 0x53, 0xff, 0xe6, 0x11, 0xc6, 0x3f, 0x35, 0x42, + 0x07, 0xd0, 0xf8, 0x08, 0x89, 0x74, 0xa5, 0xd0, 0x75, 0x67, 0xc0, 0x9f, 0xe8, 0x75, 0x15, 0xfc, + 0xe4, 0x31, 0x14, 0xcf, 0xa1, 0x3b, 0x80, 0x6e, 0x10, 0x7e, 0x8b, 0x3a, 0xe4, 0x16, 0xb5, 0xee, + 0x4f, 0x83, 0x91, 0x7a, 0x4e, 0xe5, 0xa1, 0xc5, 0x7d, 0xea, 0x76, 0x13, 0x65, 0xb3, 0x72, 0x83, + 0x88, 0x0e, 0x4f, 0x19, 0xa7, 0x16, 0x7b, 0x8e, 0xaa, 0x3d, 0x61, 0x73, 0x7a, 0x67, 0xbd, 0x34, + 0xcd, 0xf6, 0x24, 0x03, 0x7f, 0x79, 0x2a, 0xde, 0x08, 0x70, 0x4f, 0x00, 0xa6, 0x9e, 0xad, 0x23, + 0x3d, 0x99, 0xf2, 0xe9, 0xc3, 0x73, 0xc8, 0x82, 0x72, 0x10, 0xa7, 0xd8, 0xb3, 0x77, 0x3e, 0xab, + 0xbf, 0x4a, 0x27, 0x2e, 0x64, 0xf2, 0x8d, 0x1c, 0xd8, 0xfa, 0xa3, 0x00, 0x45, 0x51, 0x00, 0xa2, + 0xf7, 0xbd, 0xb0, 0x9c, 0xdf, 0x82, 0x8a, 0xcc, 0xf9, 0xf3, 0x4c, 0x77, 0xfb, 0xa9, 0xa3, 0xaf, + 0x4c, 0xef, 0x84, 0x51, 0x07, 0xcf, 0xa1, 0xbb, 0x50, 0x49, 0xad, 0x41, 0xea, 0x26, 0x34, 0x61, + 0x57, 0xca, 0xba, 0xc6, 0x16, 0xa0, 0xf1, 0xfd, 0x05, 0xd5, 0xd5, 0x9d, 0x62, 0xd2, 0x9e, 0x93, + 0x05, 0xf2, 0x05, 0x54, 0x52, 0x7b, 0x84, 0xfa, 0x42, 0xa8, 0x97, 0x8d, 0x2c, 0xed, 0xb7, 0xa1, + 0x14, 0x5b, 0x1c, 0x98, 0xba, 0x44, 0xc7, 0x57, 0x8b, 0x2c, 0xb5, 0x9f, 0x43, 0x25, 0x39, 0x64, + 0x4f, 0x78, 0x2f, 0x95, 0x93, 0x78, 0x76, 0xd8, 0x5f, 0xfc, 0xc5, 0xba, 0x76, 0x75, 0xef, 0xc3, + 0x2e, 0xe5, 0xbd, 0x61, 0x27, 0x80, 0xdf, 0x3c, 0xa0, 0xfd, 0x3e, 0x3d, 0xe0, 0xc4, 0xea, 0x6d, + 0x86, 0x1a, 0xde, 0xb2, 0x29, 0xe3, 0x3e, 0xed, 0x0c, 0x39, 0xb1, 0x37, 0x47, 0x4d, 0x60, 0x53, + 0xa8, 0xdd, 0x14, 0x6a, 0x07, 0x9d, 0x4e, 0x41, 0x1c, 0xaf, 0xfc, 0x1b, 0x00, 0x00, 0xff, 0xff, + 0xe0, 0xb4, 0xcb, 0x07, 0x24, 0x18, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/internal/querynode/flow_graph_msg_stream_input_nodes.go b/internal/querynode/flow_graph_msg_stream_input_nodes.go index 0d229606bc..1816d0e836 100644 --- a/internal/querynode/flow_graph_msg_stream_input_nodes.go +++ b/internal/querynode/flow_graph_msg_stream_input_nodes.go @@ -3,7 +3,6 @@ package querynode import ( "context" - "github.com/zilliztech/milvus-distributed/internal/msgstream" "github.com/zilliztech/milvus-distributed/internal/msgstream/pulsarms" "github.com/zilliztech/milvus-distributed/internal/util/flowgraph" ) @@ -11,19 +10,14 @@ import ( func (dsService *dataSyncService) newDmInputNode(ctx context.Context) *flowgraph.InputNode { factory := pulsarms.NewFactory(Params.PulsarAddress, Params.InsertReceiveBufSize, Params.InsertPulsarBufSize) - consumeChannels := Params.InsertChannelNames - consumeSubName := Params.MsgChannelSubName - + // query node doesn't need to consume any topic insertStream, _ := factory.NewTtMsgStream(ctx) - insertStream.AsConsumer(consumeChannels, consumeSubName) - - var stream msgstream.MsgStream = insertStream - dsService.dmStream = stream + dsService.dmStream = insertStream maxQueueLength := Params.FlowGraphMaxQueueLength maxParallelism := Params.FlowGraphMaxParallelism - node := flowgraph.NewInputNode(&stream, "dmInputNode", maxQueueLength, maxParallelism) + node := flowgraph.NewInputNode(&insertStream, "dmInputNode", maxQueueLength, maxParallelism) return node } @@ -36,12 +30,11 @@ func (dsService *dataSyncService) newDDInputNode(ctx context.Context) *flowgraph ddStream, _ := factory.NewTtMsgStream(ctx) ddStream.AsConsumer(consumeChannels, consumeSubName) - var stream msgstream.MsgStream = ddStream - dsService.ddStream = stream + dsService.ddStream = ddStream maxQueueLength := Params.FlowGraphMaxQueueLength maxParallelism := Params.FlowGraphMaxParallelism - node := flowgraph.NewInputNode(&stream, "ddInputNode", maxQueueLength, maxParallelism) + node := flowgraph.NewInputNode(&ddStream, "ddInputNode", maxQueueLength, maxParallelism) return node }