Merge branch 'elastic:main' into bugfix/highlighting-for-constant_keyword-field-type

Author: piergm

.ci/matrix-runtime-javas.yml

@@ -11,3 +11,4 @@ ES_RUNTIME_JAVA:
   - openjdk18
   - openjdk19
   - openjdk20
+  - openjdk21

benchmarks/src/main/java/org/elasticsearch/benchmark/search/QueryParserHelperBenchmark.java

@@ -24,6 +24,7 @@
 import org.elasticsearch.common.compress.CompressedXContent;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.common.lucene.Lucene;
+import org.elasticsearch.common.settings.ClusterSettings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.LoggingDeprecationHandler;
 import org.elasticsearch.core.IOUtils;
@@ -138,6 +139,7 @@ protected SearchExecutionContext buildSearchExecutionContext() {
             0,
             0,
             mapperService.getIndexSettings(),
+            ClusterSettings.createBuiltInClusterSettings(),
             null,
             (ft, fdc) -> ft.fielddataBuilder(fdc).build(new IndexFieldDataCache.None(), new NoneCircuitBreakerService()),
             mapperService,

benchmarks/src/main/java/org/elasticsearch/benchmark/search/aggregations/AggConstructionContentionBenchmark.java

@@ -269,6 +269,11 @@ public IndexSettings getIndexSettings() {
             throw new UnsupportedOperationException();
         }
 
+        @Override
+        public ClusterSettings getClusterSettings() {
+            throw new UnsupportedOperationException();
+        }
+
         @Override
         public Optional<SortAndFormats> buildSort(List<SortBuilder<?>> sortBuilders) throws IOException {
             throw new UnsupportedOperationException();

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

@@ -58,6 +58,7 @@
 import javax.inject.Inject;
 
 import static org.gradle.api.JavaVersion.VERSION_20;
+import static org.gradle.api.JavaVersion.VERSION_21;
 
 @CacheableTask
 public abstract class ThirdPartyAuditTask extends DefaultTask {
@@ -337,8 +338,8 @@ private String runForbiddenAPIsCli() throws IOException {
                 spec.setExecutable(javaHome.get() + "/bin/java");
             }
             spec.classpath(getForbiddenAPIsClasspath(), classpath);
-            // Enable explicitly for each release as appropriate. Just JDK 20 for now, and just the vector module.
-            if (isJava20()) {
+            // Enable explicitly for each release as appropriate. Just JDK 20/21 for now, and just the vector module.
+            if (isJavaVersion(VERSION_20) || isJavaVersion(VERSION_21)) {
                 spec.jvmArgs("--add-modules", "jdk.incubator.vector");
             }
             spec.jvmArgs("-Xmx1g");
@@ -363,13 +364,13 @@ private String runForbiddenAPIsCli() throws IOException {
         return forbiddenApisOutput;
     }
 
-    /** Returns true iff the Java version is 20. */
-    private boolean isJava20() {
+    /** Returns true iff the build Java version is the same as the given version. */
+    private boolean isJavaVersion(JavaVersion version) {
         if (BuildParams.getIsRuntimeJavaHomeSet()) {
-            if (VERSION_20.equals(BuildParams.getRuntimeJavaVersion())) {
+            if (version.equals(BuildParams.getRuntimeJavaVersion())) {
                 return true;
             }
-        } else if ("20".equals(VersionProperties.getBundledJdkMajorVersion())) {
+        } else if (version.getMajorVersion().equals(VersionProperties.getBundledJdkMajorVersion())) {
             return true;
         }
         return false;

build-tools-internal/src/main/resources/changelog-schema.json

@@ -35,6 +35,7 @@
             "DLM",
             "Discovery-Plugins",
             "Distributed",
+            "Downsampling",
             "EQL",
             "Engine",
             "FIPS",
@@ -73,7 +74,6 @@
             "Ranking",
             "Recovery",
             "Reindex",
-            "Rollup",
             "SQL",
             "Search",
             "Security",

docs/changelog/96744.yaml

@@ -0,0 +1,5 @@
+pr: 96744
+summary: Support restricting access of API keys to only certain workflows
+area: Authorization
+type: feature
+issues: []

docs/changelog/96782.yaml

@@ -0,0 +1,5 @@
+pr: 96782
+summary: Increase concurrent request of opening point-in-time
+area: Search
+type: bug
+issues: []

docs/changelog/96878.yaml

@@ -0,0 +1,5 @@
+pr: 96878
+summary: Min score for time series
+area: TSDB
+type: bug
+issues: []

docs/changelog/96885.yaml

@@ -0,0 +1,5 @@
+pr: 96885
+summary: Add Search ALC filter index prefix to the enterprise search user
+area: Authorization
+type: enhancement
+issues: []