diff options
Diffstat (limited to 'config-model/src/test')
58 files changed, 28 insertions, 172 deletions
diff --git a/config-model/src/test/configmodel/types/documentmanager.cfg b/config-model/src/test/configmodel/types/documentmanager.cfg index c471935d9da..0269efcc4ca 100644 --- a/config-model/src/test/configmodel/types/documentmanager.cfg +++ b/config-model/src/test/configmodel/types/documentmanager.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[0].name "document" doctype[0].idx 10000 diff --git a/config-model/src/test/configmodel/types/documenttypes.cfg b/config-model/src/test/configmodel/types/documenttypes.cfg index d35928a7a4b..b1c3075df2c 100644 --- a/config-model/src/test/configmodel/types/documenttypes.cfg +++ b/config-model/src/test/configmodel/types/documenttypes.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[0].name "document" doctype[0].idx 10000 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 f8c7dacd3af..be4a18f2ab2 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 @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[0].name "document" doctype[0].idx 10000 diff --git a/config-model/src/test/configmodel/types/references/documentmanager_multiple_imported_fields.cfg b/config-model/src/test/configmodel/types/references/documentmanager_multiple_imported_fields.cfg index bf2ae28c417..778fe2a44c4 100644 --- a/config-model/src/test/configmodel/types/references/documentmanager_multiple_imported_fields.cfg +++ b/config-model/src/test/configmodel/types/references/documentmanager_multiple_imported_fields.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[0].name "document" doctype[0].idx 10000 diff --git a/config-model/src/test/configmodel/types/references/documentmanager_refs_to_other_types.cfg b/config-model/src/test/configmodel/types/references/documentmanager_refs_to_other_types.cfg index 7f93eea8e90..4d0a8396d91 100644 --- a/config-model/src/test/configmodel/types/references/documentmanager_refs_to_other_types.cfg +++ b/config-model/src/test/configmodel/types/references/documentmanager_refs_to_other_types.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[0].name "document" doctype[0].idx 10000 diff --git a/config-model/src/test/configmodel/types/references/documentmanager_refs_to_same_type.cfg b/config-model/src/test/configmodel/types/references/documentmanager_refs_to_same_type.cfg index ecb499b5ed3..17d6264e138 100644 --- a/config-model/src/test/configmodel/types/references/documentmanager_refs_to_same_type.cfg +++ b/config-model/src/test/configmodel/types/references/documentmanager_refs_to_same_type.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[0].name "document" doctype[0].idx 10000 diff --git a/config-model/src/test/configmodel/types/references/documenttypes_multiple_imported_fields.cfg b/config-model/src/test/configmodel/types/references/documenttypes_multiple_imported_fields.cfg index 6073faca616..9e76cb14b20 100644 --- a/config-model/src/test/configmodel/types/references/documenttypes_multiple_imported_fields.cfg +++ b/config-model/src/test/configmodel/types/references/documenttypes_multiple_imported_fields.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[0].name "document" doctype[0].idx 10000 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 92bde94f54a..e8398b159dd 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 @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false documenttype[].id 2987301 documenttype[].name "ad" 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 5ea07de4124..0d817fd4e07 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 @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[0].name "document" doctype[0].idx 10000 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 f31e5f6e7c0..f681a8de9ba 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 @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[0].name "document" doctype[0].idx 10000 diff --git a/config-model/src/test/derived/advanced/documentmanager.cfg b/config-model/src/test/derived/advanced/documentmanager.cfg index 1ad50f57e93..375d42bc63e 100644 --- a/config-model/src/test/derived/advanced/documentmanager.cfg +++ b/config-model/src/test/derived/advanced/documentmanager.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/annotationsimplicitstruct/documentmanager.cfg b/config-model/src/test/derived/annotationsimplicitstruct/documentmanager.cfg index 1ca66a7aea2..c5acbbf87e3 100644 --- a/config-model/src/test/derived/annotationsimplicitstruct/documentmanager.cfg +++ b/config-model/src/test/derived/annotationsimplicitstruct/documentmanager.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/annotationsinheritance/documentmanager.cfg b/config-model/src/test/derived/annotationsinheritance/documentmanager.cfg index 8dc07ae8eab..edf5fd13d1b 100644 --- a/config-model/src/test/derived/annotationsinheritance/documentmanager.cfg +++ b/config-model/src/test/derived/annotationsinheritance/documentmanager.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/annotationsinheritance2/documentmanager.cfg b/config-model/src/test/derived/annotationsinheritance2/documentmanager.cfg index 67c47032995..d931cae2048 100644 --- a/config-model/src/test/derived/annotationsinheritance2/documentmanager.cfg +++ b/config-model/src/test/derived/annotationsinheritance2/documentmanager.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/annotationspolymorphy/documentmanager.cfg b/config-model/src/test/derived/annotationspolymorphy/documentmanager.cfg index dbe6054ce6c..76882afd3c5 100644 --- a/config-model/src/test/derived/annotationspolymorphy/documentmanager.cfg +++ b/config-model/src/test/derived/annotationspolymorphy/documentmanager.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/annotationsreference/documentmanager.cfg b/config-model/src/test/derived/annotationsreference/documentmanager.cfg index d27ff5c9d07..ef0166ba4a7 100644 --- a/config-model/src/test/derived/annotationsreference/documentmanager.cfg +++ b/config-model/src/test/derived/annotationsreference/documentmanager.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/annotationssimple/documentmanager.cfg b/config-model/src/test/derived/annotationssimple/documentmanager.cfg index a52837c5c06..a076d5a7479 100644 --- a/config-model/src/test/derived/annotationssimple/documentmanager.cfg +++ b/config-model/src/test/derived/annotationssimple/documentmanager.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/annotationsstruct/documentmanager.cfg b/config-model/src/test/derived/annotationsstruct/documentmanager.cfg index 4ab3f376d9d..d0b527ddaf3 100644 --- a/config-model/src/test/derived/annotationsstruct/documentmanager.cfg +++ b/config-model/src/test/derived/annotationsstruct/documentmanager.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/annotationsstructarray/documentmanager.cfg b/config-model/src/test/derived/annotationsstructarray/documentmanager.cfg index c2078dfa671..80792768c34 100644 --- a/config-model/src/test/derived/annotationsstructarray/documentmanager.cfg +++ b/config-model/src/test/derived/annotationsstructarray/documentmanager.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/arrays/documentmanager.cfg b/config-model/src/test/derived/arrays/documentmanager.cfg index 836f3903079..ef3841f180b 100644 --- a/config-model/src/test/derived/arrays/documentmanager.cfg +++ b/config-model/src/test/derived/arrays/documentmanager.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/attributeprefetch/documentmanager.cfg b/config-model/src/test/derived/attributeprefetch/documentmanager.cfg index a5c063108e4..5733c7d1bbd 100644 --- a/config-model/src/test/derived/attributeprefetch/documentmanager.cfg +++ b/config-model/src/test/derived/attributeprefetch/documentmanager.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/complex/documentmanager.cfg b/config-model/src/test/derived/complex/documentmanager.cfg index dd0b7095d93..f44ab48c255 100644 --- a/config-model/src/test/derived/complex/documentmanager.cfg +++ b/config-model/src/test/derived/complex/documentmanager.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/declstruct/documentmanager.cfg b/config-model/src/test/derived/declstruct/documentmanager.cfg index 992d210dbe2..7b95c78d584 100644 --- a/config-model/src/test/derived/declstruct/documentmanager.cfg +++ b/config-model/src/test/derived/declstruct/documentmanager.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/duplicate_struct/documentmanager.cfg b/config-model/src/test/derived/duplicate_struct/documentmanager.cfg index 4742a75205a..af20f058eed 100644 --- a/config-model/src/test/derived/duplicate_struct/documentmanager.cfg +++ b/config-model/src/test/derived/duplicate_struct/documentmanager.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/duplicate_struct/documenttypes.cfg b/config-model/src/test/derived/duplicate_struct/documenttypes.cfg index 45c1bd8700f..b751b1ebbbf 100644 --- a/config-model/src/test/derived/duplicate_struct/documenttypes.cfg +++ b/config-model/src/test/derived/duplicate_struct/documenttypes.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/emptydefault/documentmanager.cfg b/config-model/src/test/derived/emptydefault/documentmanager.cfg index bf2a39df89f..63732728b05 100644 --- a/config-model/src/test/derived/emptydefault/documentmanager.cfg +++ b/config-model/src/test/derived/emptydefault/documentmanager.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/id/documentmanager.cfg b/config-model/src/test/derived/id/documentmanager.cfg index 33cdbe5b996..583ca8497b8 100644 --- a/config-model/src/test/derived/id/documentmanager.cfg +++ b/config-model/src/test/derived/id/documentmanager.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/imported_fields_inherited_reference/documenttypes.cfg b/config-model/src/test/derived/imported_fields_inherited_reference/documenttypes.cfg index c6cd1a2949d..aa960e70326 100644 --- a/config-model/src/test/derived/imported_fields_inherited_reference/documenttypes.cfg +++ b/config-model/src/test/derived/imported_fields_inherited_reference/documenttypes.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/indexswitches/documentmanager.cfg b/config-model/src/test/derived/indexswitches/documentmanager.cfg index fa91cb0e554..a902a5954a5 100644 --- a/config-model/src/test/derived/indexswitches/documentmanager.cfg +++ b/config-model/src/test/derived/indexswitches/documentmanager.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/inheritance/documentmanager.cfg b/config-model/src/test/derived/inheritance/documentmanager.cfg index 52cac7bfa79..fd4994dbefb 100644 --- a/config-model/src/test/derived/inheritance/documentmanager.cfg +++ b/config-model/src/test/derived/inheritance/documentmanager.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/inheritdiamond/documentmanager.cfg b/config-model/src/test/derived/inheritdiamond/documentmanager.cfg index 7d5dacbe00f..9f1207b77a3 100644 --- a/config-model/src/test/derived/inheritdiamond/documentmanager.cfg +++ b/config-model/src/test/derived/inheritdiamond/documentmanager.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/inheritfromgrandparent/documentmanager.cfg b/config-model/src/test/derived/inheritfromgrandparent/documentmanager.cfg index 537c452c38c..68503ebd5aa 100644 --- a/config-model/src/test/derived/inheritfromgrandparent/documentmanager.cfg +++ b/config-model/src/test/derived/inheritfromgrandparent/documentmanager.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/inheritfromparent/documentmanager.cfg b/config-model/src/test/derived/inheritfromparent/documentmanager.cfg index d246e886a3d..c8fdeaedf11 100644 --- a/config-model/src/test/derived/inheritfromparent/documentmanager.cfg +++ b/config-model/src/test/derived/inheritfromparent/documentmanager.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/inheritfromparent/documenttypes.cfg b/config-model/src/test/derived/inheritfromparent/documenttypes.cfg index efd8170d95e..fd9623f716a 100644 --- a/config-model/src/test/derived/inheritfromparent/documenttypes.cfg +++ b/config-model/src/test/derived/inheritfromparent/documenttypes.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/mail/onlydoc/documentmanager.cfg b/config-model/src/test/derived/mail/onlydoc/documentmanager.cfg index 27ac015e630..6bf972c1c80 100644 --- a/config-model/src/test/derived/mail/onlydoc/documentmanager.cfg +++ b/config-model/src/test/derived/mail/onlydoc/documentmanager.cfg @@ -1,4 +1,3 @@ -enablecompression false usev8geopositions false datatype[].id 1381038251 datatype[].structtype[].name "position" diff --git a/config-model/src/test/derived/multi_struct/documentmanager.cfg b/config-model/src/test/derived/multi_struct/documentmanager.cfg index e37a3dc51c6..753196b4d02 100644 --- a/config-model/src/test/derived/multi_struct/documentmanager.cfg +++ b/config-model/src/test/derived/multi_struct/documentmanager.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/multi_struct/documenttypes.cfg b/config-model/src/test/derived/multi_struct/documenttypes.cfg index 93452602f86..4926675582b 100644 --- a/config-model/src/test/derived/multi_struct/documenttypes.cfg +++ b/config-model/src/test/derived/multi_struct/documenttypes.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/namecollision/documentmanager.cfg b/config-model/src/test/derived/namecollision/documentmanager.cfg index d8cf44a9a3d..79807197b48 100644 --- a/config-model/src/test/derived/namecollision/documentmanager.cfg +++ b/config-model/src/test/derived/namecollision/documentmanager.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/prefixexactattribute/documentmanager.cfg b/config-model/src/test/derived/prefixexactattribute/documentmanager.cfg index d516eaf7886..3158348d5be 100644 --- a/config-model/src/test/derived/prefixexactattribute/documentmanager.cfg +++ b/config-model/src/test/derived/prefixexactattribute/documentmanager.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/ranktypes/documentmanager.cfg b/config-model/src/test/derived/ranktypes/documentmanager.cfg index 46457fb479d..ade7795c3ca 100644 --- a/config-model/src/test/derived/ranktypes/documentmanager.cfg +++ b/config-model/src/test/derived/ranktypes/documentmanager.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/reference_from_several/documentmanager.cfg b/config-model/src/test/derived/reference_from_several/documentmanager.cfg index 28f40aeee5b..bdcb6a04236 100644 --- a/config-model/src/test/derived/reference_from_several/documentmanager.cfg +++ b/config-model/src/test/derived/reference_from_several/documentmanager.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/schemainheritance/documentmanager.cfg b/config-model/src/test/derived/schemainheritance/documentmanager.cfg index 1fe61cf2bd2..a706c57909e 100644 --- a/config-model/src/test/derived/schemainheritance/documentmanager.cfg +++ b/config-model/src/test/derived/schemainheritance/documentmanager.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/streamingstruct/documentmanager.cfg b/config-model/src/test/derived/streamingstruct/documentmanager.cfg index b94f23a9c7b..c29ff0b3489 100644 --- a/config-model/src/test/derived/streamingstruct/documentmanager.cfg +++ b/config-model/src/test/derived/streamingstruct/documentmanager.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/structandfieldset/documentmanager.cfg b/config-model/src/test/derived/structandfieldset/documentmanager.cfg index e1169e3ca5d..e9bbc06d77a 100644 --- a/config-model/src/test/derived/structandfieldset/documentmanager.cfg +++ b/config-model/src/test/derived/structandfieldset/documentmanager.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/structanyorder/documentmanager.cfg b/config-model/src/test/derived/structanyorder/documentmanager.cfg index eac63515944..a1e8bb41a97 100644 --- a/config-model/src/test/derived/structanyorder/documentmanager.cfg +++ b/config-model/src/test/derived/structanyorder/documentmanager.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/structinheritance/documentmanager.cfg b/config-model/src/test/derived/structinheritance/documentmanager.cfg index 37240887e3b..5897b00c07b 100644 --- a/config-model/src/test/derived/structinheritance/documentmanager.cfg +++ b/config-model/src/test/derived/structinheritance/documentmanager.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/structinheritance/documenttypes.cfg b/config-model/src/test/derived/structinheritance/documenttypes.cfg index 16521b920a7..3f9fdf85734 100644 --- a/config-model/src/test/derived/structinheritance/documenttypes.cfg +++ b/config-model/src/test/derived/structinheritance/documenttypes.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/tensor/documentmanager.cfg b/config-model/src/test/derived/tensor/documentmanager.cfg index f52fe073208..bae2db34040 100644 --- a/config-model/src/test/derived/tensor/documentmanager.cfg +++ b/config-model/src/test/derived/tensor/documentmanager.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/tensor/documenttypes.cfg b/config-model/src/test/derived/tensor/documenttypes.cfg index 3081a5bd0c4..d10ecd37c8f 100644 --- a/config-model/src/test/derived/tensor/documenttypes.cfg +++ b/config-model/src/test/derived/tensor/documenttypes.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/derived/types/documentmanager.cfg b/config-model/src/test/derived/types/documentmanager.cfg index 118f7d279e6..ace183e1ab0 100644 --- a/config-model/src/test/derived/types/documentmanager.cfg +++ b/config-model/src/test/derived/types/documentmanager.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[].name "document" doctype[].idx 10000 diff --git a/config-model/src/test/examples/fieldoftypedocument-doctypes.cfg b/config-model/src/test/examples/fieldoftypedocument-doctypes.cfg index 2efc2f40d21..ebc72c2d73b 100644 --- a/config-model/src/test/examples/fieldoftypedocument-doctypes.cfg +++ b/config-model/src/test/examples/fieldoftypedocument-doctypes.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[0].name "document" doctype[0].idx 10000 diff --git a/config-model/src/test/examples/fieldoftypedocument.cfg b/config-model/src/test/examples/fieldoftypedocument.cfg index 10c66ce3e93..5aca758a5f4 100644 --- a/config-model/src/test/examples/fieldoftypedocument.cfg +++ b/config-model/src/test/examples/fieldoftypedocument.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[0].name "document" doctype[0].idx 10000 diff --git a/config-model/src/test/examples/structresult.cfg b/config-model/src/test/examples/structresult.cfg index 2e3904b7110..c2c84eb46b0 100644 --- a/config-model/src/test/examples/structresult.cfg +++ b/config-model/src/test/examples/structresult.cfg @@ -1,5 +1,4 @@ ignoreundefinedfields false -enablecompression false usev8geopositions false doctype[0].name "document" doctype[0].idx 10000 diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java index 198b5713876..b634356fcb6 100755 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java @@ -162,15 +162,15 @@ public class ContainerClusterTest { addContainer(root, cluster, "c1", "host-c1"); assertEquals(1, cluster.getContainers().size()); ApplicationContainer container = cluster.getContainers().get(0); - verifyJvmArgs(isHosted, hasDocProc, "", container.getJvmOptions()); + verifyJvmArgs(isHosted, hasDocProc, expectedJvmArgs(isHosted, ""), container.getJvmOptions()); container.setJvmOptions("initial"); - verifyJvmArgs(isHosted, hasDocProc, "initial", container.getJvmOptions()); + verifyJvmArgs(isHosted, hasDocProc, expectedJvmArgs(isHosted, "initial"), container.getJvmOptions()); container.prependJvmOptions("ignored"); - verifyJvmArgs(isHosted, hasDocProc, "ignored initial", container.getJvmOptions()); + verifyJvmArgs(isHosted, hasDocProc, expectedJvmArgs(isHosted, "ignored initial"), container.getJvmOptions()); container.appendJvmOptions("override"); - verifyJvmArgs(isHosted, hasDocProc, "ignored initial override", container.getJvmOptions()); + verifyJvmArgs(isHosted, hasDocProc, expectedJvmArgs(isHosted, "ignored initial override"), container.getJvmOptions()); container.setJvmOptions(null); - verifyJvmArgs(isHosted, hasDocProc, "", container.getJvmOptions()); + verifyJvmArgs(isHosted, hasDocProc, expectedJvmArgs(isHosted, ""), container.getJvmOptions()); } @Test @@ -510,4 +510,13 @@ public class ContainerClusterTest { return new ClusterInfoConfig(builder); } + private static String expectedJvmArgs(boolean isHosted, String extra) { + if (!isHosted) return extra; + return "-Djdk.tls.server.enableStatusRequestExtension=true " + + "-Djdk.tls.stapling.responseTimeout=2000 " + + "-Djdk.tls.stapling.cacheSize=256 " + + "-Djdk.tls.stapling.cacheLifetime=3600" + + (extra.isEmpty() ? "" : " " + extra); + } + } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/docproc/StandaloneDocprocContainerTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/docproc/StandaloneDocprocContainerTest.java deleted file mode 100644 index 5bb93255a8f..00000000000 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/docproc/StandaloneDocprocContainerTest.java +++ /dev/null @@ -1,82 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.model.container.docproc; - -import com.yahoo.component.ComponentId; -import com.yahoo.config.model.deploy.DeployState; -import com.yahoo.config.model.builder.xml.test.DomBuilderTest; -import com.yahoo.vespa.model.container.ContainerCluster; -import com.yahoo.vespa.model.container.ContainerModel; -import com.yahoo.vespa.model.container.component.Component; -import com.yahoo.vespa.model.container.xml.ContainerModelBuilder; -import com.yahoo.vespa.model.container.xml.ContainerModelBuilder.Networking; -import org.junit.Test; -import org.w3c.dom.Element; - -import java.util.Map; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -/** - * @author Einar M R Rosenvinge - */ -public class StandaloneDocprocContainerTest extends DomBuilderTest { - - public ContainerCluster setupCluster(boolean standalone) { - ContainerModelBuilder builder = new ContainerModelBuilder(standalone, Networking.disable); - ContainerModel model = builder.build(DeployState.createTestState(), null, null, root, servicesXml()); - - if (!standalone) - model.getCluster().getDocproc().getChains().addServersAndClientsForChains(); - - root.freezeModelTopology(); - return model.getCluster(); - } - - private Element servicesXml() { - return parse("" + - "<container version=\"1.0\">\n" + - " <document-processing>\n" + - " <chain id=\"foo\">\n" + - " <documentprocessor id=\"MyDocproc\"/>\n" + - " </chain>\n" + - " </document-processing>\n" + - " <nodes>\n" + - " <node hostalias=\"node01\"/>\n" + - " </nodes>\n" + - "</container>\n"); - } - - @Test - public void requireMbusProvidersWhenNonStandalone() { - ContainerCluster containerCluster = setupCluster(false); - Map<ComponentId, Component<?, ?>> components = containerCluster.getComponentsMap(); - - boolean foundAtLeastOneClient = false; - boolean foundAtLeastOneServer = false; - - for (ComponentId componentId : components.keySet()) { - if (componentId.stringValue().contains("MbusClient")) foundAtLeastOneClient = true; - if (componentId.stringValue().contains("MbusServer")) foundAtLeastOneServer = true; - } - assertTrue(foundAtLeastOneClient); - assertTrue(foundAtLeastOneServer); - - } - - @Test - public void requireNoMbusProvidersWhenStandalone() { - ContainerCluster containerCluster = setupCluster(true); - Map<ComponentId, Component<?, ?>> components = containerCluster.getComponentsMap(); - - boolean foundAtLeastOneClient = false; - boolean foundAtLeastOneServer = false; - - for (ComponentId componentId : components.keySet()) { - if (componentId.stringValue().contains("MbusClient")) foundAtLeastOneClient = true; - if (componentId.stringValue().contains("MbusServer")) foundAtLeastOneServer = true; - } - assertFalse(foundAtLeastOneClient); - assertFalse(foundAtLeastOneServer); - } -} diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/DocprocBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/DocprocBuilderTest.java index 77681489dac..2044fd2ab39 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/DocprocBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/DocprocBuilderTest.java @@ -1,14 +1,12 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.model.container.xml; -import com.yahoo.config.docproc.DocprocConfig; import com.yahoo.config.docproc.SchemamappingConfig; import com.yahoo.config.model.builder.xml.test.DomBuilderTest; import com.yahoo.config.model.deploy.DeployState; import com.yahoo.container.ComponentsConfig; import com.yahoo.container.core.ChainsConfig; import com.yahoo.container.jdisc.ContainerMbusConfig; -import com.yahoo.document.config.DocumentmanagerConfig; import com.yahoo.search.config.QrStartConfig; import com.yahoo.vespa.model.HostPorts; import com.yahoo.vespa.model.container.ApplicationContainer; @@ -38,12 +36,10 @@ import static org.junit.Assert.assertTrue; public class DocprocBuilderTest extends DomBuilderTest { private ApplicationContainerCluster cluster; - private DocumentmanagerConfig documentmanagerConfig; private ContainerMbusConfig containerMbusConfig; private ComponentsConfig componentsConfig; private ChainsConfig chainsConfig; private SchemamappingConfig schemamappingConfig; - private DocprocConfig docprocConfig; private QrStartConfig qrStartConfig; @Before @@ -58,10 +54,8 @@ public class DocprocBuilderTest extends DomBuilderTest { chainsConfig = root.getConfig(ChainsConfig.class, cluster.getConfigId() + "/component/com.yahoo.docproc.jdisc.DocumentProcessingHandler"); - documentmanagerConfig = root.getConfig(DocumentmanagerConfig.class, cluster.getConfigId()); schemamappingConfig = root.getConfig(SchemamappingConfig.class, cluster.getContainers().get(0).getConfigId()); qrStartConfig = root.getConfig(QrStartConfig.class, cluster.getConfigId()); - docprocConfig = root.getConfig(DocprocConfig.class, cluster.getConfigId()); } private Element servicesXml() { @@ -70,7 +64,7 @@ public class DocprocBuilderTest extends DomBuilderTest { " <nodes>", " <node hostalias='mockhost' baseport='1500' />", " </nodes>", - " <document-processing compressdocuments='true' preferlocalnode='true' numnodesperclient='2' maxqueuebytesize='100m' maxmessagesinqueue='300' maxqueuewait='200'>", + " <document-processing preferlocalnode='true' numnodesperclient='2' maxqueuebytesize='100m' maxmessagesinqueue='300' maxqueuewait='200'>", " <documentprocessor id='docproc1' class='com.yahoo.Docproc1' bundle='docproc1bundle'/>", " <chain id='chein'>", " <documentprocessor id='docproc2'/>", @@ -83,7 +77,6 @@ public class DocprocBuilderTest extends DomBuilderTest { @Test public void testDocprocCluster() { assertEquals("banan", cluster.getName()); - assertTrue(cluster.getDocproc().isCompressDocuments()); //assertTrue(cluster.getContainerDocproc().isPreferLocalNode()); //assertEquals(2, cluster.getContainerDocproc().getNumNodesPerClient()); List<ApplicationContainer> services = cluster.getContainers(); @@ -105,16 +98,9 @@ public class DocprocBuilderTest extends DomBuilderTest { } @Test - public void testDocumentManagerConfig() { - assertTrue(documentmanagerConfig.enablecompression()); - } - - @Test public void testContainerMbusConfig() { - assertTrue(containerMbusConfig.enabled()); assertTrue(containerMbusConfig.port() >= HostPorts.BASE_PORT); assertEquals(300, containerMbusConfig.maxpendingcount()); - assertEquals(100, containerMbusConfig.maxpendingsize()); } @Test diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/DistributorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/DistributorTest.java index 2031e74bd5b..015356d6088 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/DistributorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/DistributorTest.java @@ -273,7 +273,6 @@ public class DistributorTest { cluster.getChildren().get("0").getConfig(builder); StorCommunicationmanagerConfig config = new StorCommunicationmanagerConfig(builder); - assertTrue(config.mbus().dispatch_on_encode()); assertEquals(14066, config.rpcport()); } @@ -290,9 +289,6 @@ public class DistributorTest { cluster.getChildren().get("0").getConfig(builder); StorCommunicationmanagerConfig config = new StorCommunicationmanagerConfig(builder); - assertTrue(config.mbus().dispatch_on_encode()); - assertTrue(config.mbus().dispatch_on_decode()); - assertEquals(4, config.mbus().num_threads()); assertEquals(1, config.mbus().num_network_threads()); } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java index 5748f260bf8..c494ba0394a 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java @@ -101,9 +101,6 @@ public class StorageClusterTest { StorCommunicationmanagerConfig.Builder builder = new StorCommunicationmanagerConfig.Builder(); storage.getChildren().get("0").getConfig(builder); StorCommunicationmanagerConfig config = new StorCommunicationmanagerConfig(builder); - assertTrue(config.mbus().dispatch_on_encode()); - assertTrue(config.mbus().dispatch_on_decode()); - assertEquals(4, config.mbus().num_threads()); assertEquals(1, config.mbus().num_network_threads()); } @@ -154,23 +151,26 @@ public class StorageClusterTest { @Test public void verifyDefaultMbusConfig() { var confg = communicationmanagerConfigFromProperties(new TestProperties()); - assertTrue(confg.mbus().dispatch_on_decode()); - assertTrue(confg.mbus().dispatch_on_encode()); - assertEquals(4, confg.mbus().num_threads()); assertEquals(1, confg.mbus().num_network_threads()); + assertEquals(1, confg.mbus().num_rpc_targets()); + assertEquals(1, confg.mbus().events_before_wakeup()); + assertEquals(1, confg.rpc().num_targets_per_node()); + assertEquals(1, confg.rpc().events_before_wakeup()); } @Test public void verifyDefaultMbusConfigControl() { var confg = communicationmanagerConfigFromProperties(new TestProperties() - .setMbusDispatchOnDecode(false) - .setMbusDispatchOnEncode(false) - .setMbusThreads(3) - .setMbusNetworkThreads(7)); - assertFalse(confg.mbus().dispatch_on_decode()); - assertFalse(confg.mbus().dispatch_on_encode()); - assertEquals(3, confg.mbus().num_threads()); + .setMbusNetworkThreads(7) + .setRpcNumTargets(11) + .setRpcEventsBeforeWakeup(12) + .setMbusCppRpcNumTargets(8) + .setMbusCppEventsBeforeWakeup(9)); assertEquals(7, confg.mbus().num_network_threads()); + assertEquals(8, confg.mbus().num_rpc_targets()); + assertEquals(9, confg.mbus().events_before_wakeup()); + assertEquals(11, confg.rpc().num_targets_per_node()); + assertEquals(12, confg.rpc().events_before_wakeup()); } @Test |