From bb93b22c84a89198db85d7313414ac4228c07efd Mon Sep 17 00:00:00 2001 From: "zhenshan.cao" Date: Mon, 12 Feb 2024 08:30:55 +0800 Subject: [PATCH] fix: should return collectionName in response of ListAliases (#30532) issue : https://github.com/milvus-io/milvus/issues/30369 Signed-off-by: zhenshan.cao --- internal/proxy/task_alias.go | 10 ++++++++++ internal/querycoordv2/services.go | 2 +- internal/rootcoord/root_coord.go | 7 ++++--- .../milvus_client/test_milvus_client_partition.py | 2 +- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/internal/proxy/task_alias.go b/internal/proxy/task_alias.go index 6fd1bfa4e5..863f91e4d2 100644 --- a/internal/proxy/task_alias.go +++ b/internal/proxy/task_alias.go @@ -311,6 +311,10 @@ func (a *DescribeAliasTask) OnEnqueue() error { func (a *DescribeAliasTask) PreExecute(ctx context.Context) error { a.Base.MsgType = commonpb.MsgType_DescribeAlias a.Base.SourceID = a.nodeID + // collection alias uses the same format as collection name + if err := ValidateCollectionAlias(a.GetAlias()); err != nil { + return err + } return nil } @@ -374,6 +378,12 @@ func (a *ListAliasesTask) OnEnqueue() error { func (a *ListAliasesTask) PreExecute(ctx context.Context) error { a.Base.MsgType = commonpb.MsgType_ListAliases a.Base.SourceID = a.nodeID + + if len(a.GetCollectionName()) > 0 { + if err := validateCollectionName(a.GetCollectionName()); err != nil { + return err + } + } return nil } diff --git a/internal/querycoordv2/services.go b/internal/querycoordv2/services.go index 9273e019d9..7d0e696c5d 100644 --- a/internal/querycoordv2/services.go +++ b/internal/querycoordv2/services.go @@ -380,7 +380,7 @@ func (s *Server) ReleasePartitions(ctx context.Context, req *querypb.ReleasePart } if len(req.GetPartitionIDs()) == 0 { - err := merr.WrapErrParameterInvalid("any parttiion", "empty partition list") + err := merr.WrapErrParameterInvalid("any partition", "empty partition list") log.Warn("no partition to release", zap.Error(err)) metrics.QueryCoordReleaseCount.WithLabelValues(metrics.FailLabel).Inc() return merr.Status(err), nil diff --git a/internal/rootcoord/root_coord.go b/internal/rootcoord/root_coord.go index 430778e288..61f9158be2 100644 --- a/internal/rootcoord/root_coord.go +++ b/internal/rootcoord/root_coord.go @@ -1927,9 +1927,10 @@ func (c *Core) ListAliases(ctx context.Context, in *milvuspb.ListAliasesRequest) log.Info("done to list aliases") return &milvuspb.ListAliasesResponse{ - Status: merr.Status(nil), - DbName: in.GetDbName(), - Aliases: aliases, + Status: merr.Status(nil), + DbName: in.GetDbName(), + CollectionName: in.GetCollectionName(), + Aliases: aliases, }, nil } diff --git a/tests/python_client/milvus_client/test_milvus_client_partition.py b/tests/python_client/milvus_client/test_milvus_client_partition.py index b067a2648d..152d5aa037 100644 --- a/tests/python_client/milvus_client/test_milvus_client_partition.py +++ b/tests/python_client/milvus_client/test_milvus_client_partition.py @@ -533,7 +533,7 @@ class TestMilvusClientReleasePartitionInvalid(TestcaseBase): partition_names = [] # 2. create partition client_w.create_collection(client, collection_name, default_dim) - error = {ct.err_code: 1100, ct.err_msg: f"invalid parameter[expected=any parttiion][actual=empty partition list"} + error = {ct.err_code: 1100, ct.err_msg: f"invalid parameter[expected=any partition][actual=empty partition list"} client_w.release_partitions(client, collection_name, partition_names, check_task=CheckTasks.err_res, check_items=error)