Split segcore and plan proto for future feature (#5767)

* Split segcore and plan proto for future feature
Signed-off-by: Nfluorinedog <fluorinedog@gmail.com>

* lint
Signed-off-by: Nfluorinedog <fluorinedog@gmail.com>

internal/core/src/pb/CMakeLists.txt

@@ -12,7 +12,7 @@
 get_property(PROTOC_EXCUTABLE GLOBAL PROPERTY PROTOC_EXCUTABLE )
 
 
-set(proto_file_names common.proto etcd_meta.proto schema.proto milvus.proto index_cgo_msg.proto plan.proto)
+set(proto_file_names common.proto etcd_meta.proto schema.proto milvus.proto index_cgo_msg.proto plan.proto segcore.proto)
 
 set( PROTO_PATH          "${MILVUS_SOURCE_DIR}/../proto/" )
 

internal/core/src/query/Plan.cpp

@@ -480,7 +480,7 @@ GetNumOfQueries(const PlaceholderGroup* group) {
 }
 
 [[maybe_unused]] std::unique_ptr<RetrievePlan>
-CreateRetrievePlan(const Schema& schema, proto::plan::RetrieveRequest&& request) {
+CreateRetrievePlan(const Schema& schema, proto::segcore::RetrieveRequest&& request) {
     auto plan = std::make_unique<RetrievePlan>();
     plan->ids_ = std::unique_ptr<proto::schema::IDs>(request.release_ids());
     for (auto& field_name : request.output_fields()) {

internal/core/src/query/Plan.h

@@ -15,6 +15,7 @@
 #include <string>
 #include "common/Schema.h"
 #include "pb/plan.pb.h"
+#include "pb/segcore.pb.h"
 
 namespace milvus::query {
 // NOTE: APIs for C wrapper
@@ -38,7 +39,7 @@ int64_t
 GetNumOfQueries(const PlaceholderGroup*);
 
 std::unique_ptr<RetrievePlan>
-CreateRetrievePlan(const Schema& schema, proto::plan::RetrieveRequest&& request);
+CreateRetrievePlan(const Schema& schema, proto::segcore::RetrieveRequest&& request);
 
 // Query Overall TopK from Plan
 // Used to alloc result memory at Go side

internal/core/src/segcore/SegmentInterface.cpp

@@ -190,11 +190,11 @@ SegmentInternalInterface::BulkSubScript(FieldOffset field_offset, const SegOffse
     }
 }
 
-std::unique_ptr<proto::plan::RetrieveResults>
+std::unique_ptr<proto::segcore::RetrieveResults>
 SegmentInternalInterface::GetEntityById(const std::vector<FieldOffset>& field_offsets,
                                         const IdArray& id_array,
                                         Timestamp timestamp) const {
-    auto results = std::make_unique<proto::plan::RetrieveResults>();
+    auto results = std::make_unique<proto::segcore::RetrieveResults>();
 
     auto [ids_, seg_offsets] = search_ids(id_array, timestamp);
 

internal/core/src/segcore/SegmentInterface.h

@@ -19,6 +19,7 @@
 #include "common/SystemProperty.h"
 #include "query/PlanNode.h"
 #include "pb/schema.pb.h"
+#include "pb/segcore.pb.h"
 #include <memory>
 #include <vector>
 #include <utility>
@@ -40,7 +41,7 @@ class SegmentInterface {
            const Timestamp timestamps[],
            int64_t num_groups) const = 0;
 
-    virtual std::unique_ptr<proto::plan::RetrieveResults>
+    virtual std::unique_ptr<proto::segcore::RetrieveResults>
     GetEntityById(const std::vector<FieldOffset>& field_offsets,
                   const IdArray& id_array,
                   Timestamp timestamp) const = 0;
@@ -89,7 +90,7 @@ class SegmentInternalInterface : public SegmentInterface {
     void
     FillTargetEntry(const query::Plan* plan, QueryResult& results) const override;
 
-    std::unique_ptr<proto::plan::RetrieveResults>
+    std::unique_ptr<proto::segcore::RetrieveResults>
     GetEntityById(const std::vector<FieldOffset>& field_offsets,
                   const IdArray& id_array,
                   Timestamp timestamp) const override;

internal/core/src/segcore/plan_c.cpp

@@ -12,6 +12,7 @@
 #include "segcore/plan_c.h"
 #include "query/Plan.h"
 #include "segcore/Collection.h"
+#include "pb/segcore.pb.h"
 
 CStatus
 CreatePlan(CCollection c_col, const char* dsl, CPlan* res_plan) {
@@ -135,7 +136,7 @@ CStatus
 CreateRetrievePlan(CCollection c_col, CProto retrieve_request, CRetrievePlan* output) {
     auto col = (milvus::segcore::Collection*)c_col;
     try {
-        milvus::proto::plan::RetrieveRequest request;
+        milvus::proto::segcore::RetrieveRequest request;
         request.ParseFromArray(retrieve_request.proto_blob, retrieve_request.proto_size);
         auto plan = milvus::query::CreateRetrievePlan(*col->get_schema(), std::move(request));
         *output = plan.release();

internal/proto/plan.proto

@@ -88,13 +88,3 @@ message PlanNode {
     VectorANNS vector_anns = 1;
   }
 }
-
-message RetrieveRequest {
-  schema.IDs ids = 1;
-  repeated string output_fields = 2;
-}
-
-message RetrieveResults {
-  schema.IDs ids = 1;
-  repeated schema.FieldData fields_data = 2;
-}

internal/proto/planpb/plan.pb.go

@@ -777,100 +777,6 @@ func (*PlanNode) XXX_OneofWrappers() []interface{} {
 	}
 }
 
-type RetrieveRequest struct {
-	Ids                  *schemapb.IDs `protobuf:"bytes,1,opt,name=ids,proto3" json:"ids,omitempty"`
-	OutputFields         []string      `protobuf:"bytes,2,rep,name=output_fields,json=outputFields,proto3" json:"output_fields,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
-	XXX_unrecognized     []byte        `json:"-"`
-	XXX_sizecache        int32         `json:"-"`
-}
-
-func (m *RetrieveRequest) Reset()         { *m = RetrieveRequest{} }
-func (m *RetrieveRequest) String() string { return proto.CompactTextString(m) }
-func (*RetrieveRequest) ProtoMessage()    {}
-func (*RetrieveRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_2d655ab2f7683c23, []int{10}
-}
-
-func (m *RetrieveRequest) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_RetrieveRequest.Unmarshal(m, b)
-}
-func (m *RetrieveRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_RetrieveRequest.Marshal(b, m, deterministic)
-}
-func (m *RetrieveRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RetrieveRequest.Merge(m, src)
-}
-func (m *RetrieveRequest) XXX_Size() int {
-	return xxx_messageInfo_RetrieveRequest.Size(m)
-}
-func (m *RetrieveRequest) XXX_DiscardUnknown() {
-	xxx_messageInfo_RetrieveRequest.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_RetrieveRequest proto.InternalMessageInfo
-
-func (m *RetrieveRequest) GetIds() *schemapb.IDs {
-	if m != nil {
-		return m.Ids
-	}
-	return nil
-}
-
-func (m *RetrieveRequest) GetOutputFields() []string {
-	if m != nil {
-		return m.OutputFields
-	}
-	return nil
-}
-
-type RetrieveResults struct {
-	Ids                  *schemapb.IDs         `protobuf:"bytes,1,opt,name=ids,proto3" json:"ids,omitempty"`
-	FieldsData           []*schemapb.FieldData `protobuf:"bytes,2,rep,name=fields_data,json=fieldsData,proto3" json:"fields_data,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
-	XXX_unrecognized     []byte                `json:"-"`
-	XXX_sizecache        int32                 `json:"-"`
-}
-
-func (m *RetrieveResults) Reset()         { *m = RetrieveResults{} }
-func (m *RetrieveResults) String() string { return proto.CompactTextString(m) }
-func (*RetrieveResults) ProtoMessage()    {}
-func (*RetrieveResults) Descriptor() ([]byte, []int) {
-	return fileDescriptor_2d655ab2f7683c23, []int{11}
-}
-
-func (m *RetrieveResults) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_RetrieveResults.Unmarshal(m, b)
-}
-func (m *RetrieveResults) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_RetrieveResults.Marshal(b, m, deterministic)
-}
-func (m *RetrieveResults) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RetrieveResults.Merge(m, src)
-}
-func (m *RetrieveResults) XXX_Size() int {
-	return xxx_messageInfo_RetrieveResults.Size(m)
-}
-func (m *RetrieveResults) XXX_DiscardUnknown() {
-	xxx_messageInfo_RetrieveResults.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_RetrieveResults proto.InternalMessageInfo
-
-func (m *RetrieveResults) GetIds() *schemapb.IDs {
-	if m != nil {
-		return m.Ids
-	}
-	return nil
-}
-
-func (m *RetrieveResults) GetFieldsData() []*schemapb.FieldData {
-	if m != nil {
-		return m.FieldsData
-	}
-	return nil
-}
-
 func init() {
 	proto.RegisterEnum("milvus.proto.plan.RangeExpr_OpType", RangeExpr_OpType_name, RangeExpr_OpType_value)
 	proto.RegisterEnum("milvus.proto.plan.UnaryExpr_UnaryOp", UnaryExpr_UnaryOp_name, UnaryExpr_UnaryOp_value)
@@ -885,72 +791,65 @@ func init() {
 	proto.RegisterType((*Expr)(nil), "milvus.proto.plan.Expr")
 	proto.RegisterType((*VectorANNS)(nil), "milvus.proto.plan.VectorANNS")
 	proto.RegisterType((*PlanNode)(nil), "milvus.proto.plan.PlanNode")
-	proto.RegisterType((*RetrieveRequest)(nil), "milvus.proto.plan.RetrieveRequest")
-	proto.RegisterType((*RetrieveResults)(nil), "milvus.proto.plan.RetrieveResults")
 }
 
 func init() { proto.RegisterFile("plan.proto", fileDescriptor_2d655ab2f7683c23) }
 
 var fileDescriptor_2d655ab2f7683c23 = []byte{
-	// 951 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x4f, 0x6f, 0x1b, 0x45,
-	0x14, 0xcf, 0xee, 0x3a, 0xc9, 0xee, 0xb3, 0xeb, 0x98, 0xb9, 0x60, 0x08, 0x25, 0xd1, 0xb6, 0x82,
-	0x08, 0xd4, 0x44, 0xb8, 0x25, 0x95, 0x8a, 0x0a, 0x24, 0xa4, 0x34, 0x16, 0x95, 0x13, 0x06, 0x93,
-	0x03, 0x97, 0xd5, 0x78, 0x77, 0x6c, 0x8f, 0x3a, 0x9e, 0xd9, 0xcc, 0xce, 0x5a, 0xf5, 0x85, 0x0b,
-	0x37, 0x6e, 0x7c, 0x09, 0x2e, 0x7c, 0x21, 0xee, 0x7c, 0x11, 0x34, 0x33, 0x1b, 0xff, 0x41, 0x4e,
-	0x50, 0xa5, 0xde, 0xde, 0xbf, 0xdf, 0xfb, 0x3f, 0x6f, 0x00, 0x72, 0x4e, 0xc4, 0x61, 0xae, 0xa4,
-	0x96, 0xe8, 0xbd, 0x09, 0xe3, 0xd3, 0xb2, 0x70, 0xdc, 0xa1, 0x51, 0x7c, 0xd8, 0x28, 0xd2, 0x31,
-	0x9d, 0x10, 0x27, 0x8a, 0x73, 0x68, 0xbc, 0xa4, 0x82, 0x2a, 0x96, 0x5e, 0x11, 0x5e, 0x52, 0xb4,
-	0x0b, 0xe1, 0x40, 0x4a, 0x9e, 0x4c, 0x09, 0x6f, 0x7b, 0xfb, 0xde, 0x41, 0x78, 0xbe, 0x81, 0xb7,
-	0x8d, 0xe4, 0x8a, 0x70, 0x74, 0x1f, 0x22, 0x26, 0xf4, 0xf1, 0x13, 0xab, 0xf5, 0xf7, 0xbd, 0x83,
-	0xe0, 0x7c, 0x03, 0x87, 0x56, 0x54, 0xa9, 0x87, 0x5c, 0x12, 0x6d, 0xd5, 0xc1, 0xbe, 0x77, 0xe0,
-	0x19, 0xb5, 0x15, 0x5d, 0x11, 0x7e, 0xba, 0x09, 0xc1, 0x94, 0xf0, 0x98, 0x42, 0xf4, 0x63, 0x49,
-	0xd5, 0xac, 0x2b, 0x86, 0x12, 0x21, 0xa8, 0x69, 0x99, 0xbf, 0xb6, 0xa1, 0x02, 0x6c, 0x69, 0xb4,
-	0x07, 0xf5, 0x09, 0xd5, 0x8a, 0xa5, 0x89, 0x9e, 0xe5, 0xd4, 0x3a, 0x8a, 0x30, 0x38, 0x51, 0x7f,
-	0x96, 0x53, 0xf4, 0x00, 0xee, 0x15, 0x94, 0xa8, 0x74, 0x9c, 0xe4, 0x44, 0x91, 0x49, 0xd1, 0xae,
-	0x59, 0x93, 0x86, 0x13, 0x5e, 0x5a, 0x59, 0xfc, 0xa7, 0x07, 0xf0, 0x9d, 0xe4, 0xe5, 0x44, 0xd8,
-	0x40, 0x1f, 0x40, 0x38, 0x64, 0x94, 0x67, 0x09, 0xcb, 0xaa, 0x60, 0xdb, 0x96, 0xef, 0x66, 0xe8,
-	0x19, 0x44, 0x19, 0xd1, 0xc4, 0x45, 0x33, 0x55, 0x35, 0x3b, 0xf7, 0x0f, 0x57, 0xfa, 0x56, 0x75,
-	0xec, 0x8c, 0x68, 0x62, 0x12, 0xc0, 0x61, 0x56, 0x51, 0xe8, 0x21, 0x34, 0x59, 0x91, 0xe4, 0x8a,
-	0x4d, 0x88, 0x9a, 0x25, 0xaf, 0xe9, 0xcc, 0xa6, 0x1b, 0xe2, 0x06, 0x2b, 0x2e, 0x9d, 0xf0, 0x07,
-	0x3a, 0x43, 0xbb, 0x10, 0xb1, 0x22, 0x21, 0xa5, 0x96, 0xdd, 0x33, 0x9b, 0x6c, 0x88, 0x43, 0x56,
-	0x9c, 0x58, 0x3e, 0xfe, 0xcb, 0x87, 0x08, 0x13, 0x31, 0xa2, 0x2f, 0xde, 0xe4, 0x0a, 0x7d, 0x0d,
-	0xf5, 0xd4, 0x66, 0x9d, 0x30, 0x31, 0x94, 0x36, 0xd5, 0xfa, 0x7f, 0xd3, 0xb1, 0xf3, 0x5d, 0xd4,
-	0x86, 0x21, 0x5d, 0xd4, 0xf9, 0x25, 0x04, 0x32, 0x2f, 0xda, 0xfe, 0x7e, 0x70, 0xd0, 0xec, 0x3c,
-	0x58, 0x83, 0x9b, 0x87, 0x3a, 0xbc, 0xc8, 0x6d, 0x31, 0xc6, 0x1e, 0x3d, 0x85, 0xad, 0xa9, 0x99,
-	0x7f, 0xd1, 0x0e, 0xf6, 0x83, 0x83, 0x7a, 0x67, 0x6f, 0x0d, 0x72, 0x79, 0x4f, 0x70, 0x65, 0x1e,
-	0x0b, 0xd8, 0x72, 0x7e, 0x50, 0x1d, 0xb6, 0xbb, 0x62, 0x4a, 0x38, 0xcb, 0x5a, 0x1b, 0x68, 0x07,
-	0xea, 0x2f, 0x15, 0x25, 0x9a, 0xaa, 0xfe, 0x98, 0x88, 0x96, 0x87, 0x5a, 0xd0, 0xa8, 0x04, 0x2f,
-	0xae, 0x4b, 0xc2, 0x5b, 0x3e, 0x6a, 0x40, 0xf8, 0x8a, 0x16, 0x85, 0xd5, 0x07, 0xe8, 0x1e, 0x44,
-	0x86, 0x73, 0xca, 0x1a, 0x8a, 0x60, 0xd3, 0x91, 0x9b, 0xc6, 0xae, 0x27, 0xb5, 0xe3, 0xb6, 0xe2,
-	0xdf, 0x3c, 0x08, 0xfb, 0x54, 0x4d, 0xde, 0x49, 0xb3, 0x16, 0x55, 0xfb, 0x6f, 0x57, 0xf5, 0x1f,
-	0x1e, 0x44, 0x3f, 0x0b, 0xa2, 0x66, 0x36, 0x8d, 0x27, 0xe0, 0xcb, 0xdc, 0x46, 0x6f, 0x76, 0x1e,
-	0xae, 0x71, 0x31, 0xb7, 0x74, 0xd4, 0x45, 0x8e, 0x7d, 0x99, 0xa3, 0x47, 0xb0, 0x99, 0x8e, 0x19,
-	0xcf, 0xec, 0xca, 0xd5, 0x3b, 0xef, 0xaf, 0x01, 0x1a, 0x0c, 0x76, 0x56, 0xf1, 0x1e, 0x6c, 0x57,
-	0xe8, 0xd5, 0x4e, 0x6f, 0x43, 0xd0, 0x93, 0xba, 0xe5, 0xc5, 0x7f, 0x7b, 0x00, 0xa7, 0x6c, 0x9e,
-	0xd4, 0xf1, 0x52, 0x52, 0x9f, 0xac, 0xf1, 0xbd, 0x30, 0xad, 0xc8, 0x2a, 0xad, 0xcf, 0xa1, 0xc6,
-	0xe9, 0x50, 0xff, 0x5f, 0x56, 0xd6, 0xc8, 0xd4, 0xa0, 0xd8, 0x68, 0xac, 0xed, 0xd6, 0xdf, 0x55,
-	0x83, 0xb5, 0x8a, 0x8f, 0x21, 0xbc, 0x89, 0xb5, 0x5a, 0x44, 0x13, 0xe0, 0x95, 0x1c, 0xb1, 0x94,
-	0xf0, 0x13, 0x91, 0xb5, 0x3c, 0xbb, 0x0d, 0x8e, 0xbf, 0x50, 0x2d, 0x3f, 0xfe, 0xdd, 0x87, 0x9a,
-	0x2d, 0xea, 0x39, 0x80, 0x32, 0xfb, 0x9b, 0xd0, 0x37, 0xb9, 0xaa, 0xe6, 0xfd, 0xd1, 0x5d, 0x4b,
-	0x7e, 0xbe, 0x81, 0x23, 0x35, 0x7f, 0x5c, 0xcf, 0x20, 0xd2, 0x54, 0x4d, 0x1c, 0xda, 0x15, 0xb8,
-	0xbb, 0x06, 0x7d, 0xb3, 0x5f, 0xe6, 0x7a, 0xe9, 0x9b, 0x5d, 0x7b, 0x0e, 0x50, 0x9a, 0xd4, 0x1d,
-	0x38, 0xb8, 0x35, 0xf4, 0x7c, 0xd8, 0x26, 0x74, 0x39, 0x1f, 0xc7, 0xb7, 0x50, 0x1f, 0xb0, 0x05,
-	0xbe, 0x76, 0xeb, 0xaa, 0x2e, 0xe6, 0x72, 0xbe, 0x81, 0x61, 0x30, 0xe7, 0x4e, 0xb7, 0xa0, 0x66,
-	0xa0, 0xf1, 0x3f, 0x1e, 0xc0, 0x15, 0x4d, 0xb5, 0x54, 0x27, 0xbd, 0xde, 0x4f, 0xd5, 0x6d, 0x71,
-	0x76, 0xee, 0x62, 0x9b, 0xdb, 0xe2, 0xbc, 0xac, 0x5c, 0x3d, 0x7f, 0xf5, 0xea, 0x3d, 0x05, 0xc8,
-	0x15, 0xcd, 0x58, 0x4a, 0xb4, 0x7d, 0xf5, 0x77, 0xce, 0x6f, 0xc9, 0x14, 0x7d, 0x05, 0x70, 0x6d,
-	0xee, 0xb7, 0x7b, 0x73, 0xb5, 0x5b, 0x1b, 0x31, 0x3f, 0xf2, 0x38, 0xba, 0x9e, 0xdf, 0xfb, 0x4f,
-	0x61, 0x27, 0xe7, 0x24, 0xa5, 0x63, 0xc9, 0x33, 0xaa, 0x12, 0x4d, 0x46, 0xed, 0x4d, 0x7b, 0xbc,
-	0x9b, 0x4b, 0xe2, 0x3e, 0x19, 0xc5, 0x7d, 0x08, 0x2f, 0x39, 0x11, 0x3d, 0x99, 0x51, 0xd3, 0xbb,
-	0xa9, 0x2d, 0x38, 0x21, 0x42, 0x14, 0x77, 0x3c, 0xf3, 0x45, 0x5b, 0x4c, 0xef, 0x1c, 0xe6, 0x44,
-	0x88, 0xc2, 0xf4, 0x4e, 0xc8, 0x8c, 0xc6, 0x03, 0xd8, 0xc1, 0xe6, 0x1f, 0xa1, 0x53, 0x8a, 0xe9,
-	0x75, 0x49, 0x0b, 0x8d, 0x3e, 0x83, 0x80, 0x65, 0x37, 0x4e, 0xdb, 0x6b, 0xef, 0x7e, 0xf7, 0xac,
-	0xc0, 0xc6, 0xc8, 0x7c, 0x3c, 0xb2, 0xd4, 0x79, 0xa9, 0x13, 0xdb, 0x45, 0x77, 0x36, 0x22, 0xdc,
-	0x70, 0xc2, 0xef, 0xad, 0x2c, 0xfe, 0x75, 0x39, 0x46, 0x51, 0x72, 0x5d, 0xbc, 0x55, 0x8c, 0x6f,
-	0xa0, 0xee, 0x9c, 0x27, 0xe6, 0x93, 0xa9, 0x0e, 0xd3, 0xc7, 0x6b, 0x31, 0x36, 0xa0, 0xf9, 0x94,
-	0x30, 0x38, 0x88, 0xa1, 0x4f, 0x1f, 0xff, 0xf2, 0xc5, 0x88, 0xe9, 0x71, 0x39, 0x38, 0x4c, 0xe5,
-	0xe4, 0xc8, 0xe1, 0x1e, 0x31, 0x59, 0x51, 0x47, 0x4c, 0x68, 0xaa, 0x04, 0xe1, 0x47, 0xd6, 0xd5,
-	0x91, 0xe9, 0x5b, 0x3e, 0x18, 0x6c, 0x59, 0xee, 0xf1, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x6d,
-	0xf2, 0x58, 0xac, 0x3c, 0x08, 0x00, 0x00,
+	// 872 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0x4d, 0x6f, 0x1b, 0x37,
+	0x13, 0xd6, 0xee, 0xea, 0x63, 0x77, 0xa4, 0x28, 0x7a, 0x79, 0x79, 0xd5, 0xba, 0x81, 0x85, 0x4d,
+	0xd0, 0x0a, 0x28, 0x22, 0xa3, 0x4a, 0xea, 0x00, 0x29, 0x52, 0xd4, 0x6e, 0x82, 0xd8, 0x68, 0x20,
+	0xbb, 0x5b, 0xd5, 0x87, 0x5e, 0x16, 0xd4, 0x2e, 0x25, 0x11, 0xa1, 0x48, 0x9a, 0x4b, 0x09, 0xd1,
+	0xb9, 0xb7, 0xde, 0xfa, 0x27, 0x7a, 0xe9, 0x1f, 0xea, 0xbd, 0x7f, 0xa4, 0x20, 0xb9, 0x96, 0xac,
+	0x42, 0x76, 0x51, 0xa0, 0x37, 0xce, 0xf7, 0xf3, 0xcc, 0x0c, 0x07, 0x40, 0x32, 0xcc, 0x07, 0x52,
+	0x09, 0x2d, 0xd0, 0xff, 0x16, 0x94, 0xad, 0x96, 0x85, 0x93, 0x06, 0xc6, 0xf0, 0x71, 0xab, 0xc8,
+	0xe6, 0x64, 0x81, 0x9d, 0x2a, 0x96, 0xd0, 0x7a, 0x4b, 0x38, 0x51, 0x34, 0xbb, 0xc2, 0x6c, 0x49,
+	0xd0, 0x01, 0x84, 0x13, 0x21, 0x58, 0xba, 0xc2, 0xac, 0xeb, 0xf5, 0xbc, 0x7e, 0x78, 0x56, 0x49,
+	0x1a, 0x46, 0x73, 0x85, 0x19, 0x7a, 0x04, 0x11, 0xe5, 0xfa, 0xf8, 0xb9, 0xb5, 0xfa, 0x3d, 0xaf,
+	0x1f, 0x9c, 0x55, 0x92, 0xd0, 0xaa, 0x4a, 0xf3, 0x94, 0x09, 0xac, 0xad, 0x39, 0xe8, 0x79, 0x7d,
+	0xcf, 0x98, 0xad, 0xea, 0x0a, 0xb3, 0xd3, 0x1a, 0x04, 0x2b, 0xcc, 0x62, 0x02, 0xd1, 0xf7, 0x4b,
+	0xa2, 0xd6, 0xe7, 0x7c, 0x2a, 0x10, 0x82, 0xaa, 0x16, 0xf2, 0xbd, 0x2d, 0x15, 0x24, 0xf6, 0x8d,
+	0x0e, 0xa1, 0xb9, 0x20, 0x5a, 0xd1, 0x2c, 0xd5, 0x6b, 0x49, 0x6c, 0xa2, 0x28, 0x01, 0xa7, 0x1a,
+	0xaf, 0x25, 0x41, 0x8f, 0xe1, 0x41, 0x41, 0xb0, 0xca, 0xe6, 0xa9, 0xc4, 0x0a, 0x2f, 0x8a, 0x6e,
+	0xd5, 0xba, 0xb4, 0x9c, 0xf2, 0xd2, 0xea, 0xe2, 0xdf, 0x3c, 0x80, 0x6f, 0x05, 0x5b, 0x2e, 0xb8,
+	0x2d, 0xf4, 0x11, 0x84, 0x53, 0x4a, 0x58, 0x9e, 0xd2, 0xbc, 0x2c, 0xd6, 0xb0, 0xf2, 0x79, 0x8e,
+	0x5e, 0x42, 0x94, 0x63, 0x8d, 0x5d, 0x35, 0xc3, 0xaa, 0x3d, 0x7c, 0x34, 0xd8, 0xe9, 0x5b, 0xd9,
+	0xb1, 0xd7, 0x58, 0x63, 0x03, 0x20, 0x09, 0xf3, 0xf2, 0x85, 0x9e, 0x40, 0x9b, 0x16, 0xa9, 0x54,
+	0x74, 0x81, 0xd5, 0x3a, 0x7d, 0x4f, 0xd6, 0x16, 0x6e, 0x98, 0xb4, 0x68, 0x71, 0xe9, 0x94, 0xdf,
+	0x91, 0x35, 0x3a, 0x80, 0x88, 0x16, 0x29, 0x5e, 0x6a, 0x71, 0xfe, 0xda, 0x82, 0x0d, 0x93, 0x90,
+	0x16, 0x27, 0x56, 0x8e, 0x7f, 0xf7, 0x21, 0x4a, 0x30, 0x9f, 0x91, 0x37, 0x1f, 0xa4, 0x42, 0x5f,
+	0x43, 0x33, 0xb3, 0xa8, 0x53, 0xca, 0xa7, 0xc2, 0x42, 0x6d, 0xfe, 0x1d, 0x8e, 0x9d, 0xef, 0x96,
+	0x5b, 0x02, 0xd9, 0x96, 0xe7, 0x97, 0x10, 0x08, 0x59, 0x74, 0xfd, 0x5e, 0xd0, 0x6f, 0x0f, 0x1f,
+	0xef, 0x89, 0xdb, 0x94, 0x1a, 0x5c, 0x48, 0x4b, 0xc6, 0xf8, 0xa3, 0x17, 0x50, 0x5f, 0x99, 0xf9,
+	0x17, 0xdd, 0xa0, 0x17, 0xf4, 0x9b, 0xc3, 0xc3, 0x3d, 0x91, 0xb7, 0xf7, 0x24, 0x29, 0xdd, 0x63,
+	0x0e, 0x75, 0x97, 0x07, 0x35, 0xa1, 0x71, 0xce, 0x57, 0x98, 0xd1, 0xbc, 0x53, 0x41, 0x0f, 0xa1,
+	0xf9, 0x56, 0x11, 0xac, 0x89, 0x1a, 0xcf, 0x31, 0xef, 0x78, 0xa8, 0x03, 0xad, 0x52, 0xf1, 0xe6,
+	0x7a, 0x89, 0x59, 0xc7, 0x47, 0x2d, 0x08, 0xdf, 0x91, 0xa2, 0xb0, 0xf6, 0x00, 0x3d, 0x80, 0xc8,
+	0x48, 0xce, 0x58, 0x45, 0x11, 0xd4, 0xdc, 0xb3, 0x66, 0xfc, 0x46, 0x42, 0x3b, 0xa9, 0x1e, 0xff,
+	0xec, 0x41, 0x38, 0x26, 0x6a, 0xf1, 0x9f, 0x34, 0x6b, 0xcb, 0xda, 0xff, 0x77, 0xac, 0x7f, 0xf5,
+	0x20, 0xfa, 0x91, 0x63, 0xb5, 0xb6, 0x30, 0x9e, 0x83, 0x2f, 0xa4, 0xad, 0xde, 0x1e, 0x3e, 0xd9,
+	0x93, 0x62, 0xe3, 0xe9, 0x5e, 0x17, 0x32, 0xf1, 0x85, 0x44, 0x4f, 0xa1, 0x96, 0xcd, 0x29, 0xcb,
+	0xed, 0xca, 0x35, 0x87, 0xff, 0xdf, 0x13, 0x68, 0x62, 0x12, 0xe7, 0x15, 0x1f, 0x42, 0xa3, 0x8c,
+	0xde, 0xed, 0x74, 0x03, 0x82, 0x91, 0xd0, 0x1d, 0x2f, 0xfe, 0xc3, 0x03, 0x38, 0xa5, 0x1b, 0x50,
+	0xc7, 0xb7, 0x40, 0x7d, 0xba, 0x27, 0xf7, 0xd6, 0xb5, 0x7c, 0x96, 0xb0, 0x3e, 0x87, 0x2a, 0x23,
+	0x53, 0xfd, 0x4f, 0xa8, 0xac, 0x93, 0xe1, 0xa0, 0xe8, 0x6c, 0xae, 0xed, 0xd6, 0xdf, 0xc7, 0xc1,
+	0x7a, 0xc5, 0xc7, 0x10, 0xde, 0xd4, 0xda, 0x25, 0xd1, 0x06, 0x78, 0x27, 0x66, 0x34, 0xc3, 0xec,
+	0x84, 0xe7, 0x1d, 0xcf, 0x6e, 0x83, 0x93, 0x2f, 0x54, 0xc7, 0x8f, 0x7f, 0xf1, 0xa1, 0x6a, 0x49,
+	0xbd, 0x02, 0x50, 0x66, 0x7f, 0x53, 0xf2, 0x41, 0xaa, 0x72, 0xde, 0x9f, 0xdc, 0xb7, 0xe4, 0x67,
+	0x95, 0x24, 0x52, 0x9b, 0xcf, 0xf5, 0x12, 0x22, 0x4d, 0xd4, 0xc2, 0x45, 0x3b, 0x82, 0x07, 0x7b,
+	0xa2, 0x6f, 0xf6, 0xcb, 0x5c, 0x2f, 0x7d, 0xb3, 0x6b, 0xaf, 0x00, 0x96, 0x06, 0xba, 0x0b, 0x0e,
+	0xee, 0x2c, 0xbd, 0x19, 0xb6, 0x29, 0xbd, 0xdc, 0x8c, 0xe3, 0x1b, 0x68, 0x4e, 0xe8, 0x36, 0xbe,
+	0x7a, 0xe7, 0xaa, 0x6e, 0xe7, 0x72, 0x56, 0x49, 0x60, 0xb2, 0x91, 0x4e, 0xeb, 0x50, 0x35, 0xa1,
+	0xf1, 0x9f, 0x1e, 0xc0, 0x15, 0xc9, 0xb4, 0x50, 0x27, 0xa3, 0xd1, 0x0f, 0xe5, 0x6d, 0x71, 0x7e,
+	0xee, 0x62, 0x9b, 0xdb, 0xe2, 0xb2, 0xec, 0x5c, 0x3d, 0x7f, 0xf7, 0xea, 0xbd, 0x00, 0x90, 0x8a,
+	0xe4, 0x34, 0xc3, 0xda, 0xfe, 0xfa, 0x7b, 0xe7, 0x77, 0xcb, 0x15, 0x7d, 0x05, 0x70, 0x6d, 0xee,
+	0xb7, 0xfb, 0x73, 0xd5, 0x3b, 0x1b, 0xb1, 0x39, 0xf2, 0x49, 0x74, 0xbd, 0xb9, 0xf7, 0x9f, 0xc1,
+	0x43, 0xc9, 0x70, 0x46, 0xe6, 0x82, 0xe5, 0x44, 0xa5, 0x1a, 0xcf, 0xba, 0x35, 0x7b, 0xbc, 0xdb,
+	0xb7, 0xd4, 0x63, 0x3c, 0x8b, 0xc7, 0x10, 0x5e, 0x32, 0xcc, 0x47, 0x22, 0x27, 0xa6, 0x77, 0x2b,
+	0x4b, 0x38, 0xc5, 0x9c, 0x17, 0xf7, 0x7c, 0xf3, 0x6d, 0x5b, 0x4c, 0xef, 0x5c, 0xcc, 0x09, 0xe7,
+	0x85, 0xe9, 0x1d, 0x17, 0x39, 0x39, 0x7d, 0xf6, 0xd3, 0x17, 0x33, 0xaa, 0xe7, 0xcb, 0xc9, 0x20,
+	0x13, 0x8b, 0x23, 0x97, 0xe0, 0x29, 0x15, 0xe5, 0xeb, 0x88, 0x72, 0x4d, 0x14, 0xc7, 0xec, 0xc8,
+	0xe6, 0x3c, 0x32, 0x39, 0xe5, 0x64, 0x52, 0xb7, 0xd2, 0xb3, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff,
+	0x11, 0x2c, 0xa8, 0xdc, 0x58, 0x07, 0x00, 0x00,
 }

internal/proto/cgo.proto → internal/proto/segcore.proto

 syntax = "proto3";
-package milvus.proto.plan;
+package milvus.proto.segcore;
 
-option go_package = "github.com/milvus-io/milvus/internal/proto/cgo";
+option go_package = "github.com/milvus-io/milvus/internal/proto/segcorepb";
 import "schema.proto";
+
+message RetrieveRequest {
+  schema.IDs ids = 1;
+  repeated string output_fields = 2;
+}
+
+message RetrieveResults {
+  schema.IDs ids = 1;
+  repeated schema.FieldData fields_data = 2;
+}
+

internal/proto/segcorepb/segcore.pb.go

+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: segcore.proto
+
+package segcorepb
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	schemapb "github.com/milvus-io/milvus/internal/proto/schemapb"
+	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 RetrieveRequest struct {
+	Ids                  *schemapb.IDs `protobuf:"bytes,1,opt,name=ids,proto3" json:"ids,omitempty"`
+	OutputFields         []string      `protobuf:"bytes,2,rep,name=output_fields,json=outputFields,proto3" json:"output_fields,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *RetrieveRequest) Reset()         { *m = RetrieveRequest{} }
+func (m *RetrieveRequest) String() string { return proto.CompactTextString(m) }
+func (*RetrieveRequest) ProtoMessage()    {}
+func (*RetrieveRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_1d79fce784797357, []int{0}
+}
+
+func (m *RetrieveRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RetrieveRequest.Unmarshal(m, b)
+}
+func (m *RetrieveRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RetrieveRequest.Marshal(b, m, deterministic)
+}
+func (m *RetrieveRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RetrieveRequest.Merge(m, src)
+}
+func (m *RetrieveRequest) XXX_Size() int {
+	return xxx_messageInfo_RetrieveRequest.Size(m)
+}
+func (m *RetrieveRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_RetrieveRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RetrieveRequest proto.InternalMessageInfo
+
+func (m *RetrieveRequest) GetIds() *schemapb.IDs {
+	if m != nil {
+		return m.Ids
+	}
+	return nil
+}
+
+func (m *RetrieveRequest) GetOutputFields() []string {
+	if m != nil {
+		return m.OutputFields
+	}
+	return nil
+}
+
+type RetrieveResults struct {
+	Ids                  *schemapb.IDs         `protobuf:"bytes,1,opt,name=ids,proto3" json:"ids,omitempty"`
+	FieldsData           []*schemapb.FieldData `protobuf:"bytes,2,rep,name=fields_data,json=fieldsData,proto3" json:"fields_data,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *RetrieveResults) Reset()         { *m = RetrieveResults{} }
+func (m *RetrieveResults) String() string { return proto.CompactTextString(m) }
+func (*RetrieveResults) ProtoMessage()    {}
+func (*RetrieveResults) Descriptor() ([]byte, []int) {
+	return fileDescriptor_1d79fce784797357, []int{1}
+}
+
+func (m *RetrieveResults) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RetrieveResults.Unmarshal(m, b)
+}
+func (m *RetrieveResults) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RetrieveResults.Marshal(b, m, deterministic)
+}
+func (m *RetrieveResults) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RetrieveResults.Merge(m, src)
+}
+func (m *RetrieveResults) XXX_Size() int {
+	return xxx_messageInfo_RetrieveResults.Size(m)
+}
+func (m *RetrieveResults) XXX_DiscardUnknown() {
+	xxx_messageInfo_RetrieveResults.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RetrieveResults proto.InternalMessageInfo
+
+func (m *RetrieveResults) GetIds() *schemapb.IDs {
+	if m != nil {
+		return m.Ids
+	}
+	return nil
+}
+
+func (m *RetrieveResults) GetFieldsData() []*schemapb.FieldData {
+	if m != nil {
+		return m.FieldsData
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*RetrieveRequest)(nil), "milvus.proto.segcore.RetrieveRequest")
+	proto.RegisterType((*RetrieveResults)(nil), "milvus.proto.segcore.RetrieveResults")
+}
+
+func init() { proto.RegisterFile("segcore.proto", fileDescriptor_1d79fce784797357) }
+
+var fileDescriptor_1d79fce784797357 = []byte{
+	// 222 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x90, 0xb1, 0x4b, 0xc4, 0x30,
+	0x14, 0xc6, 0x39, 0x0f, 0x04, 0xd3, 0x3b, 0x84, 0xe2, 0x50, 0x1c, 0xe4, 0x38, 0x97, 0x43, 0x30,
+	0x81, 0x2a, 0xae, 0x82, 0x14, 0xc1, 0x35, 0xa3, 0x4b, 0x49, 0xda, 0x67, 0x1b, 0x48, 0x9b, 0x9a,
+	0xf7, 0xd2, 0xd1, 0xbf, 0x5d, 0x9a, 0x74, 0x50, 0x70, 0x71, 0xfb, 0xf2, 0x25, 0xbf, 0xef, 0x07,
+	0x61, 0x7b, 0x84, 0xae, 0x71, 0x1e, 0xf8, 0xe4, 0x1d, 0xb9, 0xfc, 0x6a, 0x30, 0x76, 0x0e, 0x98,
+	0x4e, 0x7c, 0xbd, 0xbb, 0xde, 0x61, 0xd3, 0xc3, 0xa0, 0x52, 0x7b, 0xd4, 0xec, 0x52, 0x02, 0x79,
+	0x03, 0x33, 0x48, 0xf8, 0x0c, 0x80, 0x94, 0xdf, 0xb1, 0xad, 0x69, 0xb1, 0xd8, 0x1c, 0x36, 0xa7,
+	0xac, 0x2c, 0xf8, 0xef, 0x91, 0xc4, 0xbe, 0x55, 0x28, 0x97, 0x47, 0xf9, 0x2d, 0xdb, 0xbb, 0x40,
+	0x53, 0xa0, 0xfa, 0xc3, 0x80, 0x6d, 0xb1, 0x38, 0x3b, 0x6c, 0x4f, 0x17, 0x72, 0x97, 0xca, 0xd7,
+	0xd8, 0x1d, 0xbf, 0x7e, 0x3a, 0x30, 0x58, 0xc2, 0x7f, 0x39, 0x9e, 0x59, 0x96, 0xc6, 0xeb, 0x56,
+	0x91, 0x8a, 0x86, 0xac, 0xbc, 0xf9, 0x93, 0x89, 0xc2, 0x4a, 0x91, 0x92, 0x2c, 0x21, 0x4b, 0x7e,
+	0x79, 0x7a, 0x7f, 0xec, 0x0c, 0xf5, 0x41, 0xf3, 0xc6, 0x0d, 0x22, 0x71, 0xf7, 0xc6, 0xad, 0x49,
+	0x98, 0x91, 0xc0, 0x8f, 0xca, 0x8a, 0x38, 0x25, 0xd6, 0x7f, 0x9a, 0xb4, 0x3e, 0x8f, 0xc5, 0xc3,
+	0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0xed, 0xbc, 0x2b, 0xca, 0x57, 0x01, 0x00, 0x00,
+}

internal/querynode/plan.go

@@ -24,7 +24,7 @@ import (
 	"errors"
 	"unsafe"
 
-	"github.com/milvus-io/milvus/internal/proto/planpb"
+	"github.com/milvus-io/milvus/internal/proto/segcorepb"
 )
 
 type Plan struct {
@@ -110,7 +110,7 @@ type RetrievePlan struct {
 	Timestamp       uint64
 }
 
-func createRetrievePlan(col *Collection, msg *planpb.RetrieveRequest, timestamp uint64) (*RetrievePlan, error) {
+func createRetrievePlan(col *Collection, msg *segcorepb.RetrieveRequest, timestamp uint64) (*RetrievePlan, error) {
 	protoCGo, err := MarshalForCGo(msg)
 	if err != nil {
 		return nil, err

internal/querynode/retrieve_collection.go

@@ -27,7 +27,7 @@ import (
 	"github.com/milvus-io/milvus/internal/msgstream"
 	"github.com/milvus-io/milvus/internal/proto/commonpb"
 	"github.com/milvus-io/milvus/internal/proto/internalpb"
-	"github.com/milvus-io/milvus/internal/proto/planpb"
+	"github.com/milvus-io/milvus/internal/proto/segcorepb"
 	"github.com/milvus-io/milvus/internal/util/trace"
 	"github.com/milvus-io/milvus/internal/util/tsoutil"
 )
@@ -317,15 +317,15 @@ func (rc *retrieveCollection) doUnsolvedMsgRetrieve() {
 	}
 }
 
-func mergeRetrieveResults(dataArr []*planpb.RetrieveResults) (*planpb.RetrieveResults, error) {
-	var final *planpb.RetrieveResults
+func mergeRetrieveResults(dataArr []*segcorepb.RetrieveResults) (*segcorepb.RetrieveResults, error) {
+	var final *segcorepb.RetrieveResults
 	for _, data := range dataArr {
 		if data == nil {
 			continue
 		}
 
 		if final == nil {
-			final = proto.Clone(data).(*planpb.RetrieveResults)
+			final = proto.Clone(data).(*segcorepb.RetrieveResults)
 			continue
 		}
 
@@ -360,7 +360,7 @@ func (rc *retrieveCollection) retrieve(retrieveMsg *msgstream.RetrieveMsg) error
 		return err
 	}
 
-	req := &planpb.RetrieveRequest{
+	req := &segcorepb.RetrieveRequest{
 		Ids:          retrieveMsg.Ids,
 		OutputFields: retrieveMsg.OutputFields,
 	}
@@ -401,7 +401,7 @@ func (rc *retrieveCollection) retrieve(retrieveMsg *msgstream.RetrieveMsg) error
 		}
 	}
 
-	var mergeList []*planpb.RetrieveResults
+	var mergeList []*segcorepb.RetrieveResults
 	for _, partitionID := range partitionIDsInHistorical {
 		segmentIDs, err := rc.historical.replica.getSegmentIDs(partitionID)
 		if err != nil {

internal/querynode/retrieve_collection_test.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/milvus-io/milvus/internal/proto/planpb"
 	"github.com/milvus-io/milvus/internal/proto/schemapb"
+	"github.com/milvus-io/milvus/internal/proto/segcorepb"
 )
 
 func TestRetrieve_Merge(t *testing.T) {
@@ -35,7 +35,7 @@ func TestRetrieve_Merge(t *testing.T) {
 		},
 	}
 
-	subRes := &planpb.RetrieveResults{
+	subRes := &segcorepb.RetrieveResults{
 		Ids: &schemapb.IDs{
 			IdField: &schemapb.IDs_IntId{
 				IntId: &schemapb.LongArray{
@@ -48,7 +48,7 @@ func TestRetrieve_Merge(t *testing.T) {
 			col2,
 		},
 	}
-	finalRes, err := mergeRetrieveResults([]*planpb.RetrieveResults{subRes, subRes})
+	finalRes, err := mergeRetrieveResults([]*segcorepb.RetrieveResults{subRes, subRes})
 	assert.NoError(t, err)
 	println(finalRes.String())
 }

internal/querynode/segment.go

@@ -25,7 +25,6 @@ import "C"
 import (
 	"errors"
 	"fmt"
-	"github.com/milvus-io/milvus/internal/proto/planpb"
 	"strconv"
 	"sync"
 	"unsafe"
@@ -35,6 +34,7 @@ import (
 
 	"github.com/milvus-io/milvus/internal/log"
 	"github.com/milvus-io/milvus/internal/proto/commonpb"
+	"github.com/milvus-io/milvus/internal/proto/segcorepb"
 )
 
 type segmentType int32
@@ -249,9 +249,9 @@ func (s *Segment) segmentSearch(plan *Plan,
 	return &searchResult, nil
 }
 
-func (s *Segment) segmentGetEntityByIds(plan *RetrievePlan) (*planpb.RetrieveResults, error) {
+func (s *Segment) segmentGetEntityByIds(plan *RetrievePlan) (*segcorepb.RetrieveResults, error) {
 	resProto := C.GetEntityByIds(s.segmentPtr, plan.RetrievePlanPtr, C.uint64_t(plan.Timestamp))
-	result := new(planpb.RetrieveResults)
+	result := new(segcorepb.RetrieveResults)
 	err := HandleCProtoResult(&resProto, result)
 	if err != nil {
 		return nil, err

internal/querynode/segment_test.go

@@ -22,8 +22,8 @@ import (
 
 	"github.com/milvus-io/milvus/internal/proto/commonpb"
 	"github.com/milvus-io/milvus/internal/proto/milvuspb"
-	"github.com/milvus-io/milvus/internal/proto/planpb"
 	"github.com/milvus-io/milvus/internal/proto/schemapb"
+	"github.com/milvus-io/milvus/internal/proto/segcorepb"
 )
 
 //-------------------------------------------------------------------------------------- constructor and destructor
@@ -145,7 +145,7 @@ func TestSegment_retrieve(t *testing.T) {
 	err = segment.segmentInsert(offset, &ids, &timestamps, &records)
 	assert.NoError(t, err)
 
-	reqIds := &planpb.RetrieveRequest{
+	reqIds := &segcorepb.RetrieveRequest{
 		Ids: &schemapb.IDs{
 			IdField: &schemapb.IDs_IntId{
 				IntId: &schemapb.LongArray{

scripts/proto_gen_go.sh

@@ -51,5 +51,6 @@ ${protoc} --go_out=plugins=grpc,paths=source_relative:./indexpb index_service.pr
 ${protoc} --go_out=plugins=grpc,paths=source_relative:./datapb data_service.proto
 ${protoc} --go_out=plugins=grpc,paths=source_relative:./querypb query_service.proto
 ${protoc} --go_out=plugins=grpc,paths=source_relative:./planpb plan.proto
+${protoc} --go_out=plugins=grpc,paths=source_relative:./segcorepb segcore.proto
 
 popd