diff --git a/tsdb/head_read.go b/tsdb/head_read.go index 464665ae8..4efa2e44b 100644 --- a/tsdb/head_read.go +++ b/tsdb/head_read.go @@ -113,7 +113,9 @@ func (h *headIndexReader) Postings(name string, values ...string) (index.Posting default: res := make([]index.Postings, 0, len(values)) for _, value := range values { - res = append(res, h.head.postings.Get(name, value)) + if p := h.head.postings.Get(name, value); !index.IsEmptyPostingsType(p) { + res = append(res, p) + } } return index.Merge(res...), nil } diff --git a/tsdb/index/postings.go b/tsdb/index/postings.go index 64574f85c..b55d70df0 100644 --- a/tsdb/index/postings.go +++ b/tsdb/index/postings.go @@ -428,6 +428,13 @@ func EmptyPostings() Postings { return emptyPostings } +// IsEmptyPostingsType returns true if the postings are an empty postings list. +// When this function returns false, it doesn't mean that the postings isn't empty +// (it could be an empty intersection of two non-empty postings, for example). +func IsEmptyPostingsType(p Postings) bool { + return p == emptyPostings +} + // ErrPostings returns new postings that immediately error. func ErrPostings(err error) Postings { return errPostings{err} diff --git a/tsdb/querier.go b/tsdb/querier.go index f6f1d27bd..061d5b394 100644 --- a/tsdb/querier.go +++ b/tsdb/querier.go @@ -275,6 +275,9 @@ func PostingsForMatchers(ix IndexReader, ms ...*labels.Matcher) (index.Postings, if err != nil { return nil, err } + if index.IsEmptyPostingsType(it) { + return index.EmptyPostings(), nil + } its = append(its, it) } else { // l="a" // Non-Not matcher, use normal postingsForMatcher. @@ -282,6 +285,9 @@ func PostingsForMatchers(ix IndexReader, ms ...*labels.Matcher) (index.Postings, if err != nil { return nil, err } + if index.IsEmptyPostingsType(it) { + return index.EmptyPostings(), nil + } its = append(its, it) } } else { // l="" diff --git a/tsdb/querier_bench_test.go b/tsdb/querier_bench_test.go index 3cf4e1934..1feb48f6f 100644 --- a/tsdb/querier_bench_test.go +++ b/tsdb/querier_bench_test.go @@ -91,6 +91,7 @@ func BenchmarkQuerier(b *testing.B) { func benchmarkPostingsForMatchers(b *testing.B, ir IndexReader) { n1 := labels.MustNewMatcher(labels.MatchEqual, "n", "1"+postingsBenchSuffix) + nX := labels.MustNewMatcher(labels.MatchEqual, "n", "X"+postingsBenchSuffix) jFoo := labels.MustNewMatcher(labels.MatchEqual, "j", "foo") jNotFoo := labels.MustNewMatcher(labels.MatchNotEqual, "j", "foo") @@ -106,31 +107,51 @@ func benchmarkPostingsForMatchers(b *testing.B, ir IndexReader) { iNot2 := labels.MustNewMatcher(labels.MatchNotEqual, "i", "2"+postingsBenchSuffix) iNot2Star := labels.MustNewMatcher(labels.MatchNotRegexp, "i", "^2.*$") iNotStar2Star := labels.MustNewMatcher(labels.MatchNotRegexp, "i", "^.*2.*$") - + jFooBar := labels.MustNewMatcher(labels.MatchRegexp, "j", "foo|bar") + jXXXYYY := labels.MustNewMatcher(labels.MatchRegexp, "j", "XXX|YYY") + jXplus := labels.MustNewMatcher(labels.MatchRegexp, "j", "X.+") + iCharSet := labels.MustNewMatcher(labels.MatchRegexp, "i", "1[0-9]") + iAlternate := labels.MustNewMatcher(labels.MatchRegexp, "i", "(1|2|3|4|5|6|20|55)") + iXYZ := labels.MustNewMatcher(labels.MatchRegexp, "i", "X|Y|Z") cases := []struct { name string matchers []*labels.Matcher }{ {`n="1"`, []*labels.Matcher{n1}}, + {`n="X"`, []*labels.Matcher{nX}}, {`n="1",j="foo"`, []*labels.Matcher{n1, jFoo}}, + {`n="X",j="foo"`, []*labels.Matcher{nX, jFoo}}, {`j="foo",n="1"`, []*labels.Matcher{jFoo, n1}}, {`n="1",j!="foo"`, []*labels.Matcher{n1, jNotFoo}}, + {`n="X",j!="foo"`, []*labels.Matcher{nX, jNotFoo}}, + {`i=~"1[0-9]",j=~"foo|bar"`, []*labels.Matcher{iCharSet, jFooBar}}, + {`j=~"foo|bar"`, []*labels.Matcher{jFooBar}}, + {`j=~"XXX|YYY"`, []*labels.Matcher{jXXXYYY}}, + {`j=~"X.+"`, []*labels.Matcher{jXplus}}, + {`i=~"(1|2|3|4|5|6|20|55)"`, []*labels.Matcher{iAlternate}}, + {`i=~"X|Y|Z"`, []*labels.Matcher{iXYZ}}, {`i=~".*"`, []*labels.Matcher{iStar}}, {`i=~"1.*"`, []*labels.Matcher{i1Star}}, {`i=~".*1"`, []*labels.Matcher{iStar1}}, {`i=~".+"`, []*labels.Matcher{iPlus}}, + {`i=~".+",j=~"X.+"`, []*labels.Matcher{iPlus, jXplus}}, {`i=~""`, []*labels.Matcher{iEmptyRe}}, {`i!=""`, []*labels.Matcher{iNotEmpty}}, {`n="1",i=~".*",j="foo"`, []*labels.Matcher{n1, iStar, jFoo}}, + {`n="X",i=~".*",j="foo"`, []*labels.Matcher{nX, iStar, jFoo}}, {`n="1",i=~".*",i!="2",j="foo"`, []*labels.Matcher{n1, iStar, iNot2, jFoo}}, {`n="1",i!=""`, []*labels.Matcher{n1, iNotEmpty}}, {`n="1",i!="",j="foo"`, []*labels.Matcher{n1, iNotEmpty, jFoo}}, + {`n="1",i!="",j=~"X.+"`, []*labels.Matcher{n1, iNotEmpty, jXplus}}, + {`n="1",i!="",j=~"XXX|YYY"`, []*labels.Matcher{n1, iNotEmpty, jXXXYYY}}, + {`n="1",i=~"X|Y|Z",j="foo"`, []*labels.Matcher{n1, iXYZ, jFoo}}, {`n="1",i=~".+",j="foo"`, []*labels.Matcher{n1, iPlus, jFoo}}, {`n="1",i=~"1.+",j="foo"`, []*labels.Matcher{n1, i1Plus, jFoo}}, {`n="1",i=~".*1.*",j="foo"`, []*labels.Matcher{n1, iStar1Star, jFoo}}, {`n="1",i=~".+",i!="2",j="foo"`, []*labels.Matcher{n1, iPlus, iNot2, jFoo}}, {`n="1",i=~".+",i!~"2.*",j="foo"`, []*labels.Matcher{n1, iPlus, iNot2Star, jFoo}}, {`n="1",i=~".+",i!~".*2.*",j="foo"`, []*labels.Matcher{n1, iPlus, iNotStar2Star, jFoo}}, + {`n="X",i=~".+",i!~".*2.*",j="foo"`, []*labels.Matcher{nX, iPlus, iNotStar2Star, jFoo}}, } for _, c := range cases { @@ -147,7 +168,10 @@ func benchmarkLabelValuesWithMatchers(b *testing.B, ir IndexReader) { i1 := labels.MustNewMatcher(labels.MatchEqual, "i", "1") iStar := labels.MustNewMatcher(labels.MatchRegexp, "i", "^.*$") jNotFoo := labels.MustNewMatcher(labels.MatchNotEqual, "j", "foo") + jXXXYYY := labels.MustNewMatcher(labels.MatchRegexp, "j", "XXX|YYY") + jXplus := labels.MustNewMatcher(labels.MatchRegexp, "j", "X.+") n1 := labels.MustNewMatcher(labels.MatchEqual, "n", "1"+postingsBenchSuffix) + nX := labels.MustNewMatcher(labels.MatchNotEqual, "n", "X"+postingsBenchSuffix) nPlus := labels.MustNewMatcher(labels.MatchRegexp, "i", "^.+$") cases := []struct { @@ -159,6 +183,9 @@ func benchmarkLabelValuesWithMatchers(b *testing.B, ir IndexReader) { {`i with n="1"`, "i", []*labels.Matcher{n1}}, {`i with n="^.+$"`, "i", []*labels.Matcher{nPlus}}, {`i with n="1",j!="foo"`, "i", []*labels.Matcher{n1, jNotFoo}}, + {`i with n="1",j=~"X.+"`, "i", []*labels.Matcher{n1, jXplus}}, + {`i with n="1",j=~"XXX|YYY"`, "i", []*labels.Matcher{n1, jXXXYYY}}, + {`i with n="X",j!="foo"`, "i", []*labels.Matcher{nX, jNotFoo}}, {`i with n="1",i=~"^.*$",j!="foo"`, "i", []*labels.Matcher{n1, iStar, jNotFoo}}, // n has 10 values. {`n with j!="foo"`, "n", []*labels.Matcher{jNotFoo}},