mirror of https://github.com/milvus-io/milvus.git
Add topks in searchResult (#6168)
Signed-off-by: fishpenguin <kun.yu@zilliz.com>pull/6172/head v2.0.0-rc1
yukun
GitHub
parent
7df4bf8d93
commit
b87baa108a
|
|
@ -434,6 +434,7 @@ const ::PROTOBUF_NAMESPACE_ID::uint32 TableStruct_schema_2eproto::offsets[] PROT
|
|||
PROTOBUF_FIELD_OFFSET(::milvus::proto::schema::SearchResultData, fields_data_),
|
||||
PROTOBUF_FIELD_OFFSET(::milvus::proto::schema::SearchResultData, scores_),
|
||||
PROTOBUF_FIELD_OFFSET(::milvus::proto::schema::SearchResultData, ids_),
|
||||
PROTOBUF_FIELD_OFFSET(::milvus::proto::schema::SearchResultData, topks_),
|
||||
};
|
||||
static const ::PROTOBUF_NAMESPACE_ID::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
|
||||
{ 0, -1, sizeof(::milvus::proto::schema::FieldSchema)},
|
||||
|
|
@ -506,17 +507,17 @@ const char descriptor_table_protodef_schema_2eproto[] PROTOBUF_SECTION_VARIABLE(
|
|||
"to.schema.VectorFieldH\000B\007\n\005field\"w\n\003IDs\022"
|
||||
"0\n\006int_id\030\001 \001(\0132\036.milvus.proto.schema.Lo"
|
||||
"ngArrayH\000\0222\n\006str_id\030\002 \001(\0132 .milvus.proto"
|
||||
".schema.StringArrayH\000B\n\n\010id_field\"\242\001\n\020Se"
|
||||
".schema.StringArrayH\000B\n\n\010id_field\"\261\001\n\020Se"
|
||||
"archResultData\022\023\n\013num_queries\030\001 \001(\003\022\r\n\005t"
|
||||
"op_k\030\002 \001(\003\0223\n\013fields_data\030\003 \003(\0132\036.milvus"
|
||||
".proto.schema.FieldData\022\016\n\006scores\030\004 \003(\002\022"
|
||||
"%\n\003ids\030\005 \001(\0132\030.milvus.proto.schema.IDs*\217"
|
||||
"\001\n\010DataType\022\010\n\004None\020\000\022\010\n\004Bool\020\001\022\010\n\004Int8\020"
|
||||
"\002\022\t\n\005Int16\020\003\022\t\n\005Int32\020\004\022\t\n\005Int64\020\005\022\t\n\005Fl"
|
||||
"oat\020\n\022\n\n\006Double\020\013\022\n\n\006String\020\024\022\020\n\014BinaryV"
|
||||
"ector\020d\022\017\n\013FloatVector\020eB5Z3github.com/m"
|
||||
"ilvus-io/milvus/internal/proto/schemapbb"
|
||||
"\006proto3"
|
||||
"%\n\003ids\030\005 \001(\0132\030.milvus.proto.schema.IDs\022\r"
|
||||
"\n\005topks\030\006 \003(\003*\217\001\n\010DataType\022\010\n\004None\020\000\022\010\n\004"
|
||||
"Bool\020\001\022\010\n\004Int8\020\002\022\t\n\005Int16\020\003\022\t\n\005Int32\020\004\022\t"
|
||||
"\n\005Int64\020\005\022\t\n\005Float\020\n\022\n\n\006Double\020\013\022\n\n\006Stri"
|
||||
"ng\020\024\022\020\n\014BinaryVector\020d\022\017\n\013FloatVector\020eB"
|
||||
"5Z3github.com/milvus-io/milvus/internal/"
|
||||
"proto/schemapbb\006proto3"
|
||||
;
|
||||
static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_schema_2eproto_deps[1] = {
|
||||
&::descriptor_table_common_2eproto,
|
||||
|
|
@ -540,7 +541,7 @@ static ::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase*const descriptor_table_sch
|
|||
static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_schema_2eproto_once;
|
||||
static bool descriptor_table_schema_2eproto_initialized = false;
|
||||
const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_schema_2eproto = {
|
||||
&descriptor_table_schema_2eproto_initialized, descriptor_table_protodef_schema_2eproto, "schema.proto", 1847,
|
||||
&descriptor_table_schema_2eproto_initialized, descriptor_table_protodef_schema_2eproto, "schema.proto", 1862,
|
||||
&descriptor_table_schema_2eproto_once, descriptor_table_schema_2eproto_sccs, descriptor_table_schema_2eproto_deps, 14, 1,
|
||||
schemas, file_default_instances, TableStruct_schema_2eproto::offsets,
|
||||
file_level_metadata_schema_2eproto, 14, file_level_enum_descriptors_schema_2eproto, file_level_service_descriptors_schema_2eproto,
|
||||
|
|
@ -5549,7 +5550,8 @@ SearchResultData::SearchResultData(const SearchResultData& from)
|
|||
: ::PROTOBUF_NAMESPACE_ID::Message(),
|
||||
_internal_metadata_(nullptr),
|
||||
fields_data_(from.fields_data_),
|
||||
scores_(from.scores_) {
|
||||
scores_(from.scores_),
|
||||
topks_(from.topks_) {
|
||||
_internal_metadata_.MergeFrom(from._internal_metadata_);
|
||||
if (from.has_ids()) {
|
||||
ids_ = new ::milvus::proto::schema::IDs(*from.ids_);
|
||||
|
|
@ -5595,6 +5597,7 @@ void SearchResultData::Clear() {
|
|||
|
||||
fields_data_.Clear();
|
||||
scores_.Clear();
|
||||
topks_.Clear();
|
||||
if (GetArenaNoVirtual() == nullptr && ids_ != nullptr) {
|
||||
delete ids_;
|
||||
}
|
||||
|
|
@ -5656,6 +5659,16 @@ const char* SearchResultData::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPA
|
|||
CHK_(ptr);
|
||||
} else goto handle_unusual;
|
||||
continue;
|
||||
// repeated int64 topks = 6;
|
||||
case 6:
|
||||
if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 50)) {
|
||||
ptr = ::PROTOBUF_NAMESPACE_ID::internal::PackedInt64Parser(mutable_topks(), ptr, ctx);
|
||||
CHK_(ptr);
|
||||
} else if (static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 48) {
|
||||
add_topks(::PROTOBUF_NAMESPACE_ID::internal::ReadVarint(&ptr));
|
||||
CHK_(ptr);
|
||||
} else goto handle_unusual;
|
||||
continue;
|
||||
default: {
|
||||
handle_unusual:
|
||||
if ((tag & 7) == 4 || tag == 0) {
|
||||
|
|
@ -5750,6 +5763,22 @@ bool SearchResultData::MergePartialFromCodedStream(
|
|||
break;
|
||||
}
|
||||
|
||||
// repeated int64 topks = 6;
|
||||
case 6: {
|
||||
if (static_cast< ::PROTOBUF_NAMESPACE_ID::uint8>(tag) == (50 & 0xFF)) {
|
||||
DO_((::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::ReadPackedPrimitive<
|
||||
::PROTOBUF_NAMESPACE_ID::int64, ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_INT64>(
|
||||
input, this->mutable_topks())));
|
||||
} else if (static_cast< ::PROTOBUF_NAMESPACE_ID::uint8>(tag) == (48 & 0xFF)) {
|
||||
DO_((::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::ReadRepeatedPrimitiveNoInline<
|
||||
::PROTOBUF_NAMESPACE_ID::int64, ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_INT64>(
|
||||
1, 50u, input, this->mutable_topks())));
|
||||
} else {
|
||||
goto handle_unusual;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
default: {
|
||||
handle_unusual:
|
||||
if (tag == 0) {
|
||||
|
|
@ -5811,6 +5840,17 @@ void SearchResultData::SerializeWithCachedSizes(
|
|||
5, _Internal::ids(this), output);
|
||||
}
|
||||
|
||||
// repeated int64 topks = 6;
|
||||
if (this->topks_size() > 0) {
|
||||
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteTag(6, ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED, output);
|
||||
output->WriteVarint32(_topks_cached_byte_size_.load(
|
||||
std::memory_order_relaxed));
|
||||
}
|
||||
for (int i = 0, n = this->topks_size(); i < n; i++) {
|
||||
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64NoTag(
|
||||
this->topks(i), output);
|
||||
}
|
||||
|
||||
if (_internal_metadata_.have_unknown_fields()) {
|
||||
::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SerializeUnknownFields(
|
||||
_internal_metadata_.unknown_fields(), output);
|
||||
|
|
@ -5862,6 +5902,19 @@ void SearchResultData::SerializeWithCachedSizes(
|
|||
5, _Internal::ids(this), target);
|
||||
}
|
||||
|
||||
// repeated int64 topks = 6;
|
||||
if (this->topks_size() > 0) {
|
||||
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteTagToArray(
|
||||
6,
|
||||
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED,
|
||||
target);
|
||||
target = ::PROTOBUF_NAMESPACE_ID::io::CodedOutputStream::WriteVarint32ToArray(
|
||||
_topks_cached_byte_size_.load(std::memory_order_relaxed),
|
||||
target);
|
||||
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
|
||||
WriteInt64NoTagToArray(this->topks_, target);
|
||||
}
|
||||
|
||||
if (_internal_metadata_.have_unknown_fields()) {
|
||||
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SerializeUnknownFieldsToArray(
|
||||
_internal_metadata_.unknown_fields(), target);
|
||||
|
|
@ -5909,6 +5962,21 @@ size_t SearchResultData::ByteSizeLong() const {
|
|||
total_size += data_size;
|
||||
}
|
||||
|
||||
// repeated int64 topks = 6;
|
||||
{
|
||||
size_t data_size = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
|
||||
Int64Size(this->topks_);
|
||||
if (data_size > 0) {
|
||||
total_size += 1 +
|
||||
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int32Size(
|
||||
static_cast<::PROTOBUF_NAMESPACE_ID::int32>(data_size));
|
||||
}
|
||||
int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(data_size);
|
||||
_topks_cached_byte_size_.store(cached_size,
|
||||
std::memory_order_relaxed);
|
||||
total_size += data_size;
|
||||
}
|
||||
|
||||
// .milvus.proto.schema.IDs ids = 5;
|
||||
if (this->has_ids()) {
|
||||
total_size += 1 +
|
||||
|
|
@ -5959,6 +6027,7 @@ void SearchResultData::MergeFrom(const SearchResultData& from) {
|
|||
|
||||
fields_data_.MergeFrom(from.fields_data_);
|
||||
scores_.MergeFrom(from.scores_);
|
||||
topks_.MergeFrom(from.topks_);
|
||||
if (from.has_ids()) {
|
||||
mutable_ids()->::milvus::proto::schema::IDs::MergeFrom(from.ids());
|
||||
}
|
||||
|
|
@ -5993,6 +6062,7 @@ void SearchResultData::InternalSwap(SearchResultData* other) {
|
|||
_internal_metadata_.Swap(&other->_internal_metadata_);
|
||||
CastToBase(&fields_data_)->InternalSwap(CastToBase(&other->fields_data_));
|
||||
scores_.InternalSwap(&other->scores_);
|
||||
topks_.InternalSwap(&other->topks_);
|
||||
swap(ids_, other->ids_);
|
||||
swap(num_queries_, other->num_queries_);
|
||||
swap(top_k_, other->top_k_);
|
||||
|
|
|
|||
|
|
@ -2366,6 +2366,7 @@ class SearchResultData :
|
|||
enum : int {
|
||||
kFieldsDataFieldNumber = 3,
|
||||
kScoresFieldNumber = 4,
|
||||
kTopksFieldNumber = 6,
|
||||
kIdsFieldNumber = 5,
|
||||
kNumQueriesFieldNumber = 1,
|
||||
kTopKFieldNumber = 2,
|
||||
|
|
@ -2392,6 +2393,17 @@ class SearchResultData :
|
|||
::PROTOBUF_NAMESPACE_ID::RepeatedField< float >*
|
||||
mutable_scores();
|
||||
|
||||
// repeated int64 topks = 6;
|
||||
int topks_size() const;
|
||||
void clear_topks();
|
||||
::PROTOBUF_NAMESPACE_ID::int64 topks(int index) const;
|
||||
void set_topks(int index, ::PROTOBUF_NAMESPACE_ID::int64 value);
|
||||
void add_topks(::PROTOBUF_NAMESPACE_ID::int64 value);
|
||||
const ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::int64 >&
|
||||
topks() const;
|
||||
::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::int64 >*
|
||||
mutable_topks();
|
||||
|
||||
// .milvus.proto.schema.IDs ids = 5;
|
||||
bool has_ids() const;
|
||||
void clear_ids();
|
||||
|
|
@ -2418,6 +2430,8 @@ class SearchResultData :
|
|||
::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::milvus::proto::schema::FieldData > fields_data_;
|
||||
::PROTOBUF_NAMESPACE_ID::RepeatedField< float > scores_;
|
||||
mutable std::atomic<int> _scores_cached_byte_size_;
|
||||
::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::int64 > topks_;
|
||||
mutable std::atomic<int> _topks_cached_byte_size_;
|
||||
::milvus::proto::schema::IDs* ids_;
|
||||
::PROTOBUF_NAMESPACE_ID::int64 num_queries_;
|
||||
::PROTOBUF_NAMESPACE_ID::int64 top_k_;
|
||||
|
|
@ -3961,6 +3975,36 @@ inline void SearchResultData::set_allocated_ids(::milvus::proto::schema::IDs* id
|
|||
// @@protoc_insertion_point(field_set_allocated:milvus.proto.schema.SearchResultData.ids)
|
||||
}
|
||||
|
||||
// repeated int64 topks = 6;
|
||||
inline int SearchResultData::topks_size() const {
|
||||
return topks_.size();
|
||||
}
|
||||
inline void SearchResultData::clear_topks() {
|
||||
topks_.Clear();
|
||||
}
|
||||
inline ::PROTOBUF_NAMESPACE_ID::int64 SearchResultData::topks(int index) const {
|
||||
// @@protoc_insertion_point(field_get:milvus.proto.schema.SearchResultData.topks)
|
||||
return topks_.Get(index);
|
||||
}
|
||||
inline void SearchResultData::set_topks(int index, ::PROTOBUF_NAMESPACE_ID::int64 value) {
|
||||
topks_.Set(index, value);
|
||||
// @@protoc_insertion_point(field_set:milvus.proto.schema.SearchResultData.topks)
|
||||
}
|
||||
inline void SearchResultData::add_topks(::PROTOBUF_NAMESPACE_ID::int64 value) {
|
||||
topks_.Add(value);
|
||||
// @@protoc_insertion_point(field_add:milvus.proto.schema.SearchResultData.topks)
|
||||
}
|
||||
inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::int64 >&
|
||||
SearchResultData::topks() const {
|
||||
// @@protoc_insertion_point(field_list:milvus.proto.schema.SearchResultData.topks)
|
||||
return topks_;
|
||||
}
|
||||
inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::int64 >*
|
||||
SearchResultData::mutable_topks() {
|
||||
// @@protoc_insertion_point(field_mutable_list:milvus.proto.schema.SearchResultData.topks)
|
||||
return &topks_;
|
||||
}
|
||||
|
||||
#ifdef __GNUC__
|
||||
#pragma GCC diagnostic pop
|
||||
#endif // __GNUC__
|
||||
|
|
|
|||
|
|
@ -120,4 +120,5 @@ message SearchResultData {
|
|||
repeated FieldData fields_data = 3;
|
||||
repeated float scores = 4;
|
||||
IDs ids = 5;
|
||||
repeated int64 topks = 6;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -936,6 +936,7 @@ type SearchResultData struct {
|
|||
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"`
|
||||
XXX_NoUnkeyedLiteral struct{} `json:"-"`
|
||||
XXX_unrecognized []byte `json:"-"`
|
||||
XXX_sizecache int32 `json:"-"`
|
||||
|
|
@ -1001,6 +1002,13 @@ func (m *SearchResultData) GetIds() *IDs {
|
|||
return nil
|
||||
}
|
||||
|
||||
func (m *SearchResultData) GetTopks() []int64 {
|
||||
if m != nil {
|
||||
return m.Topks
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func init() {
|
||||
proto.RegisterEnum("milvus.proto.schema.DataType", DataType_name, DataType_value)
|
||||
proto.RegisterType((*FieldSchema)(nil), "milvus.proto.schema.FieldSchema")
|
||||
|
|
@ -1022,64 +1030,65 @@ func init() {
|
|||
func init() { proto.RegisterFile("schema.proto", fileDescriptor_1c5fb4d8cc22d66a) }
|
||||
|
||||
var fileDescriptor_1c5fb4d8cc22d66a = []byte{
|
||||
// 942 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0xdf, 0x8e, 0xdb, 0xc4,
|
||||
0x17, 0x8e, 0xe3, 0xc4, 0xb1, 0x8f, 0xf3, 0xeb, 0xcf, 0x9a, 0x22, 0x64, 0x21, 0xb5, 0xeb, 0x46,
|
||||
0x20, 0x45, 0x95, 0xd8, 0x55, 0x77, 0xa1, 0x94, 0x8a, 0x0a, 0x48, 0xa3, 0x55, 0xa2, 0x45, 0xd5,
|
||||
0xe2, 0x45, 0xbd, 0xe0, 0xc6, 0x9a, 0xc4, 0xd3, 0xdd, 0x51, 0xed, 0x19, 0xe3, 0x19, 0x57, 0xe4,
|
||||
0x01, 0xb8, 0xe6, 0x86, 0x2b, 0xde, 0x89, 0x47, 0xe0, 0x02, 0x9e, 0x04, 0xcd, 0x9f, 0x24, 0x86,
|
||||
0xb8, 0xab, 0xbd, 0x3b, 0x33, 0x3e, 0xdf, 0x37, 0x73, 0xbe, 0xf3, 0xcd, 0x31, 0x8c, 0xc5, 0xfa,
|
||||
0x86, 0x94, 0xf8, 0xb8, 0xaa, 0xb9, 0xe4, 0xe8, 0x7e, 0x49, 0x8b, 0x77, 0x8d, 0x30, 0xab, 0x63,
|
||||
0xf3, 0xe9, 0xa3, 0xf1, 0x9a, 0x97, 0x25, 0x67, 0x66, 0x73, 0xf2, 0x57, 0x1f, 0xc2, 0x73, 0x4a,
|
||||
0x8a, 0xfc, 0x4a, 0x7f, 0x45, 0x31, 0x8c, 0xde, 0xa8, 0xe5, 0x72, 0x1e, 0x3b, 0x89, 0x33, 0x75,
|
||||
0xd3, 0xed, 0x12, 0x21, 0x18, 0x30, 0x5c, 0x92, 0xb8, 0x9f, 0x38, 0xd3, 0x20, 0xd5, 0x31, 0xfa,
|
||||
0x18, 0xee, 0x51, 0x91, 0x55, 0x35, 0x2d, 0x71, 0xbd, 0xc9, 0xde, 0x92, 0x4d, 0xec, 0x26, 0xce,
|
||||
0xd4, 0x4f, 0xc7, 0x54, 0x5c, 0x9a, 0xcd, 0x0b, 0xb2, 0x41, 0x09, 0x84, 0x39, 0x11, 0xeb, 0x9a,
|
||||
0x56, 0x92, 0x72, 0x16, 0x0f, 0x34, 0x41, 0x7b, 0x0b, 0x3d, 0x87, 0x20, 0xc7, 0x12, 0x67, 0x72,
|
||||
0x53, 0x91, 0x78, 0x98, 0x38, 0xd3, 0x7b, 0xa7, 0x0f, 0x8e, 0x3b, 0x2e, 0x7f, 0x3c, 0xc7, 0x12,
|
||||
0xff, 0xb0, 0xa9, 0x48, 0xea, 0xe7, 0x36, 0x42, 0x33, 0x08, 0x15, 0x2c, 0xab, 0x70, 0x8d, 0x4b,
|
||||
0x11, 0x7b, 0x89, 0x3b, 0x0d, 0x4f, 0x1f, 0xfd, 0x1b, 0x6d, 0x4b, 0xbe, 0x20, 0x9b, 0xd7, 0xb8,
|
||||
0x68, 0xc8, 0x25, 0xa6, 0x75, 0x0a, 0x0a, 0x75, 0xa9, 0x41, 0x68, 0x0e, 0x63, 0xca, 0x72, 0xf2,
|
||||
0xf3, 0x96, 0x64, 0x74, 0x57, 0x92, 0x50, 0xc3, 0x2c, 0xcb, 0x87, 0xe0, 0xe1, 0x46, 0xf2, 0xe5,
|
||||
0x3c, 0xf6, 0xb5, 0x0a, 0x76, 0x35, 0xf9, 0xdd, 0x81, 0xe8, 0x25, 0x2f, 0x0a, 0xb2, 0x56, 0xc5,
|
||||
0x5a, 0xa1, 0xb7, 0x72, 0x3a, 0x2d, 0x39, 0xff, 0x23, 0x54, 0xff, 0x50, 0xa8, 0xfd, 0x11, 0x6e,
|
||||
0xfb, 0x08, 0xf4, 0x0c, 0x3c, 0xdd, 0x27, 0x11, 0x0f, 0xf4, 0xd5, 0x93, 0x4e, 0xf5, 0x5a, 0x8d,
|
||||
0x4e, 0x6d, 0xfe, 0xe4, 0x08, 0x82, 0x19, 0xe7, 0xc5, 0xb7, 0x75, 0x8d, 0x37, 0xea, 0x52, 0x4a,
|
||||
0xd7, 0xd8, 0x49, 0xdc, 0xa9, 0x9f, 0xea, 0x78, 0xf2, 0x10, 0xfc, 0x25, 0x93, 0x87, 0xdf, 0x87,
|
||||
0xf6, 0xfb, 0x11, 0x04, 0xdf, 0x71, 0x76, 0x7d, 0x98, 0xe0, 0xda, 0x84, 0x04, 0xe0, 0xbc, 0xe0,
|
||||
0xb8, 0x83, 0xa2, 0x6f, 0x33, 0x1e, 0x41, 0x38, 0xe7, 0xcd, 0xaa, 0x20, 0x87, 0x29, 0xce, 0x9e,
|
||||
0x64, 0xb6, 0x91, 0x44, 0x1c, 0x66, 0x8c, 0xf7, 0x24, 0x57, 0xb2, 0xa6, 0x5d, 0x37, 0x09, 0x6c,
|
||||
0xca, 0x9f, 0x2e, 0x84, 0x57, 0x6b, 0x5c, 0xe0, 0x5a, 0x2b, 0x81, 0x5e, 0x40, 0xb0, 0xe2, 0xbc,
|
||||
0xc8, 0x6c, 0xa2, 0x33, 0x0d, 0x4f, 0x1f, 0x76, 0x0a, 0xb7, 0x53, 0x68, 0xd1, 0x4b, 0x7d, 0x05,
|
||||
0x51, 0x3e, 0x44, 0xcf, 0xc1, 0xa7, 0x4c, 0x1a, 0x74, 0x5f, 0xa3, 0xbb, 0x4d, 0xbb, 0x95, 0x6f,
|
||||
0xd1, 0x4b, 0x47, 0x94, 0x49, 0x8d, 0x7d, 0x01, 0x41, 0xc1, 0xd9, 0xb5, 0x01, 0xbb, 0xb7, 0x1c,
|
||||
0xbd, 0xd3, 0x56, 0x1d, 0xad, 0x20, 0x1a, 0xfe, 0x0d, 0xc0, 0x1b, 0xa5, 0xa9, 0xc1, 0x0f, 0x34,
|
||||
0xfe, 0xa8, 0xbb, 0xe7, 0x3b, 0xe9, 0x17, 0xbd, 0x34, 0xd0, 0x20, 0xcd, 0xf0, 0x12, 0xc2, 0x5c,
|
||||
0x6b, 0x6e, 0x28, 0x86, 0x9a, 0xa2, 0xdb, 0x36, 0xad, 0xde, 0x2c, 0x7a, 0x29, 0x18, 0xd8, 0x96,
|
||||
0x44, 0x68, 0xcd, 0x0d, 0x89, 0x77, 0x0b, 0x49, 0xab, 0x37, 0x8a, 0xc4, 0xc0, 0xb6, 0xb5, 0xac,
|
||||
0x54, 0x6b, 0x0d, 0xc7, 0xe8, 0x96, 0x5a, 0xf6, 0x0e, 0x50, 0xb5, 0x68, 0x90, 0x62, 0x98, 0x79,
|
||||
0xa6, 0xd7, 0x93, 0xdf, 0x1c, 0x08, 0x5f, 0x93, 0xb5, 0xe4, 0xb6, 0xbf, 0x11, 0xb8, 0x39, 0x2d,
|
||||
0xed, 0x20, 0x53, 0xa1, 0x7a, 0xe8, 0x46, 0xb7, 0x77, 0x3a, 0xcd, 0xb6, 0xed, 0x0e, 0xca, 0x85,
|
||||
0x1a, 0x66, 0xc8, 0xd1, 0x27, 0xf0, 0xbf, 0x15, 0x65, 0x6a, 0xe4, 0x59, 0x1a, 0xd5, 0xc0, 0xf1,
|
||||
0xa2, 0x97, 0x8e, 0xcd, 0xb6, 0x49, 0xdb, 0x5d, 0xeb, 0x6f, 0x07, 0x02, 0x7d, 0x21, 0x5d, 0xee,
|
||||
0x13, 0x18, 0xe8, 0x31, 0xe7, 0xdc, 0x65, 0xcc, 0xe9, 0x54, 0xf4, 0x00, 0x40, 0xbf, 0xd6, 0xac,
|
||||
0x35, 0x80, 0x03, 0xbd, 0xf3, 0x4a, 0x8d, 0x8d, 0xaf, 0x60, 0x24, 0xb4, 0xab, 0x85, 0x75, 0xd2,
|
||||
0x7b, 0x3a, 0xb0, 0x77, 0xbe, 0x72, 0xa2, 0x85, 0x28, 0xb4, 0xa9, 0x42, 0x58, 0x1f, 0x75, 0xa3,
|
||||
0x5b, 0xba, 0x2a, 0xb4, 0x85, 0xcc, 0x46, 0x30, 0xd4, 0x17, 0x99, 0xfc, 0xe2, 0x80, 0xbb, 0x9c,
|
||||
0x0b, 0xf4, 0x05, 0x78, 0xea, 0x51, 0xd0, 0xfc, 0xd6, 0x07, 0xd5, 0x76, 0xf5, 0x90, 0x32, 0xb9,
|
||||
0xcc, 0xd1, 0x97, 0xe0, 0x09, 0x59, 0x2b, 0x60, 0xff, 0xce, 0x36, 0x1a, 0x0a, 0x59, 0x2f, 0xf3,
|
||||
0x19, 0x80, 0x4f, 0xf3, 0xcc, 0xdc, 0xe3, 0x0f, 0x07, 0xa2, 0x2b, 0x82, 0xeb, 0xf5, 0x4d, 0x4a,
|
||||
0x44, 0x53, 0x18, 0xb3, 0x1f, 0x41, 0xc8, 0x9a, 0x32, 0xfb, 0xa9, 0x21, 0x35, 0x25, 0xc2, 0x1a,
|
||||
0x02, 0x58, 0x53, 0x7e, 0x6f, 0x76, 0xd0, 0x7d, 0x18, 0x4a, 0x5e, 0x65, 0x6f, 0xf5, 0xd9, 0x6e,
|
||||
0x3a, 0x90, 0xbc, 0xba, 0x40, 0x5f, 0x43, 0x68, 0x86, 0xe4, 0xf6, 0x95, 0xba, 0xef, 0xad, 0x67,
|
||||
0xd7, 0xde, 0xd4, 0x74, 0x4a, 0xfb, 0x52, 0x4d, 0x6b, 0xb1, 0xe6, 0x35, 0x31, 0x53, 0xb9, 0x9f,
|
||||
0xda, 0x15, 0x7a, 0x0c, 0x2e, 0xcd, 0x85, 0x7d, 0x73, 0x71, 0xf7, 0xcc, 0x98, 0x8b, 0x54, 0x25,
|
||||
0x3d, 0xfe, 0xd5, 0x01, 0x7f, 0x6b, 0x07, 0xe4, 0xc3, 0xe0, 0x15, 0x67, 0x24, 0xea, 0xa9, 0x48,
|
||||
0x0d, 0xa5, 0xc8, 0x51, 0xd1, 0x92, 0xc9, 0x67, 0x51, 0x1f, 0x05, 0x30, 0x5c, 0x32, 0xf9, 0xe4,
|
||||
0x69, 0xe4, 0xda, 0xf0, 0xec, 0x34, 0x1a, 0xd8, 0xf0, 0xe9, 0x67, 0xd1, 0x50, 0x85, 0xda, 0xd4,
|
||||
0x11, 0x20, 0x00, 0xcf, 0x3c, 0xeb, 0x28, 0x54, 0xb1, 0x91, 0x35, 0xfa, 0x00, 0x45, 0x30, 0x9e,
|
||||
0xb5, 0x3c, 0x1c, 0xe5, 0xe8, 0xff, 0x10, 0x9e, 0xef, 0xbd, 0x1f, 0x91, 0xd9, 0xe7, 0x3f, 0x9e,
|
||||
0x5d, 0x53, 0x79, 0xd3, 0xac, 0xd4, 0x1f, 0xf1, 0xc4, 0x5c, 0xfe, 0x53, 0xca, 0x6d, 0x74, 0x42,
|
||||
0x99, 0x24, 0x35, 0xc3, 0xc5, 0x89, 0xae, 0xe7, 0xc4, 0xd4, 0x53, 0xad, 0x56, 0x9e, 0x5e, 0x9f,
|
||||
0xfd, 0x13, 0x00, 0x00, 0xff, 0xff, 0x6e, 0xe2, 0xe5, 0x04, 0xa3, 0x08, 0x00, 0x00,
|
||||
// 951 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0x5d, 0x8f, 0xdb, 0x44,
|
||||
0x14, 0x8d, 0xe3, 0x7c, 0xd8, 0xd7, 0xa1, 0x58, 0xd3, 0x0a, 0x59, 0x48, 0xed, 0xa6, 0x11, 0x48,
|
||||
0x51, 0x25, 0x76, 0xd5, 0x5d, 0x28, 0xa5, 0xa2, 0x02, 0xd2, 0x68, 0xb5, 0xd1, 0xa2, 0x6a, 0xf1,
|
||||
0xa2, 0x3e, 0xf0, 0x12, 0x4d, 0xe2, 0xe9, 0xee, 0x68, 0xed, 0x99, 0xe0, 0x19, 0x57, 0xe4, 0x07,
|
||||
0xf0, 0xcc, 0x0b, 0x4f, 0xfc, 0x37, 0x1e, 0x80, 0x3f, 0x82, 0xe6, 0xce, 0x24, 0x31, 0xc4, 0x5d,
|
||||
0xed, 0xdb, 0x9d, 0xf1, 0x3d, 0x67, 0xe6, 0x9e, 0x7b, 0xe6, 0x1a, 0x06, 0x6a, 0x79, 0xcd, 0x0a,
|
||||
0x7a, 0xb8, 0x2a, 0xa5, 0x96, 0xe4, 0x7e, 0xc1, 0xf3, 0x77, 0x95, 0xb2, 0xab, 0x43, 0xfb, 0xe9,
|
||||
0xe3, 0xc1, 0x52, 0x16, 0x85, 0x14, 0x76, 0x73, 0xf4, 0x57, 0x1b, 0xa2, 0x53, 0xce, 0xf2, 0xec,
|
||||
0x12, 0xbf, 0x92, 0x04, 0xfa, 0x6f, 0xcd, 0x72, 0x36, 0x4d, 0xbc, 0xa1, 0x37, 0xf6, 0xd3, 0xcd,
|
||||
0x92, 0x10, 0xe8, 0x08, 0x5a, 0xb0, 0xa4, 0x3d, 0xf4, 0xc6, 0x61, 0x8a, 0x31, 0xf9, 0x04, 0xee,
|
||||
0x71, 0x35, 0x5f, 0x95, 0xbc, 0xa0, 0xe5, 0x7a, 0x7e, 0xc3, 0xd6, 0x89, 0x3f, 0xf4, 0xc6, 0x41,
|
||||
0x3a, 0xe0, 0xea, 0xc2, 0x6e, 0x9e, 0xb3, 0x35, 0x19, 0x42, 0x94, 0x31, 0xb5, 0x2c, 0xf9, 0x4a,
|
||||
0x73, 0x29, 0x92, 0x0e, 0x12, 0xd4, 0xb7, 0xc8, 0x0b, 0x08, 0x33, 0xaa, 0xe9, 0x5c, 0xaf, 0x57,
|
||||
0x2c, 0xe9, 0x0e, 0xbd, 0xf1, 0xbd, 0xe3, 0x87, 0x87, 0x0d, 0x97, 0x3f, 0x9c, 0x52, 0x4d, 0x7f,
|
||||
0x5c, 0xaf, 0x58, 0x1a, 0x64, 0x2e, 0x22, 0x13, 0x88, 0x0c, 0x6c, 0xbe, 0xa2, 0x25, 0x2d, 0x54,
|
||||
0xd2, 0x1b, 0xfa, 0xe3, 0xe8, 0xf8, 0xf1, 0x7f, 0xd1, 0xae, 0xe4, 0x73, 0xb6, 0x7e, 0x43, 0xf3,
|
||||
0x8a, 0x5d, 0x50, 0x5e, 0xa6, 0x60, 0x50, 0x17, 0x08, 0x22, 0x53, 0x18, 0x70, 0x91, 0xb1, 0x5f,
|
||||
0x36, 0x24, 0xfd, 0xbb, 0x92, 0x44, 0x08, 0x73, 0x2c, 0x1f, 0x41, 0x8f, 0x56, 0x5a, 0xce, 0xa6,
|
||||
0x49, 0x80, 0x2a, 0xb8, 0xd5, 0xe8, 0x0f, 0x0f, 0xe2, 0x57, 0x32, 0xcf, 0xd9, 0xd2, 0x14, 0xeb,
|
||||
0x84, 0xde, 0xc8, 0xe9, 0xd5, 0xe4, 0xfc, 0x9f, 0x50, 0xed, 0x7d, 0xa1, 0x76, 0x47, 0xf8, 0xf5,
|
||||
0x23, 0xc8, 0x73, 0xe8, 0x61, 0x9f, 0x54, 0xd2, 0xc1, 0xab, 0x0f, 0x1b, 0xd5, 0xab, 0x35, 0x3a,
|
||||
0x75, 0xf9, 0xa3, 0x03, 0x08, 0x27, 0x52, 0xe6, 0xdf, 0x95, 0x25, 0x5d, 0x9b, 0x4b, 0x19, 0x5d,
|
||||
0x13, 0x6f, 0xe8, 0x8f, 0x83, 0x14, 0xe3, 0xd1, 0x23, 0x08, 0x66, 0x42, 0xef, 0x7f, 0xef, 0xba,
|
||||
0xef, 0x07, 0x10, 0x7e, 0x2f, 0xc5, 0xd5, 0x7e, 0x82, 0xef, 0x12, 0x86, 0x00, 0xa7, 0xb9, 0xa4,
|
||||
0x0d, 0x14, 0x6d, 0x97, 0xf1, 0x18, 0xa2, 0xa9, 0xac, 0x16, 0x39, 0xdb, 0x4f, 0xf1, 0x76, 0x24,
|
||||
0x93, 0xb5, 0x66, 0x6a, 0x3f, 0x63, 0xb0, 0x23, 0xb9, 0xd4, 0x25, 0x6f, 0xba, 0x49, 0xe8, 0x52,
|
||||
0xfe, 0xf4, 0x21, 0xba, 0x5c, 0xd2, 0x9c, 0x96, 0xa8, 0x04, 0x79, 0x09, 0xe1, 0x42, 0xca, 0x7c,
|
||||
0xee, 0x12, 0xbd, 0x71, 0x74, 0xfc, 0xa8, 0x51, 0xb8, 0xad, 0x42, 0x67, 0xad, 0x34, 0x30, 0x10,
|
||||
0xe3, 0x43, 0xf2, 0x02, 0x02, 0x2e, 0xb4, 0x45, 0xb7, 0x11, 0xdd, 0x6c, 0xda, 0x8d, 0x7c, 0x67,
|
||||
0xad, 0xb4, 0xcf, 0x85, 0x46, 0xec, 0x4b, 0x08, 0x73, 0x29, 0xae, 0x2c, 0xd8, 0xbf, 0xe5, 0xe8,
|
||||
0xad, 0xb6, 0xe6, 0x68, 0x03, 0x41, 0xf8, 0xb7, 0x00, 0x6f, 0x8d, 0xa6, 0x16, 0xdf, 0x41, 0xfc,
|
||||
0x41, 0x73, 0xcf, 0xb7, 0xd2, 0x9f, 0xb5, 0xd2, 0x10, 0x41, 0xc8, 0xf0, 0x0a, 0xa2, 0x0c, 0x35,
|
||||
0xb7, 0x14, 0x5d, 0xa4, 0x68, 0xb6, 0x4d, 0xad, 0x37, 0x67, 0xad, 0x14, 0x2c, 0x6c, 0x43, 0xa2,
|
||||
0x50, 0x73, 0x4b, 0xd2, 0xbb, 0x85, 0xa4, 0xd6, 0x1b, 0x43, 0x62, 0x61, 0x9b, 0x5a, 0x16, 0xa6,
|
||||
0xb5, 0x96, 0xa3, 0x7f, 0x4b, 0x2d, 0x3b, 0x07, 0x98, 0x5a, 0x10, 0x64, 0x18, 0x26, 0x3d, 0xdb,
|
||||
0xeb, 0xd1, 0xef, 0x1e, 0x44, 0x6f, 0xd8, 0x52, 0x4b, 0xd7, 0xdf, 0x18, 0xfc, 0x8c, 0x17, 0x6e,
|
||||
0x90, 0x99, 0xd0, 0x3c, 0x74, 0xab, 0xdb, 0x3b, 0x4c, 0x73, 0x6d, 0xbb, 0x83, 0x72, 0x11, 0xc2,
|
||||
0x2c, 0x39, 0xf9, 0x14, 0x3e, 0x58, 0x70, 0x61, 0x46, 0x9e, 0xa3, 0x31, 0x0d, 0x1c, 0x9c, 0xb5,
|
||||
0xd2, 0x81, 0xdd, 0xb6, 0x69, 0xdb, 0x6b, 0xfd, 0xed, 0x41, 0x88, 0x17, 0xc2, 0x72, 0x9f, 0x42,
|
||||
0x07, 0xc7, 0x9c, 0x77, 0x97, 0x31, 0x87, 0xa9, 0xe4, 0x21, 0x00, 0xbe, 0xd6, 0x79, 0x6d, 0x00,
|
||||
0x87, 0xb8, 0xf3, 0xda, 0x8c, 0x8d, 0xaf, 0xa1, 0xaf, 0xd0, 0xd5, 0xca, 0x39, 0xe9, 0x3d, 0x1d,
|
||||
0xd8, 0x39, 0xdf, 0x38, 0xd1, 0x41, 0x0c, 0xda, 0x56, 0xa1, 0x9c, 0x8f, 0x9a, 0xd1, 0x35, 0x5d,
|
||||
0x0d, 0xda, 0x41, 0x26, 0x7d, 0xe8, 0xe2, 0x45, 0x46, 0xbf, 0x7a, 0xe0, 0xcf, 0xa6, 0x8a, 0x7c,
|
||||
0x09, 0x3d, 0xf3, 0x28, 0x78, 0x76, 0xeb, 0x83, 0xaa, 0xbb, 0xba, 0xcb, 0x85, 0x9e, 0x65, 0xe4,
|
||||
0x2b, 0xe8, 0x29, 0x5d, 0x1a, 0x60, 0xfb, 0xce, 0x36, 0xea, 0x2a, 0x5d, 0xce, 0xb2, 0x09, 0x40,
|
||||
0xc0, 0xb3, 0xb9, 0xbd, 0xc7, 0x3f, 0x1e, 0xc4, 0x97, 0x8c, 0x96, 0xcb, 0xeb, 0x94, 0xa9, 0x2a,
|
||||
0xb7, 0x66, 0x3f, 0x80, 0x48, 0x54, 0xc5, 0xfc, 0xe7, 0x8a, 0x95, 0x9c, 0x29, 0x67, 0x08, 0x10,
|
||||
0x55, 0xf1, 0x83, 0xdd, 0x21, 0xf7, 0xa1, 0xab, 0xe5, 0x6a, 0x7e, 0x83, 0x67, 0xfb, 0x69, 0x47,
|
||||
0xcb, 0xd5, 0x39, 0xf9, 0x06, 0x22, 0x3b, 0x24, 0x37, 0xaf, 0xd4, 0x7f, 0x6f, 0x3d, 0xdb, 0xf6,
|
||||
0xa6, 0xb6, 0x53, 0xe8, 0x4b, 0x33, 0xad, 0xd5, 0x52, 0x96, 0xcc, 0x4e, 0xe5, 0x76, 0xea, 0x56,
|
||||
0xe4, 0x09, 0xf8, 0x3c, 0x53, 0xee, 0xcd, 0x25, 0xcd, 0x33, 0x63, 0xaa, 0x52, 0x93, 0x44, 0x1e,
|
||||
0xe0, 0xcd, 0x6e, 0xec, 0x8f, 0xcd, 0x4f, 0xed, 0xe2, 0xc9, 0x6f, 0x1e, 0x04, 0x1b, 0x93, 0x90,
|
||||
0x00, 0x3a, 0xaf, 0xa5, 0x60, 0x71, 0xcb, 0x44, 0x66, 0x54, 0xc5, 0x9e, 0x89, 0x66, 0x42, 0x3f,
|
||||
0x8f, 0xdb, 0x24, 0x84, 0xee, 0x4c, 0xe8, 0xa7, 0xcf, 0x62, 0xdf, 0x85, 0x27, 0xc7, 0x71, 0xc7,
|
||||
0x85, 0xcf, 0x3e, 0x8f, 0xbb, 0x26, 0x44, 0xab, 0xc7, 0x40, 0x00, 0x7a, 0xf6, 0xb1, 0xc7, 0x91,
|
||||
0x89, 0xad, 0xd8, 0xf1, 0x03, 0x12, 0xc3, 0x60, 0x52, 0x73, 0x76, 0x9c, 0x91, 0x0f, 0x21, 0x3a,
|
||||
0xdd, 0xbd, 0x88, 0x98, 0x4d, 0xbe, 0xf8, 0xe9, 0xe4, 0x8a, 0xeb, 0xeb, 0x6a, 0x61, 0xfe, 0x93,
|
||||
0x47, 0xb6, 0xa4, 0xcf, 0xb8, 0x74, 0xd1, 0x11, 0x17, 0x9a, 0x95, 0x82, 0xe6, 0x47, 0x58, 0xe5,
|
||||
0x91, 0xad, 0x72, 0xb5, 0x58, 0xf4, 0x70, 0x7d, 0xf2, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xca,
|
||||
0x27, 0x8a, 0x41, 0xb9, 0x08, 0x00, 0x00,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1587,6 +1587,7 @@ func reduceSearchResultDataParallel(searchResultData []*schemapb.SearchResultDat
|
|||
},
|
||||
},
|
||||
},
|
||||
Topks: make([]int64, 0),
|
||||
},
|
||||
}
|
||||
|
||||
|
|
@ -1736,6 +1737,7 @@ func reduceSearchResultDataParallel(searchResultData []*schemapb.SearchResultDat
|
|||
// return nil, errors.New("the length (topk) between all result of query is different")
|
||||
}
|
||||
realTopK = j
|
||||
ret.Results.Topks = append(ret.Results.Topks, int64(realTopK))
|
||||
}
|
||||
|
||||
ret.Results.TopK = int64(realTopK)
|
||||
|
|
|
|||
Loading…
Reference in New Issue