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 beb697ca2c205f3595bc7315ac48f441e7b8299c Author: Shad Storhaug <[email protected]> AuthorDate: Sat Aug 14 03:31:50 2021 +0700 SWEEP: Removed FEATURE_THREAD_PRIORITY, since it only applied to .NET Standard 1.x --- Directory.Build.targets | 1 - src/Lucene.Net.Benchmark/ByTask/Tasks/TaskSequence.cs | 2 -- src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyCombined.cs | 2 -- src/Lucene.Net.Tests.Suggest/Spell/TestSpellChecker.cs | 2 -- .../Suggest/Analyzing/AnalyzingInfixSuggesterTest.cs | 2 -- src/Lucene.Net.Tests/Index/TestIndexWriter.cs | 2 -- src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs | 4 ---- src/Lucene.Net/Support/Index/TaskMergeScheduler.cs | 8 +------- 8 files changed, 1 insertion(+), 22 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 5c18ebc..0a9bad4 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -70,7 +70,6 @@ <DefineConstants>$(DefineConstants);FEATURE_STACKTRACE</DefineConstants> <DefineConstants>$(DefineConstants);FEATURE_TEXTWRITER_CLOSE</DefineConstants> <DefineConstants>$(DefineConstants);FEATURE_TEXTWRITER_INITIALIZELIFETIMESERVICE</DefineConstants> - <DefineConstants>$(DefineConstants);FEATURE_THREAD_PRIORITY</DefineConstants> <DefineConstants>$(DefineConstants);FEATURE_THREADPOOL_UNSAFEQUEUEWORKITEM</DefineConstants> <DefineConstants>$(DefineConstants);FEATURE_TYPE_GETMETHOD__BINDINGFLAGS_PARAMS</DefineConstants> <DefineConstants>$(DefineConstants);FEATURE_XSLT</DefineConstants> diff --git a/src/Lucene.Net.Benchmark/ByTask/Tasks/TaskSequence.cs b/src/Lucene.Net.Benchmark/ByTask/Tasks/TaskSequence.cs index 4286163..f911a29 100644 --- a/src/Lucene.Net.Benchmark/ByTask/Tasks/TaskSequence.cs +++ b/src/Lucene.Net.Benchmark/ByTask/Tasks/TaskSequence.cs @@ -206,9 +206,7 @@ namespace Lucene.Net.Benchmarks.ByTask.Tasks bgTasks = new List<RunBackgroundTask>(); } RunBackgroundTask bgTask = new RunBackgroundTask(task, letChildReport); -#if FEATURE_THREAD_PRIORITY bgTask.Priority = (task.BackgroundDeltaPriority + Thread.CurrentThread.Priority); -#endif bgTask.Start(); bgTasks.Add(bgTask); } diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyCombined.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyCombined.cs index b1c1fb2..9efbb73 100644 --- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyCombined.cs +++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyCombined.cs @@ -896,9 +896,7 @@ namespace Lucene.Net.Facet.Taxonomy public override void Run() { -#if FEATURE_THREAD_PRIORITY Priority = 1 + Priority; -#endif try { while (!stop) diff --git a/src/Lucene.Net.Tests.Suggest/Spell/TestSpellChecker.cs b/src/Lucene.Net.Tests.Suggest/Spell/TestSpellChecker.cs index 47df487..3b1db40 100644 --- a/src/Lucene.Net.Tests.Suggest/Spell/TestSpellChecker.cs +++ b/src/Lucene.Net.Tests.Suggest/Spell/TestSpellChecker.cs @@ -561,9 +561,7 @@ namespace Lucene.Net.Search.Spell public override void Run() { -#if FEATURE_THREAD_PRIORITY Priority += 1; -#endif try { while (!stop) diff --git a/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingInfixSuggesterTest.cs b/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingInfixSuggesterTest.cs index 228350b..b66fc36 100644 --- a/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingInfixSuggesterTest.cs +++ b/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingInfixSuggesterTest.cs @@ -539,9 +539,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing public override void Run() { -#if FEATURE_THREAD_PRIORITY Priority += 1; -#endif while (!stop) { string query = RandomText(); diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs b/src/Lucene.Net.Tests/Index/TestIndexWriter.cs index d0fd389..3fbfdb5 100644 --- a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs +++ b/src/Lucene.Net.Tests/Index/TestIndexWriter.cs @@ -785,7 +785,6 @@ namespace Lucene.Net.Index dir.Dispose(); } -#if FEATURE_THREAD_PRIORITY // LUCENE-1036 [Test] public virtual void TestMaxThreadPriority() @@ -814,7 +813,6 @@ namespace Lucene.Net.Index Thread.CurrentThread.Priority = pri; } } -#endif [Test] public virtual void TestVariableSchema() diff --git a/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs b/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs index e769ce7..302377d 100644 --- a/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs +++ b/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs @@ -282,17 +282,13 @@ namespace Lucene.Net.Search nrtDeletesThread = new ControlledRealTimeReopenThread<IndexSearcher>(genWriter, nrtDeletes, maxReopenSec, minReopenSec); nrtDeletesThread.Name = "NRTDeletes Reopen Thread"; -#if FEATURE_THREAD_PRIORITY nrtDeletesThread.Priority = (ThreadPriority)Math.Min((int)Thread.CurrentThread.Priority + 2, (int)ThreadPriority.Highest); -#endif nrtDeletesThread.IsBackground = (true); nrtDeletesThread.Start(); nrtNoDeletesThread = new ControlledRealTimeReopenThread<IndexSearcher>(genWriter, nrtNoDeletes, maxReopenSec, minReopenSec); nrtNoDeletesThread.Name = "NRTNoDeletes Reopen Thread"; -#if FEATURE_THREAD_PRIORITY nrtNoDeletesThread.Priority = (ThreadPriority)Math.Min((int)Thread.CurrentThread.Priority + 2, (int)ThreadPriority.Highest); -#endif nrtNoDeletesThread.IsBackground = (true); nrtNoDeletesThread.Start(); } diff --git a/src/Lucene.Net/Support/Index/TaskMergeScheduler.cs b/src/Lucene.Net/Support/Index/TaskMergeScheduler.cs index c15f303..4e50c88 100644 --- a/src/Lucene.Net/Support/Index/TaskMergeScheduler.cs +++ b/src/Lucene.Net/Support/Index/TaskMergeScheduler.cs @@ -113,13 +113,7 @@ namespace Lucene.Net.Index /// <summary> /// Return the priority that merge threads run at. This is always the same. /// </summary> - public int MergeThreadPriority => -#if !FEATURE_THREAD_PRIORITY - 2; -#else - (int)ThreadPriority.Normal; -#endif - + public int MergeThreadPriority => (int)ThreadPriority.Normal; /// <summary> /// This method has no effect in <see cref="TaskMergeScheduler"/> because the
