Refactor parameters resolution

Author: carlosdelest

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

@@ -72,34 +72,25 @@ protected final TypeResolution resolveType() {
             return new TypeResolution("Unresolved children");
         }
 
-        return resolveNonQueryParamTypes().and(resolveQueryParamType().and(checkParamCompatibility()));
+        return resolveParams();
     }
 
     /**
-     * Checks parameter specific compatibility, to be overriden by subclasses
+     * Resolves the type for the function parameters, as part of the type resolution for the function
      *
-     * @return TypeResolution for param compatibility
+     * @return type resolution for the function parameters
      */
-    protected TypeResolution checkParamCompatibility() {
-        return TypeResolution.TYPE_RESOLVED;
+    protected TypeResolution resolveParams() {
+        return resolveQuery(DEFAULT);
     }
 
     /**
      * Resolves the type for the query parameter, as part of the type resolution for the function
      *
-     * @return type resolution for query parameter
+     * @return type resolution for the query parameter
      */
-    protected TypeResolution resolveQueryParamType() {
-        return isString(query(), sourceText(), queryParamOrdinal()).and(isNotNullAndFoldable(query(), sourceText(), queryParamOrdinal()));
-    }
-
-    /**
-     * Subclasses can override this method for custom type resolution for additional function parameters
-     *
-     * @return type resolution for non-query parameter types
-     */
-    protected TypeResolution resolveNonQueryParamTypes() {
-        return TypeResolution.TYPE_RESOLVED;
+    protected TypeResolution resolveQuery(TypeResolutions.ParamOrdinal queryOrdinal) {
+        return isString(query(), sourceText(), queryOrdinal).and(isNotNullAndFoldable(query(), sourceText(), queryOrdinal));
     }
 
     public Expression query() {
@@ -120,15 +111,6 @@ public Object queryAsObject() {
         return queryAsObject;
     }
 
-    /**
-     * Returns the param ordinal for the query parameter so it can be used in error messages
-     *
-     * @return Query ordinal for the
-     */
-    protected TypeResolutions.ParamOrdinal queryParamOrdinal() {
-        return DEFAULT;
-    }
-
     @Override
     public Nullability nullable() {
         return Nullability.FALSE;

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

@@ -68,6 +68,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.isFoldable;
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isMapExpression;
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isNotNull;
@@ -277,8 +278,12 @@ public String getWriteableName() {
     }
 
     @Override
-    protected TypeResolution resolveNonQueryParamTypes() {
-        TypeResolution resolution = isNotNull(field, sourceText(), FIRST).and(
+    protected TypeResolution resolveParams() {
+        return resolveField().and(resolveQuery()).and(resolveOptions()).and(checkParamCompatibility());
+    }
+
+    private TypeResolution resolveField() {
+        return isNotNull(field, sourceText(), FIRST).and(
             isType(
                 field,
                 FIELD_DATA_TYPES::contains,
@@ -287,14 +292,16 @@ protected TypeResolution resolveNonQueryParamTypes() {
                 "keyword, text, boolean, date, date_nanos, double, integer, ip, long, unsigned_long, version"
             )
         );
-        if (resolution.unresolved()) {
-            return resolution;
-        }
+    }
 
-        // TODO Extract common logic for validating options
+    private TypeResolution resolveOptions() {
         if (options() != null && EsqlCapabilities.Cap.MATCH_FUNCTION_OPTIONS.isEnabled()) {
+            TypeResolution resolution = isNotNull(options(), sourceText(), THIRD);
+            if (resolution.unresolved()) {
+                return resolution;
+            }
             // MapExpression does not have a DataType associated with it
-            resolution = isMapExpression(options(), sourceText(), SECOND);
+            resolution = isMapExpression(options(), sourceText(), THIRD);
             if (resolution.unresolved()) {
                 return resolution;
             }
@@ -308,6 +315,16 @@ protected TypeResolution resolveNonQueryParamTypes() {
         return TypeResolution.TYPE_RESOLVED;
     }
 
+    private TypeResolution resolveQuery() {
+        return isType(
+            query(),
+            QUERY_DATA_TYPES::contains,
+            sourceText(),
+            queryParamOrdinal(),
+            "keyword, boolean, date, date_nanos, double, integer, ip, long, unsigned_long, version"
+        ).and(isNotNullAndFoldable(query(), sourceText(), SECOND));
+    }
+
     private Map<String, Object> parseOptions() throws InvalidArgumentException {
         Map<String, Object> matchOptions = new HashMap<>();
         // Match is lenient by default to avoid failing on incompatible types
@@ -347,19 +364,7 @@ private Map<String, Object> parseOptions() throws InvalidArgumentException {
         return matchOptions;
     }
 
-    @Override
-    protected TypeResolution resolveQueryParamType() {
-        return isType(
-            query(),
-            QUERY_DATA_TYPES::contains,
-            sourceText(),
-            queryParamOrdinal(),
-            "keyword, boolean, date, date_nanos, double, integer, ip, long, unsigned_long, version"
-        ).and(isNotNullAndFoldable(query(), sourceText(), queryParamOrdinal()));
-    }
-
-    @Override
-    protected TypeResolution checkParamCompatibility() {
+    private TypeResolution checkParamCompatibility() {
         DataType fieldType = field().dataType();
         DataType queryType = query().dataType();
 

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

@@ -95,8 +95,12 @@ public String getWriteableName() {
     }
 
     @Override
-    protected TypeResolution resolveNonQueryParamTypes() {
-        return isNotNull(field, sourceText(), FIRST).and(isString(field, sourceText(), FIRST)).and(super.resolveNonQueryParamTypes());
+    protected TypeResolution resolveParams() {
+        return resolveField().and(resolveQuery(SECOND));
+    }
+
+    private TypeResolution resolveField() {
+        return isNotNull(field, sourceText(), FIRST).and(isString(field, sourceText(), FIRST));
     }
 
     @Override