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 24c2a2b523827403fbcd797d731236384b5694bd Author: Shad Storhaug <[email protected]> AuthorDate: Fri Aug 28 21:34:26 2020 +0700 Lucene.Net.Search.Spans.Spans: Changed Next() > MoveNext() and deprecated Next() method (see #279, #212) --- .../Highlight/WeightedSpanTermExtractor.cs | 2 +- .../Search/Payloads/TestPayloadTermQuery.cs | 4 +- .../Search/Spans/JustCompileSearchSpans.cs | 4 +- .../Search/Spans/MultiSpansWrapper.cs | 6 +-- src/Lucene.Net.Tests/Search/Spans/TestBasics.cs | 6 +-- .../Search/Spans/TestFieldMaskingSpanQuery.cs | 38 +++++++-------- .../Search/Spans/TestNearSpansOrdered.cs | 12 ++--- .../Search/Spans/TestPayloadSpans.cs | 10 ++-- src/Lucene.Net.Tests/Search/Spans/TestSpans.cs | 56 +++++++++++----------- .../Search/TestPositionIncrement.cs | 4 +- src/Lucene.Net/Search/Payloads/PayloadNearQuery.cs | 2 +- src/Lucene.Net/Search/Payloads/PayloadSpanUtil.cs | 2 +- src/Lucene.Net/Search/Payloads/PayloadTermQuery.cs | 2 +- src/Lucene.Net/Search/Spans/NearSpansOrdered.cs | 8 ++-- src/Lucene.Net/Search/Spans/NearSpansUnordered.cs | 14 +++--- src/Lucene.Net/Search/Spans/SpanNotQuery.cs | 14 +++--- src/Lucene.Net/Search/Spans/SpanOrQuery.cs | 8 ++-- .../Search/Spans/SpanPositionCheckQuery.cs | 10 ++-- src/Lucene.Net/Search/Spans/SpanScorer.cs | 4 +- src/Lucene.Net/Search/Spans/Spans.cs | 14 ++++-- src/Lucene.Net/Search/Spans/TermSpans.cs | 4 +- 21 files changed, 115 insertions(+), 109 deletions(-) diff --git a/src/Lucene.Net.Highlighter/Highlight/WeightedSpanTermExtractor.cs b/src/Lucene.Net.Highlighter/Highlight/WeightedSpanTermExtractor.cs index 6543944..7461da8 100644 --- a/src/Lucene.Net.Highlighter/Highlight/WeightedSpanTermExtractor.cs +++ b/src/Lucene.Net.Highlighter/Highlight/WeightedSpanTermExtractor.cs @@ -303,7 +303,7 @@ namespace Lucene.Net.Search.Highlight Spans.Spans spans = q.GetSpans(context, acceptDocs, termContexts); // collect span positions - while (spans.Next()) + while (spans.MoveNext()) { spanPositions.Add(new PositionSpan(spans.Start, spans.End - 1)); } diff --git a/src/Lucene.Net.Tests/Search/Payloads/TestPayloadTermQuery.cs b/src/Lucene.Net.Tests/Search/Payloads/TestPayloadTermQuery.cs index a99acf2..d3a1011 100644 --- a/src/Lucene.Net.Tests/Search/Payloads/TestPayloadTermQuery.cs +++ b/src/Lucene.Net.Tests/Search/Payloads/TestPayloadTermQuery.cs @@ -236,7 +236,7 @@ namespace Lucene.Net.Search.Payloads //should be two matches per document int count = 0; //100 hits times 2 matches per hit, we should have 200 in count - while (spans.Next()) + while (spans.MoveNext()) { count++; } @@ -284,7 +284,7 @@ namespace Lucene.Net.Search.Payloads //should be two matches per document int count = 0; //100 hits times 2 matches per hit, we should have 200 in count - while (spans.Next()) + while (spans.MoveNext()) { count++; } diff --git a/src/Lucene.Net.Tests/Search/Spans/JustCompileSearchSpans.cs b/src/Lucene.Net.Tests/Search/Spans/JustCompileSearchSpans.cs index 65c9fd7..23fced5 100644 --- a/src/Lucene.Net.Tests/Search/Spans/JustCompileSearchSpans.cs +++ b/src/Lucene.Net.Tests/Search/Spans/JustCompileSearchSpans.cs @@ -43,7 +43,7 @@ namespace Lucene.Net.Search.Spans public override int End => throw new NotSupportedException(UNSUPPORTED_MSG); - public override bool Next() + public override bool MoveNext() { throw new NotSupportedException(UNSUPPORTED_MSG); } @@ -96,7 +96,7 @@ namespace Lucene.Net.Search.Spans public override int End => throw new NotSupportedException(UNSUPPORTED_MSG); - public override bool Next() + public override bool MoveNext() { throw new NotSupportedException(UNSUPPORTED_MSG); } diff --git a/src/Lucene.Net.Tests/Search/Spans/MultiSpansWrapper.cs b/src/Lucene.Net.Tests/Search/Spans/MultiSpansWrapper.cs index d738765..25623b3 100644 --- a/src/Lucene.Net.Tests/Search/Spans/MultiSpansWrapper.cs +++ b/src/Lucene.Net.Tests/Search/Spans/MultiSpansWrapper.cs @@ -71,7 +71,7 @@ namespace Lucene.Net.Search.Spans return new MultiSpansWrapper(leaves, query, termContexts); } - public override bool Next() + public override bool MoveNext() { if (leafOrd >= numLeaves) { @@ -84,7 +84,7 @@ namespace Lucene.Net.Search.Spans } while (true) { - if (current.Next()) + if (current.MoveNext()) { return true; } @@ -127,7 +127,7 @@ namespace Lucene.Net.Search.Spans if (target < leaves[leafOrd].DocBase) { // target was in the previous slice - if (current.Next()) + if (current.MoveNext()) { return true; } diff --git a/src/Lucene.Net.Tests/Search/Spans/TestBasics.cs b/src/Lucene.Net.Tests/Search/Spans/TestBasics.cs index 37d2d92..1468d8c 100644 --- a/src/Lucene.Net.Tests/Search/Spans/TestBasics.cs +++ b/src/Lucene.Net.Tests/Search/Spans/TestBasics.cs @@ -575,8 +575,8 @@ namespace Lucene.Net.Search.Spans Spans s1 = MultiSpansWrapper.Wrap(searcher.TopReaderContext, t1); Spans s2 = MultiSpansWrapper.Wrap(searcher.TopReaderContext, t2); - Assert.IsTrue(s1.Next()); - Assert.IsTrue(s2.Next()); + Assert.IsTrue(s1.MoveNext()); + Assert.IsTrue(s2.MoveNext()); bool hasMore = true; @@ -605,7 +605,7 @@ namespace Lucene.Net.Search.Spans { do { - if (!s.Next()) + if (!s.MoveNext()) { return false; } diff --git a/src/Lucene.Net.Tests/Search/Spans/TestFieldMaskingSpanQuery.cs b/src/Lucene.Net.Tests/Search/Spans/TestFieldMaskingSpanQuery.cs index b2b9be6..16301e7 100644 --- a/src/Lucene.Net.Tests/Search/Spans/TestFieldMaskingSpanQuery.cs +++ b/src/Lucene.Net.Tests/Search/Spans/TestFieldMaskingSpanQuery.cs @@ -239,34 +239,34 @@ namespace Lucene.Net.Search.Spans Spans span = MultiSpansWrapper.Wrap(searcher.TopReaderContext, q); - Assert.AreEqual(true, span.Next()); + Assert.AreEqual(true, span.MoveNext()); Assert.AreEqual(s(0, 0, 1), s(span)); - Assert.AreEqual(true, span.Next()); + Assert.AreEqual(true, span.MoveNext()); Assert.AreEqual(s(1, 0, 1), s(span)); - Assert.AreEqual(true, span.Next()); + Assert.AreEqual(true, span.MoveNext()); Assert.AreEqual(s(1, 1, 2), s(span)); - Assert.AreEqual(true, span.Next()); + Assert.AreEqual(true, span.MoveNext()); Assert.AreEqual(s(2, 0, 1), s(span)); - Assert.AreEqual(true, span.Next()); + Assert.AreEqual(true, span.MoveNext()); Assert.AreEqual(s(2, 1, 2), s(span)); - Assert.AreEqual(true, span.Next()); + Assert.AreEqual(true, span.MoveNext()); Assert.AreEqual(s(2, 2, 3), s(span)); - Assert.AreEqual(true, span.Next()); + Assert.AreEqual(true, span.MoveNext()); Assert.AreEqual(s(3, 0, 1), s(span)); - Assert.AreEqual(true, span.Next()); + Assert.AreEqual(true, span.MoveNext()); Assert.AreEqual(s(4, 0, 1), s(span)); - Assert.AreEqual(true, span.Next()); + Assert.AreEqual(true, span.MoveNext()); Assert.AreEqual(s(4, 1, 2), s(span)); - Assert.AreEqual(false, span.Next()); + Assert.AreEqual(false, span.MoveNext()); } [Test] @@ -283,12 +283,12 @@ namespace Lucene.Net.Search.Spans Spans spanA = MultiSpansWrapper.Wrap(searcher.TopReaderContext, qA); Spans spanB = MultiSpansWrapper.Wrap(searcher.TopReaderContext, qB); - while (spanA.Next()) + while (spanA.MoveNext()) { - Assert.IsTrue(spanB.Next(), "spanB not still going"); + Assert.IsTrue(spanB.MoveNext(), "spanB not still going"); Assert.AreEqual(s(spanA), s(spanB), "spanA not equal spanB"); } - Assert.IsTrue(!(spanB.Next()), "spanB still going even tough spanA is done"); + Assert.IsTrue(!(spanB.MoveNext()), "spanB still going even tough spanA is done"); } [Test] @@ -304,22 +304,22 @@ namespace Lucene.Net.Search.Spans Spans span = MultiSpansWrapper.Wrap(searcher.TopReaderContext, q); - Assert.AreEqual(true, span.Next()); + Assert.AreEqual(true, span.MoveNext()); Assert.AreEqual(s(0, 0, 1), s(span)); - Assert.AreEqual(true, span.Next()); + Assert.AreEqual(true, span.MoveNext()); Assert.AreEqual(s(1, 1, 2), s(span)); - Assert.AreEqual(true, span.Next()); + Assert.AreEqual(true, span.MoveNext()); Assert.AreEqual(s(2, 0, 1), s(span)); - Assert.AreEqual(true, span.Next()); + Assert.AreEqual(true, span.MoveNext()); Assert.AreEqual(s(2, 2, 3), s(span)); - Assert.AreEqual(true, span.Next()); + Assert.AreEqual(true, span.MoveNext()); Assert.AreEqual(s(3, 0, 1), s(span)); - Assert.AreEqual(false, span.Next()); + Assert.AreEqual(false, span.MoveNext()); } public virtual string s(Spans span) diff --git a/src/Lucene.Net.Tests/Search/Spans/TestNearSpansOrdered.cs b/src/Lucene.Net.Tests/Search/Spans/TestNearSpansOrdered.cs index 9568e8e..f845e99 100644 --- a/src/Lucene.Net.Tests/Search/Spans/TestNearSpansOrdered.cs +++ b/src/Lucene.Net.Tests/Search/Spans/TestNearSpansOrdered.cs @@ -106,11 +106,11 @@ namespace Lucene.Net.Search.Spans { SpanNearQuery q = MakeQuery(); Spans span = MultiSpansWrapper.Wrap(searcher.TopReaderContext, q); - Assert.AreEqual(true, span.Next()); + Assert.AreEqual(true, span.MoveNext()); Assert.AreEqual(s(0, 0, 3), s(span)); - Assert.AreEqual(true, span.Next()); + Assert.AreEqual(true, span.MoveNext()); Assert.AreEqual(s(1, 0, 4), s(span)); - Assert.AreEqual(false, span.Next()); + Assert.AreEqual(false, span.MoveNext()); } /// <summary> @@ -135,11 +135,11 @@ namespace Lucene.Net.Search.Spans { SpanNearQuery q = MakeQuery(); Spans span = MultiSpansWrapper.Wrap(searcher.TopReaderContext, q); - Assert.AreEqual(true, span.Next()); + Assert.AreEqual(true, span.MoveNext()); Assert.AreEqual(s(0, 0, 3), s(span)); Assert.AreEqual(true, span.SkipTo(1)); Assert.AreEqual(s(1, 0, 4), s(span)); - Assert.AreEqual(false, span.Next()); + Assert.AreEqual(false, span.MoveNext()); } [Test] @@ -147,7 +147,7 @@ namespace Lucene.Net.Search.Spans { SpanNearQuery q = MakeQuery(); Spans span = MultiSpansWrapper.Wrap(searcher.TopReaderContext, q); - Assert.AreEqual(true, span.Next()); + Assert.AreEqual(true, span.MoveNext()); Assert.AreEqual(s(0, 0, 3), s(span)); Assert.AreEqual(false, span.SkipTo(2)); } diff --git a/src/Lucene.Net.Tests/Search/Spans/TestPayloadSpans.cs b/src/Lucene.Net.Tests/Search/Spans/TestPayloadSpans.cs index 5c2b4d0..9a0a4b0 100644 --- a/src/Lucene.Net.Tests/Search/Spans/TestPayloadSpans.cs +++ b/src/Lucene.Net.Tests/Search/Spans/TestPayloadSpans.cs @@ -282,7 +282,7 @@ namespace Lucene.Net.Search.Spans ISet<string> payloadSet = new JCG.HashSet<string>(); for (int i = 0; i < topDocs.ScoreDocs.Length; i++) { - while (spans.Next()) + while (spans.MoveNext()) { var payloads = spans.GetPayload(); foreach (var payload in payloads) @@ -321,7 +321,7 @@ namespace Lucene.Net.Search.Spans ISet<string> payloadSet = new JCG.HashSet<string>(); for (int i = 0; i < topDocs.ScoreDocs.Length; i++) { - while (spans.Next()) + while (spans.MoveNext()) { var payloads = spans.GetPayload(); foreach (var payload in payloads) @@ -360,7 +360,7 @@ namespace Lucene.Net.Search.Spans ISet<string> payloadSet = new JCG.HashSet<string>(); for (int i = 0; i < topDocs.ScoreDocs.Length; i++) { - while (spans.Next()) + while (spans.MoveNext()) { var payloads = spans.GetPayload(); foreach (var payload in payloads) @@ -418,7 +418,7 @@ namespace Lucene.Net.Search.Spans //each position match should have a span associated with it, since there is just one underlying term query, there should //only be one entry in the span int seen = 0; - while (spans.Next() == true) + while (spans.MoveNext() == true) { //if we expect payloads, then isPayloadAvailable should be true if (expectedNumPayloads > 0) @@ -474,7 +474,7 @@ namespace Lucene.Net.Search.Spans { int cnt = 0; - while (spans.Next() == true) + while (spans.MoveNext() == true) { if (Verbose) { diff --git a/src/Lucene.Net.Tests/Search/Spans/TestSpans.cs b/src/Lucene.Net.Tests/Search/Spans/TestSpans.cs index 9d6e329..c83a054 100644 --- a/src/Lucene.Net.Tests/Search/Spans/TestSpans.cs +++ b/src/Lucene.Net.Tests/Search/Spans/TestSpans.cs @@ -205,17 +205,17 @@ namespace Lucene.Net.Search.Spans SpanNearQuery snq = new SpanNearQuery(new SpanQuery[] { MakeSpanTermQuery("t1"), MakeSpanTermQuery("t2"), MakeSpanTermQuery("t3") }, slop, ordered); Spans spans = MultiSpansWrapper.Wrap(searcher.TopReaderContext, snq); - Assert.IsTrue(spans.Next(), "first range"); + Assert.IsTrue(spans.MoveNext(), "first range"); Assert.AreEqual(11, spans.Doc, "first doc"); Assert.AreEqual(0, spans.Start, "first start"); Assert.AreEqual(4, spans.End, "first end"); - Assert.IsTrue(spans.Next(), "second range"); + Assert.IsTrue(spans.MoveNext(), "second range"); Assert.AreEqual(11, spans.Doc, "second doc"); Assert.AreEqual(2, spans.Start, "second start"); Assert.AreEqual(6, spans.End, "second end"); - Assert.IsFalse(spans.Next(), "third range"); + Assert.IsFalse(spans.MoveNext(), "third range"); } [Test] @@ -225,82 +225,82 @@ namespace Lucene.Net.Search.Spans SpanNearQuery snq; snq = new SpanNearQuery(new SpanQuery[] { MakeSpanTermQuery("u1"), MakeSpanTermQuery("u2") }, 0, false); Spans spans = MultiSpansWrapper.Wrap(searcher.TopReaderContext, snq); - Assert.IsTrue(spans.Next(), "Does not have next and it should"); + Assert.IsTrue(spans.MoveNext(), "Does not have next and it should"); Assert.AreEqual(4, spans.Doc, "doc"); Assert.AreEqual(1, spans.Start, "start"); Assert.AreEqual(3, spans.End, "end"); - Assert.IsTrue(spans.Next(), "Does not have next and it should"); + Assert.IsTrue(spans.MoveNext(), "Does not have next and it should"); Assert.AreEqual(5, spans.Doc, "doc"); Assert.AreEqual(2, spans.Start, "start"); Assert.AreEqual(4, spans.End, "end"); - Assert.IsTrue(spans.Next(), "Does not have next and it should"); + Assert.IsTrue(spans.MoveNext(), "Does not have next and it should"); Assert.AreEqual(8, spans.Doc, "doc"); Assert.AreEqual(2, spans.Start, "start"); Assert.AreEqual(4, spans.End, "end"); - Assert.IsTrue(spans.Next(), "Does not have next and it should"); + Assert.IsTrue(spans.MoveNext(), "Does not have next and it should"); Assert.AreEqual(9, spans.Doc, "doc"); Assert.AreEqual(0, spans.Start, "start"); Assert.AreEqual(2, spans.End, "end"); - Assert.IsTrue(spans.Next(), "Does not have next and it should"); + Assert.IsTrue(spans.MoveNext(), "Does not have next and it should"); Assert.AreEqual(10, spans.Doc, "doc"); Assert.AreEqual(0, spans.Start, "start"); Assert.AreEqual(2, spans.End, "end"); - Assert.IsTrue(spans.Next() == false, "Has next and it shouldn't: " + spans.Doc); + Assert.IsTrue(spans.MoveNext() == false, "Has next and it shouldn't: " + spans.Doc); SpanNearQuery u1u2 = new SpanNearQuery(new SpanQuery[] { MakeSpanTermQuery("u1"), MakeSpanTermQuery("u2") }, 0, false); snq = new SpanNearQuery(new SpanQuery[] { u1u2, MakeSpanTermQuery("u2") }, 1, false); spans = MultiSpansWrapper.Wrap(searcher.TopReaderContext, snq); - Assert.IsTrue(spans.Next(), "Does not have next and it should"); + Assert.IsTrue(spans.MoveNext(), "Does not have next and it should"); Assert.AreEqual(4, spans.Doc, "doc"); Assert.AreEqual(0, spans.Start, "start"); Assert.AreEqual(3, spans.End, "end"); - Assert.IsTrue(spans.Next(), "Does not have next and it should"); + Assert.IsTrue(spans.MoveNext(), "Does not have next and it should"); //unordered spans can be subsets Assert.AreEqual(4, spans.Doc, "doc"); Assert.AreEqual(1, spans.Start, "start"); Assert.AreEqual(3, spans.End, "end"); - Assert.IsTrue(spans.Next(), "Does not have next and it should"); + Assert.IsTrue(spans.MoveNext(), "Does not have next and it should"); Assert.AreEqual(5, spans.Doc, "doc"); Assert.AreEqual(0, spans.Start, "start"); Assert.AreEqual(4, spans.End, "end"); - Assert.IsTrue(spans.Next(), "Does not have next and it should"); + Assert.IsTrue(spans.MoveNext(), "Does not have next and it should"); Assert.AreEqual(5, spans.Doc, "doc"); Assert.AreEqual(2, spans.Start, "start"); Assert.AreEqual(4, spans.End, "end"); - Assert.IsTrue(spans.Next(), "Does not have next and it should"); + Assert.IsTrue(spans.MoveNext(), "Does not have next and it should"); Assert.AreEqual(8, spans.Doc, "doc"); Assert.AreEqual(0, spans.Start, "start"); Assert.AreEqual(4, spans.End, "end"); - Assert.IsTrue(spans.Next(), "Does not have next and it should"); + Assert.IsTrue(spans.MoveNext(), "Does not have next and it should"); Assert.AreEqual(8, spans.Doc, "doc"); Assert.AreEqual(2, spans.Start, "start"); Assert.AreEqual(4, spans.End, "end"); - Assert.IsTrue(spans.Next(), "Does not have next and it should"); + Assert.IsTrue(spans.MoveNext(), "Does not have next and it should"); Assert.AreEqual(9, spans.Doc, "doc"); Assert.AreEqual(0, spans.Start, "start"); Assert.AreEqual(2, spans.End, "end"); - Assert.IsTrue(spans.Next(), "Does not have next and it should"); + Assert.IsTrue(spans.MoveNext(), "Does not have next and it should"); Assert.AreEqual(9, spans.Doc, "doc"); Assert.AreEqual(0, spans.Start, "start"); Assert.AreEqual(4, spans.End, "end"); - Assert.IsTrue(spans.Next(), "Does not have next and it should"); + Assert.IsTrue(spans.MoveNext(), "Does not have next and it should"); Assert.AreEqual(10, spans.Doc, "doc"); Assert.AreEqual(0, spans.Start, "start"); Assert.AreEqual(2, spans.End, "end"); - Assert.IsTrue(spans.Next() == false, "Has next and it shouldn't"); + Assert.IsTrue(spans.MoveNext() == false, "Has next and it shouldn't"); } private Spans OrSpans(string[] terms) @@ -315,7 +315,7 @@ namespace Lucene.Net.Search.Spans private void TstNextSpans(Spans spans, int doc, int start, int end) { - Assert.IsTrue(spans.Next(), "next"); + Assert.IsTrue(spans.MoveNext(), "next"); Assert.AreEqual(doc, spans.Doc, "doc"); Assert.AreEqual(start, spans.Start, "start"); Assert.AreEqual(end, spans.End, "end"); @@ -325,7 +325,7 @@ namespace Lucene.Net.Search.Spans public virtual void TestSpanOrEmpty() { Spans spans = OrSpans(new string[0]); - Assert.IsFalse(spans.Next(), "empty next"); + Assert.IsFalse(spans.MoveNext(), "empty next"); SpanOrQuery a = new SpanOrQuery(); SpanOrQuery b = new SpanOrQuery(); @@ -337,7 +337,7 @@ namespace Lucene.Net.Search.Spans { Spans spans = OrSpans(new string[] { "w5" }); TstNextSpans(spans, 0, 4, 5); - Assert.IsFalse(spans.Next(), "final next"); + Assert.IsFalse(spans.MoveNext(), "final next"); } [Test] @@ -345,7 +345,7 @@ namespace Lucene.Net.Search.Spans { Spans spans = OrSpans(new string[] { "w1", "xx" }); - spans.Next(); + spans.MoveNext(); int doc = spans.Doc; Assert.AreEqual(0, doc); @@ -366,7 +366,7 @@ namespace Lucene.Net.Search.Spans TstNextSpans(spans, 2, 3, 4); TstNextSpans(spans, 3, 4, 5); TstNextSpans(spans, 7, 3, 4); - Assert.IsFalse(spans.Next(), "final next"); + Assert.IsFalse(spans.MoveNext(), "final next"); } [Test] @@ -378,7 +378,7 @@ namespace Lucene.Net.Search.Spans Assert.AreEqual(4, spans.Start, "start"); Assert.AreEqual(5, spans.End, "end"); TstNextSpans(spans, 7, 3, 4); - Assert.IsFalse(spans.Next(), "final next"); + Assert.IsFalse(spans.MoveNext(), "final next"); } [Test] @@ -389,7 +389,7 @@ namespace Lucene.Net.Search.Spans TstNextSpans(spans, 2, 3, 4); TstNextSpans(spans, 3, 4, 5); TstNextSpans(spans, 7, 3, 4); - Assert.IsFalse(spans.Next(), "final next"); + Assert.IsFalse(spans.MoveNext(), "final next"); } [Test] @@ -402,7 +402,7 @@ namespace Lucene.Net.Search.Spans TstNextSpans(spans, 11, 3, 4); TstNextSpans(spans, 11, 4, 5); TstNextSpans(spans, 11, 5, 6); - Assert.IsFalse(spans.Next(), "final next"); + Assert.IsFalse(spans.MoveNext(), "final next"); } [Test] @@ -582,7 +582,7 @@ namespace Lucene.Net.Search.Spans Spans spans = MultiSpansWrapper.Wrap(searcher.TopReaderContext, snq); int i = 0; - while (spans.Next()) + while (spans.MoveNext()) { i++; } diff --git a/src/Lucene.Net.Tests/Search/TestPositionIncrement.cs b/src/Lucene.Net.Tests/Search/TestPositionIncrement.cs index cb540ca..cbac305 100644 --- a/src/Lucene.Net.Tests/Search/TestPositionIncrement.cs +++ b/src/Lucene.Net.Tests/Search/TestPositionIncrement.cs @@ -276,7 +276,7 @@ namespace Lucene.Net.Search Console.WriteLine("\ngetPayloadSpans test"); } Search.Spans.Spans pspans = MultiSpansWrapper.Wrap(@is.TopReaderContext, snq); - while (pspans.Next()) + while (pspans.MoveNext()) { if (Verbose) { @@ -300,7 +300,7 @@ namespace Lucene.Net.Search Search.Spans.Spans spans = MultiSpansWrapper.Wrap(@is.TopReaderContext, snq); count = 0; sawZero = false; - while (spans.Next()) + while (spans.MoveNext()) { count++; sawZero |= spans.Start == 0; diff --git a/src/Lucene.Net/Search/Payloads/PayloadNearQuery.cs b/src/Lucene.Net/Search/Payloads/PayloadNearQuery.cs index f4dc779..d7ce2d0 100644 --- a/src/Lucene.Net/Search/Payloads/PayloadNearQuery.cs +++ b/src/Lucene.Net/Search/Payloads/PayloadNearQuery.cs @@ -289,7 +289,7 @@ namespace Lucene.Net.Search.Payloads Spans[] spansArr = new Spans[1]; spansArr[0] = spans; GetPayloads(spansArr); - m_more = spans.Next(); + m_more = spans.MoveNext(); } while (m_more && (m_doc == spans.Doc)); return true; } diff --git a/src/Lucene.Net/Search/Payloads/PayloadSpanUtil.cs b/src/Lucene.Net/Search/Payloads/PayloadSpanUtil.cs index 29a47ee..6f49a1e 100644 --- a/src/Lucene.Net/Search/Payloads/PayloadSpanUtil.cs +++ b/src/Lucene.Net/Search/Payloads/PayloadSpanUtil.cs @@ -194,7 +194,7 @@ namespace Lucene.Net.Search.Payloads foreach (AtomicReaderContext atomicReaderContext in context.Leaves) { Spans spans = query.GetSpans(atomicReaderContext, atomicReaderContext.AtomicReader.LiveDocs, termContexts); - while (spans.Next() == true) + while (spans.MoveNext() == true) { if (spans.IsPayloadAvailable) { diff --git a/src/Lucene.Net/Search/Payloads/PayloadTermQuery.cs b/src/Lucene.Net/Search/Payloads/PayloadTermQuery.cs index 8bab46e..1175bd8 100644 --- a/src/Lucene.Net/Search/Payloads/PayloadTermQuery.cs +++ b/src/Lucene.Net/Search/Payloads/PayloadTermQuery.cs @@ -115,7 +115,7 @@ namespace Lucene.Net.Search.Payloads m_numMatches++; ProcessPayload(outerInstance.m_similarity); - m_more = m_spans.Next(); // this moves positions to the next match in this + m_more = m_spans.MoveNext(); // this moves positions to the next match in this // document } return m_more || (m_freq != 0); diff --git a/src/Lucene.Net/Search/Spans/NearSpansOrdered.cs b/src/Lucene.Net/Search/Spans/NearSpansOrdered.cs index f510506..06ace26 100644 --- a/src/Lucene.Net/Search/Spans/NearSpansOrdered.cs +++ b/src/Lucene.Net/Search/Spans/NearSpansOrdered.cs @@ -168,14 +168,14 @@ namespace Lucene.Net.Search.Spans /// <summary> /// Move to the next match, returning true iff any such exists. </summary> - public override bool Next() + public override bool MoveNext() { if (firstTime) { firstTime = false; for (int i = 0; i < subSpans.Length; i++) { - if (!subSpans[i].Next()) + if (!subSpans[i].MoveNext()) { more = false; return false; @@ -325,7 +325,7 @@ namespace Lucene.Net.Search.Spans { while (!DocSpansOrdered(subSpans[i - 1], subSpans[i])) { - if (!subSpans[i].Next()) + if (!subSpans[i].MoveNext()) { inSameDoc = false; more = false; @@ -373,7 +373,7 @@ namespace Lucene.Net.Search.Spans int prevEnd = prevSpans.End; while (true) // Advance prevSpans until after (lastStart, lastEnd) { - if (!prevSpans.Next()) + if (!prevSpans.MoveNext()) { inSameDoc = false; more = false; diff --git a/src/Lucene.Net/Search/Spans/NearSpansUnordered.cs b/src/Lucene.Net/Search/Spans/NearSpansUnordered.cs index bee2831..e6ee67c 100644 --- a/src/Lucene.Net/Search/Spans/NearSpansUnordered.cs +++ b/src/Lucene.Net/Search/Spans/NearSpansUnordered.cs @@ -95,9 +95,9 @@ namespace Lucene.Net.Search.Spans this.index = index; } - public override bool Next() + public override bool MoveNext() { - return Adjust(spans.Next()); + return Adjust(spans.MoveNext()); } public override bool SkipTo(int target) @@ -171,7 +171,7 @@ namespace Lucene.Net.Search.Spans [SuppressMessage("Microsoft.Performance", "CA1819", Justification = "Lucene's design requires some writable array properties")] public virtual Spans[] SubSpans => subSpans; - public override bool Next() + public override bool MoveNext() { if (firstTime) { @@ -181,7 +181,7 @@ namespace Lucene.Net.Search.Spans } else if (more) { - if (Min.Next()) // trigger further scanning + if (Min.MoveNext()) // trigger further scanning { queue.UpdateTop(); // maintain queue } @@ -228,7 +228,7 @@ namespace Lucene.Net.Search.Spans return true; } - more = Min.Next(); + more = Min.MoveNext(); if (more) { queue.UpdateTop(); // maintain queue @@ -266,7 +266,7 @@ namespace Lucene.Net.Search.Spans } } } - return more && (AtMatch || Next()); + return more && (AtMatch || MoveNext()); } private SpansCell Min => queue.Top; @@ -336,7 +336,7 @@ namespace Lucene.Net.Search.Spans SpansCell cell = ordered[i]; if (next) { - more = cell.Next(); // move to first entry + more = cell.MoveNext(); // move to first entry } if (more) { diff --git a/src/Lucene.Net/Search/Spans/SpanNotQuery.cs b/src/Lucene.Net/Search/Spans/SpanNotQuery.cs index 28c831a..ca85bf2 100644 --- a/src/Lucene.Net/Search/Spans/SpanNotQuery.cs +++ b/src/Lucene.Net/Search/Spans/SpanNotQuery.cs @@ -140,7 +140,7 @@ namespace Lucene.Net.Search.Spans includeSpans = outerInstance.include.GetSpans(context, acceptDocs, termContexts); moreInclude = true; excludeSpans = outerInstance.exclude.GetSpans(context, acceptDocs, termContexts); - moreExclude = excludeSpans.Next(); + moreExclude = excludeSpans.MoveNext(); } private Spans includeSpans; @@ -149,11 +149,11 @@ namespace Lucene.Net.Search.Spans private Spans excludeSpans; private bool moreExclude; - public override bool Next() + public override bool MoveNext() { if (moreInclude) // move to next include { - moreInclude = includeSpans.Next(); + moreInclude = includeSpans.MoveNext(); } while (moreInclude && moreExclude) @@ -165,7 +165,7 @@ namespace Lucene.Net.Search.Spans while (moreExclude && includeSpans.Doc == excludeSpans.Doc && excludeSpans.End <= includeSpans.Start - outerInstance.pre) // while exclude is before { - moreExclude = excludeSpans.Next(); // increment exclude + moreExclude = excludeSpans.MoveNext(); // increment exclude } if (!moreExclude || includeSpans.Doc != excludeSpans.Doc || includeSpans.End + outerInstance.post <= excludeSpans.Start) // if no intersection @@ -173,7 +173,7 @@ namespace Lucene.Net.Search.Spans break; // we found a match } - moreInclude = includeSpans.Next(); // intersected: keep scanning + moreInclude = includeSpans.MoveNext(); // intersected: keep scanning } return moreInclude; } @@ -197,7 +197,7 @@ namespace Lucene.Net.Search.Spans while (moreExclude && includeSpans.Doc == excludeSpans.Doc && excludeSpans.End <= includeSpans.Start - outerInstance.pre) // while exclude is before { - moreExclude = excludeSpans.Next(); // increment exclude + moreExclude = excludeSpans.MoveNext(); // increment exclude } if (!moreExclude || includeSpans.Doc != excludeSpans.Doc || includeSpans.End + outerInstance.post <= excludeSpans.Start) // if no intersection @@ -205,7 +205,7 @@ namespace Lucene.Net.Search.Spans return true; // we found a match } - return Next(); // scan to next match + return MoveNext(); // scan to next match } public override int Doc => includeSpans.Doc; diff --git a/src/Lucene.Net/Search/Spans/SpanOrQuery.cs b/src/Lucene.Net/Search/Spans/SpanOrQuery.cs index 74e228c..0c51fb2 100644 --- a/src/Lucene.Net/Search/Spans/SpanOrQuery.cs +++ b/src/Lucene.Net/Search/Spans/SpanOrQuery.cs @@ -244,7 +244,7 @@ namespace Lucene.Net.Search.Spans { Spans spans = clause.GetSpans(context, acceptDocs, termContexts); cost += spans.GetCost(); - if (((target == -1) && spans.Next()) || ((target != -1) && spans.SkipTo(target))) + if (((target == -1) && spans.MoveNext()) || ((target != -1) && spans.SkipTo(target))) { queue.Add(spans); } @@ -252,7 +252,7 @@ namespace Lucene.Net.Search.Spans return queue.Count != 0; } - public override bool Next() + public override bool MoveNext() { if (queue == null) { @@ -264,7 +264,7 @@ namespace Lucene.Net.Search.Spans return false; } - if (Top.Next()) // move to next + if (Top.MoveNext()) // move to next { queue.UpdateTop(); return true; @@ -301,7 +301,7 @@ namespace Lucene.Net.Search.Spans { return queue.Count != 0; } - return Next(); + return MoveNext(); } public override int Doc => Top.Doc; diff --git a/src/Lucene.Net/Search/Spans/SpanPositionCheckQuery.cs b/src/Lucene.Net/Search/Spans/SpanPositionCheckQuery.cs index 3c72fb4..839b75f 100644 --- a/src/Lucene.Net/Search/Spans/SpanPositionCheckQuery.cs +++ b/src/Lucene.Net/Search/Spans/SpanPositionCheckQuery.cs @@ -77,13 +77,13 @@ namespace Lucene.Net.Search.Spans /// Implementing classes are required to return whether the current position is a match for the passed in /// "match" <see cref="Lucene.Net.Search.Spans.SpanQuery"/>. /// <para/> - /// This is only called if the underlying <see cref="Lucene.Net.Search.Spans.Spans.Next()"/> for the + /// This is only called if the underlying <see cref="Lucene.Net.Search.Spans.Spans.MoveNext()"/> for the /// match is successful /// </summary> /// <param name="spans"> The <see cref="Lucene.Net.Search.Spans.Spans"/> instance, positioned at the spot to check </param> /// <returns> Whether the match is accepted, rejected, or rejected and should move to the next doc. /// </returns> - /// <seealso cref="Lucene.Net.Search.Spans.Spans.Next()"/> + /// <seealso cref="Lucene.Net.Search.Spans.Spans.MoveNext()"/> protected abstract AcceptStatus AcceptPosition(Spans spans); public override Spans GetSpans(AtomicReaderContext context, IBits acceptDocs, IDictionary<Term, TermContext> termContexts) @@ -124,9 +124,9 @@ namespace Lucene.Net.Search.Spans spans = outerInstance.m_match.GetSpans(context, acceptDocs, termContexts); } - public override bool Next() + public override bool MoveNext() { - if (!spans.Next()) + if (!spans.MoveNext()) { return false; } @@ -154,7 +154,7 @@ namespace Lucene.Net.Search.Spans return true; case AcceptStatus.NO: - if (!spans.Next()) + if (!spans.MoveNext()) { return false; } diff --git a/src/Lucene.Net/Search/Spans/SpanScorer.cs b/src/Lucene.Net/Search/Spans/SpanScorer.cs index f85e638..e6e9ed2 100644 --- a/src/Lucene.Net/Search/Spans/SpanScorer.cs +++ b/src/Lucene.Net/Search/Spans/SpanScorer.cs @@ -40,7 +40,7 @@ namespace Lucene.Net.Search.Spans this.m_spans = spans; m_doc = -1; - m_more = spans.Next(); + m_more = spans.MoveNext(); } public override int NextDoc() @@ -83,7 +83,7 @@ namespace Lucene.Net.Search.Spans int matchLength = m_spans.End - m_spans.Start; m_freq += m_docScorer.ComputeSlopFactor(matchLength); m_numMatches++; - m_more = m_spans.Next(); + m_more = m_spans.MoveNext(); } while (m_more && (m_doc == m_spans.Doc)); return true; } diff --git a/src/Lucene.Net/Search/Spans/Spans.cs b/src/Lucene.Net/Search/Spans/Spans.cs index 1625489..d69dc97 100644 --- a/src/Lucene.Net/Search/Spans/Spans.cs +++ b/src/Lucene.Net/Search/Spans/Spans.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using System.IO; @@ -30,7 +31,12 @@ namespace Lucene.Net.Search.Spans { /// <summary> /// Move to the next match, returning true if any such exists. </summary> - public abstract bool Next(); + public abstract bool MoveNext(); + + /// <summary> + /// Move to the next match, returning true if any such exists. </summary> + [Obsolete("Use MoveNext() instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] + public virtual bool Next() => MoveNext(); /// <summary> /// Skips to the first match beyond the current, whose document number is @@ -70,10 +76,10 @@ namespace Lucene.Net.Search.Spans /// <summary> /// Returns the payload data for the current span. - /// this is invalid until <see cref="Next()"/> is called for + /// this is invalid until <see cref="MoveNext()"/> is called for /// the first time. /// This method must not be called more than once after each call - /// of <see cref="Next()"/>. However, most payloads are loaded lazily, + /// of <see cref="MoveNext()"/>. However, most payloads are loaded lazily, /// so if the payload data for the current position is not needed, /// this method may not be called at all for performance reasons. An ordered /// SpanQuery does not lazy load, so if you have payloads in your index and @@ -94,7 +100,7 @@ namespace Lucene.Net.Search.Spans /// Checks if a payload can be loaded at this position. /// <para/> /// Payloads can only be loaded once per call to - /// <see cref="Next()"/>. + /// <see cref="MoveNext()"/>. /// </summary> /// <returns> <c>true</c> if there is a payload available at this position that can be loaded </returns> public abstract bool IsPayloadAvailable { get; } diff --git a/src/Lucene.Net/Search/Spans/TermSpans.cs b/src/Lucene.Net/Search/Spans/TermSpans.cs index bdcc8d6..2802c72 100644 --- a/src/Lucene.Net/Search/Spans/TermSpans.cs +++ b/src/Lucene.Net/Search/Spans/TermSpans.cs @@ -52,7 +52,7 @@ namespace Lucene.Net.Search.Spans m_postings = null; } - public override bool Next() + public override bool MoveNext() { if (m_count == m_freq) { @@ -132,7 +132,7 @@ namespace Lucene.Net.Search.Spans private sealed class EmptyTermSpans : TermSpans { - public override bool Next() + public override bool MoveNext() { return false; }
