Lucene.Net.Core.Store.IndexOutput refactor: Changed FilePointer > GetFilePointer() (makes conversion)
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/070cfa37 Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/070cfa37 Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/070cfa37 Branch: refs/heads/api-work Commit: 070cfa37ab8196d26e89dca814b4d32ca9373e70 Parents: b483fa7 Author: Shad Storhaug <[email protected]> Authored: Sun Mar 19 22:57:58 2017 +0700 Committer: Shad Storhaug <[email protected]> Committed: Sun Mar 19 22:57:58 2017 +0700 ---------------------------------------------------------------------- .../BlockTerms/BlockTermsWriter.cs | 16 ++++++------- .../BlockTerms/FixedGapTermsIndexWriter.cs | 8 +++---- .../BlockTerms/VariableGapTermsIndexWriter.cs | 4 ++-- .../IntBlock/FixedIntBlockIndexOutput.cs | 2 +- .../IntBlock/VariableIntBlockIndexOutput.cs | 2 +- .../Memory/DirectDocValuesConsumer.cs | 12 +++++----- .../Memory/FSTOrdTermsWriter.cs | 24 ++++++++++---------- src/Lucene.Net.Codecs/Memory/FSTTermsWriter.cs | 4 ++-- .../Memory/MemoryDocValuesConsumer.cs | 16 ++++++------- .../Memory/MemoryPostingsFormat.cs | 8 +++---- .../Pulsing/PulsingPostingsWriter.cs | 2 +- src/Lucene.Net.Codecs/Sep/SepPostingsWriter.cs | 4 ++-- src/Lucene.Net.Codecs/Sep/SepSkipListWriter.cs | 4 ++-- .../Codecs/BlockTreeTermsWriter.cs | 18 +++++++-------- .../CompressingStoredFieldsWriter.cs | 10 ++++---- .../Compressing/CompressingTermVectorsWriter.cs | 10 ++++---- .../Lucene40/Lucene40StoredFieldsWriter.cs | 14 ++++++------ .../Lucene40/Lucene40TermVectorsWriter.cs | 24 ++++++++++---------- .../Codecs/Lucene41/Lucene41PostingsWriter.cs | 12 +++++----- .../Codecs/Lucene41/Lucene41SkipWriter.cs | 8 +++---- .../Codecs/Lucene42/Lucene42NormsConsumer.cs | 2 +- .../Lucene45/Lucene45DocValuesConsumer.cs | 18 +++++++-------- .../Codecs/MultiLevelSkipListWriter.cs | 6 ++--- .../Store/BufferedIndexOutput.cs | 7 ++---- src/Lucene.Net.Core/Store/CompoundFileWriter.cs | 13 ++++------- src/Lucene.Net.Core/Store/IndexOutput.cs | 2 +- src/Lucene.Net.Core/Store/RAMOutputStream.cs | 7 ++---- src/Lucene.Net.Core/Util/Fst/FST.cs | 2 +- .../Index/Sorter/SortingAtomicReader.cs | 2 +- .../Codecs/Lucene3x/PreFlexRWFieldsWriter.cs | 4 ++-- .../Codecs/Lucene3x/PreFlexRWSkipListWriter.cs | 8 +++---- .../Lucene3x/PreFlexRWStoredFieldsWriter.cs | 6 ++--- .../Lucene3x/PreFlexRWTermVectorsWriter.cs | 10 ++++---- .../Codecs/Lucene3x/TermInfosWriter.cs | 4 ++-- .../Codecs/Lucene40/Lucene40DocValuesWriter.cs | 14 ++++++------ .../Codecs/Lucene40/Lucene40PostingsWriter.cs | 4 ++-- .../Codecs/Lucene40/Lucene40SkipListWriter.cs | 8 +++---- .../Lucene42/Lucene42DocValuesConsumer.cs | 8 +++---- .../Codecs/MockSep/MockSingleIntIndexOutput.cs | 4 ++-- .../Store/MockIndexOutputWrapper.cs | 7 ++---- .../Util/ThrottledIndexOutput.cs | 7 ++---- src/Lucene.Net.Tests.Facet/SlowRAMDirectory.cs | 7 ++---- .../Codecs/Lucene41/TestForUtil.cs | 2 +- src/Lucene.Net.Tests/Index/TestCompoundFile.cs | 4 ++-- src/Lucene.Net.Tests/Store/TestCopyBytes.cs | 2 +- .../Util/Packed/TestPackedInts.cs | 12 +++++----- src/Lucene.Net.Tests/Util/Test2BPagedBytes.cs | 2 +- src/Lucene.Net.Tests/Util/TestPagedBytes.cs | 4 ++-- 48 files changed, 180 insertions(+), 198 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.Codecs/BlockTerms/BlockTermsWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/BlockTerms/BlockTermsWriter.cs b/src/Lucene.Net.Codecs/BlockTerms/BlockTermsWriter.cs index c16560f..fdc9226 100644 --- a/src/Lucene.Net.Codecs/BlockTerms/BlockTermsWriter.cs +++ b/src/Lucene.Net.Codecs/BlockTerms/BlockTermsWriter.cs @@ -126,7 +126,7 @@ namespace Lucene.Net.Codecs.BlockTerms //System.out.println("\nBTW.addField seg=" + segment + " field=" + field.name); Debug.Assert(currentField == null || currentField.Name.CompareToOrdinal(field.Name) < 0); currentField = field; - TermsIndexWriterBase.FieldWriter fieldIndexWriter = termsIndexWriter.AddField(field, m_output.FilePointer); + TermsIndexWriterBase.FieldWriter fieldIndexWriter = termsIndexWriter.AddField(field, m_output.GetFilePointer()); return new TermsWriter(this, fieldIndexWriter, field, postingsWriter); } @@ -136,7 +136,7 @@ namespace Lucene.Net.Codecs.BlockTerms { try { - long dirStart = m_output.FilePointer; + long dirStart = m_output.GetFilePointer(); m_output.WriteVInt32(fields.Count); foreach (FieldMetaData field in fields) @@ -215,7 +215,7 @@ namespace Lucene.Net.Codecs.BlockTerms { pendingTerms[i] = new TermEntry(); } - termsStartPointer = outerInstance.m_output.FilePointer; + termsStartPointer = outerInstance.m_output.GetFilePointer(); this.postingsWriter = postingsWriter; this.longsSize = postingsWriter.SetField(fieldInfo); } @@ -250,7 +250,7 @@ namespace Lucene.Net.Codecs.BlockTerms // entire block in between index terms: FlushBlock(); } - fieldIndexWriter.Add(text, stats, outerInstance.m_output.FilePointer); + fieldIndexWriter.Add(text, stats, outerInstance.m_output.GetFilePointer()); //System.out.println(" index term!"); } @@ -288,7 +288,7 @@ namespace Lucene.Net.Codecs.BlockTerms this.sumTotalTermFreq = sumTotalTermFreq; this.sumDocFreq = sumDocFreq; this.docCount = docCount; - fieldIndexWriter.Finish(outerInstance.m_output.FilePointer); + fieldIndexWriter.Finish(outerInstance.m_output.GetFilePointer()); if (numTerms > 0) { outerInstance.fields.Add(new FieldMetaData(fieldInfo, @@ -350,7 +350,7 @@ namespace Lucene.Net.Codecs.BlockTerms bytesWriter.WriteVInt32(suffix); bytesWriter.WriteBytes(pendingTerms[termCount].Term.Bytes, commonPrefix, suffix); } - outerInstance.m_output.WriteVInt32((int)bytesWriter.FilePointer); + outerInstance.m_output.WriteVInt32((int)bytesWriter.GetFilePointer()); bytesWriter.WriteTo(outerInstance.m_output); bytesWriter.Reset(); @@ -367,7 +367,7 @@ namespace Lucene.Net.Codecs.BlockTerms bytesWriter.WriteVInt64(state.TotalTermFreq - state.DocFreq); } } - outerInstance.m_output.WriteVInt32((int)bytesWriter.FilePointer); + outerInstance.m_output.WriteVInt32((int)bytesWriter.GetFilePointer()); bytesWriter.WriteTo(outerInstance.m_output); bytesWriter.Reset(); @@ -386,7 +386,7 @@ namespace Lucene.Net.Codecs.BlockTerms bufferWriter.Reset(); absolute = false; } - outerInstance.m_output.WriteVInt32((int)bytesWriter.FilePointer); + outerInstance.m_output.WriteVInt32((int)bytesWriter.GetFilePointer()); bytesWriter.WriteTo(outerInstance.m_output); bytesWriter.Reset(); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.Codecs/BlockTerms/FixedGapTermsIndexWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/BlockTerms/FixedGapTermsIndexWriter.cs b/src/Lucene.Net.Codecs/BlockTerms/FixedGapTermsIndexWriter.cs index a96b432..6c1ebf8 100644 --- a/src/Lucene.Net.Codecs/BlockTerms/FixedGapTermsIndexWriter.cs +++ b/src/Lucene.Net.Codecs/BlockTerms/FixedGapTermsIndexWriter.cs @@ -137,7 +137,7 @@ namespace Lucene.Net.Codecs.BlockTerms this.outerInstance = outerInstance; this.fieldInfo = fieldInfo; - indexStart = outerInstance.m_output.FilePointer; + indexStart = outerInstance.m_output.GetFilePointer(); termsStart = lastTermsPointer = termsFilePointer; termLengths = new short[0]; termsPointerDeltas = new int[0]; @@ -197,7 +197,7 @@ namespace Lucene.Net.Codecs.BlockTerms public override void Finish(long termsFilePointer) { // write primary terms dict offsets - packedIndexStart = outerInstance.m_output.FilePointer; + packedIndexStart = outerInstance.m_output.GetFilePointer(); PackedInt32s.Writer w = PackedInt32s.GetWriter(outerInstance.m_output, numIndexTerms, PackedInt32s.BitsRequired(termsFilePointer), PackedInt32s.DEFAULT); @@ -210,7 +210,7 @@ namespace Lucene.Net.Codecs.BlockTerms } w.Finish(); - packedOffsetsStart = outerInstance.m_output.FilePointer; + packedOffsetsStart = outerInstance.m_output.GetFilePointer(); // write offsets into the byte[] terms w = PackedInt32s.GetWriter(outerInstance.m_output, 1 + numIndexTerms, PackedInt32s.BitsRequired(totTermLength), PackedInt32s.DEFAULT); @@ -237,7 +237,7 @@ namespace Lucene.Net.Codecs.BlockTerms bool success = false; try { - long dirStart = m_output.FilePointer; + long dirStart = m_output.GetFilePointer(); int fieldCount = fields.Count; int nonNullFieldCount = 0; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.Codecs/BlockTerms/VariableGapTermsIndexWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/BlockTerms/VariableGapTermsIndexWriter.cs b/src/Lucene.Net.Codecs/BlockTerms/VariableGapTermsIndexWriter.cs index 4b51bc1..b87f8d7 100644 --- a/src/Lucene.Net.Codecs/BlockTerms/VariableGapTermsIndexWriter.cs +++ b/src/Lucene.Net.Codecs/BlockTerms/VariableGapTermsIndexWriter.cs @@ -259,7 +259,7 @@ namespace Lucene.Net.Codecs.BlockTerms this.fieldInfo = fieldInfo; fstOutputs = PositiveInt32Outputs.Singleton; fstBuilder = new Builder<long?>(FST.INPUT_TYPE.BYTE1, fstOutputs); - indexStart = outerInstance.m_output.FilePointer; + indexStart = outerInstance.m_output.GetFilePointer(); ////System.out.println("VGW: field=" + fieldInfo.name); // Always put empty string in @@ -324,7 +324,7 @@ namespace Lucene.Net.Codecs.BlockTerms { try { - long dirStart = m_output.FilePointer; + long dirStart = m_output.GetFilePointer(); int fieldCount = fields.Count; int nonNullFieldCount = 0; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/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 b60b70a..e158d05 100644 --- a/src/Lucene.Net.Codecs/IntBlock/FixedIntBlockIndexOutput.cs +++ b/src/Lucene.Net.Codecs/IntBlock/FixedIntBlockIndexOutput.cs @@ -77,7 +77,7 @@ namespace Lucene.Net.Codecs.IntBlock public override void Mark() { - fp = outerInstance.m_output.FilePointer; + fp = outerInstance.m_output.GetFilePointer(); upto = outerInstance.upto; } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/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 a59a6b1..17b612d 100644 --- a/src/Lucene.Net.Codecs/IntBlock/VariableIntBlockIndexOutput.cs +++ b/src/Lucene.Net.Codecs/IntBlock/VariableIntBlockIndexOutput.cs @@ -90,7 +90,7 @@ namespace Lucene.Net.Codecs.IntBlock public override void Mark() { - fp = outerInstance.m_output.FilePointer; + fp = outerInstance.m_output.GetFilePointer(); upto = outerInstance.upto; } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.Codecs/Memory/DirectDocValuesConsumer.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/Memory/DirectDocValuesConsumer.cs b/src/Lucene.Net.Codecs/Memory/DirectDocValuesConsumer.cs index 815ae47..0b8f258 100644 --- a/src/Lucene.Net.Codecs/Memory/DirectDocValuesConsumer.cs +++ b/src/Lucene.Net.Codecs/Memory/DirectDocValuesConsumer.cs @@ -72,7 +72,7 @@ namespace Lucene.Net.Codecs.Memory private void AddNumericFieldValues(FieldInfo field, IEnumerable<long?> values) { - meta.WriteInt64(data.FilePointer); + meta.WriteInt64(data.GetFilePointer()); long minValue = long.MaxValue; long maxValue = long.MinValue; bool missing = false; @@ -101,10 +101,10 @@ namespace Lucene.Net.Codecs.Memory if (missing) { - long start = data.FilePointer; + long start = data.GetFilePointer(); WriteMissingBitset(values); meta.WriteInt64(start); - meta.WriteInt64(data.FilePointer - start); + meta.WriteInt64(data.GetFilePointer() - start); } else { @@ -194,7 +194,7 @@ namespace Lucene.Net.Codecs.Memory private void AddBinaryFieldValues(FieldInfo field, IEnumerable<BytesRef> values) { // write the byte[] data - long startFP = data.FilePointer; + long startFP = data.GetFilePointer(); bool missing = false; long totalBytes = 0; int count = 0; @@ -223,10 +223,10 @@ namespace Lucene.Net.Codecs.Memory meta.WriteInt32(count); if (missing) { - long start = data.FilePointer; + long start = data.GetFilePointer(); WriteMissingBitset(values); meta.WriteInt64(start); - meta.WriteInt64(data.FilePointer - start); + meta.WriteInt64(data.GetFilePointer() - start); } else { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.Codecs/Memory/FSTOrdTermsWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/Memory/FSTOrdTermsWriter.cs b/src/Lucene.Net.Codecs/Memory/FSTOrdTermsWriter.cs index d313348..839929e 100644 --- a/src/Lucene.Net.Codecs/Memory/FSTOrdTermsWriter.cs +++ b/src/Lucene.Net.Codecs/Memory/FSTOrdTermsWriter.cs @@ -192,7 +192,7 @@ namespace Lucene.Net.Codecs.Memory IOException ioe = null; try { - var blockDirStart = blockOut.FilePointer; + var blockDirStart = blockOut.GetFilePointer(); // write field summary blockOut.WriteVInt32(_fields.Count); @@ -207,9 +207,9 @@ namespace Lucene.Net.Codecs.Memory blockOut.WriteVInt64(field.SumDocFreq); blockOut.WriteVInt32(field.DocCount); blockOut.WriteVInt32(field.Int64sSize); - blockOut.WriteVInt64(field.StatsOut.FilePointer); - blockOut.WriteVInt64(field.MetaInt64sOut.FilePointer); - blockOut.WriteVInt64(field.MetaBytesOut.FilePointer); + blockOut.WriteVInt64(field.StatsOut.GetFilePointer()); + blockOut.WriteVInt64(field.MetaInt64sOut.GetFilePointer()); + blockOut.WriteVInt64(field.MetaBytesOut.GetFilePointer()); field.SkipOut.WriteTo(blockOut); field.StatsOut.WriteTo(blockOut); @@ -360,12 +360,12 @@ namespace Lucene.Net.Codecs.Memory _metaLongsOut.WriteVInt64(longs[i] - _lastLongs[i]); _lastLongs[i] = longs[i]; } - _metaLongsOut.WriteVInt64(_metaBytesOut.FilePointer - _lastMetaBytesFp); + _metaLongsOut.WriteVInt64(_metaBytesOut.GetFilePointer() - _lastMetaBytesFp); _builder.Add(Util.ToInt32sRef(text, _scratchTerm), _numTerms); _numTerms++; - _lastMetaBytesFp = _metaBytesOut.FilePointer; + _lastMetaBytesFp = _metaBytesOut.GetFilePointer(); } public override void Finish(long sumTotalTermFreq, long sumDocFreq, int docCount) @@ -391,16 +391,16 @@ namespace Lucene.Net.Codecs.Memory private void BufferSkip() { - _skipOut.WriteVInt64(_statsOut.FilePointer - _lastBlockStatsFp); - _skipOut.WriteVInt64(_metaLongsOut.FilePointer - _lastBlockMetaLongsFp); - _skipOut.WriteVInt64(_metaBytesOut.FilePointer - _lastBlockMetaBytesFp); + _skipOut.WriteVInt64(_statsOut.GetFilePointer() - _lastBlockStatsFp); + _skipOut.WriteVInt64(_metaLongsOut.GetFilePointer() - _lastBlockMetaLongsFp); + _skipOut.WriteVInt64(_metaBytesOut.GetFilePointer() - _lastBlockMetaBytesFp); for (var i = 0; i < _longsSize; i++) { _skipOut.WriteVInt64(_lastLongs[i] - _lastBlockLongs[i]); } - _lastBlockStatsFp = _statsOut.FilePointer; - _lastBlockMetaLongsFp = _metaLongsOut.FilePointer; - _lastBlockMetaBytesFp = _metaBytesOut.FilePointer; + _lastBlockStatsFp = _statsOut.GetFilePointer(); + _lastBlockMetaLongsFp = _metaLongsOut.GetFilePointer(); + _lastBlockMetaBytesFp = _metaBytesOut.GetFilePointer(); Array.Copy(_lastLongs, 0, _lastBlockLongs, 0, _longsSize); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.Codecs/Memory/FSTTermsWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/Memory/FSTTermsWriter.cs b/src/Lucene.Net.Codecs/Memory/FSTTermsWriter.cs index 7f13d8c..3f18e36 100644 --- a/src/Lucene.Net.Codecs/Memory/FSTTermsWriter.cs +++ b/src/Lucene.Net.Codecs/Memory/FSTTermsWriter.cs @@ -172,7 +172,7 @@ namespace Lucene.Net.Codecs.Memory try { // write field summary - var dirStart = _output.FilePointer; + var dirStart = _output.GetFilePointer(); _output.WriteVInt32(_fields.Count); foreach (var field in _fields) @@ -278,7 +278,7 @@ namespace Lucene.Net.Codecs.Memory }; _outerInstance._postingsWriter.FinishTerm(state); _outerInstance._postingsWriter.EncodeTerm(meta.longs, _metaWriter, _fieldInfo, state, true); - var bytesSize = (int) _metaWriter.FilePointer; + var bytesSize = (int) _metaWriter.GetFilePointer(); if (bytesSize > 0) { meta.bytes = new byte[bytesSize]; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.Codecs/Memory/MemoryDocValuesConsumer.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/Memory/MemoryDocValuesConsumer.cs b/src/Lucene.Net.Codecs/Memory/MemoryDocValuesConsumer.cs index 7600925..0a798cb 100644 --- a/src/Lucene.Net.Codecs/Memory/MemoryDocValuesConsumer.cs +++ b/src/Lucene.Net.Codecs/Memory/MemoryDocValuesConsumer.cs @@ -86,7 +86,7 @@ namespace Lucene.Net.Codecs.Memory { meta.WriteVInt32(field.Number); meta.WriteByte(MemoryDocValuesProducer.NUMBER); - meta.WriteInt64(data.FilePointer); + meta.WriteInt64(data.GetFilePointer()); long minValue = long.MaxValue; long maxValue = long.MinValue; long gcd = 0; @@ -147,10 +147,10 @@ namespace Lucene.Net.Codecs.Memory if (missing) { - long start = data.FilePointer; + long start = data.GetFilePointer(); WriteMissingBitset(values); meta.WriteInt64(start); - meta.WriteInt64(data.FilePointer - start); + meta.WriteInt64(data.GetFilePointer() - start); } else { @@ -271,7 +271,7 @@ namespace Lucene.Net.Codecs.Memory var minLength = int.MaxValue; var maxLength = int.MinValue; - var startFP = data.FilePointer; + var startFP = data.GetFilePointer(); var missing = false; foreach (var v in values) { @@ -298,13 +298,13 @@ namespace Lucene.Net.Codecs.Memory } } meta.WriteInt64(startFP); - meta.WriteInt64(data.FilePointer - startFP); + meta.WriteInt64(data.GetFilePointer() - startFP); if (missing) { - long start = data.FilePointer; + long start = data.GetFilePointer(); WriteMissingBitset(values); meta.WriteInt64(start); - meta.WriteInt64(data.FilePointer - start); + meta.WriteInt64(data.GetFilePointer() - start); } else { @@ -339,7 +339,7 @@ namespace Lucene.Net.Codecs.Memory { meta.WriteVInt32(field.Number); meta.WriteByte(MemoryDocValuesProducer.FST); - meta.WriteInt64(data.FilePointer); + meta.WriteInt64(data.GetFilePointer()); PositiveInt32Outputs outputs = PositiveInt32Outputs.Singleton; var builder = new Builder<long?>(INPUT_TYPE.BYTE1, outputs); var scratch = new Int32sRef(); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs b/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs index 8e2b773..266fc23 100644 --- a/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs +++ b/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs @@ -230,7 +230,7 @@ namespace Lucene.Net.Codecs.Memory public virtual PostingsWriter Reset() { - Debug.Assert(buffer.FilePointer == 0); + Debug.Assert(buffer.GetFilePointer() == 0); lastDocID = 0; docCount = 0; lastPayloadLen = 0; @@ -256,18 +256,18 @@ namespace Lucene.Net.Codecs.Memory { Debug.Assert(postingsWriter.docCount == stats.DocFreq); - Debug.Assert(buffer2.FilePointer == 0); + Debug.Assert(buffer2.GetFilePointer() == 0); buffer2.WriteVInt32(stats.DocFreq); if (field.IndexOptions != IndexOptions.DOCS_ONLY) { buffer2.WriteVInt64(stats.TotalTermFreq - stats.DocFreq); } - int pos = (int)buffer2.FilePointer; + int pos = (int)buffer2.GetFilePointer(); buffer2.WriteTo(finalBuffer, 0); buffer2.Reset(); - int totalBytes = pos + (int)postingsWriter.buffer.FilePointer; + int totalBytes = pos + (int)postingsWriter.buffer.GetFilePointer(); if (totalBytes > finalBuffer.Length) { finalBuffer = ArrayUtil.Grow(finalBuffer, totalBytes); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsWriter.cs b/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsWriter.cs index d33fd72..3cae4d2 100644 --- a/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsWriter.cs +++ b/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsWriter.cs @@ -401,7 +401,7 @@ namespace Lucene.Net.Codecs.Pulsing } } - state2.bytes = new byte[(int)_buffer.FilePointer]; + state2.bytes = new byte[(int)_buffer.GetFilePointer()]; _buffer.WriteTo(state2.bytes, 0); _buffer.Reset(); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/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 fd27e60..3080cf6 100644 --- a/src/Lucene.Net.Codecs/Sep/SepPostingsWriter.cs +++ b/src/Lucene.Net.Codecs/Sep/SepPostingsWriter.cs @@ -182,7 +182,7 @@ namespace Lucene.Net.Codecs.Sep if (indexOptions == IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) { posIndex.Mark(); - payloadStart = payloadOut.FilePointer; + payloadStart = payloadOut.GetFilePointer(); lastPayloadLength = -1; } @@ -342,7 +342,7 @@ namespace Lucene.Net.Codecs.Sep if (df >= skipMinimum) { - state_.SkipFP = skipOut.FilePointer; + state_.SkipFP = skipOut.GetFilePointer(); //System.out.println(" skipFP=" + skipFP); skipListWriter.WriteSkip(skipOut); //System.out.println(" numBytes=" + (skipOut.getFilePointer()-skipFP)); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/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 4bff5b8..e51eb10 100644 --- a/src/Lucene.Net.Codecs/Sep/SepSkipListWriter.cs +++ b/src/Lucene.Net.Codecs/Sep/SepSkipListWriter.cs @@ -117,7 +117,7 @@ namespace Lucene.Net.Codecs.Sep this._curPayloadLength = payloadLength; if (_payloadOutput != null) { - _curPayloadPointer = _payloadOutput.FilePointer; + _curPayloadPointer = _payloadOutput.GetFilePointer(); } } @@ -145,7 +145,7 @@ namespace Lucene.Net.Codecs.Sep } if (_payloadOutput != null) { - Arrays.Fill(_lastSkipPayloadPointer, _payloadOutput.FilePointer); + Arrays.Fill(_lastSkipPayloadPointer, _payloadOutput.GetFilePointer()); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.Core/Codecs/BlockTreeTermsWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Codecs/BlockTreeTermsWriter.cs b/src/Lucene.Net.Core/Codecs/BlockTreeTermsWriter.cs index e81cf1f..62b2454 100644 --- a/src/Lucene.Net.Core/Codecs/BlockTreeTermsWriter.cs +++ b/src/Lucene.Net.Core/Codecs/BlockTreeTermsWriter.cs @@ -435,7 +435,7 @@ namespace Lucene.Net.Codecs { Debug.Assert((IsFloor && floorBlocks != null && floorBlocks.Count != 0) || (!IsFloor && floorBlocks == null), "isFloor=" + IsFloor + " floorBlocks=" + floorBlocks); - Debug.Assert(scratchBytes.FilePointer == 0); + Debug.Assert(scratchBytes.GetFilePointer() == 0); // TODO: try writing the leading vLong in MSB order // (opposite of what Lucene does today), for better @@ -458,7 +458,7 @@ namespace Lucene.Net.Codecs ByteSequenceOutputs outputs = ByteSequenceOutputs.Singleton; Builder<BytesRef> indexBuilder = new Builder<BytesRef>(FST.INPUT_TYPE.BYTE1, 0, 0, true, false, int.MaxValue, outputs, null, false, PackedInt32s.COMPACT, true, 15); - var bytes = new byte[(int)scratchBytes.FilePointer]; + var bytes = new byte[(int)scratchBytes.GetFilePointer()]; Debug.Assert(bytes.Length > 0); scratchBytes.WriteTo(bytes, 0); indexBuilder.Add(Util.ToInt32sRef(Prefix, scratchIntsRef), new BytesRef(bytes, 0, bytes.Length)); @@ -884,7 +884,7 @@ namespace Lucene.Net.Codecs IList<PendingEntry> slice = pending.SubList(start, start + length); - long startFP = [email protected]; + long startFP = [email protected](); BytesRef prefix = new BytesRef(indexPrefixLength); for (int m = 0; m < indexPrefixLength; m++) @@ -1058,17 +1058,17 @@ namespace Lucene.Net.Codecs // search on lookup // Write suffixes byte[] blob to terms dict output: - [email protected]((int)(suffixWriter.FilePointer << 1) | (isLeafBlock ? 1 : 0)); + [email protected]((int)(suffixWriter.GetFilePointer() << 1) | (isLeafBlock ? 1 : 0)); suffixWriter.WriteTo(outerInstance.@out); suffixWriter.Reset(); // Write term stats byte[] blob - [email protected]((int)statsWriter.FilePointer); + [email protected]((int)statsWriter.GetFilePointer()); statsWriter.WriteTo(outerInstance.@out); statsWriter.Reset(); // Write term meta data byte[] blob - [email protected]((int)metaWriter.FilePointer); + [email protected]((int)metaWriter.GetFilePointer()); metaWriter.WriteTo(outerInstance.@out); metaWriter.Reset(); @@ -1167,7 +1167,7 @@ namespace Lucene.Net.Codecs this.docCount = docCount; // Write FST to index - indexStartFP = outerInstance.indexOut.FilePointer; + indexStartFP = outerInstance.indexOut.GetFilePointer(); root.Index.Save(outerInstance.indexOut); //System.out.println(" write FST " + indexStartFP + " field=" + fieldInfo.name); @@ -1200,8 +1200,8 @@ namespace Lucene.Net.Codecs System.IO.IOException ioe = null; try { - long dirStart = @out.FilePointer; - long indexDirStart = indexOut.FilePointer; + long dirStart = @out.GetFilePointer(); + long indexDirStart = indexOut.GetFilePointer(); @out.WriteVInt32(fields.Count); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.Core/Codecs/Compressing/CompressingStoredFieldsWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Codecs/Compressing/CompressingStoredFieldsWriter.cs b/src/Lucene.Net.Core/Codecs/Compressing/CompressingStoredFieldsWriter.cs index 6767d26..98336fa 100644 --- a/src/Lucene.Net.Core/Codecs/Compressing/CompressingStoredFieldsWriter.cs +++ b/src/Lucene.Net.Core/Codecs/Compressing/CompressingStoredFieldsWriter.cs @@ -108,8 +108,8 @@ namespace Lucene.Net.Codecs.Compressing string codecNameDat = formatName + CODEC_SFX_DAT; CodecUtil.WriteHeader(indexStream, codecNameIdx, VERSION_CURRENT); CodecUtil.WriteHeader(fieldsStream, codecNameDat, VERSION_CURRENT); - Debug.Assert(CodecUtil.HeaderLength(codecNameDat) == fieldsStream.FilePointer); - Debug.Assert(CodecUtil.HeaderLength(codecNameIdx) == indexStream.FilePointer); + Debug.Assert(CodecUtil.HeaderLength(codecNameDat) == fieldsStream.GetFilePointer()); + Debug.Assert(CodecUtil.HeaderLength(codecNameIdx) == indexStream.GetFilePointer()); indexWriter = new CompressingStoredFieldsIndexWriter(indexStream); indexStream = null; @@ -231,7 +231,7 @@ namespace Lucene.Net.Codecs.Compressing private void Flush() { - indexWriter.WriteIndex(numBufferedDocs, fieldsStream.FilePointer); + indexWriter.WriteIndex(numBufferedDocs, fieldsStream.GetFilePointer()); // transform end offsets into lengths int[] lengths = endOffsets; @@ -438,7 +438,7 @@ namespace Lucene.Net.Codecs.Compressing { throw new Exception("Wrote " + docBase + " docs, finish called with numDocs=" + numDocs); } - indexWriter.Finish(numDocs, fieldsStream.FilePointer); + indexWriter.Finish(numDocs, fieldsStream.GetFilePointer()); CodecUtil.WriteFooter(fieldsStream); Debug.Assert(bufferedDocs.Length == 0); } @@ -503,7 +503,7 @@ namespace Lucene.Net.Codecs.Compressing Debug.Assert(docID == it.docBase); // no need to decompress, just copy data - indexWriter.WriteIndex(it.chunkDocs, fieldsStream.FilePointer); + indexWriter.WriteIndex(it.chunkDocs, fieldsStream.GetFilePointer()); WriteHeader(this.docBase, it.chunkDocs, it.numStoredFields, it.lengths); it.CopyCompressedData(fieldsStream); this.docBase += it.chunkDocs; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/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 31b0271..f3b729e 100644 --- a/src/Lucene.Net.Core/Codecs/Compressing/CompressingTermVectorsWriter.cs +++ b/src/Lucene.Net.Core/Codecs/Compressing/CompressingTermVectorsWriter.cs @@ -262,8 +262,8 @@ namespace Lucene.Net.Codecs.Compressing string codecNameDat = formatName + CODEC_SFX_DAT; CodecUtil.WriteHeader(indexStream, codecNameIdx, VERSION_CURRENT); CodecUtil.WriteHeader(vectorsStream, codecNameDat, VERSION_CURRENT); - Debug.Assert(CodecUtil.HeaderLength(codecNameDat) == vectorsStream.FilePointer); - Debug.Assert(CodecUtil.HeaderLength(codecNameIdx) == indexStream.FilePointer); + Debug.Assert(CodecUtil.HeaderLength(codecNameDat) == vectorsStream.GetFilePointer()); + Debug.Assert(CodecUtil.HeaderLength(codecNameIdx) == indexStream.GetFilePointer()); indexWriter = new CompressingStoredFieldsIndexWriter(indexStream); indexStream = null; @@ -377,7 +377,7 @@ namespace Lucene.Net.Codecs.Compressing Debug.Assert(chunkDocs > 0, chunkDocs.ToString()); // write the index file - indexWriter.WriteIndex(chunkDocs, vectorsStream.FilePointer); + indexWriter.WriteIndex(chunkDocs, vectorsStream.GetFilePointer()); int docBase = numDocs - chunkDocs; vectorsStream.WriteVInt32(docBase); @@ -779,7 +779,7 @@ namespace Lucene.Net.Codecs.Compressing { throw new Exception("Wrote " + this.numDocs + " docs, finish called with numDocs=" + numDocs); } - indexWriter.Finish(numDocs, vectorsStream.FilePointer); + indexWriter.Finish(numDocs, vectorsStream.GetFilePointer()); CodecUtil.WriteFooter(vectorsStream); } @@ -920,7 +920,7 @@ namespace Lucene.Net.Codecs.Compressing { long chunkEnd = index.GetStartPointer(docBase + chunkDocs); long chunkLength = chunkEnd - vectorsStream.GetFilePointer(); - indexWriter.WriteIndex(chunkDocs, this.vectorsStream.FilePointer); + indexWriter.WriteIndex(chunkDocs, this.vectorsStream.GetFilePointer()); this.vectorsStream.WriteVInt32(docCount); this.vectorsStream.WriteVInt32(chunkDocs); this.vectorsStream.CopyBytes(vectorsStream, chunkLength); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40StoredFieldsWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40StoredFieldsWriter.cs b/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40StoredFieldsWriter.cs index 2083d1a..b33e43f 100644 --- a/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40StoredFieldsWriter.cs +++ b/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40StoredFieldsWriter.cs @@ -99,8 +99,8 @@ namespace Lucene.Net.Codecs.Lucene40 CodecUtil.WriteHeader(fieldsStream, CODEC_NAME_DAT, VERSION_CURRENT); CodecUtil.WriteHeader(indexStream, CODEC_NAME_IDX, VERSION_CURRENT); - Debug.Assert(HEADER_LENGTH_DAT == fieldsStream.FilePointer); - Debug.Assert(HEADER_LENGTH_IDX == indexStream.FilePointer); + Debug.Assert(HEADER_LENGTH_DAT == fieldsStream.GetFilePointer()); + Debug.Assert(HEADER_LENGTH_IDX == indexStream.GetFilePointer()); success = true; } finally @@ -118,7 +118,7 @@ namespace Lucene.Net.Codecs.Lucene40 // in the correct fields format. public override void StartDocument(int numStoredFields) { - indexStream.WriteInt64(fieldsStream.FilePointer); + indexStream.WriteInt64(fieldsStream.GetFilePointer()); fieldsStream.WriteVInt32(numStoredFields); } @@ -249,7 +249,7 @@ namespace Lucene.Net.Codecs.Lucene40 /// </summary> public void AddRawDocuments(IndexInput stream, int[] lengths, int numDocs) { - long position = fieldsStream.FilePointer; + long position = fieldsStream.GetFilePointer(); long start = position; for (int i = 0; i < numDocs; i++) { @@ -257,19 +257,19 @@ namespace Lucene.Net.Codecs.Lucene40 position += lengths[i]; } fieldsStream.CopyBytes(stream, position - start); - Debug.Assert(fieldsStream.FilePointer == position); + Debug.Assert(fieldsStream.GetFilePointer() == position); } public override void Finish(FieldInfos fis, int numDocs) { - if (HEADER_LENGTH_IDX + ((long)numDocs) * 8 != indexStream.FilePointer) + if (HEADER_LENGTH_IDX + ((long)numDocs) * 8 != indexStream.GetFilePointer()) // this is most likely a bug in Sun JRE 1.6.0_04/_05; // we detect that the bug has struck, here, and // throw an exception to prevent the corruption from // entering the index. See LUCENE-1282 for // details. { - throw new Exception("fdx size mismatch: docCount is " + numDocs + " but fdx file size is " + indexStream.FilePointer + " file=" + indexStream.ToString() + "; now aborting this merge to prevent index corruption"); + throw new Exception("fdx size mismatch: docCount is " + numDocs + " but fdx file size is " + indexStream.GetFilePointer() + " file=" + indexStream.ToString() + "; now aborting this merge to prevent index corruption"); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40TermVectorsWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40TermVectorsWriter.cs b/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40TermVectorsWriter.cs index 9766f83..43d1f0d 100644 --- a/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40TermVectorsWriter.cs +++ b/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40TermVectorsWriter.cs @@ -76,9 +76,9 @@ namespace Lucene.Net.Codecs.Lucene40 CodecUtil.WriteHeader(tvd, Lucene40TermVectorsReader.CODEC_NAME_DOCS, Lucene40TermVectorsReader.VERSION_CURRENT); tvf = directory.CreateOutput(IndexFileNames.SegmentFileName(segment, "", Lucene40TermVectorsReader.VECTORS_FIELDS_EXTENSION), context); CodecUtil.WriteHeader(tvf, Lucene40TermVectorsReader.CODEC_NAME_FIELDS, Lucene40TermVectorsReader.VERSION_CURRENT); - Debug.Assert(Lucene40TermVectorsReader.HEADER_LENGTH_INDEX == tvx.FilePointer); - Debug.Assert(Lucene40TermVectorsReader.HEADER_LENGTH_DOCS == tvd.FilePointer); - Debug.Assert(Lucene40TermVectorsReader.HEADER_LENGTH_FIELDS == tvf.FilePointer); + Debug.Assert(Lucene40TermVectorsReader.HEADER_LENGTH_INDEX == tvx.GetFilePointer()); + Debug.Assert(Lucene40TermVectorsReader.HEADER_LENGTH_DOCS == tvd.GetFilePointer()); + Debug.Assert(Lucene40TermVectorsReader.HEADER_LENGTH_FIELDS == tvf.GetFilePointer()); success = true; } finally @@ -94,8 +94,8 @@ namespace Lucene.Net.Codecs.Lucene40 { lastFieldName = null; this.numVectorFields = numVectorFields; - tvx.WriteInt64(tvd.FilePointer); - tvx.WriteInt64(tvf.FilePointer); + tvx.WriteInt64(tvd.GetFilePointer()); + tvx.WriteInt64(tvf.GetFilePointer()); tvd.WriteVInt32(numVectorFields); fieldCount = 0; fps = ArrayUtil.Grow(fps, numVectorFields); @@ -115,7 +115,7 @@ namespace Lucene.Net.Codecs.Lucene40 this.payloads = payloads; lastTerm.Length = 0; lastPayloadLength = -1; // force first payload to write its length - fps[fieldCount++] = tvf.FilePointer; + fps[fieldCount++] = tvf.GetFilePointer(); tvd.WriteVInt32(info.Number); tvf.WriteVInt32(numTerms); sbyte bits = 0x0; @@ -340,8 +340,8 @@ namespace Lucene.Net.Codecs.Lucene40 /// </summary> private void AddRawDocuments(Lucene40TermVectorsReader reader, int[] tvdLengths, int[] tvfLengths, int numDocs) { - long tvdPosition = tvd.FilePointer; - long tvfPosition = tvf.FilePointer; + long tvdPosition = tvd.GetFilePointer(); + long tvfPosition = tvf.GetFilePointer(); long tvdStart = tvdPosition; long tvfStart = tvfPosition; for (int i = 0; i < numDocs; i++) @@ -353,8 +353,8 @@ namespace Lucene.Net.Codecs.Lucene40 } tvd.CopyBytes(reader.TvdStream, tvdPosition - tvdStart); tvf.CopyBytes(reader.TvfStream, tvfPosition - tvfStart); - Debug.Assert(tvd.FilePointer == tvdPosition); - Debug.Assert(tvf.FilePointer == tvfPosition); + Debug.Assert(tvd.GetFilePointer() == tvdPosition); + Debug.Assert(tvf.GetFilePointer() == tvfPosition); } public override int Merge(MergeState mergeState) @@ -492,14 +492,14 @@ namespace Lucene.Net.Codecs.Lucene40 public override void Finish(FieldInfos fis, int numDocs) { - if (Lucene40TermVectorsReader.HEADER_LENGTH_INDEX + ((long)numDocs) * 16 != tvx.FilePointer) + if (Lucene40TermVectorsReader.HEADER_LENGTH_INDEX + ((long)numDocs) * 16 != tvx.GetFilePointer()) // this is most likely a bug in Sun JRE 1.6.0_04/_05; // we detect that the bug has struck, here, and // throw an exception to prevent the corruption from // entering the index. See LUCENE-1282 for // details. { - throw new Exception("tvx size mismatch: mergedDocs is " + numDocs + " but tvx size is " + tvx.FilePointer + " file=" + tvx.ToString() + "; now aborting this merge to prevent index corruption"); + throw new Exception("tvx size mismatch: mergedDocs is " + numDocs + " but tvx size is " + tvx.GetFilePointer() + " file=" + tvx.ToString() + "; now aborting this merge to prevent index corruption"); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.Core/Codecs/Lucene41/Lucene41PostingsWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Codecs/Lucene41/Lucene41PostingsWriter.cs b/src/Lucene.Net.Core/Codecs/Lucene41/Lucene41PostingsWriter.cs index 60732d7..dcd68f1 100644 --- a/src/Lucene.Net.Core/Codecs/Lucene41/Lucene41PostingsWriter.cs +++ b/src/Lucene.Net.Core/Codecs/Lucene41/Lucene41PostingsWriter.cs @@ -272,13 +272,13 @@ namespace Lucene.Net.Codecs.Lucene41 public override void StartTerm() { - docStartFP = docOut.FilePointer; + docStartFP = docOut.GetFilePointer(); if (fieldHasPositions) { - posStartFP = posOut.FilePointer; + posStartFP = posOut.GetFilePointer(); if (fieldHasPayloads || fieldHasOffsets) { - payStartFP = payOut.FilePointer; + payStartFP = payOut.GetFilePointer(); } } lastDocID = 0; @@ -419,9 +419,9 @@ namespace Lucene.Net.Codecs.Lucene41 { if (payOut != null) { - lastBlockPayFP = payOut.FilePointer; + lastBlockPayFP = payOut.GetFilePointer(); } - lastBlockPosFP = posOut.FilePointer; + lastBlockPosFP = posOut.GetFilePointer(); lastBlockPosBufferUpto = posBufferUpto; lastBlockPayloadByteUpto = payloadByteUpto; } @@ -500,7 +500,7 @@ namespace Lucene.Net.Codecs.Lucene41 if (state2.TotalTermFreq > Lucene41PostingsFormat.BLOCK_SIZE) { // record file offset for last pos in last block - lastPosBlockOffset = posOut.FilePointer - posStartFP; + lastPosBlockOffset = posOut.GetFilePointer() - posStartFP; } else { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.Core/Codecs/Lucene41/Lucene41SkipWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Codecs/Lucene41/Lucene41SkipWriter.cs b/src/Lucene.Net.Core/Codecs/Lucene41/Lucene41SkipWriter.cs index c8bebc6..3565a5d 100644 --- a/src/Lucene.Net.Core/Codecs/Lucene41/Lucene41SkipWriter.cs +++ b/src/Lucene.Net.Core/Codecs/Lucene41/Lucene41SkipWriter.cs @@ -96,17 +96,17 @@ namespace Lucene.Net.Codecs.Lucene41 { base.ResetSkip(); Arrays.Fill(lastSkipDoc, 0); - Arrays.Fill(lastSkipDocPointer, docOut.FilePointer); + Arrays.Fill(lastSkipDocPointer, docOut.GetFilePointer()); if (fieldHasPositions) { - Arrays.Fill(lastSkipPosPointer, posOut.FilePointer); + Arrays.Fill(lastSkipPosPointer, posOut.GetFilePointer()); if (fieldHasPayloads) { Arrays.Fill(lastPayloadByteUpto, 0); } if (fieldHasOffsets || fieldHasPayloads) { - Arrays.Fill(lastSkipPayPointer, payOut.FilePointer); + Arrays.Fill(lastSkipPayPointer, payOut.GetFilePointer()); } } } @@ -117,7 +117,7 @@ namespace Lucene.Net.Codecs.Lucene41 public void BufferSkip(int doc, int numDocs, long posFP, long payFP, int posBufferUpto, int payloadByteUpto) { this.curDoc = doc; - this.curDocPointer = docOut.FilePointer; + this.curDocPointer = docOut.GetFilePointer(); this.curPosPointer = posFP; this.curPayPointer = payFP; this.curPosBufferUpto = posBufferUpto; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.Core/Codecs/Lucene42/Lucene42NormsConsumer.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Codecs/Lucene42/Lucene42NormsConsumer.cs b/src/Lucene.Net.Core/Codecs/Lucene42/Lucene42NormsConsumer.cs index 794ceaa..fa445de 100644 --- a/src/Lucene.Net.Core/Codecs/Lucene42/Lucene42NormsConsumer.cs +++ b/src/Lucene.Net.Core/Codecs/Lucene42/Lucene42NormsConsumer.cs @@ -79,7 +79,7 @@ namespace Lucene.Net.Codecs.Lucene42 { meta.WriteVInt32(field.Number); meta.WriteByte((byte)NUMBER); - meta.WriteInt64(data.FilePointer); + meta.WriteInt64(data.GetFilePointer()); long minValue = long.MaxValue; long maxValue = long.MinValue; long gcd = 0; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.Core/Codecs/Lucene45/Lucene45DocValuesConsumer.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Codecs/Lucene45/Lucene45DocValuesConsumer.cs b/src/Lucene.Net.Core/Codecs/Lucene45/Lucene45DocValuesConsumer.cs index deaa616..76ebffa 100644 --- a/src/Lucene.Net.Core/Codecs/Lucene45/Lucene45DocValuesConsumer.cs +++ b/src/Lucene.Net.Core/Codecs/Lucene45/Lucene45DocValuesConsumer.cs @@ -200,7 +200,7 @@ namespace Lucene.Net.Codecs.Lucene45 meta.WriteVInt32(format); if (missing) { - meta.WriteInt64(data.FilePointer); + meta.WriteInt64(data.GetFilePointer()); WriteMissingBitset(values); } else @@ -208,7 +208,7 @@ namespace Lucene.Net.Codecs.Lucene45 meta.WriteInt64(-1L); } meta.WriteVInt32(PackedInt32s.VERSION_CURRENT); - meta.WriteInt64(data.FilePointer); + meta.WriteInt64(data.GetFilePointer()); meta.WriteVInt64(count); meta.WriteVInt32(BLOCK_SIZE); @@ -292,7 +292,7 @@ namespace Lucene.Net.Codecs.Lucene45 meta.WriteByte((byte)Lucene45DocValuesFormat.BINARY); int minLength = int.MaxValue; int maxLength = int.MinValue; - long startFP = data.FilePointer; + long startFP = data.GetFilePointer(); long count = 0; bool missing = false; foreach (BytesRef v in values) @@ -318,7 +318,7 @@ namespace Lucene.Net.Codecs.Lucene45 meta.WriteVInt32(minLength == maxLength ? BINARY_FIXED_UNCOMPRESSED : BINARY_VARIABLE_UNCOMPRESSED); if (missing) { - meta.WriteInt64(data.FilePointer); + meta.WriteInt64(data.GetFilePointer()); WriteMissingBitset(values); } else @@ -334,7 +334,7 @@ namespace Lucene.Net.Codecs.Lucene45 // otherwise, we need to record the length fields... if (minLength != maxLength) { - meta.WriteInt64(data.FilePointer); + meta.WriteInt64(data.GetFilePointer()); meta.WriteVInt32(PackedInt32s.VERSION_CURRENT); meta.WriteVInt32(BLOCK_SIZE); @@ -377,7 +377,7 @@ namespace Lucene.Net.Codecs.Lucene45 meta.WriteVInt32(BINARY_PREFIX_COMPRESSED); meta.WriteInt64(-1L); // now write the bytes: sharing prefixes within a block - long startFP = data.FilePointer; + long startFP = data.GetFilePointer(); // currently, we have to store the delta from expected for every 1/nth term // we could avoid this, but its not much and less overall RAM than the previous approach! RAMOutputStream addressBuffer = new RAMOutputStream(); @@ -388,7 +388,7 @@ namespace Lucene.Net.Codecs.Lucene45 { if (count % ADDRESS_INTERVAL == 0) { - termAddresses.Add(data.FilePointer - startFP); + termAddresses.Add(data.GetFilePointer() - startFP); // force the first term in a block to be abs-encoded lastTerm.Length = 0; } @@ -401,7 +401,7 @@ namespace Lucene.Net.Codecs.Lucene45 lastTerm.CopyBytes(v); count++; } - long indexStartFP = data.FilePointer; + long indexStartFP = data.GetFilePointer(); // write addresses of indexed terms termAddresses.Finish(); addressBuffer.WriteTo(data); @@ -459,7 +459,7 @@ namespace Lucene.Net.Codecs.Lucene45 meta.WriteVInt32(DELTA_COMPRESSED); meta.WriteInt64(-1L); meta.WriteVInt32(PackedInt32s.VERSION_CURRENT); - meta.WriteInt64(data.FilePointer); + meta.WriteInt64(data.GetFilePointer()); meta.WriteVInt64(maxDoc); meta.WriteVInt32(BLOCK_SIZE); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.Core/Codecs/MultiLevelSkipListWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Codecs/MultiLevelSkipListWriter.cs b/src/Lucene.Net.Core/Codecs/MultiLevelSkipListWriter.cs index 802548d..d7fe18b 100644 --- a/src/Lucene.Net.Core/Codecs/MultiLevelSkipListWriter.cs +++ b/src/Lucene.Net.Core/Codecs/MultiLevelSkipListWriter.cs @@ -163,7 +163,7 @@ namespace Lucene.Net.Codecs { WriteSkipData(level, skipBuffer[level]); - long newChildPointer = skipBuffer[level].FilePointer; + long newChildPointer = skipBuffer[level].GetFilePointer(); if (level != 0) { @@ -183,7 +183,7 @@ namespace Lucene.Net.Codecs /// <returns> the pointer the skip list starts </returns> public virtual long WriteSkip(IndexOutput output) { - long skipPointer = output.FilePointer; + long skipPointer = output.GetFilePointer(); //System.out.println("skipper.writeSkip fp=" + skipPointer); if (skipBuffer == null || skipBuffer.Length == 0) { @@ -192,7 +192,7 @@ namespace Lucene.Net.Codecs for (int level = m_numberOfSkipLevels - 1; level > 0; level--) { - long length = skipBuffer[level].FilePointer; + long length = skipBuffer[level].GetFilePointer(); if (length > 0) { output.WriteVInt64(length); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.Core/Store/BufferedIndexOutput.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Store/BufferedIndexOutput.cs b/src/Lucene.Net.Core/Store/BufferedIndexOutput.cs index 2d7ab47..e2eb9a6 100644 --- a/src/Lucene.Net.Core/Store/BufferedIndexOutput.cs +++ b/src/Lucene.Net.Core/Store/BufferedIndexOutput.cs @@ -150,12 +150,9 @@ namespace Lucene.Net.Store Flush(); } - public override long FilePointer + public override long GetFilePointer() { - get - { - return bufferStart + bufferPosition; - } + return bufferStart + bufferPosition; } [Obsolete("(4.1) this method will be removed in Lucene 5.0")] http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.Core/Store/CompoundFileWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Store/CompoundFileWriter.cs b/src/Lucene.Net.Core/Store/CompoundFileWriter.cs index 7783832..062ff81 100644 --- a/src/Lucene.Net.Core/Store/CompoundFileWriter.cs +++ b/src/Lucene.Net.Core/Store/CompoundFileWriter.cs @@ -216,11 +216,11 @@ namespace Lucene.Net.Store bool success = false; try { - long startPtr = dataOut.FilePointer; + long startPtr = dataOut.GetFilePointer(); long length = fileEntry.Length; dataOut.CopyBytes(@is, length); // Verify that the output length diff is equal to original file - long endPtr = dataOut.FilePointer; + long endPtr = dataOut.GetFilePointer(); long diff = endPtr - startPtr; if (diff != length) { @@ -369,7 +369,7 @@ namespace Lucene.Net.Store this.outerInstance = outerInstance; this.@delegate = @delegate; this.entry = entry; - entry.Offset = offset = @delegate.FilePointer; + entry.Offset = offset = @delegate.GetFilePointer(); this.isSeparate = isSeparate; } @@ -400,12 +400,9 @@ namespace Lucene.Net.Store } } - public override long FilePointer + public override long GetFilePointer() { - get - { - return @delegate.FilePointer - offset; - } + return @delegate.GetFilePointer() - offset; } [Obsolete("(4.1) this method will be removed in Lucene 5.0")] http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.Core/Store/IndexOutput.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Store/IndexOutput.cs b/src/Lucene.Net.Core/Store/IndexOutput.cs index 8342316..d31a2a9 100644 --- a/src/Lucene.Net.Core/Store/IndexOutput.cs +++ b/src/Lucene.Net.Core/Store/IndexOutput.cs @@ -42,7 +42,7 @@ namespace Lucene.Net.Store /// Returns the current position in this file, where the next write will /// occur. </summary> /// <seealso cref= #seek(long) </seealso> - public abstract long FilePointer { get; } // LUCENENET TODO: API Change to GetFilePointer() (makes conversion) + public abstract long GetFilePointer(); /// <summary> /// Sets current position in this file, where the next write will occur. </summary> http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.Core/Store/RAMOutputStream.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Store/RAMOutputStream.cs b/src/Lucene.Net.Core/Store/RAMOutputStream.cs index 23bde83..ed2d428 100644 --- a/src/Lucene.Net.Core/Store/RAMOutputStream.cs +++ b/src/Lucene.Net.Core/Store/RAMOutputStream.cs @@ -209,12 +209,9 @@ namespace Lucene.Net.Store SetFileLength(); } - public override long FilePointer + public override long GetFilePointer() { - get - { - return currentBufferIndex < 0 ? 0 : bufferStart + bufferPosition; - } + return currentBufferIndex < 0 ? 0 : bufferStart + bufferPosition; } /// <summary> http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.Core/Util/Fst/FST.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Util/Fst/FST.cs b/src/Lucene.Net.Core/Util/Fst/FST.cs index 88d4d4c..4f290fe 100644 --- a/src/Lucene.Net.Core/Util/Fst/FST.cs +++ b/src/Lucene.Net.Core/Util/Fst/FST.cs @@ -517,7 +517,7 @@ namespace Lucene.Net.Util.Fst var ros = new RAMOutputStream(); Outputs.WriteFinalOutput(emptyOutput, ros); - var emptyOutputBytes = new byte[(int)ros.FilePointer]; + var emptyOutputBytes = new byte[(int)ros.GetFilePointer()]; ros.WriteTo(emptyOutputBytes, 0); if (!packed) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.Misc/Index/Sorter/SortingAtomicReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Misc/Index/Sorter/SortingAtomicReader.cs b/src/Lucene.Net.Misc/Index/Sorter/SortingAtomicReader.cs index 894193f..e874b88 100644 --- a/src/Lucene.Net.Misc/Index/Sorter/SortingAtomicReader.cs +++ b/src/Lucene.Net.Misc/Index/Sorter/SortingAtomicReader.cs @@ -658,7 +658,7 @@ namespace Lucene.Net.Index.Sorter offsets = Arrays.CopyOf(offsets, newLength); } docs[i] = docMap.OldToNew(doc); - offsets[i] = @out.FilePointer; + offsets[i] = @out.GetFilePointer(); AddPositions(@in, @out); i++; } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWFieldsWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWFieldsWriter.cs b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWFieldsWriter.cs index e30744e..053933a 100644 --- a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWFieldsWriter.cs +++ b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWFieldsWriter.cs @@ -232,10 +232,10 @@ namespace Lucene.Net.Codecs.Lucene3x { //System.out.println(" w term=" + text.utf8ToString()); OuterInstance.SkipListWriter.ResetSkip(); - TermInfo.FreqPointer = OuterInstance.FreqOut.FilePointer; + TermInfo.FreqPointer = OuterInstance.FreqOut.GetFilePointer(); if (OuterInstance.ProxOut != null) { - TermInfo.ProxPointer = OuterInstance.ProxOut.FilePointer; + TermInfo.ProxPointer = OuterInstance.ProxOut.GetFilePointer(); } return postingsWriter.Reset(); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWSkipListWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWSkipListWriter.cs b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWSkipListWriter.cs index 0ce2d24..2d919e1 100644 --- a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWSkipListWriter.cs +++ b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWSkipListWriter.cs @@ -61,10 +61,10 @@ namespace Lucene.Net.Codecs.Lucene3x this.CurDoc = doc; this.CurStorePayloads = storePayloads; this.CurPayloadLength = payloadLength; - this.CurFreqPointer = FreqOutput.FilePointer; + this.CurFreqPointer = FreqOutput.GetFilePointer(); if (ProxOutput != null) { - this.CurProxPointer = ProxOutput.FilePointer; + this.CurProxPointer = ProxOutput.GetFilePointer(); } } @@ -73,10 +73,10 @@ namespace Lucene.Net.Codecs.Lucene3x base.ResetSkip(); Arrays.Fill(LastSkipDoc, 0); Arrays.Fill(LastSkipPayloadLength, -1); // we don't have to write the first length in the skip list - Arrays.Fill(LastSkipFreqPointer, FreqOutput.FilePointer); + Arrays.Fill(LastSkipFreqPointer, FreqOutput.GetFilePointer()); if (ProxOutput != null) { - Arrays.Fill(LastSkipProxPointer, ProxOutput.FilePointer); + Arrays.Fill(LastSkipProxPointer, ProxOutput.GetFilePointer()); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWStoredFieldsWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWStoredFieldsWriter.cs b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWStoredFieldsWriter.cs index 628564a..2574d50 100644 --- a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWStoredFieldsWriter.cs +++ b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWStoredFieldsWriter.cs @@ -73,7 +73,7 @@ namespace Lucene.Net.Codecs.Lucene3x // in the correct fields format. public override void StartDocument(int numStoredFields) { - IndexStream.WriteInt64(FieldsStream.FilePointer); + IndexStream.WriteInt64(FieldsStream.GetFilePointer()); FieldsStream.WriteVInt32(numStoredFields); } @@ -199,14 +199,14 @@ namespace Lucene.Net.Codecs.Lucene3x public override void Finish(FieldInfos fis, int numDocs) { - if (4 + ((long)numDocs) * 8 != IndexStream.FilePointer) + if (4 + ((long)numDocs) * 8 != IndexStream.GetFilePointer()) // this is most likely a bug in Sun JRE 1.6.0_04/_05; // we detect that the bug has struck, here, and // throw an exception to prevent the corruption from // entering the index. See LUCENE-1282 for // details. { - throw new Exception("fdx size mismatch: docCount is " + numDocs + " but fdx file size is " + IndexStream.FilePointer + " file=" + IndexStream.ToString() + "; now aborting this merge to prevent index corruption"); + throw new Exception("fdx size mismatch: docCount is " + numDocs + " but fdx file size is " + IndexStream.GetFilePointer() + " file=" + IndexStream.ToString() + "; now aborting this merge to prevent index corruption"); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWTermVectorsWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWTermVectorsWriter.cs b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWTermVectorsWriter.cs index e1c1b4f..c1797fa 100644 --- a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWTermVectorsWriter.cs +++ b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWTermVectorsWriter.cs @@ -70,8 +70,8 @@ namespace Lucene.Net.Codecs.Lucene3x { LastFieldName = null; this.NumVectorFields = numVectorFields; - Tvx.WriteInt64(Tvd.FilePointer); - Tvx.WriteInt64(Tvf.FilePointer); + Tvx.WriteInt64(Tvd.GetFilePointer()); + Tvx.WriteInt64(Tvf.GetFilePointer()); Tvd.WriteVInt32(numVectorFields); FieldCount = 0; Fps = ArrayUtil.Grow(Fps, numVectorFields); @@ -93,7 +93,7 @@ namespace Lucene.Net.Codecs.Lucene3x this.Positions = positions; this.Offsets = offsets; LastTerm.Length = 0; - Fps[FieldCount++] = Tvf.FilePointer; + Fps[FieldCount++] = Tvf.GetFilePointer(); Tvd.WriteVInt32(info.Number); Tvf.WriteVInt32(numTerms); sbyte bits = 0x0; @@ -211,14 +211,14 @@ namespace Lucene.Net.Codecs.Lucene3x public override void Finish(FieldInfos fis, int numDocs) { - if (4 + ((long)numDocs) * 16 != Tvx.FilePointer) + if (4 + ((long)numDocs) * 16 != Tvx.GetFilePointer()) // this is most likely a bug in Sun JRE 1.6.0_04/_05; // we detect that the bug has struck, here, and // throw an exception to prevent the corruption from // entering the index. See LUCENE-1282 for // details. { - throw new Exception("tvx size mismatch: mergedDocs is " + numDocs + " but tvx size is " + Tvx.FilePointer + " file=" + Tvx.ToString() + "; now aborting this merge to prevent index corruption"); + throw new Exception("tvx size mismatch: mergedDocs is " + numDocs + " but tvx size is " + Tvx.GetFilePointer() + " file=" + Tvx.ToString() + "; now aborting this merge to prevent index corruption"); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.TestFramework/Codecs/Lucene3x/TermInfosWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/TermInfosWriter.cs b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/TermInfosWriter.cs index 9ce1408..f64a99b 100644 --- a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/TermInfosWriter.cs +++ b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/TermInfosWriter.cs @@ -272,8 +272,8 @@ namespace Lucene.Net.Codecs.Lucene3x if (IsIndex) { - Output.WriteVInt64(Other.Output.FilePointer - LastIndexPointer); - LastIndexPointer = Other.Output.FilePointer; // write pointer + Output.WriteVInt64(Other.Output.GetFilePointer() - LastIndexPointer); + LastIndexPointer = Other.Output.GetFilePointer(); // write pointer } LastFieldNumber = fieldNumber; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40DocValuesWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40DocValuesWriter.cs b/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40DocValuesWriter.cs index d8e3ccd..51c4b36 100644 --- a/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40DocValuesWriter.cs +++ b/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40DocValuesWriter.cs @@ -323,7 +323,7 @@ namespace Lucene.Net.Codecs.Lucene40 /* values */ - long startPos = data.FilePointer; + long startPos = data.GetFilePointer(); foreach (BytesRef v in values) { @@ -335,7 +335,7 @@ namespace Lucene.Net.Codecs.Lucene40 /* addresses */ - long maxAddress = data.FilePointer - startPos; + long maxAddress = data.GetFilePointer() - startPos; index.WriteVInt64(maxAddress); int maxDoc = State.SegmentInfo.DocCount; @@ -418,19 +418,19 @@ namespace Lucene.Net.Codecs.Lucene40 } /* values */ - long startPosition = data.FilePointer; + long startPosition = data.GetFilePointer(); long currentAddress = 0; Dictionary<BytesRef, long> valueToAddress = new Dictionary<BytesRef, long>(); foreach (BytesRef v in dictionary) { - currentAddress = data.FilePointer - startPosition; + currentAddress = data.GetFilePointer() - startPosition; valueToAddress[v] = currentAddress; WriteVShort(data, v.Length); data.WriteBytes(v.Bytes, v.Offset, v.Length); } /* ordinals */ - long totalBytes = data.FilePointer - startPosition; + long totalBytes = data.GetFilePointer() - startPosition; index.WriteInt64(totalBytes); int maxDoc = State.SegmentInfo.DocCount; PackedInt32s.Writer w = PackedInt32s.GetWriter(index, maxDoc, PackedInt32s.BitsRequired(currentAddress), PackedInt32s.DEFAULT); @@ -570,7 +570,7 @@ namespace Lucene.Net.Codecs.Lucene40 /* values */ - long startPos = data.FilePointer; + long startPos = data.GetFilePointer(); int valueCount = 0; foreach (BytesRef v in values) @@ -581,7 +581,7 @@ namespace Lucene.Net.Codecs.Lucene40 /* addresses */ - long maxAddress = data.FilePointer - startPos; + long maxAddress = data.GetFilePointer() - startPos; index.WriteInt64(maxAddress); Debug.Assert(valueCount != int.MaxValue); // unsupported by the 4.0 impl http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40PostingsWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40PostingsWriter.cs b/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40PostingsWriter.cs index 1068ab4..4d99635 100644 --- a/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40PostingsWriter.cs +++ b/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40PostingsWriter.cs @@ -164,11 +164,11 @@ namespace Lucene.Net.Codecs.Lucene40 public override void StartTerm() { - FreqStart = FreqOut.FilePointer; + FreqStart = FreqOut.GetFilePointer(); //if (DEBUG) System.out.println("SPW: startTerm freqOut.fp=" + freqStart); if (ProxOut != null) { - ProxStart = ProxOut.FilePointer; + ProxStart = ProxOut.GetFilePointer(); } // force first payload to write its length LastPayloadLength = -1; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40SkipListWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40SkipListWriter.cs b/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40SkipListWriter.cs index aa8e52e..9bde9fc 100644 --- a/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40SkipListWriter.cs +++ b/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40SkipListWriter.cs @@ -77,10 +77,10 @@ namespace Lucene.Net.Codecs.Lucene40 this.CurPayloadLength = payloadLength; this.CurStoreOffsets = storeOffsets; this.CurOffsetLength = offsetLength; - this.CurFreqPointer = FreqOutput.FilePointer; + this.CurFreqPointer = FreqOutput.GetFilePointer(); if (ProxOutput != null) { - this.CurProxPointer = ProxOutput.FilePointer; + this.CurProxPointer = ProxOutput.GetFilePointer(); } } @@ -90,10 +90,10 @@ namespace Lucene.Net.Codecs.Lucene40 Arrays.Fill(LastSkipDoc, 0); Arrays.Fill(LastSkipPayloadLength, -1); // we don't have to write the first length in the skip list Arrays.Fill(LastSkipOffsetLength, -1); // we don't have to write the first length in the skip list - Arrays.Fill(LastSkipFreqPointer, FreqOutput.FilePointer); + Arrays.Fill(LastSkipFreqPointer, FreqOutput.GetFilePointer()); if (ProxOutput != null) { - Arrays.Fill(LastSkipProxPointer, ProxOutput.FilePointer); + Arrays.Fill(LastSkipProxPointer, ProxOutput.GetFilePointer()); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.TestFramework/Codecs/Lucene42/Lucene42DocValuesConsumer.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Codecs/Lucene42/Lucene42DocValuesConsumer.cs b/src/Lucene.Net.TestFramework/Codecs/Lucene42/Lucene42DocValuesConsumer.cs index b76d113..32e943b 100644 --- a/src/Lucene.Net.TestFramework/Codecs/Lucene42/Lucene42DocValuesConsumer.cs +++ b/src/Lucene.Net.TestFramework/Codecs/Lucene42/Lucene42DocValuesConsumer.cs @@ -89,7 +89,7 @@ namespace Lucene.Net.Codecs.Lucene42 { Meta.WriteVInt32(field.Number); Meta.WriteByte((byte)Lucene42DocValuesProducer.NUMBER); - Meta.WriteInt64(Data.FilePointer); + Meta.WriteInt64(Data.GetFilePointer()); long minValue = long.MaxValue; long maxValue = long.MinValue; long gcd = 0; @@ -241,7 +241,7 @@ namespace Lucene.Net.Codecs.Lucene42 Meta.WriteByte((byte)Lucene42DocValuesProducer.BYTES); int minLength = int.MaxValue; int maxLength = int.MinValue; - long startFP = Data.FilePointer; + long startFP = Data.GetFilePointer(); foreach (BytesRef v in values) { int length = v == null ? 0 : v.Length; @@ -257,7 +257,7 @@ namespace Lucene.Net.Codecs.Lucene42 } } Meta.WriteInt64(startFP); - Meta.WriteInt64(Data.FilePointer - startFP); + Meta.WriteInt64(Data.GetFilePointer() - startFP); Meta.WriteVInt32(minLength); Meta.WriteVInt32(maxLength); @@ -286,7 +286,7 @@ namespace Lucene.Net.Codecs.Lucene42 { Meta.WriteVInt32(field.Number); Meta.WriteByte((byte)Lucene42DocValuesProducer.FST); - Meta.WriteInt64(Data.FilePointer); + Meta.WriteInt64(Data.GetFilePointer()); PositiveInt32Outputs outputs = PositiveInt32Outputs.Singleton; Builder<long?> builder = new Builder<long?>(INPUT_TYPE.BYTE1, outputs); Int32sRef scratch = new Int32sRef(); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/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 99a067b..4874218 100644 --- a/src/Lucene.Net.TestFramework/Codecs/MockSep/MockSingleIntIndexOutput.cs +++ b/src/Lucene.Net.TestFramework/Codecs/MockSep/MockSingleIntIndexOutput.cs @@ -52,7 +52,7 @@ namespace Lucene.Net.Codecs.MockSep public override string ToString() { - return "MockSingleIntIndexOutput fp=" + @out.FilePointer; + return "MockSingleIntIndexOutput fp=" + @out.GetFilePointer(); } private class MockSingleIntIndexOutputIndex : AbstractIndex @@ -68,7 +68,7 @@ namespace Lucene.Net.Codecs.MockSep public override void Mark() { - fp = [email protected]; + fp = [email protected](); } public override void CopyFrom(AbstractIndex other, bool copyLast) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.TestFramework/Store/MockIndexOutputWrapper.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Store/MockIndexOutputWrapper.cs b/src/Lucene.Net.TestFramework/Store/MockIndexOutputWrapper.cs index 95a28d8..ad61d71 100644 --- a/src/Lucene.Net.TestFramework/Store/MockIndexOutputWrapper.cs +++ b/src/Lucene.Net.TestFramework/Store/MockIndexOutputWrapper.cs @@ -164,12 +164,9 @@ namespace Lucene.Net.Store } } - public override long FilePointer + public override long GetFilePointer() { - get - { - return @delegate.FilePointer; - } + return @delegate.GetFilePointer(); } [Obsolete("(4.1) this method will be removed in Lucene 5.0")] http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.TestFramework/Util/ThrottledIndexOutput.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Util/ThrottledIndexOutput.cs b/src/Lucene.Net.TestFramework/Util/ThrottledIndexOutput.cs index 0e7b2d4..64237a3 100644 --- a/src/Lucene.Net.TestFramework/Util/ThrottledIndexOutput.cs +++ b/src/Lucene.Net.TestFramework/Util/ThrottledIndexOutput.cs @@ -89,12 +89,9 @@ namespace Lucene.Net.Util } } - public override long FilePointer + public override long GetFilePointer() { - get - { - return @delegate.FilePointer; - } + return @delegate.GetFilePointer(); } [Obsolete("(4.1) this method will be removed in Lucene 5.0")] http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/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 af1754f..a137966 100644 --- a/src/Lucene.Net.Tests.Facet/SlowRAMDirectory.cs +++ b/src/Lucene.Net.Tests.Facet/SlowRAMDirectory.cs @@ -235,12 +235,9 @@ namespace Lucene.Net.Facet { io.Flush(); } - public override long FilePointer + public override long GetFilePointer() { - get - { - return io.FilePointer; - } + return io.GetFilePointer(); } [Obsolete] http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/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 cfedfaa..d8317a8 100644 --- a/src/Lucene.Net.Tests/Codecs/Lucene41/TestForUtil.cs +++ b/src/Lucene.Net.Tests/Codecs/Lucene41/TestForUtil.cs @@ -70,7 +70,7 @@ namespace Lucene.Net.Codecs.Lucene41 { forUtil.WriteBlock(Arrays.CopyOfRange(values, i * Lucene41PostingsFormat.BLOCK_SIZE, values.Length), new byte[Lucene41.ForUtil.MAX_ENCODED_SIZE], @out); } - endPointer = @out.FilePointer; + endPointer = @out.GetFilePointer(); @out.Dispose(); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/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 186259d..f9aa9b3 100644 --- a/src/Lucene.Net.Tests/Index/TestCompoundFile.cs +++ b/src/Lucene.Net.Tests/Index/TestCompoundFile.cs @@ -635,12 +635,12 @@ namespace Lucene.Net.Index largeBuf[i] = (byte)unchecked((sbyte)(new Random(1).NextDouble() * 256)); } - long currentPos = os.FilePointer; + long currentPos = os.GetFilePointer(); os.WriteBytes(largeBuf, largeBuf.Length); try { - Assert.AreEqual(currentPos + largeBuf.Length, os.FilePointer); + Assert.AreEqual(currentPos + largeBuf.Length, os.GetFilePointer()); } finally { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.Tests/Store/TestCopyBytes.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Store/TestCopyBytes.cs b/src/Lucene.Net.Tests/Store/TestCopyBytes.cs index 50b89ff..c0e4a03 100644 --- a/src/Lucene.Net.Tests/Store/TestCopyBytes.cs +++ b/src/Lucene.Net.Tests/Store/TestCopyBytes.cs @@ -64,7 +64,7 @@ namespace Lucene.Net.Store } @out.WriteBytes(bytes, 0, byteUpto); - Assert.AreEqual(size, @out.FilePointer); + Assert.AreEqual(size, @out.GetFilePointer()); @out.Dispose(); Assert.AreEqual(size, dir.FileLength("test")); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/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 66693c8..c0cf1b9 100644 --- a/src/Lucene.Net.Tests/Util/Packed/TestPackedInts.cs +++ b/src/Lucene.Net.Tests/Util/Packed/TestPackedInts.cs @@ -107,7 +107,7 @@ namespace Lucene.Net.Util.Packed acceptableOverhead = Random().NextFloat(); } PackedInt32s.Writer w = PackedInt32s.GetWriter(@out, valueCount, nbits, acceptableOverhead); - long startFp = @out.FilePointer; + long startFp = @out.GetFilePointer(); int actualValueCount = Random().NextBoolean() ? valueCount : TestUtil.NextInt(Random(), 0, valueCount); long[] values = new long[valueCount]; @@ -124,7 +124,7 @@ namespace Lucene.Net.Util.Packed w.Add(values[i]); } w.Finish(); - long fp = @out.FilePointer; + long fp = @out.GetFilePointer(); @out.Dispose(); // ensure that finish() added the (valueCount-actualValueCount) missing values @@ -473,7 +473,7 @@ namespace Lucene.Net.Util.Packed long value = 17L & PackedInt32s.MaxValue(bitsPerValue); w.Add(value); w.Finish(); - long end = @out.FilePointer; + long end = @out.GetFilePointer(); @out.Dispose(); IndexInput @in = dir.OpenInput("out", NewIOContext(Random())); @@ -1283,7 +1283,7 @@ namespace Lucene.Net.Util.Packed } } pout.Flush(); - Assert.AreEqual((long)Math.Ceiling((double)totalBits / 8), @out.FilePointer); + Assert.AreEqual((long)Math.Ceiling((double)totalBits / 8), @out.GetFilePointer()); @out.Dispose(); IndexInput @in = dir.OpenInput("out.bin", IOContext.READ_ONCE); PackedDataInput pin = new PackedDataInput(@in); @@ -1343,7 +1343,7 @@ namespace Lucene.Net.Util.Packed Assert.AreEqual(valueCount, writer.Ord); writer.Finish(); Assert.AreEqual(valueCount, writer.Ord); - long fp = @out.FilePointer; + long fp = @out.GetFilePointer(); @out.Dispose(); IndexInput in1 = dir.OpenInput("out.bin", IOContext.DEFAULT); @@ -1469,7 +1469,7 @@ namespace Lucene.Net.Util.Packed Assert.AreEqual(valueCount, writer.Ord); writer.Finish(); Assert.AreEqual(valueCount, writer.Ord); - long fp = @out.FilePointer; + long fp = @out.GetFilePointer(); @out.Dispose(); IndexInput @in = dir.OpenInput("out.bin", IOContext.DEFAULT); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/070cfa37/src/Lucene.Net.Tests/Util/Test2BPagedBytes.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Util/Test2BPagedBytes.cs b/src/Lucene.Net.Tests/Util/Test2BPagedBytes.cs index ec0ca2e..b09f015 100644 --- a/src/Lucene.Net.Tests/Util/Test2BPagedBytes.cs +++ b/src/Lucene.Net.Tests/Util/Test2BPagedBytes.cs @@ -55,7 +55,7 @@ namespace Lucene.Net.Util byte[] bytes = new byte[numBytes]; r2.NextBytes(bytes); dataOutput.WriteBytes(bytes, bytes.Length); - long fp = dataOutput.FilePointer; + long fp = dataOutput.GetFilePointer(); Debug.Assert(fp == lastFP + numBytes); lastFP = fp; netBytes += numBytes;
