From a4c3d4e4025173612e1d688c44f11ca9aecf1220 Mon Sep 17 00:00:00 2001 From: Alan Woodward Date: Mon, 16 Mar 2020 14:03:24 +0000 Subject: [PATCH 1/2] Remove deprecation warning when doc scripts refer to '_type' field --- .../elasticsearch/search/lookup/LeafDocLookup.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/search/lookup/LeafDocLookup.java b/server/src/main/java/org/elasticsearch/search/lookup/LeafDocLookup.java index c6f6cc8a0620e..9ec969b85c39e 100644 --- a/server/src/main/java/org/elasticsearch/search/lookup/LeafDocLookup.java +++ b/server/src/main/java/org/elasticsearch/search/lookup/LeafDocLookup.java @@ -18,10 +18,8 @@ */ package org.elasticsearch.search.lookup; -import org.apache.logging.log4j.LogManager; import org.apache.lucene.index.LeafReaderContext; import org.elasticsearch.ExceptionsHelper; -import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.index.fielddata.IndexFieldData; import org.elasticsearch.index.fielddata.ScriptDocValues; import org.elasticsearch.index.mapper.MappedFieldType; @@ -38,12 +36,6 @@ public class LeafDocLookup implements Map> { - private static final DeprecationLogger DEPRECATION_LOGGER - = new DeprecationLogger(LogManager.getLogger(LeafDocLookup.class)); - static final String TYPES_DEPRECATION_KEY = "type-field-doc-lookup"; - static final String TYPES_DEPRECATION_MESSAGE = - "[types removal] Looking up doc types [_type] in scripts is deprecated."; - private final Map> localCacheFieldData = new HashMap<>(4); private final MapperService mapperService; @@ -74,10 +66,6 @@ public void setDocument(int docId) { @Override public ScriptDocValues get(Object key) { - // deprecate _type - if ("_type".equals(key)) { - DEPRECATION_LOGGER.deprecatedAndMaybeLog(TYPES_DEPRECATION_KEY, TYPES_DEPRECATION_MESSAGE); - } // assume its a string... String fieldName = key.toString(); ScriptDocValues scriptValues = localCacheFieldData.get(fieldName); From b66b44347ce585f210dcba1fcd5bffc42db3d48a Mon Sep 17 00:00:00 2001 From: Alan Woodward Date: Wed, 18 Mar 2020 10:46:01 +0000 Subject: [PATCH 2/2] Remove expected warning from type-field docs (page will be going away soon) --- docs/reference/mapping/fields/type-field.asciidoc | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/reference/mapping/fields/type-field.asciidoc b/docs/reference/mapping/fields/type-field.asciidoc index 2c5dc7195d643..044729b84eece 100644 --- a/docs/reference/mapping/fields/type-field.asciidoc +++ b/docs/reference/mapping/fields/type-field.asciidoc @@ -57,7 +57,6 @@ GET my_index/_search -------------------------- // TEST[warning:[types removal] Using the _type field in queries and aggregations is deprecated, prefer to use a field instead.] -// TEST[warning:[types removal] Looking up doc types [_type] in scripts is deprecated.] <1> Querying on the `_type` field <2> Aggregating on the `_type` field