From 7794d15b6ac7e7553710851f2e26d25e9662c061 Mon Sep 17 00:00:00 2001 From: Joe Elliott Date: Mon, 23 Sep 2019 14:59:42 -0400 Subject: [PATCH] Extended test query to expose broken query. Parsed logql correctly in validate (#1044) Signed-off-by: Joe Elliott --- pkg/querier/querier.go | 3 ++- pkg/querier/querier_test.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/querier/querier.go b/pkg/querier/querier.go index 573a995e5ca0..cf3435bfb4fb 100644 --- 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 index ae42065b2eef..75b7d93f152a 100644 --- 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(),