Lucene.Net.Codecs.Sep.IntIndexOutput: Renamed AbstractIndex > Index
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/d2825f73 Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/d2825f73 Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/d2825f73 Branch: refs/heads/api-work Commit: d2825f7311c72785455940ff5e333caffbd68d95 Parents: 90bfa65 Author: Shad Storhaug <[email protected]> Authored: Sun Mar 19 23:18:09 2017 +0700 Committer: Shad Storhaug <[email protected]> Committed: Sun Mar 19 23:18:09 2017 +0700 ---------------------------------------------------------------------- .../IntBlock/FixedIntBlockIndexOutput.cs | 6 +++--- .../IntBlock/VariableIntBlockIndexOutput.cs | 6 +++--- src/Lucene.Net.Codecs/Sep/IntIndexOutput.cs | 6 +++--- src/Lucene.Net.Codecs/Sep/SepPostingsWriter.cs | 12 ++++++------ src/Lucene.Net.Codecs/Sep/SepSkipListWriter.cs | 16 ++++++++-------- .../Codecs/MockSep/MockSingleIntIndexOutput.cs | 6 +++--- 6 files changed, 26 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d2825f73/src/Lucene.Net.Codecs/IntBlock/FixedIntBlockIndexOutput.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/IntBlock/FixedIntBlockIndexOutput.cs b/src/Lucene.Net.Codecs/IntBlock/FixedIntBlockIndexOutput.cs index e158d05..76bde79 100644 --- a/src/Lucene.Net.Codecs/IntBlock/FixedIntBlockIndexOutput.cs +++ b/src/Lucene.Net.Codecs/IntBlock/FixedIntBlockIndexOutput.cs @@ -56,12 +56,12 @@ namespace Lucene.Net.Codecs.IntBlock protected abstract void FlushBlock(); - public override AbstractIndex GetIndex() + public override Int32IndexOutput.Index GetIndex() { return new Index(this); } - private class Index : AbstractIndex + new private class Index : Int32IndexOutput.Index { private readonly FixedInt32BlockIndexOutput outerInstance; @@ -81,7 +81,7 @@ namespace Lucene.Net.Codecs.IntBlock upto = outerInstance.upto; } - public override void CopyFrom(AbstractIndex other, bool copyLast) + public override void CopyFrom(Int32IndexOutput.Index other, bool copyLast) { Index idx = (Index)other; fp = idx.fp; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d2825f73/src/Lucene.Net.Codecs/IntBlock/VariableIntBlockIndexOutput.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/IntBlock/VariableIntBlockIndexOutput.cs b/src/Lucene.Net.Codecs/IntBlock/VariableIntBlockIndexOutput.cs index 17b612d..ce391e5 100644 --- a/src/Lucene.Net.Codecs/IntBlock/VariableIntBlockIndexOutput.cs +++ b/src/Lucene.Net.Codecs/IntBlock/VariableIntBlockIndexOutput.cs @@ -69,12 +69,12 @@ namespace Lucene.Net.Codecs.IntBlock /// </summary> protected abstract int Add(int value); - public override AbstractIndex GetIndex() + public override Int32IndexOutput.Index GetIndex() { return new Index(this); } - private class Index : AbstractIndex + new private class Index : Int32IndexOutput.Index { private readonly VariableInt32BlockIndexOutput outerInstance; @@ -94,7 +94,7 @@ namespace Lucene.Net.Codecs.IntBlock upto = outerInstance.upto; } - public override void CopyFrom(AbstractIndex other, bool copyLast) + public override void CopyFrom(Int32IndexOutput.Index other, bool copyLast) { Index idx = (Index)other; fp = idx.fp; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d2825f73/src/Lucene.Net.Codecs/Sep/IntIndexOutput.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/Sep/IntIndexOutput.cs b/src/Lucene.Net.Codecs/Sep/IntIndexOutput.cs index 54b9070..f182895 100644 --- a/src/Lucene.Net.Codecs/Sep/IntIndexOutput.cs +++ b/src/Lucene.Net.Codecs/Sep/IntIndexOutput.cs @@ -43,13 +43,13 @@ namespace Lucene.Net.Codecs.Sep public abstract void Write(int v); /// <summary>Records a single skip-point in the IndexOutput. </summary> - public abstract class AbstractIndex // LUCENENET TODO: API Change back to Index ? Or make interface so names don't collide? + public abstract class Index { /// <summary>Internally records the current location </summary> public abstract void Mark(); /// <summary>Copies index from other </summary> - public abstract void CopyFrom(AbstractIndex other, bool copyLast); + public abstract void CopyFrom(Index other, bool copyLast); /// <summary> /// Writes "location" of current output pointer of primary @@ -62,7 +62,7 @@ namespace Lucene.Net.Codecs.Sep /// If you are indexing the primary output file, call /// this and interact with the returned IndexWriter. /// </summary> - public abstract AbstractIndex GetIndex(); + public abstract Index GetIndex(); public abstract void Dispose(); // LUCENENET TODO: Implement disposable pattern } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d2825f73/src/Lucene.Net.Codecs/Sep/SepPostingsWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/Sep/SepPostingsWriter.cs b/src/Lucene.Net.Codecs/Sep/SepPostingsWriter.cs index 3080cf6..dbfe65e 100644 --- a/src/Lucene.Net.Codecs/Sep/SepPostingsWriter.cs +++ b/src/Lucene.Net.Codecs/Sep/SepPostingsWriter.cs @@ -43,13 +43,13 @@ namespace Lucene.Net.Codecs.Sep internal readonly static int VERSION_CURRENT = VERSION_START; private Int32IndexOutput freqOut; - private Int32IndexOutput.AbstractIndex freqIndex; + private Int32IndexOutput.Index freqIndex; private Int32IndexOutput posOut; - private Int32IndexOutput.AbstractIndex posIndex; + private Int32IndexOutput.Index posIndex; private Int32IndexOutput docOut; - private Int32IndexOutput.AbstractIndex docIndex; + private Int32IndexOutput.Index docIndex; private IndexOutput payloadOut; @@ -303,9 +303,9 @@ namespace Lucene.Net.Codecs.Sep private class SepTermState : BlockTermState { - public Int32IndexOutput.AbstractIndex DocIndex { get; set; } - public Int32IndexOutput.AbstractIndex FreqIndex { get; set; } - public Int32IndexOutput.AbstractIndex PosIndex { get; set; } + public Int32IndexOutput.Index DocIndex { get; set; } + public Int32IndexOutput.Index FreqIndex { get; set; } + public Int32IndexOutput.Index PosIndex { get; set; } public long PayloadFP { get; set; } public long SkipFP { get; set; } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d2825f73/src/Lucene.Net.Codecs/Sep/SepSkipListWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/Sep/SepSkipListWriter.cs b/src/Lucene.Net.Codecs/Sep/SepSkipListWriter.cs index e51eb10..21c6209 100644 --- a/src/Lucene.Net.Codecs/Sep/SepSkipListWriter.cs +++ b/src/Lucene.Net.Codecs/Sep/SepSkipListWriter.cs @@ -38,9 +38,9 @@ namespace Lucene.Net.Codecs.Sep private readonly int[] _lastSkipPayloadLength; private readonly long[] _lastSkipPayloadPointer; - private readonly Int32IndexOutput.AbstractIndex[] _docIndex; - private readonly Int32IndexOutput.AbstractIndex[] _freqIndex; - private readonly Int32IndexOutput.AbstractIndex[] _posIndex; + private readonly Int32IndexOutput.Index[] _docIndex; + private readonly Int32IndexOutput.Index[] _freqIndex; + private readonly Int32IndexOutput.Index[] _posIndex; private readonly Int32IndexOutput _freqOutput; private Int32IndexOutput _posOutput; @@ -67,9 +67,9 @@ namespace Lucene.Net.Codecs.Sep // TODO: -- also cutover normal IndexOutput to use getIndex()? _lastSkipPayloadPointer = new long[numberOfSkipLevels]; - _freqIndex = new Int32IndexOutput.AbstractIndex[numberOfSkipLevels]; - _docIndex = new Int32IndexOutput.AbstractIndex[numberOfSkipLevels]; - _posIndex = new Int32IndexOutput.AbstractIndex[numberOfSkipLevels]; + _freqIndex = new Int32IndexOutput.Index[numberOfSkipLevels]; + _docIndex = new Int32IndexOutput.Index[numberOfSkipLevels]; + _posIndex = new Int32IndexOutput.Index[numberOfSkipLevels]; for (var i = 0; i < numberOfSkipLevels; i++) { @@ -124,8 +124,8 @@ namespace Lucene.Net.Codecs.Sep /// <summary> /// Called @ start of new term /// </summary> - protected internal virtual void ResetSkip(Int32IndexOutput.AbstractIndex topDocIndex, Int32IndexOutput.AbstractIndex topFreqIndex, - Int32IndexOutput.AbstractIndex topPosIndex) + protected internal virtual void ResetSkip(Int32IndexOutput.Index topDocIndex, Int32IndexOutput.Index topFreqIndex, + Int32IndexOutput.Index topPosIndex) { base.ResetSkip(); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d2825f73/src/Lucene.Net.TestFramework/Codecs/MockSep/MockSingleIntIndexOutput.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Codecs/MockSep/MockSingleIntIndexOutput.cs b/src/Lucene.Net.TestFramework/Codecs/MockSep/MockSingleIntIndexOutput.cs index 4874218..8ee7c44 100644 --- a/src/Lucene.Net.TestFramework/Codecs/MockSep/MockSingleIntIndexOutput.cs +++ b/src/Lucene.Net.TestFramework/Codecs/MockSep/MockSingleIntIndexOutput.cs @@ -40,7 +40,7 @@ namespace Lucene.Net.Codecs.MockSep @out.WriteVInt32(v); } - public override AbstractIndex GetIndex() + public override Index GetIndex() { return new MockSingleIntIndexOutputIndex(this); } @@ -55,7 +55,7 @@ namespace Lucene.Net.Codecs.MockSep return "MockSingleIntIndexOutput fp=" + @out.GetFilePointer(); } - private class MockSingleIntIndexOutputIndex : AbstractIndex + private class MockSingleIntIndexOutputIndex : Index { internal long fp; internal long lastFP; @@ -71,7 +71,7 @@ namespace Lucene.Net.Codecs.MockSep fp = [email protected](); } - public override void CopyFrom(AbstractIndex other, bool copyLast) + public override void CopyFrom(Index other, bool copyLast) { fp = ((MockSingleIntIndexOutputIndex)other).fp; if (copyLast)
