mirror of
https://gitee.com/milvus-io/milvus.git
synced 2025-12-06 17:18:35 +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>
182 lines
6.0 KiB
Go
182 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
|
|
}
|
|
|
|
defer C.transaction_destroy(transationHandle)
|
|
|
|
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
|
|
}
|