Extended test query to expose broken query. Parsed logql correctly in…

… validate (#1044) Signed-off-by: Joe Elliott <number101010@gmail.com>
grafana · Sep 23, 2019 · 7794d15 · 7794d15
1 parent 9614b02
commit 7794d15
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pkg/querier/querier.go b/pkg/querier/querier.go
@@ -378,10 +378,11 @@ func (q *Querier) validateQueryRequest(ctx context.Context, req *logproto.QueryR
 		return err
 	}
 
-	matchers, err := logql.ParseMatchers(req.Selector)
+	selector, err := logql.ParseLogSelector(req.Selector)
 	if err != nil {
 		return err
 	}
+	matchers := selector.Matchers()
 
 	maxStreamMatchersPerQuery := q.limits.MaxStreamsMatchersPerQuery(userID)
 	if len(matchers) > maxStreamMatchersPerQuery {

diff --git a/pkg/querier/querier_test.go b/pkg/querier/querier_test.go
@@ -250,7 +250,7 @@ func defaultLimitsTestConfig() validation.Limits {
 
 func TestQuerier_validateQueryRequest(t *testing.T) {
 	request := logproto.QueryRequest{
-		Selector:  "{type=\"test\", fail=\"yes\"}",
+		Selector:  "{type=\"test\", fail=\"yes\"} |= \"foo\"",
 		Limit:     10,
 		Start:     time.Now().Add(-1 * time.Minute),
 		End:       time.Now(),