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

Merge pull request #39260 from tanshanshan/check-empty-set

Browse Source 
Automatic merge from submit-queue

check if the set is empty , and delete the reduntant type convert.

**What this PR does / why we need it**:

check if the set is empty , and delete the reduntant type convert.

Thanks.

**Special notes for your reviewer**:

**Release note**:

```release-note
```
This commit is contained in:
Kubernetes Submit Queue 2017-01-24 15:53:37 -08:00 committed by GitHub
commit ee94968f94
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -793,7 +793,7 @@ func validateLabelValue(v string) error {
// SelectorFromSet returns a Selector which will match exactly the given Set. A
// nil and empty Sets are considered equivalent to Everything().
func SelectorFromSet(ls Set) Selector {
if ls == nil {
if ls == nil || len(ls) == 0 {
return internalSelector{}
}
var requirements internalSelector
@ -807,14 +807,14 @@ func SelectorFromSet(ls Set) Selector {
}
// sort to have deterministic string representation
sort.Sort(ByKey(requirements))
return internalSelector(requirements)
return requirements
}
// SelectorFromValidatedSet returns a Selector which will match exactly the given Set.
// A nil and empty Sets are considered equivalent to Everything().
// It assumes that Set is already validated and doesn't do any validation.
func SelectorFromValidatedSet(ls Set) Selector {
if ls == nil {
if ls == nil || len(ls) == 0 {
return internalSelector{}
}
var requirements internalSelector
@ -823,7 +823,7 @@ func SelectorFromValidatedSet(ls Set) Selector {
}
// sort to have deterministic string representation
sort.Sort(ByKey(requirements))
return internalSelector(requirements)
return requirements
}
// ParseToRequirements takes a string representing a selector and returns a list of