diff options
37 files changed, 7 insertions, 200 deletions
diff --git a/config-model/src/test/derived/advanced/attributes.cfg b/config-model/src/test/derived/advanced/attributes.cfg index 070bf7f2560..5ebd25b7678 100644 --- a/config-model/src/test/derived/advanced/attributes.cfg +++ b/config-model/src/test/derived/advanced/attributes.cfg @@ -7,7 +7,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch true -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true 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 b2f2f4b28c6..75e892fda7c 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 @@ -7,7 +7,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch true -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -38,7 +37,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true diff --git a/config-model/src/test/derived/attributeprefetch/attributes.cfg b/config-model/src/test/derived/attributeprefetch/attributes.cfg index 85d8565cf99..3168ec24b98 100644 --- a/config-model/src/test/derived/attributeprefetch/attributes.cfg +++ b/config-model/src/test/derived/attributeprefetch/attributes.cfg @@ -7,7 +7,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -38,7 +37,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -69,7 +67,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -100,7 +97,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -131,7 +127,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -162,7 +157,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -193,7 +187,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -224,7 +217,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -255,7 +247,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -286,7 +277,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -317,7 +307,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -348,7 +337,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -379,7 +367,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -410,7 +397,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -441,7 +427,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -472,7 +457,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true diff --git a/config-model/src/test/derived/attributes/attributes.cfg b/config-model/src/test/derived/attributes/attributes.cfg index 77a2165a10a..07a3631819d 100644 --- a/config-model/src/test/derived/attributes/attributes.cfg +++ b/config-model/src/test/derived/attributes/attributes.cfg @@ -7,7 +7,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -38,7 +37,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -69,7 +67,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -100,7 +97,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -131,7 +127,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -162,7 +157,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -193,7 +187,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -224,7 +217,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -255,7 +247,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -286,7 +277,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -317,7 +307,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -348,7 +337,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -379,7 +367,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -410,7 +397,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch true -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -441,7 +427,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -472,7 +457,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -503,7 +487,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch true -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -534,7 +517,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -565,7 +547,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true diff --git a/config-model/src/test/derived/complex/attributes.cfg b/config-model/src/test/derived/complex/attributes.cfg index 0e32061af2f..0772b797777 100644 --- a/config-model/src/test/derived/complex/attributes.cfg +++ b/config-model/src/test/derived/complex/attributes.cfg @@ -7,7 +7,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -38,7 +37,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -69,7 +67,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -100,7 +97,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -131,7 +127,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -162,7 +157,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -193,7 +187,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -224,7 +217,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -255,7 +247,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true diff --git a/config-model/src/test/derived/function_arguments/attributes.cfg b/config-model/src/test/derived/function_arguments/attributes.cfg index 27d12b1fe1d..101fe901ce2 100644 --- a/config-model/src/test/derived/function_arguments/attributes.cfg +++ b/config-model/src/test/derived/function_arguments/attributes.cfg @@ -7,7 +7,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -38,7 +37,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -69,7 +67,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true diff --git a/config-model/src/test/derived/function_arguments_with_expressions/attributes.cfg b/config-model/src/test/derived/function_arguments_with_expressions/attributes.cfg index d389c46755a..7280596be5b 100644 --- a/config-model/src/test/derived/function_arguments_with_expressions/attributes.cfg +++ b/config-model/src/test/derived/function_arguments_with_expressions/attributes.cfg @@ -7,7 +7,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -38,7 +37,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -69,7 +67,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true diff --git a/config-model/src/test/derived/hnsw_index/attributes.cfg b/config-model/src/test/derived/hnsw_index/attributes.cfg index 37e38538cc1..99a0d93fd35 100644 --- a/config-model/src/test/derived/hnsw_index/attributes.cfg +++ b/config-model/src/test/derived/hnsw_index/attributes.cfg @@ -7,7 +7,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -38,7 +37,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true 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 4f5d41815bd..70f1f21b465 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 @@ -7,7 +7,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -38,7 +37,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -69,7 +67,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -100,7 +97,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true 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 a31fda5dc3f..2d1d1b232b1 100644 --- a/config-model/src/test/derived/imported_position_field/attributes.cfg +++ b/config-model/src/test/derived/imported_position_field/attributes.cfg @@ -7,7 +7,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -38,7 +37,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch true -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true 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 4a1297ac6c0..31eb66776d4 100644 --- a/config-model/src/test/derived/imported_struct_fields/attributes.cfg +++ b/config-model/src/test/derived/imported_struct_fields/attributes.cfg @@ -7,7 +7,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -38,7 +37,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch true -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -69,7 +67,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -100,7 +97,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch true -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -131,7 +127,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch true -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -162,7 +157,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -193,7 +187,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch true -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -224,7 +217,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true diff --git a/config-model/src/test/derived/importedfields/attributes.cfg b/config-model/src/test/derived/importedfields/attributes.cfg index 7a8142501d1..7f2cb39dc3d 100644 --- a/config-model/src/test/derived/importedfields/attributes.cfg +++ b/config-model/src/test/derived/importedfields/attributes.cfg @@ -7,7 +7,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -38,7 +37,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -69,7 +67,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -100,7 +97,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -131,7 +127,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -162,7 +157,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -193,7 +187,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -224,7 +217,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true diff --git a/config-model/src/test/derived/inheritance/attributes.cfg b/config-model/src/test/derived/inheritance/attributes.cfg index 289ceeb1531..9ab0cb0c67e 100644 --- a/config-model/src/test/derived/inheritance/attributes.cfg +++ b/config-model/src/test/derived/inheritance/attributes.cfg @@ -7,7 +7,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -38,7 +37,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -69,7 +67,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true diff --git a/config-model/src/test/derived/inheritfromparent/attributes.cfg b/config-model/src/test/derived/inheritfromparent/attributes.cfg index d270c240ea0..27a18a58bfd 100644 --- a/config-model/src/test/derived/inheritfromparent/attributes.cfg +++ b/config-model/src/test/derived/inheritfromparent/attributes.cfg @@ -7,7 +7,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true diff --git a/config-model/src/test/derived/map_attribute/attributes.cfg b/config-model/src/test/derived/map_attribute/attributes.cfg index 1aa27e0472c..2b62418480b 100644 --- a/config-model/src/test/derived/map_attribute/attributes.cfg +++ b/config-model/src/test/derived/map_attribute/attributes.cfg @@ -7,7 +7,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch true -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -38,7 +37,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -69,7 +67,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true 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 c2566ea2cd8..216967a93dc 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 @@ -7,7 +7,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch true -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -38,7 +37,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -69,7 +67,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -100,7 +97,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -131,7 +127,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch true -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true diff --git a/config-model/src/test/derived/multiplesummaries/attributes.cfg b/config-model/src/test/derived/multiplesummaries/attributes.cfg index 70cb3c7d42c..bb323041c0a 100644 --- a/config-model/src/test/derived/multiplesummaries/attributes.cfg +++ b/config-model/src/test/derived/multiplesummaries/attributes.cfg @@ -7,7 +7,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -38,7 +37,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -69,7 +67,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -100,7 +97,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -131,7 +127,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch true -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true diff --git a/config-model/src/test/derived/music/attributes.cfg b/config-model/src/test/derived/music/attributes.cfg index 954f9c92352..0c37cdb207f 100644 --- a/config-model/src/test/derived/music/attributes.cfg +++ b/config-model/src/test/derived/music/attributes.cfg @@ -7,7 +7,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -38,7 +37,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -69,7 +67,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -100,7 +97,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -131,7 +127,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -162,7 +157,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -193,7 +187,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -224,7 +217,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -255,7 +247,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -286,7 +277,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -317,7 +307,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true diff --git a/config-model/src/test/derived/newrank/attributes.cfg b/config-model/src/test/derived/newrank/attributes.cfg index a477afca07e..60d174d4b12 100644 --- a/config-model/src/test/derived/newrank/attributes.cfg +++ b/config-model/src/test/derived/newrank/attributes.cfg @@ -7,7 +7,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -38,7 +37,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -69,7 +67,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -100,7 +97,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -131,7 +127,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -162,7 +157,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -193,7 +187,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -224,7 +217,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -255,7 +247,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -286,7 +277,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true diff --git a/config-model/src/test/derived/predicate_attribute/attributes.cfg b/config-model/src/test/derived/predicate_attribute/attributes.cfg index c858b6bf5cb..d5810e78185 100644 --- a/config-model/src/test/derived/predicate_attribute/attributes.cfg +++ b/config-model/src/test/derived/predicate_attribute/attributes.cfg @@ -7,7 +7,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true diff --git a/config-model/src/test/derived/prefixexactattribute/attributes.cfg b/config-model/src/test/derived/prefixexactattribute/attributes.cfg index f040eff3d6b..65a0df45fd6 100644 --- a/config-model/src/test/derived/prefixexactattribute/attributes.cfg +++ b/config-model/src/test/derived/prefixexactattribute/attributes.cfg @@ -7,7 +7,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -38,7 +37,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true diff --git a/config-model/src/test/derived/reference_fields/attributes.cfg b/config-model/src/test/derived/reference_fields/attributes.cfg index 7e69c0e305f..a79bf71f65c 100644 --- a/config-model/src/test/derived/reference_fields/attributes.cfg +++ b/config-model/src/test/derived/reference_fields/attributes.cfg @@ -7,7 +7,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -38,7 +37,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -69,7 +67,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true diff --git a/config-model/src/test/derived/schemainheritance/attributes.cfg b/config-model/src/test/derived/schemainheritance/attributes.cfg index b69e25c532b..a6ee394dcf3 100644 --- a/config-model/src/test/derived/schemainheritance/attributes.cfg +++ b/config-model/src/test/derived/schemainheritance/attributes.cfg @@ -7,7 +7,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -38,7 +37,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -69,7 +67,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -100,7 +97,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -131,7 +127,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true diff --git a/config-model/src/test/derived/sorting/attributes.cfg b/config-model/src/test/derived/sorting/attributes.cfg index e41db1db3c7..f2074be891f 100644 --- a/config-model/src/test/derived/sorting/attributes.cfg +++ b/config-model/src/test/derived/sorting/attributes.cfg @@ -7,7 +7,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -38,7 +37,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending false @@ -69,7 +67,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -100,7 +97,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending false @@ -131,7 +127,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -162,7 +157,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -193,7 +187,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending false @@ -224,7 +217,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -255,7 +247,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending false @@ -286,7 +277,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -317,7 +307,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending false diff --git a/config-model/src/test/derived/structandfieldset/attributes.cfg b/config-model/src/test/derived/structandfieldset/attributes.cfg index 79ace18e4fd..42557c2de3a 100644 --- a/config-model/src/test/derived/structandfieldset/attributes.cfg +++ b/config-model/src/test/derived/structandfieldset/attributes.cfg @@ -7,7 +7,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -38,7 +37,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -69,7 +67,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true diff --git a/config-model/src/test/derived/tensor/attributes.cfg b/config-model/src/test/derived/tensor/attributes.cfg index 0ada79f90e0..4cfb2eb97df 100644 --- a/config-model/src/test/derived/tensor/attributes.cfg +++ b/config-model/src/test/derived/tensor/attributes.cfg @@ -7,7 +7,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -38,7 +37,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -69,7 +67,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -100,7 +97,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -131,7 +127,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true diff --git a/config-model/src/test/derived/types/attributes.cfg b/config-model/src/test/derived/types/attributes.cfg index 26dbefec574..fbef851b4af 100644 --- a/config-model/src/test/derived/types/attributes.cfg +++ b/config-model/src/test/derived/types/attributes.cfg @@ -7,7 +7,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -38,7 +37,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -69,7 +67,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -100,7 +97,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -131,7 +127,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -162,7 +157,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -193,7 +187,6 @@ attribute[].match UNCASED attribute[].removeifzero true attribute[].createifnonexistent true attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -224,7 +217,6 @@ attribute[].match UNCASED attribute[].removeifzero true attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -255,7 +247,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent true attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -286,7 +277,6 @@ attribute[].match UNCASED attribute[].removeifzero true attribute[].createifnonexistent true attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -317,7 +307,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch true -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -348,7 +337,6 @@ attribute[].match UNCASED attribute[].removeifzero true attribute[].createifnonexistent true attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true @@ -379,7 +367,6 @@ attribute[].match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false -attribute[].huge false attribute[].paged false attribute[].ismutable false attribute[].sortascending true diff --git a/configdefinitions/src/vespa/attributes.def b/configdefinitions/src/vespa/attributes.def index 5b32711a1e4..38cc763704c 100644 --- a/configdefinitions/src/vespa/attributes.def +++ b/configdefinitions/src/vespa/attributes.def @@ -10,7 +10,6 @@ attribute[].match enum { CASED, UNCASED } default=UNCASED attribute[].removeifzero bool default=false attribute[].createifnonexistent bool default=false attribute[].fastsearch bool default=false -attribute[].huge bool default=false attribute[].paged bool default=false # An attribute marked mutable can be updated by a query. attribute[].ismutable bool default=false diff --git a/searchcore/src/tests/proton/common/cachedselect_test.cpp b/searchcore/src/tests/proton/common/cachedselect_test.cpp index 2fd798cd8fd..64c95c36350 100644 --- a/searchcore/src/tests/proton/common/cachedselect_test.cpp +++ b/searchcore/src/tests/proton/common/cachedselect_test.cpp @@ -190,7 +190,7 @@ public: MyIntAv(const string &name) : SvIntAttr(name, Config(BasicType::INT32, CollectionType::SINGLE, - true, false)), + true)), _gets(0) { } diff --git a/searchcore/src/tests/proton/documentdb/documentdbconfigscout/documentdbconfigscout_test.cpp b/searchcore/src/tests/proton/documentdb/documentdbconfigscout/documentdbconfigscout_test.cpp index 4350ebc0ee2..b8579d66c5f 100644 --- a/searchcore/src/tests/proton/documentdb/documentdbconfigscout/documentdbconfigscout_test.cpp +++ b/searchcore/src/tests/proton/documentdb/documentdbconfigscout/documentdbconfigscout_test.cpp @@ -40,9 +40,6 @@ assertDefaultAttribute(const AttributesConfig::Attribute &attribute, if (!EXPECT_FALSE(attribute.fastsearch)) { return false; } - if (!EXPECT_FALSE(attribute.huge)) { - return false; - } if (!EXPECT_FALSE(attribute.paged)) { return false; } @@ -66,9 +63,6 @@ assertFastSearchAttribute(const AttributesConfig::Attribute &attribute, if (!EXPECT_TRUE(attribute.fastsearch)) { return false; } - if (!EXPECT_FALSE(attribute.huge)) { - return false; - } if (!EXPECT_FALSE(attribute.paged)) { return false; } @@ -92,9 +86,6 @@ assertFastSearchAndMoreAttribute(const AttributesConfig::Attribute &attribute, if (!EXPECT_TRUE(attribute.fastsearch)) { return false; } - if (!EXPECT_TRUE(attribute.huge)) { - return false; - } if (!EXPECT_TRUE(attribute.paged)) { return false; } @@ -241,7 +232,6 @@ setupFastSearchAndMoreAttribute(const vespalib::string name) AttributesConfig::Attribute attribute; attribute.name = name; attribute.fastsearch = true; - attribute.huge = true; attribute.paged = true; attribute.enablebitvectors = true; attribute.enableonlybitvector = true; diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attributesconfigscout.cpp b/searchcore/src/vespa/searchcore/proton/attribute/attributesconfigscout.cpp index e21230a1d58..e5a087e1bf2 100644 --- a/searchcore/src/vespa/searchcore/proton/attribute/attributesconfigscout.cpp +++ b/searchcore/src/vespa/searchcore/proton/attribute/attributesconfigscout.cpp @@ -28,7 +28,6 @@ AttributesConfigScout::adjust(AttributesConfig::Attribute &attr, attr.enablebitvectors = liveAttr.enablebitvectors; attr.enableonlybitvector = liveAttr.enableonlybitvector; attr.fastsearch = liveAttr.fastsearch; - attr.huge = liveAttr.huge; attr.paged = liveAttr.paged; // Note: Predicate attributes only handle changes for the dense-posting-list-threshold config. attr.densepostinglistthreshold = liveAttr.densepostinglistthreshold; diff --git a/searchlib/src/apps/vespa-attribute-inspect/vespa-attribute-inspect.cpp b/searchlib/src/apps/vespa-attribute-inspect/vespa-attribute-inspect.cpp index d9d6bb56152..5833f9cc904 100644 --- a/searchlib/src/apps/vespa-attribute-inspect/vespa-attribute-inspect.cpp +++ b/searchlib/src/apps/vespa-attribute-inspect/vespa-attribute-inspect.cpp @@ -112,11 +112,10 @@ LoadAttribute::main(int argc, char **argv) bool doApplyUpdate = false; bool doSave = false; bool doFastSearch = false; - bool doHuge = false; int opt; bool optError = false; - while ((opt = getopt(argc, argv, "pasf:h")) != -1) { + while ((opt = getopt(argc, argv, "pasf:")) != -1) { switch (opt) { case 'p': doPrintContent = true; @@ -124,9 +123,6 @@ LoadAttribute::main(int argc, char **argv) case 'a': doApplyUpdate = true; break; - case 'h': - doHuge = true; - break; case 'f': if (strcmp(optarg, "search") == 0) { doFastSearch = true; @@ -162,7 +158,6 @@ LoadAttribute::main(int argc, char **argv) attribute::CollectionType ct(fh.getTag("collectiontype").asString()); attribute::Config c(bt, ct); c.setFastSearch(doFastSearch); - c.setHuge(doHuge); AttributePtr ptr = AttributeFactory::createAttribute(fileName, c); vespalib::Timer timer; load(ptr); diff --git a/searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp b/searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp index 8a702769312..7f0a88c9f86 100644 --- a/searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp +++ b/searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp @@ -218,12 +218,6 @@ TEST("require that config can be converted") a.fastsearch = true; EXPECT_TRUE(CC::convert(a).fastSearch()); } - { // huge - CACA a; - EXPECT_TRUE(!CC::convert(a).huge()); - a.huge = true; - EXPECT_TRUE(CC::convert(a).huge()); - } { // fastAccess CACA a; EXPECT_TRUE(!CC::convert(a).fastAccess()); diff --git a/searchlib/src/tests/searchcommon/attribute/config/attribute_config_test.cpp b/searchlib/src/tests/searchcommon/attribute/config/attribute_config_test.cpp index f9e77376b25..2183138811b 100644 --- a/searchlib/src/tests/searchcommon/attribute/config/attribute_config_test.cpp +++ b/searchlib/src/tests/searchcommon/attribute/config/attribute_config_test.cpp @@ -20,9 +20,8 @@ struct Fixture Fixture(BasicType bt, CollectionType ct = CollectionType::SINGLE, - bool fastSearch_ = false, - bool huge_ = false) - : _config(bt, ct, fastSearch_, huge_) + bool fastSearch_ = false) + : _config(bt, ct, fastSearch_) { } }; @@ -32,7 +31,6 @@ TEST_F("test default attribute config", Fixture) EXPECT_EQUAL(CollectionType::Type::SINGLE, f._config.collectionType().type()); EXPECT_TRUE(!f._config.fastSearch()); - EXPECT_TRUE(!f._config.huge()); EXPECT_TRUE(!f._config.getEnableBitVectors()); EXPECT_TRUE(!f._config.getEnableOnlyBitVector()); EXPECT_TRUE(!f._config.getIsFilter()); @@ -48,7 +46,6 @@ TEST_F("test integer weightedset attribute config", EXPECT_EQUAL(CollectionType::Type::WSET, f._config.collectionType().type()); EXPECT_TRUE(!f._config.fastSearch()); - EXPECT_TRUE(!f._config.huge()); EXPECT_TRUE(!f._config.getEnableBitVectors()); EXPECT_TRUE(!f._config.getEnableOnlyBitVector()); EXPECT_TRUE(!f._config.getIsFilter()); diff --git a/searchlib/src/vespa/searchcommon/attribute/config.cpp b/searchlib/src/vespa/searchcommon/attribute/config.cpp index 0a50faa04c0..69dab6ad88e 100644 --- a/searchlib/src/vespa/searchcommon/attribute/config.cpp +++ b/searchlib/src/vespa/searchcommon/attribute/config.cpp @@ -11,15 +11,14 @@ static constexpr uint64_t MAX_UNCOMMITTED_MEMORY = 8000; } Config::Config() noexcept - : Config(BasicType::NONE, CollectionType::SINGLE, false, false) + : Config(BasicType::NONE, CollectionType::SINGLE, false) { } -Config::Config(BasicType bt, CollectionType ct, bool fastSearch_, bool huge_) noexcept +Config::Config(BasicType bt, CollectionType ct, bool fastSearch_) noexcept : _basicType(bt), _type(ct), _fastSearch(fastSearch_), - _huge(huge_), _enableBitVectors(false), _enableOnlyBitVector(false), _isFilter(false), @@ -49,7 +48,6 @@ Config::operator==(const Config &b) const { return _basicType == b._basicType && _type == b._type && - _huge == b._huge && _fastSearch == b._fastSearch && _enableBitVectors == b._enableBitVectors && _enableOnlyBitVector == b._enableOnlyBitVector && diff --git a/searchlib/src/vespa/searchcommon/attribute/config.h b/searchlib/src/vespa/searchcommon/attribute/config.h index f572f5038fc..edd5dbcc7a1 100644 --- a/searchlib/src/vespa/searchcommon/attribute/config.h +++ b/searchlib/src/vespa/searchcommon/attribute/config.h @@ -27,10 +27,7 @@ public: Config() noexcept; Config(BasicType bt) noexcept : Config(bt, CollectionType::SINGLE) { } Config(BasicType bt, CollectionType ct) noexcept : Config(bt, ct, false) { } - Config(BasicType bt, CollectionType ct, bool fastSearch_) noexcept - : Config(bt, ct, fastSearch_, false) - {} - Config(BasicType bt, CollectionType ct, bool fastSearch_, bool huge_) noexcept; + Config(BasicType bt, CollectionType ct, bool fastSearch_) noexcept; Config(const Config &); Config & operator = (const Config &); Config(Config &&) noexcept; @@ -40,7 +37,6 @@ public: BasicType basicType() const { return _basicType; } CollectionType collectionType() const { return _type; } bool fastSearch() const { return _fastSearch; } - bool huge() const { return _huge; } bool paged() const { return _paged; } const PredicateParams &predicateParams() const { return _predicateParams; } const vespalib::eval::ValueType & tensorType() const { return _tensorType; } @@ -72,7 +68,6 @@ public: const CompactionStrategy &getCompactionStrategy() const { return _compactionStrategy; } const DictionaryConfig & get_dictionary_config() const { return _dictionary; } Match get_match() const { return _match; } - Config & setHuge(bool v) { _huge = v; return *this;} Config & setFastSearch(bool v) { _fastSearch = v; return *this; } Config & setPredicateParams(const PredicateParams &v) { _predicateParams = v; return *this; } Config & setTensorType(const vespalib::eval::ValueType &tensorType_in) { @@ -137,7 +132,6 @@ private: BasicType _basicType; CollectionType _type; bool _fastSearch; - bool _huge; bool _enableBitVectors; bool _enableOnlyBitVector; bool _isFilter; diff --git a/searchlib/src/vespa/searchlib/attribute/configconverter.cpp b/searchlib/src/vespa/searchlib/attribute/configconverter.cpp index 9aac4f301d5..ed7d5abb8f8 100644 --- a/searchlib/src/vespa/searchlib/attribute/configconverter.cpp +++ b/searchlib/src/vespa/searchlib/attribute/configconverter.cpp @@ -103,7 +103,6 @@ ConfigConverter::convert(const AttributesConfig::Attribute & cfg) Config retval(bType, cType); PredicateParams predicateParams; retval.setFastSearch(cfg.fastsearch); - retval.setHuge(cfg.huge); retval.setEnableBitVectors(cfg.enablebitvectors); retval.setEnableOnlyBitVector(cfg.enableonlybitvector); retval.setIsFilter(cfg.enableonlybitvector); |