elastic · mayya-sharipova · Oct 19, 2021 · Oct 19, 2021 · Oct 19, 2021 · Oct 19, 2021
diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties
@@ -1,5 +1,5 @@
 elasticsearch     = 8.0.0
-lucene            = 9.0.0-snapshot-cfd9f9f98f7
+lucene            = 9.0.0-snapshot-8b68bf60c98
 
 bundled_jdk_vendor = adoptium
 bundled_jdk = 17+35

diff --git a/build.gradle b/build.gradle
@@ -142,8 +142,8 @@ String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull
  */
 
 if ( BuildParams.inFipsJvm ) {
-  bwc_tests_enabled = false
-  bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/issues/66772"
+  bwc_tests_enabled = true
+  bwc_tests_disabled_issue = ""
 }
 if (bwc_tests_enabled == false) {
   if (bwc_tests_disabled_issue.isEmpty()) {

diff --git a/modules/lang-expression/licenses/lucene-expressions-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+93676b57287ef17b5eda8f0ab5aa91ac27781b30
diff --git a/modules/lang-expression/licenses/lucene-expressions-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
diff --git a/modules/legacy-geo/licenses/lucene-spatial-extras-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/modules/legacy-geo/licenses/lucene-spatial-extras-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+fabf62d18d45d4eb4e6199005f92624233b3f2e4
diff --git a/modules/legacy-geo/licenses/lucene-spatial-extras-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/modules/legacy-geo/licenses/lucene-spatial-extras-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+c5b251c26358225271e6901ae8e62f2b7b9a6e98
diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
diff --git a/...s/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/...s/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+07e69528347205991aa8b9724170c6bb4a61b0b0
diff --git a/...s/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/...s/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+f170e5a8a8105c7eb747ab77ee3a91247f1704b1
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
diff --git a/...s/analysis-phonetic/licenses/lucene-analysis-phonetic-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/...s/analysis-phonetic/licenses/lucene-analysis-phonetic-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+e1c03aa49d6dc9c5f194446ba1ac39504628456e
diff --git a/...s/analysis-phonetic/licenses/lucene-analysis-phonetic-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/...s/analysis-phonetic/licenses/lucene-analysis-phonetic-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
diff --git a/...ins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/...ins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+62b1dcdb25704edf95e634a810f8aa36aaac99ab
diff --git a/...ins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/...ins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
diff --git a/...ins/analysis-stempel/licenses/lucene-analysis-stempel-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/...ins/analysis-stempel/licenses/lucene-analysis-stempel-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+10cf350a47eb30b615a7fd9bf740ad5e45017a2d
diff --git a/...ins/analysis-stempel/licenses/lucene-analysis-stempel-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/...ins/analysis-stempel/licenses/lucene-analysis-stempel-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
diff --git a/...nalysis-ukrainian/licenses/lucene-analysis-morfologik-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/...nalysis-ukrainian/licenses/lucene-analysis-morfologik-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+839cd3dcb679d53239860f88a70c970a4b30c93a
diff --git a/...nalysis-ukrainian/licenses/lucene-analysis-morfologik-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/...nalysis-ukrainian/licenses/lucene-analysis-morfologik-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
diff --git a/server/licenses/lucene-analysis-common-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-analysis-common-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+0f73e4a59da39da41511bb960212398d82e64a97
diff --git a/server/licenses/lucene-analysis-common-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/server/licenses/lucene-analysis-common-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
diff --git a/server/licenses/lucene-backward-codecs-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-backward-codecs-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+ec67313245fcdb584b98790b6798a59f2f171f39
diff --git a/server/licenses/lucene-backward-codecs-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/server/licenses/lucene-backward-codecs-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
diff --git a/server/licenses/lucene-core-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-core-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+6f5d5f4968f6e2f066a532d0c7a8ed0fbb9aec7d
diff --git a/server/licenses/lucene-core-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/server/licenses/lucene-core-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
diff --git a/server/licenses/lucene-grouping-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-grouping-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+2992847af15ee3b61b543bddd0e501f3fe178c6f
diff --git a/server/licenses/lucene-grouping-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/server/licenses/lucene-grouping-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
diff --git a/server/licenses/lucene-highlighter-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-highlighter-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+530f39370fc0c7b6bc837d3232204670ac62c8e1
diff --git a/server/licenses/lucene-highlighter-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/server/licenses/lucene-highlighter-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
diff --git a/server/licenses/lucene-join-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-join-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+7368570d058183ccc3d1c5e1d62750ade07162da
diff --git a/server/licenses/lucene-join-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/server/licenses/lucene-join-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
diff --git a/server/licenses/lucene-memory-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-memory-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+148d1bb8a7ff899d082a03e3fab3004e270603c1
diff --git a/server/licenses/lucene-memory-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/server/licenses/lucene-memory-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
diff --git a/server/licenses/lucene-misc-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-misc-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+920bc15625ec49f1656cde591a071f4798974158
diff --git a/server/licenses/lucene-misc-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/server/licenses/lucene-misc-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
diff --git a/server/licenses/lucene-queries-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-queries-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+61561472420037e0cead34ac14cc93ec948ddca5
diff --git a/server/licenses/lucene-queries-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/server/licenses/lucene-queries-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
diff --git a/server/licenses/lucene-queryparser-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-queryparser-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+e90bbf2465f7f7fc1c606076d17a69bf7b455439
diff --git a/server/licenses/lucene-queryparser-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/server/licenses/lucene-queryparser-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
diff --git a/server/licenses/lucene-sandbox-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-sandbox-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+e67b37e3d5e6fa59eef529f5a24598958006de7e
diff --git a/server/licenses/lucene-sandbox-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/server/licenses/lucene-sandbox-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
diff --git a/server/licenses/lucene-spatial3d-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-spatial3d-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+062e6ecea21b4281d720910e486ed04012ae8b18
diff --git a/server/licenses/lucene-spatial3d-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/server/licenses/lucene-spatial3d-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
diff --git a/server/licenses/lucene-suggest-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-suggest-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+ade0398fa44d77e59842e40f76ec2910be1f5492
diff --git a/server/licenses/lucene-suggest-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/server/licenses/lucene-suggest-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
diff --git a/server/src/main/java/org/elasticsearch/Version.java b/server/src/main/java/org/elasticsearch/Version.java
@@ -91,7 +91,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
     public static final Version V_7_15_0 = new Version(7150099, org.apache.lucene.util.Version.LUCENE_8_9_0);
     public static final Version V_7_15_1 = new Version(7150199, org.apache.lucene.util.Version.LUCENE_8_9_0);
     public static final Version V_7_15_2 = new Version(7150299, org.apache.lucene.util.Version.LUCENE_8_9_0);
-    public static final Version V_7_16_0 = new Version(7160099, org.apache.lucene.util.Version.LUCENE_8_10_0);
+    public static final Version V_7_16_0 = new Version(7160099, org.apache.lucene.util.Version.LUCENE_8_10_1);
     public static final Version V_8_0_0 = new Version(8000099, org.apache.lucene.util.Version.LUCENE_9_0_0);
     public static final Version CURRENT = V_8_0_0;
 

diff --git a/server/src/test/java/org/elasticsearch/index/engine/LiveVersionMapTests.java b/server/src/test/java/org/elasticsearch/index/engine/LiveVersionMapTests.java
@@ -44,7 +44,7 @@ public void testRamBytesUsed() throws Exception {
                 map.putIndexUnderLock(uid.toBytesRef(), randomIndexVersionValue());
             }
         }
-        long actualRamBytesUsed = RamUsageTester.sizeOf(map);
+        long actualRamBytesUsed = RamUsageTester.ramUsed(map);
         long estimatedRamBytesUsed = map.ramBytesUsed();
         // less than 50% off
         assertEquals(actualRamBytesUsed, estimatedRamBytesUsed, actualRamBytesUsed / 2);
@@ -60,7 +60,7 @@ public void testRamBytesUsed() throws Exception {
                 map.putIndexUnderLock(uid.toBytesRef(), randomIndexVersionValue());
             }
         }
