Test deriving with inherited schema

5 files changed, 74 insertions, 13 deletions

diff --git a/config-model/src/test/derived/schemainheritance/attributes.cfg b/config-model/src/test/derived/schemainheritance/attributes.cfg
index e0fbc0d49b2..ad48742a20f 100644
--- a/config-model/src/test/derived/schemainheritance/attributes.cfg
+++ b/config-model/src/test/derived/schemainheritance/attributes.cfg
@@ -91,6 +91,37 @@ attribute[].index.hnsw.maxlinkspernode 16
 attribute[].index.hnsw.neighborstoexploreatinsert 200
 attribute[].index.hnsw.distancemetric EUCLIDEAN
 attribute[].index.hnsw.multithreadedindexing true
+attribute[].name "parent_imported"
+attribute[].datatype STRING
+attribute[].collectiontype SINGLE
+attribute[].dictionary.type BTREE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
+attribute[].removeifzero false
+attribute[].createifnonexistent false
+attribute[].fastsearch false
+attribute[].huge false
+attribute[].paged false
+attribute[].ismutable false
+attribute[].sortascending true
+attribute[].sortfunction UCA
+attribute[].sortstrength PRIMARY
+attribute[].sortlocale ""
+attribute[].enablebitvectors false
+attribute[].enableonlybitvector false
+attribute[].fastaccess false
+attribute[].arity 8
+attribute[].lowerbound -9223372036854775808
+attribute[].upperbound 9223372036854775807
+attribute[].densepostinglistthreshold 0.4
+attribute[].tensortype ""
+attribute[].imported true
+attribute[].distancemetric EUCLIDEAN
+attribute[].index.hnsw.enabled false
+attribute[].index.hnsw.maxlinkspernode 16
+attribute[].index.hnsw.neighborstoexploreatinsert 200
+attribute[].index.hnsw.distancemetric EUCLIDEAN
+attribute[].index.hnsw.multithreadedindexing true
 attribute[].name "child_imported"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
