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/18 18:24:34 UTC
svn commit: r1124321 [1/5] - in /lucene/dev/branches/docvalues: ./
dev-tools/eclipse/ dev-tools/idea/ dev-tools/idea/.idea/
dev-tools/idea/lucene/ dev-tools/idea/lucene/contrib/ant/
dev-tools/idea/lucene/contrib/db/bdb-je/ dev-tools/idea/lucene/contrib...
Author: simonw
Date: Wed May 18 16:24:27 2011
New Revision: 1124321
URL: http://svn.apache.org/viewvc?rev=1124321&view=rev
Log:
merged with trunk
Added:
lucene/dev/branches/docvalues/dev-tools/idea/modules/grouping/
- copied from r1124312, lucene/dev/trunk/dev-tools/idea/modules/grouping/
lucene/dev/branches/docvalues/dev-tools/idea/modules/grouping/grouping.iml
- copied unchanged from r1124312, lucene/dev/trunk/dev-tools/idea/modules/grouping/grouping.iml
lucene/dev/branches/docvalues/dev-tools/maven/modules/grouping/
- copied from r1124312, lucene/dev/trunk/dev-tools/maven/modules/grouping/
lucene/dev/branches/docvalues/dev-tools/maven/modules/grouping/pom.xml.template
- copied unchanged from r1124312, lucene/dev/trunk/dev-tools/maven/modules/grouping/pom.xml.template
lucene/dev/branches/docvalues/lucene/contrib/misc/src/java/org/apache/lucene/store/NRTCachingDirectory.java
- copied unchanged from r1124312, lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/store/NRTCachingDirectory.java
lucene/dev/branches/docvalues/lucene/contrib/misc/src/test/org/apache/lucene/store/
- copied from r1124312, lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/store/
lucene/dev/branches/docvalues/lucene/contrib/misc/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java
- copied unchanged from r1124312, lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/DocumentsWriterStallControl.java
- copied unchanged from r1124312, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocumentsWriterStallControl.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/CachingCollector.java
- copied unchanged from r1124312, lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/CachingCollector.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/BinaryTokenStream.java
- copied unchanged from r1124312, lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/BinaryTokenStream.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestBinaryTerms.java
- copied unchanged from r1124312, lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestBinaryTerms.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/search/TestCachingCollector.java
- copied unchanged from r1124312, lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingCollector.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/util/TestVersionComparator.java
- copied unchanged from r1124312, lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestVersionComparator.java
lucene/dev/branches/docvalues/modules/grouping/ (props changed)
- copied from r1124312, lucene/dev/trunk/modules/grouping/
lucene/dev/branches/docvalues/modules/grouping/build.xml
- copied unchanged from r1124312, lucene/dev/trunk/modules/grouping/build.xml
lucene/dev/branches/docvalues/modules/grouping/src/
- copied from r1124312, lucene/dev/trunk/modules/grouping/src/
lucene/dev/branches/docvalues/modules/grouping/src/java/
- copied from r1124312, lucene/dev/trunk/modules/grouping/src/java/
lucene/dev/branches/docvalues/modules/grouping/src/java/org/
- copied from r1124312, lucene/dev/trunk/modules/grouping/src/java/org/
lucene/dev/branches/docvalues/modules/grouping/src/java/org/apache/
- copied from r1124312, lucene/dev/trunk/modules/grouping/src/java/org/apache/
lucene/dev/branches/docvalues/modules/grouping/src/java/org/apache/lucene/
- copied from r1124312, lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/
lucene/dev/branches/docvalues/modules/grouping/src/java/org/apache/lucene/search/
- copied from r1124312, lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/
lucene/dev/branches/docvalues/modules/grouping/src/java/org/apache/lucene/search/grouping/
- copied from r1124312, lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/
lucene/dev/branches/docvalues/modules/grouping/src/java/org/apache/lucene/search/grouping/AllGroupsCollector.java
- copied unchanged from r1124312, lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/AllGroupsCollector.java
lucene/dev/branches/docvalues/modules/grouping/src/java/org/apache/lucene/search/grouping/FirstPassGroupingCollector.java
- copied unchanged from r1124312, lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/FirstPassGroupingCollector.java
lucene/dev/branches/docvalues/modules/grouping/src/java/org/apache/lucene/search/grouping/GroupDocs.java
- copied unchanged from r1124312, lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/GroupDocs.java
lucene/dev/branches/docvalues/modules/grouping/src/java/org/apache/lucene/search/grouping/SearchGroup.java
- copied unchanged from r1124312, lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/SearchGroup.java
lucene/dev/branches/docvalues/modules/grouping/src/java/org/apache/lucene/search/grouping/SecondPassGroupingCollector.java
- copied unchanged from r1124312, lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/SecondPassGroupingCollector.java
lucene/dev/branches/docvalues/modules/grouping/src/java/org/apache/lucene/search/grouping/SentinelIntSet.java
- copied unchanged from r1124312, lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/SentinelIntSet.java
lucene/dev/branches/docvalues/modules/grouping/src/java/org/apache/lucene/search/grouping/TopGroups.java
- copied unchanged from r1124312, lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/TopGroups.java
lucene/dev/branches/docvalues/modules/grouping/src/java/org/apache/lucene/search/grouping/package.html
- copied unchanged from r1124312, lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/package.html
lucene/dev/branches/docvalues/modules/grouping/src/java/overview.html
- copied unchanged from r1124312, lucene/dev/trunk/modules/grouping/src/java/overview.html
lucene/dev/branches/docvalues/modules/grouping/src/test/
- copied from r1124312, lucene/dev/trunk/modules/grouping/src/test/
lucene/dev/branches/docvalues/modules/grouping/src/test/org/
- copied from r1124312, lucene/dev/trunk/modules/grouping/src/test/org/
lucene/dev/branches/docvalues/modules/grouping/src/test/org/apache/
- copied from r1124312, lucene/dev/trunk/modules/grouping/src/test/org/apache/
lucene/dev/branches/docvalues/modules/grouping/src/test/org/apache/lucene/
- copied from r1124312, lucene/dev/trunk/modules/grouping/src/test/org/apache/lucene/
lucene/dev/branches/docvalues/modules/grouping/src/test/org/apache/lucene/search/
- copied from r1124312, lucene/dev/trunk/modules/grouping/src/test/org/apache/lucene/search/
lucene/dev/branches/docvalues/modules/grouping/src/test/org/apache/lucene/search/grouping/
- copied from r1124312, lucene/dev/trunk/modules/grouping/src/test/org/apache/lucene/search/grouping/
lucene/dev/branches/docvalues/modules/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.java
- copied unchanged from r1124312, lucene/dev/trunk/modules/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.java
lucene/dev/branches/docvalues/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
- copied unchanged from r1124312, lucene/dev/trunk/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
lucene/dev/branches/docvalues/solr/contrib/clustering/lib/carrot2-core-3.5.0.jar
- copied unchanged from r1124312, lucene/dev/trunk/solr/contrib/clustering/lib/carrot2-core-3.5.0.jar
lucene/dev/branches/docvalues/solr/contrib/clustering/lib/hppc-0.3.3.jar
- copied unchanged from r1124312, lucene/dev/trunk/solr/contrib/clustering/lib/hppc-0.3.3.jar
lucene/dev/branches/docvalues/solr/contrib/clustering/src/main/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2StemmerFactory.java
- copied unchanged from r1124312, lucene/dev/trunk/solr/contrib/clustering/src/main/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2StemmerFactory.java
lucene/dev/branches/docvalues/solr/contrib/clustering/src/main/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2TokenizerFactory.java
- copied unchanged from r1124312, lucene/dev/trunk/solr/contrib/clustering/src/main/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2TokenizerFactory.java
lucene/dev/branches/docvalues/solr/contrib/clustering/src/main/java/org/apache/solr/handler/clustering/carrot2/SolrStopwordsCarrot2LexicalDataFactory.java
- copied unchanged from r1124312, lucene/dev/trunk/solr/contrib/clustering/src/main/java/org/apache/solr/handler/clustering/carrot2/SolrStopwordsCarrot2LexicalDataFactory.java
lucene/dev/branches/docvalues/solr/contrib/clustering/src/test/java/org/apache/solr/handler/clustering/carrot2/LexicalResourcesCheckClusteringAlgorithm.java
- copied unchanged from r1124312, lucene/dev/trunk/solr/contrib/clustering/src/test/java/org/apache/solr/handler/clustering/carrot2/LexicalResourcesCheckClusteringAlgorithm.java
lucene/dev/branches/docvalues/solr/contrib/clustering/src/test/resources/solr-clustering/conf/clustering/
- copied from r1124312, lucene/dev/trunk/solr/contrib/clustering/src/test/resources/solr-clustering/conf/clustering/
lucene/dev/branches/docvalues/solr/contrib/clustering/src/test/resources/solr-clustering/conf/clustering/carrot2/
- copied from r1124312, lucene/dev/trunk/solr/contrib/clustering/src/test/resources/solr-clustering/conf/clustering/carrot2/
lucene/dev/branches/docvalues/solr/contrib/clustering/src/test/resources/solr-clustering/conf/clustering/carrot2/stoplabels.mt
- copied unchanged from r1124312, lucene/dev/trunk/solr/contrib/clustering/src/test/resources/solr-clustering/conf/clustering/carrot2/stoplabels.mt
lucene/dev/branches/docvalues/solr/contrib/clustering/src/test/resources/solr-clustering/conf/clustering/carrot2/stopwords.mt
- copied unchanged from r1124312, lucene/dev/trunk/solr/contrib/clustering/src/test/resources/solr-clustering/conf/clustering/carrot2/stopwords.mt
lucene/dev/branches/docvalues/solr/contrib/clustering/src/test/resources/solr-clustering/conf/clustering/custom/
- copied from r1124312, lucene/dev/trunk/solr/contrib/clustering/src/test/resources/solr-clustering/conf/clustering/custom/
lucene/dev/branches/docvalues/solr/contrib/clustering/src/test/resources/solr-clustering/conf/clustering/custom/stoplabels.mt
- copied unchanged from r1124312, lucene/dev/trunk/solr/contrib/clustering/src/test/resources/solr-clustering/conf/clustering/custom/stoplabels.mt
lucene/dev/branches/docvalues/solr/contrib/clustering/src/test/resources/solr-clustering/conf/clustering/custom/stopwords.mt
- copied unchanged from r1124312, lucene/dev/trunk/solr/contrib/clustering/src/test/resources/solr-clustering/conf/clustering/custom/stopwords.mt
lucene/dev/branches/docvalues/solr/contrib/extraction/src/test/java/org/apache/solr/handler/extraction/
- copied from r1124312, lucene/dev/trunk/solr/contrib/extraction/src/test/java/org/apache/solr/handler/extraction/
lucene/dev/branches/docvalues/solr/contrib/extraction/src/test/java/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
- copied unchanged from r1124312, lucene/dev/trunk/solr/contrib/extraction/src/test/java/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
lucene/dev/branches/docvalues/solr/contrib/extraction/src/test/resources/password-is-solrcell.docx
- copied unchanged from r1124312, lucene/dev/trunk/solr/contrib/extraction/src/test/resources/password-is-solrcell.docx
lucene/dev/branches/docvalues/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/an/DummyExceptionAnnotator.java
- copied unchanged from r1124312, lucene/dev/trunk/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/an/DummyExceptionAnnotator.java
lucene/dev/branches/docvalues/solr/contrib/uima/src/test/resources/DummyExceptionAEDescriptor.xml
- copied unchanged from r1124312, lucene/dev/trunk/solr/contrib/uima/src/test/resources/DummyExceptionAEDescriptor.xml
lucene/dev/branches/docvalues/solr/contrib/uima/src/test/resources/TestExceptionAE.xml
- copied unchanged from r1124312, lucene/dev/trunk/solr/contrib/uima/src/test/resources/TestExceptionAE.xml
Removed:
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/Healthiness.java
lucene/dev/branches/docvalues/solr/contrib/clustering/lib/carrot2-core-3.4.2.jar
lucene/dev/branches/docvalues/solr/contrib/clustering/lib/hppc-0.3.1.jar
lucene/dev/branches/docvalues/solr/contrib/clustering/src/main/java/org/apache/solr/handler/clustering/carrot2/LuceneLanguageModelFactory.java
lucene/dev/branches/docvalues/solr/contrib/extraction/src/test/java/org/apache/solr/handler/ExtractingRequestHandlerTest.java
Modified:
lucene/dev/branches/docvalues/ (props changed)
lucene/dev/branches/docvalues/dev-tools/eclipse/dot.classpath
lucene/dev/branches/docvalues/dev-tools/idea/.idea/ant.xml
lucene/dev/branches/docvalues/dev-tools/idea/.idea/modules.xml
lucene/dev/branches/docvalues/dev-tools/idea/.idea/workspace.xml
lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/ant/ant.iml (props changed)
lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/db/bdb-je/bdb-je.iml (props changed)
lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/db/bdb/bdb.iml (props changed)
lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/demo/demo.iml (props changed)
lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/highlighter/highlighter.iml (props changed)
lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/instantiated/instantiated.iml (props changed)
lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/lucli/lucli.iml (props changed)
lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/memory/memory.iml (props changed)
lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/misc/misc.iml (props changed)
lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/queries/queries.iml (props changed)
lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/queryparser/queryparser.iml (props changed)
lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/spatial/spatial.iml (props changed)
lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/spellchecker/spellchecker.iml (props changed)
lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/swing/swing.iml (props changed)
lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/wordnet/wordnet.iml (props changed)
lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/xml-query-parser/xml-query-parser.iml (props changed)
lucene/dev/branches/docvalues/dev-tools/idea/lucene/lucene.iml (props changed)
lucene/dev/branches/docvalues/dev-tools/idea/modules/analysis/common/common.iml (props changed)
lucene/dev/branches/docvalues/dev-tools/idea/modules/analysis/icu/icu.iml (props changed)
lucene/dev/branches/docvalues/dev-tools/idea/modules/analysis/phonetic/phonetic.iml (props changed)
lucene/dev/branches/docvalues/dev-tools/idea/modules/analysis/smartcn/smartcn.iml (props changed)
lucene/dev/branches/docvalues/dev-tools/idea/modules/analysis/stempel/stempel.iml (props changed)
lucene/dev/branches/docvalues/dev-tools/idea/modules/benchmark/benchmark.iml (props changed)
lucene/dev/branches/docvalues/dev-tools/idea/parent.iml (props changed)
lucene/dev/branches/docvalues/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml (props changed)
lucene/dev/branches/docvalues/dev-tools/idea/solr/contrib/clustering/clustering.iml (props changed)
lucene/dev/branches/docvalues/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml (props changed)
lucene/dev/branches/docvalues/dev-tools/idea/solr/contrib/dataimporthandler/src/extras/extras.iml (props changed)
lucene/dev/branches/docvalues/dev-tools/idea/solr/contrib/extraction/extraction.iml (props changed)
lucene/dev/branches/docvalues/dev-tools/idea/solr/contrib/uima/uima.iml (props changed)
lucene/dev/branches/docvalues/dev-tools/idea/solr/solr.iml (props changed)
lucene/dev/branches/docvalues/dev-tools/maven/lucene/src/test-framework/pom.xml.template (props changed)
lucene/dev/branches/docvalues/dev-tools/maven/modules/pom.xml.template
lucene/dev/branches/docvalues/dev-tools/maven/pom.xml.template
lucene/dev/branches/docvalues/dev-tools/maven/solr/contrib/uima/pom.xml.template (props changed)
lucene/dev/branches/docvalues/dev-tools/maven/solr/src/test-framework/pom.xml.template (contents, props changed)
lucene/dev/branches/docvalues/lucene/ (props changed)
lucene/dev/branches/docvalues/lucene/CHANGES.txt
lucene/dev/branches/docvalues/lucene/backwards/ (props changed)
lucene/dev/branches/docvalues/lucene/contrib/CHANGES.txt
lucene/dev/branches/docvalues/lucene/contrib/ant/src/test/org/apache/lucene/ant/HtmlDocumentTest.java
lucene/dev/branches/docvalues/lucene/contrib/ant/src/test/org/apache/lucene/ant/TextDocumentTest.java
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/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexWriter.java
lucene/dev/branches/docvalues/lucene/contrib/lucli/src/java/lucli/LuceneMethods.java
lucene/dev/branches/docvalues/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
lucene/dev/branches/docvalues/lucene/contrib/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.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/java/org/apache/lucene/search/similar/SimilarityQueries.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/queryparser/src/test/org/apache/lucene/queryParser/precedence/TestPrecedenceQueryParser.java
lucene/dev/branches/docvalues/lucene/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynExpand.java
lucene/dev/branches/docvalues/lucene/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynLookup.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/src/java/org/apache/lucene/index/DirectoryReader.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/DocumentsWriterFlushControl.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThreadPool.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/IndexUpgrader.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/IndexWriterConfig.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/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/SegmentInfos.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/UpgradeIndexMergePolicy.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/codecs/VariableGapTermsIndexWriter.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/DocIdSetIterator.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/QueryTermVector.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/SloppyPhraseScorer.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/store/NIOFSDirectory.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/store/SimpleFSDirectory.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/util/BytesRef.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/util/StringHelper.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/util/automaton/LevenshteinAutomata.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/util/automaton/MinimizationOperations.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/util/automaton/fst/FST.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/util/LuceneTestCase.java
lucene/dev/branches/docvalues/lucene/src/test-framework/org/apache/lucene/util/automaton/AutomatonTestUtil.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/TestGlobalFieldNumbers.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/TestIndexWriterConfig.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/search/TestTermScorer.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/util/automaton/TestLevenshteinAutomata.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/util/automaton/TestMinimize.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/util/automaton/fst/TestFSTs.java
lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PrefixAndSuffixAwareTokenFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PrefixAwareTokenFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java
lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapper.java
lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/util/ReusableAnalyzerBase.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/commongrams/CommonGramsFilterTest.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiNormalizer.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiStemmer.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/in/TestIndicNormalizer.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianLightStemFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianStemmer.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestASCIIFoldingFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCapitalizationFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestHyphenatedWordsFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeepWordFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLengthFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPrefixAndSuffixAwareTokenFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPrefixAwareTokenFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilterTest.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenFilterTest.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceCharFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterTest.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterTest.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/reverse/TestReverseStringFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianLightStemFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/DateRecognizerSinkTokenizerTest.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TokenRangeSinkTokenizerTest.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TokenTypeSinkTokenizerTest.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymFilter.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishLowerCaseFilter.java
lucene/dev/branches/docvalues/modules/build.xml
lucene/dev/branches/docvalues/solr/ (props changed)
lucene/dev/branches/docvalues/solr/CHANGES.txt
lucene/dev/branches/docvalues/solr/contrib/clustering/CHANGES.txt
lucene/dev/branches/docvalues/solr/contrib/clustering/src/main/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java
lucene/dev/branches/docvalues/solr/contrib/clustering/src/main/java/org/apache/solr/handler/clustering/carrot2/CarrotParams.java
lucene/dev/branches/docvalues/solr/contrib/clustering/src/test/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngineTest.java
lucene/dev/branches/docvalues/solr/contrib/clustering/src/test/java/org/apache/solr/handler/clustering/carrot2/MockClusteringAlgorithm.java
lucene/dev/branches/docvalues/solr/contrib/clustering/src/test/resources/solr-clustering/conf/solrconfig.xml
lucene/dev/branches/docvalues/solr/contrib/clustering/src/test/resources/solr-clustering/conf/stopwords.txt
lucene/dev/branches/docvalues/solr/contrib/extraction/CHANGES.txt
lucene/dev/branches/docvalues/solr/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java
lucene/dev/branches/docvalues/solr/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/ExtractingParams.java
lucene/dev/branches/docvalues/solr/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/SolrContentHandler.java
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/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/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/resources/solr-uima/conf/solrconfig.xml
lucene/dev/branches/docvalues/solr/example/solr/conf/solrconfig.xml
lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/core/SolrConfig.java
lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/response/JSONResponseWriter.java
lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/JoinQParserPlugin.java
lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java
lucene/dev/branches/docvalues/solr/src/test-framework/org/apache/solr/JSONTestUtil.java
lucene/dev/branches/docvalues/solr/src/test-framework/org/apache/solr/SolrTestCaseJ4.java
lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/TestJoin.java
lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/request/JSONWriterTest.java
lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java
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=1124321&r1=1124320&r2=1124321&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/docvalues/dev-tools/eclipse/dot.classpath Wed May 18 16:24:27 2011
@@ -53,6 +53,8 @@
<classpathentry kind="src" path="modules/analysis/stempel/src/test"/>
<classpathentry kind="src" path="modules/benchmark/src/java"/>
<classpathentry kind="src" path="modules/benchmark/src/test"/>
+ <classpathentry kind="src" path="modules/grouping/src/java"/>
+ <classpathentry kind="src" path="modules/grouping/src/test"/>
<classpathentry kind="src" path="solr/src/java"/>
<classpathentry kind="src" path="solr/src/webapp/src"/>
<classpathentry kind="src" path="solr/src/common"/>
@@ -124,8 +126,8 @@
<classpathentry kind="lib" path="solr/example/lib/jsp-2.1/jsp-2.1-glassfish-2.1.v20091210.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jsp-2.1/jsp-2.1-jetty-6.1.26.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jsp-2.1/jsp-api-2.1-glassfish-2.1.v20091210.jar"/>
- <classpathentry kind="lib" path="solr/contrib/clustering/lib/carrot2-core-3.4.2.jar"/>
- <classpathentry kind="lib" path="solr/contrib/clustering/lib/hppc-0.3.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/clustering/lib/carrot2-core-3.5.0.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/clustering/lib/hppc-0.3.3.jar"/>
<classpathentry kind="lib" path="solr/contrib/clustering/lib/jackson-core-asl-1.5.2.jar"/>
<classpathentry kind="lib" path="solr/contrib/clustering/lib/jackson-mapper-asl-1.5.2.jar"/>
<classpathentry kind="lib" path="solr/contrib/clustering/lib/mahout-collections-0.3.jar"/>
Modified: lucene/dev/branches/docvalues/dev-tools/idea/.idea/ant.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/idea/.idea/ant.xml?rev=1124321&r1=1124320&r2=1124321&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/idea/.idea/ant.xml (original)
+++ lucene/dev/branches/docvalues/dev-tools/idea/.idea/ant.xml Wed May 18 16:24:27 2011
@@ -26,6 +26,7 @@
<buildFile url="file://$PROJECT_DIR$/modules/analysis/smartcn/build.xml" />
<buildFile url="file://$PROJECT_DIR$/modules/analysis/stempel/build.xml" />
<buildFile url="file://$PROJECT_DIR$/modules/benchmark/build.xml" />
+ <buildFile url="file://$PROJECT_DIR$/modules/grouping/build.xml" />
<buildFile url="file://$PROJECT_DIR$/solr/build.xml" />
<buildFile url="file://$PROJECT_DIR$/solr/contrib/analysis-extras/build.xml" />
<buildFile url="file://$PROJECT_DIR$/solr/contrib/clustering/build.xml" />
Modified: lucene/dev/branches/docvalues/dev-tools/idea/.idea/modules.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/idea/.idea/modules.xml?rev=1124321&r1=1124320&r2=1124321&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/idea/.idea/modules.xml (original)
+++ lucene/dev/branches/docvalues/dev-tools/idea/.idea/modules.xml Wed May 18 16:24:27 2011
@@ -26,6 +26,7 @@
<module filepath="$PROJECT_DIR$/modules/analysis/smartcn/smartcn.iml" />
<module filepath="$PROJECT_DIR$/modules/analysis/stempel/stempel.iml" />
<module filepath="$PROJECT_DIR$/modules/benchmark/benchmark.iml" />
+ <module filepath="$PROJECT_DIR$/modules/grouping/grouping.iml" />
<module filepath="$PROJECT_DIR$/solr/solr.iml" />
<module filepath="$PROJECT_DIR$/solr/contrib/analysis-extras/analysis-extras.iml" />
<module filepath="$PROJECT_DIR$/solr/contrib/clustering/clustering.iml" />
Modified: lucene/dev/branches/docvalues/dev-tools/idea/.idea/workspace.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/idea/.idea/workspace.xml?rev=1124321&r1=1124320&r2=1124321&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/idea/.idea/workspace.xml (original)
+++ lucene/dev/branches/docvalues/dev-tools/idea/.idea/workspace.xml Wed May 18 16:24:27 2011
@@ -71,6 +71,13 @@
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
+ <configuration default="false" name="grouping module" type="JUnit" factoryName="JUnit">
+ <module name="grouping" />
+ <option name="TEST_OBJECT" value="package" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/grouping/build" />
+ <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
+ <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
+ </configuration>
<configuration default="false" name="highlighter contrib" type="JUnit" factoryName="JUnit">
<module name="highlighter" />
<option name="TEST_OBJECT" value="package" />
@@ -204,7 +211,7 @@
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
- <list size="29">
+ <list size="30">
<item index="0" class="java.lang.String" itemvalue="JUnit.analysis-extras contrib" />
<item index="1" class="java.lang.String" itemvalue="JUnit.ant contrib" />
<item index="2" class="java.lang.String" itemvalue="JUnit.bdb contrib" />
@@ -215,25 +222,26 @@
<item index="7" class="java.lang.String" itemvalue="JUnit.dataimporthandler contrib" />
<item index="8" class="java.lang.String" itemvalue="JUnit.extraction contrib" />
<item index="9" class="java.lang.String" itemvalue="JUnit.extras from dataimporthandler contrib" />
- <item index="10" class="java.lang.String" itemvalue="JUnit.highlighter contrib" />
- <item index="11" class="java.lang.String" itemvalue="JUnit.icu analysis module" />
- <item index="12" class="java.lang.String" itemvalue="JUnit.instantiated contrib" />
- <item index="13" class="java.lang.String" itemvalue="JUnit.lucene" />
- <item index="14" class="java.lang.String" itemvalue="JUnit.lucli contrib" />
- <item index="15" class="java.lang.String" itemvalue="JUnit.memory contrib" />
- <item index="16" class="java.lang.String" itemvalue="JUnit.misc contrib" />
- <item index="17" class="java.lang.String" itemvalue="JUnit.phonetic analysis module" />
- <item index="18" class="java.lang.String" itemvalue="JUnit.queries contrib" />
- <item index="19" class="java.lang.String" itemvalue="JUnit.queryparser contrib" />
- <item index="20" class="java.lang.String" itemvalue="JUnit.smartcn analysis module" />
- <item index="21" class="java.lang.String" itemvalue="JUnit.solr" />
- <item index="22" class="java.lang.String" itemvalue="JUnit.spatial contrib" />
- <item index="23" class="java.lang.String" itemvalue="JUnit.spellchecker contrib" />
- <item index="24" class="java.lang.String" itemvalue="JUnit.stempel analysis module" />
- <item index="25" class="java.lang.String" itemvalue="JUnit.swing contrib" />
- <item index="26" class="java.lang.String" itemvalue="JUnit.uima contrib" />
- <item index="27" class="java.lang.String" itemvalue="JUnit.wordnet contrib" />
- <item index="28" class="java.lang.String" itemvalue="JUnit.xml-query-parser contrib" />
+ <item index="10" class="java.lang.String" itemvalue="JUnit.grouping module" />
+ <item index="11" class="java.lang.String" itemvalue="JUnit.highlighter contrib" />
+ <item index="12" class="java.lang.String" itemvalue="JUnit.icu analysis module" />
+ <item index="13" class="java.lang.String" itemvalue="JUnit.instantiated contrib" />
+ <item index="14" class="java.lang.String" itemvalue="JUnit.lucene" />
+ <item index="15" class="java.lang.String" itemvalue="JUnit.lucli contrib" />
+ <item index="16" class="java.lang.String" itemvalue="JUnit.memory contrib" />
+ <item index="17" class="java.lang.String" itemvalue="JUnit.misc contrib" />
+ <item index="18" class="java.lang.String" itemvalue="JUnit.phonetic analysis module" />
+ <item index="19" class="java.lang.String" itemvalue="JUnit.queries contrib" />
+ <item index="20" class="java.lang.String" itemvalue="JUnit.queryparser contrib" />
+ <item index="21" class="java.lang.String" itemvalue="JUnit.smartcn analysis module" />
+ <item index="22" class="java.lang.String" itemvalue="JUnit.solr" />
+ <item index="23" class="java.lang.String" itemvalue="JUnit.spatial contrib" />
+ <item index="24" class="java.lang.String" itemvalue="JUnit.spellchecker contrib" />
+ <item index="25" class="java.lang.String" itemvalue="JUnit.stempel analysis module" />
+ <item index="26" class="java.lang.String" itemvalue="JUnit.swing contrib" />
+ <item index="27" class="java.lang.String" itemvalue="JUnit.uima contrib" />
+ <item index="28" class="java.lang.String" itemvalue="JUnit.wordnet contrib" />
+ <item index="29" class="java.lang.String" itemvalue="JUnit.xml-query-parser contrib" />
</list>
</component>
</project>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/modules/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/modules/pom.xml.template?rev=1124321&r1=1124320&r2=1124321&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/modules/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/modules/pom.xml.template Wed May 18 16:24:27 2011
@@ -33,6 +33,7 @@
<modules>
<module>analysis</module>
<module>benchmark</module>
+ <module>grouping</module>
</modules>
<build>
<directory>build/lucene-modules-aggregator</directory>
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=1124321&r1=1124320&r2=1124321&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/pom.xml.template Wed May 18 16:24:27 2011
@@ -24,6 +24,7 @@
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>8</version>
+ <relativePath/>
</parent>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-solr-grandparent</artifactId>
@@ -106,14 +107,6 @@
</licenses>
<repositories>
<repository>
- <id>carrot2.org</id>
- <name>Carrot2 Maven2 repository</name>
- <url>http://download.carrot2.org/maven2/</url>
- <snapshots>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </repository>
- <repository>
<id>apache.snapshots</id>
<name>Apache Snapshot Repository</name>
<url>http://repository.apache.org/snapshots</url>
@@ -305,7 +298,7 @@
<dependency>
<groupId>org.carrot2</groupId>
<artifactId>carrot2-core</artifactId>
- <version>3.4.2</version>
+ <version>3.5.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/solr/src/test-framework/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/solr/src/test-framework/pom.xml.template?rev=1124321&r1=1124320&r2=1124321&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/solr/src/test-framework/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/solr/src/test-framework/pom.xml.template Wed May 18 16:24:27 2011
@@ -1,76 +1,76 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-parent</artifactId>
- <version>@version@</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-test-framework</artifactId>
- <packaging>jar</packaging>
- <name>Apache Solr Test Framework</name>
- <description>Apache Solr Test Framework</description>
- <properties>
- <module-directory>solr/src/test-framework</module-directory>
- <build-directory>../../build</build-directory>
- </properties>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>solr-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-test-framework</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- </dependencies>
- <build>
- <directory>${build-directory}</directory>
- <outputDirectory>${build-directory}/classes/test-framework</outputDirectory>
- <sourceDirectory>.</sourceDirectory>
- <resources>
- <resource>
- <directory>.</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ -->
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-parent</artifactId>
+ <version>@version@</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-test-framework</artifactId>
+ <packaging>jar</packaging>
+ <name>Apache Solr Test Framework</name>
+ <description>Apache Solr Test Framework</description>
+ <properties>
+ <module-directory>solr/src/test-framework</module-directory>
+ <build-directory>../../build</build-directory>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>solr-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-test-framework</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <directory>${build-directory}</directory>
+ <outputDirectory>${build-directory}/classes/test-framework</outputDirectory>
+ <sourceDirectory>.</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Modified: lucene/dev/branches/docvalues/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/CHANGES.txt?rev=1124321&r1=1124320&r2=1124321&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/docvalues/lucene/CHANGES.txt Wed May 18 16:24:27 2011
@@ -162,11 +162,6 @@ Changes in Runtime Behavior
* LUCENE-2720: IndexWriter throws IndexFormatTooOldException on open, rather
than later when e.g. a merge starts. (Shai Erera, Mike McCandless, Uwe Schindler)
-* LUCENE-1076: The default merge policy (TieredMergePolicy) is now
- able to merge non-contiguous segments, which means docIDs no longer
- necessarily say "in order". If this is a problem then you can use
- either of the LogMergePolicy impls. (Mike McCandless)
-
* LUCENE-2881: FieldInfos is now tracked per segment. Before it was tracked
per IndexWriter session, which resulted in FieldInfos that had the FieldInfo
properties from all previous segments combined. Field numbers are now tracked
@@ -416,6 +411,10 @@ New features
it's able to handle multi-valued fields and does not hold the term
bytes in RAM. (Mike McCandless)
+* LUCENE-1421, LUCENE-3102: added CachingCollector which allow you to cache
+ document IDs and scores encountered during the search, and "reply" them to
+ another Collector. (Mike McCandless, Shai Erera)
+
Optimizations
* LUCENE-2588: Don't store unnecessary suffixes when writing the terms
@@ -452,6 +451,9 @@ Bug fixes
indexes, causing existing deletions to be applied on the incoming indexes as
well. (Shai Erera, Mike McCandless)
+* LUCENE-3068: sloppy phrase query failed to match valid documents when multiple
+ query terms had same position in the query. (Doron Cohen)
+
Test Cases
* LUCENE-3002: added 'tests.iter.min' to control 'tests.iter' by allowing to
@@ -476,9 +478,15 @@ Changes in backwards compatibility polic
(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)
+ SegmentInfos to a List<SegmentInfo>. SegmentInfos itsself was changed
+ to no longer extend Vector<SegmentInfo> (to update code that is using
+ Vector-API, use the new asList() and asSet() methods returning unmodifiable
+ collections; modifying SegmentInfos is now only possible through
+ the explicitely declared methods). IndexWriter.segString() now takes
+ Iterable<SegmentInfo> instead of List<SegmentInfo>. A simple recompile
+ should fix this. MergePolicy and SegmentInfos are internal/experimental
+ APIs not covered by the strict backwards compatibility policy.
+ (Uwe Schindler, Mike McCandless)
Changes in runtime behavior
@@ -492,6 +500,13 @@ Changes in runtime behavior
returns NumericField instances. (Uwe Schindler, Ryan McKinley,
Mike McCandless)
+* LUCENE-1076: Changed the default merge policy from
+ LogByteSizeMergePolicy to TieredMergePolicy, as of Version.LUCENE_32
+ (passed to IndexWriterConfig), which is able to merge non-contiguous
+ segments. This means docIDs no longer necessarily stay "in order"
+ during indexing. If this is a problem then you can use either of
+ the LogMergePolicy impls. (Mike McCandless)
+
New features
* LUCENE-3082: Added index upgrade tool oal.index.IndexUpgrader
Modified: lucene/dev/branches/docvalues/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/CHANGES.txt?rev=1124321&r1=1124320&r2=1124321&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/CHANGES.txt Wed May 18 16:24:27 2011
@@ -75,10 +75,36 @@ Bug Fixes
caused a problem if you consumed a tokenstream, then reused it, added different
attributes to it, and consumed it again. (Robert Muir, Uwe Schindler)
+ * LUCENE-3113: Fixed some minor analysis bugs: double-reset() in ReusableAnalyzerBase
+ and ShingleAnalyzerWrapper, missing end() implementations in PrefixAwareTokenFilter
+ and PrefixAndSuffixAwareTokenFilter, invocations of incrementToken() after it
+ already returned false in CommonGramsQueryFilter, HyphenatedWordsFilter,
+ ShingleFilter, and SynonymsFilter. (Robert Muir, Steven Rowe, Uwe Schindler)
+
New Features
* LUCENE-3016: Add analyzer for Latvian. (Robert Muir)
+ * LUCENE-1421: create new grouping contrib module, enabling search
+ results to be grouped by a single-valued indexed field. This
+ module was factored out of Solr's grouping implementation, but
+ it cannot group by function queries nor arbitrary queries. (Mike
+ McCandless)
+
+ * LUCENE-3098: add AllGroupsCollector, to collect all unique groups
+ (but in unspecified order). (Martijn van Groningen via Mike
+ McCandless)
+
+ * LUCENE-3092: Added NRTCachingDirectory in contrib/misc, which
+ caches small segments in RAM. This is useful, in the near-real-time
+ case where the indexing rate is lowish but the reopen rate is
+ highish, to take load off the IO system. (Mike McCandless)
+
+Optimizations
+
+ * LUCENE-3040: Switch all analysis consumers (highlighter, morelikethis, memory, ...)
+ over to reusableTokenStream(). (Robert Muir)
+
======================= Lucene 3.1.0 =======================
Changes in backwards compatibility policy
Modified: lucene/dev/branches/docvalues/lucene/contrib/ant/src/test/org/apache/lucene/ant/HtmlDocumentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/ant/src/test/org/apache/lucene/ant/HtmlDocumentTest.java?rev=1124321&r1=1124320&r2=1124321&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/ant/src/test/org/apache/lucene/ant/HtmlDocumentTest.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/ant/src/test/org/apache/lucene/ant/HtmlDocumentTest.java Wed May 18 16:24:27 2011
@@ -17,8 +17,6 @@ package org.apache.lucene.ant;
* limitations under the License.
*/
-import java.io.IOException;
-
import org.apache.lucene.ant.DocumentTestCase;
import org.apache.lucene.ant.HtmlDocument;
@@ -27,7 +25,8 @@ public class HtmlDocumentTest extends Do
HtmlDocument doc;
@Override
- public void setUp() throws IOException {
+ public void setUp() throws Exception {
+ super.setUp();
doc = new HtmlDocument(getFile("test.html"));
}
@@ -37,8 +36,9 @@ public class HtmlDocumentTest extends Do
}
@Override
- public void tearDown() {
+ public void tearDown() throws Exception {
doc = null;
+ super.tearDown();
}
}
Modified: lucene/dev/branches/docvalues/lucene/contrib/ant/src/test/org/apache/lucene/ant/TextDocumentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/ant/src/test/org/apache/lucene/ant/TextDocumentTest.java?rev=1124321&r1=1124320&r2=1124321&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/ant/src/test/org/apache/lucene/ant/TextDocumentTest.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/ant/src/test/org/apache/lucene/ant/TextDocumentTest.java Wed May 18 16:24:27 2011
@@ -17,8 +17,6 @@ package org.apache.lucene.ant;
* limitations under the License.
*/
-import java.io.IOException;
-
import org.apache.lucene.ant.DocumentTestCase;
import org.apache.lucene.ant.TextDocument;
@@ -27,7 +25,8 @@ public class TextDocumentTest extends Do
TextDocument doc;
@Override
- public void setUp() throws IOException {
+ public void setUp() throws Exception {
+ super.setUp();
doc = new TextDocument(getFile("test.txt"));
}
@@ -36,8 +35,9 @@ public class TextDocumentTest extends Do
}
@Override
- public void tearDown() {
+ public void tearDown() throws Exception {
doc = null;
+ super.tearDown();
}
}
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=1124321&r1=1124320&r2=1124321&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 Wed May 18 16:24:27 2011
@@ -78,7 +78,7 @@ public class Highlighter
public final String getBestFragment(Analyzer analyzer, String fieldName,String text)
throws IOException, InvalidTokenOffsetsException
{
- TokenStream tokenStream = analyzer.tokenStream(fieldName, new StringReader(text));
+ TokenStream tokenStream = analyzer.reusableTokenStream(fieldName, new StringReader(text));
return getBestFragment(tokenStream, text);
}
@@ -130,7 +130,7 @@ public class Highlighter
int maxNumFragments)
throws IOException, InvalidTokenOffsetsException
{
- TokenStream tokenStream = analyzer.tokenStream(fieldName, new StringReader(text));
+ TokenStream tokenStream = analyzer.reusableTokenStream(fieldName, new StringReader(text));
return getBestFragments(tokenStream, text, maxNumFragments);
}
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=1124321&r1=1124320&r2=1124321&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 Wed May 18 16:24:27 2011
@@ -286,7 +286,11 @@ public class TokenSources {
// convenience method
public static TokenStream getTokenStream(String field, String contents,
Analyzer analyzer) {
- return analyzer.tokenStream(field, new StringReader(contents));
+ try {
+ return analyzer.reusableTokenStream(field, new StringReader(contents));
+ } catch (IOException ex) {
+ throw new RuntimeException(ex);
+ }
}
}
Modified: lucene/dev/branches/docvalues/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexWriter.java?rev=1124321&r1=1124320&r2=1124321&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexWriter.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexWriter.java Wed May 18 16:24:27 2011
@@ -532,7 +532,7 @@ public class InstantiatedIndexWriter imp
if (field.tokenStreamValue() != null) {
tokenStream = field.tokenStreamValue();
} else {
- tokenStream = analyzer.tokenStream(field.name(), new StringReader(field.stringValue()));
+ tokenStream = analyzer.reusableTokenStream(field.name(), new StringReader(field.stringValue()));
}
// reset the TokenStream to the first token
Modified: lucene/dev/branches/docvalues/lucene/contrib/lucli/src/java/lucli/LuceneMethods.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/lucli/src/java/lucli/LuceneMethods.java?rev=1124321&r1=1124320&r2=1124321&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/lucli/src/java/lucli/LuceneMethods.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/lucli/src/java/lucli/LuceneMethods.java Wed May 18 16:24:27 2011
@@ -305,11 +305,12 @@ class LuceneMethods {
int position = 0;
// Tokenize field and add to postingTable
- TokenStream stream = analyzer.tokenStream(fieldName, reader);
+ TokenStream stream = analyzer.reusableTokenStream(fieldName, reader);
CharTermAttribute termAtt = stream.addAttribute(CharTermAttribute.class);
PositionIncrementAttribute posIncrAtt = stream.addAttribute(PositionIncrementAttribute.class);
try {
+ stream.reset();
while (stream.incrementToken()) {
position += (posIncrAtt.getPositionIncrement() - 1);
position++;
@@ -323,6 +324,7 @@ class LuceneMethods {
}
if (position > maxFieldLength) break;
}
+ stream.end();
} finally {
stream.close();
}
Modified: lucene/dev/branches/docvalues/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java?rev=1124321&r1=1124320&r2=1124321&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java Wed May 18 16:24:27 2011
@@ -262,8 +262,12 @@ public class MemoryIndex {
if (analyzer == null)
throw new IllegalArgumentException("analyzer must not be null");
- TokenStream stream = analyzer.tokenStream(fieldName,
- new StringReader(text));
+ TokenStream stream;
+ try {
+ stream = analyzer.reusableTokenStream(fieldName, new StringReader(text));
+ } catch (IOException ex) {
+ throw new RuntimeException(ex);
+ }
addField(fieldName, stream);
}
Modified: lucene/dev/branches/docvalues/lucene/contrib/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.java?rev=1124321&r1=1124320&r2=1124321&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.java Wed May 18 16:24:27 2011
@@ -19,6 +19,7 @@ package org.apache.lucene.index;
import java.io.IOException;
+import java.util.Collections;
import java.util.Set;
/**
@@ -135,7 +136,7 @@ public class BalancedSegmentMergePolicy
if (last > 1 || !isOptimized(infos.info(0))) {
spec = new MergeSpecification();
- spec.add(new OneMerge(infos.range(0, last)));
+ spec.add(new OneMerge(infos.asList().subList(0, last)));
}
} else if (last > maxNumSegments) {
@@ -192,7 +193,7 @@ public class BalancedSegmentMergePolicy
prev = backLink[i][prev];
int mergeStart = i + prev;
if((mergeEnd - mergeStart) > 1) {
- spec.add(new OneMerge(infos.range(mergeStart, mergeEnd)));
+ spec.add(new OneMerge(infos.asList().subList(mergeStart, mergeEnd)));
} else {
if(partialExpunge) {
SegmentInfo info = infos.info(mergeStart);
@@ -208,7 +209,7 @@ public class BalancedSegmentMergePolicy
if(partialExpunge && maxDelCount > 0) {
// expunge deletes
- spec.add(new OneMerge(infos.range(expungeCandidate, expungeCandidate + 1)));
+ spec.add(new OneMerge(Collections.singletonList(infos.info(expungeCandidate))));
}
return spec;
@@ -250,7 +251,10 @@ public class BalancedSegmentMergePolicy
MergeSpecification spec = null;
if(numLargeSegs < numSegs) {
- SegmentInfos smallSegments = infos.range(numLargeSegs, numSegs);
+ // hack to create a shallow sub-range as SegmentInfos instance,
+ // it does not clone all metadata, but LogMerge does not need it
+ final SegmentInfos smallSegments = new SegmentInfos();
+ smallSegments.rollbackSegmentInfos(infos.asList().subList(numLargeSegs, numSegs));
spec = super.findMergesToExpungeDeletes(smallSegments);
}
@@ -258,7 +262,7 @@ public class BalancedSegmentMergePolicy
for(int i = 0; i < numLargeSegs; i++) {
SegmentInfo info = infos.info(i);
if(info.hasDeletions()) {
- spec.add(new OneMerge(infos.range(i, i + 1)));
+ spec.add(new OneMerge(Collections.singletonList(infos.info(i))));
}
}
return spec;
@@ -296,7 +300,7 @@ public class BalancedSegmentMergePolicy
if(totalSmallSegSize < targetSegSize * 2) {
MergeSpecification spec = findBalancedMerges(infos, numLargeSegs, (numLargeSegs - 1), _partialExpunge);
if(spec == null) spec = new MergeSpecification(); // should not happen
- spec.add(new OneMerge(infos.range(numLargeSegs, numSegs)));
+ spec.add(new OneMerge(infos.asList().subList(numLargeSegs, numSegs)));
return spec;
} else {
return findBalancedMerges(infos, numSegs, numLargeSegs, _partialExpunge);
@@ -311,11 +315,13 @@ public class BalancedSegmentMergePolicy
if(size(info) < sizeThreshold) break;
startSeg++;
}
- spec.add(new OneMerge(infos.range(startSeg, numSegs)));
+ spec.add(new OneMerge(infos.asList().subList(startSeg, numSegs)));
return spec;
} else {
- // apply the log merge policy to small segments.
- SegmentInfos smallSegments = infos.range(numLargeSegs, numSegs);
+ // hack to create a shallow sub-range as SegmentInfos instance,
+ // it does not clone all metadata, but LogMerge does not need it
+ final SegmentInfos smallSegments = new SegmentInfos();
+ smallSegments.rollbackSegmentInfos(infos.asList().subList(numLargeSegs, numSegs));
MergeSpecification spec = super.findMerges(smallSegments);
if(_partialExpunge) {
@@ -342,7 +348,7 @@ public class BalancedSegmentMergePolicy
}
}
if (maxDelCount > 0) {
- return new OneMerge(infos.range(expungeCandidate, expungeCandidate + 1));
+ return new OneMerge(Collections.singletonList(infos.info(expungeCandidate)));
}
return null;
}
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=1124321&r1=1124320&r2=1124321&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 Wed May 18 16:24:27 2011
@@ -186,7 +186,7 @@ public class FuzzyLikeThisQuery extends
private void addTerms(IndexReader reader,FieldVals f) throws IOException
{
if(f.queryString==null) return;
- TokenStream ts=analyzer.tokenStream(f.fieldName,new StringReader(f.queryString));
+ TokenStream ts=analyzer.reusableTokenStream(f.fieldName,new StringReader(f.queryString));
CharTermAttribute termAtt = ts.addAttribute(CharTermAttribute.class);
int corpusNumDocs=reader.numDocs();
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=1124321&r1=1124320&r2=1124321&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 Wed May 18 16:24:27 2011
@@ -881,7 +881,7 @@ public final class MoreLikeThis {
throw new UnsupportedOperationException("To use MoreLikeThis without " +
"term vectors, you must provide an Analyzer");
}
- TokenStream ts = analyzer.tokenStream(fieldName, r);
+ TokenStream ts = analyzer.reusableTokenStream(fieldName, r);
int tokenCount=0;
// for every token
CharTermAttribute termAtt = ts.addAttribute(CharTermAttribute.class);
Modified: lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/similar/SimilarityQueries.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/similar/SimilarityQueries.java?rev=1124321&r1=1124320&r2=1124321&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/similar/SimilarityQueries.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/similar/SimilarityQueries.java Wed May 18 16:24:27 2011
@@ -85,7 +85,7 @@ public final class SimilarityQueries
Set<?> stop)
throws IOException
{
- TokenStream ts = a.tokenStream( field, new StringReader( body));
+ TokenStream ts = a.reusableTokenStream( field, new StringReader( body));
CharTermAttribute termAtt = ts.addAttribute(CharTermAttribute.class);
BooleanQuery tmp = new BooleanQuery();
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=1124321&r1=1124320&r2=1124321&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 Wed May 18 16:24:27 2011
@@ -106,15 +106,16 @@ public class AnalyzingQueryParser extend
}
// get Analyzer from superclass and tokenize the term
- TokenStream source = getAnalyzer().tokenStream(field, new StringReader(termStr));
- CharTermAttribute termAtt = source.addAttribute(CharTermAttribute.class);
+ TokenStream source;
int countTokens = 0;
try {
+ source = getAnalyzer().reusableTokenStream(field, new StringReader(termStr));
source.reset();
} catch (IOException e1) {
throw new RuntimeException(e1);
}
+ CharTermAttribute termAtt = source.addAttribute(CharTermAttribute.class);
while (true) {
try {
if (!source.incrementToken()) break;
@@ -194,14 +195,15 @@ public class AnalyzingQueryParser extend
@Override
protected Query getPrefixQuery(String field, String termStr) throws ParseException {
// get Analyzer from superclass and tokenize the term
- TokenStream source = getAnalyzer().tokenStream(field, new StringReader(termStr));
+ TokenStream source;
List<String> tlist = new ArrayList<String>();
- CharTermAttribute termAtt = source.addAttribute(CharTermAttribute.class);
try {
+ source = getAnalyzer().reusableTokenStream(field, new StringReader(termStr));
source.reset();
} catch (IOException e1) {
throw new RuntimeException(e1);
}
+ CharTermAttribute termAtt = source.addAttribute(CharTermAttribute.class);
while (true) {
try {
if (!source.incrementToken()) break;
@@ -247,12 +249,13 @@ public class AnalyzingQueryParser extend
protected Query getFuzzyQuery(String field, String termStr, float minSimilarity)
throws ParseException {
// get Analyzer from superclass and tokenize the term
- TokenStream source = getAnalyzer().tokenStream(field, new StringReader(termStr));
- CharTermAttribute termAtt = source.addAttribute(CharTermAttribute.class);
+ TokenStream source = null;
String nextToken = null;
boolean multipleTokens = false;
try {
+ source = getAnalyzer().reusableTokenStream(field, new StringReader(termStr));
+ CharTermAttribute termAtt = source.addAttribute(CharTermAttribute.class);
source.reset();
if (source.incrementToken()) {
nextToken = termAtt.toString();
@@ -292,7 +295,7 @@ public class AnalyzingQueryParser extend
if (part1 != null) {
// part1
try {
- source = getAnalyzer().tokenStream(field, new StringReader(part1));
+ source = getAnalyzer().reusableTokenStream(field, new StringReader(part1));
termAtt = source.addAttribute(CharTermAttribute.class);
source.reset();
multipleTokens = false;
@@ -318,11 +321,10 @@ public class AnalyzingQueryParser extend
}
if (part2 != null) {
- // part2
- source = getAnalyzer().tokenStream(field, new StringReader(part2));
- termAtt = source.addAttribute(CharTermAttribute.class);
-
try {
+ // part2
+ source = getAnalyzer().reusableTokenStream(field, new StringReader(part2));
+ termAtt = source.addAttribute(CharTermAttribute.class);
source.reset();
if (source.incrementToken()) {
part2 = termAtt.toString();
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=1124321&r1=1124320&r2=1124321&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 Wed May 18 16:24:27 2011
@@ -121,9 +121,9 @@ public class AnalyzerQueryNodeProcessor
String text = fieldNode.getTextAsString();
String field = fieldNode.getFieldAsString();
- TokenStream source = this.analyzer.tokenStream(field, new StringReader(
- text));
+ TokenStream source;
try {
+ source = this.analyzer.reusableTokenStream(field, new StringReader(text));
source.reset();
} catch (IOException e1) {
throw new RuntimeException(e1);
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/precedence/TestPrecedenceQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/precedence/TestPrecedenceQueryParser.java?rev=1124321&r1=1124320&r2=1124321&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/precedence/TestPrecedenceQueryParser.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/precedence/TestPrecedenceQueryParser.java Wed May 18 16:24:27 2011
@@ -631,8 +631,9 @@ public class TestPrecedenceQueryParser e
}
@Override
- public void tearDown() {
+ public void tearDown() throws Exception {
BooleanQuery.setMaxClauseCount(originalMaxClauses);
+ super.tearDown();
}
}
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=1124321&r1=1124320&r2=1124321&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 Wed May 18 16:24:27 2011
@@ -116,7 +116,7 @@ public final class SynExpand {
if ( a == null) a = new StandardAnalyzer(Version.LUCENE_CURRENT);
// [1] Parse query into separate words so that when we expand we can avoid dups
- TokenStream ts = a.tokenStream( field, new StringReader( query));
+ TokenStream ts = a.reusableTokenStream( field, new StringReader( query));
CharTermAttribute termAtt = ts.addAttribute(CharTermAttribute.class);
ts.reset();
while (ts.incrementToken()) {
Modified: lucene/dev/branches/docvalues/lucene/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynLookup.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynLookup.java?rev=1124321&r1=1124320&r2=1124321&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynLookup.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynLookup.java Wed May 18 16:24:27 2011
@@ -124,7 +124,7 @@ public class SynLookup {
List<String> top = new LinkedList<String>(); // needs to be separately listed..
// [1] Parse query into separate words so that when we expand we can avoid dups
- TokenStream ts = a.tokenStream( field, new StringReader( query));
+ TokenStream ts = a.reusableTokenStream( field, new StringReader( query));
CharTermAttribute termAtt = ts.addAttribute(CharTermAttribute.class);
while (ts.incrementToken()) {
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=1124321&r1=1124320&r2=1124321&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 Wed May 18 16:24:27 2011
@@ -76,10 +76,10 @@ public class LikeThisQueryBuilder implem
stopWordsSet=new HashSet<String>();
for (int i = 0; i < fields.length; i++)
{
- TokenStream ts = analyzer.tokenStream(fields[i],new StringReader(stopWords));
- CharTermAttribute termAtt = ts.addAttribute(CharTermAttribute.class);
try
{
+ TokenStream ts = analyzer.reusableTokenStream(fields[i],new StringReader(stopWords));
+ CharTermAttribute termAtt = ts.addAttribute(CharTermAttribute.class);
ts.reset();
while(ts.incrementToken()) {
stopWordsSet.add(termAtt.toString());
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=1124321&r1=1124320&r2=1124321&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 Wed May 18 16:24:27 2011
@@ -56,7 +56,7 @@ public class SpanOrTermsBuilder extends
try
{
ArrayList<SpanQuery> clausesList=new ArrayList<SpanQuery>();
- TokenStream ts=analyzer.tokenStream(fieldName,new StringReader(value));
+ TokenStream ts=analyzer.reusableTokenStream(fieldName,new StringReader(value));
TermToBytesRefAttribute termAtt = ts.addAttribute(TermToBytesRefAttribute.class);
BytesRef bytes = termAtt.getBytesRef();
ts.reset();
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=1124321&r1=1124320&r2=1124321&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 Wed May 18 16:24:27 2011
@@ -57,11 +57,11 @@ public class TermsFilterBuilder implemen
TermsFilter tf = new TermsFilter();
String text = DOMUtils.getNonBlankTextOrFail(e);
String fieldName = DOMUtils.getAttributeWithInheritanceOrFail(e, "fieldName");
- TokenStream ts = analyzer.tokenStream(fieldName, new StringReader(text));
- TermToBytesRefAttribute termAtt = ts.addAttribute(TermToBytesRefAttribute.class);
try
{
+ TokenStream ts = analyzer.reusableTokenStream(fieldName, new StringReader(text));
+ TermToBytesRefAttribute termAtt = ts.addAttribute(TermToBytesRefAttribute.class);
Term term = null;
BytesRef bytes = termAtt.getBytesRef();
ts.reset();
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=1124321&r1=1124320&r2=1124321&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 Wed May 18 16:24:27 2011
@@ -55,9 +55,9 @@ public class TermsQueryBuilder implement
BooleanQuery bq=new BooleanQuery(DOMUtils.getAttribute(e,"disableCoord",false));
bq.setMinimumNumberShouldMatch(DOMUtils.getAttribute(e,"minimumNumberShouldMatch",0));
- TokenStream ts = analyzer.tokenStream(fieldName, new StringReader(text));
try
{
+ TokenStream ts = analyzer.reusableTokenStream(fieldName, new StringReader(text));
TermToBytesRefAttribute termAtt = ts.addAttribute(TermToBytesRefAttribute.class);
Term term = null;
BytesRef bytes = termAtt.getBytesRef();