Merge branch 'main' into fold-time-errors

fang-xing-esql · Nov 15, 2024 · 50a0fa3 · 50a0fa3
2 parents 6b1de66 + 713788d
commit 50a0fa3
Show file tree

Hide file tree

Showing 716 changed files with 13,106 additions and 4,904 deletions.
diff --git a/.buildkite/pipelines/intake.yml b/.buildkite/pipelines/intake.yml
@@ -56,7 +56,7 @@ steps:
         timeout_in_minutes: 300
         matrix:
           setup:
-            BWC_VERSION: ["8.15.4", "8.16.0", "8.17.0", "9.0.0"]
+            BWC_VERSION: ["8.16.1", "8.17.0", "9.0.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004

diff --git a/.buildkite/pipelines/periodic-packaging.yml b/.buildkite/pipelines/periodic-packaging.yml
@@ -288,8 +288,8 @@ steps:
         env:
           BWC_VERSION: 8.15.4
 
-      - label: "{{matrix.image}} / 8.16.0 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.16.0
+      - label: "{{matrix.image}} / 8.16.1 / packaging-tests-upgrade"
+        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.16.1
         timeout_in_minutes: 300
         matrix:
           setup:
@@ -302,7 +302,7 @@ steps:
           machineType: custom-16-32768
           buildDirectory: /dev/shm/bk
         env:
-          BWC_VERSION: 8.16.0
+          BWC_VERSION: 8.16.1
 
       - label: "{{matrix.image}} / 8.17.0 / packaging-tests-upgrade"
         command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.0

diff --git a/.buildkite/pipelines/periodic.yml b/.buildkite/pipelines/periodic.yml
@@ -306,8 +306,8 @@ steps:
             - signal_reason: agent_stop
               limit: 3
 
-      - label: 8.16.0 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.16.0#bwcTest
+      - label: 8.16.1 / bwc
+        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.16.1#bwcTest
         timeout_in_minutes: 300
         agents:
           provider: gcp
@@ -316,7 +316,7 @@ steps:
           buildDirectory: /dev/shm/bk
           preemptible: true
         env:
-          BWC_VERSION: 8.16.0
+          BWC_VERSION: 8.16.1
         retry:
           automatic:
             - exit_status: "-1"
@@ -429,7 +429,7 @@ steps:
           setup:
             ES_RUNTIME_JAVA:
               - openjdk21
-            BWC_VERSION: ["8.15.4", "8.16.0", "8.17.0", "9.0.0"]
+            BWC_VERSION: ["8.16.1", "8.17.0", "9.0.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004
@@ -471,7 +471,7 @@ steps:
             ES_RUNTIME_JAVA:
               - openjdk21
               - openjdk23
-            BWC_VERSION: ["8.15.4", "8.16.0", "8.17.0", "9.0.0"]
+            BWC_VERSION: ["8.16.1", "8.17.0", "9.0.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004

diff --git a/.ci/bwcVersions b/.ci/bwcVersions
@@ -15,6 +15,6 @@ BWC_VERSION:
   - "8.13.4"
   - "8.14.3"
   - "8.15.4"
-  - "8.16.0"
+  - "8.16.1"
   - "8.17.0"
   - "9.0.0"
diff --git a/.ci/snapshotBwcVersions b/.ci/snapshotBwcVersions
@@ -1,5 +1,4 @@
 BWC_VERSION:
-  - "8.15.4"
-  - "8.16.0"
+  - "8.16.1"
   - "8.17.0"
   - "9.0.0"
diff --git a/benchmarks/src/main/java/org/elasticsearch/benchmark/index/mapper/MapperServiceFactory.java b/benchmarks/src/main/java/org/elasticsearch/benchmark/index/mapper/MapperServiceFactory.java
@@ -10,7 +10,6 @@
 package org.elasticsearch.benchmark.index.mapper;
 
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.util.Accountable;
 import org.elasticsearch.TransportVersion;
 import org.elasticsearch.cluster.ClusterModule;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
@@ -28,7 +27,6 @@
 import org.elasticsearch.index.mapper.MapperRegistry;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.mapper.ProvidedIdFieldMapper;
-import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.index.similarity.SimilarityService;
 import org.elasticsearch.indices.IndicesModule;
 import org.elasticsearch.script.Script;
@@ -56,13 +54,7 @@ public static MapperService create(String mappings) {
         MapperRegistry mapperRegistry = new IndicesModule(Collections.emptyList()).getMapperRegistry();
 
         SimilarityService similarityService = new SimilarityService(indexSettings, null, Map.of());
-        BitsetFilterCache bitsetFilterCache = new BitsetFilterCache(indexSettings, new BitsetFilterCache.Listener() {
-            @Override
-            public void onCache(ShardId shardId, Accountable accountable) {}
-
-            @Override
-            public void onRemoval(ShardId shardId, Accountable accountable) {}
-        });
+        BitsetFilterCache bitsetFilterCache = new BitsetFilterCache(indexSettings, BitsetFilterCache.Listener.NOOP);
         MapperService mapperService = new MapperService(
             () -> TransportVersion.current(),
             indexSettings,

diff --git a/build-tools-internal/src/main/resources/forbidden/es-server-signatures.txt b/build-tools-internal/src/main/resources/forbidden/es-server-signatures.txt
@@ -119,7 +119,7 @@ java.time.zone.ZoneRules#getStandardOffset(java.time.Instant)
 java.time.zone.ZoneRules#getDaylightSavings(java.time.Instant)
 java.time.zone.ZoneRules#isDaylightSavings(java.time.Instant)
 
-@defaultMessage Use logger methods with non-Object parameter
+@defaultMessage The first parameter to a log4j log statement should be a String, a log4j Supplier (not java.util.function.Supplier), or another object that log4j supports.
 org.apache.logging.log4j.Logger#trace(java.lang.Object)
 org.apache.logging.log4j.Logger#trace(java.lang.Object, java.lang.Throwable)
 org.apache.logging.log4j.Logger#debug(java.lang.Object)

diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties
@@ -14,7 +14,7 @@ log4j             = 2.19.0
 slf4j             = 2.0.6
 ecsLogging        = 1.2.0
 jna               = 5.12.1
-netty             = 4.1.109.Final
+netty             = 4.1.115.Final
 commons_lang3     = 3.9
 google_oauth_client = 1.34.1
 

diff --git a/build.gradle b/build.gradle
@@ -420,8 +420,11 @@ gradle.projectsEvaluated {
   }
 }
 
-tasks.named("validateChangelogs") {
-  onlyIf { project.gradle.startParameter.taskNames.any { it.startsWith("checkPart") || it == 'functionalTests' } == false }
+tasks.named("validateChangelogs").configure {
+  def triggeredTaskNames = gradle.startParameter.taskNames
+  onlyIf {
+    triggeredTaskNames.any { it.startsWith("checkPart") || it == 'functionalTests' } == false
+  }
 }
 
 tasks.named("precommit") {

diff --git a/docs/changelog/104683.yaml b/docs/changelog/104683.yaml
@@ -0,0 +1,5 @@
+pr: 104683
+summary: "Feature: re-structure document ID generation favoring _id inverted index compression"
+area: Logs
+type: enhancement
+issues: []
diff --git a/docs/changelog/106520.yaml b/docs/changelog/106520.yaml
diff --git a/docs/changelog/107047.yaml b/docs/changelog/107047.yaml
diff --git a/docs/changelog/107936.yaml b/docs/changelog/107936.yaml
diff --git a/docs/changelog/109017.yaml b/docs/changelog/109017.yaml
diff --git a/docs/changelog/109193.yaml b/docs/changelog/109193.yaml
diff --git a/docs/changelog/109414.yaml b/docs/changelog/109414.yaml
diff --git a/docs/changelog/109583.yaml b/docs/changelog/109583.yaml
diff --git a/docs/changelog/109667.yaml b/docs/changelog/109667.yaml
diff --git a/docs/changelog/109684.yaml b/docs/changelog/109684.yaml
diff --git a/docs/changelog/110021.yaml b/docs/changelog/110021.yaml
diff --git a/docs/changelog/110116.yaml b/docs/changelog/110116.yaml
diff --git a/docs/changelog/110216.yaml b/docs/changelog/110216.yaml
diff --git a/docs/changelog/110237.yaml b/docs/changelog/110237.yaml
diff --git a/docs/changelog/110399.yaml b/docs/changelog/110399.yaml
diff --git a/docs/changelog/110427.yaml b/docs/changelog/110427.yaml
diff --git a/docs/changelog/110520.yaml b/docs/changelog/110520.yaml
diff --git a/docs/changelog/110524.yaml b/docs/changelog/110524.yaml
diff --git a/docs/changelog/110527.yaml b/docs/changelog/110527.yaml
diff --git a/docs/changelog/110554.yaml b/docs/changelog/110554.yaml
diff --git a/docs/changelog/110574.yaml b/docs/changelog/110574.yaml
diff --git a/docs/changelog/110578.yaml b/docs/changelog/110578.yaml
diff --git a/docs/changelog/110593.yaml b/docs/changelog/110593.yaml
diff --git a/docs/changelog/110603.yaml b/docs/changelog/110603.yaml
diff --git a/docs/changelog/110606.yaml b/docs/changelog/110606.yaml
diff --git a/docs/changelog/110630.yaml b/docs/changelog/110630.yaml
diff --git a/docs/changelog/110633.yaml b/docs/changelog/110633.yaml
diff --git a/docs/changelog/110669.yaml b/docs/changelog/110669.yaml
diff --git a/docs/changelog/110676.yaml b/docs/changelog/110676.yaml
diff --git a/docs/changelog/110677.yaml b/docs/changelog/110677.yaml
diff --git a/docs/changelog/110718.yaml b/docs/changelog/110718.yaml
diff --git a/docs/changelog/110734.yaml b/docs/changelog/110734.yaml
diff --git a/docs/changelog/110796.yaml b/docs/changelog/110796.yaml
diff --git a/docs/changelog/110816.yaml b/docs/changelog/110816.yaml
diff --git a/docs/changelog/110829.yaml b/docs/changelog/110829.yaml