lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rm...@apache.org
Subject svn commit: r1213405 [1/4] - in /lucene/dev/branches/lucene3622: ./ lucene/ lucene/contrib/ lucene/contrib/demo/src/java/org/apache/lucene/demo/ lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/ lucene/contrib/memory/src/test/org/...
Date Mon, 12 Dec 2011 20:13:07 GMT
Author: rmuir
Date: Mon Dec 12 20:13:02 2011
New Revision: 1213405

URL: http://svn.apache.org/viewvc?rev=1213405&view=rev
Log:
LUCENE-3622: merge trunk (1212830:1213323)

Added:
    lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/BaseMultiReader.java
      - copied, changed from r1213323, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/BaseMultiReader.java
    lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/search/SearcherFactory.java
      - copied unchanged from r1213323, lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/SearcherFactory.java
Removed:
    lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/DocFieldConsumers.java
    lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/DocFieldConsumersPerField.java
    lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/FieldReaderException.java
    lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/ReusableStringReader.java
    lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/search/SearcherWarmer.java
Modified:
    lucene/dev/branches/lucene3622/   (props changed)
    lucene/dev/branches/lucene3622/lucene/   (props changed)
    lucene/dev/branches/lucene3622/lucene/CHANGES.txt
    lucene/dev/branches/lucene3622/lucene/contrib/CHANGES.txt
    lucene/dev/branches/lucene3622/lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java
    lucene/dev/branches/lucene3622/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java
    lucene/dev/branches/lucene3622/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
    lucene/dev/branches/lucene3622/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java
    lucene/dev/branches/lucene3622/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java
    lucene/dev/branches/lucene3622/lucene/contrib/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java
    lucene/dev/branches/lucene3622/lucene/contrib/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java
    lucene/dev/branches/lucene3622/lucene/contrib/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java
    lucene/dev/branches/lucene3622/lucene/contrib/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java
    lucene/dev/branches/lucene3622/lucene/contrib/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java
    lucene/dev/branches/lucene3622/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java
    lucene/dev/branches/lucene3622/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java
    lucene/dev/branches/lucene3622/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowCollationMethods.java
    lucene/dev/branches/lucene3622/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestRegexQuery.java
    lucene/dev/branches/lucene3622/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java   (contents, props changed)
    lucene/dev/branches/lucene3622/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestCartesian.java
    lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java
    lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/DirectoryReader.java
    lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java
    lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/DocInverter.java
    lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java
    lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java
    lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/FlushPolicy.java
    lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/IndexFileDeleter.java
    lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/IndexReader.java
    lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/IndexWriter.java
    lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/LogMergePolicy.java
    lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/MultiReader.java
    lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/TieredMergePolicy.java
    lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/UpgradeIndexMergePolicy.java
    lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40StoredFieldsReader.java
    lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/search/IndexSearcher.java
    lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/search/NRTManager.java
    lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/search/SearcherManager.java
    lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/util/IOUtils.java
    lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/util/InfoStream.java
    lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/util/ReaderUtil.java
    lucene/dev/branches/lucene3622/lucene/src/test-framework/java/org/apache/lucene/analysis/CollationTestBase.java
    lucene/dev/branches/lucene3622/lucene/src/test-framework/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
    lucene/dev/branches/lucene3622/lucene/src/test-framework/java/org/apache/lucene/search/CheckHits.java
    lucene/dev/branches/lucene3622/lucene/src/test-framework/java/org/apache/lucene/search/QueryUtils.java
    lucene/dev/branches/lucene3622/lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCase.java
    lucene/dev/branches/lucene3622/lucene/src/test-framework/java/org/apache/lucene/util/NullInfoStream.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/TestDemo.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/TestExternalCodecs.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/TestSearch.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/TestSearchForDuplicates.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/document/TestDocument.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/index/TestBinaryTerms.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/index/TestCodecs.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/index/TestForTooMuchCloning.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/index/TestIndexReaderReopen.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/index/TestIndexWriterCommit.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/index/TestNRTThreads.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/index/TestOmitTf.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/index/TestParallelReader.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/index/TestReaderClosed.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/index/TestStressIndexing.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/index/TestTermsEnum2.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/index/codecs/lucene3x/TestTermInfosReaderIndex.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/index/codecs/perfield/TestPerFieldPostingsFormat.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestAutomatonQuery.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestBoolean2.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestBooleanOr.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestBooleanQuery.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestConstantScoreQuery.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestDateFilter.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestDateSort.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestDocIdSet.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestDocValuesScoring.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestElevationComparator.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestExplanations.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestFieldValueFilter.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery2.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestNRTManager.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestNot.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestPrefixFilter.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestPrefixQuery.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestPrefixRandom.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestRegexpQuery.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestRegexpRandom.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestRegexpRandom2.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestScorerPerf.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestSearchAfter.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestSearchWithThreads.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestSearcherManager.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestSimilarity.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestSimilarityProvider.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestSort.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestSubScorerFreqs.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestTermRangeFilter.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestTermRangeQuery.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestTermScorer.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestTermVectors.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestTopDocsCollector.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestTopDocsMerge.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestTopScoreDocCollector.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestWildcard.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/TestWildcardRandom.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/spans/TestSpanFirstQuery.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/spans/TestSpanMultiTermQueryWrapper.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/spans/TestSpansAdvanced2.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/store/TestBufferedIndexInput.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/store/TestLockFactory.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/store/TestRAMDirectory.java
    lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/store/TestWindowsMMap.java
    lucene/dev/branches/lucene3622/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java
    lucene/dev/branches/lucene3622/modules/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java
    lucene/dev/branches/lucene3622/modules/benchmark/   (props changed)
    lucene/dev/branches/lucene3622/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/PerfRunData.java
    lucene/dev/branches/lucene3622/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java
    lucene/dev/branches/lucene3622/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/QueryDriver.java
    lucene/dev/branches/lucene3622/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/DocMakerTest.java
    lucene/dev/branches/lucene3622/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/LineDocSourceTest.java
    lucene/dev/branches/lucene3622/modules/benchmark/src/test/org/apache/lucene/benchmark/quality/TestQualityRun.java
    lucene/dev/branches/lucene3622/modules/facet/   (props changed)
    lucene/dev/branches/lucene3622/modules/facet/src/test/org/apache/lucene/facet/FacetTestBase.java
    lucene/dev/branches/lucene3622/modules/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java
    lucene/dev/branches/lucene3622/modules/facet/src/test/org/apache/lucene/facet/search/DrillDownTest.java
    lucene/dev/branches/lucene3622/modules/facet/src/test/org/apache/lucene/facet/search/TestMultipleCategoryLists.java
    lucene/dev/branches/lucene3622/modules/facet/src/test/org/apache/lucene/facet/search/association/AssociationsFacetRequestTest.java
    lucene/dev/branches/lucene3622/modules/facet/src/test/org/apache/lucene/facet/util/TestScoredDocIDsUtils.java
    lucene/dev/branches/lucene3622/modules/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java
    lucene/dev/branches/lucene3622/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
    lucene/dev/branches/lucene3622/modules/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
    lucene/dev/branches/lucene3622/modules/queries/src/test/org/apache/lucene/queries/ChainedFilterTest.java
    lucene/dev/branches/lucene3622/modules/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java
    lucene/dev/branches/lucene3622/modules/queries/src/test/org/apache/lucene/queries/function/TestFieldScoreQuery.java
    lucene/dev/branches/lucene3622/modules/queries/src/test/org/apache/lucene/queries/function/TestOrdValues.java
    lucene/dev/branches/lucene3622/modules/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java
    lucene/dev/branches/lucene3622/modules/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java
    lucene/dev/branches/lucene3622/modules/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java
    lucene/dev/branches/lucene3622/modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java
    lucene/dev/branches/lucene3622/modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java
    lucene/dev/branches/lucene3622/modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java
    lucene/dev/branches/lucene3622/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/BooleanQueryTst.java
    lucene/dev/branches/lucene3622/modules/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java
    lucene/dev/branches/lucene3622/modules/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java
    lucene/dev/branches/lucene3622/modules/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java
    lucene/dev/branches/lucene3622/modules/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java
    lucene/dev/branches/lucene3622/solr/   (props changed)
    lucene/dev/branches/lucene3622/solr/core/   (props changed)
    lucene/dev/branches/lucene3622/solr/core/src/java/   (props changed)
    lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
    lucene/dev/branches/lucene3622/solr/core/src/test/   (props changed)
    lucene/dev/branches/lucene3622/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
    lucene/dev/branches/lucene3622/solr/core/src/test/org/apache/solr/search/TestDocSet.java
    lucene/dev/branches/lucene3622/solr/core/src/test/org/apache/solr/search/TestSort.java

