From ee75ddf1815ff0a74e045707a4161b1b0f1c4c2e Mon Sep 17 00:00:00 2001 From: Ross Wolf <31489089+rw-access@users.noreply.github.com> Date: Mon, 27 Jan 2020 19:35:35 -0700 Subject: [PATCH 01/11] EQL: Add AstBuilder visitors --- x-pack/plugin/eql/src/main/antlr/EqlBase.g4 | 15 +- .../xpack/eql/parser/AbstractBuilder.java | 73 -- .../xpack/eql/parser/AstBuilder.java | 4 +- .../xpack/eql/parser/EqlBaseBaseListener.java | 24 +- .../xpack/eql/parser/EqlBaseBaseVisitor.java | 13 +- .../xpack/eql/parser/EqlBaseListener.java | 32 +- .../xpack/eql/parser/EqlBaseParser.java | 776 ++++++++---------- .../xpack/eql/parser/EqlBaseVisitor.java | 19 +- .../xpack/eql/parser/ExpressionBuilder.java | 166 +++- .../xpack/eql/parser/IdentifierBuilder.java | 16 +- .../xpack/eql/parser/LiteralBuilder.java | 141 ++++ .../xpack/eql/parser/QueryBuilder.java | 51 ++ .../xpack/eql/parser/ExpressionTests.java | 134 +++ .../xpack/eql/parser/GrammarTests.java | 20 +- 14 files changed, 886 insertions(+), 598 deletions(-) create mode 100644 x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/LiteralBuilder.java create mode 100644 x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/QueryBuilder.java create mode 100644 x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ExpressionTests.java diff --git a/x-pack/plugin/eql/src/main/antlr/EqlBase.g4 b/x-pack/plugin/eql/src/main/antlr/EqlBase.g4 index 8e26ec9b753df..b130c1307f918 100644 --- a/x-pack/plugin/eql/src/main/antlr/EqlBase.g4 +++ b/x-pack/plugin/eql/src/main/antlr/EqlBase.g4 @@ -73,26 +73,15 @@ expression booleanExpression : NOT booleanExpression #logicalNot | relationship=IDENTIFIER OF subquery #processCheck - | predicated #booleanDefault + | valueExpression #booleanDefault | left=booleanExpression operator=AND right=booleanExpression #logicalBinary | left=booleanExpression operator=OR right=booleanExpression #logicalBinary ; -// workaround for: -// https://github.com/antlr/antlr4/issues/780 -// https://github.com/antlr/antlr4/issues/781 -predicated - : valueExpression predicate? - ; - -// dedicated calls for each branch are not used to reuse the NOT handling across them -// instead the property kind is used for differentiation -predicate - : NOT? kind=IN LP valueExpression (COMMA valueExpression)* RP - ; valueExpression : primaryExpression #valueExpressionDefault + | primaryExpression NOT? IN LP expression (COMMA expression)* RP #containsExpression | operator=(MINUS | PLUS) valueExpression #arithmeticUnary | left=valueExpression operator=(ASTERISK | SLASH | PERCENT) right=valueExpression #arithmeticBinary | left=valueExpression operator=(PLUS | MINUS) right=valueExpression #arithmeticBinary diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/AbstractBuilder.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/AbstractBuilder.java index 86a81fa41f7f8..9b43a4bc04bb7 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/AbstractBuilder.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/AbstractBuilder.java @@ -44,14 +44,6 @@ protected T typedParsing(ParseTree ctx, Class type) { type.getSimpleName(), (result != null ? result.getClass().getSimpleName() : "null")); } - protected Expression expression(ParseTree ctx) { - return typedParsing(ctx, Expression.class); - } - - protected List expressions(List ctxs) { - return visitList(ctxs, Expression.class); - } - protected List visitList(List contexts, Class clazz) { List results = new ArrayList<>(contexts.size()); for (ParserRuleContext context : contexts) { @@ -113,71 +105,6 @@ static String text(ParseTree node) { return node == null ? null : node.getText(); } - /** - * Extracts the actual unescaped string (literal) value of a terminal node. - */ - static String string(TerminalNode node) { - return node == null ? null : unquoteString(node.getText()); - } - - static String unquoteString(String text) { - // remove leading and trailing ' for strings and also eliminate escaped single quotes - if (text == null) { - return null; - } - - // unescaped strings can be interpreted directly - if (text.startsWith("?")) { - return text.substring(2, text.length() - 1); - } - - text = text.substring(1, text.length() - 1); - Pattern regex = Pattern.compile("\\\\."); - StringBuffer resultString = new StringBuffer(); - Matcher regexMatcher = regex.matcher(text); - - while (regexMatcher.find()) { - String source = regexMatcher.group(); - String replacement; - - switch (source) { - case "\\t": - replacement = "\t"; - break; - case "\\b": - replacement = "\b"; - break; - case "\\f": - replacement = "\f"; - break; - case "\\n": - replacement = "\n"; - break; - case "\\r": - replacement = "\r"; - break; - case "\\\"": - replacement = "\""; - break; - case "\\'": - replacement = "'"; - break; - case "\\\\": - // will be interpreted as regex, so we have to escape it - replacement = "\\\\"; - break; - default: - replacement = source; - } - - regexMatcher.appendReplacement(resultString, replacement); - - } - regexMatcher.appendTail(resultString); - - return resultString.toString(); - } - @Override public Object visitTerminal(TerminalNode node) { Source source = source(node); diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/AstBuilder.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/AstBuilder.java index 95f6e8dac3545..64815e0d44c0c 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/AstBuilder.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/AstBuilder.java @@ -8,10 +8,10 @@ import org.elasticsearch.xpack.eql.parser.EqlBaseParser.SingleStatementContext; -public class AstBuilder extends ExpressionBuilder { +public class AstBuilder extends QueryBuilder { @Override public Object visitSingleStatement(SingleStatementContext ctx) { return expression(ctx.statement()); } -} \ No newline at end of file +} diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseBaseListener.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseBaseListener.java index 1290235e7a40a..b8fb35822fbdd 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseBaseListener.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseBaseListener.java @@ -232,49 +232,37 @@ class EqlBaseBaseListener implements EqlBaseListener { * *

The default implementation does nothing.

