Remove _type from SearchHit (#46942)

This commit removes the `_type` field from all search hit responses. Relates to #41059
elastic · Sep 23, 2019 · c1f99e2 · c1f99e2
1 parent 4414fcc
commit c1f99e2
Show file tree

Hide file tree

Showing 89 changed files with 123 additions and 498 deletions.
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/BulkProcessorIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/BulkProcessorIT.java
@@ -40,7 +40,6 @@
 import org.elasticsearch.rest.action.document.RestBulkAction;
 import org.elasticsearch.search.SearchHit;
 import org.hamcrest.Matcher;
-import org.hamcrest.Matchers;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -56,9 +55,7 @@
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.fieldFromSource;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasId;
-import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasIndex;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasProperty;
-import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasType;
 import static org.hamcrest.Matchers.both;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.either;
@@ -360,7 +357,6 @@ public void testGlobalParametersAndBulkProcessor() throws Exception {
                 Iterable<SearchHit> hits = searchAll(new SearchRequest("test").routing("routing"));
 
                 assertThat(hits, everyItem(hasProperty(fieldFromSource("fieldNameXYZ"), equalTo("valueXYZ"))));
-                assertThat(hits, everyItem(Matchers.allOf(hasIndex("test"), hasType(globalType))));
                 assertThat(hits, containsInAnyOrder(expectedIds(numDocs)));
             }
 
@@ -391,7 +387,6 @@ public void testGlobalParametersAndBulkProcessor() throws Exception {
                 Iterable<SearchHit> hits = searchAll(new SearchRequest("test").routing("routing"));
 
                 assertThat(hits, everyItem(hasProperty(fieldFromSource("fieldNameXYZ"), equalTo("valueXYZ"))));
-                assertThat(hits, everyItem(Matchers.allOf(hasIndex("test"), hasType(localType))));
                 assertThat(hits, containsInAnyOrder(expectedIds(numDocs)));
             }
         }
@@ -422,7 +417,6 @@ public void testGlobalParametersAndBulkProcessor() throws Exception {
                 Iterable<SearchHit> hits = searchAll(new SearchRequest("test").routing("routing"));
 
                 assertThat(hits, everyItem(hasProperty(fieldFromSource("fieldNameXYZ"), equalTo("valueXYZ"))));
-                assertThat(hits, everyItem(Matchers.allOf(hasIndex("test"), hasType(customType))));
                 assertThat(hits, containsInAnyOrder(expectedIds(numDocs)));
             }
         }

diff --git a/...-high-level/src/test/java/org/elasticsearch/client/BulkRequestWithGlobalParametersIT.java b/...-high-level/src/test/java/org/elasticsearch/client/BulkRequestWithGlobalParametersIT.java
@@ -33,7 +33,6 @@
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasId;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasIndex;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasProperty;
-import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasType;
 import static org.hamcrest.Matchers.both;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.emptyIterable;
@@ -138,36 +137,6 @@ public void testIndexGlobalAndPerRequest() throws IOException {
                 .and(hasIndex("global_index"))));
     }
 
