dom/telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor templateSpec less method (#5840)

Browse Source
This commit is contained in:
Charlie Vieth
2019-05-15 19:35:07 -04:00
committed by Daniel Nelson
parent 1b3ca655c6
commit 43c6d13c33
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
internal/templating/template.go
View File

@@ -124,21 +124,16 @@ type templateSpecs []templateSpec
// Less reports whether the element with
// index j should sort before the element with index k.
func (e templateSpecs) Less(j, k int) bool {
if len(e[j].filter) == 0 && len(e[k].filter) == 0 {
jlength := len(strings.Split(e[j].template, e[j].separator))
klength := len(strings.Split(e[k].template, e[k].separator))
return jlength < klength
}
if len(e[j].filter) == 0 {
jlen := len(e[j].filter)
klen := len(e[k].filter)
if jlen == 0 && klen != 0 {
return true
}
if len(e[k].filter) == 0 {
if klen == 0 && jlen != 0 {
return false
}
jlength := len(strings.Split(e[j].template, e[j].separator))
klength := len(strings.Split(e[k].template, e[k].separator))
return jlength < klength
return strings.Count(e[j].template, e[j].separator) <
strings.Count(e[k].template, e[k].separator)
}
// Swap swaps the elements with indexes i and j.