You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2011/11/21 00:45:35 UTC
svn commit: r1204297 [1/10] - in /lucene/dev/branches/solrcloud: ./
dev-tools/eclipse/ dev-tools/idea/lucene/contrib/
dev-tools/idea/lucene/contrib/instantiated/ dev-tools/maven/lucene/contrib/
dev-tools/maven/lucene/contrib/instantiated/ lucene/ lucen...
Author: markrmiller
Date: Sun Nov 20 23:45:25 2011
New Revision: 1204297
URL: http://svn.apache.org/viewvc?rev=1204297&view=rev
Log:
merge up to r1204271
Added:
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/TermVectorsConsumer.java
- copied unchanged from r1204292, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermVectorsConsumer.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/TermVectorsConsumerPerField.java
- copied unchanged from r1204292, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermVectorsConsumerPerField.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultFieldInfosFormat.java
- copied unchanged from r1204292, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/DefaultFieldInfosFormat.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultFieldInfosReader.java
- copied unchanged from r1204292, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/DefaultFieldInfosReader.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultFieldInfosWriter.java
- copied unchanged from r1204292, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/DefaultFieldInfosWriter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultTermVectorsFormat.java
- copied unchanged from r1204292, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/DefaultTermVectorsFormat.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultTermVectorsReader.java
- copied unchanged from r1204292, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/DefaultTermVectorsReader.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultTermVectorsWriter.java
- copied unchanged from r1204292, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/DefaultTermVectorsWriter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/FieldInfosFormat.java
- copied unchanged from r1204292, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/FieldInfosFormat.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/FieldInfosReader.java
- copied unchanged from r1204292, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/FieldInfosReader.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/FieldInfosWriter.java
- copied unchanged from r1204292, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/FieldInfosWriter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/TermVectorsFormat.java
- copied unchanged from r1204292, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/TermVectorsFormat.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/TermVectorsReader.java
- copied unchanged from r1204292, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/TermVectorsReader.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/TermVectorsWriter.java
- copied unchanged from r1204292, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/TermVectorsWriter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextFieldInfosFormat.java
- copied unchanged from r1204292, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextFieldInfosFormat.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextFieldInfosReader.java
- copied unchanged from r1204292, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextFieldInfosReader.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextFieldInfosWriter.java
- copied unchanged from r1204292, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextFieldInfosWriter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextSegmentInfosFormat.java
- copied unchanged from r1204292, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextSegmentInfosFormat.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextSegmentInfosReader.java
- copied unchanged from r1204292, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextSegmentInfosReader.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextSegmentInfosWriter.java
- copied unchanged from r1204292, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextSegmentInfosWriter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextTermVectorsFormat.java
- copied unchanged from r1204292, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextTermVectorsFormat.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextTermVectorsReader.java
- copied unchanged from r1204292, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextTermVectorsReader.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextTermVectorsWriter.java
- copied unchanged from r1204292, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextTermVectorsWriter.java
lucene/dev/branches/solrcloud/modules/facet/src/java/org/apache/lucene/facet/taxonomy/InconsistentTaxonomyException.java
- copied unchanged from r1204292, lucene/dev/trunk/modules/facet/src/java/org/apache/lucene/facet/taxonomy/InconsistentTaxonomyException.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/response/transform/EditorialMarkerFactory.java
- copied unchanged from r1204292, lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/EditorialMarkerFactory.java
Removed:
lucene/dev/branches/solrcloud/dev-tools/idea/lucene/contrib/instantiated/
lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/instantiated/
lucene/dev/branches/solrcloud/lucene/contrib/instantiated/
lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/TermVectorAccessor.java
lucene/dev/branches/solrcloud/lucene/contrib/misc/src/test/org/apache/lucene/index/TestTermVectorAccessor.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/FieldSortedTermVectorMapper.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/PositionBasedTermVectorMapper.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/SegmentTermPositionVector.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/SegmentTermVector.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/SortedTermVectorMapper.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/TermFreqVector.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/TermPositionVector.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/TermVectorEntry.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/TermVectorEntryFreqSortedComparator.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/TermVectorMapper.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/TermVectorOffsetInfo.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/TermVectorsReader.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/TermVectorsTermsWriterPerField.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/TermVectorsWriter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/QueryTermVector.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestPositionBasedTermVectorMapper.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestQueryTermVector.java
Modified:
lucene/dev/branches/solrcloud/ (props changed)
lucene/dev/branches/solrcloud/dev-tools/eclipse/dot.classpath
lucene/dev/branches/solrcloud/dev-tools/idea/lucene/contrib/ (props changed)
lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/pom.xml.template
lucene/dev/branches/solrcloud/lucene/ (props changed)
lucene/dev/branches/solrcloud/lucene/CHANGES.txt
lucene/dev/branches/solrcloud/lucene/build.xml
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/SearchFiles.java
lucene/dev/branches/solrcloud/lucene/contrib/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java
lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java
lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenStreamFromTermPositionVector.java
lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java
lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/package.html
lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java
lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java
lucene/dev/branches/solrcloud/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
lucene/dev/branches/solrcloud/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.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/FieldNormModifier.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/GetTermInfo.java
lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java
lucene/dev/branches/solrcloud/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java
lucene/dev/branches/solrcloud/lucene/contrib/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.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/TestLengthNormModifier.java
lucene/dev/branches/solrcloud/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java
lucene/dev/branches/solrcloud/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedTermRangeQuery.java
lucene/dev/branches/solrcloud/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/RegexQuery.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/test/org/apache/lucene/spatial/tier/TestCartesian.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/CheckIndex.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/DocTermOrds.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/DocumentsWriterPerThread.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/FieldInfo.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/FieldInfos.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/Fields.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/FieldsEnum.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/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/IndexWriter.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/MultiFields.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/MultiFieldsEnum.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/MultiTerms.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/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/StoredFieldsConsumer.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/Terms.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/TermsHash.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/BlockTermsReader.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/BlockTreeTermsReader.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/DefaultSegmentInfosWriter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultStoredFieldsReader.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultStoredFieldsWriter.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/StoredFieldsReader.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/StoredFieldsWriter.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/Lucene3xFields.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/lucene40/Lucene40PostingsReader.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40PostingsWriter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/memory/MemoryPostingsFormat.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/perfield/PerFieldPostingsFormat.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/pulsing/PulsingPostingsReader.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/sep/SepPostingsReader.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/sep/SepPostingsWriter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextCodec.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/SimpleTextStoredFieldsWriter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/values/MultiIndexDocValues.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/FieldComparator.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/FuzzyQuery.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/FuzzyTermsEnum.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/IndexSearcher.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/NRTManager.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/NumericRangeFilter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/NumericRangeQuery.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/PhraseQuery.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/PrefixQuery.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/TermQuery.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/TermRangeQuery.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/util/IOUtils.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/NumericUtils.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/StringHelper.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/TermContext.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/automaton/CompiledAutomaton.java
lucene/dev/branches/solrcloud/lucene/src/java/overview.html
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/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/index/codecs/preflexrw/PreFlexFieldsWriter.java
lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/codecs/preflexrw/TermInfosWriter.java
lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/codecs/ramonly/RAMOnlyPostingsFormat.java
lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/search/AssertingIndexSearcher.java
lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/search/CheckHits.java
lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/store/MockDirectoryWrapper.java
lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCase.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/TestDemo.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/TestSearch.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/TestSearchForDuplicates.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/TestBackwardsCompatibility.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/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/TestFieldInfos.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/TestFilterIndexReader.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/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/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/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/TestIndexWriterMerging.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/TestIndexableField.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/TestNoMergePolicy.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/TestParallelTermEnum.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/TestSegmentMerger.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSegmentReader.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/TestSizeBoundedForceMerge.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/TestStressIndexing.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/TestSumDocFreq.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestTermVectorsReader.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/TestTermsEnum2.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/TestTransactions.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/codecs/lucene3x/TestSurrogates.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/pulsing/Test10KPulsings.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/codecs/pulsing/TestPulsingReuse.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/TestBoolean2.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/TestMultiPhraseQuery.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/TestMultiThreadTermVectors.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/TestPhrasePrefixQuery.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestPrefixRandom.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestRegexpRandom2.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/TestSetNorm.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/TestTermRangeQuery.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/TestWildcard.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/store/TestLockFactory.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/store/TestWindowsMMap.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/util/TestNumericUtils.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/util/fst/TestFSTs.java
lucene/dev/branches/solrcloud/modules/analysis/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java
lucene/dev/branches/solrcloud/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java
lucene/dev/branches/solrcloud/modules/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java
lucene/dev/branches/solrcloud/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java
lucene/dev/branches/solrcloud/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/QueryDriver.java
lucene/dev/branches/solrcloud/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/QualityQueriesFinder.java
lucene/dev/branches/solrcloud/modules/benchmark/src/test/org/apache/lucene/benchmark/BenchmarkTestCase.java
lucene/dev/branches/solrcloud/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
lucene/dev/branches/solrcloud/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/DocMakerTest.java
lucene/dev/branches/solrcloud/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/LineDocSourceTest.java
lucene/dev/branches/solrcloud/modules/benchmark/src/test/org/apache/lucene/benchmark/quality/TestQualityRun.java
lucene/dev/branches/solrcloud/modules/facet/docs/userguide.html
lucene/dev/branches/solrcloud/modules/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyReader.java
lucene/dev/branches/solrcloud/modules/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java
lucene/dev/branches/solrcloud/modules/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.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/taxonomy/directory/TestDirectoryTaxonomyReader.java
lucene/dev/branches/solrcloud/modules/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyWriter.java
lucene/dev/branches/solrcloud/modules/queries/src/java/org/apache/lucene/queries/TermsFilter.java
lucene/dev/branches/solrcloud/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java
lucene/dev/branches/solrcloud/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java
lucene/dev/branches/solrcloud/modules/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.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/TestFieldScoreQuery.java
lucene/dev/branches/solrcloud/modules/queries/src/test/org/apache/lucene/queries/function/TestOrdValues.java
lucene/dev/branches/solrcloud/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndPrefixQuery.java
lucene/dev/branches/solrcloud/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTermQuery.java
lucene/dev/branches/solrcloud/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTruncQuery.java
lucene/dev/branches/solrcloud/modules/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java
lucene/dev/branches/solrcloud/modules/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java
lucene/dev/branches/solrcloud/modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java
lucene/dev/branches/solrcloud/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/BooleanQueryTst.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/HighFrequencyDictionary.java
lucene/dev/branches/solrcloud/modules/suggest/src/java/org/apache/lucene/search/spell/LuceneDictionary.java
lucene/dev/branches/solrcloud/modules/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.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/test-files/ (props changed)
lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler/src/test/org/ (props changed)
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/analysis/TrieTokenizerFactory.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/core/SolrCore.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/SnapShooter.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/QueryElevationComponent.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.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/handler/component/TermsComponent.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/response/transform/DocTransformer.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/response/transform/DocTransformers.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/response/transform/RenameFieldsTransformer.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/response/transform/ScoreAugmenter.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/response/transform/TransformContext.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/response/transform/ValueSourceAugmenter.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.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/function/FileFloatSource.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
lucene/dev/branches/solrcloud/solr/core/src/test/ (props changed)
lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.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/search/TestSort.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/solrconfig.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/client/solrj/response/SpellCheckResponse.java
lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/SolrDocument.java
lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/params/QueryElevationParams.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/client/solrj/response/TestSpellCheckResponse.java
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/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/eclipse/dot.classpath?rev=1204297&r1=1204296&r2=1204297&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/solrcloud/dev-tools/eclipse/dot.classpath Sun Nov 20 23:45:25 2011
@@ -10,8 +10,6 @@
<classpathentry kind="src" path="lucene/contrib/demo/src/test"/>
<classpathentry kind="src" path="lucene/contrib/highlighter/src/java"/>
<classpathentry kind="src" path="lucene/contrib/highlighter/src/test"/>
- <classpathentry kind="src" path="lucene/contrib/instantiated/src/java"/>
- <classpathentry kind="src" path="lucene/contrib/instantiated/src/test"/>
<classpathentry kind="src" path="lucene/contrib/memory/src/java"/>
<classpathentry kind="src" path="lucene/contrib/memory/src/test"/>
<classpathentry kind="src" path="lucene/contrib/misc/src/java"/>
Modified: lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/pom.xml.template?rev=1204297&r1=1204296&r2=1204297&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/pom.xml.template (original)
+++ lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/pom.xml.template Sun Nov 20 23:45:25 2011
@@ -33,7 +33,6 @@
<modules>
<module>demo</module>
<module>highlighter</module>
- <module>instantiated</module>
<module>memory</module>
<module>misc</module>
<module>sandbox</module>
Modified: lucene/dev/branches/solrcloud/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/CHANGES.txt?rev=1204297&r1=1204296&r2=1204297&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/solrcloud/lucene/CHANGES.txt Sun Nov 20 23:45:25 2011
@@ -32,6 +32,11 @@ Changes in backwards compatibility polic
now specify the skipDocs explicitly (typically this will be the
deleted docs, but in general you can provide any Bits).
+ - The term vectors APIs (TermFreqVector, TermPositionVector,
+ TermVectorMapper) have been removed in favor of the above
+ flexible indexing APIs, presenting a single-document inverted
+ index of the document from the term vectors.
+
- MultiReader ctor now throws IOException
- Directory.copy/Directory.copyTo now copies all files (not just
@@ -724,6 +729,13 @@ Bug fixes
* LUCENE-3548: Fix CharsRef#append to extend length of the existing char[]
and preserve existing chars. (Simon Willnauer)
+* LUCENE-3582: Normalize NaN values in NumericUtils.floatToSortableInt() /
+ NumericUtils.doubleToSortableLong(), so this is consistent with stored
+ fields. Also fix NumericRangeQuery to not falsely hit NaNs on half-open
+ ranges (one bound is null). Because of normalization, NumericRangeQuery
+ can now be used to hit NaN values by creating a query with
+ upper == lower == NaN (inclusive). (Dawid Weiss, Uwe Schindler)
+
API Changes
* LUCENE-3454: Rename IndexWriter.optimize to forceMerge to discourage
@@ -741,6 +753,15 @@ API Changes
* LUCENE-3574: Deprecate outdated constants in org.apache.lucene.util.Constants
and add new ones for Java 6 and Java 7. (Uwe Schindler)
+* LUCENE-3571: Deprecate IndexSearcher(Directory). Use the constructors
+ that take IndexReader instead. (Robert Muir)
+
+* LUCENE-3577: Rename IndexWriter.expungeDeletes to forceMergeDeletes,
+ and revamped the javadocs, to discourage
+ use of this method since it is horribly costly and rarely
+ justified. MergePolicy.findMergesToExpungeDeletes was renamed to
+ findForcedDeletesMerges. (Robert Muir, Mike McCandless)
+
New Features
* LUCENE-3448: Added FixedBitSet.and(other/DISI), andNot(other/DISI).
Modified: lucene/dev/branches/solrcloud/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/build.xml?rev=1204297&r1=1204296&r2=1204297&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/build.xml (original)
+++ lucene/dev/branches/solrcloud/lucene/build.xml Sun Nov 20 23:45:25 2011
@@ -252,7 +252,6 @@
<packageset dir="contrib/demo/src/java"/>
<packageset dir="contrib/highlighter/src/java"/>
- <packageset dir="contrib/instantiated/src/java"/>
<packageset dir="contrib/memory/src/java"/>
<packageset dir="contrib/misc/src/java"/>
<packageset dir="contrib/sandbox/src/java"/>
@@ -268,7 +267,6 @@
<group title="contrib: Demo" packages="org.apache.lucene.demo*"/>
<group title="contrib: ICU" packages="org.apache.lucene.collation*"/>
<group title="contrib: Highlighter" packages="org.apache.lucene.search.highlight*:org.apache.lucene.search.vectorhighlight*"/>
- <group title="contrib: Instantiated" packages="org.apache.lucene.store.instantiated*"/>
<group title="contrib: Memory" packages="org.apache.lucene.index.memory*"/>
<group title="contrib: Misc " packages="org.apache.lucene.misc*"/>
<group title="contrib: Sandbox" packages="org.apache.lucene.sandbox*"/>
Modified: lucene/dev/branches/solrcloud/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/common-build.xml?rev=1204297&r1=1204296&r2=1204297&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/common-build.xml (original)
+++ lucene/dev/branches/solrcloud/lucene/common-build.xml Sun Nov 20 23:45:25 2011
@@ -808,7 +808,7 @@
<!-- <compilerarg line="-Xmaxwarns 10000000"/>
<compilerarg line="-Xmaxerrs 10000000"/> -->
<!-- for generics in Java 1.5: -->
- <compilerarg line="-Xlint -Xlint:-deprecation -Xlint:-serial"/>
+ <compilerarg line="-Xlint -Xlint:-deprecation -Xlint:-serial"/>
</javac>
</sequential>
</macrodef>
Modified: lucene/dev/branches/solrcloud/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/CHANGES.txt?rev=1204297&r1=1204296&r2=1204297&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/CHANGES.txt Sun Nov 20 23:45:25 2011
@@ -13,6 +13,8 @@ Changes in Runtime Behavior
provide an analyzer that returns 1 from the offsetGap method.
(Mike McCandless)
+ * LUCENE-2621: Removed contrib/instantiated. (Robert Muir)
+
Build
* LUCENE-2845: Moved contrib/benchmark to modules.
Modified: lucene/dev/branches/solrcloud/lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java?rev=1204297&r1=1204296&r2=1204297&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java Sun Nov 20 23:45:25 2011
@@ -27,6 +27,7 @@ import java.util.Date;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.document.Document;
+import org.apache.lucene.index.IndexReader;
import org.apache.lucene.queryparser.classic.QueryParser;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
@@ -85,7 +86,8 @@ public class SearchFiles {
}
}
- IndexSearcher searcher = new IndexSearcher(FSDirectory.open(new File(index)));
+ IndexReader reader = IndexReader.open(FSDirectory.open(new File(index)));
+ IndexSearcher searcher = new IndexSearcher(reader);
Analyzer analyzer = new StandardAnalyzer(Version.LUCENE_40);
BufferedReader in = null;
@@ -130,6 +132,7 @@ public class SearchFiles {
}
}
searcher.close();
+ reader.close();
}
/**
Modified: lucene/dev/branches/solrcloud/lucene/contrib/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java?rev=1204297&r1=1204296&r2=1204297&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java Sun Nov 20 23:45:25 2011
@@ -38,6 +38,7 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.CorruptIndexException;
+import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.queryparser.xml.CorePlusExtensionsParser;
@@ -145,6 +146,8 @@ public class FormBasedXmlQueryDemo exten
writer.close();
//open searcher
- searcher = new IndexSearcher(rd, true);
+ // this example never closes it reader!
+ IndexReader reader = IndexReader.open(rd);
+ searcher = new IndexSearcher(reader);
}
}
Modified: lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java?rev=1204297&r1=1204296&r2=1204297&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java Sun Nov 20 23:45:25 2011
@@ -32,10 +32,11 @@ import org.apache.lucene.analysis.tokena
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
import org.apache.lucene.document.Document;
+import org.apache.lucene.index.DocsAndPositionsEnum;
+import org.apache.lucene.index.Fields;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.TermFreqVector;
-import org.apache.lucene.index.TermPositionVector;
-import org.apache.lucene.index.TermVectorOffsetInfo;
+import org.apache.lucene.index.Terms;
+import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.util.ArrayUtil;
import org.apache.lucene.util.BytesRef;
@@ -69,12 +70,14 @@ public class TokenSources {
String field, Document doc, Analyzer analyzer) throws IOException {
TokenStream ts = null;
- TermFreqVector tfv = reader.getTermFreqVector(docId, field);
- if (tfv != null) {
- if (tfv instanceof TermPositionVector) {
- ts = getTokenStream((TermPositionVector) tfv);
+ Fields vectors = reader.getTermVectors(docId);
+ if (vectors != null) {
+ Terms vector = vectors.terms(field);
+ if (vector != null) {
+ ts = getTokenStream(vector);
}
}
+
// No token info stored so fall back to analyzing raw content
if (ts == null) {
ts = getTokenStream(doc, field, analyzer);
@@ -99,12 +102,14 @@ public class TokenSources {
String field, Analyzer analyzer) throws IOException {
TokenStream ts = null;
- TermFreqVector tfv = reader.getTermFreqVector(docId, field);
- if (tfv != null) {
- if (tfv instanceof TermPositionVector) {
- ts = getTokenStream((TermPositionVector) tfv);
+ Fields vectors = reader.getTermVectors(docId);
+ if (vectors != null) {
+ Terms vector = vectors.terms(field);
+ if (vector != null) {
+ ts = getTokenStream(vector);
}
}
+
// No token info stored so fall back to analyzing raw content
if (ts == null) {
ts = getTokenStream(reader, docId, field, analyzer);
@@ -112,10 +117,25 @@ public class TokenSources {
return ts;
}
- public static TokenStream getTokenStream(TermPositionVector tpv) {
+ public static TokenStream getTokenStream(Terms vector) throws IOException {
// assumes the worst and makes no assumptions about token position
// sequences.
- return getTokenStream(tpv, false);
+ return getTokenStream(vector, false);
+ }
+
+ private static boolean hasPositions(Terms vector) throws IOException {
+ final TermsEnum termsEnum = vector.iterator(null);
+ if (termsEnum.next() != null) {
+ DocsAndPositionsEnum dpEnum = termsEnum.docsAndPositions(null, null);
+ if (dpEnum != null) {
+ int pos = dpEnum.nextPosition();
+ if (pos >= 0) {
+ return true;
+ }
+ }
+ }
+
+ return false;
}
/**
@@ -144,9 +164,10 @@ public class TokenSources {
* numbers have no overlaps or gaps. If looking to eek out the last
* drops of performance, set to true. If in doubt, set to false.
*/
- public static TokenStream getTokenStream(TermPositionVector tpv,
- boolean tokenPositionsGuaranteedContiguous) {
- if (!tokenPositionsGuaranteedContiguous && tpv.getTermPositions(0) != null) {
+ public static TokenStream getTokenStream(Terms tpv,
+ boolean tokenPositionsGuaranteedContiguous)
+ throws IOException {
+ if (!tokenPositionsGuaranteedContiguous && hasPositions(tpv)) {
return new TokenStreamFromTermPositionVector(tpv);
}
@@ -186,56 +207,57 @@ public class TokenSources {
}
}
// code to reconstruct the original sequence of Tokens
- BytesRef[] terms = tpv.getTerms();
- int[] freq = tpv.getTermFrequencies();
+ TermsEnum termsEnum = tpv.iterator(null);
int totalTokens = 0;
- for (int t = 0; t < freq.length; t++) {
- totalTokens += freq[t];
+ while(termsEnum.next() != null) {
+ totalTokens += (int) termsEnum.totalTermFreq();
}
Token tokensInOriginalOrder[] = new Token[totalTokens];
ArrayList<Token> unsortedTokens = null;
- for (int t = 0; t < freq.length; t++) {
- TermVectorOffsetInfo[] offsets = tpv.getOffsets(t);
- if (offsets == null) {
+ termsEnum = tpv.iterator(null);
+ BytesRef text;
+ DocsAndPositionsEnum dpEnum = null;
+ while ((text = termsEnum.next()) != null) {
+
+ dpEnum = termsEnum.docsAndPositions(null, dpEnum);
+ if (dpEnum == null || (!dpEnum.attributes().hasAttribute(OffsetAttribute.class))) {
throw new IllegalArgumentException(
"Required TermVector Offset information was not found");
}
- int[] pos = null;
- if (tokenPositionsGuaranteedContiguous) {
- // try get the token position info to speed up assembly of tokens into
- // sorted sequence
- pos = tpv.getTermPositions(t);
- }
- if (pos == null) {
- // tokens NOT stored with positions or not guaranteed contiguous - must
- // add to list and sort later
- if (unsortedTokens == null) {
- unsortedTokens = new ArrayList<Token>();
- }
- for (int tp = 0; tp < offsets.length; tp++) {
- Token token = new Token(terms[t].utf8ToString(),
- offsets[tp].getStartOffset(), offsets[tp].getEndOffset());
+ final String term = text.utf8ToString();
+
+ final OffsetAttribute offsetAtt = dpEnum.attributes().getAttribute(OffsetAttribute.class);
+ dpEnum.nextDoc();
+ final int freq = dpEnum.freq();
+ for(int posUpto=0;posUpto<freq;posUpto++) {
+ final int pos = dpEnum.nextPosition();
+ final Token token = new Token(term,
+ offsetAtt.startOffset(),
+ offsetAtt.endOffset());
+ if (tokenPositionsGuaranteedContiguous && pos != -1) {
+ // We have positions stored and a guarantee that the token position
+ // information is contiguous
+
+ // This may be fast BUT wont work if Tokenizers used which create >1
+ // token in same position or
+ // creates jumps in position numbers - this code would fail under those
+ // circumstances
+
+ // tokens stored with positions - can use this to index straight into
+ // sorted array
+ tokensInOriginalOrder[pos] = token;
+ } else {
+ // tokens NOT stored with positions or not guaranteed contiguous - must
+ // add to list and sort later
+ if (unsortedTokens == null) {
+ unsortedTokens = new ArrayList<Token>();
+ }
unsortedTokens.add(token);
}
- } else {
- // We have positions stored and a guarantee that the token position
- // information is contiguous
-
- // This may be fast BUT wont work if Tokenizers used which create >1
- // token in same position or
- // creates jumps in position numbers - this code would fail under those
- // circumstances
-
- // tokens stored with positions - can use this to index straight into
- // sorted array
- for (int tp = 0; tp < pos.length; tp++) {
- Token token = new Token(terms[t].utf8ToString(),
- offsets[tp].getStartOffset(), offsets[tp].getEndOffset());
- tokensInOriginalOrder[pos[tp]] = token;
- }
}
}
+
// If the field has been stored without position data we must perform a sort
if (unsortedTokens != null) {
tokensInOriginalOrder = unsortedTokens.toArray(new Token[unsortedTokens
@@ -253,18 +275,25 @@ public class TokenSources {
public static TokenStream getTokenStream(IndexReader reader, int docId,
String field) throws IOException {
- TermFreqVector tfv = reader.getTermFreqVector(docId, field);
- if (tfv == null) {
+
+ Fields vectors = reader.getTermVectors(docId);
+ if (vectors == null) {
throw new IllegalArgumentException(field + " in doc #" + docId
+ "does not have any term position data stored");
}
- if (tfv instanceof TermPositionVector) {
- TermPositionVector tpv = (TermPositionVector) reader.getTermFreqVector(
- docId, field);
- return getTokenStream(tpv);
+
+ Terms vector = vectors.terms(field);
+ if (vector == null) {
+ throw new IllegalArgumentException(field + " in doc #" + docId
+ + "does not have any term position data stored");
+ }
+
+ if (!hasPositions(vector)) {
+ throw new IllegalArgumentException(field + " in doc #" + docId
+ + "does not have any term position data stored");
}
- throw new IllegalArgumentException(field + " in doc #" + docId
- + "does not have any term position data stored");
+
+ return getTokenStream(vector);
}
// convenience method
Modified: lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenStreamFromTermPositionVector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenStreamFromTermPositionVector.java?rev=1204297&r1=1204296&r2=1204297&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenStreamFromTermPositionVector.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenStreamFromTermPositionVector.java Sun Nov 20 23:45:25 2011
@@ -27,8 +27,9 @@ import org.apache.lucene.analysis.TokenS
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
-import org.apache.lucene.index.TermPositionVector;
-import org.apache.lucene.index.TermVectorOffsetInfo;
+import org.apache.lucene.index.DocsAndPositionsEnum;
+import org.apache.lucene.index.Terms;
+import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.CollectionUtil;
@@ -47,31 +48,42 @@ public final class TokenStreamFromTermPo
/**
* Constructor.
*
- * @param termPositionVector TermPositionVector that contains the data for
+ * @param vector Terms that contains the data for
* creating the TokenStream. Must have positions and offsets.
*/
public TokenStreamFromTermPositionVector(
- final TermPositionVector termPositionVector) {
+ final Terms vector) throws IOException {
termAttribute = addAttribute(CharTermAttribute.class);
positionIncrementAttribute = addAttribute(PositionIncrementAttribute.class);
offsetAttribute = addAttribute(OffsetAttribute.class);
- final BytesRef[] terms = termPositionVector.getTerms();
- for (int i = 0; i < terms.length; i++) {
- final TermVectorOffsetInfo[] offsets = termPositionVector.getOffsets(i);
- final int[] termPositions = termPositionVector.getTermPositions(i);
- for (int j = 0; j < termPositions.length; j++) {
+ final TermsEnum termsEnum = vector.iterator(null);
+ BytesRef text;
+ DocsAndPositionsEnum dpEnum = null;
+ while((text = termsEnum.next()) != null) {
+ dpEnum = termsEnum.docsAndPositions(null, dpEnum);
+ dpEnum.nextDoc();
+ final int freq = dpEnum.freq();
+ final OffsetAttribute offsetAtt;
+ if (dpEnum.attributes().hasAttribute(OffsetAttribute.class)) {
+ offsetAtt = dpEnum.attributes().getAttribute(OffsetAttribute.class);
+ } else {
+ offsetAtt = null;
+ }
+ for (int j = 0; j < freq; j++) {
+ int pos = dpEnum.nextPosition();
Token token;
- if (offsets != null) {
- token = new Token(terms[i].utf8ToString(),
- offsets[j].getStartOffset(), offsets[j].getEndOffset());
+ if (offsetAtt != null) {
+ token = new Token(text.utf8ToString(),
+ offsetAtt.startOffset(),
+ offsetAtt.endOffset());
} else {
token = new Token();
- token.setEmpty().append(terms[i].utf8ToString());
+ token.setEmpty().append(text.utf8ToString());
}
// Yes - this is the position, not the increment! This is for
// sorting. This value
// will be corrected before use.
- token.setPositionIncrement(termPositions[j]);
+ token.setPositionIncrement(pos);
this.positionedTokens.add(token);
}
}
Modified: lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java?rev=1204297&r1=1204296&r2=1204297&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java Sun Nov 20 23:45:25 2011
@@ -21,10 +21,12 @@ import java.util.Collections;
import java.util.LinkedList;
import java.util.Set;
+import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
+import org.apache.lucene.index.DocsAndPositionsEnum;
+import org.apache.lucene.index.Fields;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.TermFreqVector;
-import org.apache.lucene.index.TermPositionVector;
-import org.apache.lucene.index.TermVectorOffsetInfo;
+import org.apache.lucene.index.Terms;
+import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.CharsRef;
@@ -76,30 +78,55 @@ public class FieldTermStack {
// just return to make null snippet if un-matched fieldName specified when fieldMatch == true
if( termSet == null ) return;
- TermFreqVector tfv = reader.getTermFreqVector( docId, fieldName );
- if( tfv == null ) return; // just return to make null snippets
- TermPositionVector tpv = null;
- try{
- tpv = (TermPositionVector)tfv;
+ final Fields vectors = reader.getTermVectors(docId);
+ if (vectors == null) {
+ // null snippet
+ return;
}
- catch( ClassCastException e ){
- return; // just return to make null snippets
+
+ final Terms vector = vectors.terms(fieldName);
+ if (vector == null) {
+ // null snippet
+ return;
}
-
+
final CharsRef spare = new CharsRef();
- for( BytesRef term : tpv.getTerms() ){
- if( !termSet.contains( term.utf8ToChars(spare).toString() ) ) continue;
- int index = tpv.indexOf( term );
- TermVectorOffsetInfo[] tvois = tpv.getOffsets( index );
- if( tvois == null ) return; // just return to make null snippets
- int[] poss = tpv.getTermPositions( index );
- if( poss == null ) return; // just return to make null snippets
- for( int i = 0; i < tvois.length; i++ )
- termList.add( new TermInfo( term.utf8ToChars(spare).toString(), tvois[i].getStartOffset(), tvois[i].getEndOffset(), poss[i] ) );
+ final TermsEnum termsEnum = vector.iterator(null);
+ DocsAndPositionsEnum dpEnum = null;
+ BytesRef text;
+ while ((text = termsEnum.next()) != null) {
+ final String term = text.utf8ToChars(spare).toString();
+ if (!termSet.contains(term)) {
+ continue;
+ }
+ dpEnum = termsEnum.docsAndPositions(null, dpEnum);
+ if (dpEnum == null) {
+ // null snippet
+ return;
+ }
+
+ if (!dpEnum.attributes().hasAttribute(OffsetAttribute.class)) {
+ // null snippet
+ return;
+ }
+ dpEnum.nextDoc();
+
+ final OffsetAttribute offsetAtt = dpEnum.attributes().getAttribute(OffsetAttribute.class);
+
+ final int freq = dpEnum.freq();
+
+ for(int i = 0;i < freq;i++) {
+ final int pos = dpEnum.nextPosition();
+ if (pos == -1) {
+ // null snippet
+ return;
+ }
+ termList.add(new TermInfo(term, offsetAtt.startOffset(), offsetAtt.endOffset(), pos));
+ }
}
// sort by position
- Collections.sort( termList );
+ Collections.sort(termList);
}
/**
Modified: lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/package.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/package.html?rev=1204297&r1=1204296&r2=1204297&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/package.html (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/package.html Sun Nov 20 23:45:25 2011
@@ -95,7 +95,7 @@ will be generated:</p>
</pre>
<h3>Step 2.</h3>
-<p>In Step 2, Fast Vector Highlighter generates {@link org.apache.lucene.search.vectorhighlight.FieldTermStack}. Fast Vector Highlighter uses {@link org.apache.lucene.index.TermFreqVector} data
+<p>In Step 2, Fast Vector Highlighter generates {@link org.apache.lucene.search.vectorhighlight.FieldTermStack}. Fast Vector Highlighter uses term vector data
(must be stored {@link org.apache.lucene.document.FieldType#setStoreTermVectorOffsets(boolean)} and {@link org.apache.lucene.document.FieldType#setStoreTermVectorPositions(boolean)})
to generate it. <code>FieldTermStack</code> keeps the terms in the user query.
Therefore, in this sample case, Fast Vector Highlighter generates the following <code>FieldTermStack</code>:</p>
Modified: lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java?rev=1204297&r1=1204296&r2=1204297&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java Sun Nov 20 23:45:25 2011
@@ -34,7 +34,6 @@ import org.apache.lucene.index.CorruptIn
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.Term;
-import org.apache.lucene.index.TermPositionVector;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.search.Collector;
import org.apache.lucene.search.IndexSearcher;
@@ -85,7 +84,7 @@ public class HighlighterPhraseTest exten
new QueryScorer(phraseQuery));
final TokenStream tokenStream = TokenSources
- .getTokenStream((TermPositionVector) indexReader.getTermFreqVector(
+ .getTokenStream(indexReader.getTermVector(
0, FIELD), false);
assertEquals(highlighter.getBestFragment(new TokenStreamConcurrent(),
TEXT), highlighter.getBestFragment(tokenStream, TEXT));
@@ -160,7 +159,7 @@ public class HighlighterPhraseTest exten
.nextSetBit(position + 1)) {
assertEquals(0, position);
final TokenStream tokenStream = TokenSources.getTokenStream(
- (TermPositionVector) indexReader.getTermFreqVector(position,
+ indexReader.getTermVector(position,
FIELD), false);
assertEquals(highlighter.getBestFragment(new TokenStreamConcurrent(),
TEXT), highlighter.getBestFragment(tokenStream, TEXT));
@@ -207,7 +206,7 @@ public class HighlighterPhraseTest exten
new SimpleHTMLFormatter(), new SimpleHTMLEncoder(),
new QueryScorer(phraseQuery));
final TokenStream tokenStream = TokenSources
- .getTokenStream((TermPositionVector) indexReader.getTermFreqVector(
+ .getTokenStream(indexReader.getTermVector(
0, FIELD), false);
assertEquals(
highlighter.getBestFragment(new TokenStreamSparse(), TEXT),
@@ -253,7 +252,7 @@ public class HighlighterPhraseTest exten
new SimpleHTMLFormatter(), new SimpleHTMLEncoder(),
new QueryScorer(phraseQuery));
final TokenStream tokenStream = TokenSources.getTokenStream(
- (TermPositionVector) indexReader.getTermFreqVector(0, FIELD), true);
+ indexReader.getTermVector(0, FIELD), true);
assertEquals("the fox <B>did</B> not <B>jump</B>", highlighter
.getBestFragment(tokenStream, TEXT));
} finally {
@@ -297,7 +296,7 @@ public class HighlighterPhraseTest exten
new SimpleHTMLFormatter(), new SimpleHTMLEncoder(),
new QueryScorer(phraseQuery));
final TokenStream tokenStream = TokenSources
- .getTokenStream((TermPositionVector) indexReader.getTermFreqVector(
+ .getTokenStream(indexReader.getTermVector(
0, FIELD), false);
assertEquals(
highlighter.getBestFragment(new TokenStreamSparse(), TEXT),
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=1204297&r1=1204296&r2=1204297&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 Sun Nov 20 23:45:25 2011
@@ -87,7 +87,7 @@ public class HighlighterTest extends Bas
phraseQuery.add(new Term(FIELD_NAME, "long"));
query = phraseQuery;
- searcher = new IndexSearcher(ramDir, true);
+ searcher = new IndexSearcher(reader);
TopDocs hits = searcher.search(query, 10);
QueryScorer scorer = new QueryScorer(query, FIELD_NAME);
@@ -330,7 +330,7 @@ public class HighlighterTest extends Bas
public void testSpanRegexQuery() throws Exception {
query = new SpanOrQuery(new SpanMultiTermQueryWrapper<RegexpQuery>(new RegexpQuery(new Term(FIELD_NAME, "ken.*"))));
- searcher = new IndexSearcher(ramDir, true);
+ searcher = new IndexSearcher(reader);
hits = searcher.search(query, 100);
int maxNumFragmentsRequired = 2;
@@ -354,7 +354,7 @@ public class HighlighterTest extends Bas
public void testRegexQuery() throws Exception {
query = new RegexpQuery(new Term(FIELD_NAME, "ken.*"));
- searcher = new IndexSearcher(ramDir, true);
+ searcher = new IndexSearcher(reader);
hits = searcher.search(query, 100);
int maxNumFragmentsRequired = 2;
@@ -379,7 +379,7 @@ public class HighlighterTest extends Bas
public void testNumericRangeQuery() throws Exception {
// doesn't currently highlight, but make sure it doesn't cause exception either
query = NumericRangeQuery.newIntRange(NUMERIC_FIELD_NAME, 2, 6, true, true);
- searcher = new IndexSearcher(ramDir, true);
+ searcher = new IndexSearcher(reader);
hits = searcher.search(query, 100);
int maxNumFragmentsRequired = 2;
@@ -754,7 +754,7 @@ public class HighlighterTest extends Bas
query = new WildcardQuery(new Term(FIELD_NAME, "ken*"));
((WildcardQuery)query).setRewriteMethod(MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE);
- searcher = new IndexSearcher(ramDir, true);
+ searcher = new IndexSearcher(reader);
// can't rewrite ConstantScore if you want to highlight it -
// it rewrites to ConstantScoreQuery which cannot be highlighted
// query = unReWrittenQuery.rewrite(reader);
@@ -1272,7 +1272,7 @@ public class HighlighterTest extends Bas
numHighlights = 0;
// test to show how rewritten query can still be used
if (searcher != null) searcher.close();
- searcher = new IndexSearcher(ramDir, true);
+ searcher = new IndexSearcher(reader);
Analyzer analyzer = new MockAnalyzer(random, MockTokenizer.SIMPLE, true, MockTokenFilter.ENGLISH_STOPSET, true);
BooleanQuery query = new BooleanQuery();
@@ -1649,7 +1649,8 @@ public class HighlighterTest extends Bas
private void searchIndex() throws IOException, InvalidTokenOffsetsException {
Query query = new TermQuery(new Term("t_text1", "random"));
- IndexSearcher searcher = new IndexSearcher( dir, true );
+ IndexReader reader = IndexReader.open(dir);
+ IndexSearcher searcher = new IndexSearcher(reader);
// This scorer can return negative idf -> null fragment
Scorer scorer = new QueryTermScorer( query, searcher.getIndexReader(), "t_text1" );
// This scorer doesn't use idf (patch version)
@@ -1664,6 +1665,7 @@ public class HighlighterTest extends Bas
assertEquals("more <B>random</B> words for second field", result);
}
searcher.close();
+ reader.close();
}
/*
@@ -1702,7 +1704,7 @@ public class HighlighterTest extends Bas
public void doSearching(Query unReWrittenQuery) throws Exception {
if (searcher != null) searcher.close();
- searcher = new IndexSearcher(ramDir, true);
+ searcher = new IndexSearcher(reader);
// for any multi-term queries to work (prefix, wildcard, range,fuzzy etc)
// you must use a rewritten query!
query = unReWrittenQuery.rewrite(reader);
Modified: lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java?rev=1204297&r1=1204296&r2=1204297&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java Sun Nov 20 23:45:25 2011
@@ -32,7 +32,6 @@ import org.apache.lucene.index.CorruptIn
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.Term;
-import org.apache.lucene.index.TermPositionVector;
import org.apache.lucene.search.DisjunctionMaxQuery;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
@@ -133,7 +132,7 @@ public class TokenSourcesTest extends Lu
new QueryScorer(query));
final TokenStream tokenStream = TokenSources
.getTokenStream(
- (TermPositionVector) indexReader.getTermFreqVector(0, FIELD),
+ indexReader.getTermVector(0, FIELD),
false);
assertEquals("<B>the fox</B> did not jump",
highlighter.getBestFragment(tokenStream, TEXT));
@@ -182,7 +181,7 @@ public class TokenSourcesTest extends Lu
new QueryScorer(query));
final TokenStream tokenStream = TokenSources
.getTokenStream(
- (TermPositionVector) indexReader.getTermFreqVector(0, FIELD),
+ indexReader.getTermVector(0, FIELD),
false);
assertEquals("<B>the fox</B> did not jump",
highlighter.getBestFragment(tokenStream, TEXT));
@@ -230,7 +229,7 @@ public class TokenSourcesTest extends Lu
new QueryScorer(phraseQuery));
final TokenStream tokenStream = TokenSources
.getTokenStream(
- (TermPositionVector) indexReader.getTermFreqVector(0, FIELD),
+ indexReader.getTermVector(0, FIELD),
false);
assertEquals("<B>the fox</B> did not jump",
highlighter.getBestFragment(tokenStream, TEXT));
@@ -279,7 +278,7 @@ public class TokenSourcesTest extends Lu
new QueryScorer(phraseQuery));
final TokenStream tokenStream = TokenSources
.getTokenStream(
- (TermPositionVector) indexReader.getTermFreqVector(0, FIELD),
+ indexReader.getTermVector(0, FIELD),
false);
assertEquals("<B>the fox</B> did not jump",
highlighter.getBestFragment(tokenStream, TEXT));