diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-08-19 22:35:24 +0200 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-08-21 20:27:36 +0000 |
| commit | 85c87f9d32c15a16148a77f4807c6617112f6037 (patch) | |
| tree | 6bc80fc0036e158f40d3c26023f758c066db12b4 | |
| parent | 55e093baadde8f245dc06e5c98fd0b85e6577cd5 (diff) | |
Remove v6 and v7 from java side.
36 files changed, 56 insertions, 1457 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/IndexStructureValidator.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/IndexStructureValidator.java index 86be74dd6f8..b09f85726e5 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/IndexStructureValidator.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/IndexStructureValidator.java @@ -6,7 +6,8 @@ import com.yahoo.searchdefinition.Search; import com.yahoo.searchdefinition.derived.DerivedConfiguration; import com.yahoo.searchdefinition.derived.IndexingScript; import com.yahoo.vespa.indexinglanguage.ExpressionVisitor; -import com.yahoo.vespa.indexinglanguage.expressions.*; +import com.yahoo.vespa.indexinglanguage.expressions.Expression; +import com.yahoo.vespa.indexinglanguage.expressions.OutputExpression; /** * @author <a href="mailto:mlidal@yahoo-inc.com">Mathias M Lidal</a> diff --git a/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentTypes.java b/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentTypes.java index cf294c2af1a..d4228b52746 100644 --- a/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentTypes.java +++ b/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentTypes.java @@ -140,7 +140,6 @@ public class DocumentTypes { new DocumenttypesConfig.Documenttype.Datatype.Sstruct.Field.Builder(); builder.name(field.getName()). id(field.getId()). - id_v6(field.getIdV6()). datatype(field.getDataType().getId()); if (field.getDataType() instanceof TensorDataType) { builder.detailedtype(((TensorDataType) field.getDataType()).getTensorType().toString()); diff --git a/config-model/src/test/configmodel/types/documenttypes.cfg b/config-model/src/test/configmodel/types/documenttypes.cfg index 0a78e18dd40..8c88ee4f4e0 100644 --- a/config-model/src/test/configmodel/types/documenttypes.cfg +++ b/config-model/src/test/configmodel/types/documenttypes.cfg @@ -37,22 +37,18 @@ documenttype[0].datatype[1].sstruct.compression.threshold 95 documenttype[0].datatype[1].sstruct.compression.minsize 200 documenttype[0].datatype[1].sstruct.field[0].name "Version" documenttype[0].datatype[1].sstruct.field[0].id 64430502 -documenttype[0].datatype[1].sstruct.field[0].id_v6 634243672 documenttype[0].datatype[1].sstruct.field[0].datatype 0 documenttype[0].datatype[1].sstruct.field[0].detailedtype "" documenttype[0].datatype[1].sstruct.field[1].name "Name" documenttype[0].datatype[1].sstruct.field[1].id 2002760220 -documenttype[0].datatype[1].sstruct.field[1].id_v6 62942997 documenttype[0].datatype[1].sstruct.field[1].datatype 2 documenttype[0].datatype[1].sstruct.field[1].detailedtype "" documenttype[0].datatype[1].sstruct.field[2].name "FlagsCounter" documenttype[0].datatype[1].sstruct.field[2].id 1741227606 -documenttype[0].datatype[1].sstruct.field[2].id_v6 1287497652 documenttype[0].datatype[1].sstruct.field[2].datatype -1865479609 documenttype[0].datatype[1].sstruct.field[2].detailedtype "" documenttype[0].datatype[1].sstruct.field[3].name "anotherfolder" documenttype[0].datatype[1].sstruct.field[3].id 1582421848 -documenttype[0].datatype[1].sstruct.field[3].id_v6 1898725199 documenttype[0].datatype[1].sstruct.field[3].datatype 294108848 documenttype[0].datatype[1].sstruct.field[3].detailedtype "" documenttype[0].datatype[2].id 109267174 @@ -72,12 +68,10 @@ documenttype[0].datatype[2].sstruct.compression.threshold 95 documenttype[0].datatype[2].sstruct.compression.minsize 200 documenttype[0].datatype[2].sstruct.field[0].name "s1" documenttype[0].datatype[2].sstruct.field[0].id 2146820765 -documenttype[0].datatype[2].sstruct.field[0].id_v6 142373281 documenttype[0].datatype[2].sstruct.field[0].datatype 2 documenttype[0].datatype[2].sstruct.field[0].detailedtype "" documenttype[0].datatype[2].sstruct.field[1].name "s2" documenttype[0].datatype[2].sstruct.field[1].id 45366795 -documenttype[0].datatype[2].sstruct.field[1].id_v6 31106270 documenttype[0].datatype[2].sstruct.field[1].datatype 2 documenttype[0].datatype[2].sstruct.field[1].detailedtype "" documenttype[0].datatype[3].id 49942803 @@ -127,22 +121,18 @@ documenttype[0].datatype[5].sstruct.compression.threshold 95 documenttype[0].datatype[5].sstruct.compression.minsize 200 documenttype[0].datatype[5].sstruct.field[0].name "bytearr" documenttype[0].datatype[5].sstruct.field[0].id 1079701754 -documenttype[0].datatype[5].sstruct.field[0].id_v6 1198855694 documenttype[0].datatype[5].sstruct.field[0].datatype 49942803 documenttype[0].datatype[5].sstruct.field[0].detailedtype "" documenttype[0].datatype[5].sstruct.field[1].name "mymap" documenttype[0].datatype[5].sstruct.field[1].id 1954178122 -documenttype[0].datatype[5].sstruct.field[1].id_v6 707189723 documenttype[0].datatype[5].sstruct.field[1].datatype 339965458 documenttype[0].datatype[5].sstruct.field[1].detailedtype "" documenttype[0].datatype[5].sstruct.field[2].name "title" documenttype[0].datatype[5].sstruct.field[2].id 567626448 -documenttype[0].datatype[5].sstruct.field[2].id_v6 29129762 documenttype[0].datatype[5].sstruct.field[2].datatype 2 documenttype[0].datatype[5].sstruct.field[2].detailedtype "" documenttype[0].datatype[5].sstruct.field[3].name "structfield" documenttype[0].datatype[5].sstruct.field[3].id 1726890940 -documenttype[0].datatype[5].sstruct.field[3].id_v6 418303145 documenttype[0].datatype[5].sstruct.field[3].datatype 2 documenttype[0].datatype[5].sstruct.field[3].detailedtype "" documenttype[0].datatype[6].id -1245117006 @@ -447,142 +437,114 @@ documenttype[0].datatype[25].sstruct.compression.threshold 95 documenttype[0].datatype[25].sstruct.compression.minsize 200 documenttype[0].datatype[25].sstruct.field[0].name "abyte" documenttype[0].datatype[25].sstruct.field[0].id 110138156 -documenttype[0].datatype[25].sstruct.field[0].id_v6 1369099343 documenttype[0].datatype[25].sstruct.field[0].datatype 16 documenttype[0].datatype[25].sstruct.field[0].detailedtype "" documenttype[0].datatype[25].sstruct.field[1].name "along" documenttype[0].datatype[25].sstruct.field[1].id 1206464520 -documenttype[0].datatype[25].sstruct.field[1].id_v6 871280609 documenttype[0].datatype[25].sstruct.field[1].datatype 4 documenttype[0].datatype[25].sstruct.field[1].detailedtype "" documenttype[0].datatype[25].sstruct.field[2].name "arrayfield" documenttype[0].datatype[25].sstruct.field[2].id 965790107 -documenttype[0].datatype[25].sstruct.field[2].id_v6 1010955705 documenttype[0].datatype[25].sstruct.field[2].datatype -1245117006 documenttype[0].datatype[25].sstruct.field[2].detailedtype "" documenttype[0].datatype[25].sstruct.field[3].name "setfield" documenttype[0].datatype[25].sstruct.field[3].id 761581914 -documenttype[0].datatype[25].sstruct.field[3].id_v6 1762943268 documenttype[0].datatype[25].sstruct.field[3].datatype 1328286588 documenttype[0].datatype[25].sstruct.field[3].detailedtype "" documenttype[0].datatype[25].sstruct.field[4].name "pos" documenttype[0].datatype[25].sstruct.field[4].id 1041567475 -documenttype[0].datatype[25].sstruct.field[4].id_v6 26353693 documenttype[0].datatype[25].sstruct.field[4].datatype 1381038251 documenttype[0].datatype[25].sstruct.field[4].detailedtype "" documenttype[0].datatype[25].sstruct.field[5].name "setfield2" documenttype[0].datatype[25].sstruct.field[5].id 1066659198 -documenttype[0].datatype[25].sstruct.field[5].id_v6 813038565 documenttype[0].datatype[25].sstruct.field[5].datatype 18 documenttype[0].datatype[25].sstruct.field[5].detailedtype "" documenttype[0].datatype[25].sstruct.field[6].name "setfield3" documenttype[0].datatype[25].sstruct.field[6].id 1180155772 -documenttype[0].datatype[25].sstruct.field[6].id_v6 1697232199 documenttype[0].datatype[25].sstruct.field[6].datatype 2125328771 documenttype[0].datatype[25].sstruct.field[6].detailedtype "" documenttype[0].datatype[25].sstruct.field[7].name "setfield4" documenttype[0].datatype[25].sstruct.field[7].id 1254131631 -documenttype[0].datatype[25].sstruct.field[7].id_v6 119755202 documenttype[0].datatype[25].sstruct.field[7].datatype 2065577986 documenttype[0].datatype[25].sstruct.field[7].detailedtype "" documenttype[0].datatype[25].sstruct.field[8].name "tagfield" documenttype[0].datatype[25].sstruct.field[8].id 1653562069 -documenttype[0].datatype[25].sstruct.field[8].id_v6 938523246 documenttype[0].datatype[25].sstruct.field[8].datatype 18 documenttype[0].datatype[25].sstruct.field[8].detailedtype "" documenttype[0].datatype[25].sstruct.field[9].name "structfield" documenttype[0].datatype[25].sstruct.field[9].id 486207386 -documenttype[0].datatype[25].sstruct.field[9].id_v6 418303145 documenttype[0].datatype[25].sstruct.field[9].datatype 109267174 documenttype[0].datatype[25].sstruct.field[9].detailedtype "" documenttype[0].datatype[25].sstruct.field[10].name "structarrayfield" documenttype[0].datatype[25].sstruct.field[10].id 335048518 -documenttype[0].datatype[25].sstruct.field[10].id_v6 607034174 documenttype[0].datatype[25].sstruct.field[10].datatype -1244829667 documenttype[0].datatype[25].sstruct.field[10].detailedtype "" documenttype[0].datatype[25].sstruct.field[11].name "stringmapfield" documenttype[0].datatype[25].sstruct.field[11].id 117465687 -documenttype[0].datatype[25].sstruct.field[11].id_v6 1492788095 documenttype[0].datatype[25].sstruct.field[11].datatype 339965458 documenttype[0].datatype[25].sstruct.field[11].detailedtype "" documenttype[0].datatype[25].sstruct.field[12].name "intmapfield" documenttype[0].datatype[25].sstruct.field[12].id 121004462 -documenttype[0].datatype[25].sstruct.field[12].id_v6 1642487905 documenttype[0].datatype[25].sstruct.field[12].datatype -1584287606 documenttype[0].datatype[25].sstruct.field[12].detailedtype "" documenttype[0].datatype[25].sstruct.field[13].name "floatmapfield" documenttype[0].datatype[25].sstruct.field[13].id 1239120925 -documenttype[0].datatype[25].sstruct.field[13].id_v6 1609437589 documenttype[0].datatype[25].sstruct.field[13].datatype 2125154557 documenttype[0].datatype[25].sstruct.field[13].detailedtype "" documenttype[0].datatype[25].sstruct.field[14].name "longmapfield" documenttype[0].datatype[25].sstruct.field[14].id 477718745 -documenttype[0].datatype[25].sstruct.field[14].id_v6 920341968 documenttype[0].datatype[25].sstruct.field[14].datatype -1715531035 documenttype[0].datatype[25].sstruct.field[14].detailedtype "" documenttype[0].datatype[25].sstruct.field[15].name "doublemapfield" documenttype[0].datatype[25].sstruct.field[15].id 877047192 -documenttype[0].datatype[25].sstruct.field[15].id_v6 957317090 documenttype[0].datatype[25].sstruct.field[15].datatype 2138385264 documenttype[0].datatype[25].sstruct.field[15].detailedtype "" documenttype[0].datatype[25].sstruct.field[16].name "arraymapfield" documenttype[0].datatype[25].sstruct.field[16].id 1670805928 -documenttype[0].datatype[25].sstruct.field[16].id_v6 1940354311 documenttype[0].datatype[25].sstruct.field[16].datatype 435886609 documenttype[0].datatype[25].sstruct.field[16].detailedtype "" documenttype[0].datatype[25].sstruct.field[17].name "arrarr" documenttype[0].datatype[25].sstruct.field[17].id 1962567166 -documenttype[0].datatype[25].sstruct.field[17].id_v6 885141301 documenttype[0].datatype[25].sstruct.field[17].datatype -794985308 documenttype[0].datatype[25].sstruct.field[17].detailedtype "" documenttype[0].datatype[25].sstruct.field[18].name "maparr" documenttype[0].datatype[25].sstruct.field[18].id 904375219 -documenttype[0].datatype[25].sstruct.field[18].id_v6 63700074 documenttype[0].datatype[25].sstruct.field[18].datatype 69621385 documenttype[0].datatype[25].sstruct.field[18].detailedtype "" documenttype[0].datatype[25].sstruct.field[19].name "complexarray" documenttype[0].datatype[25].sstruct.field[19].id 795629533 -documenttype[0].datatype[25].sstruct.field[19].id_v6 658530305 documenttype[0].datatype[25].sstruct.field[19].datatype 1416345047 documenttype[0].datatype[25].sstruct.field[19].detailedtype "" documenttype[0].datatype[25].sstruct.field[20].name "mystructfield" documenttype[0].datatype[25].sstruct.field[20].id 1348513378 -documenttype[0].datatype[25].sstruct.field[20].id_v6 2033170300 documenttype[0].datatype[25].sstruct.field[20].datatype -2092985853 documenttype[0].datatype[25].sstruct.field[20].detailedtype "" documenttype[0].datatype[25].sstruct.field[21].name "mystructmap" documenttype[0].datatype[25].sstruct.field[21].id 1511423250 -documenttype[0].datatype[25].sstruct.field[21].id_v6 449602635 documenttype[0].datatype[25].sstruct.field[21].datatype 1901258752 documenttype[0].datatype[25].sstruct.field[21].detailedtype "" documenttype[0].datatype[25].sstruct.field[22].name "mystructarr" documenttype[0].datatype[25].sstruct.field[22].id 595856991 -documenttype[0].datatype[25].sstruct.field[22].id_v6 764861972 documenttype[0].datatype[25].sstruct.field[22].datatype 759956026 documenttype[0].datatype[25].sstruct.field[22].detailedtype "" documenttype[0].datatype[25].sstruct.field[23].name "Folders" documenttype[0].datatype[25].sstruct.field[23].id 34575524 -documenttype[0].datatype[25].sstruct.field[23].id_v6 280569744 documenttype[0].datatype[25].sstruct.field[23].datatype -389833101 documenttype[0].datatype[25].sstruct.field[23].detailedtype "" documenttype[0].datatype[25].sstruct.field[24].name "juletre" documenttype[0].datatype[25].sstruct.field[24].id 1039981530 -documenttype[0].datatype[25].sstruct.field[24].id_v6 2073084146 documenttype[0].datatype[25].sstruct.field[24].datatype 4 documenttype[0].datatype[25].sstruct.field[24].detailedtype "" documenttype[0].datatype[25].sstruct.field[25].name "album0" documenttype[0].datatype[25].sstruct.field[25].id 764312262 -documenttype[0].datatype[25].sstruct.field[25].id_v6 1409364160 documenttype[0].datatype[25].sstruct.field[25].datatype 18 documenttype[0].datatype[25].sstruct.field[25].detailedtype "" documenttype[0].datatype[25].sstruct.field[26].name "album1" documenttype[0].datatype[25].sstruct.field[26].id 1967160809 -documenttype[0].datatype[25].sstruct.field[26].id_v6 1833811264 documenttype[0].datatype[25].sstruct.field[26].datatype 18 documenttype[0].datatype[25].sstruct.field[26].detailedtype "" documenttype[0].datatype[25].sstruct.field[27].name "other" documenttype[0].datatype[25].sstruct.field[27].id 2443357 -documenttype[0].datatype[25].sstruct.field[27].id_v6 903806222 documenttype[0].datatype[25].sstruct.field[27].datatype 4 documenttype[0].datatype[25].sstruct.field[27].detailedtype "" documenttype[0].datatype[26].id 348447225 diff --git a/config-model/src/test/configmodel/types/documenttypes_with_doc_field.cfg b/config-model/src/test/configmodel/types/documenttypes_with_doc_field.cfg index a24fa03a834..4f04e901a92 100644 --- a/config-model/src/test/configmodel/types/documenttypes_with_doc_field.cfg +++ b/config-model/src/test/configmodel/types/documenttypes_with_doc_field.cfg @@ -73,7 +73,6 @@ documenttype[1].datatype[1].sstruct.compression.threshold 95 documenttype[1].datatype[1].sstruct.compression.minsize 200 documenttype[1].datatype[1].sstruct.field[0].name "doc_field" documenttype[1].datatype[1].sstruct.field[0].id 819293364 -documenttype[1].datatype[1].sstruct.field[0].id_v6 1634907905 documenttype[1].datatype[1].sstruct.field[0].datatype -1368624373 documenttype[1].datatype[1].sstruct.field[0].detailedtype "" documenttype[1].datatype[2].id 348447225 diff --git a/config-model/src/test/configmodel/types/references/documenttypes_ref_to_self_type.cfg b/config-model/src/test/configmodel/types/references/documenttypes_ref_to_self_type.cfg index d07b16431be..ca568aaa43d 100644 --- a/config-model/src/test/configmodel/types/references/documenttypes_ref_to_self_type.cfg +++ b/config-model/src/test/configmodel/types/references/documenttypes_ref_to_self_type.cfg @@ -22,7 +22,6 @@ documenttype[].datatype[].sstruct.compression.threshold 95 documenttype[].datatype[].sstruct.compression.minsize 200 documenttype[].datatype[].sstruct.field[].name "self_ref" documenttype[].datatype[].sstruct.field[].id 852207313 -documenttype[].datatype[].sstruct.field[].id_v6 768042879 documenttype[].datatype[].sstruct.field[].datatype -1895788438 documenttype[].datatype[].sstruct.field[].detailedtype "" documenttype[].datatype[].id -255288561 diff --git a/config-model/src/test/configmodel/types/references/documenttypes_refs_to_other_types.cfg b/config-model/src/test/configmodel/types/references/documenttypes_refs_to_other_types.cfg index e3002074d04..a7fd3577789 100644 --- a/config-model/src/test/configmodel/types/references/documenttypes_refs_to_other_types.cfg +++ b/config-model/src/test/configmodel/types/references/documenttypes_refs_to_other_types.cfg @@ -22,12 +22,10 @@ documenttype[0].datatype[0].sstruct.compression.threshold 95 documenttype[0].datatype[0].sstruct.compression.minsize 200 documenttype[0].datatype[0].sstruct.field[0].name "campaign_ref" documenttype[0].datatype[0].sstruct.field[0].id 23963250 -documenttype[0].datatype[0].sstruct.field[0].id_v6 568616261 documenttype[0].datatype[0].sstruct.field[0].datatype 595216861 documenttype[0].datatype[0].sstruct.field[0].detailedtype "" documenttype[0].datatype[0].sstruct.field[1].name "person_ref" documenttype[0].datatype[0].sstruct.field[1].id 100779805 -documenttype[0].datatype[0].sstruct.field[1].id_v6 907695193 documenttype[0].datatype[0].sstruct.field[1].datatype 542332920 documenttype[0].datatype[0].sstruct.field[1].detailedtype "" documenttype[0].datatype[1].id -255288561 diff --git a/config-model/src/test/configmodel/types/references/documenttypes_refs_to_same_type.cfg b/config-model/src/test/configmodel/types/references/documenttypes_refs_to_same_type.cfg index d2759d86715..46a951ae8ea 100644 --- a/config-model/src/test/configmodel/types/references/documenttypes_refs_to_same_type.cfg +++ b/config-model/src/test/configmodel/types/references/documenttypes_refs_to_same_type.cfg @@ -22,12 +22,10 @@ documenttype[0].datatype[0].sstruct.compression.threshold 95 documenttype[0].datatype[0].sstruct.compression.minsize 200 documenttype[0].datatype[0].sstruct.field[0].name "campaign_ref" documenttype[0].datatype[0].sstruct.field[0].id 23963250 -documenttype[0].datatype[0].sstruct.field[0].id_v6 568616261 documenttype[0].datatype[0].sstruct.field[0].datatype 595216861 documenttype[0].datatype[0].sstruct.field[0].detailedtype "" documenttype[0].datatype[0].sstruct.field[1].name "other_campaign_ref" documenttype[0].datatype[0].sstruct.field[1].id 874751172 -documenttype[0].datatype[0].sstruct.field[1].id_v6 895644372 documenttype[0].datatype[0].sstruct.field[1].datatype 595216861 documenttype[0].datatype[0].sstruct.field[1].detailedtype "" documenttype[0].datatype[1].id -255288561 diff --git a/config-model/src/test/derived/inheritfromparent/documenttypes.cfg b/config-model/src/test/derived/inheritfromparent/documenttypes.cfg index a5ea3dbf8ed..f5ec18c4203 100644 --- a/config-model/src/test/derived/inheritfromparent/documenttypes.cfg +++ b/config-model/src/test/derived/inheritfromparent/documenttypes.cfg @@ -22,7 +22,6 @@ documenttype[].datatype[].sstruct.compression.threshold 95 documenttype[].datatype[].sstruct.compression.minsize 200 documenttype[].datatype[].sstruct.field[].name "parent_field" documenttype[].datatype[].sstruct.field[].id 933533022 -documenttype[].datatype[].sstruct.field[].id_v6 2116869443 documenttype[].datatype[].sstruct.field[].datatype 2 documenttype[].datatype[].sstruct.field[].detailedtype "" documenttype[].datatype[].id 836075987 @@ -42,12 +41,10 @@ documenttype[].datatype[].sstruct.compression.threshold 95 documenttype[].datatype[].sstruct.compression.minsize 200 documenttype[].datatype[].sstruct.field[].name "weight_src" documenttype[].datatype[].sstruct.field[].id 1225660233 -documenttype[].datatype[].sstruct.field[].id_v6 1350588470 documenttype[].datatype[].sstruct.field[].datatype 1 documenttype[].datatype[].sstruct.field[].detailedtype "" documenttype[].datatype[].sstruct.field[].name "weight" documenttype[].datatype[].sstruct.field[].id 1001392207 -documenttype[].datatype[].sstruct.field[].id_v6 1329620545 documenttype[].datatype[].sstruct.field[].datatype 1 documenttype[].datatype[].sstruct.field[].detailedtype "" documenttype[].datatype[].id -389494616 @@ -90,7 +87,6 @@ documenttype[].datatype[].sstruct.compression.threshold 95 documenttype[].datatype[].sstruct.compression.minsize 200 documenttype[].datatype[].sstruct.field[].name "child_field" documenttype[].datatype[].sstruct.field[].id 1814271363 -documenttype[].datatype[].sstruct.field[].id_v6 405182398 documenttype[].datatype[].sstruct.field[].datatype 1091188812 documenttype[].datatype[].sstruct.field[].detailedtype "" documenttype[].datatype[].id -126593034 diff --git a/config-model/src/test/derived/tensor/documenttypes.cfg b/config-model/src/test/derived/tensor/documenttypes.cfg index 4e04ad4c309..af1748e484e 100644 --- a/config-model/src/test/derived/tensor/documenttypes.cfg +++ b/config-model/src/test/derived/tensor/documenttypes.cfg @@ -22,27 +22,22 @@ 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[].id_v6 1740179945 documenttype[].datatype[].sstruct.field[].datatype 21 documenttype[].datatype[].sstruct.field[].detailedtype "tensor(x[])" documenttype[].datatype[].sstruct.field[].name "f2" documenttype[].datatype[].sstruct.field[].id 2080644671 -documenttype[].datatype[].sstruct.field[].id_v6 1424572148 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[].id_v6 1444109654 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[].id_v6 1039544782 documenttype[].datatype[].sstruct.field[].datatype 21 documenttype[].datatype[].sstruct.field[].detailedtype "tensor(x[10],y[20])" documenttype[].datatype[].sstruct.field[].name "f5" documenttype[].datatype[].sstruct.field[].id 329055840 -documenttype[].datatype[].sstruct.field[].id_v6 105711688 documenttype[].datatype[].sstruct.field[].datatype 21 documenttype[].datatype[].sstruct.field[].detailedtype "tensor<float>(x[10])" documenttype[].datatype[].id -1903234535 diff --git a/document/abi-spec.json b/document/abi-spec.json index ba2d081348f..62f0b67ea47 100644 --- a/document/abi-spec.json +++ b/document/abi-spec.json @@ -36,12 +36,10 @@ "public void addField(com.yahoo.document.Field)", "public com.yahoo.document.Field removeField(java.lang.String)", "public void clearFields()", - "public com.yahoo.document.Field getField(java.lang.Integer, int)", "public com.yahoo.document.Field getField(java.lang.String)", "public com.yahoo.document.Field getField(int)", - "public boolean hasField(com.yahoo.document.Field, int)", - "public boolean hasField(java.lang.String)", "public boolean hasField(com.yahoo.document.Field)", + "public boolean hasField(java.lang.String)", "public java.util.Collection getFields()", "public int getFieldCount()", "public com.yahoo.compress.Compressor getCompressor()", @@ -53,7 +51,6 @@ ], "fields": [ "protected java.util.Map fieldIds", - "protected java.util.Map fieldIdsV6", "protected java.util.Map fields", "protected com.yahoo.compress.Compressor compressor" ] @@ -450,7 +447,6 @@ "public com.yahoo.document.Field getField(int)", "public boolean hasField(java.lang.String)", "public int getFieldCount()", - "public com.yahoo.document.Field getField(java.lang.Integer, int)", "public com.yahoo.document.Field removeField(java.lang.String)", "public java.util.Collection getFields()", "public java.util.Set fieldSet()", @@ -1066,7 +1062,6 @@ "public void <init>(com.yahoo.document.DocumenttypesConfig$Documenttype$Datatype$Sstruct$Field)", "public com.yahoo.document.DocumenttypesConfig$Documenttype$Datatype$Sstruct$Field$Builder name(java.lang.String)", "public com.yahoo.document.DocumenttypesConfig$Documenttype$Datatype$Sstruct$Field$Builder id(int)", - "public com.yahoo.document.DocumenttypesConfig$Documenttype$Datatype$Sstruct$Field$Builder id_v6(int)", "public com.yahoo.document.DocumenttypesConfig$Documenttype$Datatype$Sstruct$Field$Builder datatype(int)", "public com.yahoo.document.DocumenttypesConfig$Documenttype$Datatype$Sstruct$Field$Builder detailedtype(java.lang.String)", "public com.yahoo.document.DocumenttypesConfig$Documenttype$Datatype$Sstruct$Field build()" @@ -1084,7 +1079,6 @@ "public void <init>(com.yahoo.document.DocumenttypesConfig$Documenttype$Datatype$Sstruct$Field$Builder)", "public java.lang.String name()", "public int id()", - "public int id_v6()", "public int datatype()", "public java.lang.String detailedtype()" ], @@ -1471,7 +1465,6 @@ "public void setDataType(com.yahoo.document.DataType)", "public final int getId(int)", "public final int getId()", - "public final int getIdV6()", "public final boolean hasForcedId()", "public boolean isHeader()", "public void setHeader(boolean)", @@ -1794,11 +1787,9 @@ "public com.yahoo.document.datatypes.FieldValue createFieldValue(java.lang.Object)", "public com.yahoo.document.StructDataType clone()", "public void assign(com.yahoo.document.StructDataType)", - "public com.yahoo.document.Field getField(java.lang.Integer, int)", "public com.yahoo.document.Field getField(java.lang.String)", "public com.yahoo.document.Field getField(int)", "public void addField(com.yahoo.document.Field)", - "public boolean hasField(com.yahoo.document.Field, int)", "public java.util.Collection getFields()", "public java.util.Collection getFieldsThisTypeOnly()", "public int getFieldCount()", @@ -3583,8 +3574,7 @@ "methods": [ "public void <init>()", "public static com.yahoo.document.serialization.DocumentDeserializer createHead(com.yahoo.document.DocumentTypeManager, com.yahoo.io.GrowableByteBuffer)", - "public static com.yahoo.document.serialization.DocumentDeserializer create6(com.yahoo.document.DocumentTypeManager, com.yahoo.io.GrowableByteBuffer)", - "public static com.yahoo.document.serialization.DocumentDeserializer create42(com.yahoo.document.DocumentTypeManager, com.yahoo.io.GrowableByteBuffer)" + "public static com.yahoo.document.serialization.DocumentDeserializer create6(com.yahoo.document.DocumentTypeManager, com.yahoo.io.GrowableByteBuffer)" ], "fields": [] }, @@ -3853,54 +3843,6 @@ ], "fields": [] }, - "com.yahoo.document.serialization.VespaDocumentDeserializer42": { - "superClass": "com.yahoo.vespa.objects.BufferSerializer", - "interfaces": [ - "com.yahoo.document.serialization.DocumentDeserializer" - ], - "attributes": [ - "public" - ], - "methods": [ - "public final com.yahoo.document.DocumentTypeManager getDocumentTypeManager()", - "public void read(com.yahoo.document.Document)", - "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.Document)", - "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.FieldValue)", - "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.Array)", - "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.MapFieldValue)", - "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.CollectionFieldValue)", - "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.BoolFieldValue)", - "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.ByteFieldValue)", - "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.DoubleFieldValue)", - "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.FloatFieldValue)", - "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.IntegerFieldValue)", - "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.LongFieldValue)", - "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.Raw)", - "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.PredicateFieldValue)", - "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.StringFieldValue)", - "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.TensorFieldValue)", - "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.ReferenceFieldValue)", - "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.Struct)", - "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.StructuredFieldValue)", - "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.WeightedSet)", - "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.annotation.AnnotationReference)", - "public void read(com.yahoo.document.DocumentUpdate)", - "public void read(com.yahoo.document.fieldpathupdate.FieldPathUpdate)", - "public void read(com.yahoo.document.fieldpathupdate.AssignFieldPathUpdate)", - "public void read(com.yahoo.document.fieldpathupdate.RemoveFieldPathUpdate)", - "public void read(com.yahoo.document.fieldpathupdate.AddFieldPathUpdate)", - "public com.yahoo.document.update.ValueUpdate getValueUpdate(com.yahoo.document.DataType, com.yahoo.document.DataType)", - "public void read(com.yahoo.document.update.FieldUpdate)", - "public com.yahoo.document.DocumentId readDocumentId()", - "public com.yahoo.document.DocumentType readDocumentType()", - "public void read(com.yahoo.document.annotation.SpanTree)", - "public void read(com.yahoo.document.annotation.Annotation)", - "public void read(com.yahoo.document.annotation.Span)", - "public void read(com.yahoo.document.annotation.SpanList)", - "public void read(com.yahoo.document.annotation.AlternateSpanList)" - ], - "fields": [] - }, "com.yahoo.document.serialization.VespaDocumentDeserializer6": { "superClass": "com.yahoo.vespa.objects.BufferSerializer", "interfaces": [ @@ -4297,8 +4239,8 @@ ], "methods": [ "public void <init>(com.yahoo.document.serialization.DocumentUpdateReader, com.yahoo.document.DocumentType, int)", + "public void <init>(com.yahoo.document.serialization.DocumentUpdateReader, com.yahoo.document.DocumentType)", "public com.yahoo.document.DocumentType getDocumentType()", - "public int getSerializationVersion()", "public com.yahoo.document.Field getField()", "public void setField(com.yahoo.document.Field)", "public com.yahoo.document.update.FieldUpdate applyTo(com.yahoo.document.Document)", diff --git a/document/src/main/java/com/yahoo/document/BaseStructDataType.java b/document/src/main/java/com/yahoo/document/BaseStructDataType.java index b010ed8c033..c7be3dd829c 100755 --- a/document/src/main/java/com/yahoo/document/BaseStructDataType.java +++ b/document/src/main/java/com/yahoo/document/BaseStructDataType.java @@ -16,7 +16,6 @@ import java.util.Map; public abstract class BaseStructDataType extends StructuredDataType { protected Map<Integer, Field> fieldIds = new LinkedHashMap<>(); - protected Map<Integer, Field> fieldIdsV6 = new LinkedHashMap<>(); protected Map<String, Field> fields = new LinkedHashMap<>(); protected Compressor compressor = new Compressor(CompressionType.NONE); @@ -33,7 +32,6 @@ public abstract class BaseStructDataType extends StructuredDataType { BaseStructDataType stype = type.clone(); fieldIds = stype.fieldIds; - fieldIdsV6 = stype.fieldIdsV6; fields = stype.fields; } @@ -41,13 +39,11 @@ public abstract class BaseStructDataType extends StructuredDataType { public BaseStructDataType clone() { BaseStructDataType type = (BaseStructDataType) super.clone(); type.fieldIds = new LinkedHashMap<>(); - type.fieldIdsV6 = new LinkedHashMap<>(); type.fields = new LinkedHashMap<>(); for (Field field : fieldIds.values()) { type.fields.put(field.getName(), field); type.fieldIds.put(field.getId(Document.SERIALIZED_VERSION), field); - type.fieldIdsV6.put(field.getId(6), field); } return type; } @@ -59,38 +55,24 @@ public abstract class BaseStructDataType extends StructuredDataType { if (fieldIds.containsKey(field.getId(Document.SERIALIZED_VERSION))) { throw new IllegalArgumentException("Struct " + getName() + " already contains field with id " + field.getId(Document.SERIALIZED_VERSION)); } - if (fieldIdsV6.containsKey(field.getId(6))) { - throw new IllegalArgumentException("Struct " + getName() + " already contains a field with deprecated document serialization id " + field.getId(6)); - } fields.put(field.getName(), field); fieldIds.put(field.getId(Document.SERIALIZED_VERSION), field); - fieldIdsV6.put(field.getId(6), field); } public Field removeField(String fieldName) { Field old = fields.remove(fieldName); if (old != null) { fieldIds.remove(old.getId(Document.SERIALIZED_VERSION)); - fieldIdsV6.remove(old.getId(6)); } return old; } public void clearFields() { fieldIds.clear(); - fieldIdsV6.clear(); fields.clear(); } - public Field getField(Integer fieldId, int version) { - if (version > 6) { - return fieldIds.get(fieldId); - } else { - return fieldIdsV6.get(fieldId); - } - } - @Override public Field getField(String fieldName) { return fields.get(fieldName); @@ -101,8 +83,8 @@ public abstract class BaseStructDataType extends StructuredDataType { return fieldIds.get(id); } - public boolean hasField(Field field, int version) { - Field f = getField(field.getId(version), version); + public boolean hasField(Field field) { + Field f = getField(field.getId()); return f != null && f.equals(field); } @@ -110,13 +92,6 @@ public abstract class BaseStructDataType extends StructuredDataType { return fields.containsKey(name); } - public boolean hasField(Field f) { - if (hasField(f, 6) || hasField(f, Document.SERIALIZED_VERSION)) { - return true; - } - return false; - } - @Override public Collection<Field> getFields() { return fields.values(); diff --git a/document/src/main/java/com/yahoo/document/DocumentType.java b/document/src/main/java/com/yahoo/document/DocumentType.java index 1aa1fed7659..f04c93b61ef 100755 --- a/document/src/main/java/com/yahoo/document/DocumentType.java +++ b/document/src/main/java/com/yahoo/document/DocumentType.java @@ -351,27 +351,6 @@ public class DocumentType extends StructuredDataType { } /** - * Gets the field matching a given ID. - * - * @param id The ID of a field. - * @param version The serialization version of the document. - * @return Returns the matching field, or null if not found. - */ - public Field getField(Integer id, int version) { - Field field = headerType.getField(id, version); - if (field == null) { - field = bodyType.getField(id, version); - } - if (field == null && !isRegistered()) { - for (DocumentType inheritedType : inherits) { - field = inheritedType.getField(id, version); - if (field != null) break; - } - } - return field; - } - - /** * Removes an field from the DocumentType. * * @param name The name of the field. diff --git a/document/src/main/java/com/yahoo/document/Field.java b/document/src/main/java/com/yahoo/document/Field.java index d0a19a50073..9523c333a78 100644 --- a/document/src/main/java/com/yahoo/document/Field.java +++ b/document/src/main/java/com/yahoo/document/Field.java @@ -21,9 +21,8 @@ public class Field extends FieldBase implements FieldSet, Comparable, Serializab protected DataType dataType; protected int fieldId; - private int fieldIdV6; private boolean isHeader; - private boolean forcedId = false; + private boolean forcedId; /** * Creates a new field. @@ -36,11 +35,10 @@ public class Field extends FieldBase implements FieldSet, Comparable, Serializab public Field(String name, int id, DataType dataType, boolean isHeader) { super(name); this.fieldId = id; - this.fieldIdV6 = id; this.dataType = dataType; this.isHeader = isHeader; this.forcedId = true; - validateId(id, null, Document.SERIALIZED_VERSION); + validateId(id, null); } public Field(String name) { @@ -60,7 +58,6 @@ public class Field extends FieldBase implements FieldSet, Comparable, Serializab public Field(String name, DataType dataType, boolean isHeader, DocumentType owner) { this(name, 0, dataType, isHeader); this.fieldId = calculateIdV7(owner); - this.fieldIdV6 = calculateIdV6(owner); this.forcedId = false; } @@ -95,21 +92,6 @@ public class Field extends FieldBase implements FieldSet, Comparable, Serializab this(name, field.dataType, field.isHeader, null); } - /** - * The field id must be unique within a document type, and also - * within a (unknown at this time) hierarchy of document types. - * In addition it should be as resilient to doctype content changes - * and inheritance hierarchy changes as possible. - * All of this is enforced for names, so id's should follow names. - * Therefore we hash on name. - */ - private int calculateIdV6(DocumentType owner) { - int newId = BobHash.hash(getName()); // Using a portfriendly hash - if (newId < 0) newId = -newId; // Highest bit is reserved to tell 7-bit id's from 31-bit ones - validateId(newId, owner, 6); - return newId; - } - public int compareTo(Object o) { return fieldId - ((Field) o).fieldId; } @@ -127,7 +109,7 @@ public class Field extends FieldBase implements FieldSet, Comparable, Serializab int newId = BobHash.hash(combined); // Using a portfriendly hash if (newId < 0) newId = -newId; // Highest bit is reserved to tell 7-bit id's from 31-bit ones - validateId(newId, owner, Document.SERIALIZED_VERSION); + validateId(newId, owner); return newId; } @@ -144,16 +126,15 @@ public class Field extends FieldBase implements FieldSet, Comparable, Serializab throw new NullPointerException("Can not assign an id of " + this + " without knowing the owner"); } - validateId(newId, owner, Document.SERIALIZED_VERSION); + validateId(newId, owner); owner.removeField(getName()); this.fieldId = newId; - this.fieldIdV6 = newId; this.forcedId = true; owner.addField(this); } - private void validateId(int newId, DocumentType owner, int version) { + private void validateId(int newId, DocumentType owner) { if (newId >= 100 && newId <= 127) { throw new IllegalArgumentException("Attempt to set the id of " + this + " to " + newId + " failed, values from 100 to 127 " + "are reserved for internal use"); @@ -168,7 +149,7 @@ public class Field extends FieldBase implements FieldSet, Comparable, Serializab if (owner == null) return; { - Field existing = owner.getField(newId, version); + Field existing = owner.getField(newId); if (existing != null && !existing.getName().equals(getName())) { throw new IllegalArgumentException("Couldn't set id of " + this + " to " + newId + ", " + existing + " already has this id in " + owner); @@ -196,17 +177,13 @@ public class Field extends FieldBase implements FieldSet, Comparable, Serializab /** Returns the numeric ID used to represent this field when serialized */ public final int getId(int version) { - return (version > 6) ? getId() : getIdV6(); + return getId(); } public final int getId() { return fieldId; } - public final int getIdV6() { - return fieldIdV6; - } - /** * * @return true if the field has a forced id diff --git a/document/src/main/java/com/yahoo/document/StructDataType.java b/document/src/main/java/com/yahoo/document/StructDataType.java index fc4792726c6..73fe580308e 100644 --- a/document/src/main/java/com/yahoo/document/StructDataType.java +++ b/document/src/main/java/com/yahoo/document/StructDataType.java @@ -62,15 +62,6 @@ public class StructDataType extends BaseStructDataType { } @Override - public Field getField(Integer fieldId, int version) { - Field f = super.getField(fieldId, version); - if (f == null && superType != null) { - f = superType.getField(fieldId, version); - } - return f; - } - - @Override public Field getField(String fieldName) { Field f = super.getField(fieldName); if (f == null && superType != null) { @@ -100,15 +91,6 @@ public class StructDataType extends BaseStructDataType { } @Override - public boolean hasField(Field field, int version) { - boolean f = super.hasField(field, version); - if (!f && superType != null) { - f = superType.hasField(field, version); - } - return f; - } - - @Override public Collection<Field> getFields() { if (superType == null) { return Collections.unmodifiableCollection(super.getFields()); diff --git a/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializerFactory.java b/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializerFactory.java index 03aa409ee8d..bdd99c54788 100644 --- a/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializerFactory.java +++ b/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializerFactory.java @@ -27,12 +27,4 @@ public class DocumentDeserializerFactory { return new VespaDocumentDeserializer6(manager, buf); } - /** - * Creates a de-serializer for the document format that was created on Vespa 4.2. - */ - @SuppressWarnings("deprecation") - public static DocumentDeserializer create42(DocumentTypeManager manager, GrowableByteBuffer buf) { - return new VespaDocumentDeserializer42(manager, buf); - } - } diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java deleted file mode 100644 index 7ec4433a24f..00000000000 --- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java +++ /dev/null @@ -1,896 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.document.serialization; - -import com.yahoo.collections.Tuple2; -import com.yahoo.compress.CompressionType; -import com.yahoo.compress.Compressor; -import com.yahoo.document.ArrayDataType; -import com.yahoo.document.CollectionDataType; -import com.yahoo.document.DataType; -import com.yahoo.document.DataTypeName; -import com.yahoo.document.Document; -import com.yahoo.document.DocumentId; -import com.yahoo.document.DocumentType; -import com.yahoo.document.DocumentTypeManager; -import com.yahoo.document.DocumentUpdate; -import com.yahoo.document.Field; -import com.yahoo.document.MapDataType; -import com.yahoo.document.StructDataType; -import com.yahoo.document.WeightedSetDataType; -import com.yahoo.document.annotation.AlternateSpanList; -import com.yahoo.document.annotation.Annotation; -import com.yahoo.document.annotation.AnnotationReference; -import com.yahoo.document.annotation.AnnotationType; -import com.yahoo.document.annotation.Span; -import com.yahoo.document.annotation.SpanList; -import com.yahoo.document.annotation.SpanNode; -import com.yahoo.document.annotation.SpanNodeParent; -import com.yahoo.document.annotation.SpanTree; -import com.yahoo.document.datatypes.Array; -import com.yahoo.document.datatypes.BoolFieldValue; -import com.yahoo.document.datatypes.ByteFieldValue; -import com.yahoo.document.datatypes.CollectionFieldValue; -import com.yahoo.document.datatypes.DoubleFieldValue; -import com.yahoo.document.datatypes.FieldValue; -import com.yahoo.document.datatypes.FloatFieldValue; -import com.yahoo.document.datatypes.IntegerFieldValue; -import com.yahoo.document.datatypes.LongFieldValue; -import com.yahoo.document.datatypes.MapFieldValue; -import com.yahoo.document.datatypes.PredicateFieldValue; -import com.yahoo.document.datatypes.Raw; -import com.yahoo.document.datatypes.ReferenceFieldValue; -import com.yahoo.document.datatypes.StringFieldValue; -import com.yahoo.document.datatypes.Struct; -import com.yahoo.document.datatypes.StructuredFieldValue; -import com.yahoo.document.datatypes.TensorFieldValue; -import com.yahoo.document.datatypes.WeightedSet; -import com.yahoo.document.fieldpathupdate.AddFieldPathUpdate; -import com.yahoo.document.fieldpathupdate.AssignFieldPathUpdate; -import com.yahoo.document.fieldpathupdate.FieldPathUpdate; -import com.yahoo.document.fieldpathupdate.RemoveFieldPathUpdate; -import com.yahoo.document.predicate.BinaryFormat; -import com.yahoo.document.select.parser.ParseException; -import com.yahoo.document.update.AddValueUpdate; -import com.yahoo.document.update.ArithmeticValueUpdate; -import com.yahoo.document.update.AssignValueUpdate; -import com.yahoo.document.update.ClearValueUpdate; -import com.yahoo.document.update.FieldUpdate; -import com.yahoo.document.update.MapValueUpdate; -import com.yahoo.document.update.RemoveValueUpdate; -import com.yahoo.document.update.ValueUpdate; -import com.yahoo.io.GrowableByteBuffer; -import com.yahoo.tensor.serialization.TypedBinaryFormat; -import com.yahoo.text.Utf8; -import com.yahoo.text.Utf8Array; -import com.yahoo.text.Utf8String; -import com.yahoo.vespa.objects.BufferSerializer; -import com.yahoo.vespa.objects.FieldBase; - -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; - -import static com.yahoo.text.Utf8.calculateStringPositions; - -/** - * Class used for de-serializing documents on the Vespa 4.2 document format. - * - * @deprecated Please use {@link com.yahoo.document.serialization.VespaDocumentDeserializerHead} instead for new code. - * @author baldersheim - */ -@Deprecated // TODO: Remove on Vespa 8 -// When removing: Move content of this class into VespaDocumentDeserializerHead -public class VespaDocumentDeserializer42 extends BufferSerializer implements DocumentDeserializer { - - private final Compressor compressor = new Compressor(); - private DocumentTypeManager manager; - GrowableByteBuffer body; - private short version; - private List<SpanNode> spanNodes; - private List<Annotation> annotations; - private int[] stringPositions; - - VespaDocumentDeserializer42(DocumentTypeManager manager, GrowableByteBuffer header, GrowableByteBuffer body, short version) { - super(header); - this.manager = manager; - this.body = body; - this.version = version; - } - - VespaDocumentDeserializer42(DocumentTypeManager manager, GrowableByteBuffer buf) { - this(manager, buf, null, Document.SERIALIZED_VERSION); - } - - VespaDocumentDeserializer42(DocumentTypeManager manager, GrowableByteBuffer buf, GrowableByteBuffer body) { - this(manager, buf, body, Document.SERIALIZED_VERSION); - } - - final public DocumentTypeManager getDocumentTypeManager() { return manager; } - - public void read(Document document) { - read(null, document); - } - - public void read(FieldBase field, Document doc) { - - // Verify that we have correct version - version = getShort(null); - if (version < 6 || version > Document.SERIALIZED_VERSION) { - throw new DeserializationException("Unknown version " + version + ", expected " + - Document.SERIALIZED_VERSION + "."); - } - - int dataLength = 0; - int dataPos = 0; - - if (version < 7) { - getInt2_4_8Bytes(null); // Total document size.. Ignore - } else { - dataLength = getInt(null); - dataPos = position(); - } - - doc.setId(readDocumentId()); - - Byte content = getByte(null); - - doc.setDataType(readDocumentType()); - - Struct h = doc.getHeader(); - Struct b = doc.getBody(); - h.clear(); - b.clear(); - if ((content & 0x2) != 0) { - readHeaderBody(h, b); - } - if ((content & 0x4) != 0) { - readHeaderBody(b, h); - } else if (body != null) { - GrowableByteBuffer header = getBuf(); - setBuf(body); - body = null; - readHeaderBody(b, h); - body = getBuf(); - setBuf(header); - } - - if (version < 8) { - int crcVal = getInt(null); - } - - if (version > 6) { - if (dataLength != (position() - dataPos)) { - throw new DeserializationException("Length mismatch"); - } - } - } - public void read(FieldBase field, FieldValue value) { - throw new IllegalArgumentException("read not implemented yet."); - } - - public <T extends FieldValue> void read(FieldBase field, Array<T> array) { - int numElements = getNumCollectionElems(); - ArrayList<T> list = new ArrayList<T>(numElements); - ArrayDataType type = array.getDataType(); - for (int i = 0; i < numElements; i++) { - if (version < 7) { - getInt(null); // We don't need size for anything - } - FieldValue fv = type.getNestedType().createFieldValue(); - fv.deserialize(null, this); - list.add((T) fv); - } - array.clear(); - array.addAll(list); - } - - public <K extends FieldValue, V extends FieldValue> void read(FieldBase field, MapFieldValue<K, V> map) { - int numElements = getNumCollectionElems(); - Map<K,V> hash = new HashMap<>(); - MapDataType type = map.getDataType(); - for (int i = 0; i < numElements; i++) { - if (version < 7) { - getInt(null); // We don't need size for anything - } - K key = (K) type.getKeyType().createFieldValue(); - V val = (V) type.getValueType().createFieldValue(); - key.deserialize(null, this); - val.deserialize(null, this); - hash.put(key, val); - } - map.clear(); - map.putAll(hash); - } - - private int getNumCollectionElems() { - int numElements; - if (version < 7) { - getInt(null); // We already know the nested type, so ignore that.. - numElements = getInt(null); - } else { - numElements = getInt1_2_4Bytes(null); - } - if (numElements < 0) { - throw new DeserializationException("Bad number of array/map elements, " + numElements); - } - return numElements; - } - - public <T extends FieldValue> void read(FieldBase field, CollectionFieldValue<T> value) { - throw new IllegalArgumentException("read not implemented yet."); - } - @Override - public void read(FieldBase field, BoolFieldValue value) { - value.setBoolean((getByte(null) != 0)); - } - public void read(FieldBase field, ByteFieldValue value) { value.assign(getByte(null)); } - public void read(FieldBase field, DoubleFieldValue value) { value.assign(getDouble(null)); } - public void read(FieldBase field, FloatFieldValue value) { value.assign(getFloat(null)); } - public void read(FieldBase field, IntegerFieldValue value) { value.assign(getInt(null)); } - public void read(FieldBase field, LongFieldValue value) { value.assign(getLong(null)); } - - public void read(FieldBase field, Raw value) { - int rawsize = getInt(null); - byte[] rawBytes = getBytes(null, rawsize); - value.assign(rawBytes); - } - - @Override - public void read(FieldBase field, PredicateFieldValue value) { - int len = getInt(null); - byte[] buf = getBytes(null, len); - value.assign(BinaryFormat.decode(buf)); - } - - public void read(FieldBase field, StringFieldValue value) { - byte coding = getByte(null); - - int length = getInt1_4Bytes(null); - - //OK, it seems that this length includes null termination. - //NOTE: the following four lines are basically parseNullTerminatedString() inlined, - //but we need to use the UTF-8 buffer below, so not using that method... - byte[] stringArray = new byte[length - 1]; - buf.get(stringArray); - buf.get(); //move past 0-termination - value.setUnChecked(Utf8.toString(stringArray)); - - if ((coding & 64) == 64) { - //we have a span tree! - try { - //we don't support serialization of nested span trees, so this is safe: - stringPositions = calculateStringPositions(stringArray); - //total length: - int size = buf.getInt(); - int startPos = buf.position(); - - int numSpanTrees = buf.getInt1_2_4Bytes(); - - for (int i = 0; i < numSpanTrees; i++) { - SpanTree tree = new SpanTree(); - StringFieldValue treeName = new StringFieldValue(); - treeName.deserialize(this); - tree.setName(treeName.getString()); - value.setSpanTree(tree); - readSpanTree(tree, false); - } - - buf.position(startPos + size); - } finally { - stringPositions = null; - } - } - } - - @Override - public void read(FieldBase field, TensorFieldValue value) { - int encodedTensorLength = buf.getInt1_4Bytes(); - if (encodedTensorLength > 0) { - byte[] encodedTensor = getBytes(null, encodedTensorLength); - value.assign(TypedBinaryFormat.decode(Optional.of(value.getDataType().getTensorType()), - GrowableByteBuffer.wrap(encodedTensor))); - } else { - value.clear(); - } - } - - @Override - public void read(FieldBase field, ReferenceFieldValue value) { - final boolean documentIdPresent = (buf.get() != 0); - if (documentIdPresent) { - value.assign(readDocumentId()); - } else { - value.clear(); - } - } - - public void read(FieldBase fieldDef, Struct s) { - s.setVersion(version); - int startPos = position(); - - if (version < 6) { - throw new DeserializationException("Illegal document serialization version " + version); - } - - int dataSize; - if (version < 7) { - long rSize = getInt2_4_8Bytes(null); - //TODO: Look into how to support data segments larger than INT_MAX bytes - if (rSize > Integer.MAX_VALUE) { - throw new DeserializationException("Raw size of data block is too large."); - } - dataSize = (int)rSize; - } else { - dataSize = getInt(null); - } - - byte comprCode = getByte(null); - CompressionType compression = CompressionType.valueOf(comprCode); - - int uncompressedSize = 0; - if (compression != CompressionType.NONE && - compression != CompressionType.INCOMPRESSIBLE) - { - // uncompressedsize (full size of FIELDS only, after decompression) - long pSize = getInt2_4_8Bytes(null); - //TODO: Look into how to support data segments larger than INT_MAX bytes - if (pSize > Integer.MAX_VALUE) { - throw new DeserializationException("Uncompressed size of data block is too large."); - } - uncompressedSize = (int) pSize; - } - - int numberOfFields = getInt1_4Bytes(null); - - List<Tuple2<Integer, Long>> fieldIdsAndLengths = new ArrayList<>(numberOfFields); - for (int i=0; i<numberOfFields; ++i) { - // id, length (length only used for unknown fields - fieldIdsAndLengths.add(new Tuple2<>(getInt1_4Bytes(null), getInt2_4_8Bytes(null))); - } - - // save a reference to the big buffer we're reading from: - GrowableByteBuffer bigBuf = buf; - - if (version < 7) { - // In V6 and earlier, the length included the header. - int headerSize = position() - startPos; - dataSize -= headerSize; - } - byte[] destination = compressor.decompress(compression, getBuf().array(), position(), uncompressedSize, Optional.of(dataSize)); - - // set position in original buffer to after data - position(position() + dataSize); - - // for a while: deserialize from this buffer instead: - buf = GrowableByteBuffer.wrap(destination); - - s.clear(); - StructDataType type = s.getDataType(); - for (int i=0; i<numberOfFields; ++i) { - Field structField = type.getField(fieldIdsAndLengths.get(i).first, version); - if (structField == null) { - //ignoring unknown field: - position(position() + fieldIdsAndLengths.get(i).second.intValue()); - } else { - int posBefore = position(); - FieldValue value = structField.getDataType().createFieldValue(); - value.deserialize(structField, this); - s.setFieldValue(structField, value); - //jump to beginning of next field: - position(posBefore + fieldIdsAndLengths.get(i).second.intValue()); - } - } - - // restore the original buffer - buf = bigBuf; - } - - private void readHeaderBody(Struct primary, Struct alternate) { - primary.setVersion(version); - int startPos = position(); - - if (version < 6) { - throw new DeserializationException("Illegal document serialization version " + version); - } - - int dataSize; - if (version < 7) { - long rSize = getInt2_4_8Bytes(null); - //TODO: Look into how to support data segments larger than INT_MAX bytes - if (rSize > Integer.MAX_VALUE) { - throw new DeserializationException("Raw size of data block is too large."); - } - dataSize = (int)rSize; - } else { - dataSize = getInt(null); - } - - byte comprCode = getByte(null); - CompressionType compression = CompressionType.valueOf(comprCode); - - int uncompressedSize = 0; - if (compression != CompressionType.NONE && - compression != CompressionType.INCOMPRESSIBLE) - { - // uncompressedsize (full size of FIELDS only, after decompression) - long pSize = getInt2_4_8Bytes(null); - //TODO: Look into how to support data segments larger than INT_MAX bytes - if (pSize > Integer.MAX_VALUE) { - throw new DeserializationException("Uncompressed size of data block is too large."); - } - uncompressedSize = (int) pSize; - } - - int numberOfFields = getInt1_4Bytes(null); - - List<Tuple2<Integer, Long>> fieldIdsAndLengths = new ArrayList<>(numberOfFields); - for (int i=0; i<numberOfFields; ++i) { - // id, length (length only used for unknown fields - fieldIdsAndLengths.add(new Tuple2<>(getInt1_4Bytes(null), getInt2_4_8Bytes(null))); - } - - // save a reference to the big buffer we're reading from: - GrowableByteBuffer bigBuf = buf; - - if (version < 7) { - // In V6 and earlier, the length included the header. - int headerSize = position() - startPos; - dataSize -= headerSize; - } - byte[] destination = compressor.decompress(compression, getBuf().array(), position(), uncompressedSize, Optional.of(dataSize)); - - // set position in original buffer to after data - position(position() + dataSize); - - // for a while: deserialize from this buffer instead: - buf = GrowableByteBuffer.wrap(destination); - - StructDataType priType = primary.getDataType(); - StructDataType altType = alternate.getDataType(); - for (int i=0; i<numberOfFields; ++i) { - int posBefore = position(); - Struct s = null; - Integer f_id = fieldIdsAndLengths.get(i).first; - Field structField = priType.getField(f_id, version); - if (structField != null) { - s = primary; - } else { - structField = altType.getField(f_id, version); - if (structField != null) { - s = alternate; - } - } - if (s != null) { - FieldValue value = structField.getDataType().createFieldValue(); - value.deserialize(structField, this); - s.setFieldValue(structField, value); - } - //jump to beginning of next field: - position(posBefore + fieldIdsAndLengths.get(i).second.intValue()); - } - - // restore the original buffer - buf = bigBuf; - } - - public void read(FieldBase field, StructuredFieldValue value) { - throw new IllegalArgumentException("read not implemented yet."); - } - public <T extends FieldValue> void read(FieldBase field, WeightedSet<T> ws) { - WeightedSetDataType type = ws.getDataType(); - getInt(null); // Have no need for type - - int numElements = getInt(null); - if (numElements < 0) { - throw new DeserializationException("Bad number of weighted set elements, " + numElements); - } - - ws.clearAndReserve(numElements * 2); // Avoid resizing - for (int i = 0; i < numElements; i++) { - int size = getInt(null); - FieldValue value = type.getNestedType().createFieldValue(); - value.deserialize(null, this); - IntegerFieldValue weight = new IntegerFieldValue(getInt(null)); - ws.putUnChecked((T) value, weight); - } - - } - - public void read(FieldBase field, AnnotationReference value) { - int seqId = buf.getInt1_2_4Bytes(); - try { - Annotation a = annotations.get(seqId); - value.setReferenceNoCompatibilityCheck(a); - } catch (IndexOutOfBoundsException iiobe) { - throw new SerializationException("Could not serialize AnnotationReference value, reference not found.", iiobe); - } - } - - private Utf8String deserializeAttributeString() throws DeserializationException { - int length = getByte(null); - return new Utf8String(parseNullTerminatedString(length)); - } - - private Utf8Array parseNullTerminatedString() { return parseNullTerminatedString(getBuf().getByteBuffer()); } - private Utf8Array parseNullTerminatedString(int lengthExcludingNull) { return parseNullTerminatedString(getBuf().getByteBuffer(), lengthExcludingNull); } - - static Utf8Array parseNullTerminatedString(ByteBuffer buf, int lengthExcludingNull) throws DeserializationException { - Utf8Array utf8 = new Utf8Array(buf, lengthExcludingNull); - buf.get(); //move past 0-termination - return utf8; - } - - static Utf8Array parseNullTerminatedString(ByteBuffer buf) throws DeserializationException { - //search for 0-byte - int end = getFirstNullByte(buf); - - if (end == -1) { - throw new DeserializationException("Could not locate terminating 0-byte for string"); - } - - return parseNullTerminatedString(buf, end - buf.position()); - } - - private static int getFirstNullByte(ByteBuffer buf) { - int end = -1; - int start = buf.position(); - - while (true) { - try { - byte dataByte = buf.get(); - if (dataByte == (byte) 0) { - end = buf.position() - 1; - break; - } - } catch (Exception e) { - break; - } - } - - buf.position(start); - return end; - } - - public void read(DocumentUpdate update) { - short serializationVersion = getShort(null); - - update.setId(new DocumentId(this)); - - byte contents = getByte(null); - - if ((contents & 0x1) == 0) { - throw new DeserializationException("Cannot deserialize DocumentUpdate without doctype"); - } - - update.setDocumentType(readDocumentType()); - - int size = getInt(null); - - for (int i = 0; i < size; i++) { - update.addFieldUpdate(new FieldUpdate(this, update.getDocumentType(), serializationVersion)); - } - } - - public void read(FieldPathUpdate update) { - String fieldPath = getString(null); - String whereClause = getString(null); - update.setFieldPath(fieldPath); - - try { - update.setWhereClause(whereClause); - } catch (ParseException e) { - throw new DeserializationException(e); - } - } - - public void read(AssignFieldPathUpdate update) { - byte flags = getByte(null); - update.setRemoveIfZero((flags & AssignFieldPathUpdate.REMOVE_IF_ZERO) != 0); - update.setCreateMissingPath((flags & AssignFieldPathUpdate.CREATE_MISSING_PATH) != 0); - if ((flags & AssignFieldPathUpdate.ARITHMETIC_EXPRESSION) != 0) { - update.setExpression(getString(null)); - } else { - DataType dt = update.getFieldPath().getResultingDataType(); - FieldValue fv = dt.createFieldValue(); - fv.deserialize(this); - update.setNewValue(fv); - } - } - - public void read(RemoveFieldPathUpdate update) { - - } - - public void read(AddFieldPathUpdate update) { - DataType dt = update.getFieldPath().getResultingDataType(); - FieldValue fv = dt.createFieldValue(); - dt.createFieldValue(); - fv.deserialize(this); - - if (!(fv instanceof Array)) { - throw new DeserializationException("Add only applicable to array types"); - } - update.setNewValues((Array)fv); - } - - public ValueUpdate getValueUpdate(DataType superType, DataType subType) { - int vuTypeId = getInt(null); - - ValueUpdate.ValueUpdateClassID op = ValueUpdate.ValueUpdateClassID.getID(vuTypeId); - if (op == null) { - throw new IllegalArgumentException("Read type "+vuTypeId+" of bytebuffer, but this is not a legal value update type."); - } - - switch (op) { - case ADD: - { - FieldValue fval = subType.createFieldValue(); - fval.deserialize(this); - int weight = getInt(null); - return new AddValueUpdate(fval, weight); - } - case ARITHMETIC: - int opId = getInt(null); - ArithmeticValueUpdate.Operator operator = ArithmeticValueUpdate.Operator.getID(opId); - double operand = getDouble(null); - return new ArithmeticValueUpdate(operator, operand); - case ASSIGN: - { - byte contents = getByte(null); - FieldValue fval = null; - if (contents == (byte) 1) { - fval = superType.createFieldValue(); - fval.deserialize(this); - } - return new AssignValueUpdate(fval); - } - case CLEAR: - return new ClearValueUpdate(); - case MAP: - if (superType instanceof ArrayDataType) { - CollectionDataType type = (CollectionDataType) superType; - IntegerFieldValue index = new IntegerFieldValue(); - index.deserialize(this); - ValueUpdate update = getValueUpdate(type.getNestedType(), null); - return new MapValueUpdate(index, update); - } else if (superType instanceof WeightedSetDataType) { - CollectionDataType type = (CollectionDataType) superType; - FieldValue fval = type.getNestedType().createFieldValue(); - fval.deserialize(this); - ValueUpdate update = getValueUpdate(DataType.INT, null); - return new MapValueUpdate(fval, update); - } else { - throw new DeserializationException("MapValueUpdate only works for arrays and weighted sets"); - } - case REMOVE: - FieldValue fval = ((CollectionDataType) superType).getNestedType().createFieldValue(); - fval.deserialize(this); - return new RemoveValueUpdate(fval); - default: - throw new DeserializationException( - "Could not deserialize ValueUpdate, unknown valueUpdateClassID type " + vuTypeId); - } - } - - public void read(FieldUpdate fieldUpdate) { - int fieldId = getInt(null); - Field field = fieldUpdate.getDocumentType().getField(fieldId, fieldUpdate.getSerializationVersion()); - if (field == null) { - throw new DeserializationException( - "Cannot deserialize FieldUpdate, field fieldId " + fieldId + " not found in " + fieldUpdate.getDocumentType()); - } - - fieldUpdate.setField(field); - int size = getInt(null); - - for (int i = 0; i < size; i++) { - if (field.getDataType() instanceof CollectionDataType) { - CollectionDataType collType = (CollectionDataType) field.getDataType(); - fieldUpdate.addValueUpdate(getValueUpdate(collType, collType.getNestedType())); - } else { - fieldUpdate.addValueUpdate(getValueUpdate(field.getDataType(), null)); - } - } - } - - public DocumentId readDocumentId() { - Utf8String uri = new Utf8String(parseNullTerminatedString(getBuf().getByteBuffer())); - return DocumentId.createFromSerialized(uri.toString()); - } - - public DocumentType readDocumentType() { - Utf8Array docTypeName = parseNullTerminatedString(); - int ignored = getShort(null); // used to hold the version - - DocumentType docType = manager.getDocumentType(new DataTypeName(docTypeName)); - if (docType == null) { - throw new DeserializationException("No known document type with name " + - new Utf8String(docTypeName).toString()); - } - return docType; - } - - private SpanNode readSpanNode() { - byte type = buf.get(); - buf.position(buf.position() - 1); - - SpanNode retval; - if ((type & Span.ID) == Span.ID) { - retval = new Span(); - if (spanNodes != null) { - spanNodes.add(retval); - } - read((Span) retval); - } else if ((type & SpanList.ID) == SpanList.ID) { - retval = new SpanList(); - if (spanNodes != null) { - spanNodes.add(retval); - } - read((SpanList) retval); - } else if ((type & AlternateSpanList.ID) == AlternateSpanList.ID) { - retval = new AlternateSpanList(); - if (spanNodes != null) { - spanNodes.add(retval); - } - read((AlternateSpanList) retval); - } else { - throw new DeserializationException("Cannot read SpanNode of type " + type); - } - return retval; - } - - private void readSpanTree(SpanTree tree, boolean readName) { - //we don't support serialization of nested span trees: - if (spanNodes != null || annotations != null) { - throw new SerializationException("Deserialization of nested SpanTrees is not supported."); - } - - //we're going to write a new SpanTree, create a new Map for nodes: - spanNodes = new ArrayList<SpanNode>(); - annotations = new ArrayList<Annotation>(); - - try { - if (readName) { - StringFieldValue treeName = new StringFieldValue(); - treeName.deserialize(this); - tree.setName(treeName.getString()); - } - - SpanNode root = readSpanNode(); - tree.setRoot(root); - - int numAnnotations = buf.getInt1_2_4Bytes(); - - for (int i = 0; i < numAnnotations; i++) { - Annotation a = new Annotation(); - annotations.add(a); - } - for (int i = 0; i < numAnnotations; i++) { - read(annotations.get(i)); - } - for (Annotation a : annotations) { - tree.annotate(a); - } - - for (SpanNode node: spanNodes) { - if (node instanceof Span) { - correctIndexes((Span) node); - } - } - } finally { - //we're done, let's set this to null to save memory and prevent madness: - spanNodes = null; - annotations = null; - } - } - - public void read(SpanTree tree) { - readSpanTree(tree, true); - } - - public void read(Annotation annotation) { - int annotationTypeId = buf.getInt(); - AnnotationType type = manager.getAnnotationTypeRegistry().getType(annotationTypeId); - - if (type == null) { - throw new DeserializationException("Cannot deserialize annotation of type " + annotationTypeId + " (unknown type)"); - } - - annotation.setType(type); - - byte features = buf.get(); - int length = buf.getInt1_2_4Bytes(); - - if ((features & (byte) 1) == (byte) 1) { - //we have a span node - int spanNodeId = buf.getInt1_2_4Bytes(); - try { - SpanNode node = spanNodes.get(spanNodeId); - annotation.setSpanNode(node); - } catch (IndexOutOfBoundsException ioobe) { - throw new DeserializationException("Could not deserialize annotation, associated span node not found ", ioobe); - } - } - if ((features & (byte) 2) == (byte) 2) { - //we have a value: - int dataTypeId = buf.getInt(); - - //if this data type ID the same as the one in our config? - if (dataTypeId != type.getDataType().getId()) { - //not the same, but we will handle it gracefully, and just skip past the data: - buf.position(buf.position() + length - 4); - } else { - FieldValue value = type.getDataType().createFieldValue(); - value.deserialize(this); - annotation.setFieldValue(value); - } - } - } - - public void read(Span span) { - byte type = buf.get(); - if ((type & Span.ID) != Span.ID) { - throw new DeserializationException("Cannot deserialize Span with type " + type); - } - span.setFrom(buf.getInt1_2_4Bytes()); - span.setLength(buf.getInt1_2_4Bytes()); - } - - private void correctIndexes(Span span) { - if (stringPositions == null) { - throw new DeserializationException("Cannot deserialize Span, no access to parent StringFieldValue."); - } - int fromIndex = stringPositions[span.getFrom()]; - int toIndex = stringPositions[span.getTo()]; - int length = toIndex - fromIndex; - - span.setFrom(fromIndex); - span.setLength(length); - } - - public void read(SpanList spanList) { - byte type = buf.get(); - if ((type & SpanList.ID) != SpanList.ID) { - throw new DeserializationException("Cannot deserialize SpanList with type " + type); - } - List<SpanNode> nodes = readSpanList(spanList); - for (SpanNode node : nodes) { - spanList.add(node); - } - } - - public void read(AlternateSpanList altSpanList) { - byte type = buf.get(); - if ((type & AlternateSpanList.ID) != AlternateSpanList.ID) { - throw new DeserializationException("Cannot deserialize AlternateSpanList with type " + type); - } - int numSubTrees = buf.getInt1_2_4Bytes(); - - for (int i = 0; i < numSubTrees; i++) { - double prob = buf.getDouble(); - List<SpanNode> list = readSpanList(altSpanList); - - if (i == 0) { - for (SpanNode node : list) { - altSpanList.add(node); - } - altSpanList.setProbability(0, prob); - } else { - altSpanList.addChildren(i, list, prob); - } - } - } - - private List<SpanNode> readSpanList(SpanNodeParent parent) { - int size = buf.getInt1_2_4Bytes(); - List<SpanNode> spanList = new ArrayList<SpanNode>(); - for (int i = 0; i < size; i++) { - spanList.add(readSpanNode()); - } - return spanList; - } - -} diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer6.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer6.java index e80cebdcc29..a0bce3cfbf6 100644 --- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer6.java +++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer6.java @@ -11,7 +11,6 @@ import com.yahoo.document.annotation.AnnotationType; import com.yahoo.document.annotation.Span; import com.yahoo.document.annotation.SpanList; import com.yahoo.document.annotation.SpanNode; -import com.yahoo.document.annotation.SpanNodeParent; import com.yahoo.document.annotation.SpanTree; import com.yahoo.document.ArrayDataType; import com.yahoo.document.CollectionDataType; @@ -105,23 +104,16 @@ public class VespaDocumentDeserializer6 extends BufferSerializer implements Docu public void read(FieldBase field, Document doc) { // Verify that we have correct version version = getShort(null); - if (version < 6 || version > Document.SERIALIZED_VERSION) { + if (version < 8 || version > Document.SERIALIZED_VERSION) { throw new DeserializationException("Unknown version " + version + ", expected " + Document.SERIALIZED_VERSION + "."); } - int dataLength = 0; - int dataPos = 0; - - if (version < 7) { - getInt2_4_8Bytes(null); // Total document size.. Ignore - } else { - dataLength = getInt(null); - dataPos = position(); - } + int dataLength = getInt(null); + int dataPos = position(); DocumentId documentId = readDocumentId(); - Byte content = getByte(null); + byte content = getByte(null); doc.setDataType(readDocumentType()); doc.setId(documentId); @@ -136,14 +128,8 @@ public class VespaDocumentDeserializer6 extends BufferSerializer implements Docu readHeaderBody(b, h); } - if (version < 8) { - int crcVal = getInt(null); - } - - if (version > 6) { - if (dataLength != (position() - dataPos)) { - throw new DeserializationException("Length mismatch"); - } + if (dataLength != (position() - dataPos)) { + throw new DeserializationException("Length mismatch"); } } public void read(FieldBase field, FieldValue value) { @@ -152,12 +138,9 @@ public class VespaDocumentDeserializer6 extends BufferSerializer implements Docu public <T extends FieldValue> void read(FieldBase field, Array<T> array) { int numElements = getNumCollectionElems(); - ArrayList<T> list = new ArrayList<T>(numElements); + ArrayList<T> list = new ArrayList<>(numElements); ArrayDataType type = array.getDataType(); for (int i = 0; i < numElements; i++) { - if (version < 7) { - getInt(null); // We don't need size for anything - } FieldValue fv = type.getNestedType().createFieldValue(); fv.deserialize(null, this); list.add((T) fv); @@ -171,9 +154,6 @@ public class VespaDocumentDeserializer6 extends BufferSerializer implements Docu Map<K,V> hash = new HashMap<>(); MapDataType type = map.getDataType(); for (int i = 0; i < numElements; i++) { - if (version < 7) { - getInt(null); // We don't need size for anything - } K key = (K) type.getKeyType().createFieldValue(); V val = (V) type.getValueType().createFieldValue(); key.deserialize(null, this); @@ -185,13 +165,7 @@ public class VespaDocumentDeserializer6 extends BufferSerializer implements Docu } private int getNumCollectionElems() { - int numElements; - if (version < 7) { - getInt(null); // We already know the nested type, so ignore that.. - numElements = getInt(null); - } else { - numElements = getInt1_2_4Bytes(null); - } + int numElements = getInt1_2_4Bytes(null); if (numElements < 0) { throw new DeserializationException("Bad number of array/map elements, " + numElements); } @@ -290,24 +264,12 @@ public class VespaDocumentDeserializer6 extends BufferSerializer implements Docu public void read(FieldBase fieldDef, Struct s) { s.setVersion(version); - int startPos = position(); - if (version < 6) { + if (version < 8) { throw new DeserializationException("Illegal document serialization version " + version); } - int dataSize; - if (version < 7) { - long rSize = getInt2_4_8Bytes(null); - //TODO: Look into how to support data segments larger than INT_MAX bytes - if (rSize > Integer.MAX_VALUE) { - throw new DeserializationException("Raw size of data block is too large."); - } - dataSize = (int)rSize; - } else { - dataSize = getInt(null); - } - + int dataSize = getInt(null); byte comprCode = getByte(null); CompressionType compression = CompressionType.valueOf(comprCode); @@ -335,11 +297,6 @@ public class VespaDocumentDeserializer6 extends BufferSerializer implements Docu // save a reference to the big buffer we're reading from: GrowableByteBuffer bigBuf = buf; - if (version < 7) { - // In V6 and earlier, the length included the header. - int headerSize = position() - startPos; - dataSize -= headerSize; - } byte[] destination = compressor.decompress(compression, getBuf().array(), position(), uncompressedSize, Optional.of(dataSize)); // set position in original buffer to after data @@ -351,7 +308,7 @@ public class VespaDocumentDeserializer6 extends BufferSerializer implements Docu s.clear(); StructDataType type = s.getDataType(); for (int i=0; i<numberOfFields; ++i) { - Field structField = type.getField(fieldIdsAndLengths.get(i).first, version); + Field structField = type.getField(fieldIdsAndLengths.get(i).first); if (structField == null) { //ignoring unknown field: position(position() + fieldIdsAndLengths.get(i).second.intValue()); @@ -371,23 +328,12 @@ public class VespaDocumentDeserializer6 extends BufferSerializer implements Docu private void readHeaderBody(Struct primary, Struct alternate) { primary.setVersion(version); - int startPos = position(); - if (version < 6) { + if (version < 8) { throw new DeserializationException("Illegal document serialization version " + version); } - int dataSize; - if (version < 7) { - long rSize = getInt2_4_8Bytes(null); - //TODO: Look into how to support data segments larger than INT_MAX bytes - if (rSize > Integer.MAX_VALUE) { - throw new DeserializationException("Raw size of data block is too large."); - } - dataSize = (int)rSize; - } else { - dataSize = getInt(null); - } + int dataSize = getInt(null); byte comprCode = getByte(null); CompressionType compression = CompressionType.valueOf(comprCode); @@ -416,11 +362,6 @@ public class VespaDocumentDeserializer6 extends BufferSerializer implements Docu // save a reference to the big buffer we're reading from: GrowableByteBuffer bigBuf = buf; - if (version < 7) { - // In V6 and earlier, the length included the header. - int headerSize = position() - startPos; - dataSize -= headerSize; - } byte[] destination = compressor.decompress(compression, getBuf().array(), position(), uncompressedSize, Optional.of(dataSize)); // set position in original buffer to after data @@ -435,11 +376,11 @@ public class VespaDocumentDeserializer6 extends BufferSerializer implements Docu int posBefore = position(); Struct s = null; Integer f_id = fieldIdsAndLengths.get(i).first; - Field structField = priType.getField(f_id, version); + Field structField = priType.getField(f_id); if (structField != null) { s = primary; } else { - structField = altType.getField(f_id, version); + structField = altType.getField(f_id); if (structField != null) { s = alternate; } @@ -471,7 +412,7 @@ public class VespaDocumentDeserializer6 extends BufferSerializer implements Docu ws.clearAndReserve(numElements * 2); // Avoid resizing for (int i = 0; i < numElements; i++) { - int size = getInt(null); + int unusedSize = getInt(null); FieldValue value = type.getNestedType().createFieldValue(); value.deserialize(null, this); IntegerFieldValue weight = new IntegerFieldValue(getInt(null)); @@ -490,13 +431,7 @@ public class VespaDocumentDeserializer6 extends BufferSerializer implements Docu } } - private Utf8String deserializeAttributeString() throws DeserializationException { - int length = getByte(null); - return new Utf8String(parseNullTerminatedString(length)); - } - private Utf8Array parseNullTerminatedString() { return parseNullTerminatedString(getBuf().getByteBuffer()); } - private Utf8Array parseNullTerminatedString(int lengthExcludingNull) { return parseNullTerminatedString(getBuf().getByteBuffer(), lengthExcludingNull); } static Utf8Array parseNullTerminatedString(ByteBuffer buf, int lengthExcludingNull) throws DeserializationException { Utf8Array utf8 = new Utf8Array(buf, lengthExcludingNull); @@ -504,7 +439,7 @@ public class VespaDocumentDeserializer6 extends BufferSerializer implements Docu return utf8; } - static Utf8Array parseNullTerminatedString(ByteBuffer buf) throws DeserializationException { + static Utf8Array parseNullTerminatedString(ByteBuffer buf) throws DeserializationException { //search for 0-byte int end = getFirstNullByte(buf); @@ -542,7 +477,7 @@ public class VespaDocumentDeserializer6 extends BufferSerializer implements Docu int size = getInt(null); for (int i = 0; i < size; i++) { - update.addFieldUpdate(new FieldUpdate(this, update.getDocumentType(), 8)); + update.addFieldUpdate(new FieldUpdate(this, update.getDocumentType())); } int sizeAndFlags = getInt(null); @@ -666,7 +601,7 @@ public class VespaDocumentDeserializer6 extends BufferSerializer implements Docu public void read(FieldUpdate fieldUpdate) { int fieldId = getInt(null); - Field field = fieldUpdate.getDocumentType().getField(fieldId, fieldUpdate.getSerializationVersion()); + Field field = fieldUpdate.getDocumentType().getField(fieldId); if (field == null) { throw new DeserializationException( "Cannot deserialize FieldUpdate, field fieldId " + fieldId + " not found in " + fieldUpdate.getDocumentType()); @@ -692,7 +627,7 @@ public class VespaDocumentDeserializer6 extends BufferSerializer implements Docu public DocumentType readDocumentType() { Utf8Array docTypeName = parseNullTerminatedString(); - int ignored = getShort(null); // used to hold the version + int ignoredVersion = getShort(null); // used to hold the version DocumentType docType = manager.getDocumentType(new DataTypeName(docTypeName)); if (docType == null) { @@ -738,8 +673,8 @@ public class VespaDocumentDeserializer6 extends BufferSerializer implements Docu } //we're going to write a new SpanTree, create a new Map for nodes: - spanNodes = new ArrayList<SpanNode>(); - annotations = new ArrayList<Annotation>(); + spanNodes = new ArrayList<>(); + annotations = new ArrayList<>(); try { if (readName) { @@ -845,7 +780,7 @@ public class VespaDocumentDeserializer6 extends BufferSerializer implements Docu if ((type & SpanList.ID) != SpanList.ID) { throw new DeserializationException("Cannot deserialize SpanList with type " + type); } - List<SpanNode> nodes = readSpanList(spanList); + List<SpanNode> nodes = readSpanList(); for (SpanNode node : nodes) { spanList.add(node); } @@ -860,7 +795,7 @@ public class VespaDocumentDeserializer6 extends BufferSerializer implements Docu for (int i = 0; i < numSubTrees; i++) { double prob = buf.getDouble(); - List<SpanNode> list = readSpanList(altSpanList); + List<SpanNode> list = readSpanList(); if (i == 0) { for (SpanNode node : list) { @@ -873,9 +808,9 @@ public class VespaDocumentDeserializer6 extends BufferSerializer implements Docu } } - private List<SpanNode> readSpanList(SpanNodeParent parent) { + private List<SpanNode> readSpanList() { int size = buf.getInt1_2_4Bytes(); - List<SpanNode> spanList = new ArrayList<SpanNode>(); + List<SpanNode> spanList = new ArrayList<>(); for (int i = 0; i < size; i++) { spanList.add(readSpanNode()); } diff --git a/document/src/main/java/com/yahoo/document/update/FieldUpdate.java b/document/src/main/java/com/yahoo/document/update/FieldUpdate.java index 192afba80b3..338062270ee 100644 --- a/document/src/main/java/com/yahoo/document/update/FieldUpdate.java +++ b/document/src/main/java/com/yahoo/document/update/FieldUpdate.java @@ -60,7 +60,6 @@ public class FieldUpdate { // Used only while deserializing. private DocumentType documentType = null; - private int serializationVersion = 0; FieldUpdate(Field field) { this.field = field; @@ -76,9 +75,13 @@ public class FieldUpdate { addValueUpdates(valueUpdates); } + @Deprecated public FieldUpdate(DocumentUpdateReader reader, DocumentType type, int serializationVersion) { + this(reader, type); + } + + public FieldUpdate(DocumentUpdateReader reader, DocumentType type) { documentType = type; - this.serializationVersion = serializationVersion; reader.read(this); } @@ -86,10 +89,6 @@ public class FieldUpdate { return documentType; } - public int getSerializationVersion() { - return serializationVersion; - } - /** Returns the field that this field update applies to */ public Field getField() { return field; diff --git a/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java b/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java index 5f180beab35..de7d72c018d 100644 --- a/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java +++ b/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java @@ -23,6 +23,7 @@ import com.yahoo.io.GrowableByteBuffer; import com.yahoo.tensor.Tensor; import com.yahoo.tensor.TensorType; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import java.io.FileOutputStream; @@ -296,6 +297,7 @@ public class DocumentUpdateTestCase { } } + @Ignore @Test public void testSerialize() { docUp.addFieldUpdate(assignSingle); @@ -334,16 +336,17 @@ public class DocumentUpdateTestCase { + (4 + 4 + 4 + (1 + 1 + 2 + 1) + 4 + (1 + 1 + 2 + 1) + 4 + (1 + 1 + 2 + 1))))) //value , buf.remaining()); - DocumentUpdate docUpDeser = new DocumentUpdate(DocumentDeserializerFactory.create42(docMan, buf)); + DocumentUpdate docUpDeser = new DocumentUpdate(DocumentDeserializerFactory.createHead(docMan, buf)); assertEquals(docUp.getDocumentType(), docUpDeser.getDocumentType()); assertEquals(docUp, docUpDeser); } + @Ignore @Test public void testCppDocUpd() throws IOException { docMan = DocumentTestCase.setUpCppDocType(); byte[] data = DocumentTestCase.readFile("src/tests/data/serializeupdatecpp.dat"); - DocumentDeserializer buf = DocumentDeserializerFactory.create42(docMan, GrowableByteBuffer.wrap(data)); + DocumentDeserializer buf = DocumentDeserializerFactory.createHead(docMan, GrowableByteBuffer.wrap(data)); DocumentType type = docMan.getDocumentType("serializetest"); diff --git a/document/src/test/java/com/yahoo/document/serialization/SerializationHelperTestCase.java b/document/src/test/java/com/yahoo/document/serialization/SerializationHelperTestCase.java index 0175f87e3ee..547da37f555 100644 --- a/document/src/test/java/com/yahoo/document/serialization/SerializationHelperTestCase.java +++ b/document/src/test/java/com/yahoo/document/serialization/SerializationHelperTestCase.java @@ -8,7 +8,6 @@ import com.yahoo.text.Utf8Array; import com.yahoo.vespa.objects.BufferSerializer; import org.junit.Test; -import java.io.UnsupportedEncodingException; import java.nio.ByteBuffer; import static org.junit.Assert.assertEquals; @@ -17,7 +16,6 @@ import static org.junit.Assert.assertTrue; /** * @author Einar M R Rosenvinge */ -@SuppressWarnings("deprecation") public class SerializationHelperTestCase { @Test @@ -30,7 +28,7 @@ public class SerializationHelperTestCase { assertTrue(data.position() == 0); - Utf8Array thisIsATest = VespaDocumentDeserializer42.parseNullTerminatedString(data.getBuf().getByteBuffer()); + Utf8Array thisIsATest = VespaDocumentDeserializer6.parseNullTerminatedString(data.getBuf().getByteBuffer()); assertTrue(thisIsATest.equals(new Utf8Array(Utf8.toBytes("This is a test.")))); assertTrue(data.position() == 16); @@ -40,7 +38,7 @@ public class SerializationHelperTestCase { assertTrue(data.position() == 0); - Utf8Array thisIsATestAgain = VespaDocumentDeserializer42.parseNullTerminatedString(data.getBuf().getByteBuffer(), 15); + Utf8Array thisIsATestAgain = VespaDocumentDeserializer6.parseNullTerminatedString(data.getBuf().getByteBuffer(), 15); assertTrue(thisIsATestAgain.equals(new Utf8Array(Utf8.toBytes("This is a test.")))); assertTrue(data.position() == 16); diff --git a/document/src/test/java/com/yahoo/document/update/FieldUpdateTestCase.java b/document/src/test/java/com/yahoo/document/update/FieldUpdateTestCase.java index ba872b11c28..86ef15e8f33 100644 --- a/document/src/test/java/com/yahoo/document/update/FieldUpdateTestCase.java +++ b/document/src/test/java/com/yahoo/document/update/FieldUpdateTestCase.java @@ -189,7 +189,7 @@ public class FieldUpdateTestCase { DocumentSerializer buffer = DocumentSerializerFactory.create6(); source.serialize(buffer); buffer.getBuf().flip(); - FieldUpdate copy = new FieldUpdate(DocumentDeserializerFactory.create6(docman, buffer.getBuf()), docType, Document.SERIALIZED_VERSION); + FieldUpdate copy = new FieldUpdate(DocumentDeserializerFactory.create6(docman, buffer.getBuf()), docType); assertEquals(source, copy); return copy; } diff --git a/document/src/test/java/com/yahoo/document/update/SerializationTestCase.java b/document/src/test/java/com/yahoo/document/update/SerializationTestCase.java index 2fc1692d575..0906f147627 100644 --- a/document/src/test/java/com/yahoo/document/update/SerializationTestCase.java +++ b/document/src/test/java/com/yahoo/document/update/SerializationTestCase.java @@ -49,7 +49,7 @@ public class SerializationTestCase { fos.close(); } catch (Exception e) {} - FieldUpdate deserializedUpdate = new FieldUpdate(DocumentDeserializerFactory.create6(new DocumentTypeManager(), buffer.getBuf()), documentType, Document.SERIALIZED_VERSION); + FieldUpdate deserializedUpdate = new FieldUpdate(DocumentDeserializerFactory.create6(new DocumentTypeManager(), buffer.getBuf()), documentType); assertEquals("'field1' [add value1 1]", deserializedUpdate.toString()); } @@ -60,7 +60,7 @@ public class SerializationTestCase { update.serialize(buffer); buffer.getBuf().rewind(); - FieldUpdate deserializedUpdate = new FieldUpdate(DocumentDeserializerFactory.create6(new DocumentTypeManager(), buffer.getBuf()), documentType, Document.SERIALIZED_VERSION); + FieldUpdate deserializedUpdate = new FieldUpdate(DocumentDeserializerFactory.create6(new DocumentTypeManager(), buffer.getBuf()), documentType); assertEquals("'field1' [clear]", deserializedUpdate.toString()); } diff --git a/document/src/tests/data/crossplatform-java-cpp-doctypes.cfg b/document/src/tests/data/crossplatform-java-cpp-doctypes.cfg index 6d33df468dd..81a40be4b71 100644 --- a/document/src/tests/data/crossplatform-java-cpp-doctypes.cfg +++ b/document/src/tests/data/crossplatform-java-cpp-doctypes.cfg @@ -89,19 +89,15 @@ documenttype[0].datatype[4].sstruct.compression.minsize 0 documenttype[0].datatype[4].sstruct.field[4] documenttype[0].datatype[4].sstruct.field[0].name "floatfield" documenttype[0].datatype[4].sstruct.field[0].id 1055999199 -documenttype[0].datatype[4].sstruct.field[0].id_v6 657399019 documenttype[0].datatype[4].sstruct.field[0].datatype 1 documenttype[0].datatype[4].sstruct.field[1].name "longfield" documenttype[0].datatype[4].sstruct.field[1].id 1589309697 -documenttype[0].datatype[4].sstruct.field[1].id_v6 477609536 documenttype[0].datatype[4].sstruct.field[1].datatype 4 documenttype[0].datatype[4].sstruct.field[2].name "stringfield" documenttype[0].datatype[4].sstruct.field[2].id 1182460484 -documenttype[0].datatype[4].sstruct.field[2].id_v6 779638844 documenttype[0].datatype[4].sstruct.field[2].datatype 2 documenttype[0].datatype[4].sstruct.field[3].name "urifield" documenttype[0].datatype[4].sstruct.field[3].id 628407450 -documenttype[0].datatype[4].sstruct.field[3].id_v6 756285986 documenttype[0].datatype[4].sstruct.field[3].datatype 10 documenttype[0].datatype[5].id 1026122976 documenttype[0].datatype[5].type STRUCT @@ -121,39 +117,30 @@ documenttype[0].datatype[5].sstruct.compression.minsize 0 documenttype[0].datatype[5].sstruct.field[9] documenttype[0].datatype[5].sstruct.field[0].name "arrayofarrayoffloatfield" documenttype[0].datatype[5].sstruct.field[0].id 2061447601 -documenttype[0].datatype[5].sstruct.field[0].id_v6 903107040 documenttype[0].datatype[5].sstruct.field[0].datatype 2001 documenttype[0].datatype[5].sstruct.field[1].name "arrayoffloatfield" documenttype[0].datatype[5].sstruct.field[1].id 1870932758 -documenttype[0].datatype[5].sstruct.field[1].id_v6 86189529 documenttype[0].datatype[5].sstruct.field[1].datatype 1001 documenttype[0].datatype[5].sstruct.field[2].name "bytefield" documenttype[0].datatype[5].sstruct.field[2].id 1924064342 -documenttype[0].datatype[5].sstruct.field[2].id_v6 2050488857 documenttype[0].datatype[5].sstruct.field[2].datatype 16 documenttype[0].datatype[5].sstruct.field[3].name "docfield" documenttype[0].datatype[5].sstruct.field[3].id 728739268 -documenttype[0].datatype[5].sstruct.field[3].id_v6 1725514984 documenttype[0].datatype[5].sstruct.field[3].datatype 8 documenttype[0].datatype[5].sstruct.field[4].name "doublefield" documenttype[0].datatype[5].sstruct.field[4].id 421343958 -documenttype[0].datatype[5].sstruct.field[4].id_v6 944141865 documenttype[0].datatype[5].sstruct.field[4].datatype 5 documenttype[0].datatype[5].sstruct.field[5].name "intfield" documenttype[0].datatype[5].sstruct.field[5].id 435380425 -documenttype[0].datatype[5].sstruct.field[5].id_v6 545156740 documenttype[0].datatype[5].sstruct.field[5].datatype 0 documenttype[0].datatype[5].sstruct.field[6].name "mapfield" documenttype[0].datatype[5].sstruct.field[6].id 162466023 -documenttype[0].datatype[5].sstruct.field[6].id_v6 1028589263 documenttype[0].datatype[5].sstruct.field[6].datatype 9999 documenttype[0].datatype[5].sstruct.field[7].name "rawfield" documenttype[0].datatype[5].sstruct.field[7].id 172982133 -documenttype[0].datatype[5].sstruct.field[7].id_v6 84029972 documenttype[0].datatype[5].sstruct.field[7].datatype 3 documenttype[0].datatype[5].sstruct.field[8].name "wsfield" documenttype[0].datatype[5].sstruct.field[8].id 1683714185 -documenttype[0].datatype[5].sstruct.field[8].id_v6 2988081 documenttype[0].datatype[5].sstruct.field[8].datatype 437829 documenttype[0].annotationtype[0] documenttype[1].id 1447635645 @@ -197,6 +184,5 @@ documenttype[1].datatype[1].sstruct.compression.minsize 0 documenttype[1].datatype[1].sstruct.field[1] documenttype[1].datatype[1].sstruct.field[0].name "stringindocfield" documenttype[1].datatype[1].sstruct.field[0].id 102054923 -documenttype[1].datatype[1].sstruct.field[0].id_v6 917294979 documenttype[1].datatype[1].sstruct.field[0].datatype 2 documenttype[1].annotationtype[0] diff --git a/document/src/tests/data/defaultdoctypes.cfg b/document/src/tests/data/defaultdoctypes.cfg index 8d9f71cfeb9..0b515478e22 100644 --- a/document/src/tests/data/defaultdoctypes.cfg +++ b/document/src/tests/data/defaultdoctypes.cfg @@ -73,15 +73,12 @@ documenttype[0].datatype[3].sstruct.compression.minsize 0 documenttype[0].datatype[3].sstruct.field[3] documenttype[0].datatype[3].sstruct.field[0].name "doubleattr" documenttype[0].datatype[3].sstruct.field[0].id 149562827 -documenttype[0].datatype[3].sstruct.field[0].id_v6 630428365 documenttype[0].datatype[3].sstruct.field[0].datatype 5 documenttype[0].datatype[3].sstruct.field[1].name "floatattr" documenttype[0].datatype[3].sstruct.field[1].id 1633158509 -documenttype[0].datatype[3].sstruct.field[1].id_v6 1853512789 documenttype[0].datatype[3].sstruct.field[1].datatype 1 documenttype[0].datatype[3].sstruct.field[2].name "intattr" documenttype[0].datatype[3].sstruct.field[2].id 2079212392 -documenttype[0].datatype[3].sstruct.field[2].id_v6 1840069917 documenttype[0].datatype[3].sstruct.field[2].datatype 0 documenttype[0].datatype[4].id 5001 documenttype[0].datatype[4].type STRUCT @@ -101,50 +98,38 @@ documenttype[0].datatype[4].sstruct.compression.minsize 0 documenttype[0].datatype[4].sstruct.field[12] documenttype[0].datatype[4].sstruct.field[0].name "arrayattr" documenttype[0].datatype[4].sstruct.field[0].id 505184256 -documenttype[0].datatype[4].sstruct.field[0].id_v6 1771774378 documenttype[0].datatype[4].sstruct.field[0].datatype 1000 documenttype[0].datatype[4].sstruct.field[1].name "byteattr" documenttype[0].datatype[4].sstruct.field[1].id 2134674304 -documenttype[0].datatype[4].sstruct.field[1].id_v6 973038129 documenttype[0].datatype[4].sstruct.field[1].datatype 16 documenttype[0].datatype[4].sstruct.field[2].name "docfield" documenttype[0].datatype[4].sstruct.field[2].id 728739268 -documenttype[0].datatype[4].sstruct.field[2].id_v6 1725514984 documenttype[0].datatype[4].sstruct.field[2].datatype 8 documenttype[0].datatype[4].sstruct.field[3].name "longattr" documenttype[0].datatype[4].sstruct.field[3].id 790774460 -documenttype[0].datatype[4].sstruct.field[3].id_v6 192291556 documenttype[0].datatype[4].sstruct.field[3].datatype 4 documenttype[0].datatype[4].sstruct.field[4].name "minattr" documenttype[0].datatype[4].sstruct.field[4].id 1829587385 -documenttype[0].datatype[4].sstruct.field[4].id_v6 741727195 documenttype[0].datatype[4].sstruct.field[4].datatype 0 documenttype[0].datatype[4].sstruct.field[5].name "minattr2" documenttype[0].datatype[4].sstruct.field[5].id 128399609 -documenttype[0].datatype[4].sstruct.field[5].id_v6 920037076 documenttype[0].datatype[4].sstruct.field[5].datatype 0 documenttype[0].datatype[4].sstruct.field[6].name "rawarrayattr" documenttype[0].datatype[4].sstruct.field[6].id 730665199 -documenttype[0].datatype[4].sstruct.field[6].id_v6 1023469062 documenttype[0].datatype[4].sstruct.field[6].datatype 1003 documenttype[0].datatype[4].sstruct.field[7].name "rawattr" documenttype[0].datatype[4].sstruct.field[7].id 141092158 -documenttype[0].datatype[4].sstruct.field[7].id_v6 1247497470 documenttype[0].datatype[4].sstruct.field[7].datatype 3 documenttype[0].datatype[4].sstruct.field[8].name "stringattr" documenttype[0].datatype[4].sstruct.field[8].id 1869816099 -documenttype[0].datatype[4].sstruct.field[8].id_v6 1592475234 documenttype[0].datatype[4].sstruct.field[8].datatype 2 documenttype[0].datatype[4].sstruct.field[9].name "stringattr2" documenttype[0].datatype[4].sstruct.field[9].id 1054720742 -documenttype[0].datatype[4].sstruct.field[9].id_v6 1869816099 documenttype[0].datatype[4].sstruct.field[9].datatype 2 documenttype[0].datatype[4].sstruct.field[10].name "stringweightedsetattr" documenttype[0].datatype[4].sstruct.field[10].id 1791723468 -documenttype[0].datatype[4].sstruct.field[10].id_v6 676317895 documenttype[0].datatype[4].sstruct.field[10].datatype 2002 documenttype[0].datatype[4].sstruct.field[11].name "uri" documenttype[0].datatype[4].sstruct.field[11].id 31928604 -documenttype[0].datatype[4].sstruct.field[11].id_v6 1003424810 documenttype[0].datatype[4].sstruct.field[11].datatype 2 documenttype[0].annotationtype[0] diff --git a/document/src/tests/data/doctypesconfigtest.cfg b/document/src/tests/data/doctypesconfigtest.cfg index 36666bc7f3e..a089c5c627c 100644 --- a/document/src/tests/data/doctypesconfigtest.cfg +++ b/document/src/tests/data/doctypesconfigtest.cfg @@ -41,15 +41,12 @@ documenttype[0].datatype[1].sstruct.compression.minsize 0 documenttype[0].datatype[1].sstruct.field[3] documenttype[0].datatype[1].sstruct.field[0].name "field1" documenttype[0].datatype[1].sstruct.field[0].id 36262354 -documenttype[0].datatype[1].sstruct.field[0].id_v6 1141913055 documenttype[0].datatype[1].sstruct.field[0].datatype 0 documenttype[0].datatype[1].sstruct.field[1].name "field2" documenttype[0].datatype[1].sstruct.field[1].id 1388988771 -documenttype[0].datatype[1].sstruct.field[1].id_v6 1215205431 documenttype[0].datatype[1].sstruct.field[1].datatype 0 documenttype[0].datatype[1].sstruct.field[2].name "fieldarray1" documenttype[0].datatype[1].sstruct.field[2].id 1030920758 -documenttype[0].datatype[1].sstruct.field[2].id_v6 1073985444 documenttype[0].datatype[1].sstruct.field[2].datatype 1000 documenttype[0].datatype[2].id -1448787694 documenttype[0].datatype[2].type STRUCT @@ -93,7 +90,6 @@ documenttype[1].datatype[0].sstruct.compression.minsize 0 documenttype[1].datatype[0].sstruct.field[1] documenttype[1].datatype[0].sstruct.field[0].name "field4" documenttype[1].datatype[0].sstruct.field[0].id 1556675886 -documenttype[1].datatype[0].sstruct.field[0].id_v6 1677332587 documenttype[1].datatype[0].sstruct.field[0].datatype 2 documenttype[1].datatype[1].id 294022642 documenttype[1].datatype[1].type STRUCT @@ -113,7 +109,6 @@ documenttype[1].datatype[1].sstruct.compression.minsize 0 documenttype[1].datatype[1].sstruct.field[1] documenttype[1].datatype[1].sstruct.field[0].name "field3" documenttype[1].datatype[1].sstruct.field[0].id 722536103 -documenttype[1].datatype[1].sstruct.field[0].id_v6 1036475953 documenttype[1].datatype[1].sstruct.field[0].datatype 2 documenttype[1].annotationtype[0] documenttype[2].id 787712161 @@ -143,19 +138,15 @@ documenttype[2].datatype[0].sstruct.compression.minsize 0 documenttype[2].datatype[0].sstruct.field[4] documenttype[2].datatype[0].sstruct.field[0].name "field1" documenttype[2].datatype[0].sstruct.field[0].id 36262354 -documenttype[2].datatype[0].sstruct.field[0].id_v6 1141913055 documenttype[2].datatype[0].sstruct.field[0].datatype 0 documenttype[2].datatype[0].sstruct.field[1].name "field2" documenttype[2].datatype[0].sstruct.field[1].id 1388988771 -documenttype[2].datatype[0].sstruct.field[1].id_v6 1215205431 documenttype[2].datatype[0].sstruct.field[1].datatype 0 documenttype[2].datatype[0].sstruct.field[2].name "field4" documenttype[2].datatype[0].sstruct.field[2].id 1556675886 -documenttype[2].datatype[0].sstruct.field[2].id_v6 1677332587 documenttype[2].datatype[0].sstruct.field[2].datatype 2 documenttype[2].datatype[0].sstruct.field[3].name "fieldarray1" documenttype[2].datatype[0].sstruct.field[3].id 1030920758 -documenttype[2].datatype[0].sstruct.field[3].id_v6 1073985444 documenttype[2].datatype[0].sstruct.field[3].datatype 1000 documenttype[2].datatype[1].id -1359887401 documenttype[2].datatype[1].type STRUCT @@ -175,10 +166,8 @@ documenttype[2].datatype[1].sstruct.compression.minsize 0 documenttype[2].datatype[1].sstruct.field[2] documenttype[2].datatype[1].sstruct.field[0].name "field3" documenttype[2].datatype[1].sstruct.field[0].id 722536103 -documenttype[2].datatype[1].sstruct.field[0].id_v6 1036475953 documenttype[2].datatype[1].sstruct.field[0].datatype 2 documenttype[2].datatype[1].sstruct.field[1].name "field5" documenttype[2].datatype[1].sstruct.field[1].id 1352306621 -documenttype[2].datatype[1].sstruct.field[1].id_v6 1511574032 documenttype[2].datatype[1].sstruct.field[1].datatype 1 documenttype[2].annotationtype[0] diff --git a/document/src/tests/data/inheritancetest.cfg b/document/src/tests/data/inheritancetest.cfg index 1b2a704de92..127ececd217 100644 --- a/document/src/tests/data/inheritancetest.cfg +++ b/document/src/tests/data/inheritancetest.cfg @@ -14,15 +14,12 @@ documenttype[0].datatype[0].sstruct.version 0 documenttype[0].datatype[0].sstruct.field[3] documenttype[0].datatype[0].sstruct.field[0].datatype 0 documenttype[0].datatype[0].sstruct.field[0].id 1501857786 -documenttype[0].datatype[0].sstruct.field[0].id_v6 1023904001 documenttype[0].datatype[0].sstruct.field[0].name "popularity" documenttype[0].datatype[0].sstruct.field[1].datatype 2 documenttype[0].datatype[0].sstruct.field[1].id 567626448 -documenttype[0].datatype[0].sstruct.field[1].id_v6 29129762 documenttype[0].datatype[0].sstruct.field[1].name "title" documenttype[0].datatype[0].sstruct.field[2].datatype 0 documenttype[0].datatype[0].sstruct.field[2].id 624630872 -documenttype[0].datatype[0].sstruct.field[2].id_v6 1508520108 documenttype[0].datatype[0].sstruct.field[2].name "year" documenttype[0].datatype[1].id 380234823 documenttype[0].datatype[1].type STRUCT @@ -31,7 +28,6 @@ documenttype[0].datatype[1].sstruct.version 0 documenttype[0].datatype[1].sstruct.field[1] documenttype[0].datatype[1].sstruct.field[0].datatype 1 documenttype[0].datatype[1].sstruct.field[0].id 1225171018 -documenttype[0].datatype[1].sstruct.field[0].id_v6 205748629 documenttype[0].datatype[1].sstruct.field[0].name "price" documenttype[0].datatype[2].id 874542262 documenttype[0].datatype[2].type STRUCT @@ -40,11 +36,9 @@ documenttype[0].datatype[2].sstruct.version 0 documenttype[0].datatype[2].sstruct.field[2] documenttype[0].datatype[2].sstruct.field[0].datatype 2 documenttype[0].datatype[2].sstruct.field[0].id 725636280 -documenttype[0].datatype[2].sstruct.field[0].id_v6 2127904 documenttype[0].datatype[2].sstruct.field[0].name "city" documenttype[0].datatype[2].sstruct.field[1].datatype 2 documenttype[0].datatype[2].sstruct.field[1].id 1954764240 -documenttype[0].datatype[2].sstruct.field[1].id_v6 1527533866 documenttype[0].datatype[2].sstruct.field[1].name "street" documenttype[0].inherits[1] documenttype[0].inherits[0].id 8 @@ -67,7 +61,6 @@ documenttype[1].datatype[1].sstruct.version 0 documenttype[1].datatype[1].sstruct.field[1] documenttype[1].datatype[1].sstruct.field[0].datatype 5 documenttype[1].datatype[1].sstruct.field[0].id 552396752 -documenttype[1].datatype[1].sstruct.field[0].id_v6 713868363 documenttype[1].datatype[1].sstruct.field[0].name "randomdouble" documenttype[1].datatype[2].id 874542262 documenttype[1].datatype[2].type STRUCT @@ -76,11 +69,9 @@ documenttype[1].datatype[2].sstruct.version 0 documenttype[1].datatype[2].sstruct.field[2] documenttype[1].datatype[2].sstruct.field[0].datatype 2 documenttype[1].datatype[2].sstruct.field[0].id 725636280 -documenttype[1].datatype[2].sstruct.field[0].id_v6 2127904 documenttype[1].datatype[2].sstruct.field[0].name "city" documenttype[1].datatype[2].sstruct.field[1].datatype 2 documenttype[1].datatype[2].sstruct.field[1].id 1954764240 -documenttype[1].datatype[2].sstruct.field[1].id_v6 1527533866 documenttype[1].datatype[2].sstruct.field[1].name "street" documenttype[1].datatype[3].id -1857943347 documenttype[1].datatype[3].type ARRAY @@ -92,27 +83,21 @@ documenttype[1].datatype[4].sstruct.version 0 documenttype[1].datatype[4].sstruct.field[6] documenttype[1].datatype[4].sstruct.field[0].datatype -1857943347 documenttype[1].datatype[4].sstruct.field[0].id 785651450 -documenttype[1].datatype[4].sstruct.field[0].id_v6 1210851114 documenttype[1].datatype[4].sstruct.field[0].name "addresses" documenttype[1].datatype[4].sstruct.field[1].datatype 1328286588 documenttype[1].datatype[4].sstruct.field[1].id 1692189119 -documenttype[1].datatype[4].sstruct.field[1].id_v6 866139998 documenttype[1].datatype[4].sstruct.field[1].name "albums" documenttype[1].datatype[4].sstruct.field[2].datatype 2 documenttype[1].datatype[4].sstruct.field[2].id 51903611 -documenttype[1].datatype[4].sstruct.field[2].id_v6 1854279480 documenttype[1].datatype[4].sstruct.field[2].name "artist" documenttype[1].datatype[4].sstruct.field[3].datatype 2 documenttype[1].datatype[4].sstruct.field[3].id 306708139 -documenttype[1].datatype[4].sstruct.field[3].id_v6 1047427207 documenttype[1].datatype[4].sstruct.field[3].name "phrase" documenttype[1].datatype[4].sstruct.field[4].datatype 874542262 documenttype[1].datatype[4].sstruct.field[4].id 776401886 -documenttype[1].datatype[4].sstruct.field[4].id_v6 1741595836 documenttype[1].datatype[4].sstruct.field[4].name "randomAddr" documenttype[1].datatype[4].sstruct.field[5].datatype 10 documenttype[1].datatype[4].sstruct.field[5].id 2095970198 -documenttype[1].datatype[4].sstruct.field[5].id_v6 1826424031 documenttype[1].datatype[4].sstruct.field[5].name "url" documenttype[1].inherits[2] documenttype[1].inherits[0].id -602119955 @@ -136,11 +121,9 @@ documenttype[2].datatype[1].sstruct.version 0 documenttype[2].datatype[1].sstruct.field[2] documenttype[2].datatype[1].sstruct.field[0].datatype 2 documenttype[2].datatype[1].sstruct.field[0].id 725636280 -documenttype[2].datatype[1].sstruct.field[0].id_v6 2127904 documenttype[2].datatype[1].sstruct.field[0].name "city" documenttype[2].datatype[1].sstruct.field[1].datatype 2 documenttype[2].datatype[1].sstruct.field[1].id 1954764240 -documenttype[2].datatype[1].sstruct.field[1].id_v6 1527533866 documenttype[2].datatype[1].sstruct.field[1].name "street" documenttype[2].datatype[2].id -727249584 documenttype[2].datatype[2].type STRUCT @@ -149,11 +132,9 @@ documenttype[2].datatype[2].sstruct.version 0 documenttype[2].datatype[2].sstruct.field[2] documenttype[2].datatype[2].sstruct.field[0].datatype 1 documenttype[2].datatype[2].sstruct.field[0].id 1225171018 -documenttype[2].datatype[2].sstruct.field[0].id_v6 205748629 documenttype[2].datatype[2].sstruct.field[0].name "price" documenttype[2].datatype[2].sstruct.field[1].datatype 5 documenttype[2].datatype[2].sstruct.field[1].id 552396752 -documenttype[2].datatype[2].sstruct.field[1].id_v6 713868363 documenttype[2].datatype[2].sstruct.field[1].name "randomdouble" documenttype[2].datatype[3].id -1857943347 documenttype[2].datatype[3].type ARRAY @@ -165,47 +146,36 @@ documenttype[2].datatype[4].sstruct.version 0 documenttype[2].datatype[4].sstruct.field[11] documenttype[2].datatype[4].sstruct.field[00].datatype -1857943347 documenttype[2].datatype[4].sstruct.field[00].id 785651450 -documenttype[2].datatype[4].sstruct.field[00].id_v6 1210851114 documenttype[2].datatype[4].sstruct.field[00].name "addresses" documenttype[2].datatype[4].sstruct.field[01].datatype 1328286588 documenttype[2].datatype[4].sstruct.field[01].id 1692189119 -documenttype[2].datatype[4].sstruct.field[01].id_v6 866139998 documenttype[2].datatype[4].sstruct.field[01].name "albums" documenttype[2].datatype[4].sstruct.field[02].datatype 2 documenttype[2].datatype[4].sstruct.field[02].id 51903611 -documenttype[2].datatype[4].sstruct.field[02].id_v6 1854279480 documenttype[2].datatype[4].sstruct.field[02].name "artist" documenttype[2].datatype[4].sstruct.field[03].datatype 2 documenttype[2].datatype[4].sstruct.field[03].id 306708139 -documenttype[2].datatype[4].sstruct.field[03].id_v6 1047427207 documenttype[2].datatype[4].sstruct.field[03].name "phrase" documenttype[2].datatype[4].sstruct.field[04].datatype 0 documenttype[2].datatype[4].sstruct.field[04].id 1501857786 -documenttype[2].datatype[4].sstruct.field[04].id_v6 1023904001 documenttype[2].datatype[4].sstruct.field[04].name "popularity" documenttype[2].datatype[4].sstruct.field[05].datatype 874542262 documenttype[2].datatype[4].sstruct.field[05].id 776401886 -documenttype[2].datatype[4].sstruct.field[05].id_v6 1741595836 documenttype[2].datatype[4].sstruct.field[05].name "randomAddr" documenttype[2].datatype[4].sstruct.field[06].datatype 2 documenttype[2].datatype[4].sstruct.field[06].id 1883197392 -documenttype[2].datatype[4].sstruct.field[06].id_v6 699950698 documenttype[2].datatype[4].sstruct.field[06].name "rankfeatures" documenttype[2].datatype[4].sstruct.field[07].datatype 2 documenttype[2].datatype[4].sstruct.field[07].id 1840337115 -documenttype[2].datatype[4].sstruct.field[07].id_v6 1981648971 documenttype[2].datatype[4].sstruct.field[07].name "summaryfeatures" documenttype[2].datatype[4].sstruct.field[08].datatype 2 documenttype[2].datatype[4].sstruct.field[08].id 567626448 -documenttype[2].datatype[4].sstruct.field[08].id_v6 29129762 documenttype[2].datatype[4].sstruct.field[08].name "title" documenttype[2].datatype[4].sstruct.field[09].datatype 111553393 documenttype[2].datatype[4].sstruct.field[09].id 2119414873 -documenttype[2].datatype[4].sstruct.field[09].id_v6 1826424031 documenttype[2].datatype[4].sstruct.field[09].name "url" documenttype[2].datatype[4].sstruct.field[10].datatype 0 documenttype[2].datatype[4].sstruct.field[10].id 624630872 -documenttype[2].datatype[4].sstruct.field[10].id_v6 1508520108 documenttype[2].datatype[4].sstruct.field[10].name "year" documenttype[2].inherits[1] documenttype[2].inherits[0].id 8 @@ -227,15 +197,12 @@ documenttype[3].datatype[1].sstruct.version 0 documenttype[3].datatype[1].sstruct.field[3] documenttype[3].datatype[1].sstruct.field[0].datatype 2125154557 documenttype[3].datatype[1].sstruct.field[0].id 492235657 -documenttype[3].datatype[1].sstruct.field[0].id_v6 1647256015 documenttype[3].datatype[1].sstruct.field[0].name "bindPrice" documenttype[3].datatype[1].sstruct.field[1].datatype 16 documenttype[3].datatype[1].sstruct.field[1].id 1891624676 -documenttype[3].datatype[1].sstruct.field[1].id_v6 531118233 documenttype[3].datatype[1].sstruct.field[1].name "grade" documenttype[3].datatype[1].sstruct.field[2].datatype 4 documenttype[3].datatype[1].sstruct.field[2].id 782940634 -documenttype[3].datatype[1].sstruct.field[2].id_v6 698610188 documenttype[3].datatype[1].sstruct.field[2].name "pages" documenttype[3].datatype[2].id 874542262 documenttype[3].datatype[2].type STRUCT @@ -244,11 +211,9 @@ documenttype[3].datatype[2].sstruct.version 0 documenttype[3].datatype[2].sstruct.field[2] documenttype[3].datatype[2].sstruct.field[0].datatype 2 documenttype[3].datatype[2].sstruct.field[0].id 725636280 -documenttype[3].datatype[2].sstruct.field[0].id_v6 2127904 documenttype[3].datatype[2].sstruct.field[0].name "city" documenttype[3].datatype[2].sstruct.field[1].datatype 2 documenttype[3].datatype[2].sstruct.field[1].id 1954764240 -documenttype[3].datatype[2].sstruct.field[1].id_v6 1527533866 documenttype[3].datatype[2].sstruct.field[1].name "street" documenttype[3].datatype[3].id -1857943347 documenttype[3].datatype[3].type ARRAY @@ -260,11 +225,9 @@ documenttype[3].datatype[4].sstruct.version 0 documenttype[3].datatype[4].sstruct.field[2] documenttype[3].datatype[4].sstruct.field[0].datatype -1857943347 documenttype[3].datatype[4].sstruct.field[0].id 785651450 -documenttype[3].datatype[4].sstruct.field[0].id_v6 1210851114 documenttype[3].datatype[4].sstruct.field[0].name "addresses" documenttype[3].datatype[4].sstruct.field[1].datatype 2 documenttype[3].datatype[4].sstruct.field[1].id 644499292 -documenttype[3].datatype[4].sstruct.field[1].id_v6 177126295 documenttype[3].datatype[4].sstruct.field[1].name "author" documenttype[3].inherits[2] documenttype[3].inherits[0].id -602119955 @@ -287,15 +250,12 @@ documenttype[4].datatype[1].sstruct.version 0 documenttype[4].datatype[1].sstruct.field[3] documenttype[4].datatype[1].sstruct.field[0].datatype 2125154557 documenttype[4].datatype[1].sstruct.field[0].id 492235657 -documenttype[4].datatype[1].sstruct.field[0].id_v6 1647256015 documenttype[4].datatype[1].sstruct.field[0].name "bindPrice" documenttype[4].datatype[1].sstruct.field[1].datatype 16 documenttype[4].datatype[1].sstruct.field[1].id 1891624676 -documenttype[4].datatype[1].sstruct.field[1].id_v6 531118233 documenttype[4].datatype[1].sstruct.field[1].name "grade" documenttype[4].datatype[1].sstruct.field[2].datatype 1 documenttype[4].datatype[1].sstruct.field[2].id 1225171018 -documenttype[4].datatype[1].sstruct.field[2].id_v6 205748629 documenttype[4].datatype[1].sstruct.field[2].name "price" documenttype[4].datatype[2].id 874542262 documenttype[4].datatype[2].type STRUCT @@ -304,11 +264,9 @@ documenttype[4].datatype[2].sstruct.version 0 documenttype[4].datatype[2].sstruct.field[2] documenttype[4].datatype[2].sstruct.field[0].datatype 2 documenttype[4].datatype[2].sstruct.field[0].id 725636280 -documenttype[4].datatype[2].sstruct.field[0].id_v6 2127904 documenttype[4].datatype[2].sstruct.field[0].name "city" documenttype[4].datatype[2].sstruct.field[1].datatype 2 documenttype[4].datatype[2].sstruct.field[1].id 1954764240 -documenttype[4].datatype[2].sstruct.field[1].id_v6 1527533866 documenttype[4].datatype[2].sstruct.field[1].name "street" documenttype[4].datatype[3].id -1857943347 documenttype[4].datatype[3].type ARRAY @@ -320,35 +278,27 @@ documenttype[4].datatype[4].sstruct.version 0 documenttype[4].datatype[4].sstruct.field[8] documenttype[4].datatype[4].sstruct.field[0].datatype -1857943347 documenttype[4].datatype[4].sstruct.field[0].id 785651450 -documenttype[4].datatype[4].sstruct.field[0].id_v6 1210851114 documenttype[4].datatype[4].sstruct.field[0].name "addresses" documenttype[4].datatype[4].sstruct.field[1].datatype 2 documenttype[4].datatype[4].sstruct.field[1].id 644499292 -documenttype[4].datatype[4].sstruct.field[1].id_v6 177126295 documenttype[4].datatype[4].sstruct.field[1].name "author" documenttype[4].datatype[4].sstruct.field[2].datatype 4 documenttype[4].datatype[4].sstruct.field[2].id 782940634 -documenttype[4].datatype[4].sstruct.field[2].id_v6 698610188 documenttype[4].datatype[4].sstruct.field[2].name "pages" documenttype[4].datatype[4].sstruct.field[3].datatype 0 documenttype[4].datatype[4].sstruct.field[3].id 1501857786 -documenttype[4].datatype[4].sstruct.field[3].id_v6 1023904001 documenttype[4].datatype[4].sstruct.field[3].name "popularity" documenttype[4].datatype[4].sstruct.field[4].datatype 2 documenttype[4].datatype[4].sstruct.field[4].id 1883197392 -documenttype[4].datatype[4].sstruct.field[4].id_v6 699950698 documenttype[4].datatype[4].sstruct.field[4].name "rankfeatures" documenttype[4].datatype[4].sstruct.field[5].datatype 2 documenttype[4].datatype[4].sstruct.field[5].id 1840337115 -documenttype[4].datatype[4].sstruct.field[5].id_v6 1981648971 documenttype[4].datatype[4].sstruct.field[5].name "summaryfeatures" documenttype[4].datatype[4].sstruct.field[6].datatype 2 documenttype[4].datatype[4].sstruct.field[6].id 567626448 -documenttype[4].datatype[4].sstruct.field[6].id_v6 29129762 documenttype[4].datatype[4].sstruct.field[6].name "title" documenttype[4].datatype[4].sstruct.field[7].datatype 0 documenttype[4].datatype[4].sstruct.field[7].id 624630872 -documenttype[4].datatype[4].sstruct.field[7].id_v6 1508520108 documenttype[4].datatype[4].sstruct.field[7].name "year" documenttype[4].inherits[1] documenttype[4].inherits[0].id 8 diff --git a/document/src/tests/repo/documenttypes.cfg b/document/src/tests/repo/documenttypes.cfg index 4641663a94b..f5a0242e6a6 100644 --- a/document/src/tests/repo/documenttypes.cfg +++ b/document/src/tests/repo/documenttypes.cfg @@ -22,19 +22,15 @@ documenttype[0].datatype[03].sstruct.version 0 documenttype[0].datatype[03].sstruct.field[4] documenttype[0].datatype[03].sstruct.field[bytearr].datatype 49942803 documenttype[0].datatype[03].sstruct.field[bytearr].id 1079701754 -documenttype[0].datatype[03].sstruct.field[bytearr].id_v6 1198855694 documenttype[0].datatype[03].sstruct.field[bytearr].name "bytearr" documenttype[0].datatype[03].sstruct.field[mymap].datatype 339965458 documenttype[0].datatype[03].sstruct.field[mymap].id 1954178122 -documenttype[0].datatype[03].sstruct.field[mymap].id_v6 707189723 documenttype[0].datatype[03].sstruct.field[mymap].name "mymap" documenttype[0].datatype[03].sstruct.field[structfield].datatype 2 documenttype[0].datatype[03].sstruct.field[structfield].id 1726890940 -documenttype[0].datatype[03].sstruct.field[structfield].id_v6 418303145 documenttype[0].datatype[03].sstruct.field[structfield].name "structfield" documenttype[0].datatype[03].sstruct.field[title].datatype 2 documenttype[0].datatype[03].sstruct.field[title].id 567626448 -documenttype[0].datatype[03].sstruct.field[title].id_v6 29129762 documenttype[0].datatype[03].sstruct.field[title].name "title" documenttype[0].datatype[04].id 759956026 documenttype[0].datatype[04].type ARRAY @@ -71,11 +67,9 @@ documenttype[0].datatype[12].sstruct.version 0 documenttype[0].datatype[12].sstruct.field[2] documenttype[0].datatype[12].sstruct.field[s1].datatype 2 documenttype[0].datatype[12].sstruct.field[s1].id 2146820765 -documenttype[0].datatype[12].sstruct.field[s1].id_v6 142373281 documenttype[0].datatype[12].sstruct.field[s1].name "s1" documenttype[0].datatype[12].sstruct.field[s2].datatype 2 documenttype[0].datatype[12].sstruct.field[s2].id 45366795 -documenttype[0].datatype[12].sstruct.field[s2].id_v6 31106270 documenttype[0].datatype[12].sstruct.field[s2].name "s2" documenttype[0].datatype[13].id -1244829667 documenttype[0].datatype[13].type ARRAY @@ -100,19 +94,15 @@ documenttype[0].datatype[17].sstruct.version 0 documenttype[0].datatype[17].sstruct.field[4] documenttype[0].datatype[17].sstruct.field[FlagsCounter].datatype -1865479609 documenttype[0].datatype[17].sstruct.field[FlagsCounter].id 1741227606 -documenttype[0].datatype[17].sstruct.field[FlagsCounter].id_v6 1287497652 documenttype[0].datatype[17].sstruct.field[FlagsCounter].name "FlagsCounter" documenttype[0].datatype[17].sstruct.field[Name].datatype 2 documenttype[0].datatype[17].sstruct.field[Name].id 2002760220 -documenttype[0].datatype[17].sstruct.field[Name].id_v6 62942997 documenttype[0].datatype[17].sstruct.field[Name].name "Name" documenttype[0].datatype[17].sstruct.field[Version].datatype 0 documenttype[0].datatype[17].sstruct.field[Version].id 64430502 -documenttype[0].datatype[17].sstruct.field[Version].id_v6 634243672 documenttype[0].datatype[17].sstruct.field[Version].name "Version" documenttype[0].datatype[17].sstruct.field[anotherfolder].datatype 294108848 documenttype[0].datatype[17].sstruct.field[anotherfolder].id 1582421848 -documenttype[0].datatype[17].sstruct.field[anotherfolder].id_v6 1898725199 documenttype[0].datatype[17].sstruct.field[anotherfolder].name "anotherfolder" documenttype[0].datatype[18].id 2065577986 documenttype[0].datatype[18].type WSET @@ -130,7 +120,6 @@ documenttype[0].datatype[20].sstruct.version 0 documenttype[0].datatype[20].sstruct.field[1] documenttype[0].datatype[20].sstruct.field[complexarray].datatype 1100964733 documenttype[0].datatype[20].sstruct.field[complexarray].id 1028383787 -documenttype[0].datatype[20].sstruct.field[complexarray].id_v6 658530305 documenttype[0].datatype[20].sstruct.field[complexarray].name "complexarray" documenttype[0].datatype[21].id 2125154557 documenttype[0].datatype[21].type MAP @@ -158,103 +147,78 @@ documenttype[0].datatype[26].sstruct.version 0 documenttype[0].datatype[26].sstruct.field[25] documenttype[0].datatype[26].sstruct.field[Folders].datatype -389833101 documenttype[0].datatype[26].sstruct.field[Folders].id 34575524 -documenttype[0].datatype[26].sstruct.field[Folders].id_v6 280569744 documenttype[0].datatype[26].sstruct.field[Folders].name "Folders" documenttype[0].datatype[26].sstruct.field[abyte].datatype 16 documenttype[0].datatype[26].sstruct.field[abyte].id 110138156 -documenttype[0].datatype[26].sstruct.field[abyte].id_v6 1369099343 documenttype[0].datatype[26].sstruct.field[abyte].name "abyte" documenttype[0].datatype[26].sstruct.field[album0].datatype 18 documenttype[0].datatype[26].sstruct.field[album0].id 764312262 -documenttype[0].datatype[26].sstruct.field[album0].id_v6 1409364160 documenttype[0].datatype[26].sstruct.field[album0].name "album0" documenttype[0].datatype[26].sstruct.field[album1].datatype 18 documenttype[0].datatype[26].sstruct.field[album1].id 1967160809 -documenttype[0].datatype[26].sstruct.field[album1].id_v6 1833811264 documenttype[0].datatype[26].sstruct.field[album1].name "album1" documenttype[0].datatype[26].sstruct.field[along].datatype 4 documenttype[0].datatype[26].sstruct.field[along].id 1206464520 -documenttype[0].datatype[26].sstruct.field[along].id_v6 871280609 documenttype[0].datatype[26].sstruct.field[along].name "along" documenttype[0].datatype[26].sstruct.field[arrarr].datatype -794985308 documenttype[0].datatype[26].sstruct.field[arrarr].id 1962567166 -documenttype[0].datatype[26].sstruct.field[arrarr].id_v6 885141301 documenttype[0].datatype[26].sstruct.field[arrarr].name "arrarr" documenttype[0].datatype[26].sstruct.field[arrayfield].datatype -1245117006 documenttype[0].datatype[26].sstruct.field[arrayfield].id 965790107 -documenttype[0].datatype[26].sstruct.field[arrayfield].id_v6 1010955705 documenttype[0].datatype[26].sstruct.field[arrayfield].name "arrayfield" documenttype[0].datatype[26].sstruct.field[arraymapfield].datatype 435886609 documenttype[0].datatype[26].sstruct.field[arraymapfield].id 1670805928 -documenttype[0].datatype[26].sstruct.field[arraymapfield].id_v6 1940354311 documenttype[0].datatype[26].sstruct.field[arraymapfield].name "arraymapfield" documenttype[0].datatype[26].sstruct.field[doublemapfield].datatype 2138385264 documenttype[0].datatype[26].sstruct.field[doublemapfield].id 877047192 -documenttype[0].datatype[26].sstruct.field[doublemapfield].id_v6 957317090 documenttype[0].datatype[26].sstruct.field[doublemapfield].name "doublemapfield" documenttype[0].datatype[26].sstruct.field[floatmapfield].datatype 2125154557 documenttype[0].datatype[26].sstruct.field[floatmapfield].id 1239120925 -documenttype[0].datatype[26].sstruct.field[floatmapfield].id_v6 1609437589 documenttype[0].datatype[26].sstruct.field[floatmapfield].name "floatmapfield" documenttype[0].datatype[26].sstruct.field[intmapfield].datatype -1584287606 documenttype[0].datatype[26].sstruct.field[intmapfield].id 121004462 -documenttype[0].datatype[26].sstruct.field[intmapfield].id_v6 1642487905 documenttype[0].datatype[26].sstruct.field[intmapfield].name "intmapfield" documenttype[0].datatype[26].sstruct.field[foo].datatype 4 documenttype[0].datatype[26].sstruct.field[foo].id 266111229 -documenttype[0].datatype[26].sstruct.field[foo].id_v6 383833303 documenttype[0].datatype[26].sstruct.field[foo].name "foo" documenttype[0].datatype[26].sstruct.field[longmapfield].datatype -1715531035 documenttype[0].datatype[26].sstruct.field[longmapfield].id 477718745 -documenttype[0].datatype[26].sstruct.field[longmapfield].id_v6 920341968 documenttype[0].datatype[26].sstruct.field[longmapfield].name "longmapfield" documenttype[0].datatype[26].sstruct.field[maparr].datatype 69621385 documenttype[0].datatype[26].sstruct.field[maparr].id 904375219 -documenttype[0].datatype[26].sstruct.field[maparr].id_v6 63700074 documenttype[0].datatype[26].sstruct.field[maparr].name "maparr" documenttype[0].datatype[26].sstruct.field[mystructarr].datatype 759956026 documenttype[0].datatype[26].sstruct.field[mystructarr].id 595856991 -documenttype[0].datatype[26].sstruct.field[mystructarr].id_v6 764861972 documenttype[0].datatype[26].sstruct.field[mystructarr].name "mystructarr" documenttype[0].datatype[26].sstruct.field[mystructfield].datatype -2092985853 documenttype[0].datatype[26].sstruct.field[mystructfield].id 1348513378 -documenttype[0].datatype[26].sstruct.field[mystructfield].id_v6 2033170300 documenttype[0].datatype[26].sstruct.field[mystructfield].name "mystructfield" documenttype[0].datatype[26].sstruct.field[mystructmap].datatype 1901258752 documenttype[0].datatype[26].sstruct.field[mystructmap].id 1511423250 -documenttype[0].datatype[26].sstruct.field[mystructmap].id_v6 449602635 documenttype[0].datatype[26].sstruct.field[mystructmap].name "mystructmap" documenttype[0].datatype[26].sstruct.field[setfield].datatype 1328286588 documenttype[0].datatype[26].sstruct.field[setfield].id 761581914 -documenttype[0].datatype[26].sstruct.field[setfield].id_v6 1762943268 documenttype[0].datatype[26].sstruct.field[setfield].name "setfield" documenttype[0].datatype[26].sstruct.field[setfield2].datatype 18 documenttype[0].datatype[26].sstruct.field[setfield2].id 1066659198 -documenttype[0].datatype[26].sstruct.field[setfield2].id_v6 813038565 documenttype[0].datatype[26].sstruct.field[setfield2].name "setfield2" documenttype[0].datatype[26].sstruct.field[setfield3].datatype 2125328771 documenttype[0].datatype[26].sstruct.field[setfield3].id 1180155772 -documenttype[0].datatype[26].sstruct.field[setfield3].id_v6 1697232199 documenttype[0].datatype[26].sstruct.field[setfield3].name "setfield3" documenttype[0].datatype[26].sstruct.field[setfield4].datatype 2065577986 documenttype[0].datatype[26].sstruct.field[setfield4].id 1254131631 -documenttype[0].datatype[26].sstruct.field[setfield4].id_v6 119755202 documenttype[0].datatype[26].sstruct.field[setfield4].name "setfield4" documenttype[0].datatype[26].sstruct.field[stringmapfield].datatype 339965458 documenttype[0].datatype[26].sstruct.field[stringmapfield].id 117465687 -documenttype[0].datatype[26].sstruct.field[stringmapfield].id_v6 1492788095 documenttype[0].datatype[26].sstruct.field[stringmapfield].name "stringmapfield" documenttype[0].datatype[26].sstruct.field[structarrayfield].datatype -1244829667 documenttype[0].datatype[26].sstruct.field[structarrayfield].id 335048518 -documenttype[0].datatype[26].sstruct.field[structarrayfield].id_v6 607034174 documenttype[0].datatype[26].sstruct.field[structarrayfield].name "structarrayfield" documenttype[0].datatype[26].sstruct.field[structfield].datatype 109267174 documenttype[0].datatype[26].sstruct.field[structfield].id 486207386 -documenttype[0].datatype[26].sstruct.field[structfield].id_v6 418303145 documenttype[0].datatype[26].sstruct.field[structfield].name "structfield" documenttype[0].datatype[26].sstruct.field[tagfield].datatype 18 documenttype[0].datatype[26].sstruct.field[tagfield].id 1653562069 -documenttype[0].datatype[26].sstruct.field[tagfield].id_v6 938523246 documenttype[0].datatype[26].sstruct.field[tagfield].name "tagfield" documenttype[0].inherits[1] documenttype[0].inherits[document.0].id 8 @@ -280,11 +244,9 @@ documenttype[1].datatype[02].sstruct.version 0 documenttype[1].datatype[02].sstruct.field[2] documenttype[1].datatype[02].sstruct.field[s1].datatype 2 documenttype[1].datatype[02].sstruct.field[s1].id 2146820765 -documenttype[1].datatype[02].sstruct.field[s1].id_v6 142373281 documenttype[1].datatype[02].sstruct.field[s1].name "s1" documenttype[1].datatype[02].sstruct.field[s2].datatype 2 documenttype[1].datatype[02].sstruct.field[s2].id 45366795 -documenttype[1].datatype[02].sstruct.field[s2].id_v6 31106270 documenttype[1].datatype[02].sstruct.field[s2].name "s2" documenttype[1].datatype[03].id 294108848 documenttype[1].datatype[03].type STRUCT @@ -293,19 +255,15 @@ documenttype[1].datatype[03].sstruct.version 0 documenttype[1].datatype[03].sstruct.field[4] documenttype[1].datatype[03].sstruct.field[FlagsCounter].datatype -1865479609 documenttype[1].datatype[03].sstruct.field[FlagsCounter].id 1741227606 -documenttype[1].datatype[03].sstruct.field[FlagsCounter].id_v6 1287497652 documenttype[1].datatype[03].sstruct.field[FlagsCounter].name "FlagsCounter" documenttype[1].datatype[03].sstruct.field[Name].datatype 2 documenttype[1].datatype[03].sstruct.field[Name].id 2002760220 -documenttype[1].datatype[03].sstruct.field[Name].id_v6 62942997 documenttype[1].datatype[03].sstruct.field[Name].name "Name" documenttype[1].datatype[03].sstruct.field[Version].datatype 0 documenttype[1].datatype[03].sstruct.field[Version].id 64430502 -documenttype[1].datatype[03].sstruct.field[Version].id_v6 634243672 documenttype[1].datatype[03].sstruct.field[Version].name "Version" documenttype[1].datatype[03].sstruct.field[anotherfolder].datatype 294108848 documenttype[1].datatype[03].sstruct.field[anotherfolder].id 1582421848 -documenttype[1].datatype[03].sstruct.field[anotherfolder].id_v6 1898725199 documenttype[1].datatype[03].sstruct.field[anotherfolder].name "anotherfolder" documenttype[1].datatype[04].id 2125328771 documenttype[1].datatype[04].type WSET @@ -331,63 +289,48 @@ documenttype[1].datatype[08].sstruct.version 0 documenttype[1].datatype[08].sstruct.field[15] documenttype[1].datatype[08].sstruct.field[abyte].datatype 16 documenttype[1].datatype[08].sstruct.field[abyte].id 110138156 -documenttype[1].datatype[08].sstruct.field[abyte].id_v6 1369099343 documenttype[1].datatype[08].sstruct.field[abyte].name "abyte" documenttype[1].datatype[08].sstruct.field[album0].datatype 18 documenttype[1].datatype[08].sstruct.field[album0].id 764312262 -documenttype[1].datatype[08].sstruct.field[album0].id_v6 1409364160 documenttype[1].datatype[08].sstruct.field[album0].name "album0" documenttype[1].datatype[08].sstruct.field[album1].datatype 18 documenttype[1].datatype[08].sstruct.field[album1].id 1967160809 -documenttype[1].datatype[08].sstruct.field[album1].id_v6 1833811264 documenttype[1].datatype[08].sstruct.field[album1].name "album1" documenttype[1].datatype[08].sstruct.field[along].datatype 4 documenttype[1].datatype[08].sstruct.field[along].id 1206464520 -documenttype[1].datatype[08].sstruct.field[along].id_v6 871280609 documenttype[1].datatype[08].sstruct.field[along].name "along" documenttype[1].datatype[08].sstruct.field[arrayfield].datatype -1245117006 documenttype[1].datatype[08].sstruct.field[arrayfield].id 965790107 -documenttype[1].datatype[08].sstruct.field[arrayfield].id_v6 1010955705 documenttype[1].datatype[08].sstruct.field[arrayfield].name "arrayfield" documenttype[1].datatype[08].sstruct.field[foo].datatype 4 documenttype[1].datatype[08].sstruct.field[foo].id 266111229 -documenttype[1].datatype[08].sstruct.field[foo].id_v6 383833303 documenttype[1].datatype[08].sstruct.field[foo].name "foo" documenttype[1].datatype[08].sstruct.field[other].datatype 4 documenttype[1].datatype[08].sstruct.field[other].id 2443357 -documenttype[1].datatype[08].sstruct.field[other].id_v6 903806222 documenttype[1].datatype[08].sstruct.field[other].name "other" documenttype[1].datatype[08].sstruct.field[rankfeatures].datatype 2 documenttype[1].datatype[08].sstruct.field[rankfeatures].id 1883197392 -documenttype[1].datatype[08].sstruct.field[rankfeatures].id_v6 699950698 documenttype[1].datatype[08].sstruct.field[rankfeatures].name "rankfeatures" documenttype[1].datatype[08].sstruct.field[setfield].datatype 1328286588 documenttype[1].datatype[08].sstruct.field[setfield].id 761581914 -documenttype[1].datatype[08].sstruct.field[setfield].id_v6 1762943268 documenttype[1].datatype[08].sstruct.field[setfield].name "setfield" documenttype[1].datatype[08].sstruct.field[setfield2].datatype 18 documenttype[1].datatype[08].sstruct.field[setfield2].id 1066659198 -documenttype[1].datatype[08].sstruct.field[setfield2].id_v6 813038565 documenttype[1].datatype[08].sstruct.field[setfield2].name "setfield2" documenttype[1].datatype[08].sstruct.field[setfield3].datatype 2125328771 documenttype[1].datatype[08].sstruct.field[setfield3].id 1180155772 -documenttype[1].datatype[08].sstruct.field[setfield3].id_v6 1697232199 documenttype[1].datatype[08].sstruct.field[setfield3].name "setfield3" documenttype[1].datatype[08].sstruct.field[setfield4].datatype 2065577986 documenttype[1].datatype[08].sstruct.field[setfield4].id 1254131631 -documenttype[1].datatype[08].sstruct.field[setfield4].id_v6 119755202 documenttype[1].datatype[08].sstruct.field[setfield4].name "setfield4" documenttype[1].datatype[08].sstruct.field[stringmapfield].datatype 339965458 documenttype[1].datatype[08].sstruct.field[stringmapfield].id 117465687 -documenttype[1].datatype[08].sstruct.field[stringmapfield].id_v6 1492788095 documenttype[1].datatype[08].sstruct.field[stringmapfield].name "stringmapfield" documenttype[1].datatype[08].sstruct.field[summaryfeatures].datatype 2 documenttype[1].datatype[08].sstruct.field[summaryfeatures].id 1840337115 -documenttype[1].datatype[08].sstruct.field[summaryfeatures].id_v6 1981648971 documenttype[1].datatype[08].sstruct.field[summaryfeatures].name "summaryfeatures" documenttype[1].datatype[08].sstruct.field[tagfield].datatype 18 documenttype[1].datatype[08].sstruct.field[tagfield].id 1653562069 -documenttype[1].datatype[08].sstruct.field[tagfield].id_v6 938523246 documenttype[1].datatype[08].sstruct.field[tagfield].name "tagfield" documenttype[1].datatype[09].id 49942803 documenttype[1].datatype[09].type ARRAY @@ -399,19 +342,15 @@ documenttype[1].datatype[10].sstruct.version 0 documenttype[1].datatype[10].sstruct.field[4] documenttype[1].datatype[10].sstruct.field[bytearr].datatype 49942803 documenttype[1].datatype[10].sstruct.field[bytearr].id 1079701754 -documenttype[1].datatype[10].sstruct.field[bytearr].id_v6 1198855694 documenttype[1].datatype[10].sstruct.field[bytearr].name "bytearr" documenttype[1].datatype[10].sstruct.field[mymap].datatype 339965458 documenttype[1].datatype[10].sstruct.field[mymap].id 1954178122 -documenttype[1].datatype[10].sstruct.field[mymap].id_v6 707189723 documenttype[1].datatype[10].sstruct.field[mymap].name "mymap" documenttype[1].datatype[10].sstruct.field[structfield].datatype 2 documenttype[1].datatype[10].sstruct.field[structfield].id 1726890940 -documenttype[1].datatype[10].sstruct.field[structfield].id_v6 418303145 documenttype[1].datatype[10].sstruct.field[structfield].name "structfield" documenttype[1].datatype[10].sstruct.field[title].datatype 2 documenttype[1].datatype[10].sstruct.field[title].id 567626448 -documenttype[1].datatype[10].sstruct.field[title].id_v6 29129762 documenttype[1].datatype[10].sstruct.field[title].name "title" documenttype[1].datatype[11].id -1408707420 documenttype[1].datatype[11].type STRUCT diff --git a/document/src/tests/serialization/annotation.serialize.test.repo.cfg b/document/src/tests/serialization/annotation.serialize.test.repo.cfg index d7fa447fa34..29e3ce386f4 100644 --- a/document/src/tests/serialization/annotation.serialize.test.repo.cfg +++ b/document/src/tests/serialization/annotation.serialize.test.repo.cfg @@ -41,11 +41,9 @@ documenttype[0].datatype[1].sstruct.compression.minsize 0 documenttype[0].datatype[1].sstruct.field[2] documenttype[0].datatype[1].sstruct.field[0].name "latitude" documenttype[0].datatype[1].sstruct.field[0].id 945500241 -documenttype[0].datatype[1].sstruct.field[0].id_v6 1437005468 documenttype[0].datatype[1].sstruct.field[0].datatype 4 documenttype[0].datatype[1].sstruct.field[1].name "longitude" documenttype[0].datatype[1].sstruct.field[1].id 1458007305 -documenttype[0].datatype[1].sstruct.field[1].id_v6 1517975127 documenttype[0].datatype[1].sstruct.field[1].datatype 4 documenttype[0].datatype[2].id 10022 documenttype[0].datatype[2].type ANNOTATIONREF @@ -97,11 +95,9 @@ documenttype[0].datatype[4].sstruct.compression.minsize 0 documenttype[0].datatype[4].sstruct.field[2] documenttype[0].datatype[4].sstruct.field[0].name "position" documenttype[0].datatype[4].sstruct.field[0].id 818217702 -documenttype[0].datatype[4].sstruct.field[0].id_v6 632310942 documenttype[0].datatype[4].sstruct.field[0].datatype 10012 documenttype[0].datatype[4].sstruct.field[1].name "references" documenttype[0].datatype[4].sstruct.field[1].id 1581548957 -documenttype[0].datatype[4].sstruct.field[1].id_v6 839497794 documenttype[0].datatype[4].sstruct.field[1].datatype 10032 documenttype[0].annotationtype[6] documenttype[0].annotationtype[0].id 20000 diff --git a/document/src/tests/struct_anno/documenttypes.cfg b/document/src/tests/struct_anno/documenttypes.cfg index 38ef6d54125..5c5031d077c 100644 --- a/document/src/tests/struct_anno/documenttypes.cfg +++ b/document/src/tests/struct_anno/documenttypes.cfg @@ -25,15 +25,12 @@ documenttype[0].datatype[0].sstruct.compression.minsize 0 documenttype[0].datatype[0].sstruct.field[3] documenttype[0].datatype[0].sstruct.field[0].name "my_url" documenttype[0].datatype[0].sstruct.field[0].id 1127377169 -documenttype[0].datatype[0].sstruct.field[0].id_v6 707904318 documenttype[0].datatype[0].sstruct.field[0].datatype 111553393 documenttype[0].datatype[0].sstruct.field[1].name "rankfeatures" documenttype[0].datatype[0].sstruct.field[1].id 1883197392 -documenttype[0].datatype[0].sstruct.field[1].id_v6 699950698 documenttype[0].datatype[0].sstruct.field[1].datatype 2 documenttype[0].datatype[0].sstruct.field[2].name "summaryfeatures" documenttype[0].datatype[0].sstruct.field[2].id 1840337115 -documenttype[0].datatype[0].sstruct.field[2].id_v6 1981648971 documenttype[0].datatype[0].sstruct.field[2].datatype 2 documenttype[0].datatype[1].id 1968090595 documenttype[0].datatype[1].type STRUCT @@ -77,7 +74,6 @@ documenttype[1].datatype[0].sstruct.compression.minsize 0 documenttype[1].datatype[0].sstruct.field[1] documenttype[1].datatype[0].sstruct.field[0].name "my_url" documenttype[1].datatype[0].sstruct.field[0].id 1127377169 -documenttype[1].datatype[0].sstruct.field[0].id_v6 707904318 documenttype[1].datatype[0].sstruct.field[0].datatype 111553393 documenttype[1].datatype[1].id 1008689562 documenttype[1].datatype[1].type STRUCT diff --git a/document/src/vespa/document/config/documenttypes.def b/document/src/vespa/document/config/documenttypes.def index c0c4f50ab86..fb3fcd8b123 100644 --- a/document/src/vespa/document/config/documenttypes.def +++ b/document/src/vespa/document/config/documenttypes.def @@ -74,9 +74,6 @@ documenttype[].datatype[].sstruct.field[].name string ## Specify a document field id. If not specified, this is generated by a hash function documenttype[].datatype[].sstruct.field[].id int -## Specify a document field id for serialization version 6. If not specified, this is generated by a hash function -documenttype[].datatype[].sstruct.field[].id_v6 int - ## Specify the datatype of the field. Can only be a type defined in document ## or one of its inherited document types. documenttype[].datatype[].sstruct.field[].datatype int diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableRepository.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableRepository.java index 04f2188a594..27684e20aff 100755 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableRepository.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableRepository.java @@ -49,13 +49,8 @@ final class RoutableRepository { log.log(LogLevel.ERROR, "Received empty byte array for deserialization."); return null; } - DocumentDeserializer in; + DocumentDeserializer in = DocumentDeserializerFactory.createHead(docMan, GrowableByteBuffer.wrap(data)); - if (version.getMajor() >= 5) { - in = DocumentDeserializerFactory.createHead(docMan, GrowableByteBuffer.wrap(data)); - } else { - in = DocumentDeserializerFactory.create42(docMan, GrowableByteBuffer.wrap(data)); - } int type = in.getInt(null); RoutableFactory factory = getFactory(version, type); diff --git a/documentapi/test/cfg/testdoctypes.cfg b/documentapi/test/cfg/testdoctypes.cfg index db071076fc4..e5098f9492a 100644 --- a/documentapi/test/cfg/testdoctypes.cfg +++ b/documentapi/test/cfg/testdoctypes.cfg @@ -25,7 +25,6 @@ documenttype[0].datatype[0].sstruct.compression.minsize 0 documenttype[0].datatype[0].sstruct.field[1] documenttype[0].datatype[0].sstruct.field[0].name "longfield" documenttype[0].datatype[0].sstruct.field[0].id 1589309697 -documenttype[0].datatype[0].sstruct.field[0].id_v6 477609536 documenttype[0].datatype[0].sstruct.field[0].datatype 4 documenttype[0].datatype[1].id -1636745577 documenttype[0].datatype[1].type STRUCT @@ -45,19 +44,15 @@ documenttype[0].datatype[1].sstruct.compression.minsize 0 documenttype[0].datatype[1].sstruct.field[4] documenttype[0].datatype[1].sstruct.field[0].name "floatfield" documenttype[0].datatype[1].sstruct.field[0].id 1055999199 -documenttype[0].datatype[1].sstruct.field[0].id_v6 657399019 documenttype[0].datatype[1].sstruct.field[0].datatype 1 documenttype[0].datatype[1].sstruct.field[1].name "longfield" documenttype[0].datatype[1].sstruct.field[1].id 1589309697 -documenttype[0].datatype[1].sstruct.field[1].id_v6 477609536 documenttype[0].datatype[1].sstruct.field[1].datatype 4 documenttype[0].datatype[1].sstruct.field[2].name "stringfield" documenttype[0].datatype[1].sstruct.field[2].id 1182460484 -documenttype[0].datatype[1].sstruct.field[2].id_v6 779638844 documenttype[0].datatype[1].sstruct.field[2].datatype 2 documenttype[0].datatype[1].sstruct.field[3].name "urifield" documenttype[0].datatype[1].sstruct.field[3].id 628407450 -documenttype[0].datatype[1].sstruct.field[3].id_v6 756285986 documenttype[0].datatype[1].sstruct.field[3].datatype 10 documenttype[0].datatype[2].id 1878320748 documenttype[0].datatype[2].type STRUCT @@ -77,23 +72,18 @@ documenttype[0].datatype[2].sstruct.compression.minsize 0 documenttype[0].datatype[2].sstruct.field[5] documenttype[0].datatype[2].sstruct.field[0].name "bytefield" documenttype[0].datatype[2].sstruct.field[0].id 1924064342 -documenttype[0].datatype[2].sstruct.field[0].id_v6 2050488857 documenttype[0].datatype[2].sstruct.field[0].datatype 16 documenttype[0].datatype[2].sstruct.field[1].name "doublefield" documenttype[0].datatype[2].sstruct.field[1].id 421343958 -documenttype[0].datatype[2].sstruct.field[1].id_v6 944141865 documenttype[0].datatype[2].sstruct.field[1].datatype 5 documenttype[0].datatype[2].sstruct.field[2].name "foo" documenttype[0].datatype[2].sstruct.field[2].id 1747747633 -documenttype[0].datatype[2].sstruct.field[2].id_v6 2143417350 documenttype[0].datatype[2].sstruct.field[2].datatype 666999 documenttype[0].datatype[2].sstruct.field[3].name "intfield" documenttype[0].datatype[2].sstruct.field[3].id 435380425 -documenttype[0].datatype[2].sstruct.field[3].id_v6 545156740 documenttype[0].datatype[2].sstruct.field[3].datatype 0 documenttype[0].datatype[2].sstruct.field[4].name "rawfield" documenttype[0].datatype[2].sstruct.field[4].id 172982133 -documenttype[0].datatype[2].sstruct.field[4].id_v6 84029972 documenttype[0].datatype[2].sstruct.field[4].datatype 3 documenttype[0].annotationtype[0] documenttype[1].id -1146158894 @@ -121,7 +111,6 @@ documenttype[1].datatype[0].sstruct.compression.minsize 0 documenttype[1].datatype[0].sstruct.field[1] documenttype[1].datatype[0].sstruct.field[0].name "longfield" documenttype[1].datatype[0].sstruct.field[0].id 1589309697 -documenttype[1].datatype[0].sstruct.field[0].id_v6 477609536 documenttype[1].datatype[0].sstruct.field[0].datatype 4 documenttype[1].datatype[1].id 192273965 documenttype[1].datatype[1].type STRUCT @@ -157,6 +146,5 @@ documenttype[1].datatype[2].sstruct.compression.minsize 0 documenttype[1].datatype[2].sstruct.field[1] documenttype[1].datatype[2].sstruct.field[0].name "intfield" documenttype[1].datatype[2].sstruct.field[0].id 435380425 -documenttype[1].datatype[2].sstruct.field[0].id_v6 545156740 documenttype[1].datatype[2].sstruct.field[0].datatype 0 documenttype[1].annotationtype[0] diff --git a/storage/src/tests/config-doctypes.cfg b/storage/src/tests/config-doctypes.cfg index f41593ebfc3..c99b7c4cd13 100644 --- a/storage/src/tests/config-doctypes.cfg +++ b/storage/src/tests/config-doctypes.cfg @@ -25,15 +25,12 @@ documenttype[0].datatype[0].sstruct.compression.minsize 0 documenttype[0].datatype[0].sstruct.field[3] documenttype[0].datatype[0].sstruct.field[0].name "author" documenttype[0].datatype[0].sstruct.field[0].id 644499292 -documenttype[0].datatype[0].sstruct.field[0].id_v6 177126295 documenttype[0].datatype[0].sstruct.field[0].datatype 2 documenttype[0].datatype[0].sstruct.field[1].name "date" documenttype[0].datatype[0].sstruct.field[1].id 491786523 -documenttype[0].datatype[0].sstruct.field[1].id_v6 916979460 documenttype[0].datatype[0].sstruct.field[1].datatype 0 documenttype[0].datatype[0].sstruct.field[2].name "subject" documenttype[0].datatype[0].sstruct.field[2].id 1797950813 -documenttype[0].datatype[0].sstruct.field[2].id_v6 943449689 documenttype[0].datatype[0].sstruct.field[2].datatype 2 documenttype[0].datatype[1].id 749465898 documenttype[0].datatype[1].type STRUCT @@ -53,7 +50,6 @@ documenttype[0].datatype[1].sstruct.compression.minsize 0 documenttype[0].datatype[1].sstruct.field[1] documenttype[0].datatype[1].sstruct.field[0].name "content" documenttype[0].datatype[1].sstruct.field[0].id 1721764358 -documenttype[0].datatype[1].sstruct.field[0].id_v6 1751481844 documenttype[0].datatype[1].sstruct.field[0].datatype 3 documenttype[0].annotationtype[0] documenttype[1].id -653677105 @@ -81,15 +77,12 @@ documenttype[1].datatype[0].sstruct.compression.minsize 0 documenttype[1].datatype[0].sstruct.field[3] documenttype[1].datatype[0].sstruct.field[0].name "author" documenttype[1].datatype[0].sstruct.field[0].id 644499292 -documenttype[1].datatype[0].sstruct.field[0].id_v6 177126295 documenttype[1].datatype[0].sstruct.field[0].datatype 2 documenttype[1].datatype[0].sstruct.field[1].name "date" documenttype[1].datatype[0].sstruct.field[1].id 491786523 -documenttype[1].datatype[0].sstruct.field[1].id_v6 916979460 documenttype[1].datatype[0].sstruct.field[1].datatype 0 documenttype[1].datatype[0].sstruct.field[2].name "subject" documenttype[1].datatype[0].sstruct.field[2].id 1797950813 -documenttype[1].datatype[0].sstruct.field[2].id_v6 943449689 documenttype[1].datatype[0].sstruct.field[2].datatype 2 documenttype[1].datatype[1].id 1473469605 documenttype[1].datatype[1].type STRUCT @@ -109,7 +102,6 @@ documenttype[1].datatype[1].sstruct.compression.minsize 0 documenttype[1].datatype[1].sstruct.field[1] documenttype[1].datatype[1].sstruct.field[0].name "content" documenttype[1].datatype[1].sstruct.field[0].id 1721764358 -documenttype[1].datatype[1].sstruct.field[0].id_v6 1751481844 documenttype[1].datatype[1].sstruct.field[0].datatype 3 documenttype[1].annotationtype[0] documenttype[2].id 238423572 @@ -153,6 +145,5 @@ documenttype[2].datatype[1].sstruct.compression.minsize 0 documenttype[2].datatype[1].sstruct.field[1] documenttype[2].datatype[1].sstruct.field[0].name "content" documenttype[2].datatype[1].sstruct.field[0].id 5 -documenttype[2].datatype[1].sstruct.field[0].id_v6 5 documenttype[2].datatype[1].sstruct.field[0].datatype 2 documenttype[2].annotationtype[0] diff --git a/storageserver/src/tests/config-doctypes.cfg b/storageserver/src/tests/config-doctypes.cfg index f41593ebfc3..c99b7c4cd13 100644 --- a/storageserver/src/tests/config-doctypes.cfg +++ b/storageserver/src/tests/config-doctypes.cfg @@ -25,15 +25,12 @@ documenttype[0].datatype[0].sstruct.compression.minsize 0 documenttype[0].datatype[0].sstruct.field[3] documenttype[0].datatype[0].sstruct.field[0].name "author" documenttype[0].datatype[0].sstruct.field[0].id 644499292 -documenttype[0].datatype[0].sstruct.field[0].id_v6 177126295 documenttype[0].datatype[0].sstruct.field[0].datatype 2 documenttype[0].datatype[0].sstruct.field[1].name "date" documenttype[0].datatype[0].sstruct.field[1].id 491786523 -documenttype[0].datatype[0].sstruct.field[1].id_v6 916979460 documenttype[0].datatype[0].sstruct.field[1].datatype 0 documenttype[0].datatype[0].sstruct.field[2].name "subject" documenttype[0].datatype[0].sstruct.field[2].id 1797950813 -documenttype[0].datatype[0].sstruct.field[2].id_v6 943449689 documenttype[0].datatype[0].sstruct.field[2].datatype 2 documenttype[0].datatype[1].id 749465898 documenttype[0].datatype[1].type STRUCT @@ -53,7 +50,6 @@ documenttype[0].datatype[1].sstruct.compression.minsize 0 documenttype[0].datatype[1].sstruct.field[1] documenttype[0].datatype[1].sstruct.field[0].name "content" documenttype[0].datatype[1].sstruct.field[0].id 1721764358 -documenttype[0].datatype[1].sstruct.field[0].id_v6 1751481844 documenttype[0].datatype[1].sstruct.field[0].datatype 3 documenttype[0].annotationtype[0] documenttype[1].id -653677105 @@ -81,15 +77,12 @@ documenttype[1].datatype[0].sstruct.compression.minsize 0 documenttype[1].datatype[0].sstruct.field[3] documenttype[1].datatype[0].sstruct.field[0].name "author" documenttype[1].datatype[0].sstruct.field[0].id 644499292 -documenttype[1].datatype[0].sstruct.field[0].id_v6 177126295 documenttype[1].datatype[0].sstruct.field[0].datatype 2 documenttype[1].datatype[0].sstruct.field[1].name "date" documenttype[1].datatype[0].sstruct.field[1].id 491786523 -documenttype[1].datatype[0].sstruct.field[1].id_v6 916979460 documenttype[1].datatype[0].sstruct.field[1].datatype 0 documenttype[1].datatype[0].sstruct.field[2].name "subject" documenttype[1].datatype[0].sstruct.field[2].id 1797950813 -documenttype[1].datatype[0].sstruct.field[2].id_v6 943449689 documenttype[1].datatype[0].sstruct.field[2].datatype 2 documenttype[1].datatype[1].id 1473469605 documenttype[1].datatype[1].type STRUCT @@ -109,7 +102,6 @@ documenttype[1].datatype[1].sstruct.compression.minsize 0 documenttype[1].datatype[1].sstruct.field[1] documenttype[1].datatype[1].sstruct.field[0].name "content" documenttype[1].datatype[1].sstruct.field[0].id 1721764358 -documenttype[1].datatype[1].sstruct.field[0].id_v6 1751481844 documenttype[1].datatype[1].sstruct.field[0].datatype 3 documenttype[1].annotationtype[0] documenttype[2].id 238423572 @@ -153,6 +145,5 @@ documenttype[2].datatype[1].sstruct.compression.minsize 0 documenttype[2].datatype[1].sstruct.field[1] documenttype[2].datatype[1].sstruct.field[0].name "content" documenttype[2].datatype[1].sstruct.field[0].id 5 -documenttype[2].datatype[1].sstruct.field[0].id_v6 5 documenttype[2].datatype[1].sstruct.field[0].datatype 2 documenttype[2].annotationtype[0] diff --git a/streamingvisitors/src/tests/searchvisitor/cfg/documenttypes.cfg b/streamingvisitors/src/tests/searchvisitor/cfg/documenttypes.cfg index 7bb863dc8e2..db0df6fba25 100644 --- a/streamingvisitors/src/tests/searchvisitor/cfg/documenttypes.cfg +++ b/streamingvisitors/src/tests/searchvisitor/cfg/documenttypes.cfg @@ -22,11 +22,9 @@ documenttype[0].datatype[0].sstruct.compression.threshold 95 documenttype[0].datatype[0].sstruct.compression.minsize 200 documenttype[0].datatype[0].sstruct.field[0].name "a" documenttype[0].datatype[0].sstruct.field[0].id 493339625 -documenttype[0].datatype[0].sstruct.field[0].id_v6 703514648 documenttype[0].datatype[0].sstruct.field[0].datatype 2 documenttype[0].datatype[0].sstruct.field[1].name "b" documenttype[0].datatype[0].sstruct.field[1].id 441632370 -documenttype[0].datatype[0].sstruct.field[1].id_v6 1420600727 documenttype[0].datatype[0].sstruct.field[1].datatype 2 documenttype[0].datatype[1].id 339965458 documenttype[0].datatype[1].type MAP @@ -120,23 +118,18 @@ documenttype[0].datatype[6].sstruct.compression.threshold 95 documenttype[0].datatype[6].sstruct.compression.minsize 200 documenttype[0].datatype[6].sstruct.field[0].name "name" documenttype[0].datatype[6].sstruct.field[0].id 1160796772 -documenttype[0].datatype[6].sstruct.field[0].id_v6 774203930 documenttype[0].datatype[6].sstruct.field[0].datatype 2 documenttype[0].datatype[6].sstruct.field[1].name "m1" documenttype[0].datatype[6].sstruct.field[1].id 656260193 -documenttype[0].datatype[6].sstruct.field[1].id_v6 1013611640 documenttype[0].datatype[6].sstruct.field[1].datatype 339965458 documenttype[0].datatype[6].sstruct.field[2].name "m2" documenttype[0].datatype[6].sstruct.field[2].id 1105173090 -documenttype[0].datatype[6].sstruct.field[2].id_v6 1026497887 documenttype[0].datatype[6].sstruct.field[2].datatype 1888564261 documenttype[0].datatype[6].sstruct.field[3].name "m3" documenttype[0].datatype[6].sstruct.field[3].id 1834987989 -documenttype[0].datatype[6].sstruct.field[3].id_v6 1365320273 documenttype[0].datatype[6].sstruct.field[3].datatype -1220861393 documenttype[0].datatype[6].sstruct.field[4].name "m4" documenttype[0].datatype[6].sstruct.field[4].id 1696105521 -documenttype[0].datatype[6].sstruct.field[4].id_v6 1636310067 documenttype[0].datatype[6].sstruct.field[4].datatype 1070047409 documenttype[0].datatype[7].id -1659731740 documenttype[0].datatype[7].type STRUCT @@ -176,11 +169,9 @@ documenttype[1].datatype[0].sstruct.compression.threshold 95 documenttype[1].datatype[0].sstruct.compression.minsize 200 documenttype[1].datatype[0].sstruct.field[0].name "a" documenttype[1].datatype[0].sstruct.field[0].id 493339625 -documenttype[1].datatype[0].sstruct.field[0].id_v6 703514648 documenttype[1].datatype[0].sstruct.field[0].datatype 2 documenttype[1].datatype[0].sstruct.field[1].name "b" documenttype[1].datatype[0].sstruct.field[1].id 441632370 -documenttype[1].datatype[0].sstruct.field[1].id_v6 1420600727 documenttype[1].datatype[0].sstruct.field[1].datatype 2 documenttype[1].datatype[1].id 339965458 documenttype[1].datatype[1].type MAP @@ -274,31 +265,24 @@ documenttype[1].datatype[6].sstruct.compression.threshold 95 documenttype[1].datatype[6].sstruct.compression.minsize 200 documenttype[1].datatype[6].sstruct.field[0].name "name" documenttype[1].datatype[6].sstruct.field[0].id 1160796772 -documenttype[1].datatype[6].sstruct.field[0].id_v6 774203930 documenttype[1].datatype[6].sstruct.field[0].datatype 2 documenttype[1].datatype[6].sstruct.field[1].name "m1" documenttype[1].datatype[6].sstruct.field[1].id 656260193 -documenttype[1].datatype[6].sstruct.field[1].id_v6 1013611640 documenttype[1].datatype[6].sstruct.field[1].datatype 339965458 documenttype[1].datatype[6].sstruct.field[2].name "m2" documenttype[1].datatype[6].sstruct.field[2].id 1105173090 -documenttype[1].datatype[6].sstruct.field[2].id_v6 1026497887 documenttype[1].datatype[6].sstruct.field[2].datatype 1888564261 documenttype[1].datatype[6].sstruct.field[3].name "m3" documenttype[1].datatype[6].sstruct.field[3].id 1834987989 -documenttype[1].datatype[6].sstruct.field[3].id_v6 1365320273 documenttype[1].datatype[6].sstruct.field[3].datatype -1220861393 documenttype[1].datatype[6].sstruct.field[4].name "m4" documenttype[1].datatype[6].sstruct.field[4].id 1696105521 -documenttype[1].datatype[6].sstruct.field[4].id_v6 1636310067 documenttype[1].datatype[6].sstruct.field[4].datatype 1070047409 documenttype[1].datatype[6].sstruct.field[5].name "rankfeatures" documenttype[1].datatype[6].sstruct.field[5].id 1883197392 -documenttype[1].datatype[6].sstruct.field[5].id_v6 699950698 documenttype[1].datatype[6].sstruct.field[5].datatype 2 documenttype[1].datatype[6].sstruct.field[6].name "summaryfeatures" documenttype[1].datatype[6].sstruct.field[6].id 1840337115 -documenttype[1].datatype[6].sstruct.field[6].id_v6 1981648971 documenttype[1].datatype[6].sstruct.field[6].datatype 2 documenttype[1].datatype[7].id -125720743 documenttype[1].datatype[7].type STRUCT diff --git a/vdslib/src/test/files/documenttypes.cfg b/vdslib/src/test/files/documenttypes.cfg index d1c208f3a08..bbc6e65c455 100644 --- a/vdslib/src/test/files/documenttypes.cfg +++ b/vdslib/src/test/files/documenttypes.cfg @@ -25,63 +25,48 @@ documenttype[0].datatype[0].sstruct.compression.minsize 0 documenttype[0].datatype[0].sstruct.field[15] documenttype[0].datatype[0].sstruct.field[0].name "headerdouble" documenttype[0].datatype[0].sstruct.field[0].id 225925695 -documenttype[0].datatype[0].sstruct.field[0].id_v6 1880905482 documenttype[0].datatype[0].sstruct.field[0].datatype 5 documenttype[0].datatype[0].sstruct.field[1].name "headerfloat" documenttype[0].datatype[0].sstruct.field[1].id 1625470423 -documenttype[0].datatype[0].sstruct.field[1].id_v6 1473207887 documenttype[0].datatype[0].sstruct.field[1].datatype 1 documenttype[0].datatype[0].sstruct.field[2].name "headerint" documenttype[0].datatype[0].sstruct.field[2].id 762302378 -documenttype[0].datatype[0].sstruct.field[2].id_v6 20914570 documenttype[0].datatype[0].sstruct.field[2].datatype 0 documenttype[0].datatype[0].sstruct.field[3].name "headerlong" documenttype[0].datatype[0].sstruct.field[3].id 1173959018 -documenttype[0].datatype[0].sstruct.field[3].id_v6 447443892 documenttype[0].datatype[0].sstruct.field[3].datatype 4 documenttype[0].datatype[0].sstruct.field[4].name "headerraw" documenttype[0].datatype[0].sstruct.field[4].id 391586263 -documenttype[0].datatype[0].sstruct.field[4].id_v6 1004217617 documenttype[0].datatype[0].sstruct.field[4].datatype 3 documenttype[0].datatype[0].sstruct.field[5].name "headerstring" documenttype[0].datatype[0].sstruct.field[5].id 788916026 -documenttype[0].datatype[0].sstruct.field[5].id_v6 104714882 documenttype[0].datatype[0].sstruct.field[5].datatype 2 documenttype[0].datatype[0].sstruct.field[6].name "maxbodydocsize" documenttype[0].datatype[0].sstruct.field[6].id 1712672954 -documenttype[0].datatype[0].sstruct.field[6].id_v6 843532182 documenttype[0].datatype[0].sstruct.field[6].datatype 0 documenttype[0].datatype[0].sstruct.field[7].name "maxheaderdocsize" documenttype[0].datatype[0].sstruct.field[7].id 1706483157 -documenttype[0].datatype[0].sstruct.field[7].id_v6 2053499986 documenttype[0].datatype[0].sstruct.field[7].datatype 0 documenttype[0].datatype[0].sstruct.field[8].name "minbodydocsize" documenttype[0].datatype[0].sstruct.field[8].id 655737763 -documenttype[0].datatype[0].sstruct.field[8].id_v6 1790708929 documenttype[0].datatype[0].sstruct.field[8].datatype 0 documenttype[0].datatype[0].sstruct.field[9].name "minheaderdocsize" documenttype[0].datatype[0].sstruct.field[9].id 138730086 -documenttype[0].datatype[0].sstruct.field[9].id_v6 1021372057 documenttype[0].datatype[0].sstruct.field[9].datatype 0 documenttype[0].datatype[0].sstruct.field[10].name "pregeneratedcontent" documenttype[0].datatype[0].sstruct.field[10].id 1358420191 -documenttype[0].datatype[0].sstruct.field[10].id_v6 107210372 documenttype[0].datatype[0].sstruct.field[10].datatype 16 documenttype[0].datatype[0].sstruct.field[11].name "seed" documenttype[0].datatype[0].sstruct.field[11].id 1584656448 -documenttype[0].datatype[0].sstruct.field[11].id_v6 2028175984 documenttype[0].datatype[0].sstruct.field[11].datatype 0 documenttype[0].datatype[0].sstruct.field[12].name "simplecontent" documenttype[0].datatype[0].sstruct.field[12].id 1986822798 -documenttype[0].datatype[0].sstruct.field[12].id_v6 1673731589 documenttype[0].datatype[0].sstruct.field[12].datatype 16 documenttype[0].datatype[0].sstruct.field[13].name "totaldoccount" documenttype[0].datatype[0].sstruct.field[13].id 428258253 -documenttype[0].datatype[0].sstruct.field[13].id_v6 400080120 documenttype[0].datatype[0].sstruct.field[13].datatype 0 documenttype[0].datatype[0].sstruct.field[14].name "totalusercount" documenttype[0].datatype[0].sstruct.field[14].id 1328467779 -documenttype[0].datatype[0].sstruct.field[14].id_v6 1421225290 documenttype[0].datatype[0].sstruct.field[14].datatype 0 documenttype[0].datatype[1].id -851747595 documenttype[0].datatype[1].type STRUCT @@ -101,26 +86,20 @@ documenttype[0].datatype[1].sstruct.compression.minsize 0 documenttype[0].datatype[1].sstruct.field[6] documenttype[0].datatype[1].sstruct.field[0].name "bodydouble" documenttype[0].datatype[1].sstruct.field[0].id 409250413 -documenttype[0].datatype[1].sstruct.field[0].id_v6 896473220 documenttype[0].datatype[1].sstruct.field[0].datatype 5 documenttype[0].datatype[1].sstruct.field[1].name "bodyfloat" documenttype[0].datatype[1].sstruct.field[1].id 627746455 -documenttype[0].datatype[1].sstruct.field[1].id_v6 644475212 documenttype[0].datatype[1].sstruct.field[1].datatype 1 documenttype[0].datatype[1].sstruct.field[2].name "bodyint" documenttype[0].datatype[1].sstruct.field[2].id 1128436051 -documenttype[0].datatype[1].sstruct.field[2].id_v6 1680592860 documenttype[0].datatype[1].sstruct.field[2].datatype 0 documenttype[0].datatype[1].sstruct.field[3].name "bodylong" documenttype[0].datatype[1].sstruct.field[3].id 1947207690 -documenttype[0].datatype[1].sstruct.field[3].id_v6 82043035 documenttype[0].datatype[1].sstruct.field[3].datatype 4 documenttype[0].datatype[1].sstruct.field[4].name "bodyraw" documenttype[0].datatype[1].sstruct.field[4].id 864880572 -documenttype[0].datatype[1].sstruct.field[4].id_v6 2105006012 documenttype[0].datatype[1].sstruct.field[4].datatype 3 documenttype[0].datatype[1].sstruct.field[5].name "bodystring" documenttype[0].datatype[1].sstruct.field[5].id 316734404 -documenttype[0].datatype[1].sstruct.field[5].id_v6 474444010 documenttype[0].datatype[1].sstruct.field[5].datatype 2 documenttype[0].annotationtype[0] |