Merge branch 'main' into es-12656-mv-rcs-settings

Author: JeremyDahlgren

build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/transport/TransportVersionManagementPluginFuncTest.groovy

@@ -46,8 +46,8 @@ class TransportVersionManagementPluginFuncTest extends AbstractGradleFuncTest {
         javaResource("myserver", "transport/definitions/named/" + name + ".csv", ids)
     }
 
-    def initialTransportVersion(String name, String id) {
-        javaResource("myserver", "transport/definitions/initial/" + name + ".csv", id)
+    def unreferencedTransportVersion(String name, String id) {
+        javaResource("myserver", "transport/definitions/unreferenced/" + name + ".csv", id)
     }
 
     def definedAndUsedTransportVersion(String name, String ids) {
@@ -101,7 +101,7 @@ class TransportVersionManagementPluginFuncTest extends AbstractGradleFuncTest {
         """
         namedTransportVersion("existing_91", "8012000")
         namedTransportVersion("existing_92", "8123000,8012001")
-        initialTransportVersion("initial_9_0_0", "8000000")
+        unreferencedTransportVersion("initial_9_0_0", "8000000")
         latestTransportVersion("9.2", "existing_92", "8123000")
         latestTransportVersion("9.1", "existing_92", "8012001")
         // a mock version of TransportVersion, just here so we can compile Dummy.java et al
@@ -303,4 +303,14 @@ class TransportVersionManagementPluginFuncTest extends AbstractGradleFuncTest {
         assertDefinitionsFailure(result, "Transport version definition file " +
             "[myserver/src/main/resources/transport/definitions/named/patch.csv] has patch version 8015001 as primary id")
     }
+
+    def "unreferenced directory is optional"() {
+        given:
+        file("myserver/src/main/resources/transport/unreferenced/initial_9_0_0.csv").delete()
+        file("myserver/src/main/resources/transport/unreferenced").deleteDir()
+        when:
+        def result = gradleRunner(":myserver:validateTransportVersionDefinitions").build()
+        then:
+        result.task(":myserver:validateTransportVersionDefinitions").outcome == TaskOutcome.SUCCESS
+    }
 }

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/ValidateTransportVersionResourcesTask.java

@@ -107,10 +107,13 @@ public void validateTransportVersions() throws IOException {
         // now load all definitions, do some validation and record them by various keys for later quick lookup
         // NOTE: this must run after loading referenced names and existing definitions
         // NOTE: this is sorted so that the order of cross validation is deterministic
-        for (String subDir : List.of("initial", "named")) {
-            try (var definitionsStream = Files.list(definitionsDir.resolve(subDir)).sorted()) {
-                for (var definitionFile : definitionsStream.toList()) {
-                    recordAndValidateDefinition(readDefinitionFile(definitionFile));
+        for (String subDirName : List.of("unreferenced", "named")) {
+            Path subDir = definitionsDir.resolve(subDirName);
+            if (Files.isDirectory(subDir)) {
+                try (var definitionsStream = Files.list(subDir).sorted()) {
+                    for (var definitionFile : definitionsStream.toList()) {
+                        recordAndValidateDefinition(readDefinitionFile(definitionFile));
+                    }
                 }
             }
         }

docs/reference/query-languages/esql/_snippets/functions/types/max.md

@@ -118,7 +118,7 @@ public class ElasticsearchException extends RuntimeException implements ToXConte
     private static final String ROOT_CAUSE = "root_cause";
 
     static final String TIMED_OUT_HEADER = "X-Timed-Out";
-    static final String EXCEPTION_TYPE_HEADER = "X-Elasticsearch-Exception";
+    static final String EXCEPTION_TYPE_HEADER = "X-Elastic-App-Exception";
 
     private static final Map<Integer, CheckedFunction<StreamInput, ? extends ElasticsearchException, IOException>> ID_TO_SUPPLIER;
     private static final Map<Class<? extends ElasticsearchException>, ElasticsearchExceptionHandle> CLASS_TO_ELASTICSEARCH_EXCEPTION_HANDLE;

docs/reference/query-languages/esql/_snippets/functions/types/max_over_time.md

@@ -21,8 +21,8 @@
 import org.elasticsearch.compute.data.Page;
 import org.elasticsearch.compute.operator.Driver;
 import org.elasticsearch.compute.operator.DriverContext;
-import org.elasticsearch.compute.test.AnyOperatorTestCase;
 import org.elasticsearch.compute.test.OperatorTestCase;
+import org.elasticsearch.compute.test.SourceOperatorTestCase;
 import org.elasticsearch.compute.test.TestDriverFactory;
 import org.elasticsearch.compute.test.TestResultPageSinkOperator;
 import org.elasticsearch.core.IOUtils;
@@ -41,7 +41,7 @@
 import static org.hamcrest.Matchers.lessThanOrEqualTo;
 import static org.hamcrest.Matchers.matchesRegex;
 
-public class LuceneCountOperatorTests extends AnyOperatorTestCase {
+public class LuceneCountOperatorTests extends SourceOperatorTestCase {
     private Directory directory = newDirectory();
     private IndexReader reader;