You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by ni...@apache.org on 2017/04/16 10:38:05 UTC
[4/6] lucenenet git commit: Lucene.Net + Lucene.Net.Tests: Added
FEATURE_CONCURRENTMERGESCHEDULER so the concurrent merge scheduler can be
excluded from .NET Core without excluding files (which isn't working)
Lucene.Net + Lucene.Net.Tests: Added FEATURE_CONCURRENTMERGESCHEDULER so the concurrent merge scheduler can be excluded from .NET Core without excluding files (which isn't working)
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/0c942da2
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/0c942da2
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/0c942da2
Branch: refs/heads/api-work
Commit: 0c942da2db2d71813a4c722e3a167e708277d82a
Parents: d498d01
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sun Apr 16 01:01:36 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sun Apr 16 01:01:36 2017 +0700
----------------------------------------------------------------------
.../Index/TestConcurrentMergeScheduler.cs | 4 +++-
src/Lucene.Net.Tests/TestMergeSchedulerExternal.cs | 5 ++++-
src/Lucene.Net.Tests/project.json | 11 ++++-------
src/Lucene.Net/Index/ConcurrentMergeScheduler.cs | 4 +++-
src/Lucene.Net/project.json | 1 +
5 files changed, 15 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0c942da2/src/Lucene.Net.Tests/Index/TestConcurrentMergeScheduler.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Index/TestConcurrentMergeScheduler.cs b/src/Lucene.Net.Tests/Index/TestConcurrentMergeScheduler.cs
index 93eab70..9ef441f 100644
--- a/src/Lucene.Net.Tests/Index/TestConcurrentMergeScheduler.cs
+++ b/src/Lucene.Net.Tests/Index/TestConcurrentMergeScheduler.cs
@@ -1,3 +1,4 @@
+#if FEATURE_CONCURRENTMERGESCHEDULER
using System;
using System.Diagnostics;
using System.Threading;
@@ -435,4 +436,5 @@ namespace Lucene.Net.Index
d.Dispose();
}
}
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0c942da2/src/Lucene.Net.Tests/TestMergeSchedulerExternal.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/TestMergeSchedulerExternal.cs b/src/Lucene.Net.Tests/TestMergeSchedulerExternal.cs
index a8794d7..ff450ab 100644
--- a/src/Lucene.Net.Tests/TestMergeSchedulerExternal.cs
+++ b/src/Lucene.Net.Tests/TestMergeSchedulerExternal.cs
@@ -28,7 +28,9 @@ 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;
@@ -48,7 +50,7 @@ namespace Lucene.Net
/// </summary>
public class TestMergeSchedulerExternal : LuceneTestCase
{
-
+#if FEATURE_CONCURRENTMERGESCHEDULER
internal volatile bool MergeCalled;
internal volatile bool MergeThreadCreated;
internal volatile bool ExcCalled;
@@ -133,6 +135,7 @@ namespace Lucene.Net
Assert.IsTrue(ExcCalled);
dir.Dispose();
}
+#endif
private class ReportingMergeScheduler : MergeScheduler
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0c942da2/src/Lucene.Net.Tests/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/project.json b/src/Lucene.Net.Tests/project.json
index 44f6ff2..7f82f48 100644
--- a/src/Lucene.Net.Tests/project.json
+++ b/src/Lucene.Net.Tests/project.json
@@ -10,7 +10,6 @@
"NUnit": "3.5.0"
},
"testRunner": "nunit",
-
"frameworks": {
"netcoreapp1.0": {
"buildOptions": {
@@ -20,17 +19,15 @@
"includeFiles": [
"../CommonAssemblyInfo.cs"
],
- "exclude": [
- "Util/JunitCompat"
- ],
"excludeFiles": [
- "TestMergeSchedulerExternal.cs",
- "Index/TestConcurrentMergeScheduler.cs",
"Support/TestApiConsistency.cs",
"Support/TestCase.cs",
"Support/TestExceptionSerialization.cs",
"Support/TestSerialization.cs",
"Util/TestMaxFailuresRule.cs"
+ ],
+ "exclude": [
+ "Util/JunitCompat"
]
},
"embed": {
@@ -89,7 +86,7 @@
"net451": {
"buildOptions": {
"debugType": "portable",
- "define": [ "FEATURE_BREAKITERATOR", "FEATURE_SERIALIZABLE" ],
+ "define": [ "FEATURE_BREAKITERATOR", "FEATURE_CONCURRENTMERGESCHEDULER", "FEATURE_SERIALIZABLE" ],
"compile": {
"includeFiles": [
"../CommonAssemblyInfo.cs"
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0c942da2/src/Lucene.Net/Index/ConcurrentMergeScheduler.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/ConcurrentMergeScheduler.cs b/src/Lucene.Net/Index/ConcurrentMergeScheduler.cs
index cd7daf1..231160b 100644
--- a/src/Lucene.Net/Index/ConcurrentMergeScheduler.cs
+++ b/src/Lucene.Net/Index/ConcurrentMergeScheduler.cs
@@ -1,3 +1,4 @@
+#if FEATURE_CONCURRENTMERGESCHEDULER
using Lucene.Net.Support;
using System;
using System.Collections.Generic;
@@ -768,4 +769,5 @@ namespace Lucene.Net.Index
return clone;
}
}
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0c942da2/src/Lucene.Net/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/project.json b/src/Lucene.Net/project.json
index d6f0799..47d2d6e 100644
--- a/src/Lucene.Net/project.json
+++ b/src/Lucene.Net/project.json
@@ -52,6 +52,7 @@
"define": [
"FEATURE_BREAKITERATOR",
"FEATURE_CLONEABLE",
+ "FEATURE_CONCURRENTMERGESCHEDULER",
"FEATURE_SERIALIZABLE",
"FEATURE_THREADPOOL_UNSAFEQUEUEWORKITEM"
],