Reapply "produce new "doctype" config for document types"

This reverts commit 8c25dd8f1eee02a34e45c026924434a0b551a2ae.

1 files changed, 85 insertions, 51 deletions

diff --git a/config-model/src/test/derived/tensor/documenttypes.cfg b/config-model/src/test/derived/tensor/documenttypes.cfg
index 879b455a711..9ee6a82245f 100644
--- a/config-model/src/test/derived/tensor/documenttypes.cfg
+++ b/config-model/src/test/derived/tensor/documenttypes.cfg
@@ -1,53 +1,87 @@
 enablecompression false
 usev8geopositions false
-documenttype[].id -1290043429
-documenttype[].name "tensor"
-documenttype[].version 0
-documenttype[].headerstruct 2125927172
-documenttype[].bodystruct 0
-documenttype[].inherits[].id 8
-documenttype[].datatype[].id 2125927172
-documenttype[].datatype[].type STRUCT
-documenttype[].datatype[].array.element.id 0
-documenttype[].datatype[].map.key.id 0
-documenttype[].datatype[].map.value.id 0
-documenttype[].datatype[].wset.key.id 0
-documenttype[].datatype[].wset.createifnonexistent false
-documenttype[].datatype[].wset.removeifzero false
-documenttype[].datatype[].annotationref.annotation.id 0
-documenttype[].datatype[].sstruct.name "tensor.header"
-documenttype[].datatype[].sstruct.version 0
-documenttype[].datatype[].sstruct.compression.type NONE
-documenttype[].datatype[].sstruct.compression.level 0
-documenttype[].datatype[].sstruct.compression.threshold 95
-documenttype[].datatype[].sstruct.compression.minsize 200
-documenttype[].datatype[].sstruct.field[].name "f1"
-documenttype[].datatype[].sstruct.field[].id 26661415
-documenttype[].datatype[].sstruct.field[].datatype 21
-documenttype[].datatype[].sstruct.field[].detailedtype "tensor(x[3])"
-documenttype[].datatype[].sstruct.field[].name "f2"
-documenttype[].datatype[].sstruct.field[].id 2080644671
-documenttype[].datatype[].sstruct.field[].datatype 21
-documenttype[].datatype[].sstruct.field[].detailedtype "tensor<float>(x[2],y[1])"
-documenttype[].datatype[].sstruct.field[].name "f3"
-documenttype[].datatype[].sstruct.field[].id 1295091863
-documenttype[].datatype[].sstruct.field[].datatype 21
-documenttype[].datatype[].sstruct.field[].detailedtype "tensor(x{})"
-documenttype[].datatype[].sstruct.field[].name "f4"
-documenttype[].datatype[].sstruct.field[].id 1224191509
-documenttype[].datatype[].sstruct.field[].datatype 21
-documenttype[].datatype[].sstruct.field[].detailedtype "tensor(x[10],y[10])"
-documenttype[].datatype[].sstruct.field[].name "f5"
-documenttype[].datatype[].sstruct.field[].id 329055840
-documenttype[].datatype[].sstruct.field[].datatype 21
-documenttype[].datatype[].sstruct.field[].detailedtype "tensor<float>(x[10])"
-documenttype[].datatype[].sstruct.field[].name "f6"
-documenttype[].datatype[].sstruct.field[].id 596352344
-documenttype[].datatype[].sstruct.field[].datatype 1
-documenttype[].datatype[].sstruct.field[].detailedtype ""
-documenttype[].fieldsets{[document]}.fields[] "f1"
-documenttype[].fieldsets{[document]}.fields[] "f2"
-documenttype[].fieldsets{[document]}.fields[] "f3"
-documenttype[].fieldsets{[document]}.fields[] "f4"
-documenttype[].fieldsets{[document]}.fields[] "f5"
-documenttype[].fieldsets{[document]}.fields[] "f6"
+doctype[].name "document"
+doctype[].idx 10000
+doctype[].internalid 8
+doctype[].contentstruct 10001
+doctype[].primitivetype[].idx 10002
+doctype[].primitivetype[].name "bool"
+doctype[].primitivetype[].idx 10003
+doctype[].primitivetype[].name "byte"
+doctype[].primitivetype[].idx 10004
+doctype[].primitivetype[].name "double"
+doctype[].primitivetype[].idx 10005
+doctype[].primitivetype[].name "float"
+doctype[].primitivetype[].idx 10006
+doctype[].primitivetype[].name "float16"
+doctype[].primitivetype[].idx 10007
+doctype[].primitivetype[].name "int"
+doctype[].primitivetype[].idx 10008
+doctype[].primitivetype[].name "long"
+doctype[].primitivetype[].idx 10010
+doctype[].primitivetype[].name "predicate"
+doctype[].primitivetype[].idx 10011
+doctype[].primitivetype[].name "raw"
+doctype[].primitivetype[].idx 10012
+doctype[].primitivetype[].name "string"
+doctype[].primitivetype[].idx 10014
+doctype[].primitivetype[].name "uri"
+doctype[].wsettype[].idx 10013
+doctype[].wsettype[].elementtype 10012
+doctype[].wsettype[].createifnonexistent true
+doctype[].wsettype[].removeifzero true
+doctype[].wsettype[].internalid 18
+doctype[].structtype[].idx 10001
+doctype[].structtype[].name "document.header"
+doctype[].structtype[].internalid -284186494
+doctype[].structtype[].idx 10009
+doctype[].structtype[].name "position"
+doctype[].structtype[].field[].name "x"
+doctype[].structtype[].field[].internalid 914677694
+doctype[].structtype[].field[].type 10007
+doctype[].structtype[].field[].name "y"
+doctype[].structtype[].field[].internalid 900009410
+doctype[].structtype[].field[].type 10007
+doctype[].structtype[].internalid 1381038251
+doctype[].name "tensor"
+doctype[].idx 10015
+doctype[].internalid -1290043429
+doctype[].inherits[].idx 10000
+doctype[].contentstruct 10016
+doctype[].fieldsets{[document]}.fields[] "f1"
+doctype[].fieldsets{[document]}.fields[] "f2"
+doctype[].fieldsets{[document]}.fields[] "f3"
+doctype[].fieldsets{[document]}.fields[] "f4"
+doctype[].fieldsets{[document]}.fields[] "f5"
+doctype[].fieldsets{[document]}.fields[] "f6"
+doctype[].tensortype[].idx 10017
+doctype[].tensortype[].detailedtype "tensor(x[3])"
+doctype[].tensortype[].idx 10018
+doctype[].tensortype[].detailedtype "tensor<float>(x[2],y[1])"
+doctype[].tensortype[].idx 10019
+doctype[].tensortype[].detailedtype "tensor(x{})"
+doctype[].tensortype[].idx 10020
+doctype[].tensortype[].detailedtype "tensor(x[10],y[10])"
+doctype[].tensortype[].idx 10021
+doctype[].tensortype[].detailedtype "tensor<float>(x[10])"
+doctype[].structtype[].idx 10016
+doctype[].structtype[].name "tensor.header"
+doctype[].structtype[].field[].name "f1"
+doctype[].structtype[].field[].internalid 26661415
+doctype[].structtype[].field[].type 10017
+doctype[].structtype[].field[].name "f2"
+doctype[].structtype[].field[].internalid 2080644671
+doctype[].structtype[].field[].type 10018
+doctype[].structtype[].field[].name "f3"
+doctype[].structtype[].field[].internalid 1295091863
+doctype[].structtype[].field[].type 10019
+doctype[].structtype[].field[].name "f4"
+doctype[].structtype[].field[].internalid 1224191509
+doctype[].structtype[].field[].type 10020
+doctype[].structtype[].field[].name "f5"
+doctype[].structtype[].field[].internalid 329055840
+doctype[].structtype[].field[].type 10021
+doctype[].structtype[].field[].name "f6"
+doctype[].structtype[].field[].internalid 596352344
+doctype[].structtype[].field[].type 10005
+doctype[].structtype[].internalid 2125927172