You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2011/11/14 23:36:32 UTC
svn commit: r1201946 [1/14] - in /lucene/dev/branches/solrcloud: ./
dev-tools/idea/lucene/contrib/ lucene/ lucene/contrib/
lucene/contrib/demo/src/java/org/apache/lucene/demo/
lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/
luce...
Author: yonik
Date: Mon Nov 14 22:36:20 2011
New Revision: 1201946
URL: http://svn.apache.org/viewvc?rev=1201946&view=rev
Log:
merge trunk to r1201900
Added:
lucene/dev/branches/solrcloud/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestMultiSegmentReaderOnConstructor.java
- copied unchanged from r1201900, lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestMultiSegmentReaderOnConstructor.java
lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/document/LazyDocument.java
- copied unchanged from r1201900, lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/document/LazyDocument.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/MergeState.java
- copied unchanged from r1201900, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/MergeState.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/StoredFieldsConsumer.java
- copied unchanged from r1201900, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/StoredFieldsConsumer.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultStoredFieldsFormat.java
- copied unchanged from r1201900, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/DefaultStoredFieldsFormat.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultStoredFieldsReader.java
- copied unchanged from r1201900, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/DefaultStoredFieldsReader.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultStoredFieldsWriter.java
- copied unchanged from r1201900, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/DefaultStoredFieldsWriter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/StoredFieldsFormat.java
- copied unchanged from r1201900, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/StoredFieldsFormat.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/StoredFieldsReader.java
- copied unchanged from r1201900, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/StoredFieldsReader.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/StoredFieldsWriter.java
- copied unchanged from r1201900, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/StoredFieldsWriter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextCodec.java
- copied unchanged from r1201900, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextCodec.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextStoredFieldsFormat.java
- copied unchanged from r1201900, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextStoredFieldsFormat.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextStoredFieldsReader.java
- copied unchanged from r1201900, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextStoredFieldsReader.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextStoredFieldsWriter.java
- copied unchanged from r1201900, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextStoredFieldsWriter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextUtil.java
- copied unchanged from r1201900, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextUtil.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/NRTManager.java
- copied unchanged from r1201900, lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/NRTManager.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/NRTManagerReopenThread.java
- copied unchanged from r1201900, lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/NRTManagerReopenThread.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/SearcherLifetimeManager.java
- copied unchanged from r1201900, lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/SearcherLifetimeManager.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/SearcherManager.java
- copied unchanged from r1201900, lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/SearcherManager.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/SearcherWarmer.java
- copied unchanged from r1201900, lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/SearcherWarmer.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/store/NRTCachingDirectory.java
- copied unchanged from r1201900, lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/NRTCachingDirectory.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/InfoStream.java
- copied unchanged from r1201900, lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/InfoStream.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/PrintStreamInfoStream.java
- copied unchanged from r1201900, lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/PrintStreamInfoStream.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/packed/DirectReader.java
- copied unchanged from r1201900, lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/packed/DirectReader.java
lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/util/FailOnNonBulkMergesInfoStream.java
- copied unchanged from r1201900, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/util/FailOnNonBulkMergesInfoStream.java
lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/util/NullInfoStream.java
- copied unchanged from r1201900, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/util/NullInfoStream.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestForceMergeForever.java
- copied unchanged from r1201900, lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestForceMergeForever.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java
- copied unchanged from r1201900, lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java
- copied unchanged from r1201900, lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestThreadedForceMerge.java
- copied unchanged from r1201900, lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestThreadedForceMerge.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestNRTManager.java
- copied unchanged from r1201900, lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNRTManager.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestSearcherManager.java
- copied unchanged from r1201900, lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSearcherManager.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java
- copied unchanged from r1201900, lucene/dev/trunk/lucene/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java
lucene/dev/branches/solrcloud/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ForceMergeTask.java
- copied unchanged from r1201900, lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ForceMergeTask.java
lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/CachePropertyUtil.java
- copied unchanged from r1201900, lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/CachePropertyUtil.java
lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHCache.java
- copied unchanged from r1201900, lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHCache.java
lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHCacheSupport.java
- copied unchanged from r1201900, lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHCacheSupport.java
lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHWriterBase.java
- copied unchanged from r1201900, lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHWriterBase.java
lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SortedMapBackedCache.java
- copied unchanged from r1201900, lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SortedMapBackedCache.java
lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/dataimport-cache-ephemeral.xml
- copied unchanged from r1201900, lucene/dev/trunk/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/dataimport-cache-ephemeral.xml
lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHCacheTestCase.java
- copied unchanged from r1201900, lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHCacheTestCase.java
lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestEphemeralCache.java
- copied unchanged from r1201900, lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestEphemeralCache.java
lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSortedMapBackedCache.java
- copied unchanged from r1201900, lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSortedMapBackedCache.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/component/SpellCheckMergeData.java
- copied unchanged from r1201900, lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SpellCheckMergeData.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java
- copied unchanged from r1201900, lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java
Removed:
lucene/dev/branches/solrcloud/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestUnoptimizedReaderOnConstructor.java
lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/document/FieldSelector.java
lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/document/FieldSelectorResult.java
lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/document/FieldSelectorVisitor.java
lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/document/LoadFirstFieldSelector.java
lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/document/MapFieldSelector.java
lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/document/SetBasedFieldSelector.java
lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/NRTManager.java
lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/NRTManagerReopenThread.java
lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherLifetimeManager.java
lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherManager.java
lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherWarmer.java
lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/store/NRTCachingDirectory.java
lucene/dev/branches/solrcloud/lucene/contrib/misc/src/test/org/apache/lucene/index/TestContribFieldsReader.java
lucene/dev/branches/solrcloud/lucene/contrib/misc/src/test/org/apache/lucene/index/TestContribIndexReader.java
lucene/dev/branches/solrcloud/lucene/contrib/misc/src/test/org/apache/lucene/index/TestContribParallelReader.java
lucene/dev/branches/solrcloud/lucene/contrib/misc/src/test/org/apache/lucene/index/TestLazyBug.java
lucene/dev/branches/solrcloud/lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java
lucene/dev/branches/solrcloud/lucene/contrib/misc/src/test/org/apache/lucene/search/TestSearcherManager.java
lucene/dev/branches/solrcloud/lucene/contrib/misc/src/test/org/apache/lucene/search/TestThreadSafe.java
lucene/dev/branches/solrcloud/lucene/contrib/misc/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/StoredFieldsWriter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultFieldsFormat.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultFieldsReader.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultFieldsWriter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/FieldsFormat.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/FieldsReader.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/FieldsWriter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/MergeState.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/CachingSpanFilter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/SpanFilter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/SpanFilterResult.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/SpanQueryFilter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/cache/
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterOptimize.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestOptimizeForever.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSizeBoundedOptimize.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestThreadedOptimize.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestCachingSpanFilter.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestSpanQueryFilter.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/cache/
lucene/dev/branches/solrcloud/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OptimizeTask.java
lucene/dev/branches/solrcloud/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumericFieldCacheSource.java
Modified:
lucene/dev/branches/solrcloud/ (props changed)
lucene/dev/branches/solrcloud/dev-tools/idea/lucene/contrib/ (props changed)
lucene/dev/branches/solrcloud/lucene/ (props changed)
lucene/dev/branches/solrcloud/lucene/CHANGES.txt
lucene/dev/branches/solrcloud/lucene/common-build.xml
lucene/dev/branches/solrcloud/lucene/contrib/CHANGES.txt
lucene/dev/branches/solrcloud/lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexFiles.java
lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java
lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
lucene/dev/branches/solrcloud/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndex.java
lucene/dev/branches/solrcloud/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexReader.java
lucene/dev/branches/solrcloud/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java
lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.java
lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/IndexSplitter.java
lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingCodec.java
lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/misc/IndexMergeTool.java
lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/store/WindowsDirectory.java
lucene/dev/branches/solrcloud/lucene/contrib/misc/src/test/org/apache/lucene/index/TestIndexSplitter.java
lucene/dev/branches/solrcloud/lucene/contrib/misc/src/test/org/apache/lucene/index/codecs/appending/TestAppendingCodec.java
lucene/dev/branches/solrcloud/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java
lucene/dev/branches/solrcloud/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java
lucene/dev/branches/solrcloud/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java (contents, props changed)
lucene/dev/branches/solrcloud/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/LatLongDistanceFilter.java
lucene/dev/branches/solrcloud/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestCartesian.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/document/DocumentStoredFieldVisitor.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/document/FieldType.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/BufferedDeletesStream.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DirectoryReader.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/FilterIndexReader.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/FlushByRamOrCountsPolicy.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/FlushPolicy.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/IndexCommit.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/IndexFileDeleter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/IndexFileNames.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/IndexReader.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/IndexUpgrader.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/IndexWriter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/IndexWriterConfig.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/LogByteSizeMergePolicy.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/LogDocMergePolicy.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/LogMergePolicy.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/MergePolicy.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/MultiReader.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/NoMergePolicy.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/ParallelReader.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/PerDocWriteState.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/SegmentCoreReaders.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/SegmentInfo.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/SegmentMerger.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/SegmentReader.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/SegmentWriteState.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/SnapshotDeletionPolicy.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/StoredFieldVisitor.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/TermVectorsTermsWriter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/TermsEnum.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/TieredMergePolicy.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/UpgradeIndexMergePolicy.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/Codec.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultSegmentInfosReader.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DocValuesConsumer.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/FieldsConsumer.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/MappingMultiDocsAndPositionsEnum.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/MappingMultiDocsEnum.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/PerDocConsumer.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/PostingsConsumer.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/TermsConsumer.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/Lucene3xCodec.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/TermInfosReaderIndex.java (props changed)
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40Codec.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextFieldsReader.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextFieldsWriter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/values/Bytes.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/values/FixedDerefBytesImpl.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/values/FixedSortedBytesImpl.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/values/IndexDocValues.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/values/PackedIntValues.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/values/SortedBytesMergeUtils.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/values/VarDerefBytesImpl.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/values/VarSortedBytesImpl.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/values/VarStraightBytesImpl.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/ConstantScoreAutoRewrite.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/FieldCache.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/FieldCacheImpl.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/FieldCacheRangeFilter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/FieldComparator.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/MultiTermQuery.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/ScoringRewrite.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/SortField.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/TimeLimitingCollector.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/TopTermsRewrite.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/payloads/PayloadSpanUtil.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/spans/FieldMaskingSpanQuery.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/spans/SpanMultiTermQueryWrapper.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/spans/SpanNearQuery.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/spans/SpanNotQuery.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/spans/SpanOrQuery.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/spans/SpanPositionCheckQuery.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/spans/SpanQuery.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/spans/SpanTermQuery.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/spans/SpanWeight.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/store/FlushInfo.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/store/MergeInfo.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/store/NIOFSDirectory.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/store/RAMInputStream.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/ArrayUtil.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/Constants.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/Counter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/FieldCacheSanityChecker.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/IOUtils.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/packed/Packed64.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/packed/PackedInts.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/packed/PackedReaderIterator.java
lucene/dev/branches/solrcloud/lucene/src/resources/META-INF/services/org.apache.lucene.index.codecs.Codec
lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/analysis/CollationTestBase.java
lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/MockRandomMergePolicy.java
lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/RandomCodec.java
lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/RandomIndexWriter.java
lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCase.java
lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/util/_TestUtil.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/TestDemo.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/TestExternalCodecs.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/TestMergeSchedulerExternal.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/TestSearchForDuplicates.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/Test2BPostings.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/Test2BTerms.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestAtomicUpdate.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestCheckIndex.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestCodecs.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestDoc.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestDocCount.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestDocTermOrds.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestDocsAndPositions.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestDocumentWriter.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestFieldsReader.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestFlex.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestGlobalFieldNumbers.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexCommit.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexFileDeleter.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexReader.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexReaderClone.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexReaderCloneNorms.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexReaderDelete.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexReaderOnDiskFull.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexReaderReopen.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterCommit.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterConfig.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterNRTIsCurrent.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestMultiFields.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestNRTThreads.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestNeverDelete.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestNoMergePolicy.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestNorms.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestOmitNorms.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestOmitPositions.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestOmitTf.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestParallelReader.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestPayloadProcessorProvider.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestPayloads.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestRollingUpdates.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSegmentInfo.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSegmentTermDocs.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSegmentTermEnum.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestStressAdvance.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestStressNRT.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSumDocFreq.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestTermVectorsWriter.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestTermdocPerf.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestTermsEnum.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestTieredMergePolicy.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/codecs/lucene3x/TestTermInfosReaderIndex.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/codecs/perfield/TestPerFieldPostingsFormat.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/values/TestDocValuesIndexing.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/values/TestTypePromotion.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/FieldCacheRewriteMethod.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/JustCompileSearch.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestBooleanQuery.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestFieldCache.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery2.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestScorerPerf.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestSort.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestTermVectors.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestTopDocsMerge.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/spans/JustCompileSearchSpans.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/spans/MultiSpansWrapper.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/store/TestRAMDirectory.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/util/TestIOUtils.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/util/fst/TestFSTs.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/util/packed/TestPackedInts.java
lucene/dev/branches/solrcloud/modules/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java
lucene/dev/branches/solrcloud/modules/analysis/common/src/java/org/apache/lucene/analysis/core/StopAnalyzer.java
lucene/dev/branches/solrcloud/modules/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java
lucene/dev/branches/solrcloud/modules/analysis/common/src/java/org/apache/lucene/analysis/da/DanishAnalyzer.java
lucene/dev/branches/solrcloud/modules/analysis/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java
lucene/dev/branches/solrcloud/modules/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishAnalyzer.java
lucene/dev/branches/solrcloud/modules/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishAnalyzer.java
lucene/dev/branches/solrcloud/modules/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java
lucene/dev/branches/solrcloud/modules/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianAnalyzer.java
lucene/dev/branches/solrcloud/modules/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianAnalyzer.java
lucene/dev/branches/solrcloud/modules/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianAnalyzer.java
lucene/dev/branches/solrcloud/modules/analysis/common/src/java/org/apache/lucene/analysis/lv/LatvianAnalyzer.java
lucene/dev/branches/solrcloud/modules/analysis/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java
lucene/dev/branches/solrcloud/modules/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianAnalyzer.java
lucene/dev/branches/solrcloud/modules/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseAnalyzer.java
lucene/dev/branches/solrcloud/modules/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianAnalyzer.java
lucene/dev/branches/solrcloud/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicAnalyzer.java
lucene/dev/branches/solrcloud/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardAnalyzer.java
lucene/dev/branches/solrcloud/modules/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishAnalyzer.java
lucene/dev/branches/solrcloud/modules/analysis/common/src/java/org/apache/lucene/analysis/util/StopwordAnalyzerBase.java
lucene/dev/branches/solrcloud/modules/analysis/common/src/java/org/apache/lucene/analysis/util/WordlistLoader.java
lucene/dev/branches/solrcloud/modules/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArraySet.java
lucene/dev/branches/solrcloud/modules/analysis/common/src/test/org/apache/lucene/analysis/util/TestWordlistLoader.java
lucene/dev/branches/solrcloud/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java
lucene/dev/branches/solrcloud/modules/analysis/stempel/src/java/org/apache/lucene/analysis/pl/PolishAnalyzer.java
lucene/dev/branches/solrcloud/modules/benchmark/conf/analyzer.alg
lucene/dev/branches/solrcloud/modules/benchmark/conf/collector-small.alg
lucene/dev/branches/solrcloud/modules/benchmark/conf/collector.alg
lucene/dev/branches/solrcloud/modules/benchmark/conf/deletes.alg
lucene/dev/branches/solrcloud/modules/benchmark/conf/facets.alg
lucene/dev/branches/solrcloud/modules/benchmark/conf/highlight-profile.alg
lucene/dev/branches/solrcloud/modules/benchmark/conf/highlight-vs-vector-highlight.alg
lucene/dev/branches/solrcloud/modules/benchmark/conf/indexing-flush-by-RAM-multithreaded.alg
lucene/dev/branches/solrcloud/modules/benchmark/conf/indexing-flush-by-RAM.alg
lucene/dev/branches/solrcloud/modules/benchmark/conf/indexing-multithreaded.alg
lucene/dev/branches/solrcloud/modules/benchmark/conf/indexing.alg
lucene/dev/branches/solrcloud/modules/benchmark/conf/micro-standard-flush-by-ram.alg
lucene/dev/branches/solrcloud/modules/benchmark/conf/micro-standard.alg
lucene/dev/branches/solrcloud/modules/benchmark/conf/sample.alg
lucene/dev/branches/solrcloud/modules/benchmark/conf/sloppy-phrase.alg
lucene/dev/branches/solrcloud/modules/benchmark/conf/sort-standard.alg
lucene/dev/branches/solrcloud/modules/benchmark/conf/standard-flush-by-RAM.alg
lucene/dev/branches/solrcloud/modules/benchmark/conf/standard-highlights-notv.alg
lucene/dev/branches/solrcloud/modules/benchmark/conf/standard-highlights-tv.alg
lucene/dev/branches/solrcloud/modules/benchmark/conf/standard.alg
lucene/dev/branches/solrcloud/modules/benchmark/conf/vector-highlight-profile.alg
lucene/dev/branches/solrcloud/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ContentItemsSource.java
lucene/dev/branches/solrcloud/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseIndexTask.java
lucene/dev/branches/solrcloud/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java
lucene/dev/branches/solrcloud/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java
lucene/dev/branches/solrcloud/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RollbackIndexTask.java
lucene/dev/branches/solrcloud/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/DocNameExtractor.java
lucene/dev/branches/solrcloud/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
lucene/dev/branches/solrcloud/modules/facet/src/java/org/apache/lucene/facet/index/FacetsPayloadProcessorProvider.java
lucene/dev/branches/solrcloud/modules/facet/src/java/org/apache/lucene/facet/taxonomy/directory/Consts.java
lucene/dev/branches/solrcloud/modules/facet/src/test/org/apache/lucene/facet/FacetTestBase.java
lucene/dev/branches/solrcloud/modules/facet/src/test/org/apache/lucene/facet/search/CategoryListIteratorTest.java
lucene/dev/branches/solrcloud/modules/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java
lucene/dev/branches/solrcloud/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
lucene/dev/branches/solrcloud/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ByteFieldSource.java
lucene/dev/branches/solrcloud/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java
lucene/dev/branches/solrcloud/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java
lucene/dev/branches/solrcloud/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java
lucene/dev/branches/solrcloud/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java
lucene/dev/branches/solrcloud/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ShortFieldSource.java
lucene/dev/branches/solrcloud/modules/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java
lucene/dev/branches/solrcloud/modules/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java
lucene/dev/branches/solrcloud/modules/queries/src/test/org/apache/lucene/queries/function/TestFieldScoreQuery.java
lucene/dev/branches/solrcloud/modules/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java
lucene/dev/branches/solrcloud/modules/queryparser/src/test/org/apache/lucene/queryparser/xml/builders/TestNumericRangeFilterBuilder.java (props changed)
lucene/dev/branches/solrcloud/modules/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java
lucene/dev/branches/solrcloud/modules/suggest/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java
lucene/dev/branches/solrcloud/solr/ (props changed)
lucene/dev/branches/solrcloud/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/solrcloud/solr/LICENSE.txt (props changed)
lucene/dev/branches/solrcloud/solr/NOTICE.txt (props changed)
lucene/dev/branches/solrcloud/solr/README.txt (props changed)
lucene/dev/branches/solrcloud/solr/build.xml (props changed)
lucene/dev/branches/solrcloud/solr/client/ (props changed)
lucene/dev/branches/solrcloud/solr/common-build.xml (props changed)
lucene/dev/branches/solrcloud/solr/contrib/ (props changed)
lucene/dev/branches/solrcloud/solr/contrib/clustering/src/test-files/ (props changed)
lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler-extras/src/java/ (props changed)
lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler/src/java/ (props changed)
lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/CachedSqlEntityProcessor.java
lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHWriter.java
lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataConfig.java
lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java
lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/EntityProcessorBase.java
lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrWriter.java
lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ThreadedContext.java
lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler/src/test-files/ (props changed)
lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/dataimport-schema.xml
lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler/src/test/org/ (props changed)
lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestCachedSqlEntityProcessor.java
lucene/dev/branches/solrcloud/solr/contrib/uima/src/java/ (props changed)
lucene/dev/branches/solrcloud/solr/contrib/uima/src/test-files/ (props changed)
lucene/dev/branches/solrcloud/solr/core/ (props changed)
lucene/dev/branches/solrcloud/solr/core/src/java/ (props changed)
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/core/IndexDeletionPolicyWrapper.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/core/SolrDeletionPolicy.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/component/FieldFacetStats.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/component/StatsValues.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/request/UnInvertedField.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/schema/ByteField.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/schema/DoubleField.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/schema/FloatField.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/schema/IntField.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/schema/LongField.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/schema/ShortField.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/schema/TrieField.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/spelling/DirectSolrSpellChecker.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/spelling/PossibilityIterator.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/spelling/SolrSpellChecker.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/CommitUpdateCommand.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java
lucene/dev/branches/solrcloud/solr/core/src/test/ (props changed)
lucene/dev/branches/solrcloud/solr/core/src/test-files/solr/conf/schema-numeric.xml
lucene/dev/branches/solrcloud/solr/core/src/test-files/solr/conf/solrconfig.xml
lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java
lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java
lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/schema/NumericFieldsTest.java
lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java
lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java
lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java
lucene/dev/branches/solrcloud/solr/dev-tools/ (props changed)
lucene/dev/branches/solrcloud/solr/example/ (props changed)
lucene/dev/branches/solrcloud/solr/example/solr/conf/schema.xml
lucene/dev/branches/solrcloud/solr/lib/ (props changed)
lucene/dev/branches/solrcloud/solr/scripts/ (props changed)
lucene/dev/branches/solrcloud/solr/site/ (props changed)
lucene/dev/branches/solrcloud/solr/site-src/ (props changed)
lucene/dev/branches/solrcloud/solr/solrj/ (props changed)
lucene/dev/branches/solrcloud/solr/solrj/src/java/ (props changed)
lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/SolrInputDocument.java
lucene/dev/branches/solrcloud/solr/solrj/src/test/org/apache/solr/client/ (props changed)
lucene/dev/branches/solrcloud/solr/solrj/src/test/org/apache/solr/client/solrj/ (props changed)
lucene/dev/branches/solrcloud/solr/solrj/src/test/org/apache/solr/common/ (props changed)
lucene/dev/branches/solrcloud/solr/test-framework/ (props changed)
lucene/dev/branches/solrcloud/solr/testlogging.properties (props changed)
lucene/dev/branches/solrcloud/solr/webapp/ (props changed)
Modified: lucene/dev/branches/solrcloud/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/CHANGES.txt?rev=1201946&r1=1201945&r2=1201946&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/solrcloud/lucene/CHANGES.txt Mon Nov 14 22:36:20 2011
@@ -199,6 +199,9 @@ Changes in backwards compatibility polic
as these are no longer used by the scoring system. See MIGRATE.txt for more
details. (Robert Muir)
+* LUCENE-3533: Removed SpanFilters, they created large lists of objects and
+ did not scale. (Robert Muir)
+
Changes in Runtime Behavior
* LUCENE-2846: omitNorms now behaves like omitTermFrequencyAndPositions, if you
@@ -653,6 +656,14 @@ Changes in backwards compatibility polic
* LUCENE-3541: Remove IndexInput's protected copyBuf. If you want to
keep a buffer in your IndexInput, do this yourself in your implementation,
and be sure to do the right thing on clone()! (Robert Muir)
+
+* LUCENE-2822: TimeLimitingCollector now expects a counter clock instead of
+ relying on a private daemon thread. The global time limiting clock thread
+ has been exposed and is now lazily loaded and fully optional.
+ TimeLimitingCollector now supports setting clock baseline manually to include
+ prelude of a search. Previous versions set the baseline on construction time,
+ now baseline is set once the first IndexReader is passed to the collector
+ unless set before. (Simon Willnauer)
Changes in runtime behavior
@@ -711,7 +722,24 @@ Bug fixes
(Robert Muir)
* LUCENE-3548: Fix CharsRef#append to extend length of the existing char[]
- and presever existing chars. (Simon Willnauer)
+ and preserve existing chars. (Simon Willnauer)
+
+API Changes
+
+* LUCENE-3454: Rename IndexWriter.optimize to forceMerge to discourage
+ use of this method since it is horribly costly and rarely justified
+ anymore. MergePolicy.findMergesForOptimize was renamed to
+ findForcedMerges. IndexReader.isOptimized was
+ deprecated. IndexCommit.isOptimized was replaced with
+ getSegmentCount. (Robert Muir, Mike McCandless)
+
+* LUCENE-3205: Deprecated MultiTermQuery.getTotalNumerOfTerms() [and
+ related methods], as the numbers returned are not useful
+ for multi-segment indexes. They were only needed for tests of
+ NumericRangeQuery. (Mike McCandless, Uwe Schindler)
+
+* LUCENE-3574: Deprecate outdated constants in org.apache.lucene.util.Constants
+ and add new ones for Java 6 and Java 7. (Uwe Schindler)
New Features
@@ -726,6 +754,9 @@ New Features
for more efficient storage of int arrays when the values are
bounded, for example for storing the terms dict index (Toke
Eskildsen via Mike McCandless)
+
+* LUCENE-3558: Moved SearcherManager, NRTManager & SearcherLifetimeManager into
+ core. All classes are contained in o.a.l.search. (Simon Willnauer)
Optimizations
@@ -744,6 +775,11 @@ Optimizations
* LUCENE-2205: Very substantial (3-5X) RAM reduction required to hold
the terms index on opening an IndexReader (Aaron McCurry via Mike McCandless)
+* LUCENE-3443: FieldCache can now set docsWithField, and create an
+ array, in a single pass. This results in faster init time for apps
+ that need both (such as sorting by a field with a missing value).
+ (Mike McCandless)
+
Test Cases
* LUCENE-3420: Disable the finalness checks in TokenStream and Analyzer
Modified: lucene/dev/branches/solrcloud/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/common-build.xml?rev=1201946&r1=1201945&r2=1201946&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/common-build.xml (original)
+++ lucene/dev/branches/solrcloud/lucene/common-build.xml Mon Nov 14 22:36:20 2011
@@ -83,6 +83,7 @@
</or>
</condition>
<property name="tests.multiplier" value="1" />
+ <property name="tests.codec" value="random" />
<property name="tests.postingsformat" value="random" />
<property name="tests.locale" value="random" />
<property name="tests.timezone" value="random" />
@@ -95,6 +96,8 @@
<property name="tests.nightly" value="false" />
<property name="tests.cleanthreads.sysprop" value="perMethod"/>
<property name="tests.asserts.gracious" value="false"/>
+ <property name="tests.verbose" value="false"/>
+ <property name="tests.infostream" value="${tests.verbose}"/>
<property name="javac.deprecation" value="off"/>
<property name="javac.debug" value="on"/>
@@ -474,7 +477,7 @@
<compile-test-macro srcdir="${tests-framework.src.dir}" destdir="${common.dir}/build/classes/test-framework"
test.classpath="test-framework.classpath"/>
<!-- Copy the resources folder (if existent) -->
- <copy todir="${build.dir}/classes/test-framework">
+ <copy todir="${common.dir}/build/classes/test-framework">
<fileset dir="${tests-framework.src.dir}/../resources" erroronmissingdir="no"/>
</copy>
</target>
@@ -491,8 +494,6 @@
<compile-test-macro srcdir="${tests.src.dir}" destdir="${build.dir}/classes/test"
test.classpath="test.classpath"/>
</target>
-
- <property name="tests.verbose" value="false"/>
<macrodef name="compile-test-macro" description="Compiles junit tests.">
<attribute name="srcdir"/>
@@ -550,9 +551,13 @@
<!-- allow tests to control debug prints -->
<sysproperty key="tests.verbose" value="${tests.verbose}"/>
+ <!-- even more debugging -->
+ <sysproperty key="tests.infostream" value="${tests.infostream}"/>
<!-- directory for formatter lock -->
<sysproperty key="tests.lockdir" value="${tests.lockdir}"/>
<!-- set the codec tests should run with -->
+ <sysproperty key="tests.codec" value="${tests.codec}"/>
+ <!-- set the postingsformat tests should run with -->
<sysproperty key="tests.postingsformat" value="${tests.postingsformat}"/>
<!-- set the locale tests should run with -->
<sysproperty key="tests.locale" value="${tests.locale}"/>
Modified: lucene/dev/branches/solrcloud/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/CHANGES.txt?rev=1201946&r1=1201945&r2=1201946&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/CHANGES.txt Mon Nov 14 22:36:20 2011
@@ -96,6 +96,14 @@ Changes in backwards compatibility polic
Previously, there was no way to specify an IndexWriterConfig, and some
of these methods would sneakily pass 'true' to optimize. (Robert Muir)
+
+ * LUCENE-3558: Moved NRTManager & NRTManagerReopenThread into lucene core
+ o.a.l.search. (Simon Willnauer)
+
+ * LUCENE-2564: WordListLoader is now flaged as @lucene.internal. All methods in
+ WordListLoader now return CharArraySet/Map and expect Reader instances for
+ efficiency. Utilities to open Readers from Files, InputStreams or Java
+ resources were added to IOUtils. (Simon Willnauer, Robert Muir)
New Features
Modified: lucene/dev/branches/solrcloud/lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexFiles.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexFiles.java?rev=1201946&r1=1201945&r2=1201946&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexFiles.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexFiles.java Mon Nov 14 22:36:20 2011
@@ -109,12 +109,12 @@ public class IndexFiles {
indexDocs(writer, docDir);
// NOTE: if you want to maximize search performance,
- // you can optionally call optimize here. This can be
- // a costly operation, so generally it's only worth
- // it when your index is relatively static (ie you're
- // done adding documents to it):
+ // you can optionally call forceMerge here. This can be
+ // a terribly costly operation, so generally it's only
+ // worth it when your index is relatively static (ie
+ // you're done adding documents to it):
//
- // writer.optimize();
+ // writer.forceMerge(1);
writer.close();
Modified: lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java?rev=1201946&r1=1201945&r2=1201946&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java Mon Nov 14 22:36:20 2011
@@ -25,6 +25,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.TreeSet;
import org.apache.lucene.analysis.CachingTokenFilter;
import org.apache.lucene.analysis.TokenStream;
@@ -42,6 +43,7 @@ import org.apache.lucene.search.spans.Sp
import org.apache.lucene.search.spans.SpanTermQuery;
import org.apache.lucene.search.spans.Spans;
import org.apache.lucene.util.Bits;
+import org.apache.lucene.util.TermContext;
/**
* Class used to extract {@link WeightedSpanTerm}s from a {@link Query} based on whether
@@ -247,16 +249,21 @@ public class WeightedSpanTermExtractor {
List<PositionSpan> spanPositions = new ArrayList<PositionSpan>();
for (final String field : fieldNames) {
-
- AtomicReaderContext context = getLeafContextForField(field);
- Bits acceptDocs = context.reader.getLiveDocs();
- final Spans spans;
+ final SpanQuery q;
if (mustRewriteQuery) {
- spans = queries.get(field).getSpans(context, acceptDocs);
+ q = queries.get(field);
} else {
- spans = spanQuery.getSpans(context, acceptDocs);
+ q = spanQuery;
}
-
+ AtomicReaderContext context = getLeafContextForField(field);
+ Map<Term,TermContext> termContexts = new HashMap<Term,TermContext>();
+ TreeSet<Term> extractedTerms = new TreeSet<Term>();
+ q.extractTerms(extractedTerms);
+ for (Term term : extractedTerms) {
+ termContexts.put(term, TermContext.build(context, term, true));
+ }
+ Bits acceptDocs = context.reader.getLiveDocs();
+ final Spans spans = q.getSpans(context, acceptDocs, termContexts);
// collect span positions
while (spans.next()) {
Modified: lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java?rev=1201946&r1=1201945&r2=1201946&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java Mon Nov 14 22:36:20 2011
@@ -32,7 +32,6 @@ import org.apache.lucene.search.highligh
import org.apache.lucene.search.vectorhighlight.FieldFragList.WeightedFragInfo.SubInfo;
import org.apache.lucene.search.vectorhighlight.FieldFragList.WeightedFragInfo;
import org.apache.lucene.search.vectorhighlight.FieldPhraseList.WeightedPhraseInfo.Toffs;
-import org.apache.lucene.store.IndexInput;
public abstract class BaseFragmentsBuilder implements FragmentsBuilder {
@@ -124,20 +123,19 @@ public abstract class BaseFragmentsBuild
// according to javadoc, doc.getFields(fieldName) cannot be used with lazy loaded field???
final List<Field> fields = new ArrayList<Field>();
reader.document(docId, new StoredFieldVisitor() {
+
@Override
- public boolean stringField(FieldInfo fieldInfo, IndexInput in, int numUTF8Bytes) throws IOException {
- if (fieldInfo.name.equals(fieldName)) {
- final byte[] b = new byte[numUTF8Bytes];
- in.readBytes(b, 0, b.length);
- FieldType ft = new FieldType(TextField.TYPE_STORED);
- ft.setStoreTermVectors(fieldInfo.storeTermVector);
- ft.setStoreTermVectorOffsets(fieldInfo.storeOffsetWithTermVector);
- ft.setStoreTermVectorPositions(fieldInfo.storePositionWithTermVector);
- fields.add(new Field(fieldInfo.name, new String(b, "UTF-8"), ft));
- } else {
- in.seek(in.getFilePointer() + numUTF8Bytes);
- }
- return false;
+ public void stringField(FieldInfo fieldInfo, String value) throws IOException {
+ FieldType ft = new FieldType(TextField.TYPE_STORED);
+ ft.setStoreTermVectors(fieldInfo.storeTermVector);
+ ft.setStoreTermVectorOffsets(fieldInfo.storeOffsetWithTermVector);
+ ft.setStoreTermVectorPositions(fieldInfo.storePositionWithTermVector);
+ fields.add(new Field(fieldInfo.name, value, ft));
+ }
+
+ @Override
+ public Status needsField(FieldInfo fieldInfo) throws IOException {
+ return fieldInfo.name.equals(fieldName) ? Status.YES : Status.NO;
}
});
return fields.toArray(new Field[fields.size()]);
Modified: lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java?rev=1201946&r1=1201945&r2=1201946&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java Mon Nov 14 22:36:20 2011
@@ -1635,7 +1635,7 @@ public class HighlighterTest extends Bas
writer.addDocument( doc( "t_text1", "more random words for second field del" ) );
writer.addDocument( doc( "t_text1", "random words for highlighting tests del" ) );
writer.addDocument( doc( "t_text1", "more random words for second field" ) );
- writer.optimize();
+ writer.forceMerge(1);
writer.close();
}
@@ -1643,7 +1643,7 @@ public class HighlighterTest extends Bas
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random, MockTokenizer.WHITESPACE, false)).setOpenMode(OpenMode.APPEND));
writer.deleteDocuments( new Term( "t_text1", "del" ) );
// To see negative idf, keep comment the following line
- //writer.optimize();
+ //writer.forceMerge(1);
writer.close();
}
@@ -1759,7 +1759,7 @@ public class HighlighterTest extends Bas
doc = new Document();
doc.add(nfield);
writer.addDocument(doc, analyzer);
- writer.optimize();
+ writer.forceMerge(1);
writer.close();
reader = IndexReader.open(ramDir, true);
numHighlights = 0;
Modified: lucene/dev/branches/solrcloud/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndex.java?rev=1201946&r1=1201945&r2=1201946&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndex.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndex.java Mon Nov 14 22:36:20 2011
@@ -96,7 +96,7 @@ public class InstantiatedIndex
* Creates a new instantiated index that looks just like the index in a specific state as represented by a reader.
*
* @param sourceIndexReader the source index this new instantiated index will be copied from.
- * @throws IOException if the source index is not optimized, or when accessing the source.
+ * @throws IOException if the source index is not single-segment, or when accessing the source.
*/
public InstantiatedIndex(IndexReader sourceIndexReader) throws IOException {
this(sourceIndexReader, null);
@@ -109,13 +109,13 @@ public class InstantiatedIndex
*
* @param sourceIndexReader the source index this new instantiated index will be copied from.
* @param fields fields to be added, or null for all
- * @throws IOException if the source index is not optimized, or when accessing the source.
+ * @throws IOException if the source index is not single-segment, or when accessing the source.
*/
public InstantiatedIndex(IndexReader sourceIndexReader, Set<String> fields) throws IOException {
- if (!sourceIndexReader.isOptimized()) {
- System.out.println(("Source index is not optimized."));
- //throw new IOException("Source index is not optimized.");
+ if (sourceIndexReader.getSequentialSubReaders().length != 1) {
+ System.out.println(("Source index has more than one segment."));
+ //throw new IOException("Source index has more than one segment.");
}
Modified: lucene/dev/branches/solrcloud/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexReader.java?rev=1201946&r1=1201945&r2=1201946&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexReader.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexReader.java Mon Nov 14 22:36:20 2011
@@ -56,14 +56,6 @@ public class InstantiatedIndexReader ext
}
/**
- * @return always true.
- */
- @Override
- public boolean isOptimized() {
- return true;
- }
-
- /**
* An InstantiatedIndexReader is not a snapshot in time, it is completely in
* sync with the latest commit to the store!
*
Modified: lucene/dev/branches/solrcloud/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java?rev=1201946&r1=1201945&r2=1201946&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java Mon Nov 14 22:36:20 2011
@@ -98,7 +98,6 @@ public class TestIndicesEquals extends L
// create dir data
IndexWriter indexWriter = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer(new Random(seed))).setMergePolicy(newLogMergePolicy()));
- indexWriter.setInfoStream(VERBOSE ? System.out : null);
if (VERBOSE) {
System.out.println("TEST: make test index");
}
Modified: lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.java?rev=1201946&r1=1201945&r2=1201946&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.java Mon Nov 14 22:36:20 2011
@@ -105,22 +105,22 @@ public class BalancedSegmentMergePolicy
}
@Override
- public MergeSpecification findMergesForOptimize(SegmentInfos infos, int maxNumSegments, Map<SegmentInfo,Boolean> segmentsToOptimize) throws IOException {
+ public MergeSpecification findForcedMerges(SegmentInfos infos, int maxNumSegments, Map<SegmentInfo,Boolean> segmentsToMerge) throws IOException {
assert maxNumSegments > 0;
MergeSpecification spec = null;
- if (!isOptimized(infos, maxNumSegments, segmentsToOptimize)) {
+ if (!isMerged(infos, maxNumSegments, segmentsToMerge)) {
// Find the newest (rightmost) segment that needs to
- // be optimized (other segments may have been flushed
- // since optimize started):
+ // be merged (other segments may have been flushed
+ // since the merge started):
int last = infos.size();
while(last > 0) {
final SegmentInfo info = infos.info(--last);
- if (segmentsToOptimize.containsKey(info)) {
+ if (segmentsToMerge.containsKey(info)) {
last++;
break;
}
@@ -130,9 +130,9 @@ public class BalancedSegmentMergePolicy
if (maxNumSegments == 1) {
- // Since we must optimize down to 1 segment, the
+ // Since we must merge down to 1 segment, the
// choice is simple:
- if (last > 1 || !isOptimized(infos.info(0))) {
+ if (last > 1 || !isMerged(infos.info(0))) {
spec = new MergeSpecification();
spec.add(new OneMerge(infos.asList().subList(0, last)));
Modified: lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/IndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/IndexSplitter.java?rev=1201946&r1=1201945&r2=1201946&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/IndexSplitter.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/IndexSplitter.java Mon Nov 14 22:36:20 2011
@@ -36,8 +36,8 @@ import org.apache.lucene.store.FSDirecto
*
* <p>This tool does file-level copying of segments files.
* This means it's unable to split apart a single segment
- * into multiple segments. For example if your index is
- * optimized, this tool won't help. Also, it does basic
+ * into multiple segments. For example if your index is a
+ * single segment, this tool won't help. Also, it does basic
* file-level copying (using simple
* File{In,Out}putStream) so it will not work with non
* FSDirectory Directory impls.</p>
Modified: lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingCodec.java?rev=1201946&r1=1201945&r2=1201946&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingCodec.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingCodec.java Mon Nov 14 22:36:20 2011
@@ -19,9 +19,9 @@ package org.apache.lucene.index.codecs.a
import org.apache.lucene.index.codecs.Codec;
import org.apache.lucene.index.codecs.DefaultDocValuesFormat;
-import org.apache.lucene.index.codecs.DefaultFieldsFormat;
+import org.apache.lucene.index.codecs.DefaultStoredFieldsFormat;
import org.apache.lucene.index.codecs.DocValuesFormat;
-import org.apache.lucene.index.codecs.FieldsFormat;
+import org.apache.lucene.index.codecs.StoredFieldsFormat;
import org.apache.lucene.index.codecs.PostingsFormat;
import org.apache.lucene.index.codecs.SegmentInfosFormat;
import org.apache.lucene.index.codecs.lucene40.Lucene40Codec;
@@ -44,7 +44,7 @@ public class AppendingCodec extends Code
private final PostingsFormat postings = new AppendingPostingsFormat();
private final SegmentInfosFormat infos = new AppendingSegmentInfosFormat();
- private final FieldsFormat fields = new DefaultFieldsFormat();
+ private final StoredFieldsFormat fields = new DefaultStoredFieldsFormat();
private final DocValuesFormat docValues = new DefaultDocValuesFormat();
@Override
@@ -53,7 +53,7 @@ public class AppendingCodec extends Code
}
@Override
- public FieldsFormat fieldsFormat() {
+ public StoredFieldsFormat storedFieldsFormat() {
return fields;
}
Modified: lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/misc/IndexMergeTool.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/misc/IndexMergeTool.java?rev=1201946&r1=1201945&r2=1201946&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/misc/IndexMergeTool.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/misc/IndexMergeTool.java Mon Nov 14 22:36:20 2011
@@ -50,8 +50,8 @@ public class IndexMergeTool {
System.out.println("Merging...");
writer.addIndexes(indexes);
- System.out.println("Optimizing...");
- writer.optimize();
+ System.out.println("Full merge...");
+ writer.forceMerge(1);
writer.close();
System.out.println("Done.");
}
Modified: lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/store/WindowsDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/store/WindowsDirectory.java?rev=1201946&r1=1201945&r2=1201946&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/store/WindowsDirectory.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/store/WindowsDirectory.java Mon Nov 14 22:36:20 2011
@@ -97,7 +97,7 @@ public class WindowsDirectory extends FS
}
if (bytesRead != length) {
- throw new EOFException("Read past EOF: " + this);
+ throw new EOFException("Read past EOF (resource: " + this + ")");
}
}
Modified: lucene/dev/branches/solrcloud/lucene/contrib/misc/src/test/org/apache/lucene/index/TestIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/misc/src/test/org/apache/lucene/index/TestIndexSplitter.java?rev=1201946&r1=1201945&r2=1201946&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/misc/src/test/org/apache/lucene/index/TestIndexSplitter.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/misc/src/test/org/apache/lucene/index/TestIndexSplitter.java Mon Nov 14 22:36:20 2011
@@ -94,7 +94,7 @@ public class TestIndexSplitter extends L
fsDir.close();
}
- public void testDeleteThenOptimize() throws Exception {
+ public void testDeleteThenFullMerge() throws Exception {
// Create directories where the indexes will reside
File indexPath = new File(TEMP_DIR, "testfilesplitter");
_TestUtil.rmDir(indexPath);
@@ -134,7 +134,7 @@ public class TestIndexSplitter extends L
indexReader.close();
fsDirDest.close();
- // Optimize the split index
+ // Fully merge the split index
mergePolicy = new LogByteSizeMergePolicy();
mergePolicy.setNoCFSRatio(1);
iwConfig = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random))
@@ -142,7 +142,7 @@ public class TestIndexSplitter extends L
.setMergePolicy(mergePolicy);
fsDirDest = newFSDirectory(indexSplitPath);
indexWriter = new IndexWriter(fsDirDest, iwConfig);
- indexWriter.optimize();
+ indexWriter.forceMerge(1);
indexWriter.close();
fsDirDest.close();
Modified: lucene/dev/branches/solrcloud/lucene/contrib/misc/src/test/org/apache/lucene/index/codecs/appending/TestAppendingCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/misc/src/test/org/apache/lucene/index/codecs/appending/TestAppendingCodec.java?rev=1201946&r1=1201945&r2=1201946&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/misc/src/test/org/apache/lucene/index/codecs/appending/TestAppendingCodec.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/misc/src/test/org/apache/lucene/index/codecs/appending/TestAppendingCodec.java Mon Nov 14 22:36:20 2011
@@ -121,7 +121,7 @@ public class TestAppendingCodec extends
writer.addDocument(doc);
writer.commit();
writer.addDocument(doc);
- writer.optimize();
+ writer.forceMerge(1);
writer.close();
IndexReader reader = IndexReader.open(dir, null, true, 1);
assertEquals(2, reader.numDocs());
Modified: lucene/dev/branches/solrcloud/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java?rev=1201946&r1=1201945&r2=1201946&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java Mon Nov 14 22:36:20 2011
@@ -42,7 +42,6 @@ public class TestHighFreqTerms extends L
writer = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer(random, MockTokenizer.WHITESPACE, false))
.setMaxBufferedDocs(2));
- writer.setInfoStream(VERBOSE ? System.out : null);
indexDocs(writer);
reader = IndexReader.open(dir, true);
_TestUtil.checkIndex(dir);
Modified: lucene/dev/branches/solrcloud/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java?rev=1201946&r1=1201945&r2=1201946&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java Mon Nov 14 22:36:20 2011
@@ -57,7 +57,7 @@ public class DuplicateFilterTest extends
// Until we fix LUCENE-2348, the index must
// have only 1 segment:
- writer.optimize();
+ writer.forceMerge(1);
reader = writer.getReader();
writer.close();
Modified: lucene/dev/branches/solrcloud/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java?rev=1201946&r1=1201945&r2=1201946&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java Mon Nov 14 22:36:20 2011
@@ -68,7 +68,7 @@ public class TestSpanRegexQuery extends
doc = new Document();
doc.add(newField("field", "first auto update", TextField.TYPE_UNSTORED));
writer.addDocument(doc);
- writer.optimize();
+ writer.forceMerge(1);
writer.close();
IndexSearcher searcher = new IndexSearcher(directory, true);
@@ -98,14 +98,14 @@ public class TestSpanRegexQuery extends
IndexWriter writerA = new IndexWriter(indexStoreA, newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer(random)).setOpenMode(OpenMode.CREATE));
writerA.addDocument(lDoc);
- writerA.optimize();
+ writerA.forceMerge(1);
writerA.close();
// creating second index writer
IndexWriter writerB = new IndexWriter(indexStoreB, newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer(random)).setOpenMode(OpenMode.CREATE));
writerB.addDocument(lDoc2);
- writerB.optimize();
+ writerB.forceMerge(1);
writerB.close();
}
}