mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Remove redundant code and support charclass without base.

Browse source 
Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
This commit is contained in:
Cyril Tovena 2021-10-05 15:16:21 +02:00
parent bd4d997bee
commit 623c3ebeec
No known key found for this signature in database
GPG key ID: FD8F768F9D633FB6
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkg/labels/regexp.go
View file

@ -80,9 +80,6 @@ func findSetMatches(re *syntax.Regexp, base string) []string {
return found
}
case syntax.OpCharClass:
if len(base) == 0 {
return nil
}
if len(re.Rune) == 1 {
return []string{base + string(re.Rune)}
}
@ -99,13 +96,10 @@ func findSetMatches(re *syntax.Regexp, base string) []string {
}
for i := 0; i < len(re.Rune); i = i + 2 {
lo, hi := re.Rune[i], re.Rune[i+1]
if hi == lo {
matches = append(matches, base+string(hi))
} else {
for c := lo; c <= hi; c++ {
matches = append(matches, base+string(c))
}
for c := lo; c <= hi; c++ {
matches = append(matches, base+string(c))
}
}
return matches
default:

2
pkg/labels/regexp_test.go
View file

@ -116,7 +116,7 @@ func TestFindSetMatches(t *testing.T) {
{"bar|b|buzz", []string{"bar", "b", "buzz"}},
// Simple sets containing escaped characters.
{"fo\\.o|bar\\?|\\^baz", []string{"fo.o", "bar?", "^baz"}},
{"[abc]d", []string{"ad", "bd", "cd"}},
// high low charset different => A(B[CD]|EF)|BC[XY]
{"ABC|ABD|AEF|BCX|BCY", []string{"ABC", "ABD", "AEF", "BCX", "BCY"}},
// triple concat