You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ha...@apache.org on 2013/08/30 17:06:49 UTC
svn commit: r1518989 [1/10] - in /lucene/dev/branches/lucene3069: ./
dev-tools/ dev-tools/idea/solr/contrib/velocity/ dev-tools/maven/
dev-tools/maven/solr/core/src/java/ lucene/ lucene/analysis/
lucene/analysis/common/ lucene/analysis/common/src/java/...
Author: han
Date: Fri Aug 30 15:06:42 2013
New Revision: 1518989
URL: http://svn.apache.org/r1518989
Log:
LUCENE-3069: merge trunk changes
Added:
lucene/dev/branches/lucene3069/lucene/codecs/src/java/org/apache/lucene/codecs/diskdv/DiskNormsFormat.java
- copied unchanged from r1518970, lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/diskdv/DiskNormsFormat.java
lucene/dev/branches/lucene3069/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesConsumer.java
- copied unchanged from r1518970, lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesConsumer.java
lucene/dev/branches/lucene3069/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesFormat.java
- copied unchanged from r1518970, lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesFormat.java
lucene/dev/branches/lucene3069/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesProducer.java
- copied unchanged from r1518970, lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesProducer.java
lucene/dev/branches/lucene3069/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestMemoryDocValuesFormat.java
- copied unchanged from r1518970, lucene/dev/trunk/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestMemoryDocValuesFormat.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/codecs/lucene42/Lucene42NormsConsumer.java
- copied unchanged from r1518970, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene42/Lucene42NormsConsumer.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/codecs/lucene45/
- copied from r1518970, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene45/
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/util/PForDeltaDocIdSet.java
- copied unchanged from r1518970, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/PForDeltaDocIdSet.java
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/codecs/lucene45/
- copied from r1518970, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene45/
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/util/TestPForDeltaDocIdSet.java
- copied unchanged from r1518970, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestPForDeltaDocIdSet.java
lucene/dev/branches/lucene3069/lucene/facet/src/java/org/apache/lucene/facet/codecs/facet45/
- copied from r1518970, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/codecs/facet45/
lucene/dev/branches/lucene3069/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/SuggestStopFilter.java
- copied unchanged from r1518970, lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/SuggestStopFilter.java
lucene/dev/branches/lucene3069/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestSuggestStopFilter.java
- copied unchanged from r1518970, lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestSuggestStopFilter.java
lucene/dev/branches/lucene3069/lucene/test-framework/src/java/org/apache/lucene/codecs/MissingOrdRemapper.java
- copied unchanged from r1518970, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/MissingOrdRemapper.java
lucene/dev/branches/lucene3069/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene42/
- copied from r1518970, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene42/
lucene/dev/branches/lucene3069/lucene/test-framework/src/java/org/apache/lucene/codecs/package.html
- copied unchanged from r1518970, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/package.html
lucene/dev/branches/lucene3069/lucene/test-framework/src/java/org/apache/lucene/index/AllDeletedFilterReader.java
- copied unchanged from r1518970, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/AllDeletedFilterReader.java
lucene/dev/branches/lucene3069/solr/contrib/clustering/src/test-files/clustering/solr/solr.xml
- copied unchanged from r1518970, lucene/dev/trunk/solr/contrib/clustering/src/test-files/clustering/solr/solr.xml
lucene/dev/branches/lucene3069/solr/contrib/dataimporthandler/src/test-files/dih/solr/solr.xml
- copied unchanged from r1518970, lucene/dev/trunk/solr/contrib/dataimporthandler/src/test-files/dih/solr/solr.xml
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/search/NoOpRegenerator.java
- copied unchanged from r1518970, lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/NoOpRegenerator.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/search/join/package.html
- copied unchanged from r1518970, lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/join/package.html
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-dirfactory.xml
- copied unchanged from r1518970, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-dirfactory.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-warmer-no-reopen.xml
- copied unchanged from r1518970, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-warmer-no-reopen.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/schema-docValuesMissing.xml
- copied unchanged from r1518970, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-docValuesMissing.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml
- copied unchanged from r1518970, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig-logmergepolicy.xml
- copied unchanged from r1518970, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-logmergepolicy.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml
- copied unchanged from r1518970, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml
- copied unchanged from r1518970, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicy.xml
- copied unchanged from r1518970, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicy.xml
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/cloud/SolrXmlInZkTest.java
- copied unchanged from r1518970, lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SolrXmlInZkTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/core/TestImplicitCoreProperties.java
- copied unchanged from r1518970, lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestImplicitCoreProperties.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/core/TestNRTOpen.java
- copied unchanged from r1518970, lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestNRTOpen.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/schema/DocValuesMissingTest.java
- copied unchanged from r1518970, lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/DocValuesMissingTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/search/TestNoOpRegenerator.java
- copied unchanged from r1518970, lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestNoOpRegenerator.java
lucene/dev/branches/lucene3069/solr/licenses/netcdf-LICENSE-MIT.txt
- copied unchanged from r1518970, lucene/dev/trunk/solr/licenses/netcdf-LICENSE-MIT.txt
Removed:
lucene/dev/branches/lucene3069/lucene/codecs/src/java/org/apache/lucene/codecs/diskdv/DiskDocValuesConsumer.java
lucene/dev/branches/lucene3069/lucene/codecs/src/test/org/apache/lucene/codecs/diskdv/TestCheapBastardDocValuesFormat.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/codecs/lucene42/Lucene42DocValuesConsumer.java
lucene/dev/branches/lucene3069/lucene/facet/src/java/org/apache/lucene/facet/codecs/facet42/Facet42Codec.java
lucene/dev/branches/lucene3069/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/ForkLastTokenFilter.java
lucene/dev/branches/lucene3069/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/StopKeywordFilter.java
lucene/dev/branches/lucene3069/lucene/test-framework/src/java/org/apache/lucene/codecs/cheapbastard/CheapBastardDocValuesFormat.java
lucene/dev/branches/lucene3069/lucene/test-framework/src/java/org/apache/lucene/codecs/cheapbastard/CheapBastardDocValuesProducer.java
lucene/dev/branches/lucene3069/lucene/test-framework/src/java/org/apache/lucene/codecs/cheapbastard/CheapBastardNormsFormat.java
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/bad-schema-docValues-not-required-no-default.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig-enableplugin.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig-mutable-managed-schema.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig-termindex.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog-managed-schema.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog-mutable-managed-schema.xml
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/TestPluginEnable.java
lucene/dev/branches/lucene3069/solr/licenses/netcdf-LICENSE-BSD_LIKE.txt
Modified:
lucene/dev/branches/lucene3069/ (props changed)
lucene/dev/branches/lucene3069/dev-tools/ (props changed)
lucene/dev/branches/lucene3069/dev-tools/idea/solr/contrib/velocity/velocity.iml
lucene/dev/branches/lucene3069/dev-tools/maven/pom.xml.template
lucene/dev/branches/lucene3069/dev-tools/maven/solr/core/src/java/pom.xml.template
lucene/dev/branches/lucene3069/lucene/ (props changed)
lucene/dev/branches/lucene3069/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene3069/lucene/analysis/ (props changed)
lucene/dev/branches/lucene3069/lucene/analysis/common/ (props changed)
lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordTokenizer.java
lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountAnalyzer.java
lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PerFieldAnalyzerWrapper.java
lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizer.java
lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/PathHierarchyTokenizer.java
lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/ReversePathHierarchyTokenizer.java
lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizer.java
lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java
lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapper.java
lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizer.java
lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java
lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizer.java
lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharTokenizer.java
lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/FilteringTokenFilter.java
lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizer.java
lucene/dev/branches/lucene3069/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilter.java
lucene/dev/branches/lucene3069/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizer.java
lucene/dev/branches/lucene3069/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseTokenizer.java
lucene/dev/branches/lucene3069/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SentenceTokenizer.java
lucene/dev/branches/lucene3069/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/BaseUIMATokenizer.java
lucene/dev/branches/lucene3069/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMAAnnotationsTokenizer.java
lucene/dev/branches/lucene3069/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnnotationsTokenizer.java
lucene/dev/branches/lucene3069/lucene/benchmark/ (props changed)
lucene/dev/branches/lucene3069/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
lucene/dev/branches/lucene3069/lucene/classification/ (props changed)
lucene/dev/branches/lucene3069/lucene/classification/src/test/org/apache/lucene/classification/ClassificationTestBase.java
lucene/dev/branches/lucene3069/lucene/codecs/ (props changed)
lucene/dev/branches/lucene3069/lucene/codecs/src/java/org/apache/lucene/codecs/diskdv/DiskDocValuesFormat.java
lucene/dev/branches/lucene3069/lucene/codecs/src/java/org/apache/lucene/codecs/diskdv/DiskDocValuesProducer.java
lucene/dev/branches/lucene3069/lucene/codecs/src/java/org/apache/lucene/codecs/memory/package.html
lucene/dev/branches/lucene3069/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesFormat.java
lucene/dev/branches/lucene3069/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java
lucene/dev/branches/lucene3069/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesWriter.java
lucene/dev/branches/lucene3069/lucene/codecs/src/java/org/apache/lucene/codecs/temp/TempFSTOrdPulsing41PostingsFormat.java (props changed)
lucene/dev/branches/lucene3069/lucene/codecs/src/java/org/apache/lucene/codecs/temp/TempFSTPulsing41PostingsFormat.java (props changed)
lucene/dev/branches/lucene3069/lucene/codecs/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat
lucene/dev/branches/lucene3069/lucene/core/ (props changed)
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/analysis/Analyzer.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/analysis/AnalyzerWrapper.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/analysis/TokenStream.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/codecs/Codec.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/codecs/DocValuesConsumer.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/codecs/DocValuesProducer.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/codecs/FilterCodec.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40Codec.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40DocValuesFormat.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40DocValuesReader.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41PostingsReader.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/codecs/lucene42/Lucene42Codec.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/codecs/lucene42/Lucene42DocValuesFormat.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/codecs/lucene42/Lucene42DocValuesProducer.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/codecs/lucene42/Lucene42NormsFormat.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/codecs/lucene42/package.html
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/codecs/package.html
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldDocValuesFormat.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/codecs/temp/TempFSTOrdPostingsFormat.java (props changed)
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/codecs/temp/TempFSTOrdTermsReader.java (props changed)
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/codecs/temp/TempFSTOrdTermsWriter.java (props changed)
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/index/AtomicReader.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/index/BinaryDocValuesWriter.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/index/DocInverterPerField.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/index/DocValuesProcessor.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushQueue.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThreadPool.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/index/FieldInfo.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/index/FilterAtomicReader.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/index/FlushByRamOrCountsPolicy.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/index/FlushPolicy.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/index/NormsConsumerPerField.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/index/NumericDocValuesWriter.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/index/ParallelAtomicReader.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/index/SegmentCoreReaders.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/index/SlowCompositeReaderWrapper.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/index/SortedDocValues.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/index/SortedDocValuesWriter.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/search/CachingWrapperFilter.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/search/FieldCache.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/search/FieldCacheImpl.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/util/AttributeSource.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/util/PagedBytes.java
lucene/dev/branches/lucene3069/lucene/core/src/java/org/apache/lucene/util/fst/FST.java
lucene/dev/branches/lucene3069/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.Codec
lucene/dev/branches/lucene3069/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestLucene40DocValuesFormat.java
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestBlockPostingsFormat3.java
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/codecs/lucene42/TestLucene42DocValuesFormat.java
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/index/BinaryTokenStream.java
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/index/Test2BPositions.java
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveCodecHeader.java
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/index/TestDocValuesFormat.java
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/index/TestMultiDocValues.java
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/index/index.41.cfs.zip
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/index/index.41.nocfs.zip
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/search/TestFieldCache.java
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/search/TestSortDocValues.java
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/search/payloads/PayloadHelper.java
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/util/TestNamedSPILoader.java
lucene/dev/branches/lucene3069/lucene/core/src/test/org/apache/lucene/util/TestPagedBytes.java
lucene/dev/branches/lucene3069/lucene/facet/ (props changed)
lucene/dev/branches/lucene3069/lucene/facet/src/java/org/apache/lucene/facet/codecs/facet42/Facet42DocValuesConsumer.java
lucene/dev/branches/lucene3069/lucene/facet/src/java/org/apache/lucene/facet/codecs/facet42/Facet42DocValuesProducer.java
lucene/dev/branches/lucene3069/lucene/facet/src/java/org/apache/lucene/facet/range/RangeAccumulator.java
lucene/dev/branches/lucene3069/lucene/facet/src/java/org/apache/lucene/facet/sortedset/SortedSetDocValuesReaderState.java
lucene/dev/branches/lucene3069/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java
lucene/dev/branches/lucene3069/lucene/facet/src/java/org/apache/lucene/facet/util/FacetsPayloadMigrationReader.java
lucene/dev/branches/lucene3069/lucene/facet/src/resources/META-INF/services/org.apache.lucene.codecs.Codec
lucene/dev/branches/lucene3069/lucene/facet/src/test/org/apache/lucene/facet/FacetTestCase.java
lucene/dev/branches/lucene3069/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeAccumulator.java
lucene/dev/branches/lucene3069/lucene/facet/src/test/org/apache/lucene/facet/search/TestDemoFacets.java
lucene/dev/branches/lucene3069/lucene/grouping/ (props changed)
lucene/dev/branches/lucene3069/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java
lucene/dev/branches/lucene3069/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
lucene/dev/branches/lucene3069/lucene/highlighter/ (props changed)
lucene/dev/branches/lucene3069/lucene/highlighter/src/java/org/apache/lucene/search/highlight/SimpleHTMLEncoder.java
lucene/dev/branches/lucene3069/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
lucene/dev/branches/lucene3069/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/PostingsHighlighter.java
lucene/dev/branches/lucene3069/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldPhraseList.java
lucene/dev/branches/lucene3069/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldQuery.java
lucene/dev/branches/lucene3069/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestPostingsHighlighter.java
lucene/dev/branches/lucene3069/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java
lucene/dev/branches/lucene3069/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FastVectorHighlighterTest.java
lucene/dev/branches/lucene3069/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java
lucene/dev/branches/lucene3069/lucene/memory/ (props changed)
lucene/dev/branches/lucene3069/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
lucene/dev/branches/lucene3069/lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java
lucene/dev/branches/lucene3069/lucene/misc/ (props changed)
lucene/dev/branches/lucene3069/lucene/misc/src/java/org/apache/lucene/index/sorter/SortingAtomicReader.java
lucene/dev/branches/lucene3069/lucene/misc/src/test/org/apache/lucene/index/sorter/SorterTestBase.java
lucene/dev/branches/lucene3069/lucene/queries/ (props changed)
lucene/dev/branches/lucene3069/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/BytesRefFieldSource.java
lucene/dev/branches/lucene3069/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java
lucene/dev/branches/lucene3069/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java
lucene/dev/branches/lucene3069/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java
lucene/dev/branches/lucene3069/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java
lucene/dev/branches/lucene3069/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java
lucene/dev/branches/lucene3069/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ReverseOrdFieldSource.java
lucene/dev/branches/lucene3069/lucene/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java
lucene/dev/branches/lucene3069/lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.java
lucene/dev/branches/lucene3069/lucene/queries/src/test/org/apache/lucene/queries/TermFilterTest.java
lucene/dev/branches/lucene3069/lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java
lucene/dev/branches/lucene3069/lucene/queryparser/ (props changed)
lucene/dev/branches/lucene3069/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java
lucene/dev/branches/lucene3069/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java
lucene/dev/branches/lucene3069/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/builders/TestNumericRangeFilterBuilder.java
lucene/dev/branches/lucene3069/lucene/site/ (props changed)
lucene/dev/branches/lucene3069/lucene/site/xsl/index.xsl
lucene/dev/branches/lucene3069/lucene/spatial/ (props changed)
lucene/dev/branches/lucene3069/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxSimilarityValueSource.java
lucene/dev/branches/lucene3069/lucene/suggest/ (props changed)
lucene/dev/branches/lucene3069/lucene/suggest/build.xml
lucene/dev/branches/lucene3069/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java
lucene/dev/branches/lucene3069/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java
lucene/dev/branches/lucene3069/lucene/test-framework/ (props changed)
lucene/dev/branches/lucene3069/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java
lucene/dev/branches/lucene3069/lucene/test-framework/src/java/org/apache/lucene/analysis/MockAnalyzer.java
lucene/dev/branches/lucene3069/lucene/test-framework/src/java/org/apache/lucene/analysis/MockTokenFilter.java
lucene/dev/branches/lucene3069/lucene/test-framework/src/java/org/apache/lucene/analysis/MockTokenizer.java
lucene/dev/branches/lucene3069/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingCodec.java
lucene/dev/branches/lucene3069/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingDocValuesFormat.java
lucene/dev/branches/lucene3069/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingNormsFormat.java
lucene/dev/branches/lucene3069/lucene/test-framework/src/java/org/apache/lucene/codecs/cheapbastard/CheapBastardCodec.java
lucene/dev/branches/lucene3069/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/CompressingCodec.java
lucene/dev/branches/lucene3069/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/FastCompressingCodec.java
lucene/dev/branches/lucene3069/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/FastDecompressionCompressingCodec.java
lucene/dev/branches/lucene3069/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene40/Lucene40DocValuesWriter.java
lucene/dev/branches/lucene3069/lucene/test-framework/src/java/org/apache/lucene/index/AssertingAtomicReader.java
lucene/dev/branches/lucene3069/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java
lucene/dev/branches/lucene3069/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java
lucene/dev/branches/lucene3069/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterAtomicReader.java
lucene/dev/branches/lucene3069/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java
lucene/dev/branches/lucene3069/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java
lucene/dev/branches/lucene3069/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java
lucene/dev/branches/lucene3069/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
lucene/dev/branches/lucene3069/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java
lucene/dev/branches/lucene3069/lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java
lucene/dev/branches/lucene3069/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.Codec
lucene/dev/branches/lucene3069/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat
lucene/dev/branches/lucene3069/solr/ (props changed)
lucene/dev/branches/lucene3069/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene3069/solr/contrib/ (props changed)
lucene/dev/branches/lucene3069/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrEntityProcessor.java
lucene/dev/branches/lucene3069/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
lucene/dev/branches/lucene3069/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java
lucene/dev/branches/lucene3069/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java
lucene/dev/branches/lucene3069/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorFactory.java
lucene/dev/branches/lucene3069/solr/core/ (props changed)
lucene/dev/branches/lucene3069/solr/core/ivy.xml
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/cloud/Overseer.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/cloud/ZkCLI.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/core/ConfigSolr.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/core/ConfigSolrXmlOld.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/core/CoreContainer.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/core/CoreDescriptor.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/core/CorePropertiesLocator.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/core/IndexReaderFactory.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/core/SchemaCodecFactory.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/core/SolrConfig.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/core/SolrCore.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/core/SolrXMLCoresLocator.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/core/StandardIndexReaderFactory.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/core/ZkContainer.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/logging/LogWatcher.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/request/DocValuesFacets.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/request/NumericFacets.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/schema/SchemaField.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/schema/StrField.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/schema/TrieField.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/search/EarlyTerminatingCollector.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/search/EarlyTerminatingCollectorException.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/search/QueryResultKey.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/spelling/SpellCheckCollator.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/store/hdfs/HdfsDirectory.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/store/hdfs/HdfsFileWriter.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/update/HdfsUpdateLog.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/update/PeerSync.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactory.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessorChain.java
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/schema-docValuesFaceting.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/schema_codec.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig-solcoreproperties.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig-warmer.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/solr.xml
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/cloud/CustomCollectionTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/cloud/ShardSplitTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/core/TestBadConfig.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/core/TestCodecSupport.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/core/TestConfig.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/core/TestLazyCores.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistence.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistor.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaFieldResource.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/schema/BadIndexSchemaTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchema.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchemaAddField.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/search/TestAddFieldRealTimeGet.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/search/TestDocSet.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/search/TestFastLRUCache.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/search/TestLFUCache.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/search/TestLRUCache.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/search/join/BJQParserTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/update/processor/FieldMutatingUpdateProcessorTest.java
lucene/dev/branches/lucene3069/solr/example/ (props changed)
lucene/dev/branches/lucene3069/solr/example/solr/collection1/conf/schema.xml
lucene/dev/branches/lucene3069/solr/example/solr/collection1/conf/solrconfig.xml
lucene/dev/branches/lucene3069/solr/licenses/ (props changed)
lucene/dev/branches/lucene3069/solr/solrj/ (props changed)
lucene/dev/branches/lucene3069/solr/solrj/src/java/org/apache/solr/common/cloud/CompositeIdRouter.java
lucene/dev/branches/lucene3069/solr/solrj/src/java/org/apache/solr/common/cloud/HashBasedRouter.java
lucene/dev/branches/lucene3069/solr/solrj/src/test-files/solrj/solr/solr.xml
lucene/dev/branches/lucene3069/solr/solrj/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java
lucene/dev/branches/lucene3069/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java
lucene/dev/branches/lucene3069/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/MultiCoreEmbeddedTest.java
lucene/dev/branches/lucene3069/solr/test-framework/ (props changed)
lucene/dev/branches/lucene3069/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java
lucene/dev/branches/lucene3069/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
lucene/dev/branches/lucene3069/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
lucene/dev/branches/lucene3069/solr/test-framework/src/java/org/apache/solr/util/RandomMergePolicy.java
lucene/dev/branches/lucene3069/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java
lucene/dev/branches/lucene3069/solr/webapp/ (props changed)
lucene/dev/branches/lucene3069/solr/webapp/web/admin.html
lucene/dev/branches/lucene3069/solr/webapp/web/js/scripts/app.js
lucene/dev/branches/lucene3069/solr/webapp/web/js/scripts/logging.js
Modified: lucene/dev/branches/lucene3069/dev-tools/idea/solr/contrib/velocity/velocity.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/dev-tools/idea/solr/contrib/velocity/velocity.iml?rev=1518989&r1=1518988&r2=1518989&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/dev-tools/idea/solr/contrib/velocity/velocity.iml (original)
+++ lucene/dev/branches/lucene3069/dev-tools/idea/solr/contrib/velocity/velocity.iml Fri Aug 30 15:06:42 2013
@@ -17,6 +17,7 @@
<orderEntry type="library" name="Solr velocity library" level="project" />
<orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
<orderEntry type="module" scope="TEST" module-name="solr-test-framework" />
+ <orderEntry type="module" module-name="lucene-core" />
<orderEntry type="module" module-name="solr-core" />
<orderEntry type="module" module-name="solrj" />
</component>
Modified: lucene/dev/branches/lucene3069/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/dev-tools/maven/pom.xml.template?rev=1518989&r1=1518988&r2=1518989&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/lucene3069/dev-tools/maven/pom.xml.template Fri Aug 30 15:06:42 2013
@@ -600,23 +600,10 @@
<version>2.4</version>
<configuration>
<archive>
- <!-- This section should be *exactly* the same under -->
- <!-- maven-jar-plugin and maven-war-plugin. -->
- <!-- If you make changes here, make the same changes -->
- <!-- in the other location as well. -->
- <manifestEntries>
- <Extension-Name>${project.groupId}</Extension-Name>
- <Implementation-Title>${project.groupId}</Implementation-Title>
- <Specification-Title>${project.name}</Specification-Title>
- <!-- spec version must match "digit+{.digit+}*" -->
- <Specification-Version>${base.specification.version}.${now.version}</Specification-Version>
- <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
- <!-- impl version can be any string -->
- <Implementation-Version>${project.version} ${svn.revision} - ${user.name} - ${now.timestamp}</Implementation-Version>
- <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
- <X-Compile-Source-JDK>${java.compat.version}</X-Compile-Source-JDK>
- <X-Compile-Target-JDK>${java.compat.version}</X-Compile-Target-JDK>
- </manifestEntries>
+ <manifest>
+ <addDefaultSpecificationEntries>false</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>false</addDefaultImplementationEntries>
+ </manifest>
</archive>
</configuration>
</plugin>
@@ -681,7 +668,7 @@
<configuration>
<archive>
<!-- This section should be *exactly* the same under -->
- <!-- maven-jar-plugin and maven-war-plugin. -->
+ <!-- maven-bundle-plugin and maven-war-plugin. -->
<!-- If you make changes here, make the same changes -->
<!-- in the other location as well. -->
<manifestEntries>
@@ -694,6 +681,7 @@
<!-- impl version can be any string -->
<Implementation-Version>${project.version} ${svn.revision} - ${user.name} - ${now.timestamp}</Implementation-Version>
<Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
+ <Implementation-Vendor-Id>${project.groupId}</Implementation-Vendor-Id>
<X-Compile-Source-JDK>${java.compat.version}</X-Compile-Source-JDK>
<X-Compile-Target-JDK>${java.compat.version}</X-Compile-Target-JDK>
</manifestEntries>
@@ -806,6 +794,23 @@
<configuration>
<instructions>
<Export-Package>*;-split-package:=merge-first</Export-Package>
+
+ <!-- This section should be *exactly* the same under -->
+ <!-- maven-bundle-plugin and maven-war-plugin. -->
+ <!-- If you make changes here, make the same changes -->
+ <!-- in the other location as well. -->
+ <Extension-Name>${project.groupId}</Extension-Name>
+ <Implementation-Title>${project.groupId}</Implementation-Title>
+ <Specification-Title>${project.name}</Specification-Title>
+ <!-- spec version must match "digit+{.digit+}*" -->
+ <Specification-Version>${base.specification.version}.${now.version}</Specification-Version>
+ <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
+ <!-- impl version can be any string -->
+ <Implementation-Version>${project.version} ${svn.revision} - ${user.name} - ${now.timestamp}</Implementation-Version>
+ <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
+ <Implementation-Vendor-Id>${project.groupId}</Implementation-Vendor-Id>
+ <X-Compile-Source-JDK>${java.compat.version}</X-Compile-Source-JDK>
+ <X-Compile-Target-JDK>${java.compat.version}</X-Compile-Target-JDK>
</instructions>
</configuration>
<executions>
Modified: lucene/dev/branches/lucene3069/dev-tools/maven/solr/core/src/java/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/dev-tools/maven/solr/core/src/java/pom.xml.template?rev=1518989&r1=1518988&r2=1518989&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/dev-tools/maven/solr/core/src/java/pom.xml.template (original)
+++ lucene/dev/branches/lucene3069/dev-tools/maven/solr/core/src/java/pom.xml.template Fri Aug 30 15:06:42 2013
@@ -166,13 +166,21 @@
<artifactId>servlet-api</artifactId>
</exclusion>
<exclusion>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math</artifactId>
</exclusion>
<exclusion>
<groupId>xmlenc</groupId>
<artifactId>xmlenc</artifactId>
- </exclusion>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </exclusion>
<exclusion>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
@@ -194,6 +202,14 @@
<artifactId>jersey-server</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>tomcat</groupId>
<artifactId>jasper-compiler</artifactId>
</exclusion>
@@ -252,6 +268,10 @@
<artifactId>servlet-api</artifactId>
</exclusion>
<exclusion>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
</exclusion>
@@ -272,6 +292,14 @@
<artifactId>jackson-mapper-asl</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
</exclusion>
@@ -323,17 +351,6 @@
<optional>true</optional> <!-- Only used for tests and one command-line utility: JettySolrRunner -->
</dependency>
<dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<!-- SOLR-3263: Provided scope is required to avoid jar signing conflicts -->
Modified: lucene/dev/branches/lucene3069/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/lucene/CHANGES.txt?rev=1518989&r1=1518988&r2=1518989&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/lucene3069/lucene/CHANGES.txt Fri Aug 30 15:06:42 2013
@@ -45,7 +45,6 @@ Optimizations
on Windows if NIOFSDirectory is used, mmapped files are still locked.
(Michael Poindexter, Robert Muir, Uwe Schindler)
-
======================= Lucene 4.5.0 =======================
New features
@@ -83,6 +82,31 @@ New features
FacetsAggregator.createOrdinalValueResolver. This gives better options for
resolving an ordinal's value by FacetAggregators. (Shai Erera)
+* LUCENE-5165: Add SuggestStopFilter, to be used with analyzing
+ suggesters, so that a stop word at the very end of the lookup query,
+ and without any trailing token characters, will be preserved. This
+ enables query "a" to suggest apple; see
+ http://blog.mikemccandless.com/2013/08/suggeststopfilter-carefully-removes.html
+ for details.
+
+* LUCENE-5178: Added support for missing values to DocValues fields.
+ AtomicReader.getDocsWithField returns a Bits of documents with a value,
+ and FieldCache.getDocsWithField forwards to that for DocValues fields. Things like
+ SortField.setMissingValue, FunctionValues.exists, and FieldValueFilter now
+ work with DocValues fields. (Robert Muir)
+
+* LUCENE-5124: Lucene 4.5 has a new Lucene45Codec with Lucene45DocValues,
+ supporting missing values and with most datastructures residing off-heap.
+ Added "Memory" docvalues format that works entirely in heap, and "Disk"
+ loads no datastructures into RAM. Both of these also support missing values.
+ Added DiskNormsFormat (in case you want norms entirely on disk). (Robert Muir)
+
+* LUCENE-2750: Added PForDeltaDocIdSet, an in-memory doc id set implementation
+ based on the PFOR encoding. (Adrien Grand)
+
+* LUCENE-5186: Added CachingWrapperFilter.getFilter in order to be able to get
+ the wrapped filter. (Trejkaz via Adrien Grand)
+
Bug Fixes
* LUCENE-5116: IndexWriter.addIndexes(IndexReader...) should drop empty (or all
@@ -115,6 +139,24 @@ Bug Fixes
boundary, made it into the top-N and went to the formatter.
(Manuel Amoabeng, Michael McCandless, Robert Muir)
+* LUCENE-4583: Indexing core no longer enforces a limit on maximum
+ length binary doc values fields, but individual codecs (including
+ the default one) have their own limits (David Smiley, Robert Muir,
+ Mike McCandless)
+
+* LUCENE-3849: TokenStreams now set the position increment in end(),
+ so we can handle trailing holes. If you have a custom TokenStream
+ implementing end() then be sure it calls super.end(). (Robert Muir,
+ Mike McCandless)
+
+* LUCENE-5192: IndexWriter could allow adding same field name with different
+ DocValueTypes under some circumstances. (Shai Erera)
+
+* LUCENE-5191: SimpleHTMLEncoder in Highlighter module broke Unicode
+ outside BMP because it encoded UTF-16 chars instead of codepoints.
+ The escaping of codepoints > 127 was removed (not needed for valid HTML)
+ and missing escaping for ' and / was added. (Uwe Schindler)
+
API Changes
* LUCENE-5094: Add ramBytesUsed() to MultiDocValues.OrdinalMap.
@@ -155,6 +197,28 @@ API Changes
files. FSDirectory#setReadChunkSize() is now deprecated and will be removed
in Lucene 5.0. (Uwe Schindler, Robert Muir, gsingers)
+* LUCENE-5170: Analyzer.ReuseStrategy instances are now stateless and can
+ be reused in other Analyzer instances, which was not possible before.
+ Lucene ships now with stateless singletons for per field and global reuse.
+ Legacy code can still instantiate the deprecated implementation classes,
+ but new code should use the constants. Implementors of custom strategies
+ have to take care of new method signatures. AnalyzerWrapper can now be
+ configured to use a custom strategy, too, ideally the one from the wrapped
+ Analyzer. Analyzer adds a getter to retrieve the strategy for this use-case.
+ (Uwe Schindler, Robert Muir, Shay Banon)
+
+* LUCENE-5173: Lucene never writes segments with 0 documents anymore.
+ (Shai Erera, Uwe Schindler, Robert Muir)
+
+* LUCENE-5178: SortedDocValues always returns -1 ord when a document is missing
+ a value for the field. Previously it only did this if the SortedDocValues
+ was produced by uninversion on the FieldCache. (Robert Muir)
+
+Changes in Runtime Behavior
+
+* LUCENE-5178: DocValues codec consumer APIs (iterables) return null values
+ when the document has no value for the field. (Robert Muir)
+
Optimizations
* LUCENE-5088: Added TermFilter to filter docs by a specific term.
@@ -179,6 +243,20 @@ Optimizations
* LUCENE-5159: Prefix-code the sorted/sortedset value dictionaries in DiskDV.
(Robert Muir)
+* LUCENE-5170: Fixed several wrapper analyzers to inherit the reuse strategy
+ of the wrapped Analyzer. (Uwe Schindler, Robert Muir, Shay Banon)
+
+* LUCENE-5006: Simplified DocumentsWriter and DocumentsWriterPerThread
+ synchronization and concurrent interaction with IndexWriter. DWPT is now
+ only setup once and has no reset logic. All segment publishing and state
+ transition from DWPT into IndexWriter is now done via an Event-Queue
+ processed from within the IndexWriter in order to prevent suituations
+ where DWPT or DW calling int IW causing deadlocks. (Simon Willnauer)
+
+* LUCENE-5182: Terminate phrase searches early if max phrase window is
+ exceeded in FastVectorHighlighter to prevent very long running phrase
+ extraction if phrase terms are high frequent. (Simon Willnauer)
+
Documentation
* LUCENE-4894: remove facet userguide as it was outdated. Partially absorbed into
@@ -194,6 +272,18 @@ Changes in backwards compatibility polic
no longer support multiple "dictionaries" as there is only one dictionary available.
(Dawid Weiss)
+* LUCENE-5170: Changed method signatures of Analyzer.ReuseStrategy to take
+ Analyzer. Closeable interface was removed because the class was changed to
+ be stateless. (Uwe Schindler, Robert Muir, Shay Banon)
+
+* LUCENE-5187: SlowCompositeReaderWrapper constructor is now private,
+ SlowCompositeReaderWrapper.wrap should be used instead. (Adrien Grand)
+
+Build
+
+* SOLR-5159: Manifest includes non-parsed maven variables.
+ (Artem Karpenko via Steve Rowe)
+
======================= Lucene 4.4.0 =======================
Changes in backwards compatibility policy
Modified: lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordTokenizer.java?rev=1518989&r1=1518988&r2=1518989&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordTokenizer.java (original)
+++ lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordTokenizer.java Fri Aug 30 15:06:42 2013
@@ -80,7 +80,8 @@ public final class KeywordTokenizer exte
}
@Override
- public final void end() {
+ public final void end() throws IOException {
+ super.end();
// set final offset
offsetAtt.setOffset(finalOffset, finalOffset);
}
Modified: lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountAnalyzer.java?rev=1518989&r1=1518988&r2=1518989&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountAnalyzer.java (original)
+++ lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountAnalyzer.java Fri Aug 30 15:06:42 2013
@@ -46,6 +46,7 @@ public final class LimitTokenCountAnalyz
* @param consumeAllTokens whether all tokens from the delegate should be consumed even if maxTokenCount is reached.
*/
public LimitTokenCountAnalyzer(Analyzer delegate, int maxTokenCount, boolean consumeAllTokens) {
+ super(delegate.getReuseStrategy());
this.delegate = delegate;
this.maxTokenCount = maxTokenCount;
this.consumeAllTokens = consumeAllTokens;
Modified: lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PerFieldAnalyzerWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PerFieldAnalyzerWrapper.java?rev=1518989&r1=1518988&r2=1518989&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PerFieldAnalyzerWrapper.java (original)
+++ lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PerFieldAnalyzerWrapper.java Fri Aug 30 15:06:42 2013
@@ -73,6 +73,7 @@ public final class PerFieldAnalyzerWrapp
*/
public PerFieldAnalyzerWrapper(Analyzer defaultAnalyzer,
Map<String, Analyzer> fieldAnalyzers) {
+ super(PER_FIELD_REUSE_STRATEGY);
this.defaultAnalyzer = defaultAnalyzer;
this.fieldAnalyzers = (fieldAnalyzers != null) ? fieldAnalyzers : Collections.<String, Analyzer>emptyMap();
}
Modified: lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizer.java?rev=1518989&r1=1518988&r2=1518989&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizer.java (original)
+++ lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizer.java Fri Aug 30 15:06:42 2013
@@ -217,13 +217,15 @@ public class NGramTokenizer extends Toke
}
@Override
- public final void end() {
+ public final void end() throws IOException {
+ super.end();
assert bufferStart <= bufferEnd;
int endOffset = offset;
for (int i = bufferStart; i < bufferEnd; ++i) {
endOffset += Character.charCount(buffer[i]);
}
endOffset = correctOffset(endOffset);
+ // set final offset
offsetAtt.setOffset(endOffset, endOffset);
}
Modified: lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/PathHierarchyTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/PathHierarchyTokenizer.java?rev=1518989&r1=1518988&r2=1518989&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/PathHierarchyTokenizer.java (original)
+++ lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/PathHierarchyTokenizer.java Fri Aug 30 15:06:42 2013
@@ -191,7 +191,8 @@ public class PathHierarchyTokenizer exte
}
@Override
- public final void end() {
+ public final void end() throws IOException {
+ super.end();
// set final offset
int finalOffset = correctOffset(charsRead);
offsetAtt.setOffset(finalOffset, finalOffset);
Modified: lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/ReversePathHierarchyTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/ReversePathHierarchyTokenizer.java?rev=1518989&r1=1518988&r2=1518989&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/ReversePathHierarchyTokenizer.java (original)
+++ lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/ReversePathHierarchyTokenizer.java Fri Aug 30 15:06:42 2013
@@ -176,7 +176,8 @@ public class ReversePathHierarchyTokeniz
}
@Override
- public final void end() {
+ public final void end() throws IOException {
+ super.end();
// set final offset
offsetAtt.setOffset(finalOffset, finalOffset);
}
Modified: lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizer.java?rev=1518989&r1=1518988&r2=1518989&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizer.java (original)
+++ lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizer.java Fri Aug 30 15:06:42 2013
@@ -130,7 +130,8 @@ public final class PatternTokenizer exte
}
@Override
- public void end() {
+ public void end() throws IOException {
+ super.end();
final int ofs = correctOffset(str.length());
offsetAtt.setOffset(ofs, ofs);
}
Modified: lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java?rev=1518989&r1=1518988&r2=1518989&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java (original)
+++ lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java Fri Aug 30 15:06:42 2013
@@ -148,6 +148,7 @@ public final class QueryAutoStopWordAnal
IndexReader indexReader,
Collection<String> fields,
int maxDocFreq) throws IOException {
+ super(delegate.getReuseStrategy());
this.matchVersion = matchVersion;
this.delegate = delegate;
Modified: lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapper.java?rev=1518989&r1=1518988&r2=1518989&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapper.java (original)
+++ lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapper.java Fri Aug 30 15:06:42 2013
@@ -30,7 +30,7 @@ import org.apache.lucene.util.Version;
*/
public final class ShingleAnalyzerWrapper extends AnalyzerWrapper {
- private final Analyzer defaultAnalyzer;
+ private final Analyzer delegate;
private final int maxShingleSize;
private final int minShingleSize;
private final String tokenSeparator;
@@ -52,7 +52,7 @@ public final class ShingleAnalyzerWrappe
/**
* Creates a new ShingleAnalyzerWrapper
*
- * @param defaultAnalyzer Analyzer whose TokenStream is to be filtered
+ * @param delegate Analyzer whose TokenStream is to be filtered
* @param minShingleSize Min shingle (token ngram) size
* @param maxShingleSize Max shingle size
* @param tokenSeparator Used to separate input stream tokens in output shingles
@@ -65,13 +65,14 @@ public final class ShingleAnalyzerWrappe
* regardless of whether any shingles are available.
*/
public ShingleAnalyzerWrapper(
- Analyzer defaultAnalyzer,
+ Analyzer delegate,
int minShingleSize,
int maxShingleSize,
String tokenSeparator,
boolean outputUnigrams,
boolean outputUnigramsIfNoShingles) {
- this.defaultAnalyzer = defaultAnalyzer;
+ super(delegate.getReuseStrategy());
+ this.delegate = delegate;
if (maxShingleSize < 2) {
throw new IllegalArgumentException("Max shingle size must be >= 2");
@@ -138,7 +139,7 @@ public final class ShingleAnalyzerWrappe
@Override
protected Analyzer getWrappedAnalyzer(String fieldName) {
- return defaultAnalyzer;
+ return delegate;
}
@Override
Modified: lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizer.java?rev=1518989&r1=1518988&r2=1518989&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizer.java (original)
+++ lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizer.java Fri Aug 30 15:06:42 2013
@@ -76,6 +76,8 @@ public final class ClassicTokenizer exte
"<CJ>",
"<ACRONYM_DEP>"
};
+
+ private int skippedPositions;
private int maxTokenLength = StandardAnalyzer.DEFAULT_MAX_TOKEN_LENGTH;
@@ -130,7 +132,7 @@ public final class ClassicTokenizer exte
@Override
public final boolean incrementToken() throws IOException {
clearAttributes();
- int posIncr = 1;
+ skippedPositions = 0;
while(true) {
int tokenType = scanner.getNextToken();
@@ -140,7 +142,7 @@ public final class ClassicTokenizer exte
}
if (scanner.yylength() <= maxTokenLength) {
- posIncrAtt.setPositionIncrement(posIncr);
+ posIncrAtt.setPositionIncrement(skippedPositions+1);
scanner.getText(termAtt);
final int start = scanner.yychar();
offsetAtt.setOffset(correctOffset(start), correctOffset(start+termAtt.length()));
@@ -155,19 +157,23 @@ public final class ClassicTokenizer exte
} else
// When we skip a too-long term, we still increment the
// position increment
- posIncr++;
+ skippedPositions++;
}
}
@Override
- public final void end() {
+ public final void end() throws IOException {
+ super.end();
// set final offset
int finalOffset = correctOffset(scanner.yychar() + scanner.yylength());
offsetAtt.setOffset(finalOffset, finalOffset);
+ // adjust any skipped tokens
+ posIncrAtt.setPositionIncrement(posIncrAtt.getPositionIncrement()+skippedPositions);
}
@Override
public void reset() throws IOException {
scanner.yyreset(input);
+ skippedPositions = 0;
}
}
Modified: lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java?rev=1518989&r1=1518988&r2=1518989&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java (original)
+++ lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java Fri Aug 30 15:06:42 2013
@@ -90,6 +90,8 @@ public final class StandardTokenizer ext
"<KATAKANA>",
"<HANGUL>"
};
+
+ private int skippedPositions;
private int maxTokenLength = StandardAnalyzer.DEFAULT_MAX_TOKEN_LENGTH;
@@ -144,7 +146,7 @@ public final class StandardTokenizer ext
@Override
public final boolean incrementToken() throws IOException {
clearAttributes();
- int posIncr = 1;
+ skippedPositions = 0;
while(true) {
int tokenType = scanner.getNextToken();
@@ -154,7 +156,7 @@ public final class StandardTokenizer ext
}
if (scanner.yylength() <= maxTokenLength) {
- posIncrAtt.setPositionIncrement(posIncr);
+ posIncrAtt.setPositionIncrement(skippedPositions+1);
scanner.getText(termAtt);
final int start = scanner.yychar();
offsetAtt.setOffset(correctOffset(start), correctOffset(start+termAtt.length()));
@@ -163,19 +165,23 @@ public final class StandardTokenizer ext
} else
// When we skip a too-long term, we still increment the
// position increment
- posIncr++;
+ skippedPositions++;
}
}
@Override
- public final void end() {
+ public final void end() throws IOException {
+ super.end();
// set final offset
int finalOffset = correctOffset(scanner.yychar() + scanner.yylength());
offsetAtt.setOffset(finalOffset, finalOffset);
+ // adjust any skipped tokens
+ posIncrAtt.setPositionIncrement(posIncrAtt.getPositionIncrement()+skippedPositions);
}
@Override
public void reset() throws IOException {
scanner.yyreset(input);
+ skippedPositions = 0;
}
}
Modified: lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizer.java?rev=1518989&r1=1518988&r2=1518989&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizer.java (original)
+++ lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizer.java Fri Aug 30 15:06:42 2013
@@ -76,6 +76,8 @@ public final class UAX29URLEmailTokenize
"<URL>",
"<EMAIL>",
};
+
+ private int skippedPositions;
private int maxTokenLength = StandardAnalyzer.DEFAULT_MAX_TOKEN_LENGTH;
@@ -123,7 +125,7 @@ public final class UAX29URLEmailTokenize
@Override
public final boolean incrementToken() throws IOException {
clearAttributes();
- int posIncr = 1;
+ skippedPositions = 0;
while(true) {
int tokenType = scanner.getNextToken();
@@ -133,7 +135,7 @@ public final class UAX29URLEmailTokenize
}
if (scanner.yylength() <= maxTokenLength) {
- posIncrAtt.setPositionIncrement(posIncr);
+ posIncrAtt.setPositionIncrement(skippedPositions+1);
scanner.getText(termAtt);
final int start = scanner.yychar();
offsetAtt.setOffset(correctOffset(start), correctOffset(start+termAtt.length()));
@@ -142,19 +144,23 @@ public final class UAX29URLEmailTokenize
} else
// When we skip a too-long term, we still increment the
// position increment
- posIncr++;
+ skippedPositions++;
}
}
@Override
- public final void end() {
+ public final void end() throws IOException {
+ super.end();
// set final offset
int finalOffset = correctOffset(scanner.yychar() + scanner.yylength());
offsetAtt.setOffset(finalOffset, finalOffset);
+ // adjust any skipped tokens
+ posIncrAtt.setPositionIncrement(posIncrAtt.getPositionIncrement()+skippedPositions);
}
@Override
public void reset() throws IOException {
scanner.yyreset(input);
+ skippedPositions = 0;
}
}
Modified: lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharTokenizer.java?rev=1518989&r1=1518988&r2=1518989&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharTokenizer.java (original)
+++ lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharTokenizer.java Fri Aug 30 15:06:42 2013
@@ -142,7 +142,8 @@ public abstract class CharTokenizer exte
}
@Override
- public final void end() {
+ public final void end() throws IOException {
+ super.end();
// set final offset
offsetAtt.setOffset(finalOffset, finalOffset);
}
Modified: lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/FilteringTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/FilteringTokenFilter.java?rev=1518989&r1=1518988&r2=1518989&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/FilteringTokenFilter.java (original)
+++ lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/FilteringTokenFilter.java Fri Aug 30 15:06:42 2013
@@ -34,6 +34,7 @@ public abstract class FilteringTokenFilt
protected final Version version;
private final PositionIncrementAttribute posIncrAtt = addAttribute(PositionIncrementAttribute.class);
+ private int skippedPositions;
/**
* Create a new {@link FilteringTokenFilter}.
@@ -50,7 +51,7 @@ public abstract class FilteringTokenFilt
@Override
public final boolean incrementToken() throws IOException {
- int skippedPositions = 0;
+ skippedPositions = 0;
while (input.incrementToken()) {
if (accept()) {
if (skippedPositions != 0) {
@@ -68,6 +69,12 @@ public abstract class FilteringTokenFilt
@Override
public void reset() throws IOException {
super.reset();
+ skippedPositions = 0;
}
+ @Override
+ public void end() throws IOException {
+ super.end();
+ posIncrAtt.setPositionIncrement(posIncrAtt.getPositionIncrement() + skippedPositions);
+ }
}
Modified: lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizer.java?rev=1518989&r1=1518988&r2=1518989&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizer.java (original)
+++ lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizer.java Fri Aug 30 15:06:42 2013
@@ -309,7 +309,8 @@ public final class WikipediaTokenizer ex
}
@Override
- public void end() {
+ public void end() throws IOException {
+ super.end();
// set final offset
final int finalOffset = correctOffset(scanner.yychar() + scanner.yylength());
this.offsetAtt.setOffset(finalOffset, finalOffset);
Modified: lucene/dev/branches/lucene3069/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilter.java?rev=1518989&r1=1518988&r2=1518989&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilter.java (original)
+++ lucene/dev/branches/lucene3069/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilter.java Fri Aug 30 15:06:42 2013
@@ -90,6 +90,22 @@ public class TestStopFilter extends Base
StopFilter stpf01 = new StopFilter(TEST_VERSION_CURRENT, stpf0, stopSet1); // two stop filters concatenated!
doTestStopPositons(stpf01);
}
+
+ // LUCENE-3849: make sure after .end() we see the "ending" posInc
+ public void testEndStopword() throws Exception {
+ CharArraySet stopSet = StopFilter.makeStopSet(TEST_VERSION_CURRENT, "of");
+ StopFilter stpf = new StopFilter(Version.LUCENE_40, new MockTokenizer(new StringReader("test of"), MockTokenizer.WHITESPACE, false), stopSet);
+ assertTokenStreamContents(stpf, new String[] { "test" },
+ new int[] {0},
+ new int[] {4},
+ null,
+ new int[] {1},
+ null,
+ 7,
+ 1,
+ null,
+ true);
+ }
private void doTestStopPositons(StopFilter stpf) throws IOException {
CharTermAttribute termAtt = stpf.getAttribute(CharTermAttribute.class);
Modified: lucene/dev/branches/lucene3069/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizer.java?rev=1518989&r1=1518988&r2=1518989&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizer.java (original)
+++ lucene/dev/branches/lucene3069/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizer.java Fri Aug 30 15:06:42 2013
@@ -120,7 +120,8 @@ public final class ICUTokenizer extends
}
@Override
- public void end() {
+ public void end() throws IOException {
+ super.end();
final int finalOffset = (length < 0) ? offset : offset + length;
offsetAtt.setOffset(correctOffset(finalOffset), correctOffset(finalOffset));
}
Modified: lucene/dev/branches/lucene3069/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseTokenizer.java?rev=1518989&r1=1518988&r2=1518989&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseTokenizer.java (original)
+++ lucene/dev/branches/lucene3069/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseTokenizer.java Fri Aug 30 15:06:42 2013
@@ -280,7 +280,8 @@ public final class JapaneseTokenizer ext
}
@Override
- public void end() {
+ public void end() throws IOException {
+ super.end();
// Set final offset
int finalOffset = correctOffset(pos);
offsetAtt.setOffset(finalOffset, finalOffset);
Modified: lucene/dev/branches/lucene3069/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SentenceTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SentenceTokenizer.java?rev=1518989&r1=1518988&r2=1518989&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SentenceTokenizer.java (original)
+++ lucene/dev/branches/lucene3069/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SentenceTokenizer.java Fri Aug 30 15:06:42 2013
@@ -112,7 +112,8 @@ public final class SentenceTokenizer ext
}
@Override
- public void end() {
+ public void end() throws IOException {
+ super.end();
// set final offset
final int finalOffset = correctOffset(tokenEnd);
offsetAtt.setOffset(finalOffset, finalOffset);
Modified: lucene/dev/branches/lucene3069/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/BaseUIMATokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/BaseUIMATokenizer.java?rev=1518989&r1=1518988&r2=1518989&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/BaseUIMATokenizer.java (original)
+++ lucene/dev/branches/lucene3069/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/BaseUIMATokenizer.java Fri Aug 30 15:06:42 2013
@@ -91,9 +91,4 @@ public abstract class BaseUIMATokenizer
public void reset() throws IOException {
iterator = null;
}
-
- @Override
- public void end() throws IOException {
- iterator = null;
- }
}