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>
371 lines
12 KiB
Go
371 lines
12 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"
|
|
"strconv"
|
|
"time"
|
|
|
|
"github.com/apache/arrow/go/v17/arrow"
|
|
"github.com/apache/arrow/go/v17/arrow/array"
|
|
"github.com/samber/lo"
|
|
|
|
"github.com/milvus-io/milvus-proto/go-api/v2/schemapb"
|
|
"github.com/milvus-io/milvus/internal/storagecommon"
|
|
"github.com/milvus-io/milvus/internal/storagev2/packed"
|
|
"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/paramtable"
|
|
"github.com/milvus-io/milvus/pkg/v2/util/typeutil"
|
|
)
|
|
|
|
var _ RecordWriter = (*packedRecordWriter)(nil)
|
|
|
|
type packedRecordWriter struct {
|
|
writer *packed.PackedWriter
|
|
bufferSize int64
|
|
columnGroups []storagecommon.ColumnGroup
|
|
bucketName string
|
|
pathsMap map[typeutil.UniqueID]string
|
|
schema *schemapb.CollectionSchema
|
|
arrowSchema *arrow.Schema
|
|
rowNum int64
|
|
writtenUncompressed uint64
|
|
columnGroupUncompressed map[typeutil.UniqueID]uint64
|
|
columnGroupCompressed map[typeutil.UniqueID]uint64
|
|
outputManifest string
|
|
storageConfig *indexpb.StorageConfig
|
|
}
|
|
|
|
func (pw *packedRecordWriter) Write(r Record) error {
|
|
var rec arrow.Record
|
|
sar, ok := r.(*simpleArrowRecord)
|
|
if !ok {
|
|
// Get all fields including struct sub-fields
|
|
allFields := typeutil.GetAllFieldSchemas(pw.schema)
|
|
arrays := make([]arrow.Array, len(allFields))
|
|
for i, field := range allFields {
|
|
arrays[i] = r.Column(field.FieldID)
|
|
}
|
|
rec = array.NewRecord(pw.arrowSchema, arrays, int64(r.Len()))
|
|
} else {
|
|
rec = sar.r
|
|
}
|
|
pw.rowNum += int64(r.Len())
|
|
for col, arr := range rec.Columns() {
|
|
// size := arr.Data().SizeInBytes()
|
|
size := calculateActualDataSize(arr)
|
|
pw.writtenUncompressed += size
|
|
for _, columnGroup := range pw.columnGroups {
|
|
if lo.Contains(columnGroup.Columns, col) {
|
|
pw.columnGroupUncompressed[columnGroup.GroupID] += size
|
|
break
|
|
}
|
|
}
|
|
}
|
|
defer rec.Release()
|
|
return pw.writer.WriteRecordBatch(rec)
|
|
}
|
|
|
|
func (pw *packedRecordWriter) GetWrittenUncompressed() uint64 {
|
|
return pw.writtenUncompressed
|
|
}
|
|
|
|
func (pw *packedRecordWriter) GetColumnGroupWrittenUncompressed(columnGroup typeutil.UniqueID) uint64 {
|
|
if size, ok := pw.columnGroupUncompressed[columnGroup]; ok {
|
|
return size
|
|
}
|
|
return 0
|
|
}
|
|
|
|
func (pw *packedRecordWriter) GetColumnGroupWrittenCompressed(columnGroup typeutil.UniqueID) uint64 {
|
|
if size, ok := pw.columnGroupCompressed[columnGroup]; ok {
|
|
return size
|
|
}
|
|
return 0
|
|
}
|
|
|
|
func (pw *packedRecordWriter) GetWrittenPaths(columnGroup typeutil.UniqueID) string {
|
|
if path, ok := pw.pathsMap[columnGroup]; ok {
|
|
return path
|
|
}
|
|
return ""
|
|
}
|
|
|
|
func (pw *packedRecordWriter) GetWrittenManifest() string {
|
|
return pw.outputManifest
|
|
}
|
|
|
|
func (pw *packedRecordWriter) GetWrittenRowNum() int64 {
|
|
return pw.rowNum
|
|
}
|
|
|
|
func (pw *packedRecordWriter) Close() error {
|
|
if pw.writer != nil {
|
|
err := pw.writer.Close()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
for id, fpath := range pw.pathsMap {
|
|
truePath := path.Join(pw.bucketName, fpath)
|
|
size, err := packed.GetFileSize(truePath, pw.storageConfig)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
pw.columnGroupCompressed[id] = uint64(size)
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func NewPackedRecordWriter(
|
|
bucketName string,
|
|
paths []string,
|
|
schema *schemapb.CollectionSchema,
|
|
bufferSize int64,
|
|
multiPartUploadSize int64,
|
|
columnGroups []storagecommon.ColumnGroup,
|
|
storageConfig *indexpb.StorageConfig,
|
|
storagePluginContext *indexcgopb.StoragePluginContext,
|
|
) (*packedRecordWriter, error) {
|
|
// Validate PK field exists before proceeding
|
|
_, err := typeutil.GetPrimaryFieldSchema(schema)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
arrowSchema, err := ConvertToArrowSchema(schema, false)
|
|
if err != nil {
|
|
return nil, merr.WrapErrServiceInternal(
|
|
fmt.Sprintf("can not convert collection schema %s to arrow schema: %s", schema.Name, err.Error()))
|
|
}
|
|
// if storage config is not passed, use common config
|
|
storageType := paramtable.Get().CommonCfg.StorageType.GetValue()
|
|
if storageConfig != nil {
|
|
storageType = storageConfig.GetStorageType()
|
|
}
|
|
// compose true path before create packed writer here
|
|
// and returned writtenPaths shall remain untouched
|
|
truePaths := lo.Map(paths, func(p string, _ int) string {
|
|
if storageType == "local" {
|
|
return p
|
|
}
|
|
return path.Join(bucketName, p)
|
|
})
|
|
writer, err := packed.NewPackedWriter(truePaths, arrowSchema, bufferSize, multiPartUploadSize, columnGroups, storageConfig, storagePluginContext)
|
|
if err != nil {
|
|
return nil, merr.WrapErrServiceInternal(
|
|
fmt.Sprintf("can not new packed record writer %s", err.Error()))
|
|
}
|
|
columnGroupUncompressed := make(map[typeutil.UniqueID]uint64)
|
|
columnGroupCompressed := make(map[typeutil.UniqueID]uint64)
|
|
pathsMap := make(map[typeutil.UniqueID]string)
|
|
if len(paths) != len(columnGroups) {
|
|
return nil, merr.WrapErrParameterInvalid(len(paths), len(columnGroups),
|
|
"paths length is not equal to column groups length for packed record writer")
|
|
}
|
|
for i, columnGroup := range columnGroups {
|
|
columnGroupUncompressed[columnGroup.GroupID] = 0
|
|
columnGroupCompressed[columnGroup.GroupID] = 0
|
|
pathsMap[columnGroup.GroupID] = paths[i]
|
|
}
|
|
return &packedRecordWriter{
|
|
writer: writer,
|
|
schema: schema,
|
|
arrowSchema: arrowSchema,
|
|
bufferSize: bufferSize,
|
|
bucketName: bucketName,
|
|
pathsMap: pathsMap,
|
|
columnGroups: columnGroups,
|
|
columnGroupUncompressed: columnGroupUncompressed,
|
|
columnGroupCompressed: columnGroupCompressed,
|
|
storageConfig: storageConfig,
|
|
}, nil
|
|
}
|
|
|
|
type packedRecordManifestWriter struct {
|
|
writer *packed.FFIPackedWriter
|
|
bufferSize int64
|
|
columnGroups []storagecommon.ColumnGroup
|
|
bucketName string
|
|
pathsMap map[typeutil.UniqueID]string
|
|
schema *schemapb.CollectionSchema
|
|
arrowSchema *arrow.Schema
|
|
rowNum int64
|
|
writtenUncompressed uint64
|
|
columnGroupUncompressed map[typeutil.UniqueID]uint64
|
|
columnGroupCompressed map[typeutil.UniqueID]uint64
|
|
outputManifest string
|
|
storageConfig *indexpb.StorageConfig
|
|
}
|
|
|
|
func (pw *packedRecordManifestWriter) Write(r Record) error {
|
|
var rec arrow.Record
|
|
sar, ok := r.(*simpleArrowRecord)
|
|
if !ok {
|
|
// Get all fields including struct sub-fields
|
|
allFields := typeutil.GetAllFieldSchemas(pw.schema)
|
|
arrays := make([]arrow.Array, len(allFields))
|
|
for i, field := range allFields {
|
|
arrays[i] = r.Column(field.FieldID)
|
|
}
|
|
rec = array.NewRecord(pw.arrowSchema, arrays, int64(r.Len()))
|
|
} else {
|
|
rec = sar.r
|
|
}
|
|
pw.rowNum += int64(r.Len())
|
|
for col, arr := range rec.Columns() {
|
|
// size := arr.Data().SizeInBytes()
|
|
size := calculateActualDataSize(arr)
|
|
pw.writtenUncompressed += size
|
|
for _, columnGroup := range pw.columnGroups {
|
|
if lo.Contains(columnGroup.Columns, col) {
|
|
pw.columnGroupUncompressed[columnGroup.GroupID] += size
|
|
break
|
|
}
|
|
}
|
|
}
|
|
defer rec.Release()
|
|
return pw.writer.WriteRecordBatch(rec)
|
|
}
|
|
|
|
func (pw *packedRecordManifestWriter) GetWrittenUncompressed() uint64 {
|
|
return pw.writtenUncompressed
|
|
}
|
|
|
|
func (pw *packedRecordManifestWriter) GetColumnGroupWrittenUncompressed(columnGroup typeutil.UniqueID) uint64 {
|
|
if size, ok := pw.columnGroupUncompressed[columnGroup]; ok {
|
|
return size
|
|
}
|
|
return 0
|
|
}
|
|
|
|
func (pw *packedRecordManifestWriter) GetColumnGroupWrittenCompressed(columnGroup typeutil.UniqueID) uint64 {
|
|
if size, ok := pw.columnGroupCompressed[columnGroup]; ok {
|
|
return size
|
|
}
|
|
return 0
|
|
}
|
|
|
|
func (pw *packedRecordManifestWriter) GetWrittenPaths(columnGroup typeutil.UniqueID) string {
|
|
if path, ok := pw.pathsMap[columnGroup]; ok {
|
|
return path
|
|
}
|
|
return ""
|
|
}
|
|
|
|
func (pw *packedRecordManifestWriter) GetWrittenManifest() string {
|
|
return pw.outputManifest
|
|
}
|
|
|
|
func (pw *packedRecordManifestWriter) GetWrittenRowNum() int64 {
|
|
return pw.rowNum
|
|
}
|
|
|
|
func (pw *packedRecordManifestWriter) Close() error {
|
|
if pw.writer != nil {
|
|
manifest, err := pw.writer.Close()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
pw.outputManifest = manifest
|
|
for id := range pw.pathsMap {
|
|
pw.columnGroupCompressed[id] = uint64(0)
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func NewPackedRecordManifestWriter(
|
|
bucketName string,
|
|
basePath string,
|
|
schema *schemapb.CollectionSchema,
|
|
bufferSize int64,
|
|
multiPartUploadSize int64,
|
|
columnGroups []storagecommon.ColumnGroup,
|
|
storageConfig *indexpb.StorageConfig,
|
|
storagePluginContext *indexcgopb.StoragePluginContext,
|
|
) (*packedRecordManifestWriter, error) {
|
|
// Validate PK field exists before proceeding
|
|
_, err := typeutil.GetPrimaryFieldSchema(schema)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
arrowSchema, err := ConvertToArrowSchema(schema, true)
|
|
if err != nil {
|
|
return nil, merr.WrapErrServiceInternal(
|
|
fmt.Sprintf("can not convert collection schema %s to arrow schema: %s", schema.Name, err.Error()))
|
|
}
|
|
// if storage config is not passed, use common config
|
|
storageType := paramtable.Get().CommonCfg.StorageType.GetValue()
|
|
if storageConfig != nil {
|
|
storageType = storageConfig.GetStorageType()
|
|
}
|
|
ffiBasePath := basePath
|
|
if storageType != "local" {
|
|
ffiBasePath = path.Join(bucketName, basePath)
|
|
}
|
|
writer, err := packed.NewFFIPackedWriter(ffiBasePath, arrowSchema, columnGroups, storageConfig, storagePluginContext)
|
|
if err != nil {
|
|
return nil, merr.WrapErrServiceInternal(
|
|
fmt.Sprintf("can not new packed record writer %s", err.Error()))
|
|
}
|
|
columnGroupUncompressed := make(map[typeutil.UniqueID]uint64)
|
|
columnGroupCompressed := make(map[typeutil.UniqueID]uint64)
|
|
|
|
// provide mock path
|
|
pathsMap := make(map[typeutil.UniqueID]string)
|
|
start := time.Now().UnixNano()
|
|
for _, columnGroup := range columnGroups {
|
|
columnGroupUncompressed[columnGroup.GroupID] = 0
|
|
columnGroupCompressed[columnGroup.GroupID] = 0
|
|
start++
|
|
pathsMap[columnGroup.GroupID] = path.Join(basePath, strconv.FormatInt(columnGroup.GroupID, 10), strconv.FormatInt(start, 10))
|
|
}
|
|
|
|
return &packedRecordManifestWriter{
|
|
writer: writer,
|
|
schema: schema,
|
|
arrowSchema: arrowSchema,
|
|
bufferSize: bufferSize,
|
|
bucketName: bucketName,
|
|
pathsMap: pathsMap,
|
|
columnGroups: columnGroups,
|
|
columnGroupUncompressed: columnGroupUncompressed,
|
|
columnGroupCompressed: columnGroupCompressed,
|
|
storageConfig: storageConfig,
|
|
}, nil
|
|
}
|
|
|
|
// Deprecated, todo remove
|
|
func NewPackedSerializeWriter(bucketName string, paths []string, schema *schemapb.CollectionSchema, bufferSize int64,
|
|
multiPartUploadSize int64, columnGroups []storagecommon.ColumnGroup, batchSize int,
|
|
) (*SerializeWriterImpl[*Value], error) {
|
|
packedRecordWriter, err := NewPackedRecordWriter(bucketName, paths, schema, bufferSize, multiPartUploadSize, columnGroups, nil, nil)
|
|
if err != nil {
|
|
return nil, merr.WrapErrServiceInternal(
|
|
fmt.Sprintf("can not new packed record writer %s", err.Error()))
|
|
}
|
|
return NewSerializeRecordWriter(packedRecordWriter, func(v []*Value) (Record, error) {
|
|
return ValueSerializer(v, schema)
|
|
}, batchSize), nil
|
|
}
|