You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2011/05/13 13:18:25 UTC
svn commit: r1102677 [1/6] - in /lucene/dev/branches/docvalues: ./
dev-tools/eclipse/ dev-tools/maven/
dev-tools/maven/solr/contrib/dataimporthandler/src/extras/
dev-tools/maven/solr/src/ dev-tools/maven/solr/src/solrj/
dev-tools/scripts/ lucene/ lucen...
Author: simonw
Date: Fri May 13 11:18:19 2011
New Revision: 1102677
URL: http://svn.apache.org/viewvc?rev=1102677&view=rev
Log:
merged with trunk
Added:
lucene/dev/branches/docvalues/dev-tools/maven/README.maven
- copied unchanged from r1102657, lucene/dev/trunk/dev-tools/maven/README.maven
lucene/dev/branches/docvalues/dev-tools/scripts/
- copied from r1102657, lucene/dev/trunk/dev-tools/scripts/
lucene/dev/branches/docvalues/dev-tools/scripts/diffSources.py
- copied unchanged from r1102657, lucene/dev/trunk/dev-tools/scripts/diffSources.py
lucene/dev/branches/docvalues/lucene/docs/skin/images/apache-thanks.png
- copied unchanged from r1102657, lucene/dev/trunk/lucene/docs/skin/images/apache-thanks.png
lucene/dev/branches/docvalues/lucene/docs/skin/images/built-with-cocoon.gif
- copied unchanged from r1102657, lucene/dev/trunk/lucene/docs/skin/images/built-with-cocoon.gif
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/IndexUpgrader.java
- copied unchanged from r1102657, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexUpgrader.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/UpgradeIndexMergePolicy.java
- copied unchanged from r1102657, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/UpgradeIndexMergePolicy.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/util/automaton/fst/UpToTwoPositiveIntOutputs.java
- copied unchanged from r1102657, lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/automaton/fst/UpToTwoPositiveIntOutputs.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/index.31.optimized.cfs.zip
- copied unchanged from r1102657, lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/index.31.optimized.cfs.zip
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/index.31.optimized.nocfs.zip
- copied unchanged from r1102657, lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/index.31.optimized.nocfs.zip
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/index.32.cfs.zip
- copied unchanged from r1102657, lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/index.32.cfs.zip
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/index.32.nocfs.zip
- copied unchanged from r1102657, lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/index.32.nocfs.zip
lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/path/ReversePathHierarchyTokenizer.java
- copied unchanged from r1102657, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/path/ReversePathHierarchyTokenizer.java
lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/util/CharTokenizer.java
- copied unchanged from r1102657, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/util/CharTokenizer.java
lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/util/CharacterUtils.java
- copied unchanged from r1102657, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/util/CharacterUtils.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/path/TestReversePathHierarchyTokenizer.java
- copied unchanged from r1102657, lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/path/TestReversePathHierarchyTokenizer.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharTokenizers.java
- copied unchanged from r1102657, lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharTokenizers.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharacterUtils.java
- copied unchanged from r1102657, lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharacterUtils.java
lucene/dev/branches/docvalues/solr/example/exampledocs/manufacturers.xml
- copied unchanged from r1102657, lucene/dev/trunk/solr/example/exampledocs/manufacturers.xml
lucene/dev/branches/docvalues/solr/lib/apache-solr-noggit-r1099557.jar
- copied unchanged from r1102657, lucene/dev/trunk/solr/lib/apache-solr-noggit-r1099557.jar
Removed:
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/CharTokenizer.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/util/CharacterUtils.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/analysis/TestCharTokenizers.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/util/TestCharacterUtils.java
lucene/dev/branches/docvalues/solr/lib/apache-solr-noggit-r944541.jar
lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/response/BaseResponseWriter.java
lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/response/GenericBinaryResponseWriter.java
lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/response/GenericTextResponseWriter.java
lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/schema/TrieFieldHelper.java
Modified:
lucene/dev/branches/docvalues/ (props changed)
lucene/dev/branches/docvalues/README.txt
lucene/dev/branches/docvalues/dev-tools/eclipse/dot.classpath
lucene/dev/branches/docvalues/dev-tools/maven/pom.xml.template
lucene/dev/branches/docvalues/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template
lucene/dev/branches/docvalues/dev-tools/maven/solr/src/pom.xml.template
lucene/dev/branches/docvalues/dev-tools/maven/solr/src/solrj/pom.xml.template
lucene/dev/branches/docvalues/lucene/ (props changed)
lucene/dev/branches/docvalues/lucene/CHANGES.txt
lucene/dev/branches/docvalues/lucene/MIGRATE.txt
lucene/dev/branches/docvalues/lucene/common-build.xml
lucene/dev/branches/docvalues/lucene/contrib/CHANGES.txt
lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/Highlighter.java
lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java
lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/OffsetLimitTokenFilterTest.java
lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java
lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/FuzzyLikeThisQuery.java
lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/similar/MoreLikeThis.java
lucene/dev/branches/docvalues/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java (props changed)
lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java
lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/AnalyzerQueryNodeProcessor.java
lucene/dev/branches/docvalues/lucene/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynExpand.java
lucene/dev/branches/docvalues/lucene/contrib/wordnet/src/test/org/apache/lucene/wordnet/TestSynonymTokenFilter.java
lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/LikeThisQueryBuilder.java
lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanOrTermsBuilder.java
lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/TermsFilterBuilder.java
lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/TermsQueryBuilder.java
lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/builders/TestNumericRangeFilterBuilder.java (props changed)
lucene/dev/branches/docvalues/lucene/docs/contributions.html
lucene/dev/branches/docvalues/lucene/docs/contributions.pdf
lucene/dev/branches/docvalues/lucene/docs/demo.html
lucene/dev/branches/docvalues/lucene/docs/demo.pdf
lucene/dev/branches/docvalues/lucene/docs/demo2.html
lucene/dev/branches/docvalues/lucene/docs/demo2.pdf
lucene/dev/branches/docvalues/lucene/docs/fileformats.html
lucene/dev/branches/docvalues/lucene/docs/fileformats.pdf
lucene/dev/branches/docvalues/lucene/docs/gettingstarted.html
lucene/dev/branches/docvalues/lucene/docs/gettingstarted.pdf
lucene/dev/branches/docvalues/lucene/docs/index.html
lucene/dev/branches/docvalues/lucene/docs/index.pdf
lucene/dev/branches/docvalues/lucene/docs/linkmap.html
lucene/dev/branches/docvalues/lucene/docs/linkmap.pdf
lucene/dev/branches/docvalues/lucene/docs/lucene-contrib/index.html
lucene/dev/branches/docvalues/lucene/docs/lucene-contrib/index.pdf
lucene/dev/branches/docvalues/lucene/docs/queryparsersyntax.html
lucene/dev/branches/docvalues/lucene/docs/queryparsersyntax.pdf
lucene/dev/branches/docvalues/lucene/docs/scoring.html
lucene/dev/branches/docvalues/lucene/docs/scoring.pdf
lucene/dev/branches/docvalues/lucene/docs/systemrequirements.html
lucene/dev/branches/docvalues/lucene/docs/systemrequirements.pdf
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/document/Document.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/document/NumericField.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/BufferedDeletesStream.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/CompoundFileWriter.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/DocumentsWriterDeleteQueue.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/FieldInfo.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/FieldInfos.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/FieldsReader.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/FieldsWriter.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/IndexFileDeleter.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/IndexReader.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/IndexWriter.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/LogMergePolicy.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/MergeDocIDRemapper.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/MergePolicy.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/SegmentInfo.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/SegmentMerger.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/SegmentWriteState.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/TermVectorsTermsWriter.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/TieredMergePolicy.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/codecs/CodecProvider.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/codecs/pulsing/PulsingPostingsReaderImpl.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/codecs/sep/SepPostingsReaderImpl.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/queryParser/QueryParserBase.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/HitQueue.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/IndexSearcher.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/PhrasePositions.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/PhraseQuery.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/PhraseQueue.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/PhraseScorer.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/TopTermsRewrite.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/util/SorterTemplate.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/util/automaton/fst/Builder.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/util/automaton/fst/FST.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/util/automaton/fst/FSTEnum.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/util/automaton/fst/NodeHash.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/util/automaton/fst/Outputs.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/util/automaton/fst/PairOutputs.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/util/automaton/fst/PositiveIntOutputs.java
lucene/dev/branches/docvalues/lucene/src/site/src/documentation/content/xdocs/fileformats.xml
lucene/dev/branches/docvalues/lucene/src/site/src/documentation/content/xdocs/gettingstarted.xml
lucene/dev/branches/docvalues/lucene/src/test-framework/org/apache/lucene/analysis/BaseTokenStreamTestCase.java
lucene/dev/branches/docvalues/lucene/src/test-framework/org/apache/lucene/analysis/MockAnalyzer.java
lucene/dev/branches/docvalues/lucene/src/test-framework/org/apache/lucene/analysis/MockPayloadAnalyzer.java
lucene/dev/branches/docvalues/lucene/src/test-framework/org/apache/lucene/analysis/MockTokenizer.java
lucene/dev/branches/docvalues/lucene/src/test-framework/org/apache/lucene/index/MockRandomMergePolicy.java
lucene/dev/branches/docvalues/lucene/src/test-framework/org/apache/lucene/index/codecs/mockrandom/MockRandomCodec.java
lucene/dev/branches/docvalues/lucene/src/test-framework/org/apache/lucene/index/codecs/mocksep/MockSepCodec.java
lucene/dev/branches/docvalues/lucene/src/test-framework/org/apache/lucene/store/MockDirectoryWrapper.java
lucene/dev/branches/docvalues/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/Test2BTerms.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestCodecs.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestDoc.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestFieldsReader.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestLongPostings.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestTermVectorsWriter.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/index.31.cfs.zip
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/index.31.nocfs.zip
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/util/TestArrayUtil.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/util/TestBytesRefHash.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/util/automaton/fst/TestFSTs.java
lucene/dev/branches/docvalues/modules/analysis/CHANGES.txt
lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicLetterTokenizer.java
lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/core/LetterTokenizer.java
lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseTokenizer.java
lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/core/SimpleAnalyzer.java
lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/core/WhitespaceAnalyzer.java
lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/core/WhitespaceTokenizer.java
lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/fr/ElisionFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/in/IndicTokenizer.java
lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianAnalyzer.java
lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/path/PathHierarchyTokenizer.java
lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLetterTokenizer.java
lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/util/CharArrayMap.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianAnalyzer.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/path/TestPathHierarchyTokenizer.java
lucene/dev/branches/docvalues/solr/ (props changed)
lucene/dev/branches/docvalues/solr/CHANGES.txt
lucene/dev/branches/docvalues/solr/README.txt
lucene/dev/branches/docvalues/solr/build.xml
lucene/dev/branches/docvalues/solr/common-build.xml
lucene/dev/branches/docvalues/solr/contrib/analysis-extras/build.xml
lucene/dev/branches/docvalues/solr/contrib/clustering/build.xml
lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/build.xml
lucene/dev/branches/docvalues/solr/contrib/extraction/build.xml
lucene/dev/branches/docvalues/solr/contrib/uima/CHANGES.txt
lucene/dev/branches/docvalues/solr/contrib/uima/README.txt
lucene/dev/branches/docvalues/solr/contrib/uima/build.xml
lucene/dev/branches/docvalues/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/SolrUIMAConfiguration.java
lucene/dev/branches/docvalues/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/SolrUIMAConfigurationReader.java
lucene/dev/branches/docvalues/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java
lucene/dev/branches/docvalues/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java
lucene/dev/branches/docvalues/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java
lucene/dev/branches/docvalues/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/an/DummyEntityAnnotator.java
lucene/dev/branches/docvalues/solr/contrib/uima/src/test/java/org/apache/solr/uima/ts/EntityAnnotation.java
lucene/dev/branches/docvalues/solr/contrib/uima/src/test/java/org/apache/solr/uima/ts/EntityAnnotation_Type.java
lucene/dev/branches/docvalues/solr/contrib/uima/src/test/resources/DummyEntityAEDescriptor.xml
lucene/dev/branches/docvalues/solr/contrib/uima/src/test/resources/solr-uima/conf/schema.xml
lucene/dev/branches/docvalues/solr/contrib/uima/src/test/resources/solr-uima/conf/solrconfig.xml
lucene/dev/branches/docvalues/solr/example/exampledocs/books.json
lucene/dev/branches/docvalues/solr/example/exampledocs/hd.xml
lucene/dev/branches/docvalues/solr/example/exampledocs/ipod_other.xml
lucene/dev/branches/docvalues/solr/example/exampledocs/ipod_video.xml
lucene/dev/branches/docvalues/solr/example/exampledocs/mem.xml
lucene/dev/branches/docvalues/solr/example/exampledocs/monitor.xml
lucene/dev/branches/docvalues/solr/example/exampledocs/monitor2.xml
lucene/dev/branches/docvalues/solr/example/exampledocs/mp500.xml
lucene/dev/branches/docvalues/solr/example/exampledocs/sd500.xml
lucene/dev/branches/docvalues/solr/example/exampledocs/vidcard.xml
lucene/dev/branches/docvalues/solr/example/solr/conf/velocity/doc.vm
lucene/dev/branches/docvalues/solr/example/solr/conf/velocity/footer.vm
lucene/dev/branches/docvalues/solr/lib/apache-solr-noggit-pom.xml.template
lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/PathHierarchyTokenizerFactory.java
lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/SynonymFilterFactory.java
lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/handler/JsonLoader.java
lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/handler/JsonUpdateRequestHandler.java
lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/handler/component/TermVectorComponent.java
lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/schema/IndexSchema.java
lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/schema/SchemaField.java
lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/schema/TrieDateField.java
lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/schema/TrieField.java
lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/SolrQueryParser.java
lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/update/AddUpdateCommand.java
lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/update/DocumentBuilder.java
lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/update/UpdateHandler.java
lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/BasicFunctionalityTest.java
lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/analysis/TestSynonymMap.java
lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/handler/JsonLoaderTest.java
lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java
lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/update/DocumentBuilderTest.java
Modified: lucene/dev/branches/docvalues/README.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/README.txt?rev=1102677&r1=1102676&r2=1102677&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/README.txt (original)
+++ lucene/dev/branches/docvalues/README.txt Fri May 13 11:18:19 2011
@@ -7,6 +7,7 @@ modules/ is shared code
To compile the sources run 'ant compile'
To run all the tests run 'ant test'
To setup your ide run 'ant idea' or 'ant eclipse'
+For Maven info, see dev-tools/maven/README.maven.
For more information on how to contribute see:
http://wiki.apache.org/lucene-java/HowToContribute
Modified: lucene/dev/branches/docvalues/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/eclipse/dot.classpath?rev=1102677&r1=1102676&r2=1102677&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/docvalues/dev-tools/eclipse/dot.classpath Fri May 13 11:18:19 2011
@@ -95,7 +95,7 @@
<classpathentry kind="lib" path="modules/benchmark/lib/commons-digester-1.7.jar"/>
<classpathentry kind="lib" path="modules/benchmark/lib/commons-logging-1.0.4.jar"/>
<classpathentry kind="lib" path="modules/benchmark/lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar"/>
- <classpathentry kind="lib" path="solr/lib/apache-solr-noggit-r944541.jar"/>
+ <classpathentry kind="lib" path="solr/lib/apache-solr-noggit-r1099557.jar"/>
<classpathentry kind="lib" path="solr/lib/commons-beanutils-1.7.0.jar"/>
<classpathentry kind="lib" path="solr/lib/commons-codec-1.4.jar"/>
<classpathentry kind="lib" path="solr/lib/commons-collections-3.2.1.jar"/>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/pom.xml.template?rev=1102677&r1=1102676&r2=1102677&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/pom.xml.template Fri May 13 11:18:19 2011
@@ -699,7 +699,7 @@
<artifactId>solr-noggit</artifactId>
<version>${project.version}</version>
<packaging>jar</packaging>
- <file>solr/lib/apache-solr-noggit-r944541.jar</file>
+ <file>solr/lib/apache-solr-noggit-r1099557.jar</file>
</configuration>
</execution>
<execution>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template?rev=1102677&r1=1102676&r2=1102677&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template Fri May 13 11:18:19 2011
@@ -103,8 +103,8 @@
</dependencies>
<build>
<directory>${build-directory}</directory>
- <outputDirectory>${build-directory}/extras/classes</outputDirectory>
- <testOutputDirectory>${build-directory}/extras/test-classes</testOutputDirectory>
+ <outputDirectory>${build-directory}/classes</outputDirectory>
+ <testOutputDirectory>${build-directory}/test-classes</testOutputDirectory>
<sourceDirectory>main/java</sourceDirectory>
<testSourceDirectory>test/java</testSourceDirectory>
<testResources>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/solr/src/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/solr/src/pom.xml.template?rev=1102677&r1=1102676&r2=1102677&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/solr/src/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/solr/src/pom.xml.template Fri May 13 11:18:19 2011
@@ -159,7 +159,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/solr/src/solrj/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/solr/src/solrj/pom.xml.template?rev=1102677&r1=1102676&r2=1102677&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/solr/src/solrj/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/solr/src/solrj/pom.xml.template Fri May 13 11:18:19 2011
@@ -85,7 +85,7 @@
</dependencies>
<build>
<directory>${build-directory}</directory>
- <outputDirectory>${build-directory}</outputDirectory>
+ <outputDirectory>${build-directory}/classes</outputDirectory>
<sourceDirectory>.</sourceDirectory>
<testResources/>
<plugins>
Modified: lucene/dev/branches/docvalues/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/CHANGES.txt?rev=1102677&r1=1102676&r2=1102677&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/docvalues/lucene/CHANGES.txt Fri May 13 11:18:19 2011
@@ -472,13 +472,63 @@ Changes in backwards compatibility polic
a method getHeapArray() was added to retrieve the internal heap array as a
non-generic Object[]. (Uwe Schindler, Yonik Seeley)
+* LUCENE-1076: IndexWriter.setInfoStream now throws IOException
+ (Mike McCandless, Shai Erera)
+
+* LUCENE-3084: MergePolicy.OneMerge.segments was changed from
+ SegmentInfos to a List<SegmentInfo>; this is actually a minor change
+ because SegmentInfos itself extends Vector<SegmentInfo>. (Uwe
+ Schindler, Mike McCandless)
+
+Changes in runtime behavior
+
+* LUCENE-3065: When a NumericField is retrieved from a Document loaded
+ from IndexReader (or IndexSearcher), it will now come back as
+ NumericField not as a Field with a string-ified version of the
+ numeric value you had indexed. Note that this only applies for
+ newly-indexed Documents; older indices will still return Field
+ with the string-ified numeric value. If you call Document.get(),
+ the value comes still back as String, but Document.getFieldable()
+ returns NumericField instances. (Uwe Schindler, Ryan McKinley,
+ Mike McCandless)
+
+New features
+
+* LUCENE-3082: Added index upgrade tool oal.index.IndexUpgrader
+ that allows to upgrade all segments to last recent supported index
+ format without fully optimizing. (Uwe Schindler, Mike McCandless)
+
+* LUCENE-1076: Added TieredMergePolicy which is able to merge non-contiguous
+ segments, which means docIDs no longer necessarily stay "in order".
+ (Mike McCandless, Shai Erera)
+
+* LUCENE-3071: Adding ReversePathHierarchyTokenizer, added skip parameter to
+ PathHierarchyTokenizer (Olivier Favre via ryan)
+
+API Changes
+
+* LUCENE-3061: IndexWriter's getNextMerge() and merge(OneMerge) are now public
+ (though @lucene.experimental), allowing for custom MergeScheduler
+ implementations. (Shai Erera)
+
+* LUCENE-3065: Document.getField() was deprecated, as it throws
+ ClassCastException when loading lazy fields or NumericFields.
+ (Uwe Schindler, Ryan McKinley, Mike McCandless)
+
Optimizations
* LUCENE-2990: ArrayUtil/CollectionUtil.*Sort() methods now exit early
on empty or one-element lists/arrays. (Uwe Schindler)
+* LUCENE-2897: Apply deleted terms while flushing a segment. We still
+ buffer deleted terms to later apply to past segments. (Mike McCandless)
+
Bug fixes
+* LUCENE-2996: addIndexes(IndexReader) did not flush before adding the new
+ indexes, causing existing deletions to be applied on the incoming indexes as
+ well. (Shai Erera, Mike McCandless)
+
* LUCENE-3024: Index with more than 2.1B terms was hitting AIOOBE when
seeking TermEnum (eg used by Solr's faceting) (Tom Burton-West, Mike
McCandless)
@@ -491,6 +541,17 @@ Bug fixes
very special use cases of the TokenStream-API, most users would not
have recognized it. (Uwe Schindler, Robert Muir)
+* LUCENE-3054: PhraseQuery can in some cases stack overflow in
+ SorterTemplate.quickSort(). This fix also adds an optimization to
+ PhraseQuery as term with lower doc freq will also have less positions.
+ (Uwe Schindler, Robert Muir, Otis Gospodnetic)
+
+Test Cases
+
+* LUCENE-3002: added 'tests.iter.min' to control 'tests.iter' by allowing to
+ stop iterating if at least 'tests.iter.min' ran and a failure occured.
+ (Shai Erera, Chris Hostetter)
+
======================= Lucene 3.1.0 =======================
Changes in backwards compatibility policy
@@ -1472,6 +1533,10 @@ Bug fixes
that warming is free to do whatever it needs to. (Earwin Burrfoot
via Mike McCandless)
+* LUCENE-3029: Fix corner case when MultiPhraseQuery is used with zero
+ position-increment tokens that would sometimes assign different
+ scores to identical docs. (Mike McCandless)
+
* LUCENE-2486: Fixed intermittent FileNotFoundException on doc store
files when a mergedSegmentWarmer is set on IndexWriter. (Mike
McCandless)
Modified: lucene/dev/branches/docvalues/lucene/MIGRATE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/MIGRATE.txt?rev=1102677&r1=1102676&r2=1102677&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/MIGRATE.txt (original)
+++ lucene/dev/branches/docvalues/lucene/MIGRATE.txt Fri May 13 11:18:19 2011
@@ -312,6 +312,8 @@ LUCENE-1458, LUCENE-2111: Flexible Index
- o.a.l.analysis.ReusableAnalyzerBase -> o.a.l.analysis.util.ReusableAnalyzerBase
- o.a.l.analysis.StopwordAnalyzerBase -> o.a.l.analysis.util.StopwordAnalyzerBase
- o.a.l.analysis.WordListLoader -> o.a.l.analysis.util.WordListLoader
+ - o.a.l.analysis.CharTokenizer -> o.a.l.analysis.util.CharTokenizer
+ - o.a.l.util.CharacterUtils -> o.a.l.analysis.util.CharacterUtils
* LUCENE-2514: The option to use a Collator's order (instead of binary order) for
sorting and range queries has been moved to contrib/queries.
Modified: lucene/dev/branches/docvalues/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/common-build.xml?rev=1102677&r1=1102676&r2=1102677&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/common-build.xml (original)
+++ lucene/dev/branches/docvalues/lucene/common-build.xml Fri May 13 11:18:19 2011
@@ -73,6 +73,7 @@
</condition>
<property name="tests.multiplier" value="1" />
<property name="tests.codec" value="randomPerField" />
+ <property name="tests.codecprovider" value="random" />
<property name="tests.locale" value="random" />
<property name="tests.timezone" value="random" />
<property name="tests.directory" value="random" />
@@ -499,6 +500,8 @@
<sysproperty key="tests.verbose" value="${tests.verbose}"/>
<!-- set the codec tests should run with -->
<sysproperty key="tests.codec" value="${tests.codec}"/>
+ <!-- set the codec provider tests should run with -->
+ <sysproperty key="tests.codecprovider" value="${tests.codecprovider}"/>
<!-- set the locale tests should run with -->
<sysproperty key="tests.locale" value="${tests.locale}"/>
<!-- set the timezone tests should run with -->
Modified: lucene/dev/branches/docvalues/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/CHANGES.txt?rev=1102677&r1=1102676&r2=1102677&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/CHANGES.txt Fri May 13 11:18:19 2011
@@ -50,6 +50,11 @@ Bug Fixes
======================= Lucene 3.x (not yet released) =======================
+Changes in runtime behavior
+
+ * LUCENE-3086: ItalianAnalyzer now uses ElisionFilter with a set of Italian
+ contractions by default. (Robert Muir)
+
Bug Fixes
* LUCENE-3045: fixed QueryNodeImpl.containsTag(String key) that was
@@ -183,6 +188,10 @@ Bug fixes
* LUCENE-2943: Fix thread-safety issues with ICUCollationKeyFilter.
(Robert Muir)
+ * LUCENE-3087: Highlighter: fix case that was preventing highlighting
+ of exact phrase when tokens overlap. (Pierre Gossé via Mike
+ McCandless)
+
API Changes
* LUCENE-2867: Some contrib queryparser methods that receives CharSequence as
Modified: lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/Highlighter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/Highlighter.java?rev=1102677&r1=1102676&r2=1102677&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/Highlighter.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/Highlighter.java Fri May 13 11:18:19 2011
@@ -355,6 +355,7 @@ public class Highlighter
{
try
{
+ tokenStream.end();
tokenStream.close();
}
catch (Exception e)
Modified: lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java?rev=1102677&r1=1102676&r2=1102677&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java Fri May 13 11:18:19 2011
@@ -30,6 +30,7 @@ import org.apache.lucene.analysis.Token;
import org.apache.lucene.analysis.TokenStream;
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.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.TermFreqVector;
@@ -158,10 +159,13 @@ public class TokenSources {
OffsetAttribute offsetAtt;
+ PositionIncrementAttribute posincAtt;
+
StoredTokenStream(Token tokens[]) {
this.tokens = tokens;
termAtt = addAttribute(CharTermAttribute.class);
offsetAtt = addAttribute(OffsetAttribute.class);
+ posincAtt = (PositionIncrementAttribute) addAttribute(PositionIncrementAttribute.class);
}
@Override
@@ -173,6 +177,10 @@ public class TokenSources {
clearAttributes();
termAtt.setEmpty().append(token);
offsetAtt.setOffset(token.startOffset(), token.endOffset());
+ posincAtt
+ .setPositionIncrement(currentToken <= 1
+ || tokens[currentToken - 1].startOffset() > tokens[currentToken - 2]
+ .startOffset() ? 1 : 0);
return true;
}
}
@@ -180,7 +188,6 @@ public class TokenSources {
BytesRef[] terms = tpv.getTerms();
int[] freq = tpv.getTermFrequencies();
int totalTokens = 0;
-
for (int t = 0; t < freq.length; t++) {
totalTokens += freq[t];
}
@@ -189,7 +196,8 @@ public class TokenSources {
for (int t = 0; t < freq.length; t++) {
TermVectorOffsetInfo[] offsets = tpv.getOffsets(t);
if (offsets == null) {
- throw new IllegalArgumentException("Required TermVector Offset information was not found");
+ throw new IllegalArgumentException(
+ "Required TermVector Offset information was not found");
}
int[] pos = null;
@@ -205,8 +213,8 @@ public class TokenSources {
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());
+ Token token = new Token(terms[t].utf8ToString(),
+ offsets[tp].getStartOffset(), offsets[tp].getEndOffset());
unsortedTokens.add(token);
}
} else {
@@ -221,8 +229,8 @@ public class TokenSources {
// 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());
+ Token token = new Token(terms[t].utf8ToString(),
+ offsets[tp].getStartOffset(), offsets[tp].getEndOffset());
tokensInOriginalOrder[pos[tp]] = token;
}
}
@@ -231,12 +239,11 @@ public class TokenSources {
if (unsortedTokens != null) {
tokensInOriginalOrder = unsortedTokens.toArray(new Token[unsortedTokens
.size()]);
- ArrayUtil.quickSort(tokensInOriginalOrder, new Comparator<Token>() {
+ ArrayUtil.mergeSort(tokensInOriginalOrder, new Comparator<Token>() {
public int compare(Token t1, Token t2) {
- if (t1.startOffset() == t2.startOffset())
- return t1.endOffset() - t2.endOffset();
- else
- return t1.startOffset() - t2.startOffset();
+ if (t1.startOffset() == t2.startOffset()) return t1.endOffset()
+ - t2.endOffset();
+ else return t1.startOffset() - t2.startOffset();
}
});
}
Modified: lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java?rev=1102677&r1=1102676&r2=1102677&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java Fri May 13 11:18:19 2011
@@ -1093,6 +1093,10 @@ public class HighlighterTest extends Bas
}
public void testMaxSizeHighlight() throws Exception {
+ final MockAnalyzer analyzer = new MockAnalyzer(random, MockTokenizer.SIMPLE, true, MockTokenFilter.ENGLISH_STOPSET, true);
+ // we disable MockTokenizer checks because we will forcefully limit the
+ // tokenstream and call end() before incrementToken() returns false.
+ analyzer.setEnableChecks(false);
TestHighlightRunner helper = new TestHighlightRunner() {
@Override
@@ -1122,7 +1126,10 @@ public class HighlighterTest extends Bas
public void run() throws Exception {
String goodWord = "goodtoken";
CharacterRunAutomaton stopWords = new CharacterRunAutomaton(BasicAutomata.makeString("stoppedtoken"));
-
+ // we disable MockTokenizer checks because we will forcefully limit the
+ // tokenstream and call end() before incrementToken() returns false.
+ final MockAnalyzer analyzer = new MockAnalyzer(random, MockTokenizer.SIMPLE, true, stopWords, true);
+ analyzer.setEnableChecks(false);
TermQuery query = new TermQuery(new Term("data", goodWord));
String match;
@@ -1134,13 +1141,13 @@ public class HighlighterTest extends Bas
sb.append("stoppedtoken");
}
SimpleHTMLFormatter fm = new SimpleHTMLFormatter();
- Highlighter hg = getHighlighter(query, "data", new MockAnalyzer(random, MockTokenizer.SIMPLE, true, stopWords, true).tokenStream(
+ Highlighter hg = getHighlighter(query, "data", analyzer.tokenStream(
"data", new StringReader(sb.toString())), fm);// new Highlighter(fm,
// new
// QueryTermScorer(query));
hg.setTextFragmenter(new NullFragmenter());
hg.setMaxDocCharsToAnalyze(100);
- match = hg.getBestFragment(new MockAnalyzer(random, MockTokenizer.SIMPLE, true, stopWords, true), "data", sb.toString());
+ match = hg.getBestFragment(analyzer, "data", sb.toString());
assertTrue("Matched text should be no more than 100 chars in length ", match.length() < hg
.getMaxDocCharsToAnalyze());
@@ -1151,7 +1158,7 @@ public class HighlighterTest extends Bas
// + whitespace)
sb.append(" ");
sb.append(goodWord);
- match = hg.getBestFragment(new MockAnalyzer(random, MockTokenizer.SIMPLE, true, stopWords, true), "data", sb.toString());
+ match = hg.getBestFragment(analyzer, "data", sb.toString());
assertTrue("Matched text should be no more than 100 chars in length ", match.length() < hg
.getMaxDocCharsToAnalyze());
}
@@ -1726,6 +1733,11 @@ final class SynonymAnalyzer extends Anal
stream.addAttribute(CharTermAttribute.class);
stream.addAttribute(PositionIncrementAttribute.class);
stream.addAttribute(OffsetAttribute.class);
+ try {
+ stream.reset();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
return new SynonymTokenizer(stream, synonyms);
}
}
Modified: lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/OffsetLimitTokenFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/OffsetLimitTokenFilterTest.java?rev=1102677&r1=1102676&r2=1102677&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/OffsetLimitTokenFilterTest.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/OffsetLimitTokenFilterTest.java Fri May 13 11:18:19 2011
@@ -28,32 +28,38 @@ import org.apache.lucene.analysis.TokenS
public class OffsetLimitTokenFilterTest extends BaseTokenStreamTestCase {
public void testFilter() throws Exception {
- TokenStream stream = new MockTokenizer(new StringReader(
+ // we disable MockTokenizer checks because we will forcefully limit the
+ // tokenstream and call end() before incrementToken() returns false.
+ MockTokenizer stream = new MockTokenizer(new StringReader(
"short toolong evenmuchlongertext a ab toolong foo"),
MockTokenizer.WHITESPACE, false);
+ stream.setEnableChecks(false);
OffsetLimitTokenFilter filter = new OffsetLimitTokenFilter(stream, 10);
assertTokenStreamContents(filter, new String[] {"short", "toolong"});
stream = new MockTokenizer(new StringReader(
"short toolong evenmuchlongertext a ab toolong foo"),
MockTokenizer.WHITESPACE, false);
+ stream.setEnableChecks(false);
filter = new OffsetLimitTokenFilter(stream, 12);
assertTokenStreamContents(filter, new String[] {"short", "toolong"});
stream = new MockTokenizer(new StringReader(
"short toolong evenmuchlongertext a ab toolong foo"),
MockTokenizer.WHITESPACE, false);
+ stream.setEnableChecks(false);
filter = new OffsetLimitTokenFilter(stream, 30);
assertTokenStreamContents(filter, new String[] {"short", "toolong",
"evenmuchlongertext"});
-
+ // TODO: This is not actually testing reuse! (reusableTokenStream is not implemented)
checkOneTermReuse(new Analyzer() {
@Override
public TokenStream tokenStream(String fieldName, Reader reader) {
- return new OffsetLimitTokenFilter(new MockTokenizer(reader,
- MockTokenizer.WHITESPACE, false), 10);
+ MockTokenizer tokenizer = new MockTokenizer(reader, MockTokenizer.WHITESPACE, false);
+ tokenizer.setEnableChecks(false);
+ return new OffsetLimitTokenFilter(tokenizer, 10);
}
}, "llenges", "llenges");
}
Modified: lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java?rev=1102677&r1=1102676&r2=1102677&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java Fri May 13 11:18:19 2011
@@ -36,7 +36,10 @@ 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;
import org.apache.lucene.search.TopDocs;
+import org.apache.lucene.search.spans.SpanNearQuery;
+import org.apache.lucene.search.spans.SpanQuery;
import org.apache.lucene.search.spans.SpanTermQuery;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.LockObtainFailedException;
@@ -86,12 +89,12 @@ public class TokenSourcesTest extends Lu
public void reset() {
this.i = -1;
this.tokens = new Token[] {
- new Token(new char[] { 't', 'h', 'e' }, 0, 3, 0, 3),
- new Token(new char[] { '{', 'f', 'o', 'x', '}' }, 0, 5, 0, 7),
- new Token(new char[] { 'f', 'o', 'x' }, 0, 3, 4, 7),
- new Token(new char[] { 'd', 'i', 'd' }, 0, 3, 8, 11),
- new Token(new char[] { 'n', 'o', 't' }, 0, 3, 12, 15),
- new Token(new char[] { 'j', 'u', 'm', 'p' }, 0, 4, 16, 20) };
+ new Token(new char[] {'t', 'h', 'e'}, 0, 3, 0, 3),
+ new Token(new char[] {'{', 'f', 'o', 'x', '}'}, 0, 5, 0, 7),
+ new Token(new char[] {'f', 'o', 'x'}, 0, 3, 4, 7),
+ new Token(new char[] {'d', 'i', 'd'}, 0, 3, 8, 11),
+ new Token(new char[] {'n', 'o', 't'}, 0, 3, 12, 15),
+ new Token(new char[] {'j', 'u', 'm', 'p'}, 0, 4, 16, 20)};
this.tokens[1].setPositionIncrement(0);
}
}
@@ -188,4 +191,97 @@ public class TokenSourcesTest extends Lu
}
}
+ public void testOverlapWithOffsetExactPhrase() throws CorruptIndexException,
+ LockObtainFailedException, IOException, InvalidTokenOffsetsException {
+ final String TEXT = "the fox did not jump";
+ final Directory directory = newDirectory();
+ final IndexWriter indexWriter = new IndexWriter(directory,
+ newIndexWriterConfig(TEST_VERSION_CURRENT, new OverlapAnalyzer()));
+ try {
+ final Document document = new Document();
+ document.add(new Field(FIELD, new TokenStreamOverlap(),
+ TermVector.WITH_OFFSETS));
+ indexWriter.addDocument(document);
+ } finally {
+ indexWriter.close();
+ }
+ final IndexReader indexReader = IndexReader.open(directory, true);
+ try {
+ assertEquals(1, indexReader.numDocs());
+ final IndexSearcher indexSearcher = newSearcher(indexReader);
+ try {
+ // final DisjunctionMaxQuery query = new DisjunctionMaxQuery(1);
+ // query.add(new SpanTermQuery(new Term(FIELD, "{fox}")));
+ // query.add(new SpanTermQuery(new Term(FIELD, "fox")));
+ final Query phraseQuery = new SpanNearQuery(new SpanQuery[] {
+ new SpanTermQuery(new Term(FIELD, "the")),
+ new SpanTermQuery(new Term(FIELD, "fox"))}, 0, true);
+
+ TopDocs hits = indexSearcher.search(phraseQuery, 1);
+ assertEquals(1, hits.totalHits);
+ final Highlighter highlighter = new Highlighter(
+ new SimpleHTMLFormatter(), new SimpleHTMLEncoder(),
+ new QueryScorer(phraseQuery));
+ final TokenStream tokenStream = TokenSources
+ .getTokenStream(
+ (TermPositionVector) indexReader.getTermFreqVector(0, FIELD),
+ false);
+ assertEquals("<B>the fox</B> did not jump",
+ highlighter.getBestFragment(tokenStream, TEXT));
+ } finally {
+ indexSearcher.close();
+ }
+ } finally {
+ indexReader.close();
+ directory.close();
+ }
+ }
+
+ public void testOverlapWithPositionsAndOffsetExactPhrase()
+ throws CorruptIndexException, LockObtainFailedException, IOException,
+ InvalidTokenOffsetsException {
+ final String TEXT = "the fox did not jump";
+ final Directory directory = newDirectory();
+ final IndexWriter indexWriter = new IndexWriter(directory,
+ newIndexWriterConfig(TEST_VERSION_CURRENT, new OverlapAnalyzer()));
+ try {
+ final Document document = new Document();
+ document.add(new Field(FIELD, new TokenStreamOverlap(),
+ TermVector.WITH_POSITIONS_OFFSETS));
+ indexWriter.addDocument(document);
+ } finally {
+ indexWriter.close();
+ }
+ final IndexReader indexReader = IndexReader.open(directory, true);
+ try {
+ assertEquals(1, indexReader.numDocs());
+ final IndexSearcher indexSearcher = newSearcher(indexReader);
+ try {
+ // final DisjunctionMaxQuery query = new DisjunctionMaxQuery(1);
+ // query.add(new SpanTermQuery(new Term(FIELD, "the")));
+ // query.add(new SpanTermQuery(new Term(FIELD, "fox")));
+ final Query phraseQuery = new SpanNearQuery(new SpanQuery[] {
+ new SpanTermQuery(new Term(FIELD, "the")),
+ new SpanTermQuery(new Term(FIELD, "fox"))}, 0, true);
+
+ TopDocs hits = indexSearcher.search(phraseQuery, 1);
+ assertEquals(1, hits.totalHits);
+ final Highlighter highlighter = new Highlighter(
+ new SimpleHTMLFormatter(), new SimpleHTMLEncoder(),
+ new QueryScorer(phraseQuery));
+ final TokenStream tokenStream = TokenSources
+ .getTokenStream(
+ (TermPositionVector) indexReader.getTermFreqVector(0, FIELD),
+ false);
+ assertEquals("<B>the fox</B> did not jump",
+ highlighter.getBestFragment(tokenStream, TEXT));
+ } finally {
+ indexSearcher.close();
+ }
+ } finally {
+ indexReader.close();
+ directory.close();
+ }
+ }
+
}
Modified: lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/FuzzyLikeThisQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/FuzzyLikeThisQuery.java?rev=1102677&r1=1102676&r2=1102677&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/FuzzyLikeThisQuery.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/FuzzyLikeThisQuery.java Fri May 13 11:18:19 2011
@@ -192,6 +192,7 @@ public class FuzzyLikeThisQuery extends
int corpusNumDocs=reader.numDocs();
Term internSavingTemplateTerm =new Term(f.fieldName); //optimization to avoid constructing new Term() objects
HashSet<String> processedTerms=new HashSet<String>();
+ ts.reset();
while (ts.incrementToken())
{
String term = termAtt.toString();
@@ -213,17 +214,15 @@ public class FuzzyLikeThisQuery extends
BoostAttribute boostAtt =
fe.attributes().addAttribute(BoostAttribute.class);
while ((possibleMatch = fe.next()) != null) {
- if (possibleMatch!=null) {
- numVariants++;
- totalVariantDocFreqs+=fe.docFreq();
- float score=boostAtt.getBoost();
- if (variantsQ.size() < MAX_VARIANTS_PER_TERM || score > minScore){
- ScoreTerm st=new ScoreTerm(new Term(startTerm.field(), new BytesRef(possibleMatch)),score,startTerm);
- variantsQ.insertWithOverflow(st);
- minScore = variantsQ.top().score; // maintain minScore
- }
- maxBoostAtt.setMaxNonCompetitiveBoost(variantsQ.size() >= MAX_VARIANTS_PER_TERM ? minScore : Float.NEGATIVE_INFINITY);
+ numVariants++;
+ totalVariantDocFreqs+=fe.docFreq();
+ float score=boostAtt.getBoost();
+ if (variantsQ.size() < MAX_VARIANTS_PER_TERM || score > minScore){
+ ScoreTerm st=new ScoreTerm(new Term(startTerm.field(), new BytesRef(possibleMatch)),score,startTerm);
+ variantsQ.insertWithOverflow(st);
+ minScore = variantsQ.top().score; // maintain minScore
}
+ maxBoostAtt.setMaxNonCompetitiveBoost(variantsQ.size() >= MAX_VARIANTS_PER_TERM ? minScore : Float.NEGATIVE_INFINITY);
}
if(numVariants>0)
@@ -246,7 +245,9 @@ public class FuzzyLikeThisQuery extends
}
}
}
- }
+ }
+ ts.end();
+ ts.close();
}
@Override
Modified: lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/similar/MoreLikeThis.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/similar/MoreLikeThis.java?rev=1102677&r1=1102676&r2=1102677&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/similar/MoreLikeThis.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/similar/MoreLikeThis.java Fri May 13 11:18:19 2011
@@ -885,7 +885,7 @@ public final class MoreLikeThis {
int tokenCount=0;
// for every token
CharTermAttribute termAtt = ts.addAttribute(CharTermAttribute.class);
-
+ ts.reset();
while (ts.incrementToken()) {
String word = termAtt.toString();
tokenCount++;
@@ -906,6 +906,8 @@ public final class MoreLikeThis {
cnt.x++;
}
}
+ ts.end();
+ ts.close();
}
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java?rev=1102677&r1=1102676&r2=1102677&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java Fri May 13 11:18:19 2011
@@ -110,6 +110,11 @@ public class AnalyzingQueryParser extend
CharTermAttribute termAtt = source.addAttribute(CharTermAttribute.class);
int countTokens = 0;
+ try {
+ source.reset();
+ } catch (IOException e1) {
+ throw new RuntimeException(e1);
+ }
while (true) {
try {
if (!source.incrementToken()) break;
@@ -126,6 +131,7 @@ public class AnalyzingQueryParser extend
}
}
try {
+ source.end();
source.close();
} catch (IOException e) {
// ignore
@@ -191,7 +197,11 @@ public class AnalyzingQueryParser extend
TokenStream source = getAnalyzer().tokenStream(field, new StringReader(termStr));
List<String> tlist = new ArrayList<String>();
CharTermAttribute termAtt = source.addAttribute(CharTermAttribute.class);
-
+ try {
+ source.reset();
+ } catch (IOException e1) {
+ throw new RuntimeException(e1);
+ }
while (true) {
try {
if (!source.incrementToken()) break;
@@ -202,6 +212,7 @@ public class AnalyzingQueryParser extend
}
try {
+ source.end();
source.close();
} catch (IOException e) {
// ignore
@@ -242,6 +253,7 @@ public class AnalyzingQueryParser extend
boolean multipleTokens = false;
try {
+ source.reset();
if (source.incrementToken()) {
nextToken = termAtt.toString();
}
@@ -251,6 +263,7 @@ public class AnalyzingQueryParser extend
}
try {
+ source.end();
source.close();
} catch (IOException e) {
// ignore
@@ -281,6 +294,7 @@ public class AnalyzingQueryParser extend
try {
source = getAnalyzer().tokenStream(field, new StringReader(part1));
termAtt = source.addAttribute(CharTermAttribute.class);
+ source.reset();
multipleTokens = false;
@@ -292,6 +306,7 @@ public class AnalyzingQueryParser extend
// ignore
}
try {
+ source.end();
source.close();
} catch (IOException e) {
// ignore
@@ -308,6 +323,7 @@ public class AnalyzingQueryParser extend
termAtt = source.addAttribute(CharTermAttribute.class);
try {
+ source.reset();
if (source.incrementToken()) {
part2 = termAtt.toString();
}
@@ -316,6 +332,7 @@ public class AnalyzingQueryParser extend
// ignore
}
try {
+ source.end();
source.close();
} catch (IOException e) {
// ignore
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/AnalyzerQueryNodeProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/AnalyzerQueryNodeProcessor.java?rev=1102677&r1=1102676&r2=1102677&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/AnalyzerQueryNodeProcessor.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/AnalyzerQueryNodeProcessor.java Fri May 13 11:18:19 2011
@@ -123,6 +123,11 @@ public class AnalyzerQueryNodeProcessor
TokenStream source = this.analyzer.tokenStream(field, new StringReader(
text));
+ try {
+ source.reset();
+ } catch (IOException e1) {
+ throw new RuntimeException(e1);
+ }
CachingTokenFilter buffer = new CachingTokenFilter(source);
PositionIncrementAttribute posIncrAtt = null;
Modified: lucene/dev/branches/docvalues/lucene/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynExpand.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynExpand.java?rev=1102677&r1=1102676&r2=1102677&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynExpand.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynExpand.java Fri May 13 11:18:19 2011
@@ -118,12 +118,14 @@ public final class SynExpand {
// [1] Parse query into separate words so that when we expand we can avoid dups
TokenStream ts = a.tokenStream( field, new StringReader( query));
CharTermAttribute termAtt = ts.addAttribute(CharTermAttribute.class);
-
+ ts.reset();
while (ts.incrementToken()) {
String word = termAtt.toString();
if ( already.add( word))
top.add( word);
}
+ ts.end();
+ ts.close();
final BooleanQuery tmp = new BooleanQuery();
// [2] form query
Modified: lucene/dev/branches/docvalues/lucene/contrib/wordnet/src/test/org/apache/lucene/wordnet/TestSynonymTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/wordnet/src/test/org/apache/lucene/wordnet/TestSynonymTokenFilter.java?rev=1102677&r1=1102676&r2=1102677&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/wordnet/src/test/org/apache/lucene/wordnet/TestSynonymTokenFilter.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/wordnet/src/test/org/apache/lucene/wordnet/TestSynonymTokenFilter.java Fri May 13 11:18:19 2011
@@ -111,7 +111,6 @@ public class TestSynonymTokenFilter exte
setPreviousTokenStream(streams);
} else {
streams.source.reset(reader);
- streams.result.reset(); // reset the SynonymTokenFilter
}
return streams.result;
}
Modified: lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/LikeThisQueryBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/LikeThisQueryBuilder.java?rev=1102677&r1=1102676&r2=1102677&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/LikeThisQueryBuilder.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/LikeThisQueryBuilder.java Fri May 13 11:18:19 2011
@@ -80,9 +80,12 @@ public class LikeThisQueryBuilder implem
CharTermAttribute termAtt = ts.addAttribute(CharTermAttribute.class);
try
{
+ ts.reset();
while(ts.incrementToken()) {
stopWordsSet.add(termAtt.toString());
}
+ ts.end();
+ ts.close();
}
catch(IOException ioe)
{
Modified: lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanOrTermsBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanOrTermsBuilder.java?rev=1102677&r1=1102676&r2=1102677&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanOrTermsBuilder.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanOrTermsBuilder.java Fri May 13 11:18:19 2011
@@ -59,11 +59,14 @@ public class SpanOrTermsBuilder extends
TokenStream ts=analyzer.tokenStream(fieldName,new StringReader(value));
TermToBytesRefAttribute termAtt = ts.addAttribute(TermToBytesRefAttribute.class);
BytesRef bytes = termAtt.getBytesRef();
+ ts.reset();
while (ts.incrementToken()) {
termAtt.fillBytesRef();
SpanTermQuery stq=new SpanTermQuery(new Term(fieldName, new BytesRef(bytes)));
clausesList.add(stq);
}
+ ts.end();
+ ts.close();
SpanOrQuery soq=new SpanOrQuery(clausesList.toArray(new SpanQuery[clausesList.size()]));
soq.setBoost(DOMUtils.getAttribute(e,"boost",1.0f));
return soq;
Modified: lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/TermsFilterBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/TermsFilterBuilder.java?rev=1102677&r1=1102676&r2=1102677&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/TermsFilterBuilder.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/TermsFilterBuilder.java Fri May 13 11:18:19 2011
@@ -64,6 +64,7 @@ public class TermsFilterBuilder implemen
{
Term term = null;
BytesRef bytes = termAtt.getBytesRef();
+ ts.reset();
while (ts.incrementToken()) {
termAtt.fillBytesRef();
if (term == null)
@@ -76,6 +77,8 @@ public class TermsFilterBuilder implemen
}
tf.addTerm(term);
}
+ ts.end();
+ ts.close();
}
catch (IOException ioe)
{
Modified: lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/TermsQueryBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/TermsQueryBuilder.java?rev=1102677&r1=1102676&r2=1102677&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/TermsQueryBuilder.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/TermsQueryBuilder.java Fri May 13 11:18:19 2011
@@ -61,6 +61,7 @@ public class TermsQueryBuilder implement
TermToBytesRefAttribute termAtt = ts.addAttribute(TermToBytesRefAttribute.class);
Term term = null;
BytesRef bytes = termAtt.getBytesRef();
+ ts.reset();
while (ts.incrementToken()) {
termAtt.fillBytesRef();
if (term == null)
@@ -73,6 +74,8 @@ public class TermsQueryBuilder implement
}
bq.add(new BooleanClause(new TermQuery(term),BooleanClause.Occur.SHOULD));
}
+ ts.end();
+ ts.close();
}
catch (IOException ioe)
{
Modified: lucene/dev/branches/docvalues/lucene/docs/contributions.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/contributions.html?rev=1102677&r1=1102676&r2=1102677&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/docs/contributions.html (original)
+++ lucene/dev/branches/docvalues/lucene/docs/contributions.html Fri May 13 11:18:19 2011
@@ -3,7 +3,7 @@
<head>
<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
<meta name="Forrest-skin-name" content="lucene">
<title>
Apache Lucene - Contributions
@@ -275,7 +275,7 @@ document.write("Last Published: " + docu
<a href="#PDFTextStream -- PDF text and metadata extraction">PDFTextStream -- PDF text and metadata extraction</a>
</li>
<li>
-<a href="#PJ Classic & PJ Professional - PDF Document Conversion">PJ Classic & PJ Professional - PDF Document Conversion</a>
+<a href="#PJ Classic & PJ Professional - PDF Document Conversion">PJ Classic & PJ Professional - PDF Document Conversion</a>
</li>
</ul>
</li>
@@ -403,7 +403,7 @@ document.write("Last Published: " + docu
URL
</th>
<td>
- <a href="http://marc.theaimsgroup.com/?l=lucene-dev&m=100723333506246&w=2">
+ <a href="http://marc.theaimsgroup.com/?l=lucene-dev&m=100723333506246&w=2">
http://marc.theaimsgroup.com/?l=lucene-dev&m=100723333506246&w=2
</a>
</td>
@@ -538,7 +538,7 @@ document.write("Last Published: " + docu
</tr>
</table>
-<a name="N10124"></a><a name="PJ Classic & PJ Professional - PDF Document Conversion"></a>
+<a name="N10124"></a><a name="PJ Classic & PJ Professional - PDF Document Conversion"></a>
<h3 class="boxed">PJ Classic & PJ Professional - PDF Document Conversion</h3>
<table class="ForrestTable" cellspacing="1" cellpadding="4">
Modified: lucene/dev/branches/docvalues/lucene/docs/contributions.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/contributions.pdf?rev=1102677&r1=1102676&r2=1102677&view=diff
==============================================================================
Files lucene/dev/branches/docvalues/lucene/docs/contributions.pdf (original) and lucene/dev/branches/docvalues/lucene/docs/contributions.pdf Fri May 13 11:18:19 2011 differ
Modified: lucene/dev/branches/docvalues/lucene/docs/demo.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/demo.html?rev=1102677&r1=1102676&r2=1102677&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/docs/demo.html (original)
+++ lucene/dev/branches/docvalues/lucene/docs/demo.html Fri May 13 11:18:19 2011
@@ -3,7 +3,7 @@
<head>
<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
<meta name="Forrest-skin-name" content="lucene">
<title>
Apache Lucene - Building and Installing the Basic Demo
Modified: lucene/dev/branches/docvalues/lucene/docs/demo.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/demo.pdf?rev=1102677&r1=1102676&r2=1102677&view=diff
==============================================================================
Files lucene/dev/branches/docvalues/lucene/docs/demo.pdf (original) and lucene/dev/branches/docvalues/lucene/docs/demo.pdf Fri May 13 11:18:19 2011 differ
Modified: lucene/dev/branches/docvalues/lucene/docs/demo2.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/demo2.html?rev=1102677&r1=1102676&r2=1102677&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/docs/demo2.html (original)
+++ lucene/dev/branches/docvalues/lucene/docs/demo2.html Fri May 13 11:18:19 2011
@@ -3,7 +3,7 @@
<head>
<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
<meta name="Forrest-skin-name" content="lucene">
<title>
Apache Lucene - Basic Demo Sources Walk-through
Modified: lucene/dev/branches/docvalues/lucene/docs/demo2.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/demo2.pdf?rev=1102677&r1=1102676&r2=1102677&view=diff
==============================================================================
Files lucene/dev/branches/docvalues/lucene/docs/demo2.pdf (original) and lucene/dev/branches/docvalues/lucene/docs/demo2.pdf Fri May 13 11:18:19 2011 differ