diff --git a/go-api/federpb/feder.pb.go b/go-api/federpb/feder.pb.go index 8a6209c4..0cff4dfc 100644 --- a/go-api/federpb/feder.pb.go +++ b/go-api/federpb/feder.pb.go @@ -7,6 +7,7 @@ import ( fmt "fmt" proto "github.com/golang/protobuf/proto" commonpb "github.com/milvus-io/milvus-proto/go-api/commonpb" + schemapb "github.com/milvus-io/milvus-proto/go-api/schemapb" math "math" ) @@ -22,11 +23,12 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type SegmentIndexData struct { - SegmentID int64 `protobuf:"varint,1,opt,name=segmentID,proto3" json:"segmentID,omitempty"` - IndexData string `protobuf:"bytes,2,opt,name=index_data,json=indexData,proto3" json:"index_data,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + SegmentID int64 `protobuf:"varint,1,opt,name=segmentID,proto3" json:"segmentID,omitempty"` + IndexData string `protobuf:"bytes,2,opt,name=index_data,json=indexData,proto3" json:"index_data,omitempty"` + IdsSet *schemapb.IDs `protobuf:"bytes,3,opt,name=ids_set,json=idsSet,proto3" json:"ids_set,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *SegmentIndexData) Reset() { *m = SegmentIndexData{} } @@ -68,51 +70,11 @@ func (m *SegmentIndexData) GetIndexData() string { return "" } -type FederSegmentSearchResult struct { - SegmentID int64 `protobuf:"varint,1,opt,name=segmentID,proto3" json:"segmentID,omitempty"` - VisitInfo string `protobuf:"bytes,2,opt,name=visit_info,json=visitInfo,proto3" json:"visit_info,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *FederSegmentSearchResult) Reset() { *m = FederSegmentSearchResult{} } -func (m *FederSegmentSearchResult) String() string { return proto.CompactTextString(m) } -func (*FederSegmentSearchResult) ProtoMessage() {} -func (*FederSegmentSearchResult) Descriptor() ([]byte, []int) { - return fileDescriptor_84d670fd126c7825, []int{1} -} - -func (m *FederSegmentSearchResult) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_FederSegmentSearchResult.Unmarshal(m, b) -} -func (m *FederSegmentSearchResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_FederSegmentSearchResult.Marshal(b, m, deterministic) -} -func (m *FederSegmentSearchResult) XXX_Merge(src proto.Message) { - xxx_messageInfo_FederSegmentSearchResult.Merge(m, src) -} -func (m *FederSegmentSearchResult) XXX_Size() int { - return xxx_messageInfo_FederSegmentSearchResult.Size(m) -} -func (m *FederSegmentSearchResult) XXX_DiscardUnknown() { - xxx_messageInfo_FederSegmentSearchResult.DiscardUnknown(m) -} - -var xxx_messageInfo_FederSegmentSearchResult proto.InternalMessageInfo - -func (m *FederSegmentSearchResult) GetSegmentID() int64 { +func (m *SegmentIndexData) GetIdsSet() *schemapb.IDs { if m != nil { - return m.SegmentID + return m.IdsSet } - return 0 -} - -func (m *FederSegmentSearchResult) GetVisitInfo() string { - if m != nil { - return m.VisitInfo - } - return "" + return nil } type ListIndexedSegmentRequest struct { @@ -128,7 +90,7 @@ func (m *ListIndexedSegmentRequest) Reset() { *m = ListIndexedSegmentReq func (m *ListIndexedSegmentRequest) String() string { return proto.CompactTextString(m) } func (*ListIndexedSegmentRequest) ProtoMessage() {} func (*ListIndexedSegmentRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_84d670fd126c7825, []int{2} + return fileDescriptor_84d670fd126c7825, []int{1} } func (m *ListIndexedSegmentRequest) XXX_Unmarshal(b []byte) error { @@ -182,7 +144,7 @@ func (m *ListIndexedSegmentResponse) Reset() { *m = ListIndexedSegmentRe func (m *ListIndexedSegmentResponse) String() string { return proto.CompactTextString(m) } func (*ListIndexedSegmentResponse) ProtoMessage() {} func (*ListIndexedSegmentResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_84d670fd126c7825, []int{3} + return fileDescriptor_84d670fd126c7825, []int{2} } func (m *ListIndexedSegmentResponse) XXX_Unmarshal(b []byte) error { @@ -231,7 +193,7 @@ func (m *DescribeSegmentIndexDataRequest) Reset() { *m = DescribeSegment func (m *DescribeSegmentIndexDataRequest) String() string { return proto.CompactTextString(m) } func (*DescribeSegmentIndexDataRequest) ProtoMessage() {} func (*DescribeSegmentIndexDataRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_84d670fd126c7825, []int{4} + return fileDescriptor_84d670fd126c7825, []int{3} } func (m *DescribeSegmentIndexDataRequest) XXX_Unmarshal(b []byte) error { @@ -294,7 +256,7 @@ func (m *DescribeSegmentIndexDataResponse) Reset() { *m = DescribeSegmen func (m *DescribeSegmentIndexDataResponse) String() string { return proto.CompactTextString(m) } func (*DescribeSegmentIndexDataResponse) ProtoMessage() {} func (*DescribeSegmentIndexDataResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_84d670fd126c7825, []int{5} + return fileDescriptor_84d670fd126c7825, []int{4} } func (m *DescribeSegmentIndexDataResponse) XXX_Unmarshal(b []byte) error { @@ -338,7 +300,6 @@ func (m *DescribeSegmentIndexDataResponse) GetIndexParams() []*commonpb.KeyValue func init() { proto.RegisterType((*SegmentIndexData)(nil), "milvus.proto.feder.SegmentIndexData") - proto.RegisterType((*FederSegmentSearchResult)(nil), "milvus.proto.feder.FederSegmentSearchResult") proto.RegisterType((*ListIndexedSegmentRequest)(nil), "milvus.proto.feder.ListIndexedSegmentRequest") proto.RegisterType((*ListIndexedSegmentResponse)(nil), "milvus.proto.feder.ListIndexedSegmentResponse") proto.RegisterType((*DescribeSegmentIndexDataRequest)(nil), "milvus.proto.feder.DescribeSegmentIndexDataRequest") @@ -349,34 +310,34 @@ func init() { func init() { proto.RegisterFile("feder.proto", fileDescriptor_84d670fd126c7825) } var fileDescriptor_84d670fd126c7825 = []byte{ - // 457 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x53, 0xcb, 0x6e, 0xd3, 0x40, - 0x14, 0x95, 0xe3, 0x52, 0x29, 0xd7, 0x55, 0xa9, 0x66, 0x65, 0x42, 0x01, 0x63, 0x21, 0x91, 0x4d, - 0x9d, 0x2a, 0xdd, 0xa0, 0x2e, 0x4b, 0x40, 0xaa, 0x78, 0x55, 0x13, 0x09, 0x24, 0x36, 0xd1, 0xd8, - 0xb9, 0x49, 0x47, 0xd8, 0x33, 0xae, 0xef, 0x38, 0x22, 0x1f, 0xc2, 0xe7, 0xf0, 0x39, 0xfc, 0x07, - 0xf2, 0x78, 0xd2, 0xa4, 0x6d, 0x50, 0x17, 0x2c, 0xba, 0xb3, 0xcf, 0xdc, 0xf3, 0x9a, 0x07, 0x04, - 0x33, 0x9c, 0x62, 0x95, 0x94, 0x95, 0x36, 0x9a, 0xb1, 0x42, 0xe6, 0x8b, 0x9a, 0xda, 0xbf, 0xc4, - 0xae, 0xf4, 0xf6, 0x32, 0x5d, 0x14, 0x5a, 0xb5, 0x58, 0xfc, 0x05, 0x0e, 0xc6, 0x38, 0x2f, 0x50, - 0x99, 0x73, 0x35, 0xc5, 0x9f, 0x23, 0x61, 0x04, 0x3b, 0x84, 0x2e, 0x39, 0x6c, 0x14, 0x7a, 0x91, - 0xd7, 0xf7, 0xf9, 0x1a, 0x60, 0xcf, 0x00, 0x64, 0x33, 0x3a, 0x99, 0x0a, 0x23, 0xc2, 0x4e, 0xe4, - 0xf5, 0xbb, 0xbc, 0x2b, 0x57, 0xe4, 0xf8, 0x1b, 0x84, 0xef, 0x1b, 0x1f, 0xa7, 0x3a, 0x46, 0x51, - 0x65, 0x97, 0x1c, 0xa9, 0xce, 0xcd, 0xfd, 0xc2, 0x0b, 0x49, 0xd2, 0x4c, 0xa4, 0x9a, 0xe9, 0x95, - 0xb0, 0x45, 0xce, 0xd5, 0x4c, 0xc7, 0xbf, 0x3c, 0x78, 0xf2, 0x51, 0x52, 0x9b, 0x13, 0xa7, 0x4e, - 0x9f, 0xe3, 0x55, 0x8d, 0x64, 0xd8, 0x31, 0xec, 0xa4, 0x82, 0xd0, 0xaa, 0x06, 0xc3, 0xc3, 0xe4, - 0x46, 0x71, 0xd7, 0xf8, 0x13, 0xcd, 0xcf, 0x04, 0x21, 0xb7, 0x93, 0xec, 0x35, 0x3c, 0xce, 0x74, - 0x9e, 0x63, 0x66, 0xa4, 0x56, 0x13, 0x25, 0x0a, 0x74, 0x9e, 0xfb, 0x6b, 0xf8, 0xb3, 0x28, 0x70, - 0x5d, 0xd8, 0xce, 0xf8, 0x1b, 0x85, 0x9b, 0xe5, 0xf8, 0x0a, 0x7a, 0xdb, 0x62, 0x51, 0xa9, 0x15, - 0x21, 0x3b, 0x81, 0x5d, 0x32, 0xc2, 0xd4, 0xe4, 0x92, 0x3d, 0xdd, 0x9a, 0x6c, 0x6c, 0x47, 0xb8, - 0x1b, 0x65, 0xcf, 0x01, 0xae, 0xb7, 0x85, 0xc2, 0x4e, 0xe4, 0xf7, 0x7d, 0xbe, 0x81, 0xc4, 0xbf, - 0x3d, 0x78, 0x31, 0x42, 0xca, 0x2a, 0x99, 0xe2, 0xed, 0xd3, 0x7b, 0xf0, 0x0d, 0x61, 0x11, 0x04, - 0x2e, 0x2b, 0x35, 0xf1, 0x77, 0x6c, 0xfc, 0x4d, 0x28, 0xfe, 0xd3, 0x81, 0xe8, 0xdf, 0xf9, 0xff, - 0x67, 0xe7, 0xd2, 0x5b, 0x97, 0xd3, 0xef, 0x07, 0xc3, 0xb7, 0xc9, 0xdd, 0x57, 0x90, 0xdc, 0x67, - 0x9f, 0x5c, 0x23, 0xef, 0x94, 0xa9, 0x96, 0x1b, 0x37, 0x9c, 0x8d, 0x60, 0xaf, 0xf5, 0x28, 0x45, - 0x25, 0x0a, 0x0a, 0x7d, 0xeb, 0xf2, 0x72, 0x6b, 0xbc, 0x0f, 0xb8, 0xfc, 0x2a, 0xf2, 0x1a, 0x2f, - 0x84, 0xac, 0x78, 0x60, 0x69, 0x17, 0x96, 0xd5, 0x4b, 0x61, 0xff, 0xa6, 0x05, 0x3b, 0x00, 0xff, - 0x07, 0x2e, 0xdd, 0xbb, 0x68, 0x3e, 0xd9, 0x29, 0x3c, 0x5a, 0x34, 0x6c, 0x7b, 0x0e, 0xc1, 0xf0, - 0xd5, 0xb6, 0x22, 0x77, 0x0a, 0xb4, 0x94, 0xd3, 0xce, 0x1b, 0xef, 0x6c, 0xf8, 0xfd, 0x78, 0x2e, - 0xcd, 0x65, 0x9d, 0x36, 0x71, 0x06, 0x2d, 0xf9, 0x48, 0xea, 0xd5, 0x97, 0x95, 0x19, 0xcc, 0xf5, - 0x91, 0x28, 0xe5, 0xc0, 0xaa, 0x95, 0x69, 0xba, 0x6b, 0xd1, 0x93, 0xbf, 0x01, 0x00, 0x00, 0xff, - 0xff, 0x40, 0x49, 0x4e, 0x8e, 0x48, 0x04, 0x00, 0x00, + // 460 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x93, 0xcd, 0x6e, 0xd3, 0x40, + 0x10, 0xc7, 0xe5, 0xb8, 0x04, 0x65, 0x1c, 0x95, 0x6a, 0x4f, 0x26, 0x14, 0x30, 0x16, 0x12, 0xbe, + 0xd4, 0x29, 0xee, 0x05, 0xf5, 0x58, 0xcc, 0xa1, 0xe2, 0x43, 0x95, 0x23, 0x71, 0xe0, 0x12, 0xad, + 0xed, 0x21, 0x5d, 0x11, 0x7b, 0x5d, 0xcf, 0xba, 0x22, 0x57, 0xde, 0x81, 0xc7, 0xe1, 0x71, 0x78, + 0x0f, 0xe4, 0xf5, 0x92, 0x8f, 0xc6, 0x88, 0x03, 0x07, 0x6e, 0xde, 0xff, 0xce, 0x7f, 0xe6, 0x37, + 0xb3, 0x63, 0x70, 0x3e, 0x63, 0x8e, 0x75, 0x58, 0xd5, 0x52, 0x49, 0xc6, 0x0a, 0xb1, 0xbc, 0x6d, + 0xa8, 0x3b, 0x85, 0xfa, 0x66, 0x32, 0xce, 0x64, 0x51, 0xc8, 0xb2, 0xd3, 0x26, 0x63, 0xca, 0xae, + 0xb1, 0xe0, 0xdd, 0xc9, 0xff, 0x66, 0xc1, 0xd1, 0x0c, 0x17, 0x05, 0x96, 0xea, 0xb2, 0xcc, 0xf1, + 0x6b, 0xcc, 0x15, 0x67, 0xc7, 0x30, 0x22, 0xa3, 0xc5, 0xae, 0xe5, 0x59, 0x81, 0x9d, 0x6c, 0x04, + 0xf6, 0x18, 0x40, 0xb4, 0xa1, 0xf3, 0x9c, 0x2b, 0xee, 0x0e, 0x3c, 0x2b, 0x18, 0x25, 0x23, 0xb1, + 0x36, 0xbf, 0x84, 0xfb, 0x22, 0xa7, 0x39, 0xa1, 0x72, 0x6d, 0xcf, 0x0a, 0x9c, 0xc8, 0x0d, 0x77, + 0x98, 0x4c, 0xf9, 0xcb, 0x98, 0x92, 0xa1, 0xc8, 0x69, 0x86, 0xca, 0xff, 0x6e, 0xc1, 0xc3, 0x77, + 0x82, 0x3a, 0x02, 0xcc, 0x0d, 0x4f, 0x82, 0x37, 0x0d, 0x92, 0x62, 0xa7, 0x70, 0x90, 0x72, 0x42, + 0x0d, 0xe2, 0x44, 0xc7, 0xbb, 0xd9, 0x4c, 0x6b, 0xef, 0x69, 0x71, 0xc1, 0x09, 0x13, 0x1d, 0xc9, + 0x5e, 0xc0, 0x83, 0x4c, 0x2e, 0x97, 0x98, 0x29, 0x21, 0xcb, 0x79, 0xc9, 0x0b, 0x34, 0x98, 0x87, + 0x1b, 0xf9, 0x03, 0x2f, 0x70, 0xd3, 0x8a, 0x8e, 0xb1, 0xb7, 0x5a, 0x69, 0xaf, 0xfd, 0x1b, 0x98, + 0xf4, 0x61, 0x51, 0x25, 0x4b, 0x42, 0x76, 0x06, 0x43, 0x52, 0x5c, 0x35, 0x64, 0xc8, 0x1e, 0xf5, + 0x92, 0xcd, 0x74, 0x48, 0x62, 0x42, 0xd9, 0x13, 0x80, 0xf5, 0x24, 0xc9, 0x1d, 0x78, 0x76, 0x60, + 0x27, 0x5b, 0x8a, 0xff, 0xc3, 0x82, 0xa7, 0x31, 0x52, 0x56, 0x8b, 0x14, 0xef, 0xbe, 0xcb, 0x7f, + 0x1f, 0x08, 0xf3, 0xc0, 0x31, 0xac, 0xd4, 0xe2, 0x1f, 0x68, 0xfc, 0x6d, 0xc9, 0xff, 0x39, 0x00, + 0xef, 0xcf, 0xfc, 0xff, 0x32, 0xb9, 0xf4, 0xce, 0xda, 0xd9, 0x81, 0x13, 0xbd, 0x0e, 0xf7, 0xd7, + 0x3d, 0xfc, 0x5b, 0xf9, 0x70, 0xad, 0xbc, 0x29, 0x55, 0xbd, 0xda, 0xde, 0xdd, 0x18, 0xc6, 0x5d, + 0x8d, 0x8a, 0xd7, 0xbc, 0x20, 0xd7, 0xd6, 0x55, 0x9e, 0xf5, 0xe2, 0xbd, 0xc5, 0xd5, 0x47, 0xbe, + 0x6c, 0xf0, 0x8a, 0x8b, 0x3a, 0x71, 0xb4, 0xed, 0x4a, 0xbb, 0x26, 0x29, 0x1c, 0xee, 0x96, 0x60, + 0x47, 0x60, 0x7f, 0xc1, 0x95, 0xf9, 0x95, 0xda, 0x4f, 0x76, 0x0e, 0xf7, 0x6e, 0x5b, 0xb7, 0x7e, + 0x07, 0x27, 0x7a, 0xde, 0xd7, 0xc8, 0x5e, 0x03, 0x9d, 0xe5, 0x7c, 0xf0, 0xca, 0xba, 0x88, 0x3e, + 0x9d, 0x2e, 0x84, 0xba, 0x6e, 0xd2, 0x16, 0x67, 0xda, 0x99, 0x4f, 0x84, 0xfc, 0xfd, 0xa5, 0xd3, + 0x4c, 0x17, 0xf2, 0x84, 0x57, 0x62, 0xaa, 0xb3, 0x55, 0x69, 0x3a, 0xd4, 0xea, 0xd9, 0xaf, 0x00, + 0x00, 0x00, 0xff, 0xff, 0xbe, 0x27, 0xfe, 0x60, 0x31, 0x04, 0x00, 0x00, } diff --git a/go-api/schemapb/schema.pb.go b/go-api/schemapb/schema.pb.go index 74efb836..242d6a5b 100644 --- a/go-api/schemapb/schema.pb.go +++ b/go-api/schemapb/schema.pb.go @@ -1307,6 +1307,7 @@ func (*IDs) XXX_OneofWrappers() []interface{} { } type SearchResultData struct { +<<<<<<< HEAD NumQueries int64 `protobuf:"varint,1,opt,name=num_queries,json=numQueries,proto3" json:"num_queries,omitempty"` TopK int64 `protobuf:"varint,2,opt,name=top_k,json=topK,proto3" json:"top_k,omitempty"` FieldsData []*FieldData `protobuf:"bytes,3,rep,name=fields_data,json=fieldsData,proto3" json:"fields_data,omitempty"` @@ -1317,6 +1318,18 @@ type SearchResultData struct { XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` +======= + NumQueries int64 `protobuf:"varint,1,opt,name=num_queries,json=numQueries,proto3" json:"num_queries,omitempty"` + TopK int64 `protobuf:"varint,2,opt,name=top_k,json=topK,proto3" json:"top_k,omitempty"` + FieldsData []*FieldData `protobuf:"bytes,3,rep,name=fields_data,json=fieldsData,proto3" json:"fields_data,omitempty"` + Scores []float32 `protobuf:"fixed32,4,rep,packed,name=scores,proto3" json:"scores,omitempty"` + Ids *IDs `protobuf:"bytes,5,opt,name=ids,proto3" json:"ids,omitempty"` + Topks []int64 `protobuf:"varint,6,rep,packed,name=topks,proto3" json:"topks,omitempty"` + VisitorViews map[int64]*FederSegmentSearchResult `protobuf:"bytes,7,rep,name=visitor_views,json=visitorViews,proto3" json:"visitor_views,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +>>>>>>> 81c4945... Support feder search } func (m *SearchResultData) Reset() { *m = SearchResultData{} } @@ -1386,9 +1399,70 @@ func (m *SearchResultData) GetTopks() []int64 { return nil } +<<<<<<< HEAD func (m *SearchResultData) GetOutputFields() []string { if m != nil { return m.OutputFields +======= +func (m *SearchResultData) GetVisitorViews() map[int64]*FederSegmentSearchResult { + if m != nil { + return m.VisitorViews + } + return nil +} + +type FederSegmentSearchResult struct { + SegmentID int64 `protobuf:"varint,1,opt,name=segmentID,proto3" json:"segmentID,omitempty"` + VisitInfo string `protobuf:"bytes,2,opt,name=visit_info,json=visitInfo,proto3" json:"visit_info,omitempty"` + VisitIds *IDs `protobuf:"bytes,3,opt,name=visit_ids,json=visitIds,proto3" json:"visit_ids,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *FederSegmentSearchResult) Reset() { *m = FederSegmentSearchResult{} } +func (m *FederSegmentSearchResult) String() string { return proto.CompactTextString(m) } +func (*FederSegmentSearchResult) ProtoMessage() {} +func (*FederSegmentSearchResult) Descriptor() ([]byte, []int) { + return fileDescriptor_1c5fb4d8cc22d66a, []int{17} +} + +func (m *FederSegmentSearchResult) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_FederSegmentSearchResult.Unmarshal(m, b) +} +func (m *FederSegmentSearchResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_FederSegmentSearchResult.Marshal(b, m, deterministic) +} +func (m *FederSegmentSearchResult) XXX_Merge(src proto.Message) { + xxx_messageInfo_FederSegmentSearchResult.Merge(m, src) +} +func (m *FederSegmentSearchResult) XXX_Size() int { + return xxx_messageInfo_FederSegmentSearchResult.Size(m) +} +func (m *FederSegmentSearchResult) XXX_DiscardUnknown() { + xxx_messageInfo_FederSegmentSearchResult.DiscardUnknown(m) +} + +var xxx_messageInfo_FederSegmentSearchResult proto.InternalMessageInfo + +func (m *FederSegmentSearchResult) GetSegmentID() int64 { + if m != nil { + return m.SegmentID + } + return 0 +} + +func (m *FederSegmentSearchResult) GetVisitInfo() string { + if m != nil { + return m.VisitInfo + } + return "" +} + +func (m *FederSegmentSearchResult) GetVisitIds() *IDs { + if m != nil { + return m.VisitIds +>>>>>>> 81c4945... Support feder search } return nil } @@ -1413,11 +1487,14 @@ func init() { proto.RegisterType((*FieldData)(nil), "milvus.proto.schema.FieldData") proto.RegisterType((*IDs)(nil), "milvus.proto.schema.IDs") proto.RegisterType((*SearchResultData)(nil), "milvus.proto.schema.SearchResultData") + proto.RegisterMapType((map[int64]*FederSegmentSearchResult)(nil), "milvus.proto.schema.SearchResultData.VisitorViewsEntry") + proto.RegisterType((*FederSegmentSearchResult)(nil), "milvus.proto.schema.FederSegmentSearchResult") } func init() { proto.RegisterFile("schema.proto", fileDescriptor_1c5fb4d8cc22d66a) } var fileDescriptor_1c5fb4d8cc22d66a = []byte{ +<<<<<<< HEAD // 1329 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0xcd, 0x72, 0x1b, 0x45, 0x10, 0xf6, 0x6a, 0xf5, 0xb3, 0xdb, 0x2b, 0x9b, 0x65, 0x12, 0xc2, 0x02, 0xe5, 0x58, 0x31, 0x50, @@ -1503,4 +1580,93 @@ var fileDescriptor_1c5fb4d8cc22d66a = []byte{ 0x73, 0x9c, 0xdf, 0x4b, 0x5b, 0x9d, 0x17, 0x7b, 0x5f, 0x19, 0xaf, 0x9f, 0x17, 0x79, 0xbf, 0x57, 0xd5, 0xd0, 0xfb, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x5c, 0x9b, 0xd8, 0x30, 0x20, 0x0d, 0x00, 0x00, +======= + // 1366 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x57, 0xcf, 0x73, 0xdb, 0xc4, + 0x17, 0xcf, 0x5a, 0xb6, 0x23, 0x3d, 0x39, 0xf9, 0xaa, 0xdb, 0x7e, 0x8b, 0x28, 0xa4, 0x71, 0x3d, + 0x30, 0xe3, 0xe9, 0x4c, 0xd3, 0x69, 0xfa, 0x93, 0x0e, 0x1d, 0x8a, 0x63, 0x4a, 0x4c, 0xa1, 0x0d, + 0x0a, 0x93, 0x03, 0xc3, 0x8c, 0x47, 0xb6, 0x36, 0xc9, 0x12, 0x59, 0x2b, 0xa4, 0x75, 0xc0, 0x77, + 0xb8, 0x72, 0xe2, 0xc4, 0xa9, 0x67, 0x6e, 0xfd, 0x87, 0xf8, 0x37, 0x38, 0x31, 0xc3, 0xbc, 0xdd, + 0x95, 0x7f, 0x3b, 0x84, 0xdb, 0xdb, 0xb7, 0x9f, 0xf7, 0xf4, 0xf6, 0xf3, 0x7e, 0xec, 0x0a, 0x6a, + 0x79, 0xff, 0x94, 0x0d, 0xc2, 0x9d, 0x34, 0x13, 0x52, 0xd0, 0xab, 0x03, 0x1e, 0x9f, 0x0f, 0x73, + 0xbd, 0xda, 0xd1, 0x5b, 0x37, 0x6a, 0x7d, 0x31, 0x18, 0x88, 0x44, 0x2b, 0x1b, 0x6f, 0xca, 0xe0, + 0xbe, 0xe0, 0x2c, 0x8e, 0x0e, 0xd5, 0x2e, 0xf5, 0x61, 0xfd, 0x18, 0x97, 0x9d, 0xb6, 0x4f, 0xea, + 0xa4, 0x69, 0x05, 0xc5, 0x92, 0x52, 0x28, 0x27, 0xe1, 0x80, 0xf9, 0xa5, 0x3a, 0x69, 0x3a, 0x81, + 0x92, 0xe9, 0x07, 0xb0, 0xc9, 0xf3, 0x6e, 0x9a, 0xf1, 0x41, 0x98, 0x8d, 0xba, 0x67, 0x6c, 0xe4, + 0x5b, 0x75, 0xd2, 0xb4, 0x83, 0x1a, 0xcf, 0x0f, 0xb4, 0xf2, 0x25, 0x1b, 0xd1, 0x3a, 0xb8, 0x11, + 0xcb, 0xfb, 0x19, 0x4f, 0x25, 0x17, 0x89, 0x5f, 0x56, 0x0e, 0xa6, 0x55, 0xf4, 0x29, 0x38, 0x51, + 0x28, 0xc3, 0xae, 0x1c, 0xa5, 0xcc, 0xaf, 0xd4, 0x49, 0x73, 0x73, 0x77, 0x6b, 0x67, 0x49, 0xf0, + 0x3b, 0xed, 0x50, 0x86, 0xdf, 0x8c, 0x52, 0x16, 0xd8, 0x91, 0x91, 0x68, 0x0b, 0x5c, 0x34, 0xeb, + 0xa6, 0x61, 0x16, 0x0e, 0x72, 0xbf, 0x5a, 0xb7, 0x9a, 0xee, 0xee, 0xad, 0x59, 0x6b, 0x73, 0xe4, + 0x97, 0x6c, 0x74, 0x14, 0xc6, 0x43, 0x76, 0x10, 0xf2, 0x2c, 0x00, 0xb4, 0x3a, 0x50, 0x46, 0xb4, + 0x0d, 0x35, 0x9e, 0x44, 0xec, 0xa7, 0xc2, 0xc9, 0xfa, 0x65, 0x9d, 0xb8, 0xca, 0xcc, 0x78, 0xb9, + 0x0e, 0xd5, 0x70, 0x28, 0x45, 0xa7, 0xed, 0xdb, 0x8a, 0x05, 0xb3, 0xa2, 0x0f, 0xa1, 0x92, 0xcb, + 0x50, 0x32, 0xdf, 0x51, 0x27, 0xdb, 0x5e, 0x7a, 0x32, 0x9d, 0x04, 0x84, 0x05, 0x1a, 0x4d, 0x9f, + 0x43, 0x8d, 0xc5, 0x6c, 0xc0, 0x12, 0xa9, 0x79, 0x81, 0xcb, 0xf0, 0xe2, 0x1a, 0x13, 0x45, 0x4d, + 0x1b, 0x36, 0x22, 0x76, 0x1c, 0x0e, 0x63, 0xd9, 0x3d, 0xc7, 0x90, 0x7d, 0xb7, 0x4e, 0x9a, 0xee, + 0x8a, 0x00, 0xd4, 0xa1, 0x54, 0x14, 0x41, 0xcd, 0x58, 0x29, 0x55, 0xe3, 0x77, 0x02, 0xde, 0x9e, + 0x88, 0x63, 0xd6, 0xc7, 0x5c, 0x99, 0x3a, 0x29, 0xaa, 0x81, 0x4c, 0x55, 0xc3, 0x5c, 0x9e, 0x4b, + 0x8b, 0x79, 0x9e, 0x30, 0x64, 0xcd, 0x30, 0xf4, 0x04, 0xaa, 0xaa, 0xcc, 0x72, 0xbf, 0xac, 0x98, + 0xaf, 0x5f, 0x40, 0x91, 0x92, 0x03, 0x83, 0x6f, 0x6c, 0x83, 0xd3, 0x12, 0x22, 0xfe, 0x34, 0xcb, + 0xc2, 0x11, 0x06, 0x85, 0x65, 0xe1, 0x93, 0xba, 0xd5, 0xb4, 0x03, 0x25, 0x37, 0x6e, 0x82, 0xdd, + 0x49, 0xe4, 0xe2, 0x7e, 0xc5, 0xec, 0x6f, 0x83, 0xf3, 0xa5, 0x48, 0x4e, 0x16, 0x01, 0x96, 0x01, + 0xd4, 0x01, 0x5e, 0xc4, 0x22, 0x5c, 0xe2, 0xa2, 0x64, 0x10, 0xb7, 0xc0, 0x6d, 0x8b, 0x61, 0x2f, + 0x66, 0x8b, 0x10, 0x32, 0x71, 0xd2, 0x1a, 0x49, 0x96, 0x2f, 0x22, 0x6a, 0x13, 0x27, 0x87, 0x32, + 0xe3, 0xcb, 0x22, 0x71, 0x0c, 0xe4, 0x67, 0x02, 0xa0, 0x76, 0x35, 0xe4, 0xc1, 0x14, 0x64, 0x15, + 0x65, 0x87, 0xfd, 0x30, 0x0e, 0x33, 0x9d, 0x55, 0x85, 0x5e, 0xa8, 0xaa, 0xd2, 0x7f, 0xad, 0x2a, + 0x64, 0xec, 0x8b, 0xc3, 0xd7, 0xaf, 0x56, 0x1f, 0xe5, 0x2f, 0x02, 0x30, 0xa9, 0x26, 0xba, 0x05, + 0x4e, 0x4f, 0x88, 0xb8, 0x6b, 0x70, 0xa4, 0x69, 0xef, 0xaf, 0x05, 0x36, 0xaa, 0xd0, 0x3f, 0x7d, + 0x0f, 0x6c, 0x9e, 0x48, 0xbd, 0x8b, 0xc1, 0x54, 0xf6, 0xd7, 0x82, 0x75, 0x9e, 0x48, 0xb5, 0xb9, + 0x05, 0x4e, 0x2c, 0x92, 0x13, 0xbd, 0x8b, 0x35, 0x63, 0xa1, 0x2d, 0xaa, 0xd4, 0xf6, 0x36, 0xc0, + 0x31, 0xe6, 0x46, 0xef, 0xe3, 0x60, 0x29, 0xed, 0xaf, 0x05, 0x8e, 0xd2, 0x29, 0xc0, 0x2d, 0x70, + 0x23, 0x95, 0x1a, 0x8d, 0xc0, 0xd1, 0x42, 0xf6, 0xd7, 0x02, 0xd0, 0xca, 0x02, 0x92, 0x2b, 0xe2, + 0x35, 0xa4, 0x8a, 0x55, 0x8b, 0x10, 0xad, 0x2c, 0x3e, 0xd3, 0xc3, 0xec, 0x69, 0xc4, 0x7a, 0x9d, + 0x34, 0x6b, 0xf8, 0x19, 0xa5, 0x43, 0x40, 0xab, 0xaa, 0x59, 0x68, 0xfc, 0x59, 0x06, 0x77, 0x8a, + 0x72, 0xfa, 0x6c, 0xfe, 0xe8, 0xee, 0xee, 0xcd, 0xa5, 0x4c, 0x8f, 0x6b, 0x78, 0x86, 0x9a, 0xa7, + 0x73, 0xd4, 0xb8, 0x2b, 0xf2, 0x54, 0x14, 0xf8, 0x34, 0x73, 0xcf, 0xe6, 0x99, 0x5b, 0xf5, 0xe9, + 0x71, 0xf5, 0xcf, 0x30, 0xfb, 0x7c, 0x81, 0xd9, 0x55, 0x73, 0x63, 0xd2, 0x1c, 0xb3, 0xd4, 0xef, + 0x2d, 0x52, 0xbf, 0xaa, 0x4a, 0xa7, 0xba, 0x67, 0x2e, 0x39, 0x7b, 0x8b, 0xc9, 0x59, 0x59, 0xea, + 0x93, 0xee, 0x99, 0x4b, 0xdf, 0xf3, 0x85, 0xf4, 0xad, 0x3a, 0xcb, 0xa4, 0x47, 0x67, 0xf2, 0x8b, + 0x1e, 0x42, 0xd4, 0x6a, 0x0f, 0xf6, 0x05, 0x1e, 0x26, 0xfd, 0x89, 0x1e, 0x94, 0x51, 0x91, 0x8e, + 0xef, 0x73, 0x91, 0x68, 0x07, 0xce, 0x05, 0xe9, 0x18, 0xb7, 0x16, 0xa6, 0x03, 0x4d, 0x66, 0x0a, + 0xec, 0x37, 0x02, 0xee, 0x11, 0xeb, 0x4b, 0x61, 0x0a, 0xcc, 0x03, 0x2b, 0xe2, 0x03, 0x73, 0x55, + 0xa3, 0x88, 0x57, 0x99, 0x4e, 0xdc, 0xb9, 0x82, 0x99, 0xba, 0xb9, 0x44, 0xea, 0x5c, 0x65, 0xa6, + 0x9d, 0xd3, 0x0f, 0x61, 0xa3, 0xc7, 0x13, 0xbc, 0xd4, 0x8d, 0x1b, 0xcb, 0x14, 0x7d, 0x4d, 0xab, + 0x35, 0x6c, 0x1c, 0xd6, 0xdf, 0x04, 0x1c, 0x15, 0x90, 0x3a, 0xeb, 0x3d, 0x28, 0xab, 0xd1, 0x42, + 0x2e, 0x33, 0x5a, 0x14, 0x94, 0x6e, 0x01, 0xa8, 0x81, 0xde, 0x9d, 0x7a, 0x62, 0x38, 0x4a, 0xf3, + 0x0a, 0x6f, 0x96, 0x8f, 0x61, 0x3d, 0x57, 0x6d, 0x95, 0x9b, 0x52, 0xfe, 0xd7, 0x69, 0x87, 0xad, + 0x60, 0x4c, 0xd0, 0x5a, 0x9f, 0x22, 0x37, 0x85, 0xbc, 0xdc, 0x7a, 0x8a, 0x57, 0xb4, 0x36, 0x26, + 0xf4, 0x5d, 0xb0, 0x75, 0x68, 0x3c, 0x52, 0x45, 0x3c, 0x7e, 0x12, 0x45, 0xad, 0x75, 0xa8, 0x28, + 0xb1, 0xf1, 0x0b, 0x01, 0xab, 0xd3, 0xce, 0xe9, 0x63, 0xa8, 0x62, 0xc3, 0xf2, 0xe8, 0xc2, 0x66, + 0x9f, 0xee, 0xb8, 0x0a, 0x4f, 0x64, 0x27, 0xa2, 0x1f, 0x41, 0x35, 0x97, 0x19, 0x1a, 0x96, 0x2e, + 0x5d, 0xe2, 0x95, 0x5c, 0x66, 0x9d, 0xa8, 0x05, 0x60, 0xf3, 0xa8, 0xab, 0xe3, 0x78, 0x6b, 0x81, + 0x77, 0xc8, 0xc2, 0xac, 0x7f, 0x1a, 0xb0, 0x7c, 0x18, 0x4b, 0x33, 0xbd, 0xdc, 0x64, 0x38, 0xe8, + 0xfe, 0x30, 0x64, 0x19, 0x67, 0xb9, 0xa9, 0x15, 0x48, 0x86, 0x83, 0xaf, 0xb5, 0x86, 0x5e, 0x85, + 0x8a, 0x14, 0x69, 0xf7, 0x4c, 0x7d, 0xdb, 0x0a, 0xca, 0x52, 0xa4, 0x2f, 0xe9, 0x27, 0xe0, 0xea, + 0x2b, 0xb6, 0x98, 0x20, 0xd6, 0xca, 0xf3, 0x8c, 0x33, 0x1f, 0xe8, 0x24, 0xea, 0x9e, 0xb9, 0x0e, + 0xd5, 0xbc, 0x2f, 0x32, 0xa6, 0xef, 0xf4, 0x52, 0x60, 0x56, 0xf4, 0x36, 0x58, 0x3c, 0xca, 0xcd, + 0x3c, 0xf0, 0x97, 0xcf, 0xb3, 0x76, 0x1e, 0x20, 0x88, 0x5e, 0x53, 0x91, 0x9d, 0xe9, 0x57, 0x9d, + 0x15, 0xe8, 0x05, 0xfd, 0x0e, 0x36, 0xce, 0x79, 0xce, 0xa5, 0xc8, 0xba, 0xe7, 0x9c, 0xfd, 0x58, + 0x3c, 0xd7, 0x1e, 0x2f, 0xe7, 0x6c, 0x8e, 0x8e, 0x9d, 0x23, 0x6d, 0x7a, 0x84, 0x96, 0x9f, 0x25, + 0x32, 0x1b, 0x05, 0xb5, 0xf3, 0x29, 0xd5, 0x8d, 0x04, 0xae, 0x2c, 0x40, 0xb0, 0xcf, 0xf0, 0x75, + 0x6b, 0xfa, 0xec, 0x8c, 0x8d, 0xe8, 0x1e, 0x54, 0xf4, 0x9b, 0x4a, 0x27, 0xec, 0xce, 0x72, 0x66, + 0x58, 0xc4, 0xb2, 0x43, 0x76, 0x82, 0x77, 0xe7, 0x74, 0x20, 0x81, 0xb6, 0x7d, 0x5a, 0x7a, 0x42, + 0x1a, 0xbf, 0x12, 0xf0, 0x57, 0xe1, 0xe8, 0xfb, 0xe0, 0xe4, 0x5a, 0x3d, 0x7e, 0x90, 0x4f, 0x14, + 0xd8, 0x35, 0x2a, 0xf4, 0x2e, 0x4f, 0x8e, 0x45, 0xd1, 0x35, 0x4a, 0xd3, 0x49, 0x8e, 0x05, 0x7d, + 0x08, 0x8e, 0xd9, 0x8e, 0x8a, 0xbe, 0x59, 0xcd, 0xb7, 0xad, 0xed, 0xa2, 0xfc, 0xf6, 0x5b, 0x02, + 0x76, 0xd1, 0x9e, 0xd4, 0x86, 0xf2, 0x2b, 0x91, 0x30, 0x6f, 0x0d, 0x25, 0xbc, 0xa5, 0x3c, 0x82, + 0x52, 0x27, 0x91, 0x4f, 0xbc, 0x12, 0x75, 0xa0, 0xd2, 0x49, 0xe4, 0xbd, 0x47, 0x9e, 0x65, 0xc4, + 0xfb, 0xbb, 0x5e, 0xd9, 0x88, 0x8f, 0x1e, 0x78, 0x15, 0x14, 0xd5, 0x90, 0xf1, 0x80, 0x02, 0x54, + 0xf5, 0x9c, 0xf7, 0x5c, 0x94, 0x75, 0x2d, 0x7b, 0xd7, 0xa8, 0x0b, 0xeb, 0x47, 0x61, 0xb6, 0x77, + 0x1a, 0x66, 0xde, 0xff, 0x11, 0xaf, 0xca, 0xdb, 0xbb, 0x8e, 0x5f, 0xc1, 0x59, 0xe8, 0xbd, 0x43, + 0x3d, 0xa8, 0xb5, 0xa6, 0xa6, 0x8e, 0x17, 0xd1, 0xff, 0x81, 0xfb, 0x62, 0x32, 0xad, 0x3c, 0x76, + 0xfb, 0x08, 0x60, 0xf2, 0x80, 0x46, 0x03, 0xb5, 0xda, 0xcb, 0x58, 0x28, 0x59, 0xe4, 0xad, 0xd1, + 0x2b, 0xb0, 0x31, 0xd1, 0xe0, 0x77, 0xc9, 0x58, 0xd5, 0xce, 0x44, 0x9a, 0xa2, 0xaa, 0x34, 0xb6, + 0x53, 0x2a, 0x16, 0x79, 0x56, 0xeb, 0x18, 0x36, 0xb9, 0x28, 0x38, 0x3b, 0xc9, 0xd2, 0x7e, 0xcb, + 0xd5, 0x0f, 0xd0, 0x03, 0xe4, 0xef, 0x80, 0x7c, 0x7b, 0xef, 0x84, 0xcb, 0xd3, 0x61, 0x0f, 0x7f, + 0x0e, 0xee, 0x6a, 0xd8, 0x1d, 0x2e, 0x0a, 0x49, 0x91, 0x7c, 0xf7, 0x44, 0xdc, 0x09, 0x53, 0x7e, + 0x57, 0x73, 0x9d, 0xf6, 0xde, 0x10, 0xf2, 0x47, 0x69, 0xb3, 0xf3, 0x7a, 0xe7, 0x2b, 0xed, 0xf5, + 0xf3, 0x2c, 0xed, 0xf7, 0xaa, 0x0a, 0x7a, 0xff, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x27, 0xc0, + 0xa9, 0x1e, 0xc0, 0x0d, 0x00, 0x00, +>>>>>>> 81c4945... Support feder search } diff --git a/proto/feder.proto b/proto/feder.proto index 63c72190..eb462486 100644 --- a/proto/feder.proto +++ b/proto/feder.proto @@ -3,15 +3,12 @@ package milvus.proto.feder; option go_package = "github.com/milvus-io/milvus-proto/go-api/federpb"; import "common.proto"; +import "schema.proto"; message SegmentIndexData { int64 segmentID = 1; string index_data = 2; // data from knownwhere -} - -message FederSegmentSearchResult { - int64 segmentID = 1; - string visit_info = 2; + schema.IDs ids_set = 3; } message ListIndexedSegmentRequest { diff --git a/proto/schema.proto b/proto/schema.proto index d1aa90f7..68e46f10 100644 --- a/proto/schema.proto +++ b/proto/schema.proto @@ -155,4 +155,11 @@ message SearchResultData { IDs ids = 5; repeated int64 topks = 6; repeated string output_fields = 7; + map visitor_views = 8; +} + +message FederSegmentSearchResult { + int64 segmentID = 1; + string visit_info = 2; + IDs visit_ids = 3; }