From e89d7204eb0e97b9dddd48457074215a887f6175 Mon Sep 17 00:00:00 2001 From: helen Date: Fri, 9 Jun 2023 14:47:00 +0800 Subject: [PATCH] MergeStringSlices use sets Signed-off-by: helen --- pkg/cri/util/strings.go | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/pkg/cri/util/strings.go b/pkg/cri/util/strings.go index df1a5c91a..1dfb28c3d 100644 --- a/pkg/cri/util/strings.go +++ b/pkg/cri/util/strings.go @@ -16,7 +16,11 @@ package util -import "strings" +import ( + "strings" + + "k8s.io/apimachinery/pkg/util/sets" +) // InStringSlice checks whether a string is inside a string slice. // Comparison is case insensitive. @@ -44,16 +48,7 @@ func SubtractStringSlice(ss []string, str string) []string { // MergeStringSlices merges 2 string slices into one and remove duplicated elements. func MergeStringSlices(a []string, b []string) []string { - set := map[string]struct{}{} - for _, s := range a { - set[s] = struct{}{} - } - for _, s := range b { - set[s] = struct{}{} - } - var ss []string - for s := range set { - ss = append(ss, s) - } - return ss + set := sets.NewString(a...) + set.Insert(b...) + return set.UnsortedList() }