map as function argument

Author: fang-xing-esql

docs/reference/esql/functions/parameters/match.asciidoc

@@ -60,8 +60,10 @@ public MatchQuery(Source source, String name, Object text, Map<String, String> o
         this.name = name;
         this.text = text;
         this.options = options;
-        this.boost = null;
-        this.fuzziness = null;
+        String boost = options.get("boost");
+        String fuzziness = options.get("fuzziness");
+        this.boost = boost == null ? null : Double.valueOf(boost);
+        this.fuzziness = fuzziness == null ? null : Fuzziness.fromString(fuzziness);
     }
 
     public MatchQuery(Source source, String name, Object text, Double boost, Fuzziness fuzziness) {

docs/reference/esql/functions/signature/match.svg

@@ -39,6 +39,7 @@ public Set<String> getSupportedAnnotationTypes() {
             "org.elasticsearch.injection.guice.Inject",
             "org.elasticsearch.xpack.esql.expression.function.FunctionInfo",
             "org.elasticsearch.xpack.esql.expression.function.Param",
+            "org.elasticsearch.xpack.esql.expression.function.MapParam",
             "org.elasticsearch.rest.ServerlessScope",
             "org.elasticsearch.xcontent.ParserConstructor",
             "org.elasticsearch.core.UpdateForV9",

docs/reference/esql/functions/types/match.asciidoc

@@ -197,3 +197,30 @@ emp_no:integer | first_name:keyword | last_name:keyword
 10041          | Uri                 | Lenart         
 10043          | Yishay              | Tzvieli        
 ;
+
+mapCount
+required_capability: optional_named_argument_map_for_function
+row x = 1
+| eval y = map_count({"option1":"value2", "option2":2, "option3":3.0, "option4":true})
+;
+
+x:integer |y:long
+1         |4
+;
+
+matchWithOptions
+required_capability: match_function
+required_capability: optional_named_argument_map_for_function
+FROM books 
+| WHERE MATCH(author, "Faulkner", {"fuzziness":"auto", "boost":2, "analyzer":"whitespace"})
+| KEEP book_no, author 
+| SORT book_no 
+| LIMIT 5;
+
+book_no:keyword | author:text
+2378            | [Carol Faulkner, Holly Byers Ochoa, Lucretia Mott]
+2713            | William Faulkner
+2847            | Colleen Faulkner
+2883            | William Faulkner
+3293            | Danny Faulkner
+;

docs/reference/esql/functions/types/match_operator.asciidoc

@@ -216,6 +216,9 @@ ASTERISK : '*';
 SLASH : '/';
 PERCENT : '%';
 
+LEFT_BRACES : {this.isDevVersion()}? '{';
+RIGHT_BRACES : {this.isDevVersion()}? '}';
+
 NESTED_WHERE : WHERE -> type(WHERE);
 
 NAMED_OR_POSITIONAL_PARAM

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/querydsl/query/MatchQuery.java

@@ -102,13 +102,26 @@ primaryExpression
     ;
 
 functionExpression
-    : functionName LP (ASTERISK | (booleanExpression (COMMA booleanExpression)*))? RP
+    : functionName LP (ASTERISK | (functionArgument (COMMA functionArgument)*))? RP
     ;
 
 functionName
     : identifierOrParameter
     ;
 
+functionArgument
+    : booleanExpression                                                                 #functionArgumentDefault
+    | {this.isDevVersion()}? LEFT_BRACES namedConstants RIGHT_BRACES                    #functionArgumentWithName
+    ;
+
+namedConstants
+    : namedConstant (COMMA namedConstant)*
+    ;
+
+namedConstant
+    : key=string COLON value=constant
+    ;
+
 dataType
     : identifier                                                                        #toDataType
     ;