You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2015/06/25 15:59:21 UTC
svn commit: r1687524 [1/7] - in /lucene/dev/trunk: lucene/
lucene/analysis/common/src/test/org/apache/lucene/analysis/core/
lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/
lucene/analysis/common/src/test/org/apache/lucene/analysis/sta...
Author: jpountz
Date: Thu Jun 25 13:59:19 2015
New Revision: 1687524
URL: http://svn.apache.org/r1687524
Log:
LUCENE-6553: Simplify how live docs are applied.
Added:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/BitsFilteredPostingsEnum.java (with props)
Modified:
lucene/dev/trunk/lucene/CHANGES.txt
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestClassicAnalyzer.java
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
lucene/dev/trunk/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsIntersectTermsEnum.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsSegmentTermsEnum.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesProducer.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsWriter.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
lucene/dev/trunk/lucene/codecs/src/test/org/apache/lucene/codecs/autoprefix/TestAutoPrefixTerms.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/PostingsReaderBase.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/PushPostingsWriterBase.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BitSetTermsEnum.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BlockTreeTermsWriter.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/IntersectTermsEnum.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/SegmentTermsEnum.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50DocValuesProducer.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50PostingsReader.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/BufferedUpdatesStream.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/FilterLeafReader.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/FilteredTermsEnum.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/FreqProxFields.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriter.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/LeafReader.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/MappedMultiFields.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/MultiFields.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/MultiTermsEnum.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/PostingsEnum.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SortedDocValuesTermsEnum.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SortedSetDocValuesTermsEnum.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/TermsEnum.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/BooleanWeight.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/BulkScorer.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/CachingWrapperQuery.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ConstantScoreWeight.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/Filter.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FuzzyTermsEnum.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/LRUQueryCache.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/MultiTermQueryConstantScoreWrapper.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/QueryRescorer.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/QueryWrapperFilter.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/RandomAccessWeight.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/TermQuery.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/Weight.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/package-info.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/payloads/PayloadSpanUtil.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/payloads/SpanPayloadCheckQuery.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanContainQuery.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanContainingQuery.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanNearQuery.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanNotQuery.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanOrQuery.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanPositionCheckQuery.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanTermQuery.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanWeight.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanWithinQuery.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestBlockPostingsFormat3.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDoc.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocCount.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestFilterLeafReader.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMaxPosition.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestOmitPositions.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/JustCompileSearch.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanCoord.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperQuery.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNeedsScores.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/MultiSpansWrapper.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpans.java
lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/DrillSidewaysQuery.java
lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/DrillSidewaysScorer.java
lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java
lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java
lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/TaxonomyIndexArrays.java
lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenStreamFromTermVector.java
lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/PostingsHighlighter.java
lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java
lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsQuery.java
lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsWithScoreQuery.java
lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java
lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java
lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinIndexSearcher.java
lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java
lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinValidation.java
lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java
lucene/dev/trunk/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
lucene/dev/trunk/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndexAgainstRAMDir.java
lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/SortingLeafReader.java
lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/uninverting/DocTermOrds.java
lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java
lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/SorterTestBase.java
lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java
lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java
lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/TermsQuery.java
lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java
lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java
lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java
lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java
lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java
lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/bkdtree/BKDPointInBBoxQuery.java
lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/bkdtree/BKDPointInPolygonQuery.java
lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/bkdtree/BKDTreeReader.java
lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsReader.java
lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionSegmentTermsEnum.java
lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/SingleDocsEnum.java
lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/SinglePostingsEnum.java
lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java
lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonQuery.java
lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/TestIDVersionPostingsFormat.java
lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java
lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/search/TestDocValuesRangeQuery.java
lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/composite/CompositeVerifyQuery.java
lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/composite/IntersectsRPTVerifyQuery.java
lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/AbstractPrefixTreeFilter.java
lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/ContainsPrefixTreeFilter.java
lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeFacetCounter.java
lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheProvider.java
lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggester.java
lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionFieldsConsumer.java
lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionScorer.java
lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionWeight.java
lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/NRTSuggester.java
lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/SuggestIndexSearcher.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseTermVectorsFormatTestCase.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/PerThreadPKLookup.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/RandomPostingsTester.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/AssertingBulkScorer.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/AssertingScorer.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/AssertingWeight.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/BulkScorerWrapperScorer.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/RandomApproximationQuery.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/ScorerIndexSearcher.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/SearchEquivalenceTestBase.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/spans/AssertingSpanWeight.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java
lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/LatLonType.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrConstantScoreQuery.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/facet/FacetField.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/join/IgnoreAcceptDocsQuery.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DeleteByQueryWrapper.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRTGBase.java
Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1687524&r1=1687523&r2=1687524&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Thu Jun 25 13:59:19 2015
@@ -42,6 +42,7 @@ API Changes
BooleanQuery with one MUST clause for the query, and one FILTER clause for
the filter. (Adrien Grand)
+
======================= Lucene 5.3.0 =======================
New Features
@@ -132,6 +133,10 @@ API Changes
be replaced with a BooleanQuery which handle the query as a MUST clause and
the filter as a FILTER clause. (Adrien Grand)
+* LUCENE-6553: The postings, spans and scorer APIs no longer take an acceptDocs
+ parameter. Live docs are now always checked on top of these APIs.
+ (Adrien Grand)
+
Bug fixes
* LUCENE-6500: ParallelCompositeReader did not always call
@@ -225,6 +230,12 @@ Build
* LUCENE-6567: Simplify payload checking in SpanPayloadCheckQuery (Alan
Woodward)
+Changes in Backwards Compatibility Policy
+
+* LUCENE-6553: The iterator returned by the LeafReader.postings method now
+ always includes deleted docs, so you have to check for deleted documents on
+ top of the iterator. (Adrien Grand)
+
======================= Lucene 5.2.1 =======================
Bug Fixes
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java?rev=1687524&r1=1687523&r2=1687524&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java Thu Jun 25 13:59:19 2015
@@ -101,7 +101,6 @@ public class TestKeywordAnalyzer extends
reader,
"partnum",
new BytesRef("Q36"),
- MultiFields.getLiveDocs(reader),
null,
0);
assertTrue(td.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
@@ -109,7 +108,6 @@ public class TestKeywordAnalyzer extends
reader,
"partnum",
new BytesRef("Q37"),
- MultiFields.getLiveDocs(reader),
null,
0);
assertTrue(td.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java?rev=1687524&r1=1687523&r2=1687524&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java Thu Jun 25 13:59:19 2015
@@ -111,7 +111,7 @@ public class TestTeeSinkTokenFilter exte
TermsEnum termsEnum = vector.iterator();
termsEnum.next();
assertEquals(2, termsEnum.totalTermFreq());
- PostingsEnum positions = termsEnum.postings(null, null, PostingsEnum.ALL);
+ PostingsEnum positions = termsEnum.postings(null, PostingsEnum.ALL);
assertTrue(positions.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(2, positions.freq());
positions.nextPosition();
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestClassicAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestClassicAnalyzer.java?rev=1687524&r1=1687523&r2=1687524&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestClassicAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestClassicAnalyzer.java Thu Jun 25 13:59:19 2015
@@ -300,7 +300,6 @@ public class TestClassicAnalyzer extends
// Make sure position is still incremented when
// massive term is skipped:
PostingsEnum tps = MultiFields.getTermPositionsEnum(reader,
- MultiFields.getLiveDocs(reader),
"content",
new BytesRef("another"));
assertTrue(tps.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
Modified: lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java?rev=1687524&r1=1687523&r2=1687524&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (original)
+++ lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java Thu Jun 25 13:59:19 2015
@@ -991,7 +991,7 @@ public class TestBackwardsCompatibility
// should be found exactly
assertEquals(TermsEnum.SeekStatus.FOUND,
terms.seekCeil(aaaTerm));
- assertEquals(35, countDocs(TestUtil.docs(random(), terms, null, null, PostingsEnum.NONE)));
+ assertEquals(35, countDocs(TestUtil.docs(random(), terms, null, PostingsEnum.NONE)));
assertNull(terms.next());
// should hit end of field
@@ -1003,12 +1003,12 @@ public class TestBackwardsCompatibility
assertEquals(TermsEnum.SeekStatus.NOT_FOUND,
terms.seekCeil(new BytesRef("a")));
assertTrue(terms.term().bytesEquals(aaaTerm));
- assertEquals(35, countDocs(TestUtil.docs(random(), terms, null, null, PostingsEnum.NONE)));
+ assertEquals(35, countDocs(TestUtil.docs(random(), terms, null, PostingsEnum.NONE)));
assertNull(terms.next());
assertEquals(TermsEnum.SeekStatus.FOUND,
terms.seekCeil(aaaTerm));
- assertEquals(35, countDocs(TestUtil.docs(random(), terms, null, null, PostingsEnum.NONE)));
+ assertEquals(35, countDocs(TestUtil.docs(random(), terms, null, PostingsEnum.NONE)));
assertNull(terms.next());
r.close();
Modified: lucene/dev/trunk/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java?rev=1687524&r1=1687523&r2=1687524&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java Thu Jun 25 13:59:19 2015
@@ -499,7 +499,7 @@ public class TestPerfTasksLogic extends
TermsEnum termsEnum = terms.iterator();
PostingsEnum docs = null;
while(termsEnum.next() != null) {
- docs = TestUtil.docs(random(), termsEnum, MultiFields.getLiveDocs(reader), docs, PostingsEnum.FREQS);
+ docs = TestUtil.docs(random(), termsEnum, docs, PostingsEnum.FREQS);
while(docs.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {
totalTokenCount2 += docs.freq();
}
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java?rev=1687524&r1=1687523&r2=1687524&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java Thu Jun 25 13:59:19 2015
@@ -651,11 +651,11 @@ public class BlockTermsReader extends Fi
}
@Override
- public PostingsEnum postings(Bits liveDocs, PostingsEnum reuse, int flags) throws IOException {
+ public PostingsEnum postings(PostingsEnum reuse, int flags) throws IOException {
//System.out.println("BTR.docs this=" + this);
decodeMetaData();
//System.out.println("BTR.docs: state.docFreq=" + state.docFreq);
- return postingsReader.postings(fieldInfo, state, liveDocs, reuse, flags);
+ return postingsReader.postings(fieldInfo, state, reuse, flags);
}
@Override
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsIntersectTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsIntersectTermsEnum.java?rev=1687524&r1=1687523&r2=1687524&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsIntersectTermsEnum.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsIntersectTermsEnum.java Thu Jun 25 13:59:19 2015
@@ -202,9 +202,9 @@ final class OrdsIntersectTermsEnum exten
}
@Override
- public PostingsEnum postings(Bits skipDocs, PostingsEnum reuse, int flags) throws IOException {
+ public PostingsEnum postings(PostingsEnum reuse, int flags) throws IOException {
currentFrame.decodeMetaData();
- return fr.parent.postingsReader.postings(fr.fieldInfo, currentFrame.termState, skipDocs, reuse, flags);
+ return fr.parent.postingsReader.postings(fr.fieldInfo, currentFrame.termState, reuse, flags);
}
private int getState() {
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsSegmentTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsSegmentTermsEnum.java?rev=1687524&r1=1687523&r2=1687524&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsSegmentTermsEnum.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsSegmentTermsEnum.java Thu Jun 25 13:59:19 2015
@@ -923,7 +923,7 @@ public final class OrdsSegmentTermsEnum
}
@Override
- public PostingsEnum postings(Bits skipDocs, PostingsEnum reuse, int flags) throws IOException {
+ public PostingsEnum postings(PostingsEnum reuse, int flags) throws IOException {
assert !eof;
//if (DEBUG) {
//System.out.println("BTTR.docs seg=" + segment);
@@ -932,7 +932,7 @@ public final class OrdsSegmentTermsEnum
//if (DEBUG) {
//System.out.println(" state=" + currentFrame.state);
//}
- return fr.parent.postingsReader.postings(fr.fieldInfo, currentFrame.state, skipDocs, reuse, flags);
+ return fr.parent.postingsReader.postings(fr.fieldInfo, currentFrame.state, reuse, flags);
}
@Override
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java?rev=1687524&r1=1687523&r2=1687524&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java Thu Jun 25 13:59:19 2015
@@ -369,9 +369,9 @@ public final class BloomFilteringPosting
}
@Override
- public PostingsEnum postings(Bits liveDocs, PostingsEnum reuse, int flags)
+ public PostingsEnum postings(PostingsEnum reuse, int flags)
throws IOException {
- return delegate().postings(liveDocs, reuse, flags);
+ return delegate().postings(reuse, flags);
}
}
@@ -455,7 +455,7 @@ public final class BloomFilteringPosting
bloomFilters.put(fieldInfo, bloomFilter);
}
// Make sure there's at least one doc for this term:
- postingsEnum = termsEnum.postings(null, postingsEnum, 0);
+ postingsEnum = termsEnum.postings(postingsEnum, 0);
if (postingsEnum.nextDoc() != PostingsEnum.NO_MORE_DOCS) {
bloomFilter.addValue(term);
}
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java?rev=1687524&r1=1687523&r2=1687524&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java Thu Jun 25 13:59:19 2015
@@ -43,7 +43,6 @@ import org.apache.lucene.store.RAMOutput
import org.apache.lucene.util.Accountable;
import org.apache.lucene.util.Accountables;
import org.apache.lucene.util.ArrayUtil;
-import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.RamUsageEstimator;
import org.apache.lucene.util.automaton.CompiledAutomaton;
@@ -357,9 +356,9 @@ public final class DirectPostingsFormat
termOffsets[count+1] = termOffset;
if (hasPos) {
- docsAndPositionsEnum = termsEnum.postings(null, docsAndPositionsEnum, PostingsEnum.ALL);
+ docsAndPositionsEnum = termsEnum.postings(docsAndPositionsEnum, PostingsEnum.ALL);
} else {
- postingsEnum = termsEnum.postings(null, postingsEnum);
+ postingsEnum = termsEnum.postings(postingsEnum);
}
final TermAndSkip ent;
@@ -848,7 +847,7 @@ public final class DirectPostingsFormat
}
@Override
- public PostingsEnum postings(Bits liveDocs, PostingsEnum reuse, int flags) throws IOException {
+ public PostingsEnum postings(PostingsEnum reuse, int flags) throws IOException {
// TODO: implement reuse
// it's hairy!
@@ -862,11 +861,8 @@ public final class DirectPostingsFormat
LowFreqDocsEnumNoTF docsEnum;
if (reuse instanceof LowFreqDocsEnumNoTF) {
docsEnum = (LowFreqDocsEnumNoTF) reuse;
- if (!docsEnum.canReuse(liveDocs)) {
- docsEnum = new LowFreqDocsEnumNoTF(liveDocs);
- }
} else {
- docsEnum = new LowFreqDocsEnumNoTF(liveDocs);
+ docsEnum = new LowFreqDocsEnumNoTF();
}
return docsEnum.reset(postings);
@@ -875,23 +871,20 @@ public final class DirectPostingsFormat
LowFreqDocsEnumNoPos docsEnum;
if (reuse instanceof LowFreqDocsEnumNoPos) {
docsEnum = (LowFreqDocsEnumNoPos) reuse;
- if (!docsEnum.canReuse(liveDocs)) {
- docsEnum = new LowFreqDocsEnumNoPos(liveDocs);
- }
} else {
- docsEnum = new LowFreqDocsEnumNoPos(liveDocs);
+ docsEnum = new LowFreqDocsEnumNoPos();
}
return docsEnum.reset(postings);
}
final byte[] payloads = term.payloads;
- return new LowFreqPostingsEnum(liveDocs, hasOffsets, hasPayloads).reset(postings, payloads);
+ return new LowFreqPostingsEnum(hasOffsets, hasPayloads).reset(postings, payloads);
} else {
final HighFreqTerm term = (HighFreqTerm) terms[termOrd];
if (hasPos == false) {
- return new HighFreqDocsEnum(liveDocs).reset(term.docIDs, term.freqs);
+ return new HighFreqDocsEnum().reset(term.docIDs, term.freqs);
} else {
- return new HighFreqPostingsEnum(liveDocs, hasOffsets).reset(term.docIDs, term.freqs, term.positions, term.payloads);
+ return new HighFreqPostingsEnum(hasOffsets).reset(term.docIDs, term.freqs, term.positions, term.payloads);
}
}
}
@@ -912,11 +905,8 @@ public final class DirectPostingsFormat
LowFreqDocsEnum docsEnum;
if (reuse instanceof LowFreqDocsEnum) {
docsEnum = (LowFreqDocsEnum) reuse;
- if (!docsEnum.canReuse(liveDocs, posLen)) {
- docsEnum = new LowFreqDocsEnum(liveDocs, posLen);
- }
} else {
- docsEnum = new LowFreqDocsEnum(liveDocs, posLen);
+ docsEnum = new LowFreqDocsEnum( posLen);
}
return docsEnum.reset(postings);
@@ -924,11 +914,8 @@ public final class DirectPostingsFormat
LowFreqDocsEnumNoPos docsEnum;
if (reuse instanceof LowFreqDocsEnumNoPos) {
docsEnum = (LowFreqDocsEnumNoPos) reuse;
- if (!docsEnum.canReuse(liveDocs)) {
- docsEnum = new LowFreqDocsEnumNoPos(liveDocs);
- }
} else {
- docsEnum = new LowFreqDocsEnumNoPos(liveDocs);
+ docsEnum = new LowFreqDocsEnumNoPos();
}
return docsEnum.reset(postings);
@@ -937,11 +924,8 @@ public final class DirectPostingsFormat
LowFreqDocsEnumNoTF docsEnum;
if (reuse instanceof LowFreqDocsEnumNoTF) {
docsEnum = (LowFreqDocsEnumNoTF) reuse;
- if (!docsEnum.canReuse(liveDocs)) {
- docsEnum = new LowFreqDocsEnumNoTF(liveDocs);
- }
} else {
- docsEnum = new LowFreqDocsEnumNoTF(liveDocs);
+ docsEnum = new LowFreqDocsEnumNoTF();
}
return docsEnum.reset(postings);
@@ -952,11 +936,8 @@ public final class DirectPostingsFormat
HighFreqDocsEnum docsEnum;
if (reuse instanceof HighFreqDocsEnum) {
docsEnum = (HighFreqDocsEnum) reuse;
- if (!docsEnum.canReuse(liveDocs)) {
- docsEnum = new HighFreqDocsEnum(liveDocs);
- }
} else {
- docsEnum = new HighFreqDocsEnum(liveDocs);
+ docsEnum = new HighFreqDocsEnum();
}
//System.out.println(" DE for term=" + new BytesRef(terms[termOrd].term).utf8ToString() + ": " + term.docIDs.length + " docs");
@@ -1471,7 +1452,7 @@ public final class DirectPostingsFormat
}
@Override
- public PostingsEnum postings(Bits liveDocs, PostingsEnum reuse, int flags) {
+ public PostingsEnum postings(PostingsEnum reuse, int flags) {
// TODO: implement reuse
// it's hairy!
@@ -1481,10 +1462,10 @@ public final class DirectPostingsFormat
final LowFreqTerm term = ((LowFreqTerm) terms[termOrd]);
final int[] postings = term.postings;
final byte[] payloads = term.payloads;
- return new LowFreqPostingsEnum(liveDocs, hasOffsets, hasPayloads).reset(postings, payloads);
+ return new LowFreqPostingsEnum(hasOffsets, hasPayloads).reset(postings, payloads);
} else {
final HighFreqTerm term = (HighFreqTerm) terms[termOrd];
- return new HighFreqPostingsEnum(liveDocs, hasOffsets).reset(term.docIDs, term.freqs, term.positions, term.payloads);
+ return new HighFreqPostingsEnum(hasOffsets).reset(term.docIDs, term.freqs, term.positions, term.payloads);
}
}
@@ -1501,17 +1482,17 @@ public final class DirectPostingsFormat
if (hasPayloads) {
posLen++;
}
- return new LowFreqDocsEnum(liveDocs, posLen).reset(postings);
+ return new LowFreqDocsEnum(posLen).reset(postings);
} else {
- return new LowFreqDocsEnumNoPos(liveDocs).reset(postings);
+ return new LowFreqDocsEnumNoPos().reset(postings);
}
} else {
- return new LowFreqDocsEnumNoTF(liveDocs).reset(postings);
+ return new LowFreqDocsEnumNoTF().reset(postings);
}
} else {
final HighFreqTerm term = (HighFreqTerm) terms[termOrd];
// System.out.println("DE for term=" + new BytesRef(terms[termOrd].term).utf8ToString() + ": " + term.docIDs.length + " docs");
- return new HighFreqDocsEnum(liveDocs).reset(term.docIDs, term.freqs);
+ return new HighFreqDocsEnum().reset(term.docIDs, term.freqs);
}
}
@@ -1530,17 +1511,8 @@ public final class DirectPostingsFormat
// Docs only:
private final static class LowFreqDocsEnumNoTF extends PostingsEnum {
private int[] postings;
- private final Bits liveDocs;
private int upto;
- public LowFreqDocsEnumNoTF(Bits liveDocs) {
- this.liveDocs = liveDocs;
- }
-
- public boolean canReuse(Bits liveDocs) {
- return liveDocs == this.liveDocs;
- }
-
public PostingsEnum reset(int[] postings) {
this.postings = postings;
upto = -1;
@@ -1552,17 +1524,8 @@ public final class DirectPostingsFormat
@Override
public int nextDoc() {
upto++;
- if (liveDocs == null) {
- if (upto < postings.length) {
- return postings[upto];
- }
- } else {
- while (upto < postings.length) {
- if (liveDocs.get(postings[upto])) {
- return postings[upto];
- }
- upto++;
- }
+ if (upto < postings.length) {
+ return postings[upto];
}
return NO_MORE_DOCS;
}
@@ -1619,16 +1582,9 @@ public final class DirectPostingsFormat
// Docs + freqs:
private final static class LowFreqDocsEnumNoPos extends PostingsEnum {
private int[] postings;
- private final Bits liveDocs;
private int upto;
- public LowFreqDocsEnumNoPos(Bits liveDocs) {
- this.liveDocs = liveDocs;
- }
-
- public boolean canReuse(Bits liveDocs) {
- return liveDocs == this.liveDocs;
- }
+ public LowFreqDocsEnumNoPos() {}
public PostingsEnum reset(int[] postings) {
this.postings = postings;
@@ -1640,17 +1596,8 @@ public final class DirectPostingsFormat
@Override
public int nextDoc() {
upto += 2;
- if (liveDocs == null) {
- if (upto < postings.length) {
- return postings[upto];
- }
- } else {
- while (upto < postings.length) {
- if (liveDocs.get(postings[upto])) {
- return postings[upto];
- }
- upto += 2;
- }
+ if (upto < postings.length) {
+ return postings[upto];
}
return NO_MORE_DOCS;
}
@@ -1707,23 +1654,17 @@ public final class DirectPostingsFormat
// Docs + freqs + positions/offets:
private final static class LowFreqDocsEnum extends PostingsEnum {
private int[] postings;
- private final Bits liveDocs;
private final int posMult;
private int upto;
private int freq;
- public LowFreqDocsEnum(Bits liveDocs, int posMult) {
- this.liveDocs = liveDocs;
+ public LowFreqDocsEnum(int posMult) {
this.posMult = posMult;
// if (DEBUG) {
// System.out.println("LowFreqDE: posMult=" + posMult);
// }
}
- public boolean canReuse(Bits liveDocs, int posMult) {
- return liveDocs == this.liveDocs && posMult == this.posMult;
- }
-
public PostingsEnum reset(int[] postings) {
this.postings = postings;
upto = -2;
@@ -1738,21 +1679,10 @@ public final class DirectPostingsFormat
// if (DEBUG) {
// System.out.println(" nextDoc freq=" + freq + " upto=" + upto + " vs " + postings.length);
// }
- if (liveDocs == null) {
- if (upto < postings.length) {
- freq = postings[upto+1];
- assert freq > 0;
- return postings[upto];
- }
- } else {
- while (upto < postings.length) {
- freq = postings[upto+1];
- assert freq > 0;
- if (liveDocs.get(postings[upto])) {
- return postings[upto];
- }
- upto += 2 + freq*posMult;
- }
+ if (upto < postings.length) {
+ freq = postings[upto+1];
+ assert freq > 0;
+ return postings[upto];
}
return NO_MORE_DOCS;
}
@@ -1811,7 +1741,6 @@ public final class DirectPostingsFormat
private final static class LowFreqPostingsEnum extends PostingsEnum {
private int[] postings;
- private final Bits liveDocs;
private final int posMult;
private final boolean hasOffsets;
private final boolean hasPayloads;
@@ -1828,8 +1757,7 @@ public final class DirectPostingsFormat
private int payloadLength;
private byte[] payloadBytes;
- public LowFreqPostingsEnum(Bits liveDocs, boolean hasOffsets, boolean hasPayloads) {
- this.liveDocs = liveDocs;
+ public LowFreqPostingsEnum(boolean hasOffsets, boolean hasPayloads) {
this.hasOffsets = hasOffsets;
this.hasPayloads = hasPayloads;
if (hasOffsets) {
@@ -1873,33 +1801,11 @@ public final class DirectPostingsFormat
upto += posMult * skipPositions;
}
- if (liveDocs == null) {
- if (upto < postings.length) {
- docID = postings[upto++];
- freq = postings[upto++];
- skipPositions = freq;
- return docID;
- }
- } else {
- while(upto < postings.length) {
- docID = postings[upto++];
- freq = postings[upto++];
- if (liveDocs.get(docID)) {
- skipPositions = freq;
- return docID;
- }
- if (hasPayloads) {
- for(int i=0;i<freq;i++) {
- upto++;
- if (hasOffsets) {
- upto += 2;
- }
- payloadOffset += postings[upto++];
- }
- } else {
- upto += posMult * freq;
- }
- }
+ if (upto < postings.length) {
+ docID = postings[upto++];
+ freq = postings[upto++];
+ skipPositions = freq;
+ return docID;
}
return docID = NO_MORE_DOCS;
@@ -1970,17 +1876,10 @@ public final class DirectPostingsFormat
private final static class HighFreqDocsEnum extends PostingsEnum {
private int[] docIDs;
private int[] freqs;
- private final Bits liveDocs;
private int upto;
private int docID = -1;
- public HighFreqDocsEnum(Bits liveDocs) {
- this.liveDocs = liveDocs;
- }
-
- public boolean canReuse(Bits liveDocs) {
- return liveDocs == this.liveDocs;
- }
+ public HighFreqDocsEnum() {}
public int[] getDocIDs() {
return docIDs;
@@ -2000,18 +1899,9 @@ public final class DirectPostingsFormat
@Override
public int nextDoc() {
upto++;
- if (liveDocs == null) {
- try {
- return docID = docIDs[upto];
- } catch (ArrayIndexOutOfBoundsException e) {
- }
- } else {
- while (upto < docIDs.length) {
- if (liveDocs.get(docIDs[upto])) {
- return docID = docIDs[upto];
- }
- upto++;
- }
+ try {
+ return docID = docIDs[upto];
+ } catch (ArrayIndexOutOfBoundsException e) {
}
return docID = NO_MORE_DOCS;
}
@@ -2121,14 +2011,6 @@ public final class DirectPostingsFormat
//System.out.println(" end upto=" + upto + " docID=" + (upto >= docIDs.length ? NO_MORE_DOCS : docIDs[upto]));
- if (liveDocs != null) {
- while (upto < docIDs.length) {
- if (liveDocs.get(docIDs[upto])) {
- break;
- }
- upto++;
- }
- }
if (upto == docIDs.length) {
//System.out.println(" return END");
return docID = NO_MORE_DOCS;
@@ -2170,7 +2052,6 @@ public final class DirectPostingsFormat
private int[] freqs;
private int[][] positions;
private byte[][][] payloads;
- private final Bits liveDocs;
private final boolean hasOffsets;
private final int posJump;
private int upto;
@@ -2178,8 +2059,7 @@ public final class DirectPostingsFormat
private int posUpto;
private int[] curPositions;
- public HighFreqPostingsEnum(Bits liveDocs, boolean hasOffsets) {
- this.liveDocs = liveDocs;
+ public HighFreqPostingsEnum(boolean hasOffsets) {
this.hasOffsets = hasOffsets;
posJump = hasOffsets ? 3 : 1;
}
@@ -2196,10 +2076,6 @@ public final class DirectPostingsFormat
return posJump;
}
- public Bits getLiveDocs() {
- return liveDocs;
- }
-
public PostingsEnum reset(int[] docIDs, int[] freqs, int[][] positions, byte[][][] payloads) {
this.docIDs = docIDs;
this.freqs = freqs;
@@ -2212,21 +2088,10 @@ public final class DirectPostingsFormat
@Override
public int nextDoc() {
upto++;
- if (liveDocs == null) {
- if (upto < docIDs.length) {
- posUpto = -posJump;
- curPositions = positions[upto];
- return docID = docIDs[upto];
- }
- } else {
- while (upto < docIDs.length) {
- if (liveDocs.get(docIDs[upto])) {
- posUpto = -posJump;
- curPositions = positions[upto];
- return docID = docIDs[upto];
- }
- upto++;
- }
+ if (upto < docIDs.length) {
+ posUpto = -posJump;
+ curPositions = positions[upto];
+ return docID = docIDs[upto];
}
return docID = NO_MORE_DOCS;
@@ -2360,14 +2225,6 @@ public final class DirectPostingsFormat
//System.out.println(" end upto=" + upto + " docID=" + (upto >= docIDs.length ? NO_MORE_DOCS : docIDs[upto]));
- if (liveDocs != null) {
- while (upto < docIDs.length) {
- if (liveDocs.get(docIDs[upto])) {
- break;
- }
- upto++;
- }
- }
if (upto == docIDs.length) {
//System.out.println(" return END");
return docID = NO_MORE_DOCS;
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java?rev=1687524&r1=1687523&r2=1687524&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java Thu Jun 25 13:59:19 2015
@@ -427,9 +427,9 @@ public class FSTOrdTermsReader extends F
}
@Override
- public PostingsEnum postings(Bits liveDocs, PostingsEnum reuse, int flags) throws IOException {
+ public PostingsEnum postings(PostingsEnum reuse, int flags) throws IOException {
decodeMetaData();
- return postingsReader.postings(fieldInfo, state, liveDocs, reuse, flags);
+ return postingsReader.postings(fieldInfo, state, reuse, flags);
}
// TODO: this can be achieved by making use of Util.getByOutput()
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java?rev=1687524&r1=1687523&r2=1687524&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java Thu Jun 25 13:59:19 2015
@@ -46,7 +46,6 @@ import org.apache.lucene.store.IndexInpu
import org.apache.lucene.util.Accountable;
import org.apache.lucene.util.Accountables;
import org.apache.lucene.util.ArrayUtil;
-import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.BytesRefBuilder;
import org.apache.lucene.util.IOUtils;
@@ -290,9 +289,9 @@ public class FSTTermsReader extends Fiel
}
@Override
- public PostingsEnum postings(Bits liveDocs, PostingsEnum reuse, int flags) throws IOException {
+ public PostingsEnum postings(PostingsEnum reuse, int flags) throws IOException {
decodeMetaData();
- return postingsReader.postings(fieldInfo, state, liveDocs, reuse, flags);
+ return postingsReader.postings(fieldInfo, state, reuse, flags);
}
@Override
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesProducer.java?rev=1687524&r1=1687523&r2=1687524&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesProducer.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesProducer.java Thu Jun 25 13:59:19 2015
@@ -892,7 +892,7 @@ class MemoryDocValuesProducer extends Do
}
@Override
- public PostingsEnum postings(Bits liveDocs, PostingsEnum reuse, int flags) throws IOException {
+ public PostingsEnum postings(PostingsEnum reuse, int flags) throws IOException {
throw new UnsupportedOperationException();
}
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java?rev=1687524&r1=1687523&r2=1687524&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java Thu Jun 25 13:59:19 2015
@@ -353,10 +353,10 @@ public final class MemoryPostingsFormat
termsWriter.postingsWriter.reset();
if (writePositions) {
- posEnum = termsEnum.postings(null, posEnum, enumFlags);
+ posEnum = termsEnum.postings(posEnum, enumFlags);
postingsEnum = posEnum;
} else {
- postingsEnum = termsEnum.postings(null, postingsEnum, enumFlags);
+ postingsEnum = termsEnum.postings(postingsEnum, enumFlags);
posEnum = null;
}
@@ -433,7 +433,6 @@ public final class MemoryPostingsFormat
private byte[] buffer = new byte[16];
private final ByteArrayDataInput in = new ByteArrayDataInput(buffer);
- private Bits liveDocs;
private int docUpto;
private int docID = -1;
private int accum;
@@ -450,14 +449,13 @@ public final class MemoryPostingsFormat
return indexOptions == this.indexOptions && storePayloads == this.storePayloads;
}
- public FSTDocsEnum reset(BytesRef bufferIn, Bits liveDocs, int numDocs) {
+ public FSTDocsEnum reset(BytesRef bufferIn, int numDocs) {
assert numDocs > 0;
if (buffer.length < bufferIn.length) {
buffer = ArrayUtil.grow(buffer, bufferIn.length);
}
in.reset(buffer, 0, bufferIn.length);
System.arraycopy(bufferIn.bytes, bufferIn.offset, buffer, 0, bufferIn.length);
- this.liveDocs = liveDocs;
docID = -1;
accum = 0;
docUpto = 0;
@@ -469,62 +467,58 @@ public final class MemoryPostingsFormat
@Override
public int nextDoc() {
- while(true) {
- //System.out.println(" nextDoc cycle docUpto=" + docUpto + " numDocs=" + numDocs + " fp=" + in.getPosition() + " this=" + this);
- if (docUpto == numDocs) {
- // System.out.println(" END");
- return docID = NO_MORE_DOCS;
- }
- docUpto++;
- if (indexOptions == IndexOptions.DOCS) {
- accum += in.readVInt();
+ //System.out.println(" nextDoc cycle docUpto=" + docUpto + " numDocs=" + numDocs + " fp=" + in.getPosition() + " this=" + this);
+ if (docUpto == numDocs) {
+ // System.out.println(" END");
+ return docID = NO_MORE_DOCS;
+ }
+ docUpto++;
+ if (indexOptions == IndexOptions.DOCS) {
+ accum += in.readVInt();
+ } else {
+ final int code = in.readVInt();
+ accum += code >>> 1;
+ //System.out.println(" docID=" + accum + " code=" + code);
+ if ((code & 1) != 0) {
+ freq = 1;
} else {
- final int code = in.readVInt();
- accum += code >>> 1;
- //System.out.println(" docID=" + accum + " code=" + code);
- if ((code & 1) != 0) {
- freq = 1;
- } else {
- freq = in.readVInt();
- assert freq > 0;
- }
+ freq = in.readVInt();
+ assert freq > 0;
+ }
- if (indexOptions == IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) {
- // Skip positions/payloads
- for(int posUpto=0;posUpto<freq;posUpto++) {
- if (!storePayloads) {
- in.readVInt();
- } else {
- final int posCode = in.readVInt();
- if ((posCode & 1) != 0) {
- payloadLen = in.readVInt();
- }
- in.skipBytes(payloadLen);
- }
- }
- } else if (indexOptions == IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS) {
- // Skip positions/offsets/payloads
- for(int posUpto=0;posUpto<freq;posUpto++) {
- int posCode = in.readVInt();
- if (storePayloads && ((posCode & 1) != 0)) {
+ if (indexOptions == IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) {
+ // Skip positions/payloads
+ for(int posUpto=0;posUpto<freq;posUpto++) {
+ if (!storePayloads) {
+ in.readVInt();
+ } else {
+ final int posCode = in.readVInt();
+ if ((posCode & 1) != 0) {
payloadLen = in.readVInt();
}
- if ((in.readVInt() & 1) != 0) {
- // new offset length
- in.readVInt();
- }
- if (storePayloads) {
- in.skipBytes(payloadLen);
- }
+ in.skipBytes(payloadLen);
+ }
+ }
+ } else if (indexOptions == IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS) {
+ // Skip positions/offsets/payloads
+ for(int posUpto=0;posUpto<freq;posUpto++) {
+ int posCode = in.readVInt();
+ if (storePayloads && ((posCode & 1) != 0)) {
+ payloadLen = in.readVInt();
+ }
+ if ((in.readVInt() & 1) != 0) {
+ // new offset length
+ in.readVInt();
+ }
+ if (storePayloads) {
+ in.skipBytes(payloadLen);
}
}
- }
-
- if (liveDocs == null || liveDocs.get(accum)) {
- //System.out.println(" return docID=" + accum + " freq=" + freq);
- return (docID = accum);
}
}
+
+ //System.out.println(" return docID=" + accum + " freq=" + freq);
+ return (docID = accum);
}
@Override
@@ -577,7 +571,6 @@ public final class MemoryPostingsFormat
private byte[] buffer = new byte[16];
private final ByteArrayDataInput in = new ByteArrayDataInput(buffer);
- private Bits liveDocs;
private int docUpto;
private int docID = -1;
private int accum;
@@ -601,7 +594,7 @@ public final class MemoryPostingsFormat
return storePayloads == this.storePayloads && storeOffsets == this.storeOffsets;
}
- public FSTPostingsEnum reset(BytesRef bufferIn, Bits liveDocs, int numDocs) {
+ public FSTPostingsEnum reset(BytesRef bufferIn, int numDocs) {
assert numDocs > 0;
// System.out.println("D&P reset bytes this=" + this);
@@ -614,7 +607,6 @@ public final class MemoryPostingsFormat
}
in.reset(buffer, 0, bufferIn.length - bufferIn.offset);
System.arraycopy(bufferIn.bytes, bufferIn.offset, buffer, 0, bufferIn.length);
- this.liveDocs = liveDocs;
docID = -1;
accum = 0;
docUpto = 0;
@@ -649,37 +641,11 @@ public final class MemoryPostingsFormat
assert freq > 0;
}
- if (liveDocs == null || liveDocs.get(accum)) {
- pos = 0;
- startOffset = storeOffsets ? 0 : -1;
- posPending = freq;
- //System.out.println(" return docID=" + accum + " freq=" + freq);
- return (docID = accum);
- }
-
- // Skip positions
- for(int posUpto=0;posUpto<freq;posUpto++) {
- if (!storePayloads) {
- in.readVInt();
- } else {
- final int skipCode = in.readVInt();
- if ((skipCode & 1) != 0) {
- payloadLength = in.readVInt();
- //System.out.println(" new payloadLen=" + payloadLength);
- }
- }
-
- if (storeOffsets) {
- if ((in.readVInt() & 1) != 0) {
- // new offset length
- offsetLength = in.readVInt();
- }
- }
-
- if (storePayloads) {
- in.skipBytes(payloadLength);
- }
- }
+ pos = 0;
+ startOffset = storeOffsets ? 0 : -1;
+ posPending = freq;
+ //System.out.println(" return docID=" + accum + " freq=" + freq);
+ return (docID = accum);
}
}
@@ -827,7 +793,7 @@ public final class MemoryPostingsFormat
}
@Override
- public PostingsEnum postings(Bits liveDocs, PostingsEnum reuse, int flags) {
+ public PostingsEnum postings(PostingsEnum reuse, int flags) {
// TODO: the logic of which enum impl to choose should be refactored to be simpler...
boolean hasPositions = field.getIndexOptions().compareTo(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) >= 0;
@@ -844,7 +810,7 @@ public final class MemoryPostingsFormat
}
}
//System.out.println("D&P reset this=" + this);
- return docsAndPositionsEnum.reset(postingsSpare, liveDocs, docFreq);
+ return docsAndPositionsEnum.reset(postingsSpare, docFreq);
}
decodeMetaData();
@@ -858,7 +824,7 @@ public final class MemoryPostingsFormat
docsEnum = new FSTDocsEnum(field.getIndexOptions(), field.hasPayloads());
}
}
- return docsEnum.reset(this.postingsSpare, liveDocs, docFreq);
+ return docsEnum.reset(this.postingsSpare, docFreq);
}
@Override
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java?rev=1687524&r1=1687523&r2=1687524&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java Thu Jun 25 13:59:19 2015
@@ -207,7 +207,7 @@ class SimpleTextFieldsReader extends Fie
}
@Override
- public PostingsEnum postings(Bits liveDocs, PostingsEnum reuse, int flags) throws IOException {
+ public PostingsEnum postings(PostingsEnum reuse, int flags) throws IOException {
boolean hasPositions = indexOptions.compareTo(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) >= 0;
if (hasPositions && PostingsEnum.featureRequested(flags, PostingsEnum.POSITIONS)) {
@@ -218,7 +218,7 @@ class SimpleTextFieldsReader extends Fie
} else {
docsAndPositionsEnum = new SimpleTextPostingsEnum();
}
- return docsAndPositionsEnum.reset(docsStart, liveDocs, indexOptions, docFreq);
+ return docsAndPositionsEnum.reset(docsStart, indexOptions, docFreq);
}
@@ -228,7 +228,7 @@ class SimpleTextFieldsReader extends Fie
} else {
docsEnum = new SimpleTextDocsEnum();
}
- return docsEnum.reset(docsStart, liveDocs, indexOptions == IndexOptions.DOCS, docFreq);
+ return docsEnum.reset(docsStart, indexOptions == IndexOptions.DOCS, docFreq);
}
}
@@ -239,7 +239,6 @@ class SimpleTextFieldsReader extends Fie
private boolean omitTF;
private int docID = -1;
private int tf;
- private Bits liveDocs;
private final BytesRefBuilder scratch = new BytesRefBuilder();
private final CharsRefBuilder scratchUTF16 = new CharsRefBuilder();
private int cost;
@@ -253,8 +252,7 @@ class SimpleTextFieldsReader extends Fie
return in == inStart;
}
- public SimpleTextDocsEnum reset(long fp, Bits liveDocs, boolean omitTF, int docFreq) throws IOException {
- this.liveDocs = liveDocs;
+ public SimpleTextDocsEnum reset(long fp, boolean omitTF, int docFreq) throws IOException {
in.seek(fp);
this.omitTF = omitTF;
docID = -1;
@@ -304,7 +302,7 @@ class SimpleTextFieldsReader extends Fie
final long lineStart = in.getFilePointer();
SimpleTextUtil.readLine(in, scratch);
if (StringHelper.startsWith(scratch.get(), DOC)) {
- if (!first && (liveDocs == null || liveDocs.get(docID))) {
+ if (!first) {
in.seek(lineStart);
if (!omitTF) {
tf = termFreq;
@@ -328,7 +326,7 @@ class SimpleTextFieldsReader extends Fie
// skip
} else {
assert StringHelper.startsWith(scratch.get(), TERM) || StringHelper.startsWith(scratch.get(), FIELD) || StringHelper.startsWith(scratch.get(), END): "scratch=" + scratch.get().utf8ToString();
- if (!first && (liveDocs == null || liveDocs.get(docID))) {
+ if (!first) {
in.seek(lineStart);
if (!omitTF) {
tf = termFreq;
@@ -357,7 +355,6 @@ class SimpleTextFieldsReader extends Fie
private final IndexInput in;
private int docID = -1;
private int tf;
- private Bits liveDocs;
private final BytesRefBuilder scratch = new BytesRefBuilder();
private final BytesRefBuilder scratch2 = new BytesRefBuilder();
private final CharsRefBuilder scratchUTF16 = new CharsRefBuilder();
@@ -380,8 +377,7 @@ class SimpleTextFieldsReader extends Fie
return in == inStart;
}
- public SimpleTextPostingsEnum reset(long fp, Bits liveDocs, IndexOptions indexOptions, int docFreq) {
- this.liveDocs = liveDocs;
+ public SimpleTextPostingsEnum reset(long fp, IndexOptions indexOptions, int docFreq) {
nextDocStart = fp;
docID = -1;
readPositions = indexOptions.compareTo(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) >= 0;
@@ -414,7 +410,7 @@ class SimpleTextFieldsReader extends Fie
SimpleTextUtil.readLine(in, scratch);
//System.out.println("NEXT DOC: " + scratch.utf8ToString());
if (StringHelper.startsWith(scratch.get(), DOC)) {
- if (!first && (liveDocs == null || liveDocs.get(docID))) {
+ if (!first) {
nextDocStart = lineStart;
in.seek(posStart);
return docID;
@@ -437,7 +433,7 @@ class SimpleTextFieldsReader extends Fie
// skip
} else {
assert StringHelper.startsWith(scratch.get(), TERM) || StringHelper.startsWith(scratch.get(), FIELD) || StringHelper.startsWith(scratch.get(), END);
- if (!first && (liveDocs == null || liveDocs.get(docID))) {
+ if (!first) {
nextDocStart = lineStart;
in.seek(posStart);
return docID;
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsWriter.java?rev=1687524&r1=1687523&r2=1687524&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsWriter.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsWriter.java Thu Jun 25 13:59:19 2015
@@ -101,7 +101,7 @@ class SimpleTextFieldsWriter extends Fie
break;
}
- postingsEnum = termsEnum.postings(null, postingsEnum, flags);
+ postingsEnum = termsEnum.postings(postingsEnum, flags);
assert postingsEnum != null: "termsEnum=" + termsEnum + " hasPos=" + hasPositions + " flags=" + flags;
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java?rev=1687524&r1=1687523&r2=1687524&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java Thu Jun 25 13:59:19 2015
@@ -387,21 +387,21 @@ public class SimpleTextTermVectorsReader
}
@Override
- public PostingsEnum postings(Bits liveDocs, PostingsEnum reuse, int flags) throws IOException {
+ public PostingsEnum postings(PostingsEnum reuse, int flags) throws IOException {
if (PostingsEnum.featureRequested(flags, PostingsEnum.POSITIONS)) {
SimpleTVPostings postings = current.getValue();
if (postings.positions != null || postings.startOffsets != null) {
// TODO: reuse
SimpleTVPostingsEnum e = new SimpleTVPostingsEnum();
- e.reset(liveDocs, postings.positions, postings.startOffsets, postings.endOffsets, postings.payloads);
+ e.reset(postings.positions, postings.startOffsets, postings.endOffsets, postings.payloads);
return e;
}
}
// TODO: reuse
SimpleTVDocsEnum e = new SimpleTVDocsEnum();
- e.reset(liveDocs, PostingsEnum.featureRequested(flags, PostingsEnum.FREQS) == false ? 1 : current.getValue().freq);
+ e.reset(PostingsEnum.featureRequested(flags, PostingsEnum.FREQS) == false ? 1 : current.getValue().freq);
return e;
}
@@ -412,7 +412,6 @@ public class SimpleTextTermVectorsReader
private boolean didNext;
private int doc = -1;
private int freq;
- private Bits liveDocs;
@Override
public int freq() throws IOException {
@@ -447,7 +446,7 @@ public class SimpleTextTermVectorsReader
@Override
public int nextDoc() {
- if (!didNext && (liveDocs == null || liveDocs.get(0))) {
+ if (!didNext) {
didNext = true;
return (doc = 0);
} else {
@@ -460,8 +459,7 @@ public class SimpleTextTermVectorsReader
return slowAdvance(target);
}
- public void reset(Bits liveDocs, int freq) {
- this.liveDocs = liveDocs;
+ public void reset(int freq) {
this.freq = freq;
this.doc = -1;
didNext = false;
@@ -477,7 +475,6 @@ public class SimpleTextTermVectorsReader
private boolean didNext;
private int doc = -1;
private int nextPos;
- private Bits liveDocs;
private int[] positions;
private BytesRef[] payloads;
private int[] startOffsets;
@@ -500,7 +497,7 @@ public class SimpleTextTermVectorsReader
@Override
public int nextDoc() {
- if (!didNext && (liveDocs == null || liveDocs.get(0))) {
+ if (!didNext) {
didNext = true;
return (doc = 0);
} else {
@@ -513,8 +510,7 @@ public class SimpleTextTermVectorsReader
return slowAdvance(target);
}
- public void reset(Bits liveDocs, int[] positions, int[] startOffsets, int[] endOffsets, BytesRef payloads[]) {
- this.liveDocs = liveDocs;
+ public void reset(int[] positions, int[] startOffsets, int[] endOffsets, BytesRef payloads[]) {
this.positions = positions;
this.startOffsets = startOffsets;
this.endOffsets = endOffsets;
Modified: lucene/dev/trunk/lucene/codecs/src/test/org/apache/lucene/codecs/autoprefix/TestAutoPrefixTerms.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/test/org/apache/lucene/codecs/autoprefix/TestAutoPrefixTerms.java?rev=1687524&r1=1687523&r2=1687524&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/test/org/apache/lucene/codecs/autoprefix/TestAutoPrefixTerms.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/test/org/apache/lucene/codecs/autoprefix/TestAutoPrefixTerms.java Thu Jun 25 13:59:19 2015
@@ -55,7 +55,6 @@ import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.MultiTermQuery;
import org.apache.lucene.search.PrefixQuery;
import org.apache.lucene.search.TermRangeQuery;
import org.apache.lucene.store.Directory;
@@ -169,7 +168,7 @@ public class TestAutoPrefixTerms extends
System.out.println(" got term=" + te.term().utf8ToString());
}
verifier.sawTerm(te.term());
- postingsEnum = te.postings(null, postingsEnum);
+ postingsEnum = te.postings(postingsEnum);
int docID;
while ((docID = postingsEnum.nextDoc()) != PostingsEnum.NO_MORE_DOCS) {
long v = docValues.get(docID);
@@ -296,7 +295,7 @@ public class TestAutoPrefixTerms extends
System.out.println(" got term=" + te.term() + " docFreq=" + te.docFreq());
}
verifier.sawTerm(te.term());
- postingsEnum = te.postings(null, postingsEnum);
+ postingsEnum = te.postings(postingsEnum);
int docID;
while ((docID = postingsEnum.nextDoc()) != PostingsEnum.NO_MORE_DOCS) {
long v = docValues.get(docID);
@@ -415,7 +414,7 @@ public class TestAutoPrefixTerms extends
System.out.println("TEST: got term=" + te.term().utf8ToString() + " docFreq=" + te.docFreq());
}
verifier.sawTerm(te.term());
- postingsEnum = te.postings(null, postingsEnum);
+ postingsEnum = te.postings(postingsEnum);
int docID;
while ((docID = postingsEnum.nextDoc()) != PostingsEnum.NO_MORE_DOCS) {
assertTrue("prefixBR=" + prefixBR + " docBR=" + docValues.get(docID), StringHelper.startsWith(docValues.get(docID), prefixBR));
@@ -491,7 +490,7 @@ public class TestAutoPrefixTerms extends
//TermsEnum te = terms.intersect(new CompiledAutomaton(a, true, false), null);
while (te.next() != null) {
verifier.sawTerm(te.term());
- postingsEnum = te.postings(null, postingsEnum);
+ postingsEnum = te.postings(postingsEnum);
int docID;
while ((docID = postingsEnum.nextDoc()) != PostingsEnum.NO_MORE_DOCS) {
// The auto-prefix terms should never "overlap" one another, so we should only ever see a given docID one time:
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/PostingsReaderBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/PostingsReaderBase.java?rev=1687524&r1=1687523&r2=1687524&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/PostingsReaderBase.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/PostingsReaderBase.java Thu Jun 25 13:59:19 2015
@@ -26,7 +26,6 @@ import org.apache.lucene.index.SegmentRe
import org.apache.lucene.store.DataInput;
import org.apache.lucene.store.IndexInput;
import org.apache.lucene.util.Accountable;
-import org.apache.lucene.util.Bits;
/** The core terms dictionaries (BlockTermsReader,
* BlockTreeTermsReader) interact with a single instance
@@ -65,7 +64,7 @@ public abstract class PostingsReaderBase
/** Must fully consume state, since after this call that
* TermState may be reused. */
- public abstract PostingsEnum postings(FieldInfo fieldInfo, BlockTermState state, Bits skipDocs, PostingsEnum reuse, int flags) throws IOException;
+ public abstract PostingsEnum postings(FieldInfo fieldInfo, BlockTermState state, PostingsEnum reuse, int flags) throws IOException;
/**
* Checks consistency of this reader.
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/PushPostingsWriterBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/PushPostingsWriterBase.java?rev=1687524&r1=1687523&r2=1687524&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/PushPostingsWriterBase.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/PushPostingsWriterBase.java Thu Jun 25 13:59:19 2015
@@ -119,7 +119,7 @@ public abstract class PushPostingsWriter
@Override
public final BlockTermState writeTerm(BytesRef term, TermsEnum termsEnum, FixedBitSet docsSeen) throws IOException {
startTerm();
- postingsEnum = termsEnum.postings(null, postingsEnum, enumFlags);
+ postingsEnum = termsEnum.postings(postingsEnum, enumFlags);
assert postingsEnum != null;
int docFreq = 0;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java?rev=1687524&r1=1687523&r2=1687524&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java Thu Jun 25 13:59:19 2015
@@ -267,7 +267,7 @@ public abstract class TermVectorsWriter
startTerm(termsEnum.term(), freq);
if (hasPositions || hasOffsets) {
- docsAndPositionsEnum = termsEnum.postings(null, docsAndPositionsEnum, PostingsEnum.OFFSETS | PostingsEnum.PAYLOADS);
+ docsAndPositionsEnum = termsEnum.postings(docsAndPositionsEnum, PostingsEnum.OFFSETS | PostingsEnum.PAYLOADS);
assert docsAndPositionsEnum != null;
final int docID = docsAndPositionsEnum.nextDoc();
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BitSetTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BitSetTermsEnum.java?rev=1687524&r1=1687523&r2=1687524&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BitSetTermsEnum.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BitSetTermsEnum.java Thu Jun 25 13:59:19 2015
@@ -21,7 +21,6 @@ import org.apache.lucene.codecs.Postings
import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.util.BitSet;
-import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
/** Silly stub class, used only when writing an auto-prefix
@@ -73,14 +72,11 @@ class BitSetTermsEnum extends TermsEnum
}
@Override
- public PostingsEnum postings(Bits liveDocs, PostingsEnum reuse, int flags) {
+ public PostingsEnum postings(PostingsEnum reuse, int flags) {
if (flags != PostingsEnum.NONE) {
// We only work with DOCS_ONLY fields
return null;
}
- if (liveDocs != null) {
- throw new IllegalArgumentException("cannot handle live docs");
- }
postingsEnum.reset();
return postingsEnum;
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BlockTreeTermsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BlockTreeTermsWriter.java?rev=1687524&r1=1687523&r2=1687524&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BlockTreeTermsWriter.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BlockTreeTermsWriter.java Thu Jun 25 13:59:19 2015
@@ -474,7 +474,7 @@ public final class BlockTreeTermsWriter
while (prefixTermsEnum.next() != null) {
//System.out.println(" got term=" + prefixTermsEnum.term().utf8ToString());
//termCount++;
- prefixDocsEnum = prefixTermsEnum.postings(null, prefixDocsEnum, 0);
+ prefixDocsEnum = prefixTermsEnum.postings(prefixDocsEnum, 0);
//System.out.println(" " + prefixDocsEnum + " doc=" + prefixDocsEnum.docID());
prefixDocs.or(prefixDocsEnum);
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/IntersectTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/IntersectTermsEnum.java?rev=1687524&r1=1687523&r2=1687524&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/IntersectTermsEnum.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/IntersectTermsEnum.java Thu Jun 25 13:59:19 2015
@@ -25,7 +25,6 @@ import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.store.IndexInput;
import org.apache.lucene.util.ArrayUtil;
-import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.RamUsageEstimator;
import org.apache.lucene.util.StringHelper;
@@ -231,9 +230,9 @@ final class IntersectTermsEnum extends T
}
@Override
- public PostingsEnum postings(Bits skipDocs, PostingsEnum reuse, int flags) throws IOException {
+ public PostingsEnum postings(PostingsEnum reuse, int flags) throws IOException {
currentFrame.decodeMetaData();
- return fr.parent.postingsReader.postings(fr.fieldInfo, currentFrame.termState, skipDocs, reuse, flags);
+ return fr.parent.postingsReader.postings(fr.fieldInfo, currentFrame.termState, reuse, flags);
}
private int getState() {
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/SegmentTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/SegmentTermsEnum.java?rev=1687524&r1=1687523&r2=1687524&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/SegmentTermsEnum.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/SegmentTermsEnum.java Thu Jun 25 13:59:19 2015
@@ -27,7 +27,6 @@ import org.apache.lucene.index.TermsEnum
import org.apache.lucene.store.ByteArrayDataInput;
import org.apache.lucene.store.IndexInput;
import org.apache.lucene.util.ArrayUtil;
-import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.BytesRefBuilder;
import org.apache.lucene.util.RamUsageEstimator;
@@ -993,7 +992,7 @@ final class SegmentTermsEnum extends Ter
}
@Override
- public PostingsEnum postings(Bits skipDocs, PostingsEnum reuse, int flags) throws IOException {
+ public PostingsEnum postings(PostingsEnum reuse, int flags) throws IOException {
assert !eof;
//if (DEBUG) {
//System.out.println("BTTR.docs seg=" + segment);
@@ -1002,7 +1001,7 @@ final class SegmentTermsEnum extends Ter
//if (DEBUG) {
//System.out.println(" state=" + currentFrame.state);
//}
- return fr.parent.postingsReader.postings(fr.fieldInfo, currentFrame.state, skipDocs, reuse, flags);
+ return fr.parent.postingsReader.postings(fr.fieldInfo, currentFrame.state, reuse, flags);
}
@Override
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java?rev=1687524&r1=1687523&r2=1687524&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java Thu Jun 25 13:59:19 2015
@@ -44,7 +44,6 @@ import org.apache.lucene.store.IndexInpu
import org.apache.lucene.util.Accountable;
import org.apache.lucene.util.Accountables;
import org.apache.lucene.util.ArrayUtil;
-import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.LongsRef;
@@ -930,7 +929,7 @@ public final class CompressingTermVector
}
@Override
- public final PostingsEnum postings(Bits liveDocs, PostingsEnum reuse, int flags) throws IOException {
+ public final PostingsEnum postings(PostingsEnum reuse, int flags) throws IOException {
final TVPostingsEnum docsEnum;
if (reuse != null && reuse instanceof TVPostingsEnum) {
docsEnum = (TVPostingsEnum) reuse;
@@ -938,7 +937,7 @@ public final class CompressingTermVector
docsEnum = new TVPostingsEnum();
}
- docsEnum.reset(liveDocs, termFreqs[ord], positionIndex[ord], positions, startOffsets, lengths, payloads, payloadIndex);
+ docsEnum.reset(termFreqs[ord], positionIndex[ord], positions, startOffsets, lengths, payloads, payloadIndex);
return docsEnum;
}
@@ -946,7 +945,6 @@ public final class CompressingTermVector
private static class TVPostingsEnum extends PostingsEnum {
- private Bits liveDocs;
private int doc = -1;
private int termFreq;
private int positionIndex;
@@ -962,10 +960,9 @@ public final class CompressingTermVector
payload = new BytesRef();
}
- public void reset(Bits liveDocs, int freq, int positionIndex, int[] positions,
+ public void reset(int freq, int positionIndex, int[] positions,
int[] startOffsets, int[] lengths, BytesRef payloads,
int[] payloadIndex) {
- this.liveDocs = liveDocs;
this.termFreq = freq;
this.positionIndex = positionIndex;
this.positions = positions;
@@ -1061,7 +1058,7 @@ public final class CompressingTermVector
@Override
public int nextDoc() throws IOException {
- if (doc == -1 && (liveDocs == null || liveDocs.get(0))) {
+ if (doc == -1) {
return (doc = 0);
} else {
return (doc = NO_MORE_DOCS);