-    public void testGlobalType() throws IOException {
-        BulkRequest request = new BulkRequest(null, "global_type");
-        request.add(new IndexRequest("index").id("1")
-            .source(XContentType.JSON, "field", "bulk1"));
-        request.add(new IndexRequest("index").id("2")
-            .source(XContentType.JSON, "field", "bulk2"));
-
-        bulkWithTypes(request);
-
-        Iterable<SearchHit> hits = searchAll("index");
-        assertThat(hits, everyItem(hasType("global_type")));
-    }
-
-    public void testTypeGlobalAndPerRequest() throws IOException {
-        BulkRequest request = new BulkRequest(null, "global_type");
-        request.add(new IndexRequest("index1", "local_type", "1")
-            .source(XContentType.JSON, "field", "bulk1"));
-        request.add(new IndexRequest("index2").id("2") // will take global type
-            .source(XContentType.JSON, "field", "bulk2"));
-
-        bulkWithTypes(request);
-
-        Iterable<SearchHit> hits = searchAll("index1", "index2");
-        assertThat(hits, containsInAnyOrder(
-            both(hasId("1"))
-                .and(hasType("local_type")),
-            both(hasId("2"))
-                .and(hasType("global_type"))));
-    }
-
     public void testGlobalRouting() throws IOException {
         createIndexWithMultipleShards("index");
         BulkRequest request = new BulkRequest((String) null);
@@ -177,7 +146,7 @@ public void testGlobalRouting() throws IOException {
             .source(XContentType.JSON, "field", "bulk1"));
         request.routing("1");
         bulk(request);
-        
+
         Iterable<SearchHit> emptyHits = searchAll(new SearchRequest("index").routing("xxx"));
         assertThat(emptyHits, is(emptyIterable()));
 
@@ -199,7 +168,7 @@ public void testMixLocalAndGlobalRouting() throws IOException {
         Iterable<SearchHit> hits = searchAll(new SearchRequest("index").routing("globalRouting", "localRouting"));
         assertThat(hits, containsInAnyOrder(hasId("1"), hasId("2")));
     }
-    
+
     public void testGlobalIndexNoTypes() throws IOException {
         BulkRequest request = new BulkRequest("global_index");
         request.add(new IndexRequest().id("1")
@@ -211,20 +180,20 @@ public void testGlobalIndexNoTypes() throws IOException {
 
         Iterable<SearchHit> hits = searchAll("global_index");
         assertThat(hits, everyItem(hasIndex("global_index")));
-    }    
+    }
 
     private BulkResponse bulkWithTypes(BulkRequest request) throws IOException {
-        BulkResponse bulkResponse = execute(request, highLevelClient()::bulk, highLevelClient()::bulkAsync, 
+        BulkResponse bulkResponse = execute(request, highLevelClient()::bulk, highLevelClient()::bulkAsync,
                 expectWarnings(RestBulkAction.TYPES_DEPRECATION_MESSAGE));
         assertFalse(bulkResponse.hasFailures());
         return bulkResponse;
     }
-    
+
     private BulkResponse bulk(BulkRequest request) throws IOException {
         BulkResponse bulkResponse = execute(request, highLevelClient()::bulk, highLevelClient()::bulkAsync, RequestOptions.DEFAULT);
         assertFalse(bulkResponse.hasFailures());
         return bulkResponse;
-    }    
+    }
 
     @SuppressWarnings("unchecked")
     private static <T> Function<SearchHit, T> fieldFromSource(String fieldName) {

diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/SearchIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/SearchIT.java
@@ -227,7 +227,6 @@ public void testSearchNoQuery() throws IOException {
         assertEquals(5, searchResponse.getHits().getHits().length);
         for (SearchHit searchHit : searchResponse.getHits().getHits()) {
             assertEquals("index", searchHit.getIndex());
-            assertEquals("type", searchHit.getType());
             assertThat(Integer.valueOf(searchHit.getId()), both(greaterThan(0)).and(lessThan(6)));
             assertEquals(1.0f, searchHit.getScore(), 0);
             assertEquals(-1L, searchHit.getVersion());
@@ -252,7 +251,6 @@ public void testSearchMatchQuery() throws IOException {
         assertThat(searchResponse.getHits().getMaxScore(), greaterThan(0f));
         SearchHit searchHit = searchResponse.getHits().getHits()[0];
         assertEquals("index", searchHit.getIndex());
-        assertEquals("type", searchHit.getType());
         assertEquals("1", searchHit.getId());
         assertThat(searchHit.getScore(), greaterThan(0f));
         assertEquals(-1L, searchHit.getVersion());

diff --git a/docs/reference/aggregations/metrics/tophits-aggregation.asciidoc b/docs/reference/aggregations/metrics/tophits-aggregation.asciidoc
@@ -89,7 +89,6 @@ Possible response:
                    "hits": [
                       {
                          "_index": "sales",
-                         "_type": "_doc",
                          "_id": "AVnNBmauCQpcRyxw6ChK",
                          "_source": {
                             "date": "2015/03/01 00:00:00",
@@ -117,7 +116,6 @@ Possible response:
                    "hits": [
                       {
                          "_index": "sales",
-                         "_type": "_doc",
                          "_id": "AVnNBmauCQpcRyxw6ChL",
                          "_source": {
                             "date": "2015/03/01 00:00:00",
@@ -145,7 +143,6 @@ Possible response:
                    "hits": [
                       {
                          "_index": "sales",
-                         "_type": "_doc",
                          "_id": "AVnNBmatCQpcRyxw6ChH",
                          "_source": {
                             "date": "2015/01/01 00:00:00",
@@ -331,7 +328,6 @@ Top hits response snippet with a nested hit, which resides in the first slot of
                 "hits": [
                   {
                     "_index": "sales",
-                    "_type" : "_doc",
                     "_id": "1",
                     "_nested": {
                       "field": "comments",  <1>
@@ -385,7 +381,6 @@ the second slow of the `nested_child_field` field:
  "hits": [
    {
      "_index": "a",
-     "_type": "b",
      "_id": "1",
      "_score": 1,
      "_nested" : {

diff --git a/docs/reference/aggregations/misc.asciidoc b/docs/reference/aggregations/misc.asciidoc
@@ -138,7 +138,6 @@ In the response, the aggregations names will be changed to respectively `date_hi
                             "hits" : [
                                 {
                                   "_index": "twitter",
-                                  "_type": "_doc",
                                   "_id": "0",
                                   "_score": 1.0,
                                   "_source": {

diff --git a/docs/reference/analysis/charfilters/pattern-replace-charfilter.asciidoc b/docs/reference/analysis/charfilters/pattern-replace-charfilter.asciidoc
@@ -243,7 +243,6 @@ The output from the above is:
     "hits": [
       {
         "_index": "my_index",
-        "_type": "_doc",
         "_id": "1",
         "_score": 0.2876821,
         "_source": {

diff --git a/docs/reference/analysis/tokenizers/edgengram-tokenizer.asciidoc b/docs/reference/analysis/tokenizers/edgengram-tokenizer.asciidoc
@@ -301,7 +301,6 @@ GET my_index/_search
     "hits": [
       {
         "_index": "my_index",
-        "_type": "_doc",
         "_id": "1",
         "_score": 0.5753642,
         "_source": {

diff --git a/docs/reference/getting-started.asciidoc b/docs/reference/getting-started.asciidoc
@@ -386,14 +386,12 @@ that match the search criteria:
     "max_score" : null,
     "hits" : [ {
       "_index" : "bank",
-      "_type" : "_doc",
       "_id" : "0",
       "sort": [0],
       "_score" : null,
       "_source" : {"account_number":0,"balance":16623,"firstname":"Bradshaw","lastname":"Mckenzie","age":29,"gender":"F","address":"244 Columbus Place","employer":"Euron","email":"[email protected]","city":"Hobucken","state":"CO"}
     }, {
       "_index" : "bank",
-      "_type" : "_doc",
       "_id" : "1",
       "sort": [1],
       "_score" : null,

diff --git a/docs/reference/how-to/recipes/stemming.asciidoc b/docs/reference/how-to/recipes/stemming.asciidoc
@@ -88,7 +88,6 @@ GET index/_search
     "hits": [
       {
         "_index": "index",
-        "_type": "_doc",
         "_id": "1",
         "_score": 0.18232156,
         "_source": {
@@ -97,7 +96,6 @@ GET index/_search
       },
       {
         "_index": "index",
-        "_type": "_doc",
         "_id": "2",
         "_score": 0.18232156,
         "_source": {
@@ -148,7 +146,6 @@ GET index/_search
     "hits": [
       {
         "_index": "index",
-        "_type": "_doc",
         "_id": "1",
         "_score": 0.8025915,
         "_source": {
@@ -207,7 +204,6 @@ GET index/_search
     "hits": [
       {
         "_index": "index",
-        "_type": "_doc",
         "_id": "1",
         "_score": 0.8025915,
         "_source": {

diff --git a/docs/reference/index-modules/similarity.asciidoc b/docs/reference/index-modules/similarity.asciidoc
@@ -260,7 +260,6 @@ Which yields:
         "_shard": "[index][0]",
         "_node": "OzrdjxNtQGaqs4DmioFw9A",
         "_index": "index",
-        "_type": "_doc",
         "_id": "1",
         "_score": 1.9508477,
         "_source": {
@@ -433,7 +432,6 @@ GET /index/_search?explain=true
         "_shard": "[index][0]",
         "_node": "OzrdjxNtQGaqs4DmioFw9A",
         "_index": "index",
-        "_type": "_doc",
         "_id": "1",
         "_score": 1.9508477,
         "_source": {

diff --git a/docs/reference/ingest/processors/geoip.asciidoc b/docs/reference/ingest/processors/geoip.asciidoc
@@ -266,7 +266,6 @@ GET /my_ip_locations/_search
     "hits" : [
       {
         "_index" : "my_ip_locations",
-        "_type" : "_doc",
         "_id" : "1",
         "_score" : 1.0,
         "_source" : {

diff --git a/docs/reference/mapping/params/normalizer.asciidoc b/docs/reference/mapping/params/normalizer.asciidoc
@@ -94,7 +94,6 @@ both index and query time.
     "hits": [
       {
         "_index": "index",
-        "_type": "_doc",
         "_id": "1",
         "_score": 0.47000363,
         "_source": {
@@ -103,7 +102,6 @@ both index and query time.
       },
       {
         "_index": "index",
-        "_type": "_doc",
         "_id": "2",
         "_score": 0.47000363,
         "_source": {

diff --git a/docs/reference/mapping/types/parent-join.asciidoc b/docs/reference/mapping/types/parent-join.asciidoc
@@ -179,7 +179,6 @@ Will return:
         "hits": [
             {
                 "_index": "my_index",
-                "_type": "_doc",
                 "_id": "1",
                 "_score": null,
                 "_source": {
@@ -192,7 +191,6 @@ Will return:
             },
             {
                 "_index": "my_index",
-                "_type": "_doc",
                 "_id": "2",
                 "_score": null,
                 "_source": {
@@ -205,7 +203,6 @@ Will return:
             },
             {
                 "_index": "my_index",
-                "_type": "_doc",
                 "_id": "3",
                 "_score": null,
                 "_routing": "1",
@@ -222,7 +219,6 @@ Will return:
             },
             {
                 "_index": "my_index",
-                "_type": "_doc",
                 "_id": "4",
                 "_score": null,
                 "_routing": "1",

diff --git a/docs/reference/mapping/types/percolator.asciidoc b/docs/reference/mapping/types/percolator.asciidoc
@@ -199,7 +199,6 @@ now returns matches from the new index:
     "hits": [
       {
         "_index": "new_index", <1>
-        "_type": "_doc",
         "_id": "1",
         "_score": 0.13076457,
         "_source": {
@@ -390,7 +389,6 @@ This results in a response like this:
     "hits": [
       {
         "_index": "test_index",
-        "_type": "_doc",
         "_id": "1",
         "_score": 0.13076457,
         "_source": {
@@ -547,7 +545,6 @@ GET /my_queries1/_search
     "hits": [
       {
         "_index": "my_queries1",
-        "_type": "_doc",
         "_id": "1",
         "_score": 0.18864399,
         "_source": {

diff --git a/docs/reference/mapping/types/range.asciidoc b/docs/reference/mapping/types/range.asciidoc
@@ -94,7 +94,6 @@ The result produced by the above query.
     "hits" : [
       {
         "_index" : "range_index",
-        "_type" : "_doc",
         "_id" : "1",
         "_score" : 1.0,
         "_source" : {
@@ -156,7 +155,6 @@ This query produces a similar result:
     "hits" : [
       {
         "_index" : "range_index",
-        "_type" : "_doc",
         "_id" : "1",
         "_score" : 1.0,
         "_source" : {

diff --git a/docs/reference/mapping/types/search-as-you-type.asciidoc b/docs/reference/mapping/types/search-as-you-type.asciidoc
@@ -122,7 +122,6 @@ GET my_index/_search
     "hits" : [
       {
         "_index" : "my_index",
-        "_type" : "_doc",
         "_id" : "1",
         "_score" : 0.8630463,
         "_source" : {