Skip to content

M
milvus

milvus / milvus
11 个月 前同步成功

通知 261
Star 22476
Fork 2472
M
milvus

体验新版 GitCode，发现更多精彩内容 >>

提交 0b9cffaf 编写于 作者: S sunby 提交者： yefu.chen
浏览文件
操作

Remove index_name in IndexRequest and remove indexType in FieldIndexMeta 

Signed-off-by: Nsunby <bingyi.sun@zilliz.com>
上级 11316525
展开全部 隐藏空白更改
内联 并排
Showing with 728 addition and 878 deletion
internal/core/src/pb/etcd_meta.pb.cc
浏览文件 @ 0b9cffaf
......@@ -198,7 +198,6 @@ const ::PROTOBUF_NAMESPACE_ID::uint32 TableStruct_etcd_5fmeta_2eproto::offsets[]
~0u, // no _weak_field_map_
PROTOBUF_FIELD_OFFSET(::milvus::proto::etcd::FieldIndexMeta, segmentid_),
PROTOBUF_FIELD_OFFSET(::milvus::proto::etcd::FieldIndexMeta, fieldid_),
PROTOBUF_FIELD_OFFSET(::milvus::proto::etcd::FieldIndexMeta, index_type_),
PROTOBUF_FIELD_OFFSET(::milvus::proto::etcd::FieldIndexMeta, indexid_),
PROTOBUF_FIELD_OFFSET(::milvus::proto::etcd::FieldIndexMeta, index_params_),
PROTOBUF_FIELD_OFFSET(::milvus::proto::etcd::FieldIndexMeta, status_),
......@@ -242,14 +241,13 @@ const char descriptor_table_protodef_etcd_5fmeta_2eproto[] PROTOBUF_SECTION_VARI
"\022\022\n\nclose_time\030\007 \001(\004\022\020\n\010num_rows\030\010 \001(\003\022\020"
"\n\010mem_size\030\t \001(\003\022>\n\021binlog_file_paths\030\n "
"\003(\0132#.milvus.proto.etcd.FieldBinlogFiles"
"\"\337\001\n\016FieldIndexMeta\022\021\n\tsegmentID\030\001 \001(\003\022\017"
"\n\007fieldID\030\002 \001(\003\022\022\n\nindex_type\030\003 \001(\t\022\017\n\007i"
"ndexID\030\004 \001(\003\0227\n\014index_params\030\005 \003(\0132!.mil"
"vus.proto.common.KeyValuePair\0221\n\006status\030"
"\006 \001(\0162!.milvus.proto.service.IndexStatus"
"\022\030\n\020index_file_paths\030\007 \003(\tB@Z>github.com"
"/zilliztech/milvus-distributed/internal/"
"proto/etcdpbb\006proto3"
"\"\313\001\n\016FieldIndexMeta\022\021\n\tsegmentID\030\001 \001(\003\022\017"
"\n\007fieldID\030\002 \001(\003\022\017\n\007indexID\030\003 \001(\003\0227\n\014inde"
"x_params\030\004 \003(\0132!.milvus.proto.common.Key"
"ValuePair\0221\n\006status\030\005 \001(\0162!.milvus.proto"
".service.IndexStatus\022\030\n\020index_file_paths"
"\030\006 \003(\tB@Z>github.com/zilliztech/milvus-d"
"istributed/internal/proto/etcdpbb\006proto3"
;
static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_etcd_5fmeta_2eproto_deps[3] = {
&::descriptor_table_common_2eproto,
......@@ -267,7 +265,7 @@ static ::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase*const descriptor_table_etc
static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_etcd_5fmeta_2eproto_once;
static bool descriptor_table_etcd_5fmeta_2eproto_initialized = false;
const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_etcd_5fmeta_2eproto = {
&descriptor_table_etcd_5fmeta_2eproto_initialized, descriptor_table_protodef_etcd_5fmeta_2eproto, "etcd_meta.proto", 1060,
&descriptor_table_etcd_5fmeta_2eproto_initialized, descriptor_table_protodef_etcd_5fmeta_2eproto, "etcd_meta.proto", 1040,
&descriptor_table_etcd_5fmeta_2eproto_once, descriptor_table_etcd_5fmeta_2eproto_sccs, descriptor_table_etcd_5fmeta_2eproto_deps, 6, 3,
schemas, file_default_instances, TableStruct_etcd_5fmeta_2eproto::offsets,
file_level_metadata_etcd_5fmeta_2eproto, 6, file_level_enum_descriptors_etcd_5fmeta_2eproto, file_level_service_descriptors_etcd_5fmeta_2eproto,
......@@ -2560,10 +2558,6 @@ FieldIndexMeta::FieldIndexMeta(const FieldIndexMeta& from)
index_params_(from.index_params_),
index_file_paths_(from.index_file_paths_) {
_internal_metadata_.MergeFrom(from._internal_metadata_);
index_type_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
if (!from.index_type().empty()) {
index_type_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.index_type_);
}
::memcpy(&segmentid_, &from.segmentid_,
static_cast<size_t>(reinterpret_cast<char*>(&status_) -
reinterpret_cast<char*>(&segmentid_)) + sizeof(status_));
......@@ -2572,7 +2566,6 @@ FieldIndexMeta::FieldIndexMeta(const FieldIndexMeta& from)
void FieldIndexMeta::SharedCtor() {
::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&scc_info_FieldIndexMeta_etcd_5fmeta_2eproto.base);
index_type_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
::memset(&segmentid_, 0, static_cast<size_t>(
reinterpret_cast<char*>(&status_) -
reinterpret_cast<char*>(&segmentid_)) + sizeof(status_));
......@@ -2584,7 +2577,6 @@ FieldIndexMeta::~FieldIndexMeta() {
}
void FieldIndexMeta::SharedDtor() {
index_type_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
}
void FieldIndexMeta::SetCachedSize(int size) const {
......@@ -2604,7 +2596,6 @@ void FieldIndexMeta::Clear() {
index_params_.Clear();
index_file_paths_.Clear();
index_type_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
::memset(&segmentid_, 0, static_cast<size_t>(
reinterpret_cast<char*>(&status_) -
reinterpret_cast<char*>(&segmentid_)) + sizeof(status_));
......@@ -2633,50 +2624,43 @@ const char* FieldIndexMeta::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE
CHK_(ptr);
} else goto handle_unusual;
continue;
// string index_type = 3;
// int64 indexID = 3;
case 3:
if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 26)) {
ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(mutable_index_type(), ptr, ctx, "milvus.proto.etcd.FieldIndexMeta.index_type");
CHK_(ptr);
} else goto handle_unusual;
continue;
// int64 indexID = 4;
case 4:
if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 32)) {
if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 24)) {
indexid_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint(&ptr);
CHK_(ptr);
} else goto handle_unusual;
continue;
// repeated .milvus.proto.common.KeyValuePair index_params = 5;
case 5:
if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 42)) {
// repeated .milvus.proto.common.KeyValuePair index_params = 4;
case 4:
if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 34)) {
ptr -= 1;
do {
ptr += 1;
ptr = ctx->ParseMessage(add_index_params(), ptr);
CHK_(ptr);
if (!ctx->DataAvailable(ptr)) break;
} while (::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad<::PROTOBUF_NAMESPACE_ID::uint8>(ptr) == 42);
} while (::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad<::PROTOBUF_NAMESPACE_ID::uint8>(ptr) == 34);
} else goto handle_unusual;
continue;
// .milvus.proto.service.IndexStatus status = 6;
case 6:
if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 48)) {
// .milvus.proto.service.IndexStatus status = 5;
case 5:
if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 40)) {
::PROTOBUF_NAMESPACE_ID::uint64 val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint(&ptr);
CHK_(ptr);
set_status(static_cast<::milvus::proto::service::IndexStatus>(val));
} else goto handle_unusual;
continue;
// repeated string index_file_paths = 7;
case 7:
if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 58)) {
// repeated string index_file_paths = 6;
case 6:
if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 50)) {
ptr -= 1;
do {
ptr += 1;
ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(add_index_file_paths(), ptr, ctx, "milvus.proto.etcd.FieldIndexMeta.index_file_paths");
CHK_(ptr);
if (!ctx->DataAvailable(ptr)) break;
} while (::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad<::PROTOBUF_NAMESPACE_ID::uint8>(ptr) == 58);
} while (::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad<::PROTOBUF_NAMESPACE_ID::uint8>(ptr) == 50);
} else goto handle_unusual;
continue;
default: {
......@@ -2735,24 +2719,9 @@ bool FieldIndexMeta::MergePartialFromCodedStream(
break;
}
// string index_type = 3;
// int64 indexID = 3;
case 3: {
if (static_cast< ::PROTOBUF_NAMESPACE_ID::uint8>(tag) == (26 & 0xFF)) {
DO_(::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::ReadString(
input, this->mutable_index_type()));
DO_(::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
this->index_type().data(), static_cast<int>(this->index_type().length()),
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::PARSE,
"milvus.proto.etcd.FieldIndexMeta.index_type"));
} else {
goto handle_unusual;
}
break;
}
// int64 indexID = 4;
case 4: {
if (static_cast< ::PROTOBUF_NAMESPACE_ID::uint8>(tag) == (32 & 0xFF)) {
if (static_cast< ::PROTOBUF_NAMESPACE_ID::uint8>(tag) == (24 & 0xFF)) {
DO_((::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::ReadPrimitive<
::PROTOBUF_NAMESPACE_ID::int64, ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_INT64>(
......@@ -2763,9 +2732,9 @@ bool FieldIndexMeta::MergePartialFromCodedStream(
break;
}
// repeated .milvus.proto.common.KeyValuePair index_params = 5;
case 5: {
if (static_cast< ::PROTOBUF_NAMESPACE_ID::uint8>(tag) == (42 & 0xFF)) {
// repeated .milvus.proto.common.KeyValuePair index_params = 4;
case 4: {
if (static_cast< ::PROTOBUF_NAMESPACE_ID::uint8>(tag) == (34 & 0xFF)) {
DO_(::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::ReadMessage(
input, add_index_params()));
} else {
......@@ -2774,9 +2743,9 @@ bool FieldIndexMeta::MergePartialFromCodedStream(
break;
}
// .milvus.proto.service.IndexStatus status = 6;
case 6: {
if (static_cast< ::PROTOBUF_NAMESPACE_ID::uint8>(tag) == (48 & 0xFF)) {
// .milvus.proto.service.IndexStatus status = 5;
case 5: {
if (static_cast< ::PROTOBUF_NAMESPACE_ID::uint8>(tag) == (40 & 0xFF)) {
int value = 0;
DO_((::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::ReadPrimitive<
int, ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_ENUM>(
......@@ -2788,9 +2757,9 @@ bool FieldIndexMeta::MergePartialFromCodedStream(
break;
}
// repeated string index_file_paths = 7;
case 7: {
if (static_cast< ::PROTOBUF_NAMESPACE_ID::uint8>(tag) == (58 & 0xFF)) {
// repeated string index_file_paths = 6;
case 6: {
if (static_cast< ::PROTOBUF_NAMESPACE_ID::uint8>(tag) == (50 & 0xFF)) {
DO_(::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::ReadString(
input, this->add_index_file_paths()));
DO_(::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
......@@ -2841,44 +2810,34 @@ void FieldIndexMeta::SerializeWithCachedSizes(
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64(2, this->fieldid(), output);
}
// string index_type = 3;
if (this->index_type().size() > 0) {
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
this->index_type().data(), static_cast<int>(this->index_type().length()),
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
"milvus.proto.etcd.FieldIndexMeta.index_type");
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteStringMaybeAliased(
3, this->index_type(), output);
}
// int64 indexID = 4;
// int64 indexID = 3;
if (this->indexid() != 0) {
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64(4, this->indexid(), output);
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64(3, this->indexid(), output);
}
// repeated .milvus.proto.common.KeyValuePair index_params = 5;
// repeated .milvus.proto.common.KeyValuePair index_params = 4;
for (unsigned int i = 0,
n = static_cast<unsigned int>(this->index_params_size()); i < n; i++) {
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteMessageMaybeToArray(
5,
4,
this->index_params(static_cast<int>(i)),
output);
}
// .milvus.proto.service.IndexStatus status = 6;
// .milvus.proto.service.IndexStatus status = 5;
if (this->status() != 0) {
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteEnum(
6, this->status(), output);
5, this->status(), output);
}
// repeated string index_file_paths = 7;
// repeated string index_file_paths = 6;
for (int i = 0, n = this->index_file_paths_size(); i < n; i++) {
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
this->index_file_paths(i).data(), static_cast<int>(this->index_file_paths(i).length()),
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
"milvus.proto.etcd.FieldIndexMeta.index_file_paths");
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteString(
7, this->index_file_paths(i), output);
6, this->index_file_paths(i), output);
}
if (_internal_metadata_.have_unknown_fields()) {
......@@ -2904,44 +2863,33 @@ void FieldIndexMeta::SerializeWithCachedSizes(
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(2, this->fieldid(), target);
}
// string index_type = 3;
if (this->index_type().size() > 0) {
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
this->index_type().data(), static_cast<int>(this->index_type().length()),
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
"milvus.proto.etcd.FieldIndexMeta.index_type");
target =
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteStringToArray(
3, this->index_type(), target);
}
// int64 indexID = 4;
// int64 indexID = 3;
if (this->indexid() != 0) {
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(4, this->indexid(), target);
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(3, this->indexid(), target);
}
// repeated .milvus.proto.common.KeyValuePair index_params = 5;
// repeated .milvus.proto.common.KeyValuePair index_params = 4;
for (unsigned int i = 0,
n = static_cast<unsigned int>(this->index_params_size()); i < n; i++) {
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
InternalWriteMessageToArray(
5, this->index_params(static_cast<int>(i)), target);
4, this->index_params(static_cast<int>(i)), target);
}
// .milvus.proto.service.IndexStatus status = 6;
// .milvus.proto.service.IndexStatus status = 5;
if (this->status() != 0) {
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteEnumToArray(
6, this->status(), target);
5, this->status(), target);
}
// repeated string index_file_paths = 7;
// repeated string index_file_paths = 6;
for (int i = 0, n = this->index_file_paths_size(); i < n; i++) {
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
this->index_file_paths(i).data(), static_cast<int>(this->index_file_paths(i).length()),
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
"milvus.proto.etcd.FieldIndexMeta.index_file_paths");
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
WriteStringToArray(7, this->index_file_paths(i), target);
WriteStringToArray(6, this->index_file_paths(i), target);
}
if (_internal_metadata_.have_unknown_fields()) {
......@@ -2965,7 +2913,7 @@ size_t FieldIndexMeta::ByteSizeLong() const {
// Prevent compiler warnings about cached_has_bits being unused
(void) cached_has_bits;
// repeated .milvus.proto.common.KeyValuePair index_params = 5;
// repeated .milvus.proto.common.KeyValuePair index_params = 4;
{
unsigned int count = static_cast<unsigned int>(this->index_params_size());
total_size += 1UL * count;
......@@ -2976,7 +2924,7 @@ size_t FieldIndexMeta::ByteSizeLong() const {
}
}
// repeated string index_file_paths = 7;
// repeated string index_file_paths = 6;
total_size += 1 *
::PROTOBUF_NAMESPACE_ID::internal::FromIntSize(this->index_file_paths_size());
for (int i = 0, n = this->index_file_paths_size(); i < n; i++) {
......@@ -2984,13 +2932,6 @@ size_t FieldIndexMeta::ByteSizeLong() const {
this->index_file_paths(i));
}
// string index_type = 3;
if (this->index_type().size() > 0) {
total_size += 1 +
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
this->index_type());
}
// int64 segmentID = 1;
if (this->segmentid() != 0) {
total_size += 1 +
......@@ -3005,14 +2946,14 @@ size_t FieldIndexMeta::ByteSizeLong() const {
this->fieldid());
}
// int64 indexID = 4;
// int64 indexID = 3;
if (this->indexid() != 0) {
total_size += 1 +
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64Size(
this->indexid());
}
// .milvus.proto.service.IndexStatus status = 6;
// .milvus.proto.service.IndexStatus status = 5;
if (this->status() != 0) {
total_size += 1 +
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::EnumSize(this->status());
......@@ -3047,10 +2988,6 @@ void FieldIndexMeta::MergeFrom(const FieldIndexMeta& from) {
index_params_.MergeFrom(from.index_params_);
index_file_paths_.MergeFrom(from.index_file_paths_);
if (from.index_type().size() > 0) {
index_type_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.index_type_);
}
if (from.segmentid() != 0) {
set_segmentid(from.segmentid());
}
......@@ -3088,8 +3025,6 @@ void FieldIndexMeta::InternalSwap(FieldIndexMeta* other) {
_internal_metadata_.Swap(&other->_internal_metadata_);
CastToBase(&index_params_)->InternalSwap(CastToBase(&other->index_params_));
index_file_paths_.InternalSwap(CastToBase(&other->index_file_paths_));
index_type_.Swap(&other->index_type_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
GetArenaNoVirtual());
swap(segmentid_, other->segmentid_);
swap(fieldid_, other->fieldid_);
swap(indexid_, other->indexid_);
......
internal/core/src/pb/etcd_meta.pb.h
浏览文件 @ 0b9cffaf
......@@ -1075,15 +1075,14 @@ class FieldIndexMeta :
// accessors -------------------------------------------------------
enum : int {
kIndexParamsFieldNumber = 5,
kIndexFilePathsFieldNumber = 7,
kIndexTypeFieldNumber = 3,
kIndexParamsFieldNumber = 4,
kIndexFilePathsFieldNumber = 6,
kSegmentIDFieldNumber = 1,
kFieldIDFieldNumber = 2,
kIndexIDFieldNumber = 4,
kStatusFieldNumber = 6,
kIndexIDFieldNumber = 3,
kStatusFieldNumber = 5,
};
// repeated .milvus.proto.common.KeyValuePair index_params = 5;
// repeated .milvus.proto.common.KeyValuePair index_params = 4;
int index_params_size() const;
void clear_index_params();
::milvus::proto::common::KeyValuePair* mutable_index_params(int index);
......@@ -1094,7 +1093,7 @@ class FieldIndexMeta :
const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::milvus::proto::common::KeyValuePair >&
index_params() const;
// repeated string index_file_paths = 7;
// repeated string index_file_paths = 6;
int index_file_paths_size() const;
void clear_index_file_paths();
const std::string& index_file_paths(int index) const;
......@@ -1111,17 +1110,6 @@ class FieldIndexMeta :
const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>& index_file_paths() const;
::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>* mutable_index_file_paths();
// string index_type = 3;
void clear_index_type();
const std::string& index_type() const;
void set_index_type(const std::string& value);
void set_index_type(std::string&& value);
void set_index_type(const char* value);
void set_index_type(const char* value, size_t size);
std::string* mutable_index_type();
std::string* release_index_type();
void set_allocated_index_type(std::string* index_type);
// int64 segmentID = 1;
void clear_segmentid();
::PROTOBUF_NAMESPACE_ID::int64 segmentid() const;
......@@ -1132,12 +1120,12 @@ class FieldIndexMeta :
::PROTOBUF_NAMESPACE_ID::int64 fieldid() const;
void set_fieldid(::PROTOBUF_NAMESPACE_ID::int64 value);
// int64 indexID = 4;
// int64 indexID = 3;
void clear_indexid();
::PROTOBUF_NAMESPACE_ID::int64 indexid() const;
void set_indexid(::PROTOBUF_NAMESPACE_ID::int64 value);
// .milvus.proto.service.IndexStatus status = 6;
// .milvus.proto.service.IndexStatus status = 5;
void clear_status();
::milvus::proto::service::IndexStatus status() const;
void set_status(::milvus::proto::service::IndexStatus value);
......@@ -1149,7 +1137,6 @@ class FieldIndexMeta :
::PROTOBUF_NAMESPACE_ID::internal::InternalMetadataWithArena _internal_metadata_;
::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::milvus::proto::common::KeyValuePair > index_params_;
::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string> index_file_paths_;
::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr index_type_;
::PROTOBUF_NAMESPACE_ID::int64 segmentid_;
::PROTOBUF_NAMESPACE_ID::int64 fieldid_;
::PROTOBUF_NAMESPACE_ID::int64 indexid_;
......@@ -1924,58 +1911,7 @@ inline void FieldIndexMeta::set_fieldid(::PROTOBUF_NAMESPACE_ID::int64 value) {
// @@protoc_insertion_point(field_set:milvus.proto.etcd.FieldIndexMeta.fieldID)
}
// string index_type = 3;
inline void FieldIndexMeta::clear_index_type() {
index_type_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
}
inline const std::string& FieldIndexMeta::index_type() const {
// @@protoc_insertion_point(field_get:milvus.proto.etcd.FieldIndexMeta.index_type)
return index_type_.GetNoArena();
}
inline void FieldIndexMeta::set_index_type(const std::string& value) {
index_type_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value);
// @@protoc_insertion_point(field_set:milvus.proto.etcd.FieldIndexMeta.index_type)
}
inline void FieldIndexMeta::set_index_type(std::string&& value) {
index_type_.SetNoArena(
&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
// @@protoc_insertion_point(field_set_rvalue:milvus.proto.etcd.FieldIndexMeta.index_type)
}
inline void FieldIndexMeta::set_index_type(const char* value) {
GOOGLE_DCHECK(value != nullptr);
index_type_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
// @@protoc_insertion_point(field_set_char:milvus.proto.etcd.FieldIndexMeta.index_type)
}
inline void FieldIndexMeta::set_index_type(const char* value, size_t size) {
index_type_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
::std::string(reinterpret_cast<const char*>(value), size));
// @@protoc_insertion_point(field_set_pointer:milvus.proto.etcd.FieldIndexMeta.index_type)
}
inline std::string* FieldIndexMeta::mutable_index_type() {
// @@protoc_insertion_point(field_mutable:milvus.proto.etcd.FieldIndexMeta.index_type)
return index_type_.MutableNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
}
inline std::string* FieldIndexMeta::release_index_type() {
// @@protoc_insertion_point(field_release:milvus.proto.etcd.FieldIndexMeta.index_type)
return index_type_.ReleaseNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
}
inline void FieldIndexMeta::set_allocated_index_type(std::string* index_type) {
if (index_type != nullptr) {
} else {
}
index_type_.SetAllocatedNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), index_type);
// @@protoc_insertion_point(field_set_allocated:milvus.proto.etcd.FieldIndexMeta.index_type)
}
// int64 indexID = 4;
// int64 indexID = 3;
inline void FieldIndexMeta::clear_indexid() {
indexid_ = PROTOBUF_LONGLONG(0);
}
......@@ -1989,7 +1925,7 @@ inline void FieldIndexMeta::set_indexid(::PROTOBUF_NAMESPACE_ID::int64 value) {
// @@protoc_insertion_point(field_set:milvus.proto.etcd.FieldIndexMeta.indexID)
}
// repeated .milvus.proto.common.KeyValuePair index_params = 5;
// repeated .milvus.proto.common.KeyValuePair index_params = 4;
inline int FieldIndexMeta::index_params_size() const {
return index_params_.size();
}
......@@ -2016,7 +1952,7 @@ FieldIndexMeta::index_params() const {
return index_params_;
}
// .milvus.proto.service.IndexStatus status = 6;
// .milvus.proto.service.IndexStatus status = 5;
inline void FieldIndexMeta::clear_status() {
status_ = 0;
}
......@@ -2030,7 +1966,7 @@ inline void FieldIndexMeta::set_status(::milvus::proto::service::IndexStatus val
// @@protoc_insertion_point(field_set:milvus.proto.etcd.FieldIndexMeta.status)
}
// repeated string index_file_paths = 7;
// repeated string index_file_paths = 6;
inline int FieldIndexMeta::index_file_paths_size() const {
return index_file_paths_.size();
}
......
internal/core/src/pb/service_msg.pb.cc
浏览文件 @ 0b9cffaf
......@@ -501,7 +501,6 @@ const ::PROTOBUF_NAMESPACE_ID::uint32 TableStruct_service_5fmsg_2eproto::offsets
~0u, // no _weak_field_map_
PROTOBUF_FIELD_OFFSET(::milvus::proto::service::IndexParam, collection_name_),
PROTOBUF_FIELD_OFFSET(::milvus::proto::service::IndexParam, field_name_),
PROTOBUF_FIELD_OFFSET(::milvus::proto::service::IndexParam, index_name_),
PROTOBUF_FIELD_OFFSET(::milvus::proto::service::IndexParam, extra_params_),
~0u, // no _has_bits_
PROTOBUF_FIELD_OFFSET(::milvus::proto::service::DescribeIndexResponse, _internal_metadata_),
......@@ -532,7 +531,7 @@ static const ::PROTOBUF_NAMESPACE_ID::internal::MigrationSchema schemas[] PROTOB
{ 105, -1, sizeof(::milvus::proto::service::Hits)},
{ 113, -1, sizeof(::milvus::proto::service::QueryResult)},
{ 120, -1, sizeof(::milvus::proto::service::IndexParam)},
{ 129, -1, sizeof(::milvus::proto::service::DescribeIndexResponse)},
{ 128, -1, sizeof(::milvus::proto::service::DescribeIndexResponse)},
};
static ::PROTOBUF_NAMESPACE_ID::Message const * const file_default_instances[] = {
......@@ -596,19 +595,18 @@ const char descriptor_table_protodef_service_5fmsg_2eproto[] PROTOBUF_SECTION_VA
" \003(\t\"5\n\004Hits\022\013\n\003IDs\030\001 \003(\003\022\020\n\010row_data\030\002 "
"\003(\014\022\016\n\006scores\030\003 \003(\002\"H\n\013QueryResult\022+\n\006st"
"atus\030\001 \001(\0132\033.milvus.proto.common.Status\022"
"\014\n\004hits\030\002 \003(\014\"\206\001\n\nIndexParam\022\027\n\017collecti"
"on_name\030\002 \001(\t\022\022\n\nfield_name\030\003 \001(\t\022\022\n\nind"
"ex_name\030\004 \001(\t\0227\n\014extra_params\030\005 \003(\0132!.mi"
"lvus.proto.common.KeyValuePair\"\276\001\n\025Descr"
"ibeIndexResponse\022+\n\006status\030\001 \001(\0132\033.milvu"
"s.proto.common.Status\022\027\n\017collection_name"
"\030\002 \001(\t\022\022\n\nfield_name\030\003 \001(\t\022\022\n\nindex_name"
"\030\004 \001(\t\0227\n\014extra_params\030\005 \003(\0132!.milvus.pr"
"oto.common.KeyValuePair*@\n\017PlaceholderTy"
"pe\022\010\n\004NONE\020\000\022\021\n\rVECTOR_BINARY\020d\022\020\n\014VECTO"
"R_FLOAT\020eBCZAgithub.com/zilliztech/milvu"
"s-distributed/internal/proto/servicepbb\006"
"proto3"
"\014\n\004hits\030\002 \003(\014\"r\n\nIndexParam\022\027\n\017collectio"
"n_name\030\001 \001(\t\022\022\n\nfield_name\030\002 \001(\t\0227\n\014extr"
"a_params\030\003 \003(\0132!.milvus.proto.common.Key"
"ValuePair\"\276\001\n\025DescribeIndexResponse\022+\n\006s"
"tatus\030\001 \001(\0132\033.milvus.proto.common.Status"
"\022\027\n\017collection_name\030\002 \001(\t\022\022\n\nfield_name\030"
"\003 \001(\t\022\022\n\nindex_name\030\004 \001(\t\0227\n\014extra_param"
"s\030\005 \003(\0132!.milvus.proto.common.KeyValuePa"
"ir*@\n\017PlaceholderType\022\010\n\004NONE\020\000\022\021\n\rVECTO"
"R_BINARY\020d\022\020\n\014VECTOR_FLOAT\020eBCZAgithub.c"
"om/zilliztech/milvus-distributed/interna"
"l/proto/servicepbb\006proto3"
;
static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_service_5fmsg_2eproto_deps[2] = {
&::descriptor_table_common_2eproto,
......@@ -637,7 +635,7 @@ static ::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase*const descriptor_table_ser
static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_service_5fmsg_2eproto_once;
static bool descriptor_table_service_5fmsg_2eproto_initialized = false;
const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_service_5fmsg_2eproto = {
&descriptor_table_service_5fmsg_2eproto_initialized, descriptor_table_protodef_service_5fmsg_2eproto, "service_msg.proto", 2046,
&descriptor_table_service_5fmsg_2eproto_initialized, descriptor_table_protodef_service_5fmsg_2eproto, "service_msg.proto", 2025,
&descriptor_table_service_5fmsg_2eproto_once, descriptor_table_service_5fmsg_2eproto_sccs, descriptor_table_service_5fmsg_2eproto_deps, 18, 2,
schemas, file_default_instances, TableStruct_service_5fmsg_2eproto::offsets,
file_level_metadata_service_5fmsg_2eproto, 18, file_level_enum_descriptors_service_5fmsg_2eproto, file_level_service_descriptors_service_5fmsg_2eproto,
......@@ -6393,10 +6391,6 @@ IndexParam::IndexParam(const IndexParam& from)
if (!from.field_name().empty()) {
field_name_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.field_name_);
}
index_name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
if (!from.index_name().empty()) {
index_name_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.index_name_);
}
// @@protoc_insertion_point(copy_constructor:milvus.proto.service.IndexParam)
}
......@@ -6404,7 +6398,6 @@ void IndexParam::SharedCtor() {
::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&scc_info_IndexParam_service_5fmsg_2eproto.base);
collection_name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
field_name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
index_name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
}
IndexParam::~IndexParam() {
......@@ -6415,7 +6408,6 @@ IndexParam::~IndexParam() {
void IndexParam::SharedDtor() {
collection_name_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
field_name_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
index_name_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
}
void IndexParam::SetCachedSize(int size) const {
......@@ -6436,7 +6428,6 @@ void IndexParam::Clear() {
extra_params_.Clear();
collection_name_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
field_name_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
index_name_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
_internal_metadata_.Clear();
}
......@@ -6448,37 +6439,30 @@ const char* IndexParam::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID:
ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
CHK_(ptr);
switch (tag >> 3) {
// string collection_name = 2;
case 2:
if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 18)) {
// string collection_name = 1;
case 1:
if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 10)) {
ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(mutable_collection_name(), ptr, ctx, "milvus.proto.service.IndexParam.collection_name");
CHK_(ptr);
} else goto handle_unusual;
continue;
// string field_name = 3;
case 3:
if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 26)) {
// string field_name = 2;
case 2:
if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 18)) {
ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(mutable_field_name(), ptr, ctx, "milvus.proto.service.IndexParam.field_name");
CHK_(ptr);
} else goto handle_unusual;
continue;
// string index_name = 4;
case 4:
if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 34)) {
ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(mutable_index_name(), ptr, ctx, "milvus.proto.service.IndexParam.index_name");
CHK_(ptr);
} else goto handle_unusual;
continue;
// repeated .milvus.proto.common.KeyValuePair extra_params = 5;
case 5:
if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 42)) {
// repeated .milvus.proto.common.KeyValuePair extra_params = 3;
case 3:
if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 26)) {
ptr -= 1;
do {
ptr += 1;
ptr = ctx->ParseMessage(add_extra_params(), ptr);
CHK_(ptr);
if (!ctx->DataAvailable(ptr)) break;
} while (::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad<::PROTOBUF_NAMESPACE_ID::uint8>(ptr) == 42);
} while (::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad<::PROTOBUF_NAMESPACE_ID::uint8>(ptr) == 26);
} else goto handle_unusual;
continue;
default: {
......@@ -6511,9 +6495,9 @@ bool IndexParam::MergePartialFromCodedStream(
tag = p.first;
if (!p.second) goto handle_unusual;
switch (::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::GetTagFieldNumber(tag)) {
// string collection_name = 2;
case 2: {
if (static_cast< ::PROTOBUF_NAMESPACE_ID::uint8>(tag) == (18 & 0xFF)) {
// string collection_name = 1;
case 1: {
if (static_cast< ::PROTOBUF_NAMESPACE_ID::uint8>(tag) == (10 & 0xFF)) {
DO_(::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::ReadString(
input, this->mutable_collection_name()));
DO_(::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
......@@ -6526,9 +6510,9 @@ bool IndexParam::MergePartialFromCodedStream(
break;
}
// string field_name = 3;
case 3: {
if (static_cast< ::PROTOBUF_NAMESPACE_ID::uint8>(tag) == (26 & 0xFF)) {
// string field_name = 2;
case 2: {
if (static_cast< ::PROTOBUF_NAMESPACE_ID::uint8>(tag) == (18 & 0xFF)) {
DO_(::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::ReadString(
input, this->mutable_field_name()));
DO_(::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
......@@ -6541,24 +6525,9 @@ bool IndexParam::MergePartialFromCodedStream(
break;
}
// string index_name = 4;
case 4: {
if (static_cast< ::PROTOBUF_NAMESPACE_ID::uint8>(tag) == (34 & 0xFF)) {
DO_(::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::ReadString(
input, this->mutable_index_name()));
DO_(::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
this->index_name().data(), static_cast<int>(this->index_name().length()),
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::PARSE,
"milvus.proto.service.IndexParam.index_name"));
} else {
goto handle_unusual;
}
break;
}
// repeated .milvus.proto.common.KeyValuePair extra_params = 5;
case 5: {
if (static_cast< ::PROTOBUF_NAMESPACE_ID::uint8>(tag) == (42 & 0xFF)) {
// repeated .milvus.proto.common.KeyValuePair extra_params = 3;
case 3: {
if (static_cast< ::PROTOBUF_NAMESPACE_ID::uint8>(tag) == (26 & 0xFF)) {
DO_(::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::ReadMessage(
input, add_extra_params()));
} else {
......@@ -6594,41 +6563,31 @@ void IndexParam::SerializeWithCachedSizes(
::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0;
(void) cached_has_bits;
// string collection_name = 2;
// string collection_name = 1;
if (this->collection_name().size() > 0) {
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
this->collection_name().data(), static_cast<int>(this->collection_name().length()),
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
"milvus.proto.service.IndexParam.collection_name");
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteStringMaybeAliased(
2, this->collection_name(), output);
1, this->collection_name(), output);
}
// string field_name = 3;
// string field_name = 2;
if (this->field_name().size() > 0) {
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
this->field_name().data(), static_cast<int>(this->field_name().length()),
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
"milvus.proto.service.IndexParam.field_name");
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteStringMaybeAliased(
3, this->field_name(), output);
2, this->field_name(), output);
}
// string index_name = 4;
if (this->index_name().size() > 0) {
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
this->index_name().data(), static_cast<int>(this->index_name().length()),
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
"milvus.proto.service.IndexParam.index_name");
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteStringMaybeAliased(
4, this->index_name(), output);
}
// repeated .milvus.proto.common.KeyValuePair extra_params = 5;
// repeated .milvus.proto.common.KeyValuePair extra_params = 3;
for (unsigned int i = 0,
n = static_cast<unsigned int>(this->extra_params_size()); i < n; i++) {
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteMessageMaybeToArray(
5,
3,
this->extra_params(static_cast<int>(i)),
output);
}
......@@ -6646,7 +6605,7 @@ void IndexParam::SerializeWithCachedSizes(
::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0;
(void) cached_has_bits;
// string collection_name = 2;
// string collection_name = 1;
if (this->collection_name().size() > 0) {
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
this->collection_name().data(), static_cast<int>(this->collection_name().length()),
......@@ -6654,10 +6613,10 @@ void IndexParam::SerializeWithCachedSizes(
"milvus.proto.service.IndexParam.collection_name");
target =
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteStringToArray(
2, this->collection_name(), target);
1, this->collection_name(), target);
}
// string field_name = 3;
// string field_name = 2;
if (this->field_name().size() > 0) {
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
this->field_name().data(), static_cast<int>(this->field_name().length()),
......@@ -6665,26 +6624,15 @@ void IndexParam::SerializeWithCachedSizes(
"milvus.proto.service.IndexParam.field_name");
target =
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteStringToArray(
3, this->field_name(), target);
2, this->field_name(), target);
}
// string index_name = 4;
if (this->index_name().size() > 0) {
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
this->index_name().data(), static_cast<int>(this->index_name().length()),
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
"milvus.proto.service.IndexParam.index_name");
target =
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteStringToArray(
4, this->index_name(), target);
}
// repeated .milvus.proto.common.KeyValuePair extra_params = 5;
// repeated .milvus.proto.common.KeyValuePair extra_params = 3;
for (unsigned int i = 0,
n = static_cast<unsigned int>(this->extra_params_size()); i < n; i++) {
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
InternalWriteMessageToArray(
5, this->extra_params(static_cast<int>(i)), target);
3, this->extra_params(static_cast<int>(i)), target);
}
if (_internal_metadata_.have_unknown_fields()) {
......@@ -6708,7 +6656,7 @@ size_t IndexParam::ByteSizeLong() const {
// Prevent compiler warnings about cached_has_bits being unused
(void) cached_has_bits;
// repeated .milvus.proto.common.KeyValuePair extra_params = 5;
// repeated .milvus.proto.common.KeyValuePair extra_params = 3;
{
unsigned int count = static_cast<unsigned int>(this->extra_params_size());
total_size += 1UL * count;
......@@ -6719,27 +6667,20 @@ size_t IndexParam::ByteSizeLong() const {
}
}
// string collection_name = 2;
// string collection_name = 1;
if (this->collection_name().size() > 0) {
total_size += 1 +
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
this->collection_name());
}
// string field_name = 3;
// string field_name = 2;
if (this->field_name().size() > 0) {
total_size += 1 +
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
this->field_name());
}
// string index_name = 4;
if (this->index_name().size() > 0) {
total_size += 1 +
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
this->index_name());
}
int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(total_size);
SetCachedSize(cached_size);
return total_size;
......@@ -6776,10 +6717,6 @@ void IndexParam::MergeFrom(const IndexParam& from) {
field_name_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.field_name_);
}
if (from.index_name().size() > 0) {
index_name_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.index_name_);
}
}
void IndexParam::CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) {
......@@ -6808,8 +6745,6 @@ void IndexParam::InternalSwap(IndexParam* other) {
GetArenaNoVirtual());
field_name_.Swap(&other->field_name_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
GetArenaNoVirtual());
index_name_.Swap(&other->index_name_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
GetArenaNoVirtual());
}
::PROTOBUF_NAMESPACE_ID::Metadata IndexParam::GetMetadata() const {
......
internal/core/src/pb/service_msg.pb.h
浏览文件 @ 0b9cffaf
......@@ -2775,12 +2775,11 @@ class IndexParam :
// accessors -------------------------------------------------------
enum : int {
kExtraParamsFieldNumber = 5,
kCollectionNameFieldNumber = 2,
kFieldNameFieldNumber = 3,
kIndexNameFieldNumber = 4,
kExtraParamsFieldNumber = 3,
kCollectionNameFieldNumber = 1,
kFieldNameFieldNumber = 2,
};
// repeated .milvus.proto.common.KeyValuePair extra_params = 5;
// repeated .milvus.proto.common.KeyValuePair extra_params = 3;
int extra_params_size() const;
void clear_extra_params();
::milvus::proto::common::KeyValuePair* mutable_extra_params(int index);
......@@ -2791,7 +2790,7 @@ class IndexParam :
const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::milvus::proto::common::KeyValuePair >&
extra_params() const;
// string collection_name = 2;
// string collection_name = 1;
void clear_collection_name();
const std::string& collection_name() const;
void set_collection_name(const std::string& value);
......@@ -2802,7 +2801,7 @@ class IndexParam :
std::string* release_collection_name();
void set_allocated_collection_name(std::string* collection_name);
// string field_name = 3;
// string field_name = 2;
void clear_field_name();
const std::string& field_name() const;
void set_field_name(const std::string& value);
......@@ -2813,17 +2812,6 @@ class IndexParam :
std::string* release_field_name();
void set_allocated_field_name(std::string* field_name);
// string index_name = 4;
void clear_index_name();
const std::string& index_name() const;
void set_index_name(const std::string& value);
void set_index_name(std::string&& value);
void set_index_name(const char* value);
void set_index_name(const char* value, size_t size);
std::string* mutable_index_name();
std::string* release_index_name();
void set_allocated_index_name(std::string* index_name);
// @@protoc_insertion_point(class_scope:milvus.proto.service.IndexParam)
private:
class _Internal;
......@@ -2832,7 +2820,6 @@ class IndexParam :
::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::milvus::proto::common::KeyValuePair > extra_params_;
::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr collection_name_;
::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr field_name_;
::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr index_name_;
mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
friend struct ::TableStruct_service_5fmsg_2eproto;
};
......@@ -4850,7 +4837,7 @@ QueryResult::mutable_hits() {
// IndexParam
// string collection_name = 2;
// string collection_name = 1;
inline void IndexParam::clear_collection_name() {
collection_name_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
}
......@@ -4901,7 +4888,7 @@ inline void IndexParam::set_allocated_collection_name(std::string* collection_na
// @@protoc_insertion_point(field_set_allocated:milvus.proto.service.IndexParam.collection_name)
}
// string field_name = 3;
// string field_name = 2;
inline void IndexParam::clear_field_name() {
field_name_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
}
......@@ -4952,58 +4939,7 @@ inline void IndexParam::set_allocated_field_name(std::string* field_name) {
// @@protoc_insertion_point(field_set_allocated:milvus.proto.service.IndexParam.field_name)
}
// string index_name = 4;
inline void IndexParam::clear_index_name() {
index_name_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
}
inline const std::string& IndexParam::index_name() const {
// @@protoc_insertion_point(field_get:milvus.proto.service.IndexParam.index_name)
return index_name_.GetNoArena();
}
inline void IndexParam::set_index_name(const std::string& value) {
index_name_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value);
// @@protoc_insertion_point(field_set:milvus.proto.service.IndexParam.index_name)
}
inline void IndexParam::set_index_name(std::string&& value) {
index_name_.SetNoArena(
&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
// @@protoc_insertion_point(field_set_rvalue:milvus.proto.service.IndexParam.index_name)
}
inline void IndexParam::set_index_name(const char* value) {
GOOGLE_DCHECK(value != nullptr);
index_name_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
// @@protoc_insertion_point(field_set_char:milvus.proto.service.IndexParam.index_name)
}
inline void IndexParam::set_index_name(const char* value, size_t size) {
index_name_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
::std::string(reinterpret_cast<const char*>(value), size));
// @@protoc_insertion_point(field_set_pointer:milvus.proto.service.IndexParam.index_name)
}
inline std::string* IndexParam::mutable_index_name() {
// @@protoc_insertion_point(field_mutable:milvus.proto.service.IndexParam.index_name)
return index_name_.MutableNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
}
inline std::string* IndexParam::release_index_name() {
// @@protoc_insertion_point(field_release:milvus.proto.service.IndexParam.index_name)
return index_name_.ReleaseNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
}
inline void IndexParam::set_allocated_index_name(std::string* index_name) {
if (index_name != nullptr) {
} else {
}
index_name_.SetAllocatedNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), index_name);
// @@protoc_insertion_point(field_set_allocated:milvus.proto.service.IndexParam.index_name)
}
// repeated .milvus.proto.common.KeyValuePair extra_params = 5;
// repeated .milvus.proto.common.KeyValuePair extra_params = 3;
inline int IndexParam::extra_params_size() const {
return extra_params_.size();
}
......
internal/master/meta_table.go
浏览文件 @ 0b9cffaf
......@@ -505,7 +505,7 @@ func (mt *metaTable) AddFieldIndexMeta(meta *pb.FieldIndexMeta) error {
mt.segID2IndexMetas[segID] = make([]pb.FieldIndexMeta, 0)
}
for _, v := range mt.segID2IndexMetas[segID] {
if v.FieldID == meta.FieldID && v.IndexType == meta.IndexType && typeutil.CompareIndexParams(v.IndexParams, meta.IndexParams) {
if v.FieldID == meta.FieldID && typeutil.CompareIndexParams(v.IndexParams, meta.IndexParams) {
return fmt.Errorf("segment %d field id %d's index meta already exist", segID, meta.FieldID)
}
}
......@@ -533,7 +533,7 @@ func (mt *metaTable) DeleteFieldIndexMeta(segID UniqueID, fieldID UniqueID, inde
}
for i, v := range mt.segID2IndexMetas[segID] {
if v.FieldID == fieldID && v.IndexType == indexType && typeutil.CompareIndexParams(v.IndexParams, indexParams) {
if v.FieldID == fieldID && typeutil.CompareIndexParams(v.IndexParams, indexParams) {
mt.segID2IndexMetas[segID] = append(mt.segID2IndexMetas[segID][:i], mt.segID2IndexMetas[segID][i+1:]...)
err := mt.deleteFieldIndexMetaToEtcd(segID, fieldID, v.IndexID)
if err != nil {
......@@ -552,7 +552,7 @@ func (mt *metaTable) deleteFieldIndexMetaToEtcd(segID UniqueID, fieldID UniqueID
return mt.client.Remove(key)
}
func (mt *metaTable) HasFieldIndexMeta(segID UniqueID, fieldID UniqueID, indexType string, indexParams []*commonpb.KeyValuePair) (bool, error) {
func (mt *metaTable) HasFieldIndexMeta(segID UniqueID, fieldID UniqueID, indexParams []*commonpb.KeyValuePair) (bool, error) {
mt.indexLock.RLock()
defer mt.indexLock.RUnlock()
......@@ -561,7 +561,7 @@ func (mt *metaTable) HasFieldIndexMeta(segID UniqueID, fieldID UniqueID, indexTy
}
for _, v := range mt.segID2IndexMetas[segID] {
if v.FieldID == fieldID && v.IndexType == indexType && typeutil.CompareIndexParams(v.IndexParams, indexParams) {
if v.FieldID == fieldID && typeutil.CompareIndexParams(v.IndexParams, indexParams) {
return true, nil
}
}
......@@ -577,7 +577,7 @@ func (mt *metaTable) UpdateFieldIndexMeta(meta *pb.FieldIndexMeta) error {
mt.segID2IndexMetas[segID] = make([]pb.FieldIndexMeta, 0)
}
for i, v := range mt.segID2IndexMetas[segID] {
if v.FieldID == meta.FieldID && v.IndexType == meta.IndexType && typeutil.CompareIndexParams(v.IndexParams, meta.IndexParams) {
if v.FieldID == meta.FieldID && typeutil.CompareIndexParams(v.IndexParams, meta.IndexParams) {
mt.segID2IndexMetas[segID][i] = *meta
err := mt.deleteFieldIndexMetaToEtcd(segID, v.FieldID, v.IndexID)
if err != nil {
......
internal/master/meta_table_test.go
浏览文件 @ 0b9cffaf
......@@ -431,7 +431,6 @@ func TestMetaTable_LoadIndexMetaFromKv(t *testing.T) {
meta := pb.FieldIndexMeta{
SegmentID: 1,
FieldID: 100,
IndexType: "type1",
IndexID: 1000,
IndexParams: []*commonpb.KeyValuePair{{Key: "k1", Value: "v1"}},
Status: indexbuilderpb.IndexStatus_FINISHED,
......@@ -443,7 +442,7 @@ func TestMetaTable_LoadIndexMetaFromKv(t *testing.T) {
metaTable, err := NewMetaTable(kv)
assert.Nil(t, err)
res, err := metaTable.HasFieldIndexMeta(1, 100, "type1", []*commonpb.KeyValuePair{{Key: "k1", Value: "v1"}})
res, err := metaTable.HasFieldIndexMeta(1, 100, []*commonpb.KeyValuePair{{Key: "k1", Value: "v1"}})
assert.Nil(t, err)
assert.True(t, res)
}
......@@ -465,7 +464,6 @@ func TestMetaTable_IndexMeta(t *testing.T) {
err = meta.AddFieldIndexMeta(&pb.FieldIndexMeta{
SegmentID: 1,
FieldID: 100,
IndexType: "type1",
IndexID: 1000,
IndexParams: []*commonpb.KeyValuePair{{Key: "k1", Value: "v1"}},
Status: indexbuilderpb.IndexStatus_INPROGRESS,
......@@ -475,7 +473,6 @@ func TestMetaTable_IndexMeta(t *testing.T) {
err = meta.AddFieldIndexMeta(&pb.FieldIndexMeta{
SegmentID: 1,
FieldID: 100,
IndexType: "type1",
IndexID: 1000,
IndexParams: []*commonpb.KeyValuePair{{Key: "k1", Value: "v1"}},
Status: indexbuilderpb.IndexStatus_INPROGRESS,
......@@ -483,17 +480,16 @@ func TestMetaTable_IndexMeta(t *testing.T) {
})
assert.NotNil(t, err)
res, err := meta.HasFieldIndexMeta(1, 100, "type1", []*commonpb.KeyValuePair{{Key: "k1", Value: "v1"}})
res, err := meta.HasFieldIndexMeta(1, 100, []*commonpb.KeyValuePair{{Key: "k1", Value: "v1"}})
assert.Nil(t, err)
assert.True(t, res)
res, err = meta.HasFieldIndexMeta(1, 100, "type2", []*commonpb.KeyValuePair{{Key: "k1", Value: "v1"}})
res, err = meta.HasFieldIndexMeta(1, 100, []*commonpb.KeyValuePair{{Key: "k1", Value: "v2"}})
assert.Nil(t, err)
assert.False(t, res)
err = meta.UpdateFieldIndexMeta(&pb.FieldIndexMeta{
SegmentID: 1,
FieldID: 100,
IndexType: "type1",
IndexID: 1000,
IndexParams: []*commonpb.KeyValuePair{{Key: "k1", Value: "v1"}},
Status: indexbuilderpb.IndexStatus_FINISHED,
......@@ -503,7 +499,7 @@ func TestMetaTable_IndexMeta(t *testing.T) {
assert.EqualValues(t, indexbuilderpb.IndexStatus_FINISHED, meta.segID2IndexMetas[1][0].Status)
err = meta.DeleteFieldIndexMeta(1, 100, "type1", []*commonpb.KeyValuePair{{Key: "k1", Value: "v1"}})
assert.Nil(t, err)
res, err = meta.HasFieldIndexMeta(1, 100, "type1", []*commonpb.KeyValuePair{{Key: "k1", Value: "v1"}})
res, err = meta.HasFieldIndexMeta(1, 100, []*commonpb.KeyValuePair{{Key: "k1", Value: "v1"}})
assert.Nil(t, err)
assert.False(t, res)
}
internal/proto/etcd_meta.proto
浏览文件 @ 0b9cffaf
......@@ -50,9 +50,8 @@ message SegmentMeta {
message FieldIndexMeta {
int64 segmentID = 1;
int64 fieldID = 2;
string index_type = 3;
int64 indexID = 4;
repeated common.KeyValuePair index_params = 5;
service.IndexStatus status = 6;
repeated string index_file_paths = 7;
int64 indexID = 3;
repeated common.KeyValuePair index_params = 4;
service.IndexStatus status = 5;
repeated string index_file_paths = 6;
}
\ No newline at end of file
internal/proto/etcdpb/etcd_meta.pb.go
浏览文件 @ 0b9cffaf
......@@ -373,11 +373,10 @@ func (m *SegmentMeta) GetBinlogFilePaths() []*FieldBinlogFiles {
type FieldIndexMeta struct {
SegmentID int64 `protobuf:"varint,1,opt,name=segmentID,proto3" json:"segmentID,omitempty"`
FieldID int64 `protobuf:"varint,2,opt,name=fieldID,proto3" json:"fieldID,omitempty"`
IndexType string `protobuf:"bytes,3,opt,name=index_type,json=indexType,proto3" json:"index_type,omitempty"`
IndexID int64 `protobuf:"varint,4,opt,name=indexID,proto3" json:"indexID,omitempty"`
IndexParams []*commonpb.KeyValuePair `protobuf:"bytes,5,rep,name=index_params,json=indexParams,proto3" json:"index_params,omitempty"`
Status indexbuilderpb.IndexStatus `protobuf:"varint,6,opt,name=status,proto3,enum=milvus.proto.service.IndexStatus" json:"status,omitempty"`
IndexFilePaths []string `protobuf:"bytes,7,rep,name=index_file_paths,json=indexFilePaths,proto3" json:"index_file_paths,omitempty"`
IndexID int64 `protobuf:"varint,3,opt,name=indexID,proto3" json:"indexID,omitempty"`
IndexParams []*commonpb.KeyValuePair `protobuf:"bytes,4,rep,name=index_params,json=indexParams,proto3" json:"index_params,omitempty"`
Status indexbuilderpb.IndexStatus `protobuf:"varint,5,opt,name=status,proto3,enum=milvus.proto.service.IndexStatus" json:"status,omitempty"`
IndexFilePaths []string `protobuf:"bytes,6,rep,name=index_file_paths,json=indexFilePaths,proto3" json:"index_file_paths,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
......@@ -422,13 +421,6 @@ func (m *FieldIndexMeta) GetFieldID() int64 {
return 0
}
func (m *FieldIndexMeta) GetIndexType() string {
if m != nil {
return m.IndexType
}
return ""
}
func (m *FieldIndexMeta) GetIndexID() int64 {
if m != nil {
return m.IndexID
......@@ -469,51 +461,50 @@ func init() {
func init() { proto.RegisterFile("etcd_meta.proto", fileDescriptor_975d306d62b73e88) }
var fileDescriptor_975d306d62b73e88 = []byte{
// 725 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xd1, 0x6e, 0xeb, 0x44,
0x10, 0x55, 0xe2, 0x36, 0xa9, 0x27, 0x69, 0xd2, 0x2e, 0x2f, 0xe6, 0x72, 0x2f, 0xe4, 0xa6, 0x2a,
0x44, 0x42, 0x24, 0x52, 0x91, 0x90, 0x78, 0x00, 0x41, 0x1b, 0x2a, 0x45, 0x08, 0x1a, 0x9c, 0x88,
0x07, 0x5e, 0xac, 0x8d, 0x3d, 0x4d, 0x56, 0xf2, 0xae, 0xcd, 0xee, 0xba, 0x6d, 0xf2, 0xc4, 0x77,
0xf0, 0x0d, 0xfc, 0x07, 0x5f, 0x85, 0x84, 0x76, 0xd7, 0x71, 0x92, 0x92, 0x07, 0x1e, 0xe7, 0xcc,
0x99, 0xf1, 0x99, 0x33, 0x3b, 0x86, 0x2e, 0xea, 0x38, 0x89, 0x38, 0x6a, 0x3a, 0xcc, 0x65, 0xa6,
0x33, 0x72, 0xc9, 0x59, 0xfa, 0x54, 0x28, 0x17, 0x0d, 0x4d, 0xf6, 0xcd, 0x07, 0x4c, 0x24, 0xf8,
0x12, 0x2d, 0x0a, 0x96, 0x26, 0x28, 0x5d, 0xe6, 0x4d, 0x3b, 0xce, 0x38, 0xcf, 0xc4, 0x36, 0x52,
0xf1, 0x0a, 0x79, 0xd9, 0xa3, 0xff, 0x67, 0x0d, 0x60, 0x8e, 0x82, 0x0a, 0xfd, 0x13, 0x6a, 0x4a,
0x3a, 0x50, 0x9f, 0x8c, 0x83, 0x5a, 0xaf, 0x36, 0xf0, 0xc2, 0xfa, 0x64, 0x4c, 0x3e, 0x85, 0xae,
0x28, 0x78, 0xf4, 0x7b, 0x81, 0x72, 0x1d, 0x89, 0x2c, 0x41, 0x15, 0xd4, 0x6d, 0xf2, 0x5c, 0x14,
0xfc, 0x17, 0x83, 0xfe, 0x6c, 0x40, 0xf2, 0x39, 0x5c, 0x32, 0xa1, 0x50, 0xea, 0x28, 0x5e, 0x51,
0x21, 0x30, 0x9d, 0x8c, 0x55, 0xe0, 0xf5, 0xbc, 0x81, 0x1f, 0x5e, 0xb8, 0xc4, 0x5d, 0x85, 0x93,
0xcf, 0xa0, 0xeb, 0x1a, 0x56, 0xdc, 0xe0, 0xa4, 0x57, 0x1b, 0xf8, 0x61, 0xc7, 0xc2, 0x15, 0xb3,
0xff, 0x47, 0x0d, 0xfc, 0xa9, 0xcc, 0x5e, 0xd6, 0x47, 0xb5, 0x7d, 0x05, 0x4d, 0x9a, 0x24, 0x12,
0x95, 0xd3, 0xd4, 0xba, 0x79, 0x3b, 0x3c, 0x30, 0xa4, 0x9c, 0xfa, 0x7b, 0xc7, 0x09, 0xb7, 0x64,
0xa3, 0x55, 0xa2, 0x2a, 0xd2, 0x63, 0x5a, 0x5d, 0x62, 0xa7, 0xb5, 0xff, 0x77, 0x0d, 0x3a, 0x77,
0x59, 0x9a, 0x62, 0xac, 0x59, 0x26, 0x8e, 0xea, 0xf8, 0x06, 0x1a, 0xce, 0xd2, 0x52, 0xc6, 0xf5,
0xa1, 0x8c, 0xd2, 0xee, 0x5d, 0x93, 0x99, 0x05, 0xc2, 0xb2, 0x88, 0x7c, 0x02, 0xad, 0x58, 0x22,
0xd5, 0x18, 0x69, 0xc6, 0x31, 0xf0, 0x7a, 0xb5, 0xc1, 0x49, 0x08, 0x0e, 0x9a, 0x33, 0x8e, 0xe4,
0x63, 0x00, 0x85, 0x4b, 0x8e, 0x42, 0x1b, 0xa1, 0x27, 0x3d, 0x6f, 0xe0, 0x85, 0x7b, 0x08, 0xb9,
0x86, 0x4e, 0x4e, 0xa5, 0x66, 0xa6, 0x77, 0xa4, 0xe9, 0x52, 0x05, 0xa7, 0x76, 0x98, 0xf3, 0x0a,
0x9d, 0xd3, 0xa5, 0xea, 0x3f, 0xc0, 0xc5, 0x3d, 0xc3, 0x34, 0xb9, 0x65, 0x22, 0xcd, 0x96, 0xf7,
0x2c, 0x45, 0x45, 0x02, 0x68, 0x3e, 0x1a, 0xac, 0x9a, 0x67, 0x1b, 0x92, 0xf7, 0xd0, 0x5e, 0x58,
0x62, 0xf4, 0x68, 0x98, 0x41, 0xdd, 0xb6, 0x6c, 0x2d, 0x76, 0xc5, 0xfd, 0x7f, 0xea, 0xd0, 0x9a,
0x39, 0x19, 0xd6, 0x97, 0xb7, 0xe0, 0x57, 0xaa, 0xca, 0x76, 0x3b, 0x80, 0xf4, 0xa1, 0x1d, 0x57,
0x16, 0x4c, 0xc6, 0xe5, 0x33, 0x3a, 0xc0, 0xc8, 0x15, 0x9c, 0x1f, 0x4c, 0x62, 0xcd, 0xf0, 0xc3,
0xf6, 0xfe, 0x20, 0x86, 0x54, 0xee, 0x2d, 0x52, 0x9a, 0x4a, 0x6d, 0xdf, 0xce, 0x69, 0xd8, 0x2e,
0xc1, 0x99, 0xc1, 0xac, 0xa9, 0x25, 0x09, 0x45, 0x12, 0x9c, 0x5a, 0x0a, 0x94, 0xd0, 0x0f, 0x22,
0x21, 0x1f, 0x81, 0x9f, 0xe5, 0x28, 0x9c, 0xe7, 0x0d, 0xeb, 0xf9, 0x99, 0x01, 0xac, 0xe3, 0xef,
0x00, 0xe2, 0x34, 0x53, 0xe5, 0x46, 0x9a, 0x36, 0xeb, 0x5b, 0xc4, 0xa6, 0x3f, 0x84, 0x33, 0x73,
0x14, 0x32, 0x7b, 0x56, 0xc1, 0x99, 0xb3, 0x4d, 0x14, 0x3c, 0xcc, 0x9e, 0x95, 0x49, 0x71, 0xe4,
0x91, 0x62, 0x1b, 0x0c, 0x7c, 0x97, 0xe2, 0xc8, 0x67, 0x6c, 0x83, 0xe4, 0x01, 0x2e, 0xf7, 0x1c,
0x8d, 0x72, 0xaa, 0x57, 0x2a, 0x80, 0x9e, 0x37, 0x68, 0xdd, 0x5c, 0x0d, 0xff, 0x73, 0xc9, 0xc3,
0xd7, 0xbb, 0x0a, 0xbb, 0x3b, 0xef, 0xa7, 0xa6, 0xb6, 0xff, 0x57, 0x1d, 0x3a, 0x96, 0x35, 0x31,
0x37, 0xff, 0x3f, 0x56, 0xb0, 0xb7, 0xed, 0xfa, 0xe1, 0xb6, 0xdf, 0x01, 0xb8, 0x1f, 0x87, 0x5e,
0xe7, 0x58, 0xba, 0xee, 0x5b, 0x64, 0xbe, 0xce, 0xd1, 0x14, 0xda, 0xa0, 0x3c, 0x54, 0x2f, 0xdc,
0x86, 0x64, 0x0c, 0x6d, 0x57, 0x98, 0x53, 0x49, 0xb9, 0x7b, 0x79, 0xad, 0x9b, 0xf7, 0x47, 0x0f,
0xf1, 0x47, 0x5c, 0xff, 0x4a, 0xd3, 0x02, 0xa7, 0x94, 0xc9, 0xb0, 0x65, 0xcb, 0xa6, 0xb6, 0x8a,
0x7c, 0x0d, 0x0d, 0xa5, 0xa9, 0x2e, 0x94, 0xdd, 0x44, 0xe7, 0x75, 0xbd, 0x42, 0xf9, 0xc4, 0x62,
0x1c, 0xda, 0x39, 0x67, 0x96, 0x18, 0x96, 0x05, 0x64, 0x00, 0x17, 0x4e, 0xc0, 0x9e, 0xa9, 0x4d,
0xfb, 0x56, 0x3b, 0x16, 0xaf, 0xec, 0xba, 0xfd, 0xee, 0xb7, 0x6f, 0x97, 0x4c, 0xaf, 0x8a, 0x85,
0xd1, 0x33, 0xda, 0xb0, 0x34, 0x65, 0x1b, 0x8d, 0xf1, 0x6a, 0xe4, 0xbe, 0xf5, 0x45, 0xc2, 0x94,
0x96, 0x6c, 0x51, 0x68, 0x4c, 0x46, 0x4c, 0x68, 0x94, 0x82, 0xa6, 0x23, 0x2b, 0x60, 0x64, 0x16,
0x92, 0x2f, 0x16, 0x0d, 0x1b, 0x7d, 0xf9, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1c, 0xb6, 0x88,
0xc7, 0x89, 0x05, 0x00, 0x00,
// 716 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0x5d, 0x6f, 0xe2, 0x46,
0x14, 0x15, 0x38, 0x81, 0xf8, 0x42, 0x20, 0x99, 0xbe, 0xb8, 0x69, 0xda, 0x12, 0xa2, 0xb4, 0x48,
0x55, 0x41, 0x4a, 0xa5, 0x4a, 0x7d, 0x68, 0xd5, 0x26, 0x34, 0x12, 0xaa, 0xda, 0x50, 0x13, 0xed,
0xc3, 0xbe, 0x58, 0x83, 0x7d, 0x03, 0x23, 0x79, 0xc6, 0xec, 0xcc, 0x38, 0x1f, 0x3c, 0xed, 0x1f,
0xd8, 0x3f, 0xb0, 0x7f, 0x68, 0x7f, 0xd5, 0x4a, 0xab, 0x99, 0x31, 0x06, 0xb2, 0x3c, 0xec, 0xe3,
0x9c, 0x73, 0xee, 0xf5, 0xb9, 0xe7, 0xce, 0x18, 0xda, 0xa8, 0xe3, 0x24, 0xe2, 0xa8, 0x69, 0x7f,
0x21, 0x33, 0x9d, 0x91, 0x63, 0xce, 0xd2, 0x87, 0x5c, 0xb9, 0x53, 0xdf, 0xb0, 0x27, 0x5f, 0x31,
0x91, 0xe0, 0x53, 0x34, 0xcd, 0x59, 0x9a, 0xa0, 0x74, 0xcc, 0x49, 0x33, 0xce, 0x38, 0xcf, 0xc4,
0xea, 0xa4, 0xe2, 0x39, 0xf2, 0xa2, 0x47, 0xf7, 0x7d, 0x05, 0xe0, 0x0e, 0x05, 0x15, 0xfa, 0x5f,
0xd4, 0x94, 0xb4, 0xa0, 0x3a, 0x1a, 0x06, 0x95, 0x4e, 0xa5, 0xe7, 0x85, 0xd5, 0xd1, 0x90, 0xfc,
0x00, 0x6d, 0x91, 0xf3, 0xe8, 0x4d, 0x8e, 0xf2, 0x39, 0x12, 0x59, 0x82, 0x2a, 0xa8, 0x5a, 0xf2,
0x50, 0xe4, 0xfc, 0x7f, 0x83, 0xfe, 0x67, 0x40, 0xf2, 0x13, 0x1c, 0x33, 0xa1, 0x50, 0xea, 0x28,
0x9e, 0x53, 0x21, 0x30, 0x1d, 0x0d, 0x55, 0xe0, 0x75, 0xbc, 0x9e, 0x1f, 0x1e, 0x39, 0xe2, 0xba,
0xc4, 0xc9, 0x8f, 0xd0, 0x76, 0x0d, 0x4b, 0x6d, 0xb0, 0xd7, 0xa9, 0xf4, 0xfc, 0xb0, 0x65, 0xe1,
0x52, 0xd9, 0x7d, 0x5b, 0x01, 0x7f, 0x2c, 0xb3, 0xa7, 0xe7, 0x9d, 0xde, 0x7e, 0x85, 0x3a, 0x4d,
0x12, 0x89, 0xca, 0x79, 0x6a, 0x5c, 0x9e, 0xf6, 0xb7, 0x02, 0x29, 0xa6, 0xfe, 0xcb, 0x69, 0xc2,
0x95, 0xd8, 0x78, 0x95, 0xa8, 0xf2, 0x74, 0x97, 0x57, 0x47, 0xac, 0xbd, 0x76, 0x3f, 0x54, 0xa0,
0x75, 0x9d, 0xa5, 0x29, 0xc6, 0x9a, 0x65, 0x62, 0xa7, 0x8f, 0xdf, 0xa1, 0xe6, 0x22, 0x2d, 0x6c,
0x5c, 0x6c, 0xdb, 0x28, 0xe2, 0x5e, 0x37, 0x99, 0x58, 0x20, 0x2c, 0x8a, 0xc8, 0xf7, 0xd0, 0x88,
0x25, 0x52, 0x8d, 0x91, 0x66, 0x1c, 0x03, 0xaf, 0x53, 0xe9, 0xed, 0x85, 0xe0, 0xa0, 0x3b, 0xc6,
0x91, 0x7c, 0x07, 0xa0, 0x70, 0xc6, 0x51, 0x68, 0x63, 0x74, 0xaf, 0xe3, 0xf5, 0xbc, 0x70, 0x03,
0x21, 0x17, 0xd0, 0x5a, 0x50, 0xa9, 0x99, 0xe9, 0x1d, 0x69, 0x3a, 0x53, 0xc1, 0xbe, 0x1d, 0xe6,
0xb0, 0x44, 0xef, 0xe8, 0x4c, 0x75, 0x6f, 0xe1, 0xe8, 0x86, 0x61, 0x9a, 0x5c, 0x31, 0x91, 0x66,
0xb3, 0x1b, 0x96, 0xa2, 0x22, 0x01, 0xd4, 0xef, 0x0d, 0x56, 0xce, 0xb3, 0x3a, 0x92, 0x33, 0x68,
0x4e, 0xad, 0x30, 0xba, 0x37, 0xca, 0xa0, 0x6a, 0x5b, 0x36, 0xa6, 0xeb, 0xe2, 0xee, 0xc7, 0x2a,
0x34, 0x26, 0xce, 0x86, 0xcd, 0xe5, 0x14, 0xfc, 0xd2, 0x55, 0xd1, 0x6e, 0x0d, 0x90, 0x2e, 0x34,
0xe3, 0x32, 0x82, 0xd1, 0xb0, 0xb8, 0x46, 0x5b, 0x18, 0x39, 0x87, 0xc3, 0xad, 0x49, 0x6c, 0x18,
0x7e, 0xd8, 0xdc, 0x1c, 0xc4, 0x88, 0x8a, 0xbd, 0x45, 0x4a, 0x53, 0xa9, 0xed, 0xdd, 0xd9, 0x0f,
0x9b, 0x05, 0x38, 0x31, 0x98, 0x0d, 0xb5, 0x10, 0xa1, 0x48, 0x82, 0x7d, 0x2b, 0x81, 0x02, 0xfa,
0x5b, 0x24, 0xe4, 0x1b, 0xf0, 0xb3, 0x05, 0x0a, 0x97, 0x79, 0xcd, 0x66, 0x7e, 0x60, 0x00, 0x9b,
0xf8, 0xb7, 0x00, 0x71, 0x9a, 0xa9, 0x62, 0x23, 0x75, 0xcb, 0xfa, 0x16, 0xb1, 0xf4, 0xd7, 0x70,
0x60, 0x1e, 0x85, 0xcc, 0x1e, 0x55, 0x70, 0xe0, 0x62, 0x13, 0x39, 0x0f, 0xb3, 0x47, 0x65, 0x28,
0x8e, 0x3c, 0x52, 0x6c, 0x89, 0x81, 0xef, 0x28, 0x8e, 0x7c, 0xc2, 0x96, 0x48, 0x6e, 0xe1, 0x78,
0x23, 0xd1, 0x68, 0x41, 0xf5, 0x5c, 0x05, 0xd0, 0xf1, 0x7a, 0x8d, 0xcb, 0xf3, 0xfe, 0x67, 0x2f,
0xb9, 0xff, 0x72, 0x57, 0x61, 0x7b, 0x9d, 0xfd, 0xd8, 0xd4, 0x76, 0xdf, 0x55, 0xa1, 0x65, 0x55,
0x23, 0xf3, 0xe6, 0xbf, 0x60, 0x05, 0x1b, 0xdb, 0xae, 0x6e, 0x6f, 0x3b, 0x80, 0xba, 0xfd, 0x71,
0x8c, 0x86, 0x36, 0x72, 0x2f, 0x5c, 0x1d, 0xc9, 0x10, 0x9a, 0xee, 0x97, 0xb2, 0xa0, 0x92, 0x72,
0x77, 0xfd, 0x1a, 0x97, 0x67, 0x3b, 0x5f, 0xda, 0x3f, 0xf8, 0xfc, 0x8a, 0xa6, 0x39, 0x8e, 0x29,
0x93, 0x61, 0xc3, 0x96, 0x8d, 0x6d, 0x15, 0xf9, 0x0d, 0x6a, 0x4a, 0x53, 0x9d, 0x2b, 0xbb, 0x89,
0xd6, 0xcb, 0x7a, 0x85, 0xf2, 0x81, 0xc5, 0xd8, 0xb7, 0x83, 0x4c, 0xac, 0x30, 0x2c, 0x0a, 0x48,
0x0f, 0x8e, 0x9c, 0x81, 0x8d, 0xd4, 0x6a, 0xf6, 0x32, 0xb6, 0x2c, 0x5e, 0xe6, 0x71, 0xf5, 0xe7,
0xeb, 0x3f, 0x66, 0x4c, 0xcf, 0xf3, 0xa9, 0xf1, 0x33, 0x58, 0xb2, 0x34, 0x65, 0x4b, 0x8d, 0xf1,
0x7c, 0xe0, 0xbe, 0xf5, 0x73, 0xc2, 0x94, 0x96, 0x6c, 0x9a, 0x6b, 0x4c, 0x06, 0x4c, 0x68, 0x94,
0x82, 0xa6, 0x03, 0x6b, 0x60, 0x60, 0x12, 0x5f, 0x4c, 0xa7, 0x35, 0x7b, 0xfa, 0xe5, 0x53, 0x00,
0x00, 0x00, 0xff, 0xff, 0x0a, 0x10, 0xb5, 0x6d, 0x6a, 0x05, 0x00, 0x00,
}
internal/proto/internal_msg.proto
浏览文件 @ 0b9cffaf
......@@ -327,8 +327,7 @@ message CreateIndexRequest {
int64 proxyID = 4;
string collection_name = 5;
string field_name = 6;
string index_name = 7;
repeated common.KeyValuePair extra_params = 8;
repeated common.KeyValuePair extra_params = 7;
}
message DescribeIndexRequest {
......@@ -338,8 +337,7 @@ message DescribeIndexRequest {
int64 proxyID = 4;
string collection_name = 5;
string field_name = 6;
string index_name = 7;
repeated common.KeyValuePair extra_params = 8;
repeated common.KeyValuePair extra_params = 7;
}
message DescribeIndexProgressRequest {
......@@ -349,6 +347,5 @@ message DescribeIndexProgressRequest {
int64 proxyID = 4;
string collection_name = 5;
string field_name = 6;
string index_name = 7;
repeated common.KeyValuePair extra_params = 8;
repeated common.KeyValuePair extra_params = 7;
}
internal/proto/service_msg.proto
浏览文件 @ 0b9cffaf
......@@ -179,10 +179,9 @@ message QueryResult {
* extra_params["index_type"] = one of the values: SORTED
*/
message IndexParam {
string collection_name = 2;
string field_name = 3;
string index_name = 4;
repeated common.KeyValuePair extra_params = 5;
string collection_name = 1;
string field_name = 2;
repeated common.KeyValuePair extra_params = 3;
}
message DescribeIndexResponse {
......
internal/proto/servicepb/service_msg.pb.go
浏览文件 @ 0b9cffaf
......@@ -915,10 +915,9 @@ func (m *QueryResult) GetHits() [][]byte {
// for structured field:
// extra_params["index_type"] = one of the values: SORTED
type IndexParam struct {
CollectionName string `protobuf:"bytes,2,opt,name=collection_name,json=collectionName,proto3" json:"collection_name,omitempty"`
FieldName string `protobuf:"bytes,3,opt,name=field_name,json=fieldName,proto3" json:"field_name,omitempty"`
IndexName string `protobuf:"bytes,4,opt,name=index_name,json=indexName,proto3" json:"index_name,omitempty"`
ExtraParams []*commonpb.KeyValuePair `protobuf:"bytes,5,rep,name=extra_params,json=extraParams,proto3" json:"extra_params,omitempty"`
CollectionName string `protobuf:"bytes,1,opt,name=collection_name,json=collectionName,proto3" json:"collection_name,omitempty"`
FieldName string `protobuf:"bytes,2,opt,name=field_name,json=fieldName,proto3" json:"field_name,omitempty"`
ExtraParams []*commonpb.KeyValuePair `protobuf:"bytes,3,rep,name=extra_params,json=extraParams,proto3" json:"extra_params,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
......@@ -963,13 +962,6 @@ func (m *IndexParam) GetFieldName() string {
return ""
}
func (m *IndexParam) GetIndexName() string {
if m != nil {
return m.IndexName
}
return ""
}
func (m *IndexParam) GetExtraParams() []*commonpb.KeyValuePair {
if m != nil {
return m.ExtraParams
......@@ -1073,58 +1065,59 @@ func init() {
func init() { proto.RegisterFile("service_msg.proto", fileDescriptor_b4b40b84dd2f74cb) }
var fileDescriptor_b4b40b84dd2f74cb = []byte{
// 847 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x55, 0xdd, 0x6e, 0xdc, 0x44,
0x14, 0xc6, 0xeb, 0x4d, 0xd8, 0x9c, 0xf5, 0x6e, 0x37, 0x43, 0x5a, 0xb9, 0xad, 0x90, 0x16, 0x57,
0x85, 0x15, 0x88, 0x5d, 0x29, 0x45, 0x42, 0xbd, 0x40, 0x22, 0x9b, 0x14, 0x48, 0x53, 0x25, 0x61,
0x12, 0x45, 0x2a, 0x48, 0x58, 0x63, 0x7b, 0x6a, 0x8f, 0xb0, 0x3d, 0xd6, 0xcc, 0x38, 0xe9, 0xf6,
0x41, 0x78, 0x09, 0x9e, 0x80, 0x27, 0xe0, 0x8e, 0xf7, 0xe1, 0x0e, 0x79, 0xc6, 0xfb, 0x17, 0x16,
0x11, 0xb2, 0xb9, 0xe1, 0x6e, 0xce, 0x39, 0x3e, 0xe7, 0x3b, 0xbf, 0x9f, 0x61, 0x5b, 0x52, 0x71,
0xc9, 0x42, 0xea, 0x67, 0x32, 0x1e, 0x16, 0x82, 0x2b, 0x8e, 0x76, 0x32, 0x96, 0x5e, 0x96, 0xd2,
0x48, 0xc3, 0xda, 0xfe, 0xc8, 0x09, 0x79, 0x96, 0xf1, 0xdc, 0x68, 0x1f, 0x39, 0x32, 0x4c, 0x68,
0x46, 0x8c, 0xe4, 0x3d, 0x87, 0xee, 0x3e, 0x4f, 0x53, 0x1a, 0x2a, 0xc6, 0xf3, 0x63, 0x92, 0x51,
0xf4, 0x09, 0xdc, 0x0b, 0x67, 0x1a, 0x3f, 0x27, 0x19, 0x75, 0xad, 0xbe, 0x35, 0xd8, 0xc2, 0xdd,
0x70, 0xe9, 0x43, 0xef, 0x25, 0x74, 0x4e, 0x89, 0x50, 0xec, 0x3f, 0x7b, 0xa2, 0x1e, 0xd8, 0x8a,
0xc4, 0x6e, 0x43, 0x1b, 0xab, 0xa7, 0xf7, 0xab, 0x05, 0x2d, 0xcc, 0xaf, 0xc6, 0x44, 0x85, 0xc9,
0xcd, 0xe3, 0x3c, 0x81, 0x4e, 0x31, 0xcd, 0xc0, 0x9f, 0x47, 0x74, 0x66, 0xca, 0x73, 0x12, 0xa3,
0x2f, 0xa0, 0x25, 0xf8, 0x95, 0x1f, 0x11, 0x45, 0x5c, 0xbb, 0x6f, 0x0f, 0xda, 0xbb, 0x0f, 0x87,
0x4b, 0x6d, 0xaa, 0xbb, 0x33, 0x4e, 0x79, 0x80, 0xdf, 0x17, 0xfc, 0xea, 0x80, 0x28, 0x82, 0x1e,
0xc3, 0x56, 0x42, 0x64, 0xe2, 0xff, 0x4c, 0x27, 0xd2, 0x6d, 0xf6, 0xed, 0x41, 0x07, 0xb7, 0x2a,
0xc5, 0x11, 0x9d, 0x48, 0xef, 0x0a, 0x7a, 0xa7, 0x29, 0x09, 0x69, 0xc2, 0xd3, 0x88, 0x8a, 0x0b,
0x92, 0x96, 0xb3, 0x9a, 0xac, 0x59, 0x4d, 0xe8, 0x39, 0x34, 0xd5, 0xa4, 0xa0, 0x3a, 0xa9, 0xee,
0xee, 0xd3, 0xe1, 0xaa, 0xd9, 0x0c, 0x17, 0xe2, 0x9c, 0x4f, 0x0a, 0x8a, 0xb5, 0x0b, 0x7a, 0x00,
0x9b, 0x97, 0x55, 0x54, 0xa9, 0x33, 0x76, 0x70, 0x2d, 0x79, 0x3f, 0x2d, 0x01, 0x7f, 0x2b, 0x78,
0x59, 0xa0, 0x97, 0xe0, 0x14, 0x73, 0x9d, 0x74, 0x2d, 0x5d, 0xe3, 0xc7, 0xff, 0x0a, 0xa7, 0xd3,
0xc6, 0x4b, 0xbe, 0xde, 0x2f, 0x16, 0x6c, 0x7c, 0x5f, 0x52, 0x31, 0xb9, 0xf9, 0x0c, 0x9e, 0x42,
0x77, 0x69, 0x06, 0xd2, 0x6d, 0xf4, 0xed, 0xc1, 0x16, 0xee, 0x2c, 0x0e, 0x41, 0x56, 0xed, 0x89,
0x64, 0xea, 0xda, 0xa6, 0x3d, 0x91, 0x4c, 0xd1, 0x67, 0xb0, 0xbd, 0x80, 0xed, 0xc7, 0x55, 0x31,
0x6e, 0xb3, 0x6f, 0x0d, 0x1c, 0xdc, 0x2b, 0xae, 0x15, 0xe9, 0xfd, 0x08, 0xdd, 0x33, 0x25, 0x58,
0x1e, 0x63, 0x2a, 0x0b, 0x9e, 0x4b, 0x8a, 0x9e, 0xc1, 0xa6, 0x54, 0x44, 0x95, 0x52, 0xe7, 0xd5,
0xde, 0x7d, 0xbc, 0x72, 0xa8, 0x67, 0xfa, 0x13, 0x5c, 0x7f, 0x8a, 0x76, 0x60, 0x43, 0x77, 0xb2,
0x5e, 0x14, 0x23, 0x78, 0xaf, 0xc1, 0x19, 0x73, 0x9e, 0xde, 0x61, 0xe8, 0xd6, 0x34, 0x34, 0x01,
0x64, 0xf2, 0x7e, 0xc5, 0xa4, 0x5a, 0x0f, 0x60, 0xbe, 0x13, 0xa6, 0xc1, 0xd3, 0x9d, 0x08, 0xe0,
0x83, 0xc3, 0x5c, 0xd1, 0x98, 0x8a, 0xbb, 0xc6, 0xb0, 0x67, 0x18, 0x12, 0x76, 0x6a, 0x0c, 0x4c,
0xf2, 0x98, 0xae, 0xdd, 0xa9, 0x80, 0xc6, 0x2c, 0xd7, 0x9d, 0xb2, 0xb1, 0x11, 0xaa, 0x05, 0xa1,
0x79, 0xa4, 0x17, 0xc4, 0xc6, 0xd5, 0xd3, 0xfb, 0xc3, 0x82, 0xfb, 0x73, 0x6e, 0x3a, 0xa0, 0x32,
0x14, 0xac, 0xa8, 0x9e, 0xb7, 0x83, 0xfd, 0x0a, 0x36, 0x0d, 0xf3, 0x69, 0xdc, 0xf6, 0xdf, 0x0e,
0xd2, 0xb0, 0xe2, 0x1c, 0xf0, 0x4c, 0x2b, 0x70, 0xed, 0x84, 0xf6, 0x00, 0xaa, 0x40, 0x4c, 0x2a,
0x16, 0xca, 0x9a, 0x48, 0x3e, 0x5a, 0x89, 0x7b, 0x44, 0x27, 0xfa, 0xb6, 0x4e, 0x09, 0x13, 0x78,
0xc1, 0xc9, 0xfb, 0xdd, 0x82, 0x9d, 0x19, 0x63, 0xae, 0x5d, 0xcf, 0x97, 0xd0, 0xd4, 0x67, 0x69,
0xaa, 0x79, 0xf2, 0x0f, 0xf7, 0xbe, 0x48, 0xd0, 0x58, 0x3b, 0xdc, 0x45, 0x25, 0x0a, 0xb6, 0xcf,
0x26, 0x72, 0x9f, 0xe7, 0x6f, 0xd8, 0x9a, 0x17, 0x89, 0xa0, 0xa9, 0x29, 0xd6, 0xec, 0xb4, 0x7e,
0x5f, 0x63, 0xbf, 0xf9, 0xa6, 0x1f, 0x41, 0xf3, 0x3b, 0xa6, 0x34, 0x97, 0x1c, 0x1e, 0x18, 0xa2,
0xb3, 0x71, 0xf5, 0x44, 0x0f, 0x17, 0x38, 0xbe, 0xa1, 0x19, 0x73, 0x46, 0xe4, 0x0f, 0xaa, 0xb1,
0x73, 0x51, 0x07, 0x6b, 0xe0, 0x5a, 0xf2, 0x2e, 0xa0, 0xad, 0x99, 0x0e, 0x53, 0x59, 0xa6, 0xea,
0xd6, 0xc9, 0x27, 0x4c, 0xc9, 0x1a, 0x52, 0xbf, 0xbd, 0xdf, 0x2c, 0x80, 0xc3, 0x3c, 0xa2, 0x6f,
0x4f, 0x89, 0x20, 0xd9, 0x2a, 0x1e, 0x6d, 0xac, 0xe4, 0xd1, 0x0f, 0x01, 0xde, 0x30, 0x9a, 0x46,
0xe6, 0x1b, 0xc3, 0x93, 0x5b, 0x5a, 0x33, 0x35, 0xb3, 0x2a, 0xaa, 0x31, 0x37, 0x8d, 0x59, 0x6b,
0xb4, 0xf9, 0x00, 0x1c, 0xfa, 0x56, 0x09, 0xe2, 0x17, 0x15, 0xaa, 0x74, 0x37, 0x6e, 0x3a, 0xd5,
0xb6, 0x76, 0xd3, 0xb9, 0x4a, 0xef, 0x4f, 0x0b, 0xee, 0x9b, 0xbd, 0x0c, 0xa8, 0xae, 0x61, 0xbd,
0xd9, 0xfe, 0x9f, 0x6a, 0xff, 0xf4, 0x6b, 0xb8, 0x77, 0xed, 0x5f, 0x8c, 0x5a, 0xd0, 0x3c, 0x3e,
0x39, 0x7e, 0xd1, 0x7b, 0x0f, 0x6d, 0x43, 0xe7, 0xe2, 0xc5, 0xfe, 0xf9, 0x09, 0xf6, 0xc7, 0x87,
0xc7, 0x7b, 0xf8, 0x75, 0x2f, 0x42, 0x3d, 0x70, 0x6a, 0xd5, 0x37, 0xaf, 0x4e, 0xf6, 0xce, 0x7b,
0x74, 0xbc, 0xff, 0xc3, 0x5e, 0xcc, 0x54, 0x52, 0x06, 0x15, 0xd8, 0xe8, 0x1d, 0x4b, 0x53, 0xf6,
0x4e, 0xd1, 0x30, 0x19, 0x99, 0x44, 0x3e, 0x8f, 0x98, 0x54, 0x82, 0x05, 0xa5, 0xa2, 0xd1, 0x88,
0xe5, 0x8a, 0x8a, 0x9c, 0xa4, 0x23, 0x9d, 0xdd, 0xa8, 0x3e, 0xd7, 0x22, 0x08, 0x36, 0xb5, 0xe2,
0xd9, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x26, 0x6f, 0x59, 0x0a, 0xdd, 0x09, 0x00, 0x00,
// 854 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xdd, 0x6e, 0xdb, 0x36,
0x14, 0x9e, 0x2c, 0x27, 0xb3, 0x8f, 0x65, 0xd7, 0xe1, 0xd2, 0xc2, 0x6d, 0x51, 0xc0, 0x53, 0xd1,
0xcd, 0xd8, 0x30, 0x1b, 0x48, 0x07, 0x0c, 0xbd, 0x18, 0xb0, 0x38, 0xe9, 0xb6, 0x34, 0x45, 0x92,
0x31, 0x41, 0x80, 0x6e, 0xc0, 0x04, 0x5a, 0x62, 0x25, 0x62, 0x92, 0x28, 0x90, 0x54, 0x52, 0xf7,
0x41, 0x76, 0xb1, 0x57, 0xd8, 0x83, 0xec, 0x6e, 0xef, 0xb3, 0xbb, 0x41, 0xa4, 0x22, 0xdb, 0x99,
0x87, 0x3a, 0x71, 0xee, 0xc8, 0x43, 0x9d, 0xf3, 0x9d, 0xef, 0xfc, 0x7c, 0x82, 0x2d, 0x49, 0xc5,
0x05, 0xf3, 0xa9, 0x97, 0xc8, 0x70, 0x98, 0x09, 0xae, 0x38, 0xda, 0x4e, 0x58, 0x7c, 0x91, 0x4b,
0x73, 0x1b, 0x96, 0xef, 0x8f, 0x1c, 0x9f, 0x27, 0x09, 0x4f, 0x8d, 0xf5, 0x91, 0x23, 0xfd, 0x88,
0x26, 0xc4, 0xdc, 0xdc, 0x17, 0xd0, 0xd9, 0xe3, 0x71, 0x4c, 0x7d, 0xc5, 0x78, 0x7a, 0x44, 0x12,
0x8a, 0x3e, 0x87, 0x7b, 0x7e, 0x65, 0xf1, 0x52, 0x92, 0xd0, 0x9e, 0xd5, 0xb7, 0x06, 0x4d, 0xdc,
0xf1, 0x17, 0x3e, 0x74, 0x5f, 0x41, 0xfb, 0x84, 0x08, 0xc5, 0x6e, 0xec, 0x89, 0xba, 0x60, 0x2b,
0x12, 0xf6, 0x6a, 0xfa, 0xb1, 0x38, 0xba, 0x7f, 0x5a, 0xd0, 0xc0, 0xfc, 0x72, 0x4c, 0x94, 0x1f,
0xad, 0x1e, 0xe7, 0x29, 0xb4, 0xb3, 0xab, 0x0c, 0xbc, 0x59, 0x44, 0xa7, 0x32, 0x9e, 0x91, 0x10,
0x7d, 0x0d, 0x0d, 0xc1, 0x2f, 0xbd, 0x80, 0x28, 0xd2, 0xb3, 0xfb, 0xf6, 0xa0, 0xb5, 0xf3, 0x70,
0xb8, 0x50, 0xa6, 0xb2, 0x3a, 0xe3, 0x98, 0x4f, 0xf0, 0xc7, 0x82, 0x5f, 0xee, 0x13, 0x45, 0xd0,
0x63, 0x68, 0x46, 0x44, 0x46, 0xde, 0x6f, 0x74, 0x2a, 0x7b, 0xf5, 0xbe, 0x3d, 0x68, 0xe3, 0x46,
0x61, 0x38, 0xa4, 0x53, 0xe9, 0x5e, 0x42, 0xf7, 0x24, 0x26, 0x3e, 0x8d, 0x78, 0x1c, 0x50, 0x71,
0x4e, 0xe2, 0xbc, 0xe2, 0x64, 0x55, 0x9c, 0xd0, 0x0b, 0xa8, 0xab, 0x69, 0x46, 0x75, 0x52, 0x9d,
0x9d, 0x67, 0xc3, 0x65, 0xbd, 0x19, 0xce, 0xc5, 0x39, 0x9b, 0x66, 0x14, 0x6b, 0x17, 0xf4, 0x00,
0x36, 0x2f, 0x8a, 0xa8, 0x52, 0x67, 0xec, 0xe0, 0xf2, 0xe6, 0xfe, 0xba, 0x00, 0xfc, 0x83, 0xe0,
0x79, 0x86, 0x5e, 0x81, 0x93, 0xcd, 0x6c, 0xb2, 0x67, 0x69, 0x8e, 0x9f, 0x7d, 0x10, 0x4e, 0xa7,
0x8d, 0x17, 0x7c, 0xdd, 0xdf, 0x2d, 0xd8, 0xf8, 0x29, 0xa7, 0x62, 0xba, 0x7a, 0x0f, 0x9e, 0x41,
0x67, 0xa1, 0x07, 0xb2, 0x57, 0xeb, 0xdb, 0x83, 0x26, 0x6e, 0xcf, 0x37, 0x41, 0x16, 0xe5, 0x09,
0x64, 0xdc, 0xb3, 0x4d, 0x79, 0x02, 0x19, 0xa3, 0x2f, 0x61, 0x6b, 0x0e, 0xdb, 0x0b, 0x0b, 0x32,
0xbd, 0x7a, 0xdf, 0x1a, 0x38, 0xb8, 0x9b, 0x5d, 0x23, 0xe9, 0xfe, 0x02, 0x9d, 0x53, 0x25, 0x58,
0x1a, 0x62, 0x2a, 0x33, 0x9e, 0x4a, 0x8a, 0x9e, 0xc3, 0xa6, 0x54, 0x44, 0xe5, 0x52, 0xe7, 0xd5,
0xda, 0x79, 0xbc, 0xb4, 0xa9, 0xa7, 0xfa, 0x13, 0x5c, 0x7e, 0x8a, 0xb6, 0x61, 0x43, 0x57, 0xb2,
0x1c, 0x14, 0x73, 0x71, 0xdf, 0x80, 0x33, 0xe6, 0x3c, 0xbe, 0xc3, 0xd0, 0x8d, 0xab, 0xd0, 0x04,
0x90, 0xc9, 0xfb, 0x35, 0x93, 0x6a, 0x3d, 0x80, 0xd9, 0x4c, 0x98, 0x02, 0x5f, 0xcd, 0xc4, 0x04,
0x3e, 0x39, 0x48, 0x15, 0x0d, 0xa9, 0xb8, 0x6b, 0x0c, 0xbb, 0xc2, 0x90, 0xb0, 0x5d, 0x62, 0x60,
0x92, 0x86, 0x74, 0xed, 0x4a, 0x4d, 0x68, 0xc8, 0x52, 0x5d, 0x29, 0x1b, 0x9b, 0x4b, 0x31, 0x20,
0x34, 0x0d, 0xf4, 0x80, 0xd8, 0xb8, 0x38, 0xba, 0x7f, 0x5b, 0x70, 0x7f, 0xa6, 0x4d, 0xfb, 0x54,
0xfa, 0x82, 0x65, 0xc5, 0xf1, 0x76, 0xb0, 0xdf, 0xc2, 0xa6, 0x51, 0x3e, 0x8d, 0xdb, 0xfa, 0xcf,
0x42, 0x1a, 0x55, 0x9c, 0x01, 0x9e, 0x6a, 0x03, 0x2e, 0x9d, 0xd0, 0x2e, 0x40, 0x11, 0x88, 0x49,
0xc5, 0x7c, 0x59, 0x0a, 0xc9, 0xa7, 0x4b, 0x71, 0x0f, 0xe9, 0x54, 0xef, 0xd6, 0x09, 0x61, 0x02,
0xcf, 0x39, 0xb9, 0x7f, 0x59, 0xb0, 0x5d, 0x29, 0xe6, 0xda, 0x7c, 0xbe, 0x81, 0xba, 0x5e, 0x4b,
0xc3, 0xe6, 0xe9, 0xff, 0xec, 0xfb, 0xbc, 0x40, 0x63, 0xed, 0x70, 0x17, 0x4c, 0x14, 0x6c, 0x9d,
0x4e, 0xe5, 0x1e, 0x4f, 0xdf, 0xb2, 0x35, 0x37, 0x12, 0x41, 0x5d, 0x4b, 0xac, 0x99, 0x69, 0x7d,
0xbe, 0xa6, 0x7e, 0xb3, 0x49, 0x3f, 0x84, 0xfa, 0x8f, 0x4c, 0x69, 0x2d, 0x39, 0xd8, 0x37, 0x42,
0x67, 0xe3, 0xe2, 0x88, 0x1e, 0xce, 0x69, 0x7c, 0x4d, 0x2b, 0x66, 0x25, 0xe4, 0x0f, 0x8a, 0xb6,
0x73, 0x51, 0x06, 0xab, 0xe1, 0xf2, 0xe6, 0x9e, 0x43, 0x4b, 0x2b, 0x1d, 0xa6, 0x32, 0x8f, 0xd5,
0xad, 0x93, 0x8f, 0x98, 0x92, 0x25, 0xa4, 0x3e, 0xbb, 0x7f, 0x58, 0x00, 0x07, 0x69, 0x40, 0xdf,
0x9d, 0x10, 0x41, 0x92, 0xd5, 0x75, 0xf4, 0x09, 0xc0, 0x5b, 0x46, 0xe3, 0xc0, 0xab, 0x9a, 0xda,
0xc4, 0x4d, 0x6d, 0xd1, 0xcf, 0xfb, 0xe0, 0xd0, 0x77, 0x4a, 0x10, 0x2f, 0x2b, 0xc2, 0xde, 0xa0,
0x6d, 0x2d, 0xed, 0xa6, 0x93, 0x91, 0xee, 0x3f, 0x16, 0xdc, 0x37, 0x83, 0x37, 0xa1, 0x3a, 0xc9,
0xf5, 0x9a, 0xb7, 0x84, 0x5c, 0x6d, 0x05, 0x72, 0xf6, 0x75, 0x72, 0x4f, 0x00, 0x58, 0x91, 0x8d,
0x79, 0xae, 0x9b, 0x67, 0x6d, 0x59, 0xca, 0x7d, 0xe3, 0x36, 0xdc, 0xbf, 0xf8, 0x0e, 0xee, 0x5d,
0xfb, 0xd9, 0xa2, 0x06, 0xd4, 0x8f, 0x8e, 0x8f, 0x5e, 0x76, 0x3f, 0x42, 0x5b, 0xd0, 0x3e, 0x7f,
0xb9, 0x77, 0x76, 0x8c, 0xbd, 0xf1, 0xc1, 0xd1, 0x2e, 0x7e, 0xd3, 0x0d, 0x50, 0x17, 0x9c, 0xd2,
0xf4, 0xfd, 0xeb, 0xe3, 0xdd, 0xb3, 0x2e, 0x1d, 0xef, 0xfd, 0xbc, 0x1b, 0x32, 0x15, 0xe5, 0x93,
0x02, 0x6c, 0xf4, 0x9e, 0xc5, 0x31, 0x7b, 0xaf, 0xa8, 0x1f, 0x8d, 0x4c, 0x22, 0x5f, 0x05, 0x4c,
0x2a, 0xc1, 0x26, 0xb9, 0xa2, 0xc1, 0x88, 0xa5, 0x8a, 0x8a, 0x94, 0xc4, 0x23, 0x9d, 0xdd, 0xa8,
0xdc, 0xc7, 0x6c, 0x32, 0xd9, 0xd4, 0x86, 0xe7, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x2b, 0x24,
0x3d, 0xc8, 0xbe, 0x09, 0x00, 0x00,
}
internal/proxy/grpc_service.go
浏览文件 @ 0b9cffaf
......@@ -595,14 +595,12 @@ func (p *Proxy) ShowPartitions(ctx context.Context, req *servicepb.CollectionNam
}
func (p *Proxy) CreateIndex(ctx context.Context, indexParam *servicepb.IndexParam) (*commonpb.Status, error) {
log.Println("create index: ", indexParam.IndexName)
cit := &CreateIndexTask{
Condition: NewTaskCondition(ctx),
CreateIndexRequest: internalpb.CreateIndexRequest{
MsgType: internalpb.MsgType_kCreateIndex,
CollectionName: indexParam.CollectionName,
FieldName: indexParam.FieldName,
IndexName: indexParam.IndexName,
ExtraParams: indexParam.ExtraParams,
},
masterClient: p.masterClient,
......
internal/storage/data_codec.go
浏览文件 @ 0b9cffaf
......@@ -2,6 +2,9 @@ package storage
import (
"fmt"
"sort"
"strconv"
"strings"
"github.com/zilliztech/milvus-distributed/internal/errors"
ms "github.com/zilliztech/milvus-distributed/internal/master"
......@@ -17,8 +20,26 @@ type (
)
type Blob struct {
key string
value []byte
Key string
Value []byte
}
type BlobList []*Blob
func (s BlobList) Len() int {
return len(s)
}
func (s BlobList) Less(i, j int) bool {
leftValues := strings.Split(s[i].Key, "/")
rightValues := strings.Split(s[j].Key, "/")
left, _ := strconv.ParseInt(leftValues[len(leftValues)-1], 0, 10)
right, _ := strconv.ParseInt(rightValues[len(rightValues)-1], 0, 10)
return left < right
}
func (s BlobList) Swap(i, j int) {
s[i], s[j] = s[j], s[i]
}
func NewBlob(key string, value []byte) *Blob {
......@@ -26,11 +47,11 @@ func NewBlob(key string, value []byte) *Blob {
}
func (b Blob) GetKey() string {
return b.key
return b.Key
}
func (b Blob) GetValue() []byte {
return b.value
return b.Value
}
type Base struct {
......@@ -113,7 +134,7 @@ func (insertCodec *InsertCodec) Serialize(partitionID UniqueID, segmentID Unique
if !ok {
return nil, errors.New("data doesn't contains timestamp field")
}
ts := timeFieldData.(Int64FieldData).Data
ts := timeFieldData.(*Int64FieldData).Data
for _, field := range insertCodec.Schema.Schema.Fields {
singleData := data.Data[field.FieldID]
......@@ -129,30 +150,30 @@ func (insertCodec *InsertCodec) Serialize(partitionID UniqueID, segmentID Unique
eventWriter.SetEndTimestamp(typeutil.Timestamp(ts[len(ts)-1]))
switch field.DataType {
case schemapb.DataType_BOOL:
err = eventWriter.AddBoolToPayload(singleData.(BoolFieldData).Data)
err = eventWriter.AddBoolToPayload(singleData.(*BoolFieldData).Data)
case schemapb.DataType_INT8:
err = eventWriter.AddInt8ToPayload(singleData.(Int8FieldData).Data)
err = eventWriter.AddInt8ToPayload(singleData.(*Int8FieldData).Data)
case schemapb.DataType_INT16:
err = eventWriter.AddInt16ToPayload(singleData.(Int16FieldData).Data)
err = eventWriter.AddInt16ToPayload(singleData.(*Int16FieldData).Data)
case schemapb.DataType_INT32:
err = eventWriter.AddInt32ToPayload(singleData.(Int32FieldData).Data)
err = eventWriter.AddInt32ToPayload(singleData.(*Int32FieldData).Data)
case schemapb.DataType_INT64:
err = eventWriter.AddInt64ToPayload(singleData.(Int64FieldData).Data)
err = eventWriter.AddInt64ToPayload(singleData.(*Int64FieldData).Data)
case schemapb.DataType_FLOAT:
err = eventWriter.AddFloatToPayload(singleData.(FloatFieldData).Data)
err = eventWriter.AddFloatToPayload(singleData.(*FloatFieldData).Data)
case schemapb.DataType_DOUBLE:
err = eventWriter.AddDoubleToPayload(singleData.(DoubleFieldData).Data)
err = eventWriter.AddDoubleToPayload(singleData.(*DoubleFieldData).Data)
case schemapb.DataType_STRING:
for _, singleString := range singleData.(StringFieldData).Data {
for _, singleString := range singleData.(*StringFieldData).Data {
err = eventWriter.AddOneStringToPayload(singleString)
if err != nil {
return nil, err
}
}
case schemapb.DataType_VECTOR_BINARY:
err = eventWriter.AddBinaryVectorToPayload(singleData.(BinaryVectorFieldData).Data, singleData.(BinaryVectorFieldData).Dim)
err = eventWriter.AddBinaryVectorToPayload(singleData.(*BinaryVectorFieldData).Data, singleData.(*BinaryVectorFieldData).Dim)
case schemapb.DataType_VECTOR_FLOAT:
err = eventWriter.AddFloatVectorToPayload(singleData.(FloatVectorFieldData).Data, singleData.(FloatVectorFieldData).Dim)
err = eventWriter.AddFloatVectorToPayload(singleData.(*FloatVectorFieldData).Data, singleData.(*FloatVectorFieldData).Dim)
default:
return nil, errors.Errorf("undefined data type %d", field.DataType)
}
......@@ -176,8 +197,8 @@ func (insertCodec *InsertCodec) Serialize(partitionID UniqueID, segmentID Unique
}
blobKey := fmt.Sprintf("%d", field.FieldID)
blobs = append(blobs, &Blob{
key: blobKey,
value: buffer,
Key: blobKey,
Value: buffer,
})
}
......@@ -191,12 +212,16 @@ func (insertCodec *InsertCodec) Deserialize(blobs []*Blob) (partitionID UniqueID
readerClose := func(reader *BinlogReader) func() error {
return func() error { return reader.Close() }
}
var resultData InsertData
var blobList BlobList = blobs
sort.Sort(blobList)
var pID UniqueID
var sID UniqueID
resultData := &InsertData{}
resultData.Data = make(map[FieldID]FieldData)
for _, blob := range blobs {
binlogReader, err := NewBinlogReader(blob.value)
for _, blob := range blobList {
binlogReader, err := NewBinlogReader(blob.Value)
if err != nil {
return -1, -1, nil, err
}
......@@ -206,150 +231,187 @@ func (insertCodec *InsertCodec) Deserialize(blobs []*Blob) (partitionID UniqueID
dataType := binlogReader.PayloadDataType
fieldID := binlogReader.FieldID
switch dataType {
case schemapb.DataType_BOOL:
var boolFieldData BoolFieldData
eventReader, err := binlogReader.NextEventReader()
if err != nil {
return -1, -1, nil, err
}
boolFieldData.Data, err = eventReader.GetBoolFromPayload()
if err != nil {
return -1, -1, nil, err
}
boolFieldData.NumRows = len(boolFieldData.Data)
resultData.Data[fieldID] = boolFieldData
insertCodec.readerCloseFunc = append(insertCodec.readerCloseFunc, readerClose(binlogReader))
case schemapb.DataType_INT8:
var int8FieldData Int8FieldData
for {
eventReader, err := binlogReader.NextEventReader()
if err != nil {
return -1, -1, nil, err
}
int8FieldData.Data, err = eventReader.GetInt8FromPayload()
if err != nil {
return -1, -1, nil, err
if eventReader == nil {
break
}
int8FieldData.NumRows = len(int8FieldData.Data)
resultData.Data[fieldID] = int8FieldData
insertCodec.readerCloseFunc = append(insertCodec.readerCloseFunc, readerClose(binlogReader))
case schemapb.DataType_INT16:
var int16FieldData Int16FieldData
eventReader, err := binlogReader.NextEventReader()
if err != nil {
return -1, -1, nil, err
}
int16FieldData.Data, err = eventReader.GetInt16FromPayload()
if err != nil {
return -1, -1, nil, err
}
int16FieldData.NumRows = len(int16FieldData.Data)
resultData.Data[fieldID] = int16FieldData
insertCodec.readerCloseFunc = append(insertCodec.readerCloseFunc, readerClose(binlogReader))
case schemapb.DataType_INT32:
var int32FieldData Int32FieldData
eventReader, err := binlogReader.NextEventReader()
if err != nil {
return -1, -1, nil, err
}
int32FieldData.Data, err = eventReader.GetInt32FromPayload()
if err != nil {
return -1, -1, nil, err
}
int32FieldData.NumRows = len(int32FieldData.Data)
resultData.Data[fieldID] = int32FieldData
insertCodec.readerCloseFunc = append(insertCodec.readerCloseFunc, readerClose(binlogReader))
case schemapb.DataType_INT64:
var int64FieldData Int64FieldData
eventReader, err := binlogReader.NextEventReader()
if err != nil {
return -1, -1, nil, err
}
int64FieldData.Data, err = eventReader.GetInt64FromPayload()
if err != nil {
return -1, -1, nil, err
}
int64FieldData.NumRows = len(int64FieldData.Data)
resultData.Data[fieldID] = int64FieldData
insertCodec.readerCloseFunc = append(insertCodec.readerCloseFunc, readerClose(binlogReader))
case schemapb.DataType_FLOAT:
var floatFieldData FloatFieldData
eventReader, err := binlogReader.NextEventReader()
if err != nil {
return -1, -1, nil, err
}
floatFieldData.Data, err = eventReader.GetFloatFromPayload()
if err != nil {
return -1, -1, nil, err
}
floatFieldData.NumRows = len(floatFieldData.Data)
resultData.Data[fieldID] = floatFieldData
insertCodec.readerCloseFunc = append(insertCodec.readerCloseFunc, readerClose(binlogReader))
case schemapb.DataType_DOUBLE:
var doubleFieldData DoubleFieldData
eventReader, err := binlogReader.NextEventReader()
if err != nil {
return -1, -1, nil, err
}
doubleFieldData.Data, err = eventReader.GetDoubleFromPayload()
if err != nil {
return -1, -1, nil, err
}
doubleFieldData.NumRows = len(doubleFieldData.Data)
resultData.Data[fieldID] = doubleFieldData
insertCodec.readerCloseFunc = append(insertCodec.readerCloseFunc, readerClose(binlogReader))
case schemapb.DataType_STRING:
var stringFieldData StringFieldData
eventReader, err := binlogReader.NextEventReader()
if err != nil {
return -1, -1, nil, err
}
length, err := eventReader.GetPayloadLengthFromReader()
stringFieldData.NumRows = length
if err != nil {
return -1, -1, nil, err
}
for i := 0; i < length; i++ {
singleString, err := eventReader.GetOneStringFromPayload(i)
switch dataType {
case schemapb.DataType_BOOL:
if resultData.Data[fieldID] == nil {
resultData.Data[fieldID] = &BoolFieldData{}
}
boolFieldData := resultData.Data[fieldID].(*BoolFieldData)
singleData, err := eventReader.GetBoolFromPayload()
if err != nil {
return -1, -1, nil, err
}
stringFieldData.Data = append(stringFieldData.Data, singleString)
}
resultData.Data[fieldID] = stringFieldData
insertCodec.readerCloseFunc = append(insertCodec.readerCloseFunc, readerClose(binlogReader))
case schemapb.DataType_VECTOR_BINARY:
var binaryVectorFieldData BinaryVectorFieldData
eventReader, err := binlogReader.NextEventReader()
if err != nil {
return -1, -1, nil, err
}
binaryVectorFieldData.Data, binaryVectorFieldData.Dim, err = eventReader.GetBinaryVectorFromPayload()
if err != nil {
return -1, -1, nil, err
}
binaryVectorFieldData.NumRows = len(binaryVectorFieldData.Data)
resultData.Data[fieldID] = binaryVectorFieldData
insertCodec.readerCloseFunc = append(insertCodec.readerCloseFunc, readerClose(binlogReader))
case schemapb.DataType_VECTOR_FLOAT:
var floatVectorFieldData FloatVectorFieldData
eventReader, err := binlogReader.NextEventReader()
if err != nil {
return -1, -1, nil, err
}
floatVectorFieldData.Data, floatVectorFieldData.Dim, err = eventReader.GetFloatVectorFromPayload()
if err != nil {
return -1, -1, nil, err
boolFieldData.Data = append(boolFieldData.Data, singleData...)
length, err := eventReader.GetPayloadLengthFromReader()
if err != nil {
return -1, -1, nil, err
}
boolFieldData.NumRows += length
resultData.Data[fieldID] = boolFieldData
case schemapb.DataType_INT8:
if resultData.Data[fieldID] == nil {
resultData.Data[fieldID] = &Int8FieldData{}
}
int8FieldData := resultData.Data[fieldID].(*Int8FieldData)
singleData, err := eventReader.GetInt8FromPayload()
if err != nil {
return -1, -1, nil, err
}
int8FieldData.Data = append(int8FieldData.Data, singleData...)
length, err := eventReader.GetPayloadLengthFromReader()
if err != nil {
return -1, -1, nil, err
}
int8FieldData.NumRows += length
resultData.Data[fieldID] = int8FieldData
case schemapb.DataType_INT16:
if resultData.Data[fieldID] == nil {
resultData.Data[fieldID] = &Int16FieldData{}
}
int16FieldData := resultData.Data[fieldID].(*Int16FieldData)
singleData, err := eventReader.GetInt16FromPayload()
if err != nil {
return -1, -1, nil, err
}
int16FieldData.Data = append(int16FieldData.Data, singleData...)
length, err := eventReader.GetPayloadLengthFromReader()
if err != nil {
return -1, -1, nil, err
}
int16FieldData.NumRows += length
resultData.Data[fieldID] = int16FieldData
case schemapb.DataType_INT32:
if resultData.Data[fieldID] == nil {
resultData.Data[fieldID] = &Int32FieldData{}
}
int32FieldData := resultData.Data[fieldID].(*Int32FieldData)
singleData, err := eventReader.GetInt32FromPayload()
if err != nil {
return -1, -1, nil, err
}
int32FieldData.Data = append(int32FieldData.Data, singleData...)
length, err := eventReader.GetPayloadLengthFromReader()
if err != nil {
return -1, -1, nil, err
}
int32FieldData.NumRows += length
resultData.Data[fieldID] = int32FieldData
case schemapb.DataType_INT64:
if resultData.Data[fieldID] == nil {
resultData.Data[fieldID] = &Int64FieldData{}
}
int64FieldData := resultData.Data[fieldID].(*Int64FieldData)
singleData, err := eventReader.GetInt64FromPayload()
if err != nil {
return -1, -1, nil, err
}
int64FieldData.Data = append(int64FieldData.Data, singleData...)
length, err := eventReader.GetPayloadLengthFromReader()
if err != nil {
return -1, -1, nil, err
}
int64FieldData.NumRows += length
resultData.Data[fieldID] = int64FieldData
case schemapb.DataType_FLOAT:
if resultData.Data[fieldID] == nil {
resultData.Data[fieldID] = &FloatFieldData{}
}
floatFieldData := resultData.Data[fieldID].(*FloatFieldData)
singleData, err := eventReader.GetFloatFromPayload()
if err != nil {
return -1, -1, nil, err
}
floatFieldData.Data = append(floatFieldData.Data, singleData...)
length, err := eventReader.GetPayloadLengthFromReader()
if err != nil {
return -1, -1, nil, err
}
floatFieldData.NumRows += length
resultData.Data[fieldID] = floatFieldData
case schemapb.DataType_DOUBLE:
if resultData.Data[fieldID] == nil {
resultData.Data[fieldID] = &DoubleFieldData{}
}
doubleFieldData := resultData.Data[fieldID].(*DoubleFieldData)
singleData, err := eventReader.GetDoubleFromPayload()
if err != nil {
return -1, -1, nil, err
}
doubleFieldData.Data = append(doubleFieldData.Data, singleData...)
length, err := eventReader.GetPayloadLengthFromReader()
if err != nil {
return -1, -1, nil, err
}
doubleFieldData.NumRows += length
resultData.Data[fieldID] = doubleFieldData
case schemapb.DataType_STRING:
if resultData.Data[fieldID] == nil {
resultData.Data[fieldID] = &StringFieldData{}
}
stringFieldData := resultData.Data[fieldID].(*StringFieldData)
length, err := eventReader.GetPayloadLengthFromReader()
if err != nil {
return -1, -1, nil, err
}
stringFieldData.NumRows += length
for i := 0; i < length; i++ {
singleString, err := eventReader.GetOneStringFromPayload(i)
if err != nil {
return -1, -1, nil, err
}
stringFieldData.Data = append(stringFieldData.Data, singleString)
}
resultData.Data[fieldID] = stringFieldData
case schemapb.DataType_VECTOR_BINARY:
if resultData.Data[fieldID] == nil {
resultData.Data[fieldID] = &BinaryVectorFieldData{}
}
binaryVectorFieldData := resultData.Data[fieldID].(*BinaryVectorFieldData)
var singleData []byte
singleData, binaryVectorFieldData.Dim, err = eventReader.GetBinaryVectorFromPayload()
if err != nil {
return -1, -1, nil, err
}
binaryVectorFieldData.Data = append(binaryVectorFieldData.Data, singleData...)
length, err := eventReader.GetPayloadLengthFromReader()
if err != nil {
return -1, -1, nil, err
}
binaryVectorFieldData.NumRows += length
resultData.Data[fieldID] = binaryVectorFieldData
case schemapb.DataType_VECTOR_FLOAT:
if resultData.Data[fieldID] == nil {
resultData.Data[fieldID] = &FloatVectorFieldData{}
}
floatVectorFieldData := resultData.Data[fieldID].(*FloatVectorFieldData)
var singleData []float32
singleData, floatVectorFieldData.Dim, err = eventReader.GetFloatVectorFromPayload()
if err != nil {
return -1, -1, nil, err
}
floatVectorFieldData.Data = append(floatVectorFieldData.Data, singleData...)
length, err := eventReader.GetPayloadLengthFromReader()
if err != nil {
return -1, -1, nil, err
}
floatVectorFieldData.NumRows += length
resultData.Data[fieldID] = floatVectorFieldData
default:
return -1, -1, nil, errors.Errorf("undefined data type %d", dataType)
}
floatVectorFieldData.NumRows = len(floatVectorFieldData.Data) / 8
resultData.Data[fieldID] = floatVectorFieldData
insertCodec.readerCloseFunc = append(insertCodec.readerCloseFunc, readerClose(binlogReader))
default:
return -1, -1, nil, errors.Errorf("undefined data type %d", dataType)
}
insertCodec.readerCloseFunc = append(insertCodec.readerCloseFunc, readerClose(binlogReader))
}
return pID, sID, &resultData, nil
return pID, sID, resultData, nil
}
func (insertCodec *InsertCodec) Close() error {
......@@ -436,8 +498,8 @@ func (dataDefinitionCodec *DataDefinitionCodec) Serialize(ts []Timestamp, ddRequ
return nil, err
}
blobs = append(blobs, &Blob{
key: "",
value: buffer,
Key: "",
Value: buffer,
})
writer, err = NewDDLBinlogWriter(schemapb.DataType_INT64, dataDefinitionCodec.Schema.ID)
......@@ -470,8 +532,8 @@ func (dataDefinitionCodec *DataDefinitionCodec) Serialize(ts []Timestamp, ddRequ
return nil, err
}
blobs = append(blobs, &Blob{
key: "",
value: buffer,
Key: "",
Value: buffer,
})
return blobs, nil
......@@ -487,37 +549,35 @@ func (dataDefinitionCodec *DataDefinitionCodec) Deserialize(blobs []*Blob) (ts [
}
var requestsStrings []string
var resultTs []Timestamp
for _, blob := range blobs {
binlogReader, err := NewBinlogReader(blob.value)
var blobList BlobList = blobs
sort.Sort(blobList)
for _, blob := range blobList {
binlogReader, err := NewBinlogReader(blob.Value)
if err != nil {
return nil, nil, err
}
dataType := binlogReader.PayloadDataType
switch dataType {
case schemapb.DataType_INT64:
for {
eventReader, err := binlogReader.NextEventReader()
if err != nil {
return nil, nil, err
}
int64Ts, err := eventReader.GetInt64FromPayload()
if err != nil {
return nil, nil, err
}
for _, singleTs := range int64Ts {
resultTs = append(resultTs, Timestamp(singleTs))
}
dataDefinitionCodec.readerCloseFunc = append(dataDefinitionCodec.readerCloseFunc, readerClose(binlogReader))
case schemapb.DataType_STRING:
binlogReader, err := NewBinlogReader(blob.value)
if err != nil {
return nil, nil, err
if eventReader == nil {
break
}
eventReader, err := binlogReader.NextEventReader()
if err != nil {
return nil, nil, err
}
for eventReader != nil {
switch dataType {
case schemapb.DataType_INT64:
int64Ts, err := eventReader.GetInt64FromPayload()
if err != nil {
return nil, nil, err
}
for _, singleTs := range int64Ts {
resultTs = append(resultTs, Timestamp(singleTs))
}
case schemapb.DataType_STRING:
length, err := eventReader.GetPayloadLengthFromReader()
if err != nil {
return nil, nil, err
......@@ -529,14 +589,10 @@ func (dataDefinitionCodec *DataDefinitionCodec) Deserialize(blobs []*Blob) (ts [
}
requestsStrings = append(requestsStrings, singleString)
}
eventReader, err = binlogReader.NextEventReader()
if err != nil {
return nil, nil, err
}
}
dataDefinitionCodec.readerCloseFunc = append(dataDefinitionCodec.readerCloseFunc, readerClose(binlogReader))
}
dataDefinitionCodec.readerCloseFunc = append(dataDefinitionCodec.readerCloseFunc, readerClose(binlogReader))
}
return resultTs, requestsStrings, nil
......
internal/storage/data_codec_test.go
浏览文件 @ 0b9cffaf
package storage
import (
"fmt"
"testing"
"github.com/stretchr/testify/assert"
......@@ -23,6 +24,13 @@ func TestInsertCodec(t *testing.T) {
Description: "schema",
AutoID: true,
Fields: []*schemapb.FieldSchema{
{
FieldID: 0,
Name: "row_id",
IsPrimaryKey: false,
Description: "row_id",
DataType: schemapb.DataType_INT64,
},
{
FieldID: 1,
Name: "Ts",
......@@ -108,63 +116,155 @@ func TestInsertCodec(t *testing.T) {
base,
make([]func() error, 0),
}
insertData := &InsertData{
insertDataFirst := &InsertData{
Data: map[int64]FieldData{
0: &Int64FieldData{
NumRows: 2,
Data: []int64{3, 4},
},
1: &Int64FieldData{
NumRows: 2,
Data: []int64{3, 4},
},
100: &BoolFieldData{
NumRows: 2,
Data: []bool{true, false},
},
101: &Int8FieldData{
NumRows: 2,
Data: []int8{3, 4},
},
102: &Int16FieldData{
NumRows: 2,
Data: []int16{3, 4},
},
103: &Int32FieldData{
NumRows: 2,
Data: []int32{3, 4},
},
104: &Int64FieldData{
NumRows: 2,
Data: []int64{3, 4},
},
105: &FloatFieldData{
NumRows: 2,
Data: []float32{3, 4},
},
106: &DoubleFieldData{
NumRows: 2,
Data: []float64{3, 4},
},
107: &StringFieldData{
NumRows: 2,
Data: []string{"3", "4"},
},
108: &BinaryVectorFieldData{
NumRows: 2,
Data: []byte{0, 255},
Dim: 8,
},
109: &FloatVectorFieldData{
NumRows: 2,
Data: []float32{0, 1, 2, 3, 4, 5, 6, 7, 0, 1, 2, 3, 4, 5, 6, 7},
Dim: 8,
},
},
}
insertDataSecond := &InsertData{
Data: map[int64]FieldData{
1: Int64FieldData{
0: &Int64FieldData{
NumRows: 2,
Data: []int64{1, 2},
},
1: &Int64FieldData{
NumRows: 2,
Data: []int64{1, 2},
},
100: BoolFieldData{
100: &BoolFieldData{
NumRows: 2,
Data: []bool{true, false},
},
101: Int8FieldData{
101: &Int8FieldData{
NumRows: 2,
Data: []int8{1, 2},
},
102: Int16FieldData{
102: &Int16FieldData{
NumRows: 2,
Data: []int16{1, 2},
},
103: Int32FieldData{
103: &Int32FieldData{
NumRows: 2,
Data: []int32{1, 2},
},
104: Int64FieldData{
104: &Int64FieldData{
NumRows: 2,
Data: []int64{1, 2},
},
105: FloatFieldData{
105: &FloatFieldData{
NumRows: 2,
Data: []float32{1, 2},
},
106: DoubleFieldData{
106: &DoubleFieldData{
NumRows: 2,
Data: []float64{1, 2},
},
107: StringFieldData{
107: &StringFieldData{
NumRows: 2,
Data: []string{"1", "2"},
},
108: BinaryVectorFieldData{
NumRows: 8,
Data: []byte{0, 255, 0, 1, 0, 1, 0, 1},
108: &BinaryVectorFieldData{
NumRows: 2,
Data: []byte{0, 255},
Dim: 8,
},
109: FloatVectorFieldData{
NumRows: 1,
Data: []float32{0, 1, 2, 3, 4, 5, 6, 7},
109: &FloatVectorFieldData{
NumRows: 2,
Data: []float32{0, 1, 2, 3, 4, 5, 6, 7, 0, 1, 2, 3, 4, 5, 6, 7},
Dim: 8,
},
},
}
blobs, err := insertCodec.Serialize(1, 1, insertData)
firstBlobs, err := insertCodec.Serialize(1, 1, insertDataFirst)
assert.Nil(t, err)
partitionID, segmentID, resultData, err := insertCodec.Deserialize(blobs)
for _, blob := range firstBlobs {
blob.Key = fmt.Sprintf("1/insert_log/2/3/4/5/%d", 100)
}
secondBlobs, err := insertCodec.Serialize(1, 1, insertDataSecond)
assert.Nil(t, err)
assert.Equal(t, partitionID, int64(1))
assert.Equal(t, segmentID, int64(1))
assert.Equal(t, resultData, insertData)
for _, blob := range secondBlobs {
blob.Key = fmt.Sprintf("1/insert_log/2/3/4/5/%d", 99)
}
resultBlobs := append(firstBlobs, secondBlobs...)
partitionID, segmentID, resultData, err := insertCodec.Deserialize(resultBlobs)
assert.Nil(t, err)
assert.Equal(t, int64(1), partitionID)
assert.Equal(t, int64(1), segmentID)
assert.Equal(t, 4, resultData.Data[0].(*Int64FieldData).NumRows)
assert.Equal(t, 4, resultData.Data[1].(*Int64FieldData).NumRows)
assert.Equal(t, 4, resultData.Data[100].(*BoolFieldData).NumRows)
assert.Equal(t, 4, resultData.Data[101].(*Int8FieldData).NumRows)
assert.Equal(t, 4, resultData.Data[102].(*Int16FieldData).NumRows)
assert.Equal(t, 4, resultData.Data[103].(*Int32FieldData).NumRows)
assert.Equal(t, 4, resultData.Data[104].(*Int64FieldData).NumRows)
assert.Equal(t, 4, resultData.Data[105].(*FloatFieldData).NumRows)
assert.Equal(t, 4, resultData.Data[106].(*DoubleFieldData).NumRows)
assert.Equal(t, 4, resultData.Data[107].(*StringFieldData).NumRows)
assert.Equal(t, 4, resultData.Data[108].(*BinaryVectorFieldData).NumRows)
assert.Equal(t, 4, resultData.Data[109].(*FloatVectorFieldData).NumRows)
assert.Equal(t, []int64{1, 2, 3, 4}, resultData.Data[0].(*Int64FieldData).Data)
assert.Equal(t, []int64{1, 2, 3, 4}, resultData.Data[1].(*Int64FieldData).Data)
assert.Equal(t, []bool{true, false, true, false}, resultData.Data[100].(*BoolFieldData).Data)
assert.Equal(t, []int8{1, 2, 3, 4}, resultData.Data[101].(*Int8FieldData).Data)
assert.Equal(t, []int16{1, 2, 3, 4}, resultData.Data[102].(*Int16FieldData).Data)
assert.Equal(t, []int32{1, 2, 3, 4}, resultData.Data[103].(*Int32FieldData).Data)
assert.Equal(t, []int64{1, 2, 3, 4}, resultData.Data[104].(*Int64FieldData).Data)
assert.Equal(t, []float32{1, 2, 3, 4}, resultData.Data[105].(*FloatFieldData).Data)
assert.Equal(t, []float64{1, 2, 3, 4}, resultData.Data[106].(*DoubleFieldData).Data)
assert.Equal(t, []string{"1", "2", "3", "4"}, resultData.Data[107].(*StringFieldData).Data)
assert.Equal(t, []byte{0, 255, 0, 255}, resultData.Data[108].(*BinaryVectorFieldData).Data)
assert.Equal(t, []float32{0, 1, 2, 3, 4, 5, 6, 7, 0, 1, 2, 3, 4, 5, 6, 7, 0, 1, 2, 3, 4, 5, 6, 7, 0, 1, 2, 3, 4, 5, 6, 7},
resultData.Data[109].(*FloatVectorFieldData).Data)
assert.Nil(t, insertCodec.Close())
}
func TestDDCodec(t *testing.T) {
......@@ -240,6 +340,9 @@ func TestDDCodec(t *testing.T) {
}
blobs, err := dataDefinitionCodec.Serialize(ts, ddRequests, eventTypeCodes)
assert.Nil(t, err)
for _, blob := range blobs {
blob.Key = fmt.Sprintf("1/data_definition/3/4/5/%d", 99)
}
resultTs, resultRequests, err := dataDefinitionCodec.Deserialize(blobs)
assert.Nil(t, err)
assert.Equal(t, resultTs, ts)
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或