Skip to content

Commit f5a8d25

Browse files
Joshua ArestyDifan Zhao
authored andcommitted
Optimize dns performance for non-glob use case
[#156576780](https://www.pivotaltracker.com/story/show/156576780) Signed-off-by: Difan Zhao <dzhao@pivotal.io>
1 parent 121ec34 commit f5a8d25

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

src/bosh-dns/dns/server/criteria/criteria.go

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,7 @@ func Field(field string, values []string) Matcher {
102102
}
103103

104104
func globMatches(field, value string) bool {
105-
if !strings.Contains(value, "*") {
106-
return field == value
107-
} else if value == "*" {
105+
if value == "*" {
108106
return true
109107
} else if strings.HasPrefix(value, "*") {
110108
return strings.HasSuffix(field, value[1:])
@@ -121,11 +119,20 @@ func FieldMatcher(field, value string) MatcherFunc {
121119
case "instanceName":
122120
return func(r *record.Record) bool { return r.ID == value }
123121
case "instanceGroupName":
124-
return func(r *record.Record) bool { return globMatches(r.Group, value) }
122+
if strings.Contains(value, "*") {
123+
return func(r *record.Record) bool { return globMatches(r.Group, value) }
124+
}
125+
return func(r *record.Record) bool { return r.Group == value }
125126
case "network":
126-
return func(r *record.Record) bool { return globMatches(r.Network, value) }
127+
if strings.Contains(value, "*") {
128+
return func(r *record.Record) bool { return globMatches(r.Network, value) }
129+
}
130+
return func(r *record.Record) bool { return r.Network == value }
127131
case "deployment":
128-
return func(r *record.Record) bool { return globMatches(r.Deployment, value) }
132+
if strings.Contains(value, "*") {
133+
return func(r *record.Record) bool { return globMatches(r.Deployment, value) }
134+
}
135+
return func(r *record.Record) bool { return r.Deployment == value }
129136
case "domain":
130137
return func(r *record.Record) bool { return r.Domain == value }
131138

0 commit comments

Comments
 (0)