[8.19] Upgrade to lucene 9.12.2

build-tools-internal/src/main/resources/forbidden/es-all-signatures.txt

@@ -61,10 +61,3 @@ org.apache.logging.log4j.message.ParameterizedMessage#<init>(java.lang.String, j
 
 @defaultMessage Use WriteLoadForecaster#getForecastedWriteLoad instead
 org.elasticsearch.cluster.metadata.IndexMetadata#getForecastedWriteLoad()
-
-# This is a temporary patch as there is a low level Lucene bug in certain scenarios
-org.apache.lucene.document.LongField#newExactQuery(java.lang.String, long) @ Use org.elasticsearch.lucene.document.NumericField#newExactLongQuery(java.lang.String, long) instead.
-org.apache.lucene.document.LongField#newRangeQuery(java.lang.String, long, long) @ Use org.elasticsearch.lucene.document.NumericField#newRangeLongQuery(java.lang.String, long, long) instead.
-org.apache.lucene.document.IntField#newExactQuery(java.lang.String, int) @ Use org.elasticsearch.lucene.document.NumericField#newExactIntQuery(java.lang.String, int) instead.
-org.apache.lucene.document.IntField#newRangeQuery(java.lang.String, int, int) @ Use org.elasticsearch.lucene.document.NumericField#newRangeIntQuery(java.lang.String, int, int) instead.
-org.apache.lucene.search.IndexSortSortedNumericDocValuesRangeQuery @ use org.elasticsearch.lucene.search.XIndexSortSortedNumericDocValuesRangeQuery instead.

build-tools-internal/version.properties

@@ -1,5 +1,5 @@
 elasticsearch     = 8.19.0
-lucene            = 9.12.1
+lucene            = 9.12.2
 
 bundled_jdk_vendor = openjdk
 bundled_jdk = 24+36@1f9ff9062db4449d8ca828c504ffae90

docs/Versions.asciidoc

@@ -1,8 +1,8 @@
 
 include::{docs-root}/shared/versions/stack/{source_branch}.asciidoc[]
 
-:lucene_version:        9.12.1
-:lucene_version_path:   9_12_1
+:lucene_version:        9.12.2
+:lucene_version_path:   9_12_2
 :jdk:                   11.0.2
 :jdk_major:             11
 :build_type:            tar

docs/changelog/129555.yaml

@@ -0,0 +1,14 @@
+pr: 129555
+summary: "[8.19] Upgrade to lucene 9.12.2"
+area: Search
+type: upgrade
+issues: []
+highlight:
+  title: Upgrade to lucene 9.12.2
+  body: |-
+    * Reduce NeighborArray on-heap memory during HNSW graph building
+    * Fix IndexSortSortedNumericDocValuesRangeQuery for integer sorting
+    * ValueSource.fromDoubleValuesSource(dvs).getSortField() would throw errors when used if the DoubleValuesSource needed scores
+    * Disable connectedComponents logic in HNSW graph building.
+    ----
+  notable: true

gradle/verification-metadata.xml

@@ -2998,129 +2998,129 @@
             <sha256 value="015d5c229f3cd5c0ebf175c1da08d596d94043362ae9d92637d88848c90537c8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <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"/>
