This is an automated email from the ASF dual-hosted git repository.
paulirwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucenenet.git
The following commit(s) were added to refs/heads/master by this push:
new 2054f5f1e Rename IndexWriter.NextMerge() to GetNextMerge(), #986 (#990)
2054f5f1e is described below
commit 2054f5f1ef7b118978242bcbaafc750db82ea0eb
Author: Paul Irwin <[email protected]>
AuthorDate: Wed Oct 23 13:47:16 2024 -0600
Rename IndexWriter.NextMerge() to GetNextMerge(), #986 (#990)
---
src/Lucene.Net.TestFramework/Index/BaseMergePolicyTestCase.cs | 2 +-
src/Lucene.Net.Tests/Index/TestIndexWriterMerging.cs | 2 +-
src/Lucene.Net.Tests/TestMergeSchedulerExternal.cs | 2 +-
src/Lucene.Net/Index/ConcurrentMergeScheduler.cs | 4 ++--
src/Lucene.Net/Index/IndexWriter.cs | 2 +-
src/Lucene.Net/Index/MergeScheduler.cs | 4 ++--
src/Lucene.Net/Index/SerialMergeScheduler.cs | 2 +-
src/Lucene.Net/Support/Index/TaskMergeScheduler.cs | 4 ++--
8 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/Lucene.Net.TestFramework/Index/BaseMergePolicyTestCase.cs
b/src/Lucene.Net.TestFramework/Index/BaseMergePolicyTestCase.cs
index 08965c7e6..0dd81a1e0 100644
--- a/src/Lucene.Net.TestFramework/Index/BaseMergePolicyTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BaseMergePolicyTestCase.cs
@@ -78,7 +78,7 @@ namespace Lucene.Net.Index
UninterruptableMonitor.Enter(this);
try
{
- if (!mayMerge.Value && writer.NextMerge() != null)
+ if (!mayMerge.Value && writer.GetNextMerge() != null)
{
throw AssertionError.Create();
}
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterMerging.cs
b/src/Lucene.Net.Tests/Index/TestIndexWriterMerging.cs
index b8e5a6658..bddcb786e 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterMerging.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterMerging.cs
@@ -321,7 +321,7 @@ namespace Lucene.Net.Index
{
while (true)
{
- MergePolicy.OneMerge merge = writer.NextMerge();
+ MergePolicy.OneMerge merge = writer.GetNextMerge();
if (merge is null)
{
break;
diff --git a/src/Lucene.Net.Tests/TestMergeSchedulerExternal.cs
b/src/Lucene.Net.Tests/TestMergeSchedulerExternal.cs
index a440a065e..ef89731d6 100644
--- a/src/Lucene.Net.Tests/TestMergeSchedulerExternal.cs
+++ b/src/Lucene.Net.Tests/TestMergeSchedulerExternal.cs
@@ -143,7 +143,7 @@ namespace Lucene.Net
public override void Merge(IndexWriter writer, MergeTrigger
trigger, bool newMergesFound)
{
MergePolicy.OneMerge merge = null;
- while ((merge = writer.NextMerge()) != null)
+ while ((merge = writer.GetNextMerge()) != null)
{
if (Verbose)
{
diff --git a/src/Lucene.Net/Index/ConcurrentMergeScheduler.cs
b/src/Lucene.Net/Index/ConcurrentMergeScheduler.cs
index 767e679a4..43bcf98eb 100644
--- a/src/Lucene.Net/Index/ConcurrentMergeScheduler.cs
+++ b/src/Lucene.Net/Index/ConcurrentMergeScheduler.cs
@@ -485,7 +485,7 @@ namespace Lucene.Net.Index
}
}
- MergePolicy.OneMerge merge = writer.NextMerge();
+ MergePolicy.OneMerge merge = writer.GetNextMerge();
if (merge is null)
{
if (IsVerbose)
@@ -691,7 +691,7 @@ namespace Lucene.Net.Index
// Subsequent times through the loop we do any new
// merge that writer says is necessary:
- merge = tWriter.NextMerge();
+ merge = tWriter.GetNextMerge();
// Notify here in case any threads were stalled;
// they will notice that the pending merge has
diff --git a/src/Lucene.Net/Index/IndexWriter.cs
b/src/Lucene.Net/Index/IndexWriter.cs
index 829c7fcd5..443799b8d 100644
--- a/src/Lucene.Net/Index/IndexWriter.cs
+++ b/src/Lucene.Net/Index/IndexWriter.cs
@@ -2680,7 +2680,7 @@ namespace Lucene.Net.Index
/// <para/>
/// @lucene.experimental
/// </summary>
- public virtual MergePolicy.OneMerge NextMerge() // LUCENENET TODO: API
- Revert name to GetNextMerge() to match Java
+ public virtual MergePolicy.OneMerge GetNextMerge()
{
UninterruptableMonitor.Enter(this);
try
diff --git a/src/Lucene.Net/Index/MergeScheduler.cs
b/src/Lucene.Net/Index/MergeScheduler.cs
index 694111ea2..cf4a6be8c 100644
--- a/src/Lucene.Net/Index/MergeScheduler.cs
+++ b/src/Lucene.Net/Index/MergeScheduler.cs
@@ -41,7 +41,7 @@ namespace Lucene.Net.Index
}
/// <summary>
- /// Run the merges provided by <see cref="IndexWriter.NextMerge()"/>.
</summary>
+ /// Run the merges provided by <see
cref="IndexWriter.GetNextMerge()"/>. </summary>
/// <param name="writer"> the <see cref="IndexWriter"/> to obtain the
merges from. </param>
/// <param name="trigger"> the <see cref="MergeTrigger"/> that caused
this merge to happen </param>
/// <param name="newMergesFound"> <c>true</c> iff any new merges were
found by the caller; otherwise <c>false</c>
@@ -66,4 +66,4 @@ namespace Lucene.Net.Index
return (MergeScheduler)base.MemberwiseClone();
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Lucene.Net/Index/SerialMergeScheduler.cs
b/src/Lucene.Net/Index/SerialMergeScheduler.cs
index 582a415f4..044b4ee85 100644
--- a/src/Lucene.Net/Index/SerialMergeScheduler.cs
+++ b/src/Lucene.Net/Index/SerialMergeScheduler.cs
@@ -45,7 +45,7 @@ namespace Lucene.Net.Index
{
while (true)
{
- MergePolicy.OneMerge merge = writer.NextMerge();
+ MergePolicy.OneMerge merge = writer.GetNextMerge();
if (merge is null)
{
break;
diff --git a/src/Lucene.Net/Support/Index/TaskMergeScheduler.cs
b/src/Lucene.Net/Support/Index/TaskMergeScheduler.cs
index 984593708..3fa597b86 100644
--- a/src/Lucene.Net/Support/Index/TaskMergeScheduler.cs
+++ b/src/Lucene.Net/Support/Index/TaskMergeScheduler.cs
@@ -269,7 +269,7 @@ namespace Lucene.Net.Index
}
}
- MergePolicy.OneMerge merge = writer.NextMerge();
+ MergePolicy.OneMerge merge = writer.GetNextMerge();
if (merge is null)
{
if (Verbose)
@@ -576,7 +576,7 @@ namespace Lucene.Net.Index
// Subsequent times through the loop we do any new
// merge that writer says is necessary:
- merge = _writer.NextMerge();
+ merge = _writer.GetNextMerge();
// Notify here in case any threads were stalled;
// they will notice that the pending merge has
