opendev/gerrit
Code Issues Proposed changes

Add support for Elasticsearch 6.5.0

Browse Source 
Feature: Issue 10038
Change-Id: Iea007c8188053dc5cf93e46f0638faca1960b09c
This commit is contained in:
David Pursehouse
2018-11-14 21:28:35 -08:00
parent 8baca632d9
commit 1e7fb56afc
9 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
WORKSPACE
View File

@@ -896,8 +896,8 @@ maven_jar(
# and httpasyncclient as necessary. # and httpasyncclient as necessary.
maven_jar( maven_jar(
name = "elasticsearch-rest-client", name = "elasticsearch-rest-client",
artifact = "org.elasticsearch.client:elasticsearch-rest-client:6.4.3", artifact = "org.elasticsearch.client:elasticsearch-rest-client:6.5.0",
sha1 = "5c24325430971ba2fa4769eb446f026b7680d5e7", sha1 = "241436d27cf65b84d17126dc7b6b947e8e2c173c",
) )
JACKSON_VERSION = "2.9.7" JACKSON_VERSION = "2.9.7"

2
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java
View File

@@ -48,7 +48,7 @@ public class ElasticReindexIT extends AbstractReindexTests {
@ConfigSuite.Config @ConfigSuite.Config
public static Config elasticsearchV6() { public static Config elasticsearchV6() {
return getConfig(ElasticVersion.V6_4); return getConfig(ElasticVersion.V6_5);
} }
@Override @Override

2
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java
View File

@@ -47,7 +47,7 @@ public class ElasticIndexIT extends AbstractIndexTests {
@ConfigSuite.Config @ConfigSuite.Config
public static Config elasticsearchV6() { public static Config elasticsearchV6() {
return getConfig(ElasticVersion.V6_4); return getConfig(ElasticVersion.V6_5);
} }
@Override @Override

1
gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticQueryAdapter.java
View File

@@ -39,6 +39,7 @@ public class ElasticQueryAdapter {
case V6_2: case V6_2:
case V6_3: case V6_3:
case V6_4: case V6_4:
case V6_5:
this.searchFilteringName = "_source"; this.searchFilteringName = "_source";
this.indicesExistParam = "?allow_no_indices=false"; this.indicesExistParam = "?allow_no_indices=false";
this.exactFieldType = "keyword"; this.exactFieldType = "keyword";

3
gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticVersion.java
View File

@@ -22,7 +22,8 @@ public enum ElasticVersion {
V5_6("5.6.*"), V5_6("5.6.*"),
V6_2("6.2.*"), V6_2("6.2.*"),
V6_3("6.3.*"), V6_3("6.3.*"),
V6_4("6.4.*"); V6_4("6.4.*"),
V6_5("6.5.*");
private final String version; private final String version;
private final Pattern pattern; private final Pattern pattern;

2
gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java
View File

@@ -52,6 +52,8 @@ public class ElasticContainer<SELF extends ElasticContainer<SELF>> extends Gener
return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.3.2"; return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.3.2";
case V6_4: case V6_4:
return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.4.3"; return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.4.3";
case V6_5:
return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.5.0";
} }
throw new IllegalStateException("No tests for version: " + version.name()); throw new IllegalStateException("No tests for version: " + version.name());
} }

2
gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV6QueryAccountsTest.java
View File

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

2
gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV6QueryChangesTest.java
View File

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

2
gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV6QueryGroupsTest.java
View File

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