Remove TypeFieldMapper

docs/reference/mapping/fields.asciidoc

@@ -1,9 +1,9 @@
 [[mapping-fields]]
 == Metadata fields
 
-Each document has metadata associated with it, such as the `_index`, mapping
-<<mapping-type-field,`_type`>>, and `_id` metadata fields.  The behavior of
-some of these metadata fields can be customized when a mapping type is created.
+Each document has metadata associated with it, such as the `_index`
+and `_id` metadata fields.  The behavior of some of these metadata
+fields can be customized when a mapping is created.
 
 [discrete]
 === Identity metadata fields
@@ -13,10 +13,6 @@ some of these metadata fields can be customized when a mapping type is created.
 
     The index to which the document belongs.
 
-<<mapping-type-field,`_type`>>::
-
-    The document's mapping type.
-
 <<mapping-id-field,`_id`>>::
 
     The document's ID.
@@ -74,5 +70,3 @@ include::fields/routing-field.asciidoc[]
 
 include::fields/source-field.asciidoc[]
 
-include::fields/type-field.asciidoc[]
-

rest-api-spec/src/main/resources/rest-api-spec/test/search/160_exists_query.yml

@@ -1,6 +1,6 @@
 setup:
   - skip:
-      features: ["headers"]
+      features: ["headers", "allowed_warnings"]
 
   - do:
       indices.create:
@@ -567,6 +567,8 @@ setup:
 "Test exists query on _type field":
 
   - do:
+      allowed_warnings:
+        - "[types removal] Using the _type field in queries and aggregations is deprecated, prefer to use a field instead."
       search:
           rest_total_hits_as_int: true
           index: test

server/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java

@@ -144,7 +144,7 @@ public DocumentMapper(MapperService mapperService, Mapping mapping) {
         }
 
         final Collection<String> deleteTombstoneMetadataFields = Arrays.asList(VersionFieldMapper.NAME, IdFieldMapper.NAME,
-            TypeFieldMapper.NAME, SeqNoFieldMapper.NAME, SeqNoFieldMapper.PRIMARY_TERM_NAME, SeqNoFieldMapper.TOMBSTONE_NAME);
+            SeqNoFieldMapper.NAME, SeqNoFieldMapper.PRIMARY_TERM_NAME, SeqNoFieldMapper.TOMBSTONE_NAME);
         this.deleteTombstoneMetadataFieldMappers = Stream.of(mapping.metadataMappers)
             .filter(field -> deleteTombstoneMetadataFields.contains(field.name())).toArray(MetadataFieldMapper[]::new);
         final Collection<String> noopTombstoneMetadataFields = Arrays.asList(

server/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java

@@ -360,10 +360,6 @@ public static Term extractTerm(Query termQuery) {
         while (termQuery instanceof BoostQuery) {
             termQuery = ((BoostQuery) termQuery).getQuery();
         }
-        if (termQuery instanceof TypeFieldMapper.TypesQuery) {
-            assert ((TypeFieldMapper.TypesQuery) termQuery).getTerms().length == 1;
-            return new Term(TypeFieldMapper.NAME, ((TypeFieldMapper.TypesQuery) termQuery).getTerms()[0]);
-        }
         if (termQuery instanceof TermInSetQuery) {
             TermInSetQuery tisQuery = (TermInSetQuery) termQuery;
             PrefixCodedTerms terms = tisQuery.getTermData();

server/src/main/java/org/elasticsearch/index/mapper/MapperService.java

@@ -391,6 +391,9 @@ public DocumentMapperForType documentMapperWithAutoCreate() {
      * Given the full name of a field, returns its {@link MappedFieldType}.
      */
     public MappedFieldType fieldType(String fullName) {
+        if (fullName.equals(TypeFieldType.NAME)) {
+            return new TypeFieldType(this.mapper == null ? "_doc" : this.mapper.type());
+        }
         return this.mapper == null ? null : this.mapper.fieldTypes().get(fullName);
     }