Fix merge

Author: carlosdelest

docs/reference/esql/functions/kibana/docs/match_operator.md

@@ -8,6 +8,8 @@
 package org.elasticsearch.xpack.esql.expression.function.fulltext;
 
 import org.apache.lucene.util.BytesRef;
+import org.elasticsearch.TransportVersions;
+import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.xpack.esql.capabilities.PostOptimizationVerificationAware;
 import org.elasticsearch.xpack.esql.common.Failure;
@@ -25,11 +27,12 @@
 import org.elasticsearch.xpack.esql.querydsl.query.MatchQuery;
 import org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter;
 
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
-import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.ParamOrdinal;
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.ParamOrdinal.FIRST;
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.ParamOrdinal.SECOND;
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isNotNull;
@@ -98,7 +101,21 @@ public Expression field() {
     }
 
     @Override
-    protected TypeResolution resolveNonQueryParamTypes() {
+    public void writeTo(StreamOutput out) throws IOException {
+        source().writeTo(out);
+        out.writeNamedWriteable(field());
+        out.writeNamedWriteable(query());
+        if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_QUERY_BUILDER_IN_SEARCH_FUNCTIONS)) {
+            out.writeOptionalNamedWriteable(queryBuilder());
+        }
+    }
+
+    @Override
+    protected TypeResolution resolveParams() {
+        return resolveField().and(resolveQuery()).and(checkParamCompatibility());
+    }
+
+    protected TypeResolution resolveField() {
         return isNotNull(field, sourceText(), FIRST).and(
             isType(
                 field,
@@ -110,18 +127,16 @@ protected TypeResolution resolveNonQueryParamTypes() {
         );
     }
 
-    @Override
-    protected TypeResolution resolveQueryParamType() {
+    protected TypeResolution resolveQuery() {
         return isType(
             query(),
             QUERY_DATA_TYPES::contains,
             sourceText(),
-            queryParamOrdinal(),
+            SECOND,
             "keyword, boolean, date, date_nanos, double, integer, ip, long, unsigned_long, version"
-        ).and(isNotNullAndFoldable(query(), sourceText(), queryParamOrdinal()));
+        ).and(isNotNullAndFoldable(query(), sourceText(), SECOND));
     }
 
-    @Override
     protected TypeResolution checkParamCompatibility() {
         DataType fieldType = field().dataType();
         DataType queryType = query().dataType();
@@ -206,14 +221,4 @@ protected Query translate(TranslatorHandler handler) {
 
         throw new IllegalArgumentException("Match must have a field attribute as the first argument");
     }
-
-    @Override
-    public Expression replaceQueryBuilder(QueryBuilder queryBuilder) {
-        return new Match(source(), field, query(), queryBuilder);
-    }
-
-    protected ParamOrdinal queryParamOrdinal() {
-        return SECOND;
-    }
-
 }

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

@@ -7,31 +7,21 @@
 
 package org.elasticsearch.xpack.esql.expression.function.fulltext;
 
+import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.TransportVersions;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.common.io.stream.StreamInput;
-import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.unit.Fuzziness;
 import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.xpack.esql.capabilities.PostOptimizationVerificationAware;
-import org.elasticsearch.xpack.esql.common.Failure;
-import org.elasticsearch.xpack.esql.common.Failures;
 import org.elasticsearch.xpack.esql.core.InvalidArgumentException;
 import org.elasticsearch.xpack.esql.core.expression.EntryExpression;
 import org.elasticsearch.xpack.esql.core.expression.Expression;
-import org.elasticsearch.xpack.esql.core.expression.FieldAttribute;
-import org.elasticsearch.xpack.esql.core.expression.FoldContext;
 import org.elasticsearch.xpack.esql.core.expression.Literal;
 import org.elasticsearch.xpack.esql.core.expression.MapExpression;
-import org.elasticsearch.xpack.esql.core.expression.TypeResolutions;
-import org.elasticsearch.xpack.esql.core.querydsl.query.Query;
-import org.elasticsearch.xpack.esql.core.querydsl.query.QueryStringQuery;
 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.type.DataTypeConverter;
-import org.elasticsearch.xpack.esql.core.type.MultiTypeEsField;
-import org.elasticsearch.xpack.esql.core.util.NumericUtils;
 import org.elasticsearch.xpack.esql.expression.function.Example;
 import org.elasticsearch.xpack.esql.expression.function.FunctionInfo;
 import org.elasticsearch.xpack.esql.expression.function.MapParam;
@@ -42,10 +32,8 @@
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
 
 import static java.util.Map.entry;
 import static org.elasticsearch.common.logging.LoggerMessageFormat.format;
@@ -60,33 +48,20 @@
 import static org.elasticsearch.index.query.MatchQueryBuilder.OPERATOR_FIELD;
 import static org.elasticsearch.index.query.MatchQueryBuilder.PREFIX_LENGTH_FIELD;
 import static org.elasticsearch.index.query.MatchQueryBuilder.ZERO_TERMS_QUERY_FIELD;
-import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.ParamOrdinal.FIRST;
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.ParamOrdinal.SECOND;
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.ParamOrdinal.THIRD;
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isFoldable;
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isMapExpression;
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isNotNull;
-import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isNotNullAndFoldable;
-import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isType;
 import static org.elasticsearch.xpack.esql.core.type.DataType.BOOLEAN;
-import static org.elasticsearch.xpack.esql.core.type.DataType.DATETIME;
-import static org.elasticsearch.xpack.esql.core.type.DataType.DATE_NANOS;
-import static org.elasticsearch.xpack.esql.core.type.DataType.DOUBLE;
 import static org.elasticsearch.xpack.esql.core.type.DataType.FLOAT;
 import static org.elasticsearch.xpack.esql.core.type.DataType.INTEGER;
-import static org.elasticsearch.xpack.esql.core.type.DataType.IP;
 import static org.elasticsearch.xpack.esql.core.type.DataType.KEYWORD;
-import static org.elasticsearch.xpack.esql.core.type.DataType.LONG;
-import static org.elasticsearch.xpack.esql.core.type.DataType.SEMANTIC_TEXT;
-import static org.elasticsearch.xpack.esql.core.type.DataType.TEXT;
-import static org.elasticsearch.xpack.esql.core.type.DataType.UNSIGNED_LONG;
-import static org.elasticsearch.xpack.esql.core.type.DataType.VERSION;
-import static org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.EsqlBinaryComparison.formatIncompatibleTypesMessage;
 
 /**
  * Full text function that performs a {@link org.elasticsearch.xpack.esql.querydsl.query.MatchQuery} .
  */
-public class Match extends AbstractMatchFullTextFunction, OptionalArgument {
+public class Match extends AbstractMatchFullTextFunction implements OptionalArgument {
 
     public static final NamedWriteableRegistry.Entry ENTRY = new NamedWriteableRegistry.Entry(Expression.class, "Match", Match::readFrom);
 
@@ -225,7 +200,7 @@ public Match(
     }
 
     public Match(Source source, Expression field, Expression matchQuery, Expression options, QueryBuilder queryBuilder) {
-        super(source, matchQuery, options == null ? List.of(field, matchQuery) : List.of(field, matchQuery, options), queryBuilder);
+        super(source, matchQuery, options == null ? List.of(field, matchQuery) : List.of(field, matchQuery, options), queryBuilder, field);
         this.options = options;
     }
 
@@ -311,6 +286,9 @@ private Map<String, Object> parseOptions() throws InvalidArgumentException {
         return matchOptions;
     }
 
+    private Expression options() {
+        return options;
+    }
 
     @Override
     public Expression replaceChildren(List<Expression> newChildren) {
@@ -325,11 +303,12 @@ public Expression replaceChildren(List<Expression> newChildren) {
 
     @Override
     protected NodeInfo<? extends Expression> info() {
-        return NodeInfo.create(this, Match::new, field(), query(), queryBuilder());
+        return NodeInfo.create(this, Match::new, field(), query(), options(), queryBuilder());
     }
 
-    private Expression options() {
-        return options;
+    @Override
+    public Expression replaceQueryBuilder(QueryBuilder queryBuilder) {
+        return new Match(source(), field, query(), options(), queryBuilder);
     }
 
     @Override

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

@@ -7,8 +7,10 @@
 
 package org.elasticsearch.xpack.esql.expression.function.fulltext;
 
+import org.elasticsearch.TransportVersions;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.xpack.esql.core.expression.Expression;
 import org.elasticsearch.xpack.esql.core.tree.NodeInfo;
 import org.elasticsearch.xpack.esql.core.tree.Source;
@@ -23,7 +25,7 @@
 /**
  * This class performs a {@link org.elasticsearch.xpack.esql.querydsl.query.MatchQuery} using an operator.
  */
-public class MatchOperator extends Match {
+public class MatchOperator extends AbstractMatchFullTextFunction {
 
     public static final NamedWriteableRegistry.Entry ENTRY = new NamedWriteableRegistry.Entry(
         Expression.class,
@@ -60,15 +62,22 @@ public MatchOperator(
             description = "Value to find in the provided field."
         ) Expression matchQuery
     ) {
-        super(source, field, matchQuery);
+        this(source, field, matchQuery, null);
     }
 
-    private static Match readFrom(StreamInput in) throws IOException {
+    public MatchOperator(Source source, Expression field, Expression matchQuery, QueryBuilder queryBuilder) {
+        super(source, matchQuery, List.of(field, matchQuery), queryBuilder, field);
+    }
+
+    private static MatchOperator readFrom(StreamInput in) throws IOException {
         Source source = Source.readFrom((PlanStreamInput) in);
         Expression field = in.readNamedWriteable(Expression.class);
         Expression query = in.readNamedWriteable(Expression.class);
-
-        return new MatchOperator(source, field, query);
+        QueryBuilder queryBuilder = null;
+        if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_QUERY_BUILDER_IN_SEARCH_FUNCTIONS)) {
+            queryBuilder = in.readOptionalNamedWriteable(QueryBuilder.class);
+        }
+        return new MatchOperator(source, field, query, queryBuilder);
     }
 
     @Override
@@ -95,4 +104,9 @@ protected NodeInfo<? extends Expression> info() {
     public Expression replaceChildren(List<Expression> newChildren) {
         return new MatchOperator(source(), newChildren.get(0), newChildren.get(1));
     }
+
+    @Override
+    public Expression replaceQueryBuilder(QueryBuilder queryBuilder) {
+        return new MatchOperator(source(), field(), query(), queryBuilder);
+    }
 }

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

@@ -7,8 +7,6 @@
 
 package org.elasticsearch.xpack.esql.expression.function.fulltext;
 
-import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
-
 import org.elasticsearch.xpack.esql.core.expression.Expression;
 import org.elasticsearch.xpack.esql.core.type.DataType;
 import org.elasticsearch.xpack.esql.core.util.NumericUtils;
@@ -23,17 +21,16 @@
 import static org.hamcrest.Matchers.equalTo;
 
 public abstract class AbstractMatchFullTextFunctionTests extends AbstractFunctionTestCase {
-    @ParametersFactory
-    public static Iterable<Object[]> parameters() {
+
+    protected static List<TestCaseSupplier> testCaseSuppliers() {
         List<TestCaseSupplier> suppliers = new ArrayList<>();
 
         AbstractMatchFullTextFunctionTests.addUnsignedLongCases(suppliers);
         AbstractMatchFullTextFunctionTests.addNumericCases(suppliers);
         AbstractMatchFullTextFunctionTests.addNonNumericCases(suppliers);
         AbstractMatchFullTextFunctionTests.addQueryAsStringTestCases(suppliers);
         AbstractMatchFullTextFunctionTests.addStringTestCases(suppliers);
-
-        return parameterSuppliersFromTypedData(suppliers);
+        return suppliers;
     }
 
     private static void addNonNumericCases(List<TestCaseSupplier> suppliers) {

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

@@ -28,9 +28,10 @@
 import static org.hamcrest.Matchers.equalTo;
 
 public class MatchErrorTests extends ErrorsForCasesWithoutExamplesTestCase {
+
     @Override
     protected List<TestCaseSupplier> cases() {
-        return paramsToSuppliers(AbstractMatchFullTextFunctionTests.parameters());
+        return paramsToSuppliers(MatchTests.parameters());
     }
 
     @Override

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

@@ -25,12 +25,12 @@
 public class MatchOperatorTests extends AbstractMatchFullTextFunctionTests {
 
     public MatchOperatorTests(@Name("TestCase") Supplier<TestCaseSupplier.TestCase> testCaseSupplier) {
-        super(testCaseSupplier);
+        this.testCase = testCaseSupplier.get();
     }
 
     @ParametersFactory
     public static Iterable<Object[]> parameters() {
-        return AparameterSuppliersFromTypedData(parametersWithoutFunctionNamedParams());
+        return parameterSuppliersFromTypedData(testCaseSuppliers());
     }
 
     @Override