mirror of
https://gitee.com/milvus-io/milvus.git
synced 2025-12-08 01:58:34 +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>
156 lines
4.3 KiB
Go
156 lines
4.3 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 (
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/milvus-io/milvus-proto/go-api/v2/schemapb"
|
|
"github.com/milvus-io/milvus/pkg/v2/util/paramtable"
|
|
)
|
|
|
|
func TestDeltalogReaderWriter(t *testing.T) {
|
|
const (
|
|
testCollectionID = int64(1)
|
|
testPartitionID = int64(2)
|
|
testSegmentID = int64(3)
|
|
testBatchSize = 1024
|
|
testNumLogs = 100
|
|
)
|
|
|
|
type deleteLogGenerator func(i int) *DeleteLog
|
|
|
|
tests := []struct {
|
|
name string
|
|
format string
|
|
pkType schemapb.DataType
|
|
logGenerator deleteLogGenerator
|
|
wantErr bool
|
|
}{
|
|
{
|
|
name: "Int64 PK - JSON format",
|
|
format: "json",
|
|
pkType: schemapb.DataType_Int64,
|
|
logGenerator: func(i int) *DeleteLog {
|
|
return NewDeleteLog(NewInt64PrimaryKey(int64(i)), uint64(100+i))
|
|
},
|
|
wantErr: false,
|
|
},
|
|
{
|
|
name: "VarChar PK - JSON format",
|
|
format: "json",
|
|
pkType: schemapb.DataType_VarChar,
|
|
logGenerator: func(i int) *DeleteLog {
|
|
return NewDeleteLog(NewVarCharPrimaryKey("key_"+string(rune(i))), uint64(100+i))
|
|
},
|
|
wantErr: false,
|
|
},
|
|
{
|
|
name: "Int64 PK - Parquet format",
|
|
format: "parquet",
|
|
pkType: schemapb.DataType_Int64,
|
|
logGenerator: func(i int) *DeleteLog {
|
|
return NewDeleteLog(NewInt64PrimaryKey(int64(i)), uint64(100+i))
|
|
},
|
|
wantErr: false,
|
|
},
|
|
{
|
|
name: "VarChar PK - Parquet format",
|
|
format: "parquet",
|
|
pkType: schemapb.DataType_VarChar,
|
|
logGenerator: func(i int) *DeleteLog {
|
|
return NewDeleteLog(NewVarCharPrimaryKey("key_"+string(rune(i))), uint64(100+i))
|
|
},
|
|
wantErr: false,
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
// Set deltalog format
|
|
originalFormat := paramtable.Get().DataNodeCfg.DeltalogFormat.GetValue()
|
|
paramtable.Get().Save(paramtable.Get().DataNodeCfg.DeltalogFormat.Key, tt.format)
|
|
defer paramtable.Get().Save(paramtable.Get().DataNodeCfg.DeltalogFormat.Key, originalFormat)
|
|
|
|
writer, finalizer, err := createDeltalogWriter(testCollectionID, testPartitionID, testSegmentID, tt.pkType, testBatchSize)
|
|
if tt.wantErr {
|
|
assert.Error(t, err)
|
|
return
|
|
}
|
|
require.NoError(t, err)
|
|
assert.NotNil(t, writer)
|
|
assert.NotNil(t, finalizer)
|
|
|
|
// Write delete logs
|
|
expectedLogs := make([]*DeleteLog, 0, testNumLogs)
|
|
for i := 0; i < testNumLogs; i++ {
|
|
deleteLog := tt.logGenerator(i)
|
|
expectedLogs = append(expectedLogs, deleteLog)
|
|
err = writer.WriteValue(deleteLog)
|
|
require.NoError(t, err)
|
|
}
|
|
|
|
err = writer.Close()
|
|
require.NoError(t, err)
|
|
|
|
blob, err := finalizer()
|
|
require.NoError(t, err)
|
|
assert.NotNil(t, blob)
|
|
assert.Greater(t, len(blob.Value), 0)
|
|
|
|
// Test round trip
|
|
reader, err := CreateDeltalogReader([]*Blob{blob})
|
|
require.NoError(t, err)
|
|
require.NotNil(t, reader)
|
|
|
|
// Read and verify contents
|
|
readLogs := make([]*DeleteLog, 0)
|
|
for {
|
|
log, err := reader.NextValue()
|
|
if err != nil {
|
|
break
|
|
}
|
|
if log != nil {
|
|
readLogs = append(readLogs, *log)
|
|
}
|
|
}
|
|
|
|
assert.Equal(t, len(expectedLogs), len(readLogs))
|
|
for i := 0; i < len(expectedLogs); i++ {
|
|
assert.Equal(t, expectedLogs[i].Ts, readLogs[i].Ts)
|
|
assert.Equal(t, expectedLogs[i].Pk.GetValue(), readLogs[i].Pk.GetValue())
|
|
}
|
|
|
|
err = reader.Close()
|
|
assert.NoError(t, err)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestDeltalogStreamWriter_NoRecordWriter(t *testing.T) {
|
|
writer := newDeltalogStreamWriter(1, 2, 3)
|
|
assert.NotNil(t, writer)
|
|
|
|
// Finalize without getting record writer should return error
|
|
blob, err := writer.Finalize()
|
|
assert.Error(t, err)
|
|
assert.Nil(t, blob)
|
|
}
|