Add matching pattern to error in fields

modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeatureFieldMapper.java

@@ -104,7 +104,7 @@ public IndexFieldData.Builder fielddataBuilder(String fullyQualifiedIndexName, S
         @Override
         public ValueFetcher valueFetcher(SearchExecutionContext context, String format) {
             if (format != null) {
-                throw new IllegalArgumentException("Field [" + name() + "] of type [" + typeName() + "] doesn't support formats.");
+                throw new IllegalArgumentException("[" + typeName() + "] doesn't support formats.");
             }
             return new SourceValueFetcher(name(), context) {
                 @Override

modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentJoinFieldMapper.java

@@ -151,7 +151,7 @@ public IndexFieldData.Builder fielddataBuilder(String fullyQualifiedIndexName, S
         @Override
         public ValueFetcher valueFetcher(SearchExecutionContext context, String format) {
             if (format != null) {
-                throw new IllegalArgumentException("Field [" + name() + "] of type [" + typeName() + "] doesn't support formats.");
+                throw new IllegalArgumentException("[" + typeName() + "] doesn't support formats.");
             }
             return SourceValueFetcher.identity(name(), context, format);
         }

modules/parent-join/src/test/java/org/elasticsearch/join/mapper/JoinFieldTypeTests.java

@@ -29,6 +29,6 @@ public void testFetchSourceValue() throws IOException {
 
         IllegalArgumentException e = expectThrows(IllegalArgumentException.class,
             () -> fetchSourceValue(fieldType, parentValue, "format"));
-        assertEquals("Field [field] of type [join] doesn't support formats.", e.getMessage());
+        assertEquals("[join] doesn't support formats.", e.getMessage());
     }
 }

plugins/analysis-icu/src/main/java/org/elasticsearch/index/mapper/ICUCollationKeywordFieldMapper.java

@@ -73,7 +73,7 @@ public String typeName() {
         @Override
         public ValueFetcher valueFetcher(SearchExecutionContext context, String format) {
             if (format != null) {
-                throw new IllegalArgumentException("Field [" + name() + "] of type [" + typeName() + "] doesn't support formats.");
+                throw new IllegalArgumentException("[" + typeName() + "] doesn't support formats.");
             }
 
             return new SourceValueFetcher(name(), context, nullValue) {

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/330_fetch_fields.yml

@@ -855,6 +855,7 @@ Test nested field with sibling field resolving to DocValueFetcher:
   - match: { hits.hits.0.fields.number.2 : 3 }
   - match: { hits.hits.0.fields.number.3 : 5 }
   - match: { hits.hits.0.fields.number.4 : 6 }
+
 ---
 Test token_count inside nested field doesn't fail:
   - skip:
@@ -892,3 +893,117 @@ Test token_count inside nested field doesn't fail:
            body:
               _source: false
               fields: [ "*" ]
+
+---
+error includes field name:
+  - skip:
+      version: ' - 7.99.99'
+      reason:  'error changed in 8.0.0 to be backported to 7.15'
+
+  - do:
+      indices.create:
+        index:  test
+        body:
+          settings:
+            index.number_of_shards: 1
+          mappings:
+            properties:
+              keyword:
+                type: keyword
+              date:
+                type: date
+
+  - do:
+      index:
+        index:   test
+        id:      1
+        refresh: true
+        body:
+          keyword: "value"
+          date: "1990-12-29T22:30:00.000Z"
+
+  - do:
+      catch: '/error fetching \[keyword\]: \[keyword\] doesn''t support formats./'
+      search:
+        index: test
+        body:
+          fields:
+            - field: keyword
+              format: "yyyy/MM/dd"
+
+---
+error includes glob pattern:
+  - skip:
+      version: ' - 7.99.99'
+      reason:  'error changed in 8.0.0 to be backported to 7.15'
+
+  - do:
+      indices.create:
+        index:  test
+        body:
+          settings:
+            index.number_of_shards: 1
+          mappings:
+            properties:
+              dkeyword:
+                type: keyword
+              date:
+                type: date
+
+  - do:
+      index:
+        index:   test
+        id:      1
+        refresh: true
+        body:
+          dkeyword: "value"
+          date: "1990-12-29T22:30:00.000Z"
+
+  - do:
+      catch: '/error fetching \[dkeyword\] which matched \[d\*\]: \[keyword\] doesn''t support formats./'
+      search:
+        index: test
+        body:
+          fields:
+            - field: d*
+              format: "yyyy/MM/dd"
+
+
+---
+error for flattened includes whole path:
+  - skip:
+      version: ' - 7.99.99'
+      reason:  'error changed in 8.0.0 to be backported to 7.15'
+
+  - do:
+      indices.create:
+        index:  test
+        body:
+          settings:
+            index.number_of_shards: 1
+          mappings:
+            properties:
+              flattened:
+                type: flattened
+
+              date:
+                type: date
+
+  - do:
+      index:
+        index:   test
+        id:      1
+        refresh: true
+        body:
+          flattened:
+            foo: bar
+          date: "1990-12-29T22:30:00.000Z"
+
+  - do:
+      catch: '/error fetching \[flattened.bar\]: \[flattened\] doesn''t support formats./'
+      search:
+        index: test
+        body:
+          fields:
+            - field: flattened.bar
+              format: "yyyy/MM/dd"

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

@@ -57,7 +57,7 @@ public Query termQuery(Object value, SearchExecutionContext context) {
         @Override
         public ValueFetcher valueFetcher(SearchExecutionContext context, String format) {
             if (format != null) {
-                throw new IllegalArgumentException("Field [" + name() + "] of type [" + typeName() + "] doesn't support formats.");
+                throw new IllegalArgumentException("[" + typeName() + "] doesn't support formats.");
             }
 
             return new SourceValueFetcher(name(), context, DEFAULT_VALUE) {

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

@@ -195,7 +195,7 @@ private static InetAddress parse(Object value) {
         @Override
         public ValueFetcher valueFetcher(SearchExecutionContext context, String format) {
             if (format != null) {
-                throw new IllegalArgumentException("Field [" + name() + "] of type [" + typeName() + "] doesn't support formats.");
+                throw new IllegalArgumentException("[" + typeName() + "] doesn't support formats.");
             }
             if (scriptValues != null) {
                 return FieldValues.valueFetcher(scriptValues, v -> InetAddresses.toAddrString((InetAddress)v), context);

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

@@ -352,7 +352,7 @@ public IndexFieldData.Builder fielddataBuilder(String fullyQualifiedIndexName, S
         @Override
         public ValueFetcher valueFetcher(SearchExecutionContext context, String format) {
             if (format != null) {
-                throw new IllegalArgumentException("Field [" + name() + "] of type [" + typeName() + "] doesn't support formats.");
+                throw new IllegalArgumentException("[" + typeName() + "] doesn't support formats.");
             }
             if (this.scriptValues != null) {
                 return FieldValues.valueFetcher(this.scriptValues, context);

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

@@ -1042,7 +1042,7 @@ public Object valueForDisplay(Object value) {
         @Override
         public ValueFetcher valueFetcher(SearchExecutionContext context, String format) {
             if (format != null) {
-                throw new IllegalArgumentException("Field [" + name() + "] of type [" + typeName() + "] doesn't support formats.");
+                throw new IllegalArgumentException("[" + typeName() + "] doesn't support formats.");
             }
             if (this.scriptValues != null) {
                 return FieldValues.valueFetcher(this.scriptValues, context);

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

@@ -101,7 +101,7 @@ public List<Object> fetchValues(SourceLookup lookup) {
      */
     public static SourceValueFetcher identity(String fieldName, SearchExecutionContext context, String format) {
         if (format != null) {
-            throw new IllegalArgumentException("Field [" + fieldName + "] doesn't support formats.");
+            throw new IllegalArgumentException("Field doesn't support formats.");
         }
         return new SourceValueFetcher(fieldName, context) {
             @Override
@@ -116,7 +116,7 @@ protected Object parseSourceValue(Object value) {
      */
     public static SourceValueFetcher toString(String fieldName, SearchExecutionContext context, String format) {
         if (format != null) {
-            throw new IllegalArgumentException("Field [" + fieldName + "] doesn't support formats.");
+            throw new IllegalArgumentException("Field doesn't support formats.");
         }
         return new SourceValueFetcher(fieldName, context) {
             @Override

server/src/main/java/org/elasticsearch/index/mapper/flattened/FlattenedFieldMapper.java

@@ -306,8 +306,7 @@ public IndexFieldData.Builder fielddataBuilder(String fullyQualifiedIndexName, S
         @Override
         public ValueFetcher valueFetcher(SearchExecutionContext context, String format) {
             if (format != null) {
-                throw new IllegalArgumentException("Field [" + rootName + "." + key + "] of type [" + typeName() +
-                    "] doesn't support formats.");
+                throw new IllegalArgumentException("[" + typeName() + "] doesn't support formats.");
             }
             return SourceValueFetcher.identity(rootName + "." + key, context, format);
         }

server/src/main/java/org/elasticsearch/search/fetch/subphase/FieldFetcher.java

@@ -92,8 +92,17 @@ private static FieldFetcher create(SearchExecutionContext context,
                 }
                 // only add concrete fields if they are not beneath a known nested field
                 if (nestedParentPath == null) {
-                    ValueFetcher valueFetcher = ft.valueFetcher(context, fieldAndFormat.format);
-                    fieldContexts.put(field, new FieldContext(field, valueFetcher));
+                    try {
+                        ValueFetcher valueFetcher = ft.valueFetcher(context, fieldAndFormat.format);
+                        fieldContexts.put(field, new FieldContext(field, valueFetcher));
+                    } catch (IllegalArgumentException e) {
+                        StringBuilder error = new StringBuilder("error fetching [").append(field).append(']');
+                        if (isWildcardPattern) {
+                            error.append(" which matched [").append(fieldAndFormat.field).append(']');
+                        }
+                        error.append(": ").append(e.getMessage());
+                        throw new IllegalArgumentException(error.toString(), e);
+                    }
                 }
             }
         }

server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldTypeTests.java

@@ -175,7 +175,7 @@ public void testFetchSourceValue() throws IOException {
         assertEquals(List.of("true"), fetchSourceValue(mapper, true));
 
         IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> fetchSourceValue(mapper, "value", "format"));
-        assertEquals("Field [field] of type [keyword] doesn't support formats.", e.getMessage());
+        assertEquals("[keyword] doesn't support formats.", e.getMessage());
 
         MappedFieldType ignoreAboveMapper = new KeywordFieldMapper.Builder("field")
             .ignoreAbove(4)

server/src/test/java/org/elasticsearch/index/mapper/flattened/KeyedFlattenedFieldTypeTests.java

@@ -183,6 +183,6 @@ public void testFetchSourceValue() throws IOException {
         assertEquals(List.of(), fetcher.fetchValues(lookup));
 
         IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> ft.valueFetcher(searchExecutionContext, "format"));
-        assertEquals("Field [field.key] of type [flattened] doesn't support formats.", e.getMessage());
+        assertEquals("[flattened] doesn't support formats.", e.getMessage());
     }
 }

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/cluster/routing/allocation/mapper/DataTierFieldMapper.java

@@ -74,7 +74,7 @@ public Query existsQuery(SearchExecutionContext context) {
         @Override
         public ValueFetcher valueFetcher(SearchExecutionContext context, String format) {
             if (format != null) {
-                throw new IllegalArgumentException("Field [" + name() + "] of type [" + typeName() + "] doesn't support formats.");
+                throw new IllegalArgumentException("[" + typeName() + "] doesn't support formats.");
             }
 
             String tierPreference = getTierPreference(context);

x-pack/plugin/mapper-aggregate-metric/src/main/java/org/elasticsearch/xpack/aggregatemetric/mapper/AggregateDoubleMetricFieldMapper.java

@@ -447,7 +447,7 @@ public BucketedSort newBucketedSort(
         @Override
         public ValueFetcher valueFetcher(SearchExecutionContext context, String format) {
             if (format != null) {
-                throw new IllegalArgumentException("Field [" + name() + "] of type [" + typeName() + "] doesn't support formats.");
+                throw new IllegalArgumentException("[" + typeName() + "] doesn't support formats.");
             }
 
             return new SourceValueFetcher(name(), context) {

x-pack/plugin/mapper-constant-keyword/src/main/java/org/elasticsearch/xpack/constantkeyword/mapper/ConstantKeywordFieldMapper.java

@@ -137,7 +137,7 @@ public IndexFieldData.Builder fielddataBuilder(String fullyQualifiedIndexName, S
         @Override
         public ValueFetcher valueFetcher(SearchExecutionContext context, String format) {
             if (format != null) {
-                throw new IllegalArgumentException("Field [" + name() + "] of type [" + typeName() + "] doesn't support formats.");
+                throw new IllegalArgumentException("[" + typeName() + "] doesn't support formats.");
             }
 
             return value == null

x-pack/plugin/mapper-unsigned-long/src/main/java/org/elasticsearch/xpack/unsignedlong/UnsignedLongFieldMapper.java

@@ -241,7 +241,7 @@ public IndexFieldData.Builder fielddataBuilder(String fullyQualifiedIndexName, S
         @Override
         public ValueFetcher valueFetcher(SearchExecutionContext context, String format) {
             if (format != null) {
-                throw new IllegalArgumentException("Field [" + name() + "] of type [" + typeName() + "] doesn't support formats.");
+                throw new IllegalArgumentException("[" + typeName() + "] doesn't support formats.");
             }
 
             return new SourceValueFetcher(name(), context, nullValueFormatted) {

x-pack/plugin/mapper-version/src/test/java/org/elasticsearch/xpack/versionfield/VersionStringFieldTypeTests.java

@@ -23,6 +23,6 @@ public void testFetchSourceValue() throws IOException {
         assertEquals(List.of("true"), fetchSourceValue(mapper, true));
 
         IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> fetchSourceValue(mapper, "value", "format"));
-        assertEquals("Field [field] doesn't support formats.", e.getMessage());
+        assertEquals("Field doesn't support formats.", e.getMessage());
     }
 }

x-pack/plugin/vectors/src/main/java/org/elasticsearch/xpack/vectors/mapper/DenseVectorFieldMapper.java

@@ -115,7 +115,7 @@ public String typeName() {
         @Override
         public ValueFetcher valueFetcher(SearchExecutionContext context, String format) {
             if (format != null) {
-                throw new IllegalArgumentException("Field [" + name() + "] of type [" + typeName() + "] doesn't support formats.");
+                throw new IllegalArgumentException("[" + typeName() + "] doesn't support formats.");
             }
             return new ArraySourceValueFetcher(name(), context) {
                 @Override

x-pack/plugin/wildcard/src/main/java/org/elasticsearch/xpack/wildcard/mapper/WildcardFieldMapper.java

@@ -892,7 +892,7 @@ public IndexFieldData.Builder fielddataBuilder(String fullyQualifiedIndexName, S
          @Override
          public ValueFetcher valueFetcher(SearchExecutionContext context, String format) {
              if (format != null) {
-                 throw new IllegalArgumentException("Field [" + name() + "] of type [" + typeName() + "] doesn't support formats.");
+                 throw new IllegalArgumentException("[" + typeName() + "] doesn't support formats.");
              }
 
              return new SourceValueFetcher(name(), context, nullValue) {

x-pack/qa/runtime-fields/build.gradle

@@ -80,6 +80,9 @@ subprojects {
           'search.aggregation/20_terms/Global ordinals are loaded with the global_ordinals execution hint',
           'search.aggregation/170_cardinality_metric/profiler string',
           'search.aggregation/235_composite_sorted/*',
+          // The error messages are different
+          'search/330_fetch_fields/error includes field name',
+          'search/330_fetch_fields/error includes glob pattern',
           /////// NOT SUPPORTED ///////
         ].join(',')
     }