diff options
27 files changed, 189 insertions, 145 deletions
diff --git a/config-model/src/test/derived/advanced/attributes.cfg b/config-model/src/test/derived/advanced/attributes.cfg index 760d39b8f55..d2d5b91f894 100644 --- a/config-model/src/test/derived/advanced/attributes.cfg +++ b/config-model/src/test/derived/advanced/attributes.cfg @@ -3,7 +3,7 @@ attribute[].datatype INT64 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch 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 951cd8e4157..499cf693a6e 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 @@ -3,7 +3,7 @@ attribute[].datatype STRING attribute[].collectiontype ARRAY attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch true @@ -33,7 +33,7 @@ attribute[].datatype INT32 attribute[].collectiontype ARRAY attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false diff --git a/config-model/src/test/derived/attributeprefetch/attributes.cfg b/config-model/src/test/derived/attributeprefetch/attributes.cfg index 1700cc5ff32..50c6de9d4da 100644 --- a/config-model/src/test/derived/attributeprefetch/attributes.cfg +++ b/config-model/src/test/derived/attributeprefetch/attributes.cfg @@ -3,7 +3,7 @@ attribute[].datatype INT8 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -33,7 +33,7 @@ attribute[].datatype INT8 attribute[].collectiontype ARRAY attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -63,7 +63,7 @@ attribute[].datatype INT8 attribute[].collectiontype WEIGHTEDSET attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -93,7 +93,7 @@ attribute[].datatype INT32 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -123,7 +123,7 @@ attribute[].datatype INT32 attribute[].collectiontype ARRAY attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -153,7 +153,7 @@ attribute[].datatype INT32 attribute[].collectiontype WEIGHTEDSET attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -183,7 +183,7 @@ attribute[].datatype INT64 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -213,7 +213,7 @@ attribute[].datatype INT64 attribute[].collectiontype ARRAY attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -243,7 +243,7 @@ attribute[].datatype INT64 attribute[].collectiontype WEIGHTEDSET attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -273,7 +273,7 @@ attribute[].datatype FLOAT attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -303,7 +303,7 @@ attribute[].datatype FLOAT attribute[].collectiontype ARRAY attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -333,7 +333,7 @@ attribute[].datatype FLOAT attribute[].collectiontype WEIGHTEDSET attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -363,7 +363,7 @@ attribute[].datatype DOUBLE attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -393,7 +393,7 @@ attribute[].datatype DOUBLE attribute[].collectiontype ARRAY attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -423,7 +423,7 @@ attribute[].datatype DOUBLE attribute[].collectiontype WEIGHTEDSET attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -453,7 +453,7 @@ attribute[].datatype STRING attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -483,7 +483,7 @@ attribute[].datatype STRING attribute[].collectiontype ARRAY attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -513,7 +513,7 @@ attribute[].datatype STRING attribute[].collectiontype WEIGHTEDSET attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false diff --git a/config-model/src/test/derived/attributes/attributes.cfg b/config-model/src/test/derived/attributes/attributes.cfg index 632ab97bbfe..f8fb274ae14 100644 --- a/config-model/src/test/derived/attributes/attributes.cfg +++ b/config-model/src/test/derived/attributes/attributes.cfg @@ -3,7 +3,7 @@ attribute[].datatype STRING attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -33,7 +33,7 @@ attribute[].datatype STRING attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -63,7 +63,7 @@ attribute[].datatype STRING attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -93,7 +93,7 @@ attribute[].datatype STRING attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -123,7 +123,7 @@ attribute[].datatype STRING attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -153,7 +153,7 @@ attribute[].datatype STRING attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -183,7 +183,7 @@ attribute[].datatype STRING attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -213,7 +213,7 @@ attribute[].datatype STRING attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -243,7 +243,7 @@ attribute[].datatype INT32 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -273,7 +273,7 @@ attribute[].datatype INT32 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -303,7 +303,7 @@ attribute[].datatype INT64 attribute[].collectiontype ARRAY attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -333,7 +333,7 @@ attribute[].datatype DOUBLE attribute[].collectiontype WEIGHTEDSET attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -363,7 +363,7 @@ attribute[].datatype INT32 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -393,7 +393,7 @@ attribute[].datatype INT32 attribute[].collectiontype ARRAY attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch true @@ -423,7 +423,7 @@ attribute[].datatype INT32 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -453,7 +453,7 @@ attribute[].datatype INT32 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -483,7 +483,7 @@ attribute[].datatype STRING attribute[].collectiontype ARRAY attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -513,7 +513,7 @@ attribute[].datatype STRING attribute[].collectiontype ARRAY attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false diff --git a/config-model/src/test/derived/complex/attributes.cfg b/config-model/src/test/derived/complex/attributes.cfg index 8bfc14e6795..84644de548e 100644 --- a/config-model/src/test/derived/complex/attributes.cfg +++ b/config-model/src/test/derived/complex/attributes.cfg @@ -3,7 +3,7 @@ attribute[].datatype STRING attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -33,7 +33,7 @@ attribute[].datatype FLOAT attribute[].collectiontype ARRAY attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -63,7 +63,7 @@ attribute[].datatype FLOAT attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -93,7 +93,7 @@ attribute[].datatype INT64 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -123,7 +123,7 @@ attribute[].datatype INT32 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -153,7 +153,7 @@ attribute[].datatype INT64 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -183,7 +183,7 @@ attribute[].datatype INT32 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -213,7 +213,7 @@ attribute[].datatype INT32 attribute[].collectiontype ARRAY attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -243,7 +243,7 @@ attribute[].datatype INT32 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false diff --git a/config-model/src/test/derived/hnsw_index/attributes.cfg b/config-model/src/test/derived/hnsw_index/attributes.cfg index 188ebed6bc2..cb86e0a6fb1 100644 --- a/config-model/src/test/derived/hnsw_index/attributes.cfg +++ b/config-model/src/test/derived/hnsw_index/attributes.cfg @@ -3,7 +3,7 @@ attribute[].datatype TENSOR attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -33,7 +33,7 @@ attribute[].datatype TENSOR attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false 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 f2a18de22bf..258dd2e030f 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 @@ -3,7 +3,7 @@ attribute[].datatype REFERENCE attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -33,7 +33,7 @@ attribute[].datatype REFERENCE attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -63,7 +63,7 @@ attribute[].datatype INT32 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -93,7 +93,7 @@ attribute[].datatype INT32 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false 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 0433c41fced..8e441537641 100644 --- a/config-model/src/test/derived/imported_position_field/attributes.cfg +++ b/config-model/src/test/derived/imported_position_field/attributes.cfg @@ -3,7 +3,7 @@ attribute[].datatype REFERENCE attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -33,7 +33,7 @@ attribute[].datatype INT64 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch 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 894683e6389..24e3baa12f1 100644 --- a/config-model/src/test/derived/imported_struct_fields/attributes.cfg +++ b/config-model/src/test/derived/imported_struct_fields/attributes.cfg @@ -3,7 +3,7 @@ attribute[].datatype REFERENCE attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -33,7 +33,7 @@ attribute[].datatype STRING attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch true @@ -63,7 +63,7 @@ attribute[].datatype INT32 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -93,7 +93,7 @@ attribute[].datatype STRING attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch true @@ -123,7 +123,7 @@ attribute[].datatype STRING attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch true @@ -153,7 +153,7 @@ attribute[].datatype INT32 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -183,7 +183,7 @@ attribute[].datatype STRING attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch true @@ -213,7 +213,7 @@ attribute[].datatype INT32 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false diff --git a/config-model/src/test/derived/importedfields/attributes.cfg b/config-model/src/test/derived/importedfields/attributes.cfg index 16ddd67ad6d..a7b5e5af1ca 100644 --- a/config-model/src/test/derived/importedfields/attributes.cfg +++ b/config-model/src/test/derived/importedfields/attributes.cfg @@ -3,7 +3,7 @@ attribute[].datatype REFERENCE attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -33,7 +33,7 @@ attribute[].datatype REFERENCE attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -63,7 +63,7 @@ attribute[].datatype REFERENCE attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -93,7 +93,7 @@ attribute[].datatype INT32 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -123,7 +123,7 @@ attribute[].datatype STRING attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -153,7 +153,7 @@ attribute[].datatype INT32 attribute[].collectiontype ARRAY attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -183,7 +183,7 @@ attribute[].datatype INT32 attribute[].collectiontype WEIGHTEDSET attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -213,7 +213,7 @@ attribute[].datatype INT32 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false diff --git a/config-model/src/test/derived/inheritance/attributes.cfg b/config-model/src/test/derived/inheritance/attributes.cfg index 900a93efe23..be9ccf47be3 100644 --- a/config-model/src/test/derived/inheritance/attributes.cfg +++ b/config-model/src/test/derived/inheritance/attributes.cfg @@ -3,7 +3,7 @@ attribute[].datatype INT32 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -33,7 +33,7 @@ attribute[].datatype INT32 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -63,7 +63,7 @@ attribute[].datatype STRING attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false diff --git a/config-model/src/test/derived/inheritfromparent/attributes.cfg b/config-model/src/test/derived/inheritfromparent/attributes.cfg index 93dfc9b3234..d0843e1aa0f 100644 --- a/config-model/src/test/derived/inheritfromparent/attributes.cfg +++ b/config-model/src/test/derived/inheritfromparent/attributes.cfg @@ -3,7 +3,7 @@ attribute[].datatype FLOAT attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false diff --git a/config-model/src/test/derived/map_attribute/attributes.cfg b/config-model/src/test/derived/map_attribute/attributes.cfg index 35b9a1722a9..c03db9f7e8d 100644 --- a/config-model/src/test/derived/map_attribute/attributes.cfg +++ b/config-model/src/test/derived/map_attribute/attributes.cfg @@ -3,7 +3,7 @@ attribute[].datatype STRING attribute[].collectiontype ARRAY attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch true @@ -33,7 +33,7 @@ attribute[].datatype STRING attribute[].collectiontype ARRAY attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -63,7 +63,7 @@ attribute[].datatype INT32 attribute[].collectiontype ARRAY attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false 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 e9471d91c45..b647a7408fa 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 @@ -3,7 +3,7 @@ attribute[].datatype STRING attribute[].collectiontype ARRAY attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch true @@ -33,7 +33,7 @@ attribute[].datatype STRING attribute[].collectiontype ARRAY attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -63,7 +63,7 @@ attribute[].datatype INT32 attribute[].collectiontype ARRAY attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -93,7 +93,7 @@ attribute[].datatype INT32 attribute[].collectiontype ARRAY attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -123,7 +123,7 @@ attribute[].datatype STRING attribute[].collectiontype ARRAY attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch true diff --git a/config-model/src/test/derived/music/attributes.cfg b/config-model/src/test/derived/music/attributes.cfg index e1685f55357..7cbd7e775d9 100644 --- a/config-model/src/test/derived/music/attributes.cfg +++ b/config-model/src/test/derived/music/attributes.cfg @@ -3,7 +3,7 @@ attribute[].datatype INT32 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -33,7 +33,7 @@ attribute[].datatype INT32 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -63,7 +63,7 @@ attribute[].datatype INT32 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -93,7 +93,7 @@ attribute[].datatype FLOAT attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -123,7 +123,7 @@ attribute[].datatype FLOAT attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -153,7 +153,7 @@ attribute[].datatype INT32 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -183,7 +183,7 @@ attribute[].datatype INT32 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -213,7 +213,7 @@ attribute[].datatype INT32 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -243,7 +243,7 @@ attribute[].datatype INT32 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -273,7 +273,7 @@ attribute[].datatype STRING attribute[].collectiontype ARRAY attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -303,7 +303,7 @@ attribute[].datatype STRING attribute[].collectiontype ARRAY attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false diff --git a/config-model/src/test/derived/newrank/attributes.cfg b/config-model/src/test/derived/newrank/attributes.cfg index 0b3c39c44f6..20a48d79cce 100644 --- a/config-model/src/test/derived/newrank/attributes.cfg +++ b/config-model/src/test/derived/newrank/attributes.cfg @@ -3,7 +3,7 @@ attribute[].datatype INT32 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -33,7 +33,7 @@ attribute[].datatype INT32 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -63,7 +63,7 @@ attribute[].datatype INT32 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -93,7 +93,7 @@ attribute[].datatype FLOAT attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -123,7 +123,7 @@ attribute[].datatype FLOAT attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -153,7 +153,7 @@ attribute[].datatype INT32 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -183,7 +183,7 @@ attribute[].datatype INT32 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -213,7 +213,7 @@ attribute[].datatype INT32 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -243,7 +243,7 @@ attribute[].datatype INT32 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -273,7 +273,7 @@ attribute[].datatype INT32 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false diff --git a/config-model/src/test/derived/predicate_attribute/attributes.cfg b/config-model/src/test/derived/predicate_attribute/attributes.cfg index 52ad169550d..101d809b469 100644 --- a/config-model/src/test/derived/predicate_attribute/attributes.cfg +++ b/config-model/src/test/derived/predicate_attribute/attributes.cfg @@ -3,7 +3,7 @@ attribute[].datatype PREDICATE attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false diff --git a/config-model/src/test/derived/prefixexactattribute/attributes.cfg b/config-model/src/test/derived/prefixexactattribute/attributes.cfg index a0657f5bc27..bd543a79da1 100644 --- a/config-model/src/test/derived/prefixexactattribute/attributes.cfg +++ b/config-model/src/test/derived/prefixexactattribute/attributes.cfg @@ -3,7 +3,7 @@ attribute[].datatype STRING attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -33,7 +33,7 @@ attribute[].datatype STRING attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false diff --git a/config-model/src/test/derived/reference_fields/attributes.cfg b/config-model/src/test/derived/reference_fields/attributes.cfg index 1517a96950c..f629d78a3b0 100644 --- a/config-model/src/test/derived/reference_fields/attributes.cfg +++ b/config-model/src/test/derived/reference_fields/attributes.cfg @@ -3,7 +3,7 @@ attribute[].datatype REFERENCE attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -33,7 +33,7 @@ attribute[].datatype REFERENCE attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -63,7 +63,7 @@ attribute[].datatype REFERENCE attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false diff --git a/config-model/src/test/derived/sorting/attributes.cfg b/config-model/src/test/derived/sorting/attributes.cfg index e878c1f054f..62cf845c861 100644 --- a/config-model/src/test/derived/sorting/attributes.cfg +++ b/config-model/src/test/derived/sorting/attributes.cfg @@ -3,7 +3,7 @@ attribute[].datatype STRING attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -33,7 +33,7 @@ attribute[].datatype STRING attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -63,7 +63,7 @@ attribute[].datatype STRING attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false diff --git a/config-model/src/test/derived/tensor/attributes.cfg b/config-model/src/test/derived/tensor/attributes.cfg index 71789c2987c..9423ed957fb 100644 --- a/config-model/src/test/derived/tensor/attributes.cfg +++ b/config-model/src/test/derived/tensor/attributes.cfg @@ -3,7 +3,7 @@ attribute[].datatype TENSOR attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -33,7 +33,7 @@ attribute[].datatype TENSOR attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -63,7 +63,7 @@ attribute[].datatype TENSOR attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -93,7 +93,7 @@ attribute[].datatype TENSOR attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -123,7 +123,7 @@ attribute[].datatype FLOAT attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false diff --git a/config-model/src/test/derived/types/attributes.cfg b/config-model/src/test/derived/types/attributes.cfg index e48d4d1bd09..a1230dcbef8 100644 --- a/config-model/src/test/derived/types/attributes.cfg +++ b/config-model/src/test/derived/types/attributes.cfg @@ -3,7 +3,7 @@ attribute[].datatype INT8 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -33,7 +33,7 @@ attribute[].datatype INT64 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -63,7 +63,7 @@ attribute[].datatype BOOL attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -93,7 +93,7 @@ attribute[].datatype FLOAT16 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -123,7 +123,7 @@ attribute[].datatype INT32 attribute[].collectiontype ARRAY attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -153,7 +153,7 @@ attribute[].datatype STRING attribute[].collectiontype WEIGHTEDSET attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false @@ -183,7 +183,7 @@ attribute[].datatype STRING attribute[].collectiontype WEIGHTEDSET attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero true attribute[].createifnonexistent true attribute[].fastsearch false @@ -213,7 +213,7 @@ attribute[].datatype STRING attribute[].collectiontype WEIGHTEDSET attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero true attribute[].createifnonexistent false attribute[].fastsearch false @@ -243,7 +243,7 @@ attribute[].datatype STRING attribute[].collectiontype WEIGHTEDSET attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent true attribute[].fastsearch false @@ -273,7 +273,7 @@ attribute[].datatype STRING attribute[].collectiontype WEIGHTEDSET attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero true attribute[].createifnonexistent true attribute[].fastsearch false @@ -303,7 +303,7 @@ attribute[].datatype INT64 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch true @@ -333,7 +333,7 @@ attribute[].datatype STRING attribute[].collectiontype WEIGHTEDSET attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero true attribute[].createifnonexistent true attribute[].fastsearch false @@ -363,7 +363,7 @@ attribute[].datatype INT64 attribute[].collectiontype SINGLE attribute[].dictionary.ordering ORDERED attribute[].dictionary.type BTREE -attribute[].dictionary.match CASE_INSENSITIVE +attribute[].dictionary.match UNCASED attribute[].removeifzero false attribute[].createifnonexistent false attribute[].fastsearch false diff --git a/configdefinitions/src/vespa/attributes.def b/configdefinitions/src/vespa/attributes.def index f5b5a7cb450..0a7142a1a98 100644 --- a/configdefinitions/src/vespa/attributes.def +++ b/configdefinitions/src/vespa/attributes.def @@ -7,7 +7,7 @@ attribute[].collectiontype enum { SINGLE, ARRAY, WEIGHTEDSET } default=SING # Deprecated/ do-not-use, will soon be GCed. attribute[].dictionary.ordering enum { ORDERED, UNORDERED } default = ORDERED attribute[].dictionary.type enum { BTREE, HASH, BTREE_AND_HASH } default = BTREE -attribute[].dictionary.match enum { CASE_SENSITIVE, CASE_INSENSITIVE } default=CASE_INSENSITIVE +attribute[].dictionary.match enum { CASE_SENSITIVE, CASE_INSENSITIVE, CASED, UNCASED } default=UNCASED attribute[].removeifzero bool default=false attribute[].createifnonexistent bool default=false attribute[].fastsearch bool default=false diff --git a/searchcommon/src/tests/attribute/config/attribute_config_test.cpp b/searchcommon/src/tests/attribute/config/attribute_config_test.cpp index 98b2bfe5c90..12a9837629d 100644 --- a/searchcommon/src/tests/attribute/config/attribute_config_test.cpp +++ b/searchcommon/src/tests/attribute/config/attribute_config_test.cpp @@ -111,10 +111,18 @@ TEST("Test GrowStrategy consistency") { TEST("DictionaryConfig") { using Type = DictionaryConfig::Type; + using Match = DictionaryConfig::Match; EXPECT_EQUAL(Type::BTREE, DictionaryConfig().getType()); + EXPECT_EQUAL(Match::UNCASED, DictionaryConfig().getMatch()); + EXPECT_EQUAL(Type::BTREE, DictionaryConfig(Type::BTREE).getType()); + EXPECT_EQUAL(Match::UNCASED, DictionaryConfig(Type::BTREE).getMatch()); + EXPECT_EQUAL(Match::UNCASED, DictionaryConfig(Type::BTREE, Match::UNCASED).getMatch()); + EXPECT_EQUAL(Match::CASED, DictionaryConfig(Type::BTREE, Match::CASED).getMatch()); + EXPECT_EQUAL(Type::HASH, DictionaryConfig(Type::HASH).getType()); EXPECT_EQUAL(Type::BTREE_AND_HASH, DictionaryConfig(Type::BTREE_AND_HASH).getType()); + EXPECT_EQUAL(DictionaryConfig(Type::BTREE), DictionaryConfig(Type::BTREE)); EXPECT_EQUAL(DictionaryConfig(Type::HASH), DictionaryConfig(Type::HASH)); EXPECT_EQUAL(DictionaryConfig(Type::BTREE_AND_HASH), DictionaryConfig(Type::BTREE_AND_HASH)); diff --git a/searchcommon/src/vespa/searchcommon/common/dictionary_config.cpp b/searchcommon/src/vespa/searchcommon/common/dictionary_config.cpp index a6a0255f96d..0156a7f9d8c 100644 --- a/searchcommon/src/vespa/searchcommon/common/dictionary_config.cpp +++ b/searchcommon/src/vespa/searchcommon/common/dictionary_config.cpp @@ -8,13 +8,30 @@ namespace search { std::ostream& operator<<(std::ostream& os, const DictionaryConfig & cfg) { - switch(cfg.getType()) { - case DictionaryConfig::Type::BTREE: - return os << "BTREE"; - case DictionaryConfig::Type::HASH: - return os << "HASH"; - case DictionaryConfig::Type::BTREE_AND_HASH: - return os << "BTREE_AND_HASH"; + return os << cfg.getType() << "," << cfg.getMatch(); +} + +std::ostream& +operator<<(std::ostream& os, DictionaryConfig::Type type) { + + switch (type) { + case DictionaryConfig::Type::BTREE: + return os << "BTREE"; + case DictionaryConfig::Type::HASH: + return os << "HASH"; + case DictionaryConfig::Type::BTREE_AND_HASH: + return os << "BTREE_AND_HASH"; + } + assert(false); +} + +std::ostream& +operator<<(std::ostream& os, DictionaryConfig::Match match) { + switch(match) { + case DictionaryConfig::Match::CASED: + return os << "CASE_SENSTITIVE"; + case DictionaryConfig::Match::UNCASED: + return os << "CASE_INSENSTITIVE"; } assert(false); } diff --git a/searchcommon/src/vespa/searchcommon/common/dictionary_config.h b/searchcommon/src/vespa/searchcommon/common/dictionary_config.h index c35f7eaafef..b429b910d4e 100644 --- a/searchcommon/src/vespa/searchcommon/common/dictionary_config.h +++ b/searchcommon/src/vespa/searchcommon/common/dictionary_config.h @@ -12,14 +12,20 @@ namespace search { class DictionaryConfig { public: enum class Type { BTREE, HASH, BTREE_AND_HASH }; - DictionaryConfig() noexcept : _type(Type::BTREE) {} - DictionaryConfig(Type ordering) noexcept : _type(ordering) {} + enum class Match { CASED, UNCASED }; + DictionaryConfig() noexcept : _type(Type::BTREE), _match(Match::UNCASED) {} + DictionaryConfig(Type type) noexcept : _type(type), _match(Match::UNCASED) {} + DictionaryConfig(Type type, Match match) noexcept : _type(type), _match(match) {} Type getType() const { return _type; } - bool operator == (const DictionaryConfig & b) const { return _type == b._type; } + Match getMatch() const { return _match; } + bool operator == (const DictionaryConfig & b) const { return (_type == b._type) && (_match == b._match); } private: - Type _type; + Type _type; + Match _match; }; std::ostream& operator<<(std::ostream& os, const DictionaryConfig & cfg); +std::ostream& operator<<(std::ostream& os, DictionaryConfig::Type type); +std::ostream& operator<<(std::ostream& os, DictionaryConfig::Match match); } // namespace search diff --git a/searchlib/src/vespa/searchlib/attribute/configconverter.cpp b/searchlib/src/vespa/searchlib/attribute/configconverter.cpp index 2e946c7d34b..ced5ccfdc85 100644 --- a/searchlib/src/vespa/searchlib/attribute/configconverter.cpp +++ b/searchlib/src/vespa/searchlib/attribute/configconverter.cpp @@ -63,9 +63,22 @@ convert(AttributesConfig::Attribute::Dictionary::Type type_cfg) { assert(false); } +DictionaryConfig::Match +convert(AttributesConfig::Attribute::Dictionary::Match match_cfg) { + switch (match_cfg) { + case AttributesConfig::Attribute::Dictionary::Match::CASE_SENSITIVE: + case AttributesConfig::Attribute::Dictionary::Match::CASED: + return DictionaryConfig::Match::CASED; + case AttributesConfig::Attribute::Dictionary::Match::CASE_INSENSITIVE: + case AttributesConfig::Attribute::Dictionary::Match::UNCASED: + return DictionaryConfig::Match::UNCASED; + } + assert(false); +} + DictionaryConfig convert_dictionary(const AttributesConfig::Attribute::Dictionary & dictionary) { - return DictionaryConfig(convert(dictionary.type)); + return DictionaryConfig(convert(dictionary.type), convert(dictionary.match)); } } |