Merge branch 'main' into pkar/resolve-index-force-reconn

Author: pawankartik-elastic

.buildkite/pipelines/periodic-packaging.template.yml

@@ -12,16 +12,19 @@ steps:
               - opensuse-leap-15
               - oraclelinux-8
               - oraclelinux-9
+              - orcalelinux-10
               - sles-15
               - ubuntu-2204
               - ubuntu-2404
               - rocky-8
               - rocky-9
+              - rocky-10
               - rhel-8
               - rhel-9
               - rhel-10
               - almalinux-8
               - almalinux-9
+              - almalinux-10
         agents:
           provider: gcp
           image: family/elasticsearch-{{matrix.image}}

.buildkite/pipelines/periodic-packaging.yml

@@ -13,16 +13,19 @@ steps:
               - opensuse-leap-15
               - oraclelinux-8
               - oraclelinux-9
+              - orcalelinux-10
               - sles-15
               - ubuntu-2204
               - ubuntu-2404
               - rocky-8
               - rocky-9
+              - rocky-10
               - rhel-8
               - rhel-9
               - rhel-10
               - almalinux-8
               - almalinux-9
+              - almalinux-10
         agents:
           provider: gcp
           image: family/elasticsearch-{{matrix.image}}

.buildkite/pipelines/periodic-platform-support.yml

@@ -14,16 +14,19 @@ steps:
               - opensuse-leap-15
               - oraclelinux-8
               - oraclelinux-9
+              - oraclelinux-10
               - sles-15
               - ubuntu-2204
               - ubuntu-2404
               - rocky-8
               - rocky-9
+              - rocky-10
               - rhel-8
               - rhel-9
               - rhel-10
               - almalinux-8
               - almalinux-9
+              - almalinux-10
         agents:
           provider: gcp
           image: family/elasticsearch-{{matrix.image}}

.buildkite/pipelines/pull-request/packaging-tests-unix.yml

@@ -15,16 +15,19 @@ steps:
               - opensuse-leap-15
               - oraclelinux-8
               - oraclelinux-9
+              - oraclelinux-10
               - sles-15
               - ubuntu-2204
               - ubuntu-2404
               - rocky-8
               - rocky-9
+              - rocky-10
               - rhel-8
               - rhel-9
               - rhel-10
               - almalinux-8
               - almalinux-9
+              - almalinux-10
             PACKAGING_TASK:
               - docker
               - docker-cloud-ess

.buildkite/scripts/gradle-build-cache-validation.sh

@@ -12,7 +12,7 @@ tmpOutputFile=$(mktemp)
 trap "rm $tmpOutputFile" EXIT
 
 set +e
-develocity-gradle-build-validation/03-validate-local-build-caching-different-locations.sh -r https://github.com/elastic/elasticsearch.git -b $BUILDKITE_BRANCH --develocity-server https://gradle-enterprise.elastic.co -t precommit --fail-if-not-fully-cacheable | tee $tmpOutputFile
+develocity-gradle-build-validation/03-validate-local-build-caching-different-locations.sh -r https://github.com/elastic/elasticsearch.git -b $BUILDKITE_BRANCH --develocity-server https://gradle-enterprise.elastic.co -t "precommit javadoc" --fail-if-not-fully-cacheable | tee $tmpOutputFile
 # Capture the return value
 retval=$?
 set -e

AGENTS.md

@@ -90,7 +90,7 @@ The repository is organized into several key directories:
 - Prefer Gradle tasks over ad-hoc scripts.
 - When scripting CLI sequences, leverage `gradlew` task.
 - Unrecognized changes: assume other agent; keep going; focus your changes. If it causes issues, stop + ask user.
-- Do not add "Co-Authored-By" lines to commit messages. commit messages should adhere to the 50/72 rule: use a maximum of 50 columns for the commit summary
+- Do not add "Co-Authored-By" or any AI attribution trailers to commit messages, by any means—including `--trailer`, `-m`, or any other git flag. commit messages should adhere to the 50/72 rule: use a maximum of 50 columns for the commit summary
 
 ## Backwards compatibility
 - For changes to a `Writeable` implementation (`writeTo` and constructor from `StreamInput`), add a new `public static final <UNIQUE_DESCRIPTIVE_NAME> = TransportVersion.fromName("<unique_descriptive_name>")` and use it in the new code paths. Confirm the backport branches and then generate a new version file with `./gradlew generateTransportVersion`.

benchmarks/build.gradle

