Lucene.Net.Codecs.IntBlock (FixedIntBlockIndexInput + VariableIntBlockIndexInput) refactor: renamed InputReader > Reader, InputIndex > Index
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/0f32196f Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/0f32196f Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/0f32196f Branch: refs/heads/api-work Commit: 0f32196fe6ea875920eec7603848610e7e356f23 Parents: c4fad82 Author: Shad Storhaug <[email protected]> Authored: Sun Jan 29 15:06:05 2017 +0700 Committer: Shad Storhaug <[email protected]> Committed: Sun Jan 29 15:06:05 2017 +0700 ---------------------------------------------------------------------- .../Intblock/FixedIntBlockIndexInput.cs | 18 +++++++++--------- .../Intblock/VariableIntBlockIndexInput.cs | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0f32196f/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 7c27399..bf269a2 100644 --- a/src/Lucene.Net.Codecs/Intblock/FixedIntBlockIndexInput.cs +++ b/src/Lucene.Net.Codecs/Intblock/FixedIntBlockIndexInput.cs @@ -50,7 +50,7 @@ namespace Lucene.Net.Codecs.IntBlock var buffer = new int[blockSize]; var clone = (IndexInput)input.Clone(); // TODO: can this be simplified? - return new InputReader(clone, buffer, GetBlockReader(clone, buffer)); + return new Reader(clone, buffer, GetBlockReader(clone, buffer)); } public override void Dispose() @@ -60,7 +60,7 @@ namespace Lucene.Net.Codecs.IntBlock public override AbstractIndex GetIndex() { - return new InputIndex(this); + return new Index(this); } protected abstract IBlockReader GetBlockReader(IndexInput @in, int[] buffer); @@ -77,7 +77,7 @@ namespace Lucene.Net.Codecs.IntBlock void ReadBlock(); } - private class InputReader : AbstractReader // LUCENENET TODO: Rename Reader + private class Reader : AbstractReader { private readonly IndexInput input; private readonly IBlockReader blockReader; @@ -89,7 +89,7 @@ namespace Lucene.Net.Codecs.IntBlock private long pendingFP; private long lastBlockFP = -1; - public InputReader(IndexInput input, int[] pending, IBlockReader blockReader) + public Reader(IndexInput input, int[] pending, IBlockReader blockReader) { this.input = input; this.pending = pending; @@ -130,11 +130,11 @@ namespace Lucene.Net.Codecs.IntBlock } } - private class InputIndex : AbstractIndex // LUCENENET TODO: Rename Index + private class Index : AbstractIndex { private readonly FixedIntBlockIndexInput outerInstance; - public InputIndex(FixedIntBlockIndexInput outerInstance) + public Index(FixedIntBlockIndexInput outerInstance) { this.outerInstance = outerInstance; } @@ -169,19 +169,19 @@ namespace Lucene.Net.Codecs.IntBlock public override void Seek(AbstractReader other) { - ((InputReader)other).Seek(fp, upto); + ((Reader)other).Seek(fp, upto); } public override void CopyFrom(AbstractIndex other) { - InputIndex idx = (InputIndex)other; + Index idx = (Index)other; fp = idx.fp; upto = idx.upto; } public override AbstractIndex Clone() { - InputIndex other = new InputIndex(outerInstance); + Index other = new Index(outerInstance); other.fp = fp; other.upto = upto; return other; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0f32196f/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 93376a2..55e02ba 100644 --- a/src/Lucene.Net.Codecs/Intblock/VariableIntBlockIndexInput.cs +++ b/src/Lucene.Net.Codecs/Intblock/VariableIntBlockIndexInput.cs @@ -52,7 +52,7 @@ namespace Lucene.Net.Codecs.IntBlock var buffer = new int[maxBlockSize]; var clone = (IndexInput)input.Clone(); // TODO: can this be simplified? - return new InputReader(clone, buffer, GetBlockReader(clone, buffer)); + return new Reader(clone, buffer, GetBlockReader(clone, buffer)); } public override void Dispose() @@ -62,7 +62,7 @@ namespace Lucene.Net.Codecs.IntBlock public override AbstractIndex GetIndex() { - return new InputIndex(this); + return new Index(this); } protected abstract IBlockReader GetBlockReader(IndexInput @in, int[] buffer); @@ -79,7 +79,7 @@ namespace Lucene.Net.Codecs.IntBlock void Seek(long pos); } - private class InputReader : AbstractReader // LUCENENET TODO: Rename Reader + private class Reader : AbstractReader { private readonly IndexInput input; @@ -93,7 +93,7 @@ namespace Lucene.Net.Codecs.IntBlock private int blockSize; private readonly IBlockReader blockReader; - public InputReader(IndexInput input, int[] pending, IBlockReader blockReader) + public Reader(IndexInput input, int[] pending, IBlockReader blockReader) { this.input = input; this.pending = pending; @@ -155,11 +155,11 @@ namespace Lucene.Net.Codecs.IntBlock } } - private class InputIndex : AbstractIndex // LUCENENET TODO: Rename Index + private class Index : AbstractIndex { private readonly VariableIntBlockIndexInput outerInstance; - public InputIndex(VariableIntBlockIndexInput outerInstance) + public Index(VariableIntBlockIndexInput outerInstance) { this.outerInstance = outerInstance; } @@ -201,19 +201,19 @@ namespace Lucene.Net.Codecs.IntBlock public override void Seek(AbstractReader other) { - ((InputReader)other).Seek(fp, upto); + ((Reader)other).Seek(fp, upto); } public override void CopyFrom(AbstractIndex other) { - InputIndex idx = (InputIndex)other; + Index idx = (Index)other; fp = idx.fp; upto = idx.upto; } public override AbstractIndex Clone() { - InputIndex other = new InputIndex(outerInstance); + Index other = new Index(outerInstance); other.fp = fp; other.upto = upto; return other;
