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 6605cb9d8b536b7d695adcb1d84e78a417862f51 Author: Shad Storhaug <[email protected]> AuthorDate: Wed Feb 17 22:26:41 2021 +0700 Directory.Build.targets: Removed FEATURE_CONCURRENTMERGESCHEDULER (see #354) --- Directory.Build.targets | 3 +-- .../ByTask/Tasks/CreateIndexTask.cs | 15 +-------------- src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs | 19 +++---------------- .../Index/TestConcurrentMergeScheduler.cs | 6 ++---- src/Lucene.Net.Tests/Index/TestIndexWriterConfig.cs | 14 +------------- .../Index/TestIndexWriterExceptions.cs | 7 +------ src/Lucene.Net.Tests/Search/TestSearcherManager.cs | 8 +------- src/Lucene.Net.Tests/TestMergeSchedulerExternal.cs | 6 +----- src/Lucene.Net/Index/ConcurrentMergeScheduler.cs | 6 ++---- src/Lucene.Net/Index/IndexWriterConfig.cs | 14 +------------- src/Lucene.Net/Index/LiveIndexWriterConfig.cs | 6 +----- 11 files changed, 15 insertions(+), 89 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index d62cfbb..dc364c2 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,4 +1,4 @@ -<!-- +<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -62,7 +62,6 @@ <DefineConstants>$(DefineConstants);FEATURE_APPDOMAIN_ISFULLYTRUSTED</DefineConstants> <DefineConstants>$(DefineConstants);FEATURE_ASSEMBLY_GETCALLINGASSEMBLY</DefineConstants> <DefineConstants>$(DefineConstants);FEATURE_BITARRAY_COPYTO</DefineConstants> - <DefineConstants>$(DefineConstants);FEATURE_CONCURRENTMERGESCHEDULER</DefineConstants> <DefineConstants>$(DefineConstants);FEATURE_CULTUREINFO_GETCULTURES</DefineConstants> <DefineConstants>$(DefineConstants);FEATURE_DTD_PROCESSING</DefineConstants> <DefineConstants>$(DefineConstants);FEATURE_FILESTREAM_LOCK</DefineConstants> diff --git a/src/Lucene.Net.Benchmark/ByTask/Tasks/CreateIndexTask.cs b/src/Lucene.Net.Benchmark/ByTask/Tasks/CreateIndexTask.cs index 53a68a5..af63cfa 100644 --- a/src/Lucene.Net.Benchmark/ByTask/Tasks/CreateIndexTask.cs +++ b/src/Lucene.Net.Benchmark/ByTask/Tasks/CreateIndexTask.cs @@ -111,14 +111,7 @@ namespace Lucene.Net.Benchmarks.ByTask.Tasks string mergeScheduler = config.Get("merge.scheduler", "Lucene.Net.Index.ConcurrentMergeScheduler, Lucene.Net"); -#if !FEATURE_CONCURRENTMERGESCHEDULER - // LUCENENET specific - hack to get our TaskMergeScheduler - // when a ConcurrentMergeScheduler is requested. - if (mergeScheduler.Contains(".ConcurrentMergeScheduler,")) - { - mergeScheduler = "Lucene.Net.Index.TaskMergeScheduler, Lucene.Net"; - } -#endif + Type mergeSchedulerType = Type.GetType(mergeScheduler); if (mergeSchedulerType == null) { @@ -141,15 +134,9 @@ namespace Lucene.Net.Benchmarks.ByTask.Tasks if (mergeScheduler.Equals("Lucene.Net.Index.ConcurrentMergeScheduler", StringComparison.Ordinal)) { -#if FEATURE_CONCURRENTMERGESCHEDULER ConcurrentMergeScheduler cms = (ConcurrentMergeScheduler)iwConf.MergeScheduler; int maxThreadCount = config.Get("concurrent.merge.scheduler.max.thread.count", ConcurrentMergeScheduler.DEFAULT_MAX_THREAD_COUNT); int maxMergeCount = config.Get("concurrent.merge.scheduler.max.merge.count", ConcurrentMergeScheduler.DEFAULT_MAX_MERGE_COUNT); -#else - TaskMergeScheduler cms = (TaskMergeScheduler)iwConf.MergeScheduler; - int maxThreadCount = config.Get("concurrent.merge.scheduler.max.thread.count", 1); - int maxMergeCount = config.Get("concurrent.merge.scheduler.max.merge.count", 2); -#endif cms.SetMaxMergesAndThreads(maxMergeCount, maxThreadCount); } } diff --git a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs index 85679d3..70a99d2 100644 --- a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs +++ b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs @@ -1563,22 +1563,9 @@ namespace Lucene.Net.Util { int maxThreadCount = TestUtil.NextInt32(Random, 1, 4); int maxMergeCount = TestUtil.NextInt32(Random, maxThreadCount, maxThreadCount + 4); - IConcurrentMergeScheduler mergeScheduler; - -#if !FEATURE_CONCURRENTMERGESCHEDULER - mergeScheduler = new TaskMergeScheduler(); -#else - //if (Rarely(random)) - //{ - // mergeScheduler = new TaskMergeScheduler(); - //} - //else - { - mergeScheduler = new ConcurrentMergeScheduler(); - } -#endif - mergeScheduler.SetMaxMergesAndThreads(maxMergeCount, maxThreadCount); - c.SetMergeScheduler(mergeScheduler); + IConcurrentMergeScheduler cms = new ConcurrentMergeScheduler(); + cms.SetMaxMergesAndThreads(maxMergeCount, maxThreadCount); + c.SetMergeScheduler(cms); } if (random.NextBoolean()) { diff --git a/src/Lucene.Net.Tests/Index/TestConcurrentMergeScheduler.cs b/src/Lucene.Net.Tests/Index/TestConcurrentMergeScheduler.cs index 3da3ece..a43aed1 100644 --- a/src/Lucene.Net.Tests/Index/TestConcurrentMergeScheduler.cs +++ b/src/Lucene.Net.Tests/Index/TestConcurrentMergeScheduler.cs @@ -1,5 +1,4 @@ -#if FEATURE_CONCURRENTMERGESCHEDULER -using J2N.Threading.Atomic; +using J2N.Threading.Atomic; using Lucene.Net.Attributes; using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; @@ -480,5 +479,4 @@ namespace Lucene.Net.Index assertTrue(exceptionHit); } } -} -#endif \ No newline at end of file +} \ No newline at end of file diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterConfig.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterConfig.cs index 41e7f50..44652a4 100644 --- a/src/Lucene.Net.Tests/Index/TestIndexWriterConfig.cs +++ b/src/Lucene.Net.Tests/Index/TestIndexWriterConfig.cs @@ -1,4 +1,4 @@ -using Lucene.Net.Documents; +using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using Lucene.Net.Util; using NUnit.Framework; @@ -62,11 +62,7 @@ namespace Lucene.Net.Index Assert.AreEqual(typeof(MockAnalyzer), conf.Analyzer.GetType()); Assert.IsNull(conf.IndexCommit); Assert.AreEqual(typeof(KeepOnlyLastCommitDeletionPolicy), conf.IndexDeletionPolicy.GetType()); -#if !FEATURE_CONCURRENTMERGESCHEDULER - Assert.AreEqual(typeof(TaskMergeScheduler), conf.MergeScheduler.GetType()); -#else Assert.AreEqual(typeof(ConcurrentMergeScheduler), conf.MergeScheduler.GetType()); -#endif Assert.AreEqual(OpenMode.CREATE_OR_APPEND, conf.OpenMode); // we don't need to assert this, it should be unspecified Assert.IsTrue(IndexSearcher.DefaultSimilarity == conf.Similarity); @@ -296,11 +292,7 @@ namespace Lucene.Net.Index Assert.IsTrue(mergeSched.GetType() == mergeSchedClone.GetType() && (mergeSched != mergeSchedClone || mergeSched.Clone() == mergeSchedClone.Clone())); conf.SetMergeScheduler(new SerialMergeScheduler()); -#if !FEATURE_CONCURRENTMERGESCHEDULER - Assert.AreEqual(typeof(TaskMergeScheduler), clone.MergeScheduler.GetType()); -#else Assert.AreEqual(typeof(ConcurrentMergeScheduler), clone.MergeScheduler.GetType()); -#endif } [Test] @@ -325,11 +317,7 @@ namespace Lucene.Net.Index } // Test MergeScheduler -#if !FEATURE_CONCURRENTMERGESCHEDULER - Assert.AreEqual(typeof(TaskMergeScheduler), conf.MergeScheduler.GetType()); -#else Assert.AreEqual(typeof(ConcurrentMergeScheduler), conf.MergeScheduler.GetType()); -#endif conf.SetMergeScheduler(new SerialMergeScheduler()); Assert.AreEqual(typeof(SerialMergeScheduler), conf.MergeScheduler.GetType()); try diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs index a597b86..41f6a11 100644 --- a/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs +++ b/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs @@ -2397,12 +2397,7 @@ namespace Lucene.Net.Index } } - private class ConcurrentMergeSchedulerAnonymousInnerClassHelper : -#if !FEATURE_CONCURRENTMERGESCHEDULER - TaskMergeScheduler -#else - ConcurrentMergeScheduler -#endif + private class ConcurrentMergeSchedulerAnonymousInnerClassHelper : ConcurrentMergeScheduler { protected override void HandleMergeException(Exception exc) { diff --git a/src/Lucene.Net.Tests/Search/TestSearcherManager.cs b/src/Lucene.Net.Tests/Search/TestSearcherManager.cs index 7adc3aa..b559452 100644 --- a/src/Lucene.Net.Tests/Search/TestSearcherManager.cs +++ b/src/Lucene.Net.Tests/Search/TestSearcherManager.cs @@ -256,13 +256,7 @@ namespace Lucene.Net.Search { Directory dir = NewDirectory(); // Test can deadlock if we use SMS: - IConcurrentMergeScheduler scheduler; -#if !FEATURE_CONCURRENTMERGESCHEDULER - scheduler = new TaskMergeScheduler(); -#else - scheduler = new ConcurrentMergeScheduler(); -#endif - IndexWriter writer = new IndexWriter(dir, NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random)).SetMergeScheduler(scheduler)); + IndexWriter writer = new IndexWriter(dir, NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random)).SetMergeScheduler(new ConcurrentMergeScheduler())); writer.AddDocument(new Document()); writer.Commit(); CountdownEvent awaitEnterWarm = new CountdownEvent(1); diff --git a/src/Lucene.Net.Tests/TestMergeSchedulerExternal.cs b/src/Lucene.Net.Tests/TestMergeSchedulerExternal.cs index e33adcc..a440a06 100644 --- a/src/Lucene.Net.Tests/TestMergeSchedulerExternal.cs +++ b/src/Lucene.Net.Tests/TestMergeSchedulerExternal.cs @@ -1,4 +1,4 @@ -using Lucene.Net.Documents; +using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using Lucene.Net.Store; using Lucene.Net.Util; @@ -31,9 +31,7 @@ namespace Lucene.Net using MockAnalyzer = Lucene.Net.Analysis.MockAnalyzer; using Document = Documents.Document; using Field = Field; -#if FEATURE_CONCURRENTMERGESCHEDULER using ConcurrentMergeScheduler = Lucene.Net.Index.ConcurrentMergeScheduler; -#endif using IndexWriter = Lucene.Net.Index.IndexWriter; using IndexWriterConfig = Lucene.Net.Index.IndexWriterConfig; using LogMergePolicy = Lucene.Net.Index.LogMergePolicy; @@ -52,7 +50,6 @@ namespace Lucene.Net /// </summary> public class TestMergeSchedulerExternal : LuceneTestCase { -#if FEATURE_CONCURRENTMERGESCHEDULER internal volatile bool mergeCalled; internal volatile bool mergeThreadCreated; internal volatile bool excCalled; @@ -139,7 +136,6 @@ namespace Lucene.Net Assert.IsTrue(excCalled); dir.Dispose(); } -#endif private class ReportingMergeScheduler : MergeScheduler { diff --git a/src/Lucene.Net/Index/ConcurrentMergeScheduler.cs b/src/Lucene.Net/Index/ConcurrentMergeScheduler.cs index 6a48765..d6ce849 100644 --- a/src/Lucene.Net/Index/ConcurrentMergeScheduler.cs +++ b/src/Lucene.Net/Index/ConcurrentMergeScheduler.cs @@ -1,5 +1,4 @@ -#if FEATURE_CONCURRENTMERGESCHEDULER -using J2N.Threading; +using J2N.Threading; using Lucene.Net.Diagnostics; using System; using System.Collections.Generic; @@ -747,5 +746,4 @@ namespace Lucene.Net.Index return clone; } } -} -#endif \ No newline at end of file +} \ No newline at end of file diff --git a/src/Lucene.Net/Index/IndexWriterConfig.cs b/src/Lucene.Net/Index/IndexWriterConfig.cs index a525a9b..ef33649 100644 --- a/src/Lucene.Net/Index/IndexWriterConfig.cs +++ b/src/Lucene.Net/Index/IndexWriterConfig.cs @@ -1,4 +1,4 @@ -using Lucene.Net.Util; +using Lucene.Net.Util; using System; using System.IO; using System.Text; @@ -272,17 +272,6 @@ namespace Lucene.Net.Index set => similarity = value ?? throw new ArgumentNullException(nameof(value), "Similarity must not be null"); } - -#if !FEATURE_CONCURRENTMERGESCHEDULER - /// <summary> - /// Expert: Gets or sets the merge scheduler used by this writer. The default is - /// <see cref="TaskMergeScheduler"/>. - /// <para/> - /// <b>NOTE:</b> the merge scheduler cannot be <c>null</c>. - /// - /// <para/>Only takes effect when <see cref="IndexWriter"/> is first created. - /// </summary> -#else /// <summary> /// Expert: Gets or sets the merge scheduler used by this writer. The default is /// <see cref="ConcurrentMergeScheduler"/>. @@ -291,7 +280,6 @@ namespace Lucene.Net.Index /// /// <para/>Only takes effect when <see cref="IndexWriter"/> is first created. /// </summary> -#endif // LUCENENET NOTE: We cannot override a getter and add a setter, // so must declare it new. See: http://stackoverflow.com/q/82437 new public IMergeScheduler MergeScheduler diff --git a/src/Lucene.Net/Index/LiveIndexWriterConfig.cs b/src/Lucene.Net/Index/LiveIndexWriterConfig.cs index b564d45..a4f8c63 100644 --- a/src/Lucene.Net/Index/LiveIndexWriterConfig.cs +++ b/src/Lucene.Net/Index/LiveIndexWriterConfig.cs @@ -1,4 +1,4 @@ -using Lucene.Net.Util; +using Lucene.Net.Util; using System; using System.Text; @@ -153,11 +153,7 @@ namespace Lucene.Net.Index useCompoundFile = IndexWriterConfig.DEFAULT_USE_COMPOUND_FILE_SYSTEM; openMode = Index.OpenMode.CREATE_OR_APPEND; similarity = IndexSearcher.DefaultSimilarity; -#if !FEATURE_CONCURRENTMERGESCHEDULER - mergeScheduler = new TaskMergeScheduler(); -#else mergeScheduler = new ConcurrentMergeScheduler(); -#endif writeLockTimeout = IndexWriterConfig.WRITE_LOCK_TIMEOUT; indexingChain = DocumentsWriterPerThread.DefaultIndexingChain; codec = Codec.Default;
