Merge remote-tracking branch 'upstream/main' into es819-merge-optimization

Author: jordan-powers

muted-tests.yml

@@ -414,6 +414,9 @@ tests:
 - class: org.elasticsearch.repositories.blobstore.testkit.analyze.RepositoryAnalysisFailureIT
   method: testFailsOnReadError
   issue: https://github.com/elastic/elasticsearch/issues/127029
+- class: org.elasticsearch.xpack.test.rest.XPackRestIT
+  method: test {p0=esql/10_basic/basic with documents_found}
+  issue: https://github.com/elastic/elasticsearch/issues/127039
 
 # Examples:
 #

server/src/main/java/org/elasticsearch/TransportVersions.java

@@ -222,10 +222,14 @@ static TransportVersion def(int id) {
     public static final TransportVersion REPO_ANALYSIS_COPY_BLOB = def(9_048_0_00);
     public static final TransportVersion AMAZON_BEDROCK_TASK_SETTINGS = def(9_049_0_00);
     public static final TransportVersion ESQL_REPORT_SHARD_PARTITIONING = def(9_050_0_00);
-    public static final TransportVersion ESQL_QUERY_PLANNING_DURATION = def(9_051_0_00);
-    public static final TransportVersion ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED = def(9_052_0_00);
-    public static final TransportVersion BATCHED_QUERY_EXECUTION_DELAYABLE_WRITABLE = def(9_053_0_00);
-    public static final TransportVersion SEARCH_INCREMENTAL_TOP_DOCS_NULL = def(9_054_0_00);
+    public static final TransportVersion DEAD_ESQL_QUERY_PLANNING_DURATION = def(9_051_0_00);
+    public static final TransportVersion DEAD_ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED = def(9_052_0_00);
+    public static final TransportVersion DEAD_BATCHED_QUERY_EXECUTION_DELAYABLE_WRITABLE = def(9_053_0_00);
+    public static final TransportVersion DEAD_SEARCH_INCREMENTAL_TOP_DOCS_NULL = def(9_054_0_00);
+    public static final TransportVersion ESQL_QUERY_PLANNING_DURATION = def(9_055_0_00);
+    public static final TransportVersion ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED = def(9_056_0_00);
+    public static final TransportVersion BATCHED_QUERY_EXECUTION_DELAYABLE_WRITABLE = def(9_057_0_00);
+    public static final TransportVersion SEARCH_INCREMENTAL_TOP_DOCS_NULL = def(9_058_0_00);
 
     /*
      * STOP! READ THIS FIRST! No, really,

x-pack/plugin/esql/compute/build.gradle

@@ -862,4 +862,27 @@ tasks.named('stringTemplates').configure {
     it.outputFile = "org/elasticsearch/xpack/compute/operator/lookup/EnrichResultBuilderForBoolean.java"
   }
 
+  // TODO: add last_over_time for other types: boolean, bytes_refs
+  File lastOverTimeAggregatorInputFile = file("src/main/java/org/elasticsearch/compute/aggregation/X-LastOverTimeAggregator.java.st")
+  template {
+    it.properties = intProperties
+    it.inputFile = lastOverTimeAggregatorInputFile
+    it.outputFile = "org/elasticsearch/compute/aggregation/LastOverTimeIntAggregator.java"
+  }
+  template {
+    it.properties = longProperties
+    it.inputFile = lastOverTimeAggregatorInputFile
+    it.outputFile = "org/elasticsearch/compute/aggregation/LastOverTimeLongAggregator.java"
+  }
+  template {
+    it.properties = floatProperties
+    it.inputFile = lastOverTimeAggregatorInputFile
+    it.outputFile = "org/elasticsearch/compute/aggregation/LastOverTimeFloatAggregator.java"
+  }
+  template {
+    it.properties = doubleProperties
+    it.inputFile = lastOverTimeAggregatorInputFile
+    it.outputFile = "org/elasticsearch/compute/aggregation/LastOverTimeDoubleAggregator.java"
+  }
+
 }