honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump version to 6.0.0-beta1 

This commit does two things:
 - bumps the version from 6.0.0-alpha3 to 6.0.0-beta1
 - renames the 6.0.0-alpha3 version constant to 6.0.0-beta1

Relates #25621
This commit is contained in:
Jason Tedor 2017-07-09 18:12:50 -04:00 committed by GitHub
parent c75ddd2c85
commit c084542731
17 changed files with 55 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/version.properties
View File

@ -1,5 +1,5 @@
# When updating elasticsearch, please update 'rest' version in core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy # When updating elasticsearch, please update 'rest' version in core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy
elasticsearch = 6.0.0-alpha3 elasticsearch = 6.0.0-beta1
lucene = 7.0.0-snapshot-ad2cb77 lucene = 7.0.0-snapshot-ad2cb77
# optional dependencies # optional dependencies

12
core/src/main/java/org/elasticsearch/Version.java
View File

@ -94,10 +94,10 @@ public class Version implements Comparable<Version> {
public static final int V_6_0_0_alpha2_ID = 6000002; public static final int V_6_0_0_alpha2_ID = 6000002;
public static final Version V_6_0_0_alpha2 = public static final Version V_6_0_0_alpha2 =
new Version(V_6_0_0_alpha2_ID, org.apache.lucene.util.Version.LUCENE_7_0_0); new Version(V_6_0_0_alpha2_ID, org.apache.lucene.util.Version.LUCENE_7_0_0);
public static final int V_6_0_0_alpha3_ID = 6000003; public static final int V_6_0_0_beta1_ID = 6000026;
public static final Version V_6_0_0_alpha3 = public static final Version V_6_0_0_beta1 =
new Version(V_6_0_0_alpha3_ID, org.apache.lucene.util.Version.LUCENE_7_0_0); new Version(V_6_0_0_beta1_ID, org.apache.lucene.util.Version.LUCENE_7_0_0);
public static final Version CURRENT = V_6_0_0_alpha3; public static final Version CURRENT = V_6_0_0_beta1;
// unreleased versions must be added to the above list with the suffix _UNRELEASED (with the exception of CURRENT) // unreleased versions must be added to the above list with the suffix _UNRELEASED (with the exception of CURRENT)
@ -112,8 +112,8 @@ public class Version implements Comparable<Version> {
public static Version fromId(int id) { public static Version fromId(int id) {
switch (id) { switch (id) {
case V_6_0_0_alpha3_ID: case V_6_0_0_beta1_ID:
return V_6_0_0_alpha3; return V_6_0_0_beta1;
case V_6_0_0_alpha2_ID: case V_6_0_0_alpha2_ID:
return V_6_0_0_alpha2; return V_6_0_0_alpha2;
case V_6_0_0_alpha1_ID: case V_6_0_0_alpha1_ID:

4
core/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequest.java
View File

@ -240,7 +240,7 @@ public class AnalyzeRequest extends SingleShardRequest<AnalyzeRequest> {
field = in.readOptionalString(); field = in.readOptionalString();
explain = in.readBoolean(); explain = in.readBoolean();
attributes = in.readStringArray(); attributes = in.readStringArray();
if (in.getVersion().onOrAfter(Version.V_6_0_0_alpha3)) { if (in.getVersion().onOrAfter(Version.V_6_0_0_beta1)) {
normalizer = in.readOptionalString(); normalizer = in.readOptionalString();
} }
} }
@ -256,7 +256,7 @@ public class AnalyzeRequest extends SingleShardRequest<AnalyzeRequest> {
out.writeOptionalString(field); out.writeOptionalString(field);
out.writeBoolean(explain); out.writeBoolean(explain);
out.writeStringArray(attributes); out.writeStringArray(attributes);
if (out.getVersion().onOrAfter(Version.V_6_0_0_alpha3)) { if (out.getVersion().onOrAfter(Version.V_6_0_0_beta1)) {
out.writeOptionalString(normalizer); out.writeOptionalString(normalizer);
} }
} }

6
core/src/main/java/org/elasticsearch/index/analysis/SynonymTokenFilterFactory.java
View File

@ -34,10 +34,8 @@ import org.elasticsearch.env.Environment;
import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.IndexSettings;
import org.elasticsearch.indices.analysis.AnalysisModule; import org.elasticsearch.indices.analysis.AnalysisModule;
import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.io.Reader; import java.io.Reader;
import java.nio.file.Files;
import java.util.List; import java.util.List;
public class SynonymTokenFilterFactory extends AbstractTokenFilterFactory { public class SynonymTokenFilterFactory extends AbstractTokenFilterFactory {
@ -58,7 +56,7 @@ public class SynonymTokenFilterFactory extends AbstractTokenFilterFactory {
this.ignoreCase = this.ignoreCase =
settings.getAsBooleanLenientForPreEs6Indices(indexSettings.getIndexVersionCreated(), "ignore_case", false, deprecationLogger); settings.getAsBooleanLenientForPreEs6Indices(indexSettings.getIndexVersionCreated(), "ignore_case", false, deprecationLogger);
if (indexSettings.getIndexVersionCreated().onOrAfter(Version.V_6_0_0_alpha3) && settings.get("ignore_case") != null) { if (indexSettings.getIndexVersionCreated().onOrAfter(Version.V_6_0_0_beta1) && settings.get("ignore_case") != null) {
deprecationLogger.deprecated( deprecationLogger.deprecated(
"This tokenize synonyms with whatever tokenizer and token filters appear before it in the chain. " + "This tokenize synonyms with whatever tokenizer and token filters appear before it in the chain. " +
"If you need ignore case with this filter, you should set lowercase filter before this"); "If you need ignore case with this filter, you should set lowercase filter before this");
@ -68,7 +66,7 @@ public class SynonymTokenFilterFactory extends AbstractTokenFilterFactory {
settings.getAsBooleanLenientForPreEs6Indices(indexSettings.getIndexVersionCreated(), "expand", true, deprecationLogger); settings.getAsBooleanLenientForPreEs6Indices(indexSettings.getIndexVersionCreated(), "expand", true, deprecationLogger);
// for backward compatibility // for backward compatibility
if (indexSettings.getIndexVersionCreated().before(Version.V_6_0_0_alpha3)) { if (indexSettings.getIndexVersionCreated().before(Version.V_6_0_0_beta1)) {
String tokenizerName = settings.get("tokenizer", "whitespace"); String tokenizerName = settings.get("tokenizer", "whitespace");
AnalysisModule.AnalysisProvider<TokenizerFactory> tokenizerFactoryFactory = AnalysisModule.AnalysisProvider<TokenizerFactory> tokenizerFactoryFactory =
analysisRegistry.getTokenizerProvider(tokenizerName, indexSettings); analysisRegistry.getTokenizerProvider(tokenizerName, indexSettings);

6
core/src/main/java/org/elasticsearch/index/mapper/IdFieldMapper.java
View File

@ -131,7 +131,7 @@ public class IdFieldMapper extends MetadataFieldMapper {
if (indexOptions() != IndexOptions.NONE) { if (indexOptions() != IndexOptions.NONE) {
failIfNotIndexed(); failIfNotIndexed();
BytesRef[] bytesRefs = new BytesRef[values.size()]; BytesRef[] bytesRefs = new BytesRef[values.size()];
final boolean is5xIndex = context.indexVersionCreated().before(Version.V_6_0_0_alpha3); final boolean is5xIndex = context.indexVersionCreated().before(Version.V_6_0_0_beta1);
for (int i = 0; i < bytesRefs.length; i++) { for (int i = 0; i < bytesRefs.length; i++) {
BytesRef id; BytesRef id;
if (is5xIndex) { if (is5xIndex) {
@ -166,7 +166,7 @@ public class IdFieldMapper extends MetadataFieldMapper {
public IndexFieldData<?> build(IndexSettings indexSettings, MappedFieldType fieldType, IndexFieldDataCache cache, public IndexFieldData<?> build(IndexSettings indexSettings, MappedFieldType fieldType, IndexFieldDataCache cache,
CircuitBreakerService breakerService, MapperService mapperService) { CircuitBreakerService breakerService, MapperService mapperService) {
final IndexFieldData<?> fieldData = fieldDataBuilder.build(indexSettings, fieldType, cache, breakerService, mapperService); final IndexFieldData<?> fieldData = fieldDataBuilder.build(indexSettings, fieldType, cache, breakerService, mapperService);
if (indexSettings.getIndexVersionCreated().before(Version.V_6_0_0_alpha3)) { if (indexSettings.getIndexVersionCreated().before(Version.V_6_0_0_beta1)) {
// ids were indexed as utf-8 // ids were indexed as utf-8
return fieldData; return fieldData;
} }
@ -288,7 +288,7 @@ public class IdFieldMapper extends MetadataFieldMapper {
@Override @Override
protected void parseCreateField(ParseContext context, List<IndexableField> fields) throws IOException { protected void parseCreateField(ParseContext context, List<IndexableField> fields) throws IOException {
if (fieldType.indexOptions() != IndexOptions.NONE || fieldType.stored()) { if (fieldType.indexOptions() != IndexOptions.NONE || fieldType.stored()) {
if (context.mapperService().getIndexSettings().getIndexVersionCreated().onOrAfter(Version.V_6_0_0_alpha3)) { if (context.mapperService().getIndexSettings().getIndexVersionCreated().onOrAfter(Version.V_6_0_0_beta1)) {
BytesRef id = Uid.encodeId(context.sourceToParse().id()); BytesRef id = Uid.encodeId(context.sourceToParse().id());
fields.add(new Field(NAME, id, fieldType)); fields.add(new Field(NAME, id, fieldType));
} else { } else {

3
core/src/main/java/org/elasticsearch/index/mapper/MapperService.java
View File

@ -35,7 +35,6 @@ import org.elasticsearch.common.compress.CompressedXContent;
import org.elasticsearch.common.regex.Regex; import org.elasticsearch.common.regex.Regex;
import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.common.settings.Setting.Property; import org.elasticsearch.common.settings.Setting.Property;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParser;
@ -805,7 +804,7 @@ public class MapperService extends AbstractIndexComponent implements Closeable {
if (hasMapping(type) == false) { if (hasMapping(type) == false) {
return null; return null;
} }
if (indexSettings.getIndexVersionCreated().onOrAfter(Version.V_6_0_0_alpha3)) { if (indexSettings.getIndexVersionCreated().onOrAfter(Version.V_6_0_0_beta1)) {
assert indexSettings.isSingleType(); assert indexSettings.isSingleType();
return new Term(IdFieldMapper.NAME, Uid.encodeId(id)); return new Term(IdFieldMapper.NAME, Uid.encodeId(id));
} else if (indexSettings.isSingleType()) { } else if (indexSettings.isSingleType()) {

2
core/src/main/java/org/elasticsearch/index/mapper/UidFieldMapper.java
View File

@ -158,7 +158,7 @@ public class UidFieldMapper extends MetadataFieldMapper {
if (uidString.startsWith(expectedPrefix)) { if (uidString.startsWith(expectedPrefix)) {
String id = uidString.substring(expectedPrefix.length(), uidString.length()); String id = uidString.substring(expectedPrefix.length(), uidString.length());
BytesRef encodedId; BytesRef encodedId;
if (context.indexVersionCreated().onOrAfter(Version.V_6_0_0_alpha3)) { if (context.indexVersionCreated().onOrAfter(Version.V_6_0_0_beta1)) {
encodedId = Uid.encodeId(id); encodedId = Uid.encodeId(id);
} else { } else {
encodedId = new BytesRef(id); encodedId = new BytesRef(id);

4
core/src/main/java/org/elasticsearch/index/shard/IndexShard.java
View File

@ -679,7 +679,7 @@ public class IndexShard extends AbstractIndexShardComponent implements IndicesCl
doc.addDynamicMappingsUpdate(docMapper.getMapping()); doc.addDynamicMappingsUpdate(docMapper.getMapping());
} }
Term uid; Term uid;
if (indexCreatedVersion.onOrAfter(Version.V_6_0_0_alpha3)) { if (indexCreatedVersion.onOrAfter(Version.V_6_0_0_beta1)) {
uid = new Term(IdFieldMapper.NAME, Uid.encodeId(doc.id())); uid = new Term(IdFieldMapper.NAME, Uid.encodeId(doc.id()));
} else if (docMapper.getDocumentMapper().idFieldMapper().fieldType().indexOptions() != IndexOptions.NONE) { } else if (docMapper.getDocumentMapper().idFieldMapper().fieldType().indexOptions() != IndexOptions.NONE) {
uid = new Term(IdFieldMapper.NAME, doc.id()); uid = new Term(IdFieldMapper.NAME, doc.id());
@ -776,7 +776,7 @@ public class IndexShard extends AbstractIndexShardComponent implements IndicesCl
} }
private Term extractUidForDelete(String type, String id) { private Term extractUidForDelete(String type, String id) {
if (indexSettings.getIndexVersionCreated().onOrAfter(Version.V_6_0_0_alpha3)) { if (indexSettings.getIndexVersionCreated().onOrAfter(Version.V_6_0_0_beta1)) {
assert indexSettings.isSingleType(); assert indexSettings.isSingleType();
// This is only correct because we create types dynamically on delete operations // This is only correct because we create types dynamically on delete operations
// otherwise this could match the same _id from a different type // otherwise this could match the same _id from a different type

2
core/src/main/java/org/elasticsearch/index/translog/Translog.java
View File

@ -223,7 +223,7 @@ public class Translog extends AbstractIndexShardComponent implements IndexShardC
final long minGenerationToRecoverFrom; final long minGenerationToRecoverFrom;
if (checkpoint.minTranslogGeneration < 0) { if (checkpoint.minTranslogGeneration < 0) {
final Version indexVersionCreated = indexSettings().getIndexVersionCreated(); final Version indexVersionCreated = indexSettings().getIndexVersionCreated();
assert indexVersionCreated.before(Version.V_6_0_0_alpha3) : assert indexVersionCreated.before(Version.V_6_0_0_beta1) :
"no minTranslogGeneration in checkpoint, but index was created with version [" + indexVersionCreated + "]"; "no minTranslogGeneration in checkpoint, but index was created with version [" + indexVersionCreated + "]";
minGenerationToRecoverFrom = deletionPolicy.getMinTranslogGenerationForRecovery(); minGenerationToRecoverFrom = deletionPolicy.getMinTranslogGenerationForRecovery();
} else { } else {

4
core/src/main/java/org/elasticsearch/index/translog/TranslogStats.java
View File

@ -100,7 +100,7 @@ public class TranslogStats extends ToXContentToBytes implements Streamable {
public void readFrom(StreamInput in) throws IOException { public void readFrom(StreamInput in) throws IOException {
numberOfOperations = in.readVInt(); numberOfOperations = in.readVInt();
translogSizeInBytes = in.readVLong(); translogSizeInBytes = in.readVLong();
if (in.getVersion().onOrAfter(Version.V_6_0_0_alpha3)) { if (in.getVersion().onOrAfter(Version.V_6_0_0_beta1)) {
uncommittedOperations = in.readVInt(); uncommittedOperations = in.readVInt();
uncommittedSizeInBytes = in.readVLong(); uncommittedSizeInBytes = in.readVLong();
} else { } else {
@ -113,7 +113,7 @@ public class TranslogStats extends ToXContentToBytes implements Streamable {
public void writeTo(StreamOutput out) throws IOException { public void writeTo(StreamOutput out) throws IOException {
out.writeVInt(numberOfOperations); out.writeVInt(numberOfOperations);
out.writeVLong(translogSizeInBytes); out.writeVLong(translogSizeInBytes);
if (out.getVersion().onOrAfter(Version.V_6_0_0_alpha3)) { if (out.getVersion().onOrAfter(Version.V_6_0_0_beta1)) {
out.writeVInt(uncommittedOperations); out.writeVInt(uncommittedOperations);
out.writeVLong(uncommittedSizeInBytes); out.writeVLong(uncommittedSizeInBytes);
} }

4
core/src/main/java/org/elasticsearch/search/SearchHits.java
View File

@ -180,7 +180,7 @@ public final class SearchHits implements Streamable, ToXContent, Iterable<Search
@Override @Override
public void readFrom(StreamInput in) throws IOException { public void readFrom(StreamInput in) throws IOException {
final boolean hasTotalHits; final boolean hasTotalHits;
if (in.getVersion().onOrAfter(Version.V_6_0_0_alpha3)) { if (in.getVersion().onOrAfter(Version.V_6_0_0_beta1)) {
hasTotalHits = in.readBoolean(); hasTotalHits = in.readBoolean();
} else { } else {
hasTotalHits = true; hasTotalHits = true;
@ -205,7 +205,7 @@ public final class SearchHits implements Streamable, ToXContent, Iterable<Search
@Override @Override
public void writeTo(StreamOutput out) throws IOException { public void writeTo(StreamOutput out) throws IOException {
final boolean hasTotalHits; final boolean hasTotalHits;
if (out.getVersion().onOrAfter(Version.V_6_0_0_alpha3)) { if (out.getVersion().onOrAfter(Version.V_6_0_0_beta1)) {
hasTotalHits = totalHits >= 0; hasTotalHits = totalHits >= 0;
out.writeBoolean(hasTotalHits); out.writeBoolean(hasTotalHits);
} else { } else {

4
core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java
View File

@ -227,7 +227,7 @@ public final class SearchSourceBuilder extends ToXContentToBytes implements Writ
if (in.getVersion().onOrAfter(Version.V_5_3_0)) { if (in.getVersion().onOrAfter(Version.V_5_3_0)) {
collapse = in.readOptionalWriteable(CollapseBuilder::new); collapse = in.readOptionalWriteable(CollapseBuilder::new);
} }
if (in.getVersion().onOrAfter(Version.V_6_0_0_alpha3)) { if (in.getVersion().onOrAfter(Version.V_6_0_0_beta1)) {
trackTotalHits = in.readBoolean(); trackTotalHits = in.readBoolean();
} else { } else {
trackTotalHits = true; trackTotalHits = true;
@ -283,7 +283,7 @@ public final class SearchSourceBuilder extends ToXContentToBytes implements Writ
if (out.getVersion().onOrAfter(Version.V_5_3_0)) { if (out.getVersion().onOrAfter(Version.V_5_3_0)) {
out.writeOptionalWriteable(collapse); out.writeOptionalWriteable(collapse);
} }
if (out.getVersion().onOrAfter(Version.V_6_0_0_alpha3)) { if (out.getVersion().onOrAfter(Version.V_6_0_0_beta1)) {
out.writeBoolean(trackTotalHits); out.writeBoolean(trackTotalHits);
} }
} }

2
core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy
View File

@ -64,7 +64,7 @@ grant codeBase "${codebase.mocksocket-1.2.jar}" {
}; };
grant codeBase "${codebase.rest-6.0.0-alpha3-SNAPSHOT.jar}" { grant codeBase "${codebase.rest-6.0.0-beta1-SNAPSHOT.jar}" {
// rest makes socket connections for rest tests // rest makes socket connections for rest tests
permission java.net.SocketPermission "*", "connect"; permission java.net.SocketPermission "*", "connect";
}; };

32
core/src/test/java/org/elasticsearch/VersionTests.java
View File

@ -34,7 +34,7 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import static org.elasticsearch.Version.V_5_3_0; import static org.elasticsearch.Version.V_5_3_0;
import static org.elasticsearch.Version.V_6_0_0_alpha3; import static org.elasticsearch.Version.V_6_0_0_beta1;
import static org.elasticsearch.test.VersionUtils.randomVersion; import static org.elasticsearch.test.VersionUtils.randomVersion;
import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.containsString;
@ -46,30 +46,30 @@ import static org.hamcrest.Matchers.sameInstance;
public class VersionTests extends ESTestCase { public class VersionTests extends ESTestCase {
public void testVersionComparison() throws Exception { public void testVersionComparison() throws Exception {
assertThat(V_5_3_0.before(V_6_0_0_alpha3), is(true)); assertThat(V_5_3_0.before(V_6_0_0_beta1), is(true));
assertThat(V_5_3_0.before(V_5_3_0), is(false)); assertThat(V_5_3_0.before(V_5_3_0), is(false));
assertThat(V_6_0_0_alpha3.before(V_5_3_0), is(false)); assertThat(V_6_0_0_beta1.before(V_5_3_0), is(false));
assertThat(V_5_3_0.onOrBefore(V_6_0_0_alpha3), is(true)); assertThat(V_5_3_0.onOrBefore(V_6_0_0_beta1), is(true));
assertThat(V_5_3_0.onOrBefore(V_5_3_0), is(true)); assertThat(V_5_3_0.onOrBefore(V_5_3_0), is(true));
assertThat(V_6_0_0_alpha3.onOrBefore(V_5_3_0), is(false)); assertThat(V_6_0_0_beta1.onOrBefore(V_5_3_0), is(false));
assertThat(V_5_3_0.after(V_6_0_0_alpha3), is(false)); assertThat(V_5_3_0.after(V_6_0_0_beta1), is(false));
assertThat(V_5_3_0.after(V_5_3_0), is(false)); assertThat(V_5_3_0.after(V_5_3_0), is(false));
assertThat(V_6_0_0_alpha3.after(V_5_3_0), is(true)); assertThat(V_6_0_0_beta1.after(V_5_3_0), is(true));
assertThat(V_5_3_0.onOrAfter(V_6_0_0_alpha3), is(false)); assertThat(V_5_3_0.onOrAfter(V_6_0_0_beta1), is(false));
assertThat(V_5_3_0.onOrAfter(V_5_3_0), is(true)); assertThat(V_5_3_0.onOrAfter(V_5_3_0), is(true));
assertThat(V_6_0_0_alpha3.onOrAfter(V_5_3_0), is(true)); assertThat(V_6_0_0_beta1.onOrAfter(V_5_3_0), is(true));
assertTrue(Version.fromString("5.0.0-alpha2").onOrAfter(Version.fromString("5.0.0-alpha1"))); assertTrue(Version.fromString("5.0.0-alpha2").onOrAfter(Version.fromString("5.0.0-alpha1")));
assertTrue(Version.fromString("5.0.0").onOrAfter(Version.fromString("5.0.0-beta2"))); assertTrue(Version.fromString("5.0.0").onOrAfter(Version.fromString("5.0.0-beta2")));
assertTrue(Version.fromString("5.0.0-rc1").onOrAfter(Version.fromString("5.0.0-beta24"))); assertTrue(Version.fromString("5.0.0-rc1").onOrAfter(Version.fromString("5.0.0-beta24")));
assertTrue(Version.fromString("5.0.0-alpha24").before(Version.fromString("5.0.0-beta0"))); assertTrue(Version.fromString("5.0.0-alpha24").before(Version.fromString("5.0.0-beta0")));
assertThat(V_5_3_0, is(lessThan(V_6_0_0_alpha3))); assertThat(V_5_3_0, is(lessThan(V_6_0_0_beta1)));
assertThat(V_5_3_0.compareTo(V_5_3_0), is(0)); assertThat(V_5_3_0.compareTo(V_5_3_0), is(0));
assertThat(V_6_0_0_alpha3, is(greaterThan(V_5_3_0))); assertThat(V_6_0_0_beta1, is(greaterThan(V_5_3_0)));
} }
public void testMin() { public void testMin() {
@ -97,7 +97,7 @@ public class VersionTests extends ESTestCase {
} }
public void testMinimumIndexCompatibilityVersion() { public void testMinimumIndexCompatibilityVersion() {
assertEquals(Version.V_5_0_0, Version.V_6_0_0_alpha3.minimumIndexCompatibilityVersion()); assertEquals(Version.V_5_0_0, Version.V_6_0_0_beta1.minimumIndexCompatibilityVersion());
assertEquals(Version.fromId(2000099), Version.V_5_0_0.minimumIndexCompatibilityVersion()); assertEquals(Version.fromId(2000099), Version.V_5_0_0.minimumIndexCompatibilityVersion());
assertEquals(Version.fromId(2000099), assertEquals(Version.fromId(2000099),
Version.V_5_1_1.minimumIndexCompatibilityVersion()); Version.V_5_1_1.minimumIndexCompatibilityVersion());
@ -157,7 +157,7 @@ public class VersionTests extends ESTestCase {
public void testIndexCreatedVersion() { public void testIndexCreatedVersion() {
// an actual index has a IndexMetaData.SETTING_INDEX_UUID // an actual index has a IndexMetaData.SETTING_INDEX_UUID
final Version version = randomFrom(Version.V_5_0_0, Version.V_5_0_2, final Version version = randomFrom(Version.V_5_0_0, Version.V_5_0_2,
Version.V_5_2_0, Version.V_6_0_0_alpha3); Version.V_5_2_0, Version.V_6_0_0_beta1);
assertEquals(version, Version.indexCreated(Settings.builder().put(IndexMetaData.SETTING_INDEX_UUID, "foo").put(IndexMetaData.SETTING_VERSION_CREATED, version).build())); assertEquals(version, Version.indexCreated(Settings.builder().put(IndexMetaData.SETTING_INDEX_UUID, "foo").put(IndexMetaData.SETTING_VERSION_CREATED, version).build()));
} }
@ -171,10 +171,10 @@ public class VersionTests extends ESTestCase {
// from 6.0 on we are supporting the latest minor of the previous major... this might fail once we add a new version ie. 5.x is // from 6.0 on we are supporting the latest minor of the previous major... this might fail once we add a new version ie. 5.x is
// released since we need to bump the supported minor in Version#minimumCompatibilityVersion() // released since we need to bump the supported minor in Version#minimumCompatibilityVersion()
Version lastVersion = VersionUtils.getPreviousVersion(Version.V_6_0_0_alpha1); Version lastVersion = VersionUtils.getPreviousVersion(Version.V_6_0_0_alpha1);
assertEquals(lastVersion.major, Version.V_6_0_0_alpha3.minimumCompatibilityVersion().major); assertEquals(lastVersion.major, Version.V_6_0_0_beta1.minimumCompatibilityVersion().major);
assertEquals("did you miss to bump the minor in Version#minimumCompatibilityVersion()", assertEquals("did you miss to bump the minor in Version#minimumCompatibilityVersion()",
lastVersion.minor, Version.V_6_0_0_alpha3.minimumCompatibilityVersion().minor); lastVersion.minor, Version.V_6_0_0_beta1.minimumCompatibilityVersion().minor);
assertEquals(0, Version.V_6_0_0_alpha3.minimumCompatibilityVersion().revision); assertEquals(0, Version.V_6_0_0_beta1.minimumCompatibilityVersion().revision);
} }
public void testToString() { public void testToString() {

2
core/src/test/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequestTests.java
View File

@ -97,7 +97,7 @@ public class AnalyzeRequestTests extends ESTestCase {
// AnalyzeRequest serializedRequest = new AnalyzeRequest("foo"); // AnalyzeRequest serializedRequest = new AnalyzeRequest("foo");
// serializedRequest.text("text"); // serializedRequest.text("text");
// serializedRequest.normalizer("normalizer"); // serializedRequest.normalizer("normalizer");
// Using Version.V_6_0_0_alpha3 // Using Version.V_6_0_0_beta1
final byte[] data = Base64.getDecoder().decode("AAABA2ZvbwEEdGV4dAAAAAAAAAABCm5vcm1hbGl6ZXI="); final byte[] data = Base64.getDecoder().decode("AAABA2ZvbwEEdGV4dAAAAAAAAAABCm5vcm1hbGl6ZXI=");
final Version version = VersionUtils.randomVersionBetween(random(), Version.V_5_0_0, Version.V_5_4_0); final Version version = VersionUtils.randomVersionBetween(random(), Version.V_5_0_0, Version.V_5_4_0);
try (StreamInput in = StreamInput.wrap(data)) { try (StreamInput in = StreamInput.wrap(data)) {

4
modules/percolator/src/main/java/org/elasticsearch/percolator/PercolateQueryBuilder.java
View File

@ -200,7 +200,7 @@ public class PercolateQueryBuilder extends AbstractQueryBuilder<PercolateQueryBu
PercolateQueryBuilder(StreamInput in) throws IOException { PercolateQueryBuilder(StreamInput in) throws IOException {
super(in); super(in);
field = in.readString(); field = in.readString();
if (in.getVersion().before(Version.V_6_0_0_alpha3)) { if (in.getVersion().before(Version.V_6_0_0_beta1)) {
documentType = in.readString(); documentType = in.readString();
} else { } else {
documentType = in.readOptionalString(); documentType = in.readOptionalString();
@ -230,7 +230,7 @@ public class PercolateQueryBuilder extends AbstractQueryBuilder<PercolateQueryBu
@Override @Override
protected void doWriteTo(StreamOutput out) throws IOException { protected void doWriteTo(StreamOutput out) throws IOException {
out.writeString(field); out.writeString(field);
if (out.getVersion().before(Version.V_6_0_0_alpha3)) { if (out.getVersion().before(Version.V_6_0_0_beta1)) {
out.writeString(documentType); out.writeString(documentType);
} else { } else {
out.writeOptionalString(documentType); out.writeOptionalString(documentType);

20
test/framework/src/test/java/org/elasticsearch/test/VersionUtilsTests.java
View File

@ -53,14 +53,14 @@ public class VersionUtilsTests extends ESTestCase {
// sub range // sub range
got = VersionUtils.randomVersionBetween(random(), Version.V_5_0_0, got = VersionUtils.randomVersionBetween(random(), Version.V_5_0_0,
Version.V_6_0_0_alpha3); Version.V_6_0_0_beta1);
assertTrue(got.onOrAfter(Version.V_5_0_0)); assertTrue(got.onOrAfter(Version.V_5_0_0));
assertTrue(got.onOrBefore(Version.V_6_0_0_alpha3)); assertTrue(got.onOrBefore(Version.V_6_0_0_beta1));
// unbounded lower // unbounded lower
got = VersionUtils.randomVersionBetween(random(), null, Version.V_6_0_0_alpha3); got = VersionUtils.randomVersionBetween(random(), null, Version.V_6_0_0_beta1);
assertTrue(got.onOrAfter(VersionUtils.getFirstVersion())); assertTrue(got.onOrAfter(VersionUtils.getFirstVersion()));
assertTrue(got.onOrBefore(Version.V_6_0_0_alpha3)); assertTrue(got.onOrBefore(Version.V_6_0_0_beta1));
got = VersionUtils.randomVersionBetween(random(), null, VersionUtils.allReleasedVersions().get(0)); got = VersionUtils.randomVersionBetween(random(), null, VersionUtils.allReleasedVersions().get(0));
assertTrue(got.onOrAfter(VersionUtils.getFirstVersion())); assertTrue(got.onOrAfter(VersionUtils.getFirstVersion()));
assertTrue(got.onOrBefore(VersionUtils.allReleasedVersions().get(0))); assertTrue(got.onOrBefore(VersionUtils.allReleasedVersions().get(0)));
@ -78,9 +78,9 @@ public class VersionUtilsTests extends ESTestCase {
assertEquals(got, VersionUtils.getFirstVersion()); assertEquals(got, VersionUtils.getFirstVersion());
got = VersionUtils.randomVersionBetween(random(), Version.CURRENT, Version.CURRENT); got = VersionUtils.randomVersionBetween(random(), Version.CURRENT, Version.CURRENT);
assertEquals(got, Version.CURRENT); assertEquals(got, Version.CURRENT);
got = VersionUtils.randomVersionBetween(random(), Version.V_6_0_0_alpha3, got = VersionUtils.randomVersionBetween(random(), Version.V_6_0_0_beta1,
Version.V_6_0_0_alpha3); Version.V_6_0_0_beta1);
assertEquals(got, Version.V_6_0_0_alpha3); assertEquals(got, Version.V_6_0_0_beta1);
// implicit range of one // implicit range of one
got = VersionUtils.randomVersionBetween(random(), null, VersionUtils.getFirstVersion()); got = VersionUtils.randomVersionBetween(random(), null, VersionUtils.getFirstVersion());
@ -153,8 +153,8 @@ public class VersionUtilsTests extends ESTestCase {
public static final Version V_5_4_0 = Version.fromString("5.4.0"); public static final Version V_5_4_0 = Version.fromString("5.4.0");
public static final Version V_6_0_0_alpha1 = Version.fromString("6.0.0-alpha1"); public static final Version V_6_0_0_alpha1 = Version.fromString("6.0.0-alpha1");
public static final Version V_6_0_0_alpha2 = Version.fromString("6.0.0-alpha2"); public static final Version V_6_0_0_alpha2 = Version.fromString("6.0.0-alpha2");
public static final Version V_6_0_0_alpha3 = Version.fromString("6.0.0-alpha3"); public static final Version V_6_0_0_beta1 = Version.fromString("6.0.0-beta1");
public static final Version CURRENT = V_6_0_0_alpha3; public static final Version CURRENT = V_6_0_0_beta1;
} }
public void testResolveReleasedVersionsForUnstableBranch() { public void testResolveReleasedVersionsForUnstableBranch() {
@ -164,7 +164,7 @@ public class VersionUtilsTests extends ESTestCase {
List<Version> unreleased = t.v2(); List<Version> unreleased = t.v2();
assertEquals(Arrays.asList(TestUnstableBranch.V_5_3_0, TestUnstableBranch.V_5_3_1, assertEquals(Arrays.asList(TestUnstableBranch.V_5_3_0, TestUnstableBranch.V_5_3_1,
TestUnstableBranch.V_6_0_0_alpha1, TestUnstableBranch.V_6_0_0_alpha2), released); TestUnstableBranch.V_6_0_0_alpha1, TestUnstableBranch.V_6_0_0_alpha2), released);
assertEquals(Arrays.asList(TestUnstableBranch.V_5_3_2, TestUnstableBranch.V_5_4_0, TestUnstableBranch.V_6_0_0_alpha3), unreleased); assertEquals(Arrays.asList(TestUnstableBranch.V_5_3_2, TestUnstableBranch.V_5_4_0, TestUnstableBranch.V_6_0_0_beta1), unreleased);
} }
/** /**