aboutsummaryrefslogtreecommitdiffstats
path: root/document/src/test/java/com/yahoo
diff options
context:
space:
mode:
Diffstat (limited to 'document/src/test/java/com/yahoo')
-rw-r--r--document/src/test/java/com/yahoo/document/annotation/documentmanager.6394548.cfg401
-rw-r--r--document/src/test/java/com/yahoo/document/annotation/documentmanager.bug4259784.cfg274
-rw-r--r--document/src/test/java/com/yahoo/document/annotation/documentmanager.bug4261985.cfg324
-rw-r--r--document/src/test/java/com/yahoo/document/annotation/documentmanager.bug4475379.cfg256
-rw-r--r--document/src/test/java/com/yahoo/document/annotation/documentmanager.systemtest.cfg284
-rw-r--r--document/src/test/java/com/yahoo/document/datatypes/documentmanager.blog.sd248
-rw-r--r--document/src/test/java/com/yahoo/document/documentmanager.docindoc.cfg114
7 files changed, 932 insertions, 969 deletions
diff --git a/document/src/test/java/com/yahoo/document/annotation/documentmanager.6394548.cfg b/document/src/test/java/com/yahoo/document/annotation/documentmanager.6394548.cfg
index 35717a3e0c1..ee78c2708fe 100644
--- a/document/src/test/java/com/yahoo/document/annotation/documentmanager.6394548.cfg
+++ b/document/src/test/java/com/yahoo/document/annotation/documentmanager.6394548.cfg
@@ -1,189 +1,212 @@
-enablecompression false
-datatype[0].id 1381038251
-datatype[0].structtype[0].name "position"
-datatype[0].structtype[0].version 0
-datatype[0].structtype[0].compresstype NONE
-datatype[0].structtype[0].compresslevel 0
-datatype[0].structtype[0].compressthreshold 95
-datatype[0].structtype[0].compressminsize 800
-datatype[0].structtype[0].field[0].name "x"
-datatype[0].structtype[0].field[0].datatype 0
-datatype[0].structtype[0].field[1].name "y"
-datatype[0].structtype[0].field[1].datatype 0
-datatype[1].id -1466283082
-datatype[1].structtype[0].name "annotation.person"
-datatype[1].structtype[0].version 0
-datatype[1].structtype[0].compresstype NONE
-datatype[1].structtype[0].compresslevel 0
-datatype[1].structtype[0].compressthreshold 95
-datatype[1].structtype[0].compressminsize 800
-datatype[1].structtype[0].field[0].name "name"
-datatype[1].structtype[0].field[0].datatype 2
-datatype[2].id -1149562679
-datatype[2].annotationreftype[0].annotation "person"
-datatype[3].id -772171888
-datatype[3].annotationreftype[0].annotation "date"
-datatype[4].id -2109350185
-datatype[4].annotationreftype[0].annotation "place"
-datatype[5].id 1194300957
-datatype[5].structtype[0].name "annotation.event"
-datatype[5].structtype[0].version 0
-datatype[5].structtype[0].compresstype NONE
-datatype[5].structtype[0].compresslevel 0
-datatype[5].structtype[0].compressthreshold 95
-datatype[5].structtype[0].compressminsize 800
-datatype[5].structtype[0].field[0].name "description"
-datatype[5].structtype[0].field[0].datatype 2
-datatype[5].structtype[0].field[1].name "person"
-datatype[5].structtype[0].field[1].datatype -1149562679
-datatype[5].structtype[0].field[2].name "date"
-datatype[5].structtype[0].field[2].datatype -772171888
-datatype[5].structtype[0].field[3].name "place"
-datatype[5].structtype[0].field[3].datatype -2109350185
-datatype[6].id 1463704666
-datatype[6].structtype[0].name "annotation.morty.RICK_DOCSTATS"
-datatype[6].structtype[0].version 0
-datatype[6].structtype[0].compresstype NONE
-datatype[6].structtype[0].compresslevel 0
-datatype[6].structtype[0].compressthreshold 95
-datatype[6].structtype[0].compressminsize 800
-datatype[6].structtype[0].field[0].name "bodycount"
-datatype[6].structtype[0].field[0].datatype 0
-datatype[6].structtype[0].field[1].name "anchorcount"
-datatype[6].structtype[0].field[1].datatype 0
-datatype[7].id 1157126952
-datatype[7].structtype[0].name "annotation.artist"
-datatype[7].structtype[0].version 0
-datatype[7].structtype[0].compresstype NONE
-datatype[7].structtype[0].compresslevel 0
-datatype[7].structtype[0].compressthreshold 95
-datatype[7].structtype[0].compressminsize 800
-datatype[7].structtype[0].field[0].name "instrument"
-datatype[7].structtype[0].field[0].datatype 0
-datatype[7].structtype[0].inherits[0].name "annotation.person"
-datatype[7].structtype[0].inherits[0].version 0
-datatype[8].id 2076579146
-datatype[8].structtype[0].name "annotation.place"
-datatype[8].structtype[0].version 0
-datatype[8].structtype[0].compresstype NONE
-datatype[8].structtype[0].compresslevel 0
-datatype[8].structtype[0].compressthreshold 95
-datatype[8].structtype[0].compressminsize 800
-datatype[8].structtype[0].field[0].name "lat"
-datatype[8].structtype[0].field[0].datatype 4
-datatype[8].structtype[0].field[1].name "lon"
-datatype[8].structtype[0].field[1].datatype 4
-datatype[9].id -840345201
-datatype[9].structtype[0].name "annotation.date"
-datatype[9].structtype[0].version 0
-datatype[9].structtype[0].compresstype NONE
-datatype[9].structtype[0].compresslevel 0
-datatype[9].structtype[0].compressthreshold 95
-datatype[9].structtype[0].compressminsize 800
-datatype[9].structtype[0].field[0].name "exacttime"
-datatype[9].structtype[0].field[0].datatype 4
-datatype[10].id -1486737430
-datatype[10].arraytype[0].datatype 2
-datatype[11].id 1021048351
-datatype[11].structtype[0].name "annotation.morty.RICK_FEATURESET"
-datatype[11].structtype[0].version 0
-datatype[11].structtype[0].compresstype NONE
-datatype[11].structtype[0].compresslevel 0
-datatype[11].structtype[0].compressthreshold 95
-datatype[11].structtype[0].compressminsize 800
-datatype[11].structtype[0].field[0].name "foo1"
-datatype[11].structtype[0].field[0].datatype 2
-datatype[11].structtype[0].field[1].name "foo2"
-datatype[11].structtype[0].field[1].datatype 0
-datatype[11].structtype[0].field[2].name "foo3"
-datatype[11].structtype[0].field[2].datatype 0
-datatype[11].structtype[0].field[3].name "foo4"
-datatype[11].structtype[0].field[3].datatype 2
-datatype[11].structtype[0].field[4].name "foo5"
-datatype[11].structtype[0].field[4].datatype 2
-datatype[11].structtype[0].field[5].name "foo6"
-datatype[11].structtype[0].field[5].datatype -1486737430
-datatype[11].structtype[0].field[6].name "foo7"
-datatype[11].structtype[0].field[6].datatype 0
-datatype[11].structtype[0].field[7].name "foo8"
-datatype[11].structtype[0].field[7].datatype 0
-datatype[11].structtype[0].field[8].name "foo9"
-datatype[11].structtype[0].field[8].datatype 1
-datatype[11].structtype[0].field[9].name "foo10"
-datatype[11].structtype[0].field[9].datatype -1486737430
-datatype[11].structtype[0].inherits[0].name "annotation.morty.FEATURESET"
-datatype[11].structtype[0].inherits[0].version 0
-datatype[12].id -228273582
-datatype[12].maptype[0].keytype 2
-datatype[12].maptype[0].valtype 5
-datatype[13].id -1584287606
-datatype[13].maptype[0].keytype 2
-datatype[13].maptype[0].valtype 0
-datatype[14].id 1980242844
-datatype[14].structtype[0].name "annotation.morty.FEATURESET"
-datatype[14].structtype[0].version 0
-datatype[14].structtype[0].compresstype NONE
-datatype[14].structtype[0].compresslevel 0
-datatype[14].structtype[0].compressthreshold 95
-datatype[14].structtype[0].compressminsize 800
-datatype[14].structtype[0].field[0].name "realvaluedfeatures"
-datatype[14].structtype[0].field[0].datatype -228273582
-datatype[14].structtype[0].field[1].name "discretevaluedfeatures"
-datatype[14].structtype[0].field[1].datatype -1584287606
-datatype[14].structtype[0].field[2].name "score"
-datatype[14].structtype[0].field[2].datatype 5
-datatype[15].id 892457735
-datatype[15].structtype[0].name "article.header"
-datatype[15].structtype[0].version 0
-datatype[15].structtype[0].compresstype NONE
-datatype[15].structtype[0].compresslevel 0
-datatype[15].structtype[0].compressthreshold 95
-datatype[15].structtype[0].compressminsize 800
-datatype[15].structtype[0].field[0].name "title"
-datatype[15].structtype[0].field[0].datatype 2
-datatype[15].structtype[0].field[1].name "content"
-datatype[15].structtype[0].field[1].datatype 2
-datatype[15].structtype[0].field[2].name "rankfeatures"
-datatype[15].structtype[0].field[2].datatype 2
-datatype[15].structtype[0].field[3].name "summaryfeatures"
-datatype[15].structtype[0].field[3].datatype 2
-datatype[16].id -1984964900
-datatype[16].structtype[0].name "article.body"
-datatype[16].structtype[0].version 0
-datatype[16].structtype[0].compresstype NONE
-datatype[16].structtype[0].compresslevel 0
-datatype[16].structtype[0].compressthreshold 95
-datatype[16].structtype[0].compressminsize 800
-datatype[17].id 559508792
-datatype[17].documenttype[0].name "article"
-datatype[17].documenttype[0].version 0
-datatype[17].documenttype[0].inherits[0].name "document"
-datatype[17].documenttype[0].inherits[0].version 0
-datatype[17].documenttype[0].headerstruct 892457735
-datatype[17].documenttype[0].bodystruct -1984964900
-annotationtype[0].id 609952424
-annotationtype[0].name "person"
-annotationtype[0].datatype -1466283082
-annotationtype[1].id -455530995
-annotationtype[1].name "event"
-annotationtype[1].datatype 1194300957
-annotationtype[2].id 295631537
-annotationtype[2].name "morty.RICK_DOCSTATS"
-annotationtype[2].datatype 1463704666
-annotationtype[3].id 690330276
-annotationtype[3].name "artist"
-annotationtype[3].datatype 1157126952
-annotationtype[3].inherits[0].id 609952424
-annotationtype[4].id -162455681
-annotationtype[4].name "date"
-annotationtype[4].datatype -840345201
-annotationtype[5].id 1707984040
-annotationtype[5].name "place"
-annotationtype[5].datatype 2076579146
-annotationtype[6].id -62680437
-annotationtype[6].name "morty.FEATURESET"
-annotationtype[6].datatype 1980242844
-annotationtype[7].id 1056322897
-annotationtype[7].name "morty.RICK_FEATURESET"
-annotationtype[7].datatype 1021048351
-annotationtype[7].inherits[0].id -62680437
+doctype[2]
+doctype[0].name "document"
+doctype[0].idx 10000
+doctype[0].contentstruct 10001
+doctype[0].primitivetype[0].idx 10005
+doctype[0].primitivetype[0].internalid 4
+doctype[0].primitivetype[0].name "long"
+doctype[0].primitivetype[1].idx 10009
+doctype[0].primitivetype[1].internalid 0
+doctype[0].primitivetype[1].name "int"
+doctype[0].primitivetype[2].idx 10012
+doctype[0].primitivetype[2].internalid 5
+doctype[0].primitivetype[2].name "double"
+doctype[0].primitivetype[3].idx 10018
+doctype[0].primitivetype[3].internalid 2
+doctype[0].primitivetype[3].name "string"
+doctype[0].primitivetype[4].idx 10019
+doctype[0].primitivetype[4].internalid 1
+doctype[0].primitivetype[4].name "float"
+doctype[0].arraytype[0].idx 10011
+doctype[0].arraytype[0].elementtype 10018
+doctype[0].maptype[0].idx 10017
+doctype[0].maptype[0].keytype 10018
+doctype[0].maptype[0].valuetype 10009
+doctype[0].maptype[1].idx 10020
+doctype[0].maptype[1].keytype 10018
+doctype[0].maptype[1].valuetype 10012
+doctype[0].annotationtype[0].idx 10021
+doctype[0].annotationtype[0].name "date"
+doctype[0].annotationtype[0].internalid -162455681
+doctype[0].annotationtype[0].datatype 10010
+doctype[0].annotationtype[1].idx 10022
+doctype[0].annotationtype[1].name "morty.RICK_FEATURESET"
+doctype[0].annotationtype[1].internalid 1056322897
+doctype[0].annotationtype[1].datatype 10003
+doctype[0].annotationtype[1].inherits[0].idx 10023
+doctype[0].annotationtype[2].idx 10024
+doctype[0].annotationtype[2].name "artist"
+doctype[0].annotationtype[2].internalid 690330276
+doctype[0].annotationtype[2].datatype 10007
+doctype[0].annotationtype[2].inherits[0].idx 10025
+doctype[0].annotationtype[3].idx 10026
+doctype[0].annotationtype[3].name "normalized"
+doctype[0].annotationtype[3].internalid 4
+doctype[0].annotationtype[3].datatype 10018
+doctype[0].annotationtype[4].idx 10027
+doctype[0].annotationtype[4].name "reading"
+doctype[0].annotationtype[4].internalid 5
+doctype[0].annotationtype[4].datatype 10018
+doctype[0].annotationtype[5].idx 10028
+doctype[0].annotationtype[5].name "morty.RICK_DOCSTATS"
+doctype[0].annotationtype[5].internalid 295631537
+doctype[0].annotationtype[5].datatype 10008
+doctype[0].annotationtype[6].idx 10029
+doctype[0].annotationtype[6].name "canonical"
+doctype[0].annotationtype[6].internalid 3
+doctype[0].annotationtype[6].datatype 10018
+doctype[0].annotationtype[7].idx 10030
+doctype[0].annotationtype[7].name "token_type"
+doctype[0].annotationtype[7].internalid 2
+doctype[0].annotationtype[7].datatype 10009
+doctype[0].annotationtype[8].idx 10031
+doctype[0].annotationtype[8].name "proximity_break"
+doctype[0].annotationtype[8].internalid 8
+doctype[0].annotationtype[8].datatype 10012
+doctype[0].annotationtype[9].idx 10025
+doctype[0].annotationtype[9].name "person"
+doctype[0].annotationtype[9].internalid 609952424
+doctype[0].annotationtype[9].datatype 10004
+doctype[0].annotationtype[10].idx 10032
+doctype[0].annotationtype[10].name "term"
+doctype[0].annotationtype[10].internalid 1
+doctype[0].annotationtype[10].datatype 10018
+doctype[0].annotationtype[11].idx 10033
+doctype[0].annotationtype[11].name "transformed"
+doctype[0].annotationtype[11].internalid 7
+doctype[0].annotationtype[11].datatype 10018
+doctype[0].annotationtype[12].idx 10023
+doctype[0].annotationtype[12].name "morty.FEATURESET"
+doctype[0].annotationtype[12].internalid -62680437
+doctype[0].annotationtype[12].datatype 10016
+doctype[0].annotationtype[13].idx 10034
+doctype[0].annotationtype[13].name "place"
+doctype[0].annotationtype[13].internalid 1707984040
+doctype[0].annotationtype[13].datatype 10002
+doctype[0].annotationtype[14].idx 10035
+doctype[0].annotationtype[14].name "event"
+doctype[0].annotationtype[14].internalid -455530995
+doctype[0].annotationtype[14].datatype 10015
+doctype[0].annotationtype[15].idx 10036
+doctype[0].annotationtype[15].name "special_token"
+doctype[0].annotationtype[15].internalid 9
+doctype[0].annotationtype[16].idx 10037
+doctype[0].annotationtype[16].name "stem"
+doctype[0].annotationtype[16].internalid 6
+doctype[0].annotationtype[16].datatype 10018
+doctype[0].annotationref[0].idx 10006
+doctype[0].annotationref[0].annotationtype 10025
+doctype[0].annotationref[1].idx 10013
+doctype[0].annotationref[1].annotationtype 10021
+doctype[0].annotationref[2].idx 10014
+doctype[0].annotationref[2].annotationtype 10034
+doctype[0].structtype[0].idx 10002
+doctype[0].structtype[0].name annotation.place
+doctype[0].structtype[0].field[0].name "lat"
+doctype[0].structtype[0].field[0].internalid 1056483963
+doctype[0].structtype[0].field[0].type 10005
+doctype[0].structtype[0].field[1].name "lon"
+doctype[0].structtype[0].field[1].internalid 383109411
+doctype[0].structtype[0].field[1].type 10005
+doctype[0].structtype[1].idx 10001
+doctype[0].structtype[1].name document.header
+doctype[0].structtype[2].idx 10003
+doctype[0].structtype[2].name annotation.morty.RICK_FEATURESET
+doctype[0].structtype[2].inherits[0].type 10016
+doctype[0].structtype[2].field[0].name "foo1"
+doctype[0].structtype[2].field[0].internalid 396139730
+doctype[0].structtype[2].field[0].type 10018
+doctype[0].structtype[2].field[1].name "foo2"
+doctype[0].structtype[2].field[1].internalid 847515256
+doctype[0].structtype[2].field[1].type 10009
+doctype[0].structtype[2].field[2].name "foo3"
+doctype[0].structtype[2].field[2].internalid 25653132
+doctype[0].structtype[2].field[2].type 10009
+doctype[0].structtype[2].field[3].name "foo4"
+doctype[0].structtype[2].field[3].internalid 1192267954
+doctype[0].structtype[2].field[3].type 10018
+doctype[0].structtype[2].field[4].name "foo5"
+doctype[0].structtype[2].field[4].internalid 468247057
+doctype[0].structtype[2].field[4].type 10018
+doctype[0].structtype[2].field[5].name "foo6"
+doctype[0].structtype[2].field[5].internalid 239079944
+doctype[0].structtype[2].field[5].type 10011
+doctype[0].structtype[2].field[6].name "foo7"
+doctype[0].structtype[2].field[6].internalid 1888765556
+doctype[0].structtype[2].field[6].type 10009
+doctype[0].structtype[2].field[7].name "foo8"
+doctype[0].structtype[2].field[7].internalid 787262953
+doctype[0].structtype[2].field[7].type 10009
+doctype[0].structtype[2].field[8].name "foo9"
+doctype[0].structtype[2].field[8].internalid 644176133
+doctype[0].structtype[2].field[8].type 10019
+doctype[0].structtype[2].field[9].name "foo10"
+doctype[0].structtype[2].field[9].internalid 1512634272
+doctype[0].structtype[2].field[9].type 10011
+doctype[0].structtype[3].idx 10004
+doctype[0].structtype[3].name annotation.person
+doctype[0].structtype[3].field[0].name "name"
+doctype[0].structtype[3].field[0].internalid 1160796772
+doctype[0].structtype[3].field[0].type 10018
+doctype[0].structtype[4].idx 10007
+doctype[0].structtype[4].name annotation.artist
+doctype[0].structtype[4].inherits[0].type 10004
+doctype[0].structtype[4].field[0].name "instrument"
+doctype[0].structtype[4].field[0].internalid 1675549145
+doctype[0].structtype[4].field[0].type 10009
+doctype[0].structtype[5].idx 10008
+doctype[0].structtype[5].name annotation.morty.RICK_DOCSTATS
+doctype[0].structtype[5].field[0].name "bodycount"
+doctype[0].structtype[5].field[0].internalid 1292978986
+doctype[0].structtype[5].field[0].type 10009
+doctype[0].structtype[5].field[1].name "anchorcount"
+doctype[0].structtype[5].field[1].internalid 1464022877
+doctype[0].structtype[5].field[1].type 10009
+doctype[0].structtype[6].idx 10010
+doctype[0].structtype[6].name annotation.date
+doctype[0].structtype[6].field[0].name "exacttime"
+doctype[0].structtype[6].field[0].internalid 1338792252
+doctype[0].structtype[6].field[0].type 10005
+doctype[0].structtype[7].idx 10015
+doctype[0].structtype[7].name annotation.event
+doctype[0].structtype[7].field[0].name "description"
+doctype[0].structtype[7].field[0].internalid 85817688
+doctype[0].structtype[7].field[0].type 10018
+doctype[0].structtype[7].field[1].name "person"
+doctype[0].structtype[7].field[1].internalid 446122015
+doctype[0].structtype[7].field[1].type 10006
+doctype[0].structtype[7].field[2].name "date"
+doctype[0].structtype[7].field[2].internalid 821159826
+doctype[0].structtype[7].field[2].type 10013
+doctype[0].structtype[7].field[3].name "place"
+doctype[0].structtype[7].field[3].internalid 573928371
+doctype[0].structtype[7].field[3].type 10014
+doctype[0].structtype[8].idx 10016
+doctype[0].structtype[8].name annotation.morty.FEATURESET
+doctype[0].structtype[8].field[0].name "realvaluedfeatures"
+doctype[0].structtype[8].field[0].internalid 1422153900
+doctype[0].structtype[8].field[0].type 10020
+doctype[0].structtype[8].field[1].name "discretevaluedfeatures"
+doctype[0].structtype[8].field[1].internalid 1778471774
+doctype[0].structtype[8].field[1].type 10017
+doctype[0].structtype[8].field[2].name "score"
+doctype[0].structtype[8].field[2].internalid 1975414760
+doctype[0].structtype[8].field[2].type 10012
+doctype[1].name "article"
+doctype[1].idx 10038
+doctype[1].inherits[0].idx 10000
+doctype[1].contentstruct 10039
+doctype[1].structtype[0].idx 10039
+doctype[1].structtype[0].name article.header
+doctype[1].structtype[0].field[0].name "title"
+doctype[1].structtype[0].field[0].internalid 567626448
+doctype[1].structtype[0].field[0].type 10018
+doctype[1].structtype[0].field[1].name "content"
+doctype[1].structtype[0].field[1].internalid 482196823
+doctype[1].structtype[0].field[1].type 10018
+doctype[1].structtype[0].field[2].name "rankfeatures"
+doctype[1].structtype[0].field[2].internalid 1883197392
+doctype[1].structtype[0].field[2].type 10018
+doctype[1].structtype[0].field[3].name "summaryfeatures"
+doctype[1].structtype[0].field[3].internalid 1840337115
+doctype[1].structtype[0].field[3].type 10018
diff --git a/document/src/test/java/com/yahoo/document/annotation/documentmanager.bug4259784.cfg b/document/src/test/java/com/yahoo/document/annotation/documentmanager.bug4259784.cfg
index 77d72ed264e..485e83ab8b7 100644
--- a/document/src/test/java/com/yahoo/document/annotation/documentmanager.bug4259784.cfg
+++ b/document/src/test/java/com/yahoo/document/annotation/documentmanager.bug4259784.cfg
@@ -1,147 +1,127 @@
-enablecompression false
-annotationtype[4]
-annotationtype[0].datatype -476092672
-annotationtype[0].id 1278713514
-annotationtype[0].name "company"
-annotationtype[0].inherits[1]
-annotationtype[0].inherits[0].id 9765800
-annotationtype[1].datatype 912259135
-annotationtype[1].id 9765800
-annotationtype[1].name "industry"
-annotationtype[1].inherits[0]
-annotationtype[2].datatype 515587158
-annotationtype[2].id -270471211
-annotationtype[2].name "location"
-annotationtype[2].inherits[0]
-annotationtype[3].datatype -1466283082
-annotationtype[3].id 609952424
-annotationtype[3].name "person"
-annotationtype[3].inherits[0]
-datatype[10]
-datatype[0].id -1149562679
-datatype[0].annotationreftype[1]
-datatype[0].annotationreftype[0].annotation "person"
-datatype[0].arraytype[0]
-datatype[0].documenttype[0]
-datatype[0].structtype[0]
-datatype[0].weightedsettype[0]
-datatype[1].id -1386162972
-datatype[1].annotationreftype[0]
-datatype[1].arraytype[0]
-datatype[1].documenttype[1]
-datatype[1].documenttype[0].bodystruct 1387420336
-datatype[1].documenttype[0].headerstruct -945638949
-datatype[1].documenttype[0].name "blog"
-datatype[1].documenttype[0].version 0
-datatype[1].documenttype[0].inherits[0]
-datatype[1].structtype[0]
-datatype[1].weightedsettype[0]
-datatype[2].id -1466283082
-datatype[2].annotationreftype[0]
-datatype[2].arraytype[0]
-datatype[2].documenttype[0]
-datatype[2].structtype[1]
-datatype[2].structtype[0].name "annotation.person"
-datatype[2].structtype[0].version 0
-datatype[2].structtype[0].field[1]
-datatype[2].structtype[0].field[0].datatype 2
-datatype[2].structtype[0].field[0].name "name"
-datatype[2].structtype[0].field[0].id[0]
-datatype[2].structtype[0].inherits[0]
-datatype[2].weightedsettype[0]
-datatype[3].id -476092672
-datatype[3].annotationreftype[0]
-datatype[3].arraytype[0]
-datatype[3].documenttype[0]
-datatype[3].structtype[1]
-datatype[3].structtype[0].name "annotation.company"
-datatype[3].structtype[0].version 0
-datatype[3].structtype[0].field[3]
-datatype[3].structtype[0].field[0].datatype 1184817987
-datatype[3].structtype[0].field[0].name "directors"
-datatype[3].structtype[0].field[0].id[0]
-datatype[3].structtype[0].field[1].datatype 2
-datatype[3].structtype[0].field[1].name "name"
-datatype[3].structtype[0].field[1].id[0]
-datatype[3].structtype[0].field[2].datatype 1321486441
-datatype[3].structtype[0].field[2].name "place"
-datatype[3].structtype[0].field[2].id[0]
-datatype[3].structtype[0].inherits[1]
-datatype[3].structtype[0].inherits[0].name "annotation.industry"
-datatype[3].structtype[0].inherits[0].version 0
-datatype[3].weightedsettype[0]
-datatype[4].id -945638949
-datatype[4].annotationreftype[0]
-datatype[4].arraytype[0]
-datatype[4].documenttype[0]
-datatype[4].structtype[1]
-datatype[4].structtype[0].name "blog.header"
-datatype[4].structtype[0].version 0
-datatype[4].structtype[0].field[4]
-datatype[4].structtype[0].field[0].datatype 2
-datatype[4].structtype[0].field[0].name "author"
-datatype[4].structtype[0].field[0].id[0]
-datatype[4].structtype[0].field[1].datatype 2
-datatype[4].structtype[0].field[1].name "body"
-datatype[4].structtype[0].field[1].id[0]
-datatype[4].structtype[0].field[2].datatype 2
-datatype[4].structtype[0].field[2].name "title"
-datatype[4].structtype[0].field[2].id[0]
-datatype[4].structtype[0].field[3].datatype 10
-datatype[4].structtype[0].field[3].name "url"
-datatype[4].structtype[0].field[3].id[0]
-datatype[4].structtype[0].inherits[0]
-datatype[4].weightedsettype[0]
-datatype[5].id 1184817987
-datatype[5].annotationreftype[0]
-datatype[5].arraytype[1]
-datatype[5].arraytype[0].datatype -1149562679
-datatype[5].documenttype[0]
-datatype[5].structtype[0]
-datatype[5].weightedsettype[0]
-datatype[6].id 1321486441
-datatype[6].annotationreftype[1]
-datatype[6].annotationreftype[0].annotation "location"
-datatype[6].arraytype[0]
-datatype[6].documenttype[0]
-datatype[6].structtype[0]
-datatype[6].weightedsettype[0]
-datatype[7].id 1387420336
-datatype[7].annotationreftype[0]
-datatype[7].arraytype[0]
-datatype[7].documenttype[0]
-datatype[7].structtype[1]
-datatype[7].structtype[0].name "blog.body"
-datatype[7].structtype[0].version 0
-datatype[7].structtype[0].field[0]
-datatype[7].structtype[0].inherits[0]
-datatype[7].weightedsettype[0]
-datatype[8].id 515587158
-datatype[8].annotationreftype[0]
-datatype[8].arraytype[0]
-datatype[8].documenttype[0]
-datatype[8].structtype[1]
-datatype[8].structtype[0].name "annotation.location"
-datatype[8].structtype[0].version 0
-datatype[8].structtype[0].field[2]
-datatype[8].structtype[0].field[0].datatype 1
-datatype[8].structtype[0].field[0].name "lat"
-datatype[8].structtype[0].field[0].id[0]
-datatype[8].structtype[0].field[1].datatype 1
-datatype[8].structtype[0].field[1].name "lon"
-datatype[8].structtype[0].field[1].id[0]
-datatype[8].structtype[0].inherits[0]
-datatype[8].weightedsettype[0]
-datatype[9].id 912259135
-datatype[9].annotationreftype[0]
-datatype[9].arraytype[0]
-datatype[9].documenttype[0]
-datatype[9].structtype[1]
-datatype[9].structtype[0].name "annotation.industry"
-datatype[9].structtype[0].version 0
-datatype[9].structtype[0].field[1]
-datatype[9].structtype[0].field[0].datatype 2
-datatype[9].structtype[0].field[0].name "vertical"
-datatype[9].structtype[0].field[0].id[0]
-datatype[9].structtype[0].inherits[0]
-datatype[9].weightedsettype[0]
+doctype[2]
+doctype[0].name "document"
+doctype[0].idx 10000
+doctype[0].contentstruct 10001
+doctype[0].primitivetype[0].idx 10002
+doctype[0].primitivetype[0].internalid 0
+doctype[0].primitivetype[0].name "int"
+doctype[0].primitivetype[1].idx 10004
+doctype[0].primitivetype[1].internalid 5
+doctype[0].primitivetype[1].name "double"
+doctype[0].primitivetype[2].idx 10011
+doctype[0].primitivetype[2].internalid 2
+doctype[0].primitivetype[2].name "string"
+doctype[0].primitivetype[3].idx 10012
+doctype[0].primitivetype[3].internalid 1
+doctype[0].primitivetype[3].name "float"
+doctype[0].arraytype[0].idx 10003
+doctype[0].arraytype[0].elementtype 10008
+doctype[0].annotationtype[0].idx 10013
+doctype[0].annotationtype[0].name "normalized"
+doctype[0].annotationtype[0].internalid 4
+doctype[0].annotationtype[0].datatype 10011
+doctype[0].annotationtype[1].idx 10014
+doctype[0].annotationtype[1].name "reading"
+doctype[0].annotationtype[1].internalid 5
+doctype[0].annotationtype[1].datatype 10011
+doctype[0].annotationtype[2].idx 10015
+doctype[0].annotationtype[2].name "industry"
+doctype[0].annotationtype[2].internalid 9765800
+doctype[0].annotationtype[2].datatype 10005
+doctype[0].annotationtype[3].idx 10016
+doctype[0].annotationtype[3].name "canonical"
+doctype[0].annotationtype[3].internalid 3
+doctype[0].annotationtype[3].datatype 10011
+doctype[0].annotationtype[4].idx 10017
+doctype[0].annotationtype[4].name "token_type"
+doctype[0].annotationtype[4].internalid 2
+doctype[0].annotationtype[4].datatype 10002
+doctype[0].annotationtype[5].idx 10018
+doctype[0].annotationtype[5].name "proximity_break"
+doctype[0].annotationtype[5].internalid 8
+doctype[0].annotationtype[5].datatype 10004
+doctype[0].annotationtype[6].idx 10019
+doctype[0].annotationtype[6].name "person"
+doctype[0].annotationtype[6].internalid 609952424
+doctype[0].annotationtype[6].datatype 10006
+doctype[0].annotationtype[7].idx 10020
+doctype[0].annotationtype[7].name "term"
+doctype[0].annotationtype[7].internalid 1
+doctype[0].annotationtype[7].datatype 10011
+doctype[0].annotationtype[8].idx 10021
+doctype[0].annotationtype[8].name "transformed"
+doctype[0].annotationtype[8].internalid 7
+doctype[0].annotationtype[8].datatype 10011
+doctype[0].annotationtype[9].idx 10022
+doctype[0].annotationtype[9].name "company"
+doctype[0].annotationtype[9].internalid 1278713514
+doctype[0].annotationtype[9].datatype 10007
+doctype[0].annotationtype[9].inherits[0].idx 10015
+doctype[0].annotationtype[10].idx 10023
+doctype[0].annotationtype[10].name "location"
+doctype[0].annotationtype[10].internalid -270471211
+doctype[0].annotationtype[10].datatype 10010
+doctype[0].annotationtype[11].idx 10024
+doctype[0].annotationtype[11].name "special_token"
+doctype[0].annotationtype[11].internalid 9
+doctype[0].annotationtype[12].idx 10025
+doctype[0].annotationtype[12].name "stem"
+doctype[0].annotationtype[12].internalid 6
+doctype[0].annotationtype[12].datatype 10011
+doctype[0].annotationref[0].idx 10008
+doctype[0].annotationref[0].annotationtype 10019
+doctype[0].annotationref[1].idx 10009
+doctype[0].annotationref[1].annotationtype 10023
+doctype[0].structtype[0].idx 10001
+doctype[0].structtype[0].name document.header
+doctype[0].structtype[1].idx 10005
+doctype[0].structtype[1].name annotation.industry
+doctype[0].structtype[1].field[0].name "vertical"
+doctype[0].structtype[1].field[0].internalid 1054642217
+doctype[0].structtype[1].field[0].type 10011
+doctype[0].structtype[2].idx 10006
+doctype[0].structtype[2].name annotation.person
+doctype[0].structtype[2].field[0].name "name"
+doctype[0].structtype[2].field[0].internalid 1160796772
+doctype[0].structtype[2].field[0].type 10011
+doctype[0].structtype[3].idx 10007
+doctype[0].structtype[3].name annotation.company
+doctype[0].structtype[3].inherits[0].type 10005
+doctype[0].structtype[3].field[0].name "directors"
+doctype[0].structtype[3].field[0].internalid 1954735596
+doctype[0].structtype[3].field[0].type 10003
+doctype[0].structtype[3].field[1].name "name"
+doctype[0].structtype[3].field[1].internalid 1160796772
+doctype[0].structtype[3].field[1].type 10011
+doctype[0].structtype[3].field[2].name "place"
+doctype[0].structtype[3].field[2].internalid 780257720
+doctype[0].structtype[3].field[2].type 10009
+doctype[0].structtype[4].idx 10010
+doctype[0].structtype[4].name annotation.location
+doctype[0].structtype[4].field[0].name "lat"
+doctype[0].structtype[4].field[0].internalid 348215633
+doctype[0].structtype[4].field[0].type 10012
+doctype[0].structtype[4].field[1].name "lon"
+doctype[0].structtype[4].field[1].internalid 290823024
+doctype[0].structtype[4].field[1].type 10012
+doctype[1].name "blog"
+doctype[1].idx 10026
+doctype[1].inherits[0].idx 10000
+doctype[1].contentstruct 10027
+doctype[1].primitivetype[0].idx 10028
+doctype[1].primitivetype[0].internalid 10
+doctype[1].primitivetype[0].name "uri"
+doctype[1].structtype[0].idx 10027
+doctype[1].structtype[0].name blog.header
+doctype[1].structtype[0].field[0].name "author"
+doctype[1].structtype[0].field[0].internalid 644499292
+doctype[1].structtype[0].field[0].type 10011
+doctype[1].structtype[0].field[1].name "body"
+doctype[1].structtype[0].field[1].internalid 563132339
+doctype[1].structtype[0].field[1].type 10011
+doctype[1].structtype[0].field[2].name "title"
+doctype[1].structtype[0].field[2].internalid 567626448
+doctype[1].structtype[0].field[2].type 10011
+doctype[1].structtype[0].field[3].name "url"
+doctype[1].structtype[0].field[3].internalid 2095970198
+doctype[1].structtype[0].field[3].type 10028
diff --git a/document/src/test/java/com/yahoo/document/annotation/documentmanager.bug4261985.cfg b/document/src/test/java/com/yahoo/document/annotation/documentmanager.bug4261985.cfg
index bbc67412652..65703d69902 100644
--- a/document/src/test/java/com/yahoo/document/annotation/documentmanager.bug4261985.cfg
+++ b/document/src/test/java/com/yahoo/document/annotation/documentmanager.bug4261985.cfg
@@ -1,181 +1,143 @@
-enablecompression false
-annotationtype[5]
-annotationtype[0].datatype 1574163290
-annotationtype[0].id 1883143872
-annotationtype[0].name "bigshots"
-annotationtype[0].inherits[0]
-annotationtype[1].datatype -476092672
-annotationtype[1].id 1278713514
-annotationtype[1].name "company"
-annotationtype[1].inherits[1]
-annotationtype[1].inherits[0].id 9765800
-annotationtype[2].datatype 912259135
-annotationtype[2].id 9765800
-annotationtype[2].name "industry"
-annotationtype[2].inherits[0]
-annotationtype[3].datatype 515587158
-annotationtype[3].id -270471211
-annotationtype[3].name "location"
-annotationtype[3].inherits[0]
-annotationtype[4].datatype -1466283082
-annotationtype[4].id 609952424
-annotationtype[4].name "person"
-annotationtype[4].inherits[0]
-datatype[13]
-datatype[00].id -1149562679
-datatype[00].annotationreftype[1]
-datatype[00].annotationreftype[0].annotation "person"
-datatype[00].arraytype[0]
-datatype[00].documenttype[0]
-datatype[00].structtype[0]
-datatype[00].weightedsettype[0]
-datatype[01].id -1386162972
-datatype[01].annotationreftype[0]
-datatype[01].arraytype[0]
-datatype[01].documenttype[1]
-datatype[01].documenttype[0].bodystruct 1387420336
-datatype[01].documenttype[0].headerstruct -945638949
-datatype[01].documenttype[0].name "blog"
-datatype[01].documenttype[0].version 0
-datatype[01].documenttype[0].inherits[0]
-datatype[01].structtype[0]
-datatype[01].weightedsettype[0]
-datatype[02].id -1466283082
-datatype[02].annotationreftype[0]
-datatype[02].arraytype[0]
-datatype[02].documenttype[0]
-datatype[02].structtype[1]
-datatype[02].structtype[0].name "annotation.person"
-datatype[02].structtype[0].version 0
-datatype[02].structtype[0].field[1]
-datatype[02].structtype[0].field[0].datatype 2
-datatype[02].structtype[0].field[0].name "name"
-datatype[02].structtype[0].field[0].id[0]
-datatype[02].structtype[0].inherits[0]
-datatype[02].weightedsettype[0]
-datatype[03].id -476092672
-datatype[03].annotationreftype[0]
-datatype[03].arraytype[0]
-datatype[03].documenttype[0]
-datatype[03].structtype[1]
-datatype[03].structtype[0].name "annotation.company"
-datatype[03].structtype[0].version 0
-datatype[03].structtype[0].field[2]
-datatype[03].structtype[0].field[0].datatype 1184817987
-datatype[03].structtype[0].field[0].name "directors"
-datatype[03].structtype[0].field[0].id[0]
-datatype[03].structtype[0].field[1].datatype 2
-datatype[03].structtype[0].field[1].name "name"
-datatype[03].structtype[0].field[1].id[0]
-datatype[03].structtype[0].inherits[1]
-datatype[03].structtype[0].inherits[0].name "annotation.industry"
-datatype[03].structtype[0].inherits[0].version 0
-datatype[03].weightedsettype[0]
-datatype[04].id -945638949
-datatype[04].annotationreftype[0]
-datatype[04].arraytype[0]
-datatype[04].documenttype[0]
-datatype[04].structtype[1]
-datatype[04].structtype[0].name "blog.header"
-datatype[04].structtype[0].version 0
-datatype[04].structtype[0].field[4]
-datatype[04].structtype[0].field[0].datatype 2
-datatype[04].structtype[0].field[0].name "author"
-datatype[04].structtype[0].field[0].id[0]
-datatype[04].structtype[0].field[1].datatype 2
-datatype[04].structtype[0].field[1].name "body"
-datatype[04].structtype[0].field[1].id[0]
-datatype[04].structtype[0].field[2].datatype 2
-datatype[04].structtype[0].field[2].name "title"
-datatype[04].structtype[0].field[2].id[0]
-datatype[04].structtype[0].field[3].datatype 10
-datatype[04].structtype[0].field[3].name "url"
-datatype[04].structtype[0].field[3].id[0]
-datatype[04].structtype[0].inherits[0]
-datatype[04].weightedsettype[0]
-datatype[05].id 108708069
-datatype[05].annotationreftype[1]
-datatype[05].annotationreftype[0].annotation "bigshots"
-datatype[05].arraytype[0]
-datatype[05].documenttype[0]
-datatype[05].structtype[0]
-datatype[05].weightedsettype[0]
-datatype[06].id 1184817987
-datatype[06].annotationreftype[0]
-datatype[06].arraytype[1]
-datatype[06].arraytype[0].datatype -1149562679
-datatype[06].documenttype[0]
-datatype[06].structtype[0]
-datatype[06].weightedsettype[0]
-datatype[07].id 1321486441
-datatype[07].annotationreftype[1]
-datatype[07].annotationreftype[0].annotation "location"
-datatype[07].arraytype[0]
-datatype[07].documenttype[0]
-datatype[07].structtype[0]
-datatype[07].weightedsettype[0]
-datatype[08].id 1387420336
-datatype[08].annotationreftype[0]
-datatype[08].arraytype[0]
-datatype[08].documenttype[0]
-datatype[08].structtype[1]
-datatype[08].structtype[0].name "blog.body"
-datatype[08].structtype[0].version 0
-datatype[08].structtype[0].field[0]
-datatype[08].structtype[0].inherits[0]
-datatype[08].weightedsettype[0]
-datatype[09].id 1574163290
-datatype[09].annotationreftype[0]
-datatype[09].arraytype[0]
-datatype[09].documenttype[0]
-datatype[09].structtype[1]
-datatype[09].structtype[0].name "annotation.bigshots"
-datatype[09].structtype[0].version 0
-datatype[09].structtype[0].field[2]
-datatype[09].structtype[0].field[0].datatype 1975335457
-datatype[09].structtype[0].field[0].name "ceos"
-datatype[09].structtype[0].field[0].id[0]
-datatype[09].structtype[0].field[1].datatype 108708069
-datatype[09].structtype[0].field[1].name "self"
-datatype[09].structtype[0].field[1].id[0]
-datatype[09].structtype[0].inherits[0]
-datatype[09].weightedsettype[0]
-datatype[10].id 1975335457
-datatype[10].annotationreftype[1]
-datatype[10].annotationreftype[0].annotation "company"
-datatype[10].arraytype[0]
-datatype[10].documenttype[0]
-datatype[10].structtype[0]
-datatype[10].weightedsettype[0]
-datatype[11].id 515587158
-datatype[11].annotationreftype[0]
-datatype[11].arraytype[0]
-datatype[11].documenttype[0]
-datatype[11].structtype[1]
-datatype[11].structtype[0].name "annotation.location"
-datatype[11].structtype[0].version 0
-datatype[11].structtype[0].field[2]
-datatype[11].structtype[0].field[0].datatype 1
-datatype[11].structtype[0].field[0].name "lat"
-datatype[11].structtype[0].field[0].id[0]
-datatype[11].structtype[0].field[1].datatype 1
-datatype[11].structtype[0].field[1].name "lon"
-datatype[11].structtype[0].field[1].id[0]
-datatype[11].structtype[0].inherits[0]
-datatype[11].weightedsettype[0]
-datatype[12].id 912259135
-datatype[12].annotationreftype[0]
-datatype[12].arraytype[0]
-datatype[12].documenttype[0]
-datatype[12].structtype[1]
-datatype[12].structtype[0].name "annotation.industry"
-datatype[12].structtype[0].version 0
-datatype[12].structtype[0].field[2]
-datatype[12].structtype[0].field[0].datatype 1321486441
-datatype[12].structtype[0].field[0].name "place"
-datatype[12].structtype[0].field[0].id[0]
-datatype[12].structtype[0].field[1].datatype 2
-datatype[12].structtype[0].field[1].name "vertical"
-datatype[12].structtype[0].field[1].id[0]
-datatype[12].structtype[0].inherits[0]
-datatype[12].weightedsettype[0]
+doctype[2]
+doctype[0].name "document"
+doctype[0].idx 10000
+doctype[0].contentstruct 10001
+doctype[0].primitivetype[0].idx 10007
+doctype[0].primitivetype[0].internalid 0
+doctype[0].primitivetype[0].name "int"
+doctype[0].primitivetype[1].idx 10008
+doctype[0].primitivetype[1].internalid 5
+doctype[0].primitivetype[1].name "double"
+doctype[0].primitivetype[2].idx 10013
+doctype[0].primitivetype[2].internalid 2
+doctype[0].primitivetype[2].name "string"
+doctype[0].primitivetype[3].idx 10014
+doctype[0].primitivetype[3].internalid 1
+doctype[0].primitivetype[3].name "float"
+doctype[0].arraytype[0].idx 10015
+doctype[0].arraytype[0].elementtype 10002
+doctype[0].annotationtype[0].idx 10016
+doctype[0].annotationtype[0].name "normalized"
+doctype[0].annotationtype[0].internalid 4
+doctype[0].annotationtype[0].datatype 10013
+doctype[0].annotationtype[1].idx 10017
+doctype[0].annotationtype[1].name "reading"
+doctype[0].annotationtype[1].internalid 5
+doctype[0].annotationtype[1].datatype 10013
+doctype[0].annotationtype[2].idx 10018
+doctype[0].annotationtype[2].name "industry"
+doctype[0].annotationtype[2].internalid 9765800
+doctype[0].annotationtype[2].datatype 10012
+doctype[0].annotationtype[3].idx 10019
+doctype[0].annotationtype[3].name "canonical"
+doctype[0].annotationtype[3].internalid 3
+doctype[0].annotationtype[3].datatype 10013
+doctype[0].annotationtype[4].idx 10020
+doctype[0].annotationtype[4].name "token_type"
+doctype[0].annotationtype[4].internalid 2
+doctype[0].annotationtype[4].datatype 10007
+doctype[0].annotationtype[5].idx 10021
+doctype[0].annotationtype[5].name "proximity_break"
+doctype[0].annotationtype[5].internalid 8
+doctype[0].annotationtype[5].datatype 10008
+doctype[0].annotationtype[6].idx 10022
+doctype[0].annotationtype[6].name "bigshots"
+doctype[0].annotationtype[6].internalid 1883143872
+doctype[0].annotationtype[6].datatype 10010
+doctype[0].annotationtype[7].idx 10023
+doctype[0].annotationtype[7].name "person"
+doctype[0].annotationtype[7].internalid 609952424
+doctype[0].annotationtype[7].datatype 10006
+doctype[0].annotationtype[8].idx 10024
+doctype[0].annotationtype[8].name "term"
+doctype[0].annotationtype[8].internalid 1
+doctype[0].annotationtype[8].datatype 10013
+doctype[0].annotationtype[9].idx 10025
+doctype[0].annotationtype[9].name "transformed"
+doctype[0].annotationtype[9].internalid 7
+doctype[0].annotationtype[9].datatype 10013
+doctype[0].annotationtype[10].idx 10026
+doctype[0].annotationtype[10].name "company"
+doctype[0].annotationtype[10].internalid 1278713514
+doctype[0].annotationtype[10].datatype 10004
+doctype[0].annotationtype[10].inherits[0].idx 10018
+doctype[0].annotationtype[11].idx 10027
+doctype[0].annotationtype[11].name "location"
+doctype[0].annotationtype[11].internalid -270471211
+doctype[0].annotationtype[11].datatype 10005
+doctype[0].annotationtype[12].idx 10028
+doctype[0].annotationtype[12].name "special_token"
+doctype[0].annotationtype[12].internalid 9
+doctype[0].annotationtype[13].idx 10029
+doctype[0].annotationtype[13].name "stem"
+doctype[0].annotationtype[13].internalid 6
+doctype[0].annotationtype[13].datatype 10013
+doctype[0].annotationref[0].idx 10002
+doctype[0].annotationref[0].annotationtype 10023
+doctype[0].annotationref[1].idx 10003
+doctype[0].annotationref[1].annotationtype 10027
+doctype[0].annotationref[2].idx 10009
+doctype[0].annotationref[2].annotationtype 10026
+doctype[0].annotationref[3].idx 10011
+doctype[0].annotationref[3].annotationtype 10022
+doctype[0].structtype[0].idx 10001
+doctype[0].structtype[0].name document.header
+doctype[0].structtype[1].idx 10004
+doctype[0].structtype[1].name annotation.company
+doctype[0].structtype[1].inherits[0].type 10012
+doctype[0].structtype[1].field[0].name "directors"
+doctype[0].structtype[1].field[0].internalid 1954735596
+doctype[0].structtype[1].field[0].type 10015
+doctype[0].structtype[1].field[1].name "name"
+doctype[0].structtype[1].field[1].internalid 1160796772
+doctype[0].structtype[1].field[1].type 10013
+doctype[0].structtype[2].idx 10005
+doctype[0].structtype[2].name annotation.location
+doctype[0].structtype[2].field[0].name "lat"
+doctype[0].structtype[2].field[0].internalid 348215633
+doctype[0].structtype[2].field[0].type 10014
+doctype[0].structtype[2].field[1].name "lon"
+doctype[0].structtype[2].field[1].internalid 290823024
+doctype[0].structtype[2].field[1].type 10014
+doctype[0].structtype[3].idx 10006
+doctype[0].structtype[3].name annotation.person
+doctype[0].structtype[3].field[0].name "name"
+doctype[0].structtype[3].field[0].internalid 1160796772
+doctype[0].structtype[3].field[0].type 10013
+doctype[0].structtype[4].idx 10010
+doctype[0].structtype[4].name annotation.bigshots
+doctype[0].structtype[4].field[0].name "ceos"
+doctype[0].structtype[4].field[0].internalid 217466272
+doctype[0].structtype[4].field[0].type 10009
+doctype[0].structtype[4].field[1].name "self"
+doctype[0].structtype[4].field[1].internalid 170584449
+doctype[0].structtype[4].field[1].type 10011
+doctype[0].structtype[5].idx 10012
+doctype[0].structtype[5].name annotation.industry
+doctype[0].structtype[5].field[0].name "place"
+doctype[0].structtype[5].field[0].internalid 780257720
+doctype[0].structtype[5].field[0].type 10003
+doctype[0].structtype[5].field[1].name "vertical"
+doctype[0].structtype[5].field[1].internalid 1054642217
+doctype[0].structtype[5].field[1].type 10013
+doctype[1].name "blog"
+doctype[1].idx 10030
+doctype[1].inherits[0].idx 10000
+doctype[1].contentstruct 10031
+doctype[1].primitivetype[0].idx 10032
+doctype[1].primitivetype[0].internalid 10
+doctype[1].primitivetype[0].name "uri"
+doctype[1].structtype[0].idx 10031
+doctype[1].structtype[0].name blog.header
+doctype[1].structtype[0].field[0].name "author"
+doctype[1].structtype[0].field[0].internalid 644499292
+doctype[1].structtype[0].field[0].type 10013
+doctype[1].structtype[0].field[1].name "body"
+doctype[1].structtype[0].field[1].internalid 563132339
+doctype[1].structtype[0].field[1].type 10013
+doctype[1].structtype[0].field[2].name "title"
+doctype[1].structtype[0].field[2].internalid 567626448
+doctype[1].structtype[0].field[2].type 10013
+doctype[1].structtype[0].field[3].name "url"
+doctype[1].structtype[0].field[3].internalid 2095970198
+doctype[1].structtype[0].field[3].type 10032
diff --git a/document/src/test/java/com/yahoo/document/annotation/documentmanager.bug4475379.cfg b/document/src/test/java/com/yahoo/document/annotation/documentmanager.bug4475379.cfg
index ae299ab81fa..5420595a487 100644
--- a/document/src/test/java/com/yahoo/document/annotation/documentmanager.bug4475379.cfg
+++ b/document/src/test/java/com/yahoo/document/annotation/documentmanager.bug4475379.cfg
@@ -1,129 +1,127 @@
-enablecompression false
-annotationtype[4]
-annotationtype[0].datatype -476092672
-annotationtype[0].id 1278713514
-annotationtype[0].name "company"
-annotationtype[0].inherits[1]
-annotationtype[0].inherits[0].id 9765800
-annotationtype[1].datatype 912259135
-annotationtype[1].id 9765800
-annotationtype[1].name "industry"
-annotationtype[1].inherits[0]
-annotationtype[2].datatype 515587158
-annotationtype[2].id -270471211
-annotationtype[2].name "location"
-annotationtype[2].inherits[0]
-annotationtype[3].datatype -1466283082
-annotationtype[3].id 609952424
-annotationtype[3].name "person"
-annotationtype[3].inherits[0]
-datatype[7]
-datatype[0].id -1386162972
-datatype[0].annotationreftype[0]
-datatype[0].arraytype[0]
-datatype[0].documenttype[1]
-datatype[0].documenttype[0].bodystruct 1387420336
-datatype[0].documenttype[0].headerstruct -945638949
-datatype[0].documenttype[0].name "blog"
-datatype[0].documenttype[0].version 0
-datatype[0].documenttype[0].inherits[0]
-datatype[0].structtype[0]
-datatype[0].weightedsettype[0]
-datatype[1].id -1466283082
-datatype[1].annotationreftype[0]
-datatype[1].arraytype[0]
-datatype[1].documenttype[0]
-datatype[1].structtype[1]
-datatype[1].structtype[0].name "annotation.person"
-datatype[1].structtype[0].version 0
-datatype[1].structtype[0].field[1]
-datatype[1].structtype[0].field[0].datatype 2
-datatype[1].structtype[0].field[0].name "name"
-datatype[1].structtype[0].field[0].id[0]
-datatype[1].structtype[0].inherits[0]
-datatype[1].weightedsettype[0]
-datatype[2].id -476092672
-datatype[2].annotationreftype[0]
-datatype[2].arraytype[0]
-datatype[2].documenttype[0]
-datatype[2].structtype[1]
-datatype[2].structtype[0].name "annotation.company"
-datatype[2].structtype[0].version 0
-datatype[2].structtype[0].field[5]
-datatype[2].structtype[0].field[0].datatype 4
-datatype[2].structtype[0].field[0].name "alt"
-datatype[2].structtype[0].field[0].id[0]
-datatype[2].structtype[0].field[1].datatype 2
-datatype[2].structtype[0].field[1].name "ceo"
-datatype[2].structtype[0].field[1].id[0]
-datatype[2].structtype[0].field[2].datatype 1
-datatype[2].structtype[0].field[2].name "lat"
-datatype[2].structtype[0].field[2].id[0]
-datatype[2].structtype[0].field[3].datatype 1
-datatype[2].structtype[0].field[3].name "lon"
-datatype[2].structtype[0].field[3].id[0]
-datatype[2].structtype[0].field[4].datatype 2
-datatype[2].structtype[0].field[4].name "name"
-datatype[2].structtype[0].field[4].id[0]
-datatype[2].structtype[0].inherits[1]
-datatype[2].structtype[0].inherits[0].name "annotation.industry"
-datatype[2].structtype[0].inherits[0].version 0
-datatype[2].weightedsettype[0]
-datatype[3].id -945638949
-datatype[3].annotationreftype[0]
-datatype[3].arraytype[0]
-datatype[3].documenttype[0]
-datatype[3].structtype[1]
-datatype[3].structtype[0].name "blog.header"
-datatype[3].structtype[0].version 0
-datatype[3].structtype[0].field[4]
-datatype[3].structtype[0].field[0].datatype 2
-datatype[3].structtype[0].field[0].name "author"
-datatype[3].structtype[0].field[0].id[0]
-datatype[3].structtype[0].field[1].datatype 2
-datatype[3].structtype[0].field[1].name "body"
-datatype[3].structtype[0].field[1].id[0]
-datatype[3].structtype[0].field[2].datatype 2
-datatype[3].structtype[0].field[2].name "title"
-datatype[3].structtype[0].field[2].id[0]
-datatype[3].structtype[0].field[3].datatype 10
-datatype[3].structtype[0].field[3].name "url"
-datatype[3].structtype[0].field[3].id[0]
-datatype[3].structtype[0].inherits[0]
-datatype[3].weightedsettype[0]
-datatype[4].id 1387420336
-datatype[4].annotationreftype[0]
-datatype[4].arraytype[0]
-datatype[4].documenttype[0]
-datatype[4].structtype[1]
-datatype[4].structtype[0].name "blog.body"
-datatype[4].structtype[0].version 0
-datatype[4].structtype[0].field[0]
-datatype[4].structtype[0].inherits[0]
-datatype[4].weightedsettype[0]
-datatype[5].id 515587158
-datatype[5].annotationreftype[0]
-datatype[5].arraytype[0]
-datatype[5].documenttype[0]
-datatype[5].structtype[1]
-datatype[5].structtype[0].name "annotation.location"
-datatype[5].structtype[0].version 0
-datatype[5].structtype[0].field[1]
-datatype[5].structtype[0].field[0].datatype 2
-datatype[5].structtype[0].field[0].name "name"
-datatype[5].structtype[0].field[0].id[0]
-datatype[5].structtype[0].inherits[0]
-datatype[5].weightedsettype[0]
-datatype[6].id 912259135
-datatype[6].annotationreftype[0]
-datatype[6].arraytype[0]
-datatype[6].documenttype[0]
-datatype[6].structtype[1]
-datatype[6].structtype[0].name "annotation.industry"
-datatype[6].structtype[0].version 0
-datatype[6].structtype[0].field[1]
-datatype[6].structtype[0].field[0].datatype 2
-datatype[6].structtype[0].field[0].name "vertical"
-datatype[6].structtype[0].field[0].id[0]
-datatype[6].structtype[0].inherits[0]
-datatype[6].weightedsettype[0]
+doctype[2]
+doctype[0].name "document"
+doctype[0].idx 10000
+doctype[0].contentstruct 10001
+doctype[0].primitivetype[0].idx 10002
+doctype[0].primitivetype[0].internalid 4
+doctype[0].primitivetype[0].name "long"
+doctype[0].primitivetype[1].idx 10004
+doctype[0].primitivetype[1].internalid 0
+doctype[0].primitivetype[1].name "int"
+doctype[0].primitivetype[2].idx 10007
+doctype[0].primitivetype[2].internalid 5
+doctype[0].primitivetype[2].name "double"
+doctype[0].primitivetype[3].idx 10009
+doctype[0].primitivetype[3].internalid 2
+doctype[0].primitivetype[3].name "string"
+doctype[0].primitivetype[4].idx 10010
+doctype[0].primitivetype[4].internalid 1
+doctype[0].primitivetype[4].name "float"
+doctype[0].annotationtype[0].idx 10011
+doctype[0].annotationtype[0].name "normalized"
+doctype[0].annotationtype[0].internalid 4
+doctype[0].annotationtype[0].datatype 10009
+doctype[0].annotationtype[1].idx 10012
+doctype[0].annotationtype[1].name "reading"
+doctype[0].annotationtype[1].internalid 5
+doctype[0].annotationtype[1].datatype 10009
+doctype[0].annotationtype[2].idx 10013
+doctype[0].annotationtype[2].name "industry"
+doctype[0].annotationtype[2].internalid 9765800
+doctype[0].annotationtype[2].datatype 10006
+doctype[0].annotationtype[3].idx 10014
+doctype[0].annotationtype[3].name "canonical"
+doctype[0].annotationtype[3].internalid 3
+doctype[0].annotationtype[3].datatype 10009
+doctype[0].annotationtype[4].idx 10015
+doctype[0].annotationtype[4].name "token_type"
+doctype[0].annotationtype[4].internalid 2
+doctype[0].annotationtype[4].datatype 10004
+doctype[0].annotationtype[5].idx 10016
+doctype[0].annotationtype[5].name "proximity_break"
+doctype[0].annotationtype[5].internalid 8
+doctype[0].annotationtype[5].datatype 10007
+doctype[0].annotationtype[6].idx 10017
+doctype[0].annotationtype[6].name "person"
+doctype[0].annotationtype[6].internalid 609952424
+doctype[0].annotationtype[6].datatype 10003
+doctype[0].annotationtype[7].idx 10018
+doctype[0].annotationtype[7].name "term"
+doctype[0].annotationtype[7].internalid 1
+doctype[0].annotationtype[7].datatype 10009
+doctype[0].annotationtype[8].idx 10019
+doctype[0].annotationtype[8].name "transformed"
+doctype[0].annotationtype[8].internalid 7
+doctype[0].annotationtype[8].datatype 10009
+doctype[0].annotationtype[9].idx 10020
+doctype[0].annotationtype[9].name "company"
+doctype[0].annotationtype[9].internalid 1278713514
+doctype[0].annotationtype[9].datatype 10005
+doctype[0].annotationtype[9].inherits[0].idx 10013
+doctype[0].annotationtype[10].idx 10021
+doctype[0].annotationtype[10].name "location"
+doctype[0].annotationtype[10].internalid -270471211
+doctype[0].annotationtype[10].datatype 10008
+doctype[0].annotationtype[11].idx 10022
+doctype[0].annotationtype[11].name "special_token"
+doctype[0].annotationtype[11].internalid 9
+doctype[0].annotationtype[12].idx 10023
+doctype[0].annotationtype[12].name "stem"
+doctype[0].annotationtype[12].internalid 6
+doctype[0].annotationtype[12].datatype 10009
+doctype[0].structtype[0].idx 10001
+doctype[0].structtype[0].name document.header
+doctype[0].structtype[1].idx 10003
+doctype[0].structtype[1].name annotation.person
+doctype[0].structtype[1].field[0].name "name"
+doctype[0].structtype[1].field[0].internalid 1160796772
+doctype[0].structtype[1].field[0].type 10009
+doctype[0].structtype[2].idx 10005
+doctype[0].structtype[2].name annotation.company
+doctype[0].structtype[2].inherits[0].type 10006
+doctype[0].structtype[2].field[0].name "alt"
+doctype[0].structtype[2].field[0].internalid 2045080471
+doctype[0].structtype[2].field[0].type 10002
+doctype[0].structtype[2].field[1].name "ceo"
+doctype[0].structtype[2].field[1].internalid 1461191475
+doctype[0].structtype[2].field[1].type 10009
+doctype[0].structtype[2].field[2].name "lat"
+doctype[0].structtype[2].field[2].internalid 348215633
+doctype[0].structtype[2].field[2].type 10010
+doctype[0].structtype[2].field[3].name "lon"
+doctype[0].structtype[2].field[3].internalid 290823024
+doctype[0].structtype[2].field[3].type 10010
+doctype[0].structtype[2].field[4].name "name"
+doctype[0].structtype[2].field[4].internalid 1160796772
+doctype[0].structtype[2].field[4].type 10009
+doctype[0].structtype[3].idx 10006
+doctype[0].structtype[3].name annotation.industry
+doctype[0].structtype[3].field[0].name "vertical"
+doctype[0].structtype[3].field[0].internalid 1054642217
+doctype[0].structtype[3].field[0].type 10009
+doctype[0].structtype[4].idx 10008
+doctype[0].structtype[4].name annotation.location
+doctype[0].structtype[4].field[0].name "name"
+doctype[0].structtype[4].field[0].internalid 1160796772
+doctype[0].structtype[4].field[0].type 10009
+doctype[1].name "blog"
+doctype[1].idx 10024
+doctype[1].inherits[0].idx 10000
+doctype[1].contentstruct 10025
+doctype[1].primitivetype[0].idx 10026
+doctype[1].primitivetype[0].internalid 10
+doctype[1].primitivetype[0].name "uri"
+doctype[1].structtype[0].idx 10025
+doctype[1].structtype[0].name blog.header
+doctype[1].structtype[0].field[0].name "author"
+doctype[1].structtype[0].field[0].internalid 644499292
+doctype[1].structtype[0].field[0].type 10009
+doctype[1].structtype[0].field[1].name "body"
+doctype[1].structtype[0].field[1].internalid 563132339
+doctype[1].structtype[0].field[1].type 10009
+doctype[1].structtype[0].field[2].name "title"
+doctype[1].structtype[0].field[2].internalid 567626448
+doctype[1].structtype[0].field[2].type 10009
+doctype[1].structtype[0].field[3].name "url"
+doctype[1].structtype[0].field[3].internalid 2095970198
+doctype[1].structtype[0].field[3].type 10026
diff --git a/document/src/test/java/com/yahoo/document/annotation/documentmanager.systemtest.cfg b/document/src/test/java/com/yahoo/document/annotation/documentmanager.systemtest.cfg
index ce8be4410a1..4233088ae9f 100644
--- a/document/src/test/java/com/yahoo/document/annotation/documentmanager.systemtest.cfg
+++ b/document/src/test/java/com/yahoo/document/annotation/documentmanager.systemtest.cfg
@@ -1,155 +1,129 @@
-enablecompression false
-datatype[11]
-datatype[0].id -198681903
-datatype[0].arraytype[0]
-datatype[0].weightedsettype[0]
-datatype[0].structtype[0]
-datatype[0].documenttype[0]
-datatype[0].annotationreftype[1]
-datatype[0].annotationreftype[0].annotation "person"
-datatype[1].id 1812054936
-datatype[1].arraytype[0]
-datatype[1].weightedsettype[0]
-datatype[1].structtype[0]
-datatype[1].documenttype[0]
-datatype[1].annotationreftype[1]
-datatype[1].annotationreftype[0].annotation "date"
-datatype[2].id 692270031
-datatype[2].arraytype[0]
-datatype[2].weightedsettype[0]
-datatype[2].structtype[0]
-datatype[2].documenttype[0]
-datatype[2].annotationreftype[1]
-datatype[2].annotationreftype[0].annotation "place"
-datatype[3].id 892457735
-datatype[3].arraytype[0]
-datatype[3].weightedsettype[0]
-datatype[3].structtype[1]
-datatype[3].structtype[0].name "article.header"
-datatype[3].structtype[0].version 0
-datatype[3].structtype[0].field[2]
-datatype[3].structtype[0].field[0].name "title"
-datatype[3].structtype[0].field[0].datatype 2
-datatype[3].structtype[0].field[0].id[0]
-datatype[3].structtype[0].field[1].name "content"
-datatype[3].structtype[0].field[1].datatype 2
-datatype[3].structtype[0].field[1].id[0]
-datatype[3].structtype[0].inherits[0]
-datatype[3].documenttype[0]
-datatype[3].annotationreftype[0]
-datatype[4].id -1984964900
-datatype[4].arraytype[0]
-datatype[4].weightedsettype[0]
-datatype[4].structtype[1]
-datatype[4].structtype[0].name "article.body"
-datatype[4].structtype[0].version 0
-datatype[4].structtype[0].field[0]
-datatype[4].structtype[0].inherits[0]
-datatype[4].documenttype[0]
-datatype[4].annotationreftype[0]
-datatype[5].id 559508792
-datatype[5].arraytype[0]
-datatype[5].weightedsettype[0]
-datatype[5].structtype[0]
-datatype[5].documenttype[1]
-datatype[5].documenttype[0].name "article"
-datatype[5].documenttype[0].version 0
-datatype[5].documenttype[0].headerstruct 892457735
-datatype[5].documenttype[0].bodystruct -1984964900
-datatype[5].documenttype[0].inherits[0]
-datatype[5].annotationreftype[0]
-datatype[6].id -1466283082
-datatype[6].arraytype[0]
-datatype[6].weightedsettype[0]
-datatype[6].structtype[1]
-datatype[6].structtype[0].name "annotation.person"
-datatype[6].structtype[0].version 0
-datatype[6].structtype[0].field[1]
-datatype[6].structtype[0].field[0].name "name"
-datatype[6].structtype[0].field[0].datatype 2
-datatype[6].structtype[0].field[0].id[0]
-datatype[6].structtype[0].inherits[0]
-datatype[6].documenttype[0]
-datatype[6].annotationreftype[0]
-datatype[7].id 1157126952
-datatype[7].arraytype[0]
-datatype[7].weightedsettype[0]
-datatype[7].structtype[1]
-datatype[7].structtype[0].name "annotation.artist"
-datatype[7].structtype[0].version 0
-datatype[7].structtype[0].field[1]
-datatype[7].structtype[0].field[0].name "instrument"
-datatype[7].structtype[0].field[0].datatype 0
-datatype[7].structtype[0].field[0].id[0]
-datatype[7].structtype[0].inherits[1]
-datatype[7].structtype[0].inherits[0].name "annotation.person"
-datatype[7].structtype[0].inherits[0].version 0
-datatype[7].documenttype[0]
-datatype[7].annotationreftype[0]
-datatype[8].id -840345201
-datatype[8].arraytype[0]
-datatype[8].weightedsettype[0]
-datatype[8].structtype[1]
-datatype[8].structtype[0].name "annotation.date"
-datatype[8].structtype[0].version 0
-datatype[8].structtype[0].field[1]
-datatype[8].structtype[0].field[0].name "exacttime"
-datatype[8].structtype[0].field[0].datatype 4
-datatype[8].structtype[0].field[0].id[0]
-datatype[8].structtype[0].inherits[0]
-datatype[8].documenttype[0]
-datatype[8].annotationreftype[0]
-datatype[9].id 2076579146
-datatype[9].arraytype[0]
-datatype[9].weightedsettype[0]
-datatype[9].structtype[1]
-datatype[9].structtype[0].name "annotation.place"
-datatype[9].structtype[0].version 0
-datatype[9].structtype[0].field[2]
-datatype[9].structtype[0].field[0].name "lat"
-datatype[9].structtype[0].field[0].datatype 4
-datatype[9].structtype[0].field[0].id[0]
-datatype[9].structtype[0].field[1].name "lon"
-datatype[9].structtype[0].field[1].datatype 4
-datatype[9].structtype[0].field[1].id[0]
-datatype[9].structtype[0].inherits[0]
-datatype[9].documenttype[0]
-datatype[9].annotationreftype[0]
-datatype[10].id 1194300957
-datatype[10].arraytype[0]
-datatype[10].weightedsettype[0]
-datatype[10].structtype[1]
-datatype[10].structtype[0].name "annotation.event"
-datatype[10].structtype[0].version 0
-datatype[10].structtype[0].field[4]
-datatype[10].structtype[0].field[0].name "description"
-datatype[10].structtype[0].field[0].datatype 2
-datatype[10].structtype[0].field[0].id[0]
-datatype[10].structtype[0].field[1].name "person"
-datatype[10].structtype[0].field[1].datatype -198681903
-datatype[10].structtype[0].field[1].id[0]
-datatype[10].structtype[0].field[2].name "date"
-datatype[10].structtype[0].field[2].datatype 1812054936
-datatype[10].structtype[0].field[2].id[0]
-datatype[10].structtype[0].field[3].name "place"
-datatype[10].structtype[0].field[3].datatype 692270031
-datatype[10].structtype[0].field[3].id[0]
-datatype[10].structtype[0].inherits[0]
-datatype[10].documenttype[0]
-datatype[10].annotationreftype[0]
-annotationtype[5]
-annotationtype[0].name "person"
-annotationtype[0].id 609952424
-annotationtype[0].datatype -1466283082
-annotationtype[1].name "event"
-annotationtype[1].id -455530995
-annotationtype[1].datatype 1194300957
-annotationtype[2].name "artist"
-annotationtype[2].id 690330276
-annotationtype[2].datatype 1157126952
-annotationtype[3].name "date"
-annotationtype[3].id -162455681
-annotationtype[3].datatype -840345201
-annotationtype[4].name "place"
-annotationtype[4].id 1707984040
-annotationtype[4].datatype 2076579146
+doctype[2]
+doctype[0].name "document"
+doctype[0].idx 10000
+doctype[0].contentstruct 10001
+doctype[0].primitivetype[0].idx 10005
+doctype[0].primitivetype[0].internalid 4
+doctype[0].primitivetype[0].name "long"
+doctype[0].primitivetype[1].idx 10007
+doctype[0].primitivetype[1].internalid 0
+doctype[0].primitivetype[1].name "int"
+doctype[0].primitivetype[2].idx 10009
+doctype[0].primitivetype[2].internalid 5
+doctype[0].primitivetype[2].name "double"
+doctype[0].primitivetype[3].idx 10013
+doctype[0].primitivetype[3].internalid 2
+doctype[0].primitivetype[3].name "string"
+doctype[0].annotationtype[0].idx 10014
+doctype[0].annotationtype[0].name "date"
+doctype[0].annotationtype[0].internalid -162455681
+doctype[0].annotationtype[0].datatype 10012
+doctype[0].annotationtype[1].idx 10015
+doctype[0].annotationtype[1].name "artist"
+doctype[0].annotationtype[1].internalid 690330276
+doctype[0].annotationtype[1].datatype 10002
+doctype[0].annotationtype[2].idx 10016
+doctype[0].annotationtype[2].name "normalized"
+doctype[0].annotationtype[2].internalid 4
+doctype[0].annotationtype[2].datatype 10013
+doctype[0].annotationtype[3].idx 10017
+doctype[0].annotationtype[3].name "reading"
+doctype[0].annotationtype[3].internalid 5
+doctype[0].annotationtype[3].datatype 10013
+doctype[0].annotationtype[4].idx 10018
+doctype[0].annotationtype[4].name "canonical"
+doctype[0].annotationtype[4].internalid 3
+doctype[0].annotationtype[4].datatype 10013
+doctype[0].annotationtype[5].idx 10019
+doctype[0].annotationtype[5].name "token_type"
+doctype[0].annotationtype[5].internalid 2
+doctype[0].annotationtype[5].datatype 10007
+doctype[0].annotationtype[6].idx 10020
+doctype[0].annotationtype[6].name "proximity_break"
+doctype[0].annotationtype[6].internalid 8
+doctype[0].annotationtype[6].datatype 10009
+doctype[0].annotationtype[7].idx 10021
+doctype[0].annotationtype[7].name "person"
+doctype[0].annotationtype[7].internalid 609952424
+doctype[0].annotationtype[7].datatype 10011
+doctype[0].annotationtype[8].idx 10022
+doctype[0].annotationtype[8].name "term"
+doctype[0].annotationtype[8].internalid 1
+doctype[0].annotationtype[8].datatype 10013
+doctype[0].annotationtype[9].idx 10023
+doctype[0].annotationtype[9].name "transformed"
+doctype[0].annotationtype[9].internalid 7
+doctype[0].annotationtype[9].datatype 10013
+doctype[0].annotationtype[10].idx 10024
+doctype[0].annotationtype[10].name "place"
+doctype[0].annotationtype[10].internalid 1707984040
+doctype[0].annotationtype[10].datatype 10004
+doctype[0].annotationtype[11].idx 10025
+doctype[0].annotationtype[11].name "event"
+doctype[0].annotationtype[11].internalid -455530995
+doctype[0].annotationtype[11].datatype 10006
+doctype[0].annotationtype[12].idx 10026
+doctype[0].annotationtype[12].name "special_token"
+doctype[0].annotationtype[12].internalid 9
+doctype[0].annotationtype[13].idx 10027
+doctype[0].annotationtype[13].name "stem"
+doctype[0].annotationtype[13].internalid 6
+doctype[0].annotationtype[13].datatype 10013
+doctype[0].annotationref[0].idx 10003
+doctype[0].annotationref[0].annotationtype 10024
+doctype[0].annotationref[1].idx 10008
+doctype[0].annotationref[1].annotationtype 10014
+doctype[0].annotationref[2].idx 10010
+doctype[0].annotationref[2].annotationtype 10021
+doctype[0].structtype[0].idx 10002
+doctype[0].structtype[0].name annotation.artist
+doctype[0].structtype[0].inherits[0].type 10011
+doctype[0].structtype[0].field[0].name "instrument"
+doctype[0].structtype[0].field[0].internalid 1675549145
+doctype[0].structtype[0].field[0].type 10007
+doctype[0].structtype[1].idx 10004
+doctype[0].structtype[1].name annotation.place
+doctype[0].structtype[1].field[0].name "lat"
+doctype[0].structtype[1].field[0].internalid 1056483963
+doctype[0].structtype[1].field[0].type 10005
+doctype[0].structtype[1].field[1].name "lon"
+doctype[0].structtype[1].field[1].internalid 383109411
+doctype[0].structtype[1].field[1].type 10005
+doctype[0].structtype[2].idx 10001
+doctype[0].structtype[2].name document.header
+doctype[0].structtype[3].idx 10006
+doctype[0].structtype[3].name annotation.event
+doctype[0].structtype[3].field[0].name "description"
+doctype[0].structtype[3].field[0].internalid 85817688
+doctype[0].structtype[3].field[0].type 10013
+doctype[0].structtype[3].field[1].name "person"
+doctype[0].structtype[3].field[1].internalid 1424249475
+doctype[0].structtype[3].field[1].type 10010
+doctype[0].structtype[3].field[2].name "date"
+doctype[0].structtype[3].field[2].internalid 1946744928
+doctype[0].structtype[3].field[2].type 10008
+doctype[0].structtype[3].field[3].name "place"
+doctype[0].structtype[3].field[3].internalid 1257855785
+doctype[0].structtype[3].field[3].type 10003
+doctype[0].structtype[4].idx 10011
+doctype[0].structtype[4].name annotation.person
+doctype[0].structtype[4].field[0].name "name"
+doctype[0].structtype[4].field[0].internalid 1160796772
+doctype[0].structtype[4].field[0].type 10013
+doctype[0].structtype[5].idx 10012
+doctype[0].structtype[5].name annotation.date
+doctype[0].structtype[5].field[0].name "exacttime"
+doctype[0].structtype[5].field[0].internalid 1338792252
+doctype[0].structtype[5].field[0].type 10005
+doctype[1].name "article"
+doctype[1].idx 10028
+doctype[1].inherits[0].idx 10000
+doctype[1].contentstruct 10029
+doctype[1].structtype[0].idx 10029
+doctype[1].structtype[0].name article.header
+doctype[1].structtype[0].field[0].name "title"
+doctype[1].structtype[0].field[0].internalid 567626448
+doctype[1].structtype[0].field[0].type 10013
+doctype[1].structtype[0].field[1].name "content"
+doctype[1].structtype[0].field[1].internalid 482196823
+doctype[1].structtype[0].field[1].type 10013
diff --git a/document/src/test/java/com/yahoo/document/datatypes/documentmanager.blog.sd b/document/src/test/java/com/yahoo/document/datatypes/documentmanager.blog.sd
index 9b5966bd458..4f0cfd204ea 100644
--- a/document/src/test/java/com/yahoo/document/datatypes/documentmanager.blog.sd
+++ b/document/src/test/java/com/yahoo/document/datatypes/documentmanager.blog.sd
@@ -1,127 +1,121 @@
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-enablecompression false
-datatype[7]
-datatype[0].id -945638949
-datatype[0].arraytype[0]
-datatype[0].weightedsettype[0]
-datatype[0].structtype[1]
-datatype[0].structtype[0].name "blog.header"
-datatype[0].structtype[0].version 0
-datatype[0].structtype[0].field[4]
-datatype[0].structtype[0].field[0].name "title"
-datatype[0].structtype[0].field[0].datatype 2
-datatype[0].structtype[0].field[0].id[0]
-datatype[0].structtype[0].field[1].name "author"
-datatype[0].structtype[0].field[1].datatype 2
-datatype[0].structtype[0].field[1].id[0]
-datatype[0].structtype[0].field[2].name "body"
-datatype[0].structtype[0].field[2].datatype 2
-datatype[0].structtype[0].field[2].id[0]
-datatype[0].structtype[0].field[3].name "url"
-datatype[0].structtype[0].field[3].datatype 10
-datatype[0].structtype[0].field[3].id[0]
-datatype[0].structtype[0].inherits[0]
-datatype[0].documenttype[0]
-datatype[0].annotationreftype[0]
-datatype[1].id 1387420336
-datatype[1].arraytype[0]
-datatype[1].weightedsettype[0]
-datatype[1].structtype[1]
-datatype[1].structtype[0].name "blog.body"
-datatype[1].structtype[0].version 0
-datatype[1].structtype[0].field[0]
-datatype[1].structtype[0].inherits[0]
-datatype[1].documenttype[0]
-datatype[1].annotationreftype[0]
-datatype[2].id -1386162972
-datatype[2].arraytype[0]
-datatype[2].weightedsettype[0]
-datatype[2].structtype[0]
-datatype[2].documenttype[1]
-datatype[2].documenttype[0].name "blog"
-datatype[2].documenttype[0].version 0
-datatype[2].documenttype[0].headerstruct -945638949
-datatype[2].documenttype[0].bodystruct 1387420336
-datatype[2].documenttype[0].inherits[0]
-datatype[2].annotationreftype[0]
-datatype[3].id 912259135
-datatype[3].arraytype[0]
-datatype[3].weightedsettype[0]
-datatype[3].structtype[1]
-datatype[3].structtype[0].name "annotation.industry"
-datatype[3].structtype[0].version 0
-datatype[3].structtype[0].field[1]
-datatype[3].structtype[0].field[0].name "vertical"
-datatype[3].structtype[0].field[0].datatype 2
-datatype[3].structtype[0].field[0].id[0]
-datatype[3].structtype[0].inherits[0]
-datatype[3].documenttype[0]
-datatype[3].annotationreftype[0]
-datatype[4].id -476092672
-datatype[4].arraytype[0]
-datatype[4].weightedsettype[0]
-datatype[4].structtype[1]
-datatype[4].structtype[0].name "annotation.company"
-datatype[4].structtype[0].version 0
-datatype[4].structtype[0].field[4]
-datatype[4].structtype[0].field[0].name "name"
-datatype[4].structtype[0].field[0].datatype 2
-datatype[4].structtype[0].field[0].id[0]
-datatype[4].structtype[0].field[1].name "ceo"
-datatype[4].structtype[0].field[1].datatype 2
-datatype[4].structtype[0].field[1].id[0]
-datatype[4].structtype[0].field[2].name "lat"
-datatype[4].structtype[0].field[2].datatype 4
-datatype[4].structtype[0].field[2].id[0]
-datatype[4].structtype[0].field[3].name "lon"
-datatype[4].structtype[0].field[3].datatype 4
-datatype[4].structtype[0].field[3].id[0]
-datatype[4].structtype[0].inherits[1]
-datatype[4].structtype[0].inherits[0].name "annotation.industry"
-datatype[4].structtype[0].inherits[0].version 0
-datatype[4].documenttype[0]
-datatype[4].annotationreftype[0]
-datatype[5].id -1466283082
-datatype[5].arraytype[0]
-datatype[5].weightedsettype[0]
-datatype[5].structtype[1]
-datatype[5].structtype[0].name "annotation.person"
-datatype[5].structtype[0].version 0
-datatype[5].structtype[0].field[1]
-datatype[5].structtype[0].field[0].name "name"
-datatype[5].structtype[0].field[0].datatype 2
-datatype[5].structtype[0].field[0].id[0]
-datatype[5].structtype[0].inherits[0]
-datatype[5].documenttype[0]
-datatype[5].annotationreftype[0]
-datatype[6].id 515587158
-datatype[6].arraytype[0]
-datatype[6].weightedsettype[0]
-datatype[6].structtype[1]
-datatype[6].structtype[0].name "annotation.location"
-datatype[6].structtype[0].version 0
-datatype[6].structtype[0].field[1]
-datatype[6].structtype[0].field[0].name "name"
-datatype[6].structtype[0].field[0].datatype 2
-datatype[6].structtype[0].field[0].id[0]
-datatype[6].structtype[0].inherits[0]
-datatype[6].documenttype[0]
-datatype[6].annotationreftype[0]
-annotationtype[4]
-annotationtype[0].name "person"
-annotationtype[0].id 609952424
-annotationtype[0].datatype -1466283082
-annotationtype[0].inherits[0]
-annotationtype[1].name "location"
-annotationtype[1].id -270471211
-annotationtype[1].datatype 515587158
-annotationtype[1].inherits[0]
-annotationtype[2].name "company"
-annotationtype[2].id 1278713514
-annotationtype[2].datatype -476092672
-annotationtype[2].inherits[1]
-annotationtype[2].inherits[0].id 9765800
-annotationtype[3].name "industry"
-annotationtype[3].id 9765800
-annotationtype[3].datatype 912259135
-annotationtype[3].inherits[0]
+doctype[2]
+doctype[0].name "document"
+doctype[0].idx 10000
+doctype[0].contentstruct 10001
+doctype[0].primitivetype[0].idx 10003
+doctype[0].primitivetype[0].internalid 4
+doctype[0].primitivetype[0].name "long"
+doctype[0].primitivetype[1].idx 10005
+doctype[0].primitivetype[1].internalid 0
+doctype[0].primitivetype[1].name "int"
+doctype[0].primitivetype[2].idx 10006
+doctype[0].primitivetype[2].internalid 5
+doctype[0].primitivetype[2].name "double"
+doctype[0].primitivetype[3].idx 10007
+doctype[0].primitivetype[3].internalid 2
+doctype[0].primitivetype[3].name "string"
+doctype[0].annotationtype[0].idx 10010
+doctype[0].annotationtype[0].name "normalized"
+doctype[0].annotationtype[0].internalid 4
+doctype[0].annotationtype[0].datatype 10007
+doctype[0].annotationtype[1].idx 10011
+doctype[0].annotationtype[1].name "reading"
+doctype[0].annotationtype[1].internalid 5
+doctype[0].annotationtype[1].datatype 10007
+doctype[0].annotationtype[2].idx 10012
+doctype[0].annotationtype[2].name "industry"
+doctype[0].annotationtype[2].internalid 9765800
+doctype[0].annotationtype[2].datatype 10008
+doctype[0].annotationtype[3].idx 10013
+doctype[0].annotationtype[3].name "canonical"
+doctype[0].annotationtype[3].internalid 3
+doctype[0].annotationtype[3].datatype 10007
+doctype[0].annotationtype[4].idx 10014
+doctype[0].annotationtype[4].name "token_type"
+doctype[0].annotationtype[4].internalid 2
+doctype[0].annotationtype[4].datatype 10005
+doctype[0].annotationtype[5].idx 10015
+doctype[0].annotationtype[5].name "proximity_break"
+doctype[0].annotationtype[5].internalid 8
+doctype[0].annotationtype[5].datatype 10006
+doctype[0].annotationtype[6].idx 10016
+doctype[0].annotationtype[6].name "person"
+doctype[0].annotationtype[6].internalid 609952424
+doctype[0].annotationtype[6].datatype 10004
+doctype[0].annotationtype[7].idx 10017
+doctype[0].annotationtype[7].name "term"
+doctype[0].annotationtype[7].internalid 1
+doctype[0].annotationtype[7].datatype 10007
+doctype[0].annotationtype[8].idx 10018
+doctype[0].annotationtype[8].name "transformed"
+doctype[0].annotationtype[8].internalid 7
+doctype[0].annotationtype[8].datatype 10007
+doctype[0].annotationtype[9].idx 10019
+doctype[0].annotationtype[9].name "location"
+doctype[0].annotationtype[9].internalid -270471211
+doctype[0].annotationtype[9].datatype 10009
+doctype[0].annotationtype[10].idx 10020
+doctype[0].annotationtype[10].name "company"
+doctype[0].annotationtype[10].internalid 1278713514
+doctype[0].annotationtype[10].datatype 10002
+doctype[0].annotationtype[10].inherits[0].idx 10012
+doctype[0].annotationtype[11].idx 10021
+doctype[0].annotationtype[11].name "special_token"
+doctype[0].annotationtype[11].internalid 9
+doctype[0].annotationtype[12].idx 10022
+doctype[0].annotationtype[12].name "stem"
+doctype[0].annotationtype[12].internalid 6
+doctype[0].annotationtype[12].datatype 10007
+doctype[0].structtype[0].idx 10001
+doctype[0].structtype[0].name document.header
+doctype[0].structtype[1].idx 10002
+doctype[0].structtype[1].name annotation.company
+doctype[0].structtype[1].inherits[0].type 10008
+doctype[0].structtype[1].field[0].name "name"
+doctype[0].structtype[1].field[0].internalid 1160796772
+doctype[0].structtype[1].field[0].type 10007
+doctype[0].structtype[1].field[1].name "ceo"
+doctype[0].structtype[1].field[1].internalid 1461191475
+doctype[0].structtype[1].field[1].type 10007
+doctype[0].structtype[1].field[2].name "lat"
+doctype[0].structtype[1].field[2].internalid 1056483963
+doctype[0].structtype[1].field[2].type 10003
+doctype[0].structtype[1].field[3].name "lon"
+doctype[0].structtype[1].field[3].internalid 383109411
+doctype[0].structtype[1].field[3].type 10003
+doctype[0].structtype[2].idx 10004
+doctype[0].structtype[2].name annotation.person
+doctype[0].structtype[2].field[0].name "name"
+doctype[0].structtype[2].field[0].internalid 1160796772
+doctype[0].structtype[2].field[0].type 10007
+doctype[0].structtype[3].idx 10008
+doctype[0].structtype[3].name annotation.industry
+doctype[0].structtype[3].field[0].name "vertical"
+doctype[0].structtype[3].field[0].internalid 1054642217
+doctype[0].structtype[3].field[0].type 10007
+doctype[0].structtype[4].idx 10009
+doctype[0].structtype[4].name annotation.location
+doctype[0].structtype[4].field[0].name "name"
+doctype[0].structtype[4].field[0].internalid 1160796772
+doctype[0].structtype[4].field[0].type 10007
+doctype[1].name "blog"
+doctype[1].idx 10023
+doctype[1].inherits[0].idx 10000
+doctype[1].contentstruct 10024
+doctype[1].primitivetype[0].idx 10025
+doctype[1].primitivetype[0].internalid 10
+doctype[1].primitivetype[0].name "uri"
+doctype[1].structtype[0].idx 10024
+doctype[1].structtype[0].name blog.header
+doctype[1].structtype[0].field[0].name "title"
+doctype[1].structtype[0].field[0].internalid 567626448
+doctype[1].structtype[0].field[0].type 10007
+doctype[1].structtype[0].field[1].name "author"
+doctype[1].structtype[0].field[1].internalid 644499292
+doctype[1].structtype[0].field[1].type 10007
+doctype[1].structtype[0].field[2].name "body"
+doctype[1].structtype[0].field[2].internalid 563132339
+doctype[1].structtype[0].field[2].type 10007
+doctype[1].structtype[0].field[3].name "url"
+doctype[1].structtype[0].field[3].internalid 2095970198
+doctype[1].structtype[0].field[3].type 10025
diff --git a/document/src/test/java/com/yahoo/document/documentmanager.docindoc.cfg b/document/src/test/java/com/yahoo/document/documentmanager.docindoc.cfg
index 65ce1b56811..0b6c59ca381 100644
--- a/document/src/test/java/com/yahoo/document/documentmanager.docindoc.cfg
+++ b/document/src/test/java/com/yahoo/document/documentmanager.docindoc.cfg
@@ -1,41 +1,73 @@
-enablecompression false
-datatype[7]
-datatype[0].id -1407012075
-datatype[0].structtype[1]
-datatype[0].structtype[0].name "outerdoc.body"
-datatype[0].structtype[0].version 0
-datatype[1].id -1686125086
-datatype[1].structtype[1]
-datatype[1].structtype[0].name "docindoc.header"
-datatype[1].structtype[0].version 0
-datatype[1].structtype[0].field[2]
-datatype[1].structtype[0].field[0].datatype 2
-datatype[1].structtype[0].field[0].name "name"
-datatype[1].structtype[0].field[1].datatype 2
-datatype[1].structtype[0].field[1].name "content"
-datatype[2].id -2035324352
-datatype[2].arraytype[1]
-datatype[2].arraytype[0].datatype 1447635645
-datatype[3].id -2040625920
-datatype[3].structtype[1]
-datatype[3].structtype[0].name "outerdoc.header"
-datatype[3].structtype[0].version 0
-datatype[3].structtype[0].field[1]
-datatype[3].structtype[0].field[0].datatype -2035324352
-datatype[3].structtype[0].field[0].name "innerdocuments"
-datatype[4].id 1447635645
-datatype[4].documenttype[1]
-datatype[4].documenttype[0].bodystruct 2030224503
-datatype[4].documenttype[0].headerstruct -1686125086
-datatype[4].documenttype[0].name "docindoc"
-datatype[4].documenttype[0].version 0
-datatype[5].id 1748635999
-datatype[5].documenttype[1]
-datatype[5].documenttype[0].bodystruct -1407012075
-datatype[5].documenttype[0].headerstruct -2040625920
-datatype[5].documenttype[0].name "outerdoc"
-datatype[5].documenttype[0].version 0
-datatype[6].id 2030224503
-datatype[6].structtype[1]
-datatype[6].structtype[0].name "docindoc.body"
-datatype[6].structtype[0].version 0
+doctype[3]
+doctype[0].name "document"
+doctype[0].idx 10000
+doctype[0].contentstruct 10001
+doctype[0].primitivetype[0].idx 10002
+doctype[0].primitivetype[0].internalid 0
+doctype[0].primitivetype[0].name "int"
+doctype[0].primitivetype[1].idx 10003
+doctype[0].primitivetype[1].internalid 5
+doctype[0].primitivetype[1].name "double"
+doctype[0].primitivetype[2].idx 10004
+doctype[0].primitivetype[2].internalid 2
+doctype[0].primitivetype[2].name "string"
+doctype[0].annotationtype[0].idx 10005
+doctype[0].annotationtype[0].name "proximity_break"
+doctype[0].annotationtype[0].internalid 8
+doctype[0].annotationtype[0].datatype 10003
+doctype[0].annotationtype[1].idx 10006
+doctype[0].annotationtype[1].name "normalized"
+doctype[0].annotationtype[1].internalid 4
+doctype[0].annotationtype[1].datatype 10004
+doctype[0].annotationtype[2].idx 10007
+doctype[0].annotationtype[2].name "reading"
+doctype[0].annotationtype[2].internalid 5
+doctype[0].annotationtype[2].datatype 10004
+doctype[0].annotationtype[3].idx 10008
+doctype[0].annotationtype[3].name "term"
+doctype[0].annotationtype[3].internalid 1
+doctype[0].annotationtype[3].datatype 10004
+doctype[0].annotationtype[4].idx 10009
+doctype[0].annotationtype[4].name "transformed"
+doctype[0].annotationtype[4].internalid 7
+doctype[0].annotationtype[4].datatype 10004
+doctype[0].annotationtype[5].idx 10010
+doctype[0].annotationtype[5].name "canonical"
+doctype[0].annotationtype[5].internalid 3
+doctype[0].annotationtype[5].datatype 10004
+doctype[0].annotationtype[6].idx 10011
+doctype[0].annotationtype[6].name "token_type"
+doctype[0].annotationtype[6].internalid 2
+doctype[0].annotationtype[6].datatype 10002
+doctype[0].annotationtype[7].idx 10012
+doctype[0].annotationtype[7].name "special_token"
+doctype[0].annotationtype[7].internalid 9
+doctype[0].annotationtype[8].idx 10013
+doctype[0].annotationtype[8].name "stem"
+doctype[0].annotationtype[8].internalid 6
+doctype[0].annotationtype[8].datatype 10004
+doctype[0].structtype[0].idx 10001
+doctype[0].structtype[0].name document.header
+doctype[1].name "docindoc"
+doctype[1].idx 10014
+doctype[1].inherits[0].idx 10000
+doctype[1].contentstruct 10015
+doctype[1].structtype[0].idx 10015
+doctype[1].structtype[0].name docindoc.header
+doctype[1].structtype[0].field[0].name "name"
+doctype[1].structtype[0].field[0].internalid 1160796772
+doctype[1].structtype[0].field[0].type 10004
+doctype[1].structtype[0].field[1].name "content"
+doctype[1].structtype[0].field[1].internalid 482196823
+doctype[1].structtype[0].field[1].type 10004
+doctype[2].name "outerdoc"
+doctype[2].idx 10016
+doctype[2].inherits[0].idx 10000
+doctype[2].contentstruct 10017
+doctype[2].arraytype[0].idx 10018
+doctype[2].arraytype[0].elementtype 10014
+doctype[2].structtype[0].idx 10017
+doctype[2].structtype[0].name outerdoc.header
+doctype[2].structtype[0].field[0].name "innerdocuments"
+doctype[2].structtype[0].field[0].internalid 1655182511
+doctype[2].structtype[0].field[0].type 10018