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

Remove build qualifier from server's Version (#35172) 

With this change, `Version` no longer carries information about the qualifier,
we still need a way to show the "display version" that does have both
qualifier and snapshot. This is now stored  by the build and red from `META-INF`.
This commit is contained in:
Alpar Torok 2018-11-07 14:01:05 +02:00 committed by GitHub
parent a467a816bc
commit 8a85b2eada
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
95 changed files with 371 additions and 304 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy
View File

@ -699,7 +699,7 @@ class BuildPlugin implements Plugin<Project> {
// this doFirst is added before the info plugin, therefore it will run // this doFirst is added before the info plugin, therefore it will run
// after the doFirst added by the info plugin, and we can override attributes // after the doFirst added by the info plugin, and we can override attributes
jarTask.manifest.attributes( jarTask.manifest.attributes(
'X-Compile-Elasticsearch-Version': VersionProperties.elasticsearch.replace("-SNAPSHOT", ""), 'X-Compile-Elasticsearch-Version': VersionProperties.elasticsearch,
'X-Compile-Lucene-Version': VersionProperties.lucene, 'X-Compile-Lucene-Version': VersionProperties.lucene,
'X-Compile-Elasticsearch-Snapshot': VersionProperties.isElasticsearchSnapshot(), 'X-Compile-Elasticsearch-Snapshot': VersionProperties.isElasticsearchSnapshot(),
'Build-Date': ZonedDateTime.now(ZoneOffset.UTC), 'Build-Date': ZonedDateTime.now(ZoneOffset.UTC),

13
buildSrc/src/main/groovy/org/elasticsearch/gradle/doc/DocsTestPlugin.groovy
View File

@ -18,6 +18,7 @@
*/ */
package org.elasticsearch.gradle.doc package org.elasticsearch.gradle.doc
import org.elasticsearch.gradle.Version
import org.elasticsearch.gradle.VersionProperties import org.elasticsearch.gradle.VersionProperties
import org.elasticsearch.gradle.test.RestTestPlugin import org.elasticsearch.gradle.test.RestTestPlugin
import org.gradle.api.Project import org.gradle.api.Project
@ -37,12 +38,12 @@ public class DocsTestPlugin extends RestTestPlugin {
// Docs are published separately so no need to assemble // Docs are published separately so no need to assemble
project.tasks.assemble.enabled = false project.tasks.assemble.enabled = false
Map<String, String> defaultSubstitutions = [ Map<String, String> defaultSubstitutions = [
/* These match up with the asciidoc syntax for substitutions but /* These match up with the asciidoc syntax for substitutions but
* the values may differ. In particular {version} needs to resolve * the values may differ. In particular {version} needs to resolve
* to the version being built for testing but needs to resolve to * to the version being built for testing but needs to resolve to
* the last released version for docs. */ * the last released version for docs. */
'\\{version\\}': '\\{version\\}': Version.fromString(VersionProperties.elasticsearch).toString(),
VersionProperties.elasticsearch.replace('-SNAPSHOT', ''), '\\{qualified_version\\}': VersionProperties.elasticsearch,
'\\{lucene_version\\}' : VersionProperties.lucene.replaceAll('-snapshot-\\w+$', ''), '\\{lucene_version\\}' : VersionProperties.lucene.replaceAll('-snapshot-\\w+$', ''),
'\\{build_flavor\\}' : '\\{build_flavor\\}' :
project.integTestCluster.distribution.startsWith('oss-') ? 'oss' : 'default', project.integTestCluster.distribution.startsWith('oss-') ? 'oss' : 'default',

11
buildSrc/src/main/groovy/org/elasticsearch/gradle/plugin/PluginPropertiesTask.groovy
View File

@ -18,6 +18,7 @@
*/ */
package org.elasticsearch.gradle.plugin package org.elasticsearch.gradle.plugin
import org.elasticsearch.gradle.Version
import org.elasticsearch.gradle.VersionProperties import org.elasticsearch.gradle.VersionProperties
import org.gradle.api.InvalidUserDataException import org.gradle.api.InvalidUserDataException
import org.gradle.api.Task import org.gradle.api.Task
@ -66,17 +67,11 @@ class PluginPropertiesTask extends Copy {
} }
Map<String, String> generateSubstitutions() { Map<String, String> generateSubstitutions() {
def stringSnap = { version ->
if (version.endsWith("-SNAPSHOT")) {
return version.substring(0, version.length() - 9)
}
return version
}
return [ return [
'name': extension.name, 'name': extension.name,
'description': extension.description, 'description': extension.description,
'version': stringSnap(extension.version), 'version': extension.version,
'elasticsearchVersion': stringSnap(VersionProperties.elasticsearch), 'elasticsearchVersion': Version.fromString(VersionProperties.elasticsearch).toString(),
'javaVersion': project.targetCompatibility as String, 'javaVersion': project.targetCompatibility as String,
'classname': extension.classname, 'classname': extension.classname,
'extendedPlugins': extension.extendedPlugins.join(','), 'extendedPlugins': extension.extendedPlugins.join(','),

6
buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy
View File

@ -278,9 +278,13 @@ class VagrantTestPlugin implements Plugin<Project> {
} }
Task createUpgradeFromFile = project.tasks.create('createUpgradeFromFile', FileContentsTask) { Task createUpgradeFromFile = project.tasks.create('createUpgradeFromFile', FileContentsTask) {
String version = project.extensions.esvagrant.upgradeFromVersion
if (project.bwcVersions.unreleased.contains(project.extensions.esvagrant.upgradeFromVersion)) {
version += "-SNAPSHOT"
}
dependsOn copyPackagingArchives dependsOn copyPackagingArchives
file "${archivesDir}/upgrade_from_version" file "${archivesDir}/upgrade_from_version"
contents project.extensions.esvagrant.upgradeFromVersion.toString() contents version
} }
Task createUpgradeIsOssFile = project.tasks.create('createUpgradeIsOssFile', FileContentsTask) { Task createUpgradeIsOssFile = project.tasks.create('createUpgradeIsOssFile', FileContentsTask) {

3
client/rest-high-level/src/test/java/org/elasticsearch/client/PingAndInfoIT.java
View File

@ -84,8 +84,7 @@ public class PingAndInfoIT extends ESRestHighLevelClientTestCase {
assertNotNull(ml.description()); assertNotNull(ml.description());
assertTrue(ml.available()); assertTrue(ml.available());
assertTrue(ml.enabled()); assertTrue(ml.enabled());
assertEquals(mainResponse.getVersion().toString(), assertEquals(mainResponse.getBuild().getQualifiedVersion(), ml.nativeCodeInfo().get("version").toString());
ml.nativeCodeInfo().get("version").toString().replace("-SNAPSHOT", ""));
} }
public void testXPackInfoEmptyRequest() throws IOException { public void testXPackInfoEmptyRequest() throws IOException {

4
distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java
View File

@ -310,11 +310,11 @@ class InstallPluginCommand extends EnvironmentAwareCommand {
baseUrl = String.format(Locale.ROOT, "https://artifacts.elastic.co/downloads/elasticsearch-plugins/%s", pluginId); baseUrl = String.format(Locale.ROOT, "https://artifacts.elastic.co/downloads/elasticsearch-plugins/%s", pluginId);
} }
final String platformUrl = final String platformUrl =
String.format(Locale.ROOT, "%s/%s-%s-%s.zip", baseUrl, pluginId, platform, Version.displayVersion(version, isSnapshot)); String.format(Locale.ROOT, "%s/%s-%s-%s.zip", baseUrl, pluginId, platform, Build.CURRENT.getQualifiedVersion());
if (urlExists(terminal, platformUrl)) { if (urlExists(terminal, platformUrl)) {
return platformUrl; return platformUrl;
} }
return String.format(Locale.ROOT, "%s/%s-%s.zip", baseUrl, pluginId, Version.displayVersion(version, isSnapshot)); return String.format(Locale.ROOT, "%s/%s-%s.zip", baseUrl, pluginId, Build.CURRENT.getQualifiedVersion());
} }
private String nonReleaseUrl(final String hostname, final Version version, final String stagingHash, final String pluginId) { private String nonReleaseUrl(final String hostname, final Version version, final String stagingHash, final String pluginId) {

46
distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java
View File

@ -936,7 +936,8 @@ public class InstallPluginCommandTests extends ESTestCase {
} }
public void testOfficialPlugin() throws Exception { public void testOfficialPlugin() throws Exception {
String url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-" + Version.CURRENT + ".zip"; String url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-" +
Build.CURRENT.getQualifiedVersion() + ".zip";
assertInstallPluginFromUrl("analysis-icu", "analysis-icu", url, null, false); assertInstallPluginFromUrl("analysis-icu", "analysis-icu", url, null, false);
} }
@ -945,7 +946,7 @@ public class InstallPluginCommandTests extends ESTestCase {
Locale.ROOT, Locale.ROOT,
"https://snapshots.elastic.co/%s-abc123/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-%s.zip", "https://snapshots.elastic.co/%s-abc123/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-%s.zip",
Version.CURRENT, Version.CURRENT,
Version.displayVersion(Version.CURRENT, true)); Build.CURRENT.getQualifiedVersion());
assertInstallPluginFromUrl("analysis-icu", "analysis-icu", url, "abc123", true); assertInstallPluginFromUrl("analysis-icu", "analysis-icu", url, "abc123", true);
} }
@ -954,7 +955,7 @@ public class InstallPluginCommandTests extends ESTestCase {
Locale.ROOT, Locale.ROOT,
"https://snapshots.elastic.co/%s-abc123/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-%s.zip", "https://snapshots.elastic.co/%s-abc123/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-%s.zip",
Version.CURRENT, Version.CURRENT,
Version.displayVersion(Version.CURRENT, true)); Build.CURRENT.getQualifiedVersion());
// attemping to install a release build of a plugin (no staging ID) on a snapshot build should throw a user exception // attemping to install a release build of a plugin (no staging ID) on a snapshot build should throw a user exception
final UserException e = final UserException e =
expectThrows(UserException.class, () -> assertInstallPluginFromUrl("analysis-icu", "analysis-icu", url, null, true)); expectThrows(UserException.class, () -> assertInstallPluginFromUrl("analysis-icu", "analysis-icu", url, null, true));
@ -965,13 +966,13 @@ public class InstallPluginCommandTests extends ESTestCase {
public void testOfficialPluginStaging() throws Exception { public void testOfficialPluginStaging() throws Exception {
String url = "https://staging.elastic.co/" + Version.CURRENT + "-abc123/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-" String url = "https://staging.elastic.co/" + Version.CURRENT + "-abc123/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-"
+ Version.CURRENT + ".zip"; + Build.CURRENT.getQualifiedVersion() + ".zip";
assertInstallPluginFromUrl("analysis-icu", "analysis-icu", url, "abc123", false); assertInstallPluginFromUrl("analysis-icu", "analysis-icu", url, "abc123", false);
} }
public void testOfficialPlatformPlugin() throws Exception { public void testOfficialPlatformPlugin() throws Exception {
String url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-" + Platforms.PLATFORM_NAME + String url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-" + Platforms.PLATFORM_NAME +
"-" + Version.CURRENT + ".zip"; "-" + Build.CURRENT.getQualifiedVersion() + ".zip";
assertInstallPluginFromUrl("analysis-icu", "analysis-icu", url, null, false); assertInstallPluginFromUrl("analysis-icu", "analysis-icu", url, null, false);
} }
@ -981,13 +982,13 @@ public class InstallPluginCommandTests extends ESTestCase {
"https://snapshots.elastic.co/%s-abc123/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-%s-%s.zip", "https://snapshots.elastic.co/%s-abc123/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-%s-%s.zip",
Version.CURRENT, Version.CURRENT,
Platforms.PLATFORM_NAME, Platforms.PLATFORM_NAME,
Version.displayVersion(Version.CURRENT, true)); Build.CURRENT.getQualifiedVersion());
assertInstallPluginFromUrl("analysis-icu", "analysis-icu", url, "abc123", true); assertInstallPluginFromUrl("analysis-icu", "analysis-icu", url, "abc123", true);
} }
public void testOfficialPlatformPluginStaging() throws Exception { public void testOfficialPlatformPluginStaging() throws Exception {
String url = "https://staging.elastic.co/" + Version.CURRENT + "-abc123/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-" String url = "https://staging.elastic.co/" + Version.CURRENT + "-abc123/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-"
+ Platforms.PLATFORM_NAME + "-"+ Version.CURRENT + ".zip"; + Platforms.PLATFORM_NAME + "-"+ Build.CURRENT.getQualifiedVersion() + ".zip";
assertInstallPluginFromUrl("analysis-icu", "analysis-icu", url, "abc123", false); assertInstallPluginFromUrl("analysis-icu", "analysis-icu", url, "abc123", false);
} }
@ -1009,10 +1010,13 @@ public class InstallPluginCommandTests extends ESTestCase {
} }
public void testOfficialShaMissing() throws Exception { public void testOfficialShaMissing() throws Exception {
String url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-" + Version.CURRENT + ".zip"; String url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-" +
Build.CURRENT.getQualifiedVersion() + ".zip";
MessageDigest digest = MessageDigest.getInstance("SHA-1"); MessageDigest digest = MessageDigest.getInstance("SHA-1");
UserException e = expectThrows(UserException.class, () -> UserException e = expectThrows(UserException.class, () ->
assertInstallPluginFromUrl("analysis-icu", "analysis-icu", url, null, false, ".sha1", checksum(digest), null, (b, p) -> null)); assertInstallPluginFromUrl("analysis-icu", "analysis-icu", url, null, false,
".sha1", checksum(digest), null, (b, p) -> null)
);
assertEquals(ExitCodes.IO_ERROR, e.exitCode); assertEquals(ExitCodes.IO_ERROR, e.exitCode);
assertEquals("Plugin checksum missing: " + url + ".sha512", e.getMessage()); assertEquals("Plugin checksum missing: " + url + ".sha512", e.getMessage());
} }
@ -1027,7 +1031,8 @@ public class InstallPluginCommandTests extends ESTestCase {
} }
public void testInvalidShaFileMissingFilename() throws Exception { public void testInvalidShaFileMissingFilename() throws Exception {
String url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-" + Version.CURRENT + ".zip"; String url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-" +
Build.CURRENT.getQualifiedVersion() + ".zip";
MessageDigest digest = MessageDigest.getInstance("SHA-512"); MessageDigest digest = MessageDigest.getInstance("SHA-512");
UserException e = expectThrows(UserException.class, UserException e = expectThrows(UserException.class,
() -> assertInstallPluginFromUrl( () -> assertInstallPluginFromUrl(
@ -1037,7 +1042,8 @@ public class InstallPluginCommandTests extends ESTestCase {
} }
public void testInvalidShaFileMismatchFilename() throws Exception { public void testInvalidShaFileMismatchFilename() throws Exception {
String url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-" + Version.CURRENT + ".zip"; String url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-" +
Build.CURRENT.getQualifiedVersion()+ ".zip";
MessageDigest digest = MessageDigest.getInstance("SHA-512"); MessageDigest digest = MessageDigest.getInstance("SHA-512");
UserException e = expectThrows(UserException.class, () -> UserException e = expectThrows(UserException.class, () ->
assertInstallPluginFromUrl( assertInstallPluginFromUrl(
@ -1047,7 +1053,7 @@ public class InstallPluginCommandTests extends ESTestCase {
null, null,
false, false,
".sha512", ".sha512",
checksumAndString(digest, " repository-s3-" + Version.CURRENT + ".zip"), checksumAndString(digest, " repository-s3-" + Build.CURRENT.getQualifiedVersion() + ".zip"),
null, null,
(b, p) -> null)); (b, p) -> null));
assertEquals(ExitCodes.IO_ERROR, e.exitCode); assertEquals(ExitCodes.IO_ERROR, e.exitCode);
@ -1055,7 +1061,8 @@ public class InstallPluginCommandTests extends ESTestCase {
} }
public void testInvalidShaFileContainingExtraLine() throws Exception { public void testInvalidShaFileContainingExtraLine() throws Exception {
String url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-" + Version.CURRENT + ".zip"; String url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-" +
Build.CURRENT.getQualifiedVersion() + ".zip";
MessageDigest digest = MessageDigest.getInstance("SHA-512"); MessageDigest digest = MessageDigest.getInstance("SHA-512");
UserException e = expectThrows(UserException.class, () -> UserException e = expectThrows(UserException.class, () ->
assertInstallPluginFromUrl( assertInstallPluginFromUrl(
@ -1065,7 +1072,7 @@ public class InstallPluginCommandTests extends ESTestCase {
null, null,
false, false,
".sha512", ".sha512",
checksumAndString(digest, " analysis-icu-" + Version.CURRENT + ".zip\nfoobar"), checksumAndString(digest, " analysis-icu-" + Build.CURRENT.getQualifiedVersion() + ".zip\nfoobar"),
null, null,
(b, p) -> null)); (b, p) -> null));
assertEquals(ExitCodes.IO_ERROR, e.exitCode); assertEquals(ExitCodes.IO_ERROR, e.exitCode);
@ -1073,7 +1080,8 @@ public class InstallPluginCommandTests extends ESTestCase {
} }
public void testSha512Mismatch() throws Exception { public void testSha512Mismatch() throws Exception {
String url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-" + Version.CURRENT + ".zip"; String url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-" +
Build.CURRENT.getQualifiedVersion() + ".zip";
UserException e = expectThrows(UserException.class, () -> UserException e = expectThrows(UserException.class, () ->
assertInstallPluginFromUrl( assertInstallPluginFromUrl(
"analysis-icu", "analysis-icu",
@ -1082,7 +1090,7 @@ public class InstallPluginCommandTests extends ESTestCase {
null, null,
false, false,
".sha512", ".sha512",
bytes -> "foobar analysis-icu-" + Version.CURRENT + ".zip", bytes -> "foobar analysis-icu-" + Build.CURRENT.getQualifiedVersion() + ".zip",
null, null,
(b, p) -> null)); (b, p) -> null));
assertEquals(ExitCodes.IO_ERROR, e.exitCode); assertEquals(ExitCodes.IO_ERROR, e.exitCode);
@ -1101,7 +1109,8 @@ public class InstallPluginCommandTests extends ESTestCase {
public void testPublicKeyIdMismatchToExpectedPublicKeyId() throws Exception { public void testPublicKeyIdMismatchToExpectedPublicKeyId() throws Exception {
final String icu = "analysis-icu"; final String icu = "analysis-icu";
final String url = final String url =
"https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/" + icu + "-" + Version.CURRENT + ".zip"; "https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/" + icu + "-" +
Build.CURRENT.getQualifiedVersion() + ".zip";
final MessageDigest digest = MessageDigest.getInstance("SHA-512"); final MessageDigest digest = MessageDigest.getInstance("SHA-512");
/* /*
* To setup a situation where the expected public key ID does not match the public key ID used for signing, we generate a new public * To setup a situation where the expected public key ID does not match the public key ID used for signing, we generate a new public
@ -1124,7 +1133,8 @@ public class InstallPluginCommandTests extends ESTestCase {
public void testFailedSignatureVerification() throws Exception { public void testFailedSignatureVerification() throws Exception {
final String icu = "analysis-icu"; final String icu = "analysis-icu";
final String url = final String url =
"https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/" + icu + "-" + Version.CURRENT + ".zip"; "https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/" + icu + "-" +
Build.CURRENT.getQualifiedVersion() + ".zip";
final MessageDigest digest = MessageDigest.getInstance("SHA-512"); final MessageDigest digest = MessageDigest.getInstance("SHA-512");
/* /*
* To setup a situation where signature verification fails, we will mutate the input byte array by modifying a single byte to some * To setup a situation where signature verification fails, we will mutate the input byte array by modifying a single byte to some

1
docs/plugins/discovery-azure-classic.asciidoc
View File

@ -377,6 +377,7 @@ This command should give you a JSON result:
"build_hash" : "f27399d", "build_hash" : "f27399d",
"build_date" : "2016-03-30T09:51:41.449Z", "build_date" : "2016-03-30T09:51:41.449Z",
"build_snapshot" : false, "build_snapshot" : false,
"build_version" : "{qualified_version}",
"lucene_version" : "{lucene_version}", "lucene_version" : "{lucene_version}",
"minimum_wire_compatibility_version" : "1.2.3", "minimum_wire_compatibility_version" : "1.2.3",
"minimum_index_compatibility_version" : "1.2.3" "minimum_index_compatibility_version" : "1.2.3"

36
docs/reference/cat/plugins.asciidoc
View File

@ -14,24 +14,24 @@ Might look like:
["source","txt",subs="attributes,callouts"] ["source","txt",subs="attributes,callouts"]
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
name component version description name component version description
U7321H6 analysis-icu {version} The ICU Analysis plugin integrates Lucene ICU module into elasticsearch, adding ICU relates analysis components. U7321H6 analysis-icu {qualified_version} The ICU Analysis plugin integrates Lucene ICU module into elasticsearch, adding ICU relates analysis components.
U7321H6 analysis-kuromoji {version} The Japanese (kuromoji) Analysis plugin integrates Lucene kuromoji analysis module into elasticsearch. U7321H6 analysis-kuromoji {qualified_version} The Japanese (kuromoji) Analysis plugin integrates Lucene kuromoji analysis module into elasticsearch.
U7321H6 analysis-nori {version} The Korean (nori) Analysis plugin integrates Lucene nori analysis module into elasticsearch. U7321H6 analysis-nori {qualified_version} The Korean (nori) Analysis plugin integrates Lucene nori analysis module into elasticsearch.
U7321H6 analysis-phonetic {version} The Phonetic Analysis plugin integrates phonetic token filter analysis with elasticsearch. U7321H6 analysis-phonetic {qualified_version} The Phonetic Analysis plugin integrates phonetic token filter analysis with elasticsearch.
U7321H6 analysis-smartcn {version} Smart Chinese Analysis plugin integrates Lucene Smart Chinese analysis module into elasticsearch. U7321H6 analysis-smartcn {qualified_version} Smart Chinese Analysis plugin integrates Lucene Smart Chinese analysis module into elasticsearch.
U7321H6 analysis-stempel {version} The Stempel (Polish) Analysis plugin integrates Lucene stempel (polish) analysis module into elasticsearch. U7321H6 analysis-stempel {qualified_version} The Stempel (Polish) Analysis plugin integrates Lucene stempel (polish) analysis module into elasticsearch.
U7321H6 analysis-ukrainian {version} The Ukrainian Analysis plugin integrates the Lucene UkrainianMorfologikAnalyzer into elasticsearch. U7321H6 analysis-ukrainian {qualified_version} The Ukrainian Analysis plugin integrates the Lucene UkrainianMorfologikAnalyzer into elasticsearch.
U7321H6 discovery-azure-classic {version} The Azure Classic Discovery plugin allows to use Azure Classic API for the unicast discovery mechanism U7321H6 discovery-azure-classic {qualified_version} The Azure Classic Discovery plugin allows to use Azure Classic API for the unicast discovery mechanism
U7321H6 discovery-ec2 {version} The EC2 discovery plugin allows to use AWS API for the unicast discovery mechanism. U7321H6 discovery-ec2 {qualified_version} The EC2 discovery plugin allows to use AWS API for the unicast discovery mechanism.
U7321H6 discovery-gce {version} The Google Compute Engine (GCE) Discovery plugin allows to use GCE API for the unicast discovery mechanism. U7321H6 discovery-gce {qualified_version} The Google Compute Engine (GCE) Discovery plugin allows to use GCE API for the unicast discovery mechanism.
U7321H6 ingest-attachment {version} Ingest processor that uses Apache Tika to extract contents U7321H6 ingest-attachment {qualified_version} Ingest processor that uses Apache Tika to extract contents
U7321H6 ingest-geoip {version} Ingest processor that uses looksup geo data based on ip adresses using the Maxmind geo database U7321H6 ingest-geoip {qualified_version} Ingest processor that uses looksup geo data based on ip adresses using the Maxmind geo database
U7321H6 ingest-user-agent {version} Ingest processor that extracts information from a user agent U7321H6 ingest-user-agent {qualified_version} Ingest processor that extracts information from a user agent
U7321H6 mapper-annotated-text {version} The Mapper Annotated_text plugin adds support for text fields with markup used to inject annotation tokens into the index. U7321H6 mapper-annotated-text {qualified_version} The Mapper Annotated_text plugin adds support for text fields with markup used to inject annotation tokens into the index.
U7321H6 mapper-murmur3 {version} The Mapper Murmur3 plugin allows to compute hashes of a field's values at index-time and to store them in the index. U7321H6 mapper-murmur3 {qualified_version} The Mapper Murmur3 plugin allows to compute hashes of a field's values at index-time and to store them in the index.
U7321H6 mapper-size {version} The Mapper Size plugin allows document to record their uncompressed size at index time. U7321H6 mapper-size {qualified_version} The Mapper Size plugin allows document to record their uncompressed size at index time.
U7321H6 store-smb {version} The Store SMB plugin adds support for SMB stores. U7321H6 store-smb {qualified_version} The Store SMB plugin adds support for SMB stores.
U7321H6 transport-nio {version} The nio transport. U7321H6 transport-nio {qualified_version} The nio transport.
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
// TESTRESPONSE[s/([.()])/\\$1/ s/U7321H6/.+/ _cat] // TESTRESPONSE[s/([.()])/\\$1/ s/U7321H6/.+/ _cat]

1
docs/reference/setup/install/check-running.asciidoc
View File

@ -24,6 +24,7 @@ which should give you a response something like this:
"build_hash" : "f27399d", "build_hash" : "f27399d",
"build_date" : "2016-03-30T09:51:41.449Z", "build_date" : "2016-03-30T09:51:41.449Z",
"build_snapshot" : false, "build_snapshot" : false,
"build_version" : "{qualified_version}",
"lucene_version" : "{lucene_version}", "lucene_version" : "{lucene_version}",
"minimum_wire_compatibility_version" : "1.2.3", "minimum_wire_compatibility_version" : "1.2.3",
"minimum_index_compatibility_version" : "1.2.3" "minimum_index_compatibility_version" : "1.2.3"

2
modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/LegacyDelimitedPayloadTokenFilterFactory.java
View File

@ -33,7 +33,7 @@ public class LegacyDelimitedPayloadTokenFilterFactory extends DelimitedPayloadTo
LegacyDelimitedPayloadTokenFilterFactory(IndexSettings indexSettings, Environment env, String name, Settings settings) { LegacyDelimitedPayloadTokenFilterFactory(IndexSettings indexSettings, Environment env, String name, Settings settings) {
super(indexSettings, env, name, settings); super(indexSettings, env, name, settings);
if (indexSettings.getIndexVersionCreated().onOrAfter(Version.V_7_0_0_alpha1)) { if (indexSettings.getIndexVersionCreated().onOrAfter(Version.V_7_0_0)) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"[delimited_payload_filter] is not supported for new indices, use [delimited_payload] instead"); "[delimited_payload_filter] is not supported for new indices, use [delimited_payload] instead");
} }

2
modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/NGramTokenFilterFactory.java
View File

@ -43,7 +43,7 @@ public class NGramTokenFilterFactory extends AbstractTokenFilterFactory {
this.maxGram = settings.getAsInt("max_gram", 2); this.maxGram = settings.getAsInt("max_gram", 2);
int ngramDiff = maxGram - minGram; int ngramDiff = maxGram - minGram;
if (ngramDiff > maxAllowedNgramDiff) { if (ngramDiff > maxAllowedNgramDiff) {
if (indexSettings.getIndexVersionCreated().onOrAfter(Version.V_7_0_0_alpha1)) { if (indexSettings.getIndexVersionCreated().onOrAfter(Version.V_7_0_0)) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"The difference between max_gram and min_gram in NGram Tokenizer must be less than or equal to: [" "The difference between max_gram and min_gram in NGram Tokenizer must be less than or equal to: ["
+ maxAllowedNgramDiff + "] but was [" + ngramDiff + "]. This limit can be set by changing the [" + maxAllowedNgramDiff + "] but was [" + ngramDiff + "]. This limit can be set by changing the ["

2
modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/NGramTokenizerFactory.java
View File

@ -91,7 +91,7 @@ public class NGramTokenizerFactory extends AbstractTokenizerFactory {
this.maxGram = settings.getAsInt("max_gram", NGramTokenizer.DEFAULT_MAX_NGRAM_SIZE); this.maxGram = settings.getAsInt("max_gram", NGramTokenizer.DEFAULT_MAX_NGRAM_SIZE);
int ngramDiff = maxGram - minGram; int ngramDiff = maxGram - minGram;
if (ngramDiff > maxAllowedNgramDiff) { if (ngramDiff > maxAllowedNgramDiff) {
if (indexSettings.getIndexVersionCreated().onOrAfter(Version.V_7_0_0_alpha1)) { if (indexSettings.getIndexVersionCreated().onOrAfter(Version.V_7_0_0)) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"The difference between max_gram and min_gram in NGram Tokenizer must be less than or equal to: [" "The difference between max_gram and min_gram in NGram Tokenizer must be less than or equal to: ["
+ maxAllowedNgramDiff + "] but was [" + ngramDiff + "]. This limit can be set by changing the [" + maxAllowedNgramDiff + "] but was [" + ngramDiff + "]. This limit can be set by changing the ["

4
modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MultiSearchTemplateResponse.java
View File

@ -154,7 +154,7 @@ public class MultiSearchTemplateResponse extends ActionResponse implements Itera
for (int i = 0; i < items.length; i++) { for (int i = 0; i < items.length; i++) {
items[i] = Item.readItem(in); items[i] = Item.readItem(in);
} }
if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { if (in.getVersion().onOrAfter(Version.V_7_0_0)) {
tookInMillis = in.readVLong(); tookInMillis = in.readVLong();
} }
} }
@ -166,7 +166,7 @@ public class MultiSearchTemplateResponse extends ActionResponse implements Itera
for (Item item : items) { for (Item item : items) {
item.writeTo(out); item.writeTo(out);
} }
if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
out.writeVLong(tookInMillis); out.writeVLong(tookInMillis);
} }
} }

2
plugins/analysis-icu/src/main/java/org/elasticsearch/index/analysis/IcuNormalizerTokenFilterFactory.java
View File

@ -65,7 +65,7 @@ public class IcuNormalizerTokenFilterFactory extends AbstractTokenFilterFactory
final Normalizer2 normalizer, final Normalizer2 normalizer,
final Settings settings) { final Settings settings) {
String unicodeSetFilter = settings.get("unicodeSetFilter"); String unicodeSetFilter = settings.get("unicodeSetFilter");
if (indexSettings.getIndexVersionCreated().onOrAfter(Version.V_7_0_0_alpha1)) { if (indexSettings.getIndexVersionCreated().onOrAfter(Version.V_7_0_0)) {
if (unicodeSetFilter != null) { if (unicodeSetFilter != null) {
deprecationLogger.deprecated("[unicodeSetFilter] has been deprecated in favor of [unicode_set_filter]"); deprecationLogger.deprecated("[unicodeSetFilter] has been deprecated in favor of [unicode_set_filter]");
} else { } else {

2
qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/IndexingIT.java
View File

@ -70,7 +70,7 @@ public class IndexingIT extends AbstractRollingTestCase {
Version minimumIndexCompatibilityVersion = Version.CURRENT.minimumIndexCompatibilityVersion(); Version minimumIndexCompatibilityVersion = Version.CURRENT.minimumIndexCompatibilityVersion();
assertThat("this branch is not needed if we aren't compatible with 6.0", assertThat("this branch is not needed if we aren't compatible with 6.0",
minimumIndexCompatibilityVersion.onOrBefore(Version.V_6_0_0), equalTo(true)); minimumIndexCompatibilityVersion.onOrBefore(Version.V_6_0_0), equalTo(true));
if (minimumIndexCompatibilityVersion.before(Version.V_7_0_0_alpha1)) { if (minimumIndexCompatibilityVersion.before(Version.V_7_0_0)) {
XContentBuilder template = jsonBuilder(); XContentBuilder template = jsonBuilder();
template.startObject(); template.startObject();
{ {

2
qa/vagrant/src/test/resources/packaging/utils/utils.bash
View File

@ -516,7 +516,7 @@ wait_for_elasticsearch_status() {
# $1 - expected version # $1 - expected version
check_elasticsearch_version() { check_elasticsearch_version() {
local version=$1 local version=$1
local versionToCheck=$(echo $version | sed -e 's/-SNAPSHOT//') local versionToCheck=$(echo $version | sed -e 's/-SNAPSHOT//' | sed -e 's/-\(alpha\|beta\|rc\)[0-9]//')
run curl -s localhost:9200 run curl -s localhost:9200
[ "$status" -eq 0 ] [ "$status" -eq 0 ]

2
qa/wildfly/build.gradle
View File

@ -129,7 +129,7 @@ task startWildfly {
assert index >= 0 assert index >= 0
httpPort = Integer.parseInt(line.substring(index + 1)) httpPort = Integer.parseInt(line.substring(index + 1))
// set this system property so the test runner knows the port Wildfly is listening for HTTP requests on // set this system property so the test runner knows the port Wildfly is listening for HTTP requests on
integTestRunner.systemProperty("tests.jboss.http.port", httpPort) integTestRunner.systemProperty("tests.jboss.root", "http://localhost:$httpPort/wildfly-$version/transport")
} else if (line.matches('.*Http management interface listening on http://.*:\\d+/management$')) { } else if (line.matches('.*Http management interface listening on http://.*:\\d+/management$')) {
assert managementPort == 0 assert managementPort == 0
final int colonIndex = line.lastIndexOf(":") final int colonIndex = line.lastIndexOf(":")

15
qa/wildfly/src/test/java/org/elasticsearch/wildfly/WildflyIT.java
View File

@ -27,10 +27,9 @@ import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.util.EntityUtils; import org.apache.http.util.EntityUtils;
import org.apache.log4j.Logger;
import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestRuleLimitSysouts; import org.apache.lucene.util.TestRuleLimitSysouts;
import org.elasticsearch.Build;
import org.elasticsearch.Version;
import org.elasticsearch.cluster.ClusterModule; import org.elasticsearch.cluster.ClusterModule;
import org.elasticsearch.common.Strings; import org.elasticsearch.common.Strings;
import org.elasticsearch.common.xcontent.DeprecationHandler; import org.elasticsearch.common.xcontent.DeprecationHandler;
@ -54,14 +53,16 @@ import static org.hamcrest.Matchers.instanceOf;
@TestRuleLimitSysouts.Limit(bytes = 14000) @TestRuleLimitSysouts.Limit(bytes = 14000)
public class WildflyIT extends LuceneTestCase { public class WildflyIT extends LuceneTestCase {
Logger logger = Logger.getLogger(WildflyIT.class);
public void testTransportClient() throws URISyntaxException, IOException { public void testTransportClient() throws URISyntaxException, IOException {
try (CloseableHttpClient client = HttpClientBuilder.create().build()) { try (CloseableHttpClient client = HttpClientBuilder.create().build()) {
final String str = String.format( final String str = String.format(
Locale.ROOT, Locale.ROOT,
"http://localhost:%d/wildfly-%s%s/transport/employees/1", "%s/employees/1",
Integer.parseInt(System.getProperty("tests.jboss.http.port")), System.getProperty("tests.jboss.root")
Version.CURRENT, );
Build.CURRENT.isSnapshot() ? "-SNAPSHOT" : ""); logger.info("Connecting to uri: " + str);
final HttpPut put = new HttpPut(new URI(str)); final HttpPut put = new HttpPut(new URI(str));
final String body; final String body;
try (XContentBuilder builder = jsonBuilder()) { try (XContentBuilder builder = jsonBuilder()) {

63
server/src/main/java/org/elasticsearch/Build.java
View File

@ -114,6 +114,7 @@ public class Build {
final String shortHash; final String shortHash;
final String date; final String date;
final boolean isSnapshot; final boolean isSnapshot;
final String version;
flavor = Flavor.fromDisplayName(System.getProperty("es.distribution.flavor", "unknown")); flavor = Flavor.fromDisplayName(System.getProperty("es.distribution.flavor", "unknown"));
type = Type.fromDisplayName(System.getProperty("es.distribution.type", "unknown")); type = Type.fromDisplayName(System.getProperty("es.distribution.type", "unknown"));
@ -121,12 +122,16 @@ public class Build {
final String esPrefix = "elasticsearch-" + Version.CURRENT; final String esPrefix = "elasticsearch-" + Version.CURRENT;
final URL url = getElasticsearchCodeSourceLocation(); final URL url = getElasticsearchCodeSourceLocation();
final String urlStr = url == null ? "" : url.toString(); final String urlStr = url == null ? "" : url.toString();
if (urlStr.startsWith("file:/") && (urlStr.endsWith(esPrefix + ".jar") || urlStr.endsWith(esPrefix + "-SNAPSHOT.jar"))) { if (urlStr.startsWith("file:/") && (
urlStr.endsWith(esPrefix + ".jar") ||
urlStr.matches("(.*)" + esPrefix + "(-)?((alpha|beta|rc)[0-9]+)?(-SNAPSHOT)?.jar")
)) {
try (JarInputStream jar = new JarInputStream(FileSystemUtils.openFileURLStream(url))) { try (JarInputStream jar = new JarInputStream(FileSystemUtils.openFileURLStream(url))) {
Manifest manifest = jar.getManifest(); Manifest manifest = jar.getManifest();
shortHash = manifest.getMainAttributes().getValue("Change"); shortHash = manifest.getMainAttributes().getValue("Change");
date = manifest.getMainAttributes().getValue("Build-Date"); date = manifest.getMainAttributes().getValue("Build-Date");
isSnapshot = "true".equals(manifest.getMainAttributes().getValue("X-Compile-Elasticsearch-Snapshot")); isSnapshot = "true".equals(manifest.getMainAttributes().getValue("X-Compile-Elasticsearch-Snapshot"));
version = manifest.getMainAttributes().getValue("X-Compile-Elasticsearch-Version");
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
@ -134,6 +139,7 @@ public class Build {
// not running from the official elasticsearch jar file (unit tests, IDE, uber client jar, shadiness) // not running from the official elasticsearch jar file (unit tests, IDE, uber client jar, shadiness)
shortHash = "Unknown"; shortHash = "Unknown";
date = "Unknown"; date = "Unknown";
version = "Unknown";
final String buildSnapshot = System.getProperty("build.snapshot"); final String buildSnapshot = System.getProperty("build.snapshot");
if (buildSnapshot != null) { if (buildSnapshot != null) {
try { try {
@ -155,8 +161,12 @@ public class Build {
throw new IllegalStateException("Error finding the build date. " + throw new IllegalStateException("Error finding the build date. " +
"Stopping Elasticsearch now so it doesn't run in subtly broken ways. This is likely a build bug."); "Stopping Elasticsearch now so it doesn't run in subtly broken ways. This is likely a build bug.");
} }
if (version == null) {
throw new IllegalStateException("Error finding the build version. " +
"Stopping Elasticsearch now so it doesn't run in subtly broken ways. This is likely a build bug.");
}
CURRENT = new Build(flavor, type, shortHash, date, isSnapshot); CURRENT = new Build(flavor, type, shortHash, date, isSnapshot, version);
} }
private final boolean isSnapshot; private final boolean isSnapshot;
@ -175,13 +185,18 @@ public class Build {
private final Type type; private final Type type;
private final String shortHash; private final String shortHash;
private final String date; private final String date;
private final String version;
public Build(final Flavor flavor, final Type type, final String shortHash, final String date, boolean isSnapshot) { public Build(
final Flavor flavor, final Type type, final String shortHash, final String date, boolean isSnapshot,
String version
) {
this.flavor = flavor; this.flavor = flavor;
this.type = type; this.type = type;
this.shortHash = shortHash; this.shortHash = shortHash;
this.date = date; this.date = date;
this.isSnapshot = isSnapshot; this.isSnapshot = isSnapshot;
this.version = version;
} }
public String shortHash() { public String shortHash() {
@ -208,7 +223,14 @@ public class Build {
String hash = in.readString(); String hash = in.readString();
String date = in.readString(); String date = in.readString();
boolean snapshot = in.readBoolean(); boolean snapshot = in.readBoolean();
return new Build(flavor, type, hash, date, snapshot);
final String version;
if (in.getVersion().onOrAfter(Version.V_7_0_0)) {
version = in.readString();
} else {
version = in.getVersion().toString();
}
return new Build(flavor, type, hash, date, snapshot, version);
} }
public static void writeBuild(Build build, StreamOutput out) throws IOException { public static void writeBuild(Build build, StreamOutput out) throws IOException {
@ -221,6 +243,22 @@ public class Build {
out.writeString(build.shortHash()); out.writeString(build.shortHash());
out.writeString(build.date()); out.writeString(build.date());
out.writeBoolean(build.isSnapshot()); out.writeBoolean(build.isSnapshot());
if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
out.writeString(build.getQualifiedVersion());
}
}
/**
* Get the version as considered at build time
*
* Offers a way to get the fully qualified version as configured by the build.
* This will be the same as {@link Version} for production releases, but may include on of the qualifier ( e.x alpha1 )
* or -SNAPSHOT for others.
*
* @return the fully qualified build
*/
public String getQualifiedVersion() {
return version;
} }
public Flavor flavor() { public Flavor flavor() {
@ -235,9 +273,18 @@ public class Build {
return isSnapshot; return isSnapshot;
} }
/**
* Provides information about the intent of the build
*
* @return true if the build is intended for production use
*/
public boolean isProductionRelease() {
return version.matches("[0-9]+\\.[0-9]+\\.[0-9]+");
}
@Override @Override
public String toString() { public String toString() {
return "[" + flavor.displayName() + "][" + type.displayName + "][" + shortHash + "][" + date + "]"; return "[" + flavor.displayName() + "][" + type.displayName + "][" + shortHash + "][" + date + "][" + version +"]";
} }
@Override @Override
@ -265,13 +312,15 @@ public class Build {
if (!shortHash.equals(build.shortHash)) { if (!shortHash.equals(build.shortHash)) {
return false; return false;
} }
if (version.equals(build.version) == false) {
return false;
}
return date.equals(build.date); return date.equals(build.date);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(flavor, type, isSnapshot, shortHash, date); return Objects.hash(flavor, type, isSnapshot, shortHash, date, version);
} }
} }

2
server/src/main/java/org/elasticsearch/ElasticsearchException.java
View File

@ -1007,7 +1007,7 @@ public class ElasticsearchException extends RuntimeException implements ToXConte
org.elasticsearch.common.xcontent.UnknownNamedObjectException::new, 148, UNKNOWN_VERSION_ADDED), org.elasticsearch.common.xcontent.UnknownNamedObjectException::new, 148, UNKNOWN_VERSION_ADDED),
TOO_MANY_BUCKETS_EXCEPTION(MultiBucketConsumerService.TooManyBucketsException.class, TOO_MANY_BUCKETS_EXCEPTION(MultiBucketConsumerService.TooManyBucketsException.class,
MultiBucketConsumerService.TooManyBucketsException::new, 149, MultiBucketConsumerService.TooManyBucketsException::new, 149,
Version.V_7_0_0_alpha1); Version.V_7_0_0);
final Class<? extends ElasticsearchException> exceptionClass; final Class<? extends ElasticsearchException> exceptionClass;
final CheckedFunction<StreamInput, ? extends ElasticsearchException, IOException> constructor; final CheckedFunction<StreamInput, ? extends ElasticsearchException, IOException> constructor;

18
server/src/main/java/org/elasticsearch/Version.java
View File

@ -111,10 +111,10 @@ public class Version implements Comparable<Version>, ToXContentFragment {
public static final Version V_6_5_0 = new Version(V_6_5_0_ID, org.apache.lucene.util.Version.LUCENE_7_5_0); public static final Version V_6_5_0 = new Version(V_6_5_0_ID, org.apache.lucene.util.Version.LUCENE_7_5_0);
public static final int V_6_6_0_ID = 6060099; public static final int V_6_6_0_ID = 6060099;
public static final Version V_6_6_0 = new Version(V_6_6_0_ID, org.apache.lucene.util.Version.LUCENE_7_6_0); public static final Version V_6_6_0 = new Version(V_6_6_0_ID, org.apache.lucene.util.Version.LUCENE_7_6_0);
public static final int V_7_0_0_alpha1_ID = 7000001; public static final int V_7_0_0_ID = 7000099;
public static final Version V_7_0_0_alpha1 = public static final Version V_7_0_0 = new Version(V_7_0_0_ID, org.apache.lucene.util.Version.LUCENE_8_0_0);
new Version(V_7_0_0_alpha1_ID, org.apache.lucene.util.Version.LUCENE_8_0_0); public static final Version CURRENT = V_7_0_0;
public static final Version CURRENT = V_7_0_0_alpha1;
static { static {
assert CURRENT.luceneVersion.equals(org.apache.lucene.util.Version.LATEST) : "Version must be upgraded to [" assert CURRENT.luceneVersion.equals(org.apache.lucene.util.Version.LATEST) : "Version must be upgraded to ["
@ -127,8 +127,8 @@ public class Version implements Comparable<Version>, ToXContentFragment {
public static Version fromId(int id) { public static Version fromId(int id) {
switch (id) { switch (id) {
case V_7_0_0_alpha1_ID: case V_7_0_0_ID:
return V_7_0_0_alpha1; return V_7_0_0;
case V_6_6_0_ID: case V_6_6_0_ID:
return V_6_6_0; return V_6_6_0;
case V_6_5_0_ID: case V_6_5_0_ID:
@ -395,7 +395,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
final String versionOutput = String.format( final String versionOutput = String.format(
Locale.ROOT, Locale.ROOT,
"Version: %s, Build: %s/%s/%s/%s, JVM: %s", "Version: %s, Build: %s/%s/%s/%s, JVM: %s",
Version.displayVersion(Version.CURRENT, Build.CURRENT.isSnapshot()), Build.CURRENT.getQualifiedVersion(),
Build.CURRENT.flavor().displayName(), Build.CURRENT.flavor().displayName(),
Build.CURRENT.type().displayName(), Build.CURRENT.type().displayName(),
Build.CURRENT.shortHash(), Build.CURRENT.shortHash(),
@ -429,10 +429,6 @@ public class Version implements Comparable<Version>, ToXContentFragment {
return sb.toString(); return sb.toString();
} }
public static String displayVersion(final Version version, final boolean isSnapshot) {
return version + (isSnapshot ? "-SNAPSHOT" : "");
}
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (this == o) { if (this == o) {

4
server/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java
View File

@ -239,7 +239,7 @@ public class IndicesAliasesRequest extends AcknowledgedRequest<IndicesAliasesReq
if (in.getVersion().onOrAfter(Version.V_6_4_0)) { if (in.getVersion().onOrAfter(Version.V_6_4_0)) {
writeIndex = in.readOptionalBoolean(); writeIndex = in.readOptionalBoolean();
} }
if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { if (in.getVersion().onOrAfter(Version.V_7_0_0)) {
originalAliases = in.readStringArray(); originalAliases = in.readStringArray();
} }
} }
@ -256,7 +256,7 @@ public class IndicesAliasesRequest extends AcknowledgedRequest<IndicesAliasesReq
if (out.getVersion().onOrAfter(Version.V_6_4_0)) { if (out.getVersion().onOrAfter(Version.V_6_4_0)) {
out.writeOptionalBoolean(writeIndex); out.writeOptionalBoolean(writeIndex);
} }
if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
out.writeStringArray(originalAliases); out.writeStringArray(originalAliases);
} }
} }

4
server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java
View File

@ -460,7 +460,7 @@ public class CreateIndexRequest extends AcknowledgedRequest<CreateIndexRequest>
for (int i = 0; i < aliasesSize; i++) { for (int i = 0; i < aliasesSize; i++) {
aliases.add(Alias.read(in)); aliases.add(Alias.read(in));
} }
if (in.getVersion().before(Version.V_7_0_0_alpha1)) { if (in.getVersion().before(Version.V_7_0_0)) {
in.readBoolean(); // updateAllTypes in.readBoolean(); // updateAllTypes
} }
waitForActiveShards = ActiveShardCount.readFrom(in); waitForActiveShards = ActiveShardCount.readFrom(in);
@ -485,7 +485,7 @@ public class CreateIndexRequest extends AcknowledgedRequest<CreateIndexRequest>
for (Alias alias : aliases) { for (Alias alias : aliases) {
alias.writeTo(out); alias.writeTo(out);
} }
if (out.getVersion().before(Version.V_7_0_0_alpha1)) { if (out.getVersion().before(Version.V_7_0_0)) {
out.writeBoolean(true); // updateAllTypes out.writeBoolean(true); // updateAllTypes
} }
waitForActiveShards.writeTo(out); waitForActiveShards.writeTo(out);

4
server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java
View File

@ -297,7 +297,7 @@ public class PutMappingRequest extends AcknowledgedRequest<PutMappingRequest> im
indicesOptions = IndicesOptions.readIndicesOptions(in); indicesOptions = IndicesOptions.readIndicesOptions(in);
type = in.readOptionalString(); type = in.readOptionalString();
source = in.readString(); source = in.readString();
if (in.getVersion().before(Version.V_7_0_0_alpha1)) { if (in.getVersion().before(Version.V_7_0_0)) {
in.readBoolean(); // updateAllTypes in.readBoolean(); // updateAllTypes
} }
concreteIndex = in.readOptionalWriteable(Index::new); concreteIndex = in.readOptionalWriteable(Index::new);
@ -310,7 +310,7 @@ public class PutMappingRequest extends AcknowledgedRequest<PutMappingRequest> im
indicesOptions.writeIndicesOptions(out); indicesOptions.writeIndicesOptions(out);
out.writeOptionalString(type); out.writeOptionalString(type);
out.writeString(source); out.writeString(source);
if (out.getVersion().before(Version.V_7_0_0_alpha1)) { if (out.getVersion().before(Version.V_7_0_0)) {
out.writeBoolean(true); // updateAllTypes out.writeBoolean(true); // updateAllTypes
} }
out.writeOptionalWriteable(concreteIndex); out.writeOptionalWriteable(concreteIndex);

4
server/src/main/java/org/elasticsearch/action/delete/DeleteRequest.java
View File

@ -189,7 +189,7 @@ public class DeleteRequest extends ReplicatedWriteRequest<DeleteRequest>
type = in.readString(); type = in.readString();
id = in.readString(); id = in.readString();
routing = in.readOptionalString(); routing = in.readOptionalString();
if (in.getVersion().before(Version.V_7_0_0_alpha1)) { if (in.getVersion().before(Version.V_7_0_0)) {
in.readOptionalString(); // _parent in.readOptionalString(); // _parent
} }
version = in.readLong(); version = in.readLong();
@ -202,7 +202,7 @@ public class DeleteRequest extends ReplicatedWriteRequest<DeleteRequest>
out.writeString(type); out.writeString(type);
out.writeString(id); out.writeString(id);
out.writeOptionalString(routing()); out.writeOptionalString(routing());
if (out.getVersion().before(Version.V_7_0_0_alpha1)) { if (out.getVersion().before(Version.V_7_0_0)) {
out.writeOptionalString(null); // _parent out.writeOptionalString(null); // _parent
} }
out.writeLong(version); out.writeLong(version);

4
server/src/main/java/org/elasticsearch/action/get/GetRequest.java
View File

@ -248,7 +248,7 @@ public class GetRequest extends SingleShardRequest<GetRequest> implements Realti
type = in.readString(); type = in.readString();
id = in.readString(); id = in.readString();
routing = in.readOptionalString(); routing = in.readOptionalString();
if (in.getVersion().before(Version.V_7_0_0_alpha1)) { if (in.getVersion().before(Version.V_7_0_0)) {
in.readOptionalString(); in.readOptionalString();
} }
preference = in.readOptionalString(); preference = in.readOptionalString();
@ -267,7 +267,7 @@ public class GetRequest extends SingleShardRequest<GetRequest> implements Realti
out.writeString(type); out.writeString(type);
out.writeString(id); out.writeString(id);
out.writeOptionalString(routing); out.writeOptionalString(routing);
if (out.getVersion().before(Version.V_7_0_0_alpha1)) { if (out.getVersion().before(Version.V_7_0_0)) {
out.writeOptionalString(null); out.writeOptionalString(null);
} }
out.writeOptionalString(preference); out.writeOptionalString(preference);

4
server/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java
View File

@ -191,7 +191,7 @@ public class MultiGetRequest extends ActionRequest
type = in.readOptionalString(); type = in.readOptionalString();
id = in.readString(); id = in.readString();
routing = in.readOptionalString(); routing = in.readOptionalString();
if (in.getVersion().before(Version.V_7_0_0_alpha1)) { if (in.getVersion().before(Version.V_7_0_0)) {
in.readOptionalString(); // _parent in.readOptionalString(); // _parent
} }
storedFields = in.readOptionalStringArray(); storedFields = in.readOptionalStringArray();
@ -207,7 +207,7 @@ public class MultiGetRequest extends ActionRequest
out.writeOptionalString(type); out.writeOptionalString(type);
out.writeString(id); out.writeString(id);
out.writeOptionalString(routing); out.writeOptionalString(routing);
if (out.getVersion().before(Version.V_7_0_0_alpha1)) { if (out.getVersion().before(Version.V_7_0_0)) {
out.writeOptionalString(null); // _parent out.writeOptionalString(null); // _parent
} }
out.writeOptionalStringArray(storedFields); out.writeOptionalStringArray(storedFields);

4
server/src/main/java/org/elasticsearch/action/index/IndexRequest.java
View File

@ -514,7 +514,7 @@ public class IndexRequest extends ReplicatedWriteRequest<IndexRequest> implement
type = in.readOptionalString(); type = in.readOptionalString();
id = in.readOptionalString(); id = in.readOptionalString();
routing = in.readOptionalString(); routing = in.readOptionalString();
if (in.getVersion().before(Version.V_7_0_0_alpha1)) { if (in.getVersion().before(Version.V_7_0_0)) {
in.readOptionalString(); // _parent in.readOptionalString(); // _parent
} }
if (in.getVersion().before(Version.V_6_0_0_alpha1)) { if (in.getVersion().before(Version.V_6_0_0_alpha1)) {
@ -541,7 +541,7 @@ public class IndexRequest extends ReplicatedWriteRequest<IndexRequest> implement
out.writeOptionalString(type); out.writeOptionalString(type);
out.writeOptionalString(id); out.writeOptionalString(id);
out.writeOptionalString(routing); out.writeOptionalString(routing);
if (out.getVersion().before(Version.V_7_0_0_alpha1)) { if (out.getVersion().before(Version.V_7_0_0)) {
out.writeOptionalString(null); // _parent out.writeOptionalString(null); // _parent
} }
if (out.getVersion().before(Version.V_6_0_0_alpha1)) { if (out.getVersion().before(Version.V_6_0_0_alpha1)) {

10
server/src/main/java/org/elasticsearch/action/main/MainResponse.java
View File

@ -61,6 +61,7 @@ public class MainResponse extends ActionResponse implements ToXContentObject {
return version; return version;
} }
public ClusterName getClusterName() { public ClusterName getClusterName() {
return clusterName; return clusterName;
} }
@ -81,7 +82,7 @@ public class MainResponse extends ActionResponse implements ToXContentObject {
clusterName.writeTo(out); clusterName.writeTo(out);
out.writeString(clusterUuid); out.writeString(clusterUuid);
Build.writeBuild(build, out); Build.writeBuild(build, out);
if (out.getVersion().before(Version.V_7_0_0_alpha1)) { if (out.getVersion().before(Version.V_7_0_0)) {
out.writeBoolean(true); out.writeBoolean(true);
} }
} }
@ -94,7 +95,7 @@ public class MainResponse extends ActionResponse implements ToXContentObject {
clusterName = new ClusterName(in); clusterName = new ClusterName(in);
clusterUuid = in.readString(); clusterUuid = in.readString();
build = Build.readBuild(in); build = Build.readBuild(in);
if (in.getVersion().before(Version.V_7_0_0_alpha1)) { if (in.getVersion().before(Version.V_7_0_0)) {
in.readBoolean(); in.readBoolean();
} }
} }
@ -112,6 +113,7 @@ public class MainResponse extends ActionResponse implements ToXContentObject {
.field("build_hash", build.shortHash()) .field("build_hash", build.shortHash())
.field("build_date", build.date()) .field("build_date", build.date())
.field("build_snapshot", build.isSnapshot()) .field("build_snapshot", build.isSnapshot())
.field("build_version", build.getQualifiedVersion())
.field("lucene_version", version.luceneVersion.toString()) .field("lucene_version", version.luceneVersion.toString())
.field("minimum_wire_compatibility_version", version.minimumCompatibilityVersion().toString()) .field("minimum_wire_compatibility_version", version.minimumCompatibilityVersion().toString())
.field("minimum_index_compatibility_version", version.minimumIndexCompatibilityVersion().toString()) .field("minimum_index_compatibility_version", version.minimumIndexCompatibilityVersion().toString())
@ -138,7 +140,9 @@ public class MainResponse extends ActionResponse implements ToXContentObject {
buildType == null ? Build.Type.UNKNOWN : Build.Type.fromDisplayName(buildType), buildType == null ? Build.Type.UNKNOWN : Build.Type.fromDisplayName(buildType),
(String) value.get("build_hash"), (String) value.get("build_hash"),
(String) value.get("build_date"), (String) value.get("build_date"),
(boolean) value.get("build_snapshot")); (boolean) value.get("build_snapshot"),
(String) value.get("build_version")
);
response.version = Version.fromString((String) value.get("number")); response.version = Version.fromString((String) value.get("number"));
}, (parser, context) -> parser.map(), new ParseField("version")); }, (parser, context) -> parser.map(), new ParseField("version"));
} }

4
server/src/main/java/org/elasticsearch/action/search/MultiSearchResponse.java
View File

@ -170,7 +170,7 @@ public class MultiSearchResponse extends ActionResponse implements Iterable<Mult
for (int i = 0; i < items.length; i++) { for (int i = 0; i < items.length; i++) {
items[i] = Item.readItem(in); items[i] = Item.readItem(in);
} }
if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { if (in.getVersion().onOrAfter(Version.V_7_0_0)) {
tookInMillis = in.readVLong(); tookInMillis = in.readVLong();
} }
} }
@ -182,7 +182,7 @@ public class MultiSearchResponse extends ActionResponse implements Iterable<Mult
for (Item item : items) { for (Item item : items) {
item.writeTo(out); item.writeTo(out);
} }
if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
out.writeVLong(tookInMillis); out.writeVLong(tookInMillis);
} }
} }

4
server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java
View File

@ -502,7 +502,7 @@ public class TermVectorsRequest extends SingleShardRequest<TermVectorsRequest> i
} }
routing = in.readOptionalString(); routing = in.readOptionalString();
if (in.getVersion().before(Version.V_7_0_0_alpha1)) { if (in.getVersion().before(Version.V_7_0_0)) {
in.readOptionalString(); // _parent in.readOptionalString(); // _parent
} }
preference = in.readOptionalString(); preference = in.readOptionalString();
@ -545,7 +545,7 @@ public class TermVectorsRequest extends SingleShardRequest<TermVectorsRequest> i
out.writeEnum(xContentType); out.writeEnum(xContentType);
} }
out.writeOptionalString(routing); out.writeOptionalString(routing);
if (out.getVersion().before(Version.V_7_0_0_alpha1)) { if (out.getVersion().before(Version.V_7_0_0)) {
out.writeOptionalString(null); // _parent out.writeOptionalString(null); // _parent
} }
out.writeOptionalString(preference); out.writeOptionalString(preference);

8
server/src/main/java/org/elasticsearch/action/update/UpdateRequest.java
View File

@ -748,7 +748,7 @@ public class UpdateRequest extends InstanceShardOperationRequest<UpdateRequest>
type = in.readString(); type = in.readString();
id = in.readString(); id = in.readString();
routing = in.readOptionalString(); routing = in.readOptionalString();
if (in.getVersion().before(Version.V_7_0_0_alpha1)) { if (in.getVersion().before(Version.V_7_0_0)) {
in.readOptionalString(); // _parent in.readOptionalString(); // _parent
} }
if (in.readBoolean()) { if (in.readBoolean()) {
@ -760,7 +760,7 @@ public class UpdateRequest extends InstanceShardOperationRequest<UpdateRequest>
doc = new IndexRequest(); doc = new IndexRequest();
doc.readFrom(in); doc.readFrom(in);
} }
if (in.getVersion().before(Version.V_7_0_0_alpha1)) { if (in.getVersion().before(Version.V_7_0_0)) {
String[] fields = in.readOptionalStringArray(); String[] fields = in.readOptionalStringArray();
if (fields != null) { if (fields != null) {
throw new IllegalArgumentException("[fields] is no longer supported"); throw new IllegalArgumentException("[fields] is no longer supported");
@ -785,7 +785,7 @@ public class UpdateRequest extends InstanceShardOperationRequest<UpdateRequest>
out.writeString(type); out.writeString(type);
out.writeString(id); out.writeString(id);
out.writeOptionalString(routing); out.writeOptionalString(routing);
if (out.getVersion().before(Version.V_7_0_0_alpha1)) { if (out.getVersion().before(Version.V_7_0_0)) {
out.writeOptionalString(null); // _parent out.writeOptionalString(null); // _parent
} }
@ -806,7 +806,7 @@ public class UpdateRequest extends InstanceShardOperationRequest<UpdateRequest>
doc.id(id); doc.id(id);
doc.writeTo(out); doc.writeTo(out);
} }
if (out.getVersion().before(Version.V_7_0_0_alpha1)) { if (out.getVersion().before(Version.V_7_0_0)) {
out.writeOptionalStringArray(null); out.writeOptionalStringArray(null);
} }
out.writeOptionalWriteable(fetchSourceContext); out.writeOptionalWriteable(fetchSourceContext);

18
server/src/main/java/org/elasticsearch/bootstrap/Elasticsearch.java
View File

@ -24,7 +24,6 @@ import joptsimple.OptionSpec;
import joptsimple.OptionSpecBuilder; import joptsimple.OptionSpecBuilder;
import joptsimple.util.PathConverter; import joptsimple.util.PathConverter;
import org.elasticsearch.Build; import org.elasticsearch.Build;
import org.elasticsearch.Version;
import org.elasticsearch.cli.EnvironmentAwareCommand; import org.elasticsearch.cli.EnvironmentAwareCommand;
import org.elasticsearch.cli.ExitCodes; import org.elasticsearch.cli.ExitCodes;
import org.elasticsearch.cli.Terminal; import org.elasticsearch.cli.Terminal;
@ -100,14 +99,15 @@ class Elasticsearch extends EnvironmentAwareCommand {
} }
if (options.has(versionOption)) { if (options.has(versionOption)) {
final String versionOutput = String.format( final String versionOutput = String.format(
Locale.ROOT, Locale.ROOT,
"Version: %s, Build: %s/%s/%s/%s, JVM: %s", "Version: %s, Build: %s/%s/%s/%s, JVM: %s",
Version.displayVersion(Version.CURRENT, Build.CURRENT.isSnapshot()), Build.CURRENT.getQualifiedVersion(),
Build.CURRENT.flavor().displayName(), Build.CURRENT.flavor().displayName(),
Build.CURRENT.type().displayName(), Build.CURRENT.type().displayName(),
Build.CURRENT.shortHash(), Build.CURRENT.shortHash(),
Build.CURRENT.date(), Build.CURRENT.date(),
JvmInfo.jvmInfo().version()); JvmInfo.jvmInfo().version()
);
terminal.println(versionOutput); terminal.println(versionOutput);
return; return;
} }

4
server/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java
View File

@ -178,7 +178,7 @@ public class MappingMetaData extends AbstractDiffable<MappingMetaData> {
out.writeOptionalString("now"); // 5.x default out.writeOptionalString("now"); // 5.x default
out.writeOptionalBoolean(null); out.writeOptionalBoolean(null);
} }
if (out.getVersion().before(Version.V_7_0_0_alpha1)) { if (out.getVersion().before(Version.V_7_0_0)) {
out.writeBoolean(false); // hasParentField out.writeBoolean(false); // hasParentField
} }
} }
@ -220,7 +220,7 @@ public class MappingMetaData extends AbstractDiffable<MappingMetaData> {
in.readOptionalString(); // defaultTimestamp in.readOptionalString(); // defaultTimestamp
in.readOptionalBoolean(); // ignoreMissing in.readOptionalBoolean(); // ignoreMissing
} }
if (in.getVersion().before(Version.V_7_0_0_alpha1)) { if (in.getVersion().before(Version.V_7_0_0)) {
in.readBoolean(); // hasParentField in.readBoolean(); // hasParentField
} }
} }

