Fix some tests

Author: kderusso

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

@@ -396,14 +396,14 @@ protected static void populateOptionsMap(
         }
     }
 
-    protected TypeResolution resolveOptions(Expression options) {
+    protected TypeResolution resolveOptions(Expression options, TypeResolutions.ParamOrdinal paramOrdinal) {
         if (options != null) {
-            TypeResolution resolution = isNotNull(options, sourceText(), THIRD);
+            TypeResolution resolution = isNotNull(options, sourceText(), paramOrdinal);
             if (resolution.unresolved()) {
                 return resolution;
             }
             // MapExpression does not have a DataType associated with it
-            resolution = isMapExpression(options, sourceText(), THIRD);
+            resolution = isMapExpression(options, sourceText(), paramOrdinal);
             if (resolution.unresolved()) {
                 return resolution;
             }

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

@@ -63,6 +63,7 @@
 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.isNotNull;
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isNotNullAndFoldable;
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isType;
@@ -299,7 +300,7 @@ public final void writeTo(StreamOutput out) throws IOException {
 
     @Override
     protected TypeResolution resolveParams() {
-        return resolveField().and(resolveQuery()).and(resolveOptions(options())).and(checkParamCompatibility());
+        return resolveField().and(resolveQuery()).and(resolveOptions(options(), THIRD)).and(checkParamCompatibility());
     }
 
     private TypeResolution resolveField() {

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

@@ -53,6 +53,7 @@
 import static org.elasticsearch.index.query.MatchQueryBuilder.ANALYZER_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.isNotNull;
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isNotNullAndFoldable;
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isType;
@@ -176,6 +177,11 @@ public String getWriteableName() {
         return ENTRY.name;
     }
 
+    @Override
+    public String functionName() {
+        return ENTRY.name;
+    }
+
     private static MatchPhrase readFrom(StreamInput in) throws IOException {
         Source source = Source.readFrom((PlanStreamInput) in);
         Expression field = in.readNamedWriteable(Expression.class);
@@ -195,7 +201,7 @@ public final void writeTo(StreamOutput out) throws IOException {
 
     @Override
     protected TypeResolution resolveParams() {
-        return resolveField().and(resolveQuery()).and(resolveOptions(options())).and(checkParamCompatibility());
+        return resolveField().and(resolveQuery()).and(resolveOptions(options(), THIRD)).and(checkParamCompatibility());
     }
 
     private TypeResolution resolveField() {

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

@@ -333,7 +333,7 @@ protected Map<String, Object> resolvedOptions() {
 
     @Override
     protected TypeResolution resolveParams() {
-        return resolveQuery().and(resolveOptions(options()));
+        return resolveQuery().and(resolveOptions(options(), SECOND));
     }
 
     @Override

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/VerifierTests.java

@@ -1217,9 +1217,9 @@ public void testMatchInsideEval() throws Exception {
 
     public void testMatchPhraseInsideEval() throws Exception {
         assertEquals(
-            "1:36: [:] operator is only supported in WHERE and STATS commands\n"
-                + "line 1:36: [:] operator cannot operate on [title], which is not a field from an index mapping",
-            error("row title = \"brown fox\" | eval x = match_phrase(title:\"fox\") ")
+            "1:36: [MatchPhrase] function is only supported in WHERE and STATS commands\n"
+                + "line 1:49: [MatchPhrase] function cannot operate on [title], which is not a field from an index mapping",
+            error("row title = \"brown fox\" | eval x = match_phrase(title, \"brown fox\") ")
         );
     }
 
@@ -1261,11 +1261,11 @@ public void testMatchWithNonIndexedColumnCurrentlyUnsupported() {
 
     public void testMatchPhraseWithNonIndexedColumnCurrentlyUnsupported() {
         assertEquals(
-            "1:67: [MATCH_PHRASE] function cannot operate on [initial], which is not a field from an index mapping",
+            "1:74: [MatchPhrase] function cannot operate on [initial], which is not a field from an index mapping",
             error("from test | eval initial = substring(first_name, 1) | where match_phrase(initial, \"A\")")
         );
         assertEquals(
-            "1:67: [MATCH_PHRASE] function cannot operate on [text], which is not a field from an index mapping",
+            "1:74: [MatchPhrase] function cannot operate on [text], which is not a field from an index mapping",
             error("from test | eval text=concat(first_name, last_name) | where match_phrase(text, \"cat\")")
         );
     }
@@ -1279,7 +1279,7 @@ public void testMatchFunctionIsNotNullable() {
 
     public void testMatchPhraseFunctionIsNotNullable() {
         assertEquals(
-            "1:48: [MATCH_PHRASE] function cannot operate on [text::keyword], which is not a field from an index mapping",
+            "1:55: [MatchPhrase] function cannot operate on [text::keyword], which is not a field from an index mapping",
             error("row n = null | eval text = n + 5 | where match_phrase(text::keyword, \"Anna\")")
         );
     }