[query] Fix bug with parsing Graphite find query (#1676)

src/query/api/v1/handler/graphite/find_parser.go

@@ -125,9 +125,9 @@ func parseFindParamsToQueries(r *http.Request) (
 
 	clonedMatchers := make([]models.Matcher, len(matchers))
 	copy(clonedMatchers, matchers)
-	// NB: change terminator from `MatchNotRegexp` to `MatchRegexp` to ensure
+	// NB: change terminator from `MatchNotField` to `MatchField` to ensure
 	// segments with children are matched.
-	clonedMatchers[len(clonedMatchers)-1].Type = models.MatchRegexp
+	clonedMatchers[len(clonedMatchers)-1].Type = models.MatchField
 	childQuery := &storage.CompleteTagsQuery{
 		CompleteNameOnly: false,
 		FilterNameTags:   filter,

src/query/api/v1/handler/graphite/find_test.go

@@ -127,7 +127,7 @@ func setupStorage(ctrl *gomock.Controller) storage.Storage {
 		matchers: []models.Matcher{
 			{Type: models.MatchEqual, Name: b("__g0__"), Value: b("foo")},
 			{Type: models.MatchRegexp, Name: b("__g1__"), Value: b(`b[^\.]*`)},
-			{Type: models.MatchNotRegexp, Name: b("__g2__"), Value: b(".*")},
+			{Type: models.MatchNotField, Name: b("__g2__")},
 		},
 	}
 
@@ -146,7 +146,7 @@ func setupStorage(ctrl *gomock.Controller) storage.Storage {
 		matchers: []models.Matcher{
 			{Type: models.MatchEqual, Name: b("__g0__"), Value: b("foo")},
 			{Type: models.MatchRegexp, Name: b("__g1__"), Value: b(`b[^\.]*`)},
-			{Type: models.MatchRegexp, Name: b("__g2__"), Value: b(".*")},
+			{Type: models.MatchField, Name: b("__g2__")},
 		},
 	}
 

src/query/generated/proto/rpcpb/query.proto

@@ -35,9 +35,12 @@ enum MatcherType {
 	REGEXP    = 2;
 	NOTREGEXP = 3;
 	// EXISTS and NOTEXISTS apply only to
-	// matcher name rather than value
+	// matcher name rather than value.
 	EXISTS    = 4;
 	NOTEXISTS = 5;
+	// ALL supercedes other matcher types
+	// and does no filtering.
+	ALL       = 6;
 }
 
 message FetchResponse {

src/query/graphite/storage/converter.go

@@ -25,15 +25,22 @@ import (
 	"github.com/m3db/m3/src/query/models"
 )
 
-var (
-	wildcard = []byte(".*")
+const (
+	wildcard = "*"
 )
 
 func convertMetricPartToMatcher(
 	count int,
 	metric string,
 ) (models.Matcher, error) {
 	var matchType models.MatchType
+	if metric == wildcard {
+		return models.Matcher{
+			Type: models.MatchField,
+			Name: graphite.TagName(count),
+		}, nil
+	}
+
 	value, isRegex, err := graphite.GlobToRegexPattern(metric)
 	if err != nil {
 		return models.Matcher{}, err
@@ -54,8 +61,7 @@ func convertMetricPartToMatcher(
 
 func matcherTerminator(count int) models.Matcher {
 	return models.Matcher{
-		Type:  models.MatchNotRegexp,
-		Name:  graphite.TagName(count),
-		Value: wildcard,
+		Type: models.MatchNotField,
+		Name: graphite.TagName(count),
 	}
 }

src/query/graphite/storage/converter_test.go

@@ -45,6 +45,20 @@ func TestConvertMetricPartToMatcher(t *testing.T) {
 	}
 }
 
+func TestConvertWildcardToMatcher(t *testing.T) {
+	metric := "*"
+	for i := 0; i < 100; i++ {
+		expected := models.Matcher{
+			Type: models.MatchField,
+			Name: graphite.TagName(i),
+		}
+
+		actual, err := convertMetricPartToMatcher(i, metric)
+		require.NoError(t, err)
+		assert.Equal(t, expected, actual)
+	}
+}
+
 func TestConvertAlphanumericMetricPartToMatcher(t *testing.T) {
 	metric := "abcdefg"
 	expected := models.Matcher{
@@ -61,9 +75,8 @@ func TestConvertAlphanumericMetricPartToMatcher(t *testing.T) {
 func TestMatcherTerminator(t *testing.T) {
 	for i := 0; i < 100; i++ {
 		expected := models.Matcher{
-			Type:  models.MatchNotRegexp,
-			Name:  graphite.TagName(i),
-			Value: []byte(".*"),
+			Type: models.MatchNotField,
+			Name: graphite.TagName(i),
 		}
 
 		actual := matcherTerminator(i)

src/query/graphite/storage/m3_wrapper_test.go

@@ -66,9 +66,9 @@ func TestTranslateQuery(t *testing.T) {
 		{Type: models.MatchEqual, Name: graphite.TagName(3), Value: []byte("terminator")},
 		{Type: models.MatchEqual, Name: graphite.TagName(4), Value: []byte("will")},
 		{Type: models.MatchEqual, Name: graphite.TagName(5), Value: []byte("be")},
-		{Type: models.MatchRegexp, Name: graphite.TagName(6), Value: []byte(`[^\.]*`)},
+		{Type: models.MatchField, Name: graphite.TagName(6)},
 		{Type: models.MatchRegexp, Name: graphite.TagName(7), Value: []byte(`back[^\.]`)},
-		{Type: models.MatchNotRegexp, Name: graphite.TagName(8), Value: []byte(".*")},
+		{Type: models.MatchNotField, Name: graphite.TagName(8)},
 	}
 
 	assert.Equal(t, expected, matchers)

src/query/models/matcher.go

@@ -38,6 +38,10 @@ func (m MatchType) String() string {
 		return "=~"
 	case MatchNotRegexp:
 		return "!~"
+	case MatchField:
+		return "-"
+	case MatchNotField:
+		return "!-"
 	case MatchAll:
 		return "*"
 	default:
@@ -69,22 +73,6 @@ func (m Matcher) String() string {
 	return fmt.Sprintf("%s%s%q", m.Name, m.Type, m.Value)
 }
 
-// Matches returns whether the matcher matches the given string value.
-func (m Matcher) Matches(s []byte) bool {
-	switch m.Type {
-	case MatchEqual:
-		return bytes.Equal(s, m.Value)
-	case MatchNotEqual:
-		return !bytes.Equal(s, m.Value)
-	case MatchRegexp:
-		return m.re.MatchString(string(s))
-	case MatchNotRegexp:
-		return !m.re.MatchString(string(s))
-	}
-
-	panic("labels.Matcher.Matches: invalid match type")
-}
-
 // ToTags converts Matchers to Tags
 // NB (braskin): this only works for exact matches
 func (m Matchers) ToTags(