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/02/05 16:51:50 UTC
[15/27] lucenenet git commit: Lucene.Net.Core.Index.IndexWriter
refactor: GetNextMerge() > NextMerge() (for consistency with iterators)
Lucene.Net.Core.Index.IndexWriter refactor: GetNextMerge() > NextMerge() (for consistency with iterators)
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/f3839209
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/f3839209
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/f3839209
Branch: refs/heads/api-work
Commit: f38392096c9597f7e23b66340ebc41309389670e
Parents: 1ace780
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sun Feb 5 14:39:54 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sun Feb 5 14:47:56 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Core/Index/ConcurrentMergeScheduler.cs | 4 ++--
src/Lucene.Net.Core/Index/IndexWriter.cs | 2 +-
src/Lucene.Net.Core/Index/SerialMergeScheduler.cs | 2 +-
src/Lucene.Net.Core/Index/TaskMergeScheduler.cs | 4 ++--
src/Lucene.Net.TestFramework/Index/BaseMergePolicyTestCase.cs | 2 +-
src/Lucene.Net.Tests/core/Index/TestIndexWriterMerging.cs | 2 +-
src/Lucene.Net.Tests/core/TestMergeSchedulerExternal.cs | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f3839209/src/Lucene.Net.Core/Index/ConcurrentMergeScheduler.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/ConcurrentMergeScheduler.cs b/src/Lucene.Net.Core/Index/ConcurrentMergeScheduler.cs
index 5026907..28164cd 100644
--- a/src/Lucene.Net.Core/Index/ConcurrentMergeScheduler.cs
+++ b/src/Lucene.Net.Core/Index/ConcurrentMergeScheduler.cs
@@ -473,7 +473,7 @@ namespace Lucene.Net.Index
}
}
- MergePolicy.OneMerge merge = writer.GetNextMerge();
+ MergePolicy.OneMerge merge = writer.NextMerge();
if (merge == null)
{
if (IsVerbose)
@@ -651,7 +651,7 @@ namespace Lucene.Net.Index
// Subsequent times through the loop we do any new
// merge that writer says is necessary:
- merge = tWriter.GetNextMerge();
+ merge = tWriter.NextMerge();
// Notify here in case any threads were stalled;
// they will notice that the pending merge has
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f3839209/src/Lucene.Net.Core/Index/IndexWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/IndexWriter.cs b/src/Lucene.Net.Core/Index/IndexWriter.cs
index d929cf1..0897287 100644
--- a/src/Lucene.Net.Core/Index/IndexWriter.cs
+++ b/src/Lucene.Net.Core/Index/IndexWriter.cs
@@ -2451,7 +2451,7 @@ namespace Lucene.Net.Index
///
/// @lucene.experimental
/// </summary>
- public virtual MergePolicy.OneMerge GetNextMerge() // LUCENENET TODO: Rename NextMerge() (consistency with iterator.Next())
+ public virtual MergePolicy.OneMerge NextMerge()
{
lock (this)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f3839209/src/Lucene.Net.Core/Index/SerialMergeScheduler.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/SerialMergeScheduler.cs b/src/Lucene.Net.Core/Index/SerialMergeScheduler.cs
index 7a7b664..06b0d79 100644
--- a/src/Lucene.Net.Core/Index/SerialMergeScheduler.cs
+++ b/src/Lucene.Net.Core/Index/SerialMergeScheduler.cs
@@ -40,7 +40,7 @@ namespace Lucene.Net.Index
{
while (true)
{
- MergePolicy.OneMerge merge = writer.GetNextMerge();
+ MergePolicy.OneMerge merge = writer.NextMerge();
if (merge == null)
{
break;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f3839209/src/Lucene.Net.Core/Index/TaskMergeScheduler.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/TaskMergeScheduler.cs b/src/Lucene.Net.Core/Index/TaskMergeScheduler.cs
index 804e7bb..36d0e9b 100644
--- a/src/Lucene.Net.Core/Index/TaskMergeScheduler.cs
+++ b/src/Lucene.Net.Core/Index/TaskMergeScheduler.cs
@@ -275,7 +275,7 @@ namespace Lucene.Net.Index
}
}
- MergePolicy.OneMerge merge = writer.GetNextMerge();
+ MergePolicy.OneMerge merge = writer.NextMerge();
if (merge == null)
{
if (Verbose)
@@ -583,7 +583,7 @@ namespace Lucene.Net.Index
// Subsequent times through the loop we do any new
// merge that writer says is necessary:
- merge = _writer.GetNextMerge();
+ merge = _writer.NextMerge();
// Notify here in case any threads were stalled;
// they will notice that the pending merge has
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f3839209/src/Lucene.Net.TestFramework/Index/BaseMergePolicyTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/BaseMergePolicyTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseMergePolicyTestCase.cs
index ee2e7e0..5da390d 100644
--- a/src/Lucene.Net.TestFramework/Index/BaseMergePolicyTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BaseMergePolicyTestCase.cs
@@ -83,7 +83,7 @@ namespace Lucene.Net.Index
{
lock (this)
{
- if (!MayMerge.Get() && writer.GetNextMerge() != null)
+ if (!MayMerge.Get() && writer.NextMerge() != null)
{
throw new InvalidOperationException();
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f3839209/src/Lucene.Net.Tests/core/Index/TestIndexWriterMerging.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterMerging.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterMerging.cs
index 879418b..37fc3cd 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterMerging.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterMerging.cs
@@ -306,7 +306,7 @@ namespace Lucene.Net.Index
{
while (true)
{
- MergePolicy.OneMerge merge = writer.GetNextMerge();
+ MergePolicy.OneMerge merge = writer.NextMerge();
if (merge == null)
{
break;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f3839209/src/Lucene.Net.Tests/core/TestMergeSchedulerExternal.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/TestMergeSchedulerExternal.cs b/src/Lucene.Net.Tests/core/TestMergeSchedulerExternal.cs
index 5e10c04..b6a8a79 100644
--- a/src/Lucene.Net.Tests/core/TestMergeSchedulerExternal.cs
+++ b/src/Lucene.Net.Tests/core/TestMergeSchedulerExternal.cs
@@ -139,7 +139,7 @@ namespace Lucene.Net
public override void Merge(IndexWriter writer, MergeTrigger trigger, bool newMergesFound)
{
MergePolicy.OneMerge merge = null;
- while ((merge = writer.GetNextMerge()) != null)
+ while ((merge = writer.NextMerge()) != null)
{
if (VERBOSE)
{