Merge pull request kubernetes#84957 from ZP-AlwaysWin/dev-1105-1

k8s-ci-robot · web-flow · commit 35de7a2537f7 · 2019-11-12T04:48:43.000-08:00
Remove unnecessary judgment
diff --git a/pkg/scheduler/algorithm/predicates/utils.go b/pkg/scheduler/algorithm/predicates/utils.go
@@ -67,7 +67,7 @@ func FilterPodsByNamespace(pods []*v1.Pod, ns string) []*v1.Pod {
 
 // CreateSelectorFromLabels is used to define a selector that corresponds to the keys in a map.
 func CreateSelectorFromLabels(aL map[string]string) labels.Selector {
-	if aL == nil || len(aL) == 0 {
+	if len(aL) == 0 {
 		return labels.Everything()
 	}
 	return labels.Set(aL).AsSelector()
diff --git a/staging/src/k8s.io/apimachinery/pkg/util/naming/from_stack.go b/staging/src/k8s.io/apimachinery/pkg/util/naming/from_stack.go
@@ -82,7 +82,7 @@ var stackCreator = regexp.MustCompile(`(?m)^created by (.*)\n\s+(.*):(\d+) \+0x[
 func extractStackCreator() (string, int, bool) {
 	stack := debug.Stack()
 	matches := stackCreator.FindStringSubmatch(string(stack))
-	if matches == nil || len(matches) != 4 {
+	if len(matches) != 4 {
 		return "", 0, false
 	}
 	line, err := strconv.Atoi(matches[3])

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ func FilterPodsByNamespace(pods []v1.Pod, ns string) []v1.Pod {`
`67`	`67`
`68`	`68`	`// CreateSelectorFromLabels is used to define a selector that corresponds to the keys in a map.`
`69`	`69`	`func CreateSelectorFromLabels(aL map[string]string) labels.Selector {`
`70`		`- if aL == nil \|\| len(aL) == 0 {`
	`70`	`+ if len(aL) == 0 {`
`71`	`71`	`return labels.Everything()`
`72`	`72`	`}`
`73`	`73`	`return labels.Set(aL).AsSelector()`
Original file line number	Diff line number	Diff line change
@@ -82,7 +82,7 @@ var stackCreator = regexp.MustCompile(`(?m)^created by (.)\n\s+(.):(\d+) \+0x[
`82`	`82`	`func extractStackCreator() (string, int, bool) {`
`83`	`83`	`stack := debug.Stack()`
`84`	`84`	`matches := stackCreator.FindStringSubmatch(string(stack))`
`85`		`- if matches == nil \|\| len(matches) != 4 {`
	`85`	`+ if len(matches) != 4 {`
`86`	`86`	`return "", 0, false`
`87`	`87`	`}`
`88`	`88`	`line, err := strconv.Atoi(matches[3])`