[ES|QL] MapExpression improvements. #129759
Open
+597
−460
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
elasticsearchmachine
added
needs:triage
afoucret
changed the title
afoucret
added
auto-backport
elasticsearchmachine
added
the
Team:Analytics
|
Pinging @elastic/es-analytical-engine (Team:Analytics) |
elasticsearchmachine
removed
the
needs:triage
afoucret
commented
Jun 20, 2025
| @@ -49,14 +49,15 @@ primaryExpression | |||
|
|
|||
| functionExpression | |||
| : functionName LP (ASTERISK | (booleanExpression (COMMA booleanExpression)* (COMMA mapExpression)?))? RP | |||
| | functionName LP mapExpression? RP | |||
There was a problem hiding this comment.
ℹ️ A small grammar change to allow a function that have only optional params which is currently impossible
my_function({"foo": "bar"})
afoucret
commented
Jun 20, 2025
| @@ -193,6 +193,10 @@ public static Literal keyword(Source source, String literal) { | |||
| return new Literal(source, BytesRefs.toBytesRef(literal), KEYWORD); | |||
| } | |||
|
|
|||
| public static Literal keyword(Source source, Collection<String> literal) { | |||
There was a problem hiding this comment.
ℹ️ Make it easier to instantiate multivalued strings literals, especially in tests
afoucret
commented
Jun 20, 2025
| @@ -612,7 +613,7 @@ public Expression visitFunctionExpression(EsqlBaseParser.FunctionExpressionConte | |||
| List<Expression> args = expressions(ctx.booleanExpression()); | |||
| if (ctx.mapExpression() != null) { | |||
| MapExpression mapArg = visitMapExpression(ctx.mapExpression()); | |||
| args.add(mapArg); | |||
| args = Stream.concat(args.stream(), Stream.of(mapArg)).toList(); | |||
There was a problem hiding this comment.
ℹ️ Sometimes the list is read only (e.g visitList use emptyList).
afoucret
commented
Jun 20, 2025
| "Invalid named function argument [{}], empty key is not supported", | ||
| entry.getText() | ||
| ); | ||
| throw new ParsingException(source(ctx), "Invalid named argument [{}], empty key is not supported", entry.getText()); |
There was a problem hiding this comment.
ℹ️ Wording changes to remove reference to functions.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Some improvements on the optional parameters.
Allow empty map
Currently when using an empty map to provide named parameters to a function (e.g.
match(tilte, "query", {})the user can see the following parser errorI think we should allow the user to provide an empty map without failing, especially with such a message that is difficult to read.
Remove reference to function in the parser error message:
Example:
Duplicated function arguments with the same ...is nowDuplicated function arguments with the same ...By doing this we can reuse the mapExpression outside of a function which is legit IMHO.
See POC of implementing RERANK/COMPLETION OPTIONS for an example of usage in command syntax
More tests
Also I added more tests for the parsing of MapExpression directly in ExpressionTests