Kiu/VictoriaMetrics
Kiu/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2024-12-15 16:30:55 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

lib/storage: add key!=".+" filter additionally to negative filter matching empty value such as key!~"|foo"

Browse Source 
Updates https://github.com/VictoriaMetrics/VictoriaMetrics/issues/546
This commit is contained in:
Aliaksandr Valialkin 2020-06-18 20:02:57 +03:00
parent 1a01fe2cf2
commit 5f3a895c23
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/storage/tag_filters.go
View File

@ -57,14 +57,24 @@ func (tfs *TagFilters) Add(key, value []byte, isNegative, isRegexp bool) error {
return nil
}
// Leave negative tag filter matching anything as is,
// since it must filter out all the time series with the given key.
// Substitute negative tag filter matching anything with negative tag filter matching non-empty value
// in order to out all the time series with the given key.
value = []byte(".+")
}
tf := tfs.addTagFilter()
if err := tf.Init(tfs.commonPrefix, key, value, isNegative, isRegexp); err != nil {
return fmt.Errorf("cannot initialize tagFilter: %s", err)
}
if tf.isNegative && tf.isEmptyMatch {
// We have {key!~"|foo"} tag filter, which matches non=empty key values.
// So add {key=~".+"} tag filter in order to enforce this.
// See https://github.com/VictoriaMetrics/VictoriaMetrics/issues/546 for details.
tfNew := tfs.addTagFilter()
if err := tfNew.Init(tfs.commonPrefix, key, []byte(".+"), false, true); err != nil {
return fmt.Errorf(`cannot initialize {%s=".+"} tag filter: %s`, key, err)
}
}
if len(tf.graphiteReverseSuffix) > 0 {
re := regexp.QuoteMeta(string(tf.graphiteReverseSuffix)) + ".*"
tfNew := tfs.addTagFilter()

14
lib/storage/tag_filters_test.go
View File

@ -23,7 +23,6 @@ func TestExtractRegexpPrefix(t *testing.T) {
func TestGetRegexpFromCache(t *testing.T) {
f := func(s string, orValuesExpected, expectedMatches, expectedMismatches []string, suffixExpected string) {
t.Helper()
for i := 0; i < 3; i++ {
rcv, err := getRegexpFromCache([]byte(s))
if err != nil {
@ -479,7 +478,6 @@ func TestTagFilterMatchSuffix(t *testing.T) {
func TestGetOrValues(t *testing.T) {
f := func(s string, valuesExpected []string) {
t.Helper()
values := getOrValues(s)
if !reflect.DeepEqual(values, valuesExpected) {
t.Fatalf("unexpected values for s=%q; got %q; want %q", s, values, valuesExpected)
@ -487,6 +485,8 @@ func TestGetOrValues(t *testing.T) {
}
f("", []string{""})
f("|foo", []string{"", "foo"})
f("|foo|", []string{"", "", "foo"})
f("foo.+", nil)
f("foo.*", nil)
f(".*", nil)
@ -609,8 +609,8 @@ func TestTagFiltersAddEmpty(t *testing.T) {
}
expectTagFilter := func(idx int, value string, isNegative, isRegexp bool) {
t.Helper()
if len(tfs.tfs) != idx+1 {
t.Fatalf("expecting non-empty tag filter")
if idx >= len(tfs.tfs) {
t.Fatalf("missing tag filter #%d; len(tfs)=%d, tfs=%s", idx, len(tfs.tfs), tfs)
}
tf := tfs.tfs[idx]
if string(tf.value) != value {
@ -639,13 +639,11 @@ func TestTagFiltersAddEmpty(t *testing.T) {
t.Fatalf("unexpectedly added empty regexp filter %s", &tfs.tfs[0])
}
mustAdd([]byte("foo"), []byte(".*"), true, true)
expectTagFilter(0, ".*", true, true)
expectTagFilter(0, ".+", true, true)
mustAdd([]byte("foo"), []byte("foo||bar"), false, true)
expectTagFilter(1, "foo||bar", false, true)
mustAdd(nil, []byte("foo||bar"), true, true)
expectTagFilter(2, "foo||bar", true, true)
// Verify that otner filters are added normally.
// Verify that other filters are added normally.
tfs.Reset(0, 0)
mustAdd(nil, []byte("foobar"), false, false)
if len(tfs.tfs) != 1 {