Lucene.Net.Codecs.Sep.IntIndexOutput refactor: Renamed IntIndexOutputIndex > AbstractIndex, nested it within IntIndexOutput, and renamed subclasses OutputIndex > Index
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/d534f631 Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/d534f631 Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/d534f631 Branch: refs/heads/api-work Commit: d534f6311e31ffaffcc85069b692595fa4fa2330 Parents: 13ba9d3 Author: Shad Storhaug <[email protected]> Authored: Sun Jan 29 15:48:24 2017 +0700 Committer: Shad Storhaug <[email protected]> Committed: Sun Jan 29 17:10:22 2017 +0700 ---------------------------------------------------------------------- .../Intblock/FixedIntBlockIndexOutput.cs | 12 +++---- .../Intblock/VariableIntBlockIndexOutput.cs | 12 +++---- src/Lucene.Net.Codecs/Sep/IntIndexOutput.cs | 37 +++++++++----------- src/Lucene.Net.Codecs/Sep/SepPostingsWriter.cs | 30 ++++++++-------- src/Lucene.Net.Codecs/Sep/SepSkipListWriter.cs | 24 ++++++------- .../Codecs/MockSep/MockSingleIntIndexOutput.cs | 6 ++-- 6 files changed, 59 insertions(+), 62 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d534f631/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 1a3239c..1f106b3 100644 --- a/src/Lucene.Net.Codecs/Intblock/FixedIntBlockIndexOutput.cs +++ b/src/Lucene.Net.Codecs/Intblock/FixedIntBlockIndexOutput.cs @@ -54,16 +54,16 @@ namespace Lucene.Net.Codecs.IntBlock protected abstract void FlushBlock(); - public override IntIndexOutputIndex Index() + public override AbstractIndex GetIndex() { - return new OutputIndex(this); + return new Index(this); } - private class OutputIndex : IntIndexOutputIndex // LUCENENET TODO: Rename Index + private class Index : AbstractIndex { private readonly FixedIntBlockIndexOutput outerInstance; - public OutputIndex(FixedIntBlockIndexOutput outerInstance) + public Index(FixedIntBlockIndexOutput outerInstance) { this.outerInstance = outerInstance; } @@ -79,9 +79,9 @@ namespace Lucene.Net.Codecs.IntBlock upto = outerInstance.upto; } - public override void CopyFrom(IntIndexOutputIndex other, bool copyLast) + public override void CopyFrom(AbstractIndex other, bool copyLast) { - OutputIndex idx = (OutputIndex)other; + Index idx = (Index)other; fp = idx.fp; upto = idx.upto; if (copyLast) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d534f631/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 82688b1..415a974 100644 --- a/src/Lucene.Net.Codecs/Intblock/VariableIntBlockIndexOutput.cs +++ b/src/Lucene.Net.Codecs/Intblock/VariableIntBlockIndexOutput.cs @@ -67,16 +67,16 @@ namespace Lucene.Net.Codecs.IntBlock /// </summary> protected abstract int Add(int value); - public override IntIndexOutputIndex Index() + public override AbstractIndex GetIndex() { - return new OutputIndex(this); + return new Index(this); } - private class OutputIndex : IntIndexOutputIndex // LUCENENET TODO: Rename Index + private class Index : AbstractIndex { private readonly VariableIntBlockIndexOutput outerInstance; - public OutputIndex(VariableIntBlockIndexOutput outerInstance) + public Index(VariableIntBlockIndexOutput outerInstance) { this.outerInstance = outerInstance; } @@ -92,9 +92,9 @@ namespace Lucene.Net.Codecs.IntBlock upto = outerInstance.upto; } - public override void CopyFrom(IntIndexOutputIndex other, bool copyLast) + public override void CopyFrom(AbstractIndex other, bool copyLast) { - OutputIndex idx = (OutputIndex)other; + Index idx = (Index)other; fp = idx.fp; upto = idx.upto; if (copyLast) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d534f631/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 aca46c2..a374b80 100644 --- a/src/Lucene.Net.Codecs/Sep/IntIndexOutput.cs +++ b/src/Lucene.Net.Codecs/Sep/IntIndexOutput.cs @@ -40,31 +40,28 @@ namespace Lucene.Net.Codecs.Sep /// </summary> public abstract void Write(int v); + /// <summary>Records a single skip-point in the IndexOutput. </summary> + public abstract class AbstractIndex + { + /// <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); + + /// <summary> + /// Writes "location" of current output pointer of primary + /// output to different output (out) + /// </summary> + public abstract void Write(DataOutput indexOut, bool absolute); + } + /// <summary> /// If you are indexing the primary output file, call /// this and interact with the returned IndexWriter. /// </summary> - public abstract IntIndexOutputIndex Index(); // LUCENENET TODO: Rename GetIndex() + public abstract AbstractIndex GetIndex(); public abstract void Dispose(); // LUCENENET TODO: Implement disposable pattern } - - - /// <summary>Records a single skip-point in the IndexOutput. </summary> - public abstract class IntIndexOutputIndex // LUCENENET TODO: Rename AbstractIndex and nest within IntIndexOutput - { - - /// <summary>Internally records the current location </summary> - public abstract void Mark(); - - /// <summary>Copies index from other </summary> - public abstract void CopyFrom(IntIndexOutputIndex other, bool copyLast); - - /// <summary> - /// Writes "location" of current output pointer of primary - /// output to different output (out) - /// </summary> - public abstract void Write(DataOutput indexOut, bool absolute); - } - } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d534f631/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 280d048..fe0a000 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 const int VERSION_CURRENT = VERSION_START; internal IntIndexOutput freqOut; - internal IntIndexOutputIndex freqIndex; + internal IntIndexOutput.AbstractIndex freqIndex; internal IntIndexOutput posOut; - internal IntIndexOutputIndex posIndex; + internal IntIndexOutput.AbstractIndex posIndex; internal IntIndexOutput docOut; - internal IntIndexOutputIndex docIndex; + internal IntIndexOutput.AbstractIndex docIndex; internal IndexOutput payloadOut; @@ -116,20 +116,20 @@ namespace Lucene.Net.Codecs.Sep var docFileName = IndexFileNames.SegmentFileName(state.SegmentInfo.Name, state.SegmentSuffix, DOC_EXTENSION); docOut = factory.CreateOutput(state.Directory, docFileName, state.Context); - docIndex = docOut.Index(); + docIndex = docOut.GetIndex(); if (state.FieldInfos.HasFreq) { var frqFileName = IndexFileNames.SegmentFileName(state.SegmentInfo.Name, state.SegmentSuffix, FREQ_EXTENSION); freqOut = factory.CreateOutput(state.Directory, frqFileName, state.Context); - freqIndex = freqOut.Index(); + freqIndex = freqOut.GetIndex(); } if (state.FieldInfos.HasProx) { var posFileName = IndexFileNames.SegmentFileName(state.SegmentInfo.Name, state.SegmentSuffix, POS_EXTENSION); posOut = factory.CreateOutput(state.Directory, posFileName, state.Context); - posIndex = posOut.Index(); + posIndex = posOut.GetIndex(); // TODO: -- only if at least one field stores payloads? var payloadFileName = IndexFileNames.SegmentFileName(state.SegmentInfo.Name, state.SegmentSuffix,PAYLOAD_EXTENSION); @@ -211,13 +211,13 @@ namespace Lucene.Net.Codecs.Sep private SepTermState SetEmptyState() { - var emptyState = new SepTermState {DocIndex = docOut.Index()}; + var emptyState = new SepTermState {DocIndex = docOut.GetIndex()}; if (indexOptions != IndexOptions.DOCS_ONLY) { - emptyState.FreqIndex = freqOut.Index(); + emptyState.FreqIndex = freqOut.GetIndex(); if (indexOptions == IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) { - emptyState.PosIndex = posOut.Index(); + emptyState.PosIndex = posOut.GetIndex(); } } emptyState.PayloadFp = 0; @@ -302,9 +302,9 @@ namespace Lucene.Net.Codecs.Sep private class SepTermState : BlockTermState { - public IntIndexOutputIndex DocIndex { get; set; } - public IntIndexOutputIndex FreqIndex { get; set; } - public IntIndexOutputIndex PosIndex { get; set; } + public IntIndexOutput.AbstractIndex DocIndex { get; set; } + public IntIndexOutput.AbstractIndex FreqIndex { get; set; } + public IntIndexOutput.AbstractIndex PosIndex { get; set; } public long PayloadFp { get; set; } public long SkipFp { get; set; } } @@ -317,15 +317,15 @@ namespace Lucene.Net.Codecs.Sep Debug.Assert(state.DocFreq > 0); Debug.Assert(state.DocFreq == df); - state.DocIndex = docOut.Index(); + state.DocIndex = docOut.GetIndex(); state.DocIndex.CopyFrom(docIndex, false); if (indexOptions != IndexOptions.DOCS_ONLY) { - state.FreqIndex = freqOut.Index(); + state.FreqIndex = freqOut.GetIndex(); state.FreqIndex.CopyFrom(freqIndex, false); if (indexOptions == IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) { - state.PosIndex = posOut.Index(); + state.PosIndex = posOut.GetIndex(); state.PosIndex.CopyFrom(posIndex, false); } else http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d534f631/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 13f9529..30ac97b 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 IntIndexOutputIndex[] _docIndex; - private readonly IntIndexOutputIndex[] _freqIndex; - private readonly IntIndexOutputIndex[] _posIndex; + private readonly IntIndexOutput.AbstractIndex[] _docIndex; + private readonly IntIndexOutput.AbstractIndex[] _freqIndex; + private readonly IntIndexOutput.AbstractIndex[] _posIndex; private readonly IntIndexOutput _freqOutput; private IntIndexOutput _posOutput; @@ -65,20 +65,20 @@ namespace Lucene.Net.Codecs.Sep // TODO: -- also cutover normal IndexOutput to use getIndex()? _lastSkipPayloadPointer = new long[numberOfSkipLevels]; - _freqIndex = new IntIndexOutputIndex[numberOfSkipLevels]; - _docIndex = new IntIndexOutputIndex[numberOfSkipLevels]; - _posIndex = new IntIndexOutputIndex[numberOfSkipLevels]; + _freqIndex = new IntIndexOutput.AbstractIndex[numberOfSkipLevels]; + _docIndex = new IntIndexOutput.AbstractIndex[numberOfSkipLevels]; + _posIndex = new IntIndexOutput.AbstractIndex[numberOfSkipLevels]; for (var i = 0; i < numberOfSkipLevels; i++) { if (freqOutput != null) { - _freqIndex[i] = freqOutput.Index(); + _freqIndex[i] = freqOutput.GetIndex(); } - _docIndex[i] = docOutput.Index(); + _docIndex[i] = docOutput.GetIndex(); if (posOutput != null) { - _posIndex[i] = posOutput.Index(); + _posIndex[i] = posOutput.GetIndex(); } } } @@ -97,7 +97,7 @@ namespace Lucene.Net.Codecs.Sep _posOutput = value; for (var i = 0; i < m_numberOfSkipLevels; i++) { - _posIndex[i] = value.Index(); + _posIndex[i] = value.GetIndex(); } } } @@ -125,8 +125,8 @@ namespace Lucene.Net.Codecs.Sep /// <summary> /// Called @ start of new term /// </summary> - protected internal virtual void ResetSkip(IntIndexOutputIndex topDocIndex, IntIndexOutputIndex topFreqIndex, - IntIndexOutputIndex topPosIndex) + protected internal virtual void ResetSkip(IntIndexOutput.AbstractIndex topDocIndex, IntIndexOutput.AbstractIndex topFreqIndex, + IntIndexOutput.AbstractIndex topPosIndex) { base.ResetSkip(); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d534f631/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 5e6b7df..13b0996 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.WriteVInt(v); } - public override IntIndexOutputIndex Index() + public override AbstractIndex GetIndex() { return new MockSingleIntIndexOutputIndex(this); } @@ -55,7 +55,7 @@ namespace Lucene.Net.Codecs.MockSep return "MockSingleIntIndexOutput fp=" + @out.FilePointer; } - private class MockSingleIntIndexOutputIndex : IntIndexOutputIndex + private class MockSingleIntIndexOutputIndex : AbstractIndex { internal long fp; internal long lastFP; @@ -71,7 +71,7 @@ namespace Lucene.Net.Codecs.MockSep fp = [email protected]; } - public override void CopyFrom(IntIndexOutputIndex other, bool copyLast) + public override void CopyFrom(AbstractIndex other, bool copyLast) { fp = ((MockSingleIntIndexOutputIndex)other).fp; if (copyLast)
