opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.15' into stable-2.16

Browse Source 
* stable-2.15:
  Add support for Elasticsearch version 7.4.*

Change-Id: Ic9bc8e16fc40e03e115c4a649fc3b4026ce1069a
This commit is contained in:
Marco Miller 2019-10-07 12:56:00 -04:00
commit 91692f83c9
9 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
WORKSPACE
View File

@ -1110,8 +1110,8 @@ maven_jar(
# and httpasyncclient as necessary.
maven_jar(
name = "elasticsearch-rest-client",
artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.3.2",
sha1 = "38721e908cad8a30fa3f8e659c0571150a60cab3",
artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.4.0",
sha1 = "481fedd31088ec6ba79a2aeffec3eccae4c0772b",
)
maven_jar(

3
java/com/google/gerrit/elasticsearch/ElasticVersion.java
View File

@ -29,7 +29,8 @@ public enum ElasticVersion {
V7_0("7.0.*"),
V7_1("7.1.*"),
V7_2("7.2.*"),
V7_3("7.3.*");
V7_3("7.3.*"),
V7_4("7.4.*");
private final String version;
private final Pattern pattern;

2
javatests/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java
View File

@ -37,7 +37,7 @@ public class ElasticReindexIT extends AbstractReindexTests {
@ConfigSuite.Config
public static Config elasticsearchV7() {
return getConfig(ElasticVersion.V7_3);
return getConfig(ElasticVersion.V7_4);
}
@Override

2
javatests/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java
View File

@ -36,7 +36,7 @@ public class ElasticIndexIT extends AbstractIndexTests {
@ConfigSuite.Config
public static Config elasticsearchV7() {
return getConfig(ElasticVersion.V7_3);
return getConfig(ElasticVersion.V7_4);
}
@Override

2
javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
View File

@ -60,6 +60,8 @@ public class ElasticContainer extends ElasticsearchContainer {
return "blacktop/elasticsearch:7.2.1";
case V7_3:
return "blacktop/elasticsearch:7.3.2";
case V7_4:
return "blacktop/elasticsearch:7.4.0";
}
throw new IllegalStateException("No tests for version: " + version.name());
}

2
javatests/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java
View File

@ -41,7 +41,7 @@ public class ElasticV7QueryAccountsTest extends AbstractQueryAccountsTest {
return;
}
container = ElasticContainer.createAndStart(ElasticVersion.V7_3);
container = ElasticContainer.createAndStart(ElasticVersion.V7_4);
nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
}

2
javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java
View File

@ -47,7 +47,7 @@ public class ElasticV7QueryChangesTest extends AbstractQueryChangesTest {
return;
}
container = ElasticContainer.createAndStart(ElasticVersion.V7_3);
container = ElasticContainer.createAndStart(ElasticVersion.V7_4);
nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
client = HttpAsyncClients.createDefault();
client.start();

2
javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java
View File

@ -41,7 +41,7 @@ public class ElasticV7QueryGroupsTest extends AbstractQueryGroupsTest {
return;
}
container = ElasticContainer.createAndStart(ElasticVersion.V7_3);
container = ElasticContainer.createAndStart(ElasticVersion.V7_4);
nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
}

6
javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java
View File

@ -60,6 +60,9 @@ public class ElasticVersionTest {
assertThat(ElasticVersion.forVersion("7.3.0")).isEqualTo(ElasticVersion.V7_3);
assertThat(ElasticVersion.forVersion("7.3.1")).isEqualTo(ElasticVersion.V7_3);
assertThat(ElasticVersion.forVersion("7.4.0")).isEqualTo(ElasticVersion.V7_4);
assertThat(ElasticVersion.forVersion("7.4.1")).isEqualTo(ElasticVersion.V7_4);
}
@Test
@ -84,6 +87,7 @@ public class ElasticVersionTest {
assertThat(ElasticVersion.V7_1.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse();
assertThat(ElasticVersion.V7_2.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse();
assertThat(ElasticVersion.V7_3.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse();
assertThat(ElasticVersion.V7_4.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse();
}
@Test
@ -100,6 +104,7 @@ public class ElasticVersionTest {
assertThat(ElasticVersion.V7_1.isV6OrLater()).isTrue();
assertThat(ElasticVersion.V7_2.isV6OrLater()).isTrue();
assertThat(ElasticVersion.V7_3.isV6OrLater()).isTrue();
assertThat(ElasticVersion.V7_4.isV6OrLater()).isTrue();
}
@Test
@ -116,5 +121,6 @@ public class ElasticVersionTest {
assertThat(ElasticVersion.V7_1.isV7OrLater()).isTrue();
assertThat(ElasticVersion.V7_2.isV7OrLater()).isTrue();
assertThat(ElasticVersion.V7_3.isV7OrLater()).isTrue();
assertThat(ElasticVersion.V7_4.isV7OrLater()).isTrue();
}
}