+      <component group="org.apache.lucene" name="lucene-analysis-common" version="9.12.2">
+         <artifact name="lucene-analysis-common-9.12.2.jar">
+            <sha256 value="a472f61b4d7738787bf1a637beac0ebf134d785c37aa069fb071e9715568c8b8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <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"/>
+      <component group="org.apache.lucene" name="lucene-analysis-icu" version="9.12.2">
+         <artifact name="lucene-analysis-icu-9.12.2.jar">
+            <sha256 value="4cb8039065c433d50095daf7a2ef2c39c3800d67b1520dfd8ff63688fc215f68" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <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"/>
+      <component group="org.apache.lucene" name="lucene-analysis-kuromoji" version="9.12.2">
+         <artifact name="lucene-analysis-kuromoji-9.12.2.jar">
+            <sha256 value="0aa57815282705ad1926f92d25202fb1beb1b6beb034b527f63efb687a506996" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <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"/>
+      <component group="org.apache.lucene" name="lucene-analysis-morfologik" version="9.12.2">
+         <artifact name="lucene-analysis-morfologik-9.12.2.jar">
+            <sha256 value="0d60093a224ab41474786a664395541b38cbc48b504e982db7bb3388b68311c9" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <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"/>
+      <component group="org.apache.lucene" name="lucene-analysis-nori" version="9.12.2">
+         <artifact name="lucene-analysis-nori-9.12.2.jar">
+            <sha256 value="74df2f9ba8dcc94ad27e3bbfb862e3596abcfae2e68ced3858f67f2499fbdec1" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <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"/>
+      <component group="org.apache.lucene" name="lucene-analysis-phonetic" version="9.12.2">
+         <artifact name="lucene-analysis-phonetic-9.12.2.jar">
+            <sha256 value="68fb35fc18290e5bc807c9b24dddc8bfcabfcb668ab28db4d0687d6add837d29" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <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"/>
+      <component group="org.apache.lucene" name="lucene-analysis-smartcn" version="9.12.2">
+         <artifact name="lucene-analysis-smartcn-9.12.2.jar">
+            <sha256 value="30b4bf85ad0f27f9c5c49e3cd1b3cbcd923f24b8a722f462e5f3e96dba9568c4" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <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"/>
+      <component group="org.apache.lucene" name="lucene-analysis-stempel" version="9.12.2">
+         <artifact name="lucene-analysis-stempel-9.12.2.jar">
+            <sha256 value="8c1c101b7fcdf48432cf409317ec58753182c2947aa34c0de7ab419ba16746c3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <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"/>
+      <component group="org.apache.lucene" name="lucene-backward-codecs" version="9.12.2">
+         <artifact name="lucene-backward-codecs-9.12.2.jar">
+            <sha256 value="4a027b24ab6213402c4af76aeae7344771548743822880aec09817e76a4690e9" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <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"/>
+      <component group="org.apache.lucene" name="lucene-codecs" version="9.12.2">
+         <artifact name="lucene-codecs-9.12.2.jar">
+            <sha256 value="ee055269f7e3934f2c0577c7417bafc65d9c08dda31061634be68519606409f8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <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"/>
+      <component group="org.apache.lucene" name="lucene-core" version="9.12.2">
+         <artifact name="lucene-core-9.12.2.jar">
+            <sha256 value="3a5426c7082a16adfe39a55502eecf4e69547e62d3dcf292c730e228fbaad2fd" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <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"/>
+      <component group="org.apache.lucene" name="lucene-expressions" version="9.12.2">
+         <artifact name="lucene-expressions-9.12.2.jar">
+            <sha256 value="193c70854a83abe16ed8ea3d33a6f4b15fd302f6f539621ace13c8b253bc02e1" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <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"/>
+      <component group="org.apache.lucene" name="lucene-facet" version="9.12.2">
+         <artifact name="lucene-facet-9.12.2.jar">
+            <sha256 value="02c9ac783dda2914f6f62689314bad0efc1d3ee3c630f5c9bb357d736f1cc9ff" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <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"/>
+      <component group="org.apache.lucene" name="lucene-grouping" version="9.12.2">
+         <artifact name="lucene-grouping-9.12.2.jar">
+            <sha256 value="d3255d0279e1a41cf145f3d01019dda6ba9d7e2d3185f4170570072baf8e95ca" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <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"/>
+      <component group="org.apache.lucene" name="lucene-highlighter" version="9.12.2">
+         <artifact name="lucene-highlighter-9.12.2.jar">
+            <sha256 value="e0ce89f860e7e450ac08500c40f2b7a221b161610d12df9f50a6a49b2547863a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <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"/>
+      <component group="org.apache.lucene" name="lucene-join" version="9.12.2">
+         <artifact name="lucene-join-9.12.2.jar">
+            <sha256 value="94d5fa2fd7e0f7e0711717b3e23bb148a5a356270c5e6cda720070a4d092276e" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <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"/>
+      <component group="org.apache.lucene" name="lucene-memory" version="9.12.2">
+         <artifact name="lucene-memory-9.12.2.jar">
+            <sha256 value="6222e7d436c380652e51bc4c4c27a8a56c7f9e70d7aa0fad07a76b85bd52dcb2" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <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"/>
+      <component group="org.apache.lucene" name="lucene-misc" version="9.12.2">
+         <artifact name="lucene-misc-9.12.2.jar">
+            <sha256 value="20eaded0c0b6141aed36359a551bad300eb8b5264b904110de7d845bad858df1" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <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"/>
+      <component group="org.apache.lucene" name="lucene-queries" version="9.12.2">
+         <artifact name="lucene-queries-9.12.2.jar">
+            <sha256 value="8c07692e0acacd7433f14107296e9d3402d6d435d4c4ed2aa6412e9b90d3d6b4" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <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"/>
+      <component group="org.apache.lucene" name="lucene-queryparser" version="9.12.2">
+         <artifact name="lucene-queryparser-9.12.2.jar">
+            <sha256 value="dc80ae71863446b5251e93ec258ba959aecb44f0800623947262860e8efff4d0" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <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"/>
+      <component group="org.apache.lucene" name="lucene-sandbox" version="9.12.2">
+         <artifact name="lucene-sandbox-9.12.2.jar">
+            <sha256 value="f44f1f534709f2b70ef9f12bfe090f97801f88be84d2edc3c18495f0c761978d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <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"/>
+      <component group="org.apache.lucene" name="lucene-spatial-extras" version="9.12.2">
+         <artifact name="lucene-spatial-extras-9.12.2.jar">
+            <sha256 value="16cfd9f14eef7a97d8549f6de5761213053f28079d859228e5d65b4a20a4ffc3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <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"/>
+      <component group="org.apache.lucene" name="lucene-spatial3d" version="9.12.2">
+         <artifact name="lucene-spatial3d-9.12.2.jar">
+            <sha256 value="b3d649a9c328418e195d82bc63301e6e0c8c702308b74a57ef630d6f8e5899d9" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <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"/>
+      <component group="org.apache.lucene" name="lucene-suggest" version="9.12.2">
+         <artifact name="lucene-suggest-9.12.2.jar">
+            <sha256 value="fab3ef755412d4563c79771264d28202f2a900d3bb826667d9eea48d01bf3822" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <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"/>
+      <component group="org.apache.lucene" name="lucene-test-framework" version="9.12.2">
+         <artifact name="lucene-test-framework-9.12.2.jar">
+            <sha256 value="ed3e2df9ddff24411cac5ba264e53f02dcbfa426f9428a3ae8da2e667bd1d18f" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.apache.maven" name="maven-api-meta" version="4.0.0-alpha-9">

