Backport SearcherManager thread-safety from LUCENE-7564 (73f068e5033)

Force single-threaded access to the SearcherManager when performing
an acquire() or reassigning, to prevent race conditions between
Build(), EnsureOpen(), DoLookup(), GetSizeInBytes(), and Count.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: paulirwin

src/Lucene.Net.Suggest/Suggest/Analyzing/AnalyzingInfixSuggester.cs

@@ -64,6 +64,9 @@ namespace Lucene.Net.Search.Suggest.Analyzing
     public class AnalyzingInfixSuggester : Lookup, IDisposable
     {
         private readonly object syncLock = new object();            //uses syncLock as substitute for Java's synchronized (method) keyword
+        // LUCENENET specific - Support for LUCENE-7564.
+        // Forces single-threaded access to the SearcherManager when performing an acquire() or reassigning.
+        private readonly object searcherMgrLock = new object();
 
         /// <summary>
         /// Field name used for the indexed text. </summary>
@@ -294,74 +297,82 @@ protected internal virtual Directory GetDirectory(DirectoryInfo path)
 
         public override void Build(IInputEnumerator enumerator)
         {
-            if (m_searcherMgr != null)
-            {
-                m_searcherMgr.Dispose();
-                m_searcherMgr = null;
-            }
-
-            if (writer != null)
-            {
-                writer.Dispose();
-                writer = null;
-            }
-
-            AtomicReader r = null;
-            bool success = false;
+            UninterruptableMonitor.Enter(searcherMgrLock);
             try
             {
-                // First pass: build a temporary normal Lucene index,
-                // just indexing the suggestions as they iterate:
-                writer = new IndexWriter(dir, indexWriterConfigFactory.Get(matchVersion, GetGramAnalyzer(), OpenMode.CREATE));
-                //long t0 = System.nanoTime();
-
-                // TODO: use threads?
-                BytesRef text;
-                while (enumerator.MoveNext())
+                if (m_searcherMgr != null)
                 {
-                    text = enumerator.Current;
-                    BytesRef payload;
-                    if (enumerator.HasPayloads)
-                    {
-                        payload = enumerator.Payload;
-                    }
-                    else
-                    {
-                        payload = null;
-                    }
-
-                    Add(text, enumerator.Contexts, enumerator.Weight, payload);
+                    m_searcherMgr.Dispose();
+                    m_searcherMgr = null;
                 }
 
-                //System.out.println("initial indexing time: " + ((System.nanoTime()-t0)/1000000) + " msec");
-                if (commitOnBuild || closeIndexWriterOnBuild) // LUCENENET specific - Support for LUCENE-5889, LUCENE-7564.
+                if (writer != null)
                 {
-                    Commit();
+                    writer.Dispose();
+                    writer = null;
                 }
-                m_searcherMgr = new SearcherManager(writer, true, null);
-                success = true;
-            }
-            finally
-            {
-                if (success)
+
+                AtomicReader r = null;
+                bool success = false;
+                try
                 {
-                    if (closeIndexWriterOnBuild)  // LUCENENET specific - Support for LUCENE-7564.
+                    // First pass: build a temporary normal Lucene index,
+                    // just indexing the suggestions as they iterate:
+                    writer = new IndexWriter(dir, indexWriterConfigFactory.Get(matchVersion, GetGramAnalyzer(), OpenMode.CREATE));
+                    //long t0 = System.nanoTime();
+
+                    // TODO: use threads?
+                    BytesRef text;
+                    while (enumerator.MoveNext())
+                    {
+                        text = enumerator.Current;
+                        BytesRef payload;
+                        if (enumerator.HasPayloads)
+                        {
+                            payload = enumerator.Payload;
+                        }
+                        else
+                        {
+                            payload = null;
+                        }
+
+                        Add(text, enumerator.Contexts, enumerator.Weight, payload);
+                    }
+
+                    //System.out.println("initial indexing time: " + ((System.nanoTime()-t0)/1000000) + " msec");
+                    if (commitOnBuild || closeIndexWriterOnBuild) // LUCENENET specific - Support for LUCENE-5889, LUCENE-7564.
                     {
-                        writer.Dispose();
-                        writer = null;
+                        Commit();
                     }
-                    IOUtils.Dispose(r);
+                    m_searcherMgr = new SearcherManager(writer, true, null);
+                    success = true;
                 }
-                else
+                finally
                 {
-                    if (writer != null)
+                    if (success)
                     {
-                        writer.Rollback();
-                        writer = null;
+                        if (closeIndexWriterOnBuild)  // LUCENENET specific - Support for LUCENE-7564.
+                        {
+                            writer.Dispose();
+                            writer = null;
+                        }
+                        IOUtils.Dispose(r);
+                    }
+                    else
+                    {
+                        if (writer != null)
+                        {
+                            writer.Rollback();
+                            writer = null;
+                        }
+                        IOUtils.DisposeWhileHandlingException(r);
                     }
-                    IOUtils.DisposeWhileHandlingException(r);
                 }
             }
+            finally
+            {
+                UninterruptableMonitor.Exit(searcherMgrLock);
+            }
         }
 
         // LUCENENET specific - Support for LUCENE-5889, LUCENE-7564.
@@ -437,11 +448,19 @@ private void EnsureOpen()
                     {
                         writer = new IndexWriter(dir, indexWriterConfigFactory.Get(matchVersion, GetGramAnalyzer(), OpenMode.CREATE));
                     }
-                    SearcherManager oldSearcherMgr = m_searcherMgr;
-                    m_searcherMgr = new SearcherManager(writer, true, null);
-                    if (oldSearcherMgr != null)
+                    UninterruptableMonitor.Enter(searcherMgrLock);
+                    try
+                    {
+                        SearcherManager oldSearcherMgr = m_searcherMgr;
+                        m_searcherMgr = new SearcherManager(writer, true, null);
+                        if (oldSearcherMgr != null)
+                        {
+                            oldSearcherMgr.Dispose();
+                        }
+                    }
+                    finally
                     {
-                        oldSearcherMgr.Dispose();
+                        UninterruptableMonitor.Exit(searcherMgrLock);
                     }
                 }
             }
