You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rj...@apache.org on 2014/08/16 07:36:37 UTC
svn commit: r1618309 [1/2] - in /lucene/dev/branches/branch_4x: ./
dev-tools/idea/.idea/ dev-tools/maven/ lucene/ lucene/analysis/
lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/
lucene/analysis/common/src/java/org/apache/lucene/an...
Author: rjernst
Date: Sat Aug 16 05:36:35 2014
New Revision: 1618309
URL: http://svn.apache.org/r1618309
Log:
LUCENE-5850: Made Version handling more robust and extensible
Removed:
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/TestConstants.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/TestVersionComparator.java
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/build.xml
lucene/dev/branches/branch_4x/dev-tools/idea/.idea/workspace.xml
lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/lucene/analysis/ (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizerFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishAnalyzer.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java
lucene/dev/branches/branch_4x/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java
lucene/dev/branches/branch_4x/lucene/benchmark/ (props changed)
lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java
lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java
lucene/dev/branches/branch_4x/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTaskTest.java
lucene/dev/branches/branch_4x/lucene/codecs/ (props changed)
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoReader.java
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoWriter.java
lucene/dev/branches/branch_4x/lucene/common-build.xml (contents, props changed)
lucene/dev/branches/branch_4x/lucene/core/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xNormsProducer.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xSegmentInfoReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfoReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfoWriter.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene45/Lucene45DocValuesProducer.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene46/Lucene46SegmentInfoReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene46/Lucene46SegmentInfoWriter.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexUpgrader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/UpgradeIndexMergePolicy.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/Constants.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/StringHelper.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/Version.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (contents, props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility3x.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDoc.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/TestVersion.java
lucene/dev/branches/branch_4x/lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java
lucene/dev/branches/branch_4x/lucene/demo/src/java/org/apache/lucene/demo/SearchFiles.java
lucene/dev/branches/branch_4x/lucene/demo/src/java/org/apache/lucene/demo/facet/FacetExamples.java
lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java
lucene/dev/branches/branch_4x/lucene/highlighter/ (props changed)
lucene/dev/branches/branch_4x/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java
lucene/dev/branches/branch_4x/lucene/misc/ (props changed)
lucene/dev/branches/branch_4x/lucene/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java
lucene/dev/branches/branch_4x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java
lucene/dev/branches/branch_4x/lucene/test-framework/ (props changed)
lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java
lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/common-build.xml (contents, props changed)
lucene/dev/branches/branch_4x/solr/contrib/ (props changed)
lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/Config.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/SolrConfig.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/analysis/TestLuceneMatchVersion.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/rest/schema/TestSerializedLuceneMatchVersion.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/similarities/TestNonDefinedSimilarityFactory.java
lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/db/conf/solrconfig.xml
lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
lucene/dev/branches/branch_4x/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml
lucene/dev/branches/branch_4x/solr/example/multicore/core0/conf/solrconfig.xml
lucene/dev/branches/branch_4x/solr/example/multicore/core1/conf/solrconfig.xml
lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/solrconfig.xml
Modified: lucene/dev/branches/branch_4x/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/build.xml?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/build.xml (original)
+++ lucene/dev/branches/branch_4x/build.xml Sat Aug 16 05:36:35 2014
@@ -143,7 +143,7 @@
</subant>
</target>
- <property name="version" value="4.10-SNAPSHOT"/>
+ <property name="version" value="4.10.0-SNAPSHOT"/>
<property name="maven-build-dir" value="maven-build"/>
<property name="maven-version" value="2.2.1"/>
Modified: lucene/dev/branches/branch_4x/dev-tools/idea/.idea/workspace.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/.idea/workspace.xml?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/.idea/workspace.xml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/.idea/workspace.xml Sat Aug 16 05:36:35 2014
@@ -8,7 +8,7 @@
<module name="lucene-core-tests" />
<option name="TEST_OBJECT" value="package" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/lucene/core" />
- <option name="VM_PARAMETERS" value="-Xmx256m -ea -Dlucene.version=4.9-SNAPSHOT -DtempDir=temp" />
+ <option name="VM_PARAMETERS" value="-Xmx256m -ea -Dlucene.version=4.10.0-SNAPSHOT -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="Module analyzers-common" type="JUnit" factoryName="JUnit">
@@ -183,28 +183,28 @@
<module name="solr-core-tests" />
<option name="TEST_OBJECT" value="package" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/solr-core" />
- <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.9 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
+ <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.10.0 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="Solrj" type="JUnit" factoryName="JUnit">
<module name="solrj-tests" />
<option name="TEST_OBJECT" value="package" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/solr-solrj" />
- <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.9 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
+ <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.10.0 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="Solr analysis-extras contrib" type="JUnit" factoryName="JUnit">
<module name="analysis-extras" />
<option name="TEST_OBJECT" value="package" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/solr-analysis-extras" />
- <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.9 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
+ <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.10.0 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="Solr clustering contrib" type="JUnit" factoryName="JUnit">
<module name="clustering" />
<option name="TEST_OBJECT" value="package" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/solr-clustering" />
- <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.9 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
+ <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.10.0 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="Solr dataimporthandler contrib" type="JUnit" factoryName="JUnit">
@@ -260,7 +260,7 @@
<module name="uima" />
<option name="TEST_OBJECT" value="package" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/solr-uima" />
- <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.9 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
+ <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.10.0 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="Solr velocity contrib" type="JUnit" factoryName="JUnit">
Modified: lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template Sat Aug 16 05:36:35 2014
@@ -58,7 +58,7 @@
<tests.codec>random</tests.codec>
<tests.directory>random</tests.directory>
<tests.locale>random</tests.locale>
- <tests.luceneMatchVersion>4.8</tests.luceneMatchVersion>
+ <tests.luceneMatchVersion>4.10.0</tests.luceneMatchVersion>
<tests.multiplier>1</tests.multiplier>
<tests.nightly>false</tests.nightly>
<tests.postingsformat>random</tests.postingsformat>
Modified: lucene/dev/branches/branch_4x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/CHANGES.txt?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/lucene/CHANGES.txt Sat Aug 16 05:36:35 2014
@@ -64,8 +64,8 @@ API Changes
CoveredBy. The area requirement on the predicates was removed, and Overlaps' definition
was fixed. (David Smiley)
-* LUCENE-5850: CheckIndex now prints the Lucene version used to write
- each segment. (Robert Muir, Mike McCandless)
+* LUCENE-5850: Made Version handling more robust and extensible. Deprecated Constants.LUCENE_MAIN_VERSION, Constants.LUCENE_VERSION and current Version constants of the form LUCENE_X_Y. Added version constants that include bugfix number of form LUCENE_X_Y_Z. Changed Version.LUCENE_CURRENT to Version.LATEST. CheckIndex now prints the Lucene version used to write
+ each segment. (Ryan Ernst, Uwe Schindler, Robert Muir, Mike McCandless)
* LUCENE-5836: BytesRef has been splitted into BytesRef, whose intended usage is
to be just a reference to a section of a larger byte[] and BytesRefBuilder
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java Sat Aug 16 05:36:35 2014
@@ -17,6 +17,7 @@ package org.apache.lucene.analysis.compo
* limitations under the License.
*/
+import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.compound.hyphenation.HyphenationTree;
import org.apache.lucene.analysis.util.CharArraySet;
@@ -103,7 +104,7 @@ public class HyphenationCompoundWordToke
}
@Override
- public HyphenationCompoundWordTokenFilter create(TokenStream input) {
+ public TokenFilter create(TokenStream input) {
return new HyphenationCompoundWordTokenFilter(luceneMatchVersion, input, hyphenator, dictionary, minWordSize, minSubwordSize, maxSubwordSize, onlyLongestMatch);
}
}
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilterFactory.java?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilterFactory.java Sat Aug 16 05:36:35 2014
@@ -118,7 +118,7 @@ public class WordDelimiterFilterFactory
@Override
public TokenFilter create(TokenStream input) {
- if (luceneMatchVersion.onOrAfter(Version.LUCENE_4_8)) {
+ if (luceneMatchVersion.onOrAfter(Version.LUCENE_4_8_0)) {
return new WordDelimiterFilter(luceneMatchVersion, input, typeTable == null ? WordDelimiterIterator.DEFAULT_WORD_DELIM_TABLE : typeTable,
flags, protectedWords);
} else {
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramFilterFactory.java?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramFilterFactory.java Sat Aug 16 05:36:35 2014
@@ -18,6 +18,8 @@ package org.apache.lucene.analysis.ngram
*/
import java.util.Map;
+
+import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
@@ -48,7 +50,7 @@ public class EdgeNGramFilterFactory exte
}
@Override
- public EdgeNGramTokenFilter create(TokenStream input) {
+ public TokenFilter create(TokenStream input) {
return new EdgeNGramTokenFilter(luceneMatchVersion, input, side, minGramSize, maxGramSize);
}
}
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerFactory.java?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerFactory.java Sat Aug 16 05:36:35 2014
@@ -52,7 +52,7 @@ public class EdgeNGramTokenizerFactory e
@Override
public Tokenizer create(AttributeFactory factory, Reader input) {
- if (luceneMatchVersion.onOrAfter(Version.LUCENE_4_4)) {
+ if (luceneMatchVersion.onOrAfter(Version.LUCENE_4_4_0)) {
if (!EdgeNGramTokenFilter.Side.FRONT.getLabel().equals(side)) {
throw new IllegalArgumentException(EdgeNGramTokenizer.class.getSimpleName() + " does not support backward n-grams as of Lucene 4.4");
}
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramFilterFactory.java?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramFilterFactory.java Sat Aug 16 05:36:35 2014
@@ -18,6 +18,8 @@ package org.apache.lucene.analysis.ngram
*/
import java.util.Map;
+
+import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
@@ -46,7 +48,7 @@ public class NGramFilterFactory extends
}
@Override
- public NGramTokenFilter create(TokenStream input) {
+ public TokenFilter create(TokenStream input) {
return new NGramTokenFilter(luceneMatchVersion, input, minGramSize, maxGramSize);
}
}
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizerFactory.java?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizerFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizerFactory.java Sat Aug 16 05:36:35 2014
@@ -52,7 +52,7 @@ 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, Reader input) {
- if (luceneMatchVersion.onOrAfter(Version.LUCENE_4_4)) {
+ if (luceneMatchVersion.onOrAfter(Version.LUCENE_4_4_0)) {
return new NGramTokenizer(luceneMatchVersion, factory, input, minGramSize, maxGramSize);
} else {
return new Lucene43NGramTokenizer(factory, input, minGramSize, maxGramSize);
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java Sat Aug 16 05:36:35 2014
@@ -108,9 +108,10 @@ public final class ThaiAnalyzer extends
* {@link StopFilter}
*/
@Override
+
protected TokenStreamComponents createComponents(String fieldName,
Reader reader) {
- if (matchVersion.onOrAfter(Version.LUCENE_4_8)) {
+ if (matchVersion.onOrAfter(Version.LUCENE_4_8_0)) {
final Tokenizer source = new ThaiTokenizer(reader);
TokenStream result = new LowerCaseFilter(matchVersion, source);
result = new StopFilter(matchVersion, result, stopwords);
@@ -118,7 +119,7 @@ public final class ThaiAnalyzer extends
} else {
final Tokenizer source = new StandardTokenizer(matchVersion, reader);
TokenStream result = new StandardFilter(matchVersion, source);
- if (matchVersion.onOrAfter(Version.LUCENE_3_1))
+ if (matchVersion.onOrAfter(Version.LUCENE_3_1_0))
result = new LowerCaseFilter(matchVersion, result);
result = new ThaiWordFilter(matchVersion, result);
return new TokenStreamComponents(source, new StopFilter(matchVersion,
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishAnalyzer.java?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishAnalyzer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishAnalyzer.java Sat Aug 16 05:36:35 2014
@@ -123,7 +123,7 @@ public final class TurkishAnalyzer exten
Reader reader) {
final Tokenizer source = new StandardTokenizer(matchVersion, reader);
TokenStream result = new StandardFilter(matchVersion, source);
- if(matchVersion.onOrAfter(Version.LUCENE_4_8))
+ if(matchVersion.onOrAfter(Version.LUCENE_4_8_0))
result = new ApostropheFilter(result);
result = new TurkishLowerCaseFilter(result);
result = new StopFilter(matchVersion, result, stopwords);
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java Sat Aug 16 05:36:35 2014
@@ -51,7 +51,7 @@ public class TestGermanAnalyzer extends
}
/** test some features of the new snowball filter
- * these only pass with LUCENE_CURRENT, not if you use o.a.l.a.de.GermanStemmer
+ * these only pass with LATEST, not if you use o.a.l.a.de.GermanStemmer
*/
public void testGermanSpecials() throws Exception {
GermanAnalyzer a = new GermanAnalyzer(TEST_VERSION_CURRENT);
Modified: lucene/dev/branches/branch_4x/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java Sat Aug 16 05:36:35 2014
@@ -90,7 +90,7 @@ public final class SmartChineseAnalyzer
return CharArraySet.unmodifiableSet(WordlistLoader.getWordSet(IOUtils
.getDecodingReader(SmartChineseAnalyzer.class, DEFAULT_STOPWORD_FILE,
StandardCharsets.UTF_8), STOPWORD_FILE_COMMENT,
- Version.LUCENE_CURRENT));
+ Version.LATEST));
}
}
@@ -138,7 +138,7 @@ public final class SmartChineseAnalyzer
public TokenStreamComponents createComponents(String fieldName, Reader reader) {
final Tokenizer tokenizer;
TokenStream result;
- if (matchVersion.onOrAfter(Version.LUCENE_4_8)) {
+ if (matchVersion.onOrAfter(Version.LUCENE_4_8_0)) {
tokenizer = new HMMChineseTokenizer(reader);
result = tokenizer;
} else {
Modified: lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java Sat Aug 16 05:36:35 2014
@@ -59,7 +59,7 @@ import java.util.regex.Pattern;
* </ol>
*
* Each component analysis factory map specify <tt>luceneMatchVersion</tt> (defaults to
- * {@link Version#LUCENE_CURRENT}) and any of the args understood by the specified
+ * {@link Version#LATEST}) and any of the args understood by the specified
* *Factory class, in the above-describe param format.
* <p/>
* Example:
@@ -68,7 +68,7 @@ import java.util.regex.Pattern;
* positionIncrementGap:100,
* HTMLStripCharFilter,
* MappingCharFilter(mapping:'mapping-FoldToASCII.txt'),
- * WhitespaceTokenizer(luceneMatchVersion:LUCENE_4_3),
+ * WhitespaceTokenizer(luceneMatchVersion:LUCENE_4_3_0),
* TokenLimitFilter(maxTokenCount:10000, consumeAllTokens:false))
* [...]
* -NewAnalyzer('strip html, fold to ascii, whitespace tokenize, max 10k tokens')
@@ -355,7 +355,7 @@ public class AnalyzerFactoryTask extends
}
}
if (!argMap.containsKey("luceneMatchVersion")) {
- argMap.put("luceneMatchVersion", Version.LUCENE_CURRENT.toString());
+ argMap.put("luceneMatchVersion", Version.LATEST.toString());
}
final AbstractAnalysisFactory instance;
try {
Modified: lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java Sat Aug 16 05:36:35 2014
@@ -16,9 +16,6 @@ package org.apache.lucene.benchmark.byTa
*/
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.util.CharFilterFactory;
-import org.apache.lucene.analysis.util.TokenFilterFactory;
-import org.apache.lucene.analysis.util.TokenizerFactory;
import org.apache.lucene.benchmark.byTask.PerfRunData;
import org.apache.lucene.benchmark.byTask.utils.AnalyzerFactory;
import org.apache.lucene.util.Version;
@@ -47,7 +44,7 @@ public class NewAnalyzerTask extends Per
try {
// first try to use a ctor with version parameter (needed for many new Analyzers that have no default one anymore
Constructor<? extends Analyzer> cnstr = clazz.getConstructor(Version.class);
- return cnstr.newInstance(Version.LUCENE_CURRENT);
+ return cnstr.newInstance(Version.LATEST);
} catch (NoSuchMethodException nsme) {
// otherwise use default ctor
return clazz.newInstance();
Modified: lucene/dev/branches/branch_4x/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTaskTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTaskTest.java?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTaskTest.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTaskTest.java Sat Aug 16 05:36:35 2014
@@ -38,7 +38,7 @@ public class CreateIndexTaskTest extends
private PerfRunData createPerfRunData(String infoStreamValue) throws Exception {
Properties props = new Properties();
// :Post-Release-Update-Version.LUCENE_XY:
- props.setProperty("writer.version", Version.LUCENE_4_10.toString());
+ props.setProperty("writer.version", Version.LUCENE_4_10_0.toString());
props.setProperty("print.props", "false"); // don't print anything
props.setProperty("directory", "RAMDirectory");
if (infoStreamValue != null) {
Modified: lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoReader.java?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoReader.java Sat Aug 16 05:36:35 2014
@@ -42,6 +42,7 @@ import org.apache.lucene.store.IOContext
import org.apache.lucene.util.BytesRefBuilder;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.StringHelper;
+import org.apache.lucene.util.Version;
/**
* reads plaintext segments files
@@ -60,7 +61,7 @@ public class SimpleTextSegmentInfoReader
try {
SimpleTextUtil.readLine(input, scratch);
assert StringHelper.startsWith(scratch.get(), SI_VERSION);
- final String version = readString(SI_VERSION.length, scratch);
+ final Version version = Version.parse(readString(SI_VERSION.length, scratch));
SimpleTextUtil.readLine(input, scratch);
assert StringHelper.startsWith(scratch.get(), SI_DOCCOUNT);
Modified: lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoWriter.java?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoWriter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoWriter.java Sat Aug 16 05:36:35 2014
@@ -62,7 +62,7 @@ public class SimpleTextSegmentInfoWriter
BytesRefBuilder scratch = new BytesRefBuilder();
SimpleTextUtil.write(output, SI_VERSION);
- SimpleTextUtil.write(output, si.getVersion(), scratch);
+ SimpleTextUtil.write(output, si.getVersion().toString(), scratch);
SimpleTextUtil.writeNewline(output);
SimpleTextUtil.write(output, SI_DOCCOUNT);
Modified: lucene/dev/branches/branch_4x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/common-build.xml?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/common-build.xml Sat Aug 16 05:36:35 2014
@@ -26,6 +26,13 @@
for standalone use.
</description>
+ <!-- !!! RELEASE MANAGER: Change version numbers only here: !!! -->
+
+ <!-- The base version of the next release (including bugfix number, e.g., x.y.z+): -->
+ <property name="version.base" value="4.10.0"/>
+
+ <!-- !!! RELEASE MANAGER: Don't change anything after this line! !!! -->
+
<dirname file="${ant.file.common}" property="common.dir"/>
<property name="dev-tools.dir" location="${common.dir}/../dev-tools"/>
<property name="prettify.dir" location="${common.dir}/tools/prettify"/>
@@ -48,14 +55,20 @@
</tstamp>
<property name="Name" value="Lucene"/>
-
<property name="name" value="${ant.project.name}"/>
- <property name="tests.luceneMatchVersion" value="4.10"/>
- <property name="dev.version.base" value="4.10"/>
- <property name="dev.version.suffix" value="SNAPSHOT"/>
- <property name="dev.version" value="${dev.version.base}-${dev.version.suffix}"/>
- <property name="version" value="${dev.version}"/>
- <property name="spec.version" value="${version}"/>
+
+ <!--TODO: remove once Jenkins jobs are updated:--><property name="dev.version.suffix" value="SNAPSHOT"/>
+
+ <!-- Suffix of the version, by default SNAPSHOT: -->
+ <property name="version.suffix" value="${dev.version.suffix}"/>
+ <property name="version" value="${version.base}-${version.suffix}"/>
+
+
+ <fail message="If you pass -Dversion=... to set a release version, it must match "${version.base}", optionally followed by a suffix (e.g., "-SNAPSHOT").">
+ <condition>
+ <not><matches pattern="^\Q${version.base}\E(|\-.*)$" casesensitive="true" string="${version}"/></not>
+ </condition>
+ </fail>
<property name="year" value="2000-${current.year}"/>
@@ -118,6 +131,7 @@
<property name="tests.verbose" value="false"/>
<property name="tests.infostream" value="${tests.verbose}"/>
<property name="tests.filterstacks" value="true"/>
+ <property name="tests.luceneMatchVersion" value="${version.base}"/>
<condition property="tests.heapsize" value="768M">
<isset property="run.clover"/>
@@ -670,7 +684,7 @@
<attribute name="excludes" default="**/pom.xml,**/*.iml"/>
<attribute name="metainf.source.dir" default="${common.dir}"/>
<attribute name="implementation.title" default="org.apache.lucene"/>
- <attribute name="spec.version" default="${spec.version}"/>
+ <attribute name="spec.version" default="${version}"/>
<attribute name="manifest.file" default="${manifest.file}"/>
<element name="filesets" optional="true"/>
<element name="jarify-additional-manifest-attributes" optional="true"/>
@@ -1016,7 +1030,7 @@
<sysproperty key="java.security.manager" value="org.apache.lucene.util.TestSecurityManager" />
<sysproperty key="java.security.policy" file="${common.dir}/tools/junit4/tests.policy" />
- <sysproperty key="lucene.version" value="${version}"/>
+ <sysproperty key="tests.LUCENE_VERSION" value="${version.base}"/>
<sysproperty key="jetty.testMode" value="1"/>
<sysproperty key="jetty.insecurerandom" value="1"/>
@@ -2502,7 +2516,7 @@ The following arguments can be provided
<junit4:pickseed property="pitest.seed" />
- <property name="pitest.sysprops" value="-Dlucene.version=${version},-Dtest.seed=${pitest.seed},-Djava.security.manager=org.apache.lucene.util.TestSecurityManager,-Djava.security.policy=${common.dir}/tools/junit4/tests.policy,-Djava.io.tmpdir=${tests.workDir},-Djunit4.childvm.cwd=${tests.workDir},-Djunit4.tempDir=${tests.workDir}" />
+ <property name="pitest.sysprops" value="-Dversion=${version},-Dtest.seed=${pitest.seed},-Djava.security.manager=org.apache.lucene.util.TestSecurityManager,-Djava.security.policy=${common.dir}/tools/junit4/tests.policy,-Djava.io.tmpdir=${tests.workDir},-Djunit4.childvm.cwd=${tests.workDir},-Djunit4.tempDir=${tests.workDir}" />
<pitest
classPath="pitest.classpath"
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xNormsProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xNormsProducer.java?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xNormsProducer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xNormsProducer.java Sat Aug 16 05:36:35 2014
@@ -42,6 +42,7 @@ import org.apache.lucene.util.Bits;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.RamUsageEstimator;
import org.apache.lucene.util.StringHelper;
+import org.apache.lucene.util.Version;
/**
* Reads Lucene 3.x norms format and exposes it via DocValues API
@@ -106,9 +107,9 @@ class Lucene3xNormsProducer extends DocV
// and don't need to do the sketchy file size check. otherwise, we check
// if the size is exactly equal to maxDoc to detect a headerless file.
// NOTE: remove this check in Lucene 5.0!
- String version = info.getVersion();
+ Version version = info.getVersion();
final boolean isUnversioned =
- (version == null || StringHelper.getVersionComparator().compare(version, "3.2") < 0)
+ (version == null || Version.LUCENE_3_2_0.onOrAfter(version))
&& normInput.length() == maxdoc;
if (isUnversioned) {
normSeek = 0;
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xSegmentInfoReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xSegmentInfoReader.java?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xSegmentInfoReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xSegmentInfoReader.java Sat Aug 16 05:36:35 2014
@@ -37,6 +37,7 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.store.IOContext;
import org.apache.lucene.store.IndexInput;
import org.apache.lucene.util.IOUtils;
+import org.apache.lucene.util.Version;
/**
* Lucene 3x implementation of {@link SegmentInfoReader}.
@@ -80,12 +81,12 @@ public class Lucene3xSegmentInfoReader e
// Above call succeeded, so it's a 3.0 segment. Upgrade it so the next
// time the segment is read, its version won't be null and we won't
// need to open FieldsReader every time for each such segment.
- si.setVersion("3.0");
+ si.setVersion(Version.LUCENE_3_0_0);
} else if (si.getVersion().equals("2.x")) {
// If it's a 3x index touched by 3.1+ code, then segments record their
// version, whether they are 2.x ones or not. We detect that and throw
// appropriate exception.
- throw new IndexFormatTooOldException("segment " + si.name + " in resource " + input, si.getVersion());
+ throw new IndexFormatTooOldException("segment " + si.name + " in resource " + input, si.getVersion().toString());
}
infos.add(siPerCommit);
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfoReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfoReader.java?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfoReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfoReader.java Sat Aug 16 05:36:35 2014
@@ -30,6 +30,7 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.store.IOContext;
import org.apache.lucene.store.IndexInput;
import org.apache.lucene.util.IOUtils;
+import org.apache.lucene.util.Version;
/**
* Lucene 4.0 implementation of {@link SegmentInfoReader}.
@@ -54,7 +55,7 @@ public class Lucene40SegmentInfoReader e
CodecUtil.checkHeader(input, Lucene40SegmentInfoFormat.CODEC_NAME,
Lucene40SegmentInfoFormat.VERSION_START,
Lucene40SegmentInfoFormat.VERSION_CURRENT);
- final String version = input.readString();
+ final Version version = Version.parse(input.readString());
final int docCount = input.readInt();
if (docCount < 0) {
throw new CorruptIndexException("invalid docCount: " + docCount + " (resource=" + input + ")");
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfoWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfoWriter.java?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfoWriter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfoWriter.java Sat Aug 16 05:36:35 2014
@@ -55,7 +55,7 @@ public class Lucene40SegmentInfoWriter e
try {
CodecUtil.writeHeader(output, Lucene40SegmentInfoFormat.CODEC_NAME, Lucene40SegmentInfoFormat.VERSION_CURRENT);
// Write the Lucene version that created this segment, since 3.1
- output.writeString(si.getVersion());
+ output.writeString(si.getVersion().toString());
output.writeInt(si.getDocCount());
output.writeByte((byte) (si.getUseCompoundFile() ? SegmentInfo.YES : SegmentInfo.NO));
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene45/Lucene45DocValuesProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene45/Lucene45DocValuesProducer.java?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene45/Lucene45DocValuesProducer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene45/Lucene45DocValuesProducer.java Sat Aug 16 05:36:35 2014
@@ -92,8 +92,8 @@ class Lucene45DocValuesProducer extends
/** expert: instantiates a new reader */
@SuppressWarnings("deprecation")
protected Lucene45DocValuesProducer(SegmentReadState state, String dataCodec, String dataExtension, String metaCodec, String metaExtension) throws IOException {
- String ver = state.segmentInfo.getVersion();
- lenientFieldInfoCheck = StringHelper.getVersionComparator().compare(ver, "4.9.0") < 0;
+ Version ver = state.segmentInfo.getVersion();
+ lenientFieldInfoCheck = Version.LUCENE_4_9_0.onOrAfter(ver);
String metaName = IndexFileNames.segmentFileName(state.segmentInfo.name, state.segmentSuffix, metaExtension);
// read in the entries from the metadata file.
ChecksumIndexInput in = state.directory.openChecksumInput(metaName, state.context);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene46/Lucene46SegmentInfoReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene46/Lucene46SegmentInfoReader.java?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene46/Lucene46SegmentInfoReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene46/Lucene46SegmentInfoReader.java Sat Aug 16 05:36:35 2014
@@ -30,6 +30,7 @@ import org.apache.lucene.store.ChecksumI
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IOContext;
import org.apache.lucene.util.IOUtils;
+import org.apache.lucene.util.Version;
/**
* Lucene 4.6 implementation of {@link SegmentInfoReader}.
@@ -52,7 +53,7 @@ public class Lucene46SegmentInfoReader e
int codecVersion = CodecUtil.checkHeader(input, Lucene46SegmentInfoFormat.CODEC_NAME,
Lucene46SegmentInfoFormat.VERSION_START,
Lucene46SegmentInfoFormat.VERSION_CURRENT);
- final String version = input.readString();
+ final Version version = Version.parse(input.readString());
final int docCount = input.readInt();
if (docCount < 0) {
throw new CorruptIndexException("invalid docCount: " + docCount + " (resource=" + input + ")");
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene46/Lucene46SegmentInfoWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene46/Lucene46SegmentInfoWriter.java?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene46/Lucene46SegmentInfoWriter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene46/Lucene46SegmentInfoWriter.java Sat Aug 16 05:36:35 2014
@@ -53,7 +53,7 @@ public class Lucene46SegmentInfoWriter e
try {
CodecUtil.writeHeader(output, Lucene46SegmentInfoFormat.CODEC_NAME, Lucene46SegmentInfoFormat.VERSION_CURRENT);
// Write the Lucene version that created this segment, since 3.1
- output.writeString(si.getVersion());
+ output.writeString(si.getVersion().toString());
output.writeInt(si.getDocCount());
output.writeByte((byte) (si.getUseCompoundFile() ? SegmentInfo.YES : SegmentInfo.NO));
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java Sat Aug 16 05:36:35 2014
@@ -48,7 +48,7 @@ import org.apache.lucene.util.CommandLin
import org.apache.lucene.util.FixedBitSet;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.LongBitSet;
-import org.apache.lucene.util.StringHelper;
+import org.apache.lucene.util.Version;
/**
@@ -424,21 +424,19 @@ public class CheckIndex {
}
// find the oldest and newest segment versions
- String oldest = Integer.toString(Integer.MAX_VALUE), newest = Integer.toString(Integer.MIN_VALUE);
+ Version oldest = null;
+ Version newest = null;
String oldSegs = null;
- boolean foundNonNullVersion = false;
- Comparator<String> versionComparator = StringHelper.getVersionComparator();
for (SegmentCommitInfo si : sis) {
- String version = si.info.getVersion();
+ Version version = si.info.getVersion();
if (version == null) {
// pre-3.1 segment
oldSegs = "pre-3.1";
} else {
- foundNonNullVersion = true;
- if (versionComparator.compare(version, oldest) < 0) {
+ if (oldest == null || version.onOrAfter(oldest) == false) {
oldest = version;
}
- if (versionComparator.compare(version, newest) > 0) {
+ if (newest == null || version.onOrAfter(newest)) {
newest = version;
}
}
@@ -490,14 +488,14 @@ public class CheckIndex {
userDataString = "";
}
- String versionString = null;
+ String versionString = "";
if (oldSegs != null) {
- if (foundNonNullVersion) {
+ if (newest != null) {
versionString = "versions=[" + oldSegs + " .. " + newest + "]";
} else {
versionString = "version=" + oldSegs;
}
- } else {
+ } else if (newest != null) { // implies oldest != null
versionString = oldest.equals(newest) ? ( "version=" + oldest ) : ("versions=[" + oldest + " .. " + newest + "]");
}
@@ -542,8 +540,8 @@ public class CheckIndex {
segInfoStat.name = info.info.name;
segInfoStat.docCount = info.info.getDocCount();
- final String version = info.info.getVersion();
- if (info.info.getDocCount() <= 0 && version != null && versionComparator.compare(version, "4.5") >= 0) {
+ final Version version = info.info.getVersion();
+ if (info.info.getDocCount() <= 0 && version != null && version.onOrAfter(Version.LUCENE_4_5_0)) {
throw new RuntimeException("illegal number of documents: maxDoc=" + info.info.getDocCount());
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java Sat Aug 16 05:36:35 2014
@@ -34,12 +34,12 @@ import org.apache.lucene.store.IOContext
import org.apache.lucene.store.TrackingDirectoryWrapper;
import org.apache.lucene.util.ByteBlockPool.Allocator;
import org.apache.lucene.util.ByteBlockPool.DirectTrackingAllocator;
-import org.apache.lucene.util.Constants;
import org.apache.lucene.util.Counter;
import org.apache.lucene.util.InfoStream;
import org.apache.lucene.util.IntBlockPool;
import org.apache.lucene.util.MutableBits;
import org.apache.lucene.util.RamUsageEstimator;
+import org.apache.lucene.util.Version;
import static org.apache.lucene.util.ByteBlockPool.BYTE_BLOCK_MASK;
import static org.apache.lucene.util.ByteBlockPool.BYTE_BLOCK_SIZE;
@@ -178,7 +178,7 @@ class DocumentsWriterPerThread {
pendingUpdates.clear();
deleteSlice = deleteQueue.newSlice();
- segmentInfo = new SegmentInfo(directoryOrig, Constants.LUCENE_MAIN_VERSION, segmentName, -1, false, codec, null);
+ segmentInfo = new SegmentInfo(directoryOrig, Version.LATEST, segmentName, -1, false, codec, null);
assert numDocsInRAM == 0;
if (INFO_VERBOSE && infoStream.isEnabled("DWPT")) {
infoStream.message("DWPT", Thread.currentThread().getName() + " init seg=" + segmentName + " delQueue=" + deleteQueue);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexUpgrader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexUpgrader.java?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexUpgrader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexUpgrader.java Sat Aug 16 05:36:35 2014
@@ -20,7 +20,6 @@ package org.apache.lucene.index;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
import org.apache.lucene.util.CommandLineUtil;
-import org.apache.lucene.util.Constants;
import org.apache.lucene.util.InfoStream;
import org.apache.lucene.util.PrintStreamInfoStream;
import org.apache.lucene.util.Version;
@@ -161,11 +160,11 @@ public final class IndexUpgrader {
try {
InfoStream infoStream = iwc.getInfoStream();
if (infoStream.isEnabled("IndexUpgrader")) {
- infoStream.message("IndexUpgrader", "Upgrading all pre-" + Constants.LUCENE_MAIN_VERSION + " segments of index directory '" + dir + "' to version " + Constants.LUCENE_MAIN_VERSION + "...");
+ infoStream.message("IndexUpgrader", "Upgrading all pre-" + Version.LATEST + " segments of index directory '" + dir + "' to version " + Version.LATEST + "...");
}
w.forceMerge(1);
if (infoStream.isEnabled("IndexUpgrader")) {
- infoStream.message("IndexUpgrader", "All segments upgraded to version " + Constants.LUCENE_MAIN_VERSION);
+ infoStream.message("IndexUpgrader", "All segments upgraded to version " + Version.LATEST);
}
} finally {
w.close();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java Sat Aug 16 05:36:35 2014
@@ -66,6 +66,7 @@ import org.apache.lucene.util.Constants;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.InfoStream;
import org.apache.lucene.util.ThreadInterruptedException;
+import org.apache.lucene.util.Version;
/**
An <code>IndexWriter</code> creates and maintains an index.
@@ -884,7 +885,7 @@ public class IndexWriter implements Clos
didMessageState = true;
infoStream.message("IW", "\ndir=" + directory + "\n" +
"index=" + segString() + "\n" +
- "version=" + Constants.LUCENE_VERSION + "\n" +
+ "version=" + Version.LATEST.toString() + "\n" +
config.toString());
}
}
@@ -2718,7 +2719,7 @@ public class IndexWriter implements Clos
// abortable so that IW.close(false) is able to stop it
TrackingDirectoryWrapper trackingDir = new TrackingDirectoryWrapper(directory);
- SegmentInfo info = new SegmentInfo(directory, Constants.LUCENE_MAIN_VERSION, mergedName, -1,
+ SegmentInfo info = new SegmentInfo(directory, Version.LATEST, mergedName, -1,
false, codec, null);
SegmentMerger merger = new SegmentMerger(mergeReaders, info, infoStream, trackingDir, config.getTermIndexInterval(),
@@ -4007,7 +4008,7 @@ public class IndexWriter implements Clos
// ConcurrentMergePolicy we keep deterministic segment
// names.
final String mergeSegmentName = newSegmentName();
- SegmentInfo si = new SegmentInfo(directory, Constants.LUCENE_MAIN_VERSION, mergeSegmentName, -1, false, codec, null);
+ SegmentInfo si = new SegmentInfo(directory, Version.LATEST, mergeSegmentName, -1, false, codec, null);
Map<String,String> details = new HashMap<>();
details.put("mergeMaxNumSegments", "" + merge.maxNumSegments);
details.put("mergeFactor", Integer.toString(merge.segments.size()));
@@ -4031,7 +4032,7 @@ public class IndexWriter implements Clos
private static void setDiagnostics(SegmentInfo info, String source, Map<String,String> details) {
Map<String,String> diagnostics = new HashMap<>();
diagnostics.put("source", source);
- diagnostics.put("lucene.version", Constants.LUCENE_VERSION);
+ diagnostics.put("lucene.version", Version.LATEST.toString());
diagnostics.put("os", Constants.OS_NAME);
diagnostics.put("os.arch", Constants.OS_ARCH);
diagnostics.put("os.version", Constants.OS_VERSION);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java Sat Aug 16 05:36:35 2014
@@ -29,6 +29,7 @@ import org.apache.lucene.codecs.Codec;
import org.apache.lucene.codecs.lucene3x.Lucene3xSegmentInfoFormat;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.TrackingDirectoryWrapper;
+import org.apache.lucene.util.Version;
/**
* Information about a segment such as it's name, directory, and files related
@@ -68,9 +69,9 @@ public final class SegmentInfo {
// Tracks the Lucene version this segment was created with, since 3.1. Null
// indicates an older than 3.0 index, and it's used to detect a too old index.
// The format expected is "x.y" - "2.x" for pre-3.0 indexes (or null), and
- // specific versions afterwards ("3.0", "3.1" etc.).
- // see Constants.LUCENE_MAIN_VERSION.
- private String version;
+ // specific versions afterwards ("3.0.0", "3.1.0" etc.).
+ // see o.a.l.util.Version.
+ private Version version;
void setDiagnostics(Map<String, String> diagnostics) {
this.diagnostics = diagnostics;
@@ -87,17 +88,35 @@ public final class SegmentInfo {
* <p>Note: this is public only to allow access from
* the codecs package.</p>
*/
- public SegmentInfo(Directory dir, String version, String name, int docCount,
+ public SegmentInfo(Directory dir, Version version, String name, int docCount,
boolean isCompoundFile, Codec codec, Map<String,String> diagnostics) {
this(dir, version, name, docCount, isCompoundFile, codec, diagnostics, null);
}
/**
+ * @deprecated Use {@link #SegmentInfo(Directory, Version, String, int, boolean, Codec, Map)}
+ */
+ @Deprecated
+ public SegmentInfo(Directory dir, String version, String name, int docCount,
+ boolean isCompoundFile, Codec codec, Map<String,String> diagnostics) {
+ this(dir, Version.parse(version), name, docCount, isCompoundFile, codec, diagnostics, null);
+ }
+
+ /**
+ * @deprecated Use {@link #SegmentInfo(Directory, Version, String, int, boolean, Codec, Map, Map)}
+ */
+ @Deprecated
+ public SegmentInfo(Directory dir, String version, String name, int docCount,
+ boolean isCompoundFile, Codec codec, Map<String,String> diagnostics, Map<String,String> attributes) {
+ this(dir, Version.parse(version), name, docCount, isCompoundFile, codec, diagnostics, attributes);
+ }
+
+ /**
* Construct a new complete SegmentInfo instance from input.
* <p>Note: this is public only to allow access from
* the codecs package.</p>
*/
- public SegmentInfo(Directory dir, String version, String name, int docCount,
+ public SegmentInfo(Directory dir, Version version, String name, int docCount,
boolean isCompoundFile, Codec codec, Map<String,String> diagnostics, Map<String,String> attributes) {
assert !(dir instanceof TrackingDirectoryWrapper);
this.dir = dir;
@@ -239,12 +258,12 @@ public final class SegmentInfo {
*
* @lucene.internal
*/
- public void setVersion(String version) {
+ public void setVersion(Version version) {
this.version = version;
}
/** Returns the version of the code which wrote the segment. */
- public String getVersion() {
+ public Version getVersion() {
return version;
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java Sat Aug 16 05:36:35 2014
@@ -48,6 +48,7 @@ import org.apache.lucene.store.IndexOutp
import org.apache.lucene.store.NoSuchDirectoryException;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.StringHelper;
+import org.apache.lucene.util.Version;
/**
* A collection of segmentInfo objects with methods for operating on those
@@ -512,8 +513,8 @@ public final class SegmentInfos implemen
// If this segment is pre-4.x, perform a one-time
// "ugprade" to write the .si file for it:
- String version = si.getVersion();
- if (version == null || StringHelper.getVersionComparator().compare(version, "4.0") < 0) {
+ Version version = si.getVersion();
+ if (version == null || version.onOrAfter(Version.LUCENE_4_0_0) == false) {
if (!segmentWasUpgraded(directory, si)) {
@@ -609,7 +610,7 @@ public final class SegmentInfos implemen
CodecUtil.writeHeader(output, Lucene3xSegmentInfoFormat.UPGRADED_SI_CODEC_NAME,
Lucene3xSegmentInfoFormat.UPGRADED_SI_VERSION_CURRENT);
// Write the Lucene version that created this segment, since 3.1
- output.writeString(si.getVersion());
+ output.writeString(si.getVersion().toString());
output.writeInt(si.getDocCount());
output.writeStringStringMap(si.attributes());
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java Sat Aug 16 05:36:35 2014
@@ -201,8 +201,8 @@ public final class SegmentReader extends
return;
}
- String ver = si.info.getVersion();
- if (ver != null && StringHelper.getVersionComparator().compare(ver, "4.9.0") >= 0) {
+ 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;
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/UpgradeIndexMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/UpgradeIndexMergePolicy.java?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/UpgradeIndexMergePolicy.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/UpgradeIndexMergePolicy.java Sat Aug 16 05:36:35 2014
@@ -17,7 +17,7 @@ package org.apache.lucene.index;
* limitations under the License.
*/
-import org.apache.lucene.util.Constants;
+import org.apache.lucene.util.Version;
import java.io.IOException;
import java.util.ArrayList;
@@ -60,12 +60,12 @@ public class UpgradeIndexMergePolicy ext
}
/** Returns if the given segment should be upgraded. The default implementation
- * will return {@code !Constants.LUCENE_MAIN_VERSION.equals(si.getVersion())},
+ * will return {@code !Version.LATEST.equals(si.getVersion())},
* so all segments created with a different version number than this Lucene version will
* get upgraded.
*/
protected boolean shouldUpgradeSegment(SegmentCommitInfo si) {
- return !Constants.LUCENE_MAIN_VERSION.equals(si.info.getVersion());
+ return !Version.LATEST.equals(si.info.getVersion());
}
@Override
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java Sat Aug 16 05:36:35 2014
@@ -52,7 +52,7 @@ import org.apache.lucene.util.IOUtils;
* <pre class="prettyprint">
* Directory fsDir = FSDirectory.open(new File("/path/to/index"));
* NRTCachingDirectory cachedFSDir = new NRTCachingDirectory(fsDir, 5.0, 60.0);
- * IndexWriterConfig conf = new IndexWriterConfig(Version.LUCENE_4_10, analyzer);
+ * IndexWriterConfig conf = new IndexWriterConfig(Version.LUCENE_4_10_0, analyzer);
* IndexWriter writer = new IndexWriter(cachedFSDir, conf);
* </pre>
*
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/Constants.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/Constants.java?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/Constants.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/Constants.java Sat Aug 16 05:36:35 2014
@@ -19,7 +19,6 @@ package org.apache.lucene.util;
import java.lang.reflect.Field;
import java.util.StringTokenizer;
-import org.apache.lucene.LucenePackage;
/**
@@ -107,45 +106,18 @@ public final class Constants {
public static final boolean JRE_IS_MINIMUM_JAVA7 =
new Boolean(true).booleanValue(); // prevent inlining in foreign class files
- // this method prevents inlining the final version constant in compiled classes,
- // see: http://www.javaworld.com/community/node/3400
- private static String ident(final String s) {
- return s.toString();
- }
-
- // We should never change index format with minor versions, so it should always be x.y or x.y.0.z for alpha/beta versions!
/**
- * This is the internal Lucene version, recorded into each segment.
- * NOTE: we track per-segment version as a String with the {@code "X.Y"} format
- * (no minor version), e.g. {@code "4.0", "3.1", "3.0"}.
- * <p>Alpha and Beta versions will have numbers like {@code "X.Y.0.Z"},
- * anything else is not allowed. This is done to prevent people from
- * using indexes created with ALPHA/BETA versions with the released version.
+ * This is the internal Lucene version, including bugfix versions, recorded into each segment.
+ * @deprecated Use {@link Version#LATEST}
*/
- public static final String LUCENE_MAIN_VERSION = ident("4.10");
+ @Deprecated
+ public static final String LUCENE_MAIN_VERSION = Version.LATEST.toString();
/**
- * This is the Lucene version for display purposes.
+ * Don't use this constant because the name is not self-describing!
+ * @deprecated Use {@link Version#LATEST}
*/
- public static final String LUCENE_VERSION;
- static {
- Package pkg = LucenePackage.get();
- String v = (pkg == null) ? null : pkg.getImplementationVersion();
- if (v == null) {
- v = mainVersionWithoutAlphaBeta() + "-SNAPSHOT";
- }
- LUCENE_VERSION = ident(v);
- }
+ @Deprecated
+ public static final String LUCENE_VERSION = Version.LATEST.toString();
- /**
- * Returns a LUCENE_MAIN_VERSION without any ALPHA/BETA qualifier
- * Used by test only!
- */
- static String mainVersionWithoutAlphaBeta() {
- final String parts[] = LUCENE_MAIN_VERSION.split("\\.");
- if (parts.length == 4 && "0".equals(parts[2])) {
- return parts[0] + "." + parts[1];
- }
- return LUCENE_MAIN_VERSION;
- }
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/StringHelper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/StringHelper.java?rev=1618309&r1=1618308&r2=1618309&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/StringHelper.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/StringHelper.java Sat Aug 16 05:36:35 2014
@@ -66,45 +66,6 @@ public abstract class StringHelper {
private StringHelper() {
}
-
- /**
- * @return a Comparator over versioned strings such as X.YY.Z
- * @lucene.internal
- */
- public static Comparator<String> getVersionComparator() {
- return versionComparator;
- }
-
- private static Comparator<String> versionComparator = new Comparator<String>() {
- @Override
- public int compare(String a, String b) {
- StringTokenizer aTokens = new StringTokenizer(a, ".");
- StringTokenizer bTokens = new StringTokenizer(b, ".");
-
- while (aTokens.hasMoreTokens()) {
- int aToken = Integer.parseInt(aTokens.nextToken());
- if (bTokens.hasMoreTokens()) {
- int bToken = Integer.parseInt(bTokens.nextToken());
- if (aToken != bToken) {
- return aToken < bToken ? -1 : 1;
- }
- } else {
- // a has some extra trailing tokens. if these are all zeroes, thats ok.
- if (aToken != 0) {
- return 1;
- }
- }
- }
-
- // b has some extra trailing tokens. if these are all zeroes, thats ok.
- while (bTokens.hasMoreTokens()) {
- if (Integer.parseInt(bTokens.nextToken()) != 0)
- return -1;
- }
-
- return 0;
- }
- };
public static boolean equals(String s1, String s2) {
if (s1 == null) {