Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EQL: Add ? param support #52301

Closed
wants to merge 5 commits into from
Closed

EQL: Add ? param support #52301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fa8d09f
EQL: Add ? param support
rw-access Feb 13, 2020
3369668
Add escape tests and formatting changes
rw-access Feb 13, 2020
d02c10f
Add tests, lint fixes, PR feedback
rw-access Feb 13, 2020
d2646ea
Merge remote-tracking branch 'origin/master' into eql/prepared-statem…
rw-access Mar 9, 2020
71c7109
Merge remote-tracking branch 'origin/master' into eql/prepared-statem…
rw-access Mar 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions x-pack/plugin/eql/src/main/antlr/EqlBase.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ constant
| number #numericLiteral
| booleanValue #booleanLiteral
| string #stringLiteral
| PARAM #paramLiteral
;

comparisonOperator
Expand Down Expand Up @@ -160,6 +161,8 @@ UNTIL: 'until';
WHERE: 'where';
WITH: 'with';

PARAM: '?';

// Operators
EQ : '=' | '==';
NEQ : '!=';
Expand Down
7 changes: 5 additions & 2 deletions x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/AstBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,16 @@

package org.elasticsearch.xpack.eql.parser;

import org.antlr.v4.runtime.Token;
import org.elasticsearch.xpack.eql.parser.EqlBaseParser.SingleStatementContext;
import org.elasticsearch.xpack.ql.plan.logical.LogicalPlan;

import java.util.Map;

public class AstBuilder extends LogicalPlanBuilder {

AstBuilder(ParserParams params) {
super(params);
AstBuilder(ParserParams params, Map<Token, Object> paramTokens) {
super(params, paramTokens);
}

@Override
Expand Down
12 changes: 12 additions & 0 deletions x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseBaseListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,18 @@ class EqlBaseBaseListener implements EqlBaseListener {
* <p>The default implementation does nothing.</p>
*/
@Override public void exitStringLiteral(EqlBaseParser.StringLiteralContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void enterParamLiteral(EqlBaseParser.ParamLiteralContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void exitParamLiteral(EqlBaseParser.ParamLiteralContext ctx) { }
/**
* {@inheritDoc}
*
Expand Down
7 changes: 7 additions & 0 deletions x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseBaseVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,13 @@ class EqlBaseBaseVisitor<T> extends AbstractParseTreeVisitor<T> implements EqlBa
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitStringLiteral(EqlBaseParser.StringLiteralContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
* <p>The default implementation returns the result of calling
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitParamLiteral(EqlBaseParser.ParamLiteralContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
Expand Down
278 changes: 140 additions & 138 deletions x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseLexer.java
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,18 @@ interface EqlBaseListener extends ParseTreeListener {
* @param ctx the parse tree
*/
void exitStringLiteral(EqlBaseParser.StringLiteralContext ctx);
/**
* Enter a parse tree produced by the {@code paramLiteral}
* labeled alternative in {@link EqlBaseParser#constant}.
* @param ctx the parse tree
*/
void enterParamLiteral(EqlBaseParser.ParamLiteralContext ctx);
/**
* Exit a parse tree produced by the {@code paramLiteral}
* labeled alternative in {@link EqlBaseParser#constant}.
* @param ctx the parse tree
*/
void exitParamLiteral(EqlBaseParser.ParamLiteralContext ctx);
/**
* Enter a parse tree produced by {@link EqlBaseParser#comparisonOperator}.
* @param ctx the parse tree
Expand Down
Loading