map as function argument

Author: fang-xing-esql

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/Expression.java

@@ -35,6 +35,7 @@ public static List<NamedWriteableRegistry.Entry> getNamedWriteables() {
             entries.add(new NamedWriteableRegistry.Entry(Expression.class, e.name, in -> (NamedExpression) e.reader.read(in)));
         }
         entries.add(Literal.ENTRY);
+        entries.add(NamedLiterals.ENTRY);
         return entries;
     }
 

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/NamedLiterals.java

@@ -0,0 +1,104 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+package org.elasticsearch.xpack.esql.core.expression;
+
+import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.xpack.esql.core.tree.NodeInfo;
+import org.elasticsearch.xpack.esql.core.tree.Source;
+import org.elasticsearch.xpack.esql.core.type.DataType;
+import org.elasticsearch.xpack.esql.core.util.PlanStreamInput;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.Objects;
+
+import static org.elasticsearch.xpack.esql.core.type.DataType.UNSUPPORTED;
+
+/**
+ * Represent a collect of key-value pairs as function arguments.
+ */
+public class NamedLiterals extends Literal {
+    public static final NamedWriteableRegistry.Entry ENTRY = new NamedWriteableRegistry.Entry(
+        Expression.class,
+        "NamedLiteras",
+        NamedLiterals::readFrom
+    );
+
+    private final Map<String, String> args;
+
+    public NamedLiterals(Source source, Map<String, String> args) {
+        super(source, args, UNSUPPORTED);
+        this.args = args;
+    }
+
+    private static NamedLiterals readFrom(StreamInput in) throws IOException {
+        Source source = Source.readFrom((StreamInput & PlanStreamInput) in);
+        Map<String, String> args = in.readMap(StreamInput::readString, StreamInput::readString);
+        return new NamedLiterals(source, args);
+    }
+
+    @Override
+    public void writeTo(StreamOutput out) throws IOException {
+        Source.EMPTY.writeTo(out);
+        out.writeMap(args, StreamOutput::writeString, StreamOutput::writeString);
+    }
+
+    @Override
+    public String getWriteableName() {
+        return ENTRY.name;
+    }
+
+    @Override
+    protected NodeInfo<? extends NamedLiterals> info() {
+        return NodeInfo.create(this, NamedLiterals::new, args);
+    }
+
+    public Map<String, String> args() {
+        return args;
+    }
+
+    @Override
+    public DataType dataType() {
+        return UNSUPPORTED;
+    }
+
+    @Override
+    public Object fold() {
+        return args;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(args);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null || getClass() != obj.getClass()) {
+            return false;
+        }
+
+        NamedLiterals other = (NamedLiterals) obj;
+        return Objects.equals(args, other.args);
+    }
+
+    @Override
+    public String toString() {
+        return String.valueOf(args);
+    }
+
+    @Override
+    public String nodeString() {
+        return toString();
+    }
+
+}

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

@@ -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(options.get("boost"));
+        this.fuzziness = fuzziness == null ? null : Fuzziness.fromString(options.get("fuzziness"));
     }
 
     public MatchQuery(Source source, String name, Object text, Double boost, Fuzziness fuzziness) {

x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/ConsumeProcessor.java

@@ -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",

x-pack/plugin/esql/qa/testFixtures/src/main/resources/match-function.csv-spec

@@ -197,3 +197,31 @@ 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
+;

x-pack/plugin/esql/src/main/antlr/EsqlBaseLexer.g4

@@ -209,6 +209,10 @@ MINUS : '-';
 ASTERISK : '*';
 SLASH : '/';
 PERCENT : '%';
+
+LEFT_BRACES : {this.isDevVersion()}? '{';
+RIGHT_BRACES : {this.isDevVersion()}? '}';
+
 EXPRESSION_COLON : {this.isDevVersion()}? COLON -> type(COLON);
 
 NESTED_WHERE : WHERE -> type(WHERE);

x-pack/plugin/esql/src/main/antlr/EsqlBaseLexer.tokens

@@ -101,13 +101,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
     ;