@@ -691,8 +710,19 @@ public virtual IList<LookupResult> DoLookup(string key, IEnumerable<BytesRef> co
             // We sorted postings by weight during indexing, so we
             // only retrieve the first num hits now:
             ICollector c2 = new EarlyTerminatingSortingCollector(c, SORT, num);
-            IndexSearcher searcher = m_searcherMgr.Acquire();
             IList<LookupResult> results = null;
+            SearcherManager mgr; // LUCENENET specific - Support for LUCENE-7564: acquire & release on same SearcherManager, via local reference
+            IndexSearcher searcher;
+            UninterruptableMonitor.Enter(searcherMgrLock);
+            try
+            {
+                mgr = m_searcherMgr;
+                searcher = mgr.Acquire();
+            }
+            finally
+            {
+                UninterruptableMonitor.Exit(searcherMgrLock);
+            }
             try
             {
                 //System.out.println("got searcher=" + searcher);
@@ -706,7 +736,7 @@ public virtual IList<LookupResult> DoLookup(string key, IEnumerable<BytesRef> co
             }
             finally
             {
-                m_searcherMgr.Release(searcher);
+                mgr.Release(searcher);
             }
 
             //System.out.println(((J2N.Time.NanoTime() / J2N.Time.MillisecondsPerNanosecond) - t0) + " msec for infix suggest"); // LUCENENET: Use NanoTime() rather than CurrentTimeMilliseconds() for more accurate/reliable results
@@ -951,7 +981,18 @@ public override long GetSizeInBytes()
             {
                 if (m_searcherMgr != null)
                 {
-                    IndexSearcher searcher = m_searcherMgr.Acquire();
+                    SearcherManager mgr; // LUCENENET specific - Support for LUCENE-7564: acquire & release on same SearcherManager, via local reference
+                    IndexSearcher searcher;
+                    UninterruptableMonitor.Enter(searcherMgrLock);
+                    try
+                    {
+                        mgr = m_searcherMgr;
+                        searcher = mgr.Acquire();
+                    }
+                    finally
+                    {
+                        UninterruptableMonitor.Exit(searcherMgrLock);
+                    }
                     try
                     {
                         foreach (AtomicReaderContext context in searcher.IndexReader.Leaves)
@@ -965,7 +1006,7 @@ public override long GetSizeInBytes()
                     }
                     finally
                     {
-                        m_searcherMgr.Release(searcher);
+                        mgr.Release(searcher);
                     }
                 }
                 return mem;
@@ -984,14 +1025,25 @@ public override long Count
                 {
                     return 0;
                 }
-                IndexSearcher searcher = m_searcherMgr.Acquire();
+                SearcherManager mgr; // LUCENENET specific - Support for LUCENE-7564: acquire & release on same SearcherManager, via local reference
+                IndexSearcher searcher;
+                UninterruptableMonitor.Enter(searcherMgrLock);
+                try
+                {
+                    mgr = m_searcherMgr;
+                    searcher = mgr.Acquire();
+                }
+                finally
+                {
+                    UninterruptableMonitor.Exit(searcherMgrLock);
+                }
                 try
                 {
                     return searcher.IndexReader.NumDocs;
                 }
                 finally
                 {
-                    m_searcherMgr.Release(searcher);
+                    mgr.Release(searcher);
                 }
             }
         }