From 146f173eea3cacb6d49c8d589f3aa2443a998d33 Mon Sep 17 00:00:00 2001 From: XuanYang-cn Date: Sun, 4 Jan 2026 16:51:23 +0800 Subject: [PATCH] enhance: tidy code in import plugin context (#46374) Signed-off-by: yangxuan --- internal/datacoord/compaction_util.go | 30 +++------------------------ internal/datacoord/import_util.go | 6 ++++-- internal/util/hookutil/cipher.go | 3 ++- 3 files changed, 9 insertions(+), 30 deletions(-) diff --git a/internal/datacoord/compaction_util.go b/internal/datacoord/compaction_util.go index da9517d075..58bd7a6245 100644 --- a/internal/datacoord/compaction_util.go +++ b/internal/datacoord/compaction_util.go @@ -51,34 +51,10 @@ func PreAllocateBinlogIDs(allocator allocator.Allocator, segmentInfos []*Segment return &datapb.IDRange{Begin: begin, End: end}, err } -func WrapPluginContextWithImport(collectionID int64, dbProperties []*commonpb.KeyValuePair, options importutilv2.Options, msg proto.Message) { - pluginContext := make([]*commonpb.KeyValuePair, 0) - +// Return None nil slice +func GetReadPluginContext(options importutilv2.Options) []*commonpb.KeyValuePair { importEzk, _ := importutilv2.GetEZK(options) - readPluginContext := hookutil.GetReadStoragePluginContext(importEzk) - if readPluginContext != nil { - pluginContext = append(pluginContext, readPluginContext...) - } - - writePluginContext := hookutil.GetStoragePluginContext(dbProperties, collectionID) - if writePluginContext != nil { - pluginContext = append(pluginContext, writePluginContext...) - } - - if len(pluginContext) == 0 { - return - } - - switch msg.(type) { - case *datapb.ImportRequest: - job := msg.(*datapb.ImportRequest) - job.PluginContext = append(job.PluginContext, pluginContext...) - case *datapb.PreImportRequest: - job := msg.(*datapb.PreImportRequest) - job.PluginContext = append(job.PluginContext, pluginContext...) - default: - return - } + return hookutil.GetReadStoragePluginContext(importEzk) } func WrapPluginContext(collectionID int64, properties []*commonpb.KeyValuePair, msg proto.Message) { diff --git a/internal/datacoord/import_util.go b/internal/datacoord/import_util.go index 11e2cc509e..00eaa6f3f4 100644 --- a/internal/datacoord/import_util.go +++ b/internal/datacoord/import_util.go @@ -300,8 +300,9 @@ func AssemblePreImportRequest(task ImportTask, job ImportJob) *datapb.PreImportR Options: job.GetOptions(), TaskSlot: task.GetTaskSlot(), StorageConfig: createStorageConfig(), + PluginContext: GetReadPluginContext(job.GetOptions()), } - WrapPluginContextWithImport(task.GetCollectionID(), job.GetSchema().GetProperties(), job.GetOptions(), req) + WrapPluginContext(task.GetCollectionID(), job.GetSchema().GetProperties(), req) return req } @@ -379,9 +380,10 @@ func AssembleImportRequest(task ImportTask, job ImportJob, meta *meta, alloc all StorageConfig: createStorageConfig(), TaskSlot: task.GetTaskSlot(), StorageVersion: storageVersion, + PluginContext: GetReadPluginContext(job.GetOptions()), UseLoonFfi: Params.CommonCfg.UseLoonFFI.GetAsBool(), } - WrapPluginContextWithImport(task.GetCollectionID(), job.GetSchema().GetProperties(), job.GetOptions(), req) + WrapPluginContext(task.GetCollectionID(), job.GetSchema().GetProperties(), req) return req, nil } diff --git a/internal/util/hookutil/cipher.go b/internal/util/hookutil/cipher.go index 46fd67e413..32f3594c45 100644 --- a/internal/util/hookutil/cipher.go +++ b/internal/util/hookutil/cipher.go @@ -249,11 +249,12 @@ func GetStoragePluginContext(collProps []*commonpb.KeyValuePair, collectionID in return nil } +// Non nill return func GetReadStoragePluginContext(importEzk string) []*commonpb.KeyValuePair { readContext, err := ImportEZ(importEzk) if err != nil { log.Error("failed to import ezk", zap.Error(err)) - return nil + return []*commonpb.KeyValuePair{} } return readContext }