Repository: lucenenet Updated Branches: refs/heads/api-work 3015c36b7 -> 418e54402
Lucene.Net.Index.DocsAndPositionsEnum refactor: Converted flags (constants) into [Flags] enum named DocsAndPositionsFlags Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/808a0eba Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/808a0eba Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/808a0eba Branch: refs/heads/api-work Commit: 808a0ebab8f12715413a36835a521035b30dd85c Parents: 3015c36 Author: Shad Storhaug <[email protected]> Authored: Sun Mar 5 20:57:39 2017 +0700 Committer: Shad Storhaug <[email protected]> Committed: Sun Mar 5 20:57:39 2017 +0700 ---------------------------------------------------------------------- .../BlockTerms/BlockTermsReader.cs | 2 +- .../Bloom/BloomFilteringPostingsFormat.cs | 2 +- .../Memory/DirectPostingsFormat.cs | 7 +-- .../Memory/FSTOrdTermsReader.cs | 2 +- src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs | 14 ++--- .../Memory/MemoryDocValuesProducer.cs | 2 +- .../Memory/MemoryPostingsFormat.cs | 5 +- .../Pulsing/PulsingPostingsReader.cs | 2 +- src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs | 2 +- .../SimpleText/SimpleTextFieldsReader.cs | 5 +- .../SimpleText/SimpleTextTermVectorsReader.cs | 4 +- .../Codecs/BlockTreeTermsReader.cs | 5 +- .../Compressing/CompressingTermVectorsReader.cs | 4 +- .../Codecs/Lucene3x/Lucene3xFields.cs | 3 +- .../Lucene3x/Lucene3xTermVectorsReader.cs | 3 +- .../Codecs/Lucene40/Lucene40PostingsReader.cs | 3 +- .../Lucene40/Lucene40TermVectorsReader.cs | 5 +- .../Codecs/Lucene41/Lucene41PostingsReader.cs | 10 ++-- .../Lucene42/Lucene42DocValuesProducer.cs | 3 +- .../Lucene45/Lucene45DocValuesProducer.cs | 3 +- .../Codecs/PostingsReaderBase.cs | 3 +- src/Lucene.Net.Core/Codecs/TermsConsumer.cs | 3 +- src/Lucene.Net.Core/Index/DocTermOrds.cs | 2 +- .../Index/DocsAndPositionsEnum.cs | 55 +++++++++++++------- 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 | 2 +- .../Index/SortedDocValuesTermsEnum.cs | 2 +- .../Index/SortedSetDocValuesTermsEnum.cs | 2 +- src/Lucene.Net.Core/Index/TermsEnum.cs | 12 ++--- src/Lucene.Net.Core/Search/FuzzyTermsEnum.cs | 3 +- src/Lucene.Net.Core/Search/MultiPhraseQuery.cs | 5 +- src/Lucene.Net.Core/Search/PhraseQuery.cs | 3 +- .../Search/Spans/SpanTermQuery.cs | 3 +- .../Taxonomy/Directory/TaxonomyIndexArrays.cs | 5 +- .../PostingsHighlight/PostingsHighlighter.cs | 2 +- .../MemoryIndex.MemoryIndexReader.cs | 2 +- .../Index/Sorter/SortingAtomicReader.cs | 2 +- .../Suggest/Analyzing/BlendedInfixSuggester.cs | 2 +- .../Codecs/RAMOnly/RAMOnlyPostingsFormat.cs | 6 ++- .../Index/AssertingAtomicReader.cs | 2 +- .../Index/BasePostingsFormatTestCase.cs | 12 ++--- src/Lucene.Net.TestFramework/Util/TestUtil.cs | 8 +-- .../Codecs/Lucene41/TestBlockPostingsFormat3.cs | 24 ++++----- .../Index/TestFilterAtomicReader.cs | 2 +- .../Index/TestPostingsOffsets.cs | 2 +- 47 files changed, 146 insertions(+), 112 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 c884725..2b0f700 100644 --- a/src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs +++ b/src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs @@ -759,7 +759,7 @@ namespace Lucene.Net.Codecs.BlockTerms } public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, - int flags) + DocsAndPositionsFlags flags) { if (_fieldReader._fieldInfo.IndexOptions.GetValueOrDefault().CompareTo(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) < 0) { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 463c7a2..d3ba27d 100644 --- a/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs +++ b/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs @@ -386,7 +386,7 @@ namespace Lucene.Net.Codecs.Bloom } public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, - DocsAndPositionsEnum reuse, int flags) + DocsAndPositionsEnum reuse, DocsAndPositionsFlags flags) { return Delegate.DocsAndPositions(liveDocs, reuse, flags); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 d53d2c9..6fabc4a 100644 --- a/src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs +++ b/src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs @@ -1,4 +1,5 @@ -using Lucene.Net.Support; +using Lucene.Net.Index; +using Lucene.Net.Support; using System; using System.Collections.Generic; using System.Diagnostics; @@ -1165,7 +1166,7 @@ namespace Lucene.Net.Codecs.Memory } public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, - int flags) + DocsAndPositionsFlags flags) { if (!outerInstance.hasPos) { @@ -1814,7 +1815,7 @@ namespace Lucene.Net.Codecs.Memory } public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, - int flags) + DocsAndPositionsFlags flags) { if (!outerInstance.hasPos) { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 b30c10c..82c8311 100644 --- a/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs +++ b/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs @@ -482,7 +482,7 @@ namespace Lucene.Net.Codecs.Memory return outerInstance.outerInstance.postingsReader.Docs(outerInstance.fieldInfo, state, liveDocs, reuse, flags); } - public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, int flags) + public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, DocsAndPositionsFlags flags) { if (!outerInstance.HasPositions) { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 efec421..73226b2 100644 --- a/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs +++ b/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs @@ -1,10 +1,10 @@ -using System; - using System.Collections; - using System.Collections.Generic; - using System.Diagnostics; - using Lucene.Net.Util.Fst; - +using Lucene.Net.Index; using Lucene.Net.Support; +using Lucene.Net.Util.Fst; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Diagnostics; namespace Lucene.Net.Codecs.Memory { @@ -333,7 +333,7 @@ namespace Lucene.Net.Codecs.Memory return outerInstance.outerInstance.postingsReader.Docs(outerInstance.fieldInfo, state, liveDocs, reuse, flags); } - public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, int flags) + public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, DocsAndPositionsFlags flags) { if (!outerInstance.HasPositions) { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 7fd6ca2..d32606f 100644 --- a/src/Lucene.Net.Codecs/Memory/MemoryDocValuesProducer.cs +++ b/src/Lucene.Net.Codecs/Memory/MemoryDocValuesProducer.cs @@ -846,7 +846,7 @@ namespace Lucene.Net.Codecs.Memory throw new NotSupportedException(); } - public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, int flags) + public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, DocsAndPositionsFlags flags) { throw new NotSupportedException(); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 4b86aff..e17f9cb 100644 --- a/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs +++ b/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs @@ -1,4 +1,5 @@ -using Lucene.Net.Util.Fst; +using Lucene.Net.Index; +using Lucene.Net.Util.Fst; using System; using System.Collections.Generic; using System.Diagnostics; @@ -843,7 +844,7 @@ namespace Lucene.Net.Codecs.Memory return docsEnum.Reset(this.postingsSpare, liveDocs, docFreq_Renamed); } - public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, int flags) + public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, DocsAndPositionsFlags flags) { bool hasOffsets = field.IndexOptions.GetValueOrDefault().CompareTo(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS) >= 0; if (field.IndexOptions.GetValueOrDefault().CompareTo(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) < 0) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 675bb1f..8bf5e99 100644 --- a/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsReader.cs +++ b/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsReader.cs @@ -265,7 +265,7 @@ namespace Lucene.Net.Codecs.Pulsing public override DocsAndPositionsEnum DocsAndPositions(FieldInfo field, BlockTermState termState, IBits liveDocs, DocsAndPositionsEnum reuse, - int flags) + DocsAndPositionsFlags flags) { var termState2 = (PulsingTermState) termState; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 e4243dd..f1e3097 100644 --- a/src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs +++ b/src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs @@ -268,7 +268,7 @@ namespace Lucene.Net.Codecs.Sep } public override DocsAndPositionsEnum DocsAndPositions(FieldInfo fieldInfo, BlockTermState bTermState, - IBits liveDocs, DocsAndPositionsEnum reuse, int flags) + IBits liveDocs, DocsAndPositionsEnum reuse, DocsAndPositionsFlags flags) { Debug.Assert(fieldInfo.IndexOptions == IndexOptions.DOCS_AND_FREQS_AND_POSITIONS); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 2cf5ec8..6e2f2dc 100644 --- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs +++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs @@ -1,4 +1,5 @@ -using Lucene.Net.Util.Fst; +using Lucene.Net.Index; +using Lucene.Net.Util.Fst; using System; using System.Collections.Generic; using System.Diagnostics; @@ -207,7 +208,7 @@ namespace Lucene.Net.Codecs.SimpleText _docFreq); } - public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, int flags) + public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, DocsAndPositionsFlags flags) { if (_indexOptions.GetValueOrDefault().CompareTo(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) < 0) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 588d19c..0bde2e6 100644 --- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs +++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs @@ -1,4 +1,4 @@ -using Lucene.Net.Support; +using Lucene.Net.Index; using System; using System.Collections.Generic; using System.Diagnostics; @@ -457,7 +457,7 @@ namespace Lucene.Net.Codecs.SimpleText return e; } - public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, int flags) + public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, DocsAndPositionsFlags flags) { var postings = _current.Value; if (postings.positions == null && postings.startOffsets == null) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 2ce3b29..8d1cb64 100644 --- a/src/Lucene.Net.Core/Codecs/BlockTreeTermsReader.cs +++ b/src/Lucene.Net.Core/Codecs/BlockTreeTermsReader.cs @@ -1,3 +1,4 @@ +using Lucene.Net.Index; using Lucene.Net.Support; using Lucene.Net.Util.Fst; using System; @@ -1192,7 +1193,7 @@ namespace Lucene.Net.Codecs return outerInstance.outerInstance.postingsReader.Docs(outerInstance.fieldInfo, currentFrame.termState, skipDocs, reuse, flags); } - public override DocsAndPositionsEnum DocsAndPositions(IBits skipDocs, DocsAndPositionsEnum reuse, int flags) + public override DocsAndPositionsEnum DocsAndPositions(IBits skipDocs, DocsAndPositionsEnum reuse, DocsAndPositionsFlags flags) { if (outerInstance.fieldInfo.IndexOptions < IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) { @@ -2617,7 +2618,7 @@ namespace Lucene.Net.Codecs return outerInstance.outerInstance.postingsReader.Docs(outerInstance.fieldInfo, currentFrame.state, skipDocs, reuse, flags); } - public override DocsAndPositionsEnum DocsAndPositions(IBits skipDocs, DocsAndPositionsEnum reuse, int flags) + public override DocsAndPositionsEnum DocsAndPositions(IBits skipDocs, DocsAndPositionsEnum reuse, DocsAndPositionsFlags flags) { if (outerInstance.fieldInfo.IndexOptions < IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 03e1191..f39cc10 100644 --- a/src/Lucene.Net.Core/Codecs/Compressing/CompressingTermVectorsReader.cs +++ b/src/Lucene.Net.Core/Codecs/Compressing/CompressingTermVectorsReader.cs @@ -1020,14 +1020,14 @@ namespace Lucene.Net.Codecs.Compressing return docsEnum; } - public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, int flags) + public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, DocsAndPositionsFlags flags) { if (positions == null && startOffsets == null) { return null; } // TODO: slightly sheisty - return (DocsAndPositionsEnum)Docs(liveDocs, reuse, flags); + return (DocsAndPositionsEnum)Docs(liveDocs, reuse, (int)flags); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 3100d1e..bcfc261 100644 --- a/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xFields.cs +++ b/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xFields.cs @@ -1,3 +1,4 @@ +using Lucene.Net.Index; using System; using System.Collections.Generic; using System.Diagnostics; @@ -1096,7 +1097,7 @@ namespace Lucene.Net.Codecs.Lucene3x return docsEnum.Reset(termEnum, liveDocs); } - public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, int flags) + public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, DocsAndPositionsFlags flags) { PreDocsAndPositionsEnum docsPosEnum; if (fieldInfo.IndexOptions != IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 46fba1a..d5dd5b6 100644 --- a/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xTermVectorsReader.cs +++ b/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xTermVectorsReader.cs @@ -1,3 +1,4 @@ +using Lucene.Net.Index; using System; using System.Collections; using System.Collections.Generic; @@ -647,7 +648,7 @@ namespace Lucene.Net.Codecs.Lucene3x return docsEnum; } - public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, int flags) + public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, DocsAndPositionsFlags flags) { if (!storePositions && !storeOffsets) { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 2c2ffca..867eae4 100644 --- a/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40PostingsReader.cs +++ b/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40PostingsReader.cs @@ -1,3 +1,4 @@ +using Lucene.Net.Index; using Lucene.Net.Support; using System; using System.Diagnostics; @@ -251,7 +252,7 @@ namespace Lucene.Net.Codecs.Lucene40 } } - public override DocsAndPositionsEnum DocsAndPositions(FieldInfo fieldInfo, BlockTermState termState, IBits liveDocs, DocsAndPositionsEnum reuse, int flags) + public override DocsAndPositionsEnum DocsAndPositions(FieldInfo fieldInfo, BlockTermState termState, IBits liveDocs, DocsAndPositionsEnum reuse, DocsAndPositionsFlags flags) { bool hasOffsets = fieldInfo.IndexOptions >= IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 956257c..e109bd7 100644 --- a/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40TermVectorsReader.cs +++ b/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40TermVectorsReader.cs @@ -1,7 +1,8 @@ +using Lucene.Net.Index; +using Lucene.Net.Support; using System; using System.Collections.Generic; using System.Diagnostics; -using Lucene.Net.Support; namespace Lucene.Net.Codecs.Lucene40 { @@ -638,7 +639,7 @@ namespace Lucene.Net.Codecs.Lucene40 return docsEnum; } - public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, int flags) + public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, DocsAndPositionsFlags flags) { if (!storePositions && !storeOffsets) { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 1d68cad..eb6275d 100644 --- a/src/Lucene.Net.Core/Codecs/Lucene41/Lucene41PostingsReader.cs +++ b/src/Lucene.Net.Core/Codecs/Lucene41/Lucene41PostingsReader.cs @@ -251,12 +251,12 @@ namespace Lucene.Net.Codecs.Lucene41 // TODO: specialize to liveDocs vs not - public override DocsAndPositionsEnum DocsAndPositions(FieldInfo fieldInfo, BlockTermState termState, IBits liveDocs, DocsAndPositionsEnum reuse, int flags) + public override DocsAndPositionsEnum DocsAndPositions(FieldInfo fieldInfo, BlockTermState termState, IBits liveDocs, DocsAndPositionsEnum reuse, DocsAndPositionsFlags flags) { bool indexHasOffsets = fieldInfo.IndexOptions >= IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS; bool indexHasPayloads = fieldInfo.HasPayloads; - if ((!indexHasOffsets || (flags & DocsAndPositionsEnum.FLAG_OFFSETS) == 0) && (!indexHasPayloads || (flags & DocsAndPositionsEnum.FLAG_PAYLOADS) == 0)) + if ((!indexHasOffsets || (flags & DocsAndPositionsFlags.OFFSETS) == 0) && (!indexHasPayloads || (flags & DocsAndPositionsFlags.PAYLOADS) == 0)) { BlockDocsAndPositionsEnum docsAndPositionsEnum; if (reuse is BlockDocsAndPositionsEnum) @@ -1188,7 +1188,7 @@ namespace Lucene.Net.Codecs.Lucene41 return docIn == startDocIn && indexHasOffsets == (fieldInfo.IndexOptions >= IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS) && indexHasPayloads == fieldInfo.HasPayloads; } - public EverythingEnum Reset(IBits liveDocs, Lucene41PostingsWriter.Int32BlockTermState termState, int flags) + public EverythingEnum Reset(IBits liveDocs, Lucene41PostingsWriter.Int32BlockTermState termState, DocsAndPositionsFlags flags) { this.liveDocs = liveDocs; // if (DEBUG) { @@ -1226,8 +1226,8 @@ namespace Lucene.Net.Codecs.Lucene41 lastPosBlockFP = posTermStartFP + termState.lastPosBlockOffset; } - this.needsOffsets = (flags & DocsAndPositionsEnum.FLAG_OFFSETS) != 0; - this.needsPayloads = (flags & DocsAndPositionsEnum.FLAG_PAYLOADS) != 0; + this.needsOffsets = (flags & DocsAndPositionsFlags.OFFSETS) != 0; + this.needsPayloads = (flags & DocsAndPositionsFlags.PAYLOADS) != 0; doc = -1; accum = 0; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 3346e6c..7566f62 100644 --- a/src/Lucene.Net.Core/Codecs/Lucene42/Lucene42DocValuesProducer.cs +++ b/src/Lucene.Net.Core/Codecs/Lucene42/Lucene42DocValuesProducer.cs @@ -1,3 +1,4 @@ +using Lucene.Net.Index; using Lucene.Net.Store; using Lucene.Net.Support; using Lucene.Net.Util.Fst; @@ -826,7 +827,7 @@ namespace Lucene.Net.Codecs.Lucene42 throw new System.NotSupportedException(); } - public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, int flags) + public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, DocsAndPositionsFlags flags) { throw new System.NotSupportedException(); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 6626f00..e443190 100644 --- a/src/Lucene.Net.Core/Codecs/Lucene45/Lucene45DocValuesProducer.cs +++ b/src/Lucene.Net.Core/Codecs/Lucene45/Lucene45DocValuesProducer.cs @@ -1,3 +1,4 @@ +using Lucene.Net.Index; using Lucene.Net.Support; using Lucene.Net.Util; using System; @@ -1262,7 +1263,7 @@ namespace Lucene.Net.Codecs.Lucene45 throw new System.NotSupportedException(); } - public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, int flags) + public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, DocsAndPositionsFlags flags) { throw new System.NotSupportedException(); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 f409f74..52aec83 100644 --- a/src/Lucene.Net.Core/Codecs/PostingsReaderBase.cs +++ b/src/Lucene.Net.Core/Codecs/PostingsReaderBase.cs @@ -1,3 +1,4 @@ +using Lucene.Net.Index; using System; namespace Lucene.Net.Codecs @@ -77,7 +78,7 @@ namespace Lucene.Net.Codecs /// Must fully consume state, since after this call that /// TermState may be reused. /// </summary> - public abstract DocsAndPositionsEnum DocsAndPositions(FieldInfo fieldInfo, BlockTermState state, IBits skipDocs, DocsAndPositionsEnum reuse, int flags); + public abstract DocsAndPositionsEnum DocsAndPositions(FieldInfo fieldInfo, BlockTermState state, IBits skipDocs, DocsAndPositionsEnum reuse, DocsAndPositionsFlags flags); /// <summary> /// Returns approximate RAM bytes used </summary> http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 097f4f7..e9c3873 100644 --- a/src/Lucene.Net.Core/Codecs/TermsConsumer.cs +++ b/src/Lucene.Net.Core/Codecs/TermsConsumer.cs @@ -1,3 +1,4 @@ +using Lucene.Net.Index; using System.Collections.Generic; using System.Diagnostics; @@ -183,7 +184,7 @@ namespace Lucene.Net.Codecs { // We can pass null for liveDocs, because the // mapping enum will skip the non-live docs: - postingsEnumIn = (MultiDocsAndPositionsEnum)termsEnum.DocsAndPositions(null, postingsEnumIn, DocsAndPositionsEnum.FLAG_PAYLOADS); + postingsEnumIn = (MultiDocsAndPositionsEnum)termsEnum.DocsAndPositions(null, postingsEnumIn, DocsAndPositionsFlags.PAYLOADS); Debug.Assert(postingsEnumIn != null); postingsEnum.Reset(postingsEnumIn); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 25b61f5..7aa048d 100644 --- a/src/Lucene.Net.Core/Index/DocTermOrds.cs +++ b/src/Lucene.Net.Core/Index/DocTermOrds.cs @@ -767,7 +767,7 @@ namespace Lucene.Net.Index return termsEnum.Docs(liveDocs, reuse, flags); } - public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, int flags) + public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, DocsAndPositionsFlags flags) { return termsEnum.DocsAndPositions(liveDocs, reuse, flags); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/src/Lucene.Net.Core/Index/DocsAndPositionsEnum.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Index/DocsAndPositionsEnum.cs b/src/Lucene.Net.Core/Index/DocsAndPositionsEnum.cs index 453b93d..6681338 100644 --- a/src/Lucene.Net.Core/Index/DocsAndPositionsEnum.cs +++ b/src/Lucene.Net.Core/Index/DocsAndPositionsEnum.cs @@ -1,3 +1,5 @@ +using System; + namespace Lucene.Net.Index { /* @@ -20,23 +22,36 @@ namespace Lucene.Net.Index // javadocs using BytesRef = Lucene.Net.Util.BytesRef; - /// <summary> - /// Also iterates through positions. </summary> - public abstract class DocsAndPositionsEnum : DocsEnum + // LUCENENET specific - converted constants from DocsAndPositionsEnum + // into a flags enum. + [Flags] + public enum DocsAndPositionsFlags { - // LUCENENET TODO: Make the following into a [Flags] enum + /// <summary> + /// Flag to pass to <see cref="TermsEnum.DocsAndPositions(Util.IBits, DocsAndPositionsEnum, DocsAndPositionsFlags)"/> + /// if you require that no offsets and payloads will be returned. + /// </summary> + NONE = 0x0, /// <summary> - /// Flag to pass to <seealso cref="TermsEnum#docsAndPositions(Bits,DocsAndPositionsEnum,int)"/> - /// if you require offsets in the returned enum. + /// Flag to pass to <see cref="TermsEnum.DocsAndPositions(Util.IBits, DocsAndPositionsEnum, DocsAndPositionsFlags)"/> + /// if you require offsets in the returned enum. /// </summary> - public static readonly int FLAG_OFFSETS = 0x1; + OFFSETS = 0x1, // LUCENENET specific - renamed from FLAG_OFFSETS since FLAG_ makes it redundant /// <summary> - /// Flag to pass to <seealso cref="TermsEnum#docsAndPositions(Bits,DocsAndPositionsEnum,int)"/> - /// if you require payloads in the returned enum. + /// Flag to pass to <see cref="TermsEnum.DocsAndPositions(Util.IBits, DocsAndPositionsEnum, DocsAndPositionsFlags)"/> + /// if you require payloads in the returned enum. /// </summary> - public static readonly int FLAG_PAYLOADS = 0x2; + PAYLOADS = 0x2 // LUCENENET specific - renamed from FLAG_PAYLOADS since FLAG_ makes it redundant + } + + + /// <summary> + /// Also iterates through positions. </summary> + public abstract class DocsAndPositionsEnum : DocsEnum + { + // LUCENENET specific - made flags into their own [Flags] enum named DocsAndPositionsFlags and de-nested from this type /// <summary> /// Sole constructor. (For invocation by subclass @@ -48,31 +63,31 @@ namespace Lucene.Net.Index /// <summary> /// Returns the next position. You should only call this - /// up to <seealso cref="DocsEnum#freq()"/> times else - /// the behavior is not defined. If positions were not - /// indexed this will return -1; this only happens if - /// offsets were indexed and you passed needsOffset=true - /// when pulling the enum. + /// up to <see cref="DocsEnum.Freq"/> times else + /// the behavior is not defined. If positions were not + /// indexed this will return -1; this only happens if + /// offsets were indexed and you passed needsOffset=true + /// when pulling the enum. /// </summary> public abstract int NextPosition(); /// <summary> /// Returns start offset for the current position, or -1 - /// if offsets were not indexed. + /// if offsets were not indexed. /// </summary> public abstract int StartOffset { get; } /// <summary> /// Returns end offset for the current position, or -1 if - /// offsets were not indexed. + /// offsets were not indexed. /// </summary> public abstract int EndOffset { get; } /// <summary> /// Returns the payload at this position, or null if no - /// payload was indexed. You should not modify anything - /// (neither members of the returned BytesRef nor bytes - /// in the byte[]). + /// payload was indexed. You should not modify anything + /// (neither members of the returned BytesRef nor bytes + /// in the byte[]). /// </summary> public abstract BytesRef GetPayload(); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 ceea3b5..d5018d7 100644 --- a/src/Lucene.Net.Core/Index/FilterAtomicReader.cs +++ b/src/Lucene.Net.Core/Index/FilterAtomicReader.cs @@ -236,7 +236,7 @@ namespace Lucene.Net.Index return m_input.Docs(liveDocs, reuse, flags); } - public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, int flags) + public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, DocsAndPositionsFlags flags) { return m_input.DocsAndPositions(liveDocs, reuse, flags); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 1874d61..b47e664 100644 --- a/src/Lucene.Net.Core/Index/FilteredTermsEnum.cs +++ b/src/Lucene.Net.Core/Index/FilteredTermsEnum.cs @@ -205,7 +205,7 @@ namespace Lucene.Net.Index return tenum.Docs(bits, reuse, flags); } - public override DocsAndPositionsEnum DocsAndPositions(IBits bits, DocsAndPositionsEnum reuse, int flags) + public override DocsAndPositionsEnum DocsAndPositions(IBits bits, DocsAndPositionsEnum reuse, DocsAndPositionsFlags flags) { return tenum.DocsAndPositions(bits, reuse, flags); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 54be7c4..7559a8d 100644 --- a/src/Lucene.Net.Core/Index/MultiFields.cs +++ b/src/Lucene.Net.Core/Index/MultiFields.cs @@ -195,7 +195,7 @@ namespace Lucene.Net.Index /// <seealso cref= #getTermPositionsEnum(IndexReader, Bits, String, BytesRef, int) </seealso> public static DocsAndPositionsEnum GetTermPositionsEnum(IndexReader r, IBits liveDocs, string field, BytesRef term) { - return GetTermPositionsEnum(r, liveDocs, field, term, DocsAndPositionsEnum.FLAG_OFFSETS | DocsAndPositionsEnum.FLAG_PAYLOADS); + return GetTermPositionsEnum(r, liveDocs, field, term, DocsAndPositionsFlags.OFFSETS | DocsAndPositionsFlags.PAYLOADS); } /// <summary> @@ -207,7 +207,7 @@ namespace Lucene.Net.Index /// exist or positions were not indexed. See {@link /// TermsEnum#docsAndPositions(Bits,DocsAndPositionsEnum,int)}. /// </summary> - public static DocsAndPositionsEnum GetTermPositionsEnum(IndexReader r, IBits liveDocs, string field, BytesRef term, int flags) + public static DocsAndPositionsEnum GetTermPositionsEnum(IndexReader r, IBits liveDocs, string field, BytesRef term, DocsAndPositionsFlags flags) { Debug.Assert(field != null); Debug.Assert(term != null); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 1ecdc2d..dcbba9e 100644 --- a/src/Lucene.Net.Core/Index/MultiTermsEnum.cs +++ b/src/Lucene.Net.Core/Index/MultiTermsEnum.cs @@ -530,7 +530,7 @@ namespace Lucene.Net.Index } } - public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, int flags) + public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, DocsAndPositionsFlags flags) { MultiDocsAndPositionsEnum docsAndPositionsEnum; // Can only reuse if incoming enum is also a MultiDocsAndPositionsEnum http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 6d53027..8afd3e7 100644 --- a/src/Lucene.Net.Core/Index/SortedDocValuesTermsEnum.cs +++ b/src/Lucene.Net.Core/Index/SortedDocValuesTermsEnum.cs @@ -134,7 +134,7 @@ namespace Lucene.Net.Index throw new System.NotSupportedException(); } - public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, int flags) + public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, DocsAndPositionsFlags flags) { throw new System.NotSupportedException(); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 061d56e..543d62b 100644 --- a/src/Lucene.Net.Core/Index/SortedSetDocValuesTermsEnum.cs +++ b/src/Lucene.Net.Core/Index/SortedSetDocValuesTermsEnum.cs @@ -134,7 +134,7 @@ namespace Lucene.Net.Index throw new System.NotSupportedException(); } - public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, int flags) + public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, DocsAndPositionsFlags flags) { throw new System.NotSupportedException(); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 1557229..0d966d5 100644 --- a/src/Lucene.Net.Core/Index/TermsEnum.cs +++ b/src/Lucene.Net.Core/Index/TermsEnum.cs @@ -218,11 +218,11 @@ namespace Lucene.Net.Index /// <seealso cref= #docsAndPositions(Bits, DocsAndPositionsEnum, int) </seealso> public DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse) { - return DocsAndPositions(liveDocs, reuse, DocsAndPositionsEnum.FLAG_OFFSETS | DocsAndPositionsEnum.FLAG_PAYLOADS); + return DocsAndPositions(liveDocs, reuse, DocsAndPositionsFlags.OFFSETS | DocsAndPositionsFlags.PAYLOADS); } /// <summary> - /// Get <seealso cref="DocsAndPositionsEnum"/> for the current term, + /// 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. @@ -233,9 +233,9 @@ namespace Lucene.Net.Index /// 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 <seealso cref="DocsAndPositionsEnum#FLAG_OFFSETS"/> and - /// <seealso cref="DocsAndPositionsEnum#FLAG_PAYLOADS"/>. </param> - public abstract DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, int flags); + /// require; see <see cref="DocsAndPositionsFlags.OFFSETS"/> and + /// <see cref="DocsAndPositionsFlags.PAYLOADS"/>. </param> + public abstract DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, DocsAndPositionsFlags flags); /// <summary> /// Expert: Returns the TermsEnums internal state to position the TermsEnum @@ -325,7 +325,7 @@ namespace Lucene.Net.Index throw new InvalidOperationException("this method should never be called"); } - public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, int flags) + public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, DocsAndPositionsFlags flags) { throw new InvalidOperationException("this method should never be called"); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 59cc0b6..4203404 100644 --- a/src/Lucene.Net.Core/Search/FuzzyTermsEnum.cs +++ b/src/Lucene.Net.Core/Search/FuzzyTermsEnum.cs @@ -1,3 +1,4 @@ +using Lucene.Net.Index; using Lucene.Net.Support; using Lucene.Net.Util; using System; @@ -308,7 +309,7 @@ namespace Lucene.Net.Search return actualEnum.Docs(liveDocs, reuse, flags); } - public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, int flags) + public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, DocsAndPositionsFlags flags) { return actualEnum.DocsAndPositions(liveDocs, reuse, flags); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 16d15a2..1415c1f 100644 --- a/src/Lucene.Net.Core/Search/MultiPhraseQuery.cs +++ b/src/Lucene.Net.Core/Search/MultiPhraseQuery.cs @@ -1,3 +1,4 @@ +using Lucene.Net.Index; using Lucene.Net.Support; using System; using System.Collections.Generic; @@ -270,7 +271,7 @@ namespace Lucene.Net.Search return null; } termsEnum.SeekExact(term.Bytes, termState); - postingsEnum = termsEnum.DocsAndPositions(liveDocs, null, DocsEnum.FLAG_NONE); + postingsEnum = termsEnum.DocsAndPositions(liveDocs, null, DocsAndPositionsFlags.NONE); if (postingsEnum == null) { @@ -598,7 +599,7 @@ namespace Lucene.Net.Search continue; } termsEnum.SeekExact(term.Bytes, termState); - DocsAndPositionsEnum postings = termsEnum.DocsAndPositions(liveDocs, null, DocsEnum.FLAG_NONE); + DocsAndPositionsEnum postings = termsEnum.DocsAndPositions(liveDocs, null, DocsAndPositionsFlags.NONE); if (postings == null) { // term does exist, but has no positions http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/src/Lucene.Net.Core/Search/PhraseQuery.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Search/PhraseQuery.cs b/src/Lucene.Net.Core/Search/PhraseQuery.cs index e8ab3c4..9d42048 100644 --- a/src/Lucene.Net.Core/Search/PhraseQuery.cs +++ b/src/Lucene.Net.Core/Search/PhraseQuery.cs @@ -1,3 +1,4 @@ +using Lucene.Net.Index; using Lucene.Net.Support; using System; using System.Collections.Generic; @@ -356,7 +357,7 @@ namespace Lucene.Net.Search return null; } te.SeekExact(t.Bytes, state); - DocsAndPositionsEnum postingsEnum = te.DocsAndPositions(liveDocs, null, DocsEnum.FLAG_NONE); + DocsAndPositionsEnum postingsEnum = te.DocsAndPositions(liveDocs, null, DocsAndPositionsFlags.NONE); // PhraseQuery on a field that did not index // positions. http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/src/Lucene.Net.Core/Search/Spans/SpanTermQuery.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Search/Spans/SpanTermQuery.cs b/src/Lucene.Net.Core/Search/Spans/SpanTermQuery.cs index b96b5e5..d00e72a 100644 --- a/src/Lucene.Net.Core/Search/Spans/SpanTermQuery.cs +++ b/src/Lucene.Net.Core/Search/Spans/SpanTermQuery.cs @@ -1,3 +1,4 @@ +using Lucene.Net.Index; using System; using System.Collections.Generic; using System.Text; @@ -168,7 +169,7 @@ namespace Lucene.Net.Search.Spans TermsEnum termsEnum_ = context.AtomicReader.Terms(m_term.Field).GetIterator(null); termsEnum_.SeekExact(m_term.Bytes, state); - DocsAndPositionsEnum postings = termsEnum_.DocsAndPositions(acceptDocs, null, DocsAndPositionsEnum.FLAG_PAYLOADS); + DocsAndPositionsEnum postings = termsEnum_.DocsAndPositions(acceptDocs, null, DocsAndPositionsFlags.PAYLOADS); if (postings != null) { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/src/Lucene.Net.Facet/Taxonomy/Directory/TaxonomyIndexArrays.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Facet/Taxonomy/Directory/TaxonomyIndexArrays.cs b/src/Lucene.Net.Facet/Taxonomy/Directory/TaxonomyIndexArrays.cs index e939ede..f815df8 100644 --- a/src/Lucene.Net.Facet/Taxonomy/Directory/TaxonomyIndexArrays.cs +++ b/src/Lucene.Net.Facet/Taxonomy/Directory/TaxonomyIndexArrays.cs @@ -1,4 +1,5 @@ -using Lucene.Net.Support; +using Lucene.Net.Index; +using Lucene.Net.Support; using System; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; @@ -153,7 +154,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory // it's ok to use MultiFields because we only iterate on one posting list. // breaking it to loop over the leaves() only complicates code for no // apparent gain. - DocsAndPositionsEnum positions = MultiFields.GetTermPositionsEnum(reader, null, Consts.FIELD_PAYLOADS, Consts.PAYLOAD_PARENT_BYTES_REF, DocsAndPositionsEnum.FLAG_PAYLOADS); + DocsAndPositionsEnum positions = MultiFields.GetTermPositionsEnum(reader, null, Consts.FIELD_PAYLOADS, Consts.PAYLOAD_PARENT_BYTES_REF, DocsAndPositionsFlags.PAYLOADS); // shouldn't really happen, if it does, something's wrong if (positions == null || positions.Advance(first) == DocIdSetIterator.NO_MORE_DOCS) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/src/Lucene.Net.Highlighter/PostingsHighlight/PostingsHighlighter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Highlighter/PostingsHighlight/PostingsHighlighter.cs b/src/Lucene.Net.Highlighter/PostingsHighlight/PostingsHighlighter.cs index eed7fe5..ce611be 100644 --- a/src/Lucene.Net.Highlighter/PostingsHighlight/PostingsHighlighter.cs +++ b/src/Lucene.Net.Highlighter/PostingsHighlight/PostingsHighlighter.cs @@ -628,7 +628,7 @@ namespace Lucene.Net.Search.PostingsHighlight { continue; // term not found } - de = postings[i] = termsEnum.DocsAndPositions(null, null, DocsAndPositionsEnum.FLAG_OFFSETS); + de = postings[i] = termsEnum.DocsAndPositions(null, null, DocsAndPositionsFlags.OFFSETS); if (de == null) { // no positions available http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 2cf38f1..c9c9765 100644 --- a/src/Lucene.Net.Memory/MemoryIndex.MemoryIndexReader.cs +++ b/src/Lucene.Net.Memory/MemoryIndex.MemoryIndexReader.cs @@ -379,7 +379,7 @@ namespace Lucene.Net.Index.Memory return ((MemoryDocsEnum)reuse).Reset(liveDocs, info.sliceArray.freq[info.sortedTerms[termUpto]]); } - public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, int flags) + public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, DocsAndPositionsFlags flags) { if (reuse == null || !(reuse is MemoryDocsAndPositionsEnum)) { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 79cb7e6..549bbf9 100644 --- a/src/Lucene.Net.Misc/Index/Sorter/SortingAtomicReader.cs +++ b/src/Lucene.Net.Misc/Index/Sorter/SortingAtomicReader.cs @@ -162,7 +162,7 @@ namespace Lucene.Net.Index.Sorter return new SortingDocsEnum(docMap.Count, wrapReuse, inDocs, withFreqs, docMap); } - public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, int flags) + public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, DocsAndPositionsFlags flags) { DocsAndPositionsEnum inReuse; SortingDocsAndPositionsEnum wrapReuse; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/src/Lucene.Net.Suggest/Suggest/Analyzing/BlendedInfixSuggester.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Suggest/Suggest/Analyzing/BlendedInfixSuggester.cs b/src/Lucene.Net.Suggest/Suggest/Analyzing/BlendedInfixSuggester.cs index 0618748..c989c57 100644 --- a/src/Lucene.Net.Suggest/Suggest/Analyzing/BlendedInfixSuggester.cs +++ b/src/Lucene.Net.Suggest/Suggest/Analyzing/BlendedInfixSuggester.cs @@ -268,7 +268,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing if (matchedTokens.Contains(docTerm) || docTerm.StartsWith(prefixToken, StringComparison.Ordinal)) { - DocsAndPositionsEnum docPosEnum = it.DocsAndPositions(null, null, DocsAndPositionsEnum.FLAG_OFFSETS); + DocsAndPositionsEnum docPosEnum = it.DocsAndPositions(null, null, DocsAndPositionsFlags.OFFSETS); docPosEnum.NextDoc(); // use the first occurrence of the term http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 8a77fa5..f1b0d5e 100644 --- a/src/Lucene.Net.TestFramework/Codecs/RAMOnly/RAMOnlyPostingsFormat.cs +++ b/src/Lucene.Net.TestFramework/Codecs/RAMOnly/RAMOnlyPostingsFormat.cs @@ -1,3 +1,5 @@ +using Lucene.Net.Index; +using Lucene.Net.Support; using System; using System.Collections.Generic; using System.Diagnostics; @@ -5,7 +7,7 @@ using System.Linq; namespace Lucene.Net.Codecs.RAMOnly { - using Lucene.Net.Support; + using IBits = Lucene.Net.Util.IBits; using BytesRef = Lucene.Net.Util.BytesRef; @@ -501,7 +503,7 @@ namespace Lucene.Net.Codecs.RAMOnly return new RAMDocsEnum(RamField.TermToDocs[Current], liveDocs); } - public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, int flags) + public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, DocsAndPositionsFlags flags) { return new RAMDocsAndPositionsEnum(RamField.TermToDocs[Current], liveDocs); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 a44c3e1..cb17d6b 100644 --- a/src/Lucene.Net.TestFramework/Index/AssertingAtomicReader.cs +++ b/src/Lucene.Net.TestFramework/Index/AssertingAtomicReader.cs @@ -142,7 +142,7 @@ namespace Lucene.Net.Index return docs == null ? null : new AssertingDocsEnum(docs); } - public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, int flags) + public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, DocsAndPositionsFlags flags) { Debug.Assert(State == State_e.POSITIONED, "docsAndPositions(...) called on unpositioned TermsEnum"); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 4715fc2..92101bf 100644 --- a/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs +++ b/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs @@ -726,14 +726,14 @@ namespace Lucene.Net.Index prevDocsEnum = threadState.ReuseDocsAndPositionsEnum; } - int flags = 0; + DocsAndPositionsFlags flags = 0; if (alwaysTestMax || Random().NextBoolean()) { - flags |= DocsAndPositionsEnum.FLAG_OFFSETS; + flags |= DocsAndPositionsFlags.OFFSETS; } if (alwaysTestMax || Random().NextBoolean()) { - flags |= DocsAndPositionsEnum.FLAG_PAYLOADS; + flags |= DocsAndPositionsFlags.PAYLOADS; } if (VERBOSE) @@ -767,14 +767,14 @@ namespace Lucene.Net.Index prevDocsEnum = threadState.ReuseDocsAndPositionsEnum; } - int flags = 0; + DocsAndPositionsFlags flags = 0; if (alwaysTestMax || doCheckOffsets || Random().Next(3) == 1) { - flags |= DocsAndPositionsEnum.FLAG_OFFSETS; + flags |= DocsAndPositionsFlags.OFFSETS; } if (alwaysTestMax || doCheckPayloads || Random().Next(3) == 1) { - flags |= DocsAndPositionsEnum.FLAG_PAYLOADS; + flags |= DocsAndPositionsFlags.PAYLOADS; } if (VERBOSE) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/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 15ecebe..a047a1a 100644 --- a/src/Lucene.Net.TestFramework/Util/TestUtil.cs +++ b/src/Lucene.Net.TestFramework/Util/TestUtil.cs @@ -1115,7 +1115,7 @@ namespace Lucene.Net.Util { if (random.NextBoolean()) { - int posFlags; + DocsAndPositionsFlags posFlags; switch (random.Next(4)) { case 0: @@ -1123,15 +1123,15 @@ namespace Lucene.Net.Util break; case 1: - posFlags = DocsAndPositionsEnum.FLAG_OFFSETS; + posFlags = DocsAndPositionsFlags.OFFSETS; break; case 2: - posFlags = DocsAndPositionsEnum.FLAG_PAYLOADS; + posFlags = DocsAndPositionsFlags.PAYLOADS; break; default: - posFlags = DocsAndPositionsEnum.FLAG_OFFSETS | DocsAndPositionsEnum.FLAG_PAYLOADS; + posFlags = DocsAndPositionsFlags.OFFSETS | DocsAndPositionsFlags.PAYLOADS; break; } // TODO: cast to DocsAndPositionsEnum? http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/src/Lucene.Net.Tests/Codecs/Lucene41/TestBlockPostingsFormat3.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Codecs/Lucene41/TestBlockPostingsFormat3.cs b/src/Lucene.Net.Tests/Codecs/Lucene41/TestBlockPostingsFormat3.cs index 5a0b6bd..aa3e730 100644 --- a/src/Lucene.Net.Tests/Codecs/Lucene41/TestBlockPostingsFormat3.cs +++ b/src/Lucene.Net.Tests/Codecs/Lucene41/TestBlockPostingsFormat3.cs @@ -357,25 +357,25 @@ namespace Lucene.Net.Codecs.Lucene41 AssertPositionsSkipping(leftTermsEnum.DocFreq, leftPositions = leftTermsEnum.DocsAndPositions(null, leftPositions), rightPositions = rightTermsEnum.DocsAndPositions(null, rightPositions)); AssertPositionsSkipping(leftTermsEnum.DocFreq, leftPositions = leftTermsEnum.DocsAndPositions(randomBits, leftPositions), rightPositions = rightTermsEnum.DocsAndPositions(randomBits, rightPositions)); // with payloads only - AssertDocsAndPositionsEnum(leftPositions = leftTermsEnum.DocsAndPositions(null, leftPositions, DocsAndPositionsEnum.FLAG_PAYLOADS), rightPositions = rightTermsEnum.DocsAndPositions(null, rightPositions, DocsAndPositionsEnum.FLAG_PAYLOADS)); - AssertDocsAndPositionsEnum(leftPositions = leftTermsEnum.DocsAndPositions(randomBits, leftPositions, DocsAndPositionsEnum.FLAG_PAYLOADS), rightPositions = rightTermsEnum.DocsAndPositions(randomBits, rightPositions, DocsAndPositionsEnum.FLAG_PAYLOADS)); + AssertDocsAndPositionsEnum(leftPositions = leftTermsEnum.DocsAndPositions(null, leftPositions, DocsAndPositionsFlags.PAYLOADS), rightPositions = rightTermsEnum.DocsAndPositions(null, rightPositions, DocsAndPositionsFlags.PAYLOADS)); + AssertDocsAndPositionsEnum(leftPositions = leftTermsEnum.DocsAndPositions(randomBits, leftPositions, DocsAndPositionsFlags.PAYLOADS), rightPositions = rightTermsEnum.DocsAndPositions(randomBits, rightPositions, DocsAndPositionsFlags.PAYLOADS)); - AssertPositionsSkipping(leftTermsEnum.DocFreq, leftPositions = leftTermsEnum.DocsAndPositions(null, leftPositions, DocsAndPositionsEnum.FLAG_PAYLOADS), rightPositions = rightTermsEnum.DocsAndPositions(null, rightPositions, DocsAndPositionsEnum.FLAG_PAYLOADS)); - AssertPositionsSkipping(leftTermsEnum.DocFreq, leftPositions = leftTermsEnum.DocsAndPositions(randomBits, leftPositions, DocsAndPositionsEnum.FLAG_PAYLOADS), rightPositions = rightTermsEnum.DocsAndPositions(randomBits, rightPositions, DocsAndPositionsEnum.FLAG_PAYLOADS)); + AssertPositionsSkipping(leftTermsEnum.DocFreq, leftPositions = leftTermsEnum.DocsAndPositions(null, leftPositions, DocsAndPositionsFlags.PAYLOADS), rightPositions = rightTermsEnum.DocsAndPositions(null, rightPositions, DocsAndPositionsFlags.PAYLOADS)); + AssertPositionsSkipping(leftTermsEnum.DocFreq, leftPositions = leftTermsEnum.DocsAndPositions(randomBits, leftPositions, DocsAndPositionsFlags.PAYLOADS), rightPositions = rightTermsEnum.DocsAndPositions(randomBits, rightPositions, DocsAndPositionsFlags.PAYLOADS)); // with offsets only - AssertDocsAndPositionsEnum(leftPositions = leftTermsEnum.DocsAndPositions(null, leftPositions, DocsAndPositionsEnum.FLAG_OFFSETS), rightPositions = rightTermsEnum.DocsAndPositions(null, rightPositions, DocsAndPositionsEnum.FLAG_OFFSETS)); - AssertDocsAndPositionsEnum(leftPositions = leftTermsEnum.DocsAndPositions(randomBits, leftPositions, DocsAndPositionsEnum.FLAG_OFFSETS), rightPositions = rightTermsEnum.DocsAndPositions(randomBits, rightPositions, DocsAndPositionsEnum.FLAG_OFFSETS)); + AssertDocsAndPositionsEnum(leftPositions = leftTermsEnum.DocsAndPositions(null, leftPositions, DocsAndPositionsFlags.OFFSETS), rightPositions = rightTermsEnum.DocsAndPositions(null, rightPositions, DocsAndPositionsFlags.OFFSETS)); + AssertDocsAndPositionsEnum(leftPositions = leftTermsEnum.DocsAndPositions(randomBits, leftPositions, DocsAndPositionsFlags.OFFSETS), rightPositions = rightTermsEnum.DocsAndPositions(randomBits, rightPositions, DocsAndPositionsFlags.OFFSETS)); - AssertPositionsSkipping(leftTermsEnum.DocFreq, leftPositions = leftTermsEnum.DocsAndPositions(null, leftPositions, DocsAndPositionsEnum.FLAG_OFFSETS), rightPositions = rightTermsEnum.DocsAndPositions(null, rightPositions, DocsAndPositionsEnum.FLAG_OFFSETS)); - AssertPositionsSkipping(leftTermsEnum.DocFreq, leftPositions = leftTermsEnum.DocsAndPositions(randomBits, leftPositions, DocsAndPositionsEnum.FLAG_OFFSETS), rightPositions = rightTermsEnum.DocsAndPositions(randomBits, rightPositions, DocsAndPositionsEnum.FLAG_OFFSETS)); + AssertPositionsSkipping(leftTermsEnum.DocFreq, leftPositions = leftTermsEnum.DocsAndPositions(null, leftPositions, DocsAndPositionsFlags.OFFSETS), rightPositions = rightTermsEnum.DocsAndPositions(null, rightPositions, DocsAndPositionsFlags.OFFSETS)); + AssertPositionsSkipping(leftTermsEnum.DocFreq, leftPositions = leftTermsEnum.DocsAndPositions(randomBits, leftPositions, DocsAndPositionsFlags.OFFSETS), rightPositions = rightTermsEnum.DocsAndPositions(randomBits, rightPositions, DocsAndPositionsFlags.OFFSETS)); // with positions only - AssertDocsAndPositionsEnum(leftPositions = leftTermsEnum.DocsAndPositions(null, leftPositions, DocsEnum.FLAG_NONE), rightPositions = rightTermsEnum.DocsAndPositions(null, rightPositions, DocsEnum.FLAG_NONE)); - AssertDocsAndPositionsEnum(leftPositions = leftTermsEnum.DocsAndPositions(randomBits, leftPositions, DocsEnum.FLAG_NONE), rightPositions = rightTermsEnum.DocsAndPositions(randomBits, rightPositions, DocsEnum.FLAG_NONE)); + AssertDocsAndPositionsEnum(leftPositions = leftTermsEnum.DocsAndPositions(null, leftPositions, DocsAndPositionsFlags.NONE), rightPositions = rightTermsEnum.DocsAndPositions(null, rightPositions, DocsAndPositionsFlags.NONE)); + AssertDocsAndPositionsEnum(leftPositions = leftTermsEnum.DocsAndPositions(randomBits, leftPositions, DocsAndPositionsFlags.NONE), rightPositions = rightTermsEnum.DocsAndPositions(randomBits, rightPositions, DocsAndPositionsFlags.NONE)); - AssertPositionsSkipping(leftTermsEnum.DocFreq, leftPositions = leftTermsEnum.DocsAndPositions(null, leftPositions, DocsEnum.FLAG_NONE), rightPositions = rightTermsEnum.DocsAndPositions(null, rightPositions, DocsEnum.FLAG_NONE)); - AssertPositionsSkipping(leftTermsEnum.DocFreq, leftPositions = leftTermsEnum.DocsAndPositions(randomBits, leftPositions, DocsEnum.FLAG_NONE), rightPositions = rightTermsEnum.DocsAndPositions(randomBits, rightPositions, DocsEnum.FLAG_NONE)); + AssertPositionsSkipping(leftTermsEnum.DocFreq, leftPositions = leftTermsEnum.DocsAndPositions(null, leftPositions, DocsAndPositionsFlags.NONE), rightPositions = rightTermsEnum.DocsAndPositions(null, rightPositions, DocsAndPositionsFlags.NONE)); + AssertPositionsSkipping(leftTermsEnum.DocFreq, leftPositions = leftTermsEnum.DocsAndPositions(randomBits, leftPositions, DocsAndPositionsFlags.NONE), rightPositions = rightTermsEnum.DocsAndPositions(randomBits, rightPositions, DocsAndPositionsFlags.NONE)); // with freqs: AssertDocsEnum(leftDocs = leftTermsEnum.Docs(null, leftDocs), rightDocs = rightTermsEnum.Docs(null, rightDocs)); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/src/Lucene.Net.Tests/Index/TestFilterAtomicReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestFilterAtomicReader.cs b/src/Lucene.Net.Tests/Index/TestFilterAtomicReader.cs index f22c0ee..3cb8531 100644 --- a/src/Lucene.Net.Tests/Index/TestFilterAtomicReader.cs +++ b/src/Lucene.Net.Tests/Index/TestFilterAtomicReader.cs @@ -89,7 +89,7 @@ namespace Lucene.Net.Index return null; } - public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, int flags) + public override DocsAndPositionsEnum DocsAndPositions(IBits liveDocs, DocsAndPositionsEnum reuse, DocsAndPositionsFlags flags) { return new TestPositions(base.DocsAndPositions(liveDocs, reuse == null ? null : ((FilterDocsAndPositionsEnum)reuse).m_input, flags)); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/808a0eba/src/Lucene.Net.Tests/Index/TestPostingsOffsets.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestPostingsOffsets.cs b/src/Lucene.Net.Tests/Index/TestPostingsOffsets.cs index 706987e..effe78c 100644 --- a/src/Lucene.Net.Tests/Index/TestPostingsOffsets.cs +++ b/src/Lucene.Net.Tests/Index/TestPostingsOffsets.cs @@ -350,7 +350,7 @@ namespace Lucene.Net.Index } // explicitly exclude offsets here - docsAndPositions = termsEnum.DocsAndPositions(null, docsAndPositions, DocsAndPositionsEnum.FLAG_PAYLOADS); + docsAndPositions = termsEnum.DocsAndPositions(null, docsAndPositions, DocsAndPositionsFlags.PAYLOADS); Assert.IsNotNull(docsAndPositions); //System.out.println(" doc/freq/pos"); while ((doc = docsAndPositions.NextDoc()) != DocIdSetIterator.NO_MORE_DOCS)
