From 1319b622c47663bbdebb60b314d45a3642df3a82 Mon Sep 17 00:00:00 2001
From: Tom Wilkie <tom.wilkie@gmail.com>
Date: Wed, 8 May 2019 09:07:37 +0100
Subject: [PATCH] Review feedback.
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
---
pkg/logql/parser.go | 3 +--
pkg/logql/parser_test.go | 6 ------
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/pkg/logql/parser.go b/pkg/logql/parser.go
index 7d34c882..167b946a 100644
--- a/pkg/logql/parser.go
+++ b/pkg/logql/parser.go
@@ -17,11 +17,10 @@ func init() {
// ParseExpr parses a string and returns an Expr.
func ParseExpr(input string) (Expr, error) {
- var l = lexer{
+ l := lexer{
parser: exprNewParser().(*exprParserImpl),
}
l.Init(strings.NewReader(input))
- //l.Scanner.Mode = scanner.SkipComments | scanner.ScanStrings | scanner.ScanInts
l.Scanner.Error = func(_ *scanner.Scanner, msg string) {
l.Error(msg)
}
diff --git a/pkg/logql/parser_test.go b/pkg/logql/parser_test.go
index 1b889500..69c2d720 100644
--- a/pkg/logql/parser_test.go
+++ b/pkg/logql/parser_test.go
@@ -54,12 +54,6 @@ func TestParse(t *testing.T) {
in: `{foo="bar"}`,
exp: &matchersExpr{matchers: []*labels.Matcher{mustNewMatcher(labels.MatchEqual, "foo", "bar")}},
},
- /*
- {
- in: `{http.url=~"^/admin"}`,
- exp: &matchersExpr{matchers: []*labels.Matcher{mustNewMatcher(labels.MatchRegexp, "http.url", "^/admin")}},
- },
- */
{
in: `{ foo = "bar" }`,
exp: &matchersExpr{matchers: []*labels.Matcher{mustNewMatcher(labels.MatchEqual, "foo", "bar")}},
--
GitLab