Merge branch 'main' into add-alibabacloud-inference

weizijun · Aug 23, 2024 · 2e1b2a1 · 2e1b2a1
2 parents 92c70cb + 9847a31
commit 2e1b2a1
Show file tree

Hide file tree

Showing 647 changed files with 17,215 additions and 3,345 deletions.
diff --git a/benchmarks/build.gradle b/benchmarks/build.gradle
@@ -37,6 +37,7 @@ dependencies {
     // us to invoke the JMH uberjar as usual.
     exclude group: 'net.sf.jopt-simple', module: 'jopt-simple'
   }
+  api(project(':libs:elasticsearch-h3'))
   api(project(':modules:aggregations'))
   api(project(':x-pack:plugin:esql-core'))
   api(project(':x-pack:plugin:esql'))

diff --git a/benchmarks/src/main/java/org/elasticsearch/benchmark/h3/H3Benchmark.java b/benchmarks/src/main/java/org/elasticsearch/benchmark/h3/H3Benchmark.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+package org.elasticsearch.benchmark.h3;
+
+import org.elasticsearch.h3.H3;
+import org.openjdk.jmh.Main;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.infra.Blackhole;
+
+import java.util.concurrent.TimeUnit;
+
+@OutputTimeUnit(TimeUnit.SECONDS)
+@Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
+@Measurement(iterations = 25, time = 1, timeUnit = TimeUnit.SECONDS)
+@Fork(1)
+public class H3Benchmark {
+
+    @Benchmark
+    public void pointToH3(H3State state, Blackhole bh) {
+        for (int i = 0; i < state.points.length; i++) {
+            for (int res = 0; res <= 15; res++) {
+                bh.consume(H3.geoToH3(state.points[i][0], state.points[i][1], res));
+            }
+        }
+    }
+
+    @Benchmark
+    public void h3Boundary(H3State state, Blackhole bh) {
+        for (int i = 0; i < state.h3.length; i++) {
+            bh.consume(H3.h3ToGeoBoundary(state.h3[i]));
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        Main.main(args);
+    }
+}
diff --git a/benchmarks/src/main/java/org/elasticsearch/benchmark/h3/H3State.java b/benchmarks/src/main/java/org/elasticsearch/benchmark/h3/H3State.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+package org.elasticsearch.benchmark.h3;
+
+import org.elasticsearch.h3.H3;
+import org.openjdk.jmh.annotations.Level;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+
+import java.io.IOException;
+import java.util.Random;
+
+@State(Scope.Benchmark)
+public class H3State {
+
+    double[][] points = new double[1000][2];
+    long[] h3 = new long[1000];
+
+    @Setup(Level.Trial)
+    public void setupTrial() throws IOException {
+        Random random = new Random(1234);
+        for (int i = 0; i < points.length; i++) {
+            points[i][0] = random.nextDouble() * 180 - 90;   // lat
+            points[i][1] = random.nextDouble() * 360 - 180;  // lon
+            int res = random.nextInt(16);            // resolution
+            h3[i] = H3.geoToH3(points[i][0], points[i][1], res);
+        }
+    }
+}
diff --git a/build-tools-internal/gradle/wrapper/gradle-wrapper.properties b/build-tools-internal/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=258e722ec21e955201e31447b0aed14201765a3bfbae296a46cf60b70e66db70
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
+distributionSha256Sum=682b4df7fe5accdca84a4d1ef6a3a6ab096b3efd5edf7de2bd8c758d95a93703
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/build-tools-internal/src/main/resources/minimumGradleVersion b/build-tools-internal/src/main/resources/minimumGradleVersion
@@ -1 +1 @@
-8.9
+8.10
diff --git a/docs/changelog/109414.yaml b/docs/changelog/109414.yaml
@@ -0,0 +1,6 @@
+pr: 109414
+summary: Don't fail retention lease sync actions due to capacity constraints
+area: CRUD
+type: bug
+issues:
+ - 105926
diff --git a/docs/changelog/110524.yaml b/docs/changelog/110524.yaml
@@ -0,0 +1,5 @@
+pr: 110524
+summary: Introduce mode `subobjects=auto` for objects
+area: Mapping
+type: enhancement
+issues: []
diff --git a/docs/changelog/110847.yaml b/docs/changelog/110847.yaml
@@ -0,0 +1,5 @@
+pr: 110847
+summary: SLM Interval based scheduling
+area: ILM+SLM
+type: feature
+issues: []
diff --git a/docs/changelog/111193.yaml b/docs/changelog/111193.yaml
@@ -0,0 +1,6 @@
+pr: 111193
+summary: Fix cases of collections with one point
+area: Geo
+type: bug
+issues:
+ - 110982
diff --git a/docs/changelog/111412.yaml b/docs/changelog/111412.yaml
@@ -0,0 +1,6 @@
+pr: 111412
+summary: Make enrich cache based on memory usage
+area: Ingest Node
+type: enhancement
+issues:
+ - 106081
diff --git a/docs/changelog/111544.yaml b/docs/changelog/111544.yaml
@@ -0,0 +1,5 @@
+pr: 111544
+summary: "ESQL: Strings support for MAX and MIN aggregations"
+area: ES|QL
+type: feature
+issues: []
diff --git a/docs/changelog/111655.yaml b/docs/changelog/111655.yaml
@@ -0,0 +1,5 @@
+pr: 111655
+summary: Migrate Inference to `ChunkedToXContent`
+area: Machine Learning
+type: enhancement
+issues: []
diff --git a/docs/changelog/111690.yaml b/docs/changelog/111690.yaml
@@ -0,0 +1,5 @@
+pr: 111690
+summary: "ESQL: Support INLINESTATS grouped on expressions"
+area: ES|QL
+type: enhancement
+issues: []
diff --git a/docs/changelog/111749.yaml b/docs/changelog/111749.yaml
@@ -0,0 +1,6 @@
+pr: 111749
+summary: "ESQL: Added `mv_percentile` function"
+area: ES|QL
+type: feature
+issues:
+ - 111591
diff --git a/docs/changelog/111797.yaml b/docs/changelog/111797.yaml
@@ -0,0 +1,6 @@
+pr: 111797
+summary: "ESQL: fix for missing indices error message"
+area: ES|QL
+type: bug
+issues:
+ - 111712
diff --git a/docs/changelog/111840.yaml b/docs/changelog/111840.yaml
@@ -0,0 +1,5 @@
+pr: 111840
+summary: "ESQL: Add async ID and `is_running` headers to ESQL async query"
+area: ES|QL
+type: feature
+issues: []
diff --git a/docs/changelog/111855.yaml b/docs/changelog/111855.yaml
@@ -0,0 +1,5 @@
+pr: 111855
+summary: "ESQL: Profile more timing information"
+area: ES|QL
+type: enhancement
+issues: []
diff --git a/docs/changelog/111874.yaml b/docs/changelog/111874.yaml
@@ -0,0 +1,8 @@
+pr: 111874
+summary: "ESQL: BUCKET: allow numerical spans as whole numbers"
+area: ES|QL
+type: enhancement
+issues:
+ - 104646
+ - 109340
+ - 105375
diff --git a/docs/changelog/111937.yaml b/docs/changelog/111937.yaml
@@ -0,0 +1,6 @@
+pr: 111937
+summary: Handle `BigInteger` in xcontent copy
+area: Infra/Core
+type: bug
+issues: 
+  - 111812
diff --git a/docs/changelog/111943.yaml b/docs/changelog/111943.yaml
@@ -0,0 +1,6 @@
+pr: 111943
+summary: Fix synthetic source for empty nested objects
+area: Mapping
+type: bug
+issues:
+ - 111811
diff --git a/docs/changelog/111948.yaml b/docs/changelog/111948.yaml
@@ -0,0 +1,5 @@
+pr: 111948
+summary: Upgrade xcontent to Jackson 2.17.0
+area: Infra/Core
+type: upgrade
+issues: []
diff --git a/docs/changelog/111955.yaml b/docs/changelog/111955.yaml
@@ -0,0 +1,7 @@
+pr: 111955
+summary: Clean up dangling S3 multipart uploads
+area: Snapshot/Restore
+type: enhancement
+issues:
+ - 101169
+ - 44971
diff --git a/docs/changelog/111966.yaml b/docs/changelog/111966.yaml
@@ -0,0 +1,5 @@
+pr: 111966
+summary: No error when `store_array_source` is used without synthetic source
+area: Mapping
+type: bug
+issues: []
diff --git a/docs/changelog/111968.yaml b/docs/changelog/111968.yaml
@@ -0,0 +1,6 @@
+pr: 111968
+summary: "ESQL: don't lose the original casting error message"
+area: ES|QL
+type: bug
+issues:
+ - 111967
diff --git a/docs/changelog/111969.yaml b/docs/changelog/111969.yaml
@@ -0,0 +1,5 @@
+pr: 111969
+summary: "[Profiling] add `container.id` field to event index template"
+area: Application
+type: enhancement
+issues: []
diff --git a/docs/changelog/111972.yaml b/docs/changelog/111972.yaml
@@ -0,0 +1,15 @@
+pr: 111972
+summary: Introduce global retention in data stream lifecycle.
+area: Data streams
+type: feature
+issues: []
+highlight:
+  title: Add global retention in data stream lifecycle
+  body: "Data stream lifecycle now supports configuring retention on a cluster level,\
+    \ namely global retention. Global retention \nallows us to configure two different\
+    \ retentions:\n\n- `data_streams.lifecycle.retention.default` is applied to all\
+    \ data streams managed by the data stream lifecycle that do not have retention\n\
+    defined on the data stream level.\n- `data_streams.lifecycle.retention.max` is\
+    \ applied to all data streams managed by the data stream lifecycle and it allows\
+    \ any data stream \ndata to be deleted after the `max_retention` has passed."
+  notable: true
diff --git a/docs/changelog/111983.yaml b/docs/changelog/111983.yaml
@@ -0,0 +1,6 @@
+pr: 111983
+summary: Avoid losing error message in failure collector
+area: ES|QL
+type: bug
+issues:
+ - 111894
diff --git a/docs/changelog/111994.yaml b/docs/changelog/111994.yaml
@@ -0,0 +1,6 @@
+pr: 111994
+summary: Merge multiple ignored source entires for the same field
+area: Logs
+type: bug
+issues:
+ - 111694
diff --git a/docs/changelog/112005.yaml b/docs/changelog/112005.yaml
@@ -0,0 +1,6 @@
+pr: 112005
+summary: Check for valid `parentDoc` before retrieving its previous
+area: Mapping
+type: bug
+issues:
+ - 111990
diff --git a/docs/changelog/112019.yaml b/docs/changelog/112019.yaml
@@ -0,0 +1,5 @@
+pr: 112019
+summary: Display effective retention in the relevant data stream APIs
+area: Data streams
+type: enhancement
+issues: []
diff --git a/docs/changelog/112038.yaml b/docs/changelog/112038.yaml
@@ -0,0 +1,6 @@
+pr: 112038
+summary: Semantic reranking should fail whenever inference ID does not exist
+area: Relevance
+type: bug
+issues:
+ - 111934
diff --git a/docs/changelog/112046.yaml b/docs/changelog/112046.yaml
@@ -0,0 +1,5 @@
+pr: 112046
+summary: Fix calculation of parent offset for ignored source in some cases
+area: Mapping
+type: bug
+issues: []
diff --git a/docs/changelog/112058.yaml b/docs/changelog/112058.yaml
@@ -0,0 +1,5 @@
+pr: 112058
+summary: Fix RRF validation for `rank_constant` < 1
+area: Ranking
+type: bug
+issues: []
diff --git a/docs/changelog/112090.yaml b/docs/changelog/112090.yaml
@@ -0,0 +1,6 @@
+pr: 112090
+summary: Always check `crsType` when folding spatial functions
+area: Geo
+type: bug
+issues:
+ - 112089
diff --git a/docs/changelog/112123.yaml b/docs/changelog/112123.yaml
@@ -0,0 +1,5 @@
+pr: 112123
+summary: SLM interval schedule followup - add back `getFieldName` style getters
+area: ILM+SLM
+type: enhancement
+issues: []
diff --git a/docs/changelog/112126.yaml b/docs/changelog/112126.yaml
@@ -0,0 +1,5 @@
+pr: 112126
+summary: Add support for spatial relationships in point field mapper
+area: Geo
+type: enhancement
+issues: []
diff --git a/docs/reference/api-conventions.asciidoc b/docs/reference/api-conventions.asciidoc
@@ -334,6 +334,7 @@ All REST API parameters (both request parameters and JSON body) support
 providing boolean "false" as the value `false` and boolean "true" as the
 value `true`. All other values will raise an error.
 
+[[api-conventions-number-values]]
 [discrete]
 === Number Values
 

diff --git a/docs/reference/autoscaling/apis/autoscaling-apis.asciidoc b/docs/reference/autoscaling/apis/autoscaling-apis.asciidoc
@@ -4,7 +4,7 @@
 
 NOTE: {cloud-only}
 
-You can use the following APIs to perform autoscaling operations.
+You can use the following APIs to perform {cloud}/ec-autoscaling.html[autoscaling operations].
 
 [discrete]
 [[autoscaling-api-top-level]]

diff --git a/docs/reference/autoscaling/apis/delete-autoscaling-policy.asciidoc b/docs/reference/autoscaling/apis/delete-autoscaling-policy.asciidoc
@@ -7,7 +7,7 @@
 
 NOTE: {cloud-only}
 
-Delete autoscaling policy.
+Delete {cloud}/ec-autoscaling.html[autoscaling] policy.
 
 [[autoscaling-delete-autoscaling-policy-request]]
 ==== {api-request-title}

diff --git a/docs/reference/autoscaling/apis/get-autoscaling-capacity.asciidoc b/docs/reference/autoscaling/apis/get-autoscaling-capacity.asciidoc
@@ -7,7 +7,7 @@
 
 NOTE: {cloud-only}
 
-Get autoscaling capacity.
+Get {cloud}/ec-autoscaling.html[autoscaling] capacity.
 
 [[autoscaling-get-autoscaling-capacity-request]]
 ==== {api-request-title}

diff --git a/docs/reference/autoscaling/apis/get-autoscaling-policy.asciidoc b/docs/reference/autoscaling/apis/get-autoscaling-policy.asciidoc
@@ -7,7 +7,7 @@
 
 NOTE: {cloud-only}
 
-Get autoscaling policy.
+Get {cloud}/ec-autoscaling.html[autoscaling] policy.
 
 [[autoscaling-get-autoscaling-policy-request]]
 ==== {api-request-title}

diff --git a/docs/reference/autoscaling/apis/put-autoscaling-policy.asciidoc b/docs/reference/autoscaling/apis/put-autoscaling-policy.asciidoc
@@ -7,7 +7,7 @@
 
 NOTE: {cloud-only}
 
-Creates or updates an autoscaling policy.
+Creates or updates an {cloud}/ec-autoscaling.html[autoscaling] policy.
 
 [[autoscaling-put-autoscaling-policy-request]]
 ==== {api-request-title}

diff --git a/docs/reference/autoscaling/deciders/fixed-decider.asciidoc b/docs/reference/autoscaling/deciders/fixed-decider.asciidoc
@@ -6,7 +6,7 @@ experimental[]
 [WARNING]
 The fixed decider is intended for testing only. Do not use this decider in production.
 
-The `fixed` decider responds with a fixed required capacity. It is not enabled
+The {cloud}/ec-autoscaling.html[autoscaling] `fixed` decider responds with a fixed required capacity. It is not enabled
 by default but can be enabled for any policy by explicitly configuring it.
 
 ==== Configuration settings

diff --git a/docs/reference/autoscaling/deciders/frozen-existence-decider.asciidoc b/docs/reference/autoscaling/deciders/frozen-existence-decider.asciidoc
@@ -2,7 +2,7 @@
 [[autoscaling-frozen-existence-decider]]
 === Frozen existence decider
 
-The frozen existence decider (`frozen_existence`) ensures that once the first
+The {cloud}/ec-autoscaling.html[autoscaling] frozen existence decider (`frozen_existence`) ensures that once the first
 index enters the frozen ILM phase, the frozen tier is scaled into existence.
 
 The frozen existence decider is enabled for all policies governing frozen data

diff --git a/docs/reference/autoscaling/deciders/frozen-shards-decider.asciidoc b/docs/reference/autoscaling/deciders/frozen-shards-decider.asciidoc
@@ -2,7 +2,7 @@
 [[autoscaling-frozen-shards-decider]]
 === Frozen shards decider
 
-The frozen shards decider (`frozen_shards`) calculates the memory required to search
+The {cloud}/ec-autoscaling.html[autoscaling] frozen shards decider (`frozen_shards`) calculates the memory required to search
 the current set of partially mounted indices in the frozen tier. Based on a
 required memory amount per shard, it calculates the necessary memory in the frozen tier.