Correctly classify references to missing fields

4 files changed, 14 insertions, 17 deletions

diff --git a/config-model/src/main/java/com/yahoo/schema/Schema.java b/config-model/src/main/java/com/yahoo/schema/Schema.java
index 93bec4975a6..36730a502ea 100644
--- a/config-model/src/main/java/com/yahoo/schema/Schema.java
+++ b/config-model/src/main/java/com/yahoo/schema/Schema.java
@@ -319,16 +319,12 @@ public class Schema implements ImmutableSchema {
         return null;
     }
 
-    /**
-     * @return true if the document has been added.
-     */
+    /** Returns true if the document has been added. */
     public boolean hasDocument() {
         return documentType != null;
     }
 
-    /**
-     * @return The document in this search.
-     */
+    /** Returns the document in this search. */
     @Override
     public SDDocumentType getDocument() {
         return documentType;
@@ -384,7 +380,7 @@ public class Schema implements ImmutableSchema {
     }
 
     /**
-     * Returns a field defined in one of the documents of this search definition.
+     * Returns a field defined in one of the documents of this schema.
      * This does not include the extra fields defined outside the document
      * (those accessible through the getExtraField() method).
      *
diff --git a/config-model/src/main/java/com/yahoo/schema/document/ImmutableSDField.java b/config-model/src/main/java/com/yahoo/schema/document/ImmutableSDField.java
index 2d826e164b7..4c7e7eb28f4 100644
--- a/config-model/src/main/java/com/yahoo/schema/document/ImmutableSDField.java
+++ b/config-model/src/main/java/com/yahoo/schema/document/ImmutableSDField.java
@@ -101,4 +101,5 @@ public interface ImmutableSDField {
     boolean existsIndex(String name);
     SummaryField getSummaryField(String name);
     boolean hasIndex();
+
 }
diff --git a/config-model/src/main/java/com/yahoo/schema/processing/IndexingInputs.java b/config-model/src/main/java/com/yahoo/schema/processing/IndexingInputs.java
index 88e84d5289f..985ec8653c7 100644
--- a/config-model/src/main/java/com/yahoo/schema/processing/IndexingInputs.java
+++ b/config-model/src/main/java/com/yahoo/schema/processing/IndexingInputs.java
@@ -96,11 +96,11 @@ public class IndexingInputs extends Processor {
         @Override
         protected void doVisit(Expression exp) {
             if ( ! (exp instanceof InputExpression)) return;
-            String inputField = ((InputExpression)exp).getFieldName();
-            if (schema.getField(inputField).hasFullIndexingDocprocRights()) return;
-
-            fail(schema, field, "Indexing script refers to field '" + inputField + "' which does not exist " +
-                                "in document type '" + schema.getDocument().getName() + "', and is not a mutable attribute.");
+            var referencedFieldName = ((InputExpression)exp).getFieldName();
+            var referencedField = schema.getField(referencedFieldName);
+            if (referencedField == null || ! referencedField.hasFullIndexingDocprocRights())
+                fail(schema, field, "Indexing script refers to field '" + referencedFieldName +
+                                    "' which is neither a field in " + schema.getDocument() + " nor a mutable attribute");
         }
     }
 }
diff --git a/config-model/src/test/java/com/yahoo/schema/processing/IndexingInputsTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/IndexingInputsTestCase.java
index 893ee3b1ea4..d420623f233 100644
--- a/config-model/src/test/java/com/yahoo/schema/processing/IndexingInputsTestCase.java
+++ b/config-model/src/test/java/com/yahoo/schema/processing/IndexingInputsTestCase.java
@@ -17,29 +17,29 @@ public class IndexingInputsTestCase {
     void requireThatExtraFieldInputExtraFieldThrows() throws IOException, ParseException {
         assertBuildFails("src/test/examples/indexing_extra_field_input_extra_field.sd",
                 "For schema 'indexing_extra_field_input_extra_field', field 'bar': Indexing script refers " +
-                        "to field 'bar' which does not exist in document type " +
-                        "'indexing_extra_field_input_extra_field', and is not a mutable attribute.");
+                        "to field 'bar' which is neither a field in document type " +
+                        "'indexing_extra_field_input_extra_field' nor a mutable attribute");
     }
 
     @Test
     void requireThatExtraFieldInputImplicitThrows() throws IOException, ParseException {
         assertBuildFails("src/test/examples/indexing_extra_field_input_implicit.sd",
                 "For schema 'indexing_extra_field_input_implicit', field 'foo': Indexing script refers to " +
-                        "field 'foo' which does not exist in document type 'indexing_extra_field_input_implicit', and is not a mutable attribute.");
+                        "field 'foo' which is neither a field in document type 'indexing_extra_field_input_implicit' nor a mutable attribute");
     }
 
     @Test
     void requireThatExtraFieldInputNullThrows() throws IOException, ParseException {
         assertBuildFails("src/test/examples/indexing_extra_field_input_null.sd",
                 "For schema 'indexing_extra_field_input_null', field 'foo': Indexing script refers to field " +
-                        "'foo' which does not exist in document type 'indexing_extra_field_input_null', and is not a mutable attribute.");
+                        "'foo' which is neither a field in document type 'indexing_extra_field_input_null' nor a mutable attribute");
     }
 
     @Test
     void requireThatExtraFieldInputSelfThrows() throws IOException, ParseException {
         assertBuildFails("src/test/examples/indexing_extra_field_input_self.sd",
                 "For schema 'indexing_extra_field_input_self', field 'foo': Indexing script refers to field " +
-                        "'foo' which does not exist in document type 'indexing_extra_field_input_self', and is not a mutable attribute.");
+                        "'foo' which is neither a field in document type 'indexing_extra_field_input_self' nor a mutable attribute");
     }
 
 }