Merge branch 'main' into transport/resolve_cherry_pick

Author: rjernst

benchmarks/src/main/java/org/elasticsearch/benchmark/_nightly/esql/QueryPlanningBenchmark.java

@@ -96,7 +96,8 @@ public void setup() {
             false,
             AnalyzerSettings.QUERY_TIMESERIES_RESULT_TRUNCATION_DEFAULT_SIZE.getDefault(Settings.EMPTY),
             AnalyzerSettings.QUERY_TIMESERIES_RESULT_TRUNCATION_DEFAULT_SIZE.get(Settings.EMPTY),
-            null
+            null,
+            Map.of()
         );
 
         var fields = 10_000;

benchmarks/src/main/java/org/elasticsearch/benchmark/compute/operator/AggregatorBenchmark.java

@@ -201,6 +201,8 @@ private static Operator operator(DriverContext driverContext, String grouping, S
         return new HashAggregationOperator(
             List.of(supplier(op, dataType, filter).groupingAggregatorFactory(AggregatorMode.SINGLE, List.of(groups.size()))),
             () -> BlockHash.build(groups, driverContext.blockFactory(), 16 * 1024, false),
+            Integer.MAX_VALUE,
+            1.0,
             driverContext
         );
     }

benchmarks/src/main/java/org/elasticsearch/benchmark/compute/operator/EvalBenchmark.java

@@ -376,7 +376,8 @@ private static Configuration configuration() {
             false,
             AnalyzerSettings.QUERY_TIMESERIES_RESULT_TRUNCATION_MAX_SIZE.getDefault(Settings.EMPTY),
             AnalyzerSettings.QUERY_TIMESERIES_RESULT_TRUNCATION_DEFAULT_SIZE.getDefault(Settings.EMPTY),
-            null
+            null,
+            Map.of()
         );
     }
 

benchmarks/src/main/java/org/elasticsearch/benchmark/compute/operator/ValuesAggregatorBenchmark.java

@@ -124,6 +124,8 @@ private static Operator operator(DriverContext driverContext, int groups, String
         return new HashAggregationOperator(
             List.of(supplier(dataType).groupingAggregatorFactory(mode, List.of(1))),
             () -> BlockHash.build(groupSpec, driverContext.blockFactory(), 16 * 1024, false),
+            Integer.MAX_VALUE,
+            1.0,
             driverContext
         ) {
             @Override

branches.json

@@ -20,10 +20,6 @@
     {
       "branch" : "8.19",
       "version" : "8.19.11"
-    },
-    {
-      "branch" : "7.17",
-      "version" : "7.17.30"
     }
   ]
 }

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

@@ -71,7 +71,6 @@ private static ListMultimap<Class<?>, String> createLegacyRestTestBasePluginUsag
         map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:sql:qa:jdbc:single-node");
         map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:sql:qa:jdbc:security:with-ssl");
         map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:sql:qa:jdbc:security:without-ssl");
-        map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:sql:qa:mixed-node");
         map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:sql:qa:server:security:with-ssl");
         map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:sql:qa:server:security:without-ssl");
         map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:text-structure:qa:text-structure-with-security");

distribution/docker/build.gradle

@@ -26,7 +26,7 @@ boolean useLocalArtifacts = buildId != null && buildId.isBlank() == false && use
 
 // FIPS version for Docker builds: '140-2' (default) or '140-3'
 // Use -Ddocker.fips.version=140-3 to build with FIPS 140-3 / BC 2.x libraries
-ext.isFips140_3 = providers.systemProperty('docker.fips.version').getOrElse('140-2') == '140-3'
+ext.isFips140_3 = providers.systemProperty('docker.fips.version').getOrElse('140-3') == '140-3'
 
 repositories {
   // Define a repository that allows Gradle to fetch a resource from GitHub. This

docs/changelog/134995.yaml

@@ -0,0 +1,11 @@
+pr: 134995
+summary: ES|QL Views support
+area: ES|QL
+type: feature
+issues: []
+highlight:
+  title: "ES|QL Views support"
+  body: |-
+    ES|QL now supports Views, allowing users to create reusable query components that can be referenced in multiple queries.
+    This feature enhances query modularity and maintainability,
+    making it easier to manage complex queries by breaking them down into simpler, reusable parts.

docs/changelog/140788.yaml

@@ -0,0 +1,5 @@
+pr: 140788
+summary: Flip cloud-ess-fips default from FIPS 140-2 to FIPS 140-3
+area: Packaging
+type: enhancement
+issues: []

docs/changelog/141242.yaml

@@ -0,0 +1,8 @@
+pr: 141242
+summary: Deep copy `BytesRef` when creating a constant vector block
+area: ES|QL
+type: bug
+issues:
+ - 140615
+ - 140809
+ - 140621