Remove types from internal GetFieldMappings request/response objects (#48815)

Type filters and intermediate type levels in mappings responses have already been
removed from the GetFieldMappings REST layer; we can also remove them from the
internal Node client classes.

Relates to #41059

Author: romseygeek

rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/20_missing_field.yml

@@ -1,5 +1,5 @@
 ---
-"Return empty object if field doesn't exist, but type and index do":
+"Return empty object if field doesn't exist, but index does":
 
   - do:
         indices.create:
@@ -17,3 +17,4 @@
         fields: not_existent
 
   - match: { 'test_index.mappings': {}}
+

server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsIndexRequest.java

@@ -19,37 +19,39 @@
 
 package org.elasticsearch.action.admin.indices.mapping.get;
 
+import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.OriginalIndices;
 import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.action.support.single.shard.SingleShardRequest;
+import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 
 import java.io.IOException;
 
 public class GetFieldMappingsIndexRequest extends SingleShardRequest<GetFieldMappingsIndexRequest> {
 
-    private final boolean probablySingleFieldRequest;
     private final boolean includeDefaults;
     private final String[] fields;
-    private final String[] types;
 
-    private OriginalIndices originalIndices;
+    private final OriginalIndices originalIndices;
 
     GetFieldMappingsIndexRequest(StreamInput in) throws IOException {
         super(in);
-        types = in.readStringArray();
+        if (in.getVersion().before(Version.V_8_0_0)) {
+            in.readStringArray();   // former types array
+        }
         fields = in.readStringArray();
         includeDefaults = in.readBoolean();
-        probablySingleFieldRequest = in.readBoolean();
+        if (in.getVersion().before(Version.V_8_0_0)) {
+            in.readBoolean();       // former probablySingleField boolean
+        }
         originalIndices = OriginalIndices.readOriginalIndices(in);
     }
 
-    GetFieldMappingsIndexRequest(GetFieldMappingsRequest other, String index, boolean probablySingleFieldRequest) {
-        this.probablySingleFieldRequest = probablySingleFieldRequest;
+    GetFieldMappingsIndexRequest(GetFieldMappingsRequest other, String index) {
         this.includeDefaults = other.includeDefaults();
-        this.types = other.types();
         this.fields = other.fields();
         assert index != null;
         this.index(index);
@@ -61,18 +63,10 @@ public ActionRequestValidationException validate() {
         return null;
     }
 
-    public String[] types() {
-        return types;
-    }
-
     public String[] fields() {
         return fields;
     }
 
-    public boolean probablySingleFieldRequest() {
-        return probablySingleFieldRequest;
-    }
-
     public boolean includeDefaults() {
         return includeDefaults;
     }
@@ -90,10 +84,14 @@ public IndicesOptions indicesOptions() {
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
-        out.writeStringArray(types);
+        if (out.getVersion().before(Version.V_8_0_0)) {
+            out.writeStringArray(Strings.EMPTY_ARRAY);
+        }
         out.writeStringArray(fields);
         out.writeBoolean(includeDefaults);
-        out.writeBoolean(probablySingleFieldRequest);
+        if (out.getVersion().before(Version.V_8_0_0)) {
+            out.writeBoolean(false);
+        }
         OriginalIndices.writeOriginalIndices(originalIndices, out);
     }
 

server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsRequest.java

@@ -19,6 +19,7 @@
 
 package org.elasticsearch.action.admin.indices.mapping.get;
 
+import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.IndicesRequest;
@@ -28,6 +29,7 @@
 import org.elasticsearch.common.io.stream.StreamOutput;
 
 import java.io.IOException;
+import java.util.Arrays;
 
 /**
  * Request the mappings of specific fields
@@ -44,7 +46,6 @@ public class GetFieldMappingsRequest extends ActionRequest implements IndicesReq
     private boolean includeDefaults = false;
 
     private String[] indices = Strings.EMPTY_ARRAY;
-    private String[] types = Strings.EMPTY_ARRAY;
 
     private IndicesOptions indicesOptions = IndicesOptions.strictExpandOpen();
 
@@ -53,7 +54,12 @@ public GetFieldMappingsRequest() {}
     public GetFieldMappingsRequest(StreamInput in) throws IOException {
         super(in);
         indices = in.readStringArray();
-        types = in.readStringArray();
+        if (in.getVersion().before(Version.V_8_0_0)) {
+            String[] types = in.readStringArray();
+            if (types != Strings.EMPTY_ARRAY) {
+                throw new IllegalArgumentException("Expected empty type array but received [" + Arrays.toString(types) + "]");
+            }
+        }
         indicesOptions = IndicesOptions.readIndicesOptions(in);
         local = in.readBoolean();
         fields = in.readStringArray();
@@ -79,11 +85,6 @@ public GetFieldMappingsRequest indices(String... indices) {
         return this;
     }
 
-    public GetFieldMappingsRequest types(String... types) {
-        this.types = types;
-        return this;
-    }
-
     public GetFieldMappingsRequest indicesOptions(IndicesOptions indicesOptions) {
         this.indicesOptions = indicesOptions;
         return this;
@@ -94,10 +95,6 @@ public String[] indices() {
         return indices;
     }
 
-    public String[] types() {
-        return types;
-    }
-
     @Override
     public IndicesOptions indicesOptions() {
         return indicesOptions;
@@ -132,7 +129,9 @@ public ActionRequestValidationException validate() {
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         out.writeStringArray(indices);
-        out.writeStringArray(types);
+        if (out.getVersion().before(Version.V_8_0_0)) {
+            out.writeStringArray(Strings.EMPTY_ARRAY);
+        }
         indicesOptions.writeIndicesOptions(out);
         out.writeBoolean(local);
         out.writeStringArray(fields);

server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsRequestBuilder.java

@@ -42,16 +42,6 @@ public GetFieldMappingsRequestBuilder addIndices(String... indices) {
         return this;
     }
 
-    public GetFieldMappingsRequestBuilder setTypes(String... types) {
-        request.types(types);
-        return this;
-    }
-
-    public GetFieldMappingsRequestBuilder addTypes(String... types) {
-        request.types(ArrayUtils.concat(request.types(), types));
-        return this;
-    }
-
     public GetFieldMappingsRequestBuilder setIndicesOptions(IndicesOptions indicesOptions) {
         request.indicesOptions(indicesOptions);
         return this;

server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsResponse.java

@@ -19,9 +19,9 @@
 
 package org.elasticsearch.action.admin.indices.mapping.get;
 
+import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.common.ParseField;
-import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -32,6 +32,7 @@
 import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.index.mapper.Mapper;
+import org.elasticsearch.index.mapper.MapperService;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -51,38 +52,35 @@ public class GetFieldMappingsResponse extends ActionResponse implements ToXConte
 
     private static final ParseField MAPPINGS = new ParseField("mappings");
 
-    // TODO remove the middle `type` level of this
-    private final Map<String, Map<String, Map<String, FieldMappingMetaData>>> mappings;
+    private final Map<String, Map<String, FieldMappingMetaData>> mappings;
 
-    GetFieldMappingsResponse(Map<String, Map<String, Map<String, FieldMappingMetaData>>> mappings) {
+    GetFieldMappingsResponse(Map<String, Map<String, FieldMappingMetaData>> mappings) {
         this.mappings = mappings;
     }
 
     GetFieldMappingsResponse(StreamInput in) throws IOException {
         super(in);
         int size = in.readVInt();
-        Map<String, Map<String, Map<String, FieldMappingMetaData>>> indexMapBuilder = new HashMap<>(size);
+        Map<String, Map<String, FieldMappingMetaData>> indexMapBuilder = new HashMap<>(size);
         for (int i = 0; i < size; i++) {
             String index = in.readString();
-            int typesSize = in.readVInt();
-            Map<String, Map<String, FieldMappingMetaData>> typeMapBuilder = new HashMap<>(typesSize);
-            for (int j = 0; j < typesSize; j++) {
-                String type = in.readString();
-                int fieldSize = in.readVInt();
-                Map<String, FieldMappingMetaData> fieldMapBuilder = new HashMap<>(fieldSize);
-                for (int k = 0; k < fieldSize; k++) {
-                    fieldMapBuilder.put(in.readString(), new FieldMappingMetaData(in.readString(), in.readBytesReference()));
-                }
-                typeMapBuilder.put(type, unmodifiableMap(fieldMapBuilder));
+            if (in.getVersion().before(Version.V_8_0_0)) {
+                int typesSize = in.readVInt();
+                assert typesSize == 1;
+                in.readString(); // type
+            }
+            int fieldSize = in.readVInt();
+            Map<String, FieldMappingMetaData> fieldMapBuilder = new HashMap<>(fieldSize);
+            for (int k = 0; k < fieldSize; k++) {
+                fieldMapBuilder.put(in.readString(), new FieldMappingMetaData(in.readString(), in.readBytesReference()));
             }
-            indexMapBuilder.put(index, unmodifiableMap(typeMapBuilder));
+            indexMapBuilder.put(index, unmodifiableMap(fieldMapBuilder));
         }
         mappings = unmodifiableMap(indexMapBuilder);
-
     }
 
-    /** returns the retrieved field mapping. The return map keys are index, type, field (as specified in the request). */
-    public Map<String, Map<String, Map<String, FieldMappingMetaData>>> mappings() {
+    /** returns the retrieved field mapping. The return map keys are index, field (as specified in the request). */
+    public Map<String, Map<String, FieldMappingMetaData>> mappings() {
         return mappings;
     }
 
@@ -92,32 +90,23 @@ public Map<String, Map<String, Map<String, FieldMappingMetaData>>> mappings() {
      * @param field field name as specified in the {@link GetFieldMappingsRequest}
      * @return FieldMappingMetaData for the requested field or null if not found.
      */
-    public FieldMappingMetaData fieldMappings(String index, String type, String field) {
-        Map<String, Map<String, FieldMappingMetaData>> indexMapping = mappings.get(index);
+    public FieldMappingMetaData fieldMappings(String index, String field) {
+        Map<String, FieldMappingMetaData> indexMapping = mappings.get(index);
         if (indexMapping == null) {
             return null;
         }
-        Map<String, FieldMappingMetaData> typeMapping = indexMapping.get(type);
-        if (typeMapping == null) {
-            return null;
-        }
-        return typeMapping.get(field);
+        return indexMapping.get(field);
     }
 
     @Override
     public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
-                builder.startObject();
-        for (Map.Entry<String, Map<String, Map<String, FieldMappingMetaData>>> indexEntry : mappings.entrySet()) {
+        builder.startObject();
+        for (Map.Entry<String, Map<String, FieldMappingMetaData>> indexEntry : mappings.entrySet()) {
             builder.startObject(indexEntry.getKey());
             builder.startObject(MAPPINGS.getPreferredName());
 
-            Map<String, FieldMappingMetaData> mappings = null;
-            for (Map.Entry<String, Map<String, FieldMappingMetaData>> typeEntry : indexEntry.getValue().entrySet()) {
-                assert mappings == null;
-                mappings = typeEntry.getValue();
-            }
-            if (mappings != null) {
-                addFieldMappingsToBuilder(builder, params, mappings);
+            if (indexEntry.getValue() != null) {
+                addFieldMappingsToBuilder(builder, params, indexEntry.getValue());
             }
 
             builder.endObject();
@@ -138,7 +127,6 @@ private void addFieldMappingsToBuilder(XContentBuilder builder,
     }
 
     public static class FieldMappingMetaData implements ToXContentFragment {
-        public static final FieldMappingMetaData NULL = new FieldMappingMetaData("", BytesArray.EMPTY);
 
         private static final ParseField FULL_NAME = new ParseField("full_name");
         private static final ParseField MAPPING = new ParseField("mapping");
@@ -165,10 +153,6 @@ public Map<String, Object> sourceAsMap() {
             return XContentHelper.convertToMap(source, true, XContentType.JSON).v2();
         }
 
-        public boolean isNull() {
-            return NULL.fullName().equals(fullName) && NULL.source.length() == source.length();
-        }
-
         //pkg-private for testing
         BytesReference getSource() {
             return source;
@@ -210,18 +194,18 @@ public int hashCode() {
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         out.writeVInt(mappings.size());
-        for (Map.Entry<String, Map<String, Map<String, FieldMappingMetaData>>> indexEntry : mappings.entrySet()) {
+        for (Map.Entry<String, Map<String, FieldMappingMetaData>> indexEntry : mappings.entrySet()) {
             out.writeString(indexEntry.getKey());
+            if (out.getVersion().before(Version.V_8_0_0)) {
+                out.writeVInt(1);
+                out.writeString(MapperService.SINGLE_MAPPING_NAME);
+            }
             out.writeVInt(indexEntry.getValue().size());
-            for (Map.Entry<String, Map<String, FieldMappingMetaData>> typeEntry : indexEntry.getValue().entrySet()) {
-                out.writeString(typeEntry.getKey());
-                out.writeVInt(typeEntry.getValue().size());
-                for (Map.Entry<String, FieldMappingMetaData> fieldEntry : typeEntry.getValue().entrySet()) {
-                    out.writeString(fieldEntry.getKey());
-                    FieldMappingMetaData fieldMapping = fieldEntry.getValue();
-                    out.writeString(fieldMapping.fullName());
-                    out.writeBytesReference(fieldMapping.source);
-                }
+            for (Map.Entry<String, FieldMappingMetaData> fieldEntry : indexEntry.getValue().entrySet()) {
+                out.writeString(fieldEntry.getKey());
+                FieldMappingMetaData fieldMapping = fieldEntry.getValue();
+                out.writeString(fieldMapping.fullName());
+                out.writeBytesReference(fieldMapping.source);
             }
         }
     }

server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsResponse.java

@@ -99,13 +99,13 @@ public void writeTo(StreamOutput out) throws IOException {
     @Override
     public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
         for (final ObjectObjectCursor<String, MappingMetaData> indexEntry : getMappings()) {
+            builder.startObject(indexEntry.key);
             if (indexEntry.value != null) {
-                builder.startObject(indexEntry.key);
                 builder.field(MAPPINGS.getPreferredName(), indexEntry.value.sourceAsMap());
-                builder.endObject();
             } else {
                 builder.startObject(MAPPINGS.getPreferredName()).endObject();
             }
+            builder.endObject();
         }
         return builder;
     }

server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsAction.java

@@ -65,9 +65,8 @@ protected void doExecute(Task task, GetFieldMappingsRequest request, final Actio
         if (concreteIndices.length == 0) {
             listener.onResponse(new GetFieldMappingsResponse(emptyMap()));
         } else {
-            boolean probablySingleFieldRequest = concreteIndices.length == 1 && request.types().length == 1 && request.fields().length == 1;
             for (final String index : concreteIndices) {
-                GetFieldMappingsIndexRequest shardRequest = new GetFieldMappingsIndexRequest(request, index, probablySingleFieldRequest);
+                GetFieldMappingsIndexRequest shardRequest = new GetFieldMappingsIndexRequest(request, index);
 
                 client.executeLocally(TransportGetFieldMappingsIndexAction.TYPE, shardRequest, new ActionListener<>() {
                     @Override
@@ -92,7 +91,7 @@ public void onFailure(Exception e) {
     }
 
     private GetFieldMappingsResponse merge(AtomicReferenceArray<Object> indexResponses) {
-        Map<String, Map<String, Map<String, GetFieldMappingsResponse.FieldMappingMetaData>>> mergedResponses = new HashMap<>();
+        Map<String, Map<String, GetFieldMappingsResponse.FieldMappingMetaData>> mergedResponses = new HashMap<>();
         for (int i = 0; i < indexResponses.length(); i++) {
             Object element = indexResponses.get(i);
             if (element instanceof GetFieldMappingsResponse) {