mirror of
https://gitee.com/milvus-io/milvus.git
synced 2025-12-06 09:08:43 +08:00
Related #44956 This commit integrates the Storage V2 FFI (Foreign Function Interface) interface throughout the Milvus codebase, enabling unified storage access through the Loon FFI layer. This is a significant step towards standardizing storage operations across different storage versions. 1. Configuration Support - **configs/milvus.yaml**: Added `useLoonFFI` configuration flag under `common.storage.file.splitByAvgSize` section - Allows runtime toggle between traditional binlog readers and new FFI-based manifest readers - Default: `false` (maintains backward compatibility) 2. Core FFI Infrastructure Enhanced Utilities (internal/core/src/storage/loon_ffi/util.cpp/h) - **ToCStorageConfig()**: Converts Go's `StorageConfig` to C's `CStorageConfig` struct for FFI calls - **GetManifest()**: Parses manifest JSON and retrieves latest column groups using FFI - Accepts manifest path with `base_path` and `ver` fields - Calls `get_latest_column_groups()` FFI function - Returns column group information as string - Comprehensive error handling for JSON parsing and FFI errors 3. Dependency Updates - **internal/core/thirdparty/milvus-storage/CMakeLists.txt**: - Updated milvus-storage version from `0883026` to `302143c` - Ensures compatibility with latest FFI interfaces 4. Data Coordinator Changes All compaction task builders now include manifest path in segment binlogs: - **compaction_task_clustering.go**: Added `Manifest: segInfo.GetManifestPath()` to segment binlogs - **compaction_task_l0.go**: Added manifest path to both L0 segment selection and compaction plan building - **compaction_task_mix.go**: Added manifest path to mixed compaction segment binlogs - **meta.go**: Updated metadata completion logic: - `completeClusterCompactionMutation()`: Set `ManifestPath` in new segment info - `completeMixCompactionMutation()`: Preserve manifest path in compacted segments - `completeSortCompactionMutation()`: Include manifest path in sorted segments 5. Data Node Compactor Enhancements All compactors updated to support dual-mode reading (binlog vs manifest): 6. Flush & Sync Manager Updates Pack Writer V2 (pack_writer_v2.go) - **BulkPackWriterV2.Write()**: Extended return signature to include `manifest string` - Implementation: - Generate manifest path: `path.Join(pack.segmentID, "manifest.json")` - Write packed data using FFI-based writer - Return manifest path along with binlogs, deltas, and stats Task Handling (task.go) - Updated all sync task result handling to accommodate new manifest return value - Ensured backward compatibility for callers not using manifest 7. Go Storage Layer Integration New Interfaces and Implementations - **record_reader.go**: Interface for unified record reading across storage versions - **record_writer.go**: Interface for unified record writing across storage versions - **binlog_record_writer.go**: Concrete implementation for traditional binlog-based writing Enhanced Schema Support (schema.go, schema_test.go) - Schema conversion utilities to support FFI-based storage operations - Ensures proper Arrow schema mapping for V2 storage Serialization Updates - **serde.go, serde_events.go, serde_events_v2.go**: Updated to work with new reader/writer interfaces - Test files updated to validate dual-mode serialization 8. Storage V2 Packed Format FFI Common (storagev2/packed/ffi_common.go) - Common FFI utilities and type conversions for packed storage format Packed Writer FFI (storagev2/packed/packed_writer_ffi.go) - FFI-based implementation of packed writer - Integrates with Loon storage layer for efficient columnar writes Packed Reader FFI (storagev2/packed/packed_reader_ffi.go) - Already existed, now complemented by writer implementation 9. Protocol Buffer Updates data_coord.proto & datapb/data_coord.pb.go - Added `manifest` field to compaction segment messages - Enables passing manifest metadata through compaction pipeline worker.proto & workerpb/worker.pb.go - Added compaction parameter for `useLoonFFI` flag - Allows workers to receive FFI configuration from coordinator 10. Parameter Configuration component_param.go - Added `UseLoonFFI` parameter to compaction configuration - Reads from `common.storage.file.useLoonFFI` config path - Default: `false` for safe rollout 11. Test Updates - **clustering_compactor_storage_v2_test.go**: Updated signatures to handle manifest return value - **mix_compactor_storage_v2_test.go**: Updated test helpers for manifest support - **namespace_compactor_test.go**: Adjusted writer calls to expect manifest - **pack_writer_v2_test.go**: Validated manifest generation in pack writing This integration follows a **dual-mode approach**: 1. **Legacy Path**: Traditional binlog-based reading/writing (when `useLoonFFI=false` or no manifest) 2. **FFI Path**: Manifest-based reading/writing through Loon FFI (when `useLoonFFI=true` and manifest exists) --------- Signed-off-by: Congqi Xia <congqi.xia@zilliz.com>
457 lines
14 KiB
Go
457 lines
14 KiB
Go
// 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.
|
|
|
|
package storage
|
|
|
|
import (
|
|
"fmt"
|
|
"path"
|
|
|
|
"github.com/apache/arrow/go/v17/arrow"
|
|
"github.com/apache/arrow/go/v17/arrow/array"
|
|
|
|
"github.com/milvus-io/milvus-proto/go-api/v2/schemapb"
|
|
"github.com/milvus-io/milvus/internal/allocator"
|
|
"github.com/milvus-io/milvus/internal/storagecommon"
|
|
"github.com/milvus-io/milvus/pkg/v2/common"
|
|
"github.com/milvus-io/milvus/pkg/v2/proto/datapb"
|
|
"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/merr"
|
|
"github.com/milvus-io/milvus/pkg/v2/util/metautil"
|
|
"github.com/milvus-io/milvus/pkg/v2/util/typeutil"
|
|
)
|
|
|
|
type BinlogRecordWriter interface {
|
|
RecordWriter
|
|
GetLogs() (
|
|
fieldBinlogs map[FieldID]*datapb.FieldBinlog,
|
|
statsLog *datapb.FieldBinlog,
|
|
bm25StatsLog map[FieldID]*datapb.FieldBinlog,
|
|
manifest string,
|
|
)
|
|
GetRowNum() int64
|
|
FlushChunk() error
|
|
GetBufferUncompressed() uint64
|
|
Schema() *schemapb.CollectionSchema
|
|
}
|
|
|
|
type packedBinlogRecordWriterBase struct {
|
|
// attributes
|
|
collectionID UniqueID
|
|
partitionID UniqueID
|
|
segmentID UniqueID
|
|
schema *schemapb.CollectionSchema
|
|
BlobsWriter ChunkedBlobsWriter
|
|
allocator allocator.Interface
|
|
maxRowNum int64
|
|
arrowSchema *arrow.Schema
|
|
bufferSize int64
|
|
multiPartUploadSize int64
|
|
columnGroups []storagecommon.ColumnGroup
|
|
storageConfig *indexpb.StorageConfig
|
|
storagePluginContext *indexcgopb.StoragePluginContext
|
|
|
|
pkCollector *PkStatsCollector
|
|
bm25Collector *Bm25StatsCollector
|
|
tsFrom typeutil.Timestamp
|
|
tsTo typeutil.Timestamp
|
|
rowNum int64
|
|
writtenUncompressed uint64
|
|
|
|
// results
|
|
fieldBinlogs map[FieldID]*datapb.FieldBinlog
|
|
statsLog *datapb.FieldBinlog
|
|
bm25StatsLog map[FieldID]*datapb.FieldBinlog
|
|
manifest string
|
|
}
|
|
|
|
func (pw *packedBinlogRecordWriterBase) getColumnStatsFromRecord(r Record, allFields []*schemapb.FieldSchema) map[int64]storagecommon.ColumnStats {
|
|
result := make(map[int64]storagecommon.ColumnStats)
|
|
for _, field := range allFields {
|
|
if arr := r.Column(field.FieldID); arr != nil {
|
|
result[field.FieldID] = storagecommon.ColumnStats{
|
|
AvgSize: int64(arr.Data().SizeInBytes()) / int64(arr.Len()),
|
|
}
|
|
}
|
|
}
|
|
return result
|
|
}
|
|
|
|
func (pw *packedBinlogRecordWriterBase) GetWrittenUncompressed() uint64 {
|
|
return pw.writtenUncompressed
|
|
}
|
|
|
|
func (pw *packedBinlogRecordWriterBase) writeStats() error {
|
|
// Write PK stats
|
|
pkStatsMap, err := pw.pkCollector.Digest(
|
|
pw.collectionID,
|
|
pw.partitionID,
|
|
pw.segmentID,
|
|
pw.storageConfig.GetRootPath(),
|
|
pw.rowNum,
|
|
pw.allocator,
|
|
pw.BlobsWriter,
|
|
)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
// Extract single PK stats from map
|
|
for _, statsLog := range pkStatsMap {
|
|
pw.statsLog = statsLog
|
|
break
|
|
}
|
|
|
|
// Write BM25 stats
|
|
bm25StatsLog, err := pw.bm25Collector.Digest(
|
|
pw.collectionID,
|
|
pw.partitionID,
|
|
pw.segmentID,
|
|
pw.storageConfig.GetRootPath(),
|
|
pw.rowNum,
|
|
pw.allocator,
|
|
pw.BlobsWriter,
|
|
)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
pw.bm25StatsLog = bm25StatsLog
|
|
|
|
return nil
|
|
}
|
|
|
|
func (pw *packedBinlogRecordWriterBase) GetLogs() (
|
|
fieldBinlogs map[FieldID]*datapb.FieldBinlog,
|
|
statsLog *datapb.FieldBinlog,
|
|
bm25StatsLog map[FieldID]*datapb.FieldBinlog,
|
|
manifest string,
|
|
) {
|
|
return pw.fieldBinlogs, pw.statsLog, pw.bm25StatsLog, pw.manifest
|
|
}
|
|
|
|
func (pw *packedBinlogRecordWriterBase) GetRowNum() int64 {
|
|
return pw.rowNum
|
|
}
|
|
|
|
func (pw *packedBinlogRecordWriterBase) FlushChunk() error {
|
|
return nil // do nothing
|
|
}
|
|
|
|
func (pw *packedBinlogRecordWriterBase) Schema() *schemapb.CollectionSchema {
|
|
return pw.schema
|
|
}
|
|
|
|
func (pw *packedBinlogRecordWriterBase) GetBufferUncompressed() uint64 {
|
|
return uint64(pw.multiPartUploadSize)
|
|
}
|
|
|
|
var _ BinlogRecordWriter = (*PackedBinlogRecordWriter)(nil)
|
|
|
|
type PackedBinlogRecordWriter struct {
|
|
packedBinlogRecordWriterBase
|
|
writer *packedRecordWriter
|
|
}
|
|
|
|
func (pw *PackedBinlogRecordWriter) Write(r Record) error {
|
|
if err := pw.initWriters(r); err != nil {
|
|
return err
|
|
}
|
|
|
|
// Track timestamps
|
|
tsArray := r.Column(common.TimeStampField).(*array.Int64)
|
|
rows := r.Len()
|
|
for i := 0; i < rows; i++ {
|
|
ts := typeutil.Timestamp(tsArray.Value(i))
|
|
if ts < pw.tsFrom {
|
|
pw.tsFrom = ts
|
|
}
|
|
if ts > pw.tsTo {
|
|
pw.tsTo = ts
|
|
}
|
|
}
|
|
|
|
// Collect statistics
|
|
if err := pw.pkCollector.Collect(r); err != nil {
|
|
return err
|
|
}
|
|
if err := pw.bm25Collector.Collect(r); err != nil {
|
|
return err
|
|
}
|
|
|
|
err := pw.writer.Write(r)
|
|
if err != nil {
|
|
return merr.WrapErrServiceInternal(fmt.Sprintf("write record batch error: %s", err.Error()))
|
|
}
|
|
pw.writtenUncompressed = pw.writer.GetWrittenUncompressed()
|
|
return nil
|
|
}
|
|
|
|
func (pw *PackedBinlogRecordWriter) initWriters(r Record) error {
|
|
if pw.writer == nil {
|
|
if len(pw.columnGroups) == 0 {
|
|
allFields := typeutil.GetAllFieldSchemas(pw.schema)
|
|
pw.columnGroups = storagecommon.SplitColumns(allFields, pw.getColumnStatsFromRecord(r, allFields), storagecommon.DefaultPolicies()...)
|
|
}
|
|
logIdStart, _, err := pw.allocator.Alloc(uint32(len(pw.columnGroups)))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
paths := []string{}
|
|
for _, columnGroup := range pw.columnGroups {
|
|
path := metautil.BuildInsertLogPath(pw.storageConfig.GetRootPath(), pw.collectionID, pw.partitionID, pw.segmentID, columnGroup.GroupID, logIdStart)
|
|
paths = append(paths, path)
|
|
logIdStart++
|
|
}
|
|
pw.writer, err = NewPackedRecordWriter(pw.storageConfig.GetBucketName(), paths, pw.schema, pw.bufferSize, pw.multiPartUploadSize, pw.columnGroups, pw.storageConfig, pw.storagePluginContext)
|
|
if err != nil {
|
|
return merr.WrapErrServiceInternal(fmt.Sprintf("can not new packed record writer %s", err.Error()))
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (pw *PackedBinlogRecordWriter) finalizeBinlogs() {
|
|
if pw.writer == nil {
|
|
return
|
|
}
|
|
pw.rowNum = pw.writer.GetWrittenRowNum()
|
|
if pw.fieldBinlogs == nil {
|
|
pw.fieldBinlogs = make(map[FieldID]*datapb.FieldBinlog, len(pw.columnGroups))
|
|
}
|
|
for _, columnGroup := range pw.columnGroups {
|
|
columnGroupID := columnGroup.GroupID
|
|
if _, exists := pw.fieldBinlogs[columnGroupID]; !exists {
|
|
pw.fieldBinlogs[columnGroupID] = &datapb.FieldBinlog{
|
|
FieldID: columnGroupID,
|
|
ChildFields: columnGroup.Fields,
|
|
}
|
|
}
|
|
pw.fieldBinlogs[columnGroupID].Binlogs = append(pw.fieldBinlogs[columnGroupID].Binlogs, &datapb.Binlog{
|
|
LogSize: int64(pw.writer.GetColumnGroupWrittenCompressed(columnGroupID)),
|
|
MemorySize: int64(pw.writer.GetColumnGroupWrittenUncompressed(columnGroupID)),
|
|
LogPath: pw.writer.GetWrittenPaths(columnGroupID),
|
|
EntriesNum: pw.writer.GetWrittenRowNum(),
|
|
TimestampFrom: pw.tsFrom,
|
|
TimestampTo: pw.tsTo,
|
|
})
|
|
}
|
|
pw.manifest = pw.writer.GetWrittenManifest()
|
|
}
|
|
|
|
func (pw *PackedBinlogRecordWriter) Close() error {
|
|
if pw.writer != nil {
|
|
if err := pw.writer.Close(); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
pw.finalizeBinlogs()
|
|
if err := pw.writeStats(); err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func newPackedBinlogRecordWriter(collectionID, partitionID, segmentID UniqueID, schema *schemapb.CollectionSchema,
|
|
blobsWriter ChunkedBlobsWriter, allocator allocator.Interface, maxRowNum int64, bufferSize, multiPartUploadSize int64, columnGroups []storagecommon.ColumnGroup,
|
|
storageConfig *indexpb.StorageConfig,
|
|
storagePluginContext *indexcgopb.StoragePluginContext,
|
|
) (*PackedBinlogRecordWriter, error) {
|
|
arrowSchema, err := ConvertToArrowSchema(schema, true)
|
|
if err != nil {
|
|
return nil, merr.WrapErrParameterInvalid("convert collection schema [%s] to arrow schema error: %s", schema.Name, err.Error())
|
|
}
|
|
|
|
writer := &PackedBinlogRecordWriter{
|
|
packedBinlogRecordWriterBase: packedBinlogRecordWriterBase{
|
|
collectionID: collectionID,
|
|
partitionID: partitionID,
|
|
segmentID: segmentID,
|
|
schema: schema,
|
|
arrowSchema: arrowSchema,
|
|
BlobsWriter: blobsWriter,
|
|
allocator: allocator,
|
|
maxRowNum: maxRowNum,
|
|
bufferSize: bufferSize,
|
|
multiPartUploadSize: multiPartUploadSize,
|
|
columnGroups: columnGroups,
|
|
storageConfig: storageConfig,
|
|
storagePluginContext: storagePluginContext,
|
|
tsFrom: typeutil.MaxTimestamp,
|
|
tsTo: 0,
|
|
},
|
|
}
|
|
|
|
// Create stats collectors
|
|
writer.pkCollector, err = NewPkStatsCollector(
|
|
collectionID,
|
|
schema,
|
|
maxRowNum,
|
|
)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
writer.bm25Collector = NewBm25StatsCollector(schema)
|
|
|
|
return writer, nil
|
|
}
|
|
|
|
var _ BinlogRecordWriter = (*PackedManifestRecordWriter)(nil)
|
|
|
|
type PackedManifestRecordWriter struct {
|
|
packedBinlogRecordWriterBase
|
|
// writer and stats generated at runtime
|
|
writer *packedRecordManifestWriter
|
|
}
|
|
|
|
func (pw *PackedManifestRecordWriter) Write(r Record) error {
|
|
if err := pw.initWriters(r); err != nil {
|
|
return err
|
|
}
|
|
|
|
// Track timestamps
|
|
tsArray := r.Column(common.TimeStampField).(*array.Int64)
|
|
rows := r.Len()
|
|
for i := 0; i < rows; i++ {
|
|
ts := typeutil.Timestamp(tsArray.Value(i))
|
|
if ts < pw.tsFrom {
|
|
pw.tsFrom = ts
|
|
}
|
|
if ts > pw.tsTo {
|
|
pw.tsTo = ts
|
|
}
|
|
}
|
|
|
|
// Collect statistics
|
|
if err := pw.pkCollector.Collect(r); err != nil {
|
|
return err
|
|
}
|
|
if err := pw.bm25Collector.Collect(r); err != nil {
|
|
return err
|
|
}
|
|
|
|
err := pw.writer.Write(r)
|
|
if err != nil {
|
|
return merr.WrapErrServiceInternal(fmt.Sprintf("write record batch error: %s", err.Error()))
|
|
}
|
|
pw.writtenUncompressed = pw.writer.GetWrittenUncompressed()
|
|
return nil
|
|
}
|
|
|
|
func (pw *PackedManifestRecordWriter) initWriters(r Record) error {
|
|
if pw.writer == nil {
|
|
if len(pw.columnGroups) == 0 {
|
|
allFields := typeutil.GetAllFieldSchemas(pw.schema)
|
|
pw.columnGroups = storagecommon.SplitColumns(allFields, pw.getColumnStatsFromRecord(r, allFields), storagecommon.DefaultPolicies()...)
|
|
}
|
|
|
|
var err error
|
|
k := metautil.JoinIDPath(pw.collectionID, pw.partitionID, pw.segmentID)
|
|
basePath := path.Join(pw.storageConfig.GetRootPath(), common.SegmentInsertLogPath, k)
|
|
pw.writer, err = NewPackedRecordManifestWriter(pw.storageConfig.GetBucketName(), basePath, pw.schema, pw.bufferSize, pw.multiPartUploadSize, pw.columnGroups, pw.storageConfig, pw.storagePluginContext)
|
|
if err != nil {
|
|
return merr.WrapErrServiceInternal(fmt.Sprintf("can not new packed record writer %s", err.Error()))
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (pw *PackedManifestRecordWriter) finalizeBinlogs() {
|
|
if pw.writer == nil {
|
|
return
|
|
}
|
|
pw.rowNum = pw.writer.GetWrittenRowNum()
|
|
if pw.fieldBinlogs == nil {
|
|
pw.fieldBinlogs = make(map[FieldID]*datapb.FieldBinlog, len(pw.columnGroups))
|
|
}
|
|
for _, columnGroup := range pw.columnGroups {
|
|
columnGroupID := columnGroup.GroupID
|
|
if _, exists := pw.fieldBinlogs[columnGroupID]; !exists {
|
|
pw.fieldBinlogs[columnGroupID] = &datapb.FieldBinlog{
|
|
FieldID: columnGroupID,
|
|
ChildFields: columnGroup.Fields,
|
|
}
|
|
}
|
|
pw.fieldBinlogs[columnGroupID].Binlogs = append(pw.fieldBinlogs[columnGroupID].Binlogs, &datapb.Binlog{
|
|
LogSize: int64(pw.writer.GetColumnGroupWrittenCompressed(columnGroupID)),
|
|
MemorySize: int64(pw.writer.GetColumnGroupWrittenUncompressed(columnGroupID)),
|
|
LogPath: pw.writer.GetWrittenPaths(columnGroupID),
|
|
EntriesNum: pw.writer.GetWrittenRowNum(),
|
|
TimestampFrom: pw.tsFrom,
|
|
TimestampTo: pw.tsTo,
|
|
})
|
|
}
|
|
pw.manifest = pw.writer.GetWrittenManifest()
|
|
}
|
|
|
|
func (pw *PackedManifestRecordWriter) Close() error {
|
|
if pw.writer != nil {
|
|
if err := pw.writer.Close(); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
pw.finalizeBinlogs()
|
|
if err := pw.writeStats(); err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func newPackedManifestRecordWriter(collectionID, partitionID, segmentID UniqueID, schema *schemapb.CollectionSchema,
|
|
blobsWriter ChunkedBlobsWriter, allocator allocator.Interface, maxRowNum int64, bufferSize, multiPartUploadSize int64, columnGroups []storagecommon.ColumnGroup,
|
|
storageConfig *indexpb.StorageConfig,
|
|
storagePluginContext *indexcgopb.StoragePluginContext,
|
|
) (*PackedManifestRecordWriter, error) {
|
|
arrowSchema, err := ConvertToArrowSchema(schema, true)
|
|
if err != nil {
|
|
return nil, merr.WrapErrParameterInvalid("convert collection schema [%s] to arrow schema error: %s", schema.Name, err.Error())
|
|
}
|
|
|
|
writer := &PackedManifestRecordWriter{
|
|
packedBinlogRecordWriterBase: packedBinlogRecordWriterBase{
|
|
collectionID: collectionID,
|
|
partitionID: partitionID,
|
|
segmentID: segmentID,
|
|
schema: schema,
|
|
arrowSchema: arrowSchema,
|
|
BlobsWriter: blobsWriter,
|
|
allocator: allocator,
|
|
maxRowNum: maxRowNum,
|
|
bufferSize: bufferSize,
|
|
multiPartUploadSize: multiPartUploadSize,
|
|
columnGroups: columnGroups,
|
|
storageConfig: storageConfig,
|
|
storagePluginContext: storagePluginContext,
|
|
tsFrom: typeutil.MaxTimestamp,
|
|
tsTo: 0,
|
|
},
|
|
}
|
|
|
|
// Create stats collectors
|
|
writer.pkCollector, err = NewPkStatsCollector(
|
|
collectionID,
|
|
schema,
|
|
maxRowNum,
|
|
)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
writer.bm25Collector = NewBm25StatsCollector(schema)
|
|
|
|
return writer, nil
|
|
}
|