Merge branch 'main' into enhancement/46453

elastic · Apr 1, 2024 · 0c2ceb9 · 0c2ceb9
2 parents b0ac3d1 + 89bf4b3
commit 0c2ceb9
Show file tree

Hide file tree

Showing 318 changed files with 2,452 additions and 1,399 deletions.
diff --git a/...main/java/org/elasticsearch/gradle/internal/conventions/precommit/LicenseHeadersTask.java b/...main/java/org/elasticsearch/gradle/internal/conventions/precommit/LicenseHeadersTask.java
@@ -25,6 +25,7 @@
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.file.ProjectLayout;
 import org.gradle.api.file.RegularFileProperty;
+import org.gradle.api.model.ObjectFactory;
 import org.gradle.api.provider.ListProperty;
 import org.gradle.api.tasks.CacheableTask;
 import org.gradle.api.tasks.IgnoreEmptyDirectories;
@@ -39,21 +40,22 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
-import org.gradle.api.model.ObjectFactory;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
+
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.io.Serializable;
 import java.io.Writer;
 import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.inject.Inject;
-import java.io.Serializable;
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
 
 /**
  * Checks files for license headers..
@@ -232,7 +234,7 @@ private ClaimStatistic toXmlReportFile(ReportConfiguration config, Writer writer
 
     private static List<String> unapprovedFiles(File xmlReportFile) {
         try {
-            NodeList resourcesNodes = DocumentBuilderFactory.newInstance()
+            NodeList resourcesNodes = createXmlDocumentBuilderFactory()
                 .newDocumentBuilder()
                 .parse(xmlReportFile)
                 .getElementsByTagName("resource");
@@ -249,6 +251,21 @@ private static List<String> unapprovedFiles(File xmlReportFile) {
         }
     }
 
+    private static DocumentBuilderFactory createXmlDocumentBuilderFactory() throws ParserConfigurationException {
+        final DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        dbf.setXIncludeAware(false);
+        dbf.setIgnoringComments(true);
+        dbf.setExpandEntityReferences(false);
+        dbf.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "");
+        dbf.setAttribute(XMLConstants.ACCESS_EXTERNAL_SCHEMA, "");
+        dbf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+        dbf.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+        dbf.setFeature("http://xml.org/sax/features/external-general-entities", false);
+        dbf.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+        dbf.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+        return dbf;
+    }
+
     private static List<Element> elementList(NodeList resourcesNodes) {
         List<Element> nodeList = new ArrayList<>(resourcesNodes.getLength());
         for (int idx = 0; idx < resourcesNodes.getLength(); idx++) {

diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/MrjarPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/MrjarPlugin.java
@@ -8,8 +8,10 @@
 
 package org.elasticsearch.gradle.internal;
 
+import org.elasticsearch.gradle.internal.info.BuildParams;
 import org.elasticsearch.gradle.internal.precommit.CheckForbiddenApisTask;
 import org.elasticsearch.gradle.util.GradleUtils;
+import org.gradle.api.JavaVersion;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.file.FileCollection;
@@ -151,8 +153,18 @@ private void createTestTask(Project project, SourceSet sourceSet, int javaVersio
             testTask.setClasspath(testRuntime.plus(project.files(jarTask)));
             testTask.setTestClassesDirs(sourceSet.getOutput().getClassesDirs());
 
-            testTask.getJavaLauncher()
-                .set(javaToolchains.launcherFor(spec -> spec.getLanguageVersion().set(JavaLanguageVersion.of(javaVersion))));
+            // only set the jdk if runtime java isn't set because setting the toolchain is incompatible with
+            // runtime java setting the executable directly
+            if (BuildParams.getIsRuntimeJavaHomeSet()) {
+                testTask.onlyIf("runtime java must support java " + javaVersion, t -> {
+                    JavaVersion runtimeJavaVersion = BuildParams.getRuntimeJavaVersion();
+                    return runtimeJavaVersion.isCompatibleWith(JavaVersion.toVersion(javaVersion));
+                });
+            } else {
+                testTask.getJavaLauncher()
+                    .set(javaToolchains.launcherFor(spec -> spec.getLanguageVersion().set(JavaLanguageVersion.of(javaVersion))));
+            }
+
         });
 
         project.getTasks().named("check").configure(checkTask -> checkTask.dependsOn(testTaskProvider));

diff --git a/docs/changelog/106836.yaml b/docs/changelog/106836.yaml
@@ -0,0 +1,5 @@
+pr: 106836
+summary: Make int8_hnsw our default index for new dense-vector fields
+area: Mapping
+type: enhancement
+issues: []
diff --git a/docs/changelog/106840.yaml b/docs/changelog/106840.yaml
@@ -0,0 +1,6 @@
+pr: 106840
+summary: Add total size in bytes to doc stats
+area: Stats
+type: enhancement
+issues:
+ - 97670
diff --git a/docs/changelog/106873.yaml b/docs/changelog/106873.yaml
@@ -0,0 +1,6 @@
+pr: 106873
+summary: Query API Key Information API support for the `typed_keys` request parameter
+area: Security
+type: enhancement
+issues:
+ - 106817
diff --git a/docs/changelog/106878.yaml b/docs/changelog/106878.yaml
@@ -0,0 +1,5 @@
+pr: 106878
+summary: Gate reading of optional string array for bwc
+area: Downsampling
+type: bug
+issues: []
diff --git a/docs/changelog/106889.yaml b/docs/changelog/106889.yaml
@@ -0,0 +1,5 @@
+pr: 106889
+summary: Slightly better geoip `databaseType` validation
+area: Ingest Node
+type: bug
+issues: []
diff --git a/docs/changelog/106919.yaml b/docs/changelog/106919.yaml
@@ -0,0 +1,6 @@
+pr: 106919
+summary: Fix downsample action request serialization
+area: Downsampling
+type: bug
+issues:
+ - 106917
diff --git a/docs/reference/cluster/stats.asciidoc b/docs/reference/cluster/stats.asciidoc
@@ -223,6 +223,10 @@ selected nodes.
 +
 This number is based on documents in Lucene segments. {es} reclaims the disk
 space of deleted Lucene documents when a segment is merged.
+
+`total_size_in_bytes`::
+(integer)
+Total size in bytes across all primary shards assigned to selected nodes.
 =====
 
 `store`::
@@ -1594,7 +1598,8 @@ The API returns the following response:
       },
       "docs": {
          "count": 10,
-         "deleted": 0
+         "deleted": 0,
+         "total_size_in_bytes": 8833
       },
       "store": {
          "size": "16.2kb",

diff --git a/docs/reference/esql/functions/cos.asciidoc b/docs/reference/esql/functions/cos.asciidoc
diff --git a/docs/reference/esql/functions/description/cos.asciidoc b/docs/reference/esql/functions/description/cos.asciidoc
@@ -2,4 +2,4 @@
 
 *Description*
 
-Returns the trigonometric cosine of an angle
+Returns the {wikipedia}/Sine_and_cosine[cosine] of an angle.
diff --git a/docs/reference/esql/functions/description/cosh.asciidoc b/docs/reference/esql/functions/description/cosh.asciidoc
@@ -2,4 +2,4 @@
 
 *Description*
 
-Returns the hyperbolic cosine of a number
+Returns the {wikipedia}/Hyperbolic_functions[hyperbolic cosine] of an angle.
diff --git a/docs/reference/esql/functions/description/sin.asciidoc b/docs/reference/esql/functions/description/sin.asciidoc
@@ -2,4 +2,4 @@
 
 *Description*
 
-Returns the trigonometric sine of an angle
+Returns ths {wikipedia}/Sine_and_cosine[Sine] trigonometric function of an angle.
diff --git a/docs/reference/esql/functions/description/sinh.asciidoc b/docs/reference/esql/functions/description/sinh.asciidoc
@@ -2,4 +2,4 @@
 
 *Description*
 
-Returns the hyperbolic sine of a number
+Returns the {wikipedia}/Hyperbolic_functions[hyperbolic sine] of an angle.
diff --git a/docs/reference/esql/functions/description/tan.asciidoc b/docs/reference/esql/functions/description/tan.asciidoc
@@ -2,4 +2,4 @@
 
 *Description*
 
-Returns the trigonometric tangent of an angle
+Returns the {wikipedia}/Sine_and_cosine[Tangent] trigonometric function of an angle.
diff --git a/docs/reference/esql/functions/description/tanh.asciidoc b/docs/reference/esql/functions/description/tanh.asciidoc
@@ -2,4 +2,4 @@
 
 *Description*
 
-Returns the hyperbolic tangent of a number
+Returns the {wikipedia}/Hyperbolic_functions[Tangent] hyperbolic function of an angle.
diff --git a/docs/reference/esql/functions/examples/cos.asciidoc b/docs/reference/esql/functions/examples/cos.asciidoc
@@ -0,0 +1,13 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
+*Example*
+
+[source.merge.styled,esql]
+----
+include::{esql-specs}/floats.csv-spec[tag=cos]
+----
+[%header.monospaced.styled,format=dsv,separator=|]
+|===
+include::{esql-specs}/floats.csv-spec[tag=cos-result]
+|===
+
diff --git a/docs/reference/esql/functions/examples/cosh.asciidoc b/docs/reference/esql/functions/examples/cosh.asciidoc
@@ -0,0 +1,13 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
+*Example*
+
+[source.merge.styled,esql]
+----
+include::{esql-specs}/floats.csv-spec[tag=cosh]
+----
+[%header.monospaced.styled,format=dsv,separator=|]
+|===
+include::{esql-specs}/floats.csv-spec[tag=cosh-result]
+|===
+
diff --git a/docs/reference/esql/functions/examples/sin.asciidoc b/docs/reference/esql/functions/examples/sin.asciidoc
@@ -0,0 +1,13 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
+*Example*
+
+[source.merge.styled,esql]
+----
+include::{esql-specs}/floats.csv-spec[tag=sin]
+----
+[%header.monospaced.styled,format=dsv,separator=|]
+|===
+include::{esql-specs}/floats.csv-spec[tag=sin-result]
+|===
+
diff --git a/docs/reference/esql/functions/examples/sinh.asciidoc b/docs/reference/esql/functions/examples/sinh.asciidoc
@@ -0,0 +1,13 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
+*Example*
+
+[source.merge.styled,esql]
+----
+include::{esql-specs}/floats.csv-spec[tag=sinh]
+----
+[%header.monospaced.styled,format=dsv,separator=|]
+|===
+include::{esql-specs}/floats.csv-spec[tag=sinh-result]
+|===
+
diff --git a/docs/reference/esql/functions/examples/tan.asciidoc b/docs/reference/esql/functions/examples/tan.asciidoc
@@ -0,0 +1,13 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
+*Example*
+
+[source.merge.styled,esql]
+----
+include::{esql-specs}/floats.csv-spec[tag=tan]
+----
+[%header.monospaced.styled,format=dsv,separator=|]
+|===
+include::{esql-specs}/floats.csv-spec[tag=tan-result]
+|===
+
diff --git a/docs/reference/esql/functions/examples/tanh.asciidoc b/docs/reference/esql/functions/examples/tanh.asciidoc
@@ -0,0 +1,13 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
+*Example*
+
+[source.merge.styled,esql]
+----
+include::{esql-specs}/floats.csv-spec[tag=tanh]
+----
+[%header.monospaced.styled,format=dsv,separator=|]
+|===
+include::{esql-specs}/floats.csv-spec[tag=tanh-result]
+|===
+
diff --git a/docs/reference/esql/functions/layout/cos.asciidoc b/docs/reference/esql/functions/layout/cos.asciidoc
@@ -12,3 +12,4 @@ image::esql/functions/signature/cos.svg[Embedded,opts=inline]
 include::../parameters/cos.asciidoc[]
 include::../description/cos.asciidoc[]
 include::../types/cos.asciidoc[]
+include::../examples/cos.asciidoc[]
diff --git a/docs/reference/esql/functions/layout/cosh.asciidoc b/docs/reference/esql/functions/layout/cosh.asciidoc
@@ -12,3 +12,4 @@ image::esql/functions/signature/cosh.svg[Embedded,opts=inline]
 include::../parameters/cosh.asciidoc[]
 include::../description/cosh.asciidoc[]
 include::../types/cosh.asciidoc[]
+include::../examples/cosh.asciidoc[]
diff --git a/docs/reference/esql/functions/layout/sin.asciidoc b/docs/reference/esql/functions/layout/sin.asciidoc
@@ -12,3 +12,4 @@ image::esql/functions/signature/sin.svg[Embedded,opts=inline]
 include::../parameters/sin.asciidoc[]
 include::../description/sin.asciidoc[]
 include::../types/sin.asciidoc[]
+include::../examples/sin.asciidoc[]
diff --git a/docs/reference/esql/functions/layout/sinh.asciidoc b/docs/reference/esql/functions/layout/sinh.asciidoc
@@ -12,3 +12,4 @@ image::esql/functions/signature/sinh.svg[Embedded,opts=inline]
 include::../parameters/sinh.asciidoc[]
 include::../description/sinh.asciidoc[]
 include::../types/sinh.asciidoc[]
+include::../examples/sinh.asciidoc[]
diff --git a/docs/reference/esql/functions/layout/tan.asciidoc b/docs/reference/esql/functions/layout/tan.asciidoc
@@ -12,3 +12,4 @@ image::esql/functions/signature/tan.svg[Embedded,opts=inline]
 include::../parameters/tan.asciidoc[]
 include::../description/tan.asciidoc[]
 include::../types/tan.asciidoc[]
+include::../examples/tan.asciidoc[]
diff --git a/docs/reference/esql/functions/layout/tanh.asciidoc b/docs/reference/esql/functions/layout/tanh.asciidoc
@@ -12,3 +12,4 @@ image::esql/functions/signature/tanh.svg[Embedded,opts=inline]
 include::../parameters/tanh.asciidoc[]
 include::../description/tanh.asciidoc[]
 include::../types/tanh.asciidoc[]
+include::../examples/tanh.asciidoc[]
diff --git a/docs/reference/esql/functions/math-functions.asciidoc b/docs/reference/esql/functions/math-functions.asciidoc
@@ -37,18 +37,18 @@ include::layout/asin.asciidoc[]
 include::layout/atan.asciidoc[]
 include::layout/atan2.asciidoc[]
 include::layout/ceil.asciidoc[]
-include::cos.asciidoc[]
-include::cosh.asciidoc[]
+include::layout/cos.asciidoc[]
+include::layout/cosh.asciidoc[]
 include::e.asciidoc[]
 include::floor.asciidoc[]
 include::log.asciidoc[]
 include::log10.asciidoc[]
 include::pi.asciidoc[]
 include::pow.asciidoc[]
 include::round.asciidoc[]
-include::sin.asciidoc[]
-include::sinh.asciidoc[]
+include::layout/sin.asciidoc[]
+include::layout/sinh.asciidoc[]
 include::sqrt.asciidoc[]
-include::tan.asciidoc[]
-include::tanh.asciidoc[]
+include::layout/tan.asciidoc[]
+include::layout/tanh.asciidoc[]
 include::tau.asciidoc[]
diff --git a/docs/reference/esql/functions/parameters/abs.asciidoc b/docs/reference/esql/functions/parameters/abs.asciidoc
@@ -1,3 +1,5 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
 *Parameters*
 
 `number`::

diff --git a/docs/reference/esql/functions/parameters/acos.asciidoc b/docs/reference/esql/functions/parameters/acos.asciidoc
@@ -1,3 +1,5 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
 *Parameters*
 
 `number`::

diff --git a/docs/reference/esql/functions/parameters/asin.asciidoc b/docs/reference/esql/functions/parameters/asin.asciidoc
@@ -1,3 +1,5 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
 *Parameters*
 
 `number`::

diff --git a/docs/reference/esql/functions/parameters/atan.asciidoc b/docs/reference/esql/functions/parameters/atan.asciidoc
@@ -1,3 +1,5 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
 *Parameters*
 
 `number`::

diff --git a/docs/reference/esql/functions/parameters/atan2.asciidoc b/docs/reference/esql/functions/parameters/atan2.asciidoc
@@ -1,3 +1,5 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
 *Parameters*
 
 `y_coordinate`::