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/04/04 15:03:48 UTC
svn commit: r1088606 [1/5] - in /lucene/dev/branches/realtime_search: ./
dev-tools/eclipse/ dev-tools/idea/solr/ dev-tools/maven/
dev-tools/maven/solr/ dev-tools/maven/solr/contrib/analysis-extras/
dev-tools/maven/solr/contrib/clustering/ dev-tools/mav...
Author: simonw
Date: Mon Apr 4 13:03:42 2011
New Revision: 1088606
URL: http://svn.apache.org/viewvc?rev=1088606&view=rev
Log:
merged with trunk
Added:
lucene/dev/branches/realtime_search/dev-tools/maven/solr/src/test-framework/
- copied from r1088598, lucene/dev/trunk/dev-tools/maven/solr/src/test-framework/
lucene/dev/branches/realtime_search/dev-tools/maven/solr/src/test-framework/pom.xml.template
- copied unchanged from r1088598, lucene/dev/trunk/dev-tools/maven/solr/src/test-framework/pom.xml.template
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/DocTermOrds.java
- copied unchanged from r1088598, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocTermOrds.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/TieredMergePolicy.java
- copied unchanged from r1088598, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TieredMergePolicy.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/TestDocTermOrds.java
- copied unchanged from r1088598, lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDocTermOrds.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/TestTieredMergePolicy.java
- copied unchanged from r1088598, lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTieredMergePolicy.java
lucene/dev/branches/realtime_search/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/
- copied from r1088598, lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/
lucene/dev/branches/realtime_search/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java
- copied unchanged from r1088598, lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java
lucene/dev/branches/realtime_search/solr/contrib/analysis-extras/src/test-files/solr-analysis-extras/
- copied from r1088598, lucene/dev/trunk/solr/contrib/analysis-extras/src/test-files/solr-analysis-extras/
lucene/dev/branches/realtime_search/solr/contrib/analysis-extras/src/test-files/solr-analysis-extras/conf/
- copied from r1088598, lucene/dev/trunk/solr/contrib/analysis-extras/src/test-files/solr-analysis-extras/conf/
lucene/dev/branches/realtime_search/solr/contrib/analysis-extras/src/test-files/solr-analysis-extras/conf/schema-icucollate.xml
- copied unchanged from r1088598, lucene/dev/trunk/solr/contrib/analysis-extras/src/test-files/solr-analysis-extras/conf/schema-icucollate.xml
lucene/dev/branches/realtime_search/solr/contrib/analysis-extras/src/test-files/solr-analysis-extras/conf/solrconfig-icucollate.xml
- copied unchanged from r1088598, lucene/dev/trunk/solr/contrib/analysis-extras/src/test-files/solr-analysis-extras/conf/solrconfig-icucollate.xml
lucene/dev/branches/realtime_search/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/
- copied from r1088598, lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/
lucene/dev/branches/realtime_search/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java
- copied unchanged from r1088598, lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java
lucene/dev/branches/realtime_search/solr/site/skin/images/apache-thanks.png
- copied unchanged from r1088598, lucene/dev/trunk/solr/site/skin/images/apache-thanks.png
lucene/dev/branches/realtime_search/solr/site/skin/images/built-with-cocoon.gif
- copied unchanged from r1088598, lucene/dev/trunk/solr/site/skin/images/built-with-cocoon.gif
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/schema/CollationField.java
- copied unchanged from r1088598, lucene/dev/trunk/solr/src/java/org/apache/solr/schema/CollationField.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/schema/SimilarityProviderFactory.java
- copied unchanged from r1088598, lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SimilarityProviderFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/schema/TrieFieldHelper.java
- copied unchanged from r1088598, lucene/dev/trunk/solr/src/java/org/apache/solr/schema/TrieFieldHelper.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/SolrSimilarityProvider.java
- copied unchanged from r1088598, lucene/dev/trunk/solr/src/java/org/apache/solr/search/SolrSimilarityProvider.java
lucene/dev/branches/realtime_search/solr/src/test-files/solr/conf/schema-collate.xml
- copied unchanged from r1088598, lucene/dev/trunk/solr/src/test-files/solr/conf/schema-collate.xml
lucene/dev/branches/realtime_search/solr/src/test-files/solr/conf/solrconfig-collate.xml
- copied unchanged from r1088598, lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-collate.xml
lucene/dev/branches/realtime_search/solr/src/test-framework/ (props changed)
- copied from r1088598, lucene/dev/trunk/solr/src/test-framework/
lucene/dev/branches/realtime_search/solr/src/test-framework/org/
- copied from r1088598, lucene/dev/trunk/solr/src/test-framework/org/
lucene/dev/branches/realtime_search/solr/src/test-framework/org/apache/
- copied from r1088598, lucene/dev/trunk/solr/src/test-framework/org/apache/
lucene/dev/branches/realtime_search/solr/src/test-framework/org/apache/solr/
- copied from r1088598, lucene/dev/trunk/solr/src/test-framework/org/apache/solr/
lucene/dev/branches/realtime_search/solr/src/test-framework/org/apache/solr/BaseDistributedSearchTestCase.java
- copied unchanged from r1088598, lucene/dev/trunk/solr/src/test-framework/org/apache/solr/BaseDistributedSearchTestCase.java
lucene/dev/branches/realtime_search/solr/src/test-framework/org/apache/solr/JSONTestUtil.java
- copied unchanged from r1088598, lucene/dev/trunk/solr/src/test-framework/org/apache/solr/JSONTestUtil.java
lucene/dev/branches/realtime_search/solr/src/test-framework/org/apache/solr/SolrTestCaseJ4.java
- copied unchanged from r1088598, lucene/dev/trunk/solr/src/test-framework/org/apache/solr/SolrTestCaseJ4.java
lucene/dev/branches/realtime_search/solr/src/test-framework/org/apache/solr/analysis/
- copied from r1088598, lucene/dev/trunk/solr/src/test-framework/org/apache/solr/analysis/
lucene/dev/branches/realtime_search/solr/src/test-framework/org/apache/solr/analysis/BaseTokenTestCase.java
- copied unchanged from r1088598, lucene/dev/trunk/solr/src/test-framework/org/apache/solr/analysis/BaseTokenTestCase.java
lucene/dev/branches/realtime_search/solr/src/test-framework/org/apache/solr/util/
- copied from r1088598, lucene/dev/trunk/solr/src/test-framework/org/apache/solr/util/
lucene/dev/branches/realtime_search/solr/src/test-framework/org/apache/solr/util/AbstractSolrTestCase.java
- copied unchanged from r1088598, lucene/dev/trunk/solr/src/test-framework/org/apache/solr/util/AbstractSolrTestCase.java
lucene/dev/branches/realtime_search/solr/src/test-framework/org/apache/solr/util/TestHarness.java
- copied unchanged from r1088598, lucene/dev/trunk/solr/src/test-framework/org/apache/solr/util/TestHarness.java
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/schema/CustomSimilarityProviderFactory.java
- copied unchanged from r1088598, lucene/dev/trunk/solr/src/test/org/apache/solr/schema/CustomSimilarityProviderFactory.java
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/schema/MockConfigurableSimilarityProvider.java
- copied unchanged from r1088598, lucene/dev/trunk/solr/src/test/org/apache/solr/schema/MockConfigurableSimilarityProvider.java
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/schema/TestCollationField.java
- copied unchanged from r1088598, lucene/dev/trunk/solr/src/test/org/apache/solr/schema/TestCollationField.java
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/schema/TestPerFieldSimilarity.java
- copied unchanged from r1088598, lucene/dev/trunk/solr/src/test/org/apache/solr/schema/TestPerFieldSimilarity.java
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/util/ExternalPaths.java
- copied unchanged from r1088598, lucene/dev/trunk/solr/src/test/org/apache/solr/util/ExternalPaths.java
Removed:
lucene/dev/branches/realtime_search/lucene/.cvsignore
lucene/dev/branches/realtime_search/lucene/contrib/highlighter/.cvsignore
lucene/dev/branches/realtime_search/solr/contrib/analysis-extras/src/test-files/empty
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/util/TestHarness.java
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/BaseDistributedSearchTestCase.java
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/JSONTestUtil.java
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/SolrTestCaseJ4.java
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/analysis/BaseTokenTestCase.java
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/util/AbstractSolrTestCase.java
Modified:
lucene/dev/branches/realtime_search/ (props changed)
lucene/dev/branches/realtime_search/dev-tools/eclipse/dot.classpath
lucene/dev/branches/realtime_search/dev-tools/idea/solr/solr.iml
lucene/dev/branches/realtime_search/dev-tools/maven/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/clustering/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/extraction/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/uima/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/solr/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/solr/src/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/solr/src/solrj/pom.xml.template
lucene/dev/branches/realtime_search/lucene/ (props changed)
lucene/dev/branches/realtime_search/lucene/CHANGES.txt
lucene/dev/branches/realtime_search/lucene/MIGRATE.txt
lucene/dev/branches/realtime_search/lucene/build.xml
lucene/dev/branches/realtime_search/lucene/common-build.xml
lucene/dev/branches/realtime_search/lucene/contrib/CHANGES.txt
lucene/dev/branches/realtime_search/lucene/contrib/ant/src/java/org/apache/lucene/ant/IndexTask.java
lucene/dev/branches/realtime_search/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java
lucene/dev/branches/realtime_search/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java
lucene/dev/branches/realtime_search/lucene/contrib/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java
lucene/dev/branches/realtime_search/lucene/contrib/misc/src/test/org/apache/lucene/index/codecs/appending/TestAppendingCodec.java
lucene/dev/branches/realtime_search/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java
lucene/dev/branches/realtime_search/lucene/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java
lucene/dev/branches/realtime_search/lucene/contrib/queries/src/test/org/apache/lucene/search/FuzzyLikeThisQueryTest.java
lucene/dev/branches/realtime_search/lucene/contrib/spellchecker/src/java/org/apache/lucene/search/spell/SpellChecker.java
lucene/dev/branches/realtime_search/lucene/contrib/wordnet/src/java/org/apache/lucene/wordnet/Syns2Index.java
lucene/dev/branches/realtime_search/lucene/contrib/wordnet/src/test/org/apache/lucene/wordnet/TestWordnet.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/CheckIndex.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/FieldInfo.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/FieldInfos.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/IndexReader.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/IndexWriter.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/IndexWriterConfig.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/LogMergePolicy.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/MergePolicy.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/SegmentInfo.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/SegmentReader.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/store/DataInput.java (props changed)
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/util/PriorityQueue.java
lucene/dev/branches/realtime_search/lucene/src/test-framework/org/apache/lucene/index/RandomIndexWriter.java
lucene/dev/branches/realtime_search/lucene/src/test-framework/org/apache/lucene/store/MockDirectoryWrapper.java
lucene/dev/branches/realtime_search/lucene/src/test-framework/org/apache/lucene/util/LineFileDocs.java
lucene/dev/branches/realtime_search/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
lucene/dev/branches/realtime_search/lucene/src/test-framework/org/apache/lucene/util/_TestUtil.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/TestAtomicUpdate.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/TestDocsAndPositions.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/TestIndexReader.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/TestIndexReaderReopen.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/TestIndexWriterConfig.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/TestMaxTermFrequency.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/TestNRTThreads.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/TestNorms.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/TestOmitNorms.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/TestOmitTf.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/TestPayloads.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/TestRollingUpdates.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/TestSegmentTermDocs.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestBoolean2.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestDocBoost.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestExplanations.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestFieldCache.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery2.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestSort.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestSpanQueryFilter.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestSubScorerFreqs.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestTermScorer.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestTermVectors.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestWildcard.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/cache/TestEntryCreators.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/function/FunctionTestSetup.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/function/TestValueSource.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/spans/TestSpansAdvanced2.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/store/TestMultiMMap.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/util/automaton/fst/TestFSTs.java
lucene/dev/branches/realtime_search/modules/ (props changed)
lucene/dev/branches/realtime_search/modules/analysis/icu/build.xml
lucene/dev/branches/realtime_search/modules/benchmark/CHANGES.txt
lucene/dev/branches/realtime_search/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java
lucene/dev/branches/realtime_search/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java
lucene/dev/branches/realtime_search/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewCollationAnalyzerTask.java
lucene/dev/branches/realtime_search/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewShingleAnalyzerTask.java
lucene/dev/branches/realtime_search/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java
lucene/dev/branches/realtime_search/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTokensTask.java
lucene/dev/branches/realtime_search/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java
lucene/dev/branches/realtime_search/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
lucene/dev/branches/realtime_search/solr/ (props changed)
lucene/dev/branches/realtime_search/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/realtime_search/solr/LICENSE.txt (props changed)
lucene/dev/branches/realtime_search/solr/NOTICE.txt (props changed)
lucene/dev/branches/realtime_search/solr/README.txt (props changed)
lucene/dev/branches/realtime_search/solr/build.xml (contents, props changed)
lucene/dev/branches/realtime_search/solr/client/ (props changed)
lucene/dev/branches/realtime_search/solr/common-build.xml (contents, props changed)
lucene/dev/branches/realtime_search/solr/contrib/ (props changed)
lucene/dev/branches/realtime_search/solr/contrib/analysis-extras/CHANGES.txt
lucene/dev/branches/realtime_search/solr/contrib/analysis-extras/build.xml
lucene/dev/branches/realtime_search/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUCollationKeyFilterFactory.java
lucene/dev/branches/realtime_search/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUCollationKeyFilterFactory.java
lucene/dev/branches/realtime_search/solr/contrib/clustering/build.xml
lucene/dev/branches/realtime_search/solr/contrib/dataimporthandler/build.xml
lucene/dev/branches/realtime_search/solr/contrib/extraction/build.xml
lucene/dev/branches/realtime_search/solr/contrib/uima/build.xml
lucene/dev/branches/realtime_search/solr/example/ (props changed)
lucene/dev/branches/realtime_search/solr/lib/ (props changed)
lucene/dev/branches/realtime_search/solr/site/ (props changed)
lucene/dev/branches/realtime_search/solr/site/features.html
lucene/dev/branches/realtime_search/solr/site/index.html
lucene/dev/branches/realtime_search/solr/site/index.pdf
lucene/dev/branches/realtime_search/solr/site/issue_tracking.html
lucene/dev/branches/realtime_search/solr/site/linkmap.html
lucene/dev/branches/realtime_search/solr/site/linkmap.pdf
lucene/dev/branches/realtime_search/solr/site/mailing_lists.html
lucene/dev/branches/realtime_search/solr/site/skin/basic.css
lucene/dev/branches/realtime_search/solr/site/skin/print.css
lucene/dev/branches/realtime_search/solr/site/skin/profile.css
lucene/dev/branches/realtime_search/solr/site/skin/screen.css
lucene/dev/branches/realtime_search/solr/site/tutorial.html
lucene/dev/branches/realtime_search/solr/site/version_control.html
lucene/dev/branches/realtime_search/solr/src/ (props changed)
lucene/dev/branches/realtime_search/solr/src/common/org/apache/solr/common/util/NamedList.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/CollationKeyFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/core/RequestHandlers.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/request/UnInvertedField.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/response/transform/DocIdAugmenterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/response/transform/ExplainAugmenterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/response/transform/ShardAugmenterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/response/transform/TransformerFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/response/transform/ValueAugmenterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/response/transform/ValueSourceAugmenter.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/schema/DateField.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/schema/FieldProperties.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/schema/FieldType.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/schema/IndexSchema.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/schema/SimilarityFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/schema/TrieDateField.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/schema/TrieField.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/ReturnFields.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/SolrQueryParser.java
lucene/dev/branches/realtime_search/solr/src/site/src/documentation/content/xdocs/index.xml
lucene/dev/branches/realtime_search/solr/src/site/src/documentation/content/xdocs/site.xml
lucene/dev/branches/realtime_search/solr/src/test-files/solr/conf/schema.xml
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/client/solrj/SolrJettyTestBase.java
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/client/solrj/TestBatchUpdate.java
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeBinaryJettyTest.java
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeEmbeddedTest.java
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeJettyTest.java
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/client/solrj/embedded/SolrExampleEmbeddedTest.java
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/client/solrj/response/TermsResponseTest.java
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/client/solrj/response/TestSpellCheckResponse.java
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/common/util/TestSystemIdResolver.java
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/request/TestFaceting.java
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/schema/CustomSimilarityFactory.java
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/schema/DateFieldTest.java
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/schema/IndexSchemaTest.java
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/schema/MockConfigurableSimilarity.java
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/spelling/suggest/PersistenceTest.java
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java
lucene/dev/branches/realtime_search/solr/src/webapp/web/admin/form.jsp
lucene/dev/branches/realtime_search/solr/testlogging.properties (props changed)
Modified: lucene/dev/branches/realtime_search/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/dev-tools/eclipse/dot.classpath?rev=1088606&r1=1088605&r2=1088606&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/realtime_search/dev-tools/eclipse/dot.classpath Mon Apr 4 13:03:42 2011
@@ -57,6 +57,7 @@
<classpathentry kind="src" path="solr/src/webapp/src"/>
<classpathentry kind="src" path="solr/src/common"/>
<classpathentry kind="src" path="solr/src/solrj"/>
+ <classpathentry kind="src" path="solr/src/test-framework"/>
<classpathentry kind="src" path="solr/src/test"/>
<classpathentry kind="src" path="solr/src/test-files"/>
<classpathentry kind="src" path="solr/contrib/analysis-extras/src/java"/>
Modified: lucene/dev/branches/realtime_search/dev-tools/idea/solr/solr.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/dev-tools/idea/solr/solr.iml?rev=1088606&r1=1088605&r2=1088606&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/dev-tools/idea/solr/solr.iml (original)
+++ lucene/dev/branches/realtime_search/dev-tools/idea/solr/solr.iml Mon Apr 4 13:03:42 2011
@@ -13,6 +13,7 @@
<sourceFolder url="file://$MODULE_DIR$/src/scripts" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test-files" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test-framework" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build" />
<excludeFolder url="file://$MODULE_DIR$/dist" />
<excludeFolder url="file://$MODULE_DIR$/lucene-libs" />
Modified: lucene/dev/branches/realtime_search/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/dev-tools/maven/pom.xml.template?rev=1088606&r1=1088605&r2=1088606&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/realtime_search/dev-tools/maven/pom.xml.template Mon Apr 4 13:03:42 2011
@@ -133,6 +133,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>r05</version>
+ </dependency>
+ <dependency>
<groupId>com.sleepycat</groupId>
<artifactId>berkeleydb</artifactId>
<version>4.7.25</version>
Modified: lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template?rev=1088606&r1=1088605&r2=1088606&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template (original)
+++ lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template Mon Apr 4 13:03:42 2011
@@ -44,9 +44,8 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>solr-core</artifactId>
+ <artifactId>solr-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
@@ -85,6 +84,11 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
@@ -94,7 +98,7 @@
<testSourceDirectory>src/test</testSourceDirectory>
<testResources>
<testResource>
- <directory>test-files</directory>
+ <directory>src/test-files</directory>
</testResource>
<testResource>
<directory>../../src/test-files</directory>
Modified: lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/clustering/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/clustering/pom.xml.template?rev=1088606&r1=1088605&r2=1088606&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/clustering/pom.xml.template (original)
+++ lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/clustering/pom.xml.template Mon Apr 4 13:03:42 2011
@@ -44,9 +44,8 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>solr-core</artifactId>
+ <artifactId>solr-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template?rev=1088606&r1=1088605&r2=1088606&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template (original)
+++ lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template Mon Apr 4 13:03:42 2011
@@ -44,9 +44,8 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>solr-core</artifactId>
+ <artifactId>solr-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template?rev=1088606&r1=1088605&r2=1088606&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template (original)
+++ lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template Mon Apr 4 13:03:42 2011
@@ -43,10 +43,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>solr-core</artifactId>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/extraction/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/extraction/pom.xml.template?rev=1088606&r1=1088605&r2=1088606&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/extraction/pom.xml.template (original)
+++ lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/extraction/pom.xml.template Mon Apr 4 13:03:42 2011
@@ -47,9 +47,8 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>solr-core</artifactId>
+ <artifactId>solr-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/uima/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/uima/pom.xml.template?rev=1088606&r1=1088605&r2=1088606&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/uima/pom.xml.template (original)
+++ lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/uima/pom.xml.template Mon Apr 4 13:03:42 2011
@@ -44,9 +44,8 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>solr-core</artifactId>
+ <artifactId>solr-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/branches/realtime_search/dev-tools/maven/solr/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/dev-tools/maven/solr/pom.xml.template?rev=1088606&r1=1088605&r2=1088606&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/dev-tools/maven/solr/pom.xml.template (original)
+++ lucene/dev/branches/realtime_search/dev-tools/maven/solr/pom.xml.template Mon Apr 4 13:03:42 2011
@@ -35,6 +35,7 @@
<module>src</module>
<module>src/solrj</module>
<module>src/webapp</module>
+ <module>src/test-framework</module>
<module>contrib</module>
</modules>
<properties>
Modified: lucene/dev/branches/realtime_search/dev-tools/maven/solr/src/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/dev-tools/maven/solr/src/pom.xml.template?rev=1088606&r1=1088605&r2=1088606&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/dev-tools/maven/solr/src/pom.xml.template (original)
+++ lucene/dev/branches/realtime_search/dev-tools/maven/solr/src/pom.xml.template Mon Apr 4 13:03:42 2011
@@ -157,6 +157,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -199,17 +204,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
@@ -248,6 +242,24 @@
</programs>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-test-source</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>test-framework</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
Modified: lucene/dev/branches/realtime_search/dev-tools/maven/solr/src/solrj/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/dev-tools/maven/solr/src/solrj/pom.xml.template?rev=1088606&r1=1088605&r2=1088606&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/dev-tools/maven/solr/src/solrj/pom.xml.template (original)
+++ lucene/dev/branches/realtime_search/dev-tools/maven/solr/src/solrj/pom.xml.template Mon Apr 4 13:03:42 2011
@@ -44,12 +44,6 @@
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
<artifactId>lucene-analyzers-common</artifactId>
<version>${project.version}</version>
<scope>test</scope>
@@ -88,11 +82,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/branches/realtime_search/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/lucene/CHANGES.txt?rev=1088606&r1=1088605&r2=1088606&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/realtime_search/lucene/CHANGES.txt Mon Apr 4 13:03:42 2011
@@ -157,11 +157,10 @@ 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 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, and call setRequireContiguousMerge(true).
- (Mike McCandless)
+* 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
@@ -334,6 +333,16 @@ New features
* LUCENE-2862: Added TermsEnum.totalTermFreq() and
Terms.getSumTotalTermFreq(). (Mike McCandless, Robert Muir)
+* LUCENE-3001: Added TrieFieldHelper to write solr compatible numeric
+ fields without the solr dependency. (ryan)
+
+* LUCENE-3003: Added new expert class oal.index.DocTermsOrd,
+ refactored from Solr's UnInvertedField, for accessing term ords for
+ multi-valued fields, per document. This is similar to FieldCache in
+ that it inverts the index to compute the ords, but differs in that
+ it's able to handle multi-valued fields and does not hold the term
+ bytes in RAM. (Mike McCandless)
+
Optimizations
* LUCENE-2588: Don't store unnecessary suffixes when writing the terms
@@ -370,6 +379,17 @@ Bug fixes
indexes, causing existing deletions to be applied on the incoming indexes as
well. (Shai Erera, Mike McCandless)
+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)
+
+Build
+
+* LUCENE-3006: Building javadocs will fail on warnings by default. Override with -Dfailonjavadocwarning=false (sarowe, gsingers)
+
+
======================= Lucene 3.x (not yet released) =======================
Changes in backwards compatibility policy
@@ -384,7 +404,7 @@ Optimizations
* LUCENE-2990: ArrayUtil/CollectionUtil.*Sort() methods now exit early
on empty or one-element lists/arrays. (Uwe Schindler)
-======================= Lucene 3.1 (not yet released) =======================
+======================= Lucene 3.1.0 =======================
Changes in backwards compatibility policy
@@ -400,7 +420,7 @@ Changes in backwards compatibility polic
* LUCENE-2190: Removed deprecated customScore() and customExplain()
methods from experimental CustomScoreQuery. (Uwe Schindler)
-
+
* LUCENE-2286: Enabled DefaultSimilarity.setDiscountOverlaps by default.
This means that terms with a position increment gap of zero do not
affect the norms calculation by default. (Robert Muir)
@@ -438,10 +458,10 @@ Changes in backwards compatibility polic
actual file's length if the file exists, and throws FileNotFoundException
otherwise. Returning length=0 for a non-existent file is no longer allowed. If
you relied on that, make sure to catch the exception. (Shai Erera)
-
+
* LUCENE-2386: IndexWriter no longer performs an empty commit upon new index
creation. Previously, if you passed an empty Directory and set OpenMode to
- CREATE*, IndexWriter would make a first empty commit. If you need that
+ CREATE*, IndexWriter would make a first empty commit. If you need that
behavior you can call writer.commit()/close() immediately after you create it.
(Shai Erera, Mike McCandless)
@@ -457,10 +477,10 @@ Changes in backwards compatibility polic
values in multi-valued field has been changed for some cases in index.
If you index empty fields and uses positions/offsets information on that
fields, reindex is recommended. (David Smiley, Koji Sekiguchi)
-
+
* LUCENE-2804: Directory.setLockFactory new declares throwing an IOException.
(Shai Erera, Robert Muir)
-
+
* LUCENE-2837: Added deprecations noting that in 4.0, Searcher and
Searchable are collapsed into IndexSearcher; contrib/remote and
MultiSearcher have been removed. (Mike McCandless)
@@ -487,7 +507,7 @@ Changes in runtime behavior
* LUCENE-2179: CharArraySet.clear() is now functional.
(Robert Muir, Uwe Schindler)
-* LUCENE-2455: IndexWriter.addIndexes no longer optimizes the target index
+* LUCENE-2455: IndexWriter.addIndexes no longer optimizes the target index
before it adds the new ones. Also, the existing segments are not merged and so
the index will not end up with a single segment (unless it was empty before).
In addition, addIndexesNoOptimize was renamed to addIndexes and no longer
@@ -506,9 +526,9 @@ Changes in runtime behavior
usage, allowing applications to accidentally open two writers on the
same directory. (Mike McCandless)
-* LUCENE-2701: maxMergeMBForOptimize and maxMergeDocs constraints set on
- LogMergePolicy now affect optimize() as well (as opposed to only regular
- merges). This means that you can run optimize() and too large segments won't
+* LUCENE-2701: maxMergeMBForOptimize and maxMergeDocs constraints set on
+ LogMergePolicy now affect optimize() as well (as opposed to only regular
+ merges). This means that you can run optimize() and too large segments won't
be merged. (Shai Erera)
* LUCENE-2753: IndexReader and DirectoryReader .listCommits() now return a List,
@@ -518,9 +538,9 @@ Changes in runtime behavior
the IndexSearcher search methods that take an int nDocs will now
throw IllegalArgumentException if nDocs is 0. Instead, you should
use the newly added TotalHitCountCollector. (Mike McCandless)
-
-* LUCENE-2790: LogMergePolicy.useCompoundFile's logic now factors in noCFSRatio
- to determine whether the passed in segment should be compound.
+
+* LUCENE-2790: LogMergePolicy.useCompoundFile's logic now factors in noCFSRatio
+ to determine whether the passed in segment should be compound.
(Shai Erera, Earwin Burrfoot)
* LUCENE-2805: IndexWriter now increments the index version on every change to
@@ -540,7 +560,7 @@ Changes in runtime behavior
* LUCENE-2010: Segments with 100% deleted documents are now removed on
IndexReader or IndexWriter commit. (Uwe Schindler, Mike McCandless)
-
+
* LUCENE-2960: Allow some changes to IndexWriterConfig to take effect
"live" (after an IW is instantiated), via
IndexWriter.getConfig().setXXX(...) (Shay Banon, Mike McCandless)
@@ -558,7 +578,7 @@ API Changes
* LUCENE-2103: NoLockFactory should have a private constructor;
until Lucene 4.0 the default one will be deprecated.
- (Shai Erera via Uwe Schindler)
+ (Shai Erera via Uwe Schindler)
* LUCENE-2177: Deprecate the Field ctors that take byte[] and Store.
Since the removal of compressed fields, Store can only be YES, so
@@ -578,30 +598,30 @@ API Changes
files are no longer open by IndexReaders. (luocanrao via Mike
McCandless)
-* LUCENE-2282: IndexFileNames is exposed as a public class allowing for easier
- use by external code. In addition it offers a matchExtension method which
+* LUCENE-2282: IndexFileNames is exposed as a public class allowing for easier
+ use by external code. In addition it offers a matchExtension method which
callers can use to query whether a certain file matches a certain extension.
- (Shai Erera via Mike McCandless)
+ (Shai Erera via Mike McCandless)
* LUCENE-124: Add a TopTermsBoostOnlyBooleanQueryRewrite to MultiTermQuery.
This rewrite method is similar to TopTermsScoringBooleanQueryRewrite, but
- only scores terms by their boost values. For example, this can be used
- with FuzzyQuery to ensure that exact matches are always scored higher,
+ only scores terms by their boost values. For example, this can be used
+ with FuzzyQuery to ensure that exact matches are always scored higher,
because only the boost will be used in scoring. (Robert Muir)
-
-* LUCENE-2015: Add a static method foldToASCII to ASCIIFoldingFilter to
+
+* LUCENE-2015: Add a static method foldToASCII to ASCIIFoldingFilter to
expose its folding logic. (Cédrik Lime via Robert Muir)
-
-* LUCENE-2294: IndexWriter constructors have been deprecated in favor of a
+
+* LUCENE-2294: IndexWriter constructors have been deprecated in favor of a
single ctor which accepts IndexWriterConfig and a Directory. You can set all
- the parameters related to IndexWriter on IndexWriterConfig. The different
- setter/getter methods were deprecated as well. One should call
+ the parameters related to IndexWriter on IndexWriterConfig. The different
+ setter/getter methods were deprecated as well. One should call
writer.getConfig().getXYZ() to query for a parameter XYZ.
- Additionally, the setter/getter related to MergePolicy were deprecated as
+ Additionally, the setter/getter related to MergePolicy were deprecated as
well. One should interact with the MergePolicy directly.
(Shai Erera via Mike McCandless)
-
-* LUCENE-2320: IndexWriter's MergePolicy configuration was moved to
+
+* LUCENE-2320: IndexWriter's MergePolicy configuration was moved to
IndexWriterConfig and the respective methods on IndexWriter were deprecated.
(Shai Erera via Mike McCandless)
@@ -625,14 +645,14 @@ API Changes
* LUCENE-2402: IndexWriter.deleteUnusedFiles now deletes unreferenced commit
points too. If you use an IndexDeletionPolicy which holds onto index commits
(such as SnapshotDeletionPolicy), you can call this method to remove those
- commit points when they are not needed anymore (instead of waiting for the
+ commit points when they are not needed anymore (instead of waiting for the
next commit). (Shai Erera)
-
+
* LUCENE-2481: SnapshotDeletionPolicy.snapshot() and release() were replaced
with equivalent ones that take a String (id) as argument. You can pass
- whatever ID you want, as long as you use the same one when calling both.
+ whatever ID you want, as long as you use the same one when calling both.
(Shai Erera)
-
+
* LUCENE-2356: Add IndexWriterConfig.set/getReaderTermIndexDivisor, to
set what IndexWriter passes for termsIndexDivisor to the readers it
opens internally when apply deletions or creating a near-real-time
@@ -642,7 +662,7 @@ API Changes
in common/standard/ now implement the Word Break rules from the Unicode 6.0.0
Text Segmentation algorithm (UAX#29), covering the full range of Unicode code
points, including values from U+FFFF to U+10FFFF
-
+
ClassicTokenizer/Analyzer retains the old (pre-Lucene 3.1) StandardTokenizer/
Analyzer implementation and behavior. Only the Unicode Basic Multilingual
Plane (code points from U+0000 to U+FFFF) is covered.
@@ -650,16 +670,16 @@ API Changes
UAX29URLEmailTokenizer tokenizes URLs and E-mail addresses according to the
relevant RFCs, in addition to implementing the UAX#29 Word Break rules.
(Steven Rowe, Robert Muir, Uwe Schindler)
-
+
* LUCENE-2778: RAMDirectory now exposes newRAMFile() which allows to override
and return a different RAMFile implementation. (Shai Erera)
-
+
* LUCENE-2785: Added TotalHitCountCollector whose sole purpose is to
count the number of hits matching the query. (Mike McCandless)
-* LUCENE-2846: Deprecated IndexReader.setNorm(int, String, float). This method
- is only syntactic sugar for setNorm(int, String, byte), but using the global
- Similarity.getDefault().encodeNormValue(). Use the byte-based method instead
+* LUCENE-2846: Deprecated IndexReader.setNorm(int, String, float). This method
+ is only syntactic sugar for setNorm(int, String, byte), but using the global
+ Similarity.getDefault().encodeNormValue(). Use the byte-based method instead
to ensure that the norm is encoded with your Similarity.
(Robert Muir, Mike McCandless)
@@ -680,6 +700,9 @@ API Changes
for AttributeImpls, but can still be provided (if needed).
(Uwe Schindler)
+* LUCENE-2691: Deprecate IndexWriter.getReader in favor of
+ IndexReader.open(IndexWriter) (Grant Ingersoll, Mike McCandless)
+
* LUCENE-2876: Deprecated Scorer.getSimilarity(). If your Scorer uses a Similarity,
it should keep it itself. Fixed Scorers to pass their parent Weight, so that
Scorer.visitSubScorers (LUCENE-2590) will work correctly.
@@ -691,7 +714,7 @@ API Changes
expert use cases can handle seeing deleted documents returned. The
deletes remain buffered so that the next time you open an NRT reader
and pass true, all deletes will be a applied. (Mike McCandless)
-
+
* LUCENE-1253: LengthFilter (and Solr's KeepWordTokenFilter) now
require up front specification of enablePositionIncrement. Together with
StopFilter they have a common base class (FilteringTokenFilter) that handles
@@ -702,7 +725,7 @@ Bug fixes
* LUCENE-2249: ParallelMultiSearcher should shut down thread pool on
close. (Martin Traverso via Uwe Schindler)
-
+
* LUCENE-2273: FieldCacheImpl.getCacheEntries() used WeakHashMap
incorrectly and lead to ConcurrentModificationException.
(Uwe Schindler, Robert Muir)
@@ -713,7 +736,7 @@ Bug fixes
* LUCENE-2074: Reduce buffer size of lexer back to default on reset.
(Ruben Laguna, Shai Erera via Uwe Schindler)
-
+
* LUCENE-2496: Don't throw NPE if IndexWriter is opened with CREATE on
a prior (corrupt) index missing its segments_N file. (Mike
McCandless)
@@ -722,10 +745,10 @@ Bug fixes
assuming whitespace tokenization. Previously all CJK queries, for example,
would be turned into phrase queries. The old behavior is preserved with
the matchVersion parameter for previous versions. Additionally, you can
- explicitly enable the old behavior with setAutoGeneratePhraseQueries(true)
+ explicitly enable the old behavior with setAutoGeneratePhraseQueries(true)
(Robert Muir)
-
-* LUCENE-2537: FSDirectory.copy() implementation was unsafe and could result in
+
+* LUCENE-2537: FSDirectory.copy() implementation was unsafe and could result in
OOM if a large file was copied. (Shai Erera)
* LUCENE-2580: MultiPhraseQuery throws AIOOBE if number of positions
@@ -743,14 +766,14 @@ Bug fixes
* LUCENE-2802: NRT DirectoryReader returned incorrect values from
getVersion, isOptimized, getCommitUserData, getIndexCommit and isCurrent due
- to a mutable reference to the IndexWriters SegmentInfos.
+ to a mutable reference to the IndexWriters SegmentInfos.
(Simon Willnauer, Earwin Burrfoot)
* LUCENE-2852: Fixed corner case in RAMInputStream that would hit a
false EOF after seeking to EOF then seeking back to same block you
were just in and then calling readBytes (Robert Muir, Mike McCandless)
-* LUCENE-2860: Fixed SegmentInfo.sizeInBytes to factor includeDocStores when it
+* LUCENE-2860: Fixed SegmentInfo.sizeInBytes to factor includeDocStores when it
decides whether to return the cached computed size or not. (Shai Erera)
* LUCENE-2584: SegmentInfo.files() could hit ConcurrentModificationException if
@@ -763,7 +786,7 @@ Bug fixes
internally, it now calls Similarity.idfExplain(Collection, IndexSearcher).
(Robert Muir)
-* LUCENE-2693: RAM used by IndexWriter was slightly incorrectly computed.
+* LUCENE-2693: RAM used by IndexWriter was slightly incorrectly computed.
(Jason Rutherglen via Shai Erera)
* LUCENE-1846: DateTools now uses the US locale everywhere, so DateTools.round()
@@ -779,6 +802,9 @@ Bug fixes
been rounded down to 0 instead of being rounded up to the smallest
positive number. (yonik)
+* LUCENE-2936: PhraseQuery score explanations were not correctly
+ identifying matches vs non-matches. (hossman)
+
* LUCENE-2975: A hotspot bug corrupts IndexInput#readVInt()/readVLong() if
the underlying readByte() is inlined (which happens e.g. in MMapDirectory).
The loop was unwinded which makes the hotspot bug disappear.
@@ -787,30 +813,30 @@ Bug fixes
New features
* LUCENE-2128: Parallelized fetching document frequencies during weight
- creation. (Israel Tsadok, Simon Willnauer via Uwe Schindler)
+ creation. (Israel Tsadok, Simon Willnauer via Uwe Schindler)
* LUCENE-2069: Added Unicode 4 support to CharArraySet. Due to the switch
to Java 5, supplementary characters are now lowercased correctly if the
set is created as case insensitive.
- CharArraySet now requires a Version argument to preserve
- backwards compatibility. If Version < 3.1 is passed to the constructor,
+ CharArraySet now requires a Version argument to preserve
+ backwards compatibility. If Version < 3.1 is passed to the constructor,
CharArraySet yields the old behavior. (Simon Willnauer)
-
+
* LUCENE-2069: Added Unicode 4 support to LowerCaseFilter. Due to the switch
to Java 5, supplementary characters are now lowercased correctly.
- LowerCaseFilter now requires a Version argument to preserve
- backwards compatibility. If Version < 3.1 is passed to the constructor,
- LowerCaseFilter yields the old behavior. (Simon Willnauer, Robert Muir)
+ LowerCaseFilter now requires a Version argument to preserve
+ backwards compatibility. If Version < 3.1 is passed to the constructor,
+ LowerCaseFilter yields the old behavior. (Simon Willnauer, Robert Muir)
* LUCENE-2034: Added ReusableAnalyzerBase, an abstract subclass of Analyzer
that makes it easier to reuse TokenStreams correctly. This issue also added
StopwordAnalyzerBase, which improves consistency of all Analyzers that use
- stopwords, and implement many analyzers in contrib with it.
+ stopwords, and implement many analyzers in contrib with it.
(Simon Willnauer via Robert Muir)
-
+
* LUCENE-2198, LUCENE-2901: Support protected words in stemming TokenFilters using a
new KeywordAttribute. (Simon Willnauer, Drew Farris via Uwe Schindler)
-
+
* LUCENE-2183, LUCENE-2240, LUCENE-2241: Added Unicode 4 support
to CharTokenizer and its subclasses. CharTokenizer now has new
int-API which is conditionally preferred to the old char-API depending
@@ -819,8 +845,8 @@ New features
* LUCENE-2247: Added a CharArrayMap<V> for performance improvements
in some stemmers and synonym filters. (Uwe Schindler)
-
-* LUCENE-2320: Added SetOnce which wraps an object and allows it to be set
+
+* LUCENE-2320: Added SetOnce which wraps an object and allows it to be set
exactly once. (Shai Erera via Mike McCandless)
* LUCENE-2314: Added AttributeSource.copyTo(AttributeSource) that
@@ -847,19 +873,19 @@ New features
Directory.copyTo, and use nio's FileChannel.transferTo when copying
files between FSDirectory instances. (Earwin Burrfoot via Mike
McCandless).
-
+
* LUCENE-2074: Make StandardTokenizer fit for Unicode 4.0, if the
matchVersion parameter is Version.LUCENE_31. (Uwe Schindler)
* LUCENE-2385: Moved NoDeletionPolicy from benchmark to core. NoDeletionPolicy
can be used to prevent commits from ever getting deleted from the index.
(Shai Erera)
-
-* LUCENE-1585: IndexWriter now accepts a PayloadProcessorProvider which can
- return a DirPayloadProcessor for a given Directory, which returns a
- PayloadProcessor for a given Term. The PayloadProcessor will be used to
+
+* LUCENE-1585: IndexWriter now accepts a PayloadProcessorProvider which can
+ return a DirPayloadProcessor for a given Directory, which returns a
+ PayloadProcessor for a given Term. The PayloadProcessor will be used to
process the payloads of the segments as they are merged (e.g. if one wants to
- rewrite payloads of external indexes as they are added, or of local ones).
+ rewrite payloads of external indexes as they are added, or of local ones).
(Shai Erera, Michael Busch, Mike McCandless)
* LUCENE-2440: Add support for custom ExecutorService in
@@ -872,7 +898,7 @@ New features
* LUCENE-2526: Don't throw NPE from MultiPhraseQuery.toString when
it's empty. (Ross Woolf via Mike McCandless)
-
+
* LUCENE-2559: Added SegmentReader.reopen methods (John Wang via Mike
McCandless)
@@ -888,17 +914,20 @@ New features
to add span support: SpanMultiTermQueryWrapper<Q extends MultiTermQuery>.
Using this wrapper its easy to add fuzzy/wildcard to e.g. a SpanNearQuery.
(Robert Muir, Uwe Schindler)
-
+
* LUCENE-2838: ConstantScoreQuery now directly supports wrapping a Query
instance for stripping off scores. The use of a QueryWrapperFilter
is no longer needed and discouraged for that use case. Directly wrapping
Query improves performance, as out-of-order collection is now supported.
(Uwe Schindler)
-* LUCENE-2864: Add getMaxTermFrequency (maximum within-document TF) to
+* LUCENE-2864: Add getMaxTermFrequency (maximum within-document TF) to
FieldInvertState so that it can be used in Similarity.computeNorm.
(Robert Muir)
+* LUCENE-2720: Segments now record the code version which created them.
+ (Shai Erera, Mike McCandless, Uwe Schindler)
+
* LUCENE-2474: Added expert ReaderFinishedListener API to
IndexReader, to allow apps that maintain external per-segment caches
to evict entries when a segment is finished. (Shay Banon, Yonik
@@ -907,8 +936,8 @@ New features
* LUCENE-2911: The new StandardTokenizer, UAX29URLEmailTokenizer, and
the ICUTokenizer in contrib now all tag types with a consistent set
of token types (defined in StandardTokenizer). Tokens in the major
- CJK types are explicitly marked to allow for custom downstream handling:
- <IDEOGRAPHIC>, <HANGUL>, <KATAKANA>, and <HIRAGANA>.
+ CJK types are explicitly marked to allow for custom downstream handling:
+ <IDEOGRAPHIC>, <HANGUL>, <KATAKANA>, and <HIRAGANA>.
(Robert Muir, Steven Rowe)
* LUCENE-2913: Add missing getters to Numeric* classes. (Uwe Schindler)
@@ -933,7 +962,7 @@ Optimizations
* LUCENE-2137: Switch to AtomicInteger for some ref counting (Earwin
Burrfoot via Mike McCandless)
-* LUCENE-2123, LUCENE-2261: Move FuzzyQuery rewrite to separate RewriteMode
+* LUCENE-2123, LUCENE-2261: Move FuzzyQuery rewrite to separate RewriteMode
into MultiTermQuery. The number of fuzzy expansions can be specified with
the maxExpansions parameter to FuzzyQuery.
(Uwe Schindler, Robert Muir, Mike McCandless)
@@ -967,12 +996,12 @@ Optimizations
TermAttributeImpl, move DEFAULT_TYPE constant to TypeInterface, improve
null-handling for TypeAttribute. (Uwe Schindler)
-* LUCENE-2329: Switch TermsHash* from using a PostingList object per unique
+* LUCENE-2329: Switch TermsHash* from using a PostingList object per unique
term to parallel arrays, indexed by termID. This reduces garbage collection
overhead significantly, which results in great indexing performance wins
when the available JVM heap space is low. This will become even more
important when the DocumentsWriter RAM buffer is searchable in the future,
- because then it will make sense to make the RAM buffers as large as
+ because then it will make sense to make the RAM buffers as large as
possible. (Mike McCandless, Michael Busch)
* LUCENE-2380: The terms field cache methods (getTerms,
@@ -987,7 +1016,7 @@ Optimizations
causing too many fallbacks to compare-by-value (instead of by-ord).
(Mike McCandless)
-* LUCENE-2574: IndexInput exposes copyBytes(IndexOutput, long) to allow for
+* LUCENE-2574: IndexInput exposes copyBytes(IndexOutput, long) to allow for
efficient copying by sub-classes. Optimized copy is implemented for RAM and FS
streams. (Shai Erera)
@@ -1010,15 +1039,15 @@ Optimizations
* LUCENE-2010: Segments with 100% deleted documents are now removed on
IndexReader or IndexWriter commit. (Uwe Schindler, Mike McCandless)
-
+
* LUCENE-1472: Removed synchronization from static DateTools methods
by using a ThreadLocal. Also converted DateTools.Resolution to a
Java 5 enum (this should not break backwards). (Uwe Schindler)
Build
-* LUCENE-2124: Moved the JDK-based collation support from contrib/collation
- into core, and moved the ICU-based collation support into contrib/icu.
+* LUCENE-2124: Moved the JDK-based collation support from contrib/collation
+ into core, and moved the ICU-based collation support into contrib/icu.
(Robert Muir)
* LUCENE-2326: Removed SVN checkouts for backwards tests. The backwards
@@ -1030,14 +1059,14 @@ Build
* LUCENE-1709: Tests are now parallelized by default (except for benchmark). You
can force them to run sequentially by passing -Drunsequential=1 on the command
- line. The number of threads that are spawned per CPU defaults to '1'. If you
+ line. The number of threads that are spawned per CPU defaults to '1'. If you
wish to change that, you can run the tests with -DthreadsPerProcessor=[num].
(Robert Muir, Shai Erera, Peter Kofler)
* LUCENE-2516: Backwards tests are now compiled against released lucene-core.jar
from tarball of previous version. Backwards tests are now packaged together
with src distribution. (Uwe Schindler)
-
+
* LUCENE-2611: Added Ant target to install IntelliJ IDEA configuration:
"ant idea". See http://wiki.apache.org/lucene-java/HowtoConfigureIntelliJ
(Steven Rowe)
@@ -1046,8 +1075,8 @@ Build
generating Maven artifacts (Steven Rowe)
* LUCENE-2609: Added jar-test-framework Ant target which packages Lucene's
- tests' framework classes. (Drew Farris, Grant Ingersoll, Shai Erera, Steven
- Rowe)
+ tests' framework classes. (Drew Farris, Grant Ingersoll, Shai Erera,
+ Steven Rowe)
Test Cases
@@ -1083,18 +1112,18 @@ Test Cases
access to "real" files from the test folder itself, can use
LuceneTestCase(J4).getDataFile(). (Uwe Schindler)
-* LUCENE-2398, LUCENE-2611: Improve tests to work better from IDEs such
+* LUCENE-2398, LUCENE-2611: Improve tests to work better from IDEs such
as Eclipse and IntelliJ.
(Paolo Castagna, Steven Rowe via Robert Muir)
* LUCENE-2804: add newFSDirectory to LuceneTestCase to create a FSDirectory at
random. (Shai Erera, Robert Muir)
-
+
Documentation
* LUCENE-2579: Fix oal.search's package.html description of abstract
methods. (Santiago M. Mola via Mike McCandless)
-
+
* LUCENE-2625: Add a note to IndexReader.termDocs() with additional verbiage
that the TermEnum must be seeked since it is unpositioned.
(Adriano Crestani via Robert Muir)
Modified: lucene/dev/branches/realtime_search/lucene/MIGRATE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/lucene/MIGRATE.txt?rev=1088606&r1=1088605&r2=1088606&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/lucene/MIGRATE.txt (original)
+++ lucene/dev/branches/realtime_search/lucene/MIGRATE.txt Mon Apr 4 13:03:42 2011
@@ -356,3 +356,9 @@ LUCENE-1458, LUCENE-2111: Flexible Index
field as a parameter, this is removed due to the fact the entire Similarity (all methods)
can now be configured per-field.
Methods that apply to the entire query such as coord() and queryNorm() exist in SimilarityProvider.
+
+* LUCENE-1076: TieredMergePolicy is now the default merge policy.
+ It's able to merge non-contiguous segments; this may cause problems
+ for applications that rely on Lucene's internal document ID
+ assigment. If so, you should instead use LogByteSize/DocMergePolicy
+ during indexing.
Modified: lucene/dev/branches/realtime_search/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/lucene/build.xml?rev=1088606&r1=1088605&r2=1088606&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/lucene/build.xml (original)
+++ lucene/dev/branches/realtime_search/lucene/build.xml Mon Apr 4 13:03:42 2011
@@ -152,6 +152,7 @@
<echo>DEPRECATED - Doing Nothing. See http://wiki.apache.org/lucene-java/HowToUpdateTheWebsite</echo>
</target>
+ <target name="javadoc" depends="javadocs"/>
<target name="javadocs" description="Generate javadoc"
depends="javadocs-all, javadocs-core, javadocs-contrib, javadocs-test-framework">
<echo file="${javadoc.dir}/index.html" append="false">
@@ -194,6 +195,17 @@
<target name="javadocs-all" description="Generate javadoc for core and contrib classes" depends="build-contrib">
<sequential>
<mkdir dir="${javadoc.dir}/all"/>
+
+ <path id="javadoc.classpath">
+ <path refid="classpath"/>
+ <pathelement location="${ant.home}/lib/ant.jar"/>
+ <fileset dir=".">
+ <exclude name="build/**/*.jar"/>
+ <include name="**/lib/*.jar"/>
+ </fileset>
+ <pathelement location="${common.dir}/../modules/analysis/build/common/lucene-analyzers-common-${version}.jar"/>
+ </path>
+
<invoke-javadoc
destdir="${javadoc.dir}/all">
<sources>
@@ -424,9 +436,12 @@
</scp>
</target>
- <target name="stage" depends="dist-all, generate-maven-artifacts, sign-artifacts, copy-to-stage">
+ <target name="prepare-release" depends="clean, dist-all, generate-maven-artifacts, sign-artifacts"/>
+ <target name="stage" depends="prepare-release, copy-to-stage">
+
</target>
+
<target name="generate-maven-artifacts"
depends="maven.ant.tasks-check, package, jar-src, jar-test-framework-src, javadocs">
<sequential>
Modified: lucene/dev/branches/realtime_search/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/lucene/common-build.xml?rev=1088606&r1=1088605&r2=1088606&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/lucene/common-build.xml (original)
+++ lucene/dev/branches/realtime_search/lucene/common-build.xml Mon Apr 4 13:03:42 2011
@@ -78,6 +78,7 @@
<property name="tests.directory" value="random" />
<property name="tests.linedocsfile" value="europarl.lines.txt.gz" />
<property name="tests.iter" value="1" />
+ <property name="tests.iter.min" value="${tests.iter}" />
<property name="tests.seed" value="random" />
<property name="tests.loggingfile" value="/dev/null"/>
<property name="tests.nightly" value="false" />
@@ -102,6 +103,7 @@
<path refid="classpath"/>
<pathelement location="${ant.home}/lib/ant.jar"/>
<fileset dir=".">
+ <exclude name="build/**/*.jar"/>
<include name="**/lib/*.jar"/>
</fileset>
</path>
@@ -507,6 +509,8 @@
<sysproperty key="tests.linedocsfile" value="${tests.linedocsfile}"/>
<!-- set the number of times tests should run -->
<sysproperty key="tests.iter" value="${tests.iter}"/>
+ <!-- set the minimum number of times tests should run unless failure -->
+ <sysproperty key="tests.iter.min" value="${tests.iter.min}"/>
<!-- set the test seed -->
<sysproperty key="tests.seed" value="${tests.seed}"/>
<!-- set the Version that tests should run against -->
@@ -759,7 +763,8 @@
</fixcrlf>
</sequential>
</macrodef>
-
+
+ <property name="failonjavadocwarning" value="true"/>
<macrodef name="invoke-javadoc">
<element name="sources" optional="yes"/>
<attribute name="destdir"/>
@@ -769,6 +774,7 @@
<copy todir="@{destdir}/../prettify" overwrite="false">
<fileset dir="${prettify.dir}"/>
</copy>
+ <record name="@{destdir}/log_javadoc.txt" action="start" append="no"/>
<javadoc
overview="@{overview}"
packagenames="org.apache.lucene.*"
@@ -780,6 +786,7 @@
author="true"
version="true"
use="true"
+ failonerror="true"
source="${ant.java.version}"
link="${javadoc.link}"
windowtitle="${Name} ${version} API"
@@ -801,6 +808,26 @@
<classpath refid="javadoc.classpath"/>
</javadoc>
+ <record name="@{destdir}/log_javadoc.txt" action="stop"/>
+
+ <delete>
+ <fileset file="@{destdir}/log_javadoc.txt">
+ <not>
+ <containsregexp expression="\[javadoc\]\s*[1-9][0-9]*[\s]*warning"/>
+ </not>
+ </fileset>
+ </delete>
+
+ <fail message="Javadocs warnings were found!">
+ <condition>
+ <and>
+ <available file="@{destdir}/log_javadoc.txt"/>
+ <istrue value="${failonjavadocwarning}"/>
+ </and>
+ </condition>
+ </fail>
+
+
</sequential>
</macrodef>
Modified: lucene/dev/branches/realtime_search/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/lucene/contrib/CHANGES.txt?rev=1088606&r1=1088605&r2=1088606&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/branches/realtime_search/lucene/contrib/CHANGES.txt Mon Apr 4 13:03:42 2011
@@ -47,26 +47,26 @@ API Changes
(No changes)
-======================= Lucene 3.1 (not yet released) =======================
+======================= Lucene 3.1.0 =======================
Changes in backwards compatibility policy
* LUCENE-2100: All Analyzers in Lucene-contrib have been marked as final.
Analyzers should be only act as a composition of TokenStreams, users should
compose their own analyzers instead of subclassing existing ones.
- (Simon Willnauer)
+ (Simon Willnauer)
* LUCENE-2194, LUCENE-2201: Snowball APIs were upgraded to snowball revision
- 502 (with some local modifications for improved performance).
- Index backwards compatibility and binary backwards compatibility is
- preserved, but some protected/public member variables changed type. This
- does NOT affect java code/class files produced by the snowball compiler,
+ 502 (with some local modifications for improved performance).
+ Index backwards compatibility and binary backwards compatibility is
+ preserved, but some protected/public member variables changed type. This
+ does NOT affect java code/class files produced by the snowball compiler,
but technically is a backwards compatibility break. (Robert Muir)
-
+
* LUCENE-2226: Moved contrib/snowball functionality into contrib/analyzers.
Be sure to remove any old obselete lucene-snowball jar files from your
classpath! (Robert Muir)
-
+
* LUCENE-2323: Moved contrib/wikipedia functionality into contrib/analyzers.
Additionally the package was changed from org.apache.lucene.wikipedia.analysis
to org.apache.lucene.analysis.wikipedia. (Robert Muir)
@@ -74,30 +74,30 @@ Changes in backwards compatibility polic
* LUCENE-2581: Added new methods to FragmentsBuilder interface. These methods
are used to set pre/post tags and Encoder. (Koji Sekiguchi)
- * LUCENE-2391: Improved spellchecker (re)build time/ram usage by omitting
+ * LUCENE-2391: Improved spellchecker (re)build time/ram usage by omitting
frequencies/positions/norms for single-valued fields, modifying the default
ramBufferMBSize to match IndexWriterConfig (16MB), making index optimization
an optional boolean parameter, and modifying the incremental update logic
- to work well with unoptimized spellcheck indexes. The indexDictionary() methods
- were made final to ensure a hard backwards break in case you were subclassing
+ to work well with unoptimized spellcheck indexes. The indexDictionary() methods
+ were made final to ensure a hard backwards break in case you were subclassing
Spellchecker. In general, subclassing Spellchecker is not recommended. (Robert Muir)
-
+
Changes in runtime behavior
* LUCENE-2117: SnowballAnalyzer uses TurkishLowerCaseFilter instead of
LowercaseFilter to correctly handle the unique Turkish casing behavior if
used with Version > 3.0 and the TurkishStemmer.
- (Robert Muir via Simon Willnauer)
+ (Robert Muir via Simon Willnauer)
- * LUCENE-2055: GermanAnalyzer now uses the Snowball German2 algorithm and
+ * LUCENE-2055: GermanAnalyzer now uses the Snowball German2 algorithm and
stopwords list by default for Version > 3.0.
(Robert Muir, Uwe Schindler, Simon Willnauer)
Bug fixes
- * LUCENE-2855: contrib queryparser was using CharSequence as key in some internal
- Map instances, which was leading to incorrect behaviour, since some CharSequence
- implementors do not override hashcode and equals methods. Now the internal Maps
+ * LUCENE-2855: contrib queryparser was using CharSequence as key in some internal
+ Map instances, which was leading to incorrect behavior, since some CharSequence
+ implementors do not override hashcode and equals methods. Now the internal Maps
are using String instead. (Adriano Crestani)
* LUCENE-2068: Fixed ReverseStringFilter which was not aware of supplementary
@@ -106,9 +106,9 @@ Bug fixes
now reverses supplementary characters correctly if used with Version > 3.0.
(Simon Willnauer, Robert Muir)
- * LUCENE-2035: TokenSources.getTokenStream() does not assign positionIncrement.
+ * LUCENE-2035: TokenSources.getTokenStream() does not assign positionIncrement.
(Christopher Morris via Mark Miller)
-
+
* LUCENE-2055: Deprecated RussianTokenizer, RussianStemmer, RussianStemFilter,
FrenchStemmer, FrenchStemFilter, DutchStemmer, and DutchStemFilter. For
these Analyzers, SnowballFilter is used instead (for Version > 3.0), as
@@ -118,7 +118,7 @@ Bug fixes
* LUCENE-2184: Fixed bug with handling best fit value when the proper best fit value is
not an indexed field. Note, this change affects the APIs. (Grant Ingersoll)
-
+
* LUCENE-2359: Fix bug in CartesianPolyFilterBuilder related to handling of behavior around
the 180th meridian (Grant Ingersoll)
@@ -135,15 +135,15 @@ Bug fixes
and regenerating a new .nrm with 'ant gennorm2'. (David Bowen via Robert Muir)
* LUCENE-2653: ThaiWordFilter depends on the JRE having a Thai dictionary, which is not
- always the case. If the dictionary is unavailable, the filter will now throw
+ always the case. If the dictionary is unavailable, the filter will now throw
UnsupportedOperationException in the constructor. (Robert Muir)
- * LUCENE-589: Fix contrib/demo for international documents.
+ * LUCENE-589: Fix contrib/demo for international documents.
(Curtis d'Entremont via Robert Muir)
-
+
* LUCENE-2246: Fix contrib/demo for Turkish html documents.
- (Selim Nadi via Robert Muir)
-
+ (Selim Nadi via Robert Muir)
+
* LUCENE-590: Demo HTML parser gives incorrect summaries when title is repeated as a heading
(Curtis d'Entremont via Robert Muir)
@@ -153,9 +153,9 @@ Bug fixes
* LUCENE-2874: Highlighting overlapping tokens outputted doubled words.
(Pierre Gossé via Robert Muir)
- * LUCENE-2943: Fix thread-safety issues with ICUCollationKeyFilter.
+ * LUCENE-2943: Fix thread-safety issues with ICUCollationKeyFilter.
(Robert Muir)
-
+
API Changes
* LUCENE-2867: Some contrib queryparser methods that receives CharSequence as
@@ -165,7 +165,7 @@ API Changes
* LUCENE-2147: Spatial GeoHashUtils now always decode GeoHash strings
with full precision. GeoHash#decode_exactly(String) was merged into
GeoHash#decode(String). (Chris Male, Simon Willnauer)
-
+
* LUCENE-2204: Change some package private classes/members to publicly accessible to implement
custom FragmentsBuilders. (Koji Sekiguchi)
@@ -182,14 +182,14 @@ API Changes
* LUCENE-2626: FastVectorHighlighter: enable FragListBuilder and FragmentsBuilder
to be set per-field override. (Koji Sekiguchi)
- * LUCENE-2712: FieldBoostMapAttribute in contrib/queryparser was changed from
+ * LUCENE-2712: FieldBoostMapAttribute in contrib/queryparser was changed from
a Map<CharSequence,Float> to a Map<String,Float>. Per the CharSequence javadoc,
CharSequence is inappropriate as a map key. (Robert Muir)
* LUCENE-1937: Add more methods to manipulate QueryNodeProcessorPipeline elements.
QueryNodeProcessorPipeline now implements the List interface, this is useful
if you want to extend or modify an existing pipeline. (Adriano Crestani via Robert Muir)
-
+
* LUCENE-2754, LUCENE-2757: Deprecated SpanRegexQuery. Use
new SpanMultiTermQueryWrapper<RegexQuery>(new RegexQuery()) instead.
(Robert Muir, Uwe Schindler)
@@ -199,10 +199,10 @@ API Changes
* LUCENE-2830: Use StringBuilder instead of StringBuffer across Benchmark, and
remove the StringBuffer HtmlParser.parse() variant. (Shai Erera)
-
+
* LUCENE-2920: Deprecated ShingleMatrixFilter as it is unmaintained and does
not work with custom Attributes or custom payload encoders. (Uwe Schindler)
-
+
New features
* LUCENE-2500: Added DirectIOLinuxDirectory, a Linux-specific
@@ -210,14 +210,14 @@ New features
cache. This is useful to prevent segment merging from evicting
pages from the buffer cache, since fadvise/madvise do not seem.
(Michael McCandless)
-
+
* LUCENE-2306: Add NumericRangeFilter and NumericRangeQuery support to XMLQueryParser.
(Jingkei Ly, via Mark Harwood)
* LUCENE-2102: Add a Turkish LowerCase Filter. TurkishLowerCaseFilter handles
Turkish and Azeri unique casing behavior correctly.
(Ahmet Arslan, Robert Muir via Simon Willnauer)
-
+
* LUCENE-2039: Add a extensible query parser to contrib/misc.
ExtendableQueryParser enables arbitrary parser extensions based on a
customizable field naming scheme.
@@ -225,11 +225,11 @@ New features
* LUCENE-2067: Add a Czech light stemmer. CzechAnalyzer will now stem words
when Version is set to 3.1 or higher. (Robert Muir)
-
+
* LUCENE-2062: Add a Bulgarian analyzer. (Robert Muir, Simon Willnauer)
* LUCENE-2206: Add Snowball's stopword lists for Danish, Dutch, English,
- Finnish, French, German, Hungarian, Italian, Norwegian, Russian, Spanish,
+ Finnish, French, German, Hungarian, Italian, Norwegian, Russian, Spanish,
and Swedish. These can be loaded with WordListLoader.getSnowballWordSet.
(Robert Muir, Simon Willnauer)
@@ -237,7 +237,7 @@ New features
(Koji Sekiguchi)
* LUCENE-2218: ShingleFilter supports minimum shingle size, and the separator
- character is now configurable. Its also up to 20% faster.
+ character is now configurable. Its also up to 20% faster.
(Steven Rowe via Robert Muir)
* LUCENE-2234: Add a Hindi analyzer. (Robert Muir)
@@ -267,7 +267,7 @@ New features
* LUCENE-2298: Add analyzers/stempel, an algorithmic stemmer with support for
the Polish language. (Andrzej Bialecki via Robert Muir)
- * LUCENE-2400: ShingleFilter was changed to don't output all-filler shingles and
+ * LUCENE-2400: ShingleFilter was changed to don't output all-filler shingles and
unigrams, and uses a more performant algorithm to build grams using a linked list
of AttributeSource.cloneAttributes() instances and the new copyTo() method.
(Steven Rowe via Uwe Schindler)
@@ -286,7 +286,7 @@ New features
* LUCENE-2464: FastVectorHighlighter: add SingleFragListBuilder to return
entire field contents. (Koji Sekiguchi)
- * LUCENE-2503: Added lighter stemming alternatives for European languages.
+ * LUCENE-2503: Added lighter stemming alternatives for European languages.
(Robert Muir)
* LUCENE-2581: FastVectorHighlighter: add Encoder to FragmentsBuilder.
@@ -294,20 +294,23 @@ New features
* LUCENE-2624: Add Analyzers for Armenian, Basque, and Catalan, from snowball.
(Robert Muir)
-
+
* LUCENE-1938: PrecedenceQueryParser is now implemented with the flexible QP framework.
This means that you can also add this functionality to your own QP pipeline by using
BooleanModifiersQueryNodeProcessor, for example instead of GroupQueryNodeProcessor.
(Adriano Crestani via Robert Muir)
* LUCENE-2791: Added WindowsDirectory, a Windows-specific Directory impl
- that doesn't synchronize on the file handle. This can be useful to
+ that doesn't synchronize on the file handle. This can be useful to
avoid the performance problems of SimpleFSDirectory and NIOFSDirectory.
(Robert Muir, Simon Willnauer, Uwe Schindler, Michael McCandless)
* LUCENE-2842: Add analyzer for Galician. Also adds the RSLP (Orengo) stemmer
for Portuguese. (Robert Muir)
+ * SOLR-1057: Add PathHierarchyTokenizer that represents file path hierarchies as synonyms of
+ /something, /something/something, /something/something/else. (Ryan McKinley, Koji Sekiguchi)
+
Build
* LUCENE-2124: Moved the JDK-based collation support from contrib/collation
Modified: lucene/dev/branches/realtime_search/lucene/contrib/ant/src/java/org/apache/lucene/ant/IndexTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/lucene/contrib/ant/src/java/org/apache/lucene/ant/IndexTask.java?rev=1088606&r1=1088605&r2=1088606&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/lucene/contrib/ant/src/java/org/apache/lucene/ant/IndexTask.java (original)
+++ lucene/dev/branches/realtime_search/lucene/contrib/ant/src/java/org/apache/lucene/ant/IndexTask.java Mon Apr 4 13:03:42 2011
@@ -39,7 +39,7 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
-import org.apache.lucene.index.LogMergePolicy;
+import org.apache.lucene.index.TieredMergePolicy;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.search.IndexSearcher;
@@ -285,9 +285,9 @@ public class IndexTask extends Task {
IndexWriterConfig conf = new IndexWriterConfig(
Version.LUCENE_CURRENT, analyzer).setOpenMode(
create ? OpenMode.CREATE : OpenMode.APPEND);
- LogMergePolicy lmp = (LogMergePolicy) conf.getMergePolicy();
- lmp.setUseCompoundFile(useCompoundIndex);
- lmp.setMergeFactor(mergeFactor);
+ TieredMergePolicy tmp = (TieredMergePolicy) conf.getMergePolicy();
+ tmp.setUseCompoundFile(useCompoundIndex);
+ tmp.setMaxMergeAtOnce(mergeFactor);
IndexWriter writer = new IndexWriter(dir, conf);
int totalFiles = 0;
int totalIndexed = 0;