You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2014/10/24 06:48:16 UTC
svn commit: r1633998 [1/2] - in /lucene/dev/trunk:
lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/
lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/
lucene/analysis/common/src/java/org/apache/lucene/analysis...
Author: rmuir
Date: Fri Oct 24 04:48:13 2014
New Revision: 1633998
URL: http://svn.apache.org/r1633998
Log:
LUCENE-5969: remove 4.x back compat
Added:
lucene/dev/trunk/lucene/backward-codecs/src/java/org/apache/lucene/codecs/Placeholder.java (with props)
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.0.0-cfs.zip
- copied unchanged from r1633997, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.0.0-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.0.0-nocfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.0.0-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.0.0.1-cfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.0.0.1-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.0.0.1-nocfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.0.0.1-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.0.0.2-cfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.0.0.2-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.0.0.2-nocfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.0.0.2-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.1.0-cfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.1.0-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.1.0-nocfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.1.0-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.10.0-cfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.10.0-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.10.0-nocfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.10.0-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.10.1-cfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.10.1-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.10.1-nocfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.10.1-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.2.0-cfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.2.0-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.2.0-nocfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.2.0-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.2.1-cfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.2.1-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.2.1-nocfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.2.1-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.3.0-cfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.3.0-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.3.0-nocfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.3.0-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.3.1-cfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.3.1-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.3.1-nocfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.3.1-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.4.0-cfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.4.0-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.4.0-nocfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.4.0-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.5.0-cfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.5.0-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.5.0-nocfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.5.0-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.5.1-cfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.5.1-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.5.1-nocfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.5.1-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.6.0-cfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.6.0-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.6.0-nocfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.6.0-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.6.1-cfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.6.1-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.6.1-nocfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.6.1-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.7.0-cfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.7.0-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.7.0-nocfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.7.0-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.7.1-cfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.7.1-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.7.1-nocfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.7.1-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.7.2-cfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.7.2-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.7.2-nocfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.7.2-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.8.0-cfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.8.0-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.8.0-nocfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.8.0-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.8.1-cfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.8.1-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.8.1-nocfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.8.1-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.9.0-cfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.9.0-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.9.0-nocfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.9.0-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.9.1-cfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.9.1-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.4.9.1-nocfs.zip
- copied unchanged from r1633987, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.9.1-nocfs.zip
Removed:
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/Lucene43CompoundWordTokenFilterBase.java
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/Lucene43DictionaryCompoundWordTokenFilter.java
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/Lucene43HyphenationCompoundWordTokenFilter.java
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/Lucene47WordDelimiterFilter.java
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/Lucene43EdgeNGramTokenFilter.java
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/Lucene43EdgeNGramTokenizer.java
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/Lucene43NGramTokenFilter.java
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/Lucene43NGramTokenizer.java
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiWordFilter.java
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiWordFilterFactory.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLucene47WordDelimiterFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiWordFilterFactory.java
lucene/dev/trunk/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SentenceTokenizer.java
lucene/dev/trunk/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseSentenceTokenizerFactory.java
lucene/dev/trunk/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseWordTokenFilterFactory.java
lucene/dev/trunk/lucene/analysis/smartcn/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory
lucene/dev/trunk/lucene/analysis/smartcn/src/test/org/apache/lucene/analysis/cn/smart/TestSmartChineseFactories.java
lucene/dev/trunk/lucene/backward-codecs/src/java/org/apache/lucene/codecs/UndeadNormsProducer.java
lucene/dev/trunk/lucene/backward-codecs/src/java/org/apache/lucene/codecs/blocktree/
lucene/dev/trunk/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/
lucene/dev/trunk/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene41/
lucene/dev/trunk/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene410/
lucene/dev/trunk/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene42/
lucene/dev/trunk/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene45/
lucene/dev/trunk/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene46/
lucene/dev/trunk/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene49/
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/codecs/
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/TestDocValuesUpdatesOnOldSegments.java
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/dvupdates.4.8.0.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.0.0-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.0.0-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.0.0-optimized-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.0.0-optimized-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.0.0.1-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.0.0.1-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.0.0.2-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.0.0.2-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.1.0-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.1.0-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.10.0-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.10.0-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.10.1-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.10.1-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.2.0-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.2.0-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.2.1-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.2.1-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.3.0-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.3.0-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.3.1-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.3.1-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.4.0-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.4.0-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.5.0-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.5.0-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.5.1-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.5.1-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.6.0-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.6.0-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.6.1-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.6.1-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.7.0-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.7.0-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.7.1-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.7.1-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.7.2-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.7.2-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.8.0-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.8.0-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.8.1-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.8.1-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.9.0-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.9.0-nocfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.9.1-cfs.zip
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/index.4.9.1-nocfs.zip
Modified:
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilterFactory.java
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramFilterFactory.java
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerFactory.java
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramFilterFactory.java
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenFilter.java
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizer.java
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizerFactory.java
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilterTest.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenFilterTest.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java
lucene/dev/trunk/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java
lucene/dev/trunk/lucene/analysis/smartcn/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenizerFactory
lucene/dev/trunk/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.Codec
lucene/dev/trunk/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat
lucene/dev/trunk/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SegmentDocValuesProducer.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/Version.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestVersion.java
lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java
lucene/dev/trunk/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema.xml
lucene/dev/trunk/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/schema.xml
lucene/dev/trunk/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/schema.xml
lucene/dev/trunk/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/schema.xml
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrConfig.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestLuceneMatchVersion.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/similarities/TestNonDefinedSimilarityFactory.java
lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/schema.xml
lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/schema.xml
lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/schema.xml
lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/schema.xml
lucene/dev/trunk/solr/example/example-DIH/solr/tika/conf/schema.xml
lucene/dev/trunk/solr/example/example-schemaless/solr/collection1/conf/schema.xml
Modified: lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java?rev=1633998&r1=1633997&r2=1633998&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java Fri Oct 24 04:48:13 2014
@@ -22,13 +22,12 @@ import org.apache.lucene.analysis.util.C
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
import org.apache.lucene.analysis.util.TokenFilterFactory;
-import org.apache.lucene.util.Version;
import java.util.Map;
import java.io.IOException;
/**
- * Factory for {@link Lucene43DictionaryCompoundWordTokenFilter}.
+ * Factory for {@link DictionaryCompoundWordTokenFilter}.
* <pre class="prettyprint">
* <fieldType name="text_dictcomp" class="solr.TextField" positionIncrementGap="100">
* <analyzer>
@@ -51,9 +50,9 @@ public class DictionaryCompoundWordToken
super(args);
assureMatchVersion();
dictFile = require(args, "dictionary");
- minWordSize = getInt(args, "minWordSize", Lucene43CompoundWordTokenFilterBase.DEFAULT_MIN_WORD_SIZE);
- minSubwordSize = getInt(args, "minSubwordSize", Lucene43CompoundWordTokenFilterBase.DEFAULT_MIN_SUBWORD_SIZE);
- maxSubwordSize = getInt(args, "maxSubwordSize", Lucene43CompoundWordTokenFilterBase.DEFAULT_MAX_SUBWORD_SIZE);
+ minWordSize = getInt(args, "minWordSize", CompoundWordTokenFilterBase.DEFAULT_MIN_WORD_SIZE);
+ minSubwordSize = getInt(args, "minSubwordSize", CompoundWordTokenFilterBase.DEFAULT_MIN_SUBWORD_SIZE);
+ maxSubwordSize = getInt(args, "maxSubwordSize", CompoundWordTokenFilterBase.DEFAULT_MAX_SUBWORD_SIZE);
onlyLongestMatch = getBoolean(args, "onlyLongestMatch", true);
if (!args.isEmpty()) {
throw new IllegalArgumentException("Unknown parameters: " + args);
@@ -71,10 +70,7 @@ public class DictionaryCompoundWordToken
if (dictionary == null) {
return input;
}
- if (luceneMatchVersion.onOrAfter(Version.LUCENE_4_4_0)) {
- return new DictionaryCompoundWordTokenFilter(input, dictionary, minWordSize, minSubwordSize, maxSubwordSize, onlyLongestMatch);
- }
- return new Lucene43DictionaryCompoundWordTokenFilter(input, dictionary, minWordSize, minSubwordSize, maxSubwordSize, onlyLongestMatch);
+ return new DictionaryCompoundWordTokenFilter(input, dictionary, minWordSize, minSubwordSize, maxSubwordSize, onlyLongestMatch);
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java?rev=1633998&r1=1633997&r2=1633998&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java Fri Oct 24 04:48:13 2014
@@ -34,7 +34,7 @@ import org.apache.lucene.util.Version;
import org.xml.sax.InputSource;
/**
- * Factory for {@link Lucene43HyphenationCompoundWordTokenFilter}.
+ * Factory for {@link HyphenationCompoundWordTokenFilter}.
* <p>
* This factory accepts the following parameters:
* <ul>
@@ -58,7 +58,7 @@ import org.xml.sax.InputSource;
* </analyzer>
* </fieldType></pre>
*
- * @see Lucene43HyphenationCompoundWordTokenFilter
+ * @see HyphenationCompoundWordTokenFilter
*/
public class HyphenationCompoundWordTokenFilterFactory extends TokenFilterFactory implements ResourceLoaderAware {
private CharArraySet dictionary;
@@ -78,9 +78,9 @@ public class HyphenationCompoundWordToke
dictFile = get(args, "dictionary");
encoding = get(args, "encoding");
hypFile = require(args, "hyphenator");
- minWordSize = getInt(args, "minWordSize", Lucene43CompoundWordTokenFilterBase.DEFAULT_MIN_WORD_SIZE);
- minSubwordSize = getInt(args, "minSubwordSize", Lucene43CompoundWordTokenFilterBase.DEFAULT_MIN_SUBWORD_SIZE);
- maxSubwordSize = getInt(args, "maxSubwordSize", Lucene43CompoundWordTokenFilterBase.DEFAULT_MAX_SUBWORD_SIZE);
+ minWordSize = getInt(args, "minWordSize", CompoundWordTokenFilterBase.DEFAULT_MIN_WORD_SIZE);
+ minSubwordSize = getInt(args, "minSubwordSize", CompoundWordTokenFilterBase.DEFAULT_MIN_SUBWORD_SIZE);
+ maxSubwordSize = getInt(args, "maxSubwordSize", CompoundWordTokenFilterBase.DEFAULT_MAX_SUBWORD_SIZE);
onlyLongestMatch = getBoolean(args, "onlyLongestMatch", false);
if (!args.isEmpty()) {
throw new IllegalArgumentException("Unknown parameters: " + args);
@@ -99,11 +99,7 @@ public class HyphenationCompoundWordToke
final InputSource is = new InputSource(stream);
is.setEncoding(encoding); // if it's null let xml parser decide
is.setSystemId(hypFile);
- if (luceneMatchVersion.onOrAfter(Version.LUCENE_4_4_0)) {
- hyphenator = HyphenationCompoundWordTokenFilter.getHyphenationTree(is);
- } else {
- hyphenator = Lucene43HyphenationCompoundWordTokenFilter.getHyphenationTree(is);
- }
+ hyphenator = HyphenationCompoundWordTokenFilter.getHyphenationTree(is);
} finally {
IOUtils.closeWhileHandlingException(stream);
}
@@ -111,9 +107,6 @@ public class HyphenationCompoundWordToke
@Override
public TokenFilter create(TokenStream input) {
- if (luceneMatchVersion.onOrAfter(Version.LUCENE_4_4_0)) {
- return new HyphenationCompoundWordTokenFilter(input, hyphenator, dictionary, minWordSize, minSubwordSize, maxSubwordSize, onlyLongestMatch);
- }
- return new Lucene43HyphenationCompoundWordTokenFilter(input, hyphenator, dictionary, minWordSize, minSubwordSize, maxSubwordSize, onlyLongestMatch);
+ return new HyphenationCompoundWordTokenFilter(input, hyphenator, dictionary, minWordSize, minSubwordSize, maxSubwordSize, onlyLongestMatch);
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilterFactory.java?rev=1633998&r1=1633997&r2=1633998&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilterFactory.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilterFactory.java Fri Oct 24 04:48:13 2014
@@ -118,13 +118,8 @@ public class WordDelimiterFilterFactory
@Override
public TokenFilter create(TokenStream input) {
- if (luceneMatchVersion.onOrAfter(Version.LUCENE_4_8_0)) {
- return new WordDelimiterFilter(input, typeTable == null ? WordDelimiterIterator.DEFAULT_WORD_DELIM_TABLE : typeTable,
+ return new WordDelimiterFilter(input, typeTable == null ? WordDelimiterIterator.DEFAULT_WORD_DELIM_TABLE : typeTable,
flags, protectedWords);
- } else {
- return new Lucene47WordDelimiterFilter(input, typeTable == null ? WordDelimiterIterator.DEFAULT_WORD_DELIM_TABLE : typeTable,
- flags, protectedWords);
- }
}
// source => type
Modified: lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramFilterFactory.java?rev=1633998&r1=1633997&r2=1633998&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramFilterFactory.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramFilterFactory.java Fri Oct 24 04:48:13 2014
@@ -22,7 +22,6 @@ import java.util.Map;
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
-import org.apache.lucene.util.Version;
/**
* Creates new instances of {@link EdgeNGramTokenFilter}.
@@ -50,9 +49,6 @@ public class EdgeNGramFilterFactory exte
@Override
public TokenFilter create(TokenStream input) {
- if (luceneMatchVersion.onOrAfter(Version.LUCENE_4_4_0)) {
- return new EdgeNGramTokenFilter(input, minGramSize, maxGramSize);
- }
- return new Lucene43EdgeNGramTokenFilter(input, minGramSize, maxGramSize);
+ return new EdgeNGramTokenFilter(input, minGramSize, maxGramSize);
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerFactory.java?rev=1633998&r1=1633997&r2=1633998&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerFactory.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerFactory.java Fri Oct 24 04:48:13 2014
@@ -20,7 +20,6 @@ package org.apache.lucene.analysis.ngram
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.util.TokenizerFactory;
import org.apache.lucene.util.AttributeFactory;
-import org.apache.lucene.util.Version;
import java.util.Map;
@@ -49,9 +48,6 @@ public class EdgeNGramTokenizerFactory e
@Override
public Tokenizer create(AttributeFactory factory) {
- if (luceneMatchVersion.onOrAfter(Version.LUCENE_4_4_0)) {
- return new EdgeNGramTokenizer(factory, minGramSize, maxGramSize);
- }
- return new Lucene43NGramTokenizer(factory, minGramSize, maxGramSize);
+ return new EdgeNGramTokenizer(factory, minGramSize, maxGramSize);
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramFilterFactory.java?rev=1633998&r1=1633997&r2=1633998&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramFilterFactory.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramFilterFactory.java Fri Oct 24 04:48:13 2014
@@ -22,7 +22,6 @@ import java.util.Map;
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
-import org.apache.lucene.util.Version;
/**
* Factory for {@link NGramTokenFilter}.
@@ -50,9 +49,6 @@ public class NGramFilterFactory extends
@Override
public TokenFilter create(TokenStream input) {
- if (luceneMatchVersion.onOrAfter(Version.LUCENE_4_4_0)) {
- return new NGramTokenFilter(input, minGramSize, maxGramSize);
- }
- return new Lucene43NGramTokenFilter(input, minGramSize, maxGramSize);
+ return new NGramTokenFilter(input, minGramSize, maxGramSize);
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenFilter.java?rev=1633998&r1=1633997&r2=1633998&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenFilter.java Fri Oct 24 04:48:13 2014
@@ -37,10 +37,6 @@ import org.apache.lucene.analysis.util.C
* <li>sorts n-grams by their offset in the original token first, then
* increasing length (meaning that "abc" will give "a", "ab", "abc", "b", "bc",
* "c").</li></ul>
- * <p>You can make this filter use the old behavior by using
- * {@link org.apache.lucene.analysis.ngram.Lucene43NGramTokenFilter} but this is not recommended as
- * it will lead to broken {@link TokenStream}s that will cause highlighting
- * bugs.
* <p>If you were using this {@link TokenFilter} to perform partial highlighting,
* this won't work anymore since this filter doesn't update offsets. You should
* modify your analysis chain to use {@link NGramTokenizer}, and potentially
Modified: lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizer.java?rev=1633998&r1=1633997&r2=1633998&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizer.java Fri Oct 24 04:48:13 2014
@@ -51,8 +51,6 @@ import org.apache.lucene.util.AttributeF
* tokens in a different order, tokens are now emitted by increasing start
* offsets while they used to be emitted by increasing lengths (which prevented
* from supporting large input streams).
- * <p>Although <b style="color:red">highly</b> discouraged, it is still possible
- * to use the old behavior through {@link Lucene43NGramTokenizer}.
*/
// non-final to allow for overriding isTokenChar, but all other methods should be final
public class NGramTokenizer extends Tokenizer {
Modified: lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizerFactory.java?rev=1633998&r1=1633997&r2=1633998&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizerFactory.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizerFactory.java Fri Oct 24 04:48:13 2014
@@ -21,7 +21,6 @@ import org.apache.lucene.analysis.TokenS
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.util.TokenizerFactory;
import org.apache.lucene.util.AttributeFactory;
-import org.apache.lucene.util.Version;
import java.io.Reader;
import java.util.Map;
@@ -52,10 +51,6 @@ public class NGramTokenizerFactory exten
/** Creates the {@link TokenStream} of n-grams from the given {@link Reader} and {@link AttributeFactory}. */
@Override
public Tokenizer create(AttributeFactory factory) {
- if (luceneMatchVersion.onOrAfter(Version.LUCENE_4_4_0)) {
- return new NGramTokenizer(factory, minGramSize, maxGramSize);
- } else {
- return new Lucene43NGramTokenizer(factory, minGramSize, maxGramSize);
- }
+ return new NGramTokenizer(factory, minGramSize, maxGramSize);
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java?rev=1633998&r1=1633997&r2=1633998&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java Fri Oct 24 04:48:13 2014
@@ -24,11 +24,8 @@ import org.apache.lucene.analysis.TokenS
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.core.LowerCaseFilter;
import org.apache.lucene.analysis.core.StopFilter;
-import org.apache.lucene.analysis.standard.StandardFilter;
-import org.apache.lucene.analysis.standard.StandardTokenizer;
import org.apache.lucene.analysis.util.CharArraySet;
import org.apache.lucene.analysis.util.StopwordAnalyzerBase;
-import org.apache.lucene.util.Version;
/**
* {@link Analyzer} for Thai language. It uses {@link java.text.BreakIterator} to break words.
@@ -92,23 +89,14 @@ public final class ThaiAnalyzer extends
* used to tokenize all the text in the provided {@link Reader}.
*
* @return {@link org.apache.lucene.analysis.Analyzer.TokenStreamComponents}
- * built from a {@link StandardTokenizer} filtered with
- * {@link StandardFilter}, {@link LowerCaseFilter}, {@link ThaiWordFilter}, and
- * {@link StopFilter}
+ * built from a {@link ThaiTokenizer} filtered with
+ * {@link LowerCaseFilter} and {@link StopFilter}
*/
@Override
protected TokenStreamComponents createComponents(String fieldName) {
- if (getVersion().onOrAfter(Version.LUCENE_4_8_0)) {
- final Tokenizer source = new ThaiTokenizer();
- TokenStream result = new LowerCaseFilter(source);
- result = new StopFilter(result, stopwords);
- return new TokenStreamComponents(source, result);
- } else {
- final Tokenizer source = new StandardTokenizer();
- TokenStream result = new StandardFilter(source);
- result = new LowerCaseFilter(result);
- result = new ThaiWordFilter(result);
- return new TokenStreamComponents(source, new StopFilter(result, stopwords));
- }
+ final Tokenizer source = new ThaiTokenizer();
+ TokenStream result = new LowerCaseFilter(source);
+ result = new StopFilter(result, stopwords);
+ return new TokenStreamComponents(source, result);
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishAnalyzer.java?rev=1633998&r1=1633997&r2=1633998&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishAnalyzer.java Fri Oct 24 04:48:13 2014
@@ -119,9 +119,7 @@ public final class TurkishAnalyzer exten
protected TokenStreamComponents createComponents(String fieldName) {
final Tokenizer source = new StandardTokenizer();
TokenStream result = new StandardFilter(source);
- if (getVersion().onOrAfter(Version.LUCENE_4_8_0)) {
- result = new ApostropheFilter(result);
- }
+ result = new ApostropheFilter(result);
result = new TurkishLowerCaseFilter(result);
result = new StopFilter(result, stopwords);
if (!stemExclusionSet.isEmpty()) {
Modified: lucene/dev/trunk/lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory?rev=1633998&r1=1633997&r2=1633998&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory Fri Oct 24 04:48:13 2014
@@ -95,6 +95,5 @@ org.apache.lucene.analysis.standard.Clas
org.apache.lucene.analysis.standard.StandardFilterFactory
org.apache.lucene.analysis.sv.SwedishLightStemFilterFactory
org.apache.lucene.analysis.synonym.SynonymFilterFactory
-org.apache.lucene.analysis.th.ThaiWordFilterFactory
org.apache.lucene.analysis.tr.TurkishLowerCaseFilterFactory
org.apache.lucene.analysis.util.ElisionFilterFactory
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java?rev=1633998&r1=1633997&r2=1633998&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java Fri Oct 24 04:48:13 2014
@@ -63,7 +63,7 @@ import org.apache.lucene.analysis.charfi
import org.apache.lucene.analysis.cjk.CJKBigramFilter;
import org.apache.lucene.analysis.commongrams.CommonGramsFilter;
import org.apache.lucene.analysis.commongrams.CommonGramsQueryFilter;
-import org.apache.lucene.analysis.compound.Lucene43HyphenationCompoundWordTokenFilter;
+import org.apache.lucene.analysis.compound.HyphenationCompoundWordTokenFilter;
import org.apache.lucene.analysis.compound.TestCompoundWordTokenFilter;
import org.apache.lucene.analysis.compound.hyphenation.HyphenationTree;
import org.apache.lucene.analysis.hunspell.Dictionary;
@@ -434,7 +434,7 @@ public class TestRandomChains extends Ba
// TODO: make nastier
try {
InputSource is = new InputSource(TestCompoundWordTokenFilter.class.getResource("da_UTF8.xml").toExternalForm());
- HyphenationTree hyphenator = Lucene43HyphenationCompoundWordTokenFilter.getHyphenationTree(is);
+ HyphenationTree hyphenator = HyphenationCompoundWordTokenFilter.getHyphenationTree(is);
return hyphenator;
} catch (Exception ex) {
Rethrow.rethrow(ex);
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilterTest.java?rev=1633998&r1=1633997&r2=1633998&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilterTest.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilterTest.java Fri Oct 24 04:48:13 2014
@@ -234,9 +234,4 @@ public class EdgeNGramTokenFilterTest ex
}
assertFalse(tk.incrementToken());
}
-
- public void test43Tokenizer() {
- new Lucene43EdgeNGramTokenizer(1, 1);
- }
-
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenFilterTest.java?rev=1633998&r1=1633997&r2=1633998&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenFilterTest.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenFilterTest.java Fri Oct 24 04:48:13 2014
@@ -172,18 +172,6 @@ public class NGramTokenFilterTest extend
checkAnalysisConsistency(random, a, random.nextBoolean(), "");
}
- public void testLucene43() throws IOException {
- TokenFilter filter = new Lucene43NGramTokenFilter(input, 2, 3);
- assertTokenStreamContents(filter,
- new String[]{"ab","bc","cd","de","abc","bcd","cde"},
- new int[]{0,1,2,3,0,1,2},
- new int[]{2,3,4,5,3,4,5},
- null,
- new int[]{1,1,1,1,1,1,1},
- null, null, false
- );
- }
-
public void testSupplementaryCharacters() throws IOException {
final String s = TestUtil.randomUnicodeString(random(), 10);
final int codePointCount = s.codePointCount(0, s.length());
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java?rev=1633998&r1=1633997&r2=1633998&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java Fri Oct 24 04:48:13 2014
@@ -245,10 +245,4 @@ public class NGramTokenizerTest extends
testNGrams(minGram, maxGram, s, "");
testNGrams(minGram, maxGram, s, "abcdef");
}
-
- public void test43Tokenizer() {
- // TODO: do more than instantiate (ie check the old broken behavior)
- new Lucene43NGramTokenizer(1, 1);
- }
-
}
Modified: lucene/dev/trunk/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java?rev=1633998&r1=1633997&r2=1633998&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java Fri Oct 24 04:48:13 2014
@@ -29,7 +29,6 @@ import org.apache.lucene.analysis.en.Por
import org.apache.lucene.analysis.util.CharArraySet;
import org.apache.lucene.analysis.util.WordlistLoader;
import org.apache.lucene.util.IOUtils;
-import org.apache.lucene.util.Version;
/**
* <p>
@@ -130,15 +129,8 @@ public final class SmartChineseAnalyzer
@Override
public TokenStreamComponents createComponents(String fieldName) {
- final Tokenizer tokenizer;
- TokenStream result;
- if (getVersion().onOrAfter(Version.LUCENE_4_8_0)) {
- tokenizer = new HMMChineseTokenizer();
- result = tokenizer;
- } else {
- tokenizer = new SentenceTokenizer();
- result = new WordTokenFilter(tokenizer);
- }
+ final Tokenizer tokenizer = new HMMChineseTokenizer();
+ TokenStream result = tokenizer;
// result = new LowerCaseFilter(result);
// LowerCaseFilter is not needed, as SegTokenFilter lowercases Basic Latin text.
// The porter stemming is too strict, this is not a bug, this is a feature:)
Modified: lucene/dev/trunk/lucene/analysis/smartcn/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenizerFactory
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/smartcn/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenizerFactory?rev=1633998&r1=1633997&r2=1633998&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/smartcn/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenizerFactory (original)
+++ lucene/dev/trunk/lucene/analysis/smartcn/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenizerFactory Fri Oct 24 04:48:13 2014
@@ -14,4 +14,3 @@
# limitations under the License.
org.apache.lucene.analysis.cn.smart.HMMChineseTokenizerFactory
-org.apache.lucene.analysis.cn.smart.SmartChineseSentenceTokenizerFactory
Added: lucene/dev/trunk/lucene/backward-codecs/src/java/org/apache/lucene/codecs/Placeholder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/backward-codecs/src/java/org/apache/lucene/codecs/Placeholder.java?rev=1633998&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/backward-codecs/src/java/org/apache/lucene/codecs/Placeholder.java (added)
+++ lucene/dev/trunk/lucene/backward-codecs/src/java/org/apache/lucene/codecs/Placeholder.java Fri Oct 24 04:48:13 2014
@@ -0,0 +1,23 @@
+package org.apache.lucene.codecs;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** Remove this file when adding back compat codecs */
+public class Placeholder {
+
+}
Modified: lucene/dev/trunk/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.Codec
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.Codec?rev=1633998&r1=1633997&r2=1633998&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.Codec (original)
+++ lucene/dev/trunk/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.Codec Fri Oct 24 04:48:13 2014
@@ -13,11 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.lucene.codecs.lucene40.Lucene40Codec
-org.apache.lucene.codecs.lucene41.Lucene41Codec
-org.apache.lucene.codecs.lucene42.Lucene42Codec
-org.apache.lucene.codecs.lucene45.Lucene45Codec
-org.apache.lucene.codecs.lucene46.Lucene46Codec
-org.apache.lucene.codecs.lucene49.Lucene49Codec
-org.apache.lucene.codecs.lucene410.Lucene410Codec
Modified: lucene/dev/trunk/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat?rev=1633998&r1=1633997&r2=1633998&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat (original)
+++ lucene/dev/trunk/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat Fri Oct 24 04:48:13 2014
@@ -13,8 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.lucene.codecs.lucene42.Lucene42DocValuesFormat
-org.apache.lucene.codecs.lucene45.Lucene45DocValuesFormat
-org.apache.lucene.codecs.lucene49.Lucene49DocValuesFormat
-org.apache.lucene.codecs.lucene410.Lucene410DocValuesFormat
Modified: lucene/dev/trunk/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat?rev=1633998&r1=1633997&r2=1633998&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat (original)
+++ lucene/dev/trunk/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat Fri Oct 24 04:48:13 2014
@@ -13,5 +13,3 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.lucene.codecs.lucene40.Lucene40PostingsFormat
-org.apache.lucene.codecs.lucene41.Lucene41PostingsFormat
Modified: lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java?rev=1633998&r1=1633997&r2=1633998&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (original)
+++ lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java Fri Oct 24 04:48:13 2014
@@ -76,6 +76,7 @@ import org.apache.lucene.util.TestUtil;
import org.apache.lucene.util.Version;
import org.junit.AfterClass;
import org.junit.BeforeClass;
+import org.junit.Ignore;
/*
Verify we can read the pre-5.0 file format, do searches
@@ -158,8 +159,8 @@ public class TestBackwardsCompatibility
}
private void updateBinary(IndexWriter writer, String id, String f, String cf, long value) throws IOException {
- writer.updateBinaryDocValue(new Term("id", id), f, TestDocValuesUpdatesOnOldSegments.toBytes(value));
- writer.updateBinaryDocValue(new Term("id", id), cf, TestDocValuesUpdatesOnOldSegments.toBytes(value*2));
+ writer.updateBinaryDocValue(new Term("id", id), f, toBytes(value));
+ writer.updateBinaryDocValue(new Term("id", id), cf, toBytes(value*2));
}
// Creates an index with DocValues updates
@@ -179,10 +180,10 @@ public class TestBackwardsCompatibility
doc.add(new NumericDocValuesField("ndv1_c", i*2));
doc.add(new NumericDocValuesField("ndv2", i*3));
doc.add(new NumericDocValuesField("ndv2_c", i*6));
- doc.add(new BinaryDocValuesField("bdv1", TestDocValuesUpdatesOnOldSegments.toBytes(i)));
- doc.add(new BinaryDocValuesField("bdv1_c", TestDocValuesUpdatesOnOldSegments.toBytes(i*2)));
- doc.add(new BinaryDocValuesField("bdv2", TestDocValuesUpdatesOnOldSegments.toBytes(i*3)));
- doc.add(new BinaryDocValuesField("bdv2_c", TestDocValuesUpdatesOnOldSegments.toBytes(i*6)));
+ doc.add(new BinaryDocValuesField("bdv1", toBytes(i)));
+ doc.add(new BinaryDocValuesField("bdv1_c", toBytes(i*2)));
+ doc.add(new BinaryDocValuesField("bdv2", toBytes(i*3)));
+ doc.add(new BinaryDocValuesField("bdv2_c", toBytes(i*6)));
writer.addDocument(doc);
if ((i+1) % 10 == 0) {
writer.commit(); // flush every 10 docs
@@ -208,50 +209,6 @@ public class TestBackwardsCompatibility
}
final static String[] oldNames = {
- "4.0.0-cfs",
- "4.0.0-nocfs",
- "4.0.0.1-cfs",
- "4.0.0.1-nocfs",
- "4.0.0.2-cfs",
- "4.0.0.2-nocfs",
- "4.1.0-cfs",
- "4.1.0-nocfs",
- "4.2.0-cfs",
- "4.2.0-nocfs",
- "4.2.1-cfs",
- "4.2.1-nocfs",
- "4.3.0-cfs",
- "4.3.0-nocfs",
- "4.3.1-cfs",
- "4.3.1-nocfs",
- "4.4.0-cfs",
- "4.4.0-nocfs",
- "4.5.0-cfs",
- "4.5.0-nocfs",
- "4.5.1-cfs",
- "4.5.1-nocfs",
- "4.6.0-cfs",
- "4.6.0-nocfs",
- "4.6.1-cfs",
- "4.6.1-nocfs",
- "4.7.0-cfs",
- "4.7.0-nocfs",
- "4.7.1-cfs",
- "4.7.1-nocfs",
- "4.7.2-cfs",
- "4.7.2-nocfs",
- "4.8.0-cfs",
- "4.8.0-nocfs",
- "4.8.1-cfs",
- "4.8.1-nocfs",
- "4.9.0-cfs",
- "4.9.0-nocfs",
- "4.9.1-cfs",
- "4.9.1-nocfs",
- "4.10.0-cfs",
- "4.10.0-nocfs",
- "4.10.1-cfs",
- "4.10.1-nocfs"
};
final String[] unsupportedNames = {
@@ -302,11 +259,54 @@ public class TestBackwardsCompatibility
"3.6.1-cfs",
"3.6.1-nocfs",
"3.6.2-cfs",
- "3.6.2-nocfs"
+ "3.6.2-nocfs",
+ "4.0.0-cfs",
+ "4.0.0-nocfs",
+ "4.0.0.1-cfs",
+ "4.0.0.1-nocfs",
+ "4.0.0.2-cfs",
+ "4.0.0.2-nocfs",
+ "4.1.0-cfs",
+ "4.1.0-nocfs",
+ "4.2.0-cfs",
+ "4.2.0-nocfs",
+ "4.2.1-cfs",
+ "4.2.1-nocfs",
+ "4.3.0-cfs",
+ "4.3.0-nocfs",
+ "4.3.1-cfs",
+ "4.3.1-nocfs",
+ "4.4.0-cfs",
+ "4.4.0-nocfs",
+ "4.5.0-cfs",
+ "4.5.0-nocfs",
+ "4.5.1-cfs",
+ "4.5.1-nocfs",
+ "4.6.0-cfs",
+ "4.6.0-nocfs",
+ "4.6.1-cfs",
+ "4.6.1-nocfs",
+ "4.7.0-cfs",
+ "4.7.0-nocfs",
+ "4.7.1-cfs",
+ "4.7.1-nocfs",
+ "4.7.2-cfs",
+ "4.7.2-nocfs",
+ "4.8.0-cfs",
+ "4.8.0-nocfs",
+ "4.8.1-cfs",
+ "4.8.1-nocfs",
+ "4.9.0-cfs",
+ "4.9.0-nocfs",
+ "4.9.1-cfs",
+ "4.9.1-nocfs",
+ "4.10.0-cfs",
+ "4.10.0-nocfs",
+ "4.10.1-cfs",
+ "4.10.1-nocfs"
};
- final static String[] oldSingleSegmentNames = {"4.0.0-optimized-cfs",
- "4.0.0-optimized-nocfs",
+ final static String[] oldSingleSegmentNames = {
};
static Map<String,Directory> oldIndexDirs;
@@ -1221,8 +1221,9 @@ public class TestBackwardsCompatibility
}
}
- public static final String moreTermsIndex = "moreterms.4.0.0.zip";
+ public static final String moreTermsIndex = "moreterms.5.0.0.zip";
+ @Ignore("needs a 5.0 index once released")
public void testMoreTerms() throws Exception {
Path oldIndexDir = createTempDir("moreterms");
TestUtil.unzip(getDataInputStream(moreTermsIndex), oldIndexDir);
@@ -1233,7 +1234,7 @@ public class TestBackwardsCompatibility
dir.close();
}
- public static final String dvUpdatesIndex = "dvupdates.4.8.0.zip";
+ public static final String dvUpdatesIndex = "dvupdates.5.0.0.zip";
private void assertNumericDocValues(LeafReader r, String f, String cf) throws IOException {
NumericDocValues ndvf = r.getNumericDocValues(f);
@@ -1247,7 +1248,7 @@ public class TestBackwardsCompatibility
BinaryDocValues bdvf = r.getBinaryDocValues(f);
BinaryDocValues bdvcf = r.getBinaryDocValues(cf);
for (int i = 0; i < r.maxDoc(); i++) {
- assertEquals(TestDocValuesUpdatesOnOldSegments.getValue(bdvcf, i), TestDocValuesUpdatesOnOldSegments.getValue(bdvf, i)*2);
+ assertEquals(getValue(bdvcf, i), getValue(bdvf, i)*2);
}
}
@@ -1263,6 +1264,7 @@ public class TestBackwardsCompatibility
reader.close();
}
+ @Ignore("needs a 5.0 index once released")
public void testDocValuesUpdates() throws Exception {
Path oldIndexDir = createTempDir("dvupdates");
TestUtil.unzip(getDataInputStream(dvUpdatesIndex), oldIndexDir);
@@ -1324,4 +1326,27 @@ public class TestBackwardsCompatibility
dir.close();
}
}
+
+ static long getValue(BinaryDocValues bdv, int idx) {
+ BytesRef term = bdv.get(idx);
+ idx = term.offset;
+ byte b = term.bytes[idx++];
+ long value = b & 0x7FL;
+ for (int shift = 7; (b & 0x80L) != 0; shift += 7) {
+ b = term.bytes[idx++];
+ value |= (b & 0x7FL) << shift;
+ }
+ return value;
+ }
+
+ // encodes a long into a BytesRef as VLong so that we get varying number of bytes when we update
+ static BytesRef toBytes(long value) {
+ BytesRef bytes = new BytesRef(10); // negative longs may take 10 bytes
+ while ((value & ~0x7FL) != 0L) {
+ bytes.bytes[bytes.length++] = (byte) ((value & 0x7FL) | 0x80L);
+ value >>>= 7;
+ }
+ bytes.bytes[bytes.length++] = (byte) value;
+ return bytes;
+ }
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java?rev=1633998&r1=1633997&r2=1633998&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java Fri Oct 24 04:48:13 2014
@@ -592,7 +592,7 @@ public class CheckIndex implements Close
segInfoStat.docCount = info.info.getDocCount();
final Version version = info.info.getVersion();
- if (info.info.getDocCount() <= 0 && version != null && version.onOrAfter(Version.LUCENE_4_5_0)) {
+ if (info.info.getDocCount() <= 0) {
throw new RuntimeException("illegal number of documents: maxDoc=" + info.info.getDocCount());
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SegmentDocValuesProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SegmentDocValuesProducer.java?rev=1633998&r1=1633997&r2=1633998&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SegmentDocValuesProducer.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SegmentDocValuesProducer.java Fri Oct 24 04:48:13 2014
@@ -34,7 +34,6 @@ import org.apache.lucene.util.Accountabl
import org.apache.lucene.util.Accountables;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.RamUsageEstimator;
-import org.apache.lucene.util.Version;
/** Encapsulates multiple producers when there are docvalues updates as one producer */
// TODO: try to clean up close? no-op?
@@ -52,63 +51,26 @@ class SegmentDocValuesProducer extends D
SegmentDocValuesProducer(SegmentCommitInfo si, Directory dir, FieldInfos fieldInfos, SegmentDocValues segDocValues, DocValuesFormat dvFormat) throws IOException {
boolean success = false;
try {
- Version ver = si.info.getVersion();
- if (ver != null && ver.onOrAfter(Version.LUCENE_4_9_0)) {
- DocValuesProducer baseProducer = null;
- for (FieldInfo fi : fieldInfos) {
- if (!fi.hasDocValues()) {
- continue;
- }
- long docValuesGen = fi.getDocValuesGen();
- if (docValuesGen == -1) {
- if (baseProducer == null) {
- // the base producer gets all the fields, so the Codec can validate properly
- baseProducer = segDocValues.getDocValuesProducer(docValuesGen, si, IOContext.READ, dir, dvFormat, fieldInfos);
- dvGens.add(docValuesGen);
- dvProducers.add(baseProducer);
- }
- dvProducersByField.put(fi.name, baseProducer);
- } else {
- assert !dvGens.contains(docValuesGen);
- final DocValuesProducer dvp = segDocValues.getDocValuesProducer(docValuesGen, si, IOContext.READ, dir, dvFormat, new FieldInfos(new FieldInfo[] { fi }));
- dvGens.add(docValuesGen);
- dvProducers.add(dvp);
- dvProducersByField.put(fi.name, dvp);
- }
- }
- } else {
- // For pre-4.9 indexes, especially with doc-values updates, multiple
- // FieldInfos could belong to the same dvGen. Therefore need to make sure
- // we initialize each DocValuesProducer once per gen.
- Map<Long,List<FieldInfo>> genInfos = new HashMap<>();
- for (FieldInfo fi : fieldInfos) {
- if (!fi.hasDocValues()) {
- continue;
- }
- List<FieldInfo> genFieldInfos = genInfos.get(fi.getDocValuesGen());
- if (genFieldInfos == null) {
- genFieldInfos = new ArrayList<>();
- genInfos.put(fi.getDocValuesGen(), genFieldInfos);
- }
- genFieldInfos.add(fi);
+ DocValuesProducer baseProducer = null;
+ for (FieldInfo fi : fieldInfos) {
+ if (!fi.hasDocValues()) {
+ continue;
}
-
- for (Map.Entry<Long,List<FieldInfo>> e : genInfos.entrySet()) {
- long docValuesGen = e.getKey();
- List<FieldInfo> infos = e.getValue();
- final DocValuesProducer dvp;
- if (docValuesGen == -1) {
- // we need to send all FieldInfos to gen=-1, but later we need to
- // record the DVP only for the "true" gen=-1 fields (not updated)
- dvp = segDocValues.getDocValuesProducer(docValuesGen, si, IOContext.READ, dir, dvFormat, fieldInfos);
- } else {
- dvp = segDocValues.getDocValuesProducer(docValuesGen, si, IOContext.READ, dir, dvFormat, new FieldInfos(infos.toArray(new FieldInfo[infos.size()])));
+ long docValuesGen = fi.getDocValuesGen();
+ if (docValuesGen == -1) {
+ if (baseProducer == null) {
+ // the base producer gets all the fields, so the Codec can validate properly
+ baseProducer = segDocValues.getDocValuesProducer(docValuesGen, si, IOContext.READ, dir, dvFormat, fieldInfos);
+ dvGens.add(docValuesGen);
+ dvProducers.add(baseProducer);
}
+ dvProducersByField.put(fi.name, baseProducer);
+ } else {
+ assert !dvGens.contains(docValuesGen);
+ final DocValuesProducer dvp = segDocValues.getDocValuesProducer(docValuesGen, si, IOContext.READ, dir, dvFormat, new FieldInfos(new FieldInfo[] { fi }));
dvGens.add(docValuesGen);
dvProducers.add(dvp);
- for (FieldInfo fi : infos) {
- dvProducersByField.put(fi.name, dvp);
- }
+ dvProducersByField.put(fi.name, dvp);
}
}
success = true;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java?rev=1633998&r1=1633997&r2=1633998&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java Fri Oct 24 04:48:13 2014
@@ -100,7 +100,7 @@ public final class SegmentInfo {
this.codec = codec;
this.diagnostics = diagnostics;
this.id = id;
- if (id != null && id.length != StringHelper.ID_LENGTH) {
+ if (id.length != StringHelper.ID_LENGTH) {
throw new IllegalArgumentException("invalid id: " + Arrays.toString(id));
}
}
@@ -223,7 +223,7 @@ public final class SegmentInfo {
/** Return the id that uniquely identifies this segment. */
public byte[] getId() {
- return id == null ? null : id.clone();
+ return id.clone();
}
private Set<String> setFiles;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java?rev=1633998&r1=1633997&r2=1633998&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java Fri Oct 24 04:48:13 2014
@@ -119,18 +119,6 @@ import org.apache.lucene.util.StringHelp
*/
public final class SegmentInfos implements Cloneable, Iterable<SegmentCommitInfo> {
- /** The file format version for the segments_N codec header, up to 4.5. */
- public static final int VERSION_40 = 0;
-
- /** The file format version for the segments_N codec header, since 4.6+. */
- public static final int VERSION_46 = 1;
-
- /** The file format version for the segments_N codec header, since 4.8+ */
- public static final int VERSION_48 = 2;
-
- /** The file format version for the segments_N codec header, since 4.9+ */
- public static final int VERSION_49 = 3;
-
/** The file format version for the segments_N codec header, since 5.0+ */
public static final int VERSION_50 = 4;
@@ -262,9 +250,9 @@ public final class SegmentInfos implemen
}
/** Since Lucene 5.0, every commit (segments_N) writes a unique id. This will
- * return that id, or null if this commit was prior to 5.0. */
+ * return that id */
public byte[] getId() {
- return id == null ? null : id.clone();
+ return id.clone();
}
/**
@@ -286,15 +274,10 @@ public final class SegmentInfos implemen
if (magic != CodecUtil.CODEC_MAGIC) {
throw new IndexFormatTooOldException(input, magic, CodecUtil.CODEC_MAGIC, CodecUtil.CODEC_MAGIC);
}
- // 4.0+
- int format = CodecUtil.checkHeaderNoMagic(input, "segments", VERSION_40, VERSION_50);
- // 5.0+
- byte id[] = null;
- if (format >= VERSION_50) {
- id = new byte[StringHelper.ID_LENGTH];
- input.readBytes(id, 0, id.length);
- CodecUtil.checkIndexHeaderSuffix(input, Long.toString(generation, Character.MAX_RADIX));
- }
+ CodecUtil.checkHeaderNoMagic(input, "segments", VERSION_50, VERSION_50);
+ byte id[] = new byte[StringHelper.ID_LENGTH];
+ input.readBytes(id, 0, id.length);
+ CodecUtil.checkIndexHeaderSuffix(input, Long.toString(generation, Character.MAX_RADIX));
SegmentInfos infos = new SegmentInfos();
infos.id = id;
@@ -309,18 +292,12 @@ public final class SegmentInfos implemen
for (int seg = 0; seg < numSegments; seg++) {
String segName = input.readString();
final byte segmentID[];
- if (format >= VERSION_50) {
- byte hasID = input.readByte();
- if (hasID == 1) {
- segmentID = new byte[StringHelper.ID_LENGTH];
- input.readBytes(segmentID, 0, segmentID.length);
- } else if (hasID == 0) {
- segmentID = null; // 4.x segment, doesn't have an ID
- } else {
- throw new CorruptIndexException("invalid hasID byte, got: " + hasID, input);
- }
+ byte hasID = input.readByte();
+ if (hasID == 1) {
+ segmentID = new byte[StringHelper.ID_LENGTH];
+ input.readBytes(segmentID, 0, segmentID.length);
} else {
- segmentID = null;
+ throw new CorruptIndexException("invalid hasID byte, got: " + hasID, input);
}
Codec codec = Codec.forName(input.readString());
SegmentInfo info = codec.segmentInfoFormat().read(directory, segName, segmentID, IOContext.READ);
@@ -330,65 +307,26 @@ public final class SegmentInfos implemen
if (delCount < 0 || delCount > info.getDocCount()) {
throw new CorruptIndexException("invalid deletion count: " + delCount + " vs docCount=" + info.getDocCount(), input);
}
- long fieldInfosGen = -1;
- if (format >= VERSION_46) {
- fieldInfosGen = input.readLong();
- }
- long dvGen = -1;
- if (format >= VERSION_49) {
- dvGen = input.readLong();
- } else {
- dvGen = fieldInfosGen;
- }
+ long fieldInfosGen = input.readLong();
+ long dvGen = input.readLong();
SegmentCommitInfo siPerCommit = new SegmentCommitInfo(info, delCount, delGen, fieldInfosGen, dvGen);
- if (format >= VERSION_46) {
- if (format < VERSION_49) {
- // Recorded per-generation files, which were buggy (see
- // LUCENE-5636). We need to read and keep them so we continue to
- // reference those files. Unfortunately it means that the files will
- // be referenced even if the fields are updated again, until the
- // segment is merged.
- final int numGensUpdatesFiles = input.readInt();
- final Map<Long,Set<String>> genUpdatesFiles;
- if (numGensUpdatesFiles == 0) {
- genUpdatesFiles = Collections.emptyMap();
- } else {
- genUpdatesFiles = new HashMap<>(numGensUpdatesFiles);
- for (int i = 0; i < numGensUpdatesFiles; i++) {
- genUpdatesFiles.put(input.readLong(), input.readStringSet());
- }
- }
- siPerCommit.setGenUpdatesFiles(genUpdatesFiles);
- } else {
- siPerCommit.setFieldInfosFiles(input.readStringSet());
- final Map<Integer,Set<String>> dvUpdateFiles;
- final int numDVFields = input.readInt();
- if (numDVFields == 0) {
- dvUpdateFiles = Collections.emptyMap();
- } else {
- dvUpdateFiles = new HashMap<>(numDVFields);
- for (int i = 0; i < numDVFields; i++) {
- dvUpdateFiles.put(input.readInt(), input.readStringSet());
- }
- }
- siPerCommit.setDocValuesUpdatesFiles(dvUpdateFiles);
+ siPerCommit.setFieldInfosFiles(input.readStringSet());
+ final Map<Integer,Set<String>> dvUpdateFiles;
+ final int numDVFields = input.readInt();
+ if (numDVFields == 0) {
+ dvUpdateFiles = Collections.emptyMap();
+ } else {
+ dvUpdateFiles = new HashMap<>(numDVFields);
+ for (int i = 0; i < numDVFields; i++) {
+ dvUpdateFiles.put(input.readInt(), input.readStringSet());
}
}
+ siPerCommit.setDocValuesUpdatesFiles(dvUpdateFiles);
infos.add(siPerCommit);
}
infos.userData = input.readStringStringMap();
- if (format >= VERSION_48) {
- CodecUtil.checkFooter(input);
- } else {
- final long checksumNow = input.getChecksum();
- final long checksumThen = input.readLong();
- if (checksumNow != checksumThen) {
- throw new CorruptIndexException("checksum failed (hardware problem?) : expected=" + Long.toHexString(checksumThen) +
- " actual=" + Long.toHexString(checksumNow), input);
- }
- CodecUtil.checkEOF(input);
- }
+ CodecUtil.checkFooter(input);
return infos;
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/Version.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/Version.java?rev=1633998&r1=1633997&r2=1633998&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/Version.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/Version.java Fri Oct 24 04:48:13 2014
@@ -33,153 +33,6 @@ import java.util.Locale;
public final class Version {
/**
- * Match settings and bugs in Lucene's 4.0.0-ALPHA release.
- * @deprecated (5.0) Use latest
- */
- @Deprecated
- public static final Version LUCENE_4_0_0_ALPHA = new Version(4, 0, 0, 0);
-
- /**
- * Match settings and bugs in Lucene's 4.0.0-BETA release.
- * @deprecated (5.0) Use latest
- */
- @Deprecated
- public static final Version LUCENE_4_0_0_BETA = new Version(4, 0, 0, 1);
-
- /**
- * Match settings and bugs in Lucene's 4.0.0 release.
- * @deprecated (5.0) Use latest
- */
- @Deprecated
- public static final Version LUCENE_4_0_0 = new Version(4, 0, 0, 2);
-
- /**
- * Match settings and bugs in Lucene's 4.1.0 release.
- * @deprecated (5.0) Use latest
- */
- @Deprecated
- public static final Version LUCENE_4_1_0 = new Version(4, 1, 0);
-
- /**
- * Match settings and bugs in Lucene's 4.2.0 release.
- * @deprecated (5.0) Use latest
- */
- @Deprecated
- public static final Version LUCENE_4_2_0 = new Version(4, 2, 0);
-
- /**
- * Match settings and bugs in Lucene's 4.2.1 release.
- * @deprecated (5.0) Use latest
- */
- @Deprecated
- public static final Version LUCENE_4_2_1 = new Version(4, 2, 1);
-
- /**
- * Match settings and bugs in Lucene's 4.3.0 release.
- * @deprecated (5.0) Use latest
- */
- @Deprecated
- public static final Version LUCENE_4_3_0 = new Version(4, 3, 0);
-
- /**
- * Match settings and bugs in Lucene's 4.3.1 release.
- * @deprecated (5.0) Use latest
- */
- @Deprecated
- public static final Version LUCENE_4_3_1 = new Version(4, 3, 1);
-
- /**
- * Match settings and bugs in Lucene's 4.4.0 release.
- * @deprecated (5.0) Use latest
- */
- @Deprecated
- public static final Version LUCENE_4_4_0 = new Version(4, 4, 0);
-
- /**
- * Match settings and bugs in Lucene's 4.5.0 release.
- * @deprecated (5.0) Use latest
- */
- @Deprecated
- public static final Version LUCENE_4_5_0 = new Version(4, 5, 0);
-
- /**
- * Match settings and bugs in Lucene's 4.5.1 release.
- * @deprecated (5.0) Use latest
- */
- @Deprecated
- public static final Version LUCENE_4_5_1 = new Version(4, 5, 1);
-
- /**
- * Match settings and bugs in Lucene's 4.6.0 release.
- * @deprecated (5.0) Use latest
- */
- @Deprecated
- public static final Version LUCENE_4_6_0 = new Version(4, 6, 0);
-
- /**
- * Match settings and bugs in Lucene's 4.6.1 release.
- * @deprecated (5.0) Use latest
- */
- @Deprecated
- public static final Version LUCENE_4_6_1 = new Version(4, 6, 1);
-
- /**
- * Match settings and bugs in Lucene's 4.7.0 release.
- * @deprecated (5.0) Use latest
- */
- @Deprecated
- public static final Version LUCENE_4_7_0 = new Version(4, 7, 0);
-
- /**
- * Match settings and bugs in Lucene's 4.7.1 release.
- * @deprecated (5.0) Use latest
- */
- @Deprecated
- public static final Version LUCENE_4_7_1 = new Version(4, 7, 1);
-
- /**
- * Match settings and bugs in Lucene's 4.7.2 release.
- * @deprecated (5.0) Use latest
- */
- @Deprecated
- public static final Version LUCENE_4_7_2 = new Version(4, 7, 2);
-
- /**
- * Match settings and bugs in Lucene's 4.8.0 release.
- * @deprecated (5.0) Use latest
- */
- @Deprecated
- public static final Version LUCENE_4_8_0 = new Version(4, 8, 0);
-
- /**
- * Match settings and bugs in Lucene's 4.8.1 release.
- * @deprecated (5.0) Use latest
- */
- @Deprecated
- public static final Version LUCENE_4_8_1 = new Version(4, 8, 1);
-
- /**
- * Match settings and bugs in Lucene's 4.9.0 release.
- * @deprecated (5.0) Use latest
- */
- @Deprecated
- public static final Version LUCENE_4_9_0 = new Version(4, 9, 0);
-
- /**
- * Match settings and bugs in Lucene's 4.10.0 release.
- * @deprecated (5.0) Use latest
- */
- @Deprecated
- public static final Version LUCENE_4_10_0 = new Version(4, 10, 0);
-
- /**
- * Match settings and bugs in Lucene's 4.10.1 release.
- * @deprecated (5.0) Use latest
- */
- @Deprecated
- public static final Version LUCENE_4_10_1 = new Version(4, 10, 1);
-
- /**
* Match settings and bugs in Lucene's 5.0 release.
* @deprecated (5.0) Use latest
*/
@@ -221,47 +74,6 @@ public final class Version {
@Deprecated
public static final Version LUCENE_CURRENT = LATEST;
- /** @deprecated Bad naming of constant; use {@link #LUCENE_4_0_0} instead (this constant actually points to {@link #LUCENE_4_0_0_ALPHA} to match whole 4.0 series). */
- @Deprecated
- public static final Version LUCENE_4_0 = LUCENE_4_0_0_ALPHA;
-
- /** @deprecated Bad naming of constant; use {@link #LUCENE_4_1_0} instead. */
- @Deprecated
- public static final Version LUCENE_4_1 = LUCENE_4_1_0;
-
- /** @deprecated Bad naming of constant; use {@link #LUCENE_4_2_0} instead. */
- @Deprecated
- public static final Version LUCENE_4_2 = LUCENE_4_2_0;
-
- /** @deprecated Bad naming of constant; use {@link #LUCENE_4_3_0} instead. */
- @Deprecated
- public static final Version LUCENE_4_3 = LUCENE_4_3_0;
-
- /** @deprecated Bad naming of constant; use {@link #LUCENE_4_4_0} instead. */
- @Deprecated
- public static final Version LUCENE_4_4 = LUCENE_4_4_0;
-
- /** @deprecated Bad naming of constant; use {@link #LUCENE_4_5_0} instead. */
- @Deprecated
- public static final Version LUCENE_4_5 = LUCENE_4_5_0;
-
- /** @deprecated Bad naming of constant; use {@link #LUCENE_4_6_0} instead. */
- @Deprecated
- public static final Version LUCENE_4_6 = LUCENE_4_6_0;
-
- /** @deprecated Bad naming of constant; use {@link #LUCENE_4_7_0} instead. */
- @Deprecated
- public static final Version LUCENE_4_7 = LUCENE_4_7_0;
-
- /** @deprecated Bad naming of constant; use {@link #LUCENE_4_8_0} instead. */
- @Deprecated
- public static final Version LUCENE_4_8 = LUCENE_4_8_0;
-
- /** @deprecated Bad naming of constant; use {@link #LUCENE_4_9_0} instead. */
- @Deprecated
- public static final Version LUCENE_4_9 = LUCENE_4_9_0;
-
-
/**
* Parse a version number of the form {@code "major.minor.bugfix.prerelease"}.
*
@@ -350,12 +162,6 @@ public final class Version {
case "LATEST":
case "LUCENE_CURRENT":
return LATEST;
- case "LUCENE_4_0_0":
- return LUCENE_4_0_0;
- case "LUCENE_4_0_0_ALPHA":
- return LUCENE_4_0_0_ALPHA;
- case "LUCENE_4_0_0_BETA":
- return LUCENE_4_0_0_BETA;
default:
version = version
.replaceFirst("^LUCENE_(\\d+)_(\\d+)_(\\d+)$", "$1.$2.$3")