Resolve merge conflicts

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

@@ -27,11 +27,11 @@
 import org.elasticsearch.xpack.esql.expression.function.scalar.date.DateTrunc;
 import org.elasticsearch.xpack.esql.expression.function.scalar.math.Abs;
 import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvMin;
+import org.elasticsearch.xpack.esql.expression.predicate.operator.arithmetic.Add;
 import org.elasticsearch.xpack.esql.planner.Layout;
 import org.elasticsearch.xpack.esql.type.EsqlDataTypes;
 import org.elasticsearch.xpack.ql.expression.FieldAttribute;
 import org.elasticsearch.xpack.ql.expression.Literal;
-import org.elasticsearch.xpack.ql.expression.predicate.operator.arithmetic.Add;
 import org.elasticsearch.xpack.ql.tree.Source;
 import org.elasticsearch.xpack.ql.type.DataTypes;
 import org.elasticsearch.xpack.ql.type.EsField;
@@ -61,6 +61,11 @@
 public class EvalBenchmark {
     private static final int BLOCK_LENGTH = 8 * 1024;
 
+    static final DriverContext driverContext = new DriverContext(
+        BigArrays.NON_RECYCLING_INSTANCE,
+        BlockFactory.getInstance(new NoopCircuitBreaker("noop"), BigArrays.NON_RECYCLING_INSTANCE)
+    );
+
     static {
         // Smoke test all the expected values and force loading subclasses more like prod
         try {
@@ -72,11 +77,6 @@ public class EvalBenchmark {
         }
     }
 
-    static final DriverContext driverContext = new DriverContext(
-        BigArrays.NON_RECYCLING_INSTANCE,
-        BlockFactory.getInstance(new NoopCircuitBreaker("noop"), BigArrays.NON_RECYCLING_INSTANCE)
-    );
-
     @Param({ "abs", "add", "date_trunc", "equal_to_const", "long_equal_to_long", "long_equal_to_int", "mv_min", "mv_min_ascending" })
     public String operation;
 

build-tools-internal/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=f2b9ed0faf8472cbe469255ae6c86eddb77076c75191741b4a462f33128dd419
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionSha256Sum=c16d517b50dd28b3f5838f0e844b7520b8f1eb610f2f29de7e4e04a1b7c9c79b
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

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

@@ -124,6 +124,7 @@ private static ListMultimap<Class<?>, String> createLegacyRestTestBasePluginUsag
         map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:eql:qa:correctness");
         map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:eql:qa:mixed-node");
         map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:esql:qa:security");
+        map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:esql:qa:server:heap-attack");
         map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:esql:qa:server:multi-node");
         map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:esql:qa:server:single-node");
         map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:fleet:qa:rest");

build-tools-internal/src/main/resources/minimumGradleVersion

@@ -1 +1 @@
-8.4
+8.5

build-tools-internal/version.properties

@@ -1,5 +1,5 @@
 elasticsearch     = 8.12.0
-lucene            = 9.8.0
+lucene            = 9.9.0
 
 bundled_jdk_vendor = openjdk
 bundled_jdk = 21.0.1+12@415e3f918a1f4062a0074a2794853d0d

build-tools/src/main/java/org/elasticsearch/gradle/testclusters/RunTask.java

@@ -205,8 +205,9 @@ public void beforeStart() {
                     } catch (IOException e) {
                         logger.warn("Unable to start APM server", e);
                     }
-                } else {
-                    // metrics are enabled by default, if the --with-apm-server was not used we should disable it
+                } else if (node.getSettingKeys().contains("telemetry.metrics.enabled") == false) {
+                    // in serverless metrics are enabled by default
+                    // if metrics were not enabled explicitly for gradlew run we should disable them
                     node.setting("telemetry.metrics.enabled", "false");
                 }
 

distribution/docker/src/docker/Dockerfile

@@ -21,7 +21,7 @@
 
 <% if (docker_base == 'iron_bank') { %>
 ARG BASE_REGISTRY=registry1.dso.mil
-ARG BASE_IMAGE=redhat/ubi/ubi9
+ARG BASE_IMAGE=ironbank/redhat/ubi/ubi9
 ARG BASE_TAG=9.2
 <% } %>
 

distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/cli/InstallPluginActionTests.java

@@ -118,6 +118,7 @@
 import static org.mockito.Mockito.spy;
 
 @LuceneTestCase.SuppressFileSystems("*")
+@LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/102783")
 public class InstallPluginActionTests extends ESTestCase {
 
     private InstallPluginAction skipJarHellAction;

docs/Versions.asciidoc

@@ -1,8 +1,8 @@
 
 include::{docs-root}/shared/versions/stack/{source_branch}.asciidoc[]
 
-:lucene_version:        9.8.0
-:lucene_version_path:   9_8_0
+:lucene_version:        9.9.0
+:lucene_version_path:   9_9_0
 :jdk:                   11.0.2
 :jdk_major:             11
 :build_type:            tar

docs/changelog/102032.yaml

@@ -0,0 +1,5 @@
+pr: 102032
+summary: Add vector_operation_count in profile output for knn searches
+area: Vector Search
+type: enhancement
+issues: []

docs/changelog/102093.yaml

@@ -0,0 +1,14 @@
+pr: 102093
+summary: Add byte quantization for float vectors in HNSW 
+area: Vector Search
+type: feature
+issues: []
+highlight:
+  title: Add new `int8_hsnw` index type for int8 quantization for HNSW
+  body: |-
+    This commit adds a new index type called `int8_hnsw`. This index will
+    automatically quantized float32 values into int8 byte values. While
+    this increases disk usage by 25%, it reduces memory required for 
+    fast HNSW search by 75%. Dramatically reducing the resource overhead
+    required for dense vector search.
+  notable: true

docs/changelog/102177.yaml

@@ -0,0 +1,5 @@
+pr: 102177
+summary: "GEO_POINT and CARTESIAN_POINT type support"
+area: ES|QL
+type: feature
+issues: []

docs/changelog/102456.yaml

@@ -0,0 +1,6 @@
+pr: 102456
+summary: Switch logs data streams to search all fields by default
+area: Data streams
+type: enhancement
+issues:
+ - 99872

docs/changelog/102713.yaml

@@ -0,0 +1,5 @@
+pr: 102713
+summary: "ESQL: Add `profile` option"
+area: ES|QL
+type: enhancement
+issues: []

docs/changelog/102727.yaml

@@ -0,0 +1,5 @@
+pr: 102727
+summary: "ESQL: Load stored fields sequentially"
+area: ES|QL
+type: enhancement
+issues: []

docs/changelog/102731.yaml

@@ -0,0 +1,5 @@
+pr: 102731
+summary: Add internal inference action for ml models an services
+area: Machine Learning
+type: enhancement
+issues: []

docs/changelog/102734.yaml

@@ -0,0 +1,5 @@
+pr: 102734
+summary: Allow match field in enrich fields
+area: ES|QL
+type: bug
+issues: []

docs/changelog/102740.yaml

@@ -0,0 +1,5 @@
+pr: 102740
+summary: "[Profiling] Notify early about task cancellation"
+area: Application
+type: enhancement
+issues: []

docs/changelog/102767.yaml

@@ -0,0 +1,6 @@
+pr: 102767
+summary: "ESQL: remove `time_zone` request parameter"
+area: ES|QL
+type: bug
+issues:
+ - 102159

docs/changelog/102779.yaml

@@ -0,0 +1,5 @@
+pr: 102779
+summary: Allow mismatched sort-by field types if there are no docs to sort
+area: Search
+type: bug
+issues: []

docs/changelog/102782.yaml

@@ -0,0 +1,5 @@
+pr: 102782
+summary: Upgrade to Lucene 9.9.0
+area: Search
+type: upgrade
+issues: []

docs/changelog/102806.yaml

@@ -0,0 +1,5 @@
+pr: 102806
+summary: Support for GET all models and by task type in the `_inference` API
+area: Machine Learning
+type: enhancement
+issues: []

docs/changelog/102808.yaml

@@ -0,0 +1,6 @@
+pr: 102808
+summary: Active shards message corrected for search shards
+area: Distributed
+type: bug
+issues:
+ - 101896

docs/changelog/102810.yaml

@@ -0,0 +1,5 @@
+pr: 102810
+summary: Add memory utilization Kibana metric to the monitoring index templates
+area: Monitoring
+type: enhancement
+issues: []

docs/changelog/102811.yaml

@@ -0,0 +1,6 @@
+pr: 102811
+summary: Split comma-separated source index strings into separate indices
+area: Transform
+type: bug
+issues:
+ - 99564

docs/changelog/102821.yaml

@@ -0,0 +1,5 @@
+pr: 102821
+summary: Better processor stat merge
+area: Ingest Node
+type: bug
+issues: []

docs/changelog/102831.yaml

@@ -0,0 +1,9 @@
+pr: 102831
+summary: Fix memory tracking in TopN.Row
+area: ES|QL
+type: bug
+issues:
+ - 100640
+ - 102784
+ - 102790
+ - 102683

docs/changelog/102832.yaml

@@ -0,0 +1,5 @@
+pr: 102832
+summary: Disable concurrency for sampler and diversified sampler
+area: Aggregations
+type: enhancement
+issues: []

docs/changelog/102840.yaml

@@ -0,0 +1,5 @@
+pr: 102840
+summary: Fail S3 repository analysis on partial reads
+area: Snapshot/Restore
+type: enhancement
+issues: []

docs/changelog/102844.yaml

@@ -0,0 +1,5 @@
+pr: 102844
+summary: Skip global ordinals loading if query does not match after rewrite
+area: Aggregations
+type: bug
+issues: []

docs/changelog/102848.yaml

@@ -0,0 +1,5 @@
+pr: 102848
+summary: Decref `SharedBytes.IO` after read is done not before
+area: Snapshot/Restore
+type: bug
+issues: []

docs/changelog/102877.yaml

@@ -0,0 +1,5 @@
+pr: 102877
+summary: Add basic telelemetry for the inference feature
+area: Machine Learning
+type: enhancement
+issues: []

docs/changelog/102891.yaml

@@ -0,0 +1,7 @@
+pr: 102891
+summary: "[Query Rules] Fix bug where combining the same metadata with text/numeric\
+  \ values leads to error"
+area: Application
+type: bug
+issues:
+ - 102827

docs/changelog/99445.yaml

@@ -0,0 +1,5 @@
+pr: 99445
+summary: Make cosine similarity faster by storing magnitude and normalizing vectors
+area: Vector Search
+type: enhancement
+issues: []

docs/reference/esql/functions/types/mv_count.asciidoc

@@ -2,8 +2,10 @@
 |===
 v | result
 boolean | integer
+cartesian_point | integer
 datetime | integer
 double | integer
+geo_point | integer
 integer | integer
 ip | integer
 keyword | integer

docs/reference/esql/functions/types/to_boolean.asciidoc

@@ -0,0 +1,11 @@
+[%header.monospaced.styled,format=dsv,separator=|]
+|===
+v | result
+boolean | boolean
+double | boolean
+integer | boolean
+keyword | boolean
+long | boolean
+text | boolean
+unsigned_long | boolean
+|===

docs/reference/esql/functions/types/to_datetime.asciidoc

@@ -0,0 +1,11 @@
+[%header.monospaced.styled,format=dsv,separator=|]
+|===
+v | result
+datetime | datetime
+double | datetime
+integer | datetime
+keyword | datetime
+long | datetime
+text | datetime
+unsigned_long | datetime
+|===

docs/reference/esql/functions/types/to_degrees.asciidoc

@@ -0,0 +1,8 @@
+[%header.monospaced.styled,format=dsv,separator=|]
+|===
+v | result
+double | double
+integer | double
+long | double
+unsigned_long | double
+|===

docs/reference/esql/functions/types/to_double.asciidoc

@@ -0,0 +1,12 @@
+[%header.monospaced.styled,format=dsv,separator=|]
+|===
+v | result
+boolean | double
+datetime | double
+double | double
+integer | double
+keyword | double
+long | double
+text | double
+unsigned_long | double
+|===

docs/reference/esql/functions/types/to_integer.asciidoc

@@ -0,0 +1,12 @@
+[%header.monospaced.styled,format=dsv,separator=|]
+|===
+v | result
+boolean | integer
+datetime | integer
+double | integer
+integer | integer
+keyword | integer
+long | integer
+text | integer
+unsigned_long | integer
+|===

docs/reference/esql/functions/types/to_ip.asciidoc

@@ -1,6 +1,7 @@
 [%header.monospaced.styled,format=dsv,separator=|]
 |===
-arg1 | result
+v | result
 ip | ip
 keyword | ip
+text | ip
 |===

docs/reference/esql/functions/types/to_long.asciidoc

@@ -0,0 +1,14 @@
+[%header.monospaced.styled,format=dsv,separator=|]
+|===
+v | result
+boolean | long
+cartesian_point | long
+datetime | long
+double | long
+geo_point | long
+integer | long
+keyword | long
+long | long
+text | long
+unsigned_long | long
+|===