*/ - @Override public void enterPredicated(EqlBaseParser.PredicatedContext ctx) { } - /** - * {@inheritDoc} - * - *

The default implementation does nothing.

- */ - @Override public void exitPredicated(EqlBaseParser.PredicatedContext ctx) { } - /** - * {@inheritDoc} - * - *

The default implementation does nothing.

- */ - @Override public void enterPredicate(EqlBaseParser.PredicateContext ctx) { } + @Override public void enterValueExpressionDefault(EqlBaseParser.ValueExpressionDefaultContext ctx) { } /** * {@inheritDoc} * *

The default implementation does nothing.

*/ - @Override public void exitPredicate(EqlBaseParser.PredicateContext ctx) { } + @Override public void exitValueExpressionDefault(EqlBaseParser.ValueExpressionDefaultContext ctx) { } /** * {@inheritDoc} * *

The default implementation does nothing.

*/ - @Override public void enterValueExpressionDefault(EqlBaseParser.ValueExpressionDefaultContext ctx) { } + @Override public void enterComparison(EqlBaseParser.ComparisonContext ctx) { } /** * {@inheritDoc} * *

The default implementation does nothing.

*/ - @Override public void exitValueExpressionDefault(EqlBaseParser.ValueExpressionDefaultContext ctx) { } + @Override public void exitComparison(EqlBaseParser.ComparisonContext ctx) { } /** * {@inheritDoc} * *

The default implementation does nothing.

*/ - @Override public void enterComparison(EqlBaseParser.ComparisonContext ctx) { } + @Override public void enterContainsExpression(EqlBaseParser.ContainsExpressionContext ctx) { } /** * {@inheritDoc} * *

The default implementation does nothing.

*/ - @Override public void exitComparison(EqlBaseParser.ComparisonContext ctx) { } + @Override public void exitContainsExpression(EqlBaseParser.ContainsExpressionContext ctx) { } /** * {@inheritDoc} * diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseBaseVisitor.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseBaseVisitor.java index cd981a4baf101..634ce95cf1d6a 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseBaseVisitor.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseBaseVisitor.java @@ -143,28 +143,21 @@ class EqlBaseBaseVisitor extends AbstractParseTreeVisitor implements EqlBa *

The default implementation returns the result of calling * {@link #visitChildren} on {@code ctx}.

*/ - @Override public T visitPredicated(EqlBaseParser.PredicatedContext ctx) { return visitChildren(ctx); } - /** - * {@inheritDoc} - * - *

The default implementation returns the result of calling - * {@link #visitChildren} on {@code ctx}.

- */ - @Override public T visitPredicate(EqlBaseParser.PredicateContext ctx) { return visitChildren(ctx); } + @Override public T visitValueExpressionDefault(EqlBaseParser.ValueExpressionDefaultContext ctx) { return visitChildren(ctx); } /** * {@inheritDoc} * *

The default implementation returns the result of calling * {@link #visitChildren} on {@code ctx}.

*/ - @Override public T visitValueExpressionDefault(EqlBaseParser.ValueExpressionDefaultContext ctx) { return visitChildren(ctx); } + @Override public T visitComparison(EqlBaseParser.ComparisonContext ctx) { return visitChildren(ctx); } /** * {@inheritDoc} * *

The default implementation returns the result of calling * {@link #visitChildren} on {@code ctx}.

*/ - @Override public T visitComparison(EqlBaseParser.ComparisonContext ctx) { return visitChildren(ctx); } + @Override public T visitContainsExpression(EqlBaseParser.ContainsExpressionContext ctx) { return visitChildren(ctx); } /** * {@inheritDoc} * diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseListener.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseListener.java index 43cd93d136c44..30ce249f8b1ba 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseListener.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseListener.java @@ -195,26 +195,6 @@ interface EqlBaseListener extends ParseTreeListener { * @param ctx the parse tree */ void exitLogicalBinary(EqlBaseParser.LogicalBinaryContext ctx); - /** - * Enter a parse tree produced by {@link EqlBaseParser#predicated}. - * @param ctx the parse tree - */ - void enterPredicated(EqlBaseParser.PredicatedContext ctx); - /** - * Exit a parse tree produced by {@link EqlBaseParser#predicated}. - * @param ctx the parse tree - */ - void exitPredicated(EqlBaseParser.PredicatedContext ctx); - /** - * Enter a parse tree produced by {@link EqlBaseParser#predicate}. - * @param ctx the parse tree - */ - void enterPredicate(EqlBaseParser.PredicateContext ctx); - /** - * Exit a parse tree produced by {@link EqlBaseParser#predicate}. - * @param ctx the parse tree - */ - void exitPredicate(EqlBaseParser.PredicateContext ctx); /** * Enter a parse tree produced by the {@code valueExpressionDefault} * labeled alternative in {@link EqlBaseParser#valueExpression}. @@ -239,6 +219,18 @@ interface EqlBaseListener extends ParseTreeListener { * @param ctx the parse tree */ void exitComparison(EqlBaseParser.ComparisonContext ctx); + /** + * Enter a parse tree produced by the {@code containsExpression} + * labeled alternative in {@link EqlBaseParser#valueExpression}. + * @param ctx the parse tree + */ + void enterContainsExpression(EqlBaseParser.ContainsExpressionContext ctx); + /** + * Exit a parse tree produced by the {@code containsExpression} + * labeled alternative in {@link EqlBaseParser#valueExpression}. + * @param ctx the parse tree + */ + void exitContainsExpression(EqlBaseParser.ContainsExpressionContext ctx); /** * Enter a parse tree produced by the {@code arithmeticBinary} * labeled alternative in {@link EqlBaseParser#valueExpression}. diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseParser.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseParser.java index 1bed5e7169e92..65f8a089e16d4 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseParser.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseParser.java @@ -28,17 +28,16 @@ class EqlBaseParser extends Parser { RULE_query = 3, RULE_sequenceParams = 4, RULE_sequence = 5, RULE_join = 6, RULE_pipe = 7, RULE_joinKeys = 8, RULE_joinTerm = 9, RULE_sequenceTerm = 10, RULE_subquery = 11, RULE_eventQuery = 12, RULE_expression = 13, RULE_booleanExpression = 14, - RULE_predicated = 15, RULE_predicate = 16, RULE_valueExpression = 17, - RULE_primaryExpression = 18, RULE_functionExpression = 19, RULE_constant = 20, - RULE_comparisonOperator = 21, RULE_booleanValue = 22, RULE_qualifiedName = 23, - RULE_identifier = 24, RULE_timeUnit = 25, RULE_number = 26, RULE_string = 27; + RULE_valueExpression = 15, RULE_primaryExpression = 16, RULE_functionExpression = 17, + RULE_constant = 18, RULE_comparisonOperator = 19, RULE_booleanValue = 20, + RULE_qualifiedName = 21, RULE_identifier = 22, RULE_timeUnit = 23, RULE_number = 24, + RULE_string = 25; public static final String[] ruleNames = { "singleStatement", "singleExpression", "statement", "query", "sequenceParams", "sequence", "join", "pipe", "joinKeys", "joinTerm", "sequenceTerm", "subquery", - "eventQuery", "expression", "booleanExpression", "predicated", "predicate", - "valueExpression", "primaryExpression", "functionExpression", "constant", - "comparisonOperator", "booleanValue", "qualifiedName", "identifier", "timeUnit", - "number", "string" + "eventQuery", "expression", "booleanExpression", "valueExpression", "primaryExpression", + "functionExpression", "constant", "comparisonOperator", "booleanValue", + "qualifiedName", "identifier", "timeUnit", "number", "string" }; private static final String[] _LITERAL_NAMES = { @@ -135,9 +134,9 @@ public final SingleStatementContext singleStatement() throws RecognitionExceptio try { enterOuterAlt(_localctx, 1); { - setState(56); + setState(52); statement(); - setState(57); + setState(53); match(EOF); } } @@ -182,9 +181,9 @@ public final SingleExpressionContext singleExpression() throws RecognitionExcept try { enterOuterAlt(_localctx, 1); { - setState(59); + setState(55); expression(); - setState(60); + setState(56); match(EOF); } } @@ -235,19 +234,19 @@ public final StatementContext statement() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(62); + setState(58); query(); - setState(66); + setState(62); _errHandler.sync(this); _la = _input.LA(1); while (_la==PIPE) { { { - setState(63); + setState(59); pipe(); } } - setState(68); + setState(64); _errHandler.sync(this); _la = _input.LA(1); } @@ -297,19 +296,19 @@ public final QueryContext query() throws RecognitionException { QueryContext _localctx = new QueryContext(_ctx, getState()); enterRule(_localctx, 6, RULE_query); try { - setState(72); + setState(68); switch (_input.LA(1)) { case SEQUENCE: enterOuterAlt(_localctx, 1); { - setState(69); + setState(65); sequence(); } break; case JOIN: enterOuterAlt(_localctx, 2); { - setState(70); + setState(66); join(); } break; @@ -317,7 +316,7 @@ public final QueryContext query() throws RecognitionException { case IDENTIFIER: enterOuterAlt(_localctx, 3); { - setState(71); + setState(67); eventQuery(); } break; @@ -368,14 +367,14 @@ public final SequenceParamsContext sequenceParams() throws RecognitionException try { enterOuterAlt(_localctx, 1); { - setState(74); + setState(70); match(WITH); { - setState(75); + setState(71); match(MAXSPAN); - setState(76); + setState(72); match(EQ); - setState(77); + setState(73); timeUnit(); } } @@ -433,19 +432,19 @@ public final SequenceContext sequence() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(79); + setState(75); match(SEQUENCE); - setState(88); + setState(84); switch (_input.LA(1)) { case BY: { - setState(80); + setState(76); ((SequenceContext)_localctx).by = joinKeys(); - setState(82); + setState(78); _la = _input.LA(1); if (_la==WITH) { { - setState(81); + setState(77); sequenceParams(); } } @@ -454,13 +453,13 @@ public final SequenceContext sequence() throws RecognitionException { break; case WITH: { - setState(84); + setState(80); sequenceParams(); - setState(86); + setState(82); _la = _input.LA(1); if (_la==BY) { { - setState(85); + setState(81); ((SequenceContext)_localctx).by = joinKeys(); } } @@ -472,29 +471,29 @@ public final SequenceContext sequence() throws RecognitionException { default: throw new NoViableAltException(this); } - setState(90); + setState(86); sequenceTerm(); - setState(92); + setState(88); _errHandler.sync(this); _la = _input.LA(1); do { { { - setState(91); + setState(87); sequenceTerm(); } } - setState(94); + setState(90); _errHandler.sync(this); _la = _input.LA(1); } while ( _la==LB ); - setState(98); + setState(94); _la = _input.LA(1); if (_la==UNTIL) { { - setState(96); + setState(92); match(UNTIL); - setState(97); + setState(93); sequenceTerm(); } } @@ -551,40 +550,40 @@ public final JoinContext join() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(100); + setState(96); match(JOIN); - setState(102); + setState(98); _la = _input.LA(1); if (_la==BY) { { - setState(101); + setState(97); ((JoinContext)_localctx).by = joinKeys(); } } - setState(104); + setState(100); joinTerm(); - setState(106); + setState(102); _errHandler.sync(this); _la = _input.LA(1); do { { { - setState(105); + setState(101); joinTerm(); } } - setState(108); + setState(104); _errHandler.sync(this); _la = _input.LA(1); } while ( _la==LB ); - setState(112); + setState(108); _la = _input.LA(1); if (_la==UNTIL) { { - setState(110); + setState(106); match(UNTIL); - setState(111); + setState(107); joinTerm(); } } @@ -642,29 +641,29 @@ public final PipeContext pipe() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(114); + setState(110); match(PIPE); - setState(115); + setState(111); ((PipeContext)_localctx).kind = match(IDENTIFIER); - setState(124); + setState(120); _la = _input.LA(1); if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << FALSE) | (1L << NOT) | (1L << NULL) | (1L << TRUE) | (1L << PLUS) | (1L << MINUS) | (1L << LP) | (1L << ESCAPED_IDENTIFIER) | (1L << STRING) | (1L << INTEGER_VALUE) | (1L << DECIMAL_VALUE) | (1L << IDENTIFIER))) != 0)) { { - setState(116); + setState(112); booleanExpression(0); - setState(121); + setState(117); _errHandler.sync(this); _la = _input.LA(1); while (_la==COMMA) { { { - setState(117); + setState(113); match(COMMA); - setState(118); + setState(114); booleanExpression(0); } } - setState(123); + setState(119); _errHandler.sync(this); _la = _input.LA(1); } @@ -722,23 +721,23 @@ public final JoinKeysContext joinKeys() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(126); + setState(122); match(BY); - setState(127); + setState(123); expression(); - setState(132); + setState(128); _errHandler.sync(this); _la = _input.LA(1); while (_la==COMMA) { { { - setState(128); + setState(124); match(COMMA); - setState(129); + setState(125); expression(); } } - setState(134); + setState(130); _errHandler.sync(this); _la = _input.LA(1); } @@ -789,13 +788,13 @@ public final JoinTermContext joinTerm() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(135); + setState(131); subquery(); - setState(137); + setState(133); _la = _input.LA(1); if (_la==BY) { { - setState(136); + setState(132); ((JoinTermContext)_localctx).by = joinKeys(); } } @@ -852,21 +851,21 @@ public final SequenceTermContext sequenceTerm() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(139); + setState(135); subquery(); - setState(145); + setState(141); _la = _input.LA(1); if (_la==FORK) { { - setState(140); + setState(136); match(FORK); - setState(143); + setState(139); _la = _input.LA(1); if (_la==EQ) { { - setState(141); + setState(137); match(EQ); - setState(142); + setState(138); booleanValue(); } } @@ -874,11 +873,11 @@ public final SequenceTermContext sequenceTerm() throws RecognitionException { } } - setState(148); + setState(144); _la = _input.LA(1); if (_la==BY) { { - setState(147); + setState(143); ((SequenceTermContext)_localctx).by = joinKeys(); } } @@ -927,11 +926,11 @@ public final SubqueryContext subquery() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(150); + setState(146); match(LB); - setState(151); + setState(147); eventQuery(); - setState(152); + setState(148); match(RB); } } @@ -980,11 +979,11 @@ public final EventQueryContext eventQuery() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(154); + setState(150); ((EventQueryContext)_localctx).event = identifier(); - setState(155); + setState(151); match(WHERE); - setState(156); + setState(152); expression(); } } @@ -1028,7 +1027,7 @@ public final ExpressionContext expression() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(158); + setState(154); booleanExpression(0); } } @@ -1075,8 +1074,8 @@ public T accept(ParseTreeVisitor visitor) { } } public static class BooleanDefaultContext extends BooleanExpressionContext { - public PredicatedContext predicated() { - return getRuleContext(PredicatedContext.class,0); + public ValueExpressionContext valueExpression() { + return getRuleContext(ValueExpressionContext.class,0); } public BooleanDefaultContext(BooleanExpressionContext ctx) { copyFrom(ctx); } @Override @@ -1158,7 +1157,7 @@ private BooleanExpressionContext booleanExpression(int _p) throws RecognitionExc int _alt; enterOuterAlt(_localctx, 1); { - setState(167); + setState(163); _errHandler.sync(this); switch ( getInterpreter().adaptivePredict(_input,17,_ctx) ) { case 1: @@ -1167,9 +1166,9 @@ private BooleanExpressionContext booleanExpression(int _p) throws RecognitionExc _ctx = _localctx; _prevctx = _localctx; - setState(161); + setState(157); match(NOT); - setState(162); + setState(158); booleanExpression(5); } break; @@ -1178,11 +1177,11 @@ private BooleanExpressionContext booleanExpression(int _p) throws RecognitionExc _localctx = new ProcessCheckContext(_localctx); _ctx = _localctx; _prevctx = _localctx; - setState(163); + setState(159); ((ProcessCheckContext)_localctx).relationship = match(IDENTIFIER); - setState(164); + setState(160); match(OF); - setState(165); + setState(161); subquery(); } break; @@ -1191,13 +1190,13 @@ private BooleanExpressionContext booleanExpression(int _p) throws RecognitionExc _localctx = new BooleanDefaultContext(_localctx); _ctx = _localctx; _prevctx = _localctx; - setState(166); - predicated(); + setState(162); + valueExpression(0); } break; } _ctx.stop = _input.LT(-1); - setState(177); + setState(173); _errHandler.sync(this); _alt = getInterpreter().adaptivePredict(_input,19,_ctx); while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) { @@ -1205,7 +1204,7 @@ private BooleanExpressionContext booleanExpression(int _p) throws RecognitionExc if ( _parseListeners!=null ) triggerExitRuleEvent(); _prevctx = _localctx; { - setState(175); + setState(171); _errHandler.sync(this); switch ( getInterpreter().adaptivePredict(_input,18,_ctx) ) { case 1: @@ -1213,11 +1212,11 @@ private BooleanExpressionContext booleanExpression(int _p) throws RecognitionExc _localctx = new LogicalBinaryContext(new BooleanExpressionContext(_parentctx, _parentState)); ((LogicalBinaryContext)_localctx).left = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_booleanExpression); - setState(169); + setState(165); if (!(precpred(_ctx, 2))) throw new FailedPredicateException(this, "precpred(_ctx, 2)"); - setState(170); + setState(166); ((LogicalBinaryContext)_localctx).operator = match(AND); - setState(171); + setState(167); ((LogicalBinaryContext)_localctx).right = booleanExpression(3); } break; @@ -1226,18 +1225,18 @@ private BooleanExpressionContext booleanExpression(int _p) throws RecognitionExc _localctx = new LogicalBinaryContext(new BooleanExpressionContext(_parentctx, _parentState)); ((LogicalBinaryContext)_localctx).left = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_booleanExpression); - setState(172); + setState(168); if (!(precpred(_ctx, 1))) throw new FailedPredicateException(this, "precpred(_ctx, 1)"); - setState(173); + setState(169); ((LogicalBinaryContext)_localctx).operator = match(OR); - setState(174); + setState(170); ((LogicalBinaryContext)_localctx).right = booleanExpression(2); } break; } } } - setState(179); + setState(175); _errHandler.sync(this); _alt = getInterpreter().adaptivePredict(_input,19,_ctx); } @@ -1254,151 +1253,6 @@ private BooleanExpressionContext booleanExpression(int _p) throws RecognitionExc return _localctx; } - public static class PredicatedContext extends ParserRuleContext { - public ValueExpressionContext valueExpression() { - return getRuleContext(ValueExpressionContext.class,0); - } - public PredicateContext predicate() { - return getRuleContext(PredicateContext.class,0); - } - public PredicatedContext(ParserRuleContext parent, int invokingState) { - super(parent, invokingState); - } - @Override public int getRuleIndex() { return RULE_predicated; } - @Override - public void enterRule(ParseTreeListener listener) { - if ( listener instanceof EqlBaseListener ) ((EqlBaseListener)listener).enterPredicated(this); - } - @Override - public void exitRule(ParseTreeListener listener) { - if ( listener instanceof EqlBaseListener ) ((EqlBaseListener)listener).exitPredicated(this); - } - @Override - public T accept(ParseTreeVisitor visitor) { - if ( visitor instanceof EqlBaseVisitor ) return ((EqlBaseVisitor)visitor).visitPredicated(this); - else return visitor.visitChildren(this); - } - } - - public final PredicatedContext predicated() throws RecognitionException { - PredicatedContext _localctx = new PredicatedContext(_ctx, getState()); - enterRule(_localctx, 30, RULE_predicated); - try { - enterOuterAlt(_localctx, 1); - { - setState(180); - valueExpression(0); - setState(182); - _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,20,_ctx) ) { - case 1: - { - setState(181); - predicate(); - } - break; - } - } - } - catch (RecognitionException re) { - _localctx.exception = re; - _errHandler.reportError(this, re); - _errHandler.recover(this, re); - } - finally { - exitRule(); - } - return _localctx; - } - - public static class PredicateContext extends ParserRuleContext { - public Token kind; - public TerminalNode LP() { return getToken(EqlBaseParser.LP, 0); } - public List valueExpression() { - return getRuleContexts(ValueExpressionContext.class); - } - public ValueExpressionContext valueExpression(int i) { - return getRuleContext(ValueExpressionContext.class,i); - } - public TerminalNode RP() { return getToken(EqlBaseParser.RP, 0); } - public TerminalNode IN() { return getToken(EqlBaseParser.IN, 0); } - public TerminalNode NOT() { return getToken(EqlBaseParser.NOT, 0); } - public List COMMA() { return getTokens(EqlBaseParser.COMMA); } - public TerminalNode COMMA(int i) { - return getToken(EqlBaseParser.COMMA, i); - } - public PredicateContext(ParserRuleContext parent, int invokingState) { - super(parent, invokingState); - } - @Override public int getRuleIndex() { return RULE_predicate; } - @Override - public void enterRule(ParseTreeListener listener) { - if ( listener instanceof EqlBaseListener ) ((EqlBaseListener)listener).enterPredicate(this); - } - @Override - public void exitRule(ParseTreeListener listener) { - if ( listener instanceof EqlBaseListener ) ((EqlBaseListener)listener).exitPredicate(this); - } - @Override - public T accept(ParseTreeVisitor visitor) { - if ( visitor instanceof EqlBaseVisitor ) return ((EqlBaseVisitor)visitor).visitPredicate(this); - else return visitor.visitChildren(this); - } - } - - public final PredicateContext predicate() throws RecognitionException { - PredicateContext _localctx = new PredicateContext(_ctx, getState()); - enterRule(_localctx, 32, RULE_predicate); - int _la; - try { - enterOuterAlt(_localctx, 1); - { - setState(185); - _la = _input.LA(1); - if (_la==NOT) { - { - setState(184); - match(NOT); - } - } - - setState(187); - ((PredicateContext)_localctx).kind = match(IN); - setState(188); - match(LP); - setState(189); - valueExpression(0); - setState(194); - _errHandler.sync(this); - _la = _input.LA(1); - while (_la==COMMA) { - { - { - setState(190); - match(COMMA); - setState(191); - valueExpression(0); - } - } - setState(196); - _errHandler.sync(this); - _la = _input.LA(1); - } - setState(197); - match(RP); - } - } - catch (RecognitionException re) { - _localctx.exception = re; - _errHandler.reportError(this, re); - _errHandler.recover(this, re); - } - finally { - exitRule(); - } - return _localctx; - } - public static class ValueExpressionContext extends ParserRuleContext { public ValueExpressionContext(ParserRuleContext parent, int invokingState) { super(parent, invokingState); @@ -1456,6 +1310,39 @@ public T accept(ParseTreeVisitor visitor) { else return visitor.visitChildren(this); } } + public static class ContainsExpressionContext extends ValueExpressionContext { + public PrimaryExpressionContext primaryExpression() { + return getRuleContext(PrimaryExpressionContext.class,0); + } + public TerminalNode IN() { return getToken(EqlBaseParser.IN, 0); } + public TerminalNode LP() { return getToken(EqlBaseParser.LP, 0); } + public List expression() { + return getRuleContexts(ExpressionContext.class); + } + public ExpressionContext expression(int i) { + return getRuleContext(ExpressionContext.class,i); + } + public TerminalNode RP() { return getToken(EqlBaseParser.RP, 0); } + public TerminalNode NOT() { return getToken(EqlBaseParser.NOT, 0); } + public List COMMA() { return getTokens(EqlBaseParser.COMMA); } + public TerminalNode COMMA(int i) { + return getToken(EqlBaseParser.COMMA, i); + } + public ContainsExpressionContext(ValueExpressionContext ctx) { copyFrom(ctx); } + @Override + public void enterRule(ParseTreeListener listener) { + if ( listener instanceof EqlBaseListener ) ((EqlBaseListener)listener).enterContainsExpression(this); + } + @Override + public void exitRule(ParseTreeListener listener) { + if ( listener instanceof EqlBaseListener ) ((EqlBaseListener)listener).exitContainsExpression(this); + } + @Override + public T accept(ParseTreeVisitor visitor) { + if ( visitor instanceof EqlBaseVisitor ) return ((EqlBaseVisitor)visitor).visitContainsExpression(this); + else return visitor.visitChildren(this); + } + } public static class ArithmeticBinaryContext extends ValueExpressionContext { public ValueExpressionContext left; public Token operator; @@ -1518,40 +1405,74 @@ private ValueExpressionContext valueExpression(int _p) throws RecognitionExcepti int _parentState = getState(); ValueExpressionContext _localctx = new ValueExpressionContext(_ctx, _parentState); ValueExpressionContext _prevctx = _localctx; - int _startState = 34; - enterRecursionRule(_localctx, 34, RULE_valueExpression, _p); + int _startState = 30; + enterRecursionRule(_localctx, 30, RULE_valueExpression, _p); int _la; try { int _alt; enterOuterAlt(_localctx, 1); { - setState(203); - switch (_input.LA(1)) { - case FALSE: - case NULL: - case TRUE: - case LP: - case ESCAPED_IDENTIFIER: - case STRING: - case INTEGER_VALUE: - case DECIMAL_VALUE: - case IDENTIFIER: + setState(196); + _errHandler.sync(this); + switch ( getInterpreter().adaptivePredict(_input,22,_ctx) ) { + case 1: { _localctx = new ValueExpressionDefaultContext(_localctx); _ctx = _localctx; _prevctx = _localctx; - setState(200); + setState(177); primaryExpression(); } break; - case PLUS: - case MINUS: + case 2: + { + _localctx = new ContainsExpressionContext(_localctx); + _ctx = _localctx; + _prevctx = _localctx; + setState(178); + primaryExpression(); + setState(180); + _la = _input.LA(1); + if (_la==NOT) { + { + setState(179); + match(NOT); + } + } + + setState(182); + match(IN); + setState(183); + match(LP); + setState(184); + expression(); + setState(189); + _errHandler.sync(this); + _la = _input.LA(1); + while (_la==COMMA) { + { + { + setState(185); + match(COMMA); + setState(186); + expression(); + } + } + setState(191); + _errHandler.sync(this); + _la = _input.LA(1); + } + setState(192); + match(RP); + } + break; + case 3: { _localctx = new ArithmeticUnaryContext(_localctx); _ctx = _localctx; _prevctx = _localctx; - setState(201); + setState(194); ((ArithmeticUnaryContext)_localctx).operator = _input.LT(1); _la = _input.LA(1); if ( !(_la==PLUS || _la==MINUS) ) { @@ -1559,33 +1480,31 @@ private ValueExpressionContext valueExpression(int _p) throws RecognitionExcepti } else { consume(); } - setState(202); + setState(195); valueExpression(4); } break; - default: - throw new NoViableAltException(this); } _ctx.stop = _input.LT(-1); - setState(217); + setState(210); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,25,_ctx); + _alt = getInterpreter().adaptivePredict(_input,24,_ctx); while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) { if ( _alt==1 ) { if ( _parseListeners!=null ) triggerExitRuleEvent(); _prevctx = _localctx; { - setState(215); + setState(208); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,24,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,23,_ctx) ) { case 1: { _localctx = new ArithmeticBinaryContext(new ValueExpressionContext(_parentctx, _parentState)); ((ArithmeticBinaryContext)_localctx).left = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_valueExpression); - setState(205); + setState(198); if (!(precpred(_ctx, 3))) throw new FailedPredicateException(this, "precpred(_ctx, 3)"); - setState(206); + setState(199); ((ArithmeticBinaryContext)_localctx).operator = _input.LT(1); _la = _input.LA(1); if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << ASTERISK) | (1L << SLASH) | (1L << PERCENT))) != 0)) ) { @@ -1593,7 +1512,7 @@ private ValueExpressionContext valueExpression(int _p) throws RecognitionExcepti } else { consume(); } - setState(207); + setState(200); ((ArithmeticBinaryContext)_localctx).right = valueExpression(4); } break; @@ -1602,9 +1521,9 @@ private ValueExpressionContext valueExpression(int _p) throws RecognitionExcepti _localctx = new ArithmeticBinaryContext(new ValueExpressionContext(_parentctx, _parentState)); ((ArithmeticBinaryContext)_localctx).left = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_valueExpression); - setState(208); + setState(201); if (!(precpred(_ctx, 2))) throw new FailedPredicateException(this, "precpred(_ctx, 2)"); - setState(209); + setState(202); ((ArithmeticBinaryContext)_localctx).operator = _input.LT(1); _la = _input.LA(1); if ( !(_la==PLUS || _la==MINUS) ) { @@ -1612,7 +1531,7 @@ private ValueExpressionContext valueExpression(int _p) throws RecognitionExcepti } else { consume(); } - setState(210); + setState(203); ((ArithmeticBinaryContext)_localctx).right = valueExpression(3); } break; @@ -1621,20 +1540,20 @@ private ValueExpressionContext valueExpression(int _p) throws RecognitionExcepti _localctx = new ComparisonContext(new ValueExpressionContext(_parentctx, _parentState)); ((ComparisonContext)_localctx).left = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_valueExpression); - setState(211); + setState(204); if (!(precpred(_ctx, 1))) throw new FailedPredicateException(this, "precpred(_ctx, 1)"); - setState(212); + setState(205); comparisonOperator(); - setState(213); + setState(206); ((ComparisonContext)_localctx).right = valueExpression(2); } break; } } } - setState(219); + setState(212); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,25,_ctx); + _alt = getInterpreter().adaptivePredict(_input,24,_ctx); } } } @@ -1741,16 +1660,16 @@ public T accept(ParseTreeVisitor visitor) { public final PrimaryExpressionContext primaryExpression() throws RecognitionException { PrimaryExpressionContext _localctx = new PrimaryExpressionContext(_ctx, getState()); - enterRule(_localctx, 36, RULE_primaryExpression); + enterRule(_localctx, 32, RULE_primaryExpression); try { - setState(227); + setState(220); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,26,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,25,_ctx) ) { case 1: _localctx = new ConstantDefaultContext(_localctx); enterOuterAlt(_localctx, 1); { - setState(220); + setState(213); constant(); } break; @@ -1758,7 +1677,7 @@ public final PrimaryExpressionContext primaryExpression() throws RecognitionExce _localctx = new FunctionContext(_localctx); enterOuterAlt(_localctx, 2); { - setState(221); + setState(214); functionExpression(); } break; @@ -1766,7 +1685,7 @@ public final PrimaryExpressionContext primaryExpression() throws RecognitionExce _localctx = new DereferenceContext(_localctx); enterOuterAlt(_localctx, 3); { - setState(222); + setState(215); qualifiedName(); } break; @@ -1774,11 +1693,11 @@ public final PrimaryExpressionContext primaryExpression() throws RecognitionExce _localctx = new ParenthesizedExpressionContext(_localctx); enterOuterAlt(_localctx, 4); { - setState(223); + setState(216); match(LP); - setState(224); + setState(217); expression(); - setState(225); + setState(218); match(RP); } break; @@ -1831,41 +1750,41 @@ public T accept(ParseTreeVisitor visitor) { public final FunctionExpressionContext functionExpression() throws RecognitionException { FunctionExpressionContext _localctx = new FunctionExpressionContext(_ctx, getState()); - enterRule(_localctx, 38, RULE_functionExpression); + enterRule(_localctx, 34, RULE_functionExpression); int _la; try { enterOuterAlt(_localctx, 1); { - setState(229); + setState(222); ((FunctionExpressionContext)_localctx).name = match(IDENTIFIER); - setState(230); + setState(223); match(LP); - setState(239); + setState(232); _la = _input.LA(1); if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << FALSE) | (1L << NOT) | (1L << NULL) | (1L << TRUE) | (1L << PLUS) | (1L << MINUS) | (1L << LP) | (1L << ESCAPED_IDENTIFIER) | (1L << STRING) | (1L << INTEGER_VALUE) | (1L << DECIMAL_VALUE) | (1L << IDENTIFIER))) != 0)) { { - setState(231); + setState(224); expression(); - setState(236); + setState(229); _errHandler.sync(this); _la = _input.LA(1); while (_la==COMMA) { { { - setState(232); + setState(225); match(COMMA); - setState(233); + setState(226); expression(); } } - setState(238); + setState(231); _errHandler.sync(this); _la = _input.LA(1); } } } - setState(241); + setState(234); match(RP); } } @@ -1968,15 +1887,15 @@ public T accept(ParseTreeVisitor visitor) { public final ConstantContext constant() throws RecognitionException { ConstantContext _localctx = new ConstantContext(_ctx, getState()); - enterRule(_localctx, 40, RULE_constant); + enterRule(_localctx, 36, RULE_constant); try { - setState(247); + setState(240); switch (_input.LA(1)) { case NULL: _localctx = new NullLiteralContext(_localctx); enterOuterAlt(_localctx, 1); { - setState(243); + setState(236); match(NULL); } break; @@ -1985,7 +1904,7 @@ public final ConstantContext constant() throws RecognitionException { _localctx = new NumericLiteralContext(_localctx); enterOuterAlt(_localctx, 2); { - setState(244); + setState(237); number(); } break; @@ -1994,7 +1913,7 @@ public final ConstantContext constant() throws RecognitionException { _localctx = new BooleanLiteralContext(_localctx); enterOuterAlt(_localctx, 3); { - setState(245); + setState(238); booleanValue(); } break; @@ -2002,7 +1921,7 @@ public final ConstantContext constant() throws RecognitionException { _localctx = new StringLiteralContext(_localctx); enterOuterAlt(_localctx, 4); { - setState(246); + setState(239); string(); } break; @@ -2049,12 +1968,12 @@ public T accept(ParseTreeVisitor visitor) { public final ComparisonOperatorContext comparisonOperator() throws RecognitionException { ComparisonOperatorContext _localctx = new ComparisonOperatorContext(_ctx, getState()); - enterRule(_localctx, 42, RULE_comparisonOperator); + enterRule(_localctx, 38, RULE_comparisonOperator); int _la; try { enterOuterAlt(_localctx, 1); { - setState(249); + setState(242); _la = _input.LA(1); if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << EQ) | (1L << NEQ) | (1L << LT) | (1L << LTE) | (1L << GT) | (1L << GTE))) != 0)) ) { _errHandler.recoverInline(this); @@ -2098,12 +2017,12 @@ public T accept(ParseTreeVisitor visitor) { public final BooleanValueContext booleanValue() throws RecognitionException { BooleanValueContext _localctx = new BooleanValueContext(_ctx, getState()); - enterRule(_localctx, 44, RULE_booleanValue); + enterRule(_localctx, 40, RULE_booleanValue); int _la; try { enterOuterAlt(_localctx, 1); { - setState(251); + setState(244); _la = _input.LA(1); if ( !(_la==FALSE || _la==TRUE) ) { _errHandler.recoverInline(this); @@ -2167,49 +2086,49 @@ public T accept(ParseTreeVisitor visitor) { public final QualifiedNameContext qualifiedName() throws RecognitionException { QualifiedNameContext _localctx = new QualifiedNameContext(_ctx, getState()); - enterRule(_localctx, 46, RULE_qualifiedName); + enterRule(_localctx, 42, RULE_qualifiedName); int _la; try { int _alt; enterOuterAlt(_localctx, 1); { - setState(253); + setState(246); identifier(); - setState(265); + setState(258); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,32,_ctx); + _alt = getInterpreter().adaptivePredict(_input,31,_ctx); while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) { if ( _alt==1 ) { { - setState(263); + setState(256); switch (_input.LA(1)) { case DOT: { - setState(254); + setState(247); match(DOT); - setState(255); + setState(248); identifier(); } break; case LB: { - setState(256); + setState(249); match(LB); - setState(258); + setState(251); _errHandler.sync(this); _la = _input.LA(1); do { { { - setState(257); + setState(250); match(INTEGER_VALUE); } } - setState(260); + setState(253); _errHandler.sync(this); _la = _input.LA(1); } while ( _la==INTEGER_VALUE ); - setState(262); + setState(255); match(RB); } break; @@ -2218,9 +2137,9 @@ public final QualifiedNameContext qualifiedName() throws RecognitionException { } } } - setState(267); + setState(260); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,32,_ctx); + _alt = getInterpreter().adaptivePredict(_input,31,_ctx); } } } @@ -2259,12 +2178,12 @@ public T accept(ParseTreeVisitor visitor) { public final IdentifierContext identifier() throws RecognitionException { IdentifierContext _localctx = new IdentifierContext(_ctx, getState()); - enterRule(_localctx, 48, RULE_identifier); + enterRule(_localctx, 44, RULE_identifier); int _la; try { enterOuterAlt(_localctx, 1); { - setState(268); + setState(261); _la = _input.LA(1); if ( !(_la==ESCAPED_IDENTIFIER || _la==IDENTIFIER) ) { _errHandler.recoverInline(this); @@ -2311,18 +2230,18 @@ public T accept(ParseTreeVisitor visitor) { public final TimeUnitContext timeUnit() throws RecognitionException { TimeUnitContext _localctx = new TimeUnitContext(_ctx, getState()); - enterRule(_localctx, 50, RULE_timeUnit); + enterRule(_localctx, 46, RULE_timeUnit); int _la; try { enterOuterAlt(_localctx, 1); { - setState(270); + setState(263); number(); - setState(272); + setState(265); _la = _input.LA(1); if (_la==IDENTIFIER) { { - setState(271); + setState(264); ((TimeUnitContext)_localctx).unit = match(IDENTIFIER); } } @@ -2388,15 +2307,15 @@ public T accept(ParseTreeVisitor visitor) { public final NumberContext number() throws RecognitionException { NumberContext _localctx = new NumberContext(_ctx, getState()); - enterRule(_localctx, 52, RULE_number); + enterRule(_localctx, 48, RULE_number); try { - setState(276); + setState(269); switch (_input.LA(1)) { case DECIMAL_VALUE: _localctx = new DecimalLiteralContext(_localctx); enterOuterAlt(_localctx, 1); { - setState(274); + setState(267); match(DECIMAL_VALUE); } break; @@ -2404,7 +2323,7 @@ public final NumberContext number() throws RecognitionException { _localctx = new IntegerLiteralContext(_localctx); enterOuterAlt(_localctx, 2); { - setState(275); + setState(268); match(INTEGER_VALUE); } break; @@ -2446,11 +2365,11 @@ public T accept(ParseTreeVisitor visitor) { public final StringContext string() throws RecognitionException { StringContext _localctx = new StringContext(_ctx, getState()); - enterRule(_localctx, 54, RULE_string); + enterRule(_localctx, 50, RULE_string); try { enterOuterAlt(_localctx, 1); { - setState(278); + setState(271); match(STRING); } } @@ -2469,7 +2388,7 @@ public boolean sempred(RuleContext _localctx, int ruleIndex, int predIndex) { switch (ruleIndex) { case 14: return booleanExpression_sempred((BooleanExpressionContext)_localctx, predIndex); - case 17: + case 15: return valueExpression_sempred((ValueExpressionContext)_localctx, predIndex); } return true; @@ -2496,103 +2415,100 @@ private boolean valueExpression_sempred(ValueExpressionContext _localctx, int pr } public static final String _serializedATN = - "\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\3,\u011b\4\2\t\2\4"+ + "\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\3,\u0114\4\2\t\2\4"+ "\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13\t"+ "\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22"+ "\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31"+ - "\4\32\t\32\4\33\t\33\4\34\t\34\4\35\t\35\3\2\3\2\3\2\3\3\3\3\3\3\3\4\3"+ - "\4\7\4C\n\4\f\4\16\4F\13\4\3\5\3\5\3\5\5\5K\n\5\3\6\3\6\3\6\3\6\3\6\3"+ - "\7\3\7\3\7\5\7U\n\7\3\7\3\7\5\7Y\n\7\5\7[\n\7\3\7\3\7\6\7_\n\7\r\7\16"+ - "\7`\3\7\3\7\5\7e\n\7\3\b\3\b\5\bi\n\b\3\b\3\b\6\bm\n\b\r\b\16\bn\3\b\3"+ - "\b\5\bs\n\b\3\t\3\t\3\t\3\t\3\t\7\tz\n\t\f\t\16\t}\13\t\5\t\177\n\t\3"+ - "\n\3\n\3\n\3\n\7\n\u0085\n\n\f\n\16\n\u0088\13\n\3\13\3\13\5\13\u008c"+ - "\n\13\3\f\3\f\3\f\3\f\5\f\u0092\n\f\5\f\u0094\n\f\3\f\5\f\u0097\n\f\3"+ - "\r\3\r\3\r\3\r\3\16\3\16\3\16\3\16\3\17\3\17\3\20\3\20\3\20\3\20\3\20"+ - "\3\20\3\20\5\20\u00aa\n\20\3\20\3\20\3\20\3\20\3\20\3\20\7\20\u00b2\n"+ - "\20\f\20\16\20\u00b5\13\20\3\21\3\21\5\21\u00b9\n\21\3\22\5\22\u00bc\n"+ - "\22\3\22\3\22\3\22\3\22\3\22\7\22\u00c3\n\22\f\22\16\22\u00c6\13\22\3"+ - "\22\3\22\3\23\3\23\3\23\3\23\5\23\u00ce\n\23\3\23\3\23\3\23\3\23\3\23"+ - "\3\23\3\23\3\23\3\23\3\23\7\23\u00da\n\23\f\23\16\23\u00dd\13\23\3\24"+ - "\3\24\3\24\3\24\3\24\3\24\3\24\5\24\u00e6\n\24\3\25\3\25\3\25\3\25\3\25"+ - "\7\25\u00ed\n\25\f\25\16\25\u00f0\13\25\5\25\u00f2\n\25\3\25\3\25\3\26"+ - "\3\26\3\26\3\26\5\26\u00fa\n\26\3\27\3\27\3\30\3\30\3\31\3\31\3\31\3\31"+ - "\3\31\6\31\u0105\n\31\r\31\16\31\u0106\3\31\7\31\u010a\n\31\f\31\16\31"+ - "\u010d\13\31\3\32\3\32\3\33\3\33\5\33\u0113\n\33\3\34\3\34\5\34\u0117"+ - "\n\34\3\35\3\35\3\35\2\4\36$\36\2\4\6\b\n\f\16\20\22\24\26\30\32\34\36"+ - " \"$&(*,.\60\62\64\668\2\7\3\2\31\32\3\2\33\35\3\2\23\30\4\2\5\5\17\17"+ - "\4\2%%))\u0129\2:\3\2\2\2\4=\3\2\2\2\6@\3\2\2\2\bJ\3\2\2\2\nL\3\2\2\2"+ - "\fQ\3\2\2\2\16f\3\2\2\2\20t\3\2\2\2\22\u0080\3\2\2\2\24\u0089\3\2\2\2"+ - "\26\u008d\3\2\2\2\30\u0098\3\2\2\2\32\u009c\3\2\2\2\34\u00a0\3\2\2\2\36"+ - "\u00a9\3\2\2\2 \u00b6\3\2\2\2\"\u00bb\3\2\2\2$\u00cd\3\2\2\2&\u00e5\3"+ - "\2\2\2(\u00e7\3\2\2\2*\u00f9\3\2\2\2,\u00fb\3\2\2\2.\u00fd\3\2\2\2\60"+ - "\u00ff\3\2\2\2\62\u010e\3\2\2\2\64\u0110\3\2\2\2\66\u0116\3\2\2\28\u0118"+ - "\3\2\2\2:;\5\6\4\2;<\7\2\2\3<\3\3\2\2\2=>\5\34\17\2>?\7\2\2\3?\5\3\2\2"+ - "\2@D\5\b\5\2AC\5\20\t\2BA\3\2\2\2CF\3\2\2\2DB\3\2\2\2DE\3\2\2\2E\7\3\2"+ - "\2\2FD\3\2\2\2GK\5\f\7\2HK\5\16\b\2IK\5\32\16\2JG\3\2\2\2JH\3\2\2\2JI"+ - "\3\2\2\2K\t\3\2\2\2LM\7\22\2\2MN\7\t\2\2NO\7\23\2\2OP\5\64\33\2P\13\3"+ - "\2\2\2QZ\7\16\2\2RT\5\22\n\2SU\5\n\6\2TS\3\2\2\2TU\3\2\2\2U[\3\2\2\2V"+ - "X\5\n\6\2WY\5\22\n\2XW\3\2\2\2XY\3\2\2\2Y[\3\2\2\2ZR\3\2\2\2ZV\3\2\2\2"+ - "Z[\3\2\2\2[\\\3\2\2\2\\^\5\26\f\2]_\5\26\f\2^]\3\2\2\2_`\3\2\2\2`^\3\2"+ - "\2\2`a\3\2\2\2ad\3\2\2\2bc\7\20\2\2ce\5\26\f\2db\3\2\2\2de\3\2\2\2e\r"+ - "\3\2\2\2fh\7\b\2\2gi\5\22\n\2hg\3\2\2\2hi\3\2\2\2ij\3\2\2\2jl\5\24\13"+ - "\2km\5\24\13\2lk\3\2\2\2mn\3\2\2\2nl\3\2\2\2no\3\2\2\2or\3\2\2\2pq\7\20"+ - "\2\2qs\5\24\13\2rp\3\2\2\2rs\3\2\2\2s\17\3\2\2\2tu\7$\2\2u~\7)\2\2v{\5"+ - "\36\20\2wx\7\37\2\2xz\5\36\20\2yw\3\2\2\2z}\3\2\2\2{y\3\2\2\2{|\3\2\2"+ - "\2|\177\3\2\2\2}{\3\2\2\2~v\3\2\2\2~\177\3\2\2\2\177\21\3\2\2\2\u0080"+ - "\u0081\7\4\2\2\u0081\u0086\5\34\17\2\u0082\u0083\7\37\2\2\u0083\u0085"+ - "\5\34\17\2\u0084\u0082\3\2\2\2\u0085\u0088\3\2\2\2\u0086\u0084\3\2\2\2"+ - "\u0086\u0087\3\2\2\2\u0087\23\3\2\2\2\u0088\u0086\3\2\2\2\u0089\u008b"+ - "\5\30\r\2\u008a\u008c\5\22\n\2\u008b\u008a\3\2\2\2\u008b\u008c\3\2\2\2"+ - "\u008c\25\3\2\2\2\u008d\u0093\5\30\r\2\u008e\u0091\7\6\2\2\u008f\u0090"+ - "\7\23\2\2\u0090\u0092\5.\30\2\u0091\u008f\3\2\2\2\u0091\u0092\3\2\2\2"+ - "\u0092\u0094\3\2\2\2\u0093\u008e\3\2\2\2\u0093\u0094\3\2\2\2\u0094\u0096"+ - "\3\2\2\2\u0095\u0097\5\22\n\2\u0096\u0095\3\2\2\2\u0096\u0097\3\2\2\2"+ - "\u0097\27\3\2\2\2\u0098\u0099\7 \2\2\u0099\u009a\5\32\16\2\u009a\u009b"+ - "\7!\2\2\u009b\31\3\2\2\2\u009c\u009d\5\62\32\2\u009d\u009e\7\21\2\2\u009e"+ - "\u009f\5\34\17\2\u009f\33\3\2\2\2\u00a0\u00a1\5\36\20\2\u00a1\35\3\2\2"+ - "\2\u00a2\u00a3\b\20\1\2\u00a3\u00a4\7\n\2\2\u00a4\u00aa\5\36\20\7\u00a5"+ - "\u00a6\7)\2\2\u00a6\u00a7\7\f\2\2\u00a7\u00aa\5\30\r\2\u00a8\u00aa\5 "+ - "\21\2\u00a9\u00a2\3\2\2\2\u00a9\u00a5\3\2\2\2\u00a9\u00a8\3\2\2\2\u00aa"+ - "\u00b3\3\2\2\2\u00ab\u00ac\f\4\2\2\u00ac\u00ad\7\3\2\2\u00ad\u00b2\5\36"+ - "\20\5\u00ae\u00af\f\3\2\2\u00af\u00b0\7\r\2\2\u00b0\u00b2\5\36\20\4\u00b1"+ - "\u00ab\3\2\2\2\u00b1\u00ae\3\2\2\2\u00b2\u00b5\3\2\2\2\u00b3\u00b1\3\2"+ - "\2\2\u00b3\u00b4\3\2\2\2\u00b4\37\3\2\2\2\u00b5\u00b3\3\2\2\2\u00b6\u00b8"+ - "\5$\23\2\u00b7\u00b9\5\"\22\2\u00b8\u00b7\3\2\2\2\u00b8\u00b9\3\2\2\2"+ - "\u00b9!\3\2\2\2\u00ba\u00bc\7\n\2\2\u00bb\u00ba\3\2\2\2\u00bb\u00bc\3"+ - "\2\2\2\u00bc\u00bd\3\2\2\2\u00bd\u00be\7\7\2\2\u00be\u00bf\7\"\2\2\u00bf"+ - "\u00c4\5$\23\2\u00c0\u00c1\7\37\2\2\u00c1\u00c3\5$\23\2\u00c2\u00c0\3"+ - "\2\2\2\u00c3\u00c6\3\2\2\2\u00c4\u00c2\3\2\2\2\u00c4\u00c5\3\2\2\2\u00c5"+ - "\u00c7\3\2\2\2\u00c6\u00c4\3\2\2\2\u00c7\u00c8\7#\2\2\u00c8#\3\2\2\2\u00c9"+ - "\u00ca\b\23\1\2\u00ca\u00ce\5&\24\2\u00cb\u00cc\t\2\2\2\u00cc\u00ce\5"+ - "$\23\6\u00cd\u00c9\3\2\2\2\u00cd\u00cb\3\2\2\2\u00ce\u00db\3\2\2\2\u00cf"+ - "\u00d0\f\5\2\2\u00d0\u00d1\t\3\2\2\u00d1\u00da\5$\23\6\u00d2\u00d3\f\4"+ - "\2\2\u00d3\u00d4\t\2\2\2\u00d4\u00da\5$\23\5\u00d5\u00d6\f\3\2\2\u00d6"+ - "\u00d7\5,\27\2\u00d7\u00d8\5$\23\4\u00d8\u00da\3\2\2\2\u00d9\u00cf\3\2"+ - "\2\2\u00d9\u00d2\3\2\2\2\u00d9\u00d5\3\2\2\2\u00da\u00dd\3\2\2\2\u00db"+ - "\u00d9\3\2\2\2\u00db\u00dc\3\2\2\2\u00dc%\3\2\2\2\u00dd\u00db\3\2\2\2"+ - "\u00de\u00e6\5*\26\2\u00df\u00e6\5(\25\2\u00e0\u00e6\5\60\31\2\u00e1\u00e2"+ - "\7\"\2\2\u00e2\u00e3\5\34\17\2\u00e3\u00e4\7#\2\2\u00e4\u00e6\3\2\2\2"+ - "\u00e5\u00de\3\2\2\2\u00e5\u00df\3\2\2\2\u00e5\u00e0\3\2\2\2\u00e5\u00e1"+ - "\3\2\2\2\u00e6\'\3\2\2\2\u00e7\u00e8\7)\2\2\u00e8\u00f1\7\"\2\2\u00e9"+ - "\u00ee\5\34\17\2\u00ea\u00eb\7\37\2\2\u00eb\u00ed\5\34\17\2\u00ec\u00ea"+ - "\3\2\2\2\u00ed\u00f0\3\2\2\2\u00ee\u00ec\3\2\2\2\u00ee\u00ef\3\2\2\2\u00ef"+ - "\u00f2\3\2\2\2\u00f0\u00ee\3\2\2\2\u00f1\u00e9\3\2\2\2\u00f1\u00f2\3\2"+ - "\2\2\u00f2\u00f3\3\2\2\2\u00f3\u00f4\7#\2\2\u00f4)\3\2\2\2\u00f5\u00fa"+ - "\7\13\2\2\u00f6\u00fa\5\66\34\2\u00f7\u00fa\5.\30\2\u00f8\u00fa\58\35"+ - "\2\u00f9\u00f5\3\2\2\2\u00f9\u00f6\3\2\2\2\u00f9\u00f7\3\2\2\2\u00f9\u00f8"+ - "\3\2\2\2\u00fa+\3\2\2\2\u00fb\u00fc\t\4\2\2\u00fc-\3\2\2\2\u00fd\u00fe"+ - "\t\5\2\2\u00fe/\3\2\2\2\u00ff\u010b\5\62\32\2\u0100\u0101\7\36\2\2\u0101"+ - "\u010a\5\62\32\2\u0102\u0104\7 \2\2\u0103\u0105\7\'\2\2\u0104\u0103\3"+ - "\2\2\2\u0105\u0106\3\2\2\2\u0106\u0104\3\2\2\2\u0106\u0107\3\2\2\2\u0107"+ - "\u0108\3\2\2\2\u0108\u010a\7!\2\2\u0109\u0100\3\2\2\2\u0109\u0102\3\2"+ - "\2\2\u010a\u010d\3\2\2\2\u010b\u0109\3\2\2\2\u010b\u010c\3\2\2\2\u010c"+ - "\61\3\2\2\2\u010d\u010b\3\2\2\2\u010e\u010f\t\6\2\2\u010f\63\3\2\2\2\u0110"+ - "\u0112\5\66\34\2\u0111\u0113\7)\2\2\u0112\u0111\3\2\2\2\u0112\u0113\3"+ - "\2\2\2\u0113\65\3\2\2\2\u0114\u0117\7(\2\2\u0115\u0117\7\'\2\2\u0116\u0114"+ - "\3\2\2\2\u0116\u0115\3\2\2\2\u0117\67\3\2\2\2\u0118\u0119\7&\2\2\u0119"+ - "9\3\2\2\2%DJTXZ`dhnr{~\u0086\u008b\u0091\u0093\u0096\u00a9\u00b1\u00b3"+ - "\u00b8\u00bb\u00c4\u00cd\u00d9\u00db\u00e5\u00ee\u00f1\u00f9\u0106\u0109"+ - "\u010b\u0112\u0116"; + "\4\32\t\32\4\33\t\33\3\2\3\2\3\2\3\3\3\3\3\3\3\4\3\4\7\4?\n\4\f\4\16\4"+ + "B\13\4\3\5\3\5\3\5\5\5G\n\5\3\6\3\6\3\6\3\6\3\6\3\7\3\7\3\7\5\7Q\n\7\3"+ + "\7\3\7\5\7U\n\7\5\7W\n\7\3\7\3\7\6\7[\n\7\r\7\16\7\\\3\7\3\7\5\7a\n\7"+ + "\3\b\3\b\5\be\n\b\3\b\3\b\6\bi\n\b\r\b\16\bj\3\b\3\b\5\bo\n\b\3\t\3\t"+ + "\3\t\3\t\3\t\7\tv\n\t\f\t\16\ty\13\t\5\t{\n\t\3\n\3\n\3\n\3\n\7\n\u0081"+ + "\n\n\f\n\16\n\u0084\13\n\3\13\3\13\5\13\u0088\n\13\3\f\3\f\3\f\3\f\5\f"+ + "\u008e\n\f\5\f\u0090\n\f\3\f\5\f\u0093\n\f\3\r\3\r\3\r\3\r\3\16\3\16\3"+ + "\16\3\16\3\17\3\17\3\20\3\20\3\20\3\20\3\20\3\20\3\20\5\20\u00a6\n\20"+ + "\3\20\3\20\3\20\3\20\3\20\3\20\7\20\u00ae\n\20\f\20\16\20\u00b1\13\20"+ + "\3\21\3\21\3\21\3\21\5\21\u00b7\n\21\3\21\3\21\3\21\3\21\3\21\7\21\u00be"+ + "\n\21\f\21\16\21\u00c1\13\21\3\21\3\21\3\21\3\21\5\21\u00c7\n\21\3\21"+ + "\3\21\3\21\3\21\3\21\3\21\3\21\3\21\3\21\3\21\7\21\u00d3\n\21\f\21\16"+ + "\21\u00d6\13\21\3\22\3\22\3\22\3\22\3\22\3\22\3\22\5\22\u00df\n\22\3\23"+ + "\3\23\3\23\3\23\3\23\7\23\u00e6\n\23\f\23\16\23\u00e9\13\23\5\23\u00eb"+ + "\n\23\3\23\3\23\3\24\3\24\3\24\3\24\5\24\u00f3\n\24\3\25\3\25\3\26\3\26"+ + "\3\27\3\27\3\27\3\27\3\27\6\27\u00fe\n\27\r\27\16\27\u00ff\3\27\7\27\u0103"+ + "\n\27\f\27\16\27\u0106\13\27\3\30\3\30\3\31\3\31\5\31\u010c\n\31\3\32"+ + "\3\32\5\32\u0110\n\32\3\33\3\33\3\33\2\4\36 \34\2\4\6\b\n\f\16\20\22\24"+ + "\26\30\32\34\36 \"$&(*,.\60\62\64\2\7\3\2\31\32\3\2\33\35\3\2\23\30\4"+ + "\2\5\5\17\17\4\2%%))\u0124\2\66\3\2\2\2\49\3\2\2\2\6<\3\2\2\2\bF\3\2\2"+ + "\2\nH\3\2\2\2\fM\3\2\2\2\16b\3\2\2\2\20p\3\2\2\2\22|\3\2\2\2\24\u0085"+ + "\3\2\2\2\26\u0089\3\2\2\2\30\u0094\3\2\2\2\32\u0098\3\2\2\2\34\u009c\3"+ + "\2\2\2\36\u00a5\3\2\2\2 \u00c6\3\2\2\2\"\u00de\3\2\2\2$\u00e0\3\2\2\2"+ + "&\u00f2\3\2\2\2(\u00f4\3\2\2\2*\u00f6\3\2\2\2,\u00f8\3\2\2\2.\u0107\3"+ + "\2\2\2\60\u0109\3\2\2\2\62\u010f\3\2\2\2\64\u0111\3\2\2\2\66\67\5\6\4"+ + "\2\678\7\2\2\38\3\3\2\2\29:\5\34\17\2:;\7\2\2\3;\5\3\2\2\2<@\5\b\5\2="+ + "?\5\20\t\2>=\3\2\2\2?B\3\2\2\2@>\3\2\2\2@A\3\2\2\2A\7\3\2\2\2B@\3\2\2"+ + "\2CG\5\f\7\2DG\5\16\b\2EG\5\32\16\2FC\3\2\2\2FD\3\2\2\2FE\3\2\2\2G\t\3"+ + "\2\2\2HI\7\22\2\2IJ\7\t\2\2JK\7\23\2\2KL\5\60\31\2L\13\3\2\2\2MV\7\16"+ + "\2\2NP\5\22\n\2OQ\5\n\6\2PO\3\2\2\2PQ\3\2\2\2QW\3\2\2\2RT\5\n\6\2SU\5"+ + "\22\n\2TS\3\2\2\2TU\3\2\2\2UW\3\2\2\2VN\3\2\2\2VR\3\2\2\2VW\3\2\2\2WX"+ + "\3\2\2\2XZ\5\26\f\2Y[\5\26\f\2ZY\3\2\2\2[\\\3\2\2\2\\Z\3\2\2\2\\]\3\2"+ + "\2\2]`\3\2\2\2^_\7\20\2\2_a\5\26\f\2`^\3\2\2\2`a\3\2\2\2a\r\3\2\2\2bd"+ + "\7\b\2\2ce\5\22\n\2dc\3\2\2\2de\3\2\2\2ef\3\2\2\2fh\5\24\13\2gi\5\24\13"+ + "\2hg\3\2\2\2ij\3\2\2\2jh\3\2\2\2jk\3\2\2\2kn\3\2\2\2lm\7\20\2\2mo\5\24"+ + "\13\2nl\3\2\2\2no\3\2\2\2o\17\3\2\2\2pq\7$\2\2qz\7)\2\2rw\5\36\20\2st"+ + "\7\37\2\2tv\5\36\20\2us\3\2\2\2vy\3\2\2\2wu\3\2\2\2wx\3\2\2\2x{\3\2\2"+ + "\2yw\3\2\2\2zr\3\2\2\2z{\3\2\2\2{\21\3\2\2\2|}\7\4\2\2}\u0082\5\34\17"+ + "\2~\177\7\37\2\2\177\u0081\5\34\17\2\u0080~\3\2\2\2\u0081\u0084\3\2\2"+ + "\2\u0082\u0080\3\2\2\2\u0082\u0083\3\2\2\2\u0083\23\3\2\2\2\u0084\u0082"+ + "\3\2\2\2\u0085\u0087\5\30\r\2\u0086\u0088\5\22\n\2\u0087\u0086\3\2\2\2"+ + "\u0087\u0088\3\2\2\2\u0088\25\3\2\2\2\u0089\u008f\5\30\r\2\u008a\u008d"+ + "\7\6\2\2\u008b\u008c\7\23\2\2\u008c\u008e\5*\26\2\u008d\u008b\3\2\2\2"+ + "\u008d\u008e\3\2\2\2\u008e\u0090\3\2\2\2\u008f\u008a\3\2\2\2\u008f\u0090"+ + "\3\2\2\2\u0090\u0092\3\2\2\2\u0091\u0093\5\22\n\2\u0092\u0091\3\2\2\2"+ + "\u0092\u0093\3\2\2\2\u0093\27\3\2\2\2\u0094\u0095\7 \2\2\u0095\u0096\5"+ + "\32\16\2\u0096\u0097\7!\2\2\u0097\31\3\2\2\2\u0098\u0099\5.\30\2\u0099"+ + "\u009a\7\21\2\2\u009a\u009b\5\34\17\2\u009b\33\3\2\2\2\u009c\u009d\5\36"+ + "\20\2\u009d\35\3\2\2\2\u009e\u009f\b\20\1\2\u009f\u00a0\7\n\2\2\u00a0"+ + "\u00a6\5\36\20\7\u00a1\u00a2\7)\2\2\u00a2\u00a3\7\f\2\2\u00a3\u00a6\5"+ + "\30\r\2\u00a4\u00a6\5 \21\2\u00a5\u009e\3\2\2\2\u00a5\u00a1\3\2\2\2\u00a5"+ + "\u00a4\3\2\2\2\u00a6\u00af\3\2\2\2\u00a7\u00a8\f\4\2\2\u00a8\u00a9\7\3"+ + "\2\2\u00a9\u00ae\5\36\20\5\u00aa\u00ab\f\3\2\2\u00ab\u00ac\7\r\2\2\u00ac"+ + "\u00ae\5\36\20\4\u00ad\u00a7\3\2\2\2\u00ad\u00aa\3\2\2\2\u00ae\u00b1\3"+ + "\2\2\2\u00af\u00ad\3\2\2\2\u00af\u00b0\3\2\2\2\u00b0\37\3\2\2\2\u00b1"+ + "\u00af\3\2\2\2\u00b2\u00b3\b\21\1\2\u00b3\u00c7\5\"\22\2\u00b4\u00b6\5"+ + "\"\22\2\u00b5\u00b7\7\n\2\2\u00b6\u00b5\3\2\2\2\u00b6\u00b7\3\2\2\2\u00b7"+ + "\u00b8\3\2\2\2\u00b8\u00b9\7\7\2\2\u00b9\u00ba\7\"\2\2\u00ba\u00bf\5\34"+ + "\17\2\u00bb\u00bc\7\37\2\2\u00bc\u00be\5\34\17\2\u00bd\u00bb\3\2\2\2\u00be"+ + "\u00c1\3\2\2\2\u00bf\u00bd\3\2\2\2\u00bf\u00c0\3\2\2\2\u00c0\u00c2\3\2"+ + "\2\2\u00c1\u00bf\3\2\2\2\u00c2\u00c3\7#\2\2\u00c3\u00c7\3\2\2\2\u00c4"+ + "\u00c5\t\2\2\2\u00c5\u00c7\5 \21\6\u00c6\u00b2\3\2\2\2\u00c6\u00b4\3\2"+ + "\2\2\u00c6\u00c4\3\2\2\2\u00c7\u00d4\3\2\2\2\u00c8\u00c9\f\5\2\2\u00c9"+ + "\u00ca\t\3\2\2\u00ca\u00d3\5 \21\6\u00cb\u00cc\f\4\2\2\u00cc\u00cd\t\2"+ + "\2\2\u00cd\u00d3\5 \21\5\u00ce\u00cf\f\3\2\2\u00cf\u00d0\5(\25\2\u00d0"+ + "\u00d1\5 \21\4\u00d1\u00d3\3\2\2\2\u00d2\u00c8\3\2\2\2\u00d2\u00cb\3\2"+ + "\2\2\u00d2\u00ce\3\2\2\2\u00d3\u00d6\3\2\2\2\u00d4\u00d2\3\2\2\2\u00d4"+ + "\u00d5\3\2\2\2\u00d5!\3\2\2\2\u00d6\u00d4\3\2\2\2\u00d7\u00df\5&\24\2"+ + "\u00d8\u00df\5$\23\2\u00d9\u00df\5,\27\2\u00da\u00db\7\"\2\2\u00db\u00dc"+ + "\5\34\17\2\u00dc\u00dd\7#\2\2\u00dd\u00df\3\2\2\2\u00de\u00d7\3\2\2\2"+ + "\u00de\u00d8\3\2\2\2\u00de\u00d9\3\2\2\2\u00de\u00da\3\2\2\2\u00df#\3"+ + "\2\2\2\u00e0\u00e1\7)\2\2\u00e1\u00ea\7\"\2\2\u00e2\u00e7\5\34\17\2\u00e3"+ + "\u00e4\7\37\2\2\u00e4\u00e6\5\34\17\2\u00e5\u00e3\3\2\2\2\u00e6\u00e9"+ + "\3\2\2\2\u00e7\u00e5\3\2\2\2\u00e7\u00e8\3\2\2\2\u00e8\u00eb\3\2\2\2\u00e9"+ + "\u00e7\3\2\2\2\u00ea\u00e2\3\2\2\2\u00ea\u00eb\3\2\2\2\u00eb\u00ec\3\2"+ + "\2\2\u00ec\u00ed\7#\2\2\u00ed%\3\2\2\2\u00ee\u00f3\7\13\2\2\u00ef\u00f3"+ + "\5\62\32\2\u00f0\u00f3\5*\26\2\u00f1\u00f3\5\64\33\2\u00f2\u00ee\3\2\2"+ + "\2\u00f2\u00ef\3\2\2\2\u00f2\u00f0\3\2\2\2\u00f2\u00f1\3\2\2\2\u00f3\'"+ + "\3\2\2\2\u00f4\u00f5\t\4\2\2\u00f5)\3\2\2\2\u00f6\u00f7\t\5\2\2\u00f7"+ + "+\3\2\2\2\u00f8\u0104\5.\30\2\u00f9\u00fa\7\36\2\2\u00fa\u0103\5.\30\2"+ + "\u00fb\u00fd\7 \2\2\u00fc\u00fe\7\'\2\2\u00fd\u00fc\3\2\2\2\u00fe\u00ff"+ + "\3\2\2\2\u00ff\u00fd\3\2\2\2\u00ff\u0100\3\2\2\2\u0100\u0101\3\2\2\2\u0101"+ + "\u0103\7!\2\2\u0102\u00f9\3\2\2\2\u0102\u00fb\3\2\2\2\u0103\u0106\3\2"+ + "\2\2\u0104\u0102\3\2\2\2\u0104\u0105\3\2\2\2\u0105-\3\2\2\2\u0106\u0104"+ + "\3\2\2\2\u0107\u0108\t\6\2\2\u0108/\3\2\2\2\u0109\u010b\5\62\32\2\u010a"+ + "\u010c\7)\2\2\u010b\u010a\3\2\2\2\u010b\u010c\3\2\2\2\u010c\61\3\2\2\2"+ + "\u010d\u0110\7(\2\2\u010e\u0110\7\'\2\2\u010f\u010d\3\2\2\2\u010f\u010e"+ + "\3\2\2\2\u0110\63\3\2\2\2\u0111\u0112\7&\2\2\u0112\65\3\2\2\2$@FPTV\\"+ + "`djnwz\u0082\u0087\u008d\u008f\u0092\u00a5\u00ad\u00af\u00b6\u00bf\u00c6"+ + "\u00d2\u00d4\u00de\u00e7\u00ea\u00f2\u00ff\u0102\u0104\u010b\u010f"; public static final ATN _ATN = new ATNDeserializer().deserialize(_serializedATN.toCharArray()); static { diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseVisitor.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseVisitor.java index ec386d12c1c38..3b692ea02ab82 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseVisitor.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseVisitor.java @@ -122,18 +122,6 @@ interface EqlBaseVisitor extends ParseTreeVisitor { * @return the visitor result */ T visitLogicalBinary(EqlBaseParser.LogicalBinaryContext ctx); - /** - * Visit a parse tree produced by {@link EqlBaseParser#predicated}. - * @param ctx the parse tree - * @return the visitor result - */ - T visitPredicated(EqlBaseParser.PredicatedContext ctx); - /** - * Visit a parse tree produced by {@link EqlBaseParser#predicate}. - * @param ctx the parse tree - * @return the visitor result - */ - T visitPredicate(EqlBaseParser.PredicateContext ctx); /** * Visit a parse tree produced by the {@code valueExpressionDefault} * labeled alternative in {@link EqlBaseParser#valueExpression}. @@ -148,6 +136,13 @@ interface EqlBaseVisitor extends ParseTreeVisitor { * @return the visitor result */ T visitComparison(EqlBaseParser.ComparisonContext ctx); + /** + * Visit a parse tree produced by the {@code containsExpression} + * labeled alternative in {@link EqlBaseParser#valueExpression}. + * @param ctx the parse tree + * @return the visitor result + */ + T visitContainsExpression(EqlBaseParser.ContainsExpressionContext ctx); /** * Visit a parse tree produced by the {@code arithmeticBinary} * labeled alternative in {@link EqlBaseParser#valueExpression}. diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/ExpressionBuilder.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/ExpressionBuilder.java index c516ccb01e179..a3be853613b76 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/ExpressionBuilder.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/ExpressionBuilder.java @@ -6,6 +6,170 @@ package org.elasticsearch.xpack.eql.parser; -public class ExpressionBuilder extends IdentifierBuilder { +import org.antlr.v4.runtime.ParserRuleContext; +import org.antlr.v4.runtime.tree.ParseTree; +import org.antlr.v4.runtime.tree.TerminalNode; +import org.elasticsearch.xpack.eql.parser.EqlBaseParser.ArithmeticUnaryContext; +import org.elasticsearch.xpack.eql.parser.EqlBaseParser.ComparisonContext; +import org.elasticsearch.xpack.eql.parser.EqlBaseParser.ContainsExpressionContext; +import org.elasticsearch.xpack.eql.parser.EqlBaseParser.DereferenceContext; +import org.elasticsearch.xpack.eql.parser.EqlBaseParser.FunctionExpressionContext; +import org.elasticsearch.xpack.eql.parser.EqlBaseParser.LogicalBinaryContext; +import org.elasticsearch.xpack.eql.parser.EqlBaseParser.LogicalNotContext; +import org.elasticsearch.xpack.ql.expression.Expression; +import org.elasticsearch.xpack.ql.expression.Literal; +import org.elasticsearch.xpack.ql.expression.UnresolvedAttribute; +import org.elasticsearch.xpack.ql.expression.function.Function; +import org.elasticsearch.xpack.ql.expression.function.UnresolvedFunction; +import org.elasticsearch.xpack.ql.expression.predicate.logical.And; +import org.elasticsearch.xpack.ql.expression.predicate.logical.Not; +import org.elasticsearch.xpack.ql.expression.predicate.logical.Or; +import org.elasticsearch.xpack.ql.expression.predicate.operator.arithmetic.Add; +import org.elasticsearch.xpack.ql.expression.predicate.operator.arithmetic.Div; +import org.elasticsearch.xpack.ql.expression.predicate.operator.arithmetic.Mod; +import org.elasticsearch.xpack.ql.expression.predicate.operator.arithmetic.Mul; +import org.elasticsearch.xpack.ql.expression.predicate.operator.arithmetic.Neg; +import org.elasticsearch.xpack.ql.expression.predicate.operator.arithmetic.Sub; +import org.elasticsearch.xpack.ql.expression.predicate.operator.comparison.Equals; +import org.elasticsearch.xpack.ql.expression.predicate.operator.comparison.GreaterThan; +import org.elasticsearch.xpack.ql.expression.predicate.operator.comparison.GreaterThanOrEqual; +import org.elasticsearch.xpack.ql.expression.predicate.operator.comparison.LessThan; +import org.elasticsearch.xpack.ql.expression.predicate.operator.comparison.LessThanOrEqual; +import org.elasticsearch.xpack.ql.expression.predicate.operator.comparison.NotEquals; +import org.elasticsearch.xpack.ql.tree.Source; +import org.elasticsearch.xpack.ql.type.DataTypes; +import java.util.List; + + +public class ExpressionBuilder extends LiteralBuilder { + + protected Expression expression(ParseTree ctx) { + return typedParsing(ctx, Expression.class); + } + + protected List expressions(List contexts) { + return visitList(contexts, Expression.class); + } + + @Override + public Expression visitSingleExpression(EqlBaseParser.SingleExpressionContext ctx) { + return expression(ctx.expression()); + } + + @Override + public Expression visitArithmeticUnary(ArithmeticUnaryContext ctx) { + Expression expr = expression(ctx.valueExpression()); + Source source = source(ctx); + int type = ctx.operator.getType(); + + return type == EqlBaseParser.MINUS ? new Neg(source, expr) : expr; + } + + @Override + public Expression visitArithmeticBinary(EqlBaseParser.ArithmeticBinaryContext ctx) { + Expression left = expression(ctx.left); + Expression right = expression(ctx.right); + Source source = source(ctx); + int type = ctx.operator.getType(); + + switch (type) { + case EqlBaseParser.ASTERISK: + return new Mul(source, left, right); + case EqlBaseParser.SLASH: + return new Div(source, left, right); + case EqlBaseParser.PERCENT: + return new Mod(source, left, right); + case EqlBaseParser.PLUS: + return new Add(source, left, right); + case EqlBaseParser.MINUS: + return new Sub(source, left, right); + default: + throw new ParsingException(source, "Unknown arithmetic {}", source.text()); + } + } + + @Override + public Expression visitComparison(ComparisonContext ctx) { + Expression left = expression(ctx.left); + Expression right = expression(ctx.right); + TerminalNode op = (TerminalNode) ctx.comparisonOperator().getChild(0); + + Source source = source(ctx); + + switch (op.getSymbol().getType()) { + case EqlBaseParser.EQ: + // TODO: check for left == null after moving IsNotNull from SQL -> QL + return new Equals(source, left, right); + case EqlBaseParser.NEQ: + // TODO: check for left != null after moving IsNotNull from SQL -> QL + return new NotEquals(source, left, right); + case EqlBaseParser.LT: + return new LessThan(source, left, right); + case EqlBaseParser.LTE: + return new LessThanOrEqual(source, left, right); + case EqlBaseParser.GT: + return new GreaterThan(source, left, right); + case EqlBaseParser.GTE: + return new GreaterThanOrEqual(source, left, right); + default: + throw new ParsingException(source, "Unknown operator {}", source.text()); + } + } + + + @Override + public Expression visitContainsExpression(ContainsExpressionContext ctx) { + Expression exp = expression(ctx.primaryExpression()); + Source source = source(ctx); + List container = expressions(ctx.expression()); + + // TODO: Add IN to QL and use that directly + Expression checkInSet = null; + + for (Expression inner: container) { + Expression termCheck = new Equals(source, exp, inner); + checkInSet = checkInSet == null ? termCheck : new Or(source, checkInSet, termCheck); + } + + return checkInSet; + } + + @Override + public Expression visitDereference(DereferenceContext ctx) { + return new UnresolvedAttribute(source(ctx), visitQualifiedName(ctx.qualifiedName())); + } + + @Override + public Function visitFunctionExpression(FunctionExpressionContext ctx) { + Source source = source(ctx); + String name = ctx.name.getText(); + List arguments = expressions(ctx.expression()); + + return new UnresolvedFunction(source, name, UnresolvedFunction.ResolutionType.STANDARD, arguments); + } + + @Override + public Expression visitLogicalBinary(LogicalBinaryContext ctx) { + int type = ctx.operator.getType(); + Source source = source(ctx); + Expression left = expression(ctx.left); + Expression right = expression(ctx.right); + + if (type == EqlBaseParser.AND) { + return new And(source, left, right); + } else { + return new Or(source, left, right); + } + } + + @Override + public Not visitLogicalNot(LogicalNotContext ctx) { + return new Not(source(ctx), expression(ctx.booleanExpression())); + } + + @Override + public Expression visitParenthesizedExpression(EqlBaseParser.ParenthesizedExpressionContext ctx) { + return expression(ctx.expression()); + } } diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/IdentifierBuilder.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/IdentifierBuilder.java index 2d9511896356e..70a6ad3848a0c 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/IdentifierBuilder.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/IdentifierBuilder.java @@ -5,7 +5,9 @@ */ package org.elasticsearch.xpack.eql.parser; +import org.elasticsearch.common.Strings; import org.elasticsearch.xpack.eql.parser.EqlBaseParser.IdentifierContext; +import org.elasticsearch.xpack.eql.parser.EqlBaseParser.QualifiedNameContext; abstract class IdentifierBuilder extends AbstractBuilder { @@ -14,7 +16,17 @@ public String visitIdentifier(IdentifierContext ctx) { return ctx == null ? null : unquoteIdentifier(ctx.getText()); } + @Override + public String visitQualifiedName(QualifiedNameContext ctx) { + if (ctx == null) { + return null; + } + + // this is fine, because we've already checked for array indexes [...] + return Strings.collectionToDelimitedString(visitList(ctx.identifier(), String.class), "."); + } + private static String unquoteIdentifier(String identifier) { - return identifier.replace("\"\"", "\""); + return identifier.replace("`", ""); } -} \ No newline at end of file +} diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/LiteralBuilder.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/LiteralBuilder.java new file mode 100644 index 0000000000000..7d06e6fa3102b --- /dev/null +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/LiteralBuilder.java @@ -0,0 +1,141 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +package org.elasticsearch.xpack.eql.parser; + +import org.antlr.v4.runtime.tree.TerminalNode; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.elasticsearch.common.collect.Tuple; +import org.elasticsearch.xpack.ql.QlIllegalArgumentException; +import org.elasticsearch.xpack.ql.expression.Expression; +import org.elasticsearch.xpack.ql.expression.Literal; +import org.elasticsearch.xpack.ql.tree.Source; +import org.elasticsearch.xpack.ql.type.DataType; +import org.elasticsearch.xpack.ql.type.DataTypes; +import org.elasticsearch.xpack.ql.util.StringUtils; + +public class LiteralBuilder extends IdentifierBuilder { + + static String unquoteString(String text) { + // remove leading and trailing ' for strings and also eliminate escaped single quotes + if (text == null) { + return null; + } + + // unescaped strings can be interpreted directly + if (text.startsWith("?")) { + return text.substring(2, text.length() - 1); + } + + text = text.substring(1, text.length() - 1); + Pattern regex = Pattern.compile("\\\\."); + StringBuffer resultString = new StringBuffer(); + Matcher regexMatcher = regex.matcher(text); + + while (regexMatcher.find()) { + String source = regexMatcher.group(); + String replacement; + + switch (source) { + case "\\t": + replacement = "\t"; + break; + case "\\b": + replacement = "\b"; + break; + case "\\f": + replacement = "\f"; + break; + case "\\n": + replacement = "\n"; + break; + case "\\r": + replacement = "\r"; + break; + case "\\\"": + replacement = "\""; + break; + case "\\'": + replacement = "'"; + break; + case "\\\\": + // will be interpreted as regex, so we have to escape it + replacement = "\\\\"; + break; + default: + // unknown escape sequence, pass through as-is + replacement = source; + } + + regexMatcher.appendReplacement(resultString, replacement); + + } + regexMatcher.appendTail(resultString); + + return resultString.toString(); + } + + @Override + public Literal visitNullLiteral(EqlBaseParser.NullLiteralContext ctx) { + Source source = source(ctx); + return new Literal(source, null, DataTypes.NULL); + } + + @Override + public Literal visitBooleanValue(EqlBaseParser.BooleanValueContext ctx) { + Source source = source(ctx); + return new Literal(source, ctx.TRUE() != null, DataTypes.BOOLEAN); + } + + @Override + public Literal visitDecimalLiteral(EqlBaseParser.DecimalLiteralContext ctx) { + Source source = source(ctx); + String text = ctx.getText(); + + try { + return new Literal(source, Double.valueOf(StringUtils.parseDouble(text)), DataTypes.DOUBLE); + } catch (QlIllegalArgumentException siae) { + throw new ParsingException(source, siae.getMessage()); + } + } + + @Override + public Literal visitIntegerLiteral(EqlBaseParser.IntegerLiteralContext ctx) { + Source source = source(ctx); + String text = ctx.getText(); + + long value; + + try { + value = Long.valueOf(StringUtils.parseLong(text)); + } catch (QlIllegalArgumentException siae) { + // if it's too large, then quietly try to parse as a float instead + try { + return new Literal(source, Double.valueOf(StringUtils.parseDouble(text)), DataTypes.DOUBLE); + } catch (QlIllegalArgumentException ignored) {} + + throw new ParsingException(source, siae.getMessage()); + } + + Object val = Long.valueOf(value); + DataType type = DataTypes.LONG; + + // try to downsize to int if possible (since that's the most common type) + if ((int) value == value) { + type = DataTypes.INTEGER; + val = Integer.valueOf((int) value); + } + return new Literal(source, val, type); + } + + @Override + public Literal visitString(EqlBaseParser.StringContext ctx) { + return new Literal(source(ctx), unquoteString(ctx.getText()), DataTypes.KEYWORD); + } +} diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/QueryBuilder.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/QueryBuilder.java new file mode 100644 index 0000000000000..51f80f5a9b7da --- /dev/null +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/QueryBuilder.java @@ -0,0 +1,51 @@ +/* + * Licensed to Elasticsearch under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.elasticsearch.xpack.eql.parser; + +import org.elasticsearch.xpack.ql.expression.Literal; +import org.elasticsearch.xpack.ql.expression.Expression; +import org.elasticsearch.xpack.ql.expression.UnresolvedAttribute; +import org.elasticsearch.xpack.ql.expression.predicate.logical.And; +import org.elasticsearch.xpack.ql.expression.predicate.operator.comparison.Equals; +import org.elasticsearch.xpack.ql.tree.Source; +import org.elasticsearch.xpack.ql.type.DataTypes; + +public class QueryBuilder extends ExpressionBuilder { + + @Override + public Expression visitEventQuery(EqlBaseParser.EventQueryContext ctx) { + Source source = source(ctx); + Expression condition = expression(ctx.expression()); + + if (ctx.event != null) { + Source eventTypeSource = source(ctx.event); + String eventTypeName = visitIdentifier(ctx.event); + Literal eventTypeValue = new Literal(eventTypeSource, eventTypeName, DataTypes.KEYWORD); + + UnresolvedAttribute eventTypeField = new UnresolvedAttribute(eventTypeSource, "event.category"); + Expression eventTypeCheck = new Equals(eventTypeSource, eventTypeField, eventTypeValue); + + return new And(source, eventTypeCheck, condition); + + } else { + return condition; + } + } +} diff --git a/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ExpressionTests.java b/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ExpressionTests.java new file mode 100644 index 0000000000000..9cc32349279d3 --- /dev/null +++ b/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ExpressionTests.java @@ -0,0 +1,134 @@ +/* + * Licensed to Elasticsearch under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.elasticsearch.xpack.eql.parser; + +import org.elasticsearch.test.ESTestCase; +import org.elasticsearch.xpack.ql.expression.Expression; +import org.elasticsearch.xpack.ql.expression.Literal; +import org.elasticsearch.xpack.ql.expression.UnresolvedAttribute; +import org.elasticsearch.xpack.ql.expression.function.UnresolvedFunction; +import org.elasticsearch.xpack.ql.expression.predicate.operator.arithmetic.Neg; +import org.elasticsearch.xpack.ql.type.DataTypes; + +import java.util.Arrays; +import java.util.List; + +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.instanceOf; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.nullValue; + +public class ExpressionTests extends ESTestCase { + + private final EqlParser parser = new EqlParser(); + + public void testStrings() throws Exception { + assertEquals("hello\"world", AstBuilder.unquoteString("'hello\"world'")); + assertEquals("hello'world", AstBuilder.unquoteString("\"hello'world\"")); + assertEquals("hello\nworld", AstBuilder.unquoteString("'hello\\nworld'")); + assertEquals("hello\\\nworld", AstBuilder.unquoteString("'hello\\\\\\nworld'")); + assertEquals("hello\\\"world", AstBuilder.unquoteString("'hello\\\\\\\"world'")); + + // test for unescaped strings: ?"...." or ?'....' + assertEquals("hello\"world", AstBuilder.unquoteString("?'hello\"world'")); + assertEquals("hello\\\"world", AstBuilder.unquoteString("?'hello\\\"world'")); + assertEquals("hello'world", AstBuilder.unquoteString("?\"hello'world\"")); + assertEquals("hello\\nworld", AstBuilder.unquoteString("?'hello\\nworld'")); + assertEquals("hello\\\\nworld", AstBuilder.unquoteString("?'hello\\\\nworld'")); + assertEquals("hello\\\\\\nworld", AstBuilder.unquoteString("?'hello\\\\\\nworld'")); + assertEquals("hello\\\\\\\"world", AstBuilder.unquoteString("?'hello\\\\\\\"world'")); + } + + public void testLiterals() { + assertEquals(Literal.TRUE, parser.createExpression("true")); + assertEquals(Literal.FALSE, parser.createExpression("false")); + assertEquals(Literal.NULL, parser.createExpression("null")); + } + + public void testSingleQuotedString() { + // "hello \" world" + Expression parsed = parser.createExpression("'hello \\' world!'"); + Expression expected = new Literal(null, "hello ' world!", DataTypes.KEYWORD); + assertEquals(expected, parsed); + } + + public void testDoubleQuotedString() { + // "hello \" world" + Expression parsed = parser.createExpression("\"hello \\\" world!\""); + Expression expected = new Literal(null, "hello \" world!", DataTypes.KEYWORD); + assertEquals(expected, parsed); + } + + public void testSingleQuotedUnescapedString() { + // "hello \" world" + Expression parsed = parser.createExpression("?'hello \\' world!'"); + Expression expected = new Literal(null, "hello \\' world!", DataTypes.KEYWORD); + assertEquals(expected, parsed); + } + + public void testDoubleQuotedUnescapedString() { + // "hello \" world" + Expression parsed = parser.createExpression("?\"hello \\\" world!\""); + Expression expected = new Literal(null, "hello \\\" world!", DataTypes.KEYWORD); + assertEquals(expected, parsed); + } + + public void testNumbers() { + assertEquals(new Literal(null, 8589934592L, DataTypes.LONG), parser.createExpression("8589934592")); + assertEquals(new Literal(null, 5, DataTypes.INTEGER), parser.createExpression("5")); + assertEquals(new Literal(null, 5e14, DataTypes.DOUBLE), parser.createExpression("5e14")); + assertEquals(new Literal(null, 5.2, DataTypes.DOUBLE), parser.createExpression("5.2")); + + Expression parsed = parser.createExpression("-5.2"); + Expression expected = new Neg(null, new Literal(null, 5.2, DataTypes.DOUBLE)); + assertEquals(expected, parsed); + } + + public void testBackQuotedAttribute() { + String quote = "`"; + String qualifier = "table"; + String name = "@timestamp"; + Expression exp = parser.createExpression(quote + qualifier + quote + "." + quote + name + quote); + assertThat(exp, instanceOf(UnresolvedAttribute.class)); + UnresolvedAttribute ua = (UnresolvedAttribute) exp; + assertThat(ua.name(), equalTo(qualifier + "." + name)); + assertThat(ua.qualifiedName(), equalTo(qualifier + "." + name)); + assertThat(ua.qualifier(), is(nullValue())); + } + + public void testFunctions() { + List arguments = Arrays.asList( + new UnresolvedAttribute(null, "some.field"), + new Literal(null, "test string", DataTypes.KEYWORD) + ); + UnresolvedFunction.ResolutionType resolutionType = UnresolvedFunction.ResolutionType.STANDARD; + Expression expected = new UnresolvedFunction(null, "concat", resolutionType, arguments); + + assertEquals(expected, parser.createExpression("concat(some.field, 'test string')")); + } + + public void testEventQuery() { + Expression fullQuery = parser.createStatement("process where process_name == 'net.exe'"); + Expression baseExpression = parser.createExpression("process_name == 'net.exe'"); + Expression fullExpression = parser.createExpression("event.category == 'process' and process_name == 'net.exe'"); + assertEquals(fullQuery, fullExpression); + assertNotEquals(baseExpression, fullExpression); + } +} diff --git a/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/GrammarTests.java b/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/GrammarTests.java index d2f9f5ae856bf..eb588696586c8 100644 --- a/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/GrammarTests.java +++ b/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/GrammarTests.java @@ -28,29 +28,14 @@ */ public class GrammarTests extends ESTestCase { - public void testStrings() throws Exception { - assertEquals("hello\"world", AstBuilder.unquoteString("'hello\"world'")); - assertEquals("hello'world", AstBuilder.unquoteString("\"hello'world\"")); - assertEquals("hello\nworld", AstBuilder.unquoteString("'hello\\nworld'")); - assertEquals("hello\\\nworld", AstBuilder.unquoteString("'hello\\\\\\nworld'")); - assertEquals("hello\\\"world", AstBuilder.unquoteString("'hello\\\\\\\"world'")); - - // test for unescaped strings: ?"...." or ?'....' - assertEquals("hello\"world", AstBuilder.unquoteString("?'hello\"world'")); - assertEquals("hello\\\"world", AstBuilder.unquoteString("?'hello\\\"world'")); - assertEquals("hello'world", AstBuilder.unquoteString("?\"hello'world\"")); - assertEquals("hello\\nworld", AstBuilder.unquoteString("?'hello\\nworld'")); - assertEquals("hello\\\\nworld", AstBuilder.unquoteString("?'hello\\\\nworld'")); - assertEquals("hello\\\\\\nworld", AstBuilder.unquoteString("?'hello\\\\\\nworld'")); - assertEquals("hello\\\\\\\"world", AstBuilder.unquoteString("?'hello\\\\\\\"world'")); - } - public void testSupportedQueries() throws Exception { EqlParser parser = new EqlParser(); List> lines = readQueries("/queries-supported.eql"); for (Tuple line : lines) { String q = line.v1(); + parser.createStatement(q); + /* try { parser.createStatement(q); } catch (ParsingException pe) { @@ -61,6 +46,7 @@ public void testSupportedQueries() throws Exception { pe.getErrorMessage() + " inside statement <{}>", q); } } + */ } } public void testUnsupportedQueries() throws Exception { From b237eeabc5dd7431c93d806f6f470daeacf674dc Mon Sep 17 00:00:00 2001 From: Ross Wolf <31489089+rw-access@users.noreply.github.com> Date: Tue, 28 Jan 2020 10:37:39 -0700 Subject: [PATCH 02/11] EQL: Add tests for wildcards and sets --- .../xpack/eql/parser/ExpressionBuilder.java | 21 +++++- .../xpack/eql/parser/ExpressionTests.java | 70 +++++++++++++++++++ 2 files changed, 90 insertions(+), 1 deletion(-) diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/ExpressionBuilder.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/ExpressionBuilder.java index a3be853613b76..579ede0753030 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/ExpressionBuilder.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/ExpressionBuilder.java @@ -39,6 +39,7 @@ import org.elasticsearch.xpack.ql.tree.Source; import org.elasticsearch.xpack.ql.type.DataTypes; +import java.util.Arrays; import java.util.List; @@ -97,6 +98,24 @@ public Expression visitComparison(ComparisonContext ctx) { Source source = source(ctx); + // check if the RHS is a wildcard string and convert to a function check instead + if (right instanceof Literal) { + Object rightValue = ((Literal) right).value(); + if ((rightValue instanceof String) && ((String) rightValue).contains("*")) { + + List arguments = Arrays.asList(left, right); + UnresolvedFunction.ResolutionType resolutionType = UnresolvedFunction.ResolutionType.STANDARD; + Expression wildcardExpression = new UnresolvedFunction(source, "wildcard", resolutionType, arguments); + + switch (op.getSymbol().getType()) { + case EqlBaseParser.EQ: + return wildcardExpression; + case EqlBaseParser.NEQ: + return new Not(source, wildcardExpression); + } + } + } + switch (op.getSymbol().getType()) { case EqlBaseParser.EQ: // TODO: check for left == null after moving IsNotNull from SQL -> QL @@ -132,7 +151,7 @@ public Expression visitContainsExpression(ContainsExpressionContext ctx) { checkInSet = checkInSet == null ? termCheck : new Or(source, checkInSet, termCheck); } - return checkInSet; + return ctx.NOT() != null ? new Not(source, checkInSet) : checkInSet; } @Override diff --git a/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ExpressionTests.java b/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ExpressionTests.java index 9cc32349279d3..f8715bb2a8089 100644 --- a/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ExpressionTests.java +++ b/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ExpressionTests.java @@ -24,7 +24,15 @@ import org.elasticsearch.xpack.ql.expression.Literal; import org.elasticsearch.xpack.ql.expression.UnresolvedAttribute; import org.elasticsearch.xpack.ql.expression.function.UnresolvedFunction; +import org.elasticsearch.xpack.ql.expression.predicate.logical.And; +import org.elasticsearch.xpack.ql.expression.predicate.logical.Or; import org.elasticsearch.xpack.ql.expression.predicate.operator.arithmetic.Neg; +import org.elasticsearch.xpack.ql.expression.predicate.operator.comparison.Equals; +import org.elasticsearch.xpack.ql.expression.predicate.operator.comparison.GreaterThan; +import org.elasticsearch.xpack.ql.expression.predicate.operator.comparison.GreaterThanOrEqual; +import org.elasticsearch.xpack.ql.expression.predicate.operator.comparison.LessThan; +import org.elasticsearch.xpack.ql.expression.predicate.operator.comparison.LessThanOrEqual; +import org.elasticsearch.xpack.ql.expression.predicate.operator.comparison.NotEquals; import org.elasticsearch.xpack.ql.type.DataTypes; import java.util.Arrays; @@ -39,6 +47,10 @@ public class ExpressionTests extends ESTestCase { private final EqlParser parser = new EqlParser(); + public Expression expr(String source) { + return parser.createExpression(source); + } + public void testStrings() throws Exception { assertEquals("hello\"world", AstBuilder.unquoteString("'hello\"world'")); assertEquals("hello'world", AstBuilder.unquoteString("\"hello'world\"")); @@ -124,6 +136,21 @@ public void testFunctions() { assertEquals(expected, parser.createExpression("concat(some.field, 'test string')")); } + public void testComparison() { + String fieldText = "field"; + String valueText = "2.0"; + + Expression field = expr(fieldText); + Expression value = expr(valueText); + + assertEquals( new Equals(null, field, value), expr(fieldText + "==" + valueText)); + assertEquals( new NotEquals(null, field, value), expr(fieldText + "!=" + valueText)); + assertEquals( new LessThanOrEqual(null, field, value), expr(fieldText + "<=" + valueText)); + assertEquals( new GreaterThanOrEqual(null, field, value), expr(fieldText + ">=" + valueText)); + assertEquals( new GreaterThan(null, field, value), expr(fieldText + ">" + valueText)); + assertEquals( new LessThan(null, field, value), expr(fieldText + "<" + valueText)); + } + public void testEventQuery() { Expression fullQuery = parser.createStatement("process where process_name == 'net.exe'"); Expression baseExpression = parser.createExpression("process_name == 'net.exe'"); @@ -131,4 +158,47 @@ public void testEventQuery() { assertEquals(fullQuery, fullExpression); assertNotEquals(baseExpression, fullExpression); } + + public void testBoolean() { + String leftText = "process_name == 'net.exe'"; + String rightText = "command_line == '* localgroup*'"; + + Expression lhs = parser.createExpression(leftText); + Expression rhs = parser.createExpression(rightText); + + Expression booleanAnd = parser.createExpression(leftText + " and " + rightText); + assertEquals(new And(null, lhs, rhs), booleanAnd); + + Expression booleanOr = parser.createExpression(leftText + " or " + rightText); + assertEquals(new Or(null, lhs, rhs), booleanOr); + } + + public void testWildcard() { + assertEquals( + parser.createExpression("command_line == '* localgroup*'"), + parser.createExpression("wildcard(command_line, '* localgroup*')") + ); + + assertEquals( + parser.createExpression("command_line != '* localgroup*'"), + parser.createExpression("not wildcard(command_line, '* localgroup*')") + ); + } + + public void testInSet() { + assertEquals( + parser.createExpression("name in ('net.exe')"), + parser.createExpression("name == 'net.exe'") + ); + + assertEquals( + parser.createExpression("name in ('net.exe', 'whoami.exe', 'hostname.exe')"), + parser.createExpression("name == 'net.exe' or name == 'whoami.exe' or name == 'hostname.exe'") + ); + + assertEquals( + parser.createExpression("name not in ('net.exe', 'whoami.exe', 'hostname.exe')"), + parser.createExpression("not (name == 'net.exe' or name == 'whoami.exe' or name == 'hostname.exe')") + ); + } } From b594566cfc6b301e749baca51ccce74748e71937 Mon Sep 17 00:00:00 2001 From: Ross Wolf <31489089+rw-access@users.noreply.github.com> Date: Tue, 28 Jan 2020 10:59:26 -0700 Subject: [PATCH 03/11] EQL: Fix licensing --- .../xpack/eql/parser/LiteralBuilder.java | 10 +++------- .../xpack/eql/parser/QueryBuilder.java | 19 +++---------------- 2 files changed, 6 insertions(+), 23 deletions(-) diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/LiteralBuilder.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/LiteralBuilder.java index 7d06e6fa3102b..7e452007e45e2 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/LiteralBuilder.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/LiteralBuilder.java @@ -6,20 +6,16 @@ package org.elasticsearch.xpack.eql.parser; -import org.antlr.v4.runtime.tree.TerminalNode; - -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.xpack.ql.QlIllegalArgumentException; -import org.elasticsearch.xpack.ql.expression.Expression; import org.elasticsearch.xpack.ql.expression.Literal; import org.elasticsearch.xpack.ql.tree.Source; import org.elasticsearch.xpack.ql.type.DataType; import org.elasticsearch.xpack.ql.type.DataTypes; import org.elasticsearch.xpack.ql.util.StringUtils; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + public class LiteralBuilder extends IdentifierBuilder { static String unquoteString(String text) { diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/QueryBuilder.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/QueryBuilder.java index 51f80f5a9b7da..3606426d3415b 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/QueryBuilder.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/QueryBuilder.java @@ -1,20 +1,7 @@ /* - * Licensed to Elasticsearch under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. */ package org.elasticsearch.xpack.eql.parser; From 89c912636e792f5372cd4acedad8d2a674ae9cb0 Mon Sep 17 00:00:00 2001 From: Ross Wolf <31489089+rw-access@users.noreply.github.com> Date: Tue, 28 Jan 2020 15:52:03 -0700 Subject: [PATCH 04/11] EQL: Fix ExpressionTests.java license --- .../xpack/eql/parser/ExpressionTests.java | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ExpressionTests.java b/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ExpressionTests.java index f8715bb2a8089..578eced65dd81 100644 --- a/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ExpressionTests.java +++ b/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ExpressionTests.java @@ -1,22 +1,10 @@ /* - * Licensed to Elasticsearch under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. */ + package org.elasticsearch.xpack.eql.parser; import org.elasticsearch.test.ESTestCase; From 0658e2b4fdaf6fa4d5a9e53a9fc2267d80cc242c Mon Sep 17 00:00:00 2001 From: Ross Wolf <31489089+rw-access@users.noreply.github.com> Date: Tue, 28 Jan 2020 16:05:38 -0700 Subject: [PATCH 05/11] EQL: Cleanup imports --- .../org/elasticsearch/xpack/eql/parser/AbstractBuilder.java | 3 --- .../java/org/elasticsearch/xpack/eql/parser/EqlParser.java | 2 +- .../org/elasticsearch/xpack/eql/parser/ExpressionBuilder.java | 1 - .../java/org/elasticsearch/xpack/eql/parser/QueryBuilder.java | 2 +- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/AbstractBuilder.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/AbstractBuilder.java index 9b43a4bc04bb7..4f00097da5911 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/AbstractBuilder.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/AbstractBuilder.java @@ -10,15 +10,12 @@ import org.antlr.v4.runtime.misc.Interval; import org.antlr.v4.runtime.tree.ParseTree; import org.antlr.v4.runtime.tree.TerminalNode; -import org.elasticsearch.xpack.ql.expression.Expression; import org.elasticsearch.xpack.ql.tree.Location; import org.elasticsearch.xpack.ql.tree.Source; import org.elasticsearch.xpack.ql.util.Check; import java.util.ArrayList; import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; /** * Base parsing visitor class offering utility methods. diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlParser.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlParser.java index 1f82b63e01de3..e5e9e86bb7489 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlParser.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlParser.java @@ -5,6 +5,7 @@ */ package org.elasticsearch.xpack.eql.parser; +import org.antlr.v4.runtime.ANTLRInputStream; import org.antlr.v4.runtime.BaseErrorListener; import org.antlr.v4.runtime.CommonTokenStream; import org.antlr.v4.runtime.DiagnosticErrorListener; @@ -18,7 +19,6 @@ import org.antlr.v4.runtime.dfa.DFA; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.antlr.v4.runtime.ANTLRInputStream; import org.elasticsearch.xpack.ql.expression.Expression; import java.util.Arrays; diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/ExpressionBuilder.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/ExpressionBuilder.java index 579ede0753030..bfd14f5fdf5da 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/ExpressionBuilder.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/ExpressionBuilder.java @@ -37,7 +37,6 @@ import org.elasticsearch.xpack.ql.expression.predicate.operator.comparison.LessThanOrEqual; import org.elasticsearch.xpack.ql.expression.predicate.operator.comparison.NotEquals; import org.elasticsearch.xpack.ql.tree.Source; -import org.elasticsearch.xpack.ql.type.DataTypes; import java.util.Arrays; import java.util.List; diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/QueryBuilder.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/QueryBuilder.java index 3606426d3415b..5ec0dca23141a 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/QueryBuilder.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/QueryBuilder.java @@ -6,8 +6,8 @@ package org.elasticsearch.xpack.eql.parser; -import org.elasticsearch.xpack.ql.expression.Literal; import org.elasticsearch.xpack.ql.expression.Expression; +import org.elasticsearch.xpack.ql.expression.Literal; import org.elasticsearch.xpack.ql.expression.UnresolvedAttribute; import org.elasticsearch.xpack.ql.expression.predicate.logical.And; import org.elasticsearch.xpack.ql.expression.predicate.operator.comparison.Equals; From eba19f752782f8780025eaecafbe3946722f337f Mon Sep 17 00:00:00 2001 From: Ross Wolf <31489089+rw-access@users.noreply.github.com> Date: Wed, 29 Jan 2020 14:26:50 -0700 Subject: [PATCH 06/11] EQL: PR feedback and remove LiteralBuilder --- .../xpack/eql/parser/AbstractBuilder.java | 63 ++++++++ .../xpack/eql/parser/ExpressionBuilder.java | 88 ++++++++--- .../xpack/eql/parser/LiteralBuilder.java | 137 ------------------ .../xpack/eql/parser/ExpressionTests.java | 100 +++++++------ 4 files changed, 180 insertions(+), 208 deletions(-) delete mode 100644 x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/LiteralBuilder.java diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/AbstractBuilder.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/AbstractBuilder.java index 4f00097da5911..a9bbea3879864 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/AbstractBuilder.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/AbstractBuilder.java @@ -16,12 +16,16 @@ import java.util.ArrayList; import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * Base parsing visitor class offering utility methods. */ abstract class AbstractBuilder extends EqlBaseBaseVisitor { + private static final Pattern slashPattern = Pattern.compile("\\\\."); + @Override public Object visit(ParseTree tree) { Object result = super.visit(tree); @@ -102,9 +106,68 @@ static String text(ParseTree node) { return node == null ? null : node.getText(); } + public static String unquoteString(String text) { + // remove leading and trailing ' for strings and also eliminate escaped single quotes + if (text == null) { + return null; + } + + // unescaped strings can be interpreted directly + if (text.startsWith("?")) { + return text.substring(2, text.length() - 1); + } + + text = text.substring(1, text.length() - 1); + StringBuffer resultString = new StringBuffer(); + Matcher regexMatcher = slashPattern.matcher(text); + + while (regexMatcher.find()) { + String source = regexMatcher.group(); + String replacement; + + switch (source) { + case "\\t": + replacement = "\t"; + break; + case "\\b": + replacement = "\b"; + break; + case "\\f": + replacement = "\f"; + break; + case "\\n": + replacement = "\n"; + break; + case "\\r": + replacement = "\r"; + break; + case "\\\"": + replacement = "\""; + break; + case "\\'": + replacement = "'"; + break; + case "\\\\": + // will be interpreted as regex, so we have to escape it + replacement = "\\\\"; + break; + default: + // unknown escape sequence, pass through as-is + replacement = source; + } + + regexMatcher.appendReplacement(resultString, replacement); + + } + regexMatcher.appendTail(resultString); + + return resultString.toString(); + } + @Override public Object visitTerminal(TerminalNode node) { Source source = source(node); throw new ParsingException(source, "Does not know how to handle {}", source.text()); } + } diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/ExpressionBuilder.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/ExpressionBuilder.java index bfd14f5fdf5da..9d9fcb3129907 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/ExpressionBuilder.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/ExpressionBuilder.java @@ -16,6 +16,7 @@ import org.elasticsearch.xpack.eql.parser.EqlBaseParser.FunctionExpressionContext; import org.elasticsearch.xpack.eql.parser.EqlBaseParser.LogicalBinaryContext; import org.elasticsearch.xpack.eql.parser.EqlBaseParser.LogicalNotContext; +import org.elasticsearch.xpack.ql.QlIllegalArgumentException; import org.elasticsearch.xpack.ql.expression.Expression; import org.elasticsearch.xpack.ql.expression.Literal; import org.elasticsearch.xpack.ql.expression.UnresolvedAttribute; @@ -37,12 +38,14 @@ import org.elasticsearch.xpack.ql.expression.predicate.operator.comparison.LessThanOrEqual; import org.elasticsearch.xpack.ql.expression.predicate.operator.comparison.NotEquals; import org.elasticsearch.xpack.ql.tree.Source; +import org.elasticsearch.xpack.ql.type.DataType; +import org.elasticsearch.xpack.ql.type.DataTypes; +import org.elasticsearch.xpack.ql.util.StringUtils; -import java.util.Arrays; import java.util.List; -public class ExpressionBuilder extends LiteralBuilder { +public class ExpressionBuilder extends IdentifierBuilder { protected Expression expression(ParseTree ctx) { return typedParsing(ctx, Expression.class); @@ -89,6 +92,12 @@ public Expression visitArithmeticBinary(EqlBaseParser.ArithmeticBinaryContext ct } } + @Override + public Literal visitBooleanValue(EqlBaseParser.BooleanValueContext ctx) { + Source source = source(ctx); + return new Literal(source, ctx.TRUE() != null, DataTypes.BOOLEAN); + } + @Override public Expression visitComparison(ComparisonContext ctx) { Expression left = expression(ctx.left); @@ -97,30 +106,10 @@ public Expression visitComparison(ComparisonContext ctx) { Source source = source(ctx); - // check if the RHS is a wildcard string and convert to a function check instead - if (right instanceof Literal) { - Object rightValue = ((Literal) right).value(); - if ((rightValue instanceof String) && ((String) rightValue).contains("*")) { - - List arguments = Arrays.asList(left, right); - UnresolvedFunction.ResolutionType resolutionType = UnresolvedFunction.ResolutionType.STANDARD; - Expression wildcardExpression = new UnresolvedFunction(source, "wildcard", resolutionType, arguments); - - switch (op.getSymbol().getType()) { - case EqlBaseParser.EQ: - return wildcardExpression; - case EqlBaseParser.NEQ: - return new Not(source, wildcardExpression); - } - } - } - switch (op.getSymbol().getType()) { case EqlBaseParser.EQ: - // TODO: check for left == null after moving IsNotNull from SQL -> QL return new Equals(source, left, right); case EqlBaseParser.NEQ: - // TODO: check for left != null after moving IsNotNull from SQL -> QL return new NotEquals(source, left, right); case EqlBaseParser.LT: return new LessThan(source, left, right); @@ -145,7 +134,7 @@ public Expression visitContainsExpression(ContainsExpressionContext ctx) { // TODO: Add IN to QL and use that directly Expression checkInSet = null; - for (Expression inner: container) { + for (Expression inner : container) { Expression termCheck = new Equals(source, exp, inner); checkInSet = checkInSet == null ? termCheck : new Or(source, checkInSet, termCheck); } @@ -153,6 +142,18 @@ public Expression visitContainsExpression(ContainsExpressionContext ctx) { return ctx.NOT() != null ? new Not(source, checkInSet) : checkInSet; } + @Override + public Literal visitDecimalLiteral(EqlBaseParser.DecimalLiteralContext ctx) { + Source source = source(ctx); + String text = ctx.getText(); + + try { + return new Literal(source, Double.valueOf(StringUtils.parseDouble(text)), DataTypes.DOUBLE); + } catch (QlIllegalArgumentException siae) { + throw new ParsingException(source, siae.getMessage()); + } + } + @Override public Expression visitDereference(DereferenceContext ctx) { return new UnresolvedAttribute(source(ctx), visitQualifiedName(ctx.qualifiedName())); @@ -167,6 +168,36 @@ public Function visitFunctionExpression(FunctionExpressionContext ctx) { return new UnresolvedFunction(source, name, UnresolvedFunction.ResolutionType.STANDARD, arguments); } + @Override + public Literal visitIntegerLiteral(EqlBaseParser.IntegerLiteralContext ctx) { + Source source = source(ctx); + String text = ctx.getText(); + + long value; + + try { + value = Long.valueOf(StringUtils.parseLong(text)); + } catch (QlIllegalArgumentException siae) { + // if it's too large, then quietly try to parse as a float instead + try { + return new Literal(source, Double.valueOf(StringUtils.parseDouble(text)), DataTypes.DOUBLE); + } catch (QlIllegalArgumentException ignored) { + } + + throw new ParsingException(source, siae.getMessage()); + } + + Object val = Long.valueOf(value); + DataType type = DataTypes.LONG; + + // try to downsize to int if possible (since that's the most common type) + if ((int) value == value) { + type = DataTypes.INTEGER; + val = Integer.valueOf((int) value); + } + return new Literal(source, val, type); + } + @Override public Expression visitLogicalBinary(LogicalBinaryContext ctx) { int type = ctx.operator.getType(); @@ -186,8 +217,19 @@ public Not visitLogicalNot(LogicalNotContext ctx) { return new Not(source(ctx), expression(ctx.booleanExpression())); } + @Override + public Literal visitNullLiteral(EqlBaseParser.NullLiteralContext ctx) { + Source source = source(ctx); + return new Literal(source, null, DataTypes.NULL); + } + @Override public Expression visitParenthesizedExpression(EqlBaseParser.ParenthesizedExpressionContext ctx) { return expression(ctx.expression()); } + + @Override + public Literal visitString(EqlBaseParser.StringContext ctx) { + return new Literal(source(ctx), unquoteString(ctx.getText()), DataTypes.KEYWORD); + } } diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/LiteralBuilder.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/LiteralBuilder.java deleted file mode 100644 index 7e452007e45e2..0000000000000 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/LiteralBuilder.java +++ /dev/null @@ -1,137 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -package org.elasticsearch.xpack.eql.parser; - -import org.elasticsearch.xpack.ql.QlIllegalArgumentException; -import org.elasticsearch.xpack.ql.expression.Literal; -import org.elasticsearch.xpack.ql.tree.Source; -import org.elasticsearch.xpack.ql.type.DataType; -import org.elasticsearch.xpack.ql.type.DataTypes; -import org.elasticsearch.xpack.ql.util.StringUtils; - -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -public class LiteralBuilder extends IdentifierBuilder { - - static String unquoteString(String text) { - // remove leading and trailing ' for strings and also eliminate escaped single quotes - if (text == null) { - return null; - } - - // unescaped strings can be interpreted directly - if (text.startsWith("?")) { - return text.substring(2, text.length() - 1); - } - - text = text.substring(1, text.length() - 1); - Pattern regex = Pattern.compile("\\\\."); - StringBuffer resultString = new StringBuffer(); - Matcher regexMatcher = regex.matcher(text); - - while (regexMatcher.find()) { - String source = regexMatcher.group(); - String replacement; - - switch (source) { - case "\\t": - replacement = "\t"; - break; - case "\\b": - replacement = "\b"; - break; - case "\\f": - replacement = "\f"; - break; - case "\\n": - replacement = "\n"; - break; - case "\\r": - replacement = "\r"; - break; - case "\\\"": - replacement = "\""; - break; - case "\\'": - replacement = "'"; - break; - case "\\\\": - // will be interpreted as regex, so we have to escape it - replacement = "\\\\"; - break; - default: - // unknown escape sequence, pass through as-is - replacement = source; - } - - regexMatcher.appendReplacement(resultString, replacement); - - } - regexMatcher.appendTail(resultString); - - return resultString.toString(); - } - - @Override - public Literal visitNullLiteral(EqlBaseParser.NullLiteralContext ctx) { - Source source = source(ctx); - return new Literal(source, null, DataTypes.NULL); - } - - @Override - public Literal visitBooleanValue(EqlBaseParser.BooleanValueContext ctx) { - Source source = source(ctx); - return new Literal(source, ctx.TRUE() != null, DataTypes.BOOLEAN); - } - - @Override - public Literal visitDecimalLiteral(EqlBaseParser.DecimalLiteralContext ctx) { - Source source = source(ctx); - String text = ctx.getText(); - - try { - return new Literal(source, Double.valueOf(StringUtils.parseDouble(text)), DataTypes.DOUBLE); - } catch (QlIllegalArgumentException siae) { - throw new ParsingException(source, siae.getMessage()); - } - } - - @Override - public Literal visitIntegerLiteral(EqlBaseParser.IntegerLiteralContext ctx) { - Source source = source(ctx); - String text = ctx.getText(); - - long value; - - try { - value = Long.valueOf(StringUtils.parseLong(text)); - } catch (QlIllegalArgumentException siae) { - // if it's too large, then quietly try to parse as a float instead - try { - return new Literal(source, Double.valueOf(StringUtils.parseDouble(text)), DataTypes.DOUBLE); - } catch (QlIllegalArgumentException ignored) {} - - throw new ParsingException(source, siae.getMessage()); - } - - Object val = Long.valueOf(value); - DataType type = DataTypes.LONG; - - // try to downsize to int if possible (since that's the most common type) - if ((int) value == value) { - type = DataTypes.INTEGER; - val = Integer.valueOf((int) value); - } - return new Literal(source, val, type); - } - - @Override - public Literal visitString(EqlBaseParser.StringContext ctx) { - return new Literal(source(ctx), unquoteString(ctx.getText()), DataTypes.KEYWORD); - } -} diff --git a/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ExpressionTests.java b/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ExpressionTests.java index 578eced65dd81..7e0ffb92d71c1 100644 --- a/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ExpressionTests.java +++ b/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ExpressionTests.java @@ -26,6 +26,7 @@ import java.util.Arrays; import java.util.List; +import static org.elasticsearch.xpack.eql.parser.AbstractBuilder.unquoteString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; @@ -39,64 +40,65 @@ public Expression expr(String source) { return parser.createExpression(source); } + public void testStrings() throws Exception { - assertEquals("hello\"world", AstBuilder.unquoteString("'hello\"world'")); - assertEquals("hello'world", AstBuilder.unquoteString("\"hello'world\"")); - assertEquals("hello\nworld", AstBuilder.unquoteString("'hello\\nworld'")); - assertEquals("hello\\\nworld", AstBuilder.unquoteString("'hello\\\\\\nworld'")); - assertEquals("hello\\\"world", AstBuilder.unquoteString("'hello\\\\\\\"world'")); + assertEquals("hello\"world", unquoteString("'hello\"world'")); + assertEquals("hello'world", unquoteString("\"hello'world\"")); + assertEquals("hello\nworld", unquoteString("'hello\\nworld'")); + assertEquals("hello\\\nworld", unquoteString("'hello\\\\\\nworld'")); + assertEquals("hello\\\"world", unquoteString("'hello\\\\\\\"world'")); // test for unescaped strings: ?"...." or ?'....' - assertEquals("hello\"world", AstBuilder.unquoteString("?'hello\"world'")); - assertEquals("hello\\\"world", AstBuilder.unquoteString("?'hello\\\"world'")); - assertEquals("hello'world", AstBuilder.unquoteString("?\"hello'world\"")); - assertEquals("hello\\nworld", AstBuilder.unquoteString("?'hello\\nworld'")); - assertEquals("hello\\\\nworld", AstBuilder.unquoteString("?'hello\\\\nworld'")); - assertEquals("hello\\\\\\nworld", AstBuilder.unquoteString("?'hello\\\\\\nworld'")); - assertEquals("hello\\\\\\\"world", AstBuilder.unquoteString("?'hello\\\\\\\"world'")); + assertEquals("hello\"world", unquoteString("?'hello\"world'")); + assertEquals("hello\\\"world", unquoteString("?'hello\\\"world'")); + assertEquals("hello'world", unquoteString("?\"hello'world\"")); + assertEquals("hello\\nworld", unquoteString("?'hello\\nworld'")); + assertEquals("hello\\\\nworld", unquoteString("?'hello\\\\nworld'")); + assertEquals("hello\\\\\\nworld", unquoteString("?'hello\\\\\\nworld'")); + assertEquals("hello\\\\\\\"world", unquoteString("?'hello\\\\\\\"world'")); } public void testLiterals() { - assertEquals(Literal.TRUE, parser.createExpression("true")); - assertEquals(Literal.FALSE, parser.createExpression("false")); - assertEquals(Literal.NULL, parser.createExpression("null")); + assertEquals(Literal.TRUE, expr("true")); + assertEquals(Literal.FALSE, expr("false")); + assertEquals(Literal.NULL, expr("null")); } public void testSingleQuotedString() { // "hello \" world" - Expression parsed = parser.createExpression("'hello \\' world!'"); + Expression parsed = expr("'hello \\' world!'"); Expression expected = new Literal(null, "hello ' world!", DataTypes.KEYWORD); assertEquals(expected, parsed); } public void testDoubleQuotedString() { // "hello \" world" - Expression parsed = parser.createExpression("\"hello \\\" world!\""); + Expression parsed = expr("\"hello \\\" world!\""); Expression expected = new Literal(null, "hello \" world!", DataTypes.KEYWORD); assertEquals(expected, parsed); } public void testSingleQuotedUnescapedString() { // "hello \" world" - Expression parsed = parser.createExpression("?'hello \\' world!'"); + Expression parsed = expr("?'hello \\' world!'"); Expression expected = new Literal(null, "hello \\' world!", DataTypes.KEYWORD); assertEquals(expected, parsed); } public void testDoubleQuotedUnescapedString() { // "hello \" world" - Expression parsed = parser.createExpression("?\"hello \\\" world!\""); + Expression parsed = expr("?\"hello \\\" world!\""); Expression expected = new Literal(null, "hello \\\" world!", DataTypes.KEYWORD); assertEquals(expected, parsed); } public void testNumbers() { - assertEquals(new Literal(null, 8589934592L, DataTypes.LONG), parser.createExpression("8589934592")); - assertEquals(new Literal(null, 5, DataTypes.INTEGER), parser.createExpression("5")); - assertEquals(new Literal(null, 5e14, DataTypes.DOUBLE), parser.createExpression("5e14")); - assertEquals(new Literal(null, 5.2, DataTypes.DOUBLE), parser.createExpression("5.2")); + assertEquals(new Literal(null, 8589934592L, DataTypes.LONG), expr("8589934592")); + assertEquals(new Literal(null, 5, DataTypes.INTEGER), expr("5")); + assertEquals(new Literal(null, 5e14, DataTypes.DOUBLE), expr("5e14")); + assertEquals(new Literal(null, 5.2, DataTypes.DOUBLE), expr("5.2")); - Expression parsed = parser.createExpression("-5.2"); + Expression parsed = expr("-5.2"); Expression expected = new Neg(null, new Literal(null, 5.2, DataTypes.DOUBLE)); assertEquals(expected, parsed); } @@ -105,7 +107,7 @@ public void testBackQuotedAttribute() { String quote = "`"; String qualifier = "table"; String name = "@timestamp"; - Expression exp = parser.createExpression(quote + qualifier + quote + "." + quote + name + quote); + Expression exp = expr(quote + qualifier + quote + "." + quote + name + quote); assertThat(exp, instanceOf(UnresolvedAttribute.class)); UnresolvedAttribute ua = (UnresolvedAttribute) exp; assertThat(ua.name(), equalTo(qualifier + "." + name)); @@ -121,7 +123,7 @@ public void testFunctions() { UnresolvedFunction.ResolutionType resolutionType = UnresolvedFunction.ResolutionType.STANDARD; Expression expected = new UnresolvedFunction(null, "concat", resolutionType, arguments); - assertEquals(expected, parser.createExpression("concat(some.field, 'test string')")); + assertEquals(expected, expr("concat(some.field, 'test string')")); } public void testComparison() { @@ -131,18 +133,18 @@ public void testComparison() { Expression field = expr(fieldText); Expression value = expr(valueText); - assertEquals( new Equals(null, field, value), expr(fieldText + "==" + valueText)); - assertEquals( new NotEquals(null, field, value), expr(fieldText + "!=" + valueText)); - assertEquals( new LessThanOrEqual(null, field, value), expr(fieldText + "<=" + valueText)); - assertEquals( new GreaterThanOrEqual(null, field, value), expr(fieldText + ">=" + valueText)); - assertEquals( new GreaterThan(null, field, value), expr(fieldText + ">" + valueText)); - assertEquals( new LessThan(null, field, value), expr(fieldText + "<" + valueText)); + assertEquals(new Equals(null, field, value), expr(fieldText + "==" + valueText)); + assertEquals(new NotEquals(null, field, value), expr(fieldText + "!=" + valueText)); + assertEquals(new LessThanOrEqual(null, field, value), expr(fieldText + "<=" + valueText)); + assertEquals(new GreaterThanOrEqual(null, field, value), expr(fieldText + ">=" + valueText)); + assertEquals(new GreaterThan(null, field, value), expr(fieldText + ">" + valueText)); + assertEquals(new LessThan(null, field, value), expr(fieldText + "<" + valueText)); } public void testEventQuery() { Expression fullQuery = parser.createStatement("process where process_name == 'net.exe'"); - Expression baseExpression = parser.createExpression("process_name == 'net.exe'"); - Expression fullExpression = parser.createExpression("event.category == 'process' and process_name == 'net.exe'"); + Expression baseExpression = expr("process_name == 'net.exe'"); + Expression fullExpression = expr("event.category == 'process' and process_name == 'net.exe'"); assertEquals(fullQuery, fullExpression); assertNotEquals(baseExpression, fullExpression); } @@ -151,42 +153,44 @@ public void testBoolean() { String leftText = "process_name == 'net.exe'"; String rightText = "command_line == '* localgroup*'"; - Expression lhs = parser.createExpression(leftText); - Expression rhs = parser.createExpression(rightText); + Expression lhs = expr(leftText); + Expression rhs = expr(rightText); - Expression booleanAnd = parser.createExpression(leftText + " and " + rightText); + Expression booleanAnd = expr(leftText + " and " + rightText); assertEquals(new And(null, lhs, rhs), booleanAnd); - Expression booleanOr = parser.createExpression(leftText + " or " + rightText); + Expression booleanOr = expr(leftText + " or " + rightText); assertEquals(new Or(null, lhs, rhs), booleanOr); } + /* public void testWildcard() { assertEquals( - parser.createExpression("command_line == '* localgroup*'"), - parser.createExpression("wildcard(command_line, '* localgroup*')") + expr("command_line == '* localgroup*'"), + expr("wildcard(command_line, '* localgroup*')") ); assertEquals( - parser.createExpression("command_line != '* localgroup*'"), - parser.createExpression("not wildcard(command_line, '* localgroup*')") + expr("command_line != '* localgroup*'"), + expr("not wildcard(command_line, '* localgroup*')") ); } + */ public void testInSet() { assertEquals( - parser.createExpression("name in ('net.exe')"), - parser.createExpression("name == 'net.exe'") + expr("name in ('net.exe')"), + expr("name == 'net.exe'") ); assertEquals( - parser.createExpression("name in ('net.exe', 'whoami.exe', 'hostname.exe')"), - parser.createExpression("name == 'net.exe' or name == 'whoami.exe' or name == 'hostname.exe'") + expr("name in ('net.exe', 'whoami.exe', 'hostname.exe')"), + expr("name == 'net.exe' or name == 'whoami.exe' or name == 'hostname.exe'") ); assertEquals( - parser.createExpression("name not in ('net.exe', 'whoami.exe', 'hostname.exe')"), - parser.createExpression("not (name == 'net.exe' or name == 'whoami.exe' or name == 'hostname.exe')") + expr("name not in ('net.exe', 'whoami.exe', 'hostname.exe')"), + expr("not (name == 'net.exe' or name == 'whoami.exe' or name == 'hostname.exe')") ); } } From d976f1e9ec1c6cb4eaa712bde3352142500bb53f Mon Sep 17 00:00:00 2001 From: Ross Wolf <31489089+rw-access@users.noreply.github.com> Date: Wed, 29 Jan 2020 15:55:43 -0700 Subject: [PATCH 07/11] EQL: Split off logical plan from expressions --- .../xpack/eql/parser/AbstractBuilder.java | 9 +++++ .../xpack/eql/parser/AstBuilder.java | 7 ++-- .../xpack/eql/parser/EqlParser.java | 5 +-- ...ryBuilder.java => LogicalPlanBuilder.java} | 24 +++++++++---- .../xpack/eql/parser/ExpressionTests.java | 8 ----- .../xpack/eql/parser/LogicalPlanTests.java | 35 +++++++++++++++++++ .../elasticsearch/xpack/ql/index/EsIndex.java | 21 +++++++++++ 7 files changed, 89 insertions(+), 20 deletions(-) rename x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/{QueryBuilder.java => LogicalPlanBuilder.java} (55%) create mode 100644 x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/LogicalPlanTests.java diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/AbstractBuilder.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/AbstractBuilder.java index a9bbea3879864..c2baf39929313 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/AbstractBuilder.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/AbstractBuilder.java @@ -10,6 +10,7 @@ import org.antlr.v4.runtime.misc.Interval; import org.antlr.v4.runtime.tree.ParseTree; import org.antlr.v4.runtime.tree.TerminalNode; +import org.elasticsearch.xpack.ql.plan.logical.LogicalPlan; import org.elasticsearch.xpack.ql.tree.Location; import org.elasticsearch.xpack.ql.tree.Source; import org.elasticsearch.xpack.ql.util.Check; @@ -45,6 +46,14 @@ protected T typedParsing(ParseTree ctx, Class type) { type.getSimpleName(), (result != null ? result.getClass().getSimpleName() : "null")); } + protected LogicalPlan plan(ParseTree ctx) { + return typedParsing(ctx, LogicalPlan.class); + } + + protected List plans(List ctxs) { + return visitList(ctxs, LogicalPlan.class); + } + protected List visitList(List contexts, Class clazz) { List results = new ArrayList<>(contexts.size()); for (ParserRuleContext context : contexts) { diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/AstBuilder.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/AstBuilder.java index 64815e0d44c0c..9867f757c5e2e 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/AstBuilder.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/AstBuilder.java @@ -7,11 +7,12 @@ package org.elasticsearch.xpack.eql.parser; import org.elasticsearch.xpack.eql.parser.EqlBaseParser.SingleStatementContext; +import org.elasticsearch.xpack.ql.plan.logical.LogicalPlan; -public class AstBuilder extends QueryBuilder { +public class AstBuilder extends LogicalPlanBuilder { @Override - public Object visitSingleStatement(SingleStatementContext ctx) { - return expression(ctx.statement()); + public LogicalPlan visitSingleStatement(SingleStatementContext ctx) { + return plan(ctx.statement()); } } diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlParser.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlParser.java index e5e9e86bb7489..d524564250fdb 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlParser.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlParser.java @@ -20,6 +20,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.elasticsearch.xpack.ql.expression.Expression; +import org.elasticsearch.xpack.ql.plan.logical.LogicalPlan; import java.util.Arrays; import java.util.BitSet; @@ -40,11 +41,11 @@ public class EqlParser { * Parses an EQL statement into execution plan * @param eql - the EQL statement */ - public Expression createStatement(String eql) { + public LogicalPlan createStatement(String eql) { if (log.isDebugEnabled()) { log.debug("Parsing as statement: {}", eql); } - return invokeParser(eql, EqlBaseParser::singleStatement, AstBuilder::expression); + return invokeParser(eql, EqlBaseParser::singleStatement, AstBuilder::plan); } public Expression createExpression(String expression) { diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/QueryBuilder.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/LogicalPlanBuilder.java similarity index 55% rename from x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/QueryBuilder.java rename to x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/LogicalPlanBuilder.java index 5ec0dca23141a..d87bf06c62855 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/QueryBuilder.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/LogicalPlanBuilder.java @@ -11,28 +11,38 @@ import org.elasticsearch.xpack.ql.expression.UnresolvedAttribute; import org.elasticsearch.xpack.ql.expression.predicate.logical.And; import org.elasticsearch.xpack.ql.expression.predicate.operator.comparison.Equals; +import org.elasticsearch.xpack.ql.index.EsIndex; +import org.elasticsearch.xpack.ql.plan.logical.EsRelation; +import org.elasticsearch.xpack.ql.plan.logical.Filter; +import org.elasticsearch.xpack.ql.plan.logical.LogicalPlan; import org.elasticsearch.xpack.ql.tree.Source; import org.elasticsearch.xpack.ql.type.DataTypes; -public class QueryBuilder extends ExpressionBuilder { +import static java.util.Collections.emptyMap; + +public abstract class LogicalPlanBuilder extends ExpressionBuilder { + + // TODO: these need to be made configurable + private static final String EVENT_TYPE = "event.category"; + private static final EsIndex esIndex = new EsIndex("", emptyMap()); @Override - public Expression visitEventQuery(EqlBaseParser.EventQueryContext ctx) { + public LogicalPlan visitEventQuery(EqlBaseParser.EventQueryContext ctx) { Source source = source(ctx); Expression condition = expression(ctx.expression()); if (ctx.event != null) { Source eventTypeSource = source(ctx.event); String eventTypeName = visitIdentifier(ctx.event); - Literal eventTypeValue = new Literal(eventTypeSource, eventTypeName, DataTypes.KEYWORD); + Literal eventTypeValue = new Literal(eventTypeSource, eventTypeName, DataTypes.KEYWORD); - UnresolvedAttribute eventTypeField = new UnresolvedAttribute(eventTypeSource, "event.category"); + UnresolvedAttribute eventTypeField = new UnresolvedAttribute(eventTypeSource, EVENT_TYPE); Expression eventTypeCheck = new Equals(eventTypeSource, eventTypeField, eventTypeValue); - return new And(source, eventTypeCheck, condition); + condition = new And(source, eventTypeCheck, condition); - } else { - return condition; } + + return new Filter(source(ctx), new EsRelation(Source.EMPTY, esIndex, false), condition); } } diff --git a/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ExpressionTests.java b/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ExpressionTests.java index 7e0ffb92d71c1..d8e7c19d043c3 100644 --- a/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ExpressionTests.java +++ b/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ExpressionTests.java @@ -141,14 +141,6 @@ public void testComparison() { assertEquals(new LessThan(null, field, value), expr(fieldText + "<" + valueText)); } - public void testEventQuery() { - Expression fullQuery = parser.createStatement("process where process_name == 'net.exe'"); - Expression baseExpression = expr("process_name == 'net.exe'"); - Expression fullExpression = expr("event.category == 'process' and process_name == 'net.exe'"); - assertEquals(fullQuery, fullExpression); - assertNotEquals(baseExpression, fullExpression); - } - public void testBoolean() { String leftText = "process_name == 'net.exe'"; String rightText = "command_line == '* localgroup*'"; diff --git a/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/LogicalPlanTests.java b/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/LogicalPlanTests.java new file mode 100644 index 0000000000000..157fd9fa4738c --- /dev/null +++ b/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/LogicalPlanTests.java @@ -0,0 +1,35 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + + +package org.elasticsearch.xpack.eql.parser; + +import org.elasticsearch.test.ESTestCase; +import org.elasticsearch.xpack.ql.expression.Expression; +import org.elasticsearch.xpack.ql.index.EsIndex; +import org.elasticsearch.xpack.ql.plan.logical.EsRelation; +import org.elasticsearch.xpack.ql.plan.logical.Filter; +import org.elasticsearch.xpack.ql.plan.logical.LogicalPlan; +import org.elasticsearch.xpack.ql.tree.Source; + +import static java.util.Collections.emptyMap; + +public class LogicalPlanTests extends ESTestCase { + + private final EqlParser parser = new EqlParser(); + + public Expression expr(String source) { + return parser.createExpression(source); + } + + public void testEventQuery() { + LogicalPlan fullQuery = parser.createStatement("process where process_name == 'net.exe'"); + Expression fullExpression = expr("event.category == 'process' and process_name == 'net.exe'"); + EsIndex esIndex = new EsIndex("", emptyMap()); + + assertEquals(fullQuery, new Filter(null, new EsRelation(Source.EMPTY, esIndex, false), fullExpression)); + } +} diff --git a/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/index/EsIndex.java b/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/index/EsIndex.java index 1481199cecf99..6f14fdbbd290c 100644 --- a/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/index/EsIndex.java +++ b/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/index/EsIndex.java @@ -5,9 +5,11 @@ */ package org.elasticsearch.xpack.ql.index; +import org.elasticsearch.xpack.ql.plan.logical.EsRelation; import org.elasticsearch.xpack.ql.type.EsField; import java.util.Map; +import java.util.Objects; public class EsIndex { @@ -33,4 +35,23 @@ public Map mapping() { public String toString() { return name; } + + @Override + public int hashCode() { + return Objects.hash(name, mapping); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + + if (obj == null || getClass() != obj.getClass()) { + return false; + } + + EsIndex other = (EsIndex) obj; + return Objects.equals(name, other.name) && mapping == other.mapping; + } } From 324f54c4cf93083610a3c2f834c3236712518901 Mon Sep 17 00:00:00 2001 From: Ross Wolf <31489089+rw-access@users.noreply.github.com> Date: Wed, 29 Jan 2020 16:00:15 -0700 Subject: [PATCH 08/11] EQL: Remove stray import --- .../src/main/java/org/elasticsearch/xpack/ql/index/EsIndex.java | 1 - 1 file changed, 1 deletion(-) diff --git a/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/index/EsIndex.java b/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/index/EsIndex.java index 6f14fdbbd290c..5250721d47fee 100644 --- a/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/index/EsIndex.java +++ b/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/index/EsIndex.java @@ -5,7 +5,6 @@ */ package org.elasticsearch.xpack.ql.index; -import org.elasticsearch.xpack.ql.plan.logical.EsRelation; import org.elasticsearch.xpack.ql.type.EsField; import java.util.Map; From 7acdf28948dbc6f881266f60e782a656046446a8 Mon Sep 17 00:00:00 2001 From: Ross Wolf <31489089+rw-access@users.noreply.github.com> Date: Wed, 29 Jan 2020 16:33:21 -0700 Subject: [PATCH 09/11] EQL: Add predicate handling for set checks --- x-pack/plugin/eql/src/main/antlr/EqlBase.g4 | 10 +- .../xpack/eql/parser/EqlBaseBaseListener.java | 12 +- .../xpack/eql/parser/EqlBaseBaseVisitor.java | 6 +- .../xpack/eql/parser/EqlBaseListener.java | 22 +- .../xpack/eql/parser/EqlBaseParser.java | 709 +++++++++--------- .../xpack/eql/parser/EqlBaseVisitor.java | 13 +- .../xpack/eql/parser/ExpressionBuilder.java | 23 +- 7 files changed, 421 insertions(+), 374 deletions(-) diff --git a/x-pack/plugin/eql/src/main/antlr/EqlBase.g4 b/x-pack/plugin/eql/src/main/antlr/EqlBase.g4 index b130c1307f918..39b3de1cd5684 100644 --- a/x-pack/plugin/eql/src/main/antlr/EqlBase.g4 +++ b/x-pack/plugin/eql/src/main/antlr/EqlBase.g4 @@ -80,14 +80,20 @@ booleanExpression valueExpression - : primaryExpression #valueExpressionDefault - | primaryExpression NOT? IN LP expression (COMMA expression)* RP #containsExpression + : primaryExpression predicate? #valueExpressionDefault | operator=(MINUS | PLUS) valueExpression #arithmeticUnary | left=valueExpression operator=(ASTERISK | SLASH | PERCENT) right=valueExpression #arithmeticBinary | left=valueExpression operator=(PLUS | MINUS) right=valueExpression #arithmeticBinary | left=valueExpression comparisonOperator right=valueExpression #comparison ; +// workaround for +// https://github.com/antlr/antlr4/issues/780 +// https://github.com/antlr/antlr4/issues/781 +predicate + : NOT? kind=IN LP expression (COMMA expression)* RP + ; + primaryExpression : constant #constantDefault | functionExpression #function diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseBaseListener.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseBaseListener.java index b8fb35822fbdd..5c720fb6e4b0b 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseBaseListener.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseBaseListener.java @@ -256,37 +256,37 @@ class EqlBaseBaseListener implements EqlBaseListener { * *

The default implementation does nothing.

*/ - @Override public void enterContainsExpression(EqlBaseParser.ContainsExpressionContext ctx) { } + @Override public void enterArithmeticBinary(EqlBaseParser.ArithmeticBinaryContext ctx) { } /** * {@inheritDoc} * *

The default implementation does nothing.

*/ - @Override public void exitContainsExpression(EqlBaseParser.ContainsExpressionContext ctx) { } + @Override public void exitArithmeticBinary(EqlBaseParser.ArithmeticBinaryContext ctx) { } /** * {@inheritDoc} * *

The default implementation does nothing.

*/ - @Override public void enterArithmeticBinary(EqlBaseParser.ArithmeticBinaryContext ctx) { } + @Override public void enterArithmeticUnary(EqlBaseParser.ArithmeticUnaryContext ctx) { } /** * {@inheritDoc} * *

The default implementation does nothing.

*/ - @Override public void exitArithmeticBinary(EqlBaseParser.ArithmeticBinaryContext ctx) { } + @Override public void exitArithmeticUnary(EqlBaseParser.ArithmeticUnaryContext ctx) { } /** * {@inheritDoc} * *

The default implementation does nothing.

*/ - @Override public void enterArithmeticUnary(EqlBaseParser.ArithmeticUnaryContext ctx) { } + @Override public void enterPredicate(EqlBaseParser.PredicateContext ctx) { } /** * {@inheritDoc} * *

The default implementation does nothing.

*/ - @Override public void exitArithmeticUnary(EqlBaseParser.ArithmeticUnaryContext ctx) { } + @Override public void exitPredicate(EqlBaseParser.PredicateContext ctx) { } /** * {@inheritDoc} * diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseBaseVisitor.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseBaseVisitor.java index 634ce95cf1d6a..4f60c45ff5b71 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseBaseVisitor.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseBaseVisitor.java @@ -157,21 +157,21 @@ class EqlBaseBaseVisitor extends AbstractParseTreeVisitor implements EqlBa *

The default implementation returns the result of calling * {@link #visitChildren} on {@code ctx}.

*/ - @Override public T visitContainsExpression(EqlBaseParser.ContainsExpressionContext ctx) { return visitChildren(ctx); } + @Override public T visitArithmeticBinary(EqlBaseParser.ArithmeticBinaryContext ctx) { return visitChildren(ctx); } /** * {@inheritDoc} * *

The default implementation returns the result of calling * {@link #visitChildren} on {@code ctx}.

*/ - @Override public T visitArithmeticBinary(EqlBaseParser.ArithmeticBinaryContext ctx) { return visitChildren(ctx); } + @Override public T visitArithmeticUnary(EqlBaseParser.ArithmeticUnaryContext ctx) { return visitChildren(ctx); } /** * {@inheritDoc} * *

The default implementation returns the result of calling * {@link #visitChildren} on {@code ctx}.

*/ - @Override public T visitArithmeticUnary(EqlBaseParser.ArithmeticUnaryContext ctx) { return visitChildren(ctx); } + @Override public T visitPredicate(EqlBaseParser.PredicateContext ctx) { return visitChildren(ctx); } /** * {@inheritDoc} * diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseListener.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseListener.java index 30ce249f8b1ba..61e50f121c72c 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseListener.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseListener.java @@ -219,18 +219,6 @@ interface EqlBaseListener extends ParseTreeListener { * @param ctx the parse tree */ void exitComparison(EqlBaseParser.ComparisonContext ctx); - /** - * Enter a parse tree produced by the {@code containsExpression} - * labeled alternative in {@link EqlBaseParser#valueExpression}. - * @param ctx the parse tree - */ - void enterContainsExpression(EqlBaseParser.ContainsExpressionContext ctx); - /** - * Exit a parse tree produced by the {@code containsExpression} - * labeled alternative in {@link EqlBaseParser#valueExpression}. - * @param ctx the parse tree - */ - void exitContainsExpression(EqlBaseParser.ContainsExpressionContext ctx); /** * Enter a parse tree produced by the {@code arithmeticBinary} * labeled alternative in {@link EqlBaseParser#valueExpression}. @@ -255,6 +243,16 @@ interface EqlBaseListener extends ParseTreeListener { * @param ctx the parse tree */ void exitArithmeticUnary(EqlBaseParser.ArithmeticUnaryContext ctx); + /** + * Enter a parse tree produced by {@link EqlBaseParser#predicate}. + * @param ctx the parse tree + */ + void enterPredicate(EqlBaseParser.PredicateContext ctx); + /** + * Exit a parse tree produced by {@link EqlBaseParser#predicate}. + * @param ctx the parse tree + */ + void exitPredicate(EqlBaseParser.PredicateContext ctx); /** * Enter a parse tree produced by the {@code constantDefault} * labeled alternative in {@link EqlBaseParser#primaryExpression}. diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseParser.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseParser.java index 65f8a089e16d4..a19f7dcdb50be 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseParser.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseParser.java @@ -28,16 +28,16 @@ class EqlBaseParser extends Parser { RULE_query = 3, RULE_sequenceParams = 4, RULE_sequence = 5, RULE_join = 6, RULE_pipe = 7, RULE_joinKeys = 8, RULE_joinTerm = 9, RULE_sequenceTerm = 10, RULE_subquery = 11, RULE_eventQuery = 12, RULE_expression = 13, RULE_booleanExpression = 14, - RULE_valueExpression = 15, RULE_primaryExpression = 16, RULE_functionExpression = 17, - RULE_constant = 18, RULE_comparisonOperator = 19, RULE_booleanValue = 20, - RULE_qualifiedName = 21, RULE_identifier = 22, RULE_timeUnit = 23, RULE_number = 24, - RULE_string = 25; + RULE_valueExpression = 15, RULE_predicate = 16, RULE_primaryExpression = 17, + RULE_functionExpression = 18, RULE_constant = 19, RULE_comparisonOperator = 20, + RULE_booleanValue = 21, RULE_qualifiedName = 22, RULE_identifier = 23, + RULE_timeUnit = 24, RULE_number = 25, RULE_string = 26; public static final String[] ruleNames = { "singleStatement", "singleExpression", "statement", "query", "sequenceParams", "sequence", "join", "pipe", "joinKeys", "joinTerm", "sequenceTerm", "subquery", - "eventQuery", "expression", "booleanExpression", "valueExpression", "primaryExpression", - "functionExpression", "constant", "comparisonOperator", "booleanValue", - "qualifiedName", "identifier", "timeUnit", "number", "string" + "eventQuery", "expression", "booleanExpression", "valueExpression", "predicate", + "primaryExpression", "functionExpression", "constant", "comparisonOperator", + "booleanValue", "qualifiedName", "identifier", "timeUnit", "number", "string" }; private static final String[] _LITERAL_NAMES = { @@ -134,9 +134,9 @@ public final SingleStatementContext singleStatement() throws RecognitionExceptio try { enterOuterAlt(_localctx, 1); { - setState(52); + setState(54); statement(); - setState(53); + setState(55); match(EOF); } } @@ -181,9 +181,9 @@ public final SingleExpressionContext singleExpression() throws RecognitionExcept try { enterOuterAlt(_localctx, 1); { - setState(55); + setState(57); expression(); - setState(56); + setState(58); match(EOF); } } @@ -234,19 +234,19 @@ public final StatementContext statement() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(58); + setState(60); query(); - setState(62); + setState(64); _errHandler.sync(this); _la = _input.LA(1); while (_la==PIPE) { { { - setState(59); + setState(61); pipe(); } } - setState(64); + setState(66); _errHandler.sync(this); _la = _input.LA(1); } @@ -296,19 +296,19 @@ public final QueryContext query() throws RecognitionException { QueryContext _localctx = new QueryContext(_ctx, getState()); enterRule(_localctx, 6, RULE_query); try { - setState(68); + setState(70); switch (_input.LA(1)) { case SEQUENCE: enterOuterAlt(_localctx, 1); { - setState(65); + setState(67); sequence(); } break; case JOIN: enterOuterAlt(_localctx, 2); { - setState(66); + setState(68); join(); } break; @@ -316,7 +316,7 @@ public final QueryContext query() throws RecognitionException { case IDENTIFIER: enterOuterAlt(_localctx, 3); { - setState(67); + setState(69); eventQuery(); } break; @@ -367,14 +367,14 @@ public final SequenceParamsContext sequenceParams() throws RecognitionException try { enterOuterAlt(_localctx, 1); { - setState(70); + setState(72); match(WITH); { - setState(71); + setState(73); match(MAXSPAN); - setState(72); + setState(74); match(EQ); - setState(73); + setState(75); timeUnit(); } } @@ -432,19 +432,19 @@ public final SequenceContext sequence() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(75); + setState(77); match(SEQUENCE); - setState(84); + setState(86); switch (_input.LA(1)) { case BY: { - setState(76); - ((SequenceContext)_localctx).by = joinKeys(); setState(78); + ((SequenceContext)_localctx).by = joinKeys(); + setState(80); _la = _input.LA(1); if (_la==WITH) { { - setState(77); + setState(79); sequenceParams(); } } @@ -453,13 +453,13 @@ public final SequenceContext sequence() throws RecognitionException { break; case WITH: { - setState(80); - sequenceParams(); setState(82); + sequenceParams(); + setState(84); _la = _input.LA(1); if (_la==BY) { { - setState(81); + setState(83); ((SequenceContext)_localctx).by = joinKeys(); } } @@ -471,29 +471,29 @@ public final SequenceContext sequence() throws RecognitionException { default: throw new NoViableAltException(this); } - setState(86); + setState(88); sequenceTerm(); - setState(88); + setState(90); _errHandler.sync(this); _la = _input.LA(1); do { { { - setState(87); + setState(89); sequenceTerm(); } } - setState(90); + setState(92); _errHandler.sync(this); _la = _input.LA(1); } while ( _la==LB ); - setState(94); + setState(96); _la = _input.LA(1); if (_la==UNTIL) { { - setState(92); + setState(94); match(UNTIL); - setState(93); + setState(95); sequenceTerm(); } } @@ -550,40 +550,40 @@ public final JoinContext join() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(96); - match(JOIN); setState(98); + match(JOIN); + setState(100); _la = _input.LA(1); if (_la==BY) { { - setState(97); + setState(99); ((JoinContext)_localctx).by = joinKeys(); } } - setState(100); + setState(102); joinTerm(); - setState(102); + setState(104); _errHandler.sync(this); _la = _input.LA(1); do { { { - setState(101); + setState(103); joinTerm(); } } - setState(104); + setState(106); _errHandler.sync(this); _la = _input.LA(1); } while ( _la==LB ); - setState(108); + setState(110); _la = _input.LA(1); if (_la==UNTIL) { { - setState(106); + setState(108); match(UNTIL); - setState(107); + setState(109); joinTerm(); } } @@ -641,29 +641,29 @@ public final PipeContext pipe() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(110); + setState(112); match(PIPE); - setState(111); + setState(113); ((PipeContext)_localctx).kind = match(IDENTIFIER); - setState(120); + setState(122); _la = _input.LA(1); if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << FALSE) | (1L << NOT) | (1L << NULL) | (1L << TRUE) | (1L << PLUS) | (1L << MINUS) | (1L << LP) | (1L << ESCAPED_IDENTIFIER) | (1L << STRING) | (1L << INTEGER_VALUE) | (1L << DECIMAL_VALUE) | (1L << IDENTIFIER))) != 0)) { { - setState(112); + setState(114); booleanExpression(0); - setState(117); + setState(119); _errHandler.sync(this); _la = _input.LA(1); while (_la==COMMA) { { { - setState(113); + setState(115); match(COMMA); - setState(114); + setState(116); booleanExpression(0); } } - setState(119); + setState(121); _errHandler.sync(this); _la = _input.LA(1); } @@ -721,23 +721,23 @@ public final JoinKeysContext joinKeys() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(122); + setState(124); match(BY); - setState(123); + setState(125); expression(); - setState(128); + setState(130); _errHandler.sync(this); _la = _input.LA(1); while (_la==COMMA) { { { - setState(124); + setState(126); match(COMMA); - setState(125); + setState(127); expression(); } } - setState(130); + setState(132); _errHandler.sync(this); _la = _input.LA(1); } @@ -788,13 +788,13 @@ public final JoinTermContext joinTerm() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(131); - subquery(); setState(133); + subquery(); + setState(135); _la = _input.LA(1); if (_la==BY) { { - setState(132); + setState(134); ((JoinTermContext)_localctx).by = joinKeys(); } } @@ -851,21 +851,21 @@ public final SequenceTermContext sequenceTerm() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(135); + setState(137); subquery(); - setState(141); + setState(143); _la = _input.LA(1); if (_la==FORK) { { - setState(136); + setState(138); match(FORK); - setState(139); + setState(141); _la = _input.LA(1); if (_la==EQ) { { - setState(137); + setState(139); match(EQ); - setState(138); + setState(140); booleanValue(); } } @@ -873,11 +873,11 @@ public final SequenceTermContext sequenceTerm() throws RecognitionException { } } - setState(144); + setState(146); _la = _input.LA(1); if (_la==BY) { { - setState(143); + setState(145); ((SequenceTermContext)_localctx).by = joinKeys(); } } @@ -926,11 +926,11 @@ public final SubqueryContext subquery() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(146); + setState(148); match(LB); - setState(147); + setState(149); eventQuery(); - setState(148); + setState(150); match(RB); } } @@ -979,11 +979,11 @@ public final EventQueryContext eventQuery() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(150); + setState(152); ((EventQueryContext)_localctx).event = identifier(); - setState(151); + setState(153); match(WHERE); - setState(152); + setState(154); expression(); } } @@ -1027,7 +1027,7 @@ public final ExpressionContext expression() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(154); + setState(156); booleanExpression(0); } } @@ -1157,7 +1157,7 @@ private BooleanExpressionContext booleanExpression(int _p) throws RecognitionExc int _alt; enterOuterAlt(_localctx, 1); { - setState(163); + setState(165); _errHandler.sync(this); switch ( getInterpreter().adaptivePredict(_input,17,_ctx) ) { case 1: @@ -1166,9 +1166,9 @@ private BooleanExpressionContext booleanExpression(int _p) throws RecognitionExc _ctx = _localctx; _prevctx = _localctx; - setState(157); + setState(159); match(NOT); - setState(158); + setState(160); booleanExpression(5); } break; @@ -1177,11 +1177,11 @@ private BooleanExpressionContext booleanExpression(int _p) throws RecognitionExc _localctx = new ProcessCheckContext(_localctx); _ctx = _localctx; _prevctx = _localctx; - setState(159); + setState(161); ((ProcessCheckContext)_localctx).relationship = match(IDENTIFIER); - setState(160); + setState(162); match(OF); - setState(161); + setState(163); subquery(); } break; @@ -1190,13 +1190,13 @@ private BooleanExpressionContext booleanExpression(int _p) throws RecognitionExc _localctx = new BooleanDefaultContext(_localctx); _ctx = _localctx; _prevctx = _localctx; - setState(162); + setState(164); valueExpression(0); } break; } _ctx.stop = _input.LT(-1); - setState(173); + setState(175); _errHandler.sync(this); _alt = getInterpreter().adaptivePredict(_input,19,_ctx); while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) { @@ -1204,7 +1204,7 @@ private BooleanExpressionContext booleanExpression(int _p) throws RecognitionExc if ( _parseListeners!=null ) triggerExitRuleEvent(); _prevctx = _localctx; { - setState(171); + setState(173); _errHandler.sync(this); switch ( getInterpreter().adaptivePredict(_input,18,_ctx) ) { case 1: @@ -1212,11 +1212,11 @@ private BooleanExpressionContext booleanExpression(int _p) throws RecognitionExc _localctx = new LogicalBinaryContext(new BooleanExpressionContext(_parentctx, _parentState)); ((LogicalBinaryContext)_localctx).left = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_booleanExpression); - setState(165); + setState(167); if (!(precpred(_ctx, 2))) throw new FailedPredicateException(this, "precpred(_ctx, 2)"); - setState(166); + setState(168); ((LogicalBinaryContext)_localctx).operator = match(AND); - setState(167); + setState(169); ((LogicalBinaryContext)_localctx).right = booleanExpression(3); } break; @@ -1225,18 +1225,18 @@ private BooleanExpressionContext booleanExpression(int _p) throws RecognitionExc _localctx = new LogicalBinaryContext(new BooleanExpressionContext(_parentctx, _parentState)); ((LogicalBinaryContext)_localctx).left = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_booleanExpression); - setState(168); + setState(170); if (!(precpred(_ctx, 1))) throw new FailedPredicateException(this, "precpred(_ctx, 1)"); - setState(169); + setState(171); ((LogicalBinaryContext)_localctx).operator = match(OR); - setState(170); + setState(172); ((LogicalBinaryContext)_localctx).right = booleanExpression(2); } break; } } } - setState(175); + setState(177); _errHandler.sync(this); _alt = getInterpreter().adaptivePredict(_input,19,_ctx); } @@ -1268,6 +1268,9 @@ public static class ValueExpressionDefaultContext extends ValueExpressionContext public PrimaryExpressionContext primaryExpression() { return getRuleContext(PrimaryExpressionContext.class,0); } + public PredicateContext predicate() { + return getRuleContext(PredicateContext.class,0); + } public ValueExpressionDefaultContext(ValueExpressionContext ctx) { copyFrom(ctx); } @Override public void enterRule(ParseTreeListener listener) { @@ -1310,39 +1313,6 @@ public T accept(ParseTreeVisitor visitor) { else return visitor.visitChildren(this); } } - public static class ContainsExpressionContext extends ValueExpressionContext { - public PrimaryExpressionContext primaryExpression() { - return getRuleContext(PrimaryExpressionContext.class,0); - } - public TerminalNode IN() { return getToken(EqlBaseParser.IN, 0); } - public TerminalNode LP() { return getToken(EqlBaseParser.LP, 0); } - public List expression() { - return getRuleContexts(ExpressionContext.class); - } - public ExpressionContext expression(int i) { - return getRuleContext(ExpressionContext.class,i); - } - public TerminalNode RP() { return getToken(EqlBaseParser.RP, 0); } - public TerminalNode NOT() { return getToken(EqlBaseParser.NOT, 0); } - public List COMMA() { return getTokens(EqlBaseParser.COMMA); } - public TerminalNode COMMA(int i) { - return getToken(EqlBaseParser.COMMA, i); - } - public ContainsExpressionContext(ValueExpressionContext ctx) { copyFrom(ctx); } - @Override - public void enterRule(ParseTreeListener listener) { - if ( listener instanceof EqlBaseListener ) ((EqlBaseListener)listener).enterContainsExpression(this); - } - @Override - public void exitRule(ParseTreeListener listener) { - if ( listener instanceof EqlBaseListener ) ((EqlBaseListener)listener).exitContainsExpression(this); - } - @Override - public T accept(ParseTreeVisitor visitor) { - if ( visitor instanceof EqlBaseVisitor ) return ((EqlBaseVisitor)visitor).visitContainsExpression(this); - else return visitor.visitChildren(this); - } - } public static class ArithmeticBinaryContext extends ValueExpressionContext { public ValueExpressionContext left; public Token operator; @@ -1412,67 +1382,43 @@ private ValueExpressionContext valueExpression(int _p) throws RecognitionExcepti int _alt; enterOuterAlt(_localctx, 1); { - setState(196); - _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,22,_ctx) ) { - case 1: + setState(185); + switch (_input.LA(1)) { + case FALSE: + case NULL: + case TRUE: + case LP: + case ESCAPED_IDENTIFIER: + case STRING: + case INTEGER_VALUE: + case DECIMAL_VALUE: + case IDENTIFIER: { _localctx = new ValueExpressionDefaultContext(_localctx); _ctx = _localctx; _prevctx = _localctx; - setState(177); + setState(179); primaryExpression(); - } - break; - case 2: - { - _localctx = new ContainsExpressionContext(_localctx); - _ctx = _localctx; - _prevctx = _localctx; - setState(178); - primaryExpression(); - setState(180); - _la = _input.LA(1); - if (_la==NOT) { - { - setState(179); - match(NOT); - } - } - - setState(182); - match(IN); - setState(183); - match(LP); - setState(184); - expression(); - setState(189); + setState(181); _errHandler.sync(this); - _la = _input.LA(1); - while (_la==COMMA) { + switch ( getInterpreter().adaptivePredict(_input,20,_ctx) ) { + case 1: { - { - setState(185); - match(COMMA); - setState(186); - expression(); - } + setState(180); + predicate(); } - setState(191); - _errHandler.sync(this); - _la = _input.LA(1); + break; } - setState(192); - match(RP); } break; - case 3: + case PLUS: + case MINUS: { _localctx = new ArithmeticUnaryContext(_localctx); _ctx = _localctx; _prevctx = _localctx; - setState(194); + setState(183); ((ArithmeticUnaryContext)_localctx).operator = _input.LT(1); _la = _input.LA(1); if ( !(_la==PLUS || _la==MINUS) ) { @@ -1480,31 +1426,33 @@ private ValueExpressionContext valueExpression(int _p) throws RecognitionExcepti } else { consume(); } - setState(195); + setState(184); valueExpression(4); } break; + default: + throw new NoViableAltException(this); } _ctx.stop = _input.LT(-1); - setState(210); + setState(199); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,24,_ctx); + _alt = getInterpreter().adaptivePredict(_input,23,_ctx); while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) { if ( _alt==1 ) { if ( _parseListeners!=null ) triggerExitRuleEvent(); _prevctx = _localctx; { - setState(208); + setState(197); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,23,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,22,_ctx) ) { case 1: { _localctx = new ArithmeticBinaryContext(new ValueExpressionContext(_parentctx, _parentState)); ((ArithmeticBinaryContext)_localctx).left = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_valueExpression); - setState(198); + setState(187); if (!(precpred(_ctx, 3))) throw new FailedPredicateException(this, "precpred(_ctx, 3)"); - setState(199); + setState(188); ((ArithmeticBinaryContext)_localctx).operator = _input.LT(1); _la = _input.LA(1); if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << ASTERISK) | (1L << SLASH) | (1L << PERCENT))) != 0)) ) { @@ -1512,7 +1460,7 @@ private ValueExpressionContext valueExpression(int _p) throws RecognitionExcepti } else { consume(); } - setState(200); + setState(189); ((ArithmeticBinaryContext)_localctx).right = valueExpression(4); } break; @@ -1521,9 +1469,9 @@ private ValueExpressionContext valueExpression(int _p) throws RecognitionExcepti _localctx = new ArithmeticBinaryContext(new ValueExpressionContext(_parentctx, _parentState)); ((ArithmeticBinaryContext)_localctx).left = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_valueExpression); - setState(201); + setState(190); if (!(precpred(_ctx, 2))) throw new FailedPredicateException(this, "precpred(_ctx, 2)"); - setState(202); + setState(191); ((ArithmeticBinaryContext)_localctx).operator = _input.LT(1); _la = _input.LA(1); if ( !(_la==PLUS || _la==MINUS) ) { @@ -1531,7 +1479,7 @@ private ValueExpressionContext valueExpression(int _p) throws RecognitionExcepti } else { consume(); } - setState(203); + setState(192); ((ArithmeticBinaryContext)_localctx).right = valueExpression(3); } break; @@ -1540,20 +1488,20 @@ private ValueExpressionContext valueExpression(int _p) throws RecognitionExcepti _localctx = new ComparisonContext(new ValueExpressionContext(_parentctx, _parentState)); ((ComparisonContext)_localctx).left = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_valueExpression); - setState(204); + setState(193); if (!(precpred(_ctx, 1))) throw new FailedPredicateException(this, "precpred(_ctx, 1)"); - setState(205); + setState(194); comparisonOperator(); - setState(206); + setState(195); ((ComparisonContext)_localctx).right = valueExpression(2); } break; } } } - setState(212); + setState(201); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,24,_ctx); + _alt = getInterpreter().adaptivePredict(_input,23,_ctx); } } } @@ -1568,6 +1516,94 @@ private ValueExpressionContext valueExpression(int _p) throws RecognitionExcepti return _localctx; } + public static class PredicateContext extends ParserRuleContext { + public Token kind; + public TerminalNode LP() { return getToken(EqlBaseParser.LP, 0); } + public List expression() { + return getRuleContexts(ExpressionContext.class); + } + public ExpressionContext expression(int i) { + return getRuleContext(ExpressionContext.class,i); + } + public TerminalNode RP() { return getToken(EqlBaseParser.RP, 0); } + public TerminalNode IN() { return getToken(EqlBaseParser.IN, 0); } + public TerminalNode NOT() { return getToken(EqlBaseParser.NOT, 0); } + public List COMMA() { return getTokens(EqlBaseParser.COMMA); } + public TerminalNode COMMA(int i) { + return getToken(EqlBaseParser.COMMA, i); + } + public PredicateContext(ParserRuleContext parent, int invokingState) { + super(parent, invokingState); + } + @Override public int getRuleIndex() { return RULE_predicate; } + @Override + public void enterRule(ParseTreeListener listener) { + if ( listener instanceof EqlBaseListener ) ((EqlBaseListener)listener).enterPredicate(this); + } + @Override + public void exitRule(ParseTreeListener listener) { + if ( listener instanceof EqlBaseListener ) ((EqlBaseListener)listener).exitPredicate(this); + } + @Override + public T accept(ParseTreeVisitor visitor) { + if ( visitor instanceof EqlBaseVisitor ) return ((EqlBaseVisitor)visitor).visitPredicate(this); + else return visitor.visitChildren(this); + } + } + + public final PredicateContext predicate() throws RecognitionException { + PredicateContext _localctx = new PredicateContext(_ctx, getState()); + enterRule(_localctx, 32, RULE_predicate); + int _la; + try { + enterOuterAlt(_localctx, 1); + { + setState(203); + _la = _input.LA(1); + if (_la==NOT) { + { + setState(202); + match(NOT); + } + } + + setState(205); + ((PredicateContext)_localctx).kind = match(IN); + setState(206); + match(LP); + setState(207); + expression(); + setState(212); + _errHandler.sync(this); + _la = _input.LA(1); + while (_la==COMMA) { + { + { + setState(208); + match(COMMA); + setState(209); + expression(); + } + } + setState(214); + _errHandler.sync(this); + _la = _input.LA(1); + } + setState(215); + match(RP); + } + } + catch (RecognitionException re) { + _localctx.exception = re; + _errHandler.reportError(this, re); + _errHandler.recover(this, re); + } + finally { + exitRule(); + } + return _localctx; + } + public static class PrimaryExpressionContext extends ParserRuleContext { public PrimaryExpressionContext(ParserRuleContext parent, int invokingState) { super(parent, invokingState); @@ -1660,16 +1696,16 @@ public T accept(ParseTreeVisitor visitor) { public final PrimaryExpressionContext primaryExpression() throws RecognitionException { PrimaryExpressionContext _localctx = new PrimaryExpressionContext(_ctx, getState()); - enterRule(_localctx, 32, RULE_primaryExpression); + enterRule(_localctx, 34, RULE_primaryExpression); try { - setState(220); + setState(224); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,25,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,26,_ctx) ) { case 1: _localctx = new ConstantDefaultContext(_localctx); enterOuterAlt(_localctx, 1); { - setState(213); + setState(217); constant(); } break; @@ -1677,7 +1713,7 @@ public final PrimaryExpressionContext primaryExpression() throws RecognitionExce _localctx = new FunctionContext(_localctx); enterOuterAlt(_localctx, 2); { - setState(214); + setState(218); functionExpression(); } break; @@ -1685,7 +1721,7 @@ public final PrimaryExpressionContext primaryExpression() throws RecognitionExce _localctx = new DereferenceContext(_localctx); enterOuterAlt(_localctx, 3); { - setState(215); + setState(219); qualifiedName(); } break; @@ -1693,11 +1729,11 @@ public final PrimaryExpressionContext primaryExpression() throws RecognitionExce _localctx = new ParenthesizedExpressionContext(_localctx); enterOuterAlt(_localctx, 4); { - setState(216); + setState(220); match(LP); - setState(217); + setState(221); expression(); - setState(218); + setState(222); match(RP); } break; @@ -1750,41 +1786,41 @@ public T accept(ParseTreeVisitor visitor) { public final FunctionExpressionContext functionExpression() throws RecognitionException { FunctionExpressionContext _localctx = new FunctionExpressionContext(_ctx, getState()); - enterRule(_localctx, 34, RULE_functionExpression); + enterRule(_localctx, 36, RULE_functionExpression); int _la; try { enterOuterAlt(_localctx, 1); { - setState(222); + setState(226); ((FunctionExpressionContext)_localctx).name = match(IDENTIFIER); - setState(223); + setState(227); match(LP); - setState(232); + setState(236); _la = _input.LA(1); if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << FALSE) | (1L << NOT) | (1L << NULL) | (1L << TRUE) | (1L << PLUS) | (1L << MINUS) | (1L << LP) | (1L << ESCAPED_IDENTIFIER) | (1L << STRING) | (1L << INTEGER_VALUE) | (1L << DECIMAL_VALUE) | (1L << IDENTIFIER))) != 0)) { { - setState(224); + setState(228); expression(); - setState(229); + setState(233); _errHandler.sync(this); _la = _input.LA(1); while (_la==COMMA) { { { - setState(225); + setState(229); match(COMMA); - setState(226); + setState(230); expression(); } } - setState(231); + setState(235); _errHandler.sync(this); _la = _input.LA(1); } } } - setState(234); + setState(238); match(RP); } } @@ -1887,15 +1923,15 @@ public T accept(ParseTreeVisitor visitor) { public final ConstantContext constant() throws RecognitionException { ConstantContext _localctx = new ConstantContext(_ctx, getState()); - enterRule(_localctx, 36, RULE_constant); + enterRule(_localctx, 38, RULE_constant); try { - setState(240); + setState(244); switch (_input.LA(1)) { case NULL: _localctx = new NullLiteralContext(_localctx); enterOuterAlt(_localctx, 1); { - setState(236); + setState(240); match(NULL); } break; @@ -1904,7 +1940,7 @@ public final ConstantContext constant() throws RecognitionException { _localctx = new NumericLiteralContext(_localctx); enterOuterAlt(_localctx, 2); { - setState(237); + setState(241); number(); } break; @@ -1913,7 +1949,7 @@ public final ConstantContext constant() throws RecognitionException { _localctx = new BooleanLiteralContext(_localctx); enterOuterAlt(_localctx, 3); { - setState(238); + setState(242); booleanValue(); } break; @@ -1921,7 +1957,7 @@ public final ConstantContext constant() throws RecognitionException { _localctx = new StringLiteralContext(_localctx); enterOuterAlt(_localctx, 4); { - setState(239); + setState(243); string(); } break; @@ -1968,12 +2004,12 @@ public T accept(ParseTreeVisitor visitor) { public final ComparisonOperatorContext comparisonOperator() throws RecognitionException { ComparisonOperatorContext _localctx = new ComparisonOperatorContext(_ctx, getState()); - enterRule(_localctx, 38, RULE_comparisonOperator); + enterRule(_localctx, 40, RULE_comparisonOperator); int _la; try { enterOuterAlt(_localctx, 1); { - setState(242); + setState(246); _la = _input.LA(1); if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << EQ) | (1L << NEQ) | (1L << LT) | (1L << LTE) | (1L << GT) | (1L << GTE))) != 0)) ) { _errHandler.recoverInline(this); @@ -2017,12 +2053,12 @@ public T accept(ParseTreeVisitor visitor) { public final BooleanValueContext booleanValue() throws RecognitionException { BooleanValueContext _localctx = new BooleanValueContext(_ctx, getState()); - enterRule(_localctx, 40, RULE_booleanValue); + enterRule(_localctx, 42, RULE_booleanValue); int _la; try { enterOuterAlt(_localctx, 1); { - setState(244); + setState(248); _la = _input.LA(1); if ( !(_la==FALSE || _la==TRUE) ) { _errHandler.recoverInline(this); @@ -2086,49 +2122,49 @@ public T accept(ParseTreeVisitor visitor) { public final QualifiedNameContext qualifiedName() throws RecognitionException { QualifiedNameContext _localctx = new QualifiedNameContext(_ctx, getState()); - enterRule(_localctx, 42, RULE_qualifiedName); + enterRule(_localctx, 44, RULE_qualifiedName); int _la; try { int _alt; enterOuterAlt(_localctx, 1); { - setState(246); + setState(250); identifier(); - setState(258); + setState(262); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,31,_ctx); + _alt = getInterpreter().adaptivePredict(_input,32,_ctx); while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) { if ( _alt==1 ) { { - setState(256); + setState(260); switch (_input.LA(1)) { case DOT: { - setState(247); + setState(251); match(DOT); - setState(248); + setState(252); identifier(); } break; case LB: { - setState(249); + setState(253); match(LB); - setState(251); + setState(255); _errHandler.sync(this); _la = _input.LA(1); do { { { - setState(250); + setState(254); match(INTEGER_VALUE); } } - setState(253); + setState(257); _errHandler.sync(this); _la = _input.LA(1); } while ( _la==INTEGER_VALUE ); - setState(255); + setState(259); match(RB); } break; @@ -2137,9 +2173,9 @@ public final QualifiedNameContext qualifiedName() throws RecognitionException { } } } - setState(260); + setState(264); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,31,_ctx); + _alt = getInterpreter().adaptivePredict(_input,32,_ctx); } } } @@ -2178,12 +2214,12 @@ public T accept(ParseTreeVisitor visitor) { public final IdentifierContext identifier() throws RecognitionException { IdentifierContext _localctx = new IdentifierContext(_ctx, getState()); - enterRule(_localctx, 44, RULE_identifier); + enterRule(_localctx, 46, RULE_identifier); int _la; try { enterOuterAlt(_localctx, 1); { - setState(261); + setState(265); _la = _input.LA(1); if ( !(_la==ESCAPED_IDENTIFIER || _la==IDENTIFIER) ) { _errHandler.recoverInline(this); @@ -2230,18 +2266,18 @@ public T accept(ParseTreeVisitor visitor) { public final TimeUnitContext timeUnit() throws RecognitionException { TimeUnitContext _localctx = new TimeUnitContext(_ctx, getState()); - enterRule(_localctx, 46, RULE_timeUnit); + enterRule(_localctx, 48, RULE_timeUnit); int _la; try { enterOuterAlt(_localctx, 1); { - setState(263); + setState(267); number(); - setState(265); + setState(269); _la = _input.LA(1); if (_la==IDENTIFIER) { { - setState(264); + setState(268); ((TimeUnitContext)_localctx).unit = match(IDENTIFIER); } } @@ -2307,15 +2343,15 @@ public T accept(ParseTreeVisitor visitor) { public final NumberContext number() throws RecognitionException { NumberContext _localctx = new NumberContext(_ctx, getState()); - enterRule(_localctx, 48, RULE_number); + enterRule(_localctx, 50, RULE_number); try { - setState(269); + setState(273); switch (_input.LA(1)) { case DECIMAL_VALUE: _localctx = new DecimalLiteralContext(_localctx); enterOuterAlt(_localctx, 1); { - setState(267); + setState(271); match(DECIMAL_VALUE); } break; @@ -2323,7 +2359,7 @@ public final NumberContext number() throws RecognitionException { _localctx = new IntegerLiteralContext(_localctx); enterOuterAlt(_localctx, 2); { - setState(268); + setState(272); match(INTEGER_VALUE); } break; @@ -2365,11 +2401,11 @@ public T accept(ParseTreeVisitor visitor) { public final StringContext string() throws RecognitionException { StringContext _localctx = new StringContext(_ctx, getState()); - enterRule(_localctx, 50, RULE_string); + enterRule(_localctx, 52, RULE_string); try { enterOuterAlt(_localctx, 1); { - setState(271); + setState(275); match(STRING); } } @@ -2415,100 +2451,101 @@ private boolean valueExpression_sempred(ValueExpressionContext _localctx, int pr } public static final String _serializedATN = - "\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\3,\u0114\4\2\t\2\4"+ + "\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\3,\u0118\4\2\t\2\4"+ "\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13\t"+ "\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22"+ "\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31"+ - "\4\32\t\32\4\33\t\33\3\2\3\2\3\2\3\3\3\3\3\3\3\4\3\4\7\4?\n\4\f\4\16\4"+ - "B\13\4\3\5\3\5\3\5\5\5G\n\5\3\6\3\6\3\6\3\6\3\6\3\7\3\7\3\7\5\7Q\n\7\3"+ - "\7\3\7\5\7U\n\7\5\7W\n\7\3\7\3\7\6\7[\n\7\r\7\16\7\\\3\7\3\7\5\7a\n\7"+ - "\3\b\3\b\5\be\n\b\3\b\3\b\6\bi\n\b\r\b\16\bj\3\b\3\b\5\bo\n\b\3\t\3\t"+ - "\3\t\3\t\3\t\7\tv\n\t\f\t\16\ty\13\t\5\t{\n\t\3\n\3\n\3\n\3\n\7\n\u0081"+ - "\n\n\f\n\16\n\u0084\13\n\3\13\3\13\5\13\u0088\n\13\3\f\3\f\3\f\3\f\5\f"+ - "\u008e\n\f\5\f\u0090\n\f\3\f\5\f\u0093\n\f\3\r\3\r\3\r\3\r\3\16\3\16\3"+ - "\16\3\16\3\17\3\17\3\20\3\20\3\20\3\20\3\20\3\20\3\20\5\20\u00a6\n\20"+ - "\3\20\3\20\3\20\3\20\3\20\3\20\7\20\u00ae\n\20\f\20\16\20\u00b1\13\20"+ - "\3\21\3\21\3\21\3\21\5\21\u00b7\n\21\3\21\3\21\3\21\3\21\3\21\7\21\u00be"+ - "\n\21\f\21\16\21\u00c1\13\21\3\21\3\21\3\21\3\21\5\21\u00c7\n\21\3\21"+ - "\3\21\3\21\3\21\3\21\3\21\3\21\3\21\3\21\3\21\7\21\u00d3\n\21\f\21\16"+ - "\21\u00d6\13\21\3\22\3\22\3\22\3\22\3\22\3\22\3\22\5\22\u00df\n\22\3\23"+ - "\3\23\3\23\3\23\3\23\7\23\u00e6\n\23\f\23\16\23\u00e9\13\23\5\23\u00eb"+ - "\n\23\3\23\3\23\3\24\3\24\3\24\3\24\5\24\u00f3\n\24\3\25\3\25\3\26\3\26"+ - "\3\27\3\27\3\27\3\27\3\27\6\27\u00fe\n\27\r\27\16\27\u00ff\3\27\7\27\u0103"+ - "\n\27\f\27\16\27\u0106\13\27\3\30\3\30\3\31\3\31\5\31\u010c\n\31\3\32"+ - "\3\32\5\32\u0110\n\32\3\33\3\33\3\33\2\4\36 \34\2\4\6\b\n\f\16\20\22\24"+ - "\26\30\32\34\36 \"$&(*,.\60\62\64\2\7\3\2\31\32\3\2\33\35\3\2\23\30\4"+ - "\2\5\5\17\17\4\2%%))\u0124\2\66\3\2\2\2\49\3\2\2\2\6<\3\2\2\2\bF\3\2\2"+ - "\2\nH\3\2\2\2\fM\3\2\2\2\16b\3\2\2\2\20p\3\2\2\2\22|\3\2\2\2\24\u0085"+ - "\3\2\2\2\26\u0089\3\2\2\2\30\u0094\3\2\2\2\32\u0098\3\2\2\2\34\u009c\3"+ - "\2\2\2\36\u00a5\3\2\2\2 \u00c6\3\2\2\2\"\u00de\3\2\2\2$\u00e0\3\2\2\2"+ - "&\u00f2\3\2\2\2(\u00f4\3\2\2\2*\u00f6\3\2\2\2,\u00f8\3\2\2\2.\u0107\3"+ - "\2\2\2\60\u0109\3\2\2\2\62\u010f\3\2\2\2\64\u0111\3\2\2\2\66\67\5\6\4"+ - "\2\678\7\2\2\38\3\3\2\2\29:\5\34\17\2:;\7\2\2\3;\5\3\2\2\2<@\5\b\5\2="+ - "?\5\20\t\2>=\3\2\2\2?B\3\2\2\2@>\3\2\2\2@A\3\2\2\2A\7\3\2\2\2B@\3\2\2"+ - "\2CG\5\f\7\2DG\5\16\b\2EG\5\32\16\2FC\3\2\2\2FD\3\2\2\2FE\3\2\2\2G\t\3"+ - "\2\2\2HI\7\22\2\2IJ\7\t\2\2JK\7\23\2\2KL\5\60\31\2L\13\3\2\2\2MV\7\16"+ - "\2\2NP\5\22\n\2OQ\5\n\6\2PO\3\2\2\2PQ\3\2\2\2QW\3\2\2\2RT\5\n\6\2SU\5"+ - "\22\n\2TS\3\2\2\2TU\3\2\2\2UW\3\2\2\2VN\3\2\2\2VR\3\2\2\2VW\3\2\2\2WX"+ - "\3\2\2\2XZ\5\26\f\2Y[\5\26\f\2ZY\3\2\2\2[\\\3\2\2\2\\Z\3\2\2\2\\]\3\2"+ - "\2\2]`\3\2\2\2^_\7\20\2\2_a\5\26\f\2`^\3\2\2\2`a\3\2\2\2a\r\3\2\2\2bd"+ - "\7\b\2\2ce\5\22\n\2dc\3\2\2\2de\3\2\2\2ef\3\2\2\2fh\5\24\13\2gi\5\24\13"+ - "\2hg\3\2\2\2ij\3\2\2\2jh\3\2\2\2jk\3\2\2\2kn\3\2\2\2lm\7\20\2\2mo\5\24"+ - "\13\2nl\3\2\2\2no\3\2\2\2o\17\3\2\2\2pq\7$\2\2qz\7)\2\2rw\5\36\20\2st"+ - "\7\37\2\2tv\5\36\20\2us\3\2\2\2vy\3\2\2\2wu\3\2\2\2wx\3\2\2\2x{\3\2\2"+ - "\2yw\3\2\2\2zr\3\2\2\2z{\3\2\2\2{\21\3\2\2\2|}\7\4\2\2}\u0082\5\34\17"+ - "\2~\177\7\37\2\2\177\u0081\5\34\17\2\u0080~\3\2\2\2\u0081\u0084\3\2\2"+ - "\2\u0082\u0080\3\2\2\2\u0082\u0083\3\2\2\2\u0083\23\3\2\2\2\u0084\u0082"+ - "\3\2\2\2\u0085\u0087\5\30\r\2\u0086\u0088\5\22\n\2\u0087\u0086\3\2\2\2"+ - "\u0087\u0088\3\2\2\2\u0088\25\3\2\2\2\u0089\u008f\5\30\r\2\u008a\u008d"+ - "\7\6\2\2\u008b\u008c\7\23\2\2\u008c\u008e\5*\26\2\u008d\u008b\3\2\2\2"+ - "\u008d\u008e\3\2\2\2\u008e\u0090\3\2\2\2\u008f\u008a\3\2\2\2\u008f\u0090"+ - "\3\2\2\2\u0090\u0092\3\2\2\2\u0091\u0093\5\22\n\2\u0092\u0091\3\2\2\2"+ - "\u0092\u0093\3\2\2\2\u0093\27\3\2\2\2\u0094\u0095\7 \2\2\u0095\u0096\5"+ - "\32\16\2\u0096\u0097\7!\2\2\u0097\31\3\2\2\2\u0098\u0099\5.\30\2\u0099"+ - "\u009a\7\21\2\2\u009a\u009b\5\34\17\2\u009b\33\3\2\2\2\u009c\u009d\5\36"+ - "\20\2\u009d\35\3\2\2\2\u009e\u009f\b\20\1\2\u009f\u00a0\7\n\2\2\u00a0"+ - "\u00a6\5\36\20\7\u00a1\u00a2\7)\2\2\u00a2\u00a3\7\f\2\2\u00a3\u00a6\5"+ - "\30\r\2\u00a4\u00a6\5 \21\2\u00a5\u009e\3\2\2\2\u00a5\u00a1\3\2\2\2\u00a5"+ - "\u00a4\3\2\2\2\u00a6\u00af\3\2\2\2\u00a7\u00a8\f\4\2\2\u00a8\u00a9\7\3"+ - "\2\2\u00a9\u00ae\5\36\20\5\u00aa\u00ab\f\3\2\2\u00ab\u00ac\7\r\2\2\u00ac"+ - "\u00ae\5\36\20\4\u00ad\u00a7\3\2\2\2\u00ad\u00aa\3\2\2\2\u00ae\u00b1\3"+ - "\2\2\2\u00af\u00ad\3\2\2\2\u00af\u00b0\3\2\2\2\u00b0\37\3\2\2\2\u00b1"+ - "\u00af\3\2\2\2\u00b2\u00b3\b\21\1\2\u00b3\u00c7\5\"\22\2\u00b4\u00b6\5"+ - "\"\22\2\u00b5\u00b7\7\n\2\2\u00b6\u00b5\3\2\2\2\u00b6\u00b7\3\2\2\2\u00b7"+ - "\u00b8\3\2\2\2\u00b8\u00b9\7\7\2\2\u00b9\u00ba\7\"\2\2\u00ba\u00bf\5\34"+ - "\17\2\u00bb\u00bc\7\37\2\2\u00bc\u00be\5\34\17\2\u00bd\u00bb\3\2\2\2\u00be"+ - "\u00c1\3\2\2\2\u00bf\u00bd\3\2\2\2\u00bf\u00c0\3\2\2\2\u00c0\u00c2\3\2"+ - "\2\2\u00c1\u00bf\3\2\2\2\u00c2\u00c3\7#\2\2\u00c3\u00c7\3\2\2\2\u00c4"+ - "\u00c5\t\2\2\2\u00c5\u00c7\5 \21\6\u00c6\u00b2\3\2\2\2\u00c6\u00b4\3\2"+ - "\2\2\u00c6\u00c4\3\2\2\2\u00c7\u00d4\3\2\2\2\u00c8\u00c9\f\5\2\2\u00c9"+ - "\u00ca\t\3\2\2\u00ca\u00d3\5 \21\6\u00cb\u00cc\f\4\2\2\u00cc\u00cd\t\2"+ - "\2\2\u00cd\u00d3\5 \21\5\u00ce\u00cf\f\3\2\2\u00cf\u00d0\5(\25\2\u00d0"+ - "\u00d1\5 \21\4\u00d1\u00d3\3\2\2\2\u00d2\u00c8\3\2\2\2\u00d2\u00cb\3\2"+ - "\2\2\u00d2\u00ce\3\2\2\2\u00d3\u00d6\3\2\2\2\u00d4\u00d2\3\2\2\2\u00d4"+ - "\u00d5\3\2\2\2\u00d5!\3\2\2\2\u00d6\u00d4\3\2\2\2\u00d7\u00df\5&\24\2"+ - "\u00d8\u00df\5$\23\2\u00d9\u00df\5,\27\2\u00da\u00db\7\"\2\2\u00db\u00dc"+ - "\5\34\17\2\u00dc\u00dd\7#\2\2\u00dd\u00df\3\2\2\2\u00de\u00d7\3\2\2\2"+ - "\u00de\u00d8\3\2\2\2\u00de\u00d9\3\2\2\2\u00de\u00da\3\2\2\2\u00df#\3"+ - "\2\2\2\u00e0\u00e1\7)\2\2\u00e1\u00ea\7\"\2\2\u00e2\u00e7\5\34\17\2\u00e3"+ - "\u00e4\7\37\2\2\u00e4\u00e6\5\34\17\2\u00e5\u00e3\3\2\2\2\u00e6\u00e9"+ - "\3\2\2\2\u00e7\u00e5\3\2\2\2\u00e7\u00e8\3\2\2\2\u00e8\u00eb\3\2\2\2\u00e9"+ - "\u00e7\3\2\2\2\u00ea\u00e2\3\2\2\2\u00ea\u00eb\3\2\2\2\u00eb\u00ec\3\2"+ - "\2\2\u00ec\u00ed\7#\2\2\u00ed%\3\2\2\2\u00ee\u00f3\7\13\2\2\u00ef\u00f3"+ - "\5\62\32\2\u00f0\u00f3\5*\26\2\u00f1\u00f3\5\64\33\2\u00f2\u00ee\3\2\2"+ - "\2\u00f2\u00ef\3\2\2\2\u00f2\u00f0\3\2\2\2\u00f2\u00f1\3\2\2\2\u00f3\'"+ - "\3\2\2\2\u00f4\u00f5\t\4\2\2\u00f5)\3\2\2\2\u00f6\u00f7\t\5\2\2\u00f7"+ - "+\3\2\2\2\u00f8\u0104\5.\30\2\u00f9\u00fa\7\36\2\2\u00fa\u0103\5.\30\2"+ - "\u00fb\u00fd\7 \2\2\u00fc\u00fe\7\'\2\2\u00fd\u00fc\3\2\2\2\u00fe\u00ff"+ - "\3\2\2\2\u00ff\u00fd\3\2\2\2\u00ff\u0100\3\2\2\2\u0100\u0101\3\2\2\2\u0101"+ - "\u0103\7!\2\2\u0102\u00f9\3\2\2\2\u0102\u00fb\3\2\2\2\u0103\u0106\3\2"+ - "\2\2\u0104\u0102\3\2\2\2\u0104\u0105\3\2\2\2\u0105-\3\2\2\2\u0106\u0104"+ - "\3\2\2\2\u0107\u0108\t\6\2\2\u0108/\3\2\2\2\u0109\u010b\5\62\32\2\u010a"+ - "\u010c\7)\2\2\u010b\u010a\3\2\2\2\u010b\u010c\3\2\2\2\u010c\61\3\2\2\2"+ - "\u010d\u0110\7(\2\2\u010e\u0110\7\'\2\2\u010f\u010d\3\2\2\2\u010f\u010e"+ - "\3\2\2\2\u0110\63\3\2\2\2\u0111\u0112\7&\2\2\u0112\65\3\2\2\2$@FPTV\\"+ - "`djnwz\u0082\u0087\u008d\u008f\u0092\u00a5\u00ad\u00af\u00b6\u00bf\u00c6"+ - "\u00d2\u00d4\u00de\u00e7\u00ea\u00f2\u00ff\u0102\u0104\u010b\u010f"; + "\4\32\t\32\4\33\t\33\4\34\t\34\3\2\3\2\3\2\3\3\3\3\3\3\3\4\3\4\7\4A\n"+ + "\4\f\4\16\4D\13\4\3\5\3\5\3\5\5\5I\n\5\3\6\3\6\3\6\3\6\3\6\3\7\3\7\3\7"+ + "\5\7S\n\7\3\7\3\7\5\7W\n\7\5\7Y\n\7\3\7\3\7\6\7]\n\7\r\7\16\7^\3\7\3\7"+ + "\5\7c\n\7\3\b\3\b\5\bg\n\b\3\b\3\b\6\bk\n\b\r\b\16\bl\3\b\3\b\5\bq\n\b"+ + "\3\t\3\t\3\t\3\t\3\t\7\tx\n\t\f\t\16\t{\13\t\5\t}\n\t\3\n\3\n\3\n\3\n"+ + "\7\n\u0083\n\n\f\n\16\n\u0086\13\n\3\13\3\13\5\13\u008a\n\13\3\f\3\f\3"+ + "\f\3\f\5\f\u0090\n\f\5\f\u0092\n\f\3\f\5\f\u0095\n\f\3\r\3\r\3\r\3\r\3"+ + "\16\3\16\3\16\3\16\3\17\3\17\3\20\3\20\3\20\3\20\3\20\3\20\3\20\5\20\u00a8"+ + "\n\20\3\20\3\20\3\20\3\20\3\20\3\20\7\20\u00b0\n\20\f\20\16\20\u00b3\13"+ + "\20\3\21\3\21\3\21\5\21\u00b8\n\21\3\21\3\21\5\21\u00bc\n\21\3\21\3\21"+ + "\3\21\3\21\3\21\3\21\3\21\3\21\3\21\3\21\7\21\u00c8\n\21\f\21\16\21\u00cb"+ + "\13\21\3\22\5\22\u00ce\n\22\3\22\3\22\3\22\3\22\3\22\7\22\u00d5\n\22\f"+ + "\22\16\22\u00d8\13\22\3\22\3\22\3\23\3\23\3\23\3\23\3\23\3\23\3\23\5\23"+ + "\u00e3\n\23\3\24\3\24\3\24\3\24\3\24\7\24\u00ea\n\24\f\24\16\24\u00ed"+ + "\13\24\5\24\u00ef\n\24\3\24\3\24\3\25\3\25\3\25\3\25\5\25\u00f7\n\25\3"+ + "\26\3\26\3\27\3\27\3\30\3\30\3\30\3\30\3\30\6\30\u0102\n\30\r\30\16\30"+ + "\u0103\3\30\7\30\u0107\n\30\f\30\16\30\u010a\13\30\3\31\3\31\3\32\3\32"+ + "\5\32\u0110\n\32\3\33\3\33\5\33\u0114\n\33\3\34\3\34\3\34\2\4\36 \35\2"+ + "\4\6\b\n\f\16\20\22\24\26\30\32\34\36 \"$&(*,.\60\62\64\66\2\7\3\2\31"+ + "\32\3\2\33\35\3\2\23\30\4\2\5\5\17\17\4\2%%))\u0127\28\3\2\2\2\4;\3\2"+ + "\2\2\6>\3\2\2\2\bH\3\2\2\2\nJ\3\2\2\2\fO\3\2\2\2\16d\3\2\2\2\20r\3\2\2"+ + "\2\22~\3\2\2\2\24\u0087\3\2\2\2\26\u008b\3\2\2\2\30\u0096\3\2\2\2\32\u009a"+ + "\3\2\2\2\34\u009e\3\2\2\2\36\u00a7\3\2\2\2 \u00bb\3\2\2\2\"\u00cd\3\2"+ + "\2\2$\u00e2\3\2\2\2&\u00e4\3\2\2\2(\u00f6\3\2\2\2*\u00f8\3\2\2\2,\u00fa"+ + "\3\2\2\2.\u00fc\3\2\2\2\60\u010b\3\2\2\2\62\u010d\3\2\2\2\64\u0113\3\2"+ + "\2\2\66\u0115\3\2\2\289\5\6\4\29:\7\2\2\3:\3\3\2\2\2;<\5\34\17\2<=\7\2"+ + "\2\3=\5\3\2\2\2>B\5\b\5\2?A\5\20\t\2@?\3\2\2\2AD\3\2\2\2B@\3\2\2\2BC\3"+ + "\2\2\2C\7\3\2\2\2DB\3\2\2\2EI\5\f\7\2FI\5\16\b\2GI\5\32\16\2HE\3\2\2\2"+ + "HF\3\2\2\2HG\3\2\2\2I\t\3\2\2\2JK\7\22\2\2KL\7\t\2\2LM\7\23\2\2MN\5\62"+ + "\32\2N\13\3\2\2\2OX\7\16\2\2PR\5\22\n\2QS\5\n\6\2RQ\3\2\2\2RS\3\2\2\2"+ + "SY\3\2\2\2TV\5\n\6\2UW\5\22\n\2VU\3\2\2\2VW\3\2\2\2WY\3\2\2\2XP\3\2\2"+ + "\2XT\3\2\2\2XY\3\2\2\2YZ\3\2\2\2Z\\\5\26\f\2[]\5\26\f\2\\[\3\2\2\2]^\3"+ + "\2\2\2^\\\3\2\2\2^_\3\2\2\2_b\3\2\2\2`a\7\20\2\2ac\5\26\f\2b`\3\2\2\2"+ + "bc\3\2\2\2c\r\3\2\2\2df\7\b\2\2eg\5\22\n\2fe\3\2\2\2fg\3\2\2\2gh\3\2\2"+ + "\2hj\5\24\13\2ik\5\24\13\2ji\3\2\2\2kl\3\2\2\2lj\3\2\2\2lm\3\2\2\2mp\3"+ + "\2\2\2no\7\20\2\2oq\5\24\13\2pn\3\2\2\2pq\3\2\2\2q\17\3\2\2\2rs\7$\2\2"+ + "s|\7)\2\2ty\5\36\20\2uv\7\37\2\2vx\5\36\20\2wu\3\2\2\2x{\3\2\2\2yw\3\2"+ + "\2\2yz\3\2\2\2z}\3\2\2\2{y\3\2\2\2|t\3\2\2\2|}\3\2\2\2}\21\3\2\2\2~\177"+ + "\7\4\2\2\177\u0084\5\34\17\2\u0080\u0081\7\37\2\2\u0081\u0083\5\34\17"+ + "\2\u0082\u0080\3\2\2\2\u0083\u0086\3\2\2\2\u0084\u0082\3\2\2\2\u0084\u0085"+ + "\3\2\2\2\u0085\23\3\2\2\2\u0086\u0084\3\2\2\2\u0087\u0089\5\30\r\2\u0088"+ + "\u008a\5\22\n\2\u0089\u0088\3\2\2\2\u0089\u008a\3\2\2\2\u008a\25\3\2\2"+ + "\2\u008b\u0091\5\30\r\2\u008c\u008f\7\6\2\2\u008d\u008e\7\23\2\2\u008e"+ + "\u0090\5,\27\2\u008f\u008d\3\2\2\2\u008f\u0090\3\2\2\2\u0090\u0092\3\2"+ + "\2\2\u0091\u008c\3\2\2\2\u0091\u0092\3\2\2\2\u0092\u0094\3\2\2\2\u0093"+ + "\u0095\5\22\n\2\u0094\u0093\3\2\2\2\u0094\u0095\3\2\2\2\u0095\27\3\2\2"+ + "\2\u0096\u0097\7 \2\2\u0097\u0098\5\32\16\2\u0098\u0099\7!\2\2\u0099\31"+ + "\3\2\2\2\u009a\u009b\5\60\31\2\u009b\u009c\7\21\2\2\u009c\u009d\5\34\17"+ + "\2\u009d\33\3\2\2\2\u009e\u009f\5\36\20\2\u009f\35\3\2\2\2\u00a0\u00a1"+ + "\b\20\1\2\u00a1\u00a2\7\n\2\2\u00a2\u00a8\5\36\20\7\u00a3\u00a4\7)\2\2"+ + "\u00a4\u00a5\7\f\2\2\u00a5\u00a8\5\30\r\2\u00a6\u00a8\5 \21\2\u00a7\u00a0"+ + "\3\2\2\2\u00a7\u00a3\3\2\2\2\u00a7\u00a6\3\2\2\2\u00a8\u00b1\3\2\2\2\u00a9"+ + "\u00aa\f\4\2\2\u00aa\u00ab\7\3\2\2\u00ab\u00b0\5\36\20\5\u00ac\u00ad\f"+ + "\3\2\2\u00ad\u00ae\7\r\2\2\u00ae\u00b0\5\36\20\4\u00af\u00a9\3\2\2\2\u00af"+ + "\u00ac\3\2\2\2\u00b0\u00b3\3\2\2\2\u00b1\u00af\3\2\2\2\u00b1\u00b2\3\2"+ + "\2\2\u00b2\37\3\2\2\2\u00b3\u00b1\3\2\2\2\u00b4\u00b5\b\21\1\2\u00b5\u00b7"+ + "\5$\23\2\u00b6\u00b8\5\"\22\2\u00b7\u00b6\3\2\2\2\u00b7\u00b8\3\2\2\2"+ + "\u00b8\u00bc\3\2\2\2\u00b9\u00ba\t\2\2\2\u00ba\u00bc\5 \21\6\u00bb\u00b4"+ + "\3\2\2\2\u00bb\u00b9\3\2\2\2\u00bc\u00c9\3\2\2\2\u00bd\u00be\f\5\2\2\u00be"+ + "\u00bf\t\3\2\2\u00bf\u00c8\5 \21\6\u00c0\u00c1\f\4\2\2\u00c1\u00c2\t\2"+ + "\2\2\u00c2\u00c8\5 \21\5\u00c3\u00c4\f\3\2\2\u00c4\u00c5\5*\26\2\u00c5"+ + "\u00c6\5 \21\4\u00c6\u00c8\3\2\2\2\u00c7\u00bd\3\2\2\2\u00c7\u00c0\3\2"+ + "\2\2\u00c7\u00c3\3\2\2\2\u00c8\u00cb\3\2\2\2\u00c9\u00c7\3\2\2\2\u00c9"+ + "\u00ca\3\2\2\2\u00ca!\3\2\2\2\u00cb\u00c9\3\2\2\2\u00cc\u00ce\7\n\2\2"+ + "\u00cd\u00cc\3\2\2\2\u00cd\u00ce\3\2\2\2\u00ce\u00cf\3\2\2\2\u00cf\u00d0"+ + "\7\7\2\2\u00d0\u00d1\7\"\2\2\u00d1\u00d6\5\34\17\2\u00d2\u00d3\7\37\2"+ + "\2\u00d3\u00d5\5\34\17\2\u00d4\u00d2\3\2\2\2\u00d5\u00d8\3\2\2\2\u00d6"+ + "\u00d4\3\2\2\2\u00d6\u00d7\3\2\2\2\u00d7\u00d9\3\2\2\2\u00d8\u00d6\3\2"+ + "\2\2\u00d9\u00da\7#\2\2\u00da#\3\2\2\2\u00db\u00e3\5(\25\2\u00dc\u00e3"+ + "\5&\24\2\u00dd\u00e3\5.\30\2\u00de\u00df\7\"\2\2\u00df\u00e0\5\34\17\2"+ + "\u00e0\u00e1\7#\2\2\u00e1\u00e3\3\2\2\2\u00e2\u00db\3\2\2\2\u00e2\u00dc"+ + "\3\2\2\2\u00e2\u00dd\3\2\2\2\u00e2\u00de\3\2\2\2\u00e3%\3\2\2\2\u00e4"+ + "\u00e5\7)\2\2\u00e5\u00ee\7\"\2\2\u00e6\u00eb\5\34\17\2\u00e7\u00e8\7"+ + "\37\2\2\u00e8\u00ea\5\34\17\2\u00e9\u00e7\3\2\2\2\u00ea\u00ed\3\2\2\2"+ + "\u00eb\u00e9\3\2\2\2\u00eb\u00ec\3\2\2\2\u00ec\u00ef\3\2\2\2\u00ed\u00eb"+ + "\3\2\2\2\u00ee\u00e6\3\2\2\2\u00ee\u00ef\3\2\2\2\u00ef\u00f0\3\2\2\2\u00f0"+ + "\u00f1\7#\2\2\u00f1\'\3\2\2\2\u00f2\u00f7\7\13\2\2\u00f3\u00f7\5\64\33"+ + "\2\u00f4\u00f7\5,\27\2\u00f5\u00f7\5\66\34\2\u00f6\u00f2\3\2\2\2\u00f6"+ + "\u00f3\3\2\2\2\u00f6\u00f4\3\2\2\2\u00f6\u00f5\3\2\2\2\u00f7)\3\2\2\2"+ + "\u00f8\u00f9\t\4\2\2\u00f9+\3\2\2\2\u00fa\u00fb\t\5\2\2\u00fb-\3\2\2\2"+ + "\u00fc\u0108\5\60\31\2\u00fd\u00fe\7\36\2\2\u00fe\u0107\5\60\31\2\u00ff"+ + "\u0101\7 \2\2\u0100\u0102\7\'\2\2\u0101\u0100\3\2\2\2\u0102\u0103\3\2"+ + "\2\2\u0103\u0101\3\2\2\2\u0103\u0104\3\2\2\2\u0104\u0105\3\2\2\2\u0105"+ + "\u0107\7!\2\2\u0106\u00fd\3\2\2\2\u0106\u00ff\3\2\2\2\u0107\u010a\3\2"+ + "\2\2\u0108\u0106\3\2\2\2\u0108\u0109\3\2\2\2\u0109/\3\2\2\2\u010a\u0108"+ + "\3\2\2\2\u010b\u010c\t\6\2\2\u010c\61\3\2\2\2\u010d\u010f\5\64\33\2\u010e"+ + "\u0110\7)\2\2\u010f\u010e\3\2\2\2\u010f\u0110\3\2\2\2\u0110\63\3\2\2\2"+ + "\u0111\u0114\7(\2\2\u0112\u0114\7\'\2\2\u0113\u0111\3\2\2\2\u0113\u0112"+ + "\3\2\2\2\u0114\65\3\2\2\2\u0115\u0116\7&\2\2\u0116\67\3\2\2\2%BHRVX^b"+ + "flpy|\u0084\u0089\u008f\u0091\u0094\u00a7\u00af\u00b1\u00b7\u00bb\u00c7"+ + "\u00c9\u00cd\u00d6\u00e2\u00eb\u00ee\u00f6\u0103\u0106\u0108\u010f\u0113"; public static final ATN _ATN = new ATNDeserializer().deserialize(_serializedATN.toCharArray()); static { diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseVisitor.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseVisitor.java index 3b692ea02ab82..8e5287a0f6632 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseVisitor.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseVisitor.java @@ -136,13 +136,6 @@ interface EqlBaseVisitor extends ParseTreeVisitor { * @return the visitor result */ T visitComparison(EqlBaseParser.ComparisonContext ctx); - /** - * Visit a parse tree produced by the {@code containsExpression} - * labeled alternative in {@link EqlBaseParser#valueExpression}. - * @param ctx the parse tree - * @return the visitor result - */ - T visitContainsExpression(EqlBaseParser.ContainsExpressionContext ctx); /** * Visit a parse tree produced by the {@code arithmeticBinary} * labeled alternative in {@link EqlBaseParser#valueExpression}. @@ -157,6 +150,12 @@ interface EqlBaseVisitor extends ParseTreeVisitor { * @return the visitor result */ T visitArithmeticUnary(EqlBaseParser.ArithmeticUnaryContext ctx); + /** + * Visit a parse tree produced by {@link EqlBaseParser#predicate}. + * @param ctx the parse tree + * @return the visitor result + */ + T visitPredicate(EqlBaseParser.PredicateContext ctx); /** * Visit a parse tree produced by the {@code constantDefault} * labeled alternative in {@link EqlBaseParser#primaryExpression}. diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/ExpressionBuilder.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/ExpressionBuilder.java index 9d9fcb3129907..6510fdc3561c7 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/ExpressionBuilder.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/ExpressionBuilder.java @@ -11,11 +11,12 @@ import org.antlr.v4.runtime.tree.TerminalNode; import org.elasticsearch.xpack.eql.parser.EqlBaseParser.ArithmeticUnaryContext; import org.elasticsearch.xpack.eql.parser.EqlBaseParser.ComparisonContext; -import org.elasticsearch.xpack.eql.parser.EqlBaseParser.ContainsExpressionContext; import org.elasticsearch.xpack.eql.parser.EqlBaseParser.DereferenceContext; import org.elasticsearch.xpack.eql.parser.EqlBaseParser.FunctionExpressionContext; import org.elasticsearch.xpack.eql.parser.EqlBaseParser.LogicalBinaryContext; import org.elasticsearch.xpack.eql.parser.EqlBaseParser.LogicalNotContext; +import org.elasticsearch.xpack.eql.parser.EqlBaseParser.PredicateContext; +import org.elasticsearch.xpack.eql.parser.EqlBaseParser.ValueExpressionDefaultContext; import org.elasticsearch.xpack.ql.QlIllegalArgumentException; import org.elasticsearch.xpack.ql.expression.Expression; import org.elasticsearch.xpack.ql.expression.Literal; @@ -124,26 +125,32 @@ public Expression visitComparison(ComparisonContext ctx) { } } - @Override - public Expression visitContainsExpression(ContainsExpressionContext ctx) { - Expression exp = expression(ctx.primaryExpression()); + public Expression visitValueExpressionDefault(ValueExpressionDefaultContext ctx) { + Expression expr = expression(ctx.primaryExpression()); Source source = source(ctx); - List container = expressions(ctx.expression()); + + PredicateContext predicate = ctx.predicate(); + + if (predicate == null) { + return expr; + } + + List container = expressions(predicate.expression()); // TODO: Add IN to QL and use that directly Expression checkInSet = null; for (Expression inner : container) { - Expression termCheck = new Equals(source, exp, inner); + Expression termCheck = new Equals(source, expr, inner); checkInSet = checkInSet == null ? termCheck : new Or(source, checkInSet, termCheck); } - return ctx.NOT() != null ? new Not(source, checkInSet) : checkInSet; + return predicate.NOT() != null ? new Not(source, checkInSet) : checkInSet; } @Override - public Literal visitDecimalLiteral(EqlBaseParser.DecimalLiteralContext ctx) { + public Expression visitDecimalLiteral(EqlBaseParser.DecimalLiteralContext ctx) { Source source = source(ctx); String text = ctx.getText(); From 160ba32f59c11143ef9ff036e575900d5366f931 Mon Sep 17 00:00:00 2001 From: Ross Wolf <31489089+rw-access@users.noreply.github.com> Date: Thu, 30 Jan 2020 09:54:44 -0700 Subject: [PATCH 10/11] EQL: Remove commented out dead code --- .../xpack/eql/parser/GrammarTests.java | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/GrammarTests.java b/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/GrammarTests.java index eb588696586c8..785a0ae3f8bdf 100644 --- a/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/GrammarTests.java +++ b/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/GrammarTests.java @@ -34,19 +34,6 @@ public void testSupportedQueries() throws Exception { for (Tuple line : lines) { String q = line.v1(); parser.createStatement(q); - - /* - try { - parser.createStatement(q); - } catch (ParsingException pe) { - if (pe.getErrorMessage().startsWith("Does not know how to handle")) { - // ignore for now - } else { - throw new ParsingException(new Source(pe.getLineNumber() + line.v2() - 1, pe.getColumnNumber(), q), - pe.getErrorMessage() + " inside statement <{}>", q); - } - } - */ } } public void testUnsupportedQueries() throws Exception { From 2edd94865508c9397f36892ebfe3057e61a53d13 Mon Sep 17 00:00:00 2001 From: Ross Wolf <31489089+rw-access@users.noreply.github.com> Date: Fri, 31 Jan 2020 08:38:49 -0700 Subject: [PATCH 11/11] EQL: Remove wildcard test, wait until analyzer --- .../xpack/eql/parser/ExpressionTests.java | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ExpressionTests.java b/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ExpressionTests.java index d8e7c19d043c3..910078ea72d93 100644 --- a/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ExpressionTests.java +++ b/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ExpressionTests.java @@ -155,20 +155,6 @@ public void testBoolean() { assertEquals(new Or(null, lhs, rhs), booleanOr); } - /* - public void testWildcard() { - assertEquals( - expr("command_line == '* localgroup*'"), - expr("wildcard(command_line, '* localgroup*')") - ); - - assertEquals( - expr("command_line != '* localgroup*'"), - expr("not wildcard(command_line, '* localgroup*')") - ); - } - */ - public void testInSet() { assertEquals( expr("name in ('net.exe')"),