4
server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java
View File

@ -575,7 +575,7 @@ public class MetaDataCreateIndexService extends AbstractComponent {
final int numberOfShards; final int numberOfShards;
final Version indexVersionCreated = final Version indexVersionCreated =
Version.fromId(Integer.parseInt(indexSettingsBuilder.get(IndexMetaData.SETTING_INDEX_VERSION_CREATED.getKey()))); Version.fromId(Integer.parseInt(indexSettingsBuilder.get(IndexMetaData.SETTING_INDEX_VERSION_CREATED.getKey())));
if (indexVersionCreated.before(Version.V_7_0_0_alpha1)) { if (indexVersionCreated.before(Version.V_7_0_0)) {
numberOfShards = 5; numberOfShards = 5;
} else { } else {
numberOfShards = 1; numberOfShards = 1;
@ -799,7 +799,7 @@ public class MetaDataCreateIndexService extends AbstractComponent {
* the less default split operations are supported * the less default split operations are supported
*/ */
public static int calculateNumRoutingShards(int numShards, Version indexVersionCreated) { public static int calculateNumRoutingShards(int numShards, Version indexVersionCreated) {
if (indexVersionCreated.onOrAfter(Version.V_7_0_0_alpha1)) { if (indexVersionCreated.onOrAfter(Version.V_7_0_0)) {
// only select this automatically for indices that are created on or after 7.0 this will prevent this new behaviour // only select this automatically for indices that are created on or after 7.0 this will prevent this new behaviour
// until we have a fully upgraded cluster. Additionally it will make integratin testing easier since mixed clusters // until we have a fully upgraded cluster. Additionally it will make integratin testing easier since mixed clusters
// will always have the behavior of the min node in the cluster. // will always have the behavior of the min node in the cluster.

4
server/src/main/java/org/elasticsearch/common/breaker/CircuitBreakingException.java
View File

@ -40,7 +40,7 @@ public class CircuitBreakingException extends ElasticsearchException {
super(in); super(in);
byteLimit = in.readLong(); byteLimit = in.readLong();
bytesWanted = in.readLong(); bytesWanted = in.readLong();
if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { if (in.getVersion().onOrAfter(Version.V_7_0_0)) {
durability = in.readEnum(CircuitBreaker.Durability.class); durability = in.readEnum(CircuitBreaker.Durability.class);
} else { } else {
durability = CircuitBreaker.Durability.PERMANENT; durability = CircuitBreaker.Durability.PERMANENT;
@ -63,7 +63,7 @@ public class CircuitBreakingException extends ElasticsearchException {
super.writeTo(out); super.writeTo(out);
out.writeLong(byteLimit); out.writeLong(byteLimit);
out.writeLong(bytesWanted); out.writeLong(bytesWanted);
if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
out.writeEnum(durability); out.writeEnum(durability);
} }
} }

8
server/src/main/java/org/elasticsearch/common/lucene/Lucene.java
View File

@ -283,7 +283,7 @@ public class Lucene {
private static TotalHits readTotalHits(StreamInput in) throws IOException { private static TotalHits readTotalHits(StreamInput in) throws IOException {
long totalHits = in.readVLong(); long totalHits = in.readVLong();
TotalHits.Relation totalHitsRelation = TotalHits.Relation.EQUAL_TO; TotalHits.Relation totalHitsRelation = TotalHits.Relation.EQUAL_TO;
if (in.getVersion().onOrAfter(org.elasticsearch.Version.V_7_0_0_alpha1)) { if (in.getVersion().onOrAfter(org.elasticsearch.Version.V_7_0_0)) {
totalHitsRelation = in.readEnum(TotalHits.Relation.class); totalHitsRelation = in.readEnum(TotalHits.Relation.class);
} }
return new TotalHits(totalHits, totalHitsRelation); return new TotalHits(totalHits, totalHitsRelation);
@ -402,7 +402,7 @@ public class Lucene {
private static void writeTotalHits(StreamOutput out, TotalHits totalHits) throws IOException { private static void writeTotalHits(StreamOutput out, TotalHits totalHits) throws IOException {
out.writeVLong(totalHits.value); out.writeVLong(totalHits.value);
if (out.getVersion().onOrAfter(org.elasticsearch.Version.V_7_0_0_alpha1)) { if (out.getVersion().onOrAfter(org.elasticsearch.Version.V_7_0_0)) {
out.writeEnum(totalHits.relation); out.writeEnum(totalHits.relation);
} else if (totalHits.value > 0 && totalHits.relation != TotalHits.Relation.EQUAL_TO) { } else if (totalHits.value > 0 && totalHits.relation != TotalHits.Relation.EQUAL_TO) {
throw new IllegalArgumentException("Cannot serialize approximate total hit counts to nodes that are on a version < 7.0.0"); throw new IllegalArgumentException("Cannot serialize approximate total hit counts to nodes that are on a version < 7.0.0");
@ -608,7 +608,7 @@ public class Lucene {
} }
private static Number readExplanationValue(StreamInput in) throws IOException { private static Number readExplanationValue(StreamInput in) throws IOException {
if (in.getVersion().onOrAfter(org.elasticsearch.Version.V_7_0_0_alpha1)) { if (in.getVersion().onOrAfter(org.elasticsearch.Version.V_7_0_0)) {
final int numberType = in.readByte(); final int numberType = in.readByte();
switch (numberType) { switch (numberType) {
case 0: case 0:
@ -640,7 +640,7 @@ public class Lucene {
} }
private static void writeExplanationValue(StreamOutput out, Number value) throws IOException { private static void writeExplanationValue(StreamOutput out, Number value) throws IOException {
if (out.getVersion().onOrAfter(org.elasticsearch.Version.V_7_0_0_alpha1)) { if (out.getVersion().onOrAfter(org.elasticsearch.Version.V_7_0_0)) {
if (value instanceof Float) { if (value instanceof Float) {
out.writeByte((byte) 0); out.writeByte((byte) 0);
out.writeFloat(value.floatValue()); out.writeFloat(value.floatValue());

2
server/src/main/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactory.java
View File

@ -40,7 +40,7 @@ public class ShingleTokenFilterFactory extends AbstractTokenFilterFactory {
int shingleDiff = maxShingleSize - minShingleSize + (outputUnigrams ? 1 : 0); int shingleDiff = maxShingleSize - minShingleSize + (outputUnigrams ? 1 : 0);
if (shingleDiff > maxAllowedShingleDiff) { if (shingleDiff > maxAllowedShingleDiff) {
if (indexSettings.getIndexVersionCreated().onOrAfter(Version.V_7_0_0_alpha1)) { if (indexSettings.getIndexVersionCreated().onOrAfter(Version.V_7_0_0)) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"In Shingle TokenFilter the difference between max_shingle_size and min_shingle_size (and +1 if outputting unigrams)" "In Shingle TokenFilter the difference between max_shingle_size and min_shingle_size (and +1 if outputting unigrams)"
+ " must be less than or equal to: [" + maxAllowedShingleDiff + "] but was [" + shingleDiff + "]. This limit" + " must be less than or equal to: [" + maxAllowedShingleDiff + "] but was [" + shingleDiff + "]. This limit"

4
server/src/main/java/org/elasticsearch/index/mapper/MapperService.java
View File

@ -154,7 +154,7 @@ public class MapperService extends AbstractIndexComponent implements Closeable {
this.mapperRegistry = mapperRegistry; this.mapperRegistry = mapperRegistry;
if (INDEX_MAPPER_DYNAMIC_SETTING.exists(indexSettings.getSettings()) && if (INDEX_MAPPER_DYNAMIC_SETTING.exists(indexSettings.getSettings()) &&
indexSettings.getIndexVersionCreated().onOrAfter(Version.V_7_0_0_alpha1)) { indexSettings.getIndexVersionCreated().onOrAfter(Version.V_7_0_0)) {
throw new IllegalArgumentException("Setting " + INDEX_MAPPER_DYNAMIC_SETTING.getKey() + " was removed after version 6.0.0"); throw new IllegalArgumentException("Setting " + INDEX_MAPPER_DYNAMIC_SETTING.getKey() + " was removed after version 6.0.0");
} }
@ -411,7 +411,7 @@ public class MapperService extends AbstractIndexComponent implements Closeable {
Map<String, DocumentMapper> results = new LinkedHashMap<>(2); Map<String, DocumentMapper> results = new LinkedHashMap<>(2);
if (defaultMapper != null) { if (defaultMapper != null) {
if (indexSettings.getIndexVersionCreated().onOrAfter(Version.V_7_0_0_alpha1)) { if (indexSettings.getIndexVersionCreated().onOrAfter(Version.V_7_0_0)) {
throw new IllegalArgumentException("The [default] mapping cannot be updated on index [" + index().getName() + throw new IllegalArgumentException("The [default] mapping cannot be updated on index [" + index().getName() +
"]: defaults mappings are not useful anymore now that indices can have at most one type."); "]: defaults mappings are not useful anymore now that indices can have at most one type.");
} else if (reason == MergeReason.MAPPING_UPDATE) { // only log in case of explicit mapping updates } else if (reason == MergeReason.MAPPING_UPDATE) { // only log in case of explicit mapping updates

6
server/src/main/java/org/elasticsearch/index/similarity/SimilarityProviders.java
View File

@ -139,7 +139,7 @@ final class SimilarityProviders {
if (model == null) { if (model == null) {
String replacement = LEGACY_BASIC_MODELS.get(basicModel); String replacement = LEGACY_BASIC_MODELS.get(basicModel);
if (replacement != null) { if (replacement != null) {
if (indexCreatedVersion.onOrAfter(Version.V_7_0_0_alpha1)) { if (indexCreatedVersion.onOrAfter(Version.V_7_0_0)) {
throw new IllegalArgumentException("Basic model [" + basicModel + "] isn't supported anymore, " + throw new IllegalArgumentException("Basic model [" + basicModel + "] isn't supported anymore, " +
"please use another model."); "please use another model.");
} else { } else {
@ -170,7 +170,7 @@ final class SimilarityProviders {
if (effect == null) { if (effect == null) {
String replacement = LEGACY_AFTER_EFFECTS.get(afterEffect); String replacement = LEGACY_AFTER_EFFECTS.get(afterEffect);
if (replacement != null) { if (replacement != null) {
if (indexCreatedVersion.onOrAfter(Version.V_7_0_0_alpha1)) { if (indexCreatedVersion.onOrAfter(Version.V_7_0_0)) {
throw new IllegalArgumentException("After effect [" + afterEffect + throw new IllegalArgumentException("After effect [" + afterEffect +
"] isn't supported anymore, please use another effect."); "] isn't supported anymore, please use another effect.");
} else { } else {
@ -261,7 +261,7 @@ final class SimilarityProviders {
unknownSettings.removeAll(Arrays.asList(supportedSettings)); unknownSettings.removeAll(Arrays.asList(supportedSettings));
unknownSettings.remove("type"); // used to figure out which sim this is unknownSettings.remove("type"); // used to figure out which sim this is
if (unknownSettings.isEmpty() == false) { if (unknownSettings.isEmpty() == false) {
if (version.onOrAfter(Version.V_7_0_0_alpha1)) { if (version.onOrAfter(Version.V_7_0_0)) {
throw new IllegalArgumentException("Unknown settings for similarity of type [" + type + "]: " + unknownSettings); throw new IllegalArgumentException("Unknown settings for similarity of type [" + type + "]: " + unknownSettings);
} else { } else {
deprecationLogger.deprecated("Unknown settings for similarity of type [" + type + "]: " + unknownSettings); deprecationLogger.deprecated("Unknown settings for similarity of type [" + type + "]: " + unknownSettings);

6
server/src/main/java/org/elasticsearch/index/similarity/SimilarityService.java
View File

@ -59,7 +59,7 @@ public final class SimilarityService extends AbstractIndexComponent {
static { static {
Map<String, Function<Version, Supplier<Similarity>>> defaults = new HashMap<>(); Map<String, Function<Version, Supplier<Similarity>>> defaults = new HashMap<>();
defaults.put(CLASSIC_SIMILARITY, version -> { defaults.put(CLASSIC_SIMILARITY, version -> {
if (version.onOrAfter(Version.V_7_0_0_alpha1)) { if (version.onOrAfter(Version.V_7_0_0)) {
return () -> { return () -> {
throw new IllegalArgumentException("The [classic] similarity may not be used anymore. Please use the [BM25] " throw new IllegalArgumentException("The [classic] similarity may not be used anymore. Please use the [BM25] "
+ "similarity or build a custom [scripted] similarity instead."); + "similarity or build a custom [scripted] similarity instead.");
@ -86,7 +86,7 @@ public final class SimilarityService extends AbstractIndexComponent {
Map<String, TriFunction<Settings, Version, ScriptService, Similarity>> builtIn = new HashMap<>(); Map<String, TriFunction<Settings, Version, ScriptService, Similarity>> builtIn = new HashMap<>();
builtIn.put(CLASSIC_SIMILARITY, builtIn.put(CLASSIC_SIMILARITY,
(settings, version, script) -> { (settings, version, script) -> {
if (version.onOrAfter(Version.V_7_0_0_alpha1)) { if (version.onOrAfter(Version.V_7_0_0)) {
throw new IllegalArgumentException("The [classic] similarity may not be used anymore. Please use the [BM25] " throw new IllegalArgumentException("The [classic] similarity may not be used anymore. Please use the [BM25] "
+ "similarity or build a custom [scripted] similarity instead."); + "similarity or build a custom [scripted] similarity instead.");
} else { } else {
@ -267,7 +267,7 @@ public final class SimilarityService extends AbstractIndexComponent {
} }
private static void fail(Version indexCreatedVersion, String message) { private static void fail(Version indexCreatedVersion, String message) {
if (indexCreatedVersion.onOrAfter(Version.V_7_0_0_alpha1)) { if (indexCreatedVersion.onOrAfter(Version.V_7_0_0)) {
throw new IllegalArgumentException(message); throw new IllegalArgumentException(message);
} else if (indexCreatedVersion.onOrAfter(Version.V_6_5_0)) { } else if (indexCreatedVersion.onOrAfter(Version.V_6_5_0)) {
deprecationLogger.deprecated(message); deprecationLogger.deprecated(message);

4
server/src/main/java/org/elasticsearch/index/translog/Translog.java
View File

@ -1200,7 +1200,7 @@ public class Translog extends AbstractIndexShardComponent implements IndexShardC
} }
private void write(final StreamOutput out) throws IOException { private void write(final StreamOutput out) throws IOException {
final int format = out.getVersion().onOrAfter(Version.V_7_0_0_alpha1) ? SERIALIZATION_FORMAT : FORMAT_6_0; final int format = out.getVersion().onOrAfter(Version.V_7_0_0) ? SERIALIZATION_FORMAT : FORMAT_6_0;
out.writeVInt(format); out.writeVInt(format);
out.writeString(id); out.writeString(id);
out.writeString(type); out.writeString(type);
@ -1360,7 +1360,7 @@ public class Translog extends AbstractIndexShardComponent implements IndexShardC
} }
private void write(final StreamOutput out) throws IOException { private void write(final StreamOutput out) throws IOException {
final int format = out.getVersion().onOrAfter(Version.V_7_0_0_alpha1) ? SERIALIZATION_FORMAT : FORMAT_6_0; final int format = out.getVersion().onOrAfter(Version.V_7_0_0) ? SERIALIZATION_FORMAT : FORMAT_6_0;
out.writeVInt(format); out.writeVInt(format);
out.writeString(type); out.writeString(type);
out.writeString(id); out.writeString(id);

4
server/src/main/java/org/elasticsearch/indices/analysis/AnalysisModule.java
View File

@ -124,7 +124,7 @@ public final class AnalysisModule {
tokenFilters.register("standard", new AnalysisProvider<TokenFilterFactory>() { tokenFilters.register("standard", new AnalysisProvider<TokenFilterFactory>() {
@Override @Override
public TokenFilterFactory get(IndexSettings indexSettings, Environment environment, String name, Settings settings) { public TokenFilterFactory get(IndexSettings indexSettings, Environment environment, String name, Settings settings) {
if (indexSettings.getIndexVersionCreated().before(Version.V_7_0_0_alpha1)) { if (indexSettings.getIndexVersionCreated().before(Version.V_7_0_0)) {
deprecationLogger.deprecatedAndMaybeLog("standard_deprecation", deprecationLogger.deprecatedAndMaybeLog("standard_deprecation",
"The [standard] token filter name is deprecated and will be removed in a future version."); "The [standard] token filter name is deprecated and will be removed in a future version.");
} else { } else {
@ -182,7 +182,7 @@ public final class AnalysisModule {
// Add "standard" for old indices (bwc) // Add "standard" for old indices (bwc)
preConfiguredTokenFilters.register( "standard", preConfiguredTokenFilters.register( "standard",
PreConfiguredTokenFilter.singletonWithVersion("standard", true, (reader, version) -> { PreConfiguredTokenFilter.singletonWithVersion("standard", true, (reader, version) -> {
if (version.before(Version.V_7_0_0_alpha1)) { if (version.before(Version.V_7_0_0)) {
deprecationLogger.deprecatedAndMaybeLog("standard_deprecation", deprecationLogger.deprecatedAndMaybeLog("standard_deprecation",
"The [standard] token filter is deprecated and will be removed in a future version."); "The [standard] token filter is deprecated and will be removed in a future version.");
} else { } else {

17
server/src/main/java/org/elasticsearch/node/Node.java
View File

@ -26,7 +26,6 @@ import org.apache.lucene.util.SetOnce;
import org.elasticsearch.Build; import org.elasticsearch.Build;
import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.ElasticsearchTimeoutException; import org.elasticsearch.ElasticsearchTimeoutException;
import org.elasticsearch.Version;
import org.elasticsearch.action.Action; import org.elasticsearch.action.Action;
import org.elasticsearch.action.ActionModule; import org.elasticsearch.action.ActionModule;
import org.elasticsearch.action.search.SearchExecutionStatsCollector; import org.elasticsearch.action.search.SearchExecutionStatsCollector;
@ -279,7 +278,7 @@ public class Node implements Closeable {
final JvmInfo jvmInfo = JvmInfo.jvmInfo(); final JvmInfo jvmInfo = JvmInfo.jvmInfo();
logger.info( logger.info(
"version[{}], pid[{}], build[{}/{}/{}/{}], OS[{}/{}/{}], JVM[{}/{}/{}/{}]", "version[{}], pid[{}], build[{}/{}/{}/{}], OS[{}/{}/{}], JVM[{}/{}/{}/{}]",
Version.displayVersion(Version.CURRENT, Build.CURRENT.isSnapshot()), Build.CURRENT.getQualifiedVersion(),
jvmInfo.pid(), jvmInfo.pid(),
Build.CURRENT.flavor().displayName(), Build.CURRENT.flavor().displayName(),
Build.CURRENT.type().displayName(), Build.CURRENT.type().displayName(),
@ -293,7 +292,11 @@ public class Node implements Closeable {
Constants.JAVA_VERSION, Constants.JAVA_VERSION,
Constants.JVM_VERSION); Constants.JVM_VERSION);
logger.info("JVM arguments {}", Arrays.toString(jvmInfo.getInputArguments())); logger.info("JVM arguments {}", Arrays.toString(jvmInfo.getInputArguments()));
warnIfPreRelease(Version.CURRENT, Build.CURRENT.isSnapshot(), logger); if (Build.CURRENT.isProductionRelease() == false) {
logger.warn(
"version [{}] is a pre-release version of Elasticsearch and is not suitable for production",
Build.CURRENT.getQualifiedVersion());
}
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug("using config [{}], data [{}], logs [{}], plugins [{}]", logger.debug("using config [{}], data [{}], logs [{}], plugins [{}]",
@ -577,14 +580,6 @@ public class Node implements Closeable {
} }
} }
static void warnIfPreRelease(final Version version, final boolean isSnapshot, final Logger logger) {
if (!version.isRelease() || isSnapshot) {
logger.warn(
"version [{}] is a pre-release version of Elasticsearch and is not suitable for production",
Version.displayVersion(version, isSnapshot));
}
}
protected TransportService newTransportService(Settings settings, Transport transport, ThreadPool threadPool, protected TransportService newTransportService(Settings settings, Transport transport, ThreadPool threadPool,
TransportInterceptor interceptor, TransportInterceptor interceptor,
Function<BoundTransportAddress, DiscoveryNode> localNodeFactory, Function<BoundTransportAddress, DiscoveryNode> localNodeFactory,

4
server/src/main/java/org/elasticsearch/script/ScriptStats.java
View File

@ -42,14 +42,14 @@ public class ScriptStats implements Writeable, ToXContentFragment {
public ScriptStats(StreamInput in) throws IOException { public ScriptStats(StreamInput in) throws IOException {
compilations = in.readVLong(); compilations = in.readVLong();
cacheEvictions = in.readVLong(); cacheEvictions = in.readVLong();
compilationLimitTriggered = in.getVersion().onOrAfter(Version.V_7_0_0_alpha1) ? in.readVLong() : 0; compilationLimitTriggered = in.getVersion().onOrAfter(Version.V_7_0_0) ? in.readVLong() : 0;
} }
@Override @Override
public void writeTo(StreamOutput out) throws IOException { public void writeTo(StreamOutput out) throws IOException {
out.writeVLong(compilations); out.writeVLong(compilations);
out.writeVLong(cacheEvictions); out.writeVLong(cacheEvictions);
if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
out.writeVLong(compilationLimitTriggered); out.writeVLong(compilationLimitTriggered);
} }
} }

4
server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceBuilder.java
View File

@ -72,7 +72,7 @@ public abstract class CompositeValuesSourceBuilder<AB extends CompositeValuesSou
} else { } else {
this.missingBucket = false; this.missingBucket = false;
} }
if (in.getVersion().before(Version.V_7_0_0_alpha1)) { if (in.getVersion().before(Version.V_7_0_0)) {
// skip missing value for BWC // skip missing value for BWC
in.readGenericValue(); in.readGenericValue();
} }
@ -101,7 +101,7 @@ public abstract class CompositeValuesSourceBuilder<AB extends CompositeValuesSou
if (out.getVersion().onOrAfter(Version.V_6_4_0)) { if (out.getVersion().onOrAfter(Version.V_6_4_0)) {
out.writeBoolean(missingBucket); out.writeBoolean(missingBucket);
} }
if (out.getVersion().before(Version.V_7_0_0_alpha1)) { if (out.getVersion().before(Version.V_7_0_0)) {
// write missing value for BWC // write missing value for BWC
out.writeGenericValue(null); out.writeGenericValue(null);
} }

4
server/src/main/java/org/elasticsearch/search/dfs/DfsSearchResult.java
View File

@ -129,7 +129,7 @@ public class DfsSearchResult extends SearchPhaseResult {
CollectionStatistics statistics = c.value; CollectionStatistics statistics = c.value;
assert statistics.maxDoc() >= 0; assert statistics.maxDoc() >= 0;
out.writeVLong(statistics.maxDoc()); out.writeVLong(statistics.maxDoc());
if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
// stats are always positive numbers // stats are always positive numbers
out.writeVLong(statistics.docCount()); out.writeVLong(statistics.docCount());
out.writeVLong(statistics.sumTotalTermFreq()); out.writeVLong(statistics.sumTotalTermFreq());
@ -176,7 +176,7 @@ public class DfsSearchResult extends SearchPhaseResult {
final long docCount; final long docCount;
final long sumTotalTermFreq; final long sumTotalTermFreq;
final long sumDocFreq; final long sumDocFreq;
if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { if (in.getVersion().onOrAfter(Version.V_7_0_0)) {
// stats are always positive numbers // stats are always positive numbers
docCount = in.readVLong(); docCount = in.readVLong();
sumTotalTermFreq = in.readVLong(); sumTotalTermFreq = in.readVLong();

2
server/src/main/java/org/elasticsearch/search/slice/SliceBuilder.java
View File

@ -260,7 +260,7 @@ public class SliceBuilder implements Writeable, ToXContentObject {
if ("_uid".equals(field)) { if ("_uid".equals(field)) {
// on new indices, the _id acts as a _uid // on new indices, the _id acts as a _uid
field = IdFieldMapper.NAME; field = IdFieldMapper.NAME;
if (context.getIndexSettings().getIndexVersionCreated().onOrAfter(Version.V_7_0_0_alpha1)) { if (context.getIndexSettings().getIndexVersionCreated().onOrAfter(Version.V_7_0_0)) {
throw new IllegalArgumentException("Computing slices on the [_uid] field is illegal for 7.x indices, use [_id] instead"); throw new IllegalArgumentException("Computing slices on the [_uid] field is illegal for 7.x indices, use [_id] instead");
} }
DEPRECATION_LOG.deprecated("Computing slices on the [_uid] field is deprecated for 6.x indices, use [_id] instead"); DEPRECATION_LOG.deprecated("Computing slices on the [_uid] field is deprecated for 6.x indices, use [_id] instead");

8
server/src/main/java/org/elasticsearch/search/suggest/Suggest.java
View File

@ -93,7 +93,7 @@ public class Suggest implements Iterable<Suggest.Suggestion<? extends Entry<? ex
public Suggest(StreamInput in) throws IOException { public Suggest(StreamInput in) throws IOException {
// in older versions, Suggestion types were serialized as Streamable // in older versions, Suggestion types were serialized as Streamable
if (in.getVersion().before(Version.V_7_0_0_alpha1)) { if (in.getVersion().before(Version.V_7_0_0)) {
final int size = in.readVInt(); final int size = in.readVInt();
suggestions = new ArrayList<>(size); suggestions = new ArrayList<>(size);
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
@ -161,7 +161,7 @@ public class Suggest implements Iterable<Suggest.Suggestion<? extends Entry<? ex
@Override @Override
public void writeTo(StreamOutput out) throws IOException { public void writeTo(StreamOutput out) throws IOException {
// in older versions, Suggestion types were serialized as Streamable // in older versions, Suggestion types were serialized as Streamable
if (out.getVersion().before(Version.V_7_0_0_alpha1)) { if (out.getVersion().before(Version.V_7_0_0)) {
out.writeVInt(suggestions.size()); out.writeVInt(suggestions.size());
for (Suggestion<?> command : suggestions) { for (Suggestion<?> command : suggestions) {
out.writeVInt(command.getWriteableType()); out.writeVInt(command.getWriteableType());
@ -279,7 +279,7 @@ public class Suggest implements Iterable<Suggest.Suggestion<? extends Entry<? ex
size = in.readVInt(); size = in.readVInt();
// this is a hack to work around slightly different serialization order of earlier versions of TermSuggestion // this is a hack to work around slightly different serialization order of earlier versions of TermSuggestion
if (in.getVersion().before(Version.V_7_0_0_alpha1) && this instanceof TermSuggestion) { if (in.getVersion().before(Version.V_7_0_0) && this instanceof TermSuggestion) {
TermSuggestion t = (TermSuggestion) this; TermSuggestion t = (TermSuggestion) this;
t.setSort(SortBy.readFromStream(in)); t.setSort(SortBy.readFromStream(in));
} }
@ -389,7 +389,7 @@ public class Suggest implements Iterable<Suggest.Suggestion<? extends Entry<? ex
out.writeVInt(size); out.writeVInt(size);
// this is a hack to work around slightly different serialization order in older versions of TermSuggestion // this is a hack to work around slightly different serialization order in older versions of TermSuggestion
if (out.getVersion().before(Version.V_7_0_0_alpha1) && this instanceof TermSuggestion) { if (out.getVersion().before(Version.V_7_0_0) && this instanceof TermSuggestion) {
TermSuggestion termSuggestion = (TermSuggestion) this; TermSuggestion termSuggestion = (TermSuggestion) this;
termSuggestion.getSort().writeTo(out); termSuggestion.getSort().writeTo(out);
} }

4
server/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoContextMapping.java
View File

@ -292,7 +292,7 @@ public class GeoContextMapping extends ContextMapping<GeoQueryContext> {
if (fieldName != null) { if (fieldName != null) {
MappedFieldType mappedFieldType = fieldResolver.apply(fieldName); MappedFieldType mappedFieldType = fieldResolver.apply(fieldName);
if (mappedFieldType == null) { if (mappedFieldType == null) {
if (indexVersionCreated.before(Version.V_7_0_0_alpha1)) { if (indexVersionCreated.before(Version.V_7_0_0)) {
deprecationLogger.deprecatedAndMaybeLog("geo_context_mapping", deprecationLogger.deprecatedAndMaybeLog("geo_context_mapping",
"field [{}] referenced in context [{}] is not defined in the mapping", fieldName, name); "field [{}] referenced in context [{}] is not defined in the mapping", fieldName, name);
} else { } else {
@ -300,7 +300,7 @@ public class GeoContextMapping extends ContextMapping<GeoQueryContext> {
"field [{}] referenced in context [{}] is not defined in the mapping", fieldName, name); "field [{}] referenced in context [{}] is not defined in the mapping", fieldName, name);
} }
} else if (GeoPointFieldMapper.CONTENT_TYPE.equals(mappedFieldType.typeName()) == false) { } else if (GeoPointFieldMapper.CONTENT_TYPE.equals(mappedFieldType.typeName()) == false) {
if (indexVersionCreated.before(Version.V_7_0_0_alpha1)) { if (indexVersionCreated.before(Version.V_7_0_0)) {
deprecationLogger.deprecatedAndMaybeLog("geo_context_mapping", deprecationLogger.deprecatedAndMaybeLog("geo_context_mapping",
"field [{}] referenced in context [{}] must be mapped to geo_point, found [{}]", "field [{}] referenced in context [{}] must be mapped to geo_point, found [{}]",
fieldName, name, mappedFieldType.typeName()); fieldName, name, mappedFieldType.typeName());

4
server/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestion.java
View File

@ -62,7 +62,7 @@ public class TermSuggestion extends Suggestion<TermSuggestion.Entry> {
public TermSuggestion(StreamInput in) throws IOException { public TermSuggestion(StreamInput in) throws IOException {
super(in); super(in);
if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { if (in.getVersion().onOrAfter(Version.V_7_0_0)) {
sort = SortBy.readFromStream(in); sort = SortBy.readFromStream(in);
} }
} }
@ -137,7 +137,7 @@ public class TermSuggestion extends Suggestion<TermSuggestion.Entry> {
public void writeTo(StreamOutput out) throws IOException { public void writeTo(StreamOutput out) throws IOException {
super.writeTo(out); super.writeTo(out);
if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
sort.writeTo(out); sort.writeTo(out);
} }
} }

4
server/src/main/java/org/elasticsearch/transport/RemoteConnectionInfo.java
View File

@ -58,7 +58,7 @@ public final class RemoteConnectionInfo implements ToXContentFragment, Writeable
public RemoteConnectionInfo(StreamInput input) throws IOException { public RemoteConnectionInfo(StreamInput input) throws IOException {
seedNodes = input.readList(TransportAddress::new); seedNodes = input.readList(TransportAddress::new);
if (input.getVersion().before(Version.V_7_0_0_alpha1)) { if (input.getVersion().before(Version.V_7_0_0)) {
/* /*
* Versions before 7.0 sent the HTTP addresses of all nodes in the * Versions before 7.0 sent the HTTP addresses of all nodes in the
* remote cluster here but it was expensive to fetch and we * remote cluster here but it was expensive to fetch and we
@ -79,7 +79,7 @@ public final class RemoteConnectionInfo implements ToXContentFragment, Writeable
@Override @Override
public void writeTo(StreamOutput out) throws IOException { public void writeTo(StreamOutput out) throws IOException {
out.writeList(seedNodes); out.writeList(seedNodes);
if (out.getVersion().before(Version.V_7_0_0_alpha1)) { if (out.getVersion().before(Version.V_7_0_0)) {
/* /*
* Versions before 7.0 sent the HTTP addresses of all nodes in the * Versions before 7.0 sent the HTTP addresses of all nodes in the
* remote cluster here but it was expensive to fetch and we * remote cluster here but it was expensive to fetch and we

58
server/src/test/java/org/elasticsearch/BuildTests.java
View File

@ -41,32 +41,78 @@ public class BuildTests extends ESTestCase {
assertNotNull(Build.CURRENT.shortHash()); assertNotNull(Build.CURRENT.shortHash());
} }
public void testIsProduction() {
Build build = new Build(
Build.CURRENT.flavor(), Build.CURRENT.type(), Build.CURRENT.shortHash(), Build.CURRENT.date(),
Build.CURRENT.isSnapshot(), Math.abs(randomInt()) + "." + Math.abs(randomInt()) + "." + Math.abs(randomInt())
);
assertTrue(build.getQualifiedVersion(), build.isProductionRelease());
assertFalse(new Build(
Build.CURRENT.flavor(), Build.CURRENT.type(), Build.CURRENT.shortHash(), Build.CURRENT.date(),
Build.CURRENT.isSnapshot(), "7.0.0-alpha1"
).isProductionRelease());
assertFalse(new Build(
Build.CURRENT.flavor(), Build.CURRENT.type(), Build.CURRENT.shortHash(), Build.CURRENT.date(),
Build.CURRENT.isSnapshot(), "7.0.0-alpha1-SNAPSHOT"
).isProductionRelease());
assertFalse(new Build(
Build.CURRENT.flavor(), Build.CURRENT.type(), Build.CURRENT.shortHash(), Build.CURRENT.date(),
Build.CURRENT.isSnapshot(), "7.0.0-SNAPSHOT"
).isProductionRelease());
assertFalse(new Build(
Build.CURRENT.flavor(), Build.CURRENT.type(), Build.CURRENT.shortHash(), Build.CURRENT.date(),
Build.CURRENT.isSnapshot(), "Unknown"
).isProductionRelease());
}
public void testEqualsAndHashCode() { public void testEqualsAndHashCode() {
Build build = Build.CURRENT; Build build = Build.CURRENT;
Build another = new Build(build.flavor(), build.type(), build.shortHash(), build.date(), build.isSnapshot()); Build another = new Build(
build.flavor(), build.type(), build.shortHash(), build.date(), build.isSnapshot(), build.getQualifiedVersion()
);
assertEquals(build, another); assertEquals(build, another);
assertEquals(build.hashCode(), another.hashCode()); assertEquals(build.hashCode(), another.hashCode());
final Set<Build.Flavor> otherFlavors = final Set<Build.Flavor> otherFlavors =
Arrays.stream(Build.Flavor.values()).filter(f -> !f.equals(build.flavor())).collect(Collectors.toSet()); Arrays.stream(Build.Flavor.values()).filter(f -> !f.equals(build.flavor())).collect(Collectors.toSet());
final Build.Flavor otherFlavor = randomFrom(otherFlavors); final Build.Flavor otherFlavor = randomFrom(otherFlavors);
Build differentFlavor = new Build(otherFlavor, build.type(), build.shortHash(), build.date(), build.isSnapshot()); Build differentFlavor = new Build(
otherFlavor, build.type(), build.shortHash(), build.date(), build.isSnapshot(), build.getQualifiedVersion()
);
assertNotEquals(build, differentFlavor); assertNotEquals(build, differentFlavor);
final Set<Build.Type> otherTypes = final Set<Build.Type> otherTypes =
Arrays.stream(Build.Type.values()).filter(f -> !f.equals(build.type())).collect(Collectors.toSet()); Arrays.stream(Build.Type.values()).filter(f -> !f.equals(build.type())).collect(Collectors.toSet());
final Build.Type otherType = randomFrom(otherTypes); final Build.Type otherType = randomFrom(otherTypes);
Build differentType = new Build(build.flavor(), otherType, build.shortHash(), build.date(), build.isSnapshot()); Build differentType = new Build(
build.flavor(), otherType, build.shortHash(), build.date(), build.isSnapshot(), build.getQualifiedVersion()
);
assertNotEquals(build, differentType); assertNotEquals(build, differentType);
Build differentHash = new Build(build.flavor(), build.type(), randomAlphaOfLengthBetween(3, 10), build.date(), build.isSnapshot()); Build differentHash = new Build(
build.flavor(), build.type(), randomAlphaOfLengthBetween(3, 10), build.date(), build.isSnapshot(),
build.getQualifiedVersion()
);
assertNotEquals(build, differentHash); assertNotEquals(build, differentHash);
Build differentDate = new Build(build.flavor(), build.type(), build.shortHash(), "1970-01-01", build.isSnapshot()); Build differentDate = new Build(
build.flavor(), build.type(), build.shortHash(), "1970-01-01", build.isSnapshot(), build.getQualifiedVersion()
);
assertNotEquals(build, differentDate); assertNotEquals(build, differentDate);
Build differentSnapshot = new Build(build.flavor(), build.type(), build.shortHash(), build.date(), !build.isSnapshot()); Build differentSnapshot = new Build(
build.flavor(), build.type(), build.shortHash(), build.date(), !build.isSnapshot(), build.getQualifiedVersion()
);
assertNotEquals(build, differentSnapshot); assertNotEquals(build, differentSnapshot);
Build differentVersion = new Build(
build.flavor(), build.type(), build.shortHash(), build.date(), build.isSnapshot(), "7.0.0"
);
assertNotEquals(build, differentVersion);
} }
} }

4
server/src/test/java/org/elasticsearch/ExceptionSerializationTests.java
View File

@ -351,7 +351,7 @@ public class ExceptionSerializationTests extends ESTestCase {
public void testCircuitBreakingException() throws IOException { public void testCircuitBreakingException() throws IOException {
CircuitBreakingException ex = serialize(new CircuitBreakingException("Too large", 0, 100, CircuitBreaker.Durability.TRANSIENT), CircuitBreakingException ex = serialize(new CircuitBreakingException("Too large", 0, 100, CircuitBreaker.Durability.TRANSIENT),
Version.V_7_0_0_alpha1); Version.V_7_0_0);
assertEquals("Too large", ex.getMessage()); assertEquals("Too large", ex.getMessage());
assertEquals(100, ex.getByteLimit()); assertEquals(100, ex.getByteLimit());
assertEquals(0, ex.getBytesWanted()); assertEquals(0, ex.getBytesWanted());
@ -361,7 +361,7 @@ public class ExceptionSerializationTests extends ESTestCase {
public void testTooManyBucketsException() throws IOException { public void testTooManyBucketsException() throws IOException {
MultiBucketConsumerService.TooManyBucketsException ex = MultiBucketConsumerService.TooManyBucketsException ex =
serialize(new MultiBucketConsumerService.TooManyBucketsException("Too many buckets", 100), serialize(new MultiBucketConsumerService.TooManyBucketsException("Too many buckets", 100),
randomFrom(Version.V_7_0_0_alpha1)); randomFrom(Version.V_7_0_0));
assertEquals("Too many buckets", ex.getMessage()); assertEquals("Too many buckets", ex.getMessage());
assertEquals(100, ex.getMaxBuckets()); assertEquals(100, ex.getMaxBuckets());
} }

48
server/src/test/java/org/elasticsearch/VersionTests.java
View File

@ -37,7 +37,7 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import static org.elasticsearch.Version.V_6_3_0; import static org.elasticsearch.Version.V_6_3_0;
import static org.elasticsearch.Version.V_7_0_0_alpha1; import static org.elasticsearch.Version.V_7_0_0;
import static org.elasticsearch.test.VersionUtils.allVersions; import static org.elasticsearch.test.VersionUtils.allVersions;
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;
@ -50,30 +50,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_6_3_0.before(V_7_0_0_alpha1), is(true)); assertThat(V_6_3_0.before(V_7_0_0), is(true));
assertThat(V_6_3_0.before(V_6_3_0), is(false)); assertThat(V_6_3_0.before(V_6_3_0), is(false));
assertThat(V_7_0_0_alpha1.before(V_6_3_0), is(false)); assertThat(V_7_0_0.before(V_6_3_0), is(false));
assertThat(V_6_3_0.onOrBefore(V_7_0_0_alpha1), is(true)); assertThat(V_6_3_0.onOrBefore(V_7_0_0), is(true));
assertThat(V_6_3_0.onOrBefore(V_6_3_0), is(true)); assertThat(V_6_3_0.onOrBefore(V_6_3_0), is(true));
assertThat(V_7_0_0_alpha1.onOrBefore(V_6_3_0), is(false)); assertThat(V_7_0_0.onOrBefore(V_6_3_0), is(false));
assertThat(V_6_3_0.after(V_7_0_0_alpha1), is(false)); assertThat(V_6_3_0.after(V_7_0_0), is(false));
assertThat(V_6_3_0.after(V_6_3_0), is(false)); assertThat(V_6_3_0.after(V_6_3_0), is(false));
assertThat(V_7_0_0_alpha1.after(V_6_3_0), is(true)); assertThat(V_7_0_0.after(V_6_3_0), is(true));
assertThat(V_6_3_0.onOrAfter(V_7_0_0_alpha1), is(false)); assertThat(V_6_3_0.onOrAfter(V_7_0_0), is(false));
assertThat(V_6_3_0.onOrAfter(V_6_3_0), is(true)); assertThat(V_6_3_0.onOrAfter(V_6_3_0), is(true));
assertThat(V_7_0_0_alpha1.onOrAfter(V_6_3_0), is(true)); assertThat(V_7_0_0.onOrAfter(V_6_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_6_3_0, is(lessThan(V_7_0_0_alpha1))); assertThat(V_6_3_0, is(lessThan(V_7_0_0)));
assertThat(V_6_3_0.compareTo(V_6_3_0), is(0)); assertThat(V_6_3_0.compareTo(V_6_3_0), is(0));
assertThat(V_7_0_0_alpha1, is(greaterThan(V_6_3_0))); assertThat(V_7_0_0, is(greaterThan(V_6_3_0)));
} }
public void testMin() { public void testMin() {
@ -182,10 +182,10 @@ public class VersionTests extends ESTestCase {
// from 7.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 7.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 = Version.V_6_6_0; // TODO: remove this once min compat version is a constant instead of method Version lastVersion = Version.V_6_6_0; // TODO: remove this once min compat version is a constant instead of method
assertEquals(lastVersion.major, Version.V_7_0_0_alpha1.minimumCompatibilityVersion().major); assertEquals(lastVersion.major, Version.V_7_0_0.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_7_0_0_alpha1.minimumCompatibilityVersion().minor); lastVersion.minor, Version.V_7_0_0.minimumCompatibilityVersion().minor);
assertEquals(0, Version.V_7_0_0_alpha1.minimumCompatibilityVersion().revision); assertEquals(0, Version.V_7_0_0.minimumCompatibilityVersion().revision);
} }
public void testToString() { public void testToString() {
@ -340,12 +340,10 @@ public class VersionTests extends ESTestCase {
public void testIsCompatible() { public void testIsCompatible() {
assertTrue(isCompatible(Version.CURRENT, Version.CURRENT.minimumCompatibilityVersion())); assertTrue(isCompatible(Version.CURRENT, Version.CURRENT.minimumCompatibilityVersion()));
assertFalse(isCompatible(Version.V_6_5_0, Version.V_7_0_0_alpha1)); assertFalse(isCompatible(Version.V_6_5_0, Version.V_7_0_0));
assertTrue(isCompatible(Version.V_6_6_0, Version.V_7_0_0_alpha1)); assertTrue(isCompatible(Version.V_6_6_0, Version.V_7_0_0));
assertFalse(isCompatible(Version.fromId(2000099), Version.V_7_0_0_alpha1)); assertFalse(isCompatible(Version.fromId(2000099), Version.V_7_0_0));
assertFalse(isCompatible(Version.fromId(2000099), Version.V_6_5_0)); assertFalse(isCompatible(Version.fromId(2000099), Version.V_6_5_0));
assertFalse(isCompatible(Version.fromString("7.0.0"), Version.fromString("8.0.0")));
assertFalse(isCompatible(Version.fromString("7.0.0-alpha1"), Version.fromString("8.0.0")));
final Version currentMajorVersion = Version.fromId(Version.CURRENT.major * 1000000 + 99); final Version currentMajorVersion = Version.fromId(Version.CURRENT.major * 1000000 + 99);
final Version currentOrNextMajorVersion; final Version currentOrNextMajorVersion;
@ -413,16 +411,4 @@ public class VersionTests extends ESTestCase {
VersionTests.assertUnknownVersion(VERSION_5_1_0_UNRELEASED); VersionTests.assertUnknownVersion(VERSION_5_1_0_UNRELEASED);
} }
public void testDisplayVersion() {
final Version version = randomVersion(random());
{
final String displayVersion = Version.displayVersion(version, true);
assertThat(displayVersion, equalTo(version.toString() + "-SNAPSHOT"));
}
{
final String displayVersion = Version.displayVersion(version, false);
assertThat(displayVersion, equalTo(version.toString()));
}
}
} }

16
server/src/test/java/org/elasticsearch/action/main/MainResponseTests.java
View File

@ -41,7 +41,10 @@ public class MainResponseTests extends AbstractStreamableXContentTestCase<MainRe
ClusterName clusterName = new ClusterName(randomAlphaOfLength(10)); ClusterName clusterName = new ClusterName(randomAlphaOfLength(10));
String nodeName = randomAlphaOfLength(10); String nodeName = randomAlphaOfLength(10);
final String date = new Date(randomNonNegativeLong()).toString(); final String date = new Date(randomNonNegativeLong()).toString();
Build build = new Build(Build.Flavor.UNKNOWN, Build.Type.UNKNOWN, randomAlphaOfLength(8), date, randomBoolean()); Build build = new Build(
Build.Flavor.UNKNOWN, Build.Type.UNKNOWN, randomAlphaOfLength(8), date, randomBoolean(),
randomAlphaOfLength(12)
);
Version version = VersionUtils.randomVersion(random()); Version version = VersionUtils.randomVersion(random());
return new MainResponse(nodeName, version, clusterName, clusterUuid , build); return new MainResponse(nodeName, version, clusterName, clusterUuid , build);
} }
@ -59,7 +62,10 @@ public class MainResponseTests extends AbstractStreamableXContentTestCase<MainRe
public void testToXContent() throws IOException { public void testToXContent() throws IOException {
String clusterUUID = randomAlphaOfLengthBetween(10, 20); String clusterUUID = randomAlphaOfLengthBetween(10, 20);
final Build current = Build.CURRENT; final Build current = Build.CURRENT;
Build build = new Build(current.flavor(), current.type(), current.shortHash(), current.date(), current.isSnapshot()); Build build = new Build(
current.flavor(), current.type(), current.shortHash(), current.date(), current.isSnapshot(),
current.getQualifiedVersion()
);
Version version = Version.CURRENT; Version version = Version.CURRENT;
MainResponse response = new MainResponse("nodeName", version, new ClusterName("clusterName"), clusterUUID, build); MainResponse response = new MainResponse("nodeName", version, new ClusterName("clusterName"), clusterUUID, build);
XContentBuilder builder = XContentFactory.jsonBuilder(); XContentBuilder builder = XContentFactory.jsonBuilder();
@ -75,6 +81,7 @@ public class MainResponseTests extends AbstractStreamableXContentTestCase<MainRe
+ "\"build_hash\":\"" + current.shortHash() + "\"," + "\"build_hash\":\"" + current.shortHash() + "\","
+ "\"build_date\":\"" + current.date() + "\"," + "\"build_date\":\"" + current.date() + "\","
+ "\"build_snapshot\":" + current.isSnapshot() + "," + "\"build_snapshot\":" + current.isSnapshot() + ","
+ "\"build_version\":\"" + current.getQualifiedVersion() + "\","
+ "\"lucene_version\":\"" + version.luceneVersion.toString() + "\"," + "\"lucene_version\":\"" + version.luceneVersion.toString() + "\","
+ "\"minimum_wire_compatibility_version\":\"" + version.minimumCompatibilityVersion().toString() + "\"," + "\"minimum_wire_compatibility_version\":\"" + version.minimumCompatibilityVersion().toString() + "\","
+ "\"minimum_index_compatibility_version\":\"" + version.minimumIndexCompatibilityVersion().toString() + "\"}," + "\"minimum_index_compatibility_version\":\"" + version.minimumIndexCompatibilityVersion().toString() + "\"},"
@ -98,7 +105,10 @@ public class MainResponseTests extends AbstractStreamableXContentTestCase<MainRe
break; break;
case 2: case 2:
// toggle the snapshot flag of the original Build parameter // toggle the snapshot flag of the original Build parameter
build = new Build(Build.Flavor.UNKNOWN, Build.Type.UNKNOWN, build.shortHash(), build.date(), !build.isSnapshot()); build = new Build(
Build.Flavor.UNKNOWN, Build.Type.UNKNOWN, build.shortHash(), build.date(), !build.isSnapshot(),
build.getQualifiedVersion()
);
break; break;
case 3: case 3:
version = randomValueOtherThan(version, () -> VersionUtils.randomVersion(random())); version = randomValueOtherThan(version, () -> VersionUtils.randomVersion(random()));

2
server/src/test/java/org/elasticsearch/action/support/IndicesOptionsTests.java
View File

@ -51,7 +51,7 @@ public class IndicesOptionsTests extends ESTestCase {
public void testSerialization() throws Exception { public void testSerialization() throws Exception {
int iterations = randomIntBetween(5, 20); int iterations = randomIntBetween(5, 20);
for (int i = 0; i < iterations; i++) { for (int i = 0; i < iterations; i++) {
Version version = randomVersionBetween(random(), Version.V_7_0_0_alpha1, null); Version version = randomVersionBetween(random(), Version.V_7_0_0, null);
IndicesOptions indicesOptions = IndicesOptions.fromOptions( IndicesOptions indicesOptions = IndicesOptions.fromOptions(
randomBoolean(), randomBoolean(), randomBoolean(), randomBoolean(), randomBoolean(), randomBoolean(), randomBoolean(), randomBoolean(), randomBoolean(), randomBoolean(), randomBoolean(), randomBoolean(), randomBoolean(), randomBoolean(),
randomBoolean()); randomBoolean());

3
server/src/test/java/org/elasticsearch/bootstrap/ElasticsearchCliTests.java
View File

@ -20,7 +20,6 @@
package org.elasticsearch.bootstrap; package org.elasticsearch.bootstrap;
import org.elasticsearch.Build; import org.elasticsearch.Build;
import org.elasticsearch.Version;
import org.elasticsearch.cli.ExitCodes; import org.elasticsearch.cli.ExitCodes;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.monitor.jvm.JvmInfo; import org.elasticsearch.monitor.jvm.JvmInfo;
@ -63,7 +62,7 @@ public class ElasticsearchCliTests extends ESElasticsearchCliTestCase {
private void runTestThatVersionIsReturned(String... args) throws Exception { private void runTestThatVersionIsReturned(String... args) throws Exception {
runTestVersion(ExitCodes.OK, output -> { runTestVersion(ExitCodes.OK, output -> {
assertThat(output, containsString("Version: " + Version.displayVersion(Version.CURRENT, Build.CURRENT.isSnapshot()))); assertThat(output, containsString("Version: " + Build.CURRENT.getQualifiedVersion()));
final String expectedBuildOutput = String.format( final String expectedBuildOutput = String.format(
Locale.ROOT, Locale.ROOT,
"Build: %s/%s/%s/%s", "Build: %s/%s/%s/%s",

6
server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexServiceTests.java
View File

@ -103,12 +103,12 @@ public class MetaDataCreateIndexServiceTests extends ESTestCase {
{ {
final Version versionCreated = VersionUtils.randomVersionBetween( final Version versionCreated = VersionUtils.randomVersionBetween(
random(), random(),
Version.V_6_0_0_alpha1, VersionUtils.getPreviousVersion(Version.V_7_0_0_alpha1)); Version.V_6_0_0_alpha1, VersionUtils.getPreviousVersion(Version.V_7_0_0));
final Settings.Builder indexSettingsBuilder = Settings.builder().put(SETTING_VERSION_CREATED, versionCreated); final Settings.Builder indexSettingsBuilder = Settings.builder().put(SETTING_VERSION_CREATED, versionCreated);
assertThat(MetaDataCreateIndexService.IndexCreationTask.getNumberOfShards(indexSettingsBuilder), equalTo(5)); assertThat(MetaDataCreateIndexService.IndexCreationTask.getNumberOfShards(indexSettingsBuilder), equalTo(5));
} }
{ {
final Version versionCreated = VersionUtils.randomVersionBetween(random(), Version.V_7_0_0_alpha1, Version.CURRENT); final Version versionCreated = VersionUtils.randomVersionBetween(random(), Version.V_7_0_0, Version.CURRENT);
final Settings.Builder indexSettingsBuilder = Settings.builder().put(SETTING_VERSION_CREATED, versionCreated); final Settings.Builder indexSettingsBuilder = Settings.builder().put(SETTING_VERSION_CREATED, versionCreated);
assertThat(MetaDataCreateIndexService.IndexCreationTask.getNumberOfShards(indexSettingsBuilder), equalTo(1)); assertThat(MetaDataCreateIndexService.IndexCreationTask.getNumberOfShards(indexSettingsBuilder), equalTo(1));
} }
@ -445,7 +445,7 @@ public class MetaDataCreateIndexServiceTests extends ESTestCase {
assertEquals(2048, MetaDataCreateIndexService.calculateNumRoutingShards(1024, Version.CURRENT)); assertEquals(2048, MetaDataCreateIndexService.calculateNumRoutingShards(1024, Version.CURRENT));
assertEquals(4096, MetaDataCreateIndexService.calculateNumRoutingShards(2048, Version.CURRENT)); assertEquals(4096, MetaDataCreateIndexService.calculateNumRoutingShards(2048, Version.CURRENT));
Version latestV6 = VersionUtils.getPreviousVersion(Version.V_7_0_0_alpha1); Version latestV6 = VersionUtils.getPreviousVersion(Version.V_7_0_0);
int numShards = randomIntBetween(1, 1000); int numShards = randomIntBetween(1, 1000);
assertEquals(numShards, MetaDataCreateIndexService.calculateNumRoutingShards(numShards, latestV6)); assertEquals(numShards, MetaDataCreateIndexService.calculateNumRoutingShards(numShards, latestV6));
assertEquals(numShards, MetaDataCreateIndexService.calculateNumRoutingShards(numShards, assertEquals(numShards, MetaDataCreateIndexService.calculateNumRoutingShards(numShards,

4
server/src/test/java/org/elasticsearch/discovery/zen/MembershipActionTests.java
View File

@ -77,7 +77,7 @@ public class MembershipActionTests extends ESTestCase {
final Version maxNodeVersion = nodes.getMaxNodeVersion(); final Version maxNodeVersion = nodes.getMaxNodeVersion();
final Version minNodeVersion = nodes.getMinNodeVersion(); final Version minNodeVersion = nodes.getMinNodeVersion();
if (maxNodeVersion.onOrAfter(Version.V_7_0_0_alpha1)) { if (maxNodeVersion.onOrAfter(Version.V_7_0_0)) {
final Version tooLow = getPreviousVersion(maxNodeVersion.minimumCompatibilityVersion()); final Version tooLow = getPreviousVersion(maxNodeVersion.minimumCompatibilityVersion());
expectThrows(IllegalStateException.class, () -> { expectThrows(IllegalStateException.class, () -> {
if (randomBoolean()) { if (randomBoolean()) {
@ -99,7 +99,7 @@ public class MembershipActionTests extends ESTestCase {
}); });
} }
if (minNodeVersion.onOrAfter(Version.V_7_0_0_alpha1)) { if (minNodeVersion.onOrAfter(Version.V_7_0_0)) {
Version oldMajor = Version.V_6_4_0.minimumCompatibilityVersion(); Version oldMajor = Version.V_6_4_0.minimumCompatibilityVersion();
expectThrows(IllegalStateException.class, () -> MembershipAction.ensureMajorVersionBarrier(oldMajor, minNodeVersion)); expectThrows(IllegalStateException.class, () -> MembershipAction.ensureMajorVersionBarrier(oldMajor, minNodeVersion));
} }

6
server/src/test/java/org/elasticsearch/index/similarity/SimilarityServiceTests.java
View File

@ -84,7 +84,7 @@ public class SimilarityServiceTests extends ESTestCase {
} }
}; };
IllegalArgumentException e = expectThrows(IllegalArgumentException.class, IllegalArgumentException e = expectThrows(IllegalArgumentException.class,
() -> SimilarityService.validateSimilarity(Version.V_7_0_0_alpha1, negativeScoresSim)); () -> SimilarityService.validateSimilarity(Version.V_7_0_0, negativeScoresSim));
assertThat(e.getMessage(), Matchers.containsString("Similarities should not return negative scores")); assertThat(e.getMessage(), Matchers.containsString("Similarities should not return negative scores"));
Similarity decreasingScoresWithFreqSim = new Similarity() { Similarity decreasingScoresWithFreqSim = new Similarity() {
@ -107,7 +107,7 @@ public class SimilarityServiceTests extends ESTestCase {
} }
}; };
e = expectThrows(IllegalArgumentException.class, e = expectThrows(IllegalArgumentException.class,
() -> SimilarityService.validateSimilarity(Version.V_7_0_0_alpha1, decreasingScoresWithFreqSim)); () -> SimilarityService.validateSimilarity(Version.V_7_0_0, decreasingScoresWithFreqSim));
assertThat(e.getMessage(), Matchers.containsString("Similarity scores should not decrease when term frequency increases")); assertThat(e.getMessage(), Matchers.containsString("Similarity scores should not decrease when term frequency increases"));
Similarity increasingScoresWithNormSim = new Similarity() { Similarity increasingScoresWithNormSim = new Similarity() {
@ -130,7 +130,7 @@ public class SimilarityServiceTests extends ESTestCase {
} }
}; };
e = expectThrows(IllegalArgumentException.class, e = expectThrows(IllegalArgumentException.class,
() -> SimilarityService.validateSimilarity(Version.V_7_0_0_alpha1, increasingScoresWithNormSim)); () -> SimilarityService.validateSimilarity(Version.V_7_0_0, increasingScoresWithNormSim));
assertThat(e.getMessage(), Matchers.containsString("Similarity scores should not increase when norm increases")); assertThat(e.getMessage(), Matchers.containsString("Similarity scores should not increase when norm increases"));
} }

2
server/src/test/java/org/elasticsearch/indices/analysis/AnalysisModuleTests.java
View File

@ -260,7 +260,7 @@ public class AnalysisModuleTests extends ESTestCase {
.put("index.analysis.analyzer.my_standard.tokenizer", "standard") .put("index.analysis.analyzer.my_standard.tokenizer", "standard")
.put("index.analysis.analyzer.my_standard.filter", "standard") .put("index.analysis.analyzer.my_standard.filter", "standard")
.put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString())
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.V_7_0_0_alpha1) .put(IndexMetaData.SETTING_VERSION_CREATED, Version.V_7_0_0)
.build(); .build();
IndexAnalyzers analyzers = getIndexAnalyzers(settings); IndexAnalyzers analyzers = getIndexAnalyzers(settings);
IllegalArgumentException exc = expectThrows(IllegalArgumentException.class, () -> IllegalArgumentException exc = expectThrows(IllegalArgumentException.class, () ->

31
server/src/test/java/org/elasticsearch/node/NodeTests.java
View File

@ -18,9 +18,7 @@
*/ */
package org.elasticsearch.node; package org.elasticsearch.node;
import org.apache.logging.log4j.Logger;
import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.LuceneTestCase;
import org.elasticsearch.Version;
import org.elasticsearch.bootstrap.BootstrapCheck; import org.elasticsearch.bootstrap.BootstrapCheck;
import org.elasticsearch.bootstrap.BootstrapContext; import org.elasticsearch.bootstrap.BootstrapContext;
import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterName;
@ -40,11 +38,6 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
@LuceneTestCase.SuppressFileSystems(value = "ExtrasFS") @LuceneTestCase.SuppressFileSystems(value = "ExtrasFS")
public class NodeTests extends ESTestCase { public class NodeTests extends ESTestCase {
@ -88,30 +81,6 @@ public class NodeTests extends ESTestCase {
} }
} }
public void testWarnIfPreRelease() {
final Logger logger = mock(Logger.class);
final int id = randomIntBetween(1, 9) * 1000000;
final Version releaseVersion = Version.fromId(id + 99);
final Version preReleaseVersion = Version.fromId(id + randomIntBetween(0, 98));
Node.warnIfPreRelease(releaseVersion, false, logger);
verifyNoMoreInteractions(logger);
reset(logger);
Node.warnIfPreRelease(releaseVersion, true, logger);
verify(logger).warn(
"version [{}] is a pre-release version of Elasticsearch and is not suitable for production", releaseVersion + "-SNAPSHOT");
reset(logger);
final boolean isSnapshot = randomBoolean();
Node.warnIfPreRelease(preReleaseVersion, isSnapshot, logger);
verify(logger).warn(
"version [{}] is a pre-release version of Elasticsearch and is not suitable for production",
preReleaseVersion + (isSnapshot ? "-SNAPSHOT" : ""));
}
public void testNodeAttributes() throws IOException { public void testNodeAttributes() throws IOException {
String attr = randomAlphaOfLength(5); String attr = randomAlphaOfLength(5);
Settings.Builder settings = baseSettings().put(Node.NODE_ATTRIBUTES.getKey() + "test_attr", attr); Settings.Builder settings = baseSettings().put(Node.NODE_ATTRIBUTES.getKey() + "test_attr", attr);

2
server/src/test/java/org/elasticsearch/transport/RemoteClusterConnectionTests.java
View File

@ -1019,7 +1019,7 @@ public class RemoteClusterConnectionTests extends ESTestCase {
public void testRemoteConnectionInfoBwComp() throws IOException { public void testRemoteConnectionInfoBwComp() throws IOException {
final Version version = VersionUtils.randomVersionBetween(random(), final Version version = VersionUtils.randomVersionBetween(random(),
Version.V_6_1_0, VersionUtils.getPreviousVersion(Version.V_7_0_0_alpha1)); Version.V_6_1_0, VersionUtils.getPreviousVersion(Version.V_7_0_0));
RemoteConnectionInfo expected = new RemoteConnectionInfo("test_cluster", RemoteConnectionInfo expected = new RemoteConnectionInfo("test_cluster",
Collections.singletonList(new TransportAddress(TransportAddress.META_ADDRESS, 1)), Collections.singletonList(new TransportAddress(TransportAddress.META_ADDRESS, 1)),
4, 4, new TimeValue(30, TimeUnit.MINUTES), false); 4, 4, new TimeValue(30, TimeUnit.MINUTES), false);

2
test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/DoSection.java
View File

@ -293,7 +293,7 @@ public class DoSection implements ExecutableSection {
if (matches) { if (matches) {
final String message = matcher.group(1); final String message = matcher.group(1);
// noinspection StatementWithEmptyBody // noinspection StatementWithEmptyBody
if (masterVersion.before(Version.V_7_0_0_alpha1) if (masterVersion.before(Version.V_7_0_0)
&& message.equals("the default number of shards will change from [5] to [1] in 7.0.0; " && message.equals("the default number of shards will change from [5] to [1] in 7.0.0; "
+ "if you wish to continue using the default of [5] shards, " + "if you wish to continue using the default of [5] shards, "
+ "you must manage this on the create index request or with an index template")) { + "you must manage this on the create index request or with an index template")) {

2
test/framework/src/main/java/org/elasticsearch/upgrades/AbstractFullClusterRestartTestCase.java
View File

@ -40,7 +40,7 @@ public abstract class AbstractFullClusterRestartTestCase extends ESRestTestCase
public void init() throws IOException { public void init() throws IOException {
assertThat("we don't need this branch if we aren't compatible with 6.0", assertThat("we don't need this branch if we aren't compatible with 6.0",
Version.CURRENT.minimumIndexCompatibilityVersion().onOrBefore(Version.V_6_0_0), equalTo(true)); Version.CURRENT.minimumIndexCompatibilityVersion().onOrBefore(Version.V_6_0_0), equalTo(true));
if (isRunningAgainstOldCluster() && getOldClusterVersion().before(Version.V_7_0_0_alpha1)) { if (isRunningAgainstOldCluster() && getOldClusterVersion().before(Version.V_7_0_0)) {
XContentBuilder template = jsonBuilder(); XContentBuilder template = jsonBuilder();
template.startObject(); template.startObject();
{ {

2
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/indexlifecycle/IndexLifecycleMetadata.java
View File

@ -106,7 +106,7 @@ public class IndexLifecycleMetadata implements XPackMetaDataCustom {
@Override @Override
public Version getMinimalSupportedVersion() { public Version getMinimalSupportedVersion() {
return Version.V_7_0_0_alpha1; return Version.V_7_0_0;
} }
@Override @Override

16
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/Job.java
View File

@ -197,7 +197,7 @@ public class Job extends AbstractDiffable<Job> implements Writeable, ToXContentO
createTime = new Date(in.readVLong()); createTime = new Date(in.readVLong());
finishedTime = in.readBoolean() ? new Date(in.readVLong()) : null; finishedTime = in.readBoolean() ? new Date(in.readVLong()) : null;
// for removed last_data_time field // for removed last_data_time field
if (in.getVersion().before(Version.V_7_0_0_alpha1)) { if (in.getVersion().before(Version.V_7_0_0)) {
if (in.readBoolean()) { if (in.readBoolean()) {
in.readVLong(); in.readVLong();
} }
@ -218,7 +218,7 @@ public class Job extends AbstractDiffable<Job> implements Writeable, ToXContentO
Map<String, Object> readCustomSettings = in.readMap(); Map<String, Object> readCustomSettings = in.readMap();
customSettings = readCustomSettings == null ? null : Collections.unmodifiableMap(readCustomSettings); customSettings = readCustomSettings == null ? null : Collections.unmodifiableMap(readCustomSettings);
modelSnapshotId = in.readOptionalString(); modelSnapshotId = in.readOptionalString();
if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1) && in.readBoolean()) { if (in.getVersion().onOrAfter(Version.V_7_0_0) && in.readBoolean()) {
modelSnapshotMinVersion = Version.readVersion(in); modelSnapshotMinVersion = Version.readVersion(in);
} else { } else {
modelSnapshotMinVersion = null; modelSnapshotMinVersion = null;
@ -464,7 +464,7 @@ public class Job extends AbstractDiffable<Job> implements Writeable, ToXContentO
out.writeBoolean(false); out.writeBoolean(false);
} }
// for removed last_data_time field // for removed last_data_time field
if (out.getVersion().before(Version.V_7_0_0_alpha1)) { if (out.getVersion().before(Version.V_7_0_0)) {
out.writeBoolean(false); out.writeBoolean(false);
} }
if (out.getVersion().onOrAfter(Version.V_6_1_0)) { if (out.getVersion().onOrAfter(Version.V_6_1_0)) {
@ -480,7 +480,7 @@ public class Job extends AbstractDiffable<Job> implements Writeable, ToXContentO
out.writeOptionalLong(resultsRetentionDays); out.writeOptionalLong(resultsRetentionDays);
out.writeMap(customSettings); out.writeMap(customSettings);
out.writeOptionalString(modelSnapshotId); out.writeOptionalString(modelSnapshotId);
if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
if (modelSnapshotMinVersion != null) { if (modelSnapshotMinVersion != null) {
out.writeBoolean(true); out.writeBoolean(true);
Version.writeVersion(modelSnapshotMinVersion, out); Version.writeVersion(modelSnapshotMinVersion, out);
@ -693,7 +693,7 @@ public class Job extends AbstractDiffable<Job> implements Writeable, ToXContentO
createTime = in.readBoolean() ? new Date(in.readVLong()) : null; createTime = in.readBoolean() ? new Date(in.readVLong()) : null;
finishedTime = in.readBoolean() ? new Date(in.readVLong()) : null; finishedTime = in.readBoolean() ? new Date(in.readVLong()) : null;
// for removed last_data_time field // for removed last_data_time field
if (in.getVersion().before(Version.V_7_0_0_alpha1)) { if (in.getVersion().before(Version.V_7_0_0)) {
if (in.readBoolean()) { if (in.readBoolean()) {
in.readVLong(); in.readVLong();
} }
@ -711,7 +711,7 @@ public class Job extends AbstractDiffable<Job> implements Writeable, ToXContentO
resultsRetentionDays = in.readOptionalLong(); resultsRetentionDays = in.readOptionalLong();
customSettings = in.readMap(); customSettings = in.readMap();
modelSnapshotId = in.readOptionalString(); modelSnapshotId = in.readOptionalString();
if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1) && in.readBoolean()) { if (in.getVersion().onOrAfter(Version.V_7_0_0) && in.readBoolean()) {
modelSnapshotMinVersion = Version.readVersion(in); modelSnapshotMinVersion = Version.readVersion(in);
} else { } else {
modelSnapshotMinVersion = null; modelSnapshotMinVersion = null;
@ -886,7 +886,7 @@ public class Job extends AbstractDiffable<Job> implements Writeable, ToXContentO
out.writeBoolean(false); out.writeBoolean(false);
} }
// for removed last_data_time field // for removed last_data_time field
if (out.getVersion().before(Version.V_7_0_0_alpha1)) { if (out.getVersion().before(Version.V_7_0_0)) {
out.writeBoolean(false); out.writeBoolean(false);
} }
if (out.getVersion().onOrAfter(Version.V_6_1_0)) { if (out.getVersion().onOrAfter(Version.V_6_1_0)) {
@ -902,7 +902,7 @@ public class Job extends AbstractDiffable<Job> implements Writeable, ToXContentO
out.writeOptionalLong(resultsRetentionDays); out.writeOptionalLong(resultsRetentionDays);
out.writeMap(customSettings); out.writeMap(customSettings);
out.writeOptionalString(modelSnapshotId); out.writeOptionalString(modelSnapshotId);
if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
if (modelSnapshotMinVersion != null) { if (modelSnapshotMinVersion != null) {
out.writeBoolean(true); out.writeBoolean(true);
Version.writeVersion(modelSnapshotMinVersion, out); Version.writeVersion(modelSnapshotMinVersion, out);

4
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/JobUpdate.java
View File

@ -141,7 +141,7 @@ public class JobUpdate implements Writeable, ToXContentObject {
} else { } else {
jobVersion = null; jobVersion = null;
} }
if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1) && in.readBoolean()) { if (in.getVersion().onOrAfter(Version.V_7_0_0) && in.readBoolean()) {
modelSnapshotMinVersion = Version.readVersion(in); modelSnapshotMinVersion = Version.readVersion(in);
} else { } else {
modelSnapshotMinVersion = null; modelSnapshotMinVersion = null;
@ -183,7 +183,7 @@ public class JobUpdate implements Writeable, ToXContentObject {
out.writeBoolean(false); out.writeBoolean(false);
} }
} }
if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
if (modelSnapshotMinVersion != null) { if (modelSnapshotMinVersion != null) {
out.writeBoolean(true); out.writeBoolean(true);
Version.writeVersion(modelSnapshotMinVersion, out); Version.writeVersion(modelSnapshotMinVersion, out);

4
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/process/autodetect/state/ModelSnapshot.java
View File

@ -118,7 +118,7 @@ public class ModelSnapshot implements ToXContentObject, Writeable {
public ModelSnapshot(StreamInput in) throws IOException { public ModelSnapshot(StreamInput in) throws IOException {
jobId = in.readString(); jobId = in.readString();
if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { if (in.getVersion().onOrAfter(Version.V_7_0_0)) {
minVersion = Version.readVersion(in); minVersion = Version.readVersion(in);
} else { } else {
minVersion = Version.CURRENT.minimumCompatibilityVersion(); minVersion = Version.CURRENT.minimumCompatibilityVersion();
@ -137,7 +137,7 @@ public class ModelSnapshot implements ToXContentObject, Writeable {
@Override @Override
public void writeTo(StreamOutput out) throws IOException { public void writeTo(StreamOutput out) throws IOException {
out.writeString(jobId); out.writeString(jobId);
if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
Version.writeVersion(minVersion, out); Version.writeVersion(minVersion, out);
} }
if (timestamp != null) { if (timestamp != null) {

2
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/monitoring/exporter/MonitoringTemplateUtils.java
View File

@ -28,7 +28,7 @@ public final class MonitoringTemplateUtils {
* <p> * <p>
* It may be possible for this to diverge between templates and pipelines, but for now they're the same. * It may be possible for this to diverge between templates and pipelines, but for now they're the same.
*/ */
public static final int LAST_UPDATED_VERSION = Version.V_7_0_0_alpha1.id; public static final int LAST_UPDATED_VERSION = Version.V_7_0_0.id;
/** /**
* Current version of templates used in their name to differentiate from breaking changes (separate from product version). * Current version of templates used in their name to differentiate from breaking changes (separate from product version).

2
x-pack/plugin/core/src/main/resources/monitoring-alerts.json
View File

@ -1,6 +1,6 @@
{ {
"index_patterns": [ ".monitoring-alerts-${monitoring.template.version}" ], "index_patterns": [ ".monitoring-alerts-${monitoring.template.version}" ],
"version": 7000001, "version": 7000099,
"settings": { "settings": {
"index": { "index": {
"number_of_shards": 1, "number_of_shards": 1,

2
x-pack/plugin/core/src/main/resources/monitoring-beats.json
View File

@ -9,7 +9,7 @@
"index.number_of_replicas": 0, "index.number_of_replicas": 0,
"index.number_of_shards": 1 "index.number_of_shards": 1
}, },
"version": 7000001, "version": 7000099,
"mappings": { "mappings": {
"doc": { "doc": {
"dynamic": false, "dynamic": false,

2
x-pack/plugin/core/src/main/resources/monitoring-es.json
View File

@ -1,6 +1,6 @@
{ {
"index_patterns": [ ".monitoring-es-${monitoring.template.version}-*" ], "index_patterns": [ ".monitoring-es-${monitoring.template.version}-*" ],
"version": 7000001, "version": 7000099,
"settings": { "settings": {
"index.number_of_shards": 1, "index.number_of_shards": 1,
"index.number_of_replicas": 0, "index.number_of_replicas": 0,

2
x-pack/plugin/core/src/main/resources/monitoring-kibana.json
View File

@ -1,6 +1,6 @@
{ {
"index_patterns": [ ".monitoring-kibana-${monitoring.template.version}-*" ], "index_patterns": [ ".monitoring-kibana-${monitoring.template.version}-*" ],
"version": 7000001, "version": 7000099,
"settings": { "settings": {
"index.number_of_shards": 1, "index.number_of_shards": 1,
"index.number_of_replicas": 0, "index.number_of_replicas": 0,

2
x-pack/plugin/core/src/main/resources/monitoring-logstash.json
View File

@ -1,6 +1,6 @@
{ {
"index_patterns": [ ".monitoring-logstash-${monitoring.template.version}-*" ], "index_patterns": [ ".monitoring-logstash-${monitoring.template.version}-*" ],
"version": 7000001, "version": 7000099,
"settings": { "settings": {
"index.number_of_shards": 1, "index.number_of_shards": 1,
"index.number_of_replicas": 0, "index.number_of_replicas": 0,

4
x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/IndexDeprecationChecks.java
View File

@ -145,7 +145,7 @@ public class IndexDeprecationChecks {
} }
static DeprecationIssue delimitedPayloadFilterCheck(IndexMetaData indexMetaData) { static DeprecationIssue delimitedPayloadFilterCheck(IndexMetaData indexMetaData) {
if (indexMetaData.getCreationVersion().before(Version.V_7_0_0_alpha1)) { if (indexMetaData.getCreationVersion().before(Version.V_7_0_0)) {
List<String> issues = new ArrayList<>(); List<String> issues = new ArrayList<>();
Map<String, Settings> filters = indexMetaData.getSettings().getGroups(AnalysisRegistry.INDEX_ANALYSIS_FILTER); Map<String, Settings> filters = indexMetaData.getSettings().getGroups(AnalysisRegistry.INDEX_ANALYSIS_FILTER);
for (Map.Entry<String, Settings> entry : filters.entrySet()) { for (Map.Entry<String, Settings> entry : filters.entrySet()) {
@ -211,4 +211,4 @@ public class IndexDeprecationChecks {
} }
return null; return null;
} }
} }

2
x-pack/plugin/deprecation/src/test/java/org/elasticsearch/xpack/deprecation/IndexDeprecationChecksTests.java
View File

@ -22,7 +22,7 @@ import static org.elasticsearch.xpack.deprecation.DeprecationChecks.INDEX_SETTIN
public class IndexDeprecationChecksTests extends ESTestCase { public class IndexDeprecationChecksTests extends ESTestCase {
public void testDelimitedPayloadFilterCheck() throws IOException { public void testDelimitedPayloadFilterCheck() throws IOException {
Settings settings = settings( Settings settings = settings(
VersionUtils.randomVersionBetween(random(), Version.V_6_0_0, VersionUtils.getPreviousVersion(Version.V_7_0_0_alpha1))) VersionUtils.randomVersionBetween(random(), Version.V_6_0_0, VersionUtils.getPreviousVersion(Version.V_7_0_0)))
.put("index.analysis.filter.my_delimited_payload_filter.type", "delimited_payload_filter") .put("index.analysis.filter.my_delimited_payload_filter.type", "delimited_payload_filter")
.put("index.analysis.filter.my_delimited_payload_filter.delimiter", "^") .put("index.analysis.filter.my_delimited_payload_filter.delimiter", "^")
.put("index.analysis.filter.my_delimited_payload_filter.encoding", "identity").build(); .put("index.analysis.filter.my_delimited_payload_filter.encoding", "identity").build();

2
x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/indexlifecycle/IndexLifecycleMetadataTests.java
View File

@ -128,7 +128,7 @@ public class IndexLifecycleMetadataTests extends AbstractDiffableSerializationTe
} }
public void testMinimumSupportedVersion() { public void testMinimumSupportedVersion() {
assertEquals(Version.V_7_0_0_alpha1, createTestInstance().getMinimalSupportedVersion()); assertEquals(Version.V_7_0_0, createTestInstance().getMinimalSupportedVersion());
} }
public void testcontext() { public void testcontext() {

2
x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/ClusterAlertsUtil.java
View File

@ -56,7 +56,7 @@ public class ClusterAlertsUtil {
* The last time that all watches were updated. For now, all watches have been updated in the same version and should all be replaced * The last time that all watches were updated. For now, all watches have been updated in the same version and should all be replaced
* together. * together.
*/ */
public static final int LAST_UPDATED_VERSION = Version.V_7_0_0_alpha1.id; public static final int LAST_UPDATED_VERSION = Version.V_7_0_0.id;
/** /**
* An unsorted list of Watch IDs representing resource files for Monitoring Cluster Alerts. * An unsorted list of Watch IDs representing resource files for Monitoring Cluster Alerts.

2
x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExporter.java
View File

@ -164,7 +164,7 @@ public class HttpExporter extends Exporter {
/** /**
* Minimum supported version of the remote monitoring cluster (same major). * Minimum supported version of the remote monitoring cluster (same major).
*/ */
public static final Version MIN_SUPPORTED_CLUSTER_VERSION = Version.V_7_0_0_alpha1; public static final Version MIN_SUPPORTED_CLUSTER_VERSION = Version.V_7_0_0;
/** /**
* The {@link RestClient} automatically pools connections and keeps them alive as necessary. * The {@link RestClient} automatically pools connections and keeps them alive as necessary.

2
x-pack/plugin/monitoring/src/main/resources/monitoring/watches/elasticsearch_cluster_status.json
View File

@ -7,7 +7,7 @@
"link": "elasticsearch/indices", "link": "elasticsearch/indices",
"severity": 2100, "severity": 2100,
"type": "monitoring", "type": "monitoring",
"version_created": 7000001, "version_created": 7000099,
"watch": "${monitoring.watch.id}" "watch": "${monitoring.watch.id}"
} }
}, },

2
x-pack/plugin/monitoring/src/main/resources/monitoring/watches/elasticsearch_nodes.json
View File

@ -7,7 +7,7 @@
"link": "elasticsearch/nodes", "link": "elasticsearch/nodes",
"severity": 1999, "severity": 1999,
"type": "monitoring", "type": "monitoring",
"version_created": 7000001, "version_created": 7000099,
"watch": "${monitoring.watch.id}" "watch": "${monitoring.watch.id}"
} }
}, },

2
x-pack/plugin/monitoring/src/main/resources/monitoring/watches/elasticsearch_version_mismatch.json
View File

@ -7,7 +7,7 @@
"link": "elasticsearch/nodes", "link": "elasticsearch/nodes",
"severity": 1000, "severity": 1000,
"type": "monitoring", "type": "monitoring",
"version_created": 7000001, "version_created": 7000099,
"watch": "${monitoring.watch.id}" "watch": "${monitoring.watch.id}"
} }
}, },

2
x-pack/plugin/monitoring/src/main/resources/monitoring/watches/kibana_version_mismatch.json
View File

@ -7,7 +7,7 @@
"link": "kibana/instances", "link": "kibana/instances",
"severity": 1000, "severity": 1000,
"type": "monitoring", "type": "monitoring",
"version_created": 7000001, "version_created": 7000099,
"watch": "${monitoring.watch.id}" "watch": "${monitoring.watch.id}"
} }
}, },

2
x-pack/plugin/monitoring/src/main/resources/monitoring/watches/logstash_version_mismatch.json
View File

@ -7,7 +7,7 @@
"link": "logstash/instances", "link": "logstash/instances",
"severity": 1000, "severity": 1000,
"type": "monitoring", "type": "monitoring",
"version_created": 7000001, "version_created": 7000099,
"watch": "${monitoring.watch.id}" "watch": "${monitoring.watch.id}"
} }
}, },

2
x-pack/plugin/monitoring/src/main/resources/monitoring/watches/xpack_license_expiration.json
View File

@ -8,7 +8,7 @@
"alert_index": ".monitoring-alerts-6", "alert_index": ".monitoring-alerts-6",
"cluster_uuid": "${monitoring.watch.cluster_uuid}", "cluster_uuid": "${monitoring.watch.cluster_uuid}",
"type": "monitoring", "type": "monitoring",
"version_created": 7000001, "version_created": 7000099,
"watch": "${monitoring.watch.id}" "watch": "${monitoring.watch.id}"
} }
}, },

2
x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/Security.java
View File

@ -1031,7 +1031,7 @@ public class Security extends Plugin implements ActionPlugin, IngestPlugin, Netw
static final class ValidateUpgradedSecurityIndex implements BiConsumer<DiscoveryNode, ClusterState> { static final class ValidateUpgradedSecurityIndex implements BiConsumer<DiscoveryNode, ClusterState> {
@Override @Override
public void accept(DiscoveryNode node, ClusterState state) { public void accept(DiscoveryNode node, ClusterState state) {
if (state.getNodes().getMinNodeVersion().before(Version.V_7_0_0_alpha1)) { if (state.getNodes().getMinNodeVersion().before(Version.V_7_0_0)) {
IndexMetaData indexMetaData = state.getMetaData().getIndices().get(SECURITY_INDEX_NAME); IndexMetaData indexMetaData = state.getMetaData().getIndices().get(SECURITY_INDEX_NAME);
if (indexMetaData != null && INDEX_FORMAT_SETTING.get(indexMetaData.getSettings()) < INTERNAL_INDEX_FORMAT) { if (indexMetaData != null && INDEX_FORMAT_SETTING.get(indexMetaData.getSettings()) < INTERNAL_INDEX_FORMAT) {
throw new IllegalStateException("Security index is not on the current version [" + INTERNAL_INDEX_FORMAT + "] - " + throw new IllegalStateException("Security index is not on the current version [" + INTERNAL_INDEX_FORMAT + "] - " +

2
x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/esnative/ReservedRealmTests.java
View File

@ -470,6 +470,6 @@ public class ReservedRealmTests extends ESTestCase {
assertThat(versionPredicate.test(Version.V_6_3_0), is(true)); assertThat(versionPredicate.test(Version.V_6_3_0), is(true));
break; break;
} }
assertThat(versionPredicate.test(Version.V_7_0_0_alpha1), is(true)); assertThat(versionPredicate.test(Version.V_7_0_0), is(true));
} }
} }

2
x-pack/plugin/sql/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/VersionTests.java
View File

@ -12,9 +12,9 @@ public class VersionTests extends ESTestCase {
public void testVersionIsCurrent() { public void testVersionIsCurrent() {
/* This test will only work properly in gradle because in gradle we run the tests /* This test will only work properly in gradle because in gradle we run the tests
* using the jar. */ * using the jar. */
assertEquals(org.elasticsearch.Version.CURRENT.toString(), Version.CURRENT.version);
assertNotNull(Version.CURRENT.hash); assertNotNull(Version.CURRENT.hash);
assertEquals(org.elasticsearch.Version.CURRENT.major, Version.CURRENT.major); assertEquals(org.elasticsearch.Version.CURRENT.major, Version.CURRENT.major);
assertEquals(org.elasticsearch.Version.CURRENT.minor, Version.CURRENT.minor); assertEquals(org.elasticsearch.Version.CURRENT.minor, Version.CURRENT.minor);
assertEquals(org.elasticsearch.Version.CURRENT.revision, Version.CURRENT.revision);
} }
} }

2
x-pack/plugin/sql/sql-cli/src/test/java/org/elasticsearch/xpack/sql/cli/VersionTests.java
View File

@ -12,10 +12,10 @@ public class VersionTests extends ESTestCase {
public void testVersionIsCurrent() { public void testVersionIsCurrent() {
/* This test will only work properly in gradle because in gradle we run the tests /* This test will only work properly in gradle because in gradle we run the tests
* using the jar. */ * using the jar. */
assertEquals(org.elasticsearch.Version.CURRENT.toString(), Version.CURRENT.version);
assertNotNull(Version.CURRENT.hash); assertNotNull(Version.CURRENT.hash);
assertEquals(org.elasticsearch.Version.CURRENT.major, Version.CURRENT.major); assertEquals(org.elasticsearch.Version.CURRENT.major, Version.CURRENT.major);
assertEquals(org.elasticsearch.Version.CURRENT.minor, Version.CURRENT.minor); assertEquals(org.elasticsearch.Version.CURRENT.minor, Version.CURRENT.minor);
assertEquals(org.elasticsearch.Version.CURRENT.revision, Version.CURRENT.revision);
} }
} }

7
x-pack/plugin/sql/sql-client/src/main/java/org/elasticsearch/xpack/sql/client/Version.java
View File

@ -38,11 +38,12 @@ public class Version {
static byte[] from(String ver) { static byte[] from(String ver) {
String[] parts = ver.split("[.-]"); String[] parts = ver.split("[.-]");
if (parts.length == 3 || parts.length == 4) { // Allow for optional snapshot and qualifier
return new byte[] { Byte.parseByte(parts[0]), Byte.parseByte(parts[1]), Byte.parseByte(parts[2]) }; if (parts.length < 3 || parts.length > 5) {
throw new IllegalArgumentException("Invalid version " + ver);
} }
else { else {
throw new IllegalArgumentException("Invalid version " + ver); return new byte[] { Byte.parseByte(parts[0]), Byte.parseByte(parts[1]), Byte.parseByte(parts[2]) };
} }
} }

2
x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/IndexingIT.java
View File

@ -55,7 +55,7 @@ public class IndexingIT extends AbstractUpgradeTestCase {
Version minimumIndexCompatibilityVersion = Version.CURRENT.minimumIndexCompatibilityVersion(); Version minimumIndexCompatibilityVersion = Version.CURRENT.minimumIndexCompatibilityVersion();
assertThat("this branch is not needed if we aren't compatible with 6.0", assertThat("this branch is not needed if we aren't compatible with 6.0",
minimumIndexCompatibilityVersion.onOrBefore(Version.V_6_0_0), equalTo(true)); minimumIndexCompatibilityVersion.onOrBefore(Version.V_6_0_0), equalTo(true));
if (minimumIndexCompatibilityVersion.before(Version.V_7_0_0_alpha1)) { if (minimumIndexCompatibilityVersion.before(Version.V_7_0_0)) {
XContentBuilder template = jsonBuilder(); XContentBuilder template = jsonBuilder();
template.startObject(); template.startObject();
{ {

2
x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/TokenBackwardsCompatibilityIT.java
View File

@ -33,7 +33,7 @@ public class TokenBackwardsCompatibilityIT extends AbstractUpgradeTestCase {
Version minimumIndexCompatibilityVersion = Version.CURRENT.minimumIndexCompatibilityVersion(); Version minimumIndexCompatibilityVersion = Version.CURRENT.minimumIndexCompatibilityVersion();
assertThat("this branch is not needed if we aren't compatible with 6.0", assertThat("this branch is not needed if we aren't compatible with 6.0",
minimumIndexCompatibilityVersion.onOrBefore(Version.V_6_0_0), equalTo(true)); minimumIndexCompatibilityVersion.onOrBefore(Version.V_6_0_0), equalTo(true));
if (minimumIndexCompatibilityVersion.before(Version.V_7_0_0_alpha1)) { if (minimumIndexCompatibilityVersion.before(Version.V_7_0_0)) {
XContentBuilder template = jsonBuilder(); XContentBuilder template = jsonBuilder();
template.startObject(); template.startObject();
{ {