populate struct fields on demand

* most SDField instances should know their "repo"
* populate with struct fields in a lazy manner
* just remember what we were told in the old API
* note: old API will be renamed so it makes a bit more sense

14 files changed, 99 insertions, 70 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/SDField.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/SDField.java
index bd6625d4bde..e72d72171d6 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/document/SDField.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/SDField.java
@@ -111,8 +111,8 @@ public class SDField extends Field implements TypedKey, FieldOperationContainer,
     /** Struct fields defined in this field */
     private final Map<String,SDField> structFields = new java.util.LinkedHashMap<>(0);
 
-    /** The document that this field was declared in, or null*/
-    private SDDocumentType ownerDocType = null;
+    /** The document that this field was declared in, or null */
+    private SDDocumentType repoDocType = null;
 
     /** The aliases declared for this field. May pertain to indexes or attributes */
     private final Map<String, String> aliasToName = new HashMap<>();
@@ -132,6 +132,7 @@ public class SDField extends Field implements TypedKey, FieldOperationContainer,
     */
     protected SDField(SDDocumentType repo, String name, int id, DataType dataType, boolean populate) {
         super(name, id, dataType);
+        this.repoDocType = repo;
         populate(populate, repo, name, dataType);
     }
 
@@ -142,12 +143,14 @@ public class SDField extends Field implements TypedKey, FieldOperationContainer,
     /** Creates a new field */
     public SDField(SDDocumentType repo, String name, DataType dataType, boolean populate) {
         super(name, dataType);
+        this.repoDocType = repo;
         populate(populate, repo, name, dataType);
     }
 
     /** Creates a new field */
     protected SDField(SDDocumentType repo, String name, DataType dataType, SDDocumentType owner, boolean populate) {
         super(name, dataType, owner == null ? null : owner.getDocumentType());
+        this.repoDocType = repo;
         populate(populate, repo, name, dataType);
     }
 
@@ -162,6 +165,8 @@ public class SDField extends Field implements TypedKey, FieldOperationContainer,
     protected SDField(SDDocumentType repo, String name, DataType dataType, SDDocumentType owner,
                       Matching fieldMatching, boolean populate, int recursion) {
         super(name, dataType, owner == null ? null : owner.getDocumentType());
+        this.repoDocType = repo;
+        this.structFieldDepth = recursion;
         if (fieldMatching != null)
             this.setMatching(fieldMatching);
         populate(populate, repo, name, dataType, fieldMatching, recursion);
@@ -171,15 +176,22 @@ public class SDField extends Field implements TypedKey, FieldOperationContainer,
         this(repo, name, dataType, true);
     }
 
+    /*
     public SDField(String name, DataType dataType) {
         this(null, name, dataType);
     }
+    */
 
     private void populate(boolean populate, SDDocumentType repo, String name, DataType dataType) {
         populate(populate, repo, name, dataType, null, 0);
     }
 
