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:33 UTC
[11/37] lucenenet git commit: Lucene.Net.Codecs.Sep.IntIndexInput
refactor: renamed IntIndexInputReader > AbstractReader,
IntIndexInputIndex > AbstractIndex and nested both classes within
IntIndexInput
Lucene.Net.Codecs.Sep.IntIndexInput refactor: renamed IntIndexInputReader > AbstractReader, IntIndexInputIndex > AbstractIndex and nested both classes within IntIndexInput
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/c4fad82d
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/c4fad82d
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/c4fad82d
Branch: refs/heads/api-work
Commit: c4fad82de5b9f51b263b7e6ba9f907980d73aa38
Parents: e17cce9
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sun Jan 29 15:01:41 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sun Jan 29 15:01:41 2017 +0700
----------------------------------------------------------------------
.../Intblock/FixedIntBlockIndexInput.cs | 14 ++++----
.../Intblock/VariableIntBlockIndexInput.cs | 14 ++++----
src/Lucene.Net.Codecs/Sep/IntIndexInput.cs | 38 ++++++++++----------
src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs | 28 +++++++--------
src/Lucene.Net.Codecs/Sep/SepSkipListReader.cs | 28 +++++++--------
.../Codecs/MockSep/MockSingleIntIndexInput.cs | 14 ++++----
.../IntBlock/TestIntBlockCodec.cs | 2 +-
7 files changed, 68 insertions(+), 70 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c4fad82d/src/Lucene.Net.Codecs/Intblock/FixedIntBlockIndexInput.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Intblock/FixedIntBlockIndexInput.cs b/src/Lucene.Net.Codecs/Intblock/FixedIntBlockIndexInput.cs
index 7b9702a..7c27399 100644
--- a/src/Lucene.Net.Codecs/Intblock/FixedIntBlockIndexInput.cs
+++ b/src/Lucene.Net.Codecs/Intblock/FixedIntBlockIndexInput.cs
@@ -45,7 +45,7 @@ namespace Lucene.Net.Codecs.IntBlock
blockSize = @in.ReadVInt();
}
- public override IntIndexInputReader GetReader()
+ public override AbstractReader GetReader()
{
var buffer = new int[blockSize];
var clone = (IndexInput)input.Clone();
@@ -58,7 +58,7 @@ namespace Lucene.Net.Codecs.IntBlock
input.Dispose();
}
- public override IntIndexInputIndex GetIndex()
+ public override AbstractIndex GetIndex()
{
return new InputIndex(this);
}
@@ -77,7 +77,7 @@ namespace Lucene.Net.Codecs.IntBlock
void ReadBlock();
}
- private class InputReader : IntIndexInputReader // LUCENENET TODO: Rename Reader
+ private class InputReader : AbstractReader // LUCENENET TODO: Rename Reader
{
private readonly IndexInput input;
private readonly IBlockReader blockReader;
@@ -130,7 +130,7 @@ namespace Lucene.Net.Codecs.IntBlock
}
}
- private class InputIndex : IntIndexInputIndex // LUCENENET TODO: Rename Index
+ private class InputIndex : AbstractIndex // LUCENENET TODO: Rename Index
{
private readonly FixedIntBlockIndexInput outerInstance;
@@ -167,19 +167,19 @@ namespace Lucene.Net.Codecs.IntBlock
Debug.Assert(upto < outerInstance.blockSize);
}
- public override void Seek(IntIndexInputReader other)
+ public override void Seek(AbstractReader other)
{
((InputReader)other).Seek(fp, upto);
}
- public override void CopyFrom(IntIndexInputIndex other)
+ public override void CopyFrom(AbstractIndex other)
{
InputIndex idx = (InputIndex)other;
fp = idx.fp;
upto = idx.upto;
}
- public override IntIndexInputIndex Clone()
+ public override AbstractIndex Clone()
{
InputIndex other = new InputIndex(outerInstance);
other.fp = fp;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c4fad82d/src/Lucene.Net.Codecs/Intblock/VariableIntBlockIndexInput.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Intblock/VariableIntBlockIndexInput.cs b/src/Lucene.Net.Codecs/Intblock/VariableIntBlockIndexInput.cs
index 440de80..93376a2 100644
--- a/src/Lucene.Net.Codecs/Intblock/VariableIntBlockIndexInput.cs
+++ b/src/Lucene.Net.Codecs/Intblock/VariableIntBlockIndexInput.cs
@@ -47,7 +47,7 @@ namespace Lucene.Net.Codecs.IntBlock
maxBlockSize = input.ReadInt();
}
- public override IntIndexInputReader GetReader()
+ public override AbstractReader GetReader()
{
var buffer = new int[maxBlockSize];
var clone = (IndexInput)input.Clone();
@@ -60,7 +60,7 @@ namespace Lucene.Net.Codecs.IntBlock
input.Dispose();
}
- public override IntIndexInputIndex GetIndex()
+ public override AbstractIndex GetIndex()
{
return new InputIndex(this);
}
@@ -79,7 +79,7 @@ namespace Lucene.Net.Codecs.IntBlock
void Seek(long pos);
}
- private class InputReader : IntIndexInputReader // LUCENENET TODO: Rename Reader
+ private class InputReader : AbstractReader // LUCENENET TODO: Rename Reader
{
private readonly IndexInput input;
@@ -155,7 +155,7 @@ namespace Lucene.Net.Codecs.IntBlock
}
}
- private class InputIndex : IntIndexInputIndex // LUCENENET TODO: Rename Index
+ private class InputIndex : AbstractIndex // LUCENENET TODO: Rename Index
{
private readonly VariableIntBlockIndexInput outerInstance;
@@ -199,19 +199,19 @@ namespace Lucene.Net.Codecs.IntBlock
return "VarIntBlock.Index fp=" + fp + " upto=" + upto + " maxBlock=" + outerInstance.maxBlockSize;
}
- public override void Seek(IntIndexInputReader other)
+ public override void Seek(AbstractReader other)
{
((InputReader)other).Seek(fp, upto);
}
- public override void CopyFrom(IntIndexInputIndex other)
+ public override void CopyFrom(AbstractIndex other)
{
InputIndex idx = (InputIndex)other;
fp = idx.fp;
upto = idx.upto;
}
- public override IntIndexInputIndex Clone()
+ public override AbstractIndex Clone()
{
InputIndex other = new InputIndex(outerInstance);
other.fp = fp;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c4fad82d/src/Lucene.Net.Codecs/Sep/IntIndexInput.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Sep/IntIndexInput.cs b/src/Lucene.Net.Codecs/Sep/IntIndexInput.cs
index f67abe7..a0065c0 100644
--- a/src/Lucene.Net.Codecs/Sep/IntIndexInput.cs
+++ b/src/Lucene.Net.Codecs/Sep/IntIndexInput.cs
@@ -29,31 +29,29 @@ namespace Lucene.Net.Codecs.Sep
/// </summary>
public abstract class IntIndexInput : IDisposable
{
- public abstract IntIndexInputReader GetReader();
+ public abstract AbstractReader GetReader();
public abstract void Dispose();
- public abstract IntIndexInputIndex GetIndex();
+ public abstract AbstractIndex GetIndex();
-
- }
-
- /// <summary>Reads int values</summary>
- public abstract class IntIndexInputReader // LUCENENET TODO: Rename AbstractReader and nest within IntIndexInput
- {
- /// <summary>Reads next single int</summary>
- public abstract int Next();
- }
+ /// <summary>
+ /// Records a single skip-point in the <see cref="IntIndexInput.GetReader"/>. </summary>
+ public abstract class AbstractIndex
+ {
+ public abstract void Read(DataInput indexIn, bool absolute);
- /// <summary>
- /// Records a single skip-point in the <seealso cref="IntIndexInput.GetReader"/>. </summary>
- public abstract class IntIndexInputIndex // LUCENENET TODO: Rename AbstractIndex and nest within IntIndexInput
- {
- public abstract void Read(DataInput indexIn, bool absolute);
+ /// <summary>Seeks primary stream to the last read offset </summary>
+ public abstract void Seek(AbstractReader stream);
- /// <summary>Seeks primary stream to the last read offset </summary>
- public abstract void Seek(IntIndexInputReader stream);
+ public abstract void CopyFrom(AbstractIndex other);
- public abstract void CopyFrom(IntIndexInputIndex other);
+ public abstract AbstractIndex Clone();
+ }
- public abstract IntIndexInputIndex Clone();
+ /// <summary>Reads int values</summary>
+ public abstract class AbstractReader
+ {
+ /// <summary>Reads next single int</summary>
+ public abstract int Next();
+ }
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c4fad82d/src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs b/src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs
index 5640fb2..84cf0e5 100644
--- a/src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs
+++ b/src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs
@@ -120,9 +120,9 @@ namespace Lucene.Net.Codecs.Sep
// We store only the seek point to the docs file because
// the rest of the info (freqIndex, posIndex, etc.) is
// stored in the docs file:
- internal IntIndexInputIndex DOC_INDEX;
- internal IntIndexInputIndex POS_INDEX;
- internal IntIndexInputIndex FREQ_INDEX;
+ internal IntIndexInput.AbstractIndex DOC_INDEX;
+ internal IntIndexInput.AbstractIndex POS_INDEX;
+ internal IntIndexInput.AbstractIndex FREQ_INDEX;
internal long PAYLOAD_FP;
internal long SKIP_FP;
@@ -309,13 +309,13 @@ namespace Lucene.Net.Codecs.Sep
private IndexOptions _indexOptions;
private bool _storePayloads;
private IBits _liveDocs;
- private readonly IntIndexInputReader _docReader;
- private readonly IntIndexInputReader _freqReader;
+ private readonly IntIndexInput.AbstractReader _docReader;
+ private readonly IntIndexInput.AbstractReader _freqReader;
private long _skipFp;
- private readonly IntIndexInputIndex _docIndex;
- private readonly IntIndexInputIndex _freqIndex;
- private readonly IntIndexInputIndex _posIndex;
+ private readonly IntIndexInput.AbstractIndex _docIndex;
+ private readonly IntIndexInput.AbstractIndex _freqIndex;
+ private readonly IntIndexInput.AbstractIndex _posIndex;
internal IntIndexInput START_DOC_IN; // LUCENENET TODO: Rename startDocIn
// TODO: -- should we do hasProx with 2 different enum classes?
@@ -486,15 +486,15 @@ namespace Lucene.Net.Codecs.Sep
private bool _storePayloads;
private IBits _liveDocs;
- private readonly IntIndexInputReader _docReader;
- private readonly IntIndexInputReader _freqReader;
- private readonly IntIndexInputReader _posReader;
+ private readonly IntIndexInput.AbstractReader _docReader;
+ private readonly IntIndexInput.AbstractReader _freqReader;
+ private readonly IntIndexInput.AbstractReader _posReader;
private readonly IndexInput _payloadIn;
private long _skipFp;
- private readonly IntIndexInputIndex _docIndex;
- private readonly IntIndexInputIndex _freqIndex;
- private readonly IntIndexInputIndex _posIndex;
+ private readonly IntIndexInput.AbstractIndex _docIndex;
+ private readonly IntIndexInput.AbstractIndex _freqIndex;
+ private readonly IntIndexInput.AbstractIndex _posIndex;
internal IntIndexInput START_DOC_IN; // LUCENENET TODO: Rename startDocIn
private long _payloadFp;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c4fad82d/src/Lucene.Net.Codecs/Sep/SepSkipListReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Sep/SepSkipListReader.cs b/src/Lucene.Net.Codecs/Sep/SepSkipListReader.cs
index 40951f7..210d468 100644
--- a/src/Lucene.Net.Codecs/Sep/SepSkipListReader.cs
+++ b/src/Lucene.Net.Codecs/Sep/SepSkipListReader.cs
@@ -33,15 +33,15 @@ namespace Lucene.Net.Codecs.Sep
internal class SepSkipListReader : MultiLevelSkipListReader
{
private bool _currentFieldStoresPayloads;
- private readonly IntIndexInputIndex[] _freqIndex;
- private readonly IntIndexInputIndex[] _docIndex;
- private readonly IntIndexInputIndex[] _posIndex;
+ private readonly IntIndexInput.AbstractIndex[] _freqIndex;
+ private readonly IntIndexInput.AbstractIndex[] _docIndex;
+ private readonly IntIndexInput.AbstractIndex[] _posIndex;
private readonly long[] _payloadPointer;
private readonly int[] _payloadLength;
- private readonly IntIndexInputIndex _lastFreqIndex;
- private readonly IntIndexInputIndex _lastDocIndex;
- private readonly IntIndexInputIndex _lastPosIndex;
+ private readonly IntIndexInput.AbstractIndex _lastFreqIndex;
+ private readonly IntIndexInput.AbstractIndex _lastDocIndex;
+ private readonly IntIndexInput.AbstractIndex _lastPosIndex;
private IndexOptions _indexOptions;
@@ -53,12 +53,12 @@ namespace Lucene.Net.Codecs.Sep
: base(skipStream, maxSkipLevels, skipInterval)
{
if (freqIn != null)
- _freqIndex = new IntIndexInputIndex[maxSkipLevels];
+ _freqIndex = new IntIndexInput.AbstractIndex[maxSkipLevels];
- _docIndex = new IntIndexInputIndex[maxSkipLevels];
+ _docIndex = new IntIndexInput.AbstractIndex[maxSkipLevels];
if (posIn != null)
- _posIndex = new IntIndexInputIndex[m_maxNumberOfSkipLevels];
+ _posIndex = new IntIndexInput.AbstractIndex[m_maxNumberOfSkipLevels];
for (var i = 0; i < maxSkipLevels; i++)
{
@@ -85,8 +85,8 @@ namespace Lucene.Net.Codecs.Sep
set { _indexOptions = value; }
}
- internal virtual void Init(long skipPointer, IntIndexInputIndex docBaseIndex, IntIndexInputIndex freqBaseIndex,
- IntIndexInputIndex posBaseIndex, long payloadBasePointer, int df, bool storesPayloads)
+ internal virtual void Init(long skipPointer, IntIndexInput.AbstractIndex docBaseIndex, IntIndexInput.AbstractIndex freqBaseIndex,
+ IntIndexInput.AbstractIndex posBaseIndex, long payloadBasePointer, int df, bool storesPayloads)
{
base.Init(skipPointer, df);
_currentFieldStoresPayloads = storesPayloads;
@@ -154,17 +154,17 @@ namespace Lucene.Net.Codecs.Sep
_posIndex[level - 1].CopyFrom(_posIndex[level]);
}
- internal virtual IntIndexInputIndex FreqIndex
+ internal virtual IntIndexInput.AbstractIndex FreqIndex
{
get { return _lastFreqIndex; }
}
- internal virtual IntIndexInputIndex PosIndex
+ internal virtual IntIndexInput.AbstractIndex PosIndex
{
get { return _lastPosIndex; }
}
- internal virtual IntIndexInputIndex DocIndex
+ internal virtual IntIndexInput.AbstractIndex DocIndex
{
get { return _lastDocIndex; }
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c4fad82d/src/Lucene.Net.TestFramework/Codecs/MockSep/MockSingleIntIndexInput.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/MockSep/MockSingleIntIndexInput.cs b/src/Lucene.Net.TestFramework/Codecs/MockSep/MockSingleIntIndexInput.cs
index 55f257a..d5affba 100644
--- a/src/Lucene.Net.TestFramework/Codecs/MockSep/MockSingleIntIndexInput.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/MockSep/MockSingleIntIndexInput.cs
@@ -40,7 +40,7 @@ namespace Lucene.Net.Codecs.MockSep
MockSingleIntIndexOutput.VERSION_START);
}
- public override IntIndexInputReader GetReader()
+ public override AbstractReader GetReader()
{
return new MockReader((IndexInput)@in.Clone());
}
@@ -53,7 +53,7 @@ namespace Lucene.Net.Codecs.MockSep
/**
* Just reads a vInt directly from the file.
*/
- public class MockReader : IntIndexInputReader
+ public class MockReader : AbstractReader
{
// clone:
internal readonly IndexInput @in;
@@ -71,7 +71,7 @@ namespace Lucene.Net.Codecs.MockSep
}
}
- internal class MockSingleIntIndexInputIndex : IntIndexInputIndex
+ internal class MockSingleIntIndexInputIndex : AbstractIndex
{
private long fp;
@@ -87,12 +87,12 @@ namespace Lucene.Net.Codecs.MockSep
}
}
- public override void CopyFrom(IntIndexInputIndex other)
+ public override void CopyFrom(AbstractIndex other)
{
fp = ((MockSingleIntIndexInputIndex)other).fp;
}
- public override void Seek(IntIndexInputReader other)
+ public override void Seek(AbstractReader other)
{
((MockReader)other).@in.Seek(fp);
}
@@ -103,14 +103,14 @@ namespace Lucene.Net.Codecs.MockSep
}
- public override IntIndexInputIndex Clone()
+ public override AbstractIndex Clone()
{
MockSingleIntIndexInputIndex other = new MockSingleIntIndexInputIndex();
other.fp = fp;
return other;
}
}
- public override IntIndexInputIndex GetIndex()
+ public override AbstractIndex GetIndex()
{
return new MockSingleIntIndexInputIndex();
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c4fad82d/src/Lucene.Net.Tests.Codecs/IntBlock/TestIntBlockCodec.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Codecs/IntBlock/TestIntBlockCodec.cs b/src/Lucene.Net.Tests.Codecs/IntBlock/TestIntBlockCodec.cs
index aef9339..7d38c4d 100644
--- a/src/Lucene.Net.Tests.Codecs/IntBlock/TestIntBlockCodec.cs
+++ b/src/Lucene.Net.Tests.Codecs/IntBlock/TestIntBlockCodec.cs
@@ -40,7 +40,7 @@ namespace Lucene.Net.Codecs.IntBlock
@out.Dispose();
IntIndexInput @in = f.OpenInput(dir, "test", NewIOContext(Random()));
- IntIndexInputReader r = @in.GetReader();
+ IntIndexInput.AbstractReader r = @in.GetReader();
for (int i = 0; i < 11777; i++)
{