Fixes

Author: svilen-mihaylov-elastic

x-pack/plugin/esql/qa/testFixtures/src/main/resources/qstr-function.csv-spec

@@ -193,11 +193,13 @@ qstrWithFieldAndOptions
 required_capability: qstr_function
 required_capability: query_string_function_options
 
+// tag::qstr-with-options[]
 FROM books 
 | WHERE QSTR("title: Hobbjt~", {"fuzziness": 2})
 | KEEP book_no, title 
 | SORT book_no 
 | LIMIT 5
+// end::qstr-with-options[]
 ;
 ignoreOrder: true
 

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

@@ -63,7 +63,6 @@
 import static org.elasticsearch.index.query.QueryStringQueryBuilder.TIME_ZONE_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;
@@ -115,7 +114,9 @@ public class QueryString extends FullTextFunction implements OptionalArgument {
         preview = true,
         description = "Performs a <<query-dsl-query-string-query,query string query>>. "
             + "Returns true if the provided query string matches the row.",
-        examples = { @Example(file = "qstr-function", tag = "qstr-with-field") }
+        examples = {
+            @Example(file = "qstr-function", tag = "qstr-with-field"),
+            @Example(file = "qstr-function", tag = "qstr-with-options") }
     )
     public QueryString(
         Source source,
@@ -349,12 +350,12 @@ private Map<String, Object> queryStringOptions() throws InvalidArgumentException
 
     private TypeResolution resolveOptions() {
         if (options() != null) {
-            TypeResolution resolution = isNotNull(options(), sourceText(), THIRD);
+            TypeResolution resolution = isNotNull(options(), sourceText(), SECOND);
             if (resolution.unresolved()) {
                 return resolution;
             }
             // MapExpression does not have a DataType associated with it
-            resolution = isMapExpression(options(), sourceText(), THIRD);
+            resolution = isMapExpression(options(), sourceText(), SECOND);
             if (resolution.unresolved()) {
                 return resolution;
             }

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/fulltext/QueryStringErrorTests.java

@@ -64,7 +64,7 @@ private static String errorMessageStringForMatch(
             if (validPerPosition.get(i).contains(signature.get(i)) == false) {
                 // Map expressions have different error messages
                 if (i == 1) {
-                    return format(null, "third argument of [{}] must be a map expression, received []", sourceForSignature(signature));
+                    return format(null, "second argument of [{}] must be a map expression, received []", sourceForSignature(signature));
                 }
                 break;
             }