This is an automated email from the ASF dual-hosted git repository. nightowl888 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/lucenenet.git
commit ed2bf968fb20d9c5fe713ef578c08827aef33082 Author: Shad Storhaug <[email protected]> AuthorDate: Fri Sep 11 04:22:35 2020 +0700 Directory.Build.targets: Added FEATURE_THREAD_INTERRUPT and implemented throughout solution --- Directory.Build.targets | 7 ++++--- .../Analysis/BaseTokenStreamTestCase.cs | 4 ++-- .../Store/SlowClosingMockIndexInputWrapper.cs | 2 +- .../Store/SlowOpeningMockIndexInputWrapper.cs | 4 ++-- src/Lucene.Net.TestFramework/Util/ThrottledIndexOutput.cs | 4 ++-- src/Lucene.Net.Tests.Facet/SlowRAMDirectory.cs | 4 ++-- .../Index/TestDocumentsWriterDeleteQueue.cs | 4 ++-- .../Index/TestDocumentsWriterStallControl.cs | 6 +++--- src/Lucene.Net.Tests/Index/TestIndexWriter.cs | 4 ++-- src/Lucene.Net.Tests/Index/TestIndexWriterNRTIsCurrent.cs | 4 ++-- src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs | 4 ++-- src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs | 4 ++-- src/Lucene.Net.Tests/Index/TestSnapshotDeletionPolicy.cs | 4 ++-- .../Search/TestControlledRealTimeReopenThread.cs | 8 ++++---- src/Lucene.Net.Tests/Search/TestSearcherManager.cs | 4 ++-- src/Lucene.Net.Tests/Search/TestTimeLimitingCollector.cs | 2 +- src/Lucene.Net.Tests/TestWorstCaseTestBehavior.cs | 8 ++++---- src/Lucene.Net.Tests/Util/TestSetOnce.cs | 2 +- src/Lucene.Net.Tests/Util/TestWeakIdentityMap.cs | 8 ++++---- src/Lucene.Net/Index/DocumentsWriterFlushControl.cs | 4 ++-- src/Lucene.Net/Index/DocumentsWriterStallControl.cs | 4 ++-- src/Lucene.Net/Index/IndexWriter.cs | 14 +++++++------- src/Lucene.Net/Index/MergePolicy.cs | 4 ++-- src/Lucene.Net/Search/ControlledRealTimeReopenThread.cs | 8 ++++---- src/Lucene.Net/Search/IndexSearcher.cs | 2 +- src/Lucene.Net/Search/TimeLimitingCollector.cs | 4 ++-- src/Lucene.Net/Store/Lock.cs | 4 ++-- src/Lucene.Net/Store/RateLimiter.cs | 4 ++-- src/Lucene.Net/Support/Index/TaskMergeScheduler.cs | 4 ++-- src/Lucene.Net/Util/IOUtils.cs | 4 ++-- 30 files changed, 72 insertions(+), 71 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 063b8fc..d70a9e9 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -46,12 +46,13 @@ <PropertyGroup Condition=" $(TargetFramework.StartsWith('net4')) Or $(TargetFramework.StartsWith('netstandard2.')) Or $(TargetFramework.StartsWith('netcoreapp2.')) Or $(TargetFramework.StartsWith('netcoreapp3.')) "> <DefineConstants>$(DefineConstants);FEATURE_CONCURRENTMERGESCHEDULER</DefineConstants> - <DefineConstants>$(DefineConstants);FEATURE_THREADPOOL_UNSAFEQUEUEWORKITEM</DefineConstants> + <DefineConstants>$(DefineConstants);FEATURE_DTD_PROCESSING</DefineConstants> <DefineConstants>$(DefineConstants);FEATURE_FILESTREAM_LOCK</DefineConstants> <DefineConstants>$(DefineConstants);FEATURE_SERIALIZABLE</DefineConstants> - <DefineConstants>$(DefineConstants);FEATURE_DTD_PROCESSING</DefineConstants> - <DefineConstants>$(DefineConstants);FEATURE_XSLT</DefineConstants> + <DefineConstants>$(DefineConstants);FEATURE_THREAD_INTERRUPT</DefineConstants> <DefineConstants>$(DefineConstants);FEATURE_THREAD_PRIORITY</DefineConstants> + <DefineConstants>$(DefineConstants);FEATURE_THREADPOOL_UNSAFEQUEUEWORKITEM</DefineConstants> + <DefineConstants>$(DefineConstants);FEATURE_XSLT</DefineConstants> <!-- NOTE: Microsoft's recommendation is not to use the ICloneable interface. To add it to the build, just add /p:IncludeICloneable to the command line. --> diff --git a/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs b/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs index 230eb14..97490d5 100644 --- a/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs +++ b/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs @@ -792,12 +792,12 @@ namespace Lucene.Net.Analysis startingGun.Signal(); foreach (var t in threads) { -#if !NETSTANDARD1_6 +#if FEATURE_THREAD_INTERRUPT try { #endif t.Join(); -#if !NETSTANDARD1_6 +#if FEATURE_THREAD_INTERRUPT } #pragma warning disable 168 catch (ThreadInterruptedException e) diff --git a/src/Lucene.Net.TestFramework/Store/SlowClosingMockIndexInputWrapper.cs b/src/Lucene.Net.TestFramework/Store/SlowClosingMockIndexInputWrapper.cs index d8a0cb0..189dcde 100644 --- a/src/Lucene.Net.TestFramework/Store/SlowClosingMockIndexInputWrapper.cs +++ b/src/Lucene.Net.TestFramework/Store/SlowClosingMockIndexInputWrapper.cs @@ -40,7 +40,7 @@ namespace Lucene.Net.Store { Thread.Sleep(50); } -//#if !NETSTANDARD1_6 // LUCENENET NOTE: Senseless to catch and rethrow the same exception type +//#if FEATURE_THREAD_INTERRUPT // LUCENENET NOTE: Senseless to catch and rethrow the same exception type // catch (ThreadInterruptedException ie) // { // throw new ThreadInterruptedException("Thread Interrupted Exception", ie); diff --git a/src/Lucene.Net.TestFramework/Store/SlowOpeningMockIndexInputWrapper.cs b/src/Lucene.Net.TestFramework/Store/SlowOpeningMockIndexInputWrapper.cs index 2ad0e00..98921a1 100644 --- a/src/Lucene.Net.TestFramework/Store/SlowOpeningMockIndexInputWrapper.cs +++ b/src/Lucene.Net.TestFramework/Store/SlowOpeningMockIndexInputWrapper.cs @@ -29,12 +29,12 @@ namespace Lucene.Net.Store public SlowOpeningMockIndexInputWrapper(MockDirectoryWrapper dir, string name, IndexInput @delegate) : base(dir, name, @delegate) { -#if !NETSTANDARD1_6 +#if FEATURE_THREAD_INTERRUPT try { #endif Thread.Sleep(50); -#if !NETSTANDARD1_6 +#if FEATURE_THREAD_INTERRUPT } catch (ThreadInterruptedException /*ie*/) { diff --git a/src/Lucene.Net.TestFramework/Util/ThrottledIndexOutput.cs b/src/Lucene.Net.TestFramework/Util/ThrottledIndexOutput.cs index 738c444..15dd14f 100644 --- a/src/Lucene.Net.TestFramework/Util/ThrottledIndexOutput.cs +++ b/src/Lucene.Net.TestFramework/Util/ThrottledIndexOutput.cs @@ -144,12 +144,12 @@ namespace Lucene.Net.Util { return; } -//#if !NETSTANDARD1_6 +//#if FEATURE_THREAD_INTERRUPT // try // { //#endif Thread.Sleep(TimeSpan.FromMilliseconds(ms)); -//#if !NETSTANDARD1_6 // LUCENENET NOTE: Senseless to catch and rethrow the same exception type +//#if FEATURE_THREAD_INTERRUPT // LUCENENET NOTE: Senseless to catch and rethrow the same exception type // } // catch (ThreadInterruptedException e) // { diff --git a/src/Lucene.Net.Tests.Facet/SlowRAMDirectory.cs b/src/Lucene.Net.Tests.Facet/SlowRAMDirectory.cs index 00df781..b9631ee 100644 --- a/src/Lucene.Net.Tests.Facet/SlowRAMDirectory.cs +++ b/src/Lucene.Net.Tests.Facet/SlowRAMDirectory.cs @@ -77,12 +77,12 @@ namespace Lucene.Net.Facet { sTime = random.Next(sTime); } -//#if !NETSTANDARD1_6 +//#if FEATURE_THREAD_INTERRUPT // try // { //#endif Thread.Sleep(sTime); -//#if !NETSTANDARD1_6 +//#if FEATURE_THREAD_INTERRUPT // } // catch (ThreadInterruptedException e) // LUCENENET NOTE: Senseless to catch and rethrow the same exception type // { diff --git a/src/Lucene.Net.Tests/Index/TestDocumentsWriterDeleteQueue.cs b/src/Lucene.Net.Tests/Index/TestDocumentsWriterDeleteQueue.cs index 0b1b8e6..cc68b06 100644 --- a/src/Lucene.Net.Tests/Index/TestDocumentsWriterDeleteQueue.cs +++ b/src/Lucene.Net.Tests/Index/TestDocumentsWriterDeleteQueue.cs @@ -318,12 +318,12 @@ namespace Lucene.Net.Index public override void Run() { -//#if !NETSTANDARD1_6 +//#if FEATURE_THREAD_INTERRUPT // try // { //#endif latch.Wait(); -//#if !NETSTANDARD1_6 +//#if FEATURE_THREAD_INTERRUPT // } // catch (ThreadInterruptedException e) // LUCENENET NOTE: Senseless to catch and rethrow the same exception type // { diff --git a/src/Lucene.Net.Tests/Index/TestDocumentsWriterStallControl.cs b/src/Lucene.Net.Tests/Index/TestDocumentsWriterStallControl.cs index 1df52c6..2b7d001 100644 --- a/src/Lucene.Net.Tests/Index/TestDocumentsWriterStallControl.cs +++ b/src/Lucene.Net.Tests/Index/TestDocumentsWriterStallControl.cs @@ -264,12 +264,12 @@ namespace Lucene.Net.Index ctrl.WaitIfStalled(); if (checkPoint) { -#if !NETSTANDARD1_6 +#if FEATURE_THREAD_INTERRUPT try { #endif Assert.IsTrue(sync.await()); -#if !NETSTANDARD1_6 +#if FEATURE_THREAD_INTERRUPT } catch (ThreadInterruptedException /*e*/) { @@ -328,7 +328,7 @@ namespace Lucene.Net.Index { Assert.IsTrue(sync.await()); } -#if !NETSTANDARD1_6 +#if FEATURE_THREAD_INTERRUPT catch (ThreadInterruptedException /*e*/) { Console.WriteLine("[Updater] got interrupted - wait count: " + sync.waiter.CurrentCount); diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs b/src/Lucene.Net.Tests/Index/TestIndexWriter.cs index 2a80fdf..2491fef 100644 --- a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs +++ b/src/Lucene.Net.Tests/Index/TestIndexWriter.cs @@ -1331,7 +1331,7 @@ namespace Lucene.Net.Index allowInterrupt = true; } } -#if !NETSTANDARD1_6 +#if FEATURE_THREAD_INTERRUPT catch (ThreadInterruptedException re) { // NOTE: important to leave this verbosity/noise @@ -1376,7 +1376,7 @@ namespace Lucene.Net.Index { w.Rollback(); } -#if !NETSTANDARD1_6 +#if FEATURE_THREAD_INTERRUPT // LUCENENET specific - there is a chance that our thread will be // interrupted here, so we need to catch and ignore that exception // when our MockDirectoryWrapper throws it. diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterNRTIsCurrent.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterNRTIsCurrent.cs index e60a3f2..73f2e5d 100644 --- a/src/Lucene.Net.Tests/Index/TestIndexWriterNRTIsCurrent.cs +++ b/src/Lucene.Net.Tests/Index/TestIndexWriterNRTIsCurrent.cs @@ -199,12 +199,12 @@ namespace Lucene.Net.Index public override void Run() { -#if !NETSTANDARD1_6 +#if FEATURE_THREAD_INTERRUPT try { #endif latch.Wait(); -#if !NETSTANDARD1_6 +#if FEATURE_THREAD_INTERRUPT } catch (ThreadInterruptedException e) { diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs index 01b75a0..bb03ae1 100644 --- a/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs +++ b/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs @@ -508,12 +508,12 @@ namespace Lucene.Net.Index { for (int i = 0; i < outerInstance.numThreads; i++) { -//#if !NETSTANDARD1_6 +//#if FEATURE_THREAD_INTERRUPT // try // { //#endif threads[i].Join(); -//#if !NETSTANDARD1_6 +//#if FEATURE_THREAD_INTERRUPT // } // catch (ThreadInterruptedException ie) // LUCENENET NOTE: Senseless to catch and rethrow the same exception type // { diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs index 1267228..2570e5d 100644 --- a/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs +++ b/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs @@ -117,12 +117,12 @@ namespace Lucene.Net.Index if (ioe.Message.StartsWith("fake disk full at", StringComparison.Ordinal) || ioe.Message.Equals("now failing on purpose", StringComparison.Ordinal)) { diskFull = true; -//#if !NETSTANDARD1_6 +//#if FEATURE_THREAD_INTERRUPT // try // { //#endif Thread.Sleep(1); -//#if !NETSTANDARD1_6 +//#if FEATURE_THREAD_INTERRUPT // } // catch (ThreadInterruptedException ie) // LUCENENET NOTE: Senseless to catch and rethrow the same exception type // { diff --git a/src/Lucene.Net.Tests/Index/TestSnapshotDeletionPolicy.cs b/src/Lucene.Net.Tests/Index/TestSnapshotDeletionPolicy.cs index f0da97a..32f2ab1 100644 --- a/src/Lucene.Net.Tests/Index/TestSnapshotDeletionPolicy.cs +++ b/src/Lucene.Net.Tests/Index/TestSnapshotDeletionPolicy.cs @@ -227,12 +227,12 @@ namespace Lucene.Net.Index } } } -//#if !NETSTANDARD1_6 +//#if FEATURE_THREAD_INTERRUPT // try // { //#endif Thread.Sleep(1); -//#if !NETSTANDARD1_6 +//#if FEATURE_THREAD_INTERRUPT // } // catch (ThreadInterruptedException ie) // LUCENENET NOTE: Senseless to catch and rethrow the same exception type // { diff --git a/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs b/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs index e9aa3b8..23e33b9 100644 --- a/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs +++ b/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs @@ -494,12 +494,12 @@ namespace Lucene.Net.Search public override void Run() { -#if !NETSTANDARD1_6 +#if FEATURE_THREAD_INTERRUPT try { #endif thread.WaitForGeneration(lastGen); -#if !NETSTANDARD1_6 +#if FEATURE_THREAD_INTERRUPT } catch (ThreadInterruptedException ie) { @@ -529,7 +529,7 @@ namespace Lucene.Net.Search public override void UpdateDocument(Term term, IEnumerable<IIndexableField> doc, Analyzer analyzer) { base.UpdateDocument(term, doc, analyzer); -//#if !NETSTANDARD1_6 +//#if FEATURE_THREAD_INTERRUPT // try // { //#endif @@ -538,7 +538,7 @@ namespace Lucene.Net.Search signal.Reset(signal.CurrentCount == 0 ? 0 : signal.CurrentCount - 1); latch.Wait(); } -//#if !NETSTANDARD1_6 +//#if FEATURE_THREAD_INTERRUPT // } // catch (ThreadInterruptedException) // LUCENENET NOTE: Senseless to catch and rethrow the same exception type // { diff --git a/src/Lucene.Net.Tests/Search/TestSearcherManager.cs b/src/Lucene.Net.Tests/Search/TestSearcherManager.cs index 5188f60..e95f944 100644 --- a/src/Lucene.Net.Tests/Search/TestSearcherManager.cs +++ b/src/Lucene.Net.Tests/Search/TestSearcherManager.cs @@ -346,7 +346,7 @@ namespace Lucene.Net.Search public override IndexSearcher NewSearcher(IndexReader r) { -#if !NETSTANDARD1_6 +#if FEATURE_THREAD_INTERRUPT try { #endif @@ -355,7 +355,7 @@ namespace Lucene.Net.Search awaitEnterWarm.Signal(); awaitClose.Wait(); } -#if !NETSTANDARD1_6 +#if FEATURE_THREAD_INTERRUPT } #pragma warning disable 168 catch (ThreadInterruptedException e) diff --git a/src/Lucene.Net.Tests/Search/TestTimeLimitingCollector.cs b/src/Lucene.Net.Tests/Search/TestTimeLimitingCollector.cs index 8162e52..6436fe4 100644 --- a/src/Lucene.Net.Tests/Search/TestTimeLimitingCollector.cs +++ b/src/Lucene.Net.Tests/Search/TestTimeLimitingCollector.cs @@ -405,7 +405,7 @@ namespace Lucene.Net.Search //{ ThreadJob.Sleep(slowdown); // } -//#if NETSTANDARD1_6 +//#if !FEATURE_THREAD_INTERRUPT // catch (Exception) // { // throw; diff --git a/src/Lucene.Net.Tests/TestWorstCaseTestBehavior.cs b/src/Lucene.Net.Tests/TestWorstCaseTestBehavior.cs index 9a6da65..9bc1c19 100644 --- a/src/Lucene.Net.Tests/TestWorstCaseTestBehavior.cs +++ b/src/Lucene.Net.Tests/TestWorstCaseTestBehavior.cs @@ -54,12 +54,12 @@ namespace Lucene.Net public override void Run() { -#if !NETSTANDARD1_6 +#if FEATURE_THREAD_INTERRUPT try { #endif Thread.Sleep(10000); -#if !NETSTANDARD1_6 +#if FEATURE_THREAD_INTERRUPT } #pragma warning disable 168 catch (ThreadInterruptedException e) @@ -142,12 +142,12 @@ namespace Lucene.Net { while (true) { -#if !NETSTANDARD1_6 +#if FEATURE_THREAD_INTERRUPT try { #endif Thread.Sleep(1000); -#if !NETSTANDARD1_6 +#if FEATURE_THREAD_INTERRUPT } #pragma warning disable 168 catch (ThreadInterruptedException e) diff --git a/src/Lucene.Net.Tests/Util/TestSetOnce.cs b/src/Lucene.Net.Tests/Util/TestSetOnce.cs index b5b8213..a2369ec 100644 --- a/src/Lucene.Net.Tests/Util/TestSetOnce.cs +++ b/src/Lucene.Net.Tests/Util/TestSetOnce.cs @@ -56,7 +56,7 @@ namespace Lucene.Net.Util set.Set(new Integer(Convert.ToInt32(Name.Substring(2), CultureInfo.InvariantCulture))); success = true; } -#if !NETSTANDARD1_6 +#if FEATURE_THREAD_INTERRUPT catch (ThreadInterruptedException) { // ignore diff --git a/src/Lucene.Net.Tests/Util/TestWeakIdentityMap.cs b/src/Lucene.Net.Tests/Util/TestWeakIdentityMap.cs index 34b4db2..5aa1224 100644 --- a/src/Lucene.Net.Tests/Util/TestWeakIdentityMap.cs +++ b/src/Lucene.Net.Tests/Util/TestWeakIdentityMap.cs @@ -140,7 +140,7 @@ // int size = map.Count; // for (int i = 0; size > 0 && i < 10; i++) // { -//#if !NETSTANDARD1_6 +//#if FEATURE_THREAD_INTERRUPT // try // { //#endif @@ -159,7 +159,7 @@ // Assert.IsTrue(size >= c, "previousSize(" + size + ")>=iteratorSize(" + c + ")"); // Assert.IsTrue(c >= newSize, "iteratorSize(" + c + ")>=newSize(" + newSize + ")"); // size = newSize; -//#if !NETSTANDARD1_6 +//#if FEATURE_THREAD_INTERRUPT // } //#pragma warning disable 168 // catch (ThreadInterruptedException ie) @@ -255,7 +255,7 @@ // int size = map.Count; // for (int i = 0; size > 0 && i < 10; i++) // { -//#if !NETSTANDARD1_6 +//#if FEATURE_THREAD_INTERRUPT // try // { //#endif @@ -274,7 +274,7 @@ // Assert.IsTrue(size >= c, "previousSize(" + size + ")>=iteratorSize(" + c + ")"); // Assert.IsTrue(c >= newSize, "iteratorSize(" + c + ")>=newSize(" + newSize + ")"); // size = newSize; -//#if !NETSTANDARD1_6 +//#if FEATURE_THREAD_INTERRUPT // } //#pragma warning disable 168 // catch (ThreadInterruptedException ie) diff --git a/src/Lucene.Net/Index/DocumentsWriterFlushControl.cs b/src/Lucene.Net/Index/DocumentsWriterFlushControl.cs index c955aec..4a05cf2 100644 --- a/src/Lucene.Net/Index/DocumentsWriterFlushControl.cs +++ b/src/Lucene.Net/Index/DocumentsWriterFlushControl.cs @@ -313,12 +313,12 @@ namespace Lucene.Net.Index { while (flushingWriters.Count != 0) { -//#if !NETSTANDARD1_6 +//#if FEATURE_THREAD_INTERRUPT // try // { //#endif Monitor.Wait(this); -//#if !NETSTANDARD1_6 // LUCENENET NOTE: Senseless to catch and rethrow the same exception type +//#if FEATURE_THREAD_INTERRUPT // LUCENENET NOTE: Senseless to catch and rethrow the same exception type // } // catch (ThreadInterruptedException e) // { diff --git a/src/Lucene.Net/Index/DocumentsWriterStallControl.cs b/src/Lucene.Net/Index/DocumentsWriterStallControl.cs index 0f1c8f5..4445b8e 100644 --- a/src/Lucene.Net/Index/DocumentsWriterStallControl.cs +++ b/src/Lucene.Net/Index/DocumentsWriterStallControl.cs @@ -81,7 +81,7 @@ namespace Lucene.Net.Index if (stalled) // react on the first wakeup call! { // don't loop here, higher level logic will re-stall! -//#if !NETSTANDARD1_6 +//#if FEATURE_THREAD_INTERRUPT // try // { //#endif @@ -92,7 +92,7 @@ namespace Lucene.Net.Index Monitor.Wait(this); result = DecrWaiters(); if (Debugging.AssertsEnabled) Debugging.Assert(result); -//#if !NETSTANDARD1_6 // LUCENENET NOTE: Senseless to catch and rethrow the same exception type +//#if FEATURE_THREAD_INTERRUPT // LUCENENET NOTE: Senseless to catch and rethrow the same exception type // } // catch (ThreadInterruptedException e) // { diff --git a/src/Lucene.Net/Index/IndexWriter.cs b/src/Lucene.Net/Index/IndexWriter.cs index f3204c0..b329669 100644 --- a/src/Lucene.Net/Index/IndexWriter.cs +++ b/src/Lucene.Net/Index/IndexWriter.cs @@ -1187,14 +1187,14 @@ namespace Lucene.Net.Index if (waitForMerges) { -#if !NETSTANDARD1_6 +#if FEATURE_THREAD_INTERRUPT try { #endif // Give merge scheduler last chance to run, in case // any pending merges are waiting: mergeScheduler.Merge(this, MergeTrigger.CLOSING, false); -#if !NETSTANDARD1_6 +#if FEATURE_THREAD_INTERRUPT } catch (ThreadInterruptedException) { @@ -1212,13 +1212,13 @@ namespace Lucene.Net.Index { for (; ; ) { -#if !NETSTANDARD1_6 +#if FEATURE_THREAD_INTERRUPT try { #endif FinishMerges(waitForMerges && !interrupted); break; -#if !NETSTANDARD1_6 +#if FEATURE_THREAD_INTERRUPT } catch (ThreadInterruptedException) { @@ -1299,7 +1299,7 @@ namespace Lucene.Net.Index // finally, restore interrupt status: if (interrupted) { -#if !NETSTANDARD1_6 +#if FEATURE_THREAD_INTERRUPT Thread.CurrentThread.Interrupt(); #endif } @@ -5345,12 +5345,12 @@ namespace Lucene.Net.Index // fails to be called, we wait for at most 1 second // and then return so caller can check if wait // conditions are satisfied: -//#if !NETSTANDARD1_6 +//#if FEATURE_THREAD_INTERRUPT // try // { //#endif Monitor.Wait(this, TimeSpan.FromMilliseconds(1000)); -//#if !NETSTANDARD1_6 // LUCENENET NOTE: Senseless to catch and rethrow the same exception type +//#if FEATURE_THREAD_INTERRUPT // LUCENENET NOTE: Senseless to catch and rethrow the same exception type // } // catch (ThreadInterruptedException ie) // { diff --git a/src/Lucene.Net/Index/MergePolicy.cs b/src/Lucene.Net/Index/MergePolicy.cs index 7cee535..73d595e 100644 --- a/src/Lucene.Net/Index/MergePolicy.cs +++ b/src/Lucene.Net/Index/MergePolicy.cs @@ -296,14 +296,14 @@ namespace Lucene.Net.Index while (paused) { -//#if !NETSTANDARD1_6 +//#if FEATURE_THREAD_INTERRUPT // try // { //#endif // In theory we could wait() indefinitely, but we // do 1000 msec, defensively Monitor.Wait(this, TimeSpan.FromMilliseconds(1000)); -//#if !NETSTANDARD1_6 // LUCENENET NOTE: Senseless to catch and rethrow the same exception type +//#if FEATURE_THREAD_INTERRUPT // LUCENENET NOTE: Senseless to catch and rethrow the same exception type // } // catch (ThreadInterruptedException ie) // { diff --git a/src/Lucene.Net/Search/ControlledRealTimeReopenThread.cs b/src/Lucene.Net/Search/ControlledRealTimeReopenThread.cs index 8d130a7..40dbd10 100644 --- a/src/Lucene.Net/Search/ControlledRealTimeReopenThread.cs +++ b/src/Lucene.Net/Search/ControlledRealTimeReopenThread.cs @@ -117,12 +117,12 @@ namespace Lucene.Net.Search { finish = true; reopenCond.Set(); -//#if !NETSTANDARD1_6 +//#if FEATURE_THREAD_INTERRUPT // try // { //#endif Join(); -//#if !NETSTANDARD1_6 // LUCENENET NOTE: Senseless to catch and rethrow the same exception type +//#if FEATURE_THREAD_INTERRUPT // LUCENENET NOTE: Senseless to catch and rethrow the same exception type // } // catch (ThreadInterruptedException ie) // { @@ -227,12 +227,12 @@ namespace Lucene.Net.Search long sleepNS = nextReopenStartNS - Time.NanoTime(); if (sleepNS > 0) -#if !NETSTANDARD1_6 +#if FEATURE_THREAD_INTERRUPT try { #endif reopenCond.WaitOne(TimeSpan.FromMilliseconds(sleepNS / Time.MILLISECONDS_PER_NANOSECOND));//Convert NS to Ticks -#if !NETSTANDARD1_6 +#if FEATURE_THREAD_INTERRUPT } #pragma warning disable 168 catch (ThreadInterruptedException ie) diff --git a/src/Lucene.Net/Search/IndexSearcher.cs b/src/Lucene.Net/Search/IndexSearcher.cs index 69baacf..d8d9671 100644 --- a/src/Lucene.Net/Search/IndexSearcher.cs +++ b/src/Lucene.Net/Search/IndexSearcher.cs @@ -878,7 +878,7 @@ namespace Lucene.Net.Search return true; } -#if !NETSTANDARD1_6 +#if FEATURE_THREAD_INTERRUPT catch (ThreadInterruptedException /*e*/) { //throw new ThreadInterruptedException(e.ToString(), e); diff --git a/src/Lucene.Net/Search/TimeLimitingCollector.cs b/src/Lucene.Net/Search/TimeLimitingCollector.cs index cbbe88c..e4f9d41 100644 --- a/src/Lucene.Net/Search/TimeLimitingCollector.cs +++ b/src/Lucene.Net/Search/TimeLimitingCollector.cs @@ -303,12 +303,12 @@ namespace Lucene.Net.Search { // TODO: Use System.nanoTime() when Lucene moves to Java SE 5. counter.AddAndGet(resolution); -//#if !NETSTANDARD1_6 +//#if FEATURE_THREAD_INTERRUPT // try // { //#endif Thread.Sleep(TimeSpan.FromMilliseconds(Interlocked.Read(ref resolution))); -//#if !NETSTANDARD1_6 // LUCENENET NOTE: Senseless to catch and rethrow the same exception type +//#if FEATURE_THREAD_INTERRUPT // LUCENENET NOTE: Senseless to catch and rethrow the same exception type // } // catch (ThreadInterruptedException ie) // { diff --git a/src/Lucene.Net/Store/Lock.cs b/src/Lucene.Net/Store/Lock.cs index 9b3417a..f0cd1ac 100644 --- a/src/Lucene.Net/Store/Lock.cs +++ b/src/Lucene.Net/Store/Lock.cs @@ -137,12 +137,12 @@ namespace Lucene.Net.Store throw e; } -//#if !NETSTANDARD1_6 +//#if FEATURE_THREAD_INTERRUPT // try // { //#endif Thread.Sleep(TimeSpan.FromMilliseconds(LOCK_POLL_INTERVAL)); -//#if !NETSTANDARD1_6 // LUCENENET NOTE: Senseless to catch and rethrow the same exception type +//#if FEATURE_THREAD_INTERRUPT // LUCENENET NOTE: Senseless to catch and rethrow the same exception type // } // catch (ThreadInterruptedException ie) // { diff --git a/src/Lucene.Net/Store/RateLimiter.cs b/src/Lucene.Net/Store/RateLimiter.cs index af20775..fa8121b 100644 --- a/src/Lucene.Net/Store/RateLimiter.cs +++ b/src/Lucene.Net/Store/RateLimiter.cs @@ -120,12 +120,12 @@ namespace Lucene.Net.Store var pauseNS = targetNS - curNS; if (pauseNS > 0) { -//#if !NETSTANDARD1_6 +//#if FEATURE_THREAD_INTERRUPT // try // { //#endif Thread.Sleep(TimeSpan.FromMilliseconds(pauseNS / 1000000)); -//#if !NETSTANDARD1_6 // LUCENENET NOTE: Senseless to catch and rethrow the same exception type +//#if FEATURE_THREAD_INTERRUPT // LUCENENET NOTE: Senseless to catch and rethrow the same exception type // } // catch (ThreadInterruptedException ie) // { diff --git a/src/Lucene.Net/Support/Index/TaskMergeScheduler.cs b/src/Lucene.Net/Support/Index/TaskMergeScheduler.cs index 64a5272..f90ba89 100644 --- a/src/Lucene.Net/Support/Index/TaskMergeScheduler.cs +++ b/src/Lucene.Net/Support/Index/TaskMergeScheduler.cs @@ -377,7 +377,7 @@ namespace Lucene.Net.Index return; } -//#if !NETSTANDARD1_6 +//#if FEATURE_THREAD_INTERRUPT // try // { //#endif @@ -388,7 +388,7 @@ namespace Lucene.Net.Index // so, we sleep here to avoid saturating CPU in such // cases: Thread.Sleep(250); -//#if !NETSTANDARD1_6 // LUCENENET NOTE: Senseless to catch and rethrow the same exception type +//#if FEATURE_THREAD_INTERRUPT // LUCENENET NOTE: Senseless to catch and rethrow the same exception type // } // catch (ThreadInterruptedException ie) // { diff --git a/src/Lucene.Net/Util/IOUtils.cs b/src/Lucene.Net/Util/IOUtils.cs index 8741e4e..45094a9 100644 --- a/src/Lucene.Net/Util/IOUtils.cs +++ b/src/Lucene.Net/Util/IOUtils.cs @@ -563,13 +563,13 @@ namespace Lucene.Net.Util // { // throw; // } - //#if !NETSTANDARD1_6 + //#if FEATURE_THREAD_INTERRUPT // try // { //#endif // // Pause 5 msec // Thread.Sleep(5); - //#if !NETSTANDARD1_6 + //#if FEATURE_THREAD_INTERRUPT // } // catch (ThreadInterruptedException ie) // {
