Add imported fields to document configs

This adds the field names of all imported fields in a search definition
to the document configs associated with it (document manager and document
types config for Java and C++, respectively). This enables consumers of
these configs to distinguish between field references to imported fields
and fields that don't exist in the document schema itself.

3 files changed, 41 insertions, 2 deletions

diff --git a/document/abi-spec.json b/document/abi-spec.json
index e4917a174a6..717b0c9f188 100644
--- a/document/abi-spec.json
+++ b/document/abi-spec.json
@@ -712,6 +712,8 @@
       "public com.yahoo.document.DocumenttypesConfig$Documenttype$Builder fieldsets(java.util.Map)",
       "public com.yahoo.document.DocumenttypesConfig$Documenttype$Builder referencetype(com.yahoo.document.DocumenttypesConfig$Documenttype$Referencetype$Builder)",
       "public com.yahoo.document.DocumenttypesConfig$Documenttype$Builder referencetype(java.util.List)",
+      "public com.yahoo.document.DocumenttypesConfig$Documenttype$Builder importedfield(com.yahoo.document.DocumenttypesConfig$Documenttype$Importedfield$Builder)",
+      "public com.yahoo.document.DocumenttypesConfig$Documenttype$Builder importedfield(java.util.List)",
       "public com.yahoo.document.DocumenttypesConfig$Documenttype build()"
     ],
     "fields": [
@@ -719,7 +721,8 @@
       "public java.util.List datatype",
       "public java.util.List annotationtype",
       "public java.util.Map fieldsets",
-      "public java.util.List referencetype"
+      "public java.util.List referencetype",
+      "public java.util.List importedfield"
     ]
   },
   "com.yahoo.document.DocumenttypesConfig$Documenttype$Datatype$Annotationref$Annotation$Builder": {
@@ -1264,6 +1267,35 @@
     ],
     "fields": []
   },
+  "com.yahoo.document.DocumenttypesConfig$Documenttype$Importedfield$Builder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.config.ConfigBuilder"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public void <init>(com.yahoo.document.DocumenttypesConfig$Documenttype$Importedfield)",
+      "public com.yahoo.document.DocumenttypesConfig$Documenttype$Importedfield$Builder name(java.lang.String)",
+      "public com.yahoo.document.DocumenttypesConfig$Documenttype$Importedfield build()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.document.DocumenttypesConfig$Documenttype$Importedfield": {
+    "superClass": "com.yahoo.config.InnerNode",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.document.DocumenttypesConfig$Documenttype$Importedfield$Builder)",
+      "public java.lang.String name()"
+    ],
+    "fields": []
+  },
   "com.yahoo.document.DocumenttypesConfig$Documenttype$Inherits$Builder": {
     "superClass": "java.lang.Object",
     "interfaces": [
@@ -1347,7 +1379,9 @@
       "public java.util.Map fieldsets()",
       "public com.yahoo.document.DocumenttypesConfig$Documenttype$Fieldsets fieldsets(java.lang.String)",
       "public java.util.List referencetype()",
-      "public com.yahoo.document.DocumenttypesConfig$Documenttype$Referencetype referencetype(int)"
+      "public com.yahoo.document.DocumenttypesConfig$Documenttype$Referencetype referencetype(int)",
+      "public java.util.List importedfield()",
+      "public com.yahoo.document.DocumenttypesConfig$Documenttype$Importedfield importedfield(int)"
     ],
     "fields": []
   },
diff --git a/document/src/vespa/document/config/documentmanager.def b/document/src/vespa/document/config/documentmanager.def
index 1961f67d83c..092a29d9293 100644
--- a/document/src/vespa/document/config/documentmanager.def
+++ b/document/src/vespa/document/config/documentmanager.def
@@ -93,6 +93,9 @@ datatype[].documenttype[].bodystruct int
 ## Field sets
 datatype[].documenttype[].fieldsets{}.fields[] string
 
+## Imported fields (specified outside the document block in the schema)
+datatype[].documenttype[].importedfield[].name string
+
 ## Cross-document reference with ID of target document type
 datatype[].referencetype[].target_type_id int
 
diff --git a/document/src/vespa/document/config/documenttypes.def b/document/src/vespa/document/config/documenttypes.def
index fb3fcd8b123..a9ebde90bb6 100644
--- a/document/src/vespa/document/config/documenttypes.def
+++ b/document/src/vespa/document/config/documenttypes.def
@@ -104,3 +104,5 @@ documenttype[].referencetype[].id int
 
 ## Numeric ID of the document type instances of the reference point to.
 documenttype[].referencetype[].target_type_id int
+
+documenttype[].importedfield[].name string