From 302ca04d6c8bdca753f6f77a498d6ddf531fb5fa Mon Sep 17 00:00:00 2001 From: dragondriver Date: Sat, 9 Oct 2021 16:10:56 +0800 Subject: [PATCH] Describe collection by collection ID (#9471) Signed-off-by: dragondriver --- internal/proxy/task.go | 7 ++++--- internal/proxy/task_test.go | 7 +++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/internal/proxy/task.go b/internal/proxy/task.go index 3a3e427aa..d0d345d95 100644 --- a/internal/proxy/task.go +++ b/internal/proxy/task.go @@ -2636,10 +2636,11 @@ func (dct *describeCollectionTask) PreExecute(ctx context.Context) error { dct.Base.MsgType = commonpb.MsgType_DescribeCollection dct.Base.SourceID = Params.ProxyID - if err := ValidateCollectionName(dct.CollectionName); err != nil { - return err + if dct.CollectionID != 0 && len(dct.CollectionName) == 0 { + return nil } - return nil + + return ValidateCollectionName(dct.CollectionName) } func (dct *describeCollectionTask) Execute(ctx context.Context) error { diff --git a/internal/proxy/task_test.go b/internal/proxy/task_test.go index 61a7fae43..149fb72b0 100644 --- a/internal/proxy/task_test.go +++ b/internal/proxy/task_test.go @@ -1311,7 +1311,14 @@ func TestDescribeCollectionTask(t *testing.T) { err = task.PreExecute(ctx) assert.NotNil(t, err) + // describe collection with id + task.CollectionID = 1 + task.CollectionName = "" + err = task.PreExecute(ctx) + assert.NoError(t, err) + rc.Stop() + task.CollectionID = 0 task.CollectionName = collectionName err = task.PreExecute(ctx) assert.Nil(t, err) -- GitLab