Skip to content

Commit 36d1609

Browse files
committed
Fix antlr4 parser issues
Signed-off-by: Lantao Jin <ltjin@amazon.com>
1 parent d22680b commit 36d1609

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

ppl/src/main/antlr/OpenSearchPPLLexer.g4

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ AD: 'AD';
3636
ML: 'ML';
3737
FILLNULL: 'FILLNULL';
3838
TRENDLINE: 'TRENDLINE';
39-
PATTERN_METHOD: 'PATTERN_METHOD';
4039
SIMPLE_PATTERN: 'SIMPLE_PATTERN';
4140
BRAIN: 'BRAIN';
4241
VARIABLE_COUNT_THRESHOLD: 'VARIABLE_COUNT_THRESHOLD';
@@ -417,7 +416,7 @@ INTEGER_LITERAL: DEC_DIGIT+;
417416
DECIMAL_LITERAL: (DEC_DIGIT+)? '.' DEC_DIGIT+;
418417

419418
fragment DATE_SUFFIX: ([\-.][*0-9]+)+;
420-
fragment CLUSTER_PREFIX_LITERAL: [*A-Z]+?[*A-Z_\-0-9]* COLON;
419+
fragment CLUSTER_PREFIX_LITERAL: [*a-zA-Z]+?[*a-zA-Z_\-0-9]* COLON;
421420
ID_DATE_SUFFIX: CLUSTER_PREFIX_LITERAL? ID_LITERAL DATE_SUFFIX;
422421
DQUOTA_STRING: '"' ( '\\'. | '""' | ~('"'| '\\') )* '"';
423422
SQUOTA_STRING: '\'' ('\\'. | '\'\'' | ~('\'' | '\\'))* '\'';
@@ -426,7 +425,7 @@ fragment DEC_DIGIT: [0-9];
426425

427426
// Identifiers cannot start with a single '_' since this an OpenSearch reserved
428427
// metadata field. Two underscores (or more) is acceptable, such as '__field'.
429-
fragment ID_LITERAL: ([@*A-Z_])+?[*A-Z_\-0-9]*;
428+
fragment ID_LITERAL: ([@*a-zA-Z_])+?[*a-zA-Z_\-0-9]*;
430429

431430

432431
ERROR_RECOGNITION: . -> channel(ERRORCHANNEL);

ppl/src/main/antlr/OpenSearchPPLParser.g4

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -983,6 +983,7 @@ keywordsCanBeId
983983
| multiFieldRelevanceFunctionName
984984
| commandName
985985
| comparisonOperator
986+
| patternMethod
986987
// commands assist keywords
987988
| IN
988989
| BETWEEN
@@ -994,6 +995,9 @@ keywordsCanBeId
994995
| FROM
995996
| PATTERN
996997
| NEW_FIELD
998+
| VARIABLE_COUNT_THRESHOLD
999+
| FREQUENCY_THRESHOLD_PERCENTAGE
1000+
| WITH
9971001
| REGEX
9981002
| PUNCT
9991003
| USING
@@ -1048,10 +1052,6 @@ keywordsCanBeId
10481052
| LAST
10491053
| LIST
10501054
| VALUES
1051-
| EARLIEST
1052-
| EARLIEST_TIME
1053-
| LATEST
1054-
| LATEST_TIME
10551055
| PER_DAY
10561056
| PER_HOUR
10571057
| PER_MINUTE
@@ -1069,4 +1069,6 @@ keywordsCanBeId
10691069
| FULL
10701070
| SEMI
10711071
| ANTI
1072+
| LEFT_HINT
1073+
| RIGHT_HINT
10721074
;

0 commit comments

Comments
 (0)