Skip to content

Commit 3fc8f38

Browse files
committed
revert useless change
Signed-off-by: xinyual <xinyual@amazon.com>
1 parent 1de8156 commit 3fc8f38

4 files changed

Lines changed: 2 additions & 31 deletions

File tree

ppl/src/main/antlr/OpenSearchPPLLexer.g4

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -385,13 +385,6 @@ JSON_DELETE: 'JSON_DELETE';
385385
JSON_APPEND: 'JSON_APPEND';
386386
JSON_EXTEND: 'JSON_EXTEND';
387387

388-
// LAMBDA FUNCTIONS
389-
//EXISTS: 'EXISTS';
390-
FORALL: 'FORALL';
391-
FILTER: 'FILTER';
392-
TRANSFORM: 'TRANSFORM';
393-
REDUCE: 'REDUCE';
394-
395388
// FLOWCONTROL FUNCTIONS
396389
IFNULL: 'IFNULL';
397390
NULLIF: 'NULLIF';

ppl/src/main/antlr/OpenSearchPPLParser.g4

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -462,8 +462,6 @@ valueExpression
462462
| timestampFunction # timestampFunctionCall
463463
| LT_PRTHS valueExpression RT_PRTHS # parentheticValueExpr
464464
| LT_SQR_PRTHS subSearch RT_SQR_PRTHS # scalarSubqueryExpr
465-
| ident ARROW expression # lambda
466-
| LT_PRTHS ident (COMMA ident)+ RT_PRTHS ARROW expression # lambda
467465
;
468466

469467
primaryExpression
@@ -583,15 +581,14 @@ evalFunctionName
583581
| jsonFunctionName
584582
| geoipFunctionName
585583
| collectionFunctionName
586-
| lambdaFunctionName
587584
;
588585

589586
functionArgs
590587
: (functionArg (COMMA functionArg)*)?
591588
;
592589

593590
functionArg
594-
: (ident EQUAL)? valueExpression
591+
: (ident EQUAL)? expression
595592
;
596593

597594
relevanceArg
@@ -720,14 +717,6 @@ jsonFunctionName
720717
| JSON_EXTEND
721718
;
722719

723-
lambdaFunctionName
724-
: FORALL
725-
| EXISTS
726-
| FILTER
727-
| TRANSFORM
728-
| REDUCE
729-
;
730-
731720
cryptographicFunctionName
732721
: MD5
733722
| SHA1

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ public UnresolvedPlan visitTableFunction(TableFunctionContext ctx) {
562562
String argName = (arg.ident() != null) ? arg.ident().getText() : null;
563563
builder.add(
564564
new UnresolvedArgument(
565-
argName, this.internalVisitExpression(arg.valueExpression())));
565+
argName, this.internalVisitExpression(arg.expression())));
566566
});
567567
return new TableFunction(this.internalVisitExpression(ctx.qualifiedName()), builder.build());
568568
}

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -133,17 +133,6 @@ public UnresolvedExpression visitLogicalXor(LogicalXorContext ctx) {
133133
return new Xor(visit(ctx.left), visit(ctx.right));
134134
}
135135

136-
@Override
137-
public UnresolvedExpression visitLambda(OpenSearchPPLParser.LambdaContext ctx) {
138-
139-
List<QualifiedName> arguments =
140-
ctx.ident().stream()
141-
.map(x -> this.visitIdentifiers(Collections.singletonList(x)))
142-
.collect(Collectors.toList());
143-
UnresolvedExpression function = visitExpression(ctx.expression());
144-
return new LambdaFunction(function, arguments);
145-
}
146-
147136
/** Comparison expression. */
148137
@Override
149138
public UnresolvedExpression visitCompareExpr(CompareExprContext ctx) {

0 commit comments

Comments
 (0)