Skip to content

Commit 5723a9f

Browse files
committed
chen - merge into 1 grammar in parser
Signed-off-by: Jialiang Liang <jiallian@amazon.com>
1 parent d9e29a5 commit 5723a9f

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

ppl/src/main/antlr/OpenSearchPPLParser.g4

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,7 @@ regexCommand
248248
;
249249

250250
regexExpr
251-
: field=qualifiedName EQUAL pattern=stringLiteral
252-
| field=qualifiedName NOT_EQUAL pattern=stringLiteral
251+
: field=qualifiedName operator=(EQUAL | NOT_EQUAL) pattern=stringLiteral
253252
;
254253

255254
patternsMethod

ppl/src/main/java/org/opensearch/sql/ppl/parser/AstBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,7 @@ public UnresolvedPlan visitAppendcolCommand(OpenSearchPPLParser.AppendcolCommand
910910
@Override
911911
public UnresolvedPlan visitRegexCommand(OpenSearchPPLParser.RegexCommandContext ctx) {
912912
UnresolvedExpression field = internalVisitExpression(ctx.regexExpr().field);
913-
boolean negated = ctx.regexExpr().NOT_EQUAL() != null;
913+
boolean negated = ctx.regexExpr().operator.getType() == OpenSearchPPLParser.NOT_EQUAL;
914914
Literal pattern = (Literal) internalVisitExpression(ctx.regexExpr().pattern);
915915

916916
return new Regex(field, negated, pattern);

0 commit comments

Comments
 (0)