admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2026-01-07 19:31:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

enhance: store system fields in segcore (#28524) (#28727)

Browse Source 
we need the system fields info for some usacase
fix: #28523

pr: #28524

---------

Signed-off-by: yah01 <yah2er0ne@outlook.com>
This commit is contained in:
yah01 2023-11-28 15:32:31 +08:00 committed by GitHub
parent ecfa0a9b10
commit 8ea1ef03ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
internal/core/src/common/Schema.cpp
View File

@ -46,7 +46,6 @@ Schema::ParseFrom(const milvus::proto::schema::CollectionSchema& schema_proto) {
AssertInfo(is_system,
"invalid system type: name(" + name.get() + "), id(" +
std::to_string(field_id.get()) + ")");
continue;
}
auto data_type = DataType(child.data_type());

16
internal/core/src/segcore/SegmentGrowingImpl.cpp
View File

@ -83,11 +83,14 @@ SegmentGrowingImpl::Insert(int64_t reserved_offset,
const Timestamp* timestamps_raw,
const InsertData* insert_data) {
AssertInfo(insert_data->num_rows() == num_rows,
"Entities_raw count not equal to insert size");
fmt::format("Entities_raw count {} not equal to insert size {}",
num_rows,
insert_data->num_rows()));
// AssertInfo(insert_data->fields_data_size() == schema_->size(),
// "num fields of insert data not equal to num of schema fields");
// step 1: check insert data if valid
std::unordered_map<FieldId, int64_t> field_id_to_offset;
field_id_to_offset.reserve(insert_data->fields_data_size());
int64_t field_offset = 0;
for (const auto& field : insert_data->fields_data()) {
auto field_id = FieldId(field.field_id());
@ -102,9 +105,14 @@ SegmentGrowingImpl::Insert(int64_t reserved_offset,
insert_record_.timestamps_.set_data_raw(
reserved_offset, timestamps_raw, num_rows);
insert_record_.row_ids_.set_data_raw(reserved_offset, row_ids, num_rows);
for (auto [field_id, field_meta] : schema_->get_fields()) {
AssertInfo(field_id_to_offset.count(field_id), "Cannot find field_id");
auto data_offset = field_id_to_offset[field_id];
for (auto& [field_id, field_meta] : schema_->get_fields()) {
if (field_id.get() < START_USER_FIELDID) {
continue;
}
auto it = field_id_to_offset.find(field_id);
AssertInfo(it != field_id_to_offset.end(),
fmt::format("can't find field {}", field_id.get()));
auto data_offset = it->second;
if (!indexing_record_.SyncDataWithIndex(field_id)) {
insert_record_.get_field_data_base(field_id)->set_data_raw(
reserved_offset,