furyhawk/milvus
1
0
Fork 0
mirror of https://github.com/milvus-io/milvus.git synced 2026-07-21 10:15:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: [2.6] preserve segment insert log paths for text index (#50959) (#51002)

Browse Source 
issue: #50865
pr: https://github.com/milvus-io/milvus/pull/50959

## Summary
Preserve existing insert log paths when building segment insert files
for StorageV2 text index builds.
Fall back to constructing paths from log IDs when the binlog path is
absent.

Signed-off-by: aoiasd <zhicheng.yue@zilliz.com>
This commit is contained in:
aoiasd
2026-07-06 19:12:33 +08:00
committed by GitHub
parent d56dcf3332
commit 24d576fe62
2 changed files with 96 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/datanode/util/util.go
+12 -5
View File
@@ -27,11 +27,7 @@ func GetSegmentInsertFiles(fieldBinlogs []*datapb.FieldBinlog, storageConfig *in
filePaths := make([]string, 0)
columnGroupID := insertLog.GetFieldID()
for _, binlog := range insertLog.GetBinlogs() {
filePath := metautil.BuildInsertLogPath(storageConfig.GetRootPath(), collectionID, partitionID, segmentID, columnGroupID, binlog.GetLogID())
if storageConfig.StorageType != "local" {
filePath = path.Join(storageConfig.GetBucketName(), filePath)
}
filePaths = append(filePaths, filePath)
filePaths = append(filePaths, getInsertLogPath(binlog, storageConfig, collectionID, partitionID, segmentID, columnGroupID))
}
insertLogs = append(insertLogs, &indexcgopb.FieldInsertFiles{
FilePaths: filePaths,
@@ -41,3 +37,14 @@ func GetSegmentInsertFiles(fieldBinlogs []*datapb.FieldBinlog, storageConfig *in
FieldInsertFiles: insertLogs,
}
}
func getInsertLogPath(binlog *datapb.Binlog, storageConfig *indexpb.StorageConfig, collectionID int64, partitionID int64, segmentID int64, columnGroupID int64) string {
filePath := binlog.GetLogPath()
if filePath == "" {
filePath = metautil.BuildInsertLogPath(storageConfig.GetRootPath(), collectionID, partitionID, segmentID, columnGroupID, binlog.GetLogID())
}
if storageConfig.GetStorageType() != "local" {
filePath = path.Join(storageConfig.GetBucketName(), filePath)
}
return filePath
}
internal/datanode/util/util_test.go
+84
View File
@@ -0,0 +1,84 @@
package util
import (
"testing"
"github.com/stretchr/testify/assert"
"github.com/milvus-io/milvus/pkg/v2/proto/datapb"
"github.com/milvus-io/milvus/pkg/v2/proto/indexpb"
)
func TestGetSegmentInsertFilesPreservesLogPath(t *testing.T) {
storageConfig := &indexpb.StorageConfig{
RootPath: "file",
StorageType: "local",
}
insertBinlogs := []*datapb.FieldBinlog{{
FieldID: 1,
Binlogs: []*datapb.Binlog{{
LogPath: "file/insert_log/10/20/30/1/40",
EntriesNum: 100,
}},
}}
got := GetSegmentInsertFiles(insertBinlogs, storageConfig, 10, 20, 30)
assert.Equal(t, "file/insert_log/10/20/30/1/40", got.GetFieldInsertFiles()[0].GetFilePaths()[0])
}
func TestGetSegmentInsertFilesPreservesLogPathWithBucket(t *testing.T) {
storageConfig := &indexpb.StorageConfig{
RootPath: "file",
BucketName: "bucket",
StorageType: "minio",
}
insertBinlogs := []*datapb.FieldBinlog{{
FieldID: 1,
Binlogs: []*datapb.Binlog{{
LogPath: "file/insert_log/10/20/30/1/40",
EntriesNum: 100,
}},
}}
got := GetSegmentInsertFiles(insertBinlogs, storageConfig, 10, 20, 30)
assert.Equal(t, "bucket/file/insert_log/10/20/30/1/40", got.GetFieldInsertFiles()[0].GetFilePaths()[0])
}
func TestGetSegmentInsertFilesFallsBackToLogID(t *testing.T) {
storageConfig := &indexpb.StorageConfig{
RootPath: "file",
StorageType: "local",
}
insertBinlogs := []*datapb.FieldBinlog{{
FieldID: 1,
Binlogs: []*datapb.Binlog{{
LogID: 40,
EntriesNum: 100,
}},
}}
got := GetSegmentInsertFiles(insertBinlogs, storageConfig, 10, 20, 30)
assert.Equal(t, "file/insert_log/10/20/30/1/40", got.GetFieldInsertFiles()[0].GetFilePaths()[0])
}
func TestGetSegmentInsertFilesFallsBackToLogIDWithBucket(t *testing.T) {
storageConfig := &indexpb.StorageConfig{
RootPath: "file",
BucketName: "bucket",
StorageType: "minio",
}
insertBinlogs := []*datapb.FieldBinlog{{
FieldID: 1,
Binlogs: []*datapb.Binlog{{
LogID: 40,
EntriesNum: 100,
}},
}}
got := GetSegmentInsertFiles(insertBinlogs, storageConfig, 10, 20, 30)
assert.Equal(t, "bucket/file/insert_log/10/20/30/1/40", got.GetFieldInsertFiles()[0].GetFilePaths()[0])
}