From 917aa112444239852c4c7b43168b90b4dc68fa25 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Mon, 3 Oct 2016 09:21:11 -0700 Subject: [PATCH] Build: Add 5.0.0-rc1 version This change also fixes the version name for beta1, as it was never updated from alpha6 in master. --- core/src/main/java/org/elasticsearch/Version.java | 12 ++++++++---- .../cluster/metadata/IndexTemplateMetaData.java | 4 ++-- .../index/analysis/AnalysisRegistry.java | 3 +-- .../elasticsearch/index/engine/InternalEngine.java | 2 +- .../org/elasticsearch/index/mapper/FieldMapper.java | 2 +- .../index/mapper/LatLonPointFieldMapper.java | 3 +-- .../org/elasticsearch/index/mapper/ObjectMapper.java | 2 +- .../index/query/GeoBoundingBoxQueryBuilderTests.java | 4 ++-- .../indices/analysis/AnalysisModuleTests.java | 2 +- 9 files changed, 18 insertions(+), 16 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/Version.java b/core/src/main/java/org/elasticsearch/Version.java index 83f706664a576..3de373ec18eef 100644 --- a/core/src/main/java/org/elasticsearch/Version.java +++ b/core/src/main/java/org/elasticsearch/Version.java @@ -85,8 +85,10 @@ public class Version { public static final Version V_5_0_0_alpha4 = new Version(V_5_0_0_alpha4_ID, org.apache.lucene.util.Version.LUCENE_6_1_0); public static final int V_5_0_0_alpha5_ID = 5000005; public static final Version V_5_0_0_alpha5 = new Version(V_5_0_0_alpha5_ID, org.apache.lucene.util.Version.LUCENE_6_1_0); - public static final int V_5_0_0_alpha6_ID = 5000006; - public static final Version V_5_0_0_alpha6 = new Version(V_5_0_0_alpha6_ID, org.apache.lucene.util.Version.LUCENE_6_2_0); + public static final int V_5_0_0_beta1_ID = 5000026; + public static final Version V_5_0_0_beta1 = new Version(V_5_0_0_beta1_ID, org.apache.lucene.util.Version.LUCENE_6_2_0); + public static final int V_5_0_0_rc1_ID = 5000051; + public static final Version V_5_0_0_rc1 = new Version(V_5_0_0_rc1_ID, org.apache.lucene.util.Version.LUCENE_6_2_0); public static final int V_6_0_0_alpha1_ID = 6000001; public static final Version V_6_0_0_alpha1 = new Version(V_6_0_0_alpha1_ID, org.apache.lucene.util.Version.LUCENE_6_2_0); public static final Version CURRENT = V_6_0_0_alpha1; @@ -104,8 +106,10 @@ public static Version fromId(int id) { switch (id) { case V_6_0_0_alpha1_ID: return V_6_0_0_alpha1; - case V_5_0_0_alpha6_ID: - return V_5_0_0_alpha6; + case V_5_0_0_rc1_ID: + return V_5_0_0_rc1; + case V_5_0_0_beta1_ID: + return V_5_0_0_beta1; case V_5_0_0_alpha5_ID: return V_5_0_0_alpha5; case V_5_0_0_alpha4_ID: diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaData.java b/core/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaData.java index 5bf08dbce90b8..c11389d2dc2ce 100644 --- a/core/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaData.java +++ b/core/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaData.java @@ -222,7 +222,7 @@ public IndexTemplateMetaData readFrom(StreamInput in) throws IOException { IndexMetaData.Custom customIndexMetaData = IndexMetaData.lookupPrototypeSafe(type).readFrom(in); builder.putCustom(type, customIndexMetaData); } - if (in.getVersion().onOrAfter(Version.V_5_0_0_alpha6)) { + if (in.getVersion().onOrAfter(Version.V_5_0_0_beta1)) { builder.version(in.readOptionalVInt()); } return builder.build(); @@ -248,7 +248,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeString(cursor.key); cursor.value.writeTo(out); } - if (out.getVersion().onOrAfter(Version.V_5_0_0_alpha6)) { + if (out.getVersion().onOrAfter(Version.V_5_0_0_beta1)) { out.writeOptionalVInt(version); } } diff --git a/core/src/main/java/org/elasticsearch/index/analysis/AnalysisRegistry.java b/core/src/main/java/org/elasticsearch/index/analysis/AnalysisRegistry.java index 1d2098d4390bf..6dddf6eb57f7b 100644 --- a/core/src/main/java/org/elasticsearch/index/analysis/AnalysisRegistry.java +++ b/core/src/main/java/org/elasticsearch/index/analysis/AnalysisRegistry.java @@ -30,7 +30,6 @@ import org.elasticsearch.common.util.set.Sets; import org.elasticsearch.env.Environment; import org.elasticsearch.index.Index; -import org.elasticsearch.index.IndexService; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.mapper.TextFieldMapper; import org.elasticsearch.indices.analysis.AnalysisModule; @@ -533,7 +532,7 @@ private void processAnalyzerFactory(DeprecationLogger deprecationLogger, // TODO: remove alias support completely when we no longer support pre 5.0 indices final String analyzerAliasKey = "index.analysis.analyzer." + analyzerFactory.name() + ".alias"; if (indexSettings.getSettings().get(analyzerAliasKey) != null) { - if (indexSettings.getIndexVersionCreated().onOrAfter(Version.V_5_0_0_alpha6)) { + if (indexSettings.getIndexVersionCreated().onOrAfter(Version.V_5_0_0_beta1)) { // do not allow alias creation if the index was created on or after v5.0 alpha6 throw new IllegalArgumentException("setting [" + analyzerAliasKey + "] is not supported"); } diff --git a/core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java b/core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java index 850299a318ec5..6336318d1e2d7 100644 --- a/core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java +++ b/core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java @@ -124,7 +124,7 @@ public class InternalEngine extends Engine { public InternalEngine(EngineConfig engineConfig) throws EngineException { super(engineConfig); openMode = engineConfig.getOpenMode(); - if (engineConfig.getIndexSettings().getIndexVersionCreated().before(Version.V_5_0_0_alpha6)) { + if (engineConfig.getIndexSettings().getIndexVersionCreated().before(Version.V_5_0_0_beta1)) { // no optimization for pre 5.0.0.alpha6 since translog might not have all information needed maxUnsafeAutoIdTimestamp.set(Long.MAX_VALUE); } else { diff --git a/core/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java index 4773d5da46847..9128002eb5ac0 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java @@ -246,7 +246,7 @@ protected FieldMapper(String simpleName, MappedFieldType fieldType, MappedFieldT super(simpleName); assert indexSettings != null; this.indexCreatedVersion = Version.indexCreated(indexSettings); - if (indexCreatedVersion.onOrAfter(Version.V_5_0_0_alpha6)) { + if (indexCreatedVersion.onOrAfter(Version.V_5_0_0_beta1)) { if (simpleName.isEmpty()) { throw new IllegalArgumentException("name cannot be empty string"); } diff --git a/core/src/main/java/org/elasticsearch/index/mapper/LatLonPointFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/LatLonPointFieldMapper.java index 9ec5970237ae8..647dd315a203c 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/LatLonPointFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/LatLonPointFieldMapper.java @@ -34,7 +34,6 @@ import org.elasticsearch.index.query.QueryShardException; import java.io.IOException; -import java.util.Iterator; import java.util.Map; /** @@ -44,7 +43,7 @@ */ public class LatLonPointFieldMapper extends BaseGeoPointFieldMapper { public static final String CONTENT_TYPE = "geo_point"; - public static final Version LAT_LON_FIELD_VERSION = Version.V_5_0_0_alpha6; + public static final Version LAT_LON_FIELD_VERSION = Version.V_5_0_0_beta1; public static class Defaults extends BaseGeoPointFieldMapper.Defaults { public static final LatLonPointFieldType FIELD_TYPE = new LatLonPointFieldType(); diff --git a/core/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java index e063629bd6107..e843e7170d8a3 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java @@ -325,7 +325,7 @@ protected static void parseProperties(ObjectMapper.Builder objBuilder, Map