Nathan,
On 9/28/15 5:16 AM, Nathan Scott wrote:
Hi Martins,
I'm seeing some recent QA regressions in pmlogrewrite tests, which
I'm guessing relate to the changes from end of last week. Could
you take a look, and/or pass back to me/Ken (I'm away for most of
of this week - can take a look when I get back though, if needed).
Sorry about that. Looks like TOK_ASSIGN was now binding to the new
pattern that allowed in broken metric names. Patch below tries to
ensure that dash and equals are followed by an alphanumeric. The
pmlogrewrite QA group now passes for me except 506, but I think this is
unrelated?
[70%] 506 [failed, exit status 1] - output mismatch (see 506.out.bad)
3c3,4
< OK
---
> -rw-r--r--. 1 pcpqa pcpqa 1909667088 Sep 28 14:20 src/big2.0
> Error: expecting 3 volumes, found 1
6c7,9
< OK
---
> -rw-r--r--. 1 pcpqa pcpqa 2147100868 Sep 28 14:21 src/big2.0
> -rw-r--r--. 1 pcpqa pcpqa 17963080 Sep 28 14:21 src/big2.1
> Error: expecting 3 volumes, found 2
Thanks
Martins
--- a/src/pmlogrewrite/lex.l
+++ b/src/pmlogrewrite/lex.l
@@ -178,7 +178,7 @@ dupstr(char *s, int strip_quotes)
[0-9]+\.\*\.\* { yylval.str = dupstr(yytext, 0); return
TOK_PMID_STAR; }
/* Generic name, e.g. for identifier or metric or hostname */
-[A-Za-z][A-Za-z0-9_.=-]* { yylval.str = dupstr(yytext, 0); return
TOK_GNAME; }
+[A-Za-z]([A-Za-z0-9_.]|([=-][A-Za-z0-9_.]))* { yylval.str =
dupstr(yytext, 0); return TOK_GNAME; }
\#.* { }
|