Fixed issue where the partition filter expression parser failed when …

…parsing '-' token in negative numbers. Basically the parser did not support it. Modified the INT token to support negative numbers.
Netflix · Mar 25, 2016 · d4b61bc · d4b61bc
1 parent e3ecbfc
commit d4b61bc
Show file tree

Hide file tree

Showing 4 changed files with 154 additions and 93 deletions.
diff --git a/...ommon-server/src/main/java/com/netflix/metacat/common/partition/parser/PartitionParser.jj b/...ommon-server/src/main/java/com/netflix/metacat/common/partition/parser/PartitionParser.jj
@@ -35,7 +35,7 @@ TOKEN :
 |	< LT: "<" >   
 |   < LPAREN : "(">    
 |   < RPAREN : ")">    
-| < INT: ( <DIGIT> )+ >
+| < INT: "-"( <DIGIT> )+ | ( <DIGIT> )+>
 |   < #DIGIT: ["0" - "9"] >
 | < FLOAT: <INT> <EXPONENT> | <MANTISSA> ( <EXPONENT> )? >
 |   < #EXPONENT: ["e", "E"] ("+"|"-")? <INT> >

diff --git a/...mmon-server/src/main/java/com/netflix/metacat/common/partition/parser/PartitionParser.jjt b/...mmon-server/src/main/java/com/netflix/metacat/common/partition/parser/PartitionParser.jjt
@@ -31,7 +31,7 @@ TOKEN :
 |	< LT: "<" >   
 |   < LPAREN : "(">    
 |   < RPAREN : ")">    
-| < INT: ( <DIGIT> )+ >
+| < INT: "-"( <DIGIT> )+ | ( <DIGIT> )+>
 |   < #DIGIT: ["0" - "9"] >
 | < FLOAT: <INT> <EXPONENT> | <MANTISSA> ( <EXPONENT> )? >
 |   < #EXPONENT: ["e", "E"] ("+"|"-")? <INT> >