-    private void populate(boolean populate, SDDocumentType repo, String name, DataType dataType, Matching fieldMatching,  int recursion) {
+    private int structFieldDepth = 0;
+
+    private void populate(boolean populate, SDDocumentType repo, String name, DataType dataType, Matching fieldMatching, int recursion) {
+        if (recursion > structFieldDepth) {
+            structFieldDepth = recursion;
+        }
         if (dataType instanceof TensorDataType) {
             TensorType type = ((TensorDataType)dataType).getTensorType();
             if (type.dimensions().stream().anyMatch(d -> d.isIndexed() && d.size().isEmpty()))
@@ -273,34 +285,46 @@ public class SDField extends Field implements TypedKey, FieldOperationContainer,
         }
     }
 
-    @SuppressWarnings("deprecation")
     public void populateWithStructFields(SDDocumentType sdoc, String name, DataType dataType, int recursion) {
+        if (repoDocType == null) {
+            repoDocType = sdoc;
+        }
         DataType dt = getFirstStructOrMapRecursive();
-        if (dt == null) return;
+        if (dt == null) {
+            // nothing to do
+            doneStructFields = true;
+        }
+    }
+
+    private boolean doneStructFields = false;
 
+    @SuppressWarnings("deprecation")
+    private void actuallyMakeStructFields() {
+        if (doneStructFields) return;
+        var sdoc = repoDocType;
+        var dataType = getDataType();
         java.util.function.BiConsumer<String, DataType> supplyStructField = (fieldName, fieldType) -> {
             if (structFields.containsKey(fieldName)) return;
-            String subName = name.concat(".").concat(fieldName);
-            var subField = new SDField(sdoc, subName, fieldType,
-                                       ownerDocType, new Matching(),
-                                       true, recursion + 1);
+            String subName = getName().concat(".").concat(fieldName);
+            var subField = new SDField(sdoc, subName, fieldType, sdoc,
+                                       null, true, structFieldDepth + 1);
             structFields.put(fieldName, subField);
         };
-
         if (dataType instanceof MapDataType) {
             MapDataType mdt = (MapDataType) dataType;
             supplyStructField.accept("key", mdt.getKeyType());
             supplyStructField.accept("value", mdt.getValueType());
         } else {
-            if (recursion >= 10) return;
+            if (structFieldDepth >= 10) {
+                // too risky
+                doneStructFields = true;
+                return;
+            }
             if (dataType instanceof CollectionDataType) {
                 dataType = ((CollectionDataType)dataType).getNestedType();
             }
-            if (dataType instanceof TemporaryStructuredDataType) {
-                SDDocumentType subType = sdoc != null ? sdoc.getType(dataType.getName()) : null;
-                if (subType == null) {
-                    throw new IllegalArgumentException("Could not find struct '" + dataType.getName() + "'.");
-                }
+            SDDocumentType subType = sdoc != null ? sdoc.getType(dataType.getName()) : null;
+            if (dataType instanceof TemporaryStructuredDataType && subType != null) {
                 for (Field field : subType.fieldSet()) {
                     supplyStructField.accept(field.getName(), field.getDataType());
                 }
@@ -310,32 +334,12 @@ public class SDField extends Field implements TypedKey, FieldOperationContainer,
                     supplyStructField.accept(field.getName(), field.getDataType());
                 }
             }
-        }
-    }
-
-    public void populateWithStructMatching(SDDocumentType sdoc, DataType dataType, Matching superFieldMatching) {
-        if (sdoc == null) return;
-        if (superFieldMatching == null) return;
-        DataType dt = getFirstStructOrMapRecursive();
-        if (dt == null) return;
-
-        if (dataType instanceof MapDataType) {
-            // old code here would never do anything useful, should we do something here?
-            return;
-        } else {
-            if (dataType instanceof CollectionDataType) {
-                dataType = ((CollectionDataType)dataType).getNestedType();
-            }
-            if (dataType instanceof StructDataType) {
-                SDDocumentType subType = sdoc.getType(dataType.getName());
-                if (subType == null) {
-                    throw new IllegalArgumentException("Could not find struct " + dataType.getName());
-                }
+            if (subType != null) {
                 for (Field f : subType.fieldSet()) {
                     if (f instanceof SDField) {
                         SDField field = (SDField) f;
                         Matching subFieldMatching = new Matching();
-                        subFieldMatching.merge(superFieldMatching);
+                        subFieldMatching.merge(matchingForStructFields);
                         subFieldMatching.merge(field.getMatching());
                         SDField subField = structFields.get(field.getName());
                         if (subField != null) {
@@ -349,6 +353,15 @@ public class SDField extends Field implements TypedKey, FieldOperationContainer,
                 }
             }
         }
+        doneStructFields = true;
+    }
+
+    private Matching matchingForStructFields = null;
+
+    public void populateWithStructMatching(SDDocumentType sdoc, DataType dataType, Matching superFieldMatching) {
+        if (superFieldMatching == null) return;
+        if (getFirstStructOrMapRecursive() == null) return;
+        matchingForStructFields = superFieldMatching;
     }
 
     public void addOperation(FieldOperation op) {
@@ -723,7 +736,10 @@ public class SDField extends Field implements TypedKey, FieldOperationContainer,
 
     /** Returns list of static struct fields */
     @Override
-    public Collection<SDField> getStructFields() { return structFields.values(); }
+    public Collection<SDField> getStructFields() {
+        actuallyMakeStructFields();
+        return structFields.values();
+    }
 
     /**
      * Returns a struct field defined in this field,
@@ -732,6 +748,7 @@ public class SDField extends Field implements TypedKey, FieldOperationContainer,
      */
     @Override
     public SDField getStructField(String name) {
+        actuallyMakeStructFields();
         if (name.contains(".")) {
             String superFieldName = name.substring(0,name.indexOf("."));
             String subFieldName = name.substring(name.indexOf(".")+1);
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/IndexingOperation.java b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/IndexingOperation.java
index fe3ac11af27..a5f5f961ab5 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/IndexingOperation.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/IndexingOperation.java
@@ -24,6 +24,8 @@ public class IndexingOperation implements FieldOperation {
         this.script = script;
     }
 
+    public ScriptExpression getScript() { return script; }
+
     public void apply(SDField field) {
         field.setIndexingScript(script);
     }
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/CreatePositionZCurve.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/CreatePositionZCurve.java
index 0bb1b7da769..d7882c7f8fb 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/CreatePositionZCurve.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/CreatePositionZCurve.java
@@ -10,6 +10,7 @@ import com.yahoo.document.PositionDataType;
 import com.yahoo.searchdefinition.Schema;
 import com.yahoo.searchdefinition.document.Attribute;
 import com.yahoo.searchdefinition.document.GeoPos;
+import com.yahoo.searchdefinition.document.SDDocumentType;
 import com.yahoo.searchdefinition.document.SDField;
 import com.yahoo.vespa.documentmodel.SummaryField;
 import com.yahoo.vespa.documentmodel.SummaryTransform;
@@ -35,8 +36,11 @@ import java.util.logging.Level;
  */
 public class CreatePositionZCurve extends Processor {
 
+    private final SDDocumentType repo;
+
     public CreatePositionZCurve(Schema schema, DeployLogger deployLogger, RankProfileRegistry rankProfileRegistry, QueryProfiles queryProfiles) {
         super(schema, deployLogger, rankProfileRegistry, queryProfiles);
+        this.repo = schema.getDocument();
     }
 
     private boolean useV8GeoPositions = false;
@@ -105,7 +109,7 @@ public class CreatePositionZCurve extends Processor {
                                                     "' already created.");
         }
         boolean isArray = inputField.getDataType() instanceof ArrayDataType;
-        SDField field = new SDField(fieldName, isArray ? DataType.getArray(DataType.LONG) : DataType.LONG);
+        SDField field = new SDField(repo, fieldName, isArray ? DataType.getArray(DataType.LONG) : DataType.LONG);
         Attribute attribute = new Attribute(fieldName, Attribute.Type.LONG, isArray ? Attribute.CollectionType.ARRAY :
                                                                             Attribute.CollectionType.SINGLE);
         attribute.setPosition(true);
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/UriHack.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/UriHack.java
index 84dc6d369fc..7397f9a289c 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/UriHack.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/UriHack.java
@@ -61,7 +61,7 @@ public class UriHack extends Processor {
             String partName = uriName + "." + suffix;
             // I wonder if this is explicit in qrs or implicit in backend?
             // search.addFieldSetItem(uriName, partName);
-            SDField partField = new SDField(partName, generatedType);
+            SDField partField = new SDField(schema.getDocument(), partName, generatedType);
             partField.setIndexStructureField(uriField.doesIndexing());
             partField.setRankType(uriField.getRankType());
             partField.setStemming(Stemming.NONE);
diff --git a/config-model/src/main/javacc/IntermediateParser.jj b/config-model/src/main/javacc/IntermediateParser.jj
index 7447eee5cec..ba955f071b2 100644
--- a/config-model/src/main/javacc/IntermediateParser.jj
+++ b/config-model/src/main/javacc/IntermediateParser.jj
@@ -958,10 +958,7 @@ void indexingOperation(ParsedField field, boolean multiLine) : { }
 {
     {
         IndexingOperation oldOp = newIndexingOperation(multiLine);
-        // TODO conversion via SDField is very ugly
-        SDField tmpField = new SDField("temp", com.yahoo.document.DataType.STRING);
-        oldOp.apply(tmpField);
-        ParsedIndexingOp newOp = new ParsedIndexingOp(tmpField.getIndexingScript());
+        ParsedIndexingOp newOp = new ParsedIndexingOp(oldOp.getScript());
         field.setIndexingOperation(newOp);
     }
 }
diff --git a/config-model/src/main/javacc/SDParser.jj b/config-model/src/main/javacc/SDParser.jj
index 1fec33c4f12..e90df2776e0 100644
--- a/config-model/src/main/javacc/SDParser.jj
+++ b/config-model/src/main/javacc/SDParser.jj
@@ -639,7 +639,7 @@ void field(SDDocumentType document, Schema schema) :
         if (name != null && Schema.isReservedName(name.toLowerCase())) {
             throw new IllegalArgumentException("Reserved name '" + name + "' can not be used as a field name.");
         }
-        field = new TemporarySDField(document, name, type, document);
+        field = new TemporarySDField(document == null ? schema.getDocument() : document, name, type, document);
     }
     lbrace() (fieldBody(field, schema, document) (<NL>)*)* <RBRACE>
     {
@@ -668,7 +668,7 @@ void fieldSet(Schema schema) :
     |
       ( <QUERYCOMMAND> <COLON> (queryCommand = identifierWithDash() | queryCommand = quotedString())) { queryCommands.add(queryCommand); }
     |
-      ( matchSetting = match(new SDField(setName, DataType.STRING)) ) { matchSettings.add(matchSetting); }
+      ( matchSetting = match(new SDField(null, setName, DataType.STRING)) ) { matchSettings.add(matchSetting); }
     )(<NL>)*)+
   <RBRACE>
   {
@@ -811,7 +811,11 @@ SDDocumentType structDefinition(Schema schema, SDDocumentType repo) :
     SDDocumentType struct;
 }
 {
-    ( <STRUCT> name = identifier() (<NL>)* { struct = new SDDocumentType(name, schema); }
+    ( <STRUCT> name = identifier() (<NL>)* {
+        if (repo == null)
+            throw new IllegalArgumentException("Can't add struct '"+name+"' to a document type, define a document type first or declare the struct inside of one.");
+        struct = new SDDocumentType(name, schema);
+    }
     [ inheritsDocument(struct) (<NL>)* ]
     lbrace() (structFieldDefinition(repo, struct) (<NL>)*)* <RBRACE> )
     {
@@ -821,7 +825,6 @@ SDDocumentType structDefinition(Schema schema, SDDocumentType repo) :
         } catch (IllegalArgumentException e) {
             // empty
         }
-        if (repo==null) throw new IllegalArgumentException("Can't add struct '"+name+"' to a document type, define a document type first or declare the struct inside of one.");
         SDDocumentType sdtype = repo.getOwnedType(struct.getDocumentName());
         DataType stype = sdtype != null
                          ? sdtype.getStruct()
@@ -830,7 +833,7 @@ SDDocumentType structDefinition(Schema schema, SDDocumentType repo) :
         return struct;
     }
 }
-
+        
 /**
  * This rule consumes a data type block from within a field element.
  *
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/DocumentReferenceResolverTest.java b/config-model/src/test/java/com/yahoo/searchdefinition/DocumentReferenceResolverTest.java
index 66f1850bd10..4fa145afae9 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/DocumentReferenceResolverTest.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/DocumentReferenceResolverTest.java
@@ -38,12 +38,12 @@ public class DocumentReferenceResolverTest {
         barSchema.addDocument(barDocument);
 
         // Create foo document with document reference to bar and add another field
-        SDField fooRefToBarField = new SDField
-                ("bar_ref", ReferenceDataType.createWithInferredId(barDocument.getDocumentType()));
-        AttributeUtils.addAttributeAspect(fooRefToBarField);
-        SDField irrelevantField = new SDField("irrelevant_stuff", DataType.INT);
         Schema fooSchema = new Schema(FOO, MockApplicationPackage.createEmpty());
         SDDocumentType fooDocument = new SDDocumentType("foo", fooSchema);
+        SDField fooRefToBarField = new SDField
+            (fooDocument, "bar_ref", ReferenceDataType.createWithInferredId(barDocument.getDocumentType()));
+        AttributeUtils.addAttributeAspect(fooRefToBarField);
+        SDField irrelevantField = new SDField(fooDocument, "irrelevant_stuff", DataType.INT);
         fooDocument.addField(fooRefToBarField);
         fooDocument.addField(irrelevantField);
         fooSchema.addDocument(fooDocument);
@@ -62,11 +62,12 @@ public class DocumentReferenceResolverTest {
     @Test
     public void throws_user_friendly_exception_if_referenced_document_does_not_exist() {
         // Create foo document with document reference to non-existing document bar
+        Schema fooSchema = new Schema(FOO, MockApplicationPackage.createEmpty());
+        SDDocumentType fooDocument = new SDDocumentType("foo", fooSchema);
         SDField fooRefToBarField = new SDField(
+                fooDocument,
                 "bar_ref", ReferenceDataType.createWithInferredId(TemporaryStructuredDataType.create("bar")));
         AttributeUtils.addAttributeAspect(fooRefToBarField);
-        Schema fooSchema = new Schema(FOO, MockApplicationPackage.createEmpty());
-        SDDocumentType fooDocument = new SDDocumentType("foo", fooSchema);
         fooDocument.addField(fooRefToBarField);
         fooSchema.addDocument(fooDocument);
 
@@ -86,10 +87,10 @@ public class DocumentReferenceResolverTest {
         barSchema.addDocument(barDocument);
 
         // Create foo document with document reference to bar
-        SDField fooRefToBarField = new SDField
-                ("bar_ref", ReferenceDataType.createWithInferredId(barDocument.getDocumentType()));
         Schema fooSchema = new Schema(FOO, MockApplicationPackage.createEmpty());
         SDDocumentType fooDocument = new SDDocumentType("foo", fooSchema);
+        SDField fooRefToBarField = new SDField
+            (fooDocument, "bar_ref", ReferenceDataType.createWithInferredId(barDocument.getDocumentType()));
         fooDocument.addField(fooRefToBarField);
         fooSchema.addDocument(fooDocument);
 
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/ImportedFieldsEnumeratorTest.java b/config-model/src/test/java/com/yahoo/searchdefinition/ImportedFieldsEnumeratorTest.java
index 7d2386030da..7e708f93a96 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/ImportedFieldsEnumeratorTest.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/ImportedFieldsEnumeratorTest.java
@@ -22,16 +22,18 @@ public class ImportedFieldsEnumeratorTest {
         String PARENT = "parent";
         Schema parentSchema = new Schema(PARENT, MockApplicationPackage.createEmpty());
         SDDocumentType parentDocument = new SDDocumentType(PARENT, parentSchema);
-        var parentField = new SDField("their_field", DataType.INT);
+        var parentField = new SDField(parentDocument, "their_field", DataType.INT);
         AttributeUtils.addAttributeAspect(parentField);
         parentDocument.addField(parentField);
         parentSchema.addDocument(parentDocument);
 
         String FOO = "foo";
         Schema fooSchema = new Schema(FOO, MockApplicationPackage.createEmpty());
+        /*
         SDField fooRefToParent = new SDField(
                 "foo_ref", ReferenceDataType.createWithInferredId(parentDocument.getDocumentType()));
         AttributeUtils.addAttributeAspect(fooRefToParent);
+        */
         var fooImports = fooSchema.temporaryImportedFields().get();
         fooImports.add(new TemporaryImportedField("my_first_import", "foo_ref", "their_field"));
         fooImports.add(new TemporaryImportedField("my_second_import", "foo_ref", "their_field"));
@@ -40,9 +42,11 @@ public class ImportedFieldsEnumeratorTest {
 
         String BAR = "bar";
         Schema barSchema = new Schema(BAR, MockApplicationPackage.createEmpty());
+        /*
         SDField barRefToParent = new SDField(
                 "bar_ref", ReferenceDataType.createWithInferredId(parentDocument.getDocumentType()));
         AttributeUtils.addAttributeAspect(barRefToParent);
+        */
         var barImports = barSchema.temporaryImportedFields().get();
         barImports.add(new TemporaryImportedField("my_cool_import", "my_ref", "their_field"));
         SDDocumentType barDocument = new SDDocumentType(BAR, barSchema);
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/EmptyRankProfileTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/EmptyRankProfileTestCase.java
index 237e6c8c992..a3123550efa 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/EmptyRankProfileTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/EmptyRankProfileTestCase.java
@@ -25,11 +25,11 @@ public class EmptyRankProfileTestCase extends AbstractSchemaTestCase {
         RankProfileRegistry rankProfileRegistry = RankProfileRegistry.createRankProfileRegistryWithBuiltinRankProfiles(schema);
         SDDocumentType doc = new SDDocumentType("test");
         schema.addDocument(doc);
-        doc.addField(new SDField("a", DataType.STRING));
-        SDField field = new SDField("b", DataType.STRING);
+        doc.addField(new SDField(doc, "a", DataType.STRING));
+        SDField field = new SDField(doc, "b", DataType.STRING);
         field.setLiteralBoost(500);
         doc.addField(field);
-        doc.addField(new SDField("c", DataType.STRING));
+        doc.addField(new SDField(doc, "c", DataType.STRING));
 
         schema = ApplicationBuilder.buildFromRawSchema(schema, rankProfileRegistry, new QueryProfileRegistry());
         new DerivedConfiguration(schema, rankProfileRegistry);
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/IdTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/IdTestCase.java
index 440f067dd00..ba485b7b96b 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/IdTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/IdTestCase.java
@@ -29,7 +29,7 @@ public class IdTestCase extends AbstractExportingTestCase {
         Schema schema = new Schema("test", MockApplicationPackage.createEmpty());
         SDDocumentType document = new SDDocumentType("test");
         schema.addDocument(document);
-        SDField uri = new SDField("URI", DataType.URI);
+        SDField uri = new SDField(document, "URI", DataType.URI);
         uri.parseIndexingScript("{ summary | index }");
         document.addField(uri);
 
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/TypeConversionTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/TypeConversionTestCase.java
index dbb32e61144..62a79e49146 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/TypeConversionTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/TypeConversionTestCase.java
@@ -30,7 +30,7 @@ public class TypeConversionTestCase extends AbstractSchemaTestCase {
         RankProfileRegistry rankProfileRegistry = RankProfileRegistry.createRankProfileRegistryWithBuiltinRankProfiles(schema);
         SDDocumentType document = new SDDocumentType("test");
         schema.addDocument(document);
-        SDField a = new SDField("a", DataType.STRING);
+        SDField a = new SDField(document, "a", DataType.STRING);
         a.parseIndexingScript("{ index }");
         document.addField(a);
 
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/AddAttributeTransformToSummaryOfImportedFieldsTest.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/AddAttributeTransformToSummaryOfImportedFieldsTest.java
index 9ca97f4dbc7..0adaba4cf68 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/AddAttributeTransformToSummaryOfImportedFieldsTest.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/AddAttributeTransformToSummaryOfImportedFieldsTest.java
@@ -59,8 +59,9 @@ public class AddAttributeTransformToSummaryOfImportedFieldsTest {
     }
 
     private static ImportedFields createSingleImportedField(String fieldName) {
-        Schema targetSchema = createSearch("target_doc");
-        SDField targetField = new SDField("target_field", DataType.INT);
+        Schema targetSchema = createSearchWithDocument("target_doc");
+        var doc = targetSchema.getDocument();
+        SDField targetField = new SDField(doc, "target_field", DataType.INT);
         DocumentReference documentReference = new DocumentReference(new Field("reference_field"), targetSchema);
         ImportedField importedField = new ImportedSimpleField(fieldName, documentReference, targetField);
         return new ImportedFields(Collections.singletonMap(fieldName, importedField));
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ValidateFieldTypesTest.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ValidateFieldTypesTest.java
index 22fd4e45c4a..8c801d9deaf 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ValidateFieldTypesTest.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ValidateFieldTypesTest.java
@@ -65,8 +65,8 @@ public class ValidateFieldTypesTest {
     }
 
     private static ImportedFields createSingleImportedField(String fieldName, DataType dataType) {
-        Schema targetSchema = createSearch("target_doc");
-        SDField targetField = new SDField("target_field", dataType);
+        Schema targetSchema = createSearchWithDocument("target_doc");
+        SDField targetField = new SDField(targetSchema.getDocument(), "target_field", dataType);
         DocumentReference documentReference = new DocumentReference(new Field("reference_field"), targetSchema);
         ImportedField importedField = new ImportedSimpleField(fieldName, documentReference, targetField);
         return new ImportedFields(Collections.singletonMap(fieldName, importedField));
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaClusterTest.java
index e58c29cc4fd..405c1127842 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaClusterTest.java
@@ -42,7 +42,7 @@ public class SchemaClusterTest {
         // sd1
         SDDocumentType sdt1 = new SDDocumentType("s1");
         Schema schema1 = new Schema("s1", MockApplicationPackage.createEmpty());
-        SDField f1 = new SDField("f1", DataType.STRING);
+        SDField f1 = new SDField(sdt1, "f1", DataType.STRING);
         f1.addAttribute(new Attribute("f1", DataType.STRING));
         f1.setIndexingScript(new ScriptExpression(new StatementExpression(new AttributeExpression("f1"))));
         sdt1.addField(f1);
@@ -51,7 +51,7 @@ public class SchemaClusterTest {
         // sd2
         SDDocumentType sdt2 = new SDDocumentType("s2");
         Schema schema2 = new Schema("s2", MockApplicationPackage.createEmpty());
-        SDField f2=new SDField("f2", DataType.STRING);
+        SDField f2=new SDField(sdt2, "f2", DataType.STRING);
         f2.addAttribute(new Attribute("f2", DataType.STRING));
         f2.setIndexingScript(new ScriptExpression(new StatementExpression(new AttributeExpression("f2"))));
         sdt2.addField(f2);