Modified: lucene/dev/branches/lucene3622/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/lucene/CHANGES.txt?rev=1213405&r1=1213404&r2=1213405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/lucene3622/lucene/CHANGES.txt Mon Dec 12 20:13:02 2011
@@ -222,6 +222,10 @@ Changes in backwards compatibility polic
   FilterIndexReader, overriding FilterIndexReader.norms(). To persist the
   changes on disk, copy the FilteredIndexReader to a new index using
   IndexWriter.addIndexes().  (Uwe Schindler, Robert Muir)
+
+* LUCENE-3640: Removed IndexSearcher.close(), because IndexSearcher no longer
+  takes a Directory and no longer "manages" IndexReaders, it is a no-op.
+  (Robert Muir)
   
 Changes in Runtime Behavior
 
@@ -671,6 +675,13 @@ Changes in backwards compatibility polic
   were made final. This is not expected to affect many apps, since these methods
   already delegate to abstract methods, which you had to already override 
   anyway. (Shai Erera)
+
+* LUCENE-3636: Added SearcherFactory, used by SearcherManager and NRTManager
+  to create new IndexSearchers. You can provide your own implementation to
+  warm new searchers, set an ExecutorService, set a custom Similarity, or
+  even return your own subclass of IndexSearcher. The SearcherWarmer and
+  ExecutorService parameters on these classes were removed, as they are
+  subsumed by SearcherFactory.  (Shai Erera, Mike McCandless, Robert Muir)
   
 Security fixes
 
@@ -717,6 +728,9 @@ Bug fixes
   In ParallelReader the bug was not existent, but the implementation method
   was also made private.  (Uwe Schindler)
 
+* LUCENE-3641: Fixed MultiReader to correctly propagate readerFinishedListeners
+  to clones/reopened readers.  (Uwe Schindler)
+
 Documentation
 
 * LUCENE-3597: Fixed incorrect grouping documentation. (Martijn van Groningen, Robert Muir)

Modified: lucene/dev/branches/lucene3622/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/lucene/contrib/CHANGES.txt?rev=1213405&r1=1213404&r2=1213405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/branches/lucene3622/lucene/contrib/CHANGES.txt Mon Dec 12 20:13:02 2011
@@ -88,6 +88,32 @@ Bug Fixes
 
 ======================= Lucene 3.6.0 ================
 
+Changes in backwards compatibility policy
+
+ * LUCENE-3626: The internal implementation classes in PKIndexSplitter
+   and MultiPassIndexSplitter were made private as they now work
+   per segment.  (Uwe Schindler)
+
+New Features
+
+* LUCENE-3596: DirectoryTaxonomyWriter extensions can override createIndexWriterConfig() 
+  and modify how its internal index writer is opened. (Doron Cohen)
+
+API Changes
+
+* LUCENE-3596: DirectoryTaxonomyWriter.openIndexWriter() now takes an 
+  openIndexWriter parameter rather than just an open-mode. (Doron Cohen) 
+  
+* LUCENE-3606: FieldNormModifier was deprecated, because IndexReader's
+  setNorm() was deprecated. Furthermore, this class is broken, as it does
+  not take position overlaps into account while recalculating norms.
+  (Uwe Schindler, Robert Muir)
+
+Changes in runtime behavior:
+
+ * LUCENE-3626: PKIndexSplitter and MultiPassIndexSplitter now work
+   per segment.  (Uwe Schindler)
+
 Bug Fixes
 
  * LUCENE-3600: BlockJoinQuery now supports parent docs that have no

Modified: lucene/dev/branches/lucene3622/lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java?rev=1213405&r1=1213404&r2=1213405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java (original)
+++ lucene/dev/branches/lucene3622/lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java Mon Dec 12 20:13:02 2011
@@ -131,7 +131,6 @@ public class SearchFiles {
         break;
       }
     }
-    searcher.close();
     reader.close();
   }
 

