github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Improve slice allocation in LabelSelectorAsSelector

Browse Source
This commit is contained in:
Aldo Culquicondor 2021-05-20 19:52:22 +00:00
parent 19c2394915
commit 82e4ab5ec6
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/helpers.go
View File

@ -38,13 +38,13 @@ func LabelSelectorAsSelector(ps *LabelSelector) (labels.Selector, error) {
if len(ps.MatchLabels)+len(ps.MatchExpressions) == 0 { if len(ps.MatchLabels)+len(ps.MatchExpressions) == 0 {
return labels.Everything(), nil return labels.Everything(), nil
} }
selector := labels.NewSelector() requirements := make([]labels.Requirement, 0, len(ps.MatchLabels)+len(ps.MatchExpressions))
for k, v := range ps.MatchLabels { for k, v := range ps.MatchLabels {
r, err := labels.NewRequirement(k, selection.Equals, []string{v}) r, err := labels.NewRequirement(k, selection.Equals, []string{v})
if err != nil { if err != nil {
return nil, err return nil, err
} }
selector = selector.Add(*r) requirements = append(requirements, *r)
} }
for _, expr := range ps.MatchExpressions { for _, expr := range ps.MatchExpressions {
var op selection.Operator var op selection.Operator
@ -64,8 +64,10 @@ func LabelSelectorAsSelector(ps *LabelSelector) (labels.Selector, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
selector = selector.Add(*r) requirements = append(requirements, *r)
} }
selector := labels.NewSelector()
selector = selector.Add(requirements...)
return selector, nil return selector, nil
} }
@ -154,7 +156,7 @@ func SetAsLabelSelector(ls labels.Set) *LabelSelector {
} }
selector := &LabelSelector{ selector := &LabelSelector{
MatchLabels: make(map[string]string), MatchLabels: make(map[string]string, len(ls)),
} }
for label, value := range ls { for label, value := range ls {
selector.MatchLabels[label] = value selector.MatchLabels[label] = value

10
staging/src/k8s.io/apimachinery/pkg/labels/selector.go
View File

@ -367,13 +367,9 @@ func safeSort(in []string) []string {
// Add adds requirements to the selector. It copies the current selector returning a new one // Add adds requirements to the selector. It copies the current selector returning a new one
func (s internalSelector) Add(reqs ...Requirement) Selector { func (s internalSelector) Add(reqs ...Requirement) Selector {
var ret internalSelector ret := make(internalSelector, 0, len(s)+len(reqs))
for ix := range s { ret = append(ret, s...)
ret = append(ret, s[ix]) ret = append(ret, reqs...)
}
for _, r := range reqs {
ret = append(ret, r)
}
sort.Sort(ByKey(ret)) sort.Sort(ByKey(ret))
return ret return ret
} }