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/01/29 13:27:27 UTC
[05/37] lucenenet git commit:
Lucene.Net.Codecs.BlockTerms.TermsIndexReaderBase refactor: Changed return
type of Seek(BytesRef), Next,
and Seek(long) from long? to long to match Lucene
Lucene.Net.Codecs.BlockTerms.TermsIndexReaderBase refactor: Changed return type of Seek(BytesRef), Next, and Seek(long) from long? to long to match Lucene
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/2060fbb9
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/2060fbb9
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/2060fbb9
Branch: refs/heads/api-work
Commit: 2060fbb974cc550afd2bdeb12b2276cbde59ce7b
Parents: c602c98
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sun Jan 29 14:11:29 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sun Jan 29 14:11:29 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs | 4 ++--
.../BlockTerms/FixedGapTermsIndexReader.cs | 6 +++---
src/Lucene.Net.Codecs/BlockTerms/TermsIndexReaderBase.cs | 6 +++---
.../BlockTerms/VariableGapTermsIndexReader.cs | 10 +++++-----
4 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2060fbb9/src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs b/src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs
index b287f95..b0bdeed 100644
--- a/src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs
+++ b/src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs
@@ -468,7 +468,7 @@ namespace Lucene.Net.Codecs.BlockTerms
// Ask terms index to find biggest indexed term (=
// first term in a block) that's <= our text:
- _input.Seek(_indexEnum.Seek(target).Value);
+ _input.Seek(_indexEnum.Seek(target));
var result = NextBlock();
// Block must exist since, at least, the indexed term
@@ -797,7 +797,7 @@ namespace Lucene.Net.Codecs.BlockTerms
// TODO: if ord is in same terms block and
// after current ord, we should avoid this seek just
// like we do in the seek(BytesRef) case
- _input.Seek(_indexEnum.Seek(ord).Value);
+ _input.Seek(_indexEnum.Seek(ord));
bool result = NextBlock();
// Block must exist since ord < numTerms:
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2060fbb9/src/Lucene.Net.Codecs/BlockTerms/FixedGapTermsIndexReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/BlockTerms/FixedGapTermsIndexReader.cs b/src/Lucene.Net.Codecs/BlockTerms/FixedGapTermsIndexReader.cs
index 0cb840d..c1551d8 100644
--- a/src/Lucene.Net.Codecs/BlockTerms/FixedGapTermsIndexReader.cs
+++ b/src/Lucene.Net.Codecs/BlockTerms/FixedGapTermsIndexReader.cs
@@ -208,7 +208,7 @@ namespace Lucene.Net.Codecs.BlockTerms
public override sealed BytesRef Term { get { return term; } }
- public override long? Seek(BytesRef target) // LUCENENET TODO: return was not nullable in Lucene
+ public override long Seek(BytesRef target)
{
var lo = 0; // binary search
var hi = _fieldIndex.NumIndexTerms - 1;
@@ -257,7 +257,7 @@ namespace Lucene.Net.Codecs.BlockTerms
return _fieldIndex.TermsStart + _fieldIndex.TermsDictOffsets.Get(hi);
}
- public override long? Next // LUCENENET TODO: Make into Next() method // LUCENENET TODO: return was not nullable in Lucene
+ public override long Next // LUCENENET TODO: Make into Next() method
{
get
{
@@ -278,7 +278,7 @@ namespace Lucene.Net.Codecs.BlockTerms
public override long Ord { get { return ord; } }
- public override long? Seek(long ord) // LUCENENET TODO: return was not nullable in Lucene
+ public override long Seek(long ord)
{
var idx = (int)(ord / _fgtir._totalIndexInterval);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2060fbb9/src/Lucene.Net.Codecs/BlockTerms/TermsIndexReaderBase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/BlockTerms/TermsIndexReaderBase.cs b/src/Lucene.Net.Codecs/BlockTerms/TermsIndexReaderBase.cs
index bf19dc1..02bff18 100644
--- a/src/Lucene.Net.Codecs/BlockTerms/TermsIndexReaderBase.cs
+++ b/src/Lucene.Net.Codecs/BlockTerms/TermsIndexReaderBase.cs
@@ -59,10 +59,10 @@ namespace Lucene.Net.Codecs.BlockTerms
/// to term; returns file pointer index (into the main
/// terms index file) for that term
/// </summary>
- public abstract long? Seek(BytesRef term); // LUCENENET TODO: make non-null
+ public abstract long Seek(BytesRef term);
/// <summary>Returns -1 at end</summary>
- public abstract long? Next { get; } // LUCENENET TODO: Make Next(), make non-null
+ public abstract long Next { get; } // LUCENENET TODO: Make Next()
public abstract BytesRef Term { get; }
@@ -70,7 +70,7 @@ namespace Lucene.Net.Codecs.BlockTerms
/// <remarks>Only implemented if {@link TermsIndexReaderBase.supportsOrd()}
/// returns true</remarks>
/// <returns></returns>
- public abstract long? Seek(long ord); // LUCENENET TODO: make non-null
+ public abstract long Seek(long ord);
/// <summary></summary>
/// <remarks>Only implemented if {@link TermsIndexReaderBase.supportsOrd()}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2060fbb9/src/Lucene.Net.Codecs/BlockTerms/VariableGapTermsIndexReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/BlockTerms/VariableGapTermsIndexReader.cs b/src/Lucene.Net.Codecs/BlockTerms/VariableGapTermsIndexReader.cs
index 48eaf86..164830b 100644
--- a/src/Lucene.Net.Codecs/BlockTerms/VariableGapTermsIndexReader.cs
+++ b/src/Lucene.Net.Codecs/BlockTerms/VariableGapTermsIndexReader.cs
@@ -140,13 +140,13 @@ namespace Lucene.Net.Codecs.BlockTerms
get { return _current == null ? null : _current.Input; }
}
- public override long? Seek(BytesRef target)
+ public override long Seek(BytesRef target)
{
_current = _fstEnum.SeekFloor(target);
- return _current.Output;
+ return _current.Output.GetValueOrDefault(); // LUCENENET NOTE: Not sure what to return if OutPut is null, so we are returning 0
}
- public override long? Next
+ public override long Next
{
get
{
@@ -154,7 +154,7 @@ namespace Lucene.Net.Codecs.BlockTerms
if (_current == null)
return -1;
- return _current.Output;
+ return _current.Output.Value;
}
}
@@ -163,7 +163,7 @@ namespace Lucene.Net.Codecs.BlockTerms
get { throw new NotImplementedException(); }
}
- public override long? Seek(long ord)
+ public override long Seek(long ord)
{
throw new NotImplementedException();
}