Modified: lucene/dev/branches/lucene3622/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java?rev=1213405&r1=1213404&r2=1213405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java (original)
+++ lucene/dev/branches/lucene3622/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java Mon Dec 12 20:13:02 2011
@@ -72,26 +72,21 @@ public class HighlighterPhraseTest exten
     try {
       assertEquals(1, indexReader.numDocs());
       final IndexSearcher indexSearcher = newSearcher(indexReader);
-      try {
-        final PhraseQuery phraseQuery = new PhraseQuery();
-        phraseQuery.add(new Term(FIELD, "fox"));
-        phraseQuery.add(new Term(FIELD, "jumped"));
-        phraseQuery.setSlop(0);
-        TopDocs hits = indexSearcher.search(phraseQuery, 1);
-        assertEquals(1, hits.totalHits);
-        final Highlighter highlighter = new Highlighter(
-            new SimpleHTMLFormatter(), new SimpleHTMLEncoder(),
-            new QueryScorer(phraseQuery));
-
-        final TokenStream tokenStream = TokenSources
-            .getTokenStream(indexReader.getTermVector(
-                0, FIELD), false);
-        assertEquals(highlighter.getBestFragment(new TokenStreamConcurrent(),
-            TEXT), highlighter.getBestFragment(tokenStream, TEXT));
-
-      } finally {
-        indexSearcher.close();
-      }
+      final PhraseQuery phraseQuery = new PhraseQuery();
+      phraseQuery.add(new Term(FIELD, "fox"));
+      phraseQuery.add(new Term(FIELD, "jumped"));
+      phraseQuery.setSlop(0);
+      TopDocs hits = indexSearcher.search(phraseQuery, 1);
+      assertEquals(1, hits.totalHits);
+      final Highlighter highlighter = new Highlighter(
+          new SimpleHTMLFormatter(), new SimpleHTMLEncoder(),
+          new QueryScorer(phraseQuery));
+
+      final TokenStream tokenStream = TokenSources
+          .getTokenStream(indexReader.getTermVector(
+              0, FIELD), false);
+      assertEquals(highlighter.getBestFragment(new TokenStreamConcurrent(),
+          TEXT), highlighter.getBestFragment(tokenStream, TEXT));
     } finally {
       indexReader.close();
       directory.close();
@@ -120,52 +115,48 @@ public class HighlighterPhraseTest exten
     try {
       assertEquals(1, indexReader.numDocs());
       final IndexSearcher indexSearcher = newSearcher(indexReader);
-      try {
-        final Query phraseQuery = new SpanNearQuery(new SpanQuery[] {
-            new SpanTermQuery(new Term(FIELD, "fox")),
-            new SpanTermQuery(new Term(FIELD, "jumped")) }, 0, true);
-        final FixedBitSet bitset = new FixedBitSet(indexReader.maxDoc());
-        indexSearcher.search(phraseQuery, new Collector() {
-          private int baseDoc;
-
-          @Override
-          public boolean acceptsDocsOutOfOrder() {
-            return true;
-          }
-
-          @Override
-          public void collect(int i) throws IOException {
-            bitset.set(this.baseDoc + i);
-          }
-
-          @Override
-          public void setNextReader(AtomicReaderContext context)
-              throws IOException {
-            this.baseDoc = context.docBase;
-          }
-
-          @Override
-          public void setScorer(org.apache.lucene.search.Scorer scorer)
-              throws IOException {
-            // Do Nothing
-          }
-        });
-        assertEquals(1, bitset.cardinality());
-        final int maxDoc = indexReader.maxDoc();
-        final Highlighter highlighter = new Highlighter(
-            new SimpleHTMLFormatter(), new SimpleHTMLEncoder(),
-            new QueryScorer(phraseQuery));
-        for (int position = bitset.nextSetBit(0); position >= 0 && position < maxDoc-1; position = bitset
-            .nextSetBit(position + 1)) {
-          assertEquals(0, position);
-          final TokenStream tokenStream = TokenSources.getTokenStream(
-              indexReader.getTermVector(position,
-                  FIELD), false);
-          assertEquals(highlighter.getBestFragment(new TokenStreamConcurrent(),
-              TEXT), highlighter.getBestFragment(tokenStream, TEXT));
+      final Query phraseQuery = new SpanNearQuery(new SpanQuery[] {
+          new SpanTermQuery(new Term(FIELD, "fox")),
+          new SpanTermQuery(new Term(FIELD, "jumped")) }, 0, true);
+      final FixedBitSet bitset = new FixedBitSet(indexReader.maxDoc());
+      indexSearcher.search(phraseQuery, new Collector() {
+        private int baseDoc;
+
+        @Override
+        public boolean acceptsDocsOutOfOrder() {
+          return true;
         }
-      } finally {
-        indexSearcher.close();
+
+        @Override
+        public void collect(int i) throws IOException {
+          bitset.set(this.baseDoc + i);
+        }
+
+        @Override
+        public void setNextReader(AtomicReaderContext context)
+            throws IOException {
+          this.baseDoc = context.docBase;
+        }
+
+        @Override
+        public void setScorer(org.apache.lucene.search.Scorer scorer)
+            throws IOException {
+          // Do Nothing
+        }
+      });
+      assertEquals(1, bitset.cardinality());
+      final int maxDoc = indexReader.maxDoc();
+      final Highlighter highlighter = new Highlighter(
+          new SimpleHTMLFormatter(), new SimpleHTMLEncoder(),
+          new QueryScorer(phraseQuery));
+      for (int position = bitset.nextSetBit(0); position >= 0 && position < maxDoc-1; position = bitset
+          .nextSetBit(position + 1)) {
+        assertEquals(0, position);
+        final TokenStream tokenStream = TokenSources.getTokenStream(
+            indexReader.getTermVector(position,
+                FIELD), false);
+        assertEquals(highlighter.getBestFragment(new TokenStreamConcurrent(),
+            TEXT), highlighter.getBestFragment(tokenStream, TEXT));
       }
     } finally {
       indexReader.close();
@@ -195,25 +186,21 @@ public class HighlighterPhraseTest exten
     try {
       assertEquals(1, indexReader.numDocs());
       final IndexSearcher indexSearcher = newSearcher(indexReader);
-      try {
-        final PhraseQuery phraseQuery = new PhraseQuery();
-        phraseQuery.add(new Term(FIELD, "did"));
-        phraseQuery.add(new Term(FIELD, "jump"));
-        phraseQuery.setSlop(0);
-        TopDocs hits = indexSearcher.search(phraseQuery, 1);
-        assertEquals(0, hits.totalHits);
-        final Highlighter highlighter = new Highlighter(
-            new SimpleHTMLFormatter(), new SimpleHTMLEncoder(),
-            new QueryScorer(phraseQuery));
-        final TokenStream tokenStream = TokenSources
-            .getTokenStream(indexReader.getTermVector(
-                0, FIELD), false);
-        assertEquals(
-            highlighter.getBestFragment(new TokenStreamSparse(), TEXT),
-            highlighter.getBestFragment(tokenStream, TEXT));
-      } finally {
-        indexSearcher.close();
-      }
+      final PhraseQuery phraseQuery = new PhraseQuery();
+      phraseQuery.add(new Term(FIELD, "did"));
+      phraseQuery.add(new Term(FIELD, "jump"));
+      phraseQuery.setSlop(0);
+      TopDocs hits = indexSearcher.search(phraseQuery, 1);
+      assertEquals(0, hits.totalHits);
+      final Highlighter highlighter = new Highlighter(
+          new SimpleHTMLFormatter(), new SimpleHTMLEncoder(),
+          new QueryScorer(phraseQuery));
+      final TokenStream tokenStream = TokenSources
+          .getTokenStream(indexReader.getTermVector(
+              0, FIELD), false);
+      assertEquals(
+          highlighter.getBestFragment(new TokenStreamSparse(), TEXT),
+          highlighter.getBestFragment(tokenStream, TEXT));
     } finally {
       indexReader.close();
       directory.close();
@@ -241,23 +228,19 @@ public class HighlighterPhraseTest exten
     try {
       assertEquals(1, indexReader.numDocs());
       final IndexSearcher indexSearcher = newSearcher(indexReader);
-      try {
-        final PhraseQuery phraseQuery = new PhraseQuery();
-        phraseQuery.add(new Term(FIELD, "did"));
-        phraseQuery.add(new Term(FIELD, "jump"));
-        phraseQuery.setSlop(1);
-        TopDocs hits = indexSearcher.search(phraseQuery, 1);
-        assertEquals(1, hits.totalHits);
-        final Highlighter highlighter = new Highlighter(
-            new SimpleHTMLFormatter(), new SimpleHTMLEncoder(),
-            new QueryScorer(phraseQuery));
-        final TokenStream tokenStream = TokenSources.getTokenStream(
-            indexReader.getTermVector(0, FIELD), true);
-        assertEquals("the fox <B>did</B> not <B>jump</B>", highlighter
-            .getBestFragment(tokenStream, TEXT));
-      } finally {
-        indexSearcher.close();
-      }
+      final PhraseQuery phraseQuery = new PhraseQuery();
+      phraseQuery.add(new Term(FIELD, "did"));
+      phraseQuery.add(new Term(FIELD, "jump"));
+      phraseQuery.setSlop(1);
+      TopDocs hits = indexSearcher.search(phraseQuery, 1);
+      assertEquals(1, hits.totalHits);
+      final Highlighter highlighter = new Highlighter(
+          new SimpleHTMLFormatter(), new SimpleHTMLEncoder(),
+          new QueryScorer(phraseQuery));
+      final TokenStream tokenStream = TokenSources.getTokenStream(
+          indexReader.getTermVector(0, FIELD), true);
+      assertEquals("the fox <B>did</B> not <B>jump</B>", highlighter
+          .getBestFragment(tokenStream, TEXT));
     } finally {
       indexReader.close();
       directory.close();
@@ -285,25 +268,21 @@ public class HighlighterPhraseTest exten
     try {
       assertEquals(1, indexReader.numDocs());
       final IndexSearcher indexSearcher = newSearcher(indexReader);
-      try {
-        final Query phraseQuery = new SpanNearQuery(new SpanQuery[] {
-            new SpanTermQuery(new Term(FIELD, "did")),
-            new SpanTermQuery(new Term(FIELD, "jump")) }, 0, true);
-
-        TopDocs hits = indexSearcher.search(phraseQuery, 1);
-        assertEquals(0, hits.totalHits);
-        final Highlighter highlighter = new Highlighter(
-            new SimpleHTMLFormatter(), new SimpleHTMLEncoder(),
-            new QueryScorer(phraseQuery));
-        final TokenStream tokenStream = TokenSources
-            .getTokenStream(indexReader.getTermVector(
-                0, FIELD), false);
-        assertEquals(
-            highlighter.getBestFragment(new TokenStreamSparse(), TEXT),
-            highlighter.getBestFragment(tokenStream, TEXT));
-      } finally {
-        indexSearcher.close();
-      }
+      final Query phraseQuery = new SpanNearQuery(new SpanQuery[] {
+          new SpanTermQuery(new Term(FIELD, "did")),
+          new SpanTermQuery(new Term(FIELD, "jump")) }, 0, true);
+
+      TopDocs hits = indexSearcher.search(phraseQuery, 1);
+      assertEquals(0, hits.totalHits);
+      final Highlighter highlighter = new Highlighter(
+          new SimpleHTMLFormatter(), new SimpleHTMLEncoder(),
+          new QueryScorer(phraseQuery));
+      final TokenStream tokenStream = TokenSources
+          .getTokenStream(indexReader.getTermVector(
+              0, FIELD), false);
+      assertEquals(
+          highlighter.getBestFragment(new TokenStreamSparse(), TEXT),
+          highlighter.getBestFragment(tokenStream, TEXT));
     } finally {
       indexReader.close();
       directory.close();

Modified: lucene/dev/branches/lucene3622/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java?rev=1213405&r1=1213404&r2=1213405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java (original)
+++ lucene/dev/branches/lucene3622/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java Mon Dec 12 20:13:02 2011
@@ -109,7 +109,6 @@ public class HighlighterTest extends Bas
 
       if (VERBOSE) System.out.println(fragment);
     }
-    searcher.close();
   }
   
   public void testHighlightingWithDefaultField() throws Exception {
@@ -1271,7 +1270,6 @@ public class HighlighterTest extends Bas
       public void run() throws Exception {
         numHighlights = 0;
         // test to show how rewritten query can still be used
-        if (searcher != null) searcher.close();
         searcher = new IndexSearcher(reader);
         Analyzer analyzer = new MockAnalyzer(random, MockTokenizer.SIMPLE, true, MockTokenFilter.ENGLISH_STOPSET, true);
         
@@ -1664,7 +1662,6 @@ public class HighlighterTest extends Bas
       if (VERBOSE) System.out.println("result:" +  result);
       assertEquals("more <B>random</B> words for second field", result);
     }
-    searcher.close();
     reader.close();
   }
 
@@ -1703,7 +1700,6 @@ public class HighlighterTest extends Bas
   }
 
   public void doSearching(Query unReWrittenQuery) throws Exception {
-    if (searcher != null) searcher.close();
     searcher = new IndexSearcher(reader);
     // for any multi-term queries to work (prefix, wildcard, range,fuzzy etc)
     // you must use a rewritten query!
@@ -1769,7 +1765,6 @@ public class HighlighterTest extends Bas
 
   @Override
   public void tearDown() throws Exception {
-    if (searcher != null) searcher.close();
     reader.close();
     dir.close();
     ramDir.close();

Modified: lucene/dev/branches/lucene3622/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java?rev=1213405&r1=1213404&r2=1213405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java (original)
+++ lucene/dev/branches/lucene3622/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java Mon Dec 12 20:13:02 2011
@@ -114,31 +114,27 @@ public class TokenSourcesTest extends Lu
       indexWriter.close();
     }
     final IndexReader indexReader = IndexReader.open(directory);
+    assertEquals(1, indexReader.numDocs());
+    final IndexSearcher indexSearcher = newSearcher(indexReader);
     try {
-      assertEquals(1, indexReader.numDocs());
-      final IndexSearcher indexSearcher = newSearcher(indexReader);
-      try {
-        final DisjunctionMaxQuery query = new DisjunctionMaxQuery(1);
-        query.add(new SpanTermQuery(new Term(FIELD, "{fox}")));
-        query.add(new SpanTermQuery(new Term(FIELD, "fox")));
+      final DisjunctionMaxQuery query = new DisjunctionMaxQuery(1);
+      query.add(new SpanTermQuery(new Term(FIELD, "{fox}")));
+      query.add(new SpanTermQuery(new Term(FIELD, "fox")));
         // final Query phraseQuery = new SpanNearQuery(new SpanQuery[] {
         // new SpanTermQuery(new Term(FIELD, "{fox}")),
         // new SpanTermQuery(new Term(FIELD, "fox")) }, 0, true);
 
-        TopDocs hits = indexSearcher.search(query, 1);
-        assertEquals(1, hits.totalHits);
-        final Highlighter highlighter = new Highlighter(
-            new SimpleHTMLFormatter(), new SimpleHTMLEncoder(),
-            new QueryScorer(query));
-        final TokenStream tokenStream = TokenSources
-            .getTokenStream(
-                indexReader.getTermVector(0, FIELD),
-                false);
-        assertEquals("<B>the fox</B> did not jump",
-            highlighter.getBestFragment(tokenStream, TEXT));
-      } finally {
-        indexSearcher.close();
-      }
+      TopDocs hits = indexSearcher.search(query, 1);
+      assertEquals(1, hits.totalHits);
+      final Highlighter highlighter = new Highlighter(
+          new SimpleHTMLFormatter(), new SimpleHTMLEncoder(),
+          new QueryScorer(query));
+      final TokenStream tokenStream = TokenSources
+          .getTokenStream(
+              indexReader.getTermVector(0, FIELD),
+              false);
+      assertEquals("<B>the fox</B> did not jump",
+          highlighter.getBestFragment(tokenStream, TEXT));
     } finally {
       indexReader.close();
       directory.close();
@@ -166,28 +162,24 @@ public class TokenSourcesTest extends Lu
     try {
       assertEquals(1, indexReader.numDocs());
       final IndexSearcher indexSearcher = newSearcher(indexReader);
-      try {
-        final DisjunctionMaxQuery query = new DisjunctionMaxQuery(1);
-        query.add(new SpanTermQuery(new Term(FIELD, "{fox}")));
-        query.add(new SpanTermQuery(new Term(FIELD, "fox")));
-        // final Query phraseQuery = new SpanNearQuery(new SpanQuery[] {
-        // new SpanTermQuery(new Term(FIELD, "{fox}")),
-        // new SpanTermQuery(new Term(FIELD, "fox")) }, 0, true);
-
-        TopDocs hits = indexSearcher.search(query, 1);
-        assertEquals(1, hits.totalHits);
-        final Highlighter highlighter = new Highlighter(
-            new SimpleHTMLFormatter(), new SimpleHTMLEncoder(),
-            new QueryScorer(query));
-        final TokenStream tokenStream = TokenSources
-            .getTokenStream(
-                indexReader.getTermVector(0, FIELD),
-                false);
-        assertEquals("<B>the fox</B> did not jump",
-            highlighter.getBestFragment(tokenStream, TEXT));
-      } finally {
-        indexSearcher.close();
-      }
+      final DisjunctionMaxQuery query = new DisjunctionMaxQuery(1);
+      query.add(new SpanTermQuery(new Term(FIELD, "{fox}")));
+      query.add(new SpanTermQuery(new Term(FIELD, "fox")));
+      // final Query phraseQuery = new SpanNearQuery(new SpanQuery[] {
+      // new SpanTermQuery(new Term(FIELD, "{fox}")),
+      // new SpanTermQuery(new Term(FIELD, "fox")) }, 0, true);
+
+      TopDocs hits = indexSearcher.search(query, 1);
+      assertEquals(1, hits.totalHits);
+      final Highlighter highlighter = new Highlighter(
+          new SimpleHTMLFormatter(), new SimpleHTMLEncoder(),
+          new QueryScorer(query));
+      final TokenStream tokenStream = TokenSources
+          .getTokenStream(
+              indexReader.getTermVector(0, FIELD),
+              false);
+      assertEquals("<B>the fox</B> did not jump",
+          highlighter.getBestFragment(tokenStream, TEXT));
     } finally {
       indexReader.close();
       directory.close();
@@ -214,28 +206,24 @@ public class TokenSourcesTest extends Lu
     try {
       assertEquals(1, indexReader.numDocs());
       final IndexSearcher indexSearcher = newSearcher(indexReader);
-      try {
-        // final DisjunctionMaxQuery query = new DisjunctionMaxQuery(1);
-        // query.add(new SpanTermQuery(new Term(FIELD, "{fox}")));
-        // query.add(new SpanTermQuery(new Term(FIELD, "fox")));
-        final Query phraseQuery = new SpanNearQuery(new SpanQuery[] {
-            new SpanTermQuery(new Term(FIELD, "the")),
-            new SpanTermQuery(new Term(FIELD, "fox"))}, 0, true);
-
-        TopDocs hits = indexSearcher.search(phraseQuery, 1);
-        assertEquals(1, hits.totalHits);
-        final Highlighter highlighter = new Highlighter(
-            new SimpleHTMLFormatter(), new SimpleHTMLEncoder(),
-            new QueryScorer(phraseQuery));
-        final TokenStream tokenStream = TokenSources
-            .getTokenStream(
-                indexReader.getTermVector(0, FIELD),
-                false);
-        assertEquals("<B>the fox</B> did not jump",
-            highlighter.getBestFragment(tokenStream, TEXT));
-      } finally {
-        indexSearcher.close();
-      }
+      // final DisjunctionMaxQuery query = new DisjunctionMaxQuery(1);
+      // query.add(new SpanTermQuery(new Term(FIELD, "{fox}")));
+      // query.add(new SpanTermQuery(new Term(FIELD, "fox")));
+      final Query phraseQuery = new SpanNearQuery(new SpanQuery[] {
+          new SpanTermQuery(new Term(FIELD, "the")),
+          new SpanTermQuery(new Term(FIELD, "fox"))}, 0, true);
+
+      TopDocs hits = indexSearcher.search(phraseQuery, 1);
+      assertEquals(1, hits.totalHits);
+      final Highlighter highlighter = new Highlighter(
+          new SimpleHTMLFormatter(), new SimpleHTMLEncoder(),
+          new QueryScorer(phraseQuery));
+      final TokenStream tokenStream = TokenSources
+          .getTokenStream(
+              indexReader.getTermVector(0, FIELD),
+              false);
+      assertEquals("<B>the fox</B> did not jump",
+          highlighter.getBestFragment(tokenStream, TEXT));
     } finally {
       indexReader.close();
       directory.close();
@@ -263,28 +251,24 @@ public class TokenSourcesTest extends Lu
     try {
       assertEquals(1, indexReader.numDocs());
       final IndexSearcher indexSearcher = newSearcher(indexReader);
-      try {
-        // final DisjunctionMaxQuery query = new DisjunctionMaxQuery(1);
-        // query.add(new SpanTermQuery(new Term(FIELD, "the")));
-        // query.add(new SpanTermQuery(new Term(FIELD, "fox")));
-        final Query phraseQuery = new SpanNearQuery(new SpanQuery[] {
-            new SpanTermQuery(new Term(FIELD, "the")),
-            new SpanTermQuery(new Term(FIELD, "fox"))}, 0, true);
-
-        TopDocs hits = indexSearcher.search(phraseQuery, 1);
-        assertEquals(1, hits.totalHits);
-        final Highlighter highlighter = new Highlighter(
-            new SimpleHTMLFormatter(), new SimpleHTMLEncoder(),
-            new QueryScorer(phraseQuery));
-        final TokenStream tokenStream = TokenSources
-            .getTokenStream(
-                indexReader.getTermVector(0, FIELD),
-                false);
-        assertEquals("<B>the fox</B> did not jump",
-            highlighter.getBestFragment(tokenStream, TEXT));
-      } finally {
-        indexSearcher.close();
-      }
+      // final DisjunctionMaxQuery query = new DisjunctionMaxQuery(1);
+      // query.add(new SpanTermQuery(new Term(FIELD, "the")));
+      // query.add(new SpanTermQuery(new Term(FIELD, "fox")));
+      final Query phraseQuery = new SpanNearQuery(new SpanQuery[] {
+          new SpanTermQuery(new Term(FIELD, "the")),
+          new SpanTermQuery(new Term(FIELD, "fox"))}, 0, true);
+
+      TopDocs hits = indexSearcher.search(phraseQuery, 1);
+      assertEquals(1, hits.totalHits);
+      final Highlighter highlighter = new Highlighter(
+          new SimpleHTMLFormatter(), new SimpleHTMLEncoder(),
+          new QueryScorer(phraseQuery));
+      final TokenStream tokenStream = TokenSources
+          .getTokenStream(
+              indexReader.getTermVector(0, FIELD),
+              false);
+      assertEquals("<B>the fox</B> did not jump",
+          highlighter.getBestFragment(tokenStream, TEXT));
     } finally {
       indexReader.close();
       directory.close();

Modified: lucene/dev/branches/lucene3622/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java?rev=1213405&r1=1213404&r2=1213405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java (original)
+++ lucene/dev/branches/lucene3622/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java Mon Dec 12 20:13:02 2011
@@ -143,9 +143,7 @@ public class MemoryIndexTest extends Bas
       TopDocs memDocs = mem.search(qp.parse(query), 1);
       assertEquals(ramDocs.totalHits, memDocs.totalHits);
     }
-    ram.close();
     reader.close();
-    mem.close();
   }
   
   /**

Modified: lucene/dev/branches/lucene3622/lucene/contrib/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/lucene/contrib/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java?rev=1213405&r1=1213404&r2=1213405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/lucene/contrib/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java (original)
+++ lucene/dev/branches/lucene3622/lucene/contrib/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java Mon Dec 12 20:13:02 2011
@@ -21,12 +21,12 @@ import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 
-import org.apache.lucene.index.IndexWriter; // javadoc
 import org.apache.lucene.index.IndexWriterConfig.OpenMode;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.FSDirectory;
 import org.apache.lucene.util.FixedBitSet;
 import org.apache.lucene.util.Bits;
+import org.apache.lucene.util.ReaderUtil;
 import org.apache.lucene.util.Version;
 
 /**
@@ -174,15 +174,60 @@ public class MultiPassIndexSplitter {
   }
   
   /**
-   * This class pretends that it can write deletions to the underlying index.
-   * Instead, deletions are buffered in a bitset and overlaid with the original
-   * list of deletions.
+   * This class emulates deletions on the underlying index.
    */
-  public static final class FakeDeleteIndexReader extends FilterIndexReader {
+  private static final class FakeDeleteIndexReader extends MultiReader {
+
+    public FakeDeleteIndexReader(IndexReader reader) throws IOException {
+      super(initSubReaders(reader), false /* dont close */);
+    }
+    
+    private static IndexReader[] initSubReaders(IndexReader reader) throws IOException {
+      final ArrayList<IndexReader> subs = new ArrayList<IndexReader>();
+      new ReaderUtil.Gather(reader) {
+        @Override
+        protected void add(int base, IndexReader r) {
+          subs.add(new FakeDeleteAtomicIndexReader(r));
+        }
+      }.run();
+      return subs.toArray(new IndexReader[subs.size()]);
+    }
+        
+    public void deleteDocument(int docID) {
+      final int i = readerIndex(docID);
+      ((FakeDeleteAtomicIndexReader) subReaders[i]).deleteDocument(docID - starts[i]);
+    }
+
+    public void undeleteAll()  {
+      for (IndexReader r : subReaders) {
+        ((FakeDeleteAtomicIndexReader) r).undeleteAll();
+      }
+    }
+
+    // override this as MultiReader precalculates the number of deletions
+    // (this method is never used by MultiPassIndexSplitter)
+    @Override
+    public int numDocs() {
+      int n = 0;
+      for (int i = 0; i < subReaders.length; i++)
+        n += subReaders[i].numDocs();
+      return n;
+    }
+  
+    // override this as MultiReader precalculates the number of deletions
+    // (this method is never used by MultiPassIndexSplitter)
+    @Override
+    public boolean hasDeletions() {
+      return (maxDoc() != numDocs());
+    }
+
+  }
+  
+  private static final class FakeDeleteAtomicIndexReader extends FilterIndexReader {
     FixedBitSet liveDocs;
 
-    public FakeDeleteIndexReader(IndexReader in) {
-      super(new SlowMultiReaderWrapper(in));
+    public FakeDeleteAtomicIndexReader(IndexReader reader) {
+      super(reader);
       undeleteAll(); // initialize main bitset
     }
 
@@ -191,7 +236,7 @@ public class MultiPassIndexSplitter {
       return liveDocs.cardinality();
     }
 
-    void undeleteAll()  {
+    public void undeleteAll()  {
       final int maxDoc = in.maxDoc();
       liveDocs = new FixedBitSet(in.maxDoc());
       if (in.hasDeletions()) {
@@ -207,7 +252,7 @@ public class MultiPassIndexSplitter {
       }
     }
 
-    void deleteDocument(int n) {
+    public void deleteDocument(int n) {
       liveDocs.clear(n);
     }
 

Modified: lucene/dev/branches/lucene3622/lucene/contrib/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/lucene/contrib/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java?rev=1213405&r1=1213404&r2=1213405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/lucene/contrib/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java (original)
+++ lucene/dev/branches/lucene3622/lucene/contrib/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java Mon Dec 12 20:13:02 2011
@@ -20,6 +20,7 @@ package org.apache.lucene.index;
 import java.io.IOException;
 
 import org.apache.lucene.index.IndexWriterConfig.OpenMode;
+import org.apache.lucene.index.IndexReader.AtomicReaderContext;
 import org.apache.lucene.search.DocIdSet;
 import org.apache.lucene.search.DocIdSetIterator;
 import org.apache.lucene.search.Filter;
@@ -28,6 +29,7 @@ import org.apache.lucene.store.Directory
 import org.apache.lucene.util.Bits;
 import org.apache.lucene.util.FixedBitSet;
 import org.apache.lucene.util.IOUtils;
+import org.apache.lucene.util.ReaderUtil;
 import org.apache.lucene.util.Version;
 
 /**
@@ -99,9 +101,14 @@ public class PKIndexSplitter {
   
   private void createIndex(IndexWriterConfig config, Directory target, IndexReader reader, Filter preserveFilter, boolean negateFilter) throws IOException {
     boolean success = false;
-    IndexWriter w = new IndexWriter(target, config);
+    final IndexWriter w = new IndexWriter(target, config);
     try {
-      w.addIndexes(new DocumentFilteredIndexReader(reader, preserveFilter, negateFilter));
+      final AtomicReaderContext[] leaves = ReaderUtil.leaves(reader.getTopReaderContext());
+      final IndexReader[] subReaders = new IndexReader[leaves.length];
+      for (int i = 0; i < leaves.length; i++) {
+        subReaders[i] = new DocumentFilteredAtomicIndexReader(leaves[i], preserveFilter, negateFilter);
+      }
+      w.addIndexes(subReaders);
       success = true;
     } finally {
       if (success) {
@@ -112,17 +119,16 @@ public class PKIndexSplitter {
     }
   }
     
-  public static class DocumentFilteredIndexReader extends FilterIndexReader {
+  private static class DocumentFilteredAtomicIndexReader extends FilterIndexReader {
     final Bits liveDocs;
     final int numDocs;
     
-    public DocumentFilteredIndexReader(IndexReader reader, Filter preserveFilter, boolean negateFilter) throws IOException {
-      super(new SlowMultiReaderWrapper(reader));
-      
+    public DocumentFilteredAtomicIndexReader(AtomicReaderContext context, Filter preserveFilter, boolean negateFilter) throws IOException {
+      super(context.reader);
       final int maxDoc = in.maxDoc();
       final FixedBitSet bits = new FixedBitSet(maxDoc);
       // ignore livedocs here, as we filter them later:
-      final DocIdSet docs = preserveFilter.getDocIdSet((AtomicReaderContext) in.getTopReaderContext(), null);
+      final DocIdSet docs = preserveFilter.getDocIdSet(context, null);
       if (docs != null) {
         final DocIdSetIterator it = docs.iterator();
         if (it != null) {

Modified: lucene/dev/branches/lucene3622/lucene/contrib/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/lucene/contrib/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java?rev=1213405&r1=1213404&r2=1213405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/lucene/contrib/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java (original)
+++ lucene/dev/branches/lucene3622/lucene/contrib/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java Mon Dec 12 20:13:02 2011
@@ -23,7 +23,6 @@ import org.apache.lucene.index.Fields;
 import org.apache.lucene.index.TermsEnum;
 import org.apache.lucene.index.FieldsEnum;
 import org.apache.lucene.index.Terms;
-import org.apache.lucene.index.FieldReaderException;
 import org.apache.lucene.index.DocsEnum;
 import org.apache.lucene.search.DocIdSetIterator;
 import org.apache.lucene.store.FSDirectory;
@@ -117,7 +116,7 @@ public class HighFreqTerms {
     if (field != null) {
       Fields fields = MultiFields.getFields(reader);
       if (fields == null) {
-        throw new FieldReaderException("field " + field + " not found");
+        throw new RuntimeException("field " + field + " not found");
       }
       Terms terms = fields.terms(field);
       if (terms != null) {
@@ -128,7 +127,7 @@ public class HighFreqTerms {
     } else {
       Fields fields = MultiFields.getFields(reader);
       if (fields == null) {
-        throw new FieldReaderException("no fields found for this index");
+        throw new RuntimeException("no fields found for this index");
       }
       tiq = new TermStatsQueue(numTerms);
       FieldsEnum fieldsEnum = fields.iterator();

Modified: lucene/dev/branches/lucene3622/lucene/contrib/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/lucene/contrib/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java?rev=1213405&r1=1213404&r2=1213405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/lucene/contrib/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java (original)
+++ lucene/dev/branches/lucene3622/lucene/contrib/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java Mon Dec 12 20:13:02 2011
@@ -33,13 +33,14 @@ public class TestMultiPassIndexSplitter 
   public void setUp() throws Exception {
     super.setUp();
     dir = newDirectory();
-    IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMergePolicy(newLogMergePolicy()));
+    IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMergePolicy(NoMergePolicy.COMPOUND_FILES));
     Document doc;
     for (int i = 0; i < NUM_DOCS; i++) {
       doc = new Document();
       doc.add(newField("id", i + "", StringField.TYPE_STORED));
       doc.add(newField("f", i + " " + i, TextField.TYPE_STORED));
       w.addDocument(doc);
+      if (i%3==0) w.commit();
     }
     w.commit();
     w.deleteDocuments(new Term("id", "" + (NUM_DOCS-1)));

Modified: lucene/dev/branches/lucene3622/lucene/contrib/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/lucene/contrib/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java?rev=1213405&r1=1213404&r2=1213405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/lucene/contrib/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java (original)
+++ lucene/dev/branches/lucene3622/lucene/contrib/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java Mon Dec 12 20:13:02 2011
@@ -37,14 +37,16 @@ public class TestPKIndexSplitter extends
     Directory dir = newDirectory();
     IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(
         TEST_VERSION_CURRENT, new MockAnalyzer(random, MockTokenizer.WHITESPACE, false))
-        .setOpenMode(OpenMode.CREATE));
+        .setOpenMode(OpenMode.CREATE).setMergePolicy(NoMergePolicy.COMPOUND_FILES));
     for (int x = 0; x < 11; x++) {
       Document doc = createDocument(x, "1", 3, format);
       w.addDocument(doc);
+      if (x%3==0) w.commit();
     }
     for (int x = 11; x < 20; x++) {
       Document doc = createDocument(x, "2", 3, format);
       w.addDocument(doc);
+      if (x%3==0) w.commit();
     }
     w.close();
     
@@ -55,7 +57,7 @@ public class TestPKIndexSplitter extends
     // delete some documents
     w = new IndexWriter(dir, newIndexWriterConfig(
         TEST_VERSION_CURRENT, new MockAnalyzer(random, MockTokenizer.WHITESPACE, false))
-        .setOpenMode(OpenMode.APPEND));
+        .setOpenMode(OpenMode.APPEND).setMergePolicy(NoMergePolicy.COMPOUND_FILES));
     w.deleteDocuments(midTerm);
     w.deleteDocuments(new Term("id", format.format(2)));
     w.close();

Modified: lucene/dev/branches/lucene3622/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java?rev=1213405&r1=1213404&r2=1213405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java (original)
+++ lucene/dev/branches/lucene3622/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java Mon Dec 12 20:13:02 2011
@@ -69,7 +69,6 @@ public class DuplicateFilterTest extends
   @Override
   public void tearDown() throws Exception {
     reader.close();
-    searcher.close();
     directory.close();
     super.tearDown();
   }

Modified: lucene/dev/branches/lucene3622/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java?rev=1213405&r1=1213404&r2=1213405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java (original)
+++ lucene/dev/branches/lucene3622/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java Mon Dec 12 20:13:02 2011
@@ -60,7 +60,6 @@ public class FuzzyLikeThisQueryTest exte
 
   @Override
   public void tearDown() throws Exception {
-    searcher.close();
     reader.close();
     directory.close();
     super.tearDown();

Modified: lucene/dev/branches/lucene3622/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowCollationMethods.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowCollationMethods.java?rev=1213405&r1=1213404&r2=1213405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowCollationMethods.java (original)
+++ lucene/dev/branches/lucene3622/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowCollationMethods.java Mon Dec 12 20:13:02 2011
@@ -71,7 +71,6 @@ public class TestSlowCollationMethods ex
   
   @AfterClass
   public static void afterClass() throws Exception {
-    searcher.close();
     reader.close();
     dir.close();
     collator = null;

Modified: lucene/dev/branches/lucene3622/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestRegexQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestRegexQuery.java?rev=1213405&r1=1213404&r2=1213405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestRegexQuery.java (original)
+++ lucene/dev/branches/lucene3622/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestRegexQuery.java Mon Dec 12 20:13:02 2011
@@ -56,7 +56,6 @@ public class TestRegexQuery extends Luce
 
   @Override
   public void tearDown() throws Exception {
-    searcher.close();
     reader.close();
     directory.close();
     super.tearDown();

Modified: lucene/dev/branches/lucene3622/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java?rev=1213405&r1=1213404&r2=1213405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java (original)
+++ lucene/dev/branches/lucene3622/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java Mon Dec 12 20:13:02 2011
@@ -80,7 +80,6 @@ public class TestSpanRegexQuery extends 
     // true);
     int numHits = searcher.search(sfq, null, 1000).totalHits;
     assertEquals(1, numHits);
-    searcher.close();
     reader.close();
     directory.close();
   }

Modified: lucene/dev/branches/lucene3622/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestCartesian.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestCartesian.java?rev=1213405&r1=1213404&r2=1213405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestCartesian.java (original)
+++ lucene/dev/branches/lucene3622/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestCartesian.java Mon Dec 12 20:13:02 2011
@@ -260,7 +260,6 @@ public class TestCartesian extends Lucen
       assertTrue(geo_distance >= lastDistance);
       lastDistance = geo_distance;
     }
-    searcher.close();
     reader.close();
   }
 
@@ -332,7 +331,6 @@ public class TestCartesian extends Lucen
       assertTrue(geo_distance >= lastDistance);
       lastDistance = geo_distance;
     }
-    searcher.close();
     reader.close();
   }
   
@@ -404,7 +402,6 @@ public class TestCartesian extends Lucen
         lastDistance = geo_distance;
       }
     }
-    searcher.close();
     reader.close();
   }
   
@@ -476,7 +473,6 @@ public class TestCartesian extends Lucen
 	      
       }
     }
-    searcher.close();
     reader.close();
   }
 }

Copied: lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/BaseMultiReader.java (from r1213323, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/BaseMultiReader.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/BaseMultiReader.java?p2=lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/BaseMultiReader.java&p1=lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/BaseMultiReader.java&r1=1213323&r2=1213405&rev=1213405&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/BaseMultiReader.java (original)
+++ lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/BaseMultiReader.java Mon Dec 12 20:13:02 2011
@@ -22,7 +22,6 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.lucene.index.codecs.PerDocValues;
 import org.apache.lucene.util.Bits;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.ReaderUtil;
@@ -156,9 +155,9 @@ abstract class BaseMultiReader<R extends
   public ReaderContext getTopReaderContext() {
     return topLevelContext;
   }
-
+  
   @Override
-  public PerDocValues perDocValues() throws IOException {
-    throw new UnsupportedOperationException("please use MultiPerDocValues.getPerDocs, or wrap your IndexReader with SlowMultiReaderWrapper, if you really need a top level Fields");
+  public DocValues docValues(String field) throws IOException {
+    throw new UnsupportedOperationException("please use MultiDocValues#getDocValues, or wrap your IndexReader with SlowMultiReaderWrapper, if you really need a top level DocValues");
   }
 }

Modified: lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java?rev=1213405&r1=1213404&r2=1213405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java (original)
+++ lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java Mon Dec 12 20:13:02 2011
@@ -18,7 +18,6 @@ package org.apache.lucene.index;
  */
 
 import org.apache.lucene.store.Directory;
-import org.apache.lucene.util.InfoStream;
 import org.apache.lucene.util.ThreadInterruptedException;
 import org.apache.lucene.util.CollectionUtil;
 
@@ -336,8 +335,9 @@ public class ConcurrentMergeScheduler ex
       // merges to do first (the easiest ones?), etc.
       MergePolicy.OneMerge merge = writer.getNextMerge();
       if (merge == null) {
-        if (verbose())
+        if (verbose()) {
           message("  no more merges pending; now return");
+        }
         return;
       }
 
@@ -348,7 +348,9 @@ public class ConcurrentMergeScheduler ex
       boolean success = false;
       try {
         synchronized(this) {
-          message("  consider merge " + merge.segString(dir));
+          if (verbose()) {
+            message("  consider merge " + merge.segString(dir));
+          }
 
           // OK to spawn a new merge thread to handle this
           // merge:
@@ -440,8 +442,9 @@ public class ConcurrentMergeScheduler ex
       
       try {
 
-        if (verbose())
+        if (verbose()) {
           message("  merge thread: start");
+        }
 
         while(true) {
           setRunningMerge(merge);
@@ -453,15 +456,17 @@ public class ConcurrentMergeScheduler ex
           if (merge != null) {
             tWriter.mergeInit(merge);
             updateMergeThreads();
-            if (verbose())
+            if (verbose()) {
               message("  merge thread: do another merge " + merge.segString(dir));
+            }
           } else {
             break;
           }
         }
 
-        if (verbose())
+        if (verbose()) {
           message("  merge thread: done");
+        }
 
       } catch (Throwable exc) {
 



Mime
View raw message