Merge remote-tracking branch 'origin/feature/semantic-text' into carl…

…osdelest/semantic-text-inference # Conflicts: # server/src/main/java/org/elasticsearch/TransportVersions.java # server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetadata.java # server/src/main/java/org/elasticsearch/index/mapper/FieldTypeLookup.java
carlosdelest · Jan 18, 2024 · 8389572 · 8389572
2 parents f3f008f + 833469c
commit 8389572
Show file tree

Hide file tree

Showing 962 changed files with 15,933 additions and 6,596 deletions.
diff --git a/.buildkite/pipelines/intake.yml b/.buildkite/pipelines/intake.yml
@@ -48,7 +48,7 @@ steps:
         timeout_in_minutes: 300
         matrix:
           setup:
-            BWC_VERSION: ["7.17.17", "8.11.5", "8.12.0", "8.13.0"]
+            BWC_VERSION: ["7.17.17", "8.12.1", "8.13.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004

diff --git a/.buildkite/pipelines/periodic-packaging.yml b/.buildkite/pipelines/periodic-packaging.yml
@@ -1793,8 +1793,8 @@ steps:
         env:
           BWC_VERSION: 8.11.4
 
-      - label: "{{matrix.image}} / 8.11.5 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.11.5
+      - label: "{{matrix.image}} / 8.12.0 / packaging-tests-upgrade"
+        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.12.0
         timeout_in_minutes: 300
         matrix:
           setup:
@@ -1807,10 +1807,10 @@ steps:
           machineType: custom-16-32768
           buildDirectory: /dev/shm/bk
         env:
-          BWC_VERSION: 8.11.5
+          BWC_VERSION: 8.12.0
 
-      - label: "{{matrix.image}} / 8.12.0 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.12.0
+      - label: "{{matrix.image}} / 8.12.1 / packaging-tests-upgrade"
+        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.12.1
         timeout_in_minutes: 300
         matrix:
           setup:
@@ -1823,7 +1823,7 @@ steps:
           machineType: custom-16-32768
           buildDirectory: /dev/shm/bk
         env:
-          BWC_VERSION: 8.12.0
+          BWC_VERSION: 8.12.1
 
       - label: "{{matrix.image}} / 8.13.0 / packaging-tests-upgrade"
         command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.13.0

diff --git a/.buildkite/pipelines/periodic.yml b/.buildkite/pipelines/periodic.yml
@@ -1102,26 +1102,26 @@ steps:
           buildDirectory: /dev/shm/bk
         env:
           BWC_VERSION: 8.11.4
-      - label: 8.11.5 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.11.5#bwcTest
+      - label: 8.12.0 / bwc
+        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.12.0#bwcTest
         timeout_in_minutes: 300
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004
           machineType: n1-standard-32
           buildDirectory: /dev/shm/bk
         env:
-          BWC_VERSION: 8.11.5
-      - label: 8.12.0 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.12.0#bwcTest
+          BWC_VERSION: 8.12.0
+      - label: 8.12.1 / bwc
+        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.12.1#bwcTest
         timeout_in_minutes: 300
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004
           machineType: n1-standard-32
           buildDirectory: /dev/shm/bk
         env:
-          BWC_VERSION: 8.12.0
+          BWC_VERSION: 8.12.1
       - label: 8.13.0 / bwc
         command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.13.0#bwcTest
         timeout_in_minutes: 300

diff --git a/.ci/bwcVersions b/.ci/bwcVersions
@@ -109,6 +109,6 @@ BWC_VERSION:
   - "8.11.2"
   - "8.11.3"
   - "8.11.4"
-  - "8.11.5"
   - "8.12.0"
+  - "8.12.1"
   - "8.13.0"
diff --git a/.ci/snapshotBwcVersions b/.ci/snapshotBwcVersions
@@ -1,5 +1,4 @@
 BWC_VERSION:
   - "7.17.17"
-  - "8.11.5"
-  - "8.12.0"
+  - "8.12.1"
   - "8.13.0"
diff --git a/benchmarks/src/main/java/org/elasticsearch/benchmark/compute/operator/BlockBenchmark.java b/benchmarks/src/main/java/org/elasticsearch/benchmark/compute/operator/BlockBenchmark.java
@@ -720,7 +720,7 @@ private static long computeBytesRefCheckSum(BytesRefBlock block, int[] traversal
     }
 
     private static long computeDoubleCheckSum(DoubleBlock block, int[] traversalOrder) {
-        double sum = 0;
+        long sum = 0;
 
         for (int position : traversalOrder) {
             if (block.isNull(position)) {
@@ -729,11 +729,12 @@ private static long computeDoubleCheckSum(DoubleBlock block, int[] traversalOrde
             int start = block.getFirstValueIndex(position);
             int end = start + block.getValueCount(position);
             for (int i = start; i < end; i++) {
-                sum += block.getDouble(i);
+                // Use an operation that is not affected by rounding errors. Otherwise, the result may depend on the traversalOrder.
+                sum += (long) block.getDouble(i);
             }
         }
 
-        return (long) sum;
+        return sum;
     }
 
     private static long computeIntCheckSum(IntBlock block, int[] traversalOrder) {

diff --git a/branches.json b/branches.json
@@ -7,9 +7,6 @@
     {
       "branch": "8.12"
     },
-    {
-      "branch": "8.11"
-    },
     {
       "branch": "7.17"
     }

diff --git a/...tegTest/groovy/org/elasticsearch/gradle/internal/SymbolicLinkPreservingTarFuncTest.groovy b/...tegTest/groovy/org/elasticsearch/gradle/internal/SymbolicLinkPreservingTarFuncTest.groovy
@@ -8,6 +8,8 @@
 
 package org.elasticsearch.gradle.internal
 
+import spock.lang.Ignore
+
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream
 import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream
@@ -36,6 +38,11 @@ class SymbolicLinkPreservingTarFuncTest extends AbstractGradleFuncTest {
         final Path linkToRealFolder = archiveSourceRoot.resolve("link-to-real-folder");
         Files.createSymbolicLink(linkToRealFolder, Paths.get("./real-folder"));
 
+        final Path realFolder2 = testProjectDir.getRoot().toPath().resolve("real-folder2")
+        final Path realFolderSub = realFolder2.resolve("sub")
+        Files.createDirectory(realFolder2);
+        Files.createDirectory(realFolderSub);
+
         buildFile << """
 import org.elasticsearch.gradle.internal.SymbolicLinkPreservingTar
 
@@ -56,6 +63,12 @@ tasks.register("buildBZip2Tar", SymbolicLinkPreservingTar) { SymbolicLinkPreserv
   tar.compression = Compression.BZIP2
   tar.preserveFileTimestamps = ${preserverTimestamp}
   from fileTree("archiveRoot")
+
+  into('config') {
+    dirMode 0750
+    fileMode 0660
+    from "real-folder2"
+  }
 }
 """
         when:
@@ -118,14 +131,20 @@ tasks.register("buildTar", SymbolicLinkPreservingTar) { SymbolicLinkPreservingTa
                 if (entry.getName().equals("real-folder/")) {
                     assert entry.isDirectory()
                     realFolderEntry = true
-                } else if (entry.getName().equals("real-folder/file")) {
+                }  else if (entry.getName().equals("real-folder/file")) {
                     assert entry.isFile()
                     fileEntry = true
                 } else if (entry.getName().equals("real-folder/link-to-file")) {
                     assert entry.isSymbolicLink()
                     assert normalized(entry.getLinkName()) == "./file"
                     linkToFileEntry = true
-                } else if (entry.getName().equals("link-in-folder/")) {
+                } else if (entry.getName().equals("config/")) {
+                    assert entry.isDirectory()
+                    assert entry.getMode() == 16877
+                } else if (entry.getName().equals("config/sub/")) {
+                    assert entry.isDirectory()
+                    assert entry.getMode() == 16872
+                }else if (entry.getName().equals("link-in-folder/")) {
                     assert entry.isDirectory()
                     linkInFolderEntry = true
                 } else if (entry.getName().equals("link-in-folder/link-to-file")) {

diff --git a/build-tools-internal/src/main/groovy/elasticsearch.fips.gradle b/build-tools-internal/src/main/groovy/elasticsearch.fips.gradle
@@ -79,7 +79,6 @@ if (BuildParams.inFipsJvm) {
           // with no x-pack. Tests having security explicitly enabled/disabled will override this setting
           setting 'xpack.security.enabled', 'false'
           setting 'xpack.security.fips_mode.enabled', 'true'
-          setting 'xpack.security.fips_mode.required_providers', '["BCFIPS", "BCJSSE"]'
           setting 'xpack.license.self_generated.type', 'trial'
           setting 'xpack.security.authc.password_hashing.algorithm', 'pbkdf2_stretch'
           keystorePassword 'keystore-password'

diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties
@@ -2,7 +2,7 @@ elasticsearch     = 8.13.0
 lucene            = 9.9.1
 
 bundled_jdk_vendor = openjdk
-bundled_jdk = 21.0.1+12@415e3f918a1f4062a0074a2794853d0d
+bundled_jdk = 21.0.2+13@f2283984656d49d69e91c558476027ac
 # optional dependencies
 spatial4j         = 0.7
 jts               = 1.15.0

diff --git a/docs/changelog/100031.yaml b/docs/changelog/100031.yaml
diff --git a/docs/changelog/100033.yaml b/docs/changelog/100033.yaml
diff --git a/docs/changelog/100236.yaml b/docs/changelog/100236.yaml
diff --git a/docs/changelog/100287.yaml b/docs/changelog/100287.yaml
diff --git a/docs/changelog/100316.yaml b/docs/changelog/100316.yaml
diff --git a/docs/changelog/100333.yaml b/docs/changelog/100333.yaml
diff --git a/docs/changelog/100368.yaml b/docs/changelog/100368.yaml
diff --git a/docs/changelog/100383.yaml b/docs/changelog/100383.yaml
diff --git a/docs/changelog/100392.yaml b/docs/changelog/100392.yaml
diff --git a/docs/changelog/100408.yaml b/docs/changelog/100408.yaml
diff --git a/docs/changelog/100466.yaml b/docs/changelog/100466.yaml
diff --git a/docs/changelog/100492.yaml b/docs/changelog/100492.yaml
diff --git a/docs/changelog/100519.yaml b/docs/changelog/100519.yaml
diff --git a/docs/changelog/100565.yaml b/docs/changelog/100565.yaml
diff --git a/docs/changelog/100570.yaml b/docs/changelog/100570.yaml
diff --git a/docs/changelog/100609.yaml b/docs/changelog/100609.yaml
diff --git a/docs/changelog/100642.yaml b/docs/changelog/100642.yaml
diff --git a/docs/changelog/100646.yaml b/docs/changelog/100646.yaml
diff --git a/docs/changelog/100776.yaml b/docs/changelog/100776.yaml
diff --git a/docs/changelog/100826.yaml b/docs/changelog/100826.yaml
diff --git a/docs/changelog/100828.yaml b/docs/changelog/100828.yaml
diff --git a/docs/changelog/100862.yaml b/docs/changelog/100862.yaml
diff --git a/docs/changelog/100899.yaml b/docs/changelog/100899.yaml
diff --git a/docs/changelog/100921.yaml b/docs/changelog/100921.yaml
diff --git a/docs/changelog/100938.yaml b/docs/changelog/100938.yaml
diff --git a/docs/changelog/100974.yaml b/docs/changelog/100974.yaml
diff --git a/docs/changelog/100990.yaml b/docs/changelog/100990.yaml
diff --git a/docs/changelog/101024.yaml b/docs/changelog/101024.yaml
diff --git a/docs/changelog/101026.yaml b/docs/changelog/101026.yaml
diff --git a/docs/changelog/101032.yaml b/docs/changelog/101032.yaml
diff --git a/docs/changelog/101050.yaml b/docs/changelog/101050.yaml
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,9 +7,6 @@ @@
         {
           "branch": "8.12"
         },
-        {
-          "branch": "8.11"
-        },
         {
           "branch": "7.17"
         }
@@ Expand Down @@