-        actualRamBytesUsed = RamUsageTester.sizeOf(map);
+        actualRamBytesUsed = RamUsageTester.ramUsed(map);
         estimatedRamBytesUsed = map.ramBytesUsed();
         long tolerance;
         if (Constants.JRE_IS_MINIMUM_JAVA9) {

diff --git a/server/src/test/java/org/elasticsearch/index/engine/VersionValueTests.java b/server/src/test/java/org/elasticsearch/index/engine/VersionValueTests.java
@@ -20,12 +20,12 @@ public void testIndexRamBytesUsed() {
             translogLoc = new Translog.Location(randomNonNegativeLong(), randomNonNegativeLong(), randomInt());
         }
         IndexVersionValue versionValue = new IndexVersionValue(translogLoc, randomLong(), randomLong(), randomLong());
-        assertEquals(RamUsageTester.sizeOf(versionValue), versionValue.ramBytesUsed());
+        assertEquals(RamUsageTester.ramUsed(versionValue), versionValue.ramBytesUsed());
     }
 
     public void testDeleteRamBytesUsed() {
         DeleteVersionValue versionValue = new DeleteVersionValue(randomLong(), randomLong(), randomLong(), randomLong());
-        assertEquals(RamUsageTester.sizeOf(versionValue), versionValue.ramBytesUsed());
+        assertEquals(RamUsageTester.ramUsed(versionValue), versionValue.ramBytesUsed());
     }
 
 }
diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+6f5d5f4968f6e2f066a532d0c7a8ed0fbb9aec7d
diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-9.0.0-snapshot-cfd9f9f98f7.jar.sha1