Lucene.Net.Index.DocsEnum refactor: Converted flags (constants) into [Flags] enum named DocsFlags
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/418e5440 Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/418e5440 Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/418e5440 Branch: refs/heads/api-work Commit: 418e54402934e0cef9a2bbb07d5d1cc28d3c3384 Parents: 808a0eb Author: Shad Storhaug <[email protected]> Authored: Sun Mar 5 22:04:35 2017 +0700 Committer: Shad Storhaug <[email protected]> Committed: Sun Mar 5 22:04:35 2017 +0700 ---------------------------------------------------------------------- .../BlockTerms/BlockTermsReader.cs | 2 +- .../Bloom/BloomFilteringPostingsFormat.cs | 2 +- .../Memory/DirectPostingsFormat.cs | 4 +- .../Memory/FSTOrdTermsReader.cs | 2 +- src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs | 2 +- .../Memory/MemoryDocValuesProducer.cs | 2 +- .../Memory/MemoryPostingsFormat.cs | 2 +- .../Pulsing/PulsingPostingsReader.cs | 2 +- src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs | 2 +- .../SimpleText/SimpleTextFieldsReader.cs | 2 +- .../SimpleText/SimpleTextTermVectorsReader.cs | 4 +- .../Codecs/BlockTreeTermsReader.cs | 4 +- .../Compressing/CompressingTermVectorsReader.cs | 4 +- .../Codecs/Lucene3x/Lucene3xFields.cs | 2 +- .../Lucene3x/Lucene3xTermVectorsReader.cs | 2 +- .../Codecs/Lucene40/Lucene40PostingsReader.cs | 2 +- .../Lucene40/Lucene40TermVectorsReader.cs | 2 +- .../Codecs/Lucene41/Lucene41PostingsReader.cs | 6 +- .../Lucene42/Lucene42DocValuesProducer.cs | 2 +- .../Lucene45/Lucene45DocValuesProducer.cs | 2 +- .../Codecs/PostingsReaderBase.cs | 2 +- src/Lucene.Net.Core/Codecs/TermsConsumer.cs | 2 +- .../Index/BufferedUpdatesStream.cs | 4 +- src/Lucene.Net.Core/Index/CheckIndex.cs | 10 +- src/Lucene.Net.Core/Index/DocTermOrds.cs | 4 +- src/Lucene.Net.Core/Index/DocsEnum.cs | 36 +++-- src/Lucene.Net.Core/Index/FilterAtomicReader.cs | 2 +- src/Lucene.Net.Core/Index/FilteredTermsEnum.cs | 2 +- src/Lucene.Net.Core/Index/MultiFields.cs | 4 +- src/Lucene.Net.Core/Index/MultiTermsEnum.cs | 4 +- .../Index/SortedDocValuesTermsEnum.cs | 2 +- .../Index/SortedSetDocValuesTermsEnum.cs | 2 +- src/Lucene.Net.Core/Index/TermsEnum.cs | 161 +++++++++---------- src/Lucene.Net.Core/Search/FieldCacheImpl.cs | 9 +- src/Lucene.Net.Core/Search/FuzzyTermsEnum.cs | 2 +- src/Lucene.Net.Core/Search/MultiPhraseQuery.cs | 2 +- .../Search/MultiTermQueryWrapperFilter.cs | 3 +- .../Directory/DirectoryTaxonomyWriter.cs | 5 +- src/Lucene.Net.Join/TermsIncludingScoreQuery.cs | 6 +- .../MemoryIndex.MemoryIndexReader.cs | 2 +- .../Index/Sorter/SortingAtomicReader.cs | 4 +- src/Lucene.Net.Queries/TermFilter.cs | 2 +- src/Lucene.Net.Queries/TermsFilter.cs | 2 +- .../Queries/DuplicateFilter.cs | 4 +- .../Prefix/AbstractPrefixTreeFilter.cs | 4 +- .../Prefix/ContainsPrefixTreeFilter.cs | 2 +- .../Util/ShapeFieldCacheProvider.cs | 2 +- .../Codecs/RAMOnly/RAMOnlyPostingsFormat.cs | 2 +- .../Index/AssertingAtomicReader.cs | 2 +- .../Index/BasePostingsFormatTestCase.cs | 2 +- .../Util/LuceneTestCase.cs | 8 +- src/Lucene.Net.TestFramework/Util/TestUtil.cs | 6 +- .../Pulsing/Test10KPulsings.cs | 4 +- .../Pulsing/TestPulsingReuse.cs | 4 +- src/Lucene.Net.Tests.Join/TestJoinUtil.cs | 2 +- .../Index/Memory/MemoryIndexTest.cs | 4 +- .../Codecs/Lucene40/TestReuseDocsEnum.cs | 15 +- .../Codecs/Lucene41/TestBlockPostingsFormat3.cs | 8 +- src/Lucene.Net.Tests/Index/TestAddIndexes.cs | 2 +- .../Index/TestBackwardsCompatibility.cs | 6 +- src/Lucene.Net.Tests/Index/TestCodecs.cs | 10 +- src/Lucene.Net.Tests/Index/TestDocCount.cs | 2 +- .../Index/TestDocsAndPositions.cs | 6 +- src/Lucene.Net.Tests/Index/TestIndexWriter.cs | 16 +- .../Index/TestIndexWriterReader.cs | 2 +- src/Lucene.Net.Tests/Index/TestLongPostings.cs | 4 +- src/Lucene.Net.Tests/Index/TestMultiFields.cs | 6 +- src/Lucene.Net.Tests/Index/TestOmitPositions.cs | 2 +- .../Index/TestParallelTermEnum.cs | 2 +- .../Index/TestPerSegmentDeletes.cs | 2 +- .../Index/TestSegmentTermDocs.cs | 10 +- src/Lucene.Net.Tests/Index/TestStressAdvance.cs | 4 +- .../Index/TestStressIndexing2.cs | 18 +-- .../Index/TestTermVectorsReader.cs | 2 +- src/Lucene.Net.Tests/Index/TestTermdocPerf.cs | 2 +- src/Lucene.Net.Tests/Index/TestTermsEnum.cs | 30 ++-- 76 files changed, 262 insertions(+), 257 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/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 2b0f700..891fca0 100644 --- a/src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs +++ b/src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs @@ -752,7 +752,7 @@ namespace Lucene.Net.Codecs.BlockTerms } } - public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, int flags) + public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, DocsFlags flags) { DecodeMetaData(); return _blockTermsReader._postingsReader.Docs(_fieldReader._fieldInfo, _state, liveDocs, reuse, flags); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs b/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs index d3ba27d..204eb16 100644 --- a/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs +++ b/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs @@ -391,7 +391,7 @@ namespace Lucene.Net.Codecs.Bloom return Delegate.DocsAndPositions(liveDocs, reuse, flags); } - public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, int flags) + public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, DocsFlags flags) { return Delegate.Docs(liveDocs, reuse, flags); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs b/src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs index 6fabc4a..5bafcf9 100644 --- a/src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs +++ b/src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs @@ -1063,7 +1063,7 @@ namespace Lucene.Net.Codecs.Memory } } - public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, int flags) + public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, DocsFlags flags) { // TODO: implement reuse, something like Pulsing: // it's hairy! @@ -1769,7 +1769,7 @@ namespace Lucene.Net.Codecs.Memory } } - public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, int flags) + public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, DocsFlags flags) { // TODO: implement reuse, something like Pulsing: // it's hairy! http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs b/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs index 82c8311..7113d8d 100644 --- a/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs +++ b/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs @@ -476,7 +476,7 @@ namespace Lucene.Net.Codecs.Memory get { return state.TotalTermFreq; } } - public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, int flags) + public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, DocsFlags flags) { DecodeMetaData(); return outerInstance.outerInstance.postingsReader.Docs(outerInstance.fieldInfo, state, liveDocs, reuse, flags); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs b/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs index 73226b2..b0c0848 100644 --- a/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs +++ b/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs @@ -327,7 +327,7 @@ namespace Lucene.Net.Codecs.Memory get { return state.TotalTermFreq; } } - public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, int flags) + public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, DocsFlags flags) { DecodeMetaData(); return outerInstance.outerInstance.postingsReader.Docs(outerInstance.fieldInfo, state, liveDocs, reuse, flags); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/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 d32606f..d22301d 100644 --- a/src/Lucene.Net.Codecs/Memory/MemoryDocValuesProducer.cs +++ b/src/Lucene.Net.Codecs/Memory/MemoryDocValuesProducer.cs @@ -841,7 +841,7 @@ namespace Lucene.Net.Codecs.Memory get { throw new NotSupportedException(); } } - public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, int flags) + public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, DocsFlags flags) { throw new NotSupportedException(); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/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 e17f9cb..e952142 100644 --- a/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs +++ b/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs @@ -824,7 +824,7 @@ namespace Lucene.Net.Codecs.Memory } } - public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, int flags) + public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, DocsFlags flags) { DecodeMetaData(); FSTDocsEnum docsEnum; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsReader.cs b/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsReader.cs index 8bf5e99..71b5e1b 100644 --- a/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsReader.cs +++ b/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsReader.cs @@ -219,7 +219,7 @@ namespace Lucene.Net.Codecs.Pulsing } public override DocsEnum Docs(FieldInfo field, BlockTermState termState, IBits liveDocs, DocsEnum reuse, - int flags) + DocsFlags flags) { var termState2 = (PulsingTermState) termState; if (termState2.PostingsSize != -1) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/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 f1e3097..dac8caa 100644 --- a/src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs +++ b/src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs @@ -243,7 +243,7 @@ namespace Lucene.Net.Codecs.Sep } public override DocsEnum Docs(FieldInfo fieldInfo, BlockTermState bTermState, IBits liveDocs, DocsEnum reuse, - int flags) + DocsFlags flags) { var termState = (SepTermState)bTermState; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/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 6e2f2dc..11516ee 100644 --- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs +++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs @@ -193,7 +193,7 @@ namespace Lucene.Net.Codecs.SimpleText get { return _indexOptions == IndexOptions.DOCS_ONLY ? -1 : _totalTermFreq; } } - public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, int flags) + public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, DocsFlags flags) { SimpleTextDocsEnum docsEnum; if (reuse != null && reuse is SimpleTextDocsEnum && ((SimpleTextDocsEnum) reuse).CanReuse(_outerInstance._input)) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/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 0bde2e6..027aab2 100644 --- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs +++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs @@ -449,11 +449,11 @@ namespace Lucene.Net.Codecs.SimpleText get { return _current.Value.freq; } } - public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, int flags) + public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, DocsFlags flags) { // TODO: reuse var e = new SimpleTVDocsEnum(); - e.Reset(liveDocs, (flags & DocsEnum.FLAG_FREQS) == 0 ? 1 : _current.Value.freq); + e.Reset(liveDocs, (flags & DocsFlags.FREQS) == 0 ? 1 : _current.Value.freq); return e; } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/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 8d1cb64..b632250 100644 --- a/src/Lucene.Net.Core/Codecs/BlockTreeTermsReader.cs +++ b/src/Lucene.Net.Core/Codecs/BlockTreeTermsReader.cs @@ -1187,7 +1187,7 @@ namespace Lucene.Net.Codecs } } - public override DocsEnum Docs(IBits skipDocs, DocsEnum reuse, int flags) + public override DocsEnum Docs(IBits skipDocs, DocsEnum reuse, DocsFlags flags) { currentFrame.DecodeMetaData(); return outerInstance.outerInstance.postingsReader.Docs(outerInstance.fieldInfo, currentFrame.termState, skipDocs, reuse, flags); @@ -2605,7 +2605,7 @@ namespace Lucene.Net.Codecs } } - public override DocsEnum Docs(IBits skipDocs, DocsEnum reuse, int flags) + public override DocsEnum Docs(IBits skipDocs, DocsEnum reuse, DocsFlags flags) { Debug.Assert(!eof); //if (DEBUG) { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/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 f39cc10..47f4e34 100644 --- a/src/Lucene.Net.Core/Codecs/Compressing/CompressingTermVectorsReader.cs +++ b/src/Lucene.Net.Core/Codecs/Compressing/CompressingTermVectorsReader.cs @@ -1004,7 +1004,7 @@ namespace Lucene.Net.Codecs.Compressing get { return termFreqs[ord]; } } - public override sealed DocsEnum Docs(IBits liveDocs, DocsEnum reuse, int flags) + public override sealed DocsEnum Docs(IBits liveDocs, DocsEnum reuse, DocsFlags flags) { TVDocsEnum docsEnum; if (reuse != null && reuse is TVDocsEnum) @@ -1027,7 +1027,7 @@ namespace Lucene.Net.Codecs.Compressing return null; } // TODO: slightly sheisty - return (DocsAndPositionsEnum)Docs(liveDocs, reuse, (int)flags); + return (DocsAndPositionsEnum)Docs(liveDocs, reuse, (DocsFlags)flags); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xFields.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xFields.cs b/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xFields.cs index bcfc261..ec02721 100644 --- a/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xFields.cs +++ b/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xFields.cs @@ -1079,7 +1079,7 @@ namespace Lucene.Net.Codecs.Lucene3x get { return -1; } } - public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, int flags) + public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, DocsFlags flags) { PreDocsEnum docsEnum; if (reuse == null || !(reuse is PreDocsEnum)) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/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 d5dd5b6..4e37611 100644 --- a/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xTermVectorsReader.cs +++ b/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xTermVectorsReader.cs @@ -633,7 +633,7 @@ namespace Lucene.Net.Codecs.Lucene3x get { return termAndPostings[currentTerm].Freq; } } - public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, int flags) // ignored + public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, DocsFlags flags) // ignored { TVDocsEnum docsEnum; if (reuse != null && reuse is TVDocsEnum) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/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 867eae4..dcc74be 100644 --- a/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40PostingsReader.cs +++ b/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40PostingsReader.cs @@ -213,7 +213,7 @@ namespace Lucene.Net.Codecs.Lucene40 } } - public override DocsEnum Docs(FieldInfo fieldInfo, BlockTermState termState, IBits liveDocs, DocsEnum reuse, int flags) + public override DocsEnum Docs(FieldInfo fieldInfo, BlockTermState termState, IBits liveDocs, DocsEnum reuse, DocsFlags flags) { if (CanReuse(reuse, liveDocs)) { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/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 e109bd7..43ca05d 100644 --- a/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40TermVectorsReader.cs +++ b/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40TermVectorsReader.cs @@ -624,7 +624,7 @@ namespace Lucene.Net.Codecs.Lucene40 get { return freq; } } - public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, int flags) // ignored + public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, DocsFlags flags) // ignored { TVDocsEnum docsEnum; if (reuse != null && reuse is TVDocsEnum) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/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 eb6275d..4da641a 100644 --- a/src/Lucene.Net.Core/Codecs/Lucene41/Lucene41PostingsReader.cs +++ b/src/Lucene.Net.Core/Codecs/Lucene41/Lucene41PostingsReader.cs @@ -231,7 +231,7 @@ namespace Lucene.Net.Codecs.Lucene41 } } - public override DocsEnum Docs(FieldInfo fieldInfo, BlockTermState termState, IBits liveDocs, DocsEnum reuse, int flags) + public override DocsEnum Docs(FieldInfo fieldInfo, BlockTermState termState, IBits liveDocs, DocsEnum reuse, DocsFlags flags) { BlockDocsEnum docsEnum; if (reuse is BlockDocsEnum) @@ -355,7 +355,7 @@ namespace Lucene.Net.Codecs.Lucene41 return docIn == startDocIn && indexHasFreq == (fieldInfo.IndexOptions >= IndexOptions.DOCS_AND_FREQS) && indexHasPos == (fieldInfo.IndexOptions >= IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) && indexHasPayloads == fieldInfo.HasPayloads; } - public DocsEnum Reset(IBits liveDocs, Lucene41PostingsWriter.Int32BlockTermState termState, int flags) + public DocsEnum Reset(IBits liveDocs, Lucene41PostingsWriter.Int32BlockTermState termState, DocsFlags flags) { this.liveDocs = liveDocs; // if (DEBUG) { @@ -377,7 +377,7 @@ namespace Lucene.Net.Codecs.Lucene41 } doc = -1; - this.needsFreq = (flags & DocsEnum.FLAG_FREQS) != 0; + this.needsFreq = (flags & DocsFlags.FREQS) != 0; if (!indexHasFreq) { Arrays.Fill(freqBuffer, 1); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Core/Codecs/Lucene42/Lucene42DocValuesProducer.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Codecs/Lucene42/Lucene42DocValuesProducer.cs b/src/Lucene.Net.Core/Codecs/Lucene42/Lucene42DocValuesProducer.cs index 7566f62..7205c24 100644 --- a/src/Lucene.Net.Core/Codecs/Lucene42/Lucene42DocValuesProducer.cs +++ b/src/Lucene.Net.Core/Codecs/Lucene42/Lucene42DocValuesProducer.cs @@ -822,7 +822,7 @@ namespace Lucene.Net.Codecs.Lucene42 get { throw new System.NotSupportedException(); } } - public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, int flags) + public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, DocsFlags flags) { throw new System.NotSupportedException(); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Core/Codecs/Lucene45/Lucene45DocValuesProducer.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Codecs/Lucene45/Lucene45DocValuesProducer.cs b/src/Lucene.Net.Core/Codecs/Lucene45/Lucene45DocValuesProducer.cs index e443190..c627861 100644 --- a/src/Lucene.Net.Core/Codecs/Lucene45/Lucene45DocValuesProducer.cs +++ b/src/Lucene.Net.Core/Codecs/Lucene45/Lucene45DocValuesProducer.cs @@ -1258,7 +1258,7 @@ namespace Lucene.Net.Codecs.Lucene45 get { return -1; } } - public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, int flags) + public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, DocsFlags flags) { throw new System.NotSupportedException(); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Core/Codecs/PostingsReaderBase.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Codecs/PostingsReaderBase.cs b/src/Lucene.Net.Core/Codecs/PostingsReaderBase.cs index 52aec83..8a5688b 100644 --- a/src/Lucene.Net.Core/Codecs/PostingsReaderBase.cs +++ b/src/Lucene.Net.Core/Codecs/PostingsReaderBase.cs @@ -72,7 +72,7 @@ namespace Lucene.Net.Codecs /// Must fully consume state, since after this call that /// TermState may be reused. /// </summary> - public abstract DocsEnum Docs(FieldInfo fieldInfo, BlockTermState state, IBits skipDocs, DocsEnum reuse, int flags); + public abstract DocsEnum Docs(FieldInfo fieldInfo, BlockTermState state, IBits skipDocs, DocsEnum reuse, DocsFlags flags); /// <summary> /// Must fully consume state, since after this call that http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Core/Codecs/TermsConsumer.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Codecs/TermsConsumer.cs b/src/Lucene.Net.Core/Codecs/TermsConsumer.cs index e9c3873..c458502 100644 --- a/src/Lucene.Net.Core/Codecs/TermsConsumer.cs +++ b/src/Lucene.Net.Core/Codecs/TermsConsumer.cs @@ -118,7 +118,7 @@ namespace Lucene.Net.Codecs { // We can pass null for liveDocs, because the // mapping enum will skip the non-live docs: - docsEnumIn = (MultiDocsEnum)termsEnum.Docs(null, docsEnumIn, Index.DocsEnum.FLAG_NONE); + docsEnumIn = (MultiDocsEnum)termsEnum.Docs(null, docsEnumIn, DocsFlags.NONE); if (docsEnumIn != null) { docsEnum.Reset(docsEnumIn); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Core/Index/BufferedUpdatesStream.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Index/BufferedUpdatesStream.cs b/src/Lucene.Net.Core/Index/BufferedUpdatesStream.cs index c86451e..a730cbd 100644 --- a/src/Lucene.Net.Core/Index/BufferedUpdatesStream.cs +++ b/src/Lucene.Net.Core/Index/BufferedUpdatesStream.cs @@ -503,7 +503,7 @@ namespace Lucene.Net.Index if (termsEnum.SeekExact(term.Bytes)) { // we don't need term frequencies for this - DocsEnum docsEnum = termsEnum.Docs(rld.LiveDocs, docs, DocsEnum.FLAG_NONE); + DocsEnum docsEnum = termsEnum.Docs(rld.LiveDocs, docs, DocsFlags.NONE); //System.out.println("BDS: got docsEnum=" + docsEnum); if (docsEnum != null) @@ -607,7 +607,7 @@ namespace Lucene.Net.Index if (termsEnum.SeekExact(term.Bytes)) { // we don't need term frequencies for this - DocsEnum docsEnum = termsEnum.Docs(rld.LiveDocs, docs, DocsEnum.FLAG_NONE); + DocsEnum docsEnum = termsEnum.Docs(rld.LiveDocs, docs, DocsFlags.NONE); //System.out.println("BDS: got docsEnum=" + docsEnum); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Core/Index/CheckIndex.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Index/CheckIndex.cs b/src/Lucene.Net.Core/Index/CheckIndex.cs index 519179a..c7e386a 100644 --- a/src/Lucene.Net.Core/Index/CheckIndex.cs +++ b/src/Lucene.Net.Core/Index/CheckIndex.cs @@ -1305,7 +1305,7 @@ namespace Lucene.Net.Index } else { - DocsEnum docsNoDel = termsEnum.Docs(null, docs, DocsEnum.FLAG_NONE); + DocsEnum docsNoDel = termsEnum.Docs(null, docs, DocsFlags.NONE); docCount = 0; totalTermFreq = -1; while (docsNoDel.NextDoc() != DocIdSetIterator.NO_MORE_DOCS) @@ -1417,7 +1417,7 @@ namespace Lucene.Net.Index for (int idx = 0; idx < 7; idx++) { int skipDocID = (int)(((idx + 1) * (long)maxDoc) / 8); - docs = termsEnum.Docs(liveDocs, docs, DocsEnum.FLAG_NONE); + docs = termsEnum.Docs(liveDocs, docs, DocsFlags.NONE); int docID = docs.Advance(skipDocID); if (docID == DocIdSetIterator.NO_MORE_DOCS) { @@ -1501,7 +1501,7 @@ namespace Lucene.Net.Index } int expectedDocFreq = termsEnum.DocFreq; - DocsEnum d = termsEnum.Docs(null, null, DocsEnum.FLAG_NONE); + DocsEnum d = termsEnum.Docs(null, null, DocsFlags.NONE); int docFreq = 0; while (d.NextDoc() != DocIdSetIterator.NO_MORE_DOCS) { @@ -1551,7 +1551,7 @@ namespace Lucene.Net.Index throw new Exception("seek to existing term " + seekTerms[i] + " failed"); } - docs = termsEnum.Docs(liveDocs, docs, DocsEnum.FLAG_NONE); + docs = termsEnum.Docs(liveDocs, docs, DocsFlags.NONE); if (docs == null) { throw new Exception("null DocsEnum from to existing term " + seekTerms[i]); @@ -1573,7 +1573,7 @@ namespace Lucene.Net.Index } totDocFreq += termsEnum.DocFreq; - docs = termsEnum.Docs(null, docs, DocsEnum.FLAG_NONE); + docs = termsEnum.Docs(null, docs, DocsFlags.NONE); if (docs == null) { throw new Exception("null DocsEnum from to existing term " + seekTerms[i]); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Core/Index/DocTermOrds.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Index/DocTermOrds.cs b/src/Lucene.Net.Core/Index/DocTermOrds.cs index 7aa048d..0be0147 100644 --- a/src/Lucene.Net.Core/Index/DocTermOrds.cs +++ b/src/Lucene.Net.Core/Index/DocTermOrds.cs @@ -439,7 +439,7 @@ namespace Lucene.Net.Index int df = te.DocFreq; if (df <= m_maxTermDocFreq) { - m_docsEnum = te.Docs(liveDocs, m_docsEnum, DocsEnum.FLAG_NONE); + m_docsEnum = te.Docs(liveDocs, m_docsEnum, DocsFlags.NONE); // dF, but takes deletions into account int actualDF = 0; @@ -762,7 +762,7 @@ namespace Lucene.Net.Index } } - public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, int flags) + public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, DocsFlags flags) { return termsEnum.Docs(liveDocs, reuse, flags); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Core/Index/DocsEnum.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Index/DocsEnum.cs b/src/Lucene.Net.Core/Index/DocsEnum.cs index 98ce7be..65299b7 100644 --- a/src/Lucene.Net.Core/Index/DocsEnum.cs +++ b/src/Lucene.Net.Core/Index/DocsEnum.cs @@ -1,3 +1,5 @@ +using System; + namespace Lucene.Net.Index { /* @@ -20,7 +22,23 @@ namespace Lucene.Net.Index using AttributeSource = Lucene.Net.Util.AttributeSource; using DocIdSetIterator = Lucene.Net.Search.DocIdSetIterator; - // javadocs + // LUCENENET specific - converted constants from DocsEnum + // into a flags enum. + [Flags] + public enum DocsFlags + { + /// <summary> + /// Flag to pass to <see cref="TermsEnum.Docs(Util.IBits, DocsEnum, DocsFlags)"/> if you don't + /// require term frequencies in the returned enum. + /// </summary> + NONE = 0x0, + + /// <summary> + /// Flag to pass to <see cref="TermsEnum.Docs(Util.IBits, DocsEnum, DocsFlags)"/> + /// if you require term frequencies in the returned enum. + /// </summary> + FREQS = 0x1 + } /// <summary> /// Iterates through the documents and term freqs. @@ -29,21 +47,7 @@ namespace Lucene.Net.Index /// </summary> public abstract class DocsEnum : DocIdSetIterator { - // LUCENENET TODO: Make the following into a [Flags] enum - - /// <summary> - /// Flag to pass to <seealso cref="TermsEnum#docs(Bits,DocsEnum,int)"/> if you don't - /// require term frequencies in the returned enum. When passed to - /// <seealso cref="TermsEnum#docsAndPositions(Bits,DocsAndPositionsEnum,int)"/> means - /// that no offsets and payloads will be returned. - /// </summary> - public static readonly int FLAG_NONE = 0x0; - - /// <summary> - /// Flag to pass to <seealso cref="TermsEnum#docs(Bits,DocsEnum,int)"/> - /// if you require term frequencies in the returned enum. - /// </summary> - public static readonly int FLAG_FREQS = 0x1; + // LUCENENET specific - made flags into their own [Flags] enum named DocsFlags and de-nested from this type private AttributeSource atts = null; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Core/Index/FilterAtomicReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Index/FilterAtomicReader.cs b/src/Lucene.Net.Core/Index/FilterAtomicReader.cs index d5018d7..7bbc017 100644 --- a/src/Lucene.Net.Core/Index/FilterAtomicReader.cs +++ b/src/Lucene.Net.Core/Index/FilterAtomicReader.cs @@ -231,7 +231,7 @@ namespace Lucene.Net.Index get { return m_input.TotalTermFreq; } } - public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, int flags) + public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, DocsFlags flags) { return m_input.Docs(liveDocs, reuse, flags); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Core/Index/FilteredTermsEnum.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Index/FilteredTermsEnum.cs b/src/Lucene.Net.Core/Index/FilteredTermsEnum.cs index b47e664..a2d75e7 100644 --- a/src/Lucene.Net.Core/Index/FilteredTermsEnum.cs +++ b/src/Lucene.Net.Core/Index/FilteredTermsEnum.cs @@ -200,7 +200,7 @@ namespace Lucene.Net.Index get { return tenum.Ord; } } - public override DocsEnum Docs(IBits bits, DocsEnum reuse, int flags) + public override DocsEnum Docs(IBits bits, DocsEnum reuse, DocsFlags flags) { return tenum.Docs(bits, reuse, flags); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Core/Index/MultiFields.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Index/MultiFields.cs b/src/Lucene.Net.Core/Index/MultiFields.cs index 7559a8d..69e271f 100644 --- a/src/Lucene.Net.Core/Index/MultiFields.cs +++ b/src/Lucene.Net.Core/Index/MultiFields.cs @@ -161,7 +161,7 @@ namespace Lucene.Net.Index /// </summary> public static DocsEnum GetTermDocsEnum(IndexReader r, IBits liveDocs, string field, BytesRef term) { - return GetTermDocsEnum(r, liveDocs, field, term, DocsEnum.FLAG_FREQS); + return GetTermDocsEnum(r, liveDocs, field, term, DocsFlags.FREQS); } /// <summary> @@ -172,7 +172,7 @@ namespace Lucene.Net.Index /// return null if the field or term does not exist. See {@link /// TermsEnum#docs(Bits,DocsEnum,int)}. /// </summary> - public static DocsEnum GetTermDocsEnum(IndexReader r, IBits liveDocs, string field, BytesRef term, int flags) + public static DocsEnum GetTermDocsEnum(IndexReader r, IBits liveDocs, string field, BytesRef term, DocsFlags flags) { Debug.Assert(field != null); Debug.Assert(term != null); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Core/Index/MultiTermsEnum.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Index/MultiTermsEnum.cs b/src/Lucene.Net.Core/Index/MultiTermsEnum.cs index dcbba9e..f1aa3e6 100644 --- a/src/Lucene.Net.Core/Index/MultiTermsEnum.cs +++ b/src/Lucene.Net.Core/Index/MultiTermsEnum.cs @@ -439,7 +439,7 @@ namespace Lucene.Net.Index } } - public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, int flags) + public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, DocsFlags flags) { MultiDocsEnum docsEnum; // Can only reuse if incoming enum is also a MultiDocsEnum @@ -608,7 +608,7 @@ namespace Lucene.Net.Index } else { - if (entry.Terms.Docs(b, null, DocsEnum.FLAG_NONE) != null) + if (entry.Terms.Docs(b, null, DocsFlags.NONE) != null) { // At least one of our subs does not store // offsets or positions -- we can't correctly http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Core/Index/SortedDocValuesTermsEnum.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Index/SortedDocValuesTermsEnum.cs b/src/Lucene.Net.Core/Index/SortedDocValuesTermsEnum.cs index 8afd3e7..b82cf9a 100644 --- a/src/Lucene.Net.Core/Index/SortedDocValuesTermsEnum.cs +++ b/src/Lucene.Net.Core/Index/SortedDocValuesTermsEnum.cs @@ -129,7 +129,7 @@ namespace Lucene.Net.Index get { return -1; } } - public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, int flags) + public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, DocsFlags flags) { throw new System.NotSupportedException(); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Core/Index/SortedSetDocValuesTermsEnum.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Index/SortedSetDocValuesTermsEnum.cs b/src/Lucene.Net.Core/Index/SortedSetDocValuesTermsEnum.cs index 543d62b..e32ca65 100644 --- a/src/Lucene.Net.Core/Index/SortedSetDocValuesTermsEnum.cs +++ b/src/Lucene.Net.Core/Index/SortedSetDocValuesTermsEnum.cs @@ -129,7 +129,7 @@ namespace Lucene.Net.Index get { return -1; } } - public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, int flags) + public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, DocsFlags flags) { throw new System.NotSupportedException(); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Core/Index/TermsEnum.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Index/TermsEnum.cs b/src/Lucene.Net.Core/Index/TermsEnum.cs index 0d966d5..86f332a 100644 --- a/src/Lucene.Net.Core/Index/TermsEnum.cs +++ b/src/Lucene.Net.Core/Index/TermsEnum.cs @@ -26,20 +26,20 @@ namespace Lucene.Net.Index using BytesRef = Lucene.Net.Util.BytesRef; /// <summary> - /// Iterator to seek (<seealso cref="#seekCeil(BytesRef)"/>, {@link - /// #seekExact(BytesRef)}) or step through ({@link - /// #next} terms to obtain frequency information ({@link - /// #docFreq}), <seealso cref="DocsEnum"/> or {@link - /// DocsAndPositionsEnum} for the current term ({@link - /// #docs}. + /// Iterator to seek (<see cref="SeekCeil(BytesRef)"/>, + /// <see cref="SeekExact(BytesRef)"/>) or step through + /// (<see cref="Next"/> terms to obtain frequency information + /// (<see cref="DocFreq"/>), <see cref="DocsEnum"/> or + /// <see cref="DocsAndPositionsEnum"/> for the current term + /// (<see cref="Docs"/>). /// - /// <p>Term enumerations are always ordered by - /// <seealso cref="#getComparer"/>. Each term in the enumeration is - /// greater than the one before it.</p> + /// <para/>Term enumerations are always ordered by + /// <see cref="Comparer"/>. Each term in the enumeration is + /// greater than the one before it. /// - /// <p>The TermsEnum is unpositioned when you first obtain it - /// and you must first successfully call <seealso cref="#next"/> or one - /// of the <code>seek</code> methods. + /// <para/>The <see cref="TermsEnum"/> is unpositioned when you first obtain it + /// and you must first successfully call <see cref="Next"/> or one + /// of the <c>Seek</c> methods. /// /// @lucene.experimental /// </summary> @@ -53,7 +53,7 @@ namespace Lucene.Net.Index /// <summary> /// Sole constructor. (For invocation by subclass - /// constructors, typically implicit.) + /// constructors, typically implicit.) /// </summary> protected TermsEnum() { @@ -74,7 +74,7 @@ namespace Lucene.Net.Index } /// <summary> - /// Represents returned result from <seealso cref="#seekCeil"/>. </summary> + /// Represents returned result from <see cref="SeekCeil(BytesRef)"/>. </summary> public enum SeekStatus { /// <summary> @@ -92,9 +92,9 @@ namespace Lucene.Net.Index /// <summary> /// Attempts to seek to the exact term, returning - /// true if the term is found. If this returns false, the - /// enum is unpositioned. For some codecs, seekExact may - /// be substantially faster than <seealso cref="#seekCeil"/>. + /// true if the term is found. If this returns false, the + /// enum is unpositioned. For some codecs, <see cref="SeekExact"/> may + /// be substantially faster than <see cref="SeekCeil"/>. /// </summary> public virtual bool SeekExact(BytesRef text) { @@ -103,43 +103,42 @@ namespace Lucene.Net.Index /// <summary> /// Seeks to the specified term, if it exists, or to the - /// next (ceiling) term. Returns SeekStatus to - /// indicate whether exact term was found, a different - /// term was found, or EOF was hit. The target term may - /// be before or after the current term. If this returns - /// SeekStatus.END, the enum is unpositioned. + /// next (ceiling) term. Returns <see cref="SeekStatus"/> to + /// indicate whether exact term was found, a different + /// term was found, or EOF was hit. The target term may + /// be before or after the current term. If this returns + /// <see cref="SeekStatus.END"/>, the enum is unpositioned. /// </summary> public abstract SeekStatus SeekCeil(BytesRef text); /// <summary> /// Seeks to the specified term by ordinal (position) as - /// previously returned by <seealso cref="#ord"/>. The target ord - /// may be before or after the current ord, and must be - /// within bounds. + /// previously returned by <see cref="Ord"/>. The target <paramref name="ord"/> + /// may be before or after the current ord, and must be + /// within bounds. /// </summary> public abstract void SeekExact(long ord); /// <summary> - /// Expert: Seeks a specific position by <seealso cref="GetTermState"/> previously obtained - /// from <seealso cref="#termState()"/>. Callers should maintain the <seealso cref="GetTermState"/> to - /// use this method. Low-level implementations may position the TermsEnum + /// Expert: Seeks a specific position by <see cref="TermState"/> previously obtained + /// from <see cref="GetTermState()"/>. Callers should maintain the <see cref="TermState"/> to + /// use this method. Low-level implementations may position the <see cref="TermsEnum"/> /// without re-seeking the term dictionary. - /// <p> - /// Seeking by <seealso cref="GetTermState"/> should only be used iff the state was obtained - /// from the same <seealso cref="TermsEnum"/> instance. - /// <p> - /// NOTE: Using this method with an incompatible <seealso cref="GetTermState"/> might leave - /// this <seealso cref="TermsEnum"/> in undefined state. On a segment level - /// <seealso cref="GetTermState"/> instances are compatible only iff the source and the - /// target <seealso cref="TermsEnum"/> operate on the same field. If operating on segment + /// <para/> + /// Seeking by <see cref="TermState"/> should only be used iff the state was obtained + /// from the same <see cref="TermsEnum"/> instance. + /// <para/> + /// NOTE: Using this method with an incompatible <see cref="TermState"/> might leave + /// this <see cref="TermsEnum"/> in undefined state. On a segment level + /// <see cref="TermState"/> instances are compatible only iff the source and the + /// target <see cref="TermsEnum"/> operate on the same field. If operating on segment /// level, TermState instances must not be used across segments. - /// <p> - /// NOTE: A seek by <seealso cref="GetTermState"/> might not restore the - /// <seealso cref="AttributeSource"/>'s state. <seealso cref="AttributeSource"/> states must be + /// <para/> + /// NOTE: A seek by <see cref="TermState"/> might not restore the + /// <see cref="AttributeSource"/>'s state. <see cref="AttributeSource"/> states must be /// maintained separately if this method is used. </summary> - /// <param name="term"> the term the TermState corresponds to </param> - /// <param name="state"> the <seealso cref="GetTermState"/> - /// </param> + /// <param name="term"> the term the <see cref="TermState"/> corresponds to </param> + /// <param name="state"> the <see cref="TermState"/> </param> public virtual void SeekExact(BytesRef term, TermState state) { if (!SeekExact(term)) @@ -150,23 +149,22 @@ namespace Lucene.Net.Index /// <summary> /// Returns current term. Do not call this when the enum - /// is unpositioned. + /// is unpositioned. /// </summary> public abstract BytesRef Term { get; } /// <summary> /// Returns ordinal position for current term. this is an - /// optional method (the codec may throw {@link - /// UnsupportedOperationException}). Do not call this - /// when the enum is unpositioned. + /// optional method (the codec may throw <see cref="NotSupportedException"/>. + /// Do not call this when the enum is unpositioned. /// </summary> public abstract long Ord { get; } // LUCENENET NOTE: Although this isn't a great candidate for a property, did so to make API consistent /// <summary> /// Returns the number of documents containing the current - /// term. Do not call this when the enum is unpositioned. - /// <seealso cref="SeekStatus#END"/>. + /// term. Do not call this when the enum is unpositioned. /// </summary> + /// <seealso cref="SeekStatus.END"/> public abstract int DocFreq { get; } // LUCENENET NOTE: Although this isn't a great candidate for a property, did so to make API consistent /// <summary> @@ -180,31 +178,31 @@ namespace Lucene.Net.Index public abstract long TotalTermFreq { get; } // LUCENENET NOTE: Although this isn't a great candidate for a property, did so to make API consistent /// <summary> - /// Get <seealso cref="DocsEnum"/> for the current term. Do not - /// call this when the enum is unpositioned. this method - /// will not return null. + /// Get <see cref="DocsEnum"/> for the current term. Do not + /// call this when the enum is unpositioned. This method + /// will not return null. /// </summary> /// <param name="liveDocs"> unset bits are documents that should not /// be returned </param> - /// <param name="reuse"> pass a prior DocsEnum for possible reuse </param> + /// <param name="reuse"> pass a prior <see cref="DocsEnum"/> for possible reuse </param> public DocsEnum Docs(IBits liveDocs, DocsEnum reuse) { - return Docs(liveDocs, reuse, DocsEnum.FLAG_FREQS); + return Docs(liveDocs, reuse, DocsFlags.FREQS); } /// <summary> - /// Get <seealso cref="DocsEnum"/> for the current term, with - /// control over whether freqs are required. Do not - /// call this when the enum is unpositioned. this method - /// will not return null. + /// Get <see cref="DocsEnum"/> for the current term, with + /// control over whether freqs are required. Do not + /// call this when the enum is unpositioned. This method + /// will not return null. /// </summary> /// <param name="liveDocs"> unset bits are documents that should not /// be returned </param> /// <param name="reuse"> pass a prior DocsEnum for possible reuse </param> /// <param name="flags"> specifies which optional per-document values - /// you require; see <seealso cref="DocsEnum#FLAG_FREQS"/> </param> - /// <seealso cref= #docs(Bits, DocsEnum, int) </seealso> - public abstract DocsEnum Docs(IBits liveDocs, DocsEnum reuse, int flags); + /// you require; <see cref="DocsFlags"/></param> + /// <seealso cref="Docs(IBits, DocsEnum)"/> + public abstract DocsEnum Docs(IBits liveDocs, DocsEnum reuse, DocsFlags flags); /// <summary> /// Get <seealso cref="DocsAndPositionsEnum"/> for the current term. @@ -223,30 +221,29 @@ namespace Lucene.Net.Index /// <summary> /// Get <see cref="DocsAndPositionsEnum"/> for the current term, - /// with control over whether offsets and payloads are - /// required. Some codecs may be able to optimize their - /// implementation when offsets and/or payloads are not required. - /// Do not call this when the enum is unpositioned. this - /// will return null if positions were not indexed. + /// with control over whether offsets and payloads are + /// required. Some codecs may be able to optimize their + /// implementation when offsets and/or payloads are not required. + /// Do not call this when the enum is unpositioned. This + /// will return null if positions were not indexed. /// </summary> - /// <param name="liveDocs"> unset bits are documents that should not - /// be returned </param> - /// <param name="reuse"> pass a prior DocsAndPositionsEnum for possible reuse </param> - /// <param name="flags"> specifies which optional per-position values you - /// require; see <see cref="DocsAndPositionsFlags.OFFSETS"/> and - /// <see cref="DocsAndPositionsFlags.PAYLOADS"/>. </param> + /// <param name="liveDocs"> unset bits are documents that should not + /// be returned </param> + /// <param name="reuse"> pass a prior DocsAndPositionsEnum for possible reuse </param> + /// <param name="flags"> specifies which optional per-position values you + /// require; see <see cref="DocsAndPositionsFlags"/>. </param> public abstract DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, DocsAndPositionsFlags flags); /// <summary> - /// Expert: Returns the TermsEnums internal state to position the TermsEnum + /// Expert: Returns the TermsEnums internal state to position the <see cref="TermsEnum"/> /// without re-seeking the term dictionary. - /// <p> - /// NOTE: A seek by <seealso cref="GetTermState"/> might not capture the - /// <seealso cref="AttributeSource"/>'s state. Callers must maintain the - /// <seealso cref="AttributeSource"/> states separately + /// <para/> + /// NOTE: A seek by <see cref="GetTermState"/> might not capture the + /// <see cref="AttributeSource"/>'s state. Callers must maintain the + /// <see cref="AttributeSource"/> states separately /// </summary> - /// <seealso cref= GetTermState </seealso> - /// <seealso cref= #seekExact(BytesRef, TermState) </seealso> + /// <seealso cref="TermState"/> + /// <seealso cref="SeekExact(BytesRef, TermState)"/> public virtual TermState GetTermState() // LUCENENET NOTE: Renamed from TermState() { return new TermStateAnonymousInnerClassHelper(this); @@ -268,9 +265,9 @@ namespace Lucene.Net.Index } /// <summary> - /// An empty TermsEnum for quickly returning an empty instance e.g. - /// in <seealso cref="Lucene.Net.Search.MultiTermQuery"/> - /// <p><em>Please note:</em> this enum should be unmodifiable, + /// An empty <see cref="TermsEnum"/> for quickly returning an empty instance e.g. + /// in <see cref="Lucene.Net.Search.MultiTermQuery"/> + /// <para/><em>Please note:</em> this enum should be unmodifiable, /// but it is currently possible to add Attributes to it. /// this should not be a problem, as the enum is always empty and /// the existence of unused Attributes does not matter. @@ -320,7 +317,7 @@ namespace Lucene.Net.Index get { throw new InvalidOperationException("this method should never be called"); } } - public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, int flags) + public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, DocsFlags flags) { throw new InvalidOperationException("this method should never be called"); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Core/Search/FieldCacheImpl.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Search/FieldCacheImpl.cs b/src/Lucene.Net.Core/Search/FieldCacheImpl.cs index 1ecaa99..8bd31d2 100644 --- a/src/Lucene.Net.Core/Search/FieldCacheImpl.cs +++ b/src/Lucene.Net.Core/Search/FieldCacheImpl.cs @@ -1,3 +1,4 @@ +using Lucene.Net.Index; using Lucene.Net.Support; using System; using System.Collections.Generic; @@ -413,7 +414,7 @@ namespace Lucene.Net.Search break; } VisitTerm(term); - docs = termsEnum.Docs(null, docs, DocsEnum.FLAG_NONE); + docs = termsEnum.Docs(null, docs, DocsFlags.NONE); while (true) { int docID = docs.NextDoc(); @@ -1024,7 +1025,7 @@ namespace Lucene.Net.Search res = new FixedBitSet(maxDoc); } - docs = termsEnum.Docs(null, docs, DocsEnum.FLAG_NONE); + docs = termsEnum.Docs(null, docs, DocsFlags.NONE); // TODO: use bulk API while (true) { @@ -1723,7 +1724,7 @@ namespace Lucene.Net.Search } termOrdToBytesOffset.Add(bytes.CopyUsingLengthPrefix(term)); - docs = termsEnum.Docs(null, docs, DocsEnum.FLAG_NONE); + docs = termsEnum.Docs(null, docs, DocsFlags.NONE); while (true) { int docID = docs.NextDoc(); @@ -1885,7 +1886,7 @@ namespace Lucene.Net.Search break; } long pointer = bytes.CopyUsingLengthPrefix(term); - docs = termsEnum.Docs(null, docs, DocsEnum.FLAG_NONE); + docs = termsEnum.Docs(null, docs, DocsFlags.NONE); while (true) { int docID = docs.NextDoc(); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Core/Search/FuzzyTermsEnum.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Search/FuzzyTermsEnum.cs b/src/Lucene.Net.Core/Search/FuzzyTermsEnum.cs index 4203404..7c000a4 100644 --- a/src/Lucene.Net.Core/Search/FuzzyTermsEnum.cs +++ b/src/Lucene.Net.Core/Search/FuzzyTermsEnum.cs @@ -304,7 +304,7 @@ namespace Lucene.Net.Search get { return actualEnum.TotalTermFreq; } } - public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, int flags) + public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, DocsFlags flags) { return actualEnum.Docs(liveDocs, reuse, flags); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Core/Search/MultiPhraseQuery.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Search/MultiPhraseQuery.cs b/src/Lucene.Net.Core/Search/MultiPhraseQuery.cs index 1415c1f..bcd3598 100644 --- a/src/Lucene.Net.Core/Search/MultiPhraseQuery.cs +++ b/src/Lucene.Net.Core/Search/MultiPhraseQuery.cs @@ -276,7 +276,7 @@ namespace Lucene.Net.Search if (postingsEnum == null) { // term does exist, but has no positions - Debug.Assert(termsEnum.Docs(liveDocs, null, DocsEnum.FLAG_NONE) != null, "termstate found but no term exists in reader"); + Debug.Assert(termsEnum.Docs(liveDocs, null, DocsFlags.NONE) != null, "termstate found but no term exists in reader"); throw new InvalidOperationException("field \"" + term.Field + "\" was indexed without position data; cannot run PhraseQuery (term=" + term.Text() + ")"); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Core/Search/MultiTermQueryWrapperFilter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Search/MultiTermQueryWrapperFilter.cs b/src/Lucene.Net.Core/Search/MultiTermQueryWrapperFilter.cs index 17004d5..73830a8 100644 --- a/src/Lucene.Net.Core/Search/MultiTermQueryWrapperFilter.cs +++ b/src/Lucene.Net.Core/Search/MultiTermQueryWrapperFilter.cs @@ -1,3 +1,4 @@ +using Lucene.Net.Index; using System.Diagnostics; namespace Lucene.Net.Search @@ -124,7 +125,7 @@ namespace Lucene.Net.Search { // System.out.println(" iter termCount=" + termCount + " term=" + // enumerator.term().toBytesString()); - docsEnum = termsEnum.Docs(acceptDocs, docsEnum, DocsEnum.FLAG_NONE); + docsEnum = termsEnum.Docs(acceptDocs, docsEnum, DocsFlags.NONE); int docid; while ((docid = docsEnum.NextDoc()) != DocIdSetIterator.NO_MORE_DOCS) { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyWriter.cs b/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyWriter.cs index 283904f..6178eaf 100644 --- a/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyWriter.cs +++ b/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyWriter.cs @@ -1,4 +1,5 @@ using Lucene.Net.Analysis.TokenAttributes; +using Lucene.Net.Index; using Lucene.Net.Store; using Lucene.Net.Support; using Lucene.Net.Util; @@ -810,7 +811,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory // is sufficient to call next(), and then doc(), exactly once with no // 'validation' checks. FacetLabel cp = new FacetLabel(FacetsConfig.StringToPath(t.Utf8ToString())); - docsEnum = termsEnum.Docs(null, docsEnum, DocsEnum.FLAG_NONE); + docsEnum = termsEnum.Docs(null, docsEnum, DocsFlags.NONE); bool res = cache.Put(cp, docsEnum.NextDoc() + ctx.DocBase); Debug.Assert(!res, "entries should not have been evicted from the cache"); } @@ -923,7 +924,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory { FacetLabel cp = new FacetLabel(FacetsConfig.StringToPath(te.Term.Utf8ToString())); int ordinal = AddCategory(cp); - docs = te.Docs(null, docs, DocsEnum.FLAG_NONE); + docs = te.Docs(null, docs, DocsFlags.NONE); ordinalMap.AddMapping(docs.NextDoc() + @base, ordinal); } @base += ar.MaxDoc; // no deletions, so we're ok http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Join/TermsIncludingScoreQuery.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Join/TermsIncludingScoreQuery.cs b/src/Lucene.Net.Join/TermsIncludingScoreQuery.cs index e312dfd..0fa0d27 100644 --- a/src/Lucene.Net.Join/TermsIncludingScoreQuery.cs +++ b/src/Lucene.Net.Join/TermsIncludingScoreQuery.cs @@ -284,7 +284,7 @@ namespace Lucene.Net.Join _scoreUpto = _upto; if (_termsEnum.SeekExact(outerInstance._terms.Get(outerInstance._ords[_upto++], _spare))) { - docsEnum = _reuse = _termsEnum.Docs(_acceptDocs, _reuse, DocsEnum.FLAG_NONE); + docsEnum = _reuse = _termsEnum.Docs(_acceptDocs, _reuse, DocsFlags.NONE); } } } @@ -388,7 +388,7 @@ namespace Lucene.Net.Join { if (termsEnum.SeekExact(m_outerInstance._terms.Get(m_outerInstance._ords[i], spare))) { - docsEnum = termsEnum.Docs(acceptDocs, docsEnum, FLAG_NONE); + docsEnum = termsEnum.Docs(acceptDocs, docsEnum, DocsFlags.NONE); float score = m_outerInstance._scores[m_outerInstance._ords[i]]; for (int doc = docsEnum.NextDoc(); doc != NO_MORE_DOCS; @@ -452,7 +452,7 @@ namespace Lucene.Net.Join { if (termsEnum.SeekExact(m_outerInstance._terms.Get(m_outerInstance._ords[i], spare))) { - docsEnum = termsEnum.Docs(acceptDocs, docsEnum, FLAG_NONE); + docsEnum = termsEnum.Docs(acceptDocs, docsEnum, DocsFlags.NONE); float score = m_outerInstance._scores[m_outerInstance._ords[i]]; for (int doc = docsEnum.NextDoc(); doc != NO_MORE_DOCS; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Memory/MemoryIndex.MemoryIndexReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Memory/MemoryIndex.MemoryIndexReader.cs b/src/Lucene.Net.Memory/MemoryIndex.MemoryIndexReader.cs index c9c9765..777e476 100644 --- a/src/Lucene.Net.Memory/MemoryIndex.MemoryIndexReader.cs +++ b/src/Lucene.Net.Memory/MemoryIndex.MemoryIndexReader.cs @@ -370,7 +370,7 @@ namespace Lucene.Net.Index.Memory get { return info.sliceArray.freq[info.sortedTerms[termUpto]]; } } - public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, int flags) + public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, DocsFlags flags) { if (reuse == null || !(reuse is MemoryDocsEnum)) { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/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 549bbf9..00584dc 100644 --- a/src/Lucene.Net.Misc/Index/Sorter/SortingAtomicReader.cs +++ b/src/Lucene.Net.Misc/Index/Sorter/SortingAtomicReader.cs @@ -140,7 +140,7 @@ namespace Lucene.Net.Index.Sorter } } - public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, int flags) + public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, DocsFlags flags) { DocsEnum inReuse; SortingDocsEnum wrapReuse; @@ -158,7 +158,7 @@ namespace Lucene.Net.Index.Sorter } DocsEnum inDocs = m_input.Docs(NewToOld(liveDocs), inReuse, flags); - bool withFreqs = indexOptions.CompareTo(IndexOptions.DOCS_AND_FREQS) >= 0 && (flags & DocsEnum.FLAG_FREQS) != 0; + bool withFreqs = indexOptions.CompareTo(IndexOptions.DOCS_AND_FREQS) >= 0 && (flags & DocsFlags.FREQS) != 0; return new SortingDocsEnum(docMap.Count, wrapReuse, inDocs, withFreqs, docMap); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Queries/TermFilter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Queries/TermFilter.cs b/src/Lucene.Net.Queries/TermFilter.cs index a3a48a8..7c7a0be 100644 --- a/src/Lucene.Net.Queries/TermFilter.cs +++ b/src/Lucene.Net.Queries/TermFilter.cs @@ -80,7 +80,7 @@ namespace Lucene.Net.Queries public override DocIdSetIterator GetIterator() { - return termsEnum.Docs(acceptDocs, null, DocsEnum.FLAG_NONE); + return termsEnum.Docs(acceptDocs, null, DocsFlags.NONE); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Queries/TermsFilter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Queries/TermsFilter.cs b/src/Lucene.Net.Queries/TermsFilter.cs index 3a82206..62e25ac 100644 --- a/src/Lucene.Net.Queries/TermsFilter.cs +++ b/src/Lucene.Net.Queries/TermsFilter.cs @@ -243,7 +243,7 @@ namespace Lucene.Net.Queries spare.Length = offsets[i + 1] - offsets[i]; if (termsEnum.SeekExact(spare)) { - docs = termsEnum.Docs(acceptDocs, docs, DocsEnum.FLAG_NONE); // no freq since we don't need them + docs = termsEnum.Docs(acceptDocs, docs, DocsFlags.NONE); // no freq since we don't need them if (result == null) { if (docs.NextDoc() != DocIdSetIterator.NO_MORE_DOCS) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Sandbox/Queries/DuplicateFilter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Sandbox/Queries/DuplicateFilter.cs b/src/Lucene.Net.Sandbox/Queries/DuplicateFilter.cs index 7e7cc39..9d716f9 100644 --- a/src/Lucene.Net.Sandbox/Queries/DuplicateFilter.cs +++ b/src/Lucene.Net.Sandbox/Queries/DuplicateFilter.cs @@ -90,7 +90,7 @@ namespace Lucene.Net.Sandbox.Queries } else { - docs = termsEnum.Docs(acceptDocs, docs, DocsEnum.FLAG_NONE); + docs = termsEnum.Docs(acceptDocs, docs, DocsFlags.NONE); int doc = docs.NextDoc(); if (doc != DocIdSetIterator.NO_MORE_DOCS) { @@ -143,7 +143,7 @@ namespace Lucene.Net.Sandbox.Queries if (termsEnum.DocFreq > 1) { // unset potential duplicates - docs = termsEnum.Docs(acceptDocs, docs, DocsEnum.FLAG_NONE); + docs = termsEnum.Docs(acceptDocs, docs, DocsFlags.NONE); int doc = docs.NextDoc(); if (doc != DocIdSetIterator.NO_MORE_DOCS) { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Spatial/Prefix/AbstractPrefixTreeFilter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Spatial/Prefix/AbstractPrefixTreeFilter.cs b/src/Lucene.Net.Spatial/Prefix/AbstractPrefixTreeFilter.cs index 1df2ee2..4965fa6 100644 --- a/src/Lucene.Net.Spatial/Prefix/AbstractPrefixTreeFilter.cs +++ b/src/Lucene.Net.Spatial/Prefix/AbstractPrefixTreeFilter.cs @@ -112,7 +112,7 @@ namespace Lucene.Net.Spatial.Prefix { //WARN: keep this specialization in sync Debug.Assert(m_termsEnum != null); - m_docsEnum = m_termsEnum.Docs(m_acceptDocs, m_docsEnum, DocsEnum.FLAG_NONE); + m_docsEnum = m_termsEnum.Docs(m_acceptDocs, m_docsEnum, DocsFlags.NONE); int docid; while ((docid = m_docsEnum.NextDoc()) != DocIdSetIterator.NO_MORE_DOCS) { @@ -128,7 +128,7 @@ namespace Lucene.Net.Spatial.Prefix protected void collectDocs(Collector collector) throws IOException { //WARN: keep this specialization in sync assert termsEnum != null; - docsEnum = termsEnum.docs(acceptDocs, docsEnum, DocsEnum.FLAG_NONE); + docsEnum = termsEnum.docs(acceptDocs, docsEnum, DocsFlags.NONE); int docid; while ((docid = docsEnum.nextDoc()) != DocIdSetIterator.NO_MORE_DOCS) { collector.collect(docid); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Spatial/Prefix/ContainsPrefixTreeFilter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Spatial/Prefix/ContainsPrefixTreeFilter.cs b/src/Lucene.Net.Spatial/Prefix/ContainsPrefixTreeFilter.cs index c8a80f6..4b87561 100644 --- a/src/Lucene.Net.Spatial/Prefix/ContainsPrefixTreeFilter.cs +++ b/src/Lucene.Net.Spatial/Prefix/ContainsPrefixTreeFilter.cs @@ -190,7 +190,7 @@ namespace Lucene.Net.Spatial.Prefix { SmallDocSet set = null; - m_docsEnum = m_termsEnum.Docs(acceptContains, m_docsEnum, DocsEnum.FLAG_NONE); + m_docsEnum = m_termsEnum.Docs(acceptContains, m_docsEnum, DocsFlags.NONE); int docid; while ((docid = m_docsEnum.NextDoc()) != DocIdSetIterator.NO_MORE_DOCS) { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Spatial/Util/ShapeFieldCacheProvider.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Spatial/Util/ShapeFieldCacheProvider.cs b/src/Lucene.Net.Spatial/Util/ShapeFieldCacheProvider.cs index d86ed3a..fde5918 100644 --- a/src/Lucene.Net.Spatial/Util/ShapeFieldCacheProvider.cs +++ b/src/Lucene.Net.Spatial/Util/ShapeFieldCacheProvider.cs @@ -81,7 +81,7 @@ namespace Lucene.Net.Spatial.Util T shape = ReadShape(term); if (shape != null) { - docs = te.Docs(null, docs, DocsEnum.FLAG_NONE); + docs = te.Docs(null, docs, DocsFlags.NONE); int docid = docs.NextDoc(); while (docid != DocIdSetIterator.NO_MORE_DOCS) { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.TestFramework/Codecs/RAMOnly/RAMOnlyPostingsFormat.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Codecs/RAMOnly/RAMOnlyPostingsFormat.cs b/src/Lucene.Net.TestFramework/Codecs/RAMOnly/RAMOnlyPostingsFormat.cs index f1b0d5e..521628f 100644 --- a/src/Lucene.Net.TestFramework/Codecs/RAMOnly/RAMOnlyPostingsFormat.cs +++ b/src/Lucene.Net.TestFramework/Codecs/RAMOnly/RAMOnlyPostingsFormat.cs @@ -498,7 +498,7 @@ namespace Lucene.Net.Codecs.RAMOnly get { return RamField.TermToDocs[Current].TotalTermFreq; } } - public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, int flags) + public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, DocsFlags flags) { return new RAMDocsEnum(RamField.TermToDocs[Current], liveDocs); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.TestFramework/Index/AssertingAtomicReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Index/AssertingAtomicReader.cs b/src/Lucene.Net.TestFramework/Index/AssertingAtomicReader.cs index cb17d6b..4e6d7d6 100644 --- a/src/Lucene.Net.TestFramework/Index/AssertingAtomicReader.cs +++ b/src/Lucene.Net.TestFramework/Index/AssertingAtomicReader.cs @@ -128,7 +128,7 @@ namespace Lucene.Net.Index { } - public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, int flags) + public override DocsEnum Docs(IBits liveDocs, DocsEnum reuse, DocsFlags flags) { Debug.Assert(State == State_e.POSITIONED, "docs(...) called on unpositioned TermsEnum"); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs index 92101bf..637aced 100644 --- a/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs +++ b/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs @@ -755,7 +755,7 @@ namespace Lucene.Net.Index { prevDocsEnum = threadState.ReuseDocsEnum; } - threadState.ReuseDocsEnum = termsEnum.Docs(liveDocs, prevDocsEnum, doCheckFreqs ? DocsEnum.FLAG_FREQS : DocsEnum.FLAG_NONE); + threadState.ReuseDocsEnum = termsEnum.Docs(liveDocs, prevDocsEnum, doCheckFreqs ? DocsFlags.FREQS : DocsFlags.NONE); docsEnum = threadState.ReuseDocsEnum; docsAndPositionsEnum = null; } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs index 87430d4..081589e 100644 --- a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs +++ b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs @@ -2059,16 +2059,16 @@ namespace Lucene.Net.Util AssertDocsEnumEquals(info, leftDocs = leftTermsEnum.Docs(randomBits, leftDocs), rightDocs = rightTermsEnum.Docs(randomBits, rightDocs), true); // w/o freqs: - AssertDocsEnumEquals(info, leftDocs = leftTermsEnum.Docs(null, leftDocs, DocsEnum.FLAG_NONE), rightDocs = rightTermsEnum.Docs(null, rightDocs, DocsEnum.FLAG_NONE), false); - AssertDocsEnumEquals(info, leftDocs = leftTermsEnum.Docs(randomBits, leftDocs, DocsEnum.FLAG_NONE), rightDocs = rightTermsEnum.Docs(randomBits, rightDocs, DocsEnum.FLAG_NONE), false); + AssertDocsEnumEquals(info, leftDocs = leftTermsEnum.Docs(null, leftDocs, DocsFlags.NONE), rightDocs = rightTermsEnum.Docs(null, rightDocs, DocsFlags.NONE), false); + AssertDocsEnumEquals(info, leftDocs = leftTermsEnum.Docs(randomBits, leftDocs, DocsFlags.NONE), rightDocs = rightTermsEnum.Docs(randomBits, rightDocs, DocsFlags.NONE), false); // with freqs: AssertDocsSkippingEquals(info, leftReader, leftTermsEnum.DocFreq, leftDocs = leftTermsEnum.Docs(null, leftDocs), rightDocs = rightTermsEnum.Docs(null, rightDocs), true); AssertDocsSkippingEquals(info, leftReader, leftTermsEnum.DocFreq, leftDocs = leftTermsEnum.Docs(randomBits, leftDocs), rightDocs = rightTermsEnum.Docs(randomBits, rightDocs), true); // w/o freqs: - AssertDocsSkippingEquals(info, leftReader, leftTermsEnum.DocFreq, leftDocs = leftTermsEnum.Docs(null, leftDocs, DocsEnum.FLAG_NONE), rightDocs = rightTermsEnum.Docs(null, rightDocs, DocsEnum.FLAG_NONE), false); - AssertDocsSkippingEquals(info, leftReader, leftTermsEnum.DocFreq, leftDocs = leftTermsEnum.Docs(randomBits, leftDocs, DocsEnum.FLAG_NONE), rightDocs = rightTermsEnum.Docs(randomBits, rightDocs, DocsEnum.FLAG_NONE), false); + AssertDocsSkippingEquals(info, leftReader, leftTermsEnum.DocFreq, leftDocs = leftTermsEnum.Docs(null, leftDocs, DocsFlags.NONE), rightDocs = rightTermsEnum.Docs(null, rightDocs, DocsFlags.NONE), false); + AssertDocsSkippingEquals(info, leftReader, leftTermsEnum.DocFreq, leftDocs = leftTermsEnum.Docs(randomBits, leftDocs, DocsFlags.NONE), rightDocs = rightTermsEnum.Docs(randomBits, rightDocs, DocsFlags.NONE), false); } } Assert.IsNull(rightTermsEnum.Next(), info); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.TestFramework/Util/TestUtil.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Util/TestUtil.cs b/src/Lucene.Net.TestFramework/Util/TestUtil.cs index a047a1a..24daa50 100644 --- a/src/Lucene.Net.TestFramework/Util/TestUtil.cs +++ b/src/Lucene.Net.TestFramework/Util/TestUtil.cs @@ -1092,7 +1092,7 @@ namespace Lucene.Net.Util // Returns a DocsEnum, but randomly sometimes uses a // DocsAndFreqsEnum, DocsAndPositionsEnum. Returns null // if field/term doesn't exist: - public static DocsEnum Docs(Random random, IndexReader r, string field, BytesRef term, IBits liveDocs, DocsEnum reuse, int flags) + public static DocsEnum Docs(Random random, IndexReader r, string field, BytesRef term, IBits liveDocs, DocsEnum reuse, DocsFlags flags) { Terms terms = MultiFields.GetTerms(r, field); if (terms == null) @@ -1109,7 +1109,7 @@ namespace Lucene.Net.Util // Returns a DocsEnum from a positioned TermsEnum, but // randomly sometimes uses a DocsAndFreqsEnum, DocsAndPositionsEnum. - public static DocsEnum Docs(Random random, TermsEnum termsEnum, IBits liveDocs, DocsEnum reuse, int flags) + public static DocsEnum Docs(Random random, TermsEnum termsEnum, IBits liveDocs, DocsEnum reuse, DocsFlags flags) { if (random.NextBoolean()) { @@ -1141,7 +1141,7 @@ namespace Lucene.Net.Util return docsAndPositions; } } - flags |= DocsEnum.FLAG_FREQS; + flags |= DocsFlags.FREQS; } return termsEnum.Docs(liveDocs, reuse, flags); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Tests.Codecs/Pulsing/Test10KPulsings.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Codecs/Pulsing/Test10KPulsings.cs b/src/Lucene.Net.Tests.Codecs/Pulsing/Test10KPulsings.cs index 64f66a0..3263b43 100644 --- a/src/Lucene.Net.Tests.Codecs/Pulsing/Test10KPulsings.cs +++ b/src/Lucene.Net.Tests.Codecs/Pulsing/Test10KPulsings.cs @@ -87,7 +87,7 @@ namespace Lucene.Net.Codecs.Pulsing //string expected = df.format(i); string expected = i.ToString("00000", CultureInfo.InvariantCulture); assertEquals(expected, te.Next().Utf8ToString()); - de = TestUtil.Docs(Random(), te, null, de, DocsEnum.FLAG_NONE); + de = TestUtil.Docs(Random(), te, null, de, DocsFlags.NONE); assertTrue(de.NextDoc() != DocIdSetIterator.NO_MORE_DOCS); assertEquals(DocIdSetIterator.NO_MORE_DOCS, de.NextDoc()); } @@ -159,7 +159,7 @@ namespace Lucene.Net.Codecs.Pulsing //string expected = df.format(i); string expected = i.ToString("00000", CultureInfo.InvariantCulture); assertEquals(expected, te.Next().Utf8ToString()); - de = TestUtil.Docs(Random(), te, null, de, DocsEnum.FLAG_NONE); + de = TestUtil.Docs(Random(), te, null, de, DocsFlags.NONE); assertTrue(de.NextDoc() != DocIdSetIterator.NO_MORE_DOCS); assertEquals(DocIdSetIterator.NO_MORE_DOCS, de.NextDoc()); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Tests.Codecs/Pulsing/TestPulsingReuse.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Codecs/Pulsing/TestPulsingReuse.cs b/src/Lucene.Net.Tests.Codecs/Pulsing/TestPulsingReuse.cs index d711b1d..5cb00c4 100644 --- a/src/Lucene.Net.Tests.Codecs/Pulsing/TestPulsingReuse.cs +++ b/src/Lucene.Net.Tests.Codecs/Pulsing/TestPulsingReuse.cs @@ -52,7 +52,7 @@ namespace Lucene.Net.Codecs.Pulsing TermsEnum te = segment.Terms("foo").GetIterator(null); while (te.Next() != null) { - reuse = te.Docs(null, reuse, DocsEnum.FLAG_NONE); + reuse = te.Docs(null, reuse, DocsFlags.NONE); allEnums[reuse] = true; } @@ -97,7 +97,7 @@ namespace Lucene.Net.Codecs.Pulsing TermsEnum te = segment.Terms("foo").GetIterator(null); while (te.Next() != null) { - reuse = te.Docs(null, reuse, DocsEnum.FLAG_NONE); + reuse = te.Docs(null, reuse, DocsFlags.NONE); allEnums[reuse] = true; } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Tests.Join/TestJoinUtil.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Join/TestJoinUtil.cs b/src/Lucene.Net.Tests.Join/TestJoinUtil.cs index 274a588..cd2c496 100644 --- a/src/Lucene.Net.Tests.Join/TestJoinUtil.cs +++ b/src/Lucene.Net.Tests.Join/TestJoinUtil.cs @@ -720,7 +720,7 @@ namespace Lucene.Net.Tests.Join termsEnum = terms.GetIterator(termsEnum); if (termsEnum.SeekExact(joinValue)) { - docsEnum = termsEnum.Docs(slowCompositeReader.LiveDocs, docsEnum, DocsEnum.FLAG_NONE); + docsEnum = termsEnum.Docs(slowCompositeReader.LiveDocs, docsEnum, DocsFlags.NONE); JoinScore joinScore = joinValueToJoinScores[joinValue]; for (int doc = docsEnum.NextDoc(); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Tests.Memory/Index/Memory/MemoryIndexTest.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Memory/Index/Memory/MemoryIndexTest.cs b/src/Lucene.Net.Tests.Memory/Index/Memory/MemoryIndexTest.cs index 637a6e1..482cf42 100644 --- a/src/Lucene.Net.Tests.Memory/Index/Memory/MemoryIndexTest.cs +++ b/src/Lucene.Net.Tests.Memory/Index/Memory/MemoryIndexTest.cs @@ -322,7 +322,7 @@ namespace Lucene.Net.Index.Memory MemoryIndex memory = new MemoryIndex(Random().nextBoolean(), Random().nextInt(50) * 1024 * 1024); memory.AddField("foo", "bar", analyzer); AtomicReader reader = (AtomicReader)memory.CreateSearcher().IndexReader; - DocsEnum disi = TestUtil.Docs(Random(), reader, "foo", new BytesRef("bar"), null, null, DocsEnum.FLAG_NONE); + DocsEnum disi = TestUtil.Docs(Random(), reader, "foo", new BytesRef("bar"), null, null, DocsFlags.NONE); int docid = disi.DocID; assertEquals(-1, docid); assertTrue(disi.NextDoc() != DocIdSetIterator.NO_MORE_DOCS); @@ -330,7 +330,7 @@ namespace Lucene.Net.Index.Memory // now reuse and check again TermsEnum te = reader.Terms("foo").GetIterator(null); assertTrue(te.SeekExact(new BytesRef("bar"))); - disi = te.Docs(null, disi, DocsEnum.FLAG_NONE); + disi = te.Docs(null, disi, DocsFlags.NONE); docid = disi.DocID; assertEquals(-1, docid); assertTrue(disi.NextDoc() != DocIdSetIterator.NO_MORE_DOCS);
