ES|QL: Fix generative tests (#129717)

Author: luigidellaquila

muted-tests.yml

@@ -562,9 +562,6 @@ tests:
 - class: org.elasticsearch.search.query.VectorIT
   method: testFilteredQueryStrategy
   issue: https://github.com/elastic/elasticsearch/issues/129517
-- class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeIT
-  method: test
-  issue: https://github.com/elastic/elasticsearch/issues/129453
 - class: org.elasticsearch.test.apmintegration.TracesApmIT
   method: testApmIntegration
   issue: https://github.com/elastic/elasticsearch/issues/129651

x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/generative/EsqlQueryGenerator.java

@@ -13,7 +13,6 @@
 import org.elasticsearch.xpack.esql.qa.rest.generative.command.pipe.DropGenerator;
 import org.elasticsearch.xpack.esql.qa.rest.generative.command.pipe.EnrichGenerator;
 import org.elasticsearch.xpack.esql.qa.rest.generative.command.pipe.EvalGenerator;
-import org.elasticsearch.xpack.esql.qa.rest.generative.command.pipe.ForkGenerator;
 import org.elasticsearch.xpack.esql.qa.rest.generative.command.pipe.GrokGenerator;
 import org.elasticsearch.xpack.esql.qa.rest.generative.command.pipe.KeepGenerator;
 import org.elasticsearch.xpack.esql.qa.rest.generative.command.pipe.LimitGenerator;
@@ -54,7 +53,8 @@ public record QueryExecuted(String query, int depth, List<Column> outputSchema,
         DropGenerator.INSTANCE,
         EnrichGenerator.INSTANCE,
         EvalGenerator.INSTANCE,
-        ForkGenerator.INSTANCE,
+        // Awaits fix: https://github.com/elastic/elasticsearch/issues/129715
+        // ForkGenerator.INSTANCE,
         GrokGenerator.INSTANCE,
         KeepGenerator.INSTANCE,
         LimitGenerator.INSTANCE,

x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/generative/command/pipe/LimitGenerator.java

@@ -42,15 +42,9 @@ public ValidationResult validateOutput(
         List<List<Object>> output
     ) {
         int limit = (int) commandDescription.context().get(LIMIT);
-        boolean defaultLimit = false;
-        for (CommandDescription previousCommand : previousCommands) {
-            if (previousCommand.commandName().equals(LIMIT)) {
-                defaultLimit = true;
-            }
-        }
 
-        if (previousOutput.size() > limit && output.size() != limit || defaultLimit && previousOutput.size() < output.size()) {
-            return new ValidationResult(false, "Expecting [" + limit + "] records, got [" + output.size() + "]");
+        if (output.size() > limit) {
+            return new ValidationResult(false, "Expecting at most [" + limit + "] records, got [" + output.size() + "]");
         }
         return CommandGenerator.expectSameColumns(previousColumns, columns);
     }