diff options
Diffstat (limited to 'java/com/google/gerrit/elasticsearch/ElasticQueryAdapter.java')
-rw-r--r-- | java/com/google/gerrit/elasticsearch/ElasticQueryAdapter.java | 45 |
1 files changed, 3 insertions, 42 deletions
diff --git a/java/com/google/gerrit/elasticsearch/ElasticQueryAdapter.java b/java/com/google/gerrit/elasticsearch/ElasticQueryAdapter.java index 779d433615..19d990181d 100644 --- a/java/com/google/gerrit/elasticsearch/ElasticQueryAdapter.java +++ b/java/com/google/gerrit/elasticsearch/ElasticQueryAdapter.java @@ -14,42 +14,23 @@ package com.google.gerrit.elasticsearch; -import static com.google.gerrit.elasticsearch.ElasticVersion.V6_8; - public class ElasticQueryAdapter { - static final String V6_TYPE = "_doc"; - - private static final String INCLUDE_TYPE = "include_type_name=true"; private static final String INDICES = "?allow_no_indices=false"; - private final boolean useV6Type; - private final boolean omitType; - private final int defaultNumberOfShards; - private final String searchFilteringName; - private final String indicesExistParams; private final String exactFieldType; private final String stringFieldType; private final String indexProperty; private final String rawFieldsKey; private final String versionDiscoveryUrl; - private final String includeTypeNameParam; - ElasticQueryAdapter(ElasticVersion version) { - this.useV6Type = version.isV6(); - this.omitType = version.isV7OrLater(); - this.defaultNumberOfShards = version.isV7OrLater() ? 1 : 5; - this.versionDiscoveryUrl = version.isV6OrLater() ? "/%s*" : "/%s*/_aliases"; + ElasticQueryAdapter() { + this.versionDiscoveryUrl = "/%s*"; this.searchFilteringName = "_source"; this.exactFieldType = "keyword"; this.stringFieldType = "text"; this.indexProperty = "true"; this.rawFieldsKey = "_source"; - - // Since v6.7 (end-of-life), in fact, for these two parameters: - this.indicesExistParams = - version.isAtLeastMinorVersion(V6_8) ? INDICES + "&" + INCLUDE_TYPE : INDICES; - this.includeTypeNameParam = version.isAtLeastMinorVersion(V6_8) ? "?" + INCLUDE_TYPE : ""; } public String searchFilteringName() { @@ -57,7 +38,7 @@ public class ElasticQueryAdapter { } String indicesExistParams() { - return indicesExistParams; + return INDICES; } String exactFieldType() { @@ -76,27 +57,7 @@ public class ElasticQueryAdapter { return rawFieldsKey; } - boolean useV6Type() { - return useV6Type; - } - - boolean omitType() { - return omitType; - } - - int getDefaultNumberOfShards() { - return defaultNumberOfShards; - } - - String getType() { - return useV6Type() ? V6_TYPE : ""; - } - String getVersionDiscoveryUrl(String name) { return String.format(versionDiscoveryUrl, name); } - - String includeTypeNameParam() { - return includeTypeNameParam; - } } |