Fix IndexWriter.Dispose breaking the standard Dispose contract, #1399

Author: paulirwin

src/Lucene.Net.Benchmark/ByTask/Tasks/CloseIndexTask.cs

@@ -48,7 +48,7 @@ public override int DoLogic()
                     infoStream.Dispose();
                 }
 #pragma warning disable 612, 618
-                iw.Dispose(doWait);
+                iw.Close(doWait);
 #pragma warning restore 612, 618
                 RunData.IndexWriter = null;
             }

src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs

@@ -773,7 +773,7 @@ public virtual void RunTest(string testName)
 
             DoClose();
 #pragma warning disable 612, 618
-            m_writer.Dispose(false);
+            m_writer.Close(false);
 #pragma warning restore 612, 618
 
             // Cannot shutdown until after writer is closed because

src/Lucene.Net.Tests/Index/TestAddIndexes.cs

@@ -805,7 +805,7 @@ internal virtual void Close(bool doWait)
             {
                 didClose = true;
 #pragma warning disable 612, 618
-                writer2.Dispose(doWait);
+                writer2.Close(doWait);
 #pragma warning restore 612, 618
             }
 

src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs

@@ -314,7 +314,7 @@ public virtual void TestUnsupportedOldIndexes()
                     if (writer != null)
                     {
 #pragma warning disable 612, 618
-                        writer.Dispose(false);
+                        writer.Close(false);
 #pragma warning restore 612, 618
                     }
                     writer = null;
@@ -1053,7 +1053,7 @@ public virtual void TestUpgradeOldSingleSegmentIndexWithAdditions()
                         AddDoc(w, id++);
                     }
 #pragma warning disable 612, 618
-                    w.Dispose(false);
+                    w.Close(false);
 #pragma warning restore 612, 618
                 }
 
@@ -1066,7 +1066,7 @@ public virtual void TestUpgradeOldSingleSegmentIndexWithAdditions()
                 IndexWriter iw = new IndexWriter(dir, iwc_);
                 iw.AddIndexes(ramDir);
 #pragma warning disable 612, 618
-                iw.Dispose(false);
+                iw.Close(false);
 #pragma warning restore 612, 618
 
                 // determine count of segments in modified index

src/Lucene.Net.Tests/Index/TestBackwardsCompatibility3x.cs

@@ -245,7 +245,7 @@ public virtual void TestUnsupportedOldIndexes()
                     if (writer != null)
                     {
 #pragma warning disable 612, 618
-                        writer.Dispose(false);
+                        writer.Close(false);
 #pragma warning restore 612, 618
                     }
                     writer = null;
@@ -958,7 +958,7 @@ public virtual void TestUpgradeOldSingleSegmentIndexWithAdditions()
                         AddDoc(w, id++);
                     }
 #pragma warning disable 612, 618
-                    w.Dispose(false);
+                    w.Close(false);
 #pragma warning restore 612, 618
                 }
 
@@ -970,7 +970,7 @@ public virtual void TestUpgradeOldSingleSegmentIndexWithAdditions()
                 IndexWriter w_ = new IndexWriter(dir, iwc_);
                 w_.AddIndexes(ramDir);
 #pragma warning disable 612, 618
-                w_.Dispose(false);
+                w_.Close(false);
 #pragma warning restore 612, 618
 
                 // determine count of segments in modified index

src/Lucene.Net.Tests/Index/TestConcurrentMergeScheduler.cs

@@ -68,7 +68,7 @@ public override void Eval(MockDirectoryWrapper dir)
                     // LUCENENET specific: for these to work in release mode, we have added [MethodImpl(MethodImplOptions.NoInlining)]
                     // to each possible target of the StackTraceHelper. If these change, so must the attribute on the target methods.
                     bool isDoFlush = StackTraceHelper.DoesStackTraceContainMethod(nameof(DocumentsWriterPerThread.Flush));
-                    bool isClose = StackTraceHelper.DoesStackTraceContainMethod(nameof(IndexWriter.Close)) || // LUCENENET NOTE: Close is aggressively inlined, so likely won't hit this case, but would hit Dispose
+                    bool isClose = StackTraceHelper.DoesStackTraceContainMethod(nameof(IndexWriter.Close)) || // LUCENENET NOTE: Close is marked NoInlining so it stays on the stack; Dispose is checked as well as a belt-and-suspenders
                         StackTraceHelper.DoesStackTraceContainMethod(nameof(IndexWriter.Dispose));
 
                     if (isDoFlush && !isClose && Random.NextBoolean())
@@ -262,7 +262,7 @@ public virtual void TestNoWaitClose()
                 writer.Commit();
 
 #pragma warning disable 612, 618
-                writer.Dispose(false);
+                writer.Close(false);
 #pragma warning restore 612, 618
 
                 IndexReader reader = DirectoryReader.Open(directory);
@@ -319,7 +319,7 @@ public virtual void TestMaxMergeCount()
                 }
             }
 #pragma warning disable 612, 618
-            w.Dispose(false);
+            w.Close(false);
 #pragma warning restore 612, 618
             dir.Dispose();
         }

src/Lucene.Net.Tests/Index/TestCrash.cs

@@ -211,7 +211,7 @@ public virtual void TestCrashAfterCloseNoWait()
             MockDirectoryWrapper dir = (MockDirectoryWrapper)writer.Directory;
 
 #pragma warning disable 612, 618
-            writer.Dispose(false);
+            writer.Close(false);
 #pragma warning restore 612, 618
 
             dir.Crash();

src/Lucene.Net.Tests/Index/TestFlushByRamOrCountsPolicy.cs

@@ -314,9 +314,7 @@ public virtual void TestStallControl()
                     Assert.IsTrue(docsWriter.flushControl.stallControl.WasStalled);
                 }
                 AssertActiveBytesAfter(flushControl);
-#pragma warning disable 612, 618
-                writer.Dispose(true);
-#pragma warning restore 612, 618
+                writer.Dispose();
                 dir.Dispose();
             }
         }

src/Lucene.Net.Tests/Index/TestIndexWriterMerging.cs

@@ -434,7 +434,7 @@ public virtual void TestNoWaitClose()
                     t1.Start();
 
 #pragma warning disable 612, 618
-                    writer.Dispose(false);
+                    writer.Close(false);
 #pragma warning restore 612, 618
                     t1.Join();
 

src/Lucene.Net.Tests/Index/TestIndexWriterOnDiskFull.cs

@@ -665,7 +665,7 @@ public virtual void TestImmediateDiskFull()
             try
             {
 #pragma warning disable 612, 618
-                writer.Dispose(false);
+                writer.Close(false);
 #pragma warning restore 612, 618
                 Assert.Fail("did not hit disk full");
             }
@@ -677,7 +677,7 @@ public virtual void TestImmediateDiskFull()
             // cleanly close:
             dir.MaxSizeInBytes = 0;
 #pragma warning disable 612, 618
-            writer.Dispose(false);
+            writer.Close(false);
 #pragma warning restore 612, 618
             dir.Dispose();
         }