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

Only count some fields types for deprecation check (#40166) 

Some field types are not used for queries which use auto-expansion, in
particular, `binary`, `geo_point`, and `geo_shape`. This was causing the
count returned by the deprecation check and the count returned by the
query-time deprecation warning to be misaligned for indices with fields
of those types, with the count returned by the deprecation check being
larger.
This commit is contained in:
Gordon Brown 2019-03-19 10:52:35 -06:00 committed by GitHub
parent a054a9866e
commit 85bb5a7f46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,8 +14,11 @@ import org.elasticsearch.index.IndexSettings;
import org.elasticsearch.xpack.core.deprecation.DeprecationIssue;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.BiConsumer;
import java.util.function.Function;
@ -112,6 +115,15 @@ public class IndexDeprecationChecks {
return null;
}
private static final Set<String> TYPES_THAT_DONT_COUNT;
static {
HashSet<String> typesThatDontCount = new HashSet<>();
typesThatDontCount.add("binary");
typesThatDontCount.add("geo_point");
typesThatDontCount.add("geo_shape");
TYPES_THAT_DONT_COUNT = Collections.unmodifiableSet(typesThatDontCount);
}
/* Counts the number of fields in a mapping, designed to count the as closely as possible to
* org.elasticsearch.index.search.QueryParserHelper#checkForTooManyFields
*/
@ -125,7 +137,8 @@ public class IndexDeprecationChecks {
for (Map.Entry<?, ?> entry : properties.entrySet()) {
Map<String, Object> valueMap = (Map<String, Object>) entry.getValue();
if (valueMap.containsKey("type")
&& (valueMap.get("type").equals("object") && valueMap.containsKey("properties") == false) == false) {
&& (valueMap.get("type").equals("object") && valueMap.containsKey("properties") == false) == false
&& (TYPES_THAT_DONT_COUNT.contains(valueMap.get("type")) == false)) {
fields++;
}
@ -133,7 +146,8 @@ public class IndexDeprecationChecks {
if (values != null) {
for (Map.Entry<?, ?> multifieldEntry : values.entrySet()) {
Map<String, Object> multifieldValueMap = (Map<String, Object>) multifieldEntry.getValue();
if (multifieldValueMap.containsKey("type")) {
if (multifieldValueMap.containsKey("type")
&& (TYPES_THAT_DONT_COUNT.contains(valueMap.get("type")) == false)) {
fields++;
}
if (multifieldValueMap.containsKey("properties")) {

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

@ -138,7 +138,7 @@ public class IndexDeprecationChecksTests extends ESTestCase {
}
mappingBuilder.endObject();
} else {
mappingBuilder.field("type", randomFrom("array", "binary", "range", "boolean", "date", "ip", "keyword", "text"));
mappingBuilder.field("type", randomFrom("array", "range", "boolean", "date", "ip", "keyword", "text"));
fieldCount.incrementAndGet();
}
}