Add boost field

Author: svilen-mihaylov-elastic

server/src/main/java/org/elasticsearch/index/query/MultiMatchQueryBuilder.java

@@ -53,6 +53,7 @@ public final class MultiMatchQueryBuilder extends AbstractQueryBuilder<MultiMatc
     public static final ZeroTermsQueryOption DEFAULT_ZERO_TERMS_QUERY = MatchQueryParser.DEFAULT_ZERO_TERMS_QUERY;
     public static final boolean DEFAULT_FUZZY_TRANSPOSITIONS = FuzzyQuery.defaultTranspositions;
 
+    public static final ParseField BOOST_FIELD = new ParseField("boost");
     public static final ParseField SLOP_FIELD = new ParseField("slop");
     public static final ParseField ZERO_TERMS_QUERY_FIELD = new ParseField("zero_terms_query");
     public static final ParseField LENIENT_FIELD = new ParseField("lenient");

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/fulltext/MultiMatch.java

@@ -46,6 +46,7 @@
 
 import static java.util.Map.entry;
 import static org.elasticsearch.index.query.MultiMatchQueryBuilder.ANALYZER_FIELD;
+import static org.elasticsearch.index.query.MultiMatchQueryBuilder.BOOST_FIELD;
 import static org.elasticsearch.index.query.MultiMatchQueryBuilder.FUZZINESS_FIELD;
 import static org.elasticsearch.index.query.MultiMatchQueryBuilder.FUZZY_REWRITE_FIELD;
 import static org.elasticsearch.index.query.MultiMatchQueryBuilder.FUZZY_TRANSPOSITIONS_FIELD;
@@ -116,6 +117,7 @@ public class MultiMatch extends FullTextFunction implements OptionalArgument, Po
     );
 
     public static final Map<String, DataType> OPTIONS = Map.ofEntries(
+        entry(BOOST_FIELD.getPreferredName(), FLOAT),
         entry(SLOP_FIELD.getPreferredName(), INTEGER),
         // TODO: add "zero_terms_query"
         entry(ANALYZER_FIELD.getPreferredName(), KEYWORD),

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

@@ -21,6 +21,7 @@
 
 import static java.util.Map.entry;
 import static org.elasticsearch.index.query.MultiMatchQueryBuilder.ANALYZER_FIELD;
+import static org.elasticsearch.index.query.MultiMatchQueryBuilder.BOOST_FIELD;
 import static org.elasticsearch.index.query.MultiMatchQueryBuilder.FUZZINESS_FIELD;
 import static org.elasticsearch.index.query.MultiMatchQueryBuilder.FUZZY_REWRITE_FIELD;
 import static org.elasticsearch.index.query.MultiMatchQueryBuilder.FUZZY_TRANSPOSITIONS_FIELD;
@@ -40,6 +41,7 @@ public class MultiMatchQuery extends Query {
 
     static {
         BUILDER_APPLIERS = Map.ofEntries(
+            entry(BOOST_FIELD.getPreferredName(), (qb, obj) -> qb.boost((Float) obj)),
             entry(SLOP_FIELD.getPreferredName(), (qb, obj) -> qb.slop((Integer) obj)),
             // TODO: add zero terms query support, I'm not sure the best way to parse it yet...
             // appliers.put("zero_terms_query", (qb, s) -> qb.zeroTermsQuery(s));

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/LocalPhysicalPlanOptimizerTests.java

@@ -1664,7 +1664,7 @@ public void testMultiMatchOptionsPushDown() {
             | where MULTI_MATCH("Anna", first_name, last_name, {"fuzzy_rewrite": "constant_score", "slop": 10, "analyzer": "auto",
             "auto_generate_synonyms_phrase_query": "false", "fuzziness": "auto", "fuzzy_transpositions": false, "lenient": "false",
             "max_expansions": 10, "minimum_should_match": 3, "operator": "AND", "prefix_length": 20, "tie_breaker": 1.0,
-            "type": "best_fields"})
+            "type": "best_fields", "boost": 2.0})
             """;
         var plan = plannerOptimizer.plan(query);
 
@@ -1673,6 +1673,7 @@ public void testMultiMatchOptionsPushDown() {
 
         var expectedQuery = new MultiMatchQueryBuilder("Anna").fields(Map.of("first_name", 1.0f, "last_name", 1.0f))
             .slop(10)
+            .boost(2.0f)
             .analyzer("auto")
             .autoGenerateSynonymsPhraseQuery(false)
             .operator(Operator.fromString("AND"))