mirror of
https://gitee.com/milvus-io/milvus.git
synced 2025-12-06 17:18:35 +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>
180 lines
6.0 KiB
Go
180 lines
6.0 KiB
Go
// Copyright 2023 Zilliz
|
|
//
|
|
// Licensed 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.
|
|
|
|
package packed
|
|
|
|
/*
|
|
#cgo pkg-config: milvus_core milvus-storage
|
|
|
|
#include <stdlib.h>
|
|
#include "milvus-storage/ffi_c.h"
|
|
#include "segcore/packed_writer_c.h"
|
|
#include "segcore/column_groups_c.h"
|
|
#include "arrow/c/abi.h"
|
|
#include "arrow/c/helpers.h"
|
|
*/
|
|
import "C"
|
|
|
|
import (
|
|
"strings"
|
|
"unsafe"
|
|
|
|
"github.com/apache/arrow/go/v17/arrow"
|
|
"github.com/apache/arrow/go/v17/arrow/cdata"
|
|
"github.com/samber/lo"
|
|
"go.uber.org/zap"
|
|
|
|
"github.com/milvus-io/milvus/internal/storagecommon"
|
|
"github.com/milvus-io/milvus/pkg/v2/log"
|
|
"github.com/milvus-io/milvus/pkg/v2/proto/indexcgopb"
|
|
"github.com/milvus-io/milvus/pkg/v2/proto/indexpb"
|
|
"github.com/milvus-io/milvus/pkg/v2/util/paramtable"
|
|
)
|
|
|
|
func createStorageConfig() *indexpb.StorageConfig {
|
|
var storageConfig *indexpb.StorageConfig
|
|
|
|
if paramtable.Get().CommonCfg.StorageType.GetValue() == "local" {
|
|
storageConfig = &indexpb.StorageConfig{
|
|
RootPath: paramtable.Get().LocalStorageCfg.Path.GetValue(),
|
|
StorageType: paramtable.Get().CommonCfg.StorageType.GetValue(),
|
|
}
|
|
} else {
|
|
storageConfig = &indexpb.StorageConfig{
|
|
Address: paramtable.Get().MinioCfg.Address.GetValue(),
|
|
AccessKeyID: paramtable.Get().MinioCfg.AccessKeyID.GetValue(),
|
|
SecretAccessKey: paramtable.Get().MinioCfg.SecretAccessKey.GetValue(),
|
|
UseSSL: paramtable.Get().MinioCfg.UseSSL.GetAsBool(),
|
|
SslCACert: paramtable.Get().MinioCfg.SslCACert.GetValue(),
|
|
BucketName: paramtable.Get().MinioCfg.BucketName.GetValue(),
|
|
RootPath: paramtable.Get().MinioCfg.RootPath.GetValue(),
|
|
UseIAM: paramtable.Get().MinioCfg.UseIAM.GetAsBool(),
|
|
IAMEndpoint: paramtable.Get().MinioCfg.IAMEndpoint.GetValue(),
|
|
StorageType: paramtable.Get().CommonCfg.StorageType.GetValue(),
|
|
Region: paramtable.Get().MinioCfg.Region.GetValue(),
|
|
UseVirtualHost: paramtable.Get().MinioCfg.UseVirtualHost.GetAsBool(),
|
|
CloudProvider: paramtable.Get().MinioCfg.CloudProvider.GetValue(),
|
|
RequestTimeoutMs: paramtable.Get().MinioCfg.RequestTimeoutMs.GetAsInt64(),
|
|
GcpCredentialJSON: paramtable.Get().MinioCfg.GcpCredentialJSON.GetValue(),
|
|
}
|
|
}
|
|
|
|
return storageConfig
|
|
}
|
|
|
|
func NewFFIPackedWriter(basePath string, schema *arrow.Schema, columnGroups []storagecommon.ColumnGroup, storageConfig *indexpb.StorageConfig, storagePluginContext *indexcgopb.StoragePluginContext) (*FFIPackedWriter, error) {
|
|
cBasePath := C.CString(basePath)
|
|
defer C.free(unsafe.Pointer(cBasePath))
|
|
|
|
var cas cdata.CArrowSchema
|
|
cdata.ExportArrowSchema(schema, &cas)
|
|
cSchema := (*C.struct_ArrowSchema)(unsafe.Pointer(&cas))
|
|
defer cdata.ReleaseCArrowSchema(&cas)
|
|
|
|
if storageConfig == nil {
|
|
storageConfig = createStorageConfig()
|
|
}
|
|
|
|
pattern := strings.Join(lo.Map(columnGroups, func(columnGroup storagecommon.ColumnGroup, _ int) string {
|
|
return strings.Join(lo.Map(columnGroup.Columns, func(index int, _ int) string {
|
|
return schema.Field(index).Name
|
|
}), "|")
|
|
}), ",")
|
|
|
|
cProperties, err := MakePropertiesFromStorageConfig(storageConfig, map[string]string{
|
|
PropertyWriterPolicy: "schema_based",
|
|
PropertyWriterSchemaBasedPattern: pattern,
|
|
})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
var writerHandle C.WriterHandle
|
|
|
|
result := C.writer_new(cBasePath, cSchema, cProperties, &writerHandle)
|
|
|
|
err = HandleFFIResult(result)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return &FFIPackedWriter{
|
|
basePath: basePath,
|
|
cWriterHandle: writerHandle,
|
|
cProperties: cProperties,
|
|
}, nil
|
|
}
|
|
|
|
func (pw *FFIPackedWriter) WriteRecordBatch(recordBatch arrow.Record) error {
|
|
var caa cdata.CArrowArray
|
|
var cas cdata.CArrowSchema
|
|
|
|
// Export the record batch to C Arrow format
|
|
cdata.ExportArrowRecordBatch(recordBatch, &caa, &cas)
|
|
defer cdata.ReleaseCArrowArray(&caa)
|
|
defer cdata.ReleaseCArrowSchema(&cas)
|
|
|
|
// Convert to C struct
|
|
cArray := (*C.struct_ArrowArray)(unsafe.Pointer(&caa))
|
|
|
|
result := C.writer_write(pw.cWriterHandle, cArray)
|
|
return HandleFFIResult(result)
|
|
}
|
|
|
|
func (pw *FFIPackedWriter) Close() (string, error) {
|
|
var manifest *C.char
|
|
|
|
result := C.writer_close(pw.cWriterHandle, nil, nil, 0, &manifest)
|
|
if err := HandleFFIResult(result); err != nil {
|
|
return "", err
|
|
}
|
|
|
|
cBasePath := C.CString(pw.basePath)
|
|
defer C.free(unsafe.Pointer(cBasePath))
|
|
var transationHandle C.TransactionHandle
|
|
result = C.transaction_begin(cBasePath, pw.cProperties, &transationHandle)
|
|
if err := HandleFFIResult(result); err != nil {
|
|
return "", err
|
|
}
|
|
defer C.transaction_destroy(transationHandle)
|
|
|
|
// #define LOON_TRANSACTION_UPDATE_ADDFILES 0
|
|
// #define LOON_TRANSACTION_UPDATE_ADDFEILD 1
|
|
// #define LOON_TRANSACTION_UPDATE_MAX 2
|
|
|
|
// #define LOON_TRANSACTION_RESOLVE_FAIL 0
|
|
// #define LOON_TRANSACTION_RESOLVE_MERGE 1
|
|
// #define LOON_TRANSACTION_RESOLVE_MAX 2
|
|
|
|
var commitResult C.bool
|
|
result = C.transaction_commit(transationHandle, C.int16_t(0), C.int16_t(0), manifest, &commitResult)
|
|
if err := HandleFFIResult(result); err != nil {
|
|
return "", err
|
|
}
|
|
|
|
var readVersion C.int64_t
|
|
|
|
// TODO: not atomic, need to get version from transaction
|
|
var cOutManifest *C.char
|
|
result = C.get_latest_column_groups(cBasePath, pw.cProperties, &cOutManifest, &readVersion)
|
|
if err := HandleFFIResult(result); err != nil {
|
|
return "", err
|
|
}
|
|
outManifest := C.GoString(cOutManifest)
|
|
log.Info("FFI writer closed with output manifest", zap.String("manifest", outManifest), zap.Int64("version", int64(readVersion)))
|
|
|
|
defer C.properties_free(pw.cProperties)
|
|
return MarshalManifestPath(pw.basePath, int64(readVersion)), nil
|
|
}
|