Merge branch 'apache:main' into pr-12543

Author: dungba88

lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/PerfRunData.java

@@ -46,6 +46,7 @@
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.FSDirectory;
 import org.apache.lucene.util.IOUtils;
+import org.apache.lucene.util.SuppressForbidden;
 
 /**
  * Data maintained by a performance test run.
@@ -204,7 +205,7 @@ public void reinit(boolean eraseIndex) throws Exception {
     resetInputs();
 
     // release unused stuff
-    System.runFinalization();
+    runFinalization();
     System.gc();
 
     // Re-init clock
@@ -482,4 +483,10 @@ public synchronized QueryMaker getQueryMaker(ReadTask readTask) {
   public Map<String, AnalyzerFactory> getAnalyzerFactories() {
     return analyzerFactories;
   }
+
+  @SuppressWarnings("removal")
+  @SuppressForbidden(reason = "requires to run finalization")
+  private static void runFinalization() {
+    System.runFinalization();
+  }
 }

lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java

@@ -2372,7 +2372,13 @@ public void testCorruptFirstCommit() throws Exception {
 
   public void testHasUncommittedChanges() throws IOException {
     Directory dir = newDirectory();
-    IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random())));
+    IndexWriter writer =
+        new IndexWriter(
+            dir,
+            newIndexWriterConfig(new MockAnalyzer(random()))
+                // Use a serial merge scheduler to avoid race conditions when checking for
+                // hasPendingMerges()
+                .setMergeScheduler(new SerialMergeScheduler()));
     assertTrue(
         writer.hasUncommittedChanges()); // this will be true because a commit will create an empty
     // index

lucene/core/src/test/org/apache/lucene/util/TestWeakIdentityMap.java

@@ -119,7 +119,7 @@ public void testSimpleHashMap() {
     int size = map.size();
     for (int i = 0; size > 0 && i < 10; i++)
       try {
-        System.runFinalization();
+        runFinalization();
         System.gc();
         int newSize = map.size();
         assertTrue("previousSize(" + size + ")>=newSize(" + newSize + ")", size >= newSize);
@@ -232,7 +232,7 @@ public void run() {
     int size = map.size();
     for (int i = 0; size > 0 && i < 10; i++)
       try {
-        System.runFinalization();
+        runFinalization();
         System.gc();
         int newSize = map.size();
         assertTrue("previousSize(" + size + ")>=newSize(" + newSize + ")", size >= newSize);
@@ -252,4 +252,10 @@ public void run() {
           InterruptedException ie) {
       }
   }
+
+  @SuppressWarnings("removal")
+  @SuppressForbidden(reason = "requires to run finalization")
+  private static void runFinalization() {
+    System.runFinalization();
+  }
 }