Improve RerankFunction tests.

Author: afoucret

docs/reference/query-languages/esql/_snippets/functions/description/rerank.md

@@ -52,6 +52,7 @@
 import org.elasticsearch.xpack.esql.expression.function.fulltext.Term;
 import org.elasticsearch.xpack.esql.expression.function.grouping.Bucket;
 import org.elasticsearch.xpack.esql.expression.function.grouping.Categorize;
+import org.elasticsearch.xpack.esql.expression.function.inference.RerankFunction;
 import org.elasticsearch.xpack.esql.expression.function.scalar.conditional.Case;
 import org.elasticsearch.xpack.esql.expression.function.scalar.conditional.Greatest;
 import org.elasticsearch.xpack.esql.expression.function.scalar.conditional.Least;
@@ -487,7 +488,8 @@ private static FunctionDefinition[][] snapshotFunctions() {
                 def(LastOverTime.class, LastOverTime::withUnresolvedTimestamp, "last_over_time"),
                 def(FirstOverTime.class, FirstOverTime::withUnresolvedTimestamp, "first_over_time"),
                 def(Term.class, bi(Term::new), "term"),
-                def(Knn.class, tri(Knn::new), "knn") } };
+                def(Knn.class, tri(Knn::new), "knn"),
+                def(RerankFunction.class, tri(RerankFunction::new), "rerank") } };
     }
 
     public EsqlFunctionRegistry snapshotRegistry() {

docs/reference/query-languages/esql/_snippets/functions/functionNamedParams/rerank.md

@@ -7,13 +7,10 @@
 
 package org.elasticsearch.xpack.esql.expression.function.inference;
 
-import org.elasticsearch.logging.LogManager;
-import org.elasticsearch.xpack.esql.core.InvalidArgumentException;
 import org.elasticsearch.xpack.esql.core.expression.Attribute;
 import org.elasticsearch.xpack.esql.core.expression.Expression;
 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.expression.function.Function;
 import org.elasticsearch.xpack.esql.core.tree.Source;
 import org.elasticsearch.xpack.esql.core.type.DataType;
@@ -47,12 +44,12 @@ public Expression options() {
 
     public abstract List<Attribute> temporaryAttributes();
 
-    protected Expression readOption(String optionName,  TypeResolutions.ParamOrdinal optionParamOrd, Expression options) {
-        return readOption(optionName, optionParamOrd, options, Literal.NULL);
+    protected Expression readOption(String optionName, Expression options) {
+        return readOption(optionName, options, Literal.NULL);
     }
 
-    protected Expression readOption(String optionName,  TypeResolutions.ParamOrdinal optionParamOrd, Expression options, Expression defaultValue) {
-        if (options != null && options.dataType() != DataType.NULL &&  options instanceof MapExpression mapOptions) {
+    protected Expression readOption(String optionName, Expression options, Expression defaultValue) {
+        if (options != null && options.dataType() != DataType.NULL && options instanceof MapExpression mapOptions) {
             return mapOptions.getOrDefault(optionName, defaultValue);
         }
 
@@ -65,7 +62,7 @@ protected TypeResolution resolveType() {
             return new TypeResolution("Unresolved children");
         }
 
-        return resolveOptions().and(resolveParams());
+        return resolveParams().and(resolveOptions());
     }
 
     protected abstract TypeResolution resolveParams();