update with new-style configs

1 files changed, 161 insertions, 144 deletions

diff --git a/config-model/src/test/derived/streamingstruct/documentmanager.cfg b/config-model/src/test/derived/streamingstruct/documentmanager.cfg
index 567944d3b78..cc2ee0b3979 100644
--- a/config-model/src/test/derived/streamingstruct/documentmanager.cfg
+++ b/config-model/src/test/derived/streamingstruct/documentmanager.cfg
@@ -1,146 +1,163 @@
 enablecompression false
 usev8geopositions false
-datatype[].id 1381038251
-datatype[].structtype[].name "position"
-datatype[].structtype[].version 0
-datatype[].structtype[].compresstype NONE
-datatype[].structtype[].compresslevel 0
-datatype[].structtype[].compressthreshold 95
-datatype[].structtype[].compressminsize 800
-datatype[].structtype[].field[].name "x"
-datatype[].structtype[].field[].datatype 0
-datatype[].structtype[].field[].detailedtype ""
-datatype[].structtype[].field[].name "y"
-datatype[].structtype[].field[].datatype 0
-datatype[].structtype[].field[].detailedtype ""
-datatype[].id 105061838
-datatype[].structtype[].name "ns1"
-datatype[].structtype[].version 0
-datatype[].structtype[].compresstype NONE
-datatype[].structtype[].compresslevel 0
-datatype[].structtype[].compressthreshold 95
-datatype[].structtype[].compressminsize 800
-datatype[].structtype[].field[].name "nf1"
-datatype[].structtype[].field[].datatype 3474528
-datatype[].structtype[].field[].detailedtype ""
-datatype[].structtype[].field[].name "nf1s"
-datatype[].structtype[].field[].datatype 3474528
-datatype[].structtype[].field[].detailedtype ""
-datatype[].structtype[].field[].name "nf2"
-datatype[].structtype[].field[].datatype 2
-datatype[].structtype[].field[].detailedtype ""
-datatype[].id 3474528
-datatype[].structtype[].name "s1"
-datatype[].structtype[].version 0
-datatype[].structtype[].compresstype NONE
-datatype[].structtype[].compresslevel 0
-datatype[].structtype[].compressthreshold 95
-datatype[].structtype[].compressminsize 800
-datatype[].structtype[].field[].name "f1"
-datatype[].structtype[].field[].datatype 2
-datatype[].structtype[].field[].detailedtype ""
-datatype[].structtype[].field[].name "f1s"
-datatype[].structtype[].field[].datatype 2
-datatype[].structtype[].field[].detailedtype ""
-datatype[].structtype[].field[].name "f2"
-datatype[].structtype[].field[].datatype 0
-datatype[].structtype[].field[].detailedtype ""
-datatype[].structtype[].field[].name "f3"
-datatype[].structtype[].field[].datatype 5
-datatype[].structtype[].field[].detailedtype ""
-datatype[].id -1497802371
-datatype[].maptype[].keytype 4
-datatype[].maptype[].valtype 2
-datatype[].id -1425630723
-datatype[].arraytype[].datatype 3474528
-datatype[].id 731395686
-datatype[].structtype[].name "streamingstruct.header"
-datatype[].structtype[].version 0
-datatype[].structtype[].compresstype NONE
-datatype[].structtype[].compresslevel 0
-datatype[].structtype[].compressthreshold 95
-datatype[].structtype[].compressminsize 800
-datatype[].structtype[].field[].name "coupleof"
-datatype[].structtype[].field[].datatype 2
-datatype[].structtype[].field[].detailedtype ""
-datatype[].structtype[].field[].name "normalfields"
-datatype[].structtype[].field[].datatype 2
-datatype[].structtype[].field[].detailedtype ""
-datatype[].structtype[].field[].name "a"
-datatype[].structtype[].field[].datatype 3474528
-datatype[].structtype[].field[].detailedtype ""
-datatype[].structtype[].field[].name "m"
-datatype[].structtype[].field[].datatype -1497802371
-datatype[].structtype[].field[].detailedtype ""
-datatype[].structtype[].field[].name "b"
-datatype[].structtype[].field[].datatype 3474528
-datatype[].structtype[].field[].detailedtype ""
-datatype[].structtype[].field[].name "c"
-datatype[].structtype[].field[].datatype 3474528
-datatype[].structtype[].field[].detailedtype ""
-datatype[].structtype[].field[].name "c2"
-datatype[].structtype[].field[].datatype 3474528
-datatype[].structtype[].field[].detailedtype ""
-datatype[].structtype[].field[].name "c3"
-datatype[].structtype[].field[].datatype 3474528
-datatype[].structtype[].field[].detailedtype ""
-datatype[].structtype[].field[].name "n"
-datatype[].structtype[].field[].datatype 105061838
-datatype[].structtype[].field[].detailedtype ""
-datatype[].structtype[].field[].name "array1"
-datatype[].structtype[].field[].datatype -1425630723
-datatype[].structtype[].field[].detailedtype ""
-datatype[].structtype[].field[].name "array2"
-datatype[].structtype[].field[].datatype -1425630723
-datatype[].structtype[].field[].detailedtype ""
-datatype[].structtype[].field[].name "array3"
-datatype[].structtype[].field[].datatype -1425630723
-datatype[].structtype[].field[].detailedtype ""
-datatype[].structtype[].field[].name "subject"
-datatype[].structtype[].field[].datatype 3474528
-datatype[].structtype[].field[].detailedtype ""
-datatype[].structtype[].field[].name "d"
-datatype[].structtype[].field[].datatype 3474528
-datatype[].structtype[].field[].detailedtype ""
-datatype[].structtype[].field[].name "e"
-datatype[].structtype[].field[].datatype 3474528
-datatype[].structtype[].field[].detailedtype ""
-datatype[].structtype[].field[].name "f"
-datatype[].structtype[].field[].datatype 3474528
-datatype[].structtype[].field[].detailedtype ""
-datatype[].structtype[].field[].name "g"
-datatype[].structtype[].field[].datatype 2
-datatype[].structtype[].field[].detailedtype ""
-datatype[].structtype[].field[].name "anothersummaryfield"
-datatype[].structtype[].field[].datatype 2
-datatype[].structtype[].field[].detailedtype ""
-datatype[].structtype[].field[].name "snippet"
-datatype[].structtype[].field[].datatype 2
-datatype[].structtype[].field[].detailedtype ""
-datatype[].structtype[].field[].name "snippet2"
-datatype[].structtype[].field[].datatype 2
-datatype[].structtype[].field[].detailedtype ""
-datatype[].id 1433175737
-datatype[].documenttype[].name "streamingstruct"
-datatype[].documenttype[].version 0
-datatype[].documenttype[].inherits[].name "document"
-datatype[].documenttype[].inherits[].version 0
-datatype[].documenttype[].headerstruct 731395686
-datatype[].documenttype[].bodystruct 0
-datatype[].documenttype[].fieldsets{[document]}.fields[] "a"
-datatype[].documenttype[].fieldsets{[document]}.fields[] "array1"
-datatype[].documenttype[].fieldsets{[document]}.fields[] "array2"
-datatype[].documenttype[].fieldsets{[document]}.fields[] "array3"
-datatype[].documenttype[].fieldsets{[document]}.fields[] "b"
-datatype[].documenttype[].fieldsets{[document]}.fields[] "c"
-datatype[].documenttype[].fieldsets{[document]}.fields[] "c2"
-datatype[].documenttype[].fieldsets{[document]}.fields[] "c3"
-datatype[].documenttype[].fieldsets{[document]}.fields[] "coupleof"
-datatype[].documenttype[].fieldsets{[document]}.fields[] "d"
-datatype[].documenttype[].fieldsets{[document]}.fields[] "e"
-datatype[].documenttype[].fieldsets{[document]}.fields[] "f"
-datatype[].documenttype[].fieldsets{[document]}.fields[] "g"
-datatype[].documenttype[].fieldsets{[document]}.fields[] "m"
-datatype[].documenttype[].fieldsets{[document]}.fields[] "n"
-datatype[].documenttype[].fieldsets{[document]}.fields[] "normalfields"
-datatype[].documenttype[].fieldsets{[document]}.fields[] "subject"
+doctype[].name "document"
+doctype[].idx 10000
+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[].structtype[].idx 10001
+doctype[].structtype[].name "document.header"
+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[].name "streamingstruct"
+doctype[].idx 10015
+doctype[].inherits[].idx 10000
+doctype[].contentstruct 10016
+doctype[].fieldsets{[document]}.fields[] "a"
+doctype[].fieldsets{[document]}.fields[] "array1"
+doctype[].fieldsets{[document]}.fields[] "array2"
+doctype[].fieldsets{[document]}.fields[] "array3"
+doctype[].fieldsets{[document]}.fields[] "b"
+doctype[].fieldsets{[document]}.fields[] "c"
+doctype[].fieldsets{[document]}.fields[] "c2"
+doctype[].fieldsets{[document]}.fields[] "c3"
+doctype[].fieldsets{[document]}.fields[] "coupleof"
+doctype[].fieldsets{[document]}.fields[] "d"
+doctype[].fieldsets{[document]}.fields[] "e"
+doctype[].fieldsets{[document]}.fields[] "f"
+doctype[].fieldsets{[document]}.fields[] "g"
+doctype[].fieldsets{[document]}.fields[] "m"
+doctype[].fieldsets{[document]}.fields[] "n"
+doctype[].fieldsets{[document]}.fields[] "normalfields"
+doctype[].fieldsets{[document]}.fields[] "subject"
+doctype[].arraytype[].idx 10020
+doctype[].arraytype[].elementtype 10017
+doctype[].arraytype[].idx 10021
+doctype[].arraytype[].elementtype 10017
+doctype[].arraytype[].idx 10022
+doctype[].arraytype[].elementtype 10017
+doctype[].arraytype[].idx 10023
+doctype[].arraytype[].elementtype 10017
+doctype[].maptype[].idx 10018
+doctype[].maptype[].keytype 10008
+doctype[].maptype[].valuetype 10012
+doctype[].maptype[].idx 10024
+doctype[].maptype[].keytype 10008
+doctype[].maptype[].valuetype 10012
+doctype[].structtype[].idx 10017
+doctype[].structtype[].name "s1"
+doctype[].structtype[].field[].name "f1"
+doctype[].structtype[].field[].internalid 1911889118
+doctype[].structtype[].field[].type 10012
+doctype[].structtype[].field[].name "f1s"
+doctype[].structtype[].field[].internalid 624198897
+doctype[].structtype[].field[].type 10012
+doctype[].structtype[].field[].name "f2"
+doctype[].structtype[].field[].internalid 708327411
+doctype[].structtype[].field[].type 10007
+doctype[].structtype[].field[].name "f3"
+doctype[].structtype[].field[].internalid 2137295507
+doctype[].structtype[].field[].type 10004
+doctype[].structtype[].idx 10019
+doctype[].structtype[].name "ns1"
+doctype[].structtype[].field[].name "nf1"
+doctype[].structtype[].field[].internalid 970725348
+doctype[].structtype[].field[].type 10017
+doctype[].structtype[].field[].name "nf1s"
+doctype[].structtype[].field[].internalid 47697102
+doctype[].structtype[].field[].type 10017
+doctype[].structtype[].field[].name "nf2"
+doctype[].structtype[].field[].internalid 1084090162
+doctype[].structtype[].field[].type 10012
+doctype[].structtype[].idx 10016
+doctype[].structtype[].name "streamingstruct.header"
+doctype[].structtype[].field[].name "coupleof"
+doctype[].structtype[].field[].internalid 1611860736
+doctype[].structtype[].field[].type 10012
+doctype[].structtype[].field[].name "normalfields"
+doctype[].structtype[].field[].internalid 1898724546
+doctype[].structtype[].field[].type 10012
+doctype[].structtype[].field[].name "a"
+doctype[].structtype[].field[].internalid 1097803284
+doctype[].structtype[].field[].type 10017
+doctype[].structtype[].field[].name "m"
+doctype[].structtype[].field[].internalid 914298689
+doctype[].structtype[].field[].type 10018
+doctype[].structtype[].field[].name "b"
+doctype[].structtype[].field[].internalid 754773144
+doctype[].structtype[].field[].type 10017
+doctype[].structtype[].field[].name "c"
+doctype[].structtype[].field[].internalid 480045975
+doctype[].structtype[].field[].type 10017
+doctype[].structtype[].field[].name "c2"
+doctype[].structtype[].field[].internalid 504337916
+doctype[].structtype[].field[].type 10017
+doctype[].structtype[].field[].name "c3"
+doctype[].structtype[].field[].internalid 996353555
+doctype[].structtype[].field[].type 10017
+doctype[].structtype[].field[].name "n"
+doctype[].structtype[].field[].internalid 679223015
+doctype[].structtype[].field[].type 10019
+doctype[].structtype[].field[].name "array1"
+doctype[].structtype[].field[].internalid 1863296233
+doctype[].structtype[].field[].type 10020
+doctype[].structtype[].field[].name "array2"
+doctype[].structtype[].field[].internalid 1491532076
+doctype[].structtype[].field[].type 10021
+doctype[].structtype[].field[].name "array3"
+doctype[].structtype[].field[].internalid 1585514103
+doctype[].structtype[].field[].type 10022
+doctype[].structtype[].field[].name "subject"
+doctype[].structtype[].field[].internalid 1677912730
+doctype[].structtype[].field[].type 10017
+doctype[].structtype[].field[].name "d"
+doctype[].structtype[].field[].internalid 679827909
+doctype[].structtype[].field[].type 10017
+doctype[].structtype[].field[].name "e"
+doctype[].structtype[].field[].internalid 416661641
+doctype[].structtype[].field[].type 10017
+doctype[].structtype[].field[].name "f"
+doctype[].structtype[].field[].internalid 1258112309
+doctype[].structtype[].field[].type 10017
+doctype[].structtype[].field[].name "g"
+doctype[].structtype[].field[].internalid 1091070635
+doctype[].structtype[].field[].type 10012
+doctype[].structtype[].field[].name "snippet"
+doctype[].structtype[].field[].internalid 1102597618
+doctype[].structtype[].field[].type 10012
+doctype[].structtype[].field[].name "snippet2"
+doctype[].structtype[].field[].internalid 1812076817
+doctype[].structtype[].field[].type 10012
+doctype[].structtype[].field[].name "anothersummaryfield"
+doctype[].structtype[].field[].internalid 1811005492
+doctype[].structtype[].field[].type 10012