mirror of
https://gitee.com/milvus-io/milvus.git
synced 2025-12-07 01:28:27 +08:00
Cherry-pick from master pr: #45061 #45488 #45803 #46017 #44991 #45132 #45723 #45726 #45798 #45897 #45918 #44998 This feature integrates the Storage V2 (Loon) FFI interface as a unified storage layer for segment loading and index building in Milvus. It enables manifest-based data access, replacing the traditional binlog-based approach with a more efficient columnar storage format. Key changes: ### Segment Self-Managed Loading Architecture - Move segment loading orchestration from Go layer to C++ segcore - Add NewSegmentWithLoadInfo() API for passing load info during segment creation - Implement SetLoadInfo() and Load() methods in SegmentInterface - Support parallel loading of indexed and non-indexed fields - Enable both sealed and growing segments to self-manage loading ### Storage V2 FFI Integration - Integrate milvus-storage library's FFI interface for packed columnar data - Add manifest path support throughout the data path (SegmentInfo, LoadInfo) - Implement ManifestReader for generating manifests from binlogs - Support zero-copy data exchange using Arrow C Data Interface - Add ToCStorageConfig() for Go-to-C storage config conversion ### Manifest-Based Index Building - Extend FileManagerContext to carry loon_ffi_properties - Implement GetFieldDatasFromManifest() using Arrow C Stream interface - Support manifest-based reading in DiskFileManagerImpl and MemFileManagerImpl - Add fallback to traditional segment insert files when manifest unavailable ### Compaction Pipeline Updates - Include manifest path in all compaction task builders (clustering, L0, mix) - Update BulkPackWriterV2 to return manifest path - Propagate manifest metadata through compaction pipeline ### Configuration & Protocol - Add common.storageV2.useLoonFFI config option (default: false) - Add manifest_path field to SegmentLoadInfo and related proto messages - Add manifest field to compaction segment messages ### Bug Fixes - Fix mmap settings not applied during segment load (key typo fix) - Populate index info after segment loading to prevent redundant load tasks - Fix memory corruption by removing premature transaction handle destruction Related issues: #44956, #45060, #39173 ## Individual Cherry-Picked Commits 1. **e1c923b5cc** - fix: apply mmap settings correctly during segment load (#46017) 2. **63b912370b** - enhance: use milvus-storage internal C++ Reader API for Loon FFI (#45897) 3. **bfc192faa5** - enhance: Resolve issues integrating loon FFI (#45918) 4. **fb18564631** - enhance: support manifest-based index building with Loon FFI reader (#45726) 5. **b9ec2392b9** - enhance: integrate StorageV2 FFI interface for manifest-based segment loading (#45798) 6. **66db3c32e6** - enhance: integrate Storage V2 FFI interface for unified storage access (#45723) 7. **ae789273ac** - fix: populate index info after segment loading to prevent redundant load tasks (#45803) 8. **49688b0be2** - enhance: Move segment loading logic from Go layer to segcore for self-managed loading (#45488) 9. **5b2df88bac** - enhance: [StorageV2] Integrate FFI interface for packed reader (#45132) 10. **91ff5706ac** - enhance: [StorageV2] add manifest path support for FFI integration (#44991) 11. **2192bb4a85** - enhance: add NewSegmentWithLoadInfo API to support segment self-managed loading (#45061) 12. **4296b01da0** - enhance: update delta log serialization APIs to integrate storage V2 (#44998) ## Technical Details ### Architecture Changes - **Before**: Go layer orchestrated segment loading, making multiple CGO calls - **After**: Segments autonomously manage loading in C++ layer with single entry point ### Storage Access Pattern - **Before**: Read individual binlog files through Go storage layer - **After**: Read manifest file that references packed columnar data via FFI ### Benefits - Reduced cross-language call overhead - Better resource management at C++ level - Improved I/O performance through batched streaming reads - Cleaner separation of concerns between Go and C++ layers - Foundation for proactive schema evolution handling --------- Signed-off-by: Ted Xu <ted.xu@zilliz.com> Signed-off-by: Congqi Xia <congqi.xia@zilliz.com> Co-authored-by: Ted Xu <ted.xu@zilliz.com>
172 lines
5.6 KiB
C++
172 lines
5.6 KiB
C++
// Licensed to the LF AI & Data foundation under one
|
|
// or more contributor license agreements. See the NOTICE file
|
|
// distributed with this work for additional information
|
|
// regarding copyright ownership. The ASF licenses this file
|
|
// to you under the Apache License, Version 2.0 (the
|
|
// "License"); you may not use this file except in compliance
|
|
// with the License. You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
#include <algorithm>
|
|
#include <cstddef>
|
|
#include <optional>
|
|
#include <string>
|
|
#include "arrow/type.h"
|
|
#include <boost/lexical_cast.hpp>
|
|
#include <google/protobuf/text_format.h>
|
|
#include <memory>
|
|
|
|
#include "Schema.h"
|
|
#include "SystemProperty.h"
|
|
#include "arrow/util/key_value_metadata.h"
|
|
#include "common/Consts.h"
|
|
#include "milvus-storage/common/constants.h"
|
|
#include "pb/common.pb.h"
|
|
#include "protobuf_utils.h"
|
|
|
|
namespace milvus {
|
|
|
|
using std::string;
|
|
|
|
std::shared_ptr<Schema>
|
|
Schema::ParseFrom(const milvus::proto::schema::CollectionSchema& schema_proto) {
|
|
auto schema = std::make_shared<Schema>();
|
|
// schema->set_auto_id(schema_proto.autoid());
|
|
|
|
// NOTE: only two system
|
|
|
|
auto process_field = [&schema, &schema_proto](const auto& child) {
|
|
auto field_id = FieldId(child.fieldid());
|
|
|
|
auto f = FieldMeta::ParseFrom(child);
|
|
schema->AddField(std::move(f));
|
|
|
|
if (child.is_primary_key()) {
|
|
AssertInfo(!schema->get_primary_field_id().has_value(),
|
|
"repetitive primary key");
|
|
schema->set_primary_field_id(field_id);
|
|
}
|
|
|
|
if (child.is_dynamic()) {
|
|
Assert(schema_proto.enable_dynamic_field());
|
|
AssertInfo(!schema->get_dynamic_field_id().has_value(),
|
|
"repetitive dynamic field");
|
|
schema->set_dynamic_field_id(field_id);
|
|
}
|
|
|
|
auto [has_setting, enabled] =
|
|
GetBoolFromRepeatedKVs(child.type_params(), MMAP_ENABLED_KEY);
|
|
if (has_setting) {
|
|
schema->mmap_fields_[field_id] = enabled;
|
|
}
|
|
};
|
|
|
|
for (const milvus::proto::schema::FieldSchema& child :
|
|
schema_proto.fields()) {
|
|
process_field(child);
|
|
}
|
|
|
|
for (const milvus::proto::schema::StructArrayFieldSchema& child :
|
|
schema_proto.struct_array_fields()) {
|
|
for (const auto& sub_field : child.fields()) {
|
|
process_field(sub_field);
|
|
}
|
|
}
|
|
|
|
std::tie(schema->has_mmap_setting_, schema->mmap_enabled_) =
|
|
GetBoolFromRepeatedKVs(schema_proto.properties(), MMAP_ENABLED_KEY);
|
|
|
|
AssertInfo(schema->get_primary_field_id().has_value(),
|
|
"primary key should be specified");
|
|
|
|
return schema;
|
|
}
|
|
|
|
const FieldMeta FieldMeta::RowIdMeta(
|
|
FieldName("RowID"), RowFieldID, DataType::INT64, false, std::nullopt);
|
|
|
|
const ArrowSchemaPtr
|
|
Schema::ConvertToArrowSchema() const {
|
|
arrow::FieldVector arrow_fields;
|
|
for (auto& field : fields_) {
|
|
auto meta = field.second;
|
|
int dim = IsVectorDataType(meta.get_data_type()) &&
|
|
!IsSparseFloatVectorDataType(meta.get_data_type())
|
|
? meta.get_dim()
|
|
: 1;
|
|
|
|
std::shared_ptr<arrow::DataType> arrow_data_type = nullptr;
|
|
auto data_type = meta.get_data_type();
|
|
if (data_type == DataType::VECTOR_ARRAY) {
|
|
arrow_data_type = GetArrowDataTypeForVectorArray(
|
|
meta.get_element_type(), meta.get_dim());
|
|
} else {
|
|
arrow_data_type = GetArrowDataType(data_type, dim);
|
|
}
|
|
|
|
auto arrow_field = std::make_shared<arrow::Field>(
|
|
meta.get_name().get(),
|
|
arrow_data_type,
|
|
meta.is_nullable(),
|
|
arrow::key_value_metadata({milvus_storage::ARROW_FIELD_ID_KEY},
|
|
{std::to_string(meta.get_id().get())}));
|
|
arrow_fields.push_back(arrow_field);
|
|
}
|
|
return arrow::schema(arrow_fields);
|
|
}
|
|
|
|
proto::schema::CollectionSchema
|
|
Schema::ToProto() const {
|
|
proto::schema::CollectionSchema schema_proto;
|
|
schema_proto.set_enable_dynamic_field(dynamic_field_id_opt_.has_value());
|
|
|
|
for (const auto& field_id : field_ids_) {
|
|
const auto& meta = fields_.at(field_id);
|
|
auto* field_proto = schema_proto.add_fields();
|
|
*field_proto = meta.ToProto();
|
|
|
|
if (primary_field_id_opt_.has_value() &&
|
|
field_id == primary_field_id_opt_.value()) {
|
|
field_proto->set_is_primary_key(true);
|
|
}
|
|
if (dynamic_field_id_opt_.has_value() &&
|
|
field_id == dynamic_field_id_opt_.value()) {
|
|
field_proto->set_is_dynamic(true);
|
|
}
|
|
}
|
|
|
|
return schema_proto;
|
|
}
|
|
|
|
std::unique_ptr<std::vector<FieldMeta>>
|
|
Schema::AbsentFields(Schema& old_schema) const {
|
|
std::vector<FieldMeta> result;
|
|
for (const auto& [field_id, field_meta] : fields_) {
|
|
auto it = old_schema.fields_.find(field_id);
|
|
if (it == old_schema.fields_.end()) {
|
|
result.emplace_back(field_meta);
|
|
}
|
|
}
|
|
|
|
return std::make_unique<std::vector<FieldMeta>>(result);
|
|
}
|
|
|
|
std::pair<bool, bool>
|
|
Schema::MmapEnabled(const FieldId& field_id) const {
|
|
auto it = mmap_fields_.find(field_id);
|
|
// fallback to collection-level config
|
|
if (it == mmap_fields_.end()) {
|
|
return {has_mmap_setting_, mmap_enabled_};
|
|
}
|
|
return {true, it->second};
|
|
}
|
|
|
|
} // namespace milvus
|