Fix tests

Author: carlosdelest

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

@@ -202,11 +202,12 @@ testMatchIpField
 required_capability: match_function
 required_capability: match_additional_types
 
-from clientips
-| where match(client_ip, "172.21.3.15");
+from sample_data
+| where match(client_ip,"172.21.0.5")
+| keep client_ip, message;
 
-client_ip:keyword   | env:keyword
-172.21.3.15         | Production
+client_ip:ip   | message:keyword
+172.21.0.5     | Disconnected
 ;
 
 testMatchDateField

x-pack/plugin/esql/qa/testFixtures/src/main/resources/match-operator.csv-spec

@@ -222,11 +222,12 @@ testMatchIpField
 required_capability: match_operator_colon
 required_capability: match_additional_types
 
-from clientips
-| where client_ip:"172.21.3.15";
+from sample_data
+| where client_ip:"172.21.0.5"
+| keep client_ip, message;
 
-client_ip:keyword   | env:keyword
-172.21.3.15         | Production
+client_ip:ip   | message:keyword
+172.21.0.5     | Disconnected
 ;
 
 testMatchDateField

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/MatchOperatorIT.java

@@ -11,7 +11,6 @@
 import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.action.support.WriteRequest;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.test.junit.annotations.TestLogging;
 import org.elasticsearch.xpack.esql.VerificationException;
 import org.elasticsearch.xpack.esql.action.AbstractEsqlIntegTestCase;
 import org.junit.Before;
@@ -21,7 +20,7 @@
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.hamcrest.CoreMatchers.containsString;
 
-@TestLogging(value = "org.elasticsearch.xpack.esql:TRACE,org.elasticsearch.compute:TRACE", reason = "debug")
+//@TestLogging(value = "org.elasticsearch.xpack.esql:TRACE,org.elasticsearch.compute:TRACE", reason = "debug")
 public class MatchOperatorIT extends AbstractEsqlIntegTestCase {
 
     @Before
@@ -197,11 +196,15 @@ public void testMatchWithinEval() {
     public void testMatchWithNonTextField() {
         var query = """
             FROM test
-            | WHERE id:"fox"
+            | WHERE id:3
+            | KEEP id
             """;
 
-        var error = expectThrows(VerificationException.class, () -> run(query));
-        assertThat(error.getMessage(), containsString("first argument of [id:\"fox\"] must be [string], found value [id] type [integer]"));
+        try (var resp = run(query)) {
+            assertColumnNames(resp.columns(), List.of("id"));
+            assertColumnTypes(resp.columns(), List.of("integer"));
+            assertValues(resp.values(), List.of(List.of(3)));
+        }
     }
 
     private void createAndPopulateIndex() {

x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/180_match_operator.yml

@@ -6,7 +6,6 @@ setup:
           path: /_query
           parameters: [ method, path, parameters, capabilities ]
           capabilities: [ match_operator_colon ]
-      cluster_features: [ "gte_v8.16.0" ]
       reason: "Match operator added in 8.16.0"
       test_runner_features: [capabilities, allowed_warnings_regex]
   - do:
@@ -97,6 +96,13 @@ setup:
 
 ---
 "match with integer field":
+  - requires:
+      capabilities:
+        - method: POST
+          path: /_query
+          parameters: [ method, path, parameters, capabilities ]
+          capabilities: [ match_additional_types ]
+      reason: "Additional types support for match"
   - do:
       allowed_warnings_regex:
         - "No limit defined, adding default limit of \\[.*\\]"