Lucene.Net.Core.Store.IndexInput refactor: Changed FilePointer > GetFilePointer() (makes conversion, throws exceptions)
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/96a4290c Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/96a4290c Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/96a4290c Branch: refs/heads/api-work Commit: 96a4290c5c5165e421a832c7876809b5f44b3564 Parents: 9bc8d93 Author: Shad Storhaug <[email protected]> Authored: Sat Mar 18 03:44:17 2017 +0700 Committer: Shad Storhaug <[email protected]> Committed: Sat Mar 18 04:37:14 2017 +0700 ---------------------------------------------------------------------- .../BlockTerms/BlockTermsReader.cs | 2 +- .../IntBlock/FixedIntBlockIndexInput.cs | 2 +- .../IntBlock/VariableIntBlockIndexInput.cs | 4 +- .../Memory/MemoryDocValuesProducer.cs | 2 +- src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs | 2 +- .../SimpleText/SimpleTextDocValuesReader.cs | 12 ++-- .../SimpleText/SimpleTextFieldsReader.cs | 12 ++-- .../SimpleText/SimpleTextStoredFieldsReader.cs | 2 +- .../SimpleText/SimpleTextTermVectorsReader.cs | 2 +- .../SimpleText/SimpleTextUtil.cs | 2 +- .../Codecs/BlockTreeTermsReader.cs | 4 +- src/Lucene.Net.Core/Codecs/CodecUtil.cs | 10 ++-- .../CompressingStoredFieldsReader.cs | 8 +-- .../Compressing/CompressingTermVectorsReader.cs | 4 +- .../Compressing/CompressingTermVectorsWriter.cs | 4 +- .../Codecs/Lucene3x/Lucene3xFieldInfosReader.cs | 4 +- .../Lucene3x/Lucene3xStoredFieldsReader.cs | 2 +- .../Lucene3x/Lucene3xTermVectorsReader.cs | 2 +- .../Codecs/Lucene3x/SegmentTermPositions.cs | 2 +- .../Codecs/Lucene40/Lucene40PostingsReader.cs | 6 +- .../Lucene40/Lucene40StoredFieldsReader.cs | 6 +- .../Lucene40/Lucene40TermVectorsReader.cs | 8 +-- src/Lucene.Net.Core/Codecs/Lucene41/ForUtil.cs | 2 +- .../Codecs/Lucene41/Lucene41PostingsReader.cs | 14 ++--- .../Codecs/MultiLevelSkipListReader.cs | 17 +++--- src/Lucene.Net.Core/Index/PrefixCodedTerms.cs | 2 +- .../Store/BufferedChecksumIndexInput.cs | 7 +-- src/Lucene.Net.Core/Store/BufferedIndexInput.cs | 9 +-- .../Store/ByteBufferIndexInput.cs | 19 +++---- src/Lucene.Net.Core/Store/CheckSumIndexInput.cs | 2 +- src/Lucene.Net.Core/Store/Directory.cs | 2 +- src/Lucene.Net.Core/Store/IndexInput.cs | 2 +- src/Lucene.Net.Core/Store/NIOFSDirectory.cs | 2 +- src/Lucene.Net.Core/Store/RAMInputStream.cs | 7 +-- src/Lucene.Net.Core/Store/SimpleFSDirectory.cs | 2 +- .../Util/Packed/BlockPackedReader.cs | 2 +- .../Util/Packed/BlockPackedReaderIterator.cs | 2 +- .../Packed/DirectPacked64SingleBlockReader.cs | 2 +- .../Util/Packed/DirectPackedReader.cs | 2 +- .../Util/Packed/MonotonicBlockPackedReader.cs | 2 +- src/Lucene.Net.Core/Util/Packed/PackedInts.cs | 2 +- .../Lucene3x/PreFlexRWFieldInfosReader.cs | 4 +- .../Store/MockIndexInputWrapper.cs | 9 +-- src/Lucene.Net.Tests.Facet/SlowRAMDirectory.cs | 7 +-- .../Codecs/Lucene41/TestForUtil.cs | 2 +- src/Lucene.Net.Tests/Index/TestCompoundFile.cs | 60 ++++++++++---------- src/Lucene.Net.Tests/Index/TestFieldsReader.cs | 4 +- .../Index/TestLazyProxSkipping.cs | 7 +-- .../Index/TestMultiLevelSkipList.cs | 7 +-- .../Store/TestBufferedIndexInput.cs | 6 +- .../Util/Packed/TestPackedInts.cs | 28 ++++----- 51 files changed, 154 insertions(+), 181 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/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 e59c61a..6c73fea 100644 --- a/src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs +++ b/src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs @@ -908,7 +908,7 @@ namespace Lucene.Net.Codecs.BlockTerms // bsearch w/in the block... //System.out.println("BTR.nextBlock() fp=" + in.getFilePointer() + " this=" + this); - _state.BlockFilePointer = _input.FilePointer; + _state.BlockFilePointer = _input.GetFilePointer(); _blockTermCount = _input.ReadVInt32(); //System.out.println(" blockTermCount=" + blockTermCount); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/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 4cce99b..39db619 100644 --- a/src/Lucene.Net.Codecs/IntBlock/FixedIntBlockIndexInput.cs +++ b/src/Lucene.Net.Codecs/IntBlock/FixedIntBlockIndexInput.cs @@ -124,7 +124,7 @@ namespace Lucene.Net.Codecs.IntBlock else if (upto == blockSize) { // Load new block - lastBlockFP = input.FilePointer; + lastBlockFP = input.GetFilePointer(); blockReader.ReadBlock(); upto = 0; } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/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 1fda534..3074a3a 100644 --- a/src/Lucene.Net.Codecs/IntBlock/VariableIntBlockIndexInput.cs +++ b/src/Lucene.Net.Codecs/IntBlock/VariableIntBlockIndexInput.cs @@ -144,7 +144,7 @@ namespace Lucene.Net.Codecs.IntBlock while (upto >= blockSize) { upto -= blockSize; - lastBlockFP = input.FilePointer; + lastBlockFP = input.GetFilePointer(); blockSize = blockReader.ReadBlock(); } seekPending = false; @@ -156,7 +156,7 @@ namespace Lucene.Net.Codecs.IntBlock this.MaybeSeek(); if (upto == blockSize) { - lastBlockFP = input.FilePointer; + lastBlockFP = input.GetFilePointer(); blockSize = blockReader.ReadBlock(); upto = 0; } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Codecs/Memory/MemoryDocValuesProducer.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/Memory/MemoryDocValuesProducer.cs b/src/Lucene.Net.Codecs/Memory/MemoryDocValuesProducer.cs index 0744276..0537e00 100644 --- a/src/Lucene.Net.Codecs/Memory/MemoryDocValuesProducer.cs +++ b/src/Lucene.Net.Codecs/Memory/MemoryDocValuesProducer.cs @@ -367,7 +367,7 @@ namespace Lucene.Net.Codecs.Memory } else { - data.Seek(data.FilePointer + entry.missingBytes); + data.Seek(data.GetFilePointer() + entry.missingBytes); var addresses = new MonotonicBlockPackedReader(data, entry.packedIntsVersion, entry.blockSize, maxDoc, false); ramBytesUsed.AddAndGet(bytes.RamBytesUsed() + addresses.RamBytesUsed()); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/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 bee4943..bd0b71c 100644 --- a/src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs +++ b/src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs @@ -773,7 +773,7 @@ namespace Lucene.Net.Codecs.Sep if (_pendingPayloadBytes > _payloadLength) { - _payloadIn.Seek(_payloadIn.FilePointer + (_pendingPayloadBytes - _payloadLength)); + _payloadIn.Seek(_payloadIn.GetFilePointer() + (_pendingPayloadBytes - _payloadLength)); } if (_payload == null) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Codecs/SimpleText/SimpleTextDocValuesReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextDocValuesReader.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextDocValuesReader.cs index 5908d73..a928290 100644 --- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextDocValuesReader.cs +++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextDocValuesReader.cs @@ -95,8 +95,8 @@ namespace Lucene.Net.Codecs.SimpleText ReadLine(); Debug.Assert(StartsWith(SimpleTextDocValuesWriter.PATTERN)); field.Pattern = StripPrefix(SimpleTextDocValuesWriter.PATTERN); - field.DataStartFilePointer = data.FilePointer; - data.Seek(data.FilePointer + (1 + field.Pattern.Length + 2)*maxDoc); + field.DataStartFilePointer = data.GetFilePointer(); + data.Seek(data.GetFilePointer() + (1 + field.Pattern.Length + 2)*maxDoc); } else if (dvType == DocValuesType.BINARY) { @@ -106,8 +106,8 @@ namespace Lucene.Net.Codecs.SimpleText ReadLine(); Debug.Assert(StartsWith(SimpleTextDocValuesWriter.PATTERN)); field.Pattern = StripPrefix(SimpleTextDocValuesWriter.PATTERN); - field.DataStartFilePointer = data.FilePointer; - data.Seek(data.FilePointer + (9 + field.Pattern.Length + field.MaxLength + 2)*maxDoc); + field.DataStartFilePointer = data.GetFilePointer(); + data.Seek(data.GetFilePointer() + (9 + field.Pattern.Length + field.MaxLength + 2)*maxDoc); } else if (dvType == DocValuesType.SORTED || dvType == DocValuesType.SORTED_SET) { @@ -123,8 +123,8 @@ namespace Lucene.Net.Codecs.SimpleText ReadLine(); Debug.Assert(StartsWith(SimpleTextDocValuesWriter.ORDPATTERN)); field.OrdPattern = StripPrefix(SimpleTextDocValuesWriter.ORDPATTERN); - field.DataStartFilePointer = data.FilePointer; - data.Seek(data.FilePointer + (9 + field.Pattern.Length + field.MaxLength)*field.NumValues + + field.DataStartFilePointer = data.GetFilePointer(); + data.Seek(data.GetFilePointer() + (9 + field.Pattern.Length + field.MaxLength)*field.NumValues + (1 + field.OrdPattern.Length)*maxDoc); } else http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs index 5c62585..172b257 100644 --- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs +++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs @@ -102,7 +102,7 @@ namespace Lucene.Net.Codecs.SimpleText { var fieldName = Encoding.UTF8.GetString(scratch.Bytes, scratch.Offset + SimpleTextFieldsWriter.FIELD.Length, scratch.Length - SimpleTextFieldsWriter.FIELD.Length); - fields[fieldName] = input.FilePointer; + fields[fieldName] = input.GetFilePointer(); } } } @@ -292,7 +292,7 @@ namespace Lucene.Net.Codecs.SimpleText int termFreq = 0; while (true) { - long lineStart = _in.FilePointer; + long lineStart = _in.GetFilePointer(); SimpleTextUtil.ReadLine(_in, _scratch); if (StringHelper.StartsWith(_scratch, SimpleTextFieldsWriter.DOC)) { @@ -428,7 +428,7 @@ namespace Lucene.Net.Codecs.SimpleText long posStart = 0; while (true) { - long lineStart = _in.FilePointer; + long lineStart = _in.GetFilePointer(); SimpleTextUtil.ReadLine(_in, _scratch); //System.out.println("NEXT DOC: " + scratch.utf8ToString()); if (StringHelper.StartsWith(_scratch, SimpleTextFieldsWriter.DOC)) @@ -450,7 +450,7 @@ namespace Lucene.Net.Codecs.SimpleText UnicodeUtil.UTF8toUTF16(_scratch.Bytes, _scratch.Offset + SimpleTextFieldsWriter.FREQ.Length, _scratch.Length - SimpleTextFieldsWriter.FREQ.Length, _scratchUtf16); _tf = ArrayUtil.ParseInt32(_scratchUtf16.Chars, 0, _scratchUtf16.Length); - posStart = _in.FilePointer; + posStart = _in.GetFilePointer(); } else if (StringHelper.StartsWith(_scratch, SimpleTextFieldsWriter.POS)) { @@ -520,7 +520,7 @@ namespace Lucene.Net.Codecs.SimpleText _endOffset = ArrayUtil.ParseInt32(_scratchUtf162.Chars, 0, _scratchUtf162.Length); } - long fp = _in.FilePointer; + long fp = _in.GetFilePointer(); SimpleTextUtil.ReadLine(_in, _scratch); if (StringHelper.StartsWith(_scratch, SimpleTextFieldsWriter.PAYLOAD)) { @@ -652,7 +652,7 @@ namespace Lucene.Net.Codecs.SimpleText b.Add(Util.ToInt32sRef(lastTerm, scratchIntsRef), outputs.NewPair(lastDocsStart, outputsInner.NewPair(docFreq, totalTermFreq))); } - lastDocsStart = input.FilePointer; + lastDocsStart = input.GetFilePointer(); int len = _scratch.Length - SimpleTextFieldsWriter.TERM.Length; if (len > lastTerm.Length) { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsReader.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsReader.cs index 33ffe3f..032c9e4 100644 --- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsReader.cs +++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsReader.cs @@ -107,7 +107,7 @@ namespace Lucene.Net.Codecs.SimpleText SimpleTextUtil.ReadLine(input, _scratch); if (StringHelper.StartsWith(_scratch, SimpleTextStoredFieldsWriter.DOC)) { - _offsets[upto] = input.FilePointer; + _offsets[upto] = input.GetFilePointer(); upto++; } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs index 6f2780a..b7ba384 100644 --- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs +++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs @@ -104,7 +104,7 @@ namespace Lucene.Net.Codecs.SimpleText SimpleTextUtil.ReadLine(input, _scratch); if (StringHelper.StartsWith(_scratch, SimpleTextTermVectorsWriter.DOC)) { - _offsets[upto] = input.FilePointer; + _offsets[upto] = input.GetFilePointer(); upto++; } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Codecs/SimpleText/SimpleTextUtil.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextUtil.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextUtil.cs index 65aeedd..c02df52 100644 --- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextUtil.cs +++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextUtil.cs @@ -115,7 +115,7 @@ namespace Lucene.Net.Codecs.SimpleText throw new CorruptIndexException("SimpleText checksum failure: " + actualChecksum + " != " + expectedChecksum + " (resource=" + input + ")"); } - if (input.Length != input.FilePointer) + if (input.Length != input.GetFilePointer()) { throw new CorruptIndexException( "Unexpected stuff at the end of file, please be careful with your text editor! (resource=" + input + http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Core/Codecs/BlockTreeTermsReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Codecs/BlockTreeTermsReader.cs b/src/Lucene.Net.Core/Codecs/BlockTreeTermsReader.cs index 674c073..3825e97 100644 --- a/src/Lucene.Net.Core/Codecs/BlockTreeTermsReader.cs +++ b/src/Lucene.Net.Core/Codecs/BlockTreeTermsReader.cs @@ -926,7 +926,7 @@ namespace Lucene.Net.Codecs { // Sub-blocks of a single floor block are always // written one after another -- tail recurse: - fpEnd = [email protected]; + fpEnd = [email protected](); } } @@ -2892,7 +2892,7 @@ namespace Lucene.Net.Codecs // Sub-blocks of a single floor block are always // written one after another -- tail recurse: - fpEnd = [email protected]; + fpEnd = [email protected](); // if (DEBUG) { // System.out.println(" fpEnd=" + fpEnd); // } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Core/Codecs/CodecUtil.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Codecs/CodecUtil.cs b/src/Lucene.Net.Core/Codecs/CodecUtil.cs index 53f1052..f77867c 100644 --- a/src/Lucene.Net.Core/Codecs/CodecUtil.cs +++ b/src/Lucene.Net.Core/Codecs/CodecUtil.cs @@ -211,9 +211,9 @@ namespace Lucene.Net.Codecs { throw new System.IO.IOException("checksum failed (hardware problem?) : expected=" + expectedChecksum.ToString("x") + " actual=" + actualChecksum.ToString("x") + " (resource=" + @in + ")"); } - if (@in.FilePointer != @in.Length) + if (@in.GetFilePointer() != @in.Length) { - throw new System.IO.IOException("did not read all bytes from file: read " + @in.FilePointer + " vs size " + @in.Length + " (resource: " + @in + ")"); + throw new System.IO.IOException("did not read all bytes from file: read " + @in.GetFilePointer() + " vs size " + @in.Length + " (resource: " + @in + ")"); } return actualChecksum; } @@ -251,9 +251,9 @@ namespace Lucene.Net.Codecs [Obsolete("Use CheckFooter() instead")] public static void CheckEOF(IndexInput @in) { - if (@in.FilePointer != @in.Length) + if (@in.GetFilePointer() != @in.Length) { - throw new System.IO.IOException("did not read all bytes from file: read " + @in.FilePointer + " vs size " + @in.Length + " (resource: " + @in + ")"); + throw new System.IO.IOException("did not read all bytes from file: read " + @in.GetFilePointer() + " vs size " + @in.Length + " (resource: " + @in + ")"); } } @@ -268,7 +268,7 @@ namespace Lucene.Net.Codecs IndexInput clone = (IndexInput)input.Clone(); clone.Seek(0); ChecksumIndexInput @in = new BufferedChecksumIndexInput(clone); - Debug.Assert(@in.FilePointer == 0); + Debug.Assert(@in.GetFilePointer() == 0); @in.Seek(@in.Length - FooterLength()); return CheckFooter(@in); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Core/Codecs/Compressing/CompressingStoredFieldsReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Codecs/Compressing/CompressingStoredFieldsReader.cs b/src/Lucene.Net.Core/Codecs/Compressing/CompressingStoredFieldsReader.cs index a95da90..335aa08 100644 --- a/src/Lucene.Net.Core/Codecs/Compressing/CompressingStoredFieldsReader.cs +++ b/src/Lucene.Net.Core/Codecs/Compressing/CompressingStoredFieldsReader.cs @@ -99,7 +99,7 @@ namespace Lucene.Net.Codecs.Compressing indexStream = d.OpenChecksumInput(indexStreamFN, context); string codecNameIdx = formatName + CompressingStoredFieldsWriter.CODEC_SFX_IDX; version = CodecUtil.CheckHeader(indexStream, codecNameIdx, CompressingStoredFieldsWriter.VERSION_START, CompressingStoredFieldsWriter.VERSION_CURRENT); - Debug.Assert(CodecUtil.HeaderLength(codecNameIdx) == indexStream.FilePointer); + Debug.Assert(CodecUtil.HeaderLength(codecNameIdx) == indexStream.GetFilePointer()); indexReader = new CompressingStoredFieldsIndexReader(indexStream, si); long maxPointer = -1; @@ -138,7 +138,7 @@ namespace Lucene.Net.Codecs.Compressing { throw new CorruptIndexException("Version mismatch between stored fields index and data: " + version + " != " + fieldsVersion); } - Debug.Assert(CodecUtil.HeaderLength(codecNameDat) == fieldsStream.FilePointer); + Debug.Assert(CodecUtil.HeaderLength(codecNameDat) == fieldsStream.GetFilePointer()); if (version >= CompressingStoredFieldsWriter.VERSION_BIG_CHUNKS) { @@ -282,7 +282,7 @@ namespace Lucene.Net.Codecs.Compressing } else { - long filePointer = fieldsStream.FilePointer; + long filePointer = fieldsStream.GetFilePointer(); PackedInt32s.Reader reader = PackedInt32s.GetDirectReaderNoHeader(fieldsStream, PackedInt32s.Format.PACKED, packedIntsVersion, chunkDocs, bitsPerStoredFields); numStoredFields = (int)(reader.Get(docID - docBase)); fieldsStream.Seek(filePointer + PackedInt32s.Format.PACKED.ByteCount(packedIntsVersion, chunkDocs, bitsPerStoredFields)); @@ -606,7 +606,7 @@ namespace Lucene.Net.Codecs.Compressing { Debug.Assert(outerInstance.Version == CompressingStoredFieldsWriter.VERSION_CURRENT); long chunkEnd = docBase + chunkDocs == outerInstance.numDocs ? outerInstance.maxPointer : outerInstance.indexReader.GetStartPointer(docBase + chunkDocs); - @out.CopyBytes(fieldsStream, chunkEnd - fieldsStream.FilePointer); + @out.CopyBytes(fieldsStream, chunkEnd - fieldsStream.GetFilePointer()); } /// <summary> http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Core/Codecs/Compressing/CompressingTermVectorsReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Codecs/Compressing/CompressingTermVectorsReader.cs b/src/Lucene.Net.Core/Codecs/Compressing/CompressingTermVectorsReader.cs index 3e36290..2d8ea75 100644 --- a/src/Lucene.Net.Core/Codecs/Compressing/CompressingTermVectorsReader.cs +++ b/src/Lucene.Net.Core/Codecs/Compressing/CompressingTermVectorsReader.cs @@ -79,7 +79,7 @@ namespace Lucene.Net.Codecs.Compressing indexStream = d.OpenChecksumInput(indexStreamFN, context); string codecNameIdx = formatName + CompressingTermVectorsWriter.CODEC_SFX_IDX; version = CodecUtil.CheckHeader(indexStream, codecNameIdx, CompressingTermVectorsWriter.VERSION_START, CompressingTermVectorsWriter.VERSION_CURRENT); - Debug.Assert(CodecUtil.HeaderLength(codecNameIdx) == indexStream.FilePointer); + Debug.Assert(CodecUtil.HeaderLength(codecNameIdx) == indexStream.GetFilePointer()); indexReader = new CompressingStoredFieldsIndexReader(indexStream, si); if (version >= CompressingTermVectorsWriter.VERSION_CHECKSUM) @@ -105,7 +105,7 @@ namespace Lucene.Net.Codecs.Compressing { throw new Exception("Version mismatch between stored fields index and data: " + version + " != " + version2); } - Debug.Assert(CodecUtil.HeaderLength(codecNameDat) == vectorsStream.FilePointer); + Debug.Assert(CodecUtil.HeaderLength(codecNameDat) == vectorsStream.GetFilePointer()); packedIntsVersion = vectorsStream.ReadVInt32(); chunkSize = vectorsStream.ReadVInt32(); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Core/Codecs/Compressing/CompressingTermVectorsWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Codecs/Compressing/CompressingTermVectorsWriter.cs b/src/Lucene.Net.Core/Codecs/Compressing/CompressingTermVectorsWriter.cs index 956b9f7..31b0271 100644 --- a/src/Lucene.Net.Core/Codecs/Compressing/CompressingTermVectorsWriter.cs +++ b/src/Lucene.Net.Core/Codecs/Compressing/CompressingTermVectorsWriter.cs @@ -907,7 +907,7 @@ namespace Lucene.Net.Codecs.Compressing // We make sure to move the checksum input in any case, otherwise the final // integrity check might need to read the whole file a second time long startPointer = index.GetStartPointer(i); - if (startPointer > vectorsStream.FilePointer) + if (startPointer > vectorsStream.GetFilePointer()) { vectorsStream.Seek(startPointer); } @@ -919,7 +919,7 @@ namespace Lucene.Net.Codecs.Compressing if (docBase + chunkDocs < matchingSegmentReader.MaxDoc && NextDeletedDoc(docBase, liveDocs, docBase + chunkDocs) == docBase + chunkDocs) { long chunkEnd = index.GetStartPointer(docBase + chunkDocs); - long chunkLength = chunkEnd - vectorsStream.FilePointer; + long chunkLength = chunkEnd - vectorsStream.GetFilePointer(); indexWriter.WriteIndex(chunkDocs, this.vectorsStream.FilePointer); this.vectorsStream.WriteVInt32(docCount); this.vectorsStream.WriteVInt32(chunkDocs); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xFieldInfosReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xFieldInfosReader.cs b/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xFieldInfosReader.cs index c6cbf4c..8377418 100644 --- a/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xFieldInfosReader.cs +++ b/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xFieldInfosReader.cs @@ -127,9 +127,9 @@ namespace Lucene.Net.Codecs.Lucene3x Collections.EmptyMap<string, string>()); } - if (input.FilePointer != input.Length) + if (input.GetFilePointer() != input.Length) { - throw new CorruptIndexException("did not read all bytes from file \"" + fileName + "\": read " + input.FilePointer + " vs size " + input.Length + " (resource: " + input + ")"); + throw new CorruptIndexException("did not read all bytes from file \"" + fileName + "\": read " + input.GetFilePointer() + " vs size " + input.Length + " (resource: " + input + ")"); } FieldInfos fieldInfos = new FieldInfos(infos); success = true; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xStoredFieldsReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xStoredFieldsReader.cs b/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xStoredFieldsReader.cs index 9030957..d30d7a2 100644 --- a/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xStoredFieldsReader.cs +++ b/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xStoredFieldsReader.cs @@ -356,7 +356,7 @@ namespace Lucene.Net.Codecs.Lucene3x else { int length = fieldsStream.ReadVInt32(); - fieldsStream.Seek(fieldsStream.FilePointer + length); + fieldsStream.Seek(fieldsStream.GetFilePointer() + length); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xTermVectorsReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xTermVectorsReader.cs b/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xTermVectorsReader.cs index 4e37611..dbce339 100644 --- a/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xTermVectorsReader.cs +++ b/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xTermVectorsReader.cs @@ -369,7 +369,7 @@ namespace Lucene.Net.Codecs.Lucene3x byte bits = outerInstance.tvf.ReadByte(); storePositions = (bits & STORE_POSITIONS_WITH_TERMVECTOR) != 0; storeOffsets = (bits & STORE_OFFSET_WITH_TERMVECTOR) != 0; - tvfFPStart = outerInstance.tvf.FilePointer; + tvfFPStart = outerInstance.tvf.GetFilePointer(); unicodeSortOrder = outerInstance.SortTermsByUnicode(); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Core/Codecs/Lucene3x/SegmentTermPositions.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Codecs/Lucene3x/SegmentTermPositions.cs b/src/Lucene.Net.Core/Codecs/Lucene3x/SegmentTermPositions.cs index 97fc5b2..8a8c762 100644 --- a/src/Lucene.Net.Core/Codecs/Lucene3x/SegmentTermPositions.cs +++ b/src/Lucene.Net.Core/Codecs/Lucene3x/SegmentTermPositions.cs @@ -180,7 +180,7 @@ namespace Lucene.Net.Codecs.Lucene3x { if (needToLoadPayload && payloadLength > 0) { - proxStream.Seek(proxStream.FilePointer + payloadLength); + proxStream.Seek(proxStream.GetFilePointer() + payloadLength); } needToLoadPayload = false; } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40PostingsReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40PostingsReader.cs b/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40PostingsReader.cs index d53ebd4..29516db 100644 --- a/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40PostingsReader.cs +++ b/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40PostingsReader.cs @@ -1169,7 +1169,7 @@ namespace Lucene.Net.Codecs.Lucene40 if (payloadPending && payloadLength > 0) { // payload of last position was never retrieved -- skip it - proxIn.Seek(proxIn.FilePointer + payloadLength); + proxIn.Seek(proxIn.GetFilePointer() + payloadLength); payloadPending = false; } @@ -1200,7 +1200,7 @@ namespace Lucene.Net.Codecs.Lucene40 if (storePayloads) { - proxIn.Seek(proxIn.FilePointer + payloadLength); + proxIn.Seek(proxIn.GetFilePointer() + payloadLength); } posPendingCount--; @@ -1214,7 +1214,7 @@ namespace Lucene.Net.Codecs.Lucene40 if (payloadPending && payloadLength > 0) { // payload wasn't retrieved for last position - proxIn.Seek(proxIn.FilePointer + payloadLength); + proxIn.Seek(proxIn.GetFilePointer() + payloadLength); } int code_ = proxIn.ReadVInt32(); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40StoredFieldsReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40StoredFieldsReader.cs b/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40StoredFieldsReader.cs index ab5608d..f3064fe 100644 --- a/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40StoredFieldsReader.cs +++ b/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40StoredFieldsReader.cs @@ -88,8 +88,8 @@ namespace Lucene.Net.Codecs.Lucene40 CodecUtil.CheckHeader(indexStream, Lucene40StoredFieldsWriter.CODEC_NAME_IDX, Lucene40StoredFieldsWriter.VERSION_START, Lucene40StoredFieldsWriter.VERSION_CURRENT); CodecUtil.CheckHeader(fieldsStream, Lucene40StoredFieldsWriter.CODEC_NAME_DAT, Lucene40StoredFieldsWriter.VERSION_START, Lucene40StoredFieldsWriter.VERSION_CURRENT); - Debug.Assert(Lucene40StoredFieldsWriter.HEADER_LENGTH_DAT == fieldsStream.FilePointer); - Debug.Assert(Lucene40StoredFieldsWriter.HEADER_LENGTH_IDX == indexStream.FilePointer); + Debug.Assert(Lucene40StoredFieldsWriter.HEADER_LENGTH_DAT == fieldsStream.GetFilePointer()); + Debug.Assert(Lucene40StoredFieldsWriter.HEADER_LENGTH_IDX == indexStream.GetFilePointer()); long indexSize = indexStream.Length - Lucene40StoredFieldsWriter.HEADER_LENGTH_IDX; this.size = (int)(indexSize >> 3); // Verify two sources of "maxDoc" agree: @@ -259,7 +259,7 @@ namespace Lucene.Net.Codecs.Lucene40 else { int length = fieldsStream.ReadVInt32(); - fieldsStream.Seek(fieldsStream.FilePointer + length); + fieldsStream.Seek(fieldsStream.GetFilePointer() + length); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40TermVectorsReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40TermVectorsReader.cs b/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40TermVectorsReader.cs index 43ca05d..a0de655 100644 --- a/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40TermVectorsReader.cs +++ b/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40TermVectorsReader.cs @@ -119,9 +119,9 @@ namespace Lucene.Net.Codecs.Lucene40 fn = IndexFileNames.SegmentFileName(segment, "", VECTORS_FIELDS_EXTENSION); tvf = d.OpenInput(fn, context); int tvfVersion = CodecUtil.CheckHeader(tvf, CODEC_NAME_FIELDS, VERSION_START, VERSION_CURRENT); - Debug.Assert(HEADER_LENGTH_INDEX == tvx.FilePointer); - Debug.Assert(HEADER_LENGTH_DOCS == tvd.FilePointer); - Debug.Assert(HEADER_LENGTH_FIELDS == tvf.FilePointer); + Debug.Assert(HEADER_LENGTH_INDEX == tvx.GetFilePointer()); + Debug.Assert(HEADER_LENGTH_DOCS == tvd.GetFilePointer()); + Debug.Assert(HEADER_LENGTH_FIELDS == tvf.GetFilePointer()); Debug.Assert(tvxVersion == tvdVersion); Debug.Assert(tvxVersion == tvfVersion); @@ -359,7 +359,7 @@ namespace Lucene.Net.Codecs.Lucene40 storePositions = (bits & STORE_POSITIONS_WITH_TERMVECTOR) != 0; storeOffsets = (bits & STORE_OFFSET_WITH_TERMVECTOR) != 0; storePayloads = (bits & STORE_PAYLOAD_WITH_TERMVECTOR) != 0; - tvfFPStart = outerInstance.tvf.FilePointer; + tvfFPStart = outerInstance.tvf.GetFilePointer(); } public override TermsEnum GetIterator(TermsEnum reuse) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Core/Codecs/Lucene41/ForUtil.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Codecs/Lucene41/ForUtil.cs b/src/Lucene.Net.Core/Codecs/Lucene41/ForUtil.cs index 7a6d3eb..3488cb3 100644 --- a/src/Lucene.Net.Core/Codecs/Lucene41/ForUtil.cs +++ b/src/Lucene.Net.Core/Codecs/Lucene41/ForUtil.cs @@ -231,7 +231,7 @@ namespace Lucene.Net.Codecs.Lucene41 } Debug.Assert(numBits > 0 && numBits <= 32, numBits.ToString()); int encodedSize = encodedSizes[numBits]; - @in.Seek(@in.FilePointer + encodedSize); + @in.Seek(@in.GetFilePointer() + encodedSize); } private static bool IsAllEqual(int[] data) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Core/Codecs/Lucene41/Lucene41PostingsReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Codecs/Lucene41/Lucene41PostingsReader.cs b/src/Lucene.Net.Core/Codecs/Lucene41/Lucene41PostingsReader.cs index e7b5f84..406cf96 100644 --- a/src/Lucene.Net.Core/Codecs/Lucene41/Lucene41PostingsReader.cs +++ b/src/Lucene.Net.Core/Codecs/Lucene41/Lucene41PostingsReader.cs @@ -775,7 +775,7 @@ namespace Lucene.Net.Codecs.Lucene41 // if (DEBUG) { // System.out.println(" refillPositions"); // } - if (posIn.FilePointer == lastPosBlockFP) + if (posIn.GetFilePointer() == lastPosBlockFP) { // if (DEBUG) { // System.out.println(" vInt pos block @ fp=" + posIn.getFilePointer() + " hasPayloads=" + indexHasPayloads + " hasOffsets=" + indexHasOffsets); @@ -794,7 +794,7 @@ namespace Lucene.Net.Codecs.Lucene41 posDeltaBuffer[i] = (int)((uint)code >> 1); if (payloadLength != 0) { - posIn.Seek(posIn.FilePointer + payloadLength); + posIn.Seek(posIn.GetFilePointer() + payloadLength); } } else @@ -993,7 +993,7 @@ namespace Lucene.Net.Codecs.Lucene41 // if (DEBUG) { // System.out.println(" skip whole block @ fp=" + posIn.getFilePointer()); // } - Debug.Assert(posIn.FilePointer != lastPosBlockFP); + Debug.Assert(posIn.GetFilePointer() != lastPosBlockFP); outerInstance.forUtil.SkipBlock(posIn); toSkip -= Lucene41PostingsFormat.BLOCK_SIZE; } @@ -1291,7 +1291,7 @@ namespace Lucene.Net.Codecs.Lucene41 // if (DEBUG) { // System.out.println(" refillPositions"); // } - if (posIn.FilePointer == lastPosBlockFP) + if (posIn.GetFilePointer() == lastPosBlockFP) { // if (DEBUG) { // System.out.println(" vInt pos block @ fp=" + posIn.getFilePointer() + " hasPayloads=" + indexHasPayloads + " hasOffsets=" + indexHasOffsets); @@ -1379,7 +1379,7 @@ namespace Lucene.Net.Codecs.Lucene41 // this works, because when writing a vint block we always force the first length to be written outerInstance.forUtil.SkipBlock(payIn); // skip over lengths int numBytes = payIn.ReadVInt32(); // read length of payloadBytes - payIn.Seek(payIn.FilePointer + numBytes); // skip over payloadBytes + payIn.Seek(payIn.GetFilePointer() + numBytes); // skip over payloadBytes } payloadByteUpto = 0; } @@ -1590,7 +1590,7 @@ namespace Lucene.Net.Codecs.Lucene41 // if (DEBUG) { // System.out.println(" skip whole block @ fp=" + posIn.getFilePointer()); // } - Debug.Assert(posIn.FilePointer != lastPosBlockFP); + Debug.Assert(posIn.GetFilePointer() != lastPosBlockFP); outerInstance.forUtil.SkipBlock(posIn); if (indexHasPayloads) @@ -1600,7 +1600,7 @@ namespace Lucene.Net.Codecs.Lucene41 // Skip payloadBytes block: int numBytes = payIn.ReadVInt32(); - payIn.Seek(payIn.FilePointer + numBytes); + payIn.Seek(payIn.GetFilePointer() + numBytes); } if (indexHasOffsets) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Core/Codecs/MultiLevelSkipListReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Codecs/MultiLevelSkipListReader.cs b/src/Lucene.Net.Core/Codecs/MultiLevelSkipListReader.cs index 5d0f568..657b72d 100644 --- a/src/Lucene.Net.Core/Codecs/MultiLevelSkipListReader.cs +++ b/src/Lucene.Net.Core/Codecs/MultiLevelSkipListReader.cs @@ -170,7 +170,7 @@ namespace Lucene.Net.Codecs else { // no more skips on this level, go down one level - if (level > 0 && lastChildPointer > skipStream[level - 1].FilePointer) + if (level > 0 && lastChildPointer > skipStream[level - 1].GetFilePointer()) { SeekChild(level - 1); } @@ -282,7 +282,7 @@ namespace Lucene.Net.Codecs long length = skipStream[0].ReadVInt64(); // the start pointer of the current level - skipPointer[i] = skipStream[0].FilePointer; + skipPointer[i] = skipStream[0].GetFilePointer(); if (toBuffer > 0) { // buffer this level @@ -299,12 +299,12 @@ namespace Lucene.Net.Codecs } // move base stream beyond the current level - skipStream[0].Seek(skipStream[0].FilePointer + length); + skipStream[0].Seek(skipStream[0].GetFilePointer() + length); } } // use base stream for the lowest level - skipPointer[0] = skipStream[0].FilePointer; + skipPointer[0] = skipStream[0].GetFilePointer(); } /// <summary> @@ -334,7 +334,7 @@ namespace Lucene.Net.Codecs : base("SkipBuffer on " + input) { data = new byte[length]; - pointer = input.FilePointer; + pointer = input.GetFilePointer(); input.ReadBytes(data, 0, length); } @@ -343,12 +343,9 @@ namespace Lucene.Net.Codecs data = null; } - public override long FilePointer + public override long GetFilePointer() { - get - { - return pointer + pos; - } + return pointer + pos; } public override long Length http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Core/Index/PrefixCodedTerms.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Index/PrefixCodedTerms.cs b/src/Lucene.Net.Core/Index/PrefixCodedTerms.cs index 79785ef..3cd1b6e 100644 --- a/src/Lucene.Net.Core/Index/PrefixCodedTerms.cs +++ b/src/Lucene.Net.Core/Index/PrefixCodedTerms.cs @@ -100,7 +100,7 @@ namespace Lucene.Net.Index public virtual bool MoveNext() { - if (input.FilePointer < input.Length) + if (input.GetFilePointer() < input.Length) { try { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Core/Store/BufferedChecksumIndexInput.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Store/BufferedChecksumIndexInput.cs b/src/Lucene.Net.Core/Store/BufferedChecksumIndexInput.cs index a9dd076..22b90c1 100644 --- a/src/Lucene.Net.Core/Store/BufferedChecksumIndexInput.cs +++ b/src/Lucene.Net.Core/Store/BufferedChecksumIndexInput.cs @@ -71,12 +71,9 @@ namespace Lucene.Net.Store main.Dispose(); } - public override long FilePointer + public override long GetFilePointer() { - get - { - return main.FilePointer; - } + return main.GetFilePointer(); } public override long Length http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Core/Store/BufferedIndexInput.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Store/BufferedIndexInput.cs b/src/Lucene.Net.Core/Store/BufferedIndexInput.cs index 4a22bae..fc72a7a 100644 --- a/src/Lucene.Net.Core/Store/BufferedIndexInput.cs +++ b/src/Lucene.Net.Core/Store/BufferedIndexInput.cs @@ -387,12 +387,9 @@ namespace Lucene.Net.Store /// <param name="length"> the number of bytes to read </param> protected abstract void ReadInternal(byte[] b, int offset, int length); - public override sealed long FilePointer + public override sealed long GetFilePointer() { - get - { - return bufferStart + bufferPosition; - } + return bufferStart + bufferPosition; } public override sealed void Seek(long pos) @@ -423,7 +420,7 @@ namespace Lucene.Net.Store clone.m_buffer = null; clone.bufferLength = 0; clone.bufferPosition = 0; - clone.bufferStart = FilePointer; + clone.bufferStart = GetFilePointer(); return clone; } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Core/Store/ByteBufferIndexInput.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Store/ByteBufferIndexInput.cs b/src/Lucene.Net.Core/Store/ByteBufferIndexInput.cs index 2b1354d..209e07f 100644 --- a/src/Lucene.Net.Core/Store/ByteBufferIndexInput.cs +++ b/src/Lucene.Net.Core/Store/ByteBufferIndexInput.cs @@ -205,18 +205,15 @@ namespace Lucene.Net.Store } } - public override sealed long FilePointer + public override sealed long GetFilePointer() { - get + try { - try - { - return (((long)curBufIndex) << chunkSizePower) + curBuf.Position - offset; - } - catch (System.NullReferenceException) - { - throw new ObjectDisposedException(this.GetType().GetTypeInfo().FullName, "Already closed: " + this); - } + return (((long)curBufIndex) << chunkSizePower) + curBuf.Position - offset; + } + catch (System.NullReferenceException) + { + throw new ObjectDisposedException(this.GetType().GetTypeInfo().FullName, "Already closed: " + this); } } @@ -263,7 +260,7 @@ namespace Lucene.Net.Store ByteBufferIndexInput clone = BuildSlice(0L, this.length); try { - clone.Seek(FilePointer); + clone.Seek(GetFilePointer()); } catch (System.IO.IOException ioe) { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Core/Store/CheckSumIndexInput.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Store/CheckSumIndexInput.cs b/src/Lucene.Net.Core/Store/CheckSumIndexInput.cs index 2787a42..12dbe4f 100644 --- a/src/Lucene.Net.Core/Store/CheckSumIndexInput.cs +++ b/src/Lucene.Net.Core/Store/CheckSumIndexInput.cs @@ -48,7 +48,7 @@ namespace Lucene.Net.Store /// </summary> public override void Seek(long pos) { - long skip = pos - FilePointer; + long skip = pos - GetFilePointer(); if (skip < 0) { throw new InvalidOperationException(this.GetType() + " cannot seek backwards"); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Core/Store/Directory.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Store/Directory.cs b/src/Lucene.Net.Core/Store/Directory.cs index dec136a..dea448f 100644 --- a/src/Lucene.Net.Core/Store/Directory.cs +++ b/src/Lucene.Net.Core/Store/Directory.cs @@ -357,7 +357,7 @@ namespace Lucene.Net.Store /// <param name="len"> the number of bytes to read </param> protected override void ReadInternal(byte[] b, int offset, int len) { - long start = FilePointer; + long start = GetFilePointer(); if (start + len > length) { throw new Exception("read past EOF: " + this); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Core/Store/IndexInput.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Store/IndexInput.cs b/src/Lucene.Net.Core/Store/IndexInput.cs index 2c10e40..e040212 100644 --- a/src/Lucene.Net.Core/Store/IndexInput.cs +++ b/src/Lucene.Net.Core/Store/IndexInput.cs @@ -60,7 +60,7 @@ namespace Lucene.Net.Store /// Returns the current position in this file, where the next read will /// occur. </summary> /// <seealso cref= #seek(long) </seealso> - public abstract long FilePointer { get; } // LUCENENET TODO: Change to GetFilePointer() (makes conversion, throws exception) + public abstract long GetFilePointer(); /// <summary> /// Sets current position in this file, where the next read will occur. </summary> http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Core/Store/NIOFSDirectory.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Store/NIOFSDirectory.cs b/src/Lucene.Net.Core/Store/NIOFSDirectory.cs index 2709760..a71af75 100644 --- a/src/Lucene.Net.Core/Store/NIOFSDirectory.cs +++ b/src/Lucene.Net.Core/Store/NIOFSDirectory.cs @@ -221,7 +221,7 @@ namespace Lucene.Net.Store int readOffset = bb.Position; int readLength = bb.Limit - readOffset; - long pos = FilePointer + m_off; + long pos = GetFilePointer() + m_off; if (pos + len > m_end) { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Core/Store/RAMInputStream.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Store/RAMInputStream.cs b/src/Lucene.Net.Core/Store/RAMInputStream.cs index 18c2898..44a85b2 100644 --- a/src/Lucene.Net.Core/Store/RAMInputStream.cs +++ b/src/Lucene.Net.Core/Store/RAMInputStream.cs @@ -119,12 +119,9 @@ namespace Lucene.Net.Store } } - public override long FilePointer + public override long GetFilePointer() { - get - { - return currentBufferIndex < 0 ? 0 : bufferStart + bufferPosition; - } + return currentBufferIndex < 0 ? 0 : bufferStart + bufferPosition; } public override void Seek(long pos) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Core/Store/SimpleFSDirectory.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Store/SimpleFSDirectory.cs b/src/Lucene.Net.Core/Store/SimpleFSDirectory.cs index a5cf898..2a93d8c 100644 --- a/src/Lucene.Net.Core/Store/SimpleFSDirectory.cs +++ b/src/Lucene.Net.Core/Store/SimpleFSDirectory.cs @@ -184,7 +184,7 @@ namespace Lucene.Net.Store { lock (m_file) { - long position = m_off + FilePointer; + long position = m_off + GetFilePointer(); m_file.Seek(position, SeekOrigin.Begin); int total = 0; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Core/Util/Packed/BlockPackedReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Util/Packed/BlockPackedReader.cs b/src/Lucene.Net.Core/Util/Packed/BlockPackedReader.cs index de46fc3..3e09a94 100644 --- a/src/Lucene.Net.Core/Util/Packed/BlockPackedReader.cs +++ b/src/Lucene.Net.Core/Util/Packed/BlockPackedReader.cs @@ -67,7 +67,7 @@ namespace Lucene.Net.Util.Packed int size = (int)Math.Min(blockSize, valueCount - (long)i * blockSize); if (direct) { - long pointer = @in.FilePointer; + long pointer = @in.GetFilePointer(); subReaders[i] = PackedInt32s.GetDirectReaderNoHeader(@in, PackedInt32s.Format.PACKED, packedIntsVersion, size, bitsPerValue); @in.Seek(pointer + PackedInt32s.Format.PACKED.ByteCount(packedIntsVersion, size, bitsPerValue)); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Core/Util/Packed/BlockPackedReaderIterator.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Util/Packed/BlockPackedReaderIterator.cs b/src/Lucene.Net.Core/Util/Packed/BlockPackedReaderIterator.cs index 08a13f7..83c792b 100644 --- a/src/Lucene.Net.Core/Util/Packed/BlockPackedReaderIterator.cs +++ b/src/Lucene.Net.Core/Util/Packed/BlockPackedReaderIterator.cs @@ -188,7 +188,7 @@ namespace Lucene.Net.Util.Packed if (@in is IndexInput) { IndexInput iin = (IndexInput)@in; - iin.Seek(iin.FilePointer + count); + iin.Seek(iin.GetFilePointer() + count); } else { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Core/Util/Packed/DirectPacked64SingleBlockReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Util/Packed/DirectPacked64SingleBlockReader.cs b/src/Lucene.Net.Core/Util/Packed/DirectPacked64SingleBlockReader.cs index 0526989..fefcf4e 100644 --- a/src/Lucene.Net.Core/Util/Packed/DirectPacked64SingleBlockReader.cs +++ b/src/Lucene.Net.Core/Util/Packed/DirectPacked64SingleBlockReader.cs @@ -32,7 +32,7 @@ namespace Lucene.Net.Util.Packed : base(valueCount, bitsPerValue) { this.@in = @in; - startPointer = @in.FilePointer; + startPointer = @in.GetFilePointer(); valuesPerBlock = 64 / bitsPerValue; mask = ~(~0L << bitsPerValue); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Core/Util/Packed/DirectPackedReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Util/Packed/DirectPackedReader.cs b/src/Lucene.Net.Core/Util/Packed/DirectPackedReader.cs index 9014bcc..e66ccdc 100644 --- a/src/Lucene.Net.Core/Util/Packed/DirectPackedReader.cs +++ b/src/Lucene.Net.Core/Util/Packed/DirectPackedReader.cs @@ -34,7 +34,7 @@ namespace Lucene.Net.Util.Packed { this.@in = @in; - startPointer = @in.FilePointer; + startPointer = @in.GetFilePointer(); if (bitsPerValue == 64) { valueMask = -1L; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Core/Util/Packed/MonotonicBlockPackedReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Util/Packed/MonotonicBlockPackedReader.cs b/src/Lucene.Net.Core/Util/Packed/MonotonicBlockPackedReader.cs index 49269c1..d688001 100644 --- a/src/Lucene.Net.Core/Util/Packed/MonotonicBlockPackedReader.cs +++ b/src/Lucene.Net.Core/Util/Packed/MonotonicBlockPackedReader.cs @@ -64,7 +64,7 @@ namespace Lucene.Net.Util.Packed int size = (int)Math.Min(blockSize, valueCount - (long)i * blockSize); if (direct) { - long pointer = @in.FilePointer; + long pointer = @in.GetFilePointer(); subReaders[i] = PackedInt32s.GetDirectReaderNoHeader(@in, PackedInt32s.Format.PACKED, packedIntsVersion, size, bitsPerValue); @in.Seek(pointer + PackedInt32s.Format.PACKED.ByteCount(packedIntsVersion, size, bitsPerValue)); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Core/Util/Packed/PackedInts.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Util/Packed/PackedInts.cs b/src/Lucene.Net.Core/Util/Packed/PackedInts.cs index a8db5fc..49f6101 100644 --- a/src/Lucene.Net.Core/Util/Packed/PackedInts.cs +++ b/src/Lucene.Net.Core/Util/Packed/PackedInts.cs @@ -1181,7 +1181,7 @@ namespace Lucene.Net.Util.Packed if (byteCount != format.ByteCount(VERSION_CURRENT, valueCount, bitsPerValue)) { Debug.Assert(version == VERSION_START); - long endPointer = @in.FilePointer + byteCount; + long endPointer = @in.GetFilePointer() + byteCount; // Some consumers of direct readers assume that reading the last value // will make the underlying IndexInput go to the end of the packed // stream, but this is not true because packed ints storage used to be http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWFieldInfosReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWFieldInfosReader.cs b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWFieldInfosReader.cs index 8cd827f..167daa9 100644 --- a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWFieldInfosReader.cs +++ b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWFieldInfosReader.cs @@ -122,9 +122,9 @@ namespace Lucene.Net.Codecs.Lucene3x null); } - if (input.FilePointer != input.Length) + if (input.GetFilePointer() != input.Length) { - throw new CorruptIndexException("did not read all bytes from file \"" + fileName + "\": read " + input.FilePointer + " vs size " + input.Length + " (resource: " + input + ")"); + throw new CorruptIndexException("did not read all bytes from file \"" + fileName + "\": read " + input.GetFilePointer() + " vs size " + input.Length + " (resource: " + input + ")"); } return new FieldInfos(infos); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.TestFramework/Store/MockIndexInputWrapper.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Store/MockIndexInputWrapper.cs b/src/Lucene.Net.TestFramework/Store/MockIndexInputWrapper.cs index b6e7a95..45ec2dd 100644 --- a/src/Lucene.Net.TestFramework/Store/MockIndexInputWrapper.cs +++ b/src/Lucene.Net.TestFramework/Store/MockIndexInputWrapper.cs @@ -97,13 +97,10 @@ namespace Lucene.Net.Store return clone; } - public override long FilePointer + public override long GetFilePointer() { - get - { - EnsureOpen(); - return @delegate.FilePointer; - } + EnsureOpen(); + return @delegate.GetFilePointer(); } public override void Seek(long pos) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Tests.Facet/SlowRAMDirectory.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Facet/SlowRAMDirectory.cs b/src/Lucene.Net.Tests.Facet/SlowRAMDirectory.cs index ea4a3ac..af1754f 100644 --- a/src/Lucene.Net.Tests.Facet/SlowRAMDirectory.cs +++ b/src/Lucene.Net.Tests.Facet/SlowRAMDirectory.cs @@ -163,12 +163,9 @@ namespace Lucene.Net.Facet { return ii.Equals(o); } - public override long FilePointer + public override long GetFilePointer() { - get - { - return ii.FilePointer; - } + return ii.GetFilePointer(); } public override void Seek(long pos) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Tests/Codecs/Lucene41/TestForUtil.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Codecs/Lucene41/TestForUtil.cs b/src/Lucene.Net.Tests/Codecs/Lucene41/TestForUtil.cs index 2f6a7bc..cfedfaa 100644 --- a/src/Lucene.Net.Tests/Codecs/Lucene41/TestForUtil.cs +++ b/src/Lucene.Net.Tests/Codecs/Lucene41/TestForUtil.cs @@ -89,7 +89,7 @@ namespace Lucene.Net.Codecs.Lucene41 forUtil.ReadBlock(@in, new byte[Lucene41.ForUtil.MAX_ENCODED_SIZE], restored); Assert.AreEqual(Arrays.CopyOfRange(values, i * Lucene41PostingsFormat.BLOCK_SIZE, (i + 1) * Lucene41PostingsFormat.BLOCK_SIZE), Arrays.CopyOf(restored, Lucene41PostingsFormat.BLOCK_SIZE)); } - Assert.AreEqual(endPointer, @in.FilePointer); + assertEquals(endPointer, @in.GetFilePointer()); @in.Dispose(); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Tests/Index/TestCompoundFile.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestCompoundFile.cs b/src/Lucene.Net.Tests/Index/TestCompoundFile.cs index 8452701..186259d 100644 --- a/src/Lucene.Net.Tests/Index/TestCompoundFile.cs +++ b/src/Lucene.Net.Tests/Index/TestCompoundFile.cs @@ -91,12 +91,12 @@ namespace Lucene.Net.Index Assert.IsNotNull(expected, msg + " null expected"); Assert.IsNotNull(test, msg + " null test"); Assert.AreEqual(expected.Length, test.Length, msg + " length"); - Assert.AreEqual(expected.FilePointer, test.FilePointer, msg + " position"); + Assert.AreEqual(expected.GetFilePointer(), test.GetFilePointer(), msg + " position"); var expectedBuffer = new byte[512]; var testBuffer = new byte[expectedBuffer.Length]; - long remainder = expected.Length - expected.FilePointer; + long remainder = expected.Length - expected.GetFilePointer(); while (remainder > 0) { int readLen = (int)Math.Min(remainder, expectedBuffer.Length); @@ -412,8 +412,8 @@ namespace Lucene.Net.Index // Seek the first pair e1.Seek(100); a1.Seek(100); - Assert.AreEqual(100, e1.FilePointer); - Assert.AreEqual(100, a1.FilePointer); + Assert.AreEqual(100, e1.GetFilePointer()); + Assert.AreEqual(100, a1.GetFilePointer()); byte be1 = e1.ReadByte(); byte ba1 = a1.ReadByte(); Assert.AreEqual(be1, ba1); @@ -421,15 +421,15 @@ namespace Lucene.Net.Index // Now seek the second pair e2.Seek(1027); a2.Seek(1027); - Assert.AreEqual(1027, e2.FilePointer); - Assert.AreEqual(1027, a2.FilePointer); + Assert.AreEqual(1027, e2.GetFilePointer()); + Assert.AreEqual(1027, a2.GetFilePointer()); byte be2 = e2.ReadByte(); byte ba2 = a2.ReadByte(); Assert.AreEqual(be2, ba2); // Now make sure the first one didn't move - Assert.AreEqual(101, e1.FilePointer); - Assert.AreEqual(101, a1.FilePointer); + Assert.AreEqual(101, e1.GetFilePointer()); + Assert.AreEqual(101, a1.GetFilePointer()); be1 = e1.ReadByte(); ba1 = a1.ReadByte(); Assert.AreEqual(be1, ba1); @@ -437,15 +437,15 @@ namespace Lucene.Net.Index // Now more the first one again, past the buffer length e1.Seek(1910); a1.Seek(1910); - Assert.AreEqual(1910, e1.FilePointer); - Assert.AreEqual(1910, a1.FilePointer); + Assert.AreEqual(1910, e1.GetFilePointer()); + Assert.AreEqual(1910, a1.GetFilePointer()); be1 = e1.ReadByte(); ba1 = a1.ReadByte(); Assert.AreEqual(be1, ba1); // Now make sure the second set didn't move - Assert.AreEqual(1028, e2.FilePointer); - Assert.AreEqual(1028, a2.FilePointer); + Assert.AreEqual(1028, e2.GetFilePointer()); + Assert.AreEqual(1028, a2.GetFilePointer()); be2 = e2.ReadByte(); ba2 = a2.ReadByte(); Assert.AreEqual(be2, ba2); @@ -453,16 +453,16 @@ namespace Lucene.Net.Index // Move the second set back, again cross the buffer size e2.Seek(17); a2.Seek(17); - Assert.AreEqual(17, e2.FilePointer); - Assert.AreEqual(17, a2.FilePointer); + Assert.AreEqual(17, e2.GetFilePointer()); + Assert.AreEqual(17, a2.GetFilePointer()); be2 = e2.ReadByte(); ba2 = a2.ReadByte(); Assert.AreEqual(be2, ba2); // Finally, make sure the first set didn't move // Now make sure the first one didn't move - Assert.AreEqual(1911, e1.FilePointer); - Assert.AreEqual(1911, a1.FilePointer); + Assert.AreEqual(1911, e1.GetFilePointer()); + Assert.AreEqual(1911, a1.GetFilePointer()); be1 = e1.ReadByte(); ba1 = a1.ReadByte(); Assert.AreEqual(be1, ba1); @@ -494,8 +494,8 @@ namespace Lucene.Net.Index // Seek the first pair e1.Seek(100); a1.Seek(100); - Assert.AreEqual(100, e1.FilePointer); - Assert.AreEqual(100, a1.FilePointer); + Assert.AreEqual(100, e1.GetFilePointer()); + Assert.AreEqual(100, a1.GetFilePointer()); byte be1 = e1.ReadByte(); byte ba1 = a1.ReadByte(); Assert.AreEqual(be1, ba1); @@ -503,15 +503,15 @@ namespace Lucene.Net.Index // Now seek the second pair e2.Seek(1027); a2.Seek(1027); - Assert.AreEqual(1027, e2.FilePointer); - Assert.AreEqual(1027, a2.FilePointer); + Assert.AreEqual(1027, e2.GetFilePointer()); + Assert.AreEqual(1027, a2.GetFilePointer()); byte be2 = e2.ReadByte(); byte ba2 = a2.ReadByte(); Assert.AreEqual(be2, ba2); // Now make sure the first one didn't move - Assert.AreEqual(101, e1.FilePointer); - Assert.AreEqual(101, a1.FilePointer); + Assert.AreEqual(101, e1.GetFilePointer()); + Assert.AreEqual(101, a1.GetFilePointer()); be1 = e1.ReadByte(); ba1 = a1.ReadByte(); Assert.AreEqual(be1, ba1); @@ -519,15 +519,15 @@ namespace Lucene.Net.Index // Now more the first one again, past the buffer length e1.Seek(1910); a1.Seek(1910); - Assert.AreEqual(1910, e1.FilePointer); - Assert.AreEqual(1910, a1.FilePointer); + Assert.AreEqual(1910, e1.GetFilePointer()); + Assert.AreEqual(1910, a1.GetFilePointer()); be1 = e1.ReadByte(); ba1 = a1.ReadByte(); Assert.AreEqual(be1, ba1); // Now make sure the second set didn't move - Assert.AreEqual(1028, e2.FilePointer); - Assert.AreEqual(1028, a2.FilePointer); + Assert.AreEqual(1028, e2.GetFilePointer()); + Assert.AreEqual(1028, a2.GetFilePointer()); be2 = e2.ReadByte(); ba2 = a2.ReadByte(); Assert.AreEqual(be2, ba2); @@ -535,16 +535,16 @@ namespace Lucene.Net.Index // Move the second set back, again cross the buffer size e2.Seek(17); a2.Seek(17); - Assert.AreEqual(17, e2.FilePointer); - Assert.AreEqual(17, a2.FilePointer); + Assert.AreEqual(17, e2.GetFilePointer()); + Assert.AreEqual(17, a2.GetFilePointer()); be2 = e2.ReadByte(); ba2 = a2.ReadByte(); Assert.AreEqual(be2, ba2); // Finally, make sure the first set didn't move // Now make sure the first one didn't move - Assert.AreEqual(1911, e1.FilePointer); - Assert.AreEqual(1911, a1.FilePointer); + Assert.AreEqual(1911, e1.GetFilePointer()); + Assert.AreEqual(1911, a1.GetFilePointer()); be1 = e1.ReadByte(); ba1 = a1.ReadByte(); Assert.AreEqual(be1, ba1); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Tests/Index/TestFieldsReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestFieldsReader.cs b/src/Lucene.Net.Tests/Index/TestFieldsReader.cs index 89e34a9..85379ce 100644 --- a/src/Lucene.Net.Tests/Index/TestFieldsReader.cs +++ b/src/Lucene.Net.Tests/Index/TestFieldsReader.cs @@ -192,7 +192,7 @@ namespace Lucene.Net.Index protected override void ReadInternal(byte[] b, int offset, int length) { SimOutage(); - @delegate.Seek(FilePointer); + @delegate.Seek(GetFilePointer()); @delegate.ReadBytes(b, offset, length); } @@ -216,7 +216,7 @@ namespace Lucene.Net.Index // seek the clone to our current position try { - i.Seek(FilePointer); + i.Seek(GetFilePointer()); } #pragma warning disable 168 catch (IOException e) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Tests/Index/TestLazyProxSkipping.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestLazyProxSkipping.cs b/src/Lucene.Net.Tests/Index/TestLazyProxSkipping.cs index c8a75b4..04cf6b5 100644 --- a/src/Lucene.Net.Tests/Index/TestLazyProxSkipping.cs +++ b/src/Lucene.Net.Tests/Index/TestLazyProxSkipping.cs @@ -233,12 +233,9 @@ namespace Lucene.Net.Index this.Input.Dispose(); } - public override long FilePointer + public override long GetFilePointer() { - get - { - return this.Input.FilePointer; - } + return this.Input.GetFilePointer(); } public override void Seek(long pos) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Tests/Index/TestMultiLevelSkipList.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestMultiLevelSkipList.cs b/src/Lucene.Net.Tests/Index/TestMultiLevelSkipList.cs index db06ba7..b1de16d 100644 --- a/src/Lucene.Net.Tests/Index/TestMultiLevelSkipList.cs +++ b/src/Lucene.Net.Tests/Index/TestMultiLevelSkipList.cs @@ -192,12 +192,9 @@ namespace Lucene.Net.Index this.Input.Dispose(); } - public override long FilePointer + public override long GetFilePointer() { - get - { - return this.Input.FilePointer; - } + return this.Input.GetFilePointer(); } public override void Seek(long pos) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Tests/Store/TestBufferedIndexInput.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Store/TestBufferedIndexInput.cs b/src/Lucene.Net.Tests/Store/TestBufferedIndexInput.cs index 79f6f5b..fad09a0 100644 --- a/src/Lucene.Net.Tests/Store/TestBufferedIndexInput.cs +++ b/src/Lucene.Net.Tests/Store/TestBufferedIndexInput.cs @@ -144,8 +144,8 @@ namespace Lucene.Net.Store // add an arbitrary offset at the beginning of the array int offset = size % 10; // arbitrary Buffer = ArrayUtil.Grow(Buffer, offset + size); - Assert.AreEqual(pos, input.FilePointer); - long left = TEST_FILE_LENGTH - input.FilePointer; + Assert.AreEqual(pos, input.GetFilePointer()); + long left = TEST_FILE_LENGTH - input.GetFilePointer(); if (left <= 0) { return; @@ -155,7 +155,7 @@ namespace Lucene.Net.Store size = (int)left; } input.ReadBytes(Buffer, offset, size); - Assert.AreEqual(pos + size, input.FilePointer); + Assert.AreEqual(pos + size, input.GetFilePointer()); for (int i = 0; i < size; i++) { Assert.AreEqual(Byten(pos + i), (byte)Buffer[offset + i], "pos=" + i + " filepos=" + (pos + i)); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/96a4290c/src/Lucene.Net.Tests/Util/Packed/TestPackedInts.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Util/Packed/TestPackedInts.cs b/src/Lucene.Net.Tests/Util/Packed/TestPackedInts.cs index becd580..66693c8 100644 --- a/src/Lucene.Net.Tests/Util/Packed/TestPackedInts.cs +++ b/src/Lucene.Net.Tests/Util/Packed/TestPackedInts.cs @@ -138,14 +138,14 @@ namespace Lucene.Net.Util.Packed Assert.AreEqual(w.BitsPerValue, @in.ReadVInt32()); Assert.AreEqual(valueCount, @in.ReadVInt32()); Assert.AreEqual(w.Format.Id, @in.ReadVInt32()); - Assert.AreEqual(startFp, @in.FilePointer); + Assert.AreEqual(startFp, @in.GetFilePointer()); @in.Dispose(); } { // test reader IndexInput @in = d.OpenInput("out.bin", NewIOContext(Random())); PackedInt32s.Reader r = PackedInt32s.GetReader(@in); - Assert.AreEqual(fp, @in.FilePointer); + Assert.AreEqual(fp, @in.GetFilePointer()); for (int i = 0; i < valueCount; i++) { Assert.AreEqual(values[i], r.Get(i), "index=" + i + " valueCount=" + valueCount + " nbits=" + nbits + " for " + r.GetType().Name); @@ -165,7 +165,7 @@ namespace Lucene.Net.Util.Packed Assert.AreEqual(values[i], r.Next(), "index=" + i + " valueCount=" + valueCount + " nbits=" + nbits + " for " + r.GetType().Name); Assert.AreEqual(i, r.Ord); } - Assert.AreEqual(fp, @in.FilePointer); + assertEquals(fp, @in.GetFilePointer()); @in.Dispose(); } @@ -183,7 +183,7 @@ namespace Lucene.Net.Util.Packed } i += next.Length; } - Assert.AreEqual(fp, @in.FilePointer); + Assert.AreEqual(fp, @in.GetFilePointer()); @in.Dispose(); } @@ -197,7 +197,7 @@ namespace Lucene.Net.Util.Packed Assert.AreEqual(values[index], intsEnum.Get(index), msg); } intsEnum.Get(intsEnum.Count - 1); - Assert.AreEqual(fp, @in.FilePointer); + Assert.AreEqual(fp, @in.GetFilePointer()); @in.Dispose(); } d.Dispose(); @@ -237,18 +237,18 @@ namespace Lucene.Net.Util.Packed { it.Next(); } - Assert.AreEqual(byteCount, @in.FilePointer, msg); + Assert.AreEqual(byteCount, @in.GetFilePointer(), msg); // test direct reader @in.Seek(0L); PackedInt32s.Reader directReader = PackedInt32s.GetDirectReaderNoHeader(@in, format, version, valueCount, bpv); directReader.Get(valueCount - 1); - Assert.AreEqual(byteCount, @in.FilePointer, msg); + Assert.AreEqual(byteCount, @in.GetFilePointer(), msg); // test reader @in.Seek(0L); PackedInt32s.GetReaderNoHeader(@in, format, version, valueCount, bpv); - Assert.AreEqual(byteCount, @in.FilePointer, msg); + Assert.AreEqual(byteCount, @in.GetFilePointer(), msg); } } } @@ -481,7 +481,7 @@ namespace Lucene.Net.Util.Packed string msg = "Impl=" + w.GetType().Name + ", bitsPerValue=" + bitsPerValue; Assert.AreEqual(1, reader.Count, msg); Assert.AreEqual(value, reader.Get(0), msg); - Assert.AreEqual(end, @in.FilePointer, msg); + Assert.AreEqual(end, @in.GetFilePointer(), msg); @in.Dispose(); dir.Dispose(); @@ -1295,7 +1295,7 @@ namespace Lucene.Net.Util.Packed pin.SkipToNextByte(); } } - Assert.AreEqual((long)Math.Ceiling((double)totalBits / 8), @in.FilePointer); + assertEquals((long)Math.Ceiling((double)totalBits / 8), @in.GetFilePointer()); @in.Dispose(); dir.Dispose(); } @@ -1371,7 +1371,7 @@ namespace Lucene.Net.Util.Packed } Assert.AreEqual(i, it.Ord); } - Assert.AreEqual(fp, @in is ByteArrayDataInput ? ((ByteArrayDataInput)@in).Position : ((IndexInput)@in).FilePointer); + assertEquals(fp, @in is ByteArrayDataInput ? ((ByteArrayDataInput)@in).Position : ((IndexInput)@in).GetFilePointer()); try { it.Next(); @@ -1410,7 +1410,7 @@ namespace Lucene.Net.Util.Packed ++k; } } - Assert.AreEqual(fp, @in is ByteArrayDataInput ? ((ByteArrayDataInput)@in).Position : ((IndexInput)@in).FilePointer); + assertEquals(fp, @in is ByteArrayDataInput ? ((ByteArrayDataInput)@in).Position : (((IndexInput)@in).GetFilePointer())); try { it2.Skip(1); @@ -1425,7 +1425,7 @@ namespace Lucene.Net.Util.Packed in1.Seek(0L); BlockPackedReader reader = new BlockPackedReader(in1, PackedInt32s.VERSION_CURRENT, blockSize, valueCount, Random().NextBoolean()); - Assert.AreEqual(in1.FilePointer, in1.Length); + assertEquals(in1.GetFilePointer(), in1.Length); for (k = 0; k < valueCount; ++k) { Assert.AreEqual(values[k], reader.Get(k), "i=" + k); @@ -1474,7 +1474,7 @@ namespace Lucene.Net.Util.Packed IndexInput @in = dir.OpenInput("out.bin", IOContext.DEFAULT); MonotonicBlockPackedReader reader = new MonotonicBlockPackedReader(@in, PackedInt32s.VERSION_CURRENT, blockSize, valueCount, Random().NextBoolean()); - Assert.AreEqual(fp, @in.FilePointer); + assertEquals(fp, @in.GetFilePointer()); for (int i = 0; i < valueCount; ++i) { Assert.AreEqual(values[i], reader.Get(i),"i=" + i);