diff --git a/config-model/src/test/derived/schemainheritance/child.sd b/config-model/src/test/derived/schemainheritance/child.sd
index bacc3d984d8..a209919763d 100644
--- a/config-model/src/test/derived/schemainheritance/child.sd
+++ b/config-model/src/test/derived/schemainheritance/child.sd
@@ -1,4 +1,4 @@
-schema child {
+schema child inherits parent {
 
     document child inherits parent {
 
diff --git a/config-model/src/test/derived/schemainheritance/documentmanager.cfg b/config-model/src/test/derived/schemainheritance/documentmanager.cfg
index df3345d30d2..0dd87029f32 100644
--- a/config-model/src/test/derived/schemainheritance/documentmanager.cfg
+++ b/config-model/src/test/derived/schemainheritance/documentmanager.cfg
@@ -73,6 +73,9 @@ datatype[].structtype[].compressminsize 800
 datatype[].structtype[].field[].name "cf1"
 datatype[].structtype[].field[].datatype 2
 datatype[].structtype[].field[].detailedtype ""
+datatype[].structtype[].field[].name "parent_field"
+datatype[].structtype[].field[].datatype 2
+datatype[].structtype[].field[].detailedtype ""
 datatype[].structtype[].field[].name "child_field"
 datatype[].structtype[].field[].datatype 2
 datatype[].structtype[].field[].detailedtype ""
@@ -85,9 +88,11 @@ datatype[].documenttype[].inherits[].name "parent"
 datatype[].documenttype[].inherits[].version 0
 datatype[].documenttype[].headerstruct 81425825
 datatype[].documenttype[].bodystruct 0
+datatype[].documenttype[].fieldsets{parent_set}.fields[] "pf1"
 datatype[].documenttype[].fieldsets{child_set}.fields[] "cf1"
 datatype[].documenttype[].fieldsets{child_set}.fields[] "pf1"
 datatype[].documenttype[].fieldsets{[]}.fields[] "cf1"
 datatype[].documenttype[].fieldsets{[]}.fields[] "importedschema_ref"
 datatype[].documenttype[].fieldsets{[]}.fields[] "pf1"
+datatype[].documenttype[].importedfield[].name "parent_imported"
 datatype[].documenttype[].importedfield[].name "child_imported"
diff --git a/config-model/src/test/derived/schemainheritance/index-info.cfg b/config-model/src/test/derived/schemainheritance/index-info.cfg
index 10c468b19c2..3febd5c5226 100644
--- a/config-model/src/test/derived/schemainheritance/index-info.cfg
+++ b/config-model/src/test/derived/schemainheritance/index-info.cfg
@@ -43,6 +43,16 @@ indexinfo[].command[].indexname "parent_field"
 indexinfo[].command[].command "plain-tokens"
 indexinfo[].command[].indexname "parent_field"
 indexinfo[].command[].command "type string"
+indexinfo[].command[].indexname "parent_imported"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "parent_imported"
+indexinfo[].command[].command "lowercase"
+indexinfo[].command[].indexname "parent_imported"
+indexinfo[].command[].command "attribute"
+indexinfo[].command[].indexname "parent_imported"
+indexinfo[].command[].command "type string"
+indexinfo[].command[].indexname "parent_imported"
+indexinfo[].command[].command "word"
 indexinfo[].command[].indexname "child_imported"
 indexinfo[].command[].command "index"
 indexinfo[].command[].indexname "child_imported"
@@ -53,6 +63,10 @@ indexinfo[].command[].indexname "child_imported"
 indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "child_imported"
 indexinfo[].command[].command "word"
+indexinfo[].command[].indexname "parent_set"
+indexinfo[].command[].command "attribute"
+indexinfo[].command[].indexname "parent_set"
+indexinfo[].command[].command "index"
 indexinfo[].command[].indexname "child_set"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "child_set"
diff --git a/config-model/src/test/derived/schemainheritance/summary.cfg b/config-model/src/test/derived/schemainheritance/summary.cfg
index 7019054b8fa..451894ec2c1 100644
--- a/config-model/src/test/derived/schemainheritance/summary.cfg
+++ b/config-model/src/test/derived/schemainheritance/summary.cfg
@@ -1,38 +1,49 @@
-defaultsummaryid 1868070885
-classes[].id 1868070885
+defaultsummaryid 1044042981
+classes[].id 1044042981
 classes[].name "default"
 classes[].omitsummaryfeatures false
-classes[].fields[].name "child_field"
-classes[].fields[].type "longstring"
-classes[].fields[].name "pf1"
-classes[].fields[].type "longstring"
 classes[].fields[].name "parent_field"
 classes[].fields[].type "longstring"
-classes[].fields[].name "cf1"
+classes[].fields[].name "pf1"
 classes[].fields[].type "longstring"
 classes[].fields[].name "rankfeatures"
 classes[].fields[].type "featuredata"
 classes[].fields[].name "summaryfeatures"
 classes[].fields[].type "featuredata"
+classes[].fields[].name "child_field"
+classes[].fields[].type "longstring"
+classes[].fields[].name "cf1"
+classes[].fields[].type "longstring"
 classes[].fields[].name "documentid"
 classes[].fields[].type "longstring"
-classes[].id 1694225577
-classes[].name "child_summary"
+classes[].id 2134223620
+classes[].name "parent_summary"
 classes[].omitsummaryfeatures false
-classes[].fields[].name "cf1"
+classes[].fields[].name "pf1"
 classes[].fields[].type "longstring"
 classes[].fields[].name "rankfeatures"
 classes[].fields[].type "featuredata"
 classes[].fields[].name "summaryfeatures"
 classes[].fields[].type "featuredata"
-classes[].id 1822613042
+classes[].id 178044032
 classes[].name "attributeprefetch"
 classes[].omitsummaryfeatures false
+classes[].fields[].name "parent_field"
+classes[].fields[].type "longstring"
+classes[].fields[].name "rankfeatures"
+classes[].fields[].type "featuredata"
+classes[].fields[].name "summaryfeatures"
+classes[].fields[].type "featuredata"
 classes[].fields[].name "child_field"
 classes[].fields[].type "longstring"
-classes[].fields[].name "parent_field"
+classes[].id 1486475170
+classes[].name "child_summary"
+classes[].omitsummaryfeatures false
+classes[].fields[].name "pf1"
 classes[].fields[].type "longstring"
 classes[].fields[].name "rankfeatures"
 classes[].fields[].type "featuredata"
 classes[].fields[].name "summaryfeatures"
 classes[].fields[].type "featuredata"
+classes[].fields[].name "cf1"
+classes[].fields[].type "longstring"