From 1602904a358bde980633df61518b7b3853fc5f5b Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Thu, 12 Aug 2021 09:36:15 +0200 Subject: Update expected results. --- config-model/src/test/derived/advanced/attributes.cfg | 1 + .../derived/array_of_struct_attribute/attributes.cfg | 2 ++ .../src/test/derived/attributeprefetch/attributes.cfg | 18 ++++++++++++++++++ .../src/test/derived/attributes/attributes.cfg | 18 ++++++++++++++++++ config-model/src/test/derived/complex/attributes.cfg | 9 +++++++++ .../src/test/derived/hnsw_index/attributes.cfg | 2 ++ .../imported_fields_inherited_reference/attributes.cfg | 4 ++++ .../derived/imported_position_field/attributes.cfg | 2 ++ .../test/derived/imported_struct_fields/attributes.cfg | 8 ++++++++ .../src/test/derived/importedfields/attributes.cfg | 8 ++++++++ .../src/test/derived/inheritance/attributes.cfg | 3 +++ .../src/test/derived/inheritfromparent/attributes.cfg | 1 + .../src/test/derived/map_attribute/attributes.cfg | 3 +++ .../derived/map_of_struct_attribute/attributes.cfg | 5 +++++ config-model/src/test/derived/music/attributes.cfg | 11 +++++++++++ config-model/src/test/derived/newrank/attributes.cfg | 10 ++++++++++ .../test/derived/predicate_attribute/attributes.cfg | 1 + .../test/derived/prefixexactattribute/attributes.cfg | 2 ++ .../src/test/derived/reference_fields/attributes.cfg | 3 +++ config-model/src/test/derived/sorting/attributes.cfg | 3 +++ config-model/src/test/derived/tensor/attributes.cfg | 5 +++++ config-model/src/test/derived/types/attributes.cfg | 13 +++++++++++++ .../searchdefinition/AttributeSettingsTestCase.java | 12 ++++++------ 23 files changed, 138 insertions(+), 6 deletions(-) diff --git a/config-model/src/test/derived/advanced/attributes.cfg b/config-model/src/test/derived/advanced/attributes.cfg index 63bd7d980a6..cd654bedbae 100644 --- a/config-model/src/test/derived/advanced/attributes.cfg +++ b/config-model/src/test/derived/advanced/attributes.cfg @@ -8,6 +8,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch true attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA diff --git a/config-model/src/test/derived/array_of_struct_attribute/attributes.cfg b/config-model/src/test/derived/array_of_struct_attribute/attributes.cfg index eff0f7bd7a1..c2c2b83c06a 100644 --- a/config-model/src/test/derived/array_of_struct_attribute/attributes.cfg +++ b/config-model/src/test/derived/array_of_struct_attribute/attributes.cfg @@ -8,6 +8,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch true attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -38,6 +39,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA diff --git a/config-model/src/test/derived/attributeprefetch/attributes.cfg b/config-model/src/test/derived/attributeprefetch/attributes.cfg index 43f8b813139..a7285d7fb5f 100644 --- a/config-model/src/test/derived/attributeprefetch/attributes.cfg +++ b/config-model/src/test/derived/attributeprefetch/attributes.cfg @@ -8,6 +8,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -38,6 +39,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -68,6 +70,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -98,6 +101,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -128,6 +132,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -158,6 +163,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -188,6 +194,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -218,6 +225,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -248,6 +256,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -278,6 +287,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -308,6 +318,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -338,6 +349,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -368,6 +380,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -398,6 +411,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -428,6 +442,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -458,6 +473,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -488,6 +504,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -518,6 +535,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA diff --git a/config-model/src/test/derived/attributes/attributes.cfg b/config-model/src/test/derived/attributes/attributes.cfg index 82d1f7c99dc..ff3f9a7eebc 100644 --- a/config-model/src/test/derived/attributes/attributes.cfg +++ b/config-model/src/test/derived/attributes/attributes.cfg @@ -8,6 +8,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -38,6 +39,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -68,6 +70,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -98,6 +101,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -128,6 +132,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -158,6 +163,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -188,6 +194,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -218,6 +225,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -248,6 +256,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -278,6 +287,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -308,6 +318,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -338,6 +349,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -368,6 +380,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -398,6 +411,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch true attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -428,6 +442,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -458,6 +473,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -488,6 +504,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -518,6 +535,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA diff --git a/config-model/src/test/derived/complex/attributes.cfg b/config-model/src/test/derived/complex/attributes.cfg index 3c0f10722de..f9d4c1bd316 100644 --- a/config-model/src/test/derived/complex/attributes.cfg +++ b/config-model/src/test/derived/complex/attributes.cfg @@ -8,6 +8,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge true +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -38,6 +39,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -68,6 +70,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -98,6 +101,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -128,6 +132,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -158,6 +163,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -188,6 +194,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -218,6 +225,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -248,6 +256,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA diff --git a/config-model/src/test/derived/hnsw_index/attributes.cfg b/config-model/src/test/derived/hnsw_index/attributes.cfg index f7f040bf182..a1b0aee8818 100644 --- a/config-model/src/test/derived/hnsw_index/attributes.cfg +++ b/config-model/src/test/derived/hnsw_index/attributes.cfg @@ -8,6 +8,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -38,6 +39,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA diff --git a/config-model/src/test/derived/imported_fields_inherited_reference/attributes.cfg b/config-model/src/test/derived/imported_fields_inherited_reference/attributes.cfg index 26019842732..50970f26951 100644 --- a/config-model/src/test/derived/imported_fields_inherited_reference/attributes.cfg +++ b/config-model/src/test/derived/imported_fields_inherited_reference/attributes.cfg @@ -8,6 +8,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -38,6 +39,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -68,6 +70,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -98,6 +101,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA diff --git a/config-model/src/test/derived/imported_position_field/attributes.cfg b/config-model/src/test/derived/imported_position_field/attributes.cfg index 70b6ed14c55..82a85cbdc44 100644 --- a/config-model/src/test/derived/imported_position_field/attributes.cfg +++ b/config-model/src/test/derived/imported_position_field/attributes.cfg @@ -8,6 +8,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -38,6 +39,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch true attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA diff --git a/config-model/src/test/derived/imported_struct_fields/attributes.cfg b/config-model/src/test/derived/imported_struct_fields/attributes.cfg index e06d0f1a220..cdc64100c52 100644 --- a/config-model/src/test/derived/imported_struct_fields/attributes.cfg +++ b/config-model/src/test/derived/imported_struct_fields/attributes.cfg @@ -8,6 +8,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -38,6 +39,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch true attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -68,6 +70,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -98,6 +101,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch true attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -128,6 +132,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch true attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -158,6 +163,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -188,6 +194,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch true attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -218,6 +225,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA diff --git a/config-model/src/test/derived/importedfields/attributes.cfg b/config-model/src/test/derived/importedfields/attributes.cfg index 57dd2408869..6abbbc5d9d5 100644 --- a/config-model/src/test/derived/importedfields/attributes.cfg +++ b/config-model/src/test/derived/importedfields/attributes.cfg @@ -8,6 +8,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -38,6 +39,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -68,6 +70,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -98,6 +101,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -128,6 +132,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -158,6 +163,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -188,6 +194,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -218,6 +225,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA diff --git a/config-model/src/test/derived/inheritance/attributes.cfg b/config-model/src/test/derived/inheritance/attributes.cfg index 9f5588b0000..b81bb6e6b04 100644 --- a/config-model/src/test/derived/inheritance/attributes.cfg +++ b/config-model/src/test/derived/inheritance/attributes.cfg @@ -8,6 +8,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -38,6 +39,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -68,6 +70,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA diff --git a/config-model/src/test/derived/inheritfromparent/attributes.cfg b/config-model/src/test/derived/inheritfromparent/attributes.cfg index 0a1cf0b9f0e..39a94f2ff47 100644 --- a/config-model/src/test/derived/inheritfromparent/attributes.cfg +++ b/config-model/src/test/derived/inheritfromparent/attributes.cfg @@ -8,6 +8,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA diff --git a/config-model/src/test/derived/map_attribute/attributes.cfg b/config-model/src/test/derived/map_attribute/attributes.cfg index ebcca4fde78..6acc6481af4 100644 --- a/config-model/src/test/derived/map_attribute/attributes.cfg +++ b/config-model/src/test/derived/map_attribute/attributes.cfg @@ -8,6 +8,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch true attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -38,6 +39,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -68,6 +70,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA diff --git a/config-model/src/test/derived/map_of_struct_attribute/attributes.cfg b/config-model/src/test/derived/map_of_struct_attribute/attributes.cfg index bc7a17ebd62..bd9fcf946a2 100644 --- a/config-model/src/test/derived/map_of_struct_attribute/attributes.cfg +++ b/config-model/src/test/derived/map_of_struct_attribute/attributes.cfg @@ -8,6 +8,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch true attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -38,6 +39,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -68,6 +70,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -98,6 +101,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -128,6 +132,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch true attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA diff --git a/config-model/src/test/derived/music/attributes.cfg b/config-model/src/test/derived/music/attributes.cfg index bbe95047caa..c9ec14396ee 100644 --- a/config-model/src/test/derived/music/attributes.cfg +++ b/config-model/src/test/derived/music/attributes.cfg @@ -8,6 +8,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -38,6 +39,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -68,6 +70,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -98,6 +101,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -128,6 +132,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -158,6 +163,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -188,6 +194,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -218,6 +225,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -248,6 +256,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -278,6 +287,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -308,6 +318,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA diff --git a/config-model/src/test/derived/newrank/attributes.cfg b/config-model/src/test/derived/newrank/attributes.cfg index a690b075f22..dffc2f3e09e 100644 --- a/config-model/src/test/derived/newrank/attributes.cfg +++ b/config-model/src/test/derived/newrank/attributes.cfg @@ -8,6 +8,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -38,6 +39,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -68,6 +70,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -98,6 +101,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -128,6 +132,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -158,6 +163,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -188,6 +194,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -218,6 +225,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -248,6 +256,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -278,6 +287,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA diff --git a/config-model/src/test/derived/predicate_attribute/attributes.cfg b/config-model/src/test/derived/predicate_attribute/attributes.cfg index 1d6e0c9de32..bfe628894a0 100644 --- a/config-model/src/test/derived/predicate_attribute/attributes.cfg +++ b/config-model/src/test/derived/predicate_attribute/attributes.cfg @@ -8,6 +8,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA diff --git a/config-model/src/test/derived/prefixexactattribute/attributes.cfg b/config-model/src/test/derived/prefixexactattribute/attributes.cfg index bb6f61a6f04..455502d8ee9 100644 --- a/config-model/src/test/derived/prefixexactattribute/attributes.cfg +++ b/config-model/src/test/derived/prefixexactattribute/attributes.cfg @@ -8,6 +8,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -38,6 +39,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA diff --git a/config-model/src/test/derived/reference_fields/attributes.cfg b/config-model/src/test/derived/reference_fields/attributes.cfg index cc10e657011..94103a5572a 100644 --- a/config-model/src/test/derived/reference_fields/attributes.cfg +++ b/config-model/src/test/derived/reference_fields/attributes.cfg @@ -8,6 +8,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -38,6 +39,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -68,6 +70,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA diff --git a/config-model/src/test/derived/sorting/attributes.cfg b/config-model/src/test/derived/sorting/attributes.cfg index 5ee9d323041..0e527701ee8 100644 --- a/config-model/src/test/derived/sorting/attributes.cfg +++ b/config-model/src/test/derived/sorting/attributes.cfg @@ -8,6 +8,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending false attribute[].sortfunction LOWERCASE @@ -38,6 +39,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending false attribute[].sortfunction LOWERCASE @@ -68,6 +70,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending false attribute[].sortfunction LOWERCASE diff --git a/config-model/src/test/derived/tensor/attributes.cfg b/config-model/src/test/derived/tensor/attributes.cfg index 79f4d2a8a69..f2dd2b2054a 100644 --- a/config-model/src/test/derived/tensor/attributes.cfg +++ b/config-model/src/test/derived/tensor/attributes.cfg @@ -8,6 +8,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -38,6 +39,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -68,6 +70,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -98,6 +101,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -128,6 +132,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA diff --git a/config-model/src/test/derived/types/attributes.cfg b/config-model/src/test/derived/types/attributes.cfg index 175dd083f60..e89aae2b9dd 100644 --- a/config-model/src/test/derived/types/attributes.cfg +++ b/config-model/src/test/derived/types/attributes.cfg @@ -8,6 +8,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -38,6 +39,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -68,6 +70,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -98,6 +101,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -128,6 +132,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -158,6 +163,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -188,6 +194,7 @@ attribute[].removeifzero true attribute[].createifnonexistent true attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -218,6 +225,7 @@ attribute[].removeifzero true attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -248,6 +256,7 @@ attribute[].removeifzero false attribute[].createifnonexistent true attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -278,6 +287,7 @@ attribute[].removeifzero true attribute[].createifnonexistent true attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -308,6 +318,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch true attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -338,6 +349,7 @@ attribute[].removeifzero true attribute[].createifnonexistent true attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA @@ -368,6 +380,7 @@ attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false attribute[].huge false +attribute[].swappable false attribute[].ismutable false attribute[].sortascending true attribute[].sortfunction UCA diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java index 87cffcf1b78..93af8783890 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java @@ -35,7 +35,7 @@ public class AttributeSettingsTestCase extends SchemaTestCase { Search search = SearchBuilder.buildFromFile("src/test/examples/attributesettings.sd"); SDField f1=(SDField) search.getDocument().getField("f1"); - assertTrue(f1.getAttributes().size() == 1); + assertEquals(1, f1.getAttributes().size()); Attribute a1 = f1.getAttributes().get(f1.getName()); assertThat(a1.getType(), is(Attribute.Type.LONG)); assertThat(a1.getCollectionType(), is(Attribute.CollectionType.SINGLE)); @@ -46,7 +46,7 @@ public class AttributeSettingsTestCase extends SchemaTestCase { assertFalse(a1.isCreateIfNonExistent()); SDField f2=(SDField) search.getDocument().getField("f2"); - assertTrue(f2.getAttributes().size() == 1); + assertEquals(1, f2.getAttributes().size()); Attribute a2 = f2.getAttributes().get(f2.getName()); assertThat(a2.getType(), is(Attribute.Type.LONG)); assertThat(a2.getCollectionType(), is(Attribute.CollectionType.SINGLE)); @@ -57,7 +57,7 @@ public class AttributeSettingsTestCase extends SchemaTestCase { assertFalse(a2.isCreateIfNonExistent()); assertThat(f2.getAliasToName().get("f2alias"), is("f2")); SDField f3=(SDField) search.getDocument().getField("f3"); - assertTrue(f3.getAttributes().size() == 1); + assertEquals(1, f3.getAttributes().size()); assertThat(f3.getAliasToName().get("f3alias"), is("f3")); Attribute a3 = f3.getAttributes().get(f3.getName()); @@ -80,7 +80,7 @@ public class AttributeSettingsTestCase extends SchemaTestCase { private void assertWeightedSet(Search search, String name, boolean createIfNonExistent, boolean removeIfZero) { SDField f4 = (SDField) search.getDocument().getField(name); - assertTrue(f4.getAttributes().size() == 1); + assertEquals(1, f4.getAttributes().size()); Attribute a4 = f4.getAttributes().get(f4.getName()); assertThat(a4.getType(), is(Attribute.Type.STRING)); assertThat(a4.getCollectionType(), is(Attribute.CollectionType.WEIGHTEDSET)); @@ -95,7 +95,7 @@ public class AttributeSettingsTestCase extends SchemaTestCase { public void requireThatFastAccessCanBeSet() throws IOException, ParseException { Search search = SearchBuilder.buildFromFile("src/test/examples/attributesettings.sd"); SDField field = (SDField) search.getDocument().getField("fast_access"); - assertTrue(field.getAttributes().size() == 1); + assertEquals(1, field.getAttributes().size()); Attribute attr = field.getAttributes().get(field.getName()); assertTrue(attr.isFastAccess()); } @@ -136,7 +136,7 @@ public class AttributeSettingsTestCase extends SchemaTestCase { " }\n" + " }\n" + "}\n"); - assertFalse(attr.isSwappable()); + assertTrue(attr.isSwappable()); } @Test -- cgit v1.2.3