server/src/main/java/module-info.java

@@ -479,5 +479,4 @@
     exports org.elasticsearch.monitor.metrics;
     exports org.elasticsearch.plugins.internal.rewriter to org.elasticsearch.inference;
     exports org.elasticsearch.index.codec.perfield;
-    exports org.elasticsearch.lucene.search;
 }

server/src/main/java/org/elasticsearch/index/IndexVersions.java

@@ -134,6 +134,8 @@ private static IndexVersion def(int id, Version luceneVersion) {
     public static final IndexVersion SEMANTIC_TEXT_DEFAULTS_TO_BBQ_BACKPORT_8_X = def(8_531_0_00, Version.LUCENE_9_12_1);
     public static final IndexVersion INDEX_INT_SORT_INT_TYPE_8_19 = def(8_532_0_00, Version.LUCENE_9_12_1);
     public static final IndexVersion MAPPER_TEXT_MATCH_ONLY_MULTI_FIELDS_DEFAULT_NOT_STORED_8_19 = def(8_533_0_00, Version.LUCENE_9_12_1);
+    public static final IndexVersion UPGRADE_TO_LUCENE_9_12_2 = def(8_534_0_00, Version.LUCENE_9_12_2);
+
     /*
      * STOP! READ THIS FIRST! No, really,
      *        ____ _____ ___  ____  _        ____  _____    _    ____    _____ _   _ ___ ____    _____ ___ ____  ____ _____ _

server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java

@@ -20,6 +20,7 @@
 import org.apache.lucene.index.PointValues;
 import org.apache.lucene.index.SortedNumericDocValues;
 import org.apache.lucene.search.IndexOrDocValuesQuery;
+import org.apache.lucene.search.IndexSortSortedNumericDocValuesRangeQuery;
 import org.apache.lucene.search.Query;
 import org.elasticsearch.ElasticsearchParseException;
 import org.elasticsearch.common.geo.ShapeRelation;
@@ -44,7 +45,6 @@
 import org.elasticsearch.index.query.DateRangeIncludingNowQuery;
 import org.elasticsearch.index.query.QueryRewriteContext;
 import org.elasticsearch.index.query.SearchExecutionContext;
-import org.elasticsearch.lucene.search.XIndexSortSortedNumericDocValuesRangeQuery;
 import org.elasticsearch.script.DateFieldScript;
 import org.elasticsearch.script.Script;
 import org.elasticsearch.script.ScriptCompiler;
@@ -678,7 +678,7 @@ public Query rangeQuery(
                     query = SortedNumericDocValuesField.newSlowRangeQuery(name(), l, u);
                 }
                 if (hasDocValues() && context.indexSortedOnField(name())) {
-                    query = new XIndexSortSortedNumericDocValuesRangeQuery(name(), l, u, query);
+                    query = new IndexSortSortedNumericDocValuesRangeQuery(name(), l, u, query);
                 }
                 return query;
             });
@@ -792,7 +792,7 @@ public Query rangeQuery(
                 query = SortedNumericDocValuesField.newSlowRangeQuery(name(), l, u);
             }
             if (hasDocValues() && context.indexSortedOnField(name())) {
-                query = new XIndexSortSortedNumericDocValuesRangeQuery(name(), l, u, query);
+                query = new IndexSortSortedNumericDocValuesRangeQuery(name(), l, u, query);
             }
             return query;
         }