You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/01/30 00:51:01 UTC
svn commit: r1237508 [1/4] - in /lucene/dev/branches/lucene2858:
lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/
lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/
lucene/contrib/memory/src/java/org/apache/l...
Author: uschindler
Date: Sun Jan 29 23:50:54 2012
New Revision: 1237508
URL: http://svn.apache.org/viewvc?rev=1237508&view=rev
Log:
LUCENE-2858: Rename AtomicIndexReader -> AtomicReader, CompositeIndexReader -> CompositeReader. Contexts not yet changed!
Added:
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/AtomicReader.java
- copied, changed from r1237442, lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/AtomicIndexReader.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/CompositeReader.java
- copied, changed from r1237442, lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/CompositeIndexReader.java
Removed:
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/AtomicIndexReader.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/CompositeIndexReader.java
Modified:
lucene/dev/branches/lucene2858/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
lucene/dev/branches/lucene2858/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java
lucene/dev/branches/lucene2858/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
lucene/dev/branches/lucene2858/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java
lucene/dev/branches/lucene2858/lucene/contrib/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java
lucene/dev/branches/lucene2858/lucene/contrib/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java
lucene/dev/branches/lucene2858/lucene/contrib/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java
lucene/dev/branches/lucene2858/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java
lucene/dev/branches/lucene2858/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedStringComparator.java
lucene/dev/branches/lucene2858/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geohash/GeoHashDistanceFilter.java
lucene/dev/branches/lucene2858/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/CartesianShapeFilter.java
lucene/dev/branches/lucene2858/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceFieldComparatorSource.java
lucene/dev/branches/lucene2858/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/LatLongDistanceFilter.java
lucene/dev/branches/lucene2858/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestDistance.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/codecs/PerDocConsumer.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40NormsFormat.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsConsumer.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/BaseMultiReader.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/BufferedDeletesStream.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/DocTermOrds.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/FilterIndexReader.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/IndexReader.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/IndexWriter.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/MergeState.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/MultiDocValues.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/MultiFields.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/ParallelReader.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/SegmentMerger.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/SegmentReader.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/SlowCompositeReaderWrapper.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/BooleanQuery.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/BooleanScorer.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/CachingCollector.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/CachingWrapperFilter.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/Collector.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/ConstantScoreQuery.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/FieldCache.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/FieldCacheImpl.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/FieldCacheRangeFilter.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/FieldCacheTermsFilter.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/FieldComparator.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/FieldValueFilter.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/Filter.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/FilteredQuery.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/IndexSearcher.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/MatchAllDocsQuery.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/MultiCollector.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/PhraseQuery.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/PositiveScoresOnlyCollector.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/QueryWrapperFilter.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/TermCollectingRewrite.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/TermQuery.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/TimeLimitingCollector.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/TopFieldCollector.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/TopScoreDocCollector.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/TotalHitCountCollector.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/Weight.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/payloads/PayloadSpanUtil.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/BM25Similarity.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/MultiSimilarity.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/Similarity.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/SimilarityBase.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/FieldMaskingSpanQuery.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanMultiTermQueryWrapper.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanNearQuery.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanNotQuery.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanOrQuery.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanPositionCheckQuery.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanQuery.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanTermQuery.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/spans/SpanWeight.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/util/FieldCacheSanityChecker.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/util/ReaderUtil.java
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/util/TermContext.java
lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/AssertingIndexSearcher.java
lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/CheckHits.java
lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/search/QueryUtils.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/codecs/lucene40/TestReuseDocsEnum.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/codecs/pulsing/TestPulsingReuse.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestCustomNorms.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestDocTermOrds.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestDocValuesIndexing.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestDocsAndPositions.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestFieldsReader.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestIndexReader.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestIndexReaderReopen.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestNorms.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestOmitTf.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestPostingsOffsets.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestSegmentReader.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestTypePromotion.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/FieldCacheRewriteMethod.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/JustCompileSearch.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/MockFilter.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/MultiCollectorTest.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/SingleDocTestFilter.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestCachingCollector.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestConstantScoreQuery.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestDocBoost.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestDocIdSet.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestDocValuesScoring.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestElevationComparator.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestFieldCache.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestScorerPerf.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestShardSearching.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestSimilarity.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestSort.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestSubScorerFreqs.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestTermScorer.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestTopDocsCollector.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestTopDocsMerge.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/spans/JustCompileSearchSpans.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/spans/MultiSpansWrapper.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java
lucene/dev/branches/lucene2858/modules/facet/src/java/org/apache/lucene/facet/search/FacetsCollector.java
lucene/dev/branches/lucene2858/modules/facet/src/java/org/apache/lucene/facet/search/ScoredDocIdCollector.java
lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/AbstractFirstPassGroupingCollector.java
lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/AbstractSecondPassGroupingCollector.java
lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/BlockGroupingCollector.java
lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVAllGroupHeadsCollector.java
lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVAllGroupsCollector.java
lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVFirstPassGroupingCollector.java
lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVSecondPassGroupingCollector.java
lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupHeadsCollector.java
lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupsCollector.java
lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionFirstPassGroupingCollector.java
lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionSecondPassGroupingCollector.java
lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/term/TermAllGroupHeadsCollector.java
lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/term/TermAllGroupsCollector.java
lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/term/TermFirstPassGroupingCollector.java
lucene/dev/branches/lucene2858/modules/grouping/src/java/org/apache/lucene/search/grouping/term/TermSecondPassGroupingCollector.java
lucene/dev/branches/lucene2858/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/TermsCollector.java
lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java
lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java
lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java
lucene/dev/branches/lucene2858/modules/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
lucene/dev/branches/lucene2858/modules/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/BooleanFilter.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/ChainedFilter.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/CustomScoreProvider.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/TermsFilter.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/ValueSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StringIndexDocValues.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ByteFieldSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/BytesRefFieldSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstValueSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DefFunction.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleConstValueSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DualFloatFunction.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IDFValueSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IfFunction.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LinearFloatFunction.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxDocValueSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiBoolFunction.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFloatFunction.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFunction.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumDocsValueSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumericIndexDocValueSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/RangeMapFloatFunction.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ReciprocalFloatFunction.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ReverseOrdFieldSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ShortFieldSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleBoolFunction.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleFloatFunction.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SumTotalTermFreqValueSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TotalTermFreqValueSource.java
lucene/dev/branches/lucene2858/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/VectorValueSource.java
lucene/dev/branches/lucene2858/modules/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java
lucene/dev/branches/lucene2858/modules/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java
lucene/dev/branches/lucene2858/modules/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java
lucene/dev/branches/lucene2858/modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeFilterBuilder.java
lucene/dev/branches/lucene2858/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/BooleanQueryTst.java
lucene/dev/branches/lucene2858/modules/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java
lucene/dev/branches/lucene2858/modules/queryparser/src/test/org/apache/lucene/queryparser/xml/builders/TestNumericRangeFilterBuilder.java
lucene/dev/branches/lucene2858/modules/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java
Modified: lucene/dev/branches/lucene2858/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java (original)
+++ lucene/dev/branches/lucene2858/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java Sun Jan 29 23:50:54 2012
@@ -31,7 +31,7 @@ import org.apache.lucene.analysis.Cachin
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.memory.MemoryIndex;
import org.apache.lucene.search.*;
import org.apache.lucene.search.spans.FieldMaskingSpanQuery;
Modified: lucene/dev/branches/lucene2858/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java (original)
+++ lucene/dev/branches/lucene2858/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java Sun Jan 29 23:50:54 2012
@@ -34,7 +34,7 @@ import org.apache.lucene.index.CorruptIn
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.Term;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.search.Collector;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.PhraseQuery;
Modified: lucene/dev/branches/lucene2858/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java (original)
+++ lucene/dev/branches/lucene2858/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java Sun Jan 29 23:50:54 2012
@@ -33,7 +33,7 @@ import org.apache.lucene.analysis.tokena
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute;
import org.apache.lucene.document.Document;
-import org.apache.lucene.index.AtomicIndexReader;
+import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.index.Norm;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.DocsAndPositionsEnum;
@@ -42,7 +42,7 @@ import org.apache.lucene.index.FieldInfo
import org.apache.lucene.index.FieldInvertState;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.FieldsEnum;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.OrdTermState;
import org.apache.lucene.index.StoredFieldVisitor;
@@ -750,7 +750,7 @@ public class MemoryIndex {
* Search support for Lucene framework integration; implements all methods
* required by the Lucene IndexReader contracts.
*/
- private final class MemoryIndexReader extends AtomicIndexReader {
+ private final class MemoryIndexReader extends AtomicReader {
private IndexSearcher searcher; // needed to find searcher.getSimilarity()
Modified: lucene/dev/branches/lucene2858/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java (original)
+++ lucene/dev/branches/lucene2858/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java Sun Jan 29 23:50:54 2012
@@ -33,7 +33,7 @@ import org.apache.lucene.codecs.lucene40
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.AtomicIndexReader;
+import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.IndexReader;
@@ -186,7 +186,7 @@ public class MemoryIndexTest extends Bas
Analyzer analyzer = new MockAnalyzer(random);
MemoryIndex memory = new MemoryIndex();
memory.addField("foo", "bar", analyzer);
- AtomicIndexReader reader = (AtomicIndexReader) memory.createSearcher().getIndexReader();
+ AtomicReader reader = (AtomicReader) memory.createSearcher().getIndexReader();
DocsEnum disi = _TestUtil.docs(random, reader, "foo", new BytesRef("bar"), null, null, false);
int docid = disi.docID();
assertTrue(docid == -1 || docid == DocIdSetIterator.NO_MORE_DOCS);
@@ -206,7 +206,7 @@ public class MemoryIndexTest extends Bas
Analyzer analyzer = new MockAnalyzer(random);
MemoryIndex memory = new MemoryIndex();
memory.addField("foo", "bar", analyzer);
- AtomicIndexReader reader = (AtomicIndexReader) memory.createSearcher().getIndexReader();
+ AtomicReader reader = (AtomicReader) memory.createSearcher().getIndexReader();
DocsAndPositionsEnum disi = reader.termPositionsEnum(null, "foo", new BytesRef("bar"), false);
int docid = disi.docID();
assertTrue(docid == -1 || docid == DocIdSetIterator.NO_MORE_DOCS);
Modified: lucene/dev/branches/lucene2858/lucene/contrib/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/contrib/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/contrib/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java (original)
+++ lucene/dev/branches/lucene2858/lucene/contrib/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java Sun Jan 29 23:50:54 2012
@@ -182,15 +182,15 @@ public class MultiPassIndexSplitter {
super(initSubReaders(reader), false /* dont close */);
}
- private static AtomicIndexReader[] initSubReaders(IndexReader reader) throws IOException {
- final ArrayList<AtomicIndexReader> subs = new ArrayList<AtomicIndexReader>();
+ private static AtomicReader[] initSubReaders(IndexReader reader) throws IOException {
+ final ArrayList<AtomicReader> subs = new ArrayList<AtomicReader>();
new ReaderUtil.Gather(reader) {
@Override
- protected void add(int base, AtomicIndexReader r) {
+ protected void add(int base, AtomicReader r) {
subs.add(new FakeDeleteAtomicIndexReader(r));
}
}.run();
- return subs.toArray(new AtomicIndexReader[subs.size()]);
+ return subs.toArray(new AtomicReader[subs.size()]);
}
public void deleteDocument(int docID) {
@@ -226,7 +226,7 @@ public class MultiPassIndexSplitter {
private static final class FakeDeleteAtomicIndexReader extends FilterIndexReader {
FixedBitSet liveDocs;
- public FakeDeleteAtomicIndexReader(AtomicIndexReader reader) {
+ public FakeDeleteAtomicIndexReader(AtomicReader reader) {
super(reader);
undeleteAll(); // initialize main bitset
}
Modified: lucene/dev/branches/lucene2858/lucene/contrib/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/contrib/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/contrib/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java (original)
+++ lucene/dev/branches/lucene2858/lucene/contrib/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java Sun Jan 29 23:50:54 2012
@@ -20,7 +20,7 @@ package org.apache.lucene.index;
import java.io.IOException;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.Filter;
Modified: lucene/dev/branches/lucene2858/lucene/contrib/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/contrib/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/contrib/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java (original)
+++ lucene/dev/branches/lucene2858/lucene/contrib/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java Sun Jan 29 23:50:54 2012
@@ -17,7 +17,7 @@ package org.apache.lucene.misc;
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicIndexReader;
+import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.index.Fields;
@@ -188,7 +188,7 @@ public class HighFreqTerms {
new ReaderUtil.Gather(reader) {
@Override
- protected void add(int base, AtomicIndexReader r) throws IOException {
+ protected void add(int base, AtomicReader r) throws IOException {
Bits liveDocs = r.getLiveDocs();
if (liveDocs == null) {
// TODO: we could do this up front, during the scan
Modified: lucene/dev/branches/lucene2858/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java (original)
+++ lucene/dev/branches/lucene2858/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java Sun Jan 29 23:50:54 2012
@@ -17,7 +17,7 @@ package org.apache.lucene.sandbox.querie
*/
import org.apache.lucene.index.*;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.Filter;
import org.apache.lucene.util.Bits;
@@ -78,7 +78,7 @@ public class DuplicateFilter extends Fil
}
}
- private FixedBitSet correctBits(AtomicIndexReader reader, Bits acceptDocs) throws IOException {
+ private FixedBitSet correctBits(AtomicReader reader, Bits acceptDocs) throws IOException {
FixedBitSet bits = new FixedBitSet(reader.maxDoc()); //assume all are INvalid
Terms terms = reader.fields().terms(fieldName);
@@ -115,7 +115,7 @@ public class DuplicateFilter extends Fil
return bits;
}
- private FixedBitSet fastBits(AtomicIndexReader reader, Bits acceptDocs) throws IOException {
+ private FixedBitSet fastBits(AtomicReader reader, Bits acceptDocs) throws IOException {
FixedBitSet bits = new FixedBitSet(reader.maxDoc());
bits.set(0, reader.maxDoc()); //assume all are valid
Terms terms = reader.fields().terms(fieldName);
Modified: lucene/dev/branches/lucene2858/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedStringComparator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedStringComparator.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedStringComparator.java (original)
+++ lucene/dev/branches/lucene2858/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedStringComparator.java Sun Jan 29 23:50:54 2012
@@ -20,7 +20,7 @@ package org.apache.lucene.sandbox.querie
import java.io.IOException;
import java.text.Collator;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.search.FieldCache;
import org.apache.lucene.search.FieldCache.DocTerms;
import org.apache.lucene.search.FieldComparator;
Modified: lucene/dev/branches/lucene2858/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geohash/GeoHashDistanceFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geohash/GeoHashDistanceFilter.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geohash/GeoHashDistanceFilter.java (original)
+++ lucene/dev/branches/lucene2858/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geohash/GeoHashDistanceFilter.java Sun Jan 29 23:50:54 2012
@@ -19,7 +19,7 @@ package org.apache.lucene.spatial.geohas
import java.io.IOException;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.search.FieldCache;
import org.apache.lucene.search.FieldCache.DocTerms;
import org.apache.lucene.search.Filter;
Modified: lucene/dev/branches/lucene2858/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/CartesianShapeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/CartesianShapeFilter.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/CartesianShapeFilter.java (original)
+++ lucene/dev/branches/lucene2858/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/CartesianShapeFilter.java Sun Jan 29 23:50:54 2012
@@ -20,7 +20,7 @@ import java.io.IOException;
import java.util.List;
import org.apache.lucene.index.DocsEnum;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.search.Filter;
import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.DocIdSetIterator;
Modified: lucene/dev/branches/lucene2858/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceFieldComparatorSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceFieldComparatorSource.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceFieldComparatorSource.java (original)
+++ lucene/dev/branches/lucene2858/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceFieldComparatorSource.java Sun Jan 29 23:50:54 2012
@@ -19,7 +19,7 @@ package org.apache.lucene.spatial.tier;
import java.io.IOException;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.search.Filter;
import org.apache.lucene.search.FieldComparator;
import org.apache.lucene.search.FieldComparatorSource;
Modified: lucene/dev/branches/lucene2858/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/LatLongDistanceFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/LatLongDistanceFilter.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/LatLongDistanceFilter.java (original)
+++ lucene/dev/branches/lucene2858/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/LatLongDistanceFilter.java Sun Jan 29 23:50:54 2012
@@ -19,7 +19,7 @@ package org.apache.lucene.spatial.tier;
import java.io.IOException;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.search.FilteredDocIdSet;
import org.apache.lucene.search.FieldCache;
import org.apache.lucene.search.Filter;
Modified: lucene/dev/branches/lucene2858/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestDistance.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestDistance.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestDistance.java (original)
+++ lucene/dev/branches/lucene2858/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestDistance.java Sun Jan 29 23:50:54 2012
@@ -24,7 +24,7 @@ import org.apache.lucene.document.FieldT
import org.apache.lucene.document.NumericField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.FieldInfo.IndexOptions;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.Term;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/codecs/PerDocConsumer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/codecs/PerDocConsumer.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/codecs/PerDocConsumer.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/codecs/PerDocConsumer.java Sun Jan 29 23:50:54 2012
@@ -20,7 +20,7 @@ import java.io.IOException;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.DocValues;
-import org.apache.lucene.index.AtomicIndexReader;
+import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.index.MergeState;
import org.apache.lucene.index.DocValues.Type;
@@ -65,13 +65,13 @@ public abstract class PerDocConsumer imp
/**
* Returns a {@link DocValues} instance for merging from the given reader for the given
* {@link FieldInfo}. This method is used for merging and uses
- * {@link AtomicIndexReader#docValues(String)} by default.
+ * {@link AtomicReader#docValues(String)} by default.
* <p>
* To enable {@link DocValues} merging for different {@link DocValues} than
* the default override this method accordingly.
* <p>
*/
- protected DocValues getDocValuesForMerge(AtomicIndexReader reader, FieldInfo info) throws IOException {
+ protected DocValues getDocValuesForMerge(AtomicReader reader, FieldInfo info) throws IOException {
return reader.docValues(info.name);
}
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40NormsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40NormsFormat.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40NormsFormat.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40NormsFormat.java Sun Jan 29 23:50:54 2012
@@ -26,7 +26,7 @@ import org.apache.lucene.index.DocValues
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.FieldInfos;
import org.apache.lucene.index.IndexFileNames;
-import org.apache.lucene.index.AtomicIndexReader;
+import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.index.PerDocWriteState;
import org.apache.lucene.index.SegmentInfo;
import org.apache.lucene.index.SegmentReadState;
@@ -88,7 +88,7 @@ public class Lucene40NormsFormat extends
}
@Override
- protected DocValues getDocValuesForMerge(AtomicIndexReader reader, FieldInfo info)
+ protected DocValues getDocValuesForMerge(AtomicReader reader, FieldInfo info)
throws IOException {
return reader.normValues(info.name);
}
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsConsumer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsConsumer.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsConsumer.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsConsumer.java Sun Jan 29 23:50:54 2012
@@ -28,7 +28,7 @@ import org.apache.lucene.index.DocValues
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.FieldInfos;
import org.apache.lucene.index.IndexFileNames;
-import org.apache.lucene.index.AtomicIndexReader;
+import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.SegmentInfo;
import org.apache.lucene.store.Directory;
@@ -87,7 +87,7 @@ public class SimpleTextNormsConsumer ext
}
@Override
- protected DocValues getDocValuesForMerge(AtomicIndexReader reader, FieldInfo info)
+ protected DocValues getDocValuesForMerge(AtomicReader reader, FieldInfo info)
throws IOException {
return reader.normValues(info.name);
}
Copied: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/AtomicReader.java (from r1237442, lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/AtomicIndexReader.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/AtomicReader.java?p2=lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/AtomicReader.java&p1=lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/AtomicIndexReader.java&r1=1237442&r2=1237508&rev=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/AtomicIndexReader.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/AtomicReader.java Sun Jan 29 23:50:54 2012
@@ -17,17 +17,9 @@ package org.apache.lucene.index;
* limitations under the License.
*/
-import java.io.Closeable;
import java.io.IOException;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.lucene.index.CompositeIndexReader.CompositeReaderContext;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.DocumentStoredFieldVisitor;
+
+import org.apache.lucene.index.CompositeReader.CompositeReaderContext;
import org.apache.lucene.search.SearcherManager; // javadocs
import org.apache.lucene.store.*;
import org.apache.lucene.util.Bits;
@@ -66,11 +58,11 @@ import org.apache.lucene.util.ReaderUtil
<code>IndexReader</code> instance; use your own
(non-Lucene) objects instead.
*/
-public abstract class AtomicIndexReader extends IndexReader {
+public abstract class AtomicReader extends IndexReader {
private final AtomicReaderContext readerContext = new AtomicReaderContext(this);
- protected AtomicIndexReader() {
+ protected AtomicReader() {
super();
}
@@ -287,7 +279,7 @@ public abstract class AtomicIndexReader
public abstract Bits getLiveDocs();
/**
- * {@link ReaderContext} for {@link AtomicIndexReader} instances
+ * {@link ReaderContext} for {@link AtomicReader} instances
* @lucene.experimental
*/
public static final class AtomicReaderContext extends ReaderContext {
@@ -296,12 +288,12 @@ public abstract class AtomicIndexReader
/** The readers absolute doc base */
public final int docBase;
- private final AtomicIndexReader reader;
+ private final AtomicReader reader;
/**
* Creates a new {@link AtomicReaderContext}
*/
- public AtomicReaderContext(CompositeReaderContext parent, AtomicIndexReader reader,
+ public AtomicReaderContext(CompositeReaderContext parent, AtomicReader reader,
int ord, int docBase, int leafOrd, int leafDocBase) {
super(parent, ord, docBase);
this.ord = leafOrd;
@@ -309,7 +301,7 @@ public abstract class AtomicIndexReader
this.reader = reader;
}
- public AtomicReaderContext(AtomicIndexReader atomicReader) {
+ public AtomicReaderContext(AtomicReader atomicReader) {
this(null, atomicReader, 0, 0, 0, 0);
}
@@ -324,7 +316,7 @@ public abstract class AtomicIndexReader
}
@Override
- public AtomicIndexReader reader() {
+ public AtomicReader reader() {
return reader;
}
}
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/BaseMultiReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/BaseMultiReader.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/BaseMultiReader.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/BaseMultiReader.java Sun Jan 29 23:50:54 2012
@@ -23,7 +23,7 @@ import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.ReaderUtil;
-abstract class BaseMultiReader<R extends IndexReader> extends CompositeIndexReader {
+abstract class BaseMultiReader<R extends IndexReader> extends CompositeReader {
protected final R[] subReaders;
protected final int[] starts; // 1st docno for each segment
private final int maxDoc;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/BufferedDeletesStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/BufferedDeletesStream.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/BufferedDeletesStream.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/BufferedDeletesStream.java Sun Jan 29 23:50:54 2012
@@ -25,7 +25,7 @@ import java.util.Collections;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.Query;
Copied: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/CompositeReader.java (from r1237442, lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/CompositeIndexReader.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/CompositeReader.java?p2=lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/CompositeReader.java&p1=lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/CompositeIndexReader.java&r1=1237442&r2=1237508&rev=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/CompositeIndexReader.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/CompositeReader.java Sun Jan 29 23:50:54 2012
@@ -17,24 +17,10 @@ package org.apache.lucene.index;
* limitations under the License.
*/
-import java.io.Closeable;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.DocumentStoredFieldVisitor;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.search.SearcherManager; // javadocs
import org.apache.lucene.store.*;
-import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.ReaderUtil; // for javadocs
-import org.apache.lucene.util.SetOnce;
/** IndexReader is an abstract class, providing an interface for accessing an
index. Search of an index is done entirely through this abstract interface,
@@ -68,11 +54,11 @@ import org.apache.lucene.util.SetOnce;
<code>IndexReader</code> instance; use your own
(non-Lucene) objects instead.
*/
-public abstract class CompositeIndexReader extends IndexReader {
+public abstract class CompositeReader extends IndexReader {
private CompositeReaderContext readerContext = null; // lazy init
- protected CompositeIndexReader() {
+ protected CompositeReader() {
super();
}
@@ -113,19 +99,19 @@ public abstract class CompositeIndexRead
public abstract IndexReader[] getSequentialSubReaders();
/**
- * {@link ReaderContext} for {@link CompositeIndexReader} instance.
+ * {@link ReaderContext} for {@link CompositeReader} instance.
* @lucene.experimental
*/
public static final class CompositeReaderContext extends ReaderContext {
private final ReaderContext[] children;
private final AtomicReaderContext[] leaves;
- private final CompositeIndexReader reader;
+ private final CompositeReader reader;
/**
* Creates a {@link CompositeReaderContext} for intermediate readers that aren't
* not top-level readers in the current context
*/
- public CompositeReaderContext(CompositeReaderContext parent, CompositeIndexReader reader,
+ public CompositeReaderContext(CompositeReaderContext parent, CompositeReader reader,
int ordInParent, int docbaseInParent, ReaderContext[] children) {
this(parent, reader, ordInParent, docbaseInParent, children, null);
}
@@ -133,11 +119,11 @@ public abstract class CompositeIndexRead
/**
* Creates a {@link CompositeReaderContext} for top-level readers with parent set to <code>null</code>
*/
- public CompositeReaderContext(CompositeIndexReader reader, ReaderContext[] children, AtomicReaderContext[] leaves) {
+ public CompositeReaderContext(CompositeReader reader, ReaderContext[] children, AtomicReaderContext[] leaves) {
this(null, reader, 0, 0, children, leaves);
}
- private CompositeReaderContext(CompositeReaderContext parent, CompositeIndexReader reader,
+ private CompositeReaderContext(CompositeReaderContext parent, CompositeReader reader,
int ordInParent, int docbaseInParent, ReaderContext[] children,
AtomicReaderContext[] leaves) {
super(parent, ordInParent, docbaseInParent);
@@ -158,7 +144,7 @@ public abstract class CompositeIndexRead
}
@Override
- public CompositeIndexReader reader() {
+ public CompositeReader reader() {
return reader;
}
}
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/DocTermOrds.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/DocTermOrds.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/DocTermOrds.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/DocTermOrds.java Sun Jan 29 23:50:54 2012
@@ -147,19 +147,19 @@ public class DocTermOrds {
}
/** Inverts all terms */
- public DocTermOrds(AtomicIndexReader reader, String field) throws IOException {
+ public DocTermOrds(AtomicReader reader, String field) throws IOException {
this(reader, field, null, Integer.MAX_VALUE);
}
/** Inverts only terms starting w/ prefix */
- public DocTermOrds(AtomicIndexReader reader, String field, BytesRef termPrefix) throws IOException {
+ public DocTermOrds(AtomicReader reader, String field, BytesRef termPrefix) throws IOException {
this(reader, field, termPrefix, Integer.MAX_VALUE);
}
/** Inverts only terms starting w/ prefix, and only terms
* whose docFreq (not taking deletions into account) is
* <= maxTermDocFreq */
- public DocTermOrds(AtomicIndexReader reader, String field, BytesRef termPrefix, int maxTermDocFreq) throws IOException {
+ public DocTermOrds(AtomicReader reader, String field, BytesRef termPrefix, int maxTermDocFreq) throws IOException {
this(reader, field, termPrefix, maxTermDocFreq, DEFAULT_INDEX_INTERVAL_BITS);
uninvert(reader, termPrefix);
}
@@ -168,7 +168,7 @@ public class DocTermOrds {
* whose docFreq (not taking deletions into account) is
* <= maxTermDocFreq, with a custom indexing interval
* (default is every 128nd term). */
- public DocTermOrds(AtomicIndexReader reader, String field, BytesRef termPrefix, int maxTermDocFreq, int indexIntervalBits) throws IOException {
+ public DocTermOrds(AtomicReader reader, String field, BytesRef termPrefix, int maxTermDocFreq, int indexIntervalBits) throws IOException {
this(field, maxTermDocFreq, indexIntervalBits);
uninvert(reader, termPrefix);
}
@@ -194,7 +194,7 @@ public class DocTermOrds {
*
* <p><b>NOTE</b>: you must pass the same reader that was
* used when creating this class */
- public TermsEnum getOrdTermsEnum(AtomicIndexReader reader) throws IOException {
+ public TermsEnum getOrdTermsEnum(AtomicReader reader) throws IOException {
if (termInstances == 0) {
return null;
}
@@ -224,7 +224,7 @@ public class DocTermOrds {
}
// Call this only once (if you subclass!)
- protected void uninvert(final AtomicIndexReader reader, final BytesRef termPrefix) throws IOException {
+ protected void uninvert(final AtomicReader reader, final BytesRef termPrefix) throws IOException {
//System.out.println("DTO uninvert field=" + field + " prefix=" + termPrefix);
final long startTime = System.currentTimeMillis();
prefix = termPrefix == null ? null : BytesRef.deepCopyOf(termPrefix);
@@ -642,12 +642,12 @@ public class DocTermOrds {
* ord; in this case we "wrap" our own terms index
* around it. */
private final class OrdWrappedTermsEnum extends TermsEnum {
- private final AtomicIndexReader reader;
+ private final AtomicReader reader;
private final TermsEnum termsEnum;
private BytesRef term;
private long ord = -indexInterval-1; // force "real" seek
- public OrdWrappedTermsEnum(AtomicIndexReader reader) throws IOException {
+ public OrdWrappedTermsEnum(AtomicReader reader) throws IOException {
this.reader = reader;
assert indexedTermsArray != null;
termsEnum = reader.fields().terms(field).iterator(null);
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/FilterIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/FilterIndexReader.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/FilterIndexReader.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/FilterIndexReader.java Sun Jan 29 23:50:54 2012
@@ -32,7 +32,7 @@ import java.util.Comparator;
* further override some of these methods and may also provide additional
* methods and fields.
*/
-public class FilterIndexReader extends AtomicIndexReader {
+public class FilterIndexReader extends AtomicReader {
/** Base class for filtering {@link Fields}
* implementations. */
@@ -272,14 +272,14 @@ public class FilterIndexReader extends A
}
}
- protected AtomicIndexReader in;
+ protected AtomicReader in;
/**
* <p>Construct a FilterIndexReader based on the specified base reader.
* <p>Note that base reader is closed if this FilterIndexReader is closed.</p>
* @param in specified base reader.
*/
- public FilterIndexReader(AtomicIndexReader in) {
+ public FilterIndexReader(AtomicReader in) {
super();
this.in = in;
}
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/IndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/IndexReader.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/IndexReader.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/IndexReader.java Sun Jan 29 23:50:54 2012
@@ -21,13 +21,11 @@ import java.io.Closeable;
import java.io.IOException;
import java.util.Collections;
import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.lucene.index.CompositeIndexReader.CompositeReaderContext;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.CompositeReader.CompositeReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.DocumentStoredFieldVisitor;
import org.apache.lucene.search.SearcherManager; // javadocs
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/IndexWriter.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/IndexWriter.java Sun Jan 29 23:50:54 2012
@@ -3954,7 +3954,7 @@ public class IndexWriter implements Clos
* <p><b>NOTE</b>: warm is called before any deletes have
* been carried over to the merged segment. */
public static abstract class IndexReaderWarmer {
- public abstract void warm(AtomicIndexReader reader) throws IOException;
+ public abstract void warm(AtomicReader reader) throws IOException;
}
private void handleOOM(OutOfMemoryError oom, String location) {
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/MergeState.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/MergeState.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/MergeState.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/MergeState.java Sun Jan 29 23:50:54 2012
@@ -31,10 +31,10 @@ import org.apache.lucene.util.InfoStream
public class MergeState {
public static class IndexReaderAndLiveDocs {
- public final AtomicIndexReader reader;
+ public final AtomicReader reader;
public final Bits liveDocs;
- public IndexReaderAndLiveDocs(AtomicIndexReader reader, Bits liveDocs) {
+ public IndexReaderAndLiveDocs(AtomicReader reader, Bits liveDocs) {
this.reader = reader;
this.liveDocs = liveDocs;
}
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/MultiDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/MultiDocValues.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/MultiDocValues.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/MultiDocValues.java Sun Jan 29 23:50:54 2012
@@ -43,11 +43,11 @@ public class MultiDocValues extends DocV
private static DocValuesPuller DEFAULT_PULLER = new DocValuesPuller();
private static final DocValuesPuller NORMS_PULLER = new DocValuesPuller() {
- public DocValues pull(AtomicIndexReader reader, String field) throws IOException {
+ public DocValues pull(AtomicReader reader, String field) throws IOException {
return reader.normValues(field);
}
- public boolean stopLoadingOnNull(AtomicIndexReader reader, String field) throws IOException {
+ public boolean stopLoadingOnNull(AtomicReader reader, String field) throws IOException {
// for norms we drop all norms if one leaf reader has no norms and the field is present
FieldInfos fieldInfos = reader.getFieldInfos();
FieldInfo fieldInfo = fieldInfos.fieldInfo(field);
@@ -69,11 +69,11 @@ public class MultiDocValues extends DocV
}
private static class DocValuesPuller {
- public DocValues pull(AtomicIndexReader reader, String field) throws IOException {
+ public DocValues pull(AtomicReader reader, String field) throws IOException {
return reader.docValues(field);
}
- public boolean stopLoadingOnNull(AtomicIndexReader reader, String field) throws IOException {
+ public boolean stopLoadingOnNull(AtomicReader reader, String field) throws IOException {
return false;
}
}
@@ -115,12 +115,12 @@ public class MultiDocValues extends DocV
private static DocValues getDocValues(IndexReader r, final String field, final DocValuesPuller puller) throws IOException {
- if (r instanceof AtomicIndexReader) {
+ if (r instanceof AtomicReader) {
// already an atomic reader
- return puller.pull((AtomicIndexReader) r, field);
+ return puller.pull((AtomicReader) r, field);
}
- assert r instanceof CompositeIndexReader;
- final IndexReader[] subs = ((CompositeIndexReader) r).getSequentialSubReaders();
+ assert r instanceof CompositeReader;
+ final IndexReader[] subs = ((CompositeReader) r).getSequentialSubReaders();
if (subs.length == 0) {
// no fields
return null;
@@ -138,7 +138,7 @@ public class MultiDocValues extends DocV
new ReaderUtil.Gather(r) {
boolean stop = false;
@Override
- protected void add(int base, AtomicIndexReader r) throws IOException {
+ protected void add(int base, AtomicReader r) throws IOException {
if (stop) {
return;
}
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/MultiFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/MultiFields.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/MultiFields.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/MultiFields.java Sun Jan 29 23:50:54 2012
@@ -61,12 +61,12 @@ public final class MultiFields extends F
* Gather}) and iterate through them
* yourself. */
public static Fields getFields(IndexReader r) throws IOException {
- if (r instanceof AtomicIndexReader) {
+ if (r instanceof AtomicReader) {
// already an atomic reader
- return ((AtomicIndexReader) r).fields();
+ return ((AtomicReader) r).fields();
}
- assert r instanceof CompositeIndexReader;
- final IndexReader[] subs = ((CompositeIndexReader) r).getSequentialSubReaders();
+ assert r instanceof CompositeReader;
+ final IndexReader[] subs = ((CompositeReader) r).getSequentialSubReaders();
if (subs.length == 0) {
// no fields
return null;
@@ -76,7 +76,7 @@ public final class MultiFields extends F
new ReaderUtil.Gather(r) {
@Override
- protected void add(int base, AtomicIndexReader r) throws IOException {
+ protected void add(int base, AtomicReader r) throws IOException {
final Fields f = r.fields();
if (f != null) {
fields.add(f);
@@ -104,7 +104,7 @@ public final class MultiFields extends F
try {
final int maxDoc = new ReaderUtil.Gather(r) {
@Override
- protected void add(int base, AtomicIndexReader r) throws IOException {
+ protected void add(int base, AtomicReader r) throws IOException {
// record all liveDocs, even if they are null
liveDocs.add(r.getLiveDocs());
starts.add(base);
@@ -246,10 +246,10 @@ public final class MultiFields extends F
/** Call this to get the (merged) FieldInfos for a
* composite reader */
public static FieldInfos getMergedFieldInfos(IndexReader reader) {
- final List<AtomicIndexReader> subReaders = new ArrayList<AtomicIndexReader>();
+ final List<AtomicReader> subReaders = new ArrayList<AtomicReader>();
ReaderUtil.gatherSubReaders(subReaders, reader);
final FieldInfos fieldInfos = new FieldInfos();
- for(AtomicIndexReader subReader : subReaders) {
+ for(AtomicReader subReader : subReaders) {
fieldInfos.add(subReader.getFieldInfos());
}
return fieldInfos;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/ParallelReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/ParallelReader.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/ParallelReader.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/ParallelReader.java Sun Jan 29 23:50:54 2012
@@ -41,13 +41,13 @@ import org.apache.lucene.util.BytesRef;
* same order to the other indexes. <em>Failure to do so will result in
* undefined behavior</em>.
*/
-public class ParallelReader extends AtomicIndexReader {
- private List<AtomicIndexReader> readers = new ArrayList<AtomicIndexReader>();
+public class ParallelReader extends AtomicReader {
+ private List<AtomicReader> readers = new ArrayList<AtomicReader>();
private List<Boolean> decrefOnClose = new ArrayList<Boolean>(); // remember which subreaders to decRef on close
boolean incRefReaders = false;
- private SortedMap<String,AtomicIndexReader> fieldToReader = new TreeMap<String,AtomicIndexReader>();
- private Map<AtomicIndexReader,Collection<String>> readerToFields = new HashMap<AtomicIndexReader,Collection<String>>();
- private List<AtomicIndexReader> storedFieldReaders = new ArrayList<AtomicIndexReader>();
+ private SortedMap<String,AtomicReader> fieldToReader = new TreeMap<String,AtomicReader>();
+ private Map<AtomicReader,Collection<String>> readerToFields = new HashMap<AtomicReader,Collection<String>>();
+ private List<AtomicReader> storedFieldReaders = new ArrayList<AtomicReader>();
private Map<String, DocValues> normsCache = new HashMap<String,DocValues>();
private int maxDoc;
private int numDocs;
@@ -75,7 +75,7 @@ public class ParallelReader extends Atom
@Override
public String toString() {
final StringBuilder buffer = new StringBuilder("ParallelReader(");
- final Iterator<AtomicIndexReader> iter = readers.iterator();
+ final Iterator<AtomicReader> iter = readers.iterator();
if (iter.hasNext()) {
buffer.append(iter.next());
}
@@ -89,7 +89,7 @@ public class ParallelReader extends Atom
/** Add an AtomicIndexReader.
* @throws IOException if there is a low-level IO error
*/
- public void add(AtomicIndexReader reader) throws IOException {
+ public void add(AtomicReader reader) throws IOException {
ensureOpen();
add(reader, false);
}
@@ -101,10 +101,10 @@ public class ParallelReader extends Atom
* @throws IllegalArgumentException if not all indexes contain the same number
* of documents
* @throws IllegalArgumentException if not all indexes have the same value
- * of {@link AtomicIndexReader#maxDoc()}
+ * of {@link AtomicReader#maxDoc()}
* @throws IOException if there is a low-level IO error
*/
- public void add(AtomicIndexReader reader, boolean ignoreStoredFields)
+ public void add(AtomicReader reader, boolean ignoreStoredFields)
throws IOException {
ensureOpen();
@@ -233,7 +233,7 @@ public class ParallelReader extends Atom
@Override
public void document(int docID, StoredFieldVisitor visitor) throws CorruptIndexException, IOException {
ensureOpen();
- for (final AtomicIndexReader reader: storedFieldReaders) {
+ for (final AtomicReader reader: storedFieldReaders) {
reader.document(docID, visitor);
}
}
@@ -243,7 +243,7 @@ public class ParallelReader extends Atom
public Fields getTermVectors(int docID) throws IOException {
ensureOpen();
ParallelFields fields = new ParallelFields();
- for (Map.Entry<String,AtomicIndexReader> ent : fieldToReader.entrySet()) {
+ for (Map.Entry<String,AtomicReader> ent : fieldToReader.entrySet()) {
String fieldName = ent.getKey();
Terms vector = ent.getValue().getTermVector(docID, fieldName);
if (vector != null) {
@@ -257,20 +257,20 @@ public class ParallelReader extends Atom
@Override
public boolean hasNorms(String field) throws IOException {
ensureOpen();
- AtomicIndexReader reader = fieldToReader.get(field);
+ AtomicReader reader = fieldToReader.get(field);
return reader==null ? false : reader.hasNorms(field);
}
@Override
public int docFreq(String field, BytesRef term) throws IOException {
ensureOpen();
- AtomicIndexReader reader = fieldToReader.get(field);
+ AtomicReader reader = fieldToReader.get(field);
return reader == null? 0 : reader.docFreq(field, term);
}
// for testing
- AtomicIndexReader[] getSubReaders() {
- return readers.toArray(new AtomicIndexReader[readers.size()]);
+ AtomicReader[] getSubReaders() {
+ return readers.toArray(new AtomicReader[readers.size()]);
}
@Override
@@ -287,7 +287,7 @@ public class ParallelReader extends Atom
// TODO: I suspect this is completely untested!!!!!
@Override
public DocValues docValues(String field) throws IOException {
- AtomicIndexReader reader = fieldToReader.get(field);
+ AtomicReader reader = fieldToReader.get(field);
return reader == null ? null : reader.docValues(field);
}
@@ -296,7 +296,7 @@ public class ParallelReader extends Atom
public synchronized DocValues normValues(String field) throws IOException {
DocValues values = normsCache.get(field);
if (values == null) {
- AtomicIndexReader reader = fieldToReader.get(field);
+ AtomicReader reader = fieldToReader.get(field);
values = reader == null ? null : reader.normValues(field);
normsCache.put(field, values);
}
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/SegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/SegmentMerger.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/SegmentMerger.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/SegmentMerger.java Sun Jan 29 23:50:54 2012
@@ -76,7 +76,7 @@ final class SegmentMerger {
try {
new ReaderUtil.Gather(reader) {
@Override
- protected void add(int base, AtomicIndexReader r) {
+ protected void add(int base, AtomicReader r) {
mergeState.readers.add(new MergeState.IndexReaderAndLiveDocs(r, r.getLiveDocs()));
}
}.run();
@@ -201,7 +201,7 @@ final class SegmentMerger {
Map<FieldInfo,TypePromoter> normValuesTypes = new HashMap<FieldInfo,TypePromoter>();
for (MergeState.IndexReaderAndLiveDocs readerAndLiveDocs : mergeState.readers) {
- final AtomicIndexReader reader = readerAndLiveDocs.reader;
+ final AtomicReader reader = readerAndLiveDocs.reader;
FieldInfos readerFieldInfos = reader.getFieldInfos();
for (FieldInfo fi : readerFieldInfos) {
FieldInfo merged = mergeState.fieldInfos.add(fi);
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/SegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/SegmentReader.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/SegmentReader.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/SegmentReader.java Sun Jan 29 23:50:54 2012
@@ -30,7 +30,7 @@ import org.apache.lucene.util.Bits;
/**
* @lucene.experimental
*/
-public final class SegmentReader extends AtomicIndexReader {
+public final class SegmentReader extends AtomicReader {
private final SegmentInfo si;
private final Bits liveDocs;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/SlowCompositeReaderWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/SlowCompositeReaderWrapper.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/SlowCompositeReaderWrapper.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/SlowCompositeReaderWrapper.java Sun Jan 29 23:50:54 2012
@@ -50,27 +50,27 @@ import org.apache.lucene.index.MultiRead
* yourself.</p>
*/
-public final class SlowCompositeReaderWrapper extends AtomicIndexReader {
+public final class SlowCompositeReaderWrapper extends AtomicReader {
- private final CompositeIndexReader in;
+ private final CompositeReader in;
private final Map<String, DocValues> normsCache = new HashMap<String, DocValues>();
private final Fields fields;
private final Bits liveDocs;
- /** This method is sugar for getting an {@link AtomicIndexReader} from
+ /** This method is sugar for getting an {@link AtomicReader} from
* an {@link IndexReader} of any kind. If the reader is already atomic,
* it is returned unchanged, otherwise wrapped by this class.
*/
- public static AtomicIndexReader wrap(IndexReader reader) throws IOException {
- if (reader instanceof CompositeIndexReader) {
- return new SlowCompositeReaderWrapper((CompositeIndexReader) reader);
+ public static AtomicReader wrap(IndexReader reader) throws IOException {
+ if (reader instanceof CompositeReader) {
+ return new SlowCompositeReaderWrapper((CompositeReader) reader);
} else {
- assert reader instanceof AtomicIndexReader;
- return (AtomicIndexReader) reader;
+ assert reader instanceof AtomicReader;
+ return (AtomicReader) reader;
}
}
- public SlowCompositeReaderWrapper(CompositeIndexReader reader) throws IOException {
+ public SlowCompositeReaderWrapper(CompositeReader reader) throws IOException {
super();
in = reader;
fields = MultiFields.getFields(in);
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/BooleanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/BooleanQuery.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/BooleanQuery.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/BooleanQuery.java Sun Jan 29 23:50:54 2012
@@ -21,7 +21,7 @@ import java.io.IOException;
import java.util.*;
import org.apache.lucene.index.DocsEnum;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermsEnum;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/BooleanScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/BooleanScorer.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/BooleanScorer.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/BooleanScorer.java Sun Jan 29 23:50:54 2012
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.search.BooleanQuery.BooleanWeight;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/CachingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/CachingCollector.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/CachingCollector.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/CachingCollector.java Sun Jan 29 23:50:54 2012
@@ -17,7 +17,7 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.util.RamUsageEstimator;
import java.io.IOException;
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/CachingWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/CachingWrapperFilter.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/CachingWrapperFilter.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/CachingWrapperFilter.java Sun Jan 29 23:50:54 2012
@@ -22,8 +22,8 @@ import java.util.Collections;
import java.util.Map;
import java.util.WeakHashMap;
-import org.apache.lucene.index.AtomicIndexReader;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.util.FixedBitSet;
import org.apache.lucene.util.Bits;
@@ -76,7 +76,7 @@ public class CachingWrapperFilter extend
* returns <code>true</code>, else it copies the {@link DocIdSetIterator} into
* a {@link FixedBitSet}.
*/
- protected DocIdSet docIdSetToCache(DocIdSet docIdSet, AtomicIndexReader reader) throws IOException {
+ protected DocIdSet docIdSetToCache(DocIdSet docIdSet, AtomicReader reader) throws IOException {
if (docIdSet == null) {
// this is better than returning null, as the nonnull result can be cached
return DocIdSet.EMPTY_DOCIDSET;
@@ -102,7 +102,7 @@ public class CachingWrapperFilter extend
@Override
public DocIdSet getDocIdSet(AtomicReaderContext context, final Bits acceptDocs) throws IOException {
- final AtomicIndexReader reader = context.reader();
+ final AtomicReader reader = context.reader();
// Only cache if incoming acceptDocs is == live docs;
// if Lucene passes in more interesting acceptDocs in
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/Collector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/Collector.java?rev=1237508&r1=1237507&r2=1237508&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/Collector.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/search/Collector.java Sun Jan 29 23:50:54 2012
@@ -19,7 +19,7 @@ package org.apache.lucene.search;
import java.io.IOException;
-import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader.ReaderContext;
/**