Refactor query options

Author: carlosdelest

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

@@ -14,6 +14,7 @@
 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.Expression;
 import org.elasticsearch.xpack.esql.core.expression.FieldAttribute;
 import org.elasticsearch.xpack.esql.core.expression.FoldContext;
@@ -30,9 +31,9 @@
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 
+import static org.elasticsearch.index.query.MatchQueryBuilder.LENIENT_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.isNotNull;
@@ -216,9 +217,16 @@ protected Query translate(TranslatorHandler handler) {
                 fieldName = multiTypeEsField.getName();
             }
             // Make query lenient so mixed field types can be queried when a field type is incompatible with the value provided
-            return new MatchQuery(source(), fieldName, queryAsObject(), Map.of("lenient", "true"));
+            return new MatchQuery(source(), fieldName, queryAsObject(), matchQueryOptions());
         }
 
         throw new IllegalArgumentException("Match must have a field attribute as the first argument");
     }
+
+    /**
+     * Returns the query options for the match query
+     */
+    protected Map<String, Object> matchQueryOptions() throws InvalidArgumentException {
+        return Map.of(LENIENT_FIELD.getPreferredName(), true);
+    }
 }

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

@@ -238,24 +238,25 @@ private TypeResolution resolveOptions() {
             }
 
             try {
-                parseOptions();
+                matchQueryOptions();
             } catch (InvalidArgumentException e) {
                 return new TypeResolution(e.getMessage());
             }
         }
         return TypeResolution.TYPE_RESOLVED;
     }
 
+    @Override
+    protected Map<String, Object> matchQueryOptions() throws InvalidArgumentException {
+
+        if (options() == null) {
+            return super.matchQueryOptions();
+        }
 
-    private Map<String, Object> parseOptions() throws InvalidArgumentException {
         Map<String, Object> matchOptions = new HashMap<>();
         // Match is lenient by default to avoid failing on incompatible types
         matchOptions.put(LENIENT_FIELD.getPreferredName(), true);
 
-        if (options() == null) {
-            return matchOptions;
-        }
-
         for (EntryExpression entry : ((MapExpression) options()).entryExpressions()) {
             Expression optionExpr = entry.key();
             Expression valueExpr = entry.value();