Elasticsearch: Add support for version 6.3.0

6.3.0 is now the latest version on the 6.x series. Update the version
detection to support this version, and add support for it in the query
adapter. There don't seem to be any breaking changes since 6.2.x, so
it's not necessary to add any specific handling other than modifying
some conditions to check for 6.3 in addition to 6.2.

Update the test container to support 6.3, using the -oss version of
6.3.0 from the elastic.co docker registry.

Update the V6 query tests to use 6.3 instead of 6.2. To test against
both 6.2 and 6.3 we would need to duplicate the account, group and
query test classes again resulting in 4 copies (V2, V5, V6.2, V6.3)
of each. If we need to explicitly test against 6.2 at any point in
the future we can manually change them back to use the 6.2 container.

Update the index and reindex tests to explicitly test 6.3 in addition
to 6.2, since those tests can be extended simply by adding another
@ConfigSuite.Config annotation.

Change-Id: I02afbac3e04958a13a6baae74e9d0de9cd3b644b
This commit is contained in:
David Pursehouse
2018-06-19 10:43:19 +09:00
parent d79d01f5a2
commit bc8d1c24f8
9 changed files with 29 additions and 9 deletions

View File

@@ -36,7 +36,7 @@ public class ElasticV6QueryAccountsTest extends AbstractQueryAccountsTest {
return;
}
container = ElasticContainer.createAndStart(ElasticVersion.V6_2);
container = ElasticContainer.createAndStart(ElasticVersion.V6_3);
nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
}

View File

@@ -37,7 +37,7 @@ public class ElasticV6QueryChangesTest extends AbstractQueryChangesTest {
return;
}
container = ElasticContainer.createAndStart(ElasticVersion.V6_2);
container = ElasticContainer.createAndStart(ElasticVersion.V6_3);
nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
}

View File

@@ -36,7 +36,7 @@ public class ElasticV6QueryGroupsTest extends AbstractQueryGroupsTest {
return;
}
container = ElasticContainer.createAndStart(ElasticVersion.V6_2);
container = ElasticContainer.createAndStart(ElasticVersion.V6_3);
nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
}

View File

@@ -34,6 +34,9 @@ public class ElasticVersionTest {
assertThat(ElasticVersion.forVersion("6.2.0")).isEqualTo(ElasticVersion.V6_2);
assertThat(ElasticVersion.forVersion("6.2.4")).isEqualTo(ElasticVersion.V6_2);
assertThat(ElasticVersion.forVersion("6.3.0")).isEqualTo(ElasticVersion.V6_3);
assertThat(ElasticVersion.forVersion("6.3.1")).isEqualTo(ElasticVersion.V6_3);
}
@Test