@@ -47,7 +47,7 @@ dependencies {
   api(project(':x-pack:plugin:core'))
   api(project(':x-pack:plugin:esql'))
   api(project(':x-pack:plugin:esql:compute'))
-  api(project(':x-pack:plugin:mapper-exponential-histogram'))
+  api(project(':x-pack:plugin:analytics'))
   api(project(':x-pack:plugin:logsdb'))
   implementation project(path: ':libs:native')
   implementation project(path: ':libs:simdvec')

benchmarks/src/main/java/org/elasticsearch/benchmark/index/codec/tsdb/TSDBDocValuesMergeBenchmark.java

@@ -28,7 +28,7 @@
 import org.elasticsearch.common.logging.LogConfigurator;
 import org.elasticsearch.index.codec.Elasticsearch92Lucene103Codec;
 import org.elasticsearch.index.codec.tsdb.BinaryDVCompressionMode;
-import org.elasticsearch.index.codec.tsdb.es819.ES819TSDBDocValuesFormat;
+import org.elasticsearch.index.codec.tsdb.es819.ES819Version3TSDBDocValuesFormat;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -54,6 +54,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
+import static org.elasticsearch.index.codec.tsdb.es819.ES819TSDBDocValuesFormat.NUMERIC_LARGE_BLOCK_SHIFT;
+
 @BenchmarkMode(Mode.SingleShotTime)
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
 @State(Scope.Benchmark)
@@ -258,12 +260,13 @@ private static IndexWriterConfig createIndexWriterConfig(boolean optimizedMergeE
         );
         config.setLeafSorter(DataStream.TIMESERIES_LEAF_READERS_SORTER);
         config.setMergePolicy(new LogByteSizeMergePolicy());
-        var docValuesFormat = new ES819TSDBDocValuesFormat(
+        var docValuesFormat = new ES819Version3TSDBDocValuesFormat(
             4096,
             512,
             optimizedMergeEnabled,
             BinaryDVCompressionMode.COMPRESSED_ZSTD_LEVEL_1,
-            true
+            true,
+            NUMERIC_LARGE_BLOCK_SHIFT
         );
         config.setCodec(new Elasticsearch92Lucene103Codec() {
             @Override

benchmarks/src/main/java/org/elasticsearch/benchmark/index/mapper/DynamicMapperBenchmark.java

@@ -11,8 +11,6 @@
 
 import org.elasticsearch.common.UUIDs;
 import org.elasticsearch.common.bytes.BytesArray;
-import org.elasticsearch.common.compress.CompressedXContent;
-import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.index.mapper.DocumentMapper;
 import org.elasticsearch.index.mapper.LuceneDocument;
 import org.elasticsearch.index.mapper.MapperService;
@@ -185,21 +183,16 @@ public List<LuceneDocument> benchmarkDynamicallyCreatedFields() throws Exception
         MapperService mapperService = MapperServiceFactory.create("{}");
         for (int i = 0; i < 25; i++) {
             DocumentMapper documentMapper = mapperService.documentMapper();
-            Mapping mapping = null;
-            if (documentMapper == null) {
+            boolean noMappings = documentMapper == null;
+            if (noMappings) {
                 documentMapper = DocumentMapper.createEmpty(mapperService);
-                mapping = documentMapper.mapping();
             }
             ParsedDocument doc = documentMapper.parse(randomFrom(sources));
-            if (mapping != null) {
-                doc.addDynamicMappingsUpdate(mapping);
+            if (noMappings) {
+                doc.addDynamicMappingsUpdate(Mapping.emptyCompressed());
             }
             if (doc.dynamicMappingsUpdate() != null) {
-                mapperService.merge(
-                    "_doc",
-                    new CompressedXContent(XContentHelper.toXContent(doc.dynamicMappingsUpdate(), XContentType.JSON, false)),
-                    MapperService.MergeReason.MAPPING_UPDATE
-                );
+                mapperService.merge("_doc", doc.dynamicMappingsUpdate(), MapperService.MergeReason.MAPPING_UPDATE);
             }
         }
         return mapperService.documentMapper().parse(randomFrom(sources)).docs();

benchmarks/src/main/java/org/elasticsearch/benchmark/vector/scorer/VectorScorerByteBenchmark.java

@@ -20,6 +20,7 @@
 import org.apache.lucene.util.hnsw.RandomVectorScorer;
 import org.apache.lucene.util.hnsw.UpdateableRandomVectorScorer;
 import org.elasticsearch.common.logging.LogConfigurator;
+import org.elasticsearch.common.logging.NodeNamePatternConverter;
 import org.elasticsearch.simdvec.VectorScorerFactory;
 import org.elasticsearch.simdvec.VectorSimilarityType;
 import org.openjdk.jmh.annotations.Benchmark;
@@ -62,6 +63,8 @@
 public class VectorScorerByteBenchmark {
 
     static {
+        NodeNamePatternConverter.setGlobalNodeName("benchmark");
+        LogConfigurator.loadLog4jPlugins();
         LogConfigurator.configureESLogging(); // native access requires logging to be initialized
         if (supportsHeapSegments() == false) {
             final Logger LOG = LogManager.getLogger(VectorScorerByteBenchmark.class);