From c2956dbe920fb48869d730348f06dac2fba57be4 Mon Sep 17 00:00:00 2001 From: neza2017 Date: Tue, 9 Feb 2021 10:36:31 +0800 Subject: [PATCH] Change master meta prefix Signed-off-by: neza2017 --- internal/masterservice/meta_table.go | 13 +++++++------ internal/queryservice/queryservice.go | 15 +++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/internal/masterservice/meta_table.go b/internal/masterservice/meta_table.go index c66f10741f..230422f24a 100644 --- a/internal/masterservice/meta_table.go +++ b/internal/masterservice/meta_table.go @@ -17,12 +17,13 @@ import ( ) const ( - TenantMetaPrefix = "tenant" - ProxyMetaPrefix = "proxy" - CollectionMetaPrefix = "collection" - PartitionMetaPrefix = "partition" - SegmentIndexMetaPrefix = "segment-index" - IndexMetaPrefix = "index" + ComponentPrefix = "master-service" + TenantMetaPrefix = ComponentPrefix + "/tenant" + ProxyMetaPrefix = ComponentPrefix + "/proxy" + CollectionMetaPrefix = ComponentPrefix + "/collection" + PartitionMetaPrefix = ComponentPrefix + "/partition" + SegmentIndexMetaPrefix = ComponentPrefix + "/segment-index" + IndexMetaPrefix = ComponentPrefix + "/index" ) type metaTable struct { diff --git a/internal/queryservice/queryservice.go b/internal/queryservice/queryservice.go index 60941772e2..25bf6febad 100644 --- a/internal/queryservice/queryservice.go +++ b/internal/queryservice/queryservice.go @@ -449,19 +449,22 @@ func (qs *QueryService) ReleasePartitions(req *querypb.ReleasePartitionRequest) segmentIDs := make([]UniqueID, 0) fmt.Println("start release partitions start, partitionIDs = ", partitionIDs) for _, partitionID := range partitionIDs { - segments, err := qs.replica.getSegments(dbID, collectionID, partitionID) + showSegmentRequest := &milvuspb.ShowSegmentRequest{ + Base: &commonpb.MsgBase{ + MsgType: commonpb.MsgType_kShowSegment, + }, + CollectionID: collectionID, + PartitionID: partitionID, + } + showSegmentResponse, err := qs.masterServiceClient.ShowSegments(showSegmentRequest) if err != nil { return &commonpb.Status{ ErrorCode: commonpb.ErrorCode_UNEXPECTED_ERROR, Reason: err.Error(), }, err } - res := make([]UniqueID, 0) - for _, segment := range segments { - res = append(res, segment.id) - } - segmentIDs = append(segmentIDs, res...) + segmentIDs = append(segmentIDs, showSegmentResponse.SegmentIDs...) err = qs.replica.releasePartition(dbID, collectionID, partitionID) if err != nil { return &commonpb.Status{