Upgrade to Lucene 9.12.1

elastic · Dec 9, 2024 · 393b5ed · 393b5ed
1 parent 2616415
commit 393b5ed
Show file tree

Hide file tree

Showing 5 changed files with 84 additions and 79 deletions.
diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties
@@ -1,5 +1,5 @@
 elasticsearch     = 8.18.0
-lucene            = 9.12.0
+lucene            = 9.12.1
 
 bundled_jdk_vendor = openjdk
 bundled_jdk = 23+37@3c5b90190c68498b986a97f276efd28a

diff --git a/build.gradle b/build.gradle
@@ -236,6 +236,11 @@ if (project.gradle.startParameter.taskNames.any { it.startsWith("checkPart") ||
 
 subprojects { proj ->
   apply plugin: 'elasticsearch.base'
+
+  repositories {
+    // TODO: Temporary for Lucene RC builds. REMOVE
+    maven { url "https://dist.apache.org/repos/dist/dev/lucene/lucene-9.12.1-RC1-rev-7a97a05a239d6fb9f1f347aa09bfa52e875be092/lucene/maven" }
+  }
 }
 
 allprojects {

diff --git a/docs/Versions.asciidoc b/docs/Versions.asciidoc
@@ -1,8 +1,8 @@
 
 include::{docs-root}/shared/versions/stack/{source_branch}.asciidoc[]
 
-:lucene_version:        9.12.0
-:lucene_version_path:   9_12_0
+:lucene_version:        9.12.1
+:lucene_version_path:   9_12_1
 :jdk:                   11.0.2
 :jdk_major:             11
 :build_type:            tar

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -2915,129 +2915,128 @@
             <sha256 value="015d5c229f3cd5c0ebf175c1da08d596d94043362ae9d92637d88848c90537c8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-common" version="9.12.0">
-         <artifact name="lucene-analysis-common-9.12.0.jar">
-            <sha256 value="8c79d8741f711cc6d7501805b03f7b5f505805d09cab1beb95f0be24b6d27655" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-common" version="9.12.1">
+         <artifact name="lucene-analysis-common-9.12.1.jar">
+            <sha256 value="0e7534d4b6e1c3ce7af939028b3e8c1730ffb29ea5d689de2bc166c482e01b5d" origin="Generated by Gradle"/>
          </artifact>
-      </component>
-      <component group="org.apache.lucene" name="lucene-analysis-icu" version="9.12.0">
-         <artifact name="lucene-analysis-icu-9.12.0.jar">
-            <sha256 value="52e914cc2d50beec8af0d07f50e5dab803cb9ce8e675ffe43a2aae6102fe6e25" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-icu" version="9.12.1">
+         <artifact name="lucene-analysis-icu-9.12.1.jar">
+            <sha256 value="27dc3353be141e9ae7ed236aeb44b5e7ff35dda45555fcbdd5d8aefb7149ab16" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-kuromoji" version="9.12.0">
-         <artifact name="lucene-analysis-kuromoji-9.12.0.jar">
-            <sha256 value="3da0bd68c68cfe518d0e87ea49af1a9560579bca6b9a7fdf642169cb76dd6887" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-kuromoji" version="9.12.1">
+         <artifact name="lucene-analysis-kuromoji-9.12.1.jar">
+            <sha256 value="c035ed289413071e88f64d8bac1eba2b9ac6f382e7d1684fedf3b822f23a6495" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-morfologik" version="9.12.0">
-         <artifact name="lucene-analysis-morfologik-9.12.0.jar">
-            <sha256 value="920358e33d806b5c3feb3566795714e1f36a616520bd2bd5da1e8b639c1f8549" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-morfologik" version="9.12.1">
+         <artifact name="lucene-analysis-morfologik-9.12.1.jar">
+            <sha256 value="6fac575c1f91b409ff82bf7d18883d0b90dc59f0b321f07036b23ed8df336663" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-nori" version="9.12.0">
-         <artifact name="lucene-analysis-nori-9.12.0.jar">
-            <sha256 value="26cacbe1d75e138ac0ba1e392edb1877c10a422f98524bf51d5d77492272889d" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-nori" version="9.12.1">
+         <artifact name="lucene-analysis-nori-9.12.1.jar">
+            <sha256 value="6fd6b9661a1fa1feae6c6a0d82ae8cb4e661bcb8ba1a35693ae80e4571afe5c3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-phonetic" version="9.12.0">
-         <artifact name="lucene-analysis-phonetic-9.12.0.jar">
-            <sha256 value="4bb24414425e04ccd28c835e8dd7f52259185f8f671aea6432460b4b7afa5cfa" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-phonetic" version="9.12.1">
+         <artifact name="lucene-analysis-phonetic-9.12.1.jar">
+            <sha256 value="d98e2d1f6c3ef9567fe6ea6eaee339653491fda100d8df546894f2368ecfdb52" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-smartcn" version="9.12.0">
-         <artifact name="lucene-analysis-smartcn-9.12.0.jar">
-            <sha256 value="ffd68804d3387968784b7f52b7c14c7439fa474ffbf1b36d93fa1d2b04101f7a" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-smartcn" version="9.12.1">
+         <artifact name="lucene-analysis-smartcn-9.12.1.jar">
+            <sha256 value="c06f28b6c5e7ce77fb66ed64471683a4a2591d883415895fde36b178d692ac88" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-stempel" version="9.12.0">
-         <artifact name="lucene-analysis-stempel-9.12.0.jar">
-            <sha256 value="c4911b5697c0403b694aa84d3f63090067c74ffa8c95cb088d0b80e91166df4a" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-stempel" version="9.12.1">
+         <artifact name="lucene-analysis-stempel-9.12.1.jar">
+            <sha256 value="9c3078761888f091a81cbc9191685f4d3a05a4aff83991ec832cfd8bb244a42a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-backward-codecs" version="9.12.0">
-         <artifact name="lucene-backward-codecs-9.12.0.jar">
-            <sha256 value="a42c17f304c9bf1e8411ebdcf91baf2df2d00c7bfa13bca9e41ccf381d78cfba" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-backward-codecs" version="9.12.1">
+         <artifact name="lucene-backward-codecs-9.12.1.jar">
+            <sha256 value="9255caa35fe9f29e97a39935118204479efde22bb23bafcd2859e296f4571792" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-codecs" version="9.12.0">
-         <artifact name="lucene-codecs-9.12.0.jar">
-            <sha256 value="8173a45b87df23a6dd279916cf16b361c0dcfeff5927121b014d210b19f17555" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-codecs" version="9.12.1">
+         <artifact name="lucene-codecs-9.12.1.jar">
+            <sha256 value="a1807c8351d8c53828e588cc586dbc4b6635341cd7ae401f18b5ac883821aaf0" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-core" version="9.12.0">
-         <artifact name="lucene-core-9.12.0.jar">
-            <sha256 value="6c7b774b75cd8f369e246f365a47caa54ae991cae6afa49c7f339e9921ca58a0" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-core" version="9.12.1">
+         <artifact name="lucene-core-9.12.1.jar">
+            <sha256 value="8d812e9fa6dbd816808205e6cb4d7ab43a747e379c8cb31a0d6dc91050b3f97a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-expressions" version="9.12.0">
-         <artifact name="lucene-expressions-9.12.0.jar">
-            <sha256 value="9d14919a3d0f07420c1d57a68de52180ae2477d6255d7f693f44515a4fda9c9b" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-expressions" version="9.12.1">
+         <artifact name="lucene-expressions-9.12.1.jar">
+            <sha256 value="7fb06e21ff3fefda6a481c70f84e489670e4fec52c58d4d082103b73c6be93d3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-facet" version="9.12.0">
-         <artifact name="lucene-facet-9.12.0.jar">
-            <sha256 value="3c07754f0a1f45ba42a637faa8568c18507defa6b77a1ed71af291cd4e7ac603" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-facet" version="9.12.1">
+         <artifact name="lucene-facet-9.12.1.jar">
+            <sha256 value="36910f094d21907908c65eaab6f892ef1aa11081612c652b6bfafddc7b0b1ef1" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-grouping" version="9.12.0">
-         <artifact name="lucene-grouping-9.12.0.jar">
-            <sha256 value="ffc02d047f4f036c5a5f409baaf8e19abca165deccc3e57e7a422560f4de1219" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-grouping" version="9.12.1">
+         <artifact name="lucene-grouping-9.12.1.jar">
+            <sha256 value="b6a93845493a275e66c776e9d567109c13b68de81cb3de067ec99637bad5551e" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-highlighter" version="9.12.0">
-         <artifact name="lucene-highlighter-9.12.0.jar">
-            <sha256 value="5094e1b38f02eb72500a4283ac0f654e2e81943c5359b629567dd7900c935a59" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-highlighter" version="9.12.1">
+         <artifact name="lucene-highlighter-9.12.1.jar">
+            <sha256 value="f8a4184b7b1cd490a7161887f2984856ff7de39ec2394073f884bcabccb45d69" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-join" version="9.12.0">
-         <artifact name="lucene-join-9.12.0.jar">
-            <sha256 value="c49cb1be843295b2c7158c03755f222416fad9915114bc7f74649d20f4fc43d6" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-join" version="9.12.1">
+         <artifact name="lucene-join-9.12.1.jar">
+            <sha256 value="e53ebf2d59c8f482ab14af07bb41ba2d3617000f7781768b7fe53b1d0e2249b0" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-memory" version="9.12.0">
-         <artifact name="lucene-memory-9.12.0.jar">
-            <sha256 value="fdbb9c9b3270ce06370d094f1a80dbbbf81b2638b55fa14cc817469092899f01" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-memory" version="9.12.1">
+         <artifact name="lucene-memory-9.12.1.jar">
+            <sha256 value="587363f98e410549fa5b2028b355d329231607f992303234ca1866311d9d7d29" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-misc" version="9.12.0">
-         <artifact name="lucene-misc-9.12.0.jar">
-            <sha256 value="7989d094b4b168ce9ef2949e13f6bfe820829944e50831881be1adeddbe02c04" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-misc" version="9.12.1">
+         <artifact name="lucene-misc-9.12.1.jar">
+            <sha256 value="0d5c9476758191a3e4c07db977a9cdc56dba3cfac026ee79d03756e81a17e16a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-queries" version="9.12.0">
-         <artifact name="lucene-queries-9.12.0.jar">
-            <sha256 value="3b4da6b1673e4edd141c7b86538cc61f6ff3386106f1f5e179c9fe2d30ea2fca" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-queries" version="9.12.1">
+         <artifact name="lucene-queries-9.12.1.jar">
+            <sha256 value="3630f4d53203d62152cdb993a7b4f9d4e52cff2688ba549ad09cc01d5d78b5f8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-queryparser" version="9.12.0">
-         <artifact name="lucene-queryparser-9.12.0.jar">
-            <sha256 value="fc866b7bbfc199436feb24be7dd5c575445342eb283bfe07dd519eab131d3675" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-queryparser" version="9.12.1">
+         <artifact name="lucene-queryparser-9.12.1.jar">
+            <sha256 value="9746eb991203553ade09491ac49415e3711ec32e4ad3cd705d8d9620a32192dd" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-sandbox" version="9.12.0">
-         <artifact name="lucene-sandbox-9.12.0.jar">
-            <sha256 value="2262f39a241f435dba61f230e7528205c34f4bf0008faa57f0808476bb782996" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-sandbox" version="9.12.1">
+         <artifact name="lucene-sandbox-9.12.1.jar">
+            <sha256 value="9aa00ce942216d513352dae89cf8588c6bdd379f82a5d8a30d8652535bd58aae" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-spatial-extras" version="9.12.0">
-         <artifact name="lucene-spatial-extras-9.12.0.jar">
-            <sha256 value="ea41de3b2da573e488033b8b1c2033e17c27ce39957cf6acb8904297ae6e1747" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-spatial-extras" version="9.12.1">
+         <artifact name="lucene-spatial-extras-9.12.1.jar">
+            <sha256 value="d9d180a559147e20ed0c1f27bc4e0daf4518b46fce19829eb397c0f07b06f54a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-spatial3d" version="9.12.0">
-         <artifact name="lucene-spatial3d-9.12.0.jar">
-            <sha256 value="4263e163937024838a8761618b1ce4eba06857adca0c9385d1ac014ec2937de6" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-spatial3d" version="9.12.1">
+         <artifact name="lucene-spatial3d-9.12.1.jar">
+            <sha256 value="920d541ee609bc36b7f999761a3055622fa08631445616825a0c1ce2d72857cf" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-suggest" version="9.12.0">
-         <artifact name="lucene-suggest-9.12.0.jar">
-            <sha256 value="1606fb9c7cf57d88b2824916c00280c92e14bcde798a6b78b27e0db8f13227f0" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-suggest" version="9.12.1">
+         <artifact name="lucene-suggest-9.12.1.jar">
+            <sha256 value="6894de92b80e294a07041447caa5bb13d5dee33fe6ff05270afc3e0d1be40140" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-test-framework" version="9.12.0">
-         <artifact name="lucene-test-framework-9.12.0.jar">
-            <sha256 value="47d4e1f47ebd26117d47af8fbff471c116c571fd7d7bd6cb199d89f8454e5cf0" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-test-framework" version="9.12.1">
+         <artifact name="lucene-test-framework-9.12.1.jar">
+            <sha256 value="62a906edd2648bc173ba86301257d8490af71b986f0abe2323cd0e596402cce1" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.apache.maven" name="maven-api-meta" version="4.0.0-alpha-9">

diff --git a/server/src/main/java/org/elasticsearch/index/IndexVersions.java b/server/src/main/java/org/elasticsearch/index/IndexVersions.java
@@ -122,6 +122,7 @@ private static IndexVersion def(int id, Version luceneVersion) {
     public static final IndexVersion LOGSDB_DEFAULT_IGNORE_DYNAMIC_BEYOND_LIMIT_BACKPORT = def(8_519_00_0, Version.LUCENE_9_12_0);
     public static final IndexVersion TIME_BASED_K_ORDERED_DOC_ID_BACKPORT = def(8_520_00_0, Version.LUCENE_9_12_0);
     public static final IndexVersion DEPRECATE_SOURCE_MODE_MAPPER = def(8_521_00_0, Version.LUCENE_9_12_0);
+    public static final IndexVersion UPGRADE_TO_LUCENE_9_12_1 = def(8_522_00_0, Version.LUCENE_9_12_1);
     /*
      * STOP! READ THIS FIRST! No, really,
      *        ____ _____ ___  ____  _        ____  _____    _    ____    _____ _   _ ___ ____    _____ ___ ____  ____ _____ _