Update expected results.

22 files changed, 132 insertions, 0 deletions

diff --git a/config-model/src/test/derived/advanced/attributes.cfg b/config-model/src/test/derived/advanced/attributes.cfg
index 0d4b3bc4ca7..641e2d8fde5 100644
--- a/config-model/src/test/derived/advanced/attributes.cfg
+++ b/config-model/src/test/derived/advanced/attributes.cfg
@@ -2,6 +2,7 @@ attribute[].name "location_zcurve"
 attribute[].datatype INT64
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 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 dc269284e8f..bb4ba665406 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
@@ -2,6 +2,7 @@ attribute[].name "elem_array.name"
 attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
@@ -30,6 +31,7 @@ attribute[].name "elem_array.weight"
 attribute[].datatype INT32
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 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 c43e38d0561..d05d2d1d5e0 100644
--- a/config-model/src/test/derived/attributeprefetch/attributes.cfg
+++ b/config-model/src/test/derived/attributeprefetch/attributes.cfg
@@ -2,6 +2,7 @@ attribute[].name "singlebyte"
 attribute[].datatype INT8
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -30,6 +31,7 @@ attribute[].name "multibyte"
 attribute[].datatype INT8
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -58,6 +60,7 @@ attribute[].name "wsbyte"
 attribute[].datatype INT8
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -86,6 +89,7 @@ attribute[].name "singleint"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -114,6 +118,7 @@ attribute[].name "multiint"
 attribute[].datatype INT32
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -142,6 +147,7 @@ attribute[].name "wsint"
 attribute[].datatype INT32
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -170,6 +176,7 @@ attribute[].name "singlelong"
 attribute[].datatype INT64
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -198,6 +205,7 @@ attribute[].name "multilong"
 attribute[].datatype INT64
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -226,6 +234,7 @@ attribute[].name "wslong"
 attribute[].datatype INT64
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -254,6 +263,7 @@ attribute[].name "singlefloat"
 attribute[].datatype FLOAT
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -282,6 +292,7 @@ attribute[].name "multifloat"
 attribute[].datatype FLOAT
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -310,6 +321,7 @@ attribute[].name "wsfloat"
 attribute[].datatype FLOAT
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -338,6 +350,7 @@ attribute[].name "singledouble"
 attribute[].datatype DOUBLE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -366,6 +379,7 @@ attribute[].name "multidouble"
 attribute[].datatype DOUBLE
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -394,6 +408,7 @@ attribute[].name "wsdouble"
 attribute[].datatype DOUBLE
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -422,6 +437,7 @@ attribute[].name "singlestring"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -450,6 +466,7 @@ attribute[].name "multistring"
 attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -478,6 +495,7 @@ attribute[].name "wsstring"
 attribute[].datatype STRING
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 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 4ecb0c2af8f..e9f3f68adc1 100644
--- a/config-model/src/test/derived/attributes/attributes.cfg
+++ b/config-model/src/test/derived/attributes/attributes.cfg
@@ -2,6 +2,7 @@ attribute[].name "a1"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -30,6 +31,7 @@ attribute[].name "a2"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -58,6 +60,7 @@ attribute[].name "a3"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -86,6 +89,7 @@ attribute[].name "a5"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -114,6 +118,7 @@ attribute[].name "a6"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -142,6 +147,7 @@ attribute[].name "b1"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -170,6 +176,7 @@ attribute[].name "b2"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -198,6 +205,7 @@ attribute[].name "b3"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -226,6 +234,7 @@ attribute[].name "b4"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -254,6 +263,7 @@ attribute[].name "b5"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -282,6 +292,7 @@ attribute[].name "b6"
 attribute[].datatype INT64
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -310,6 +321,7 @@ attribute[].name "b7"
 attribute[].datatype DOUBLE
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -338,6 +350,7 @@ attribute[].name "a9"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -366,6 +379,7 @@ attribute[].name "a10"
 attribute[].datatype INT32
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
@@ -394,6 +408,7 @@ attribute[].name "a11"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -422,6 +437,7 @@ attribute[].name "a12"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -450,6 +466,7 @@ attribute[].name "a7_arr"
 attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -478,6 +495,7 @@ attribute[].name "a8_arr"
 attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 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 fe6f42e55bc..622fb9f349c 100644
--- a/config-model/src/test/derived/complex/attributes.cfg
+++ b/config-model/src/test/derived/complex/attributes.cfg
@@ -2,6 +2,7 @@ attribute[].name "prefixenabled"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -30,6 +31,7 @@ attribute[].name "fleeting"
 attribute[].datatype FLOAT
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -58,6 +60,7 @@ attribute[].name "fleeting2"
 attribute[].datatype FLOAT
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -86,6 +89,7 @@ attribute[].name "foundat"
 attribute[].datatype INT64
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -114,6 +118,7 @@ attribute[].name "collapseby"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -142,6 +147,7 @@ attribute[].name "ts"
 attribute[].datatype INT64
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -170,6 +176,7 @@ attribute[].name "combineda"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -198,6 +205,7 @@ attribute[].name "year_arr"
 attribute[].datatype INT32
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -226,6 +234,7 @@ attribute[].name "year_sub"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 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 53eb98b6ba8..4d275787bfd 100644
--- a/config-model/src/test/derived/hnsw_index/attributes.cfg
+++ b/config-model/src/test/derived/hnsw_index/attributes.cfg
@@ -2,6 +2,7 @@ attribute[].name "t1"
 attribute[].datatype TENSOR
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -30,6 +31,7 @@ attribute[].name "t2"
 attribute[].datatype TENSOR
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 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 2c209db96f2..bfdf90ac12c 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
@@ -2,6 +2,7 @@ attribute[].name "ref_from_a"
 attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -30,6 +31,7 @@ attribute[].name "ref_from_b"
 attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -58,6 +60,7 @@ attribute[].name "from_a_int_field"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -86,6 +89,7 @@ attribute[].name "from_b_int_field"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 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 5bb0d9bfef3..f1b20c6e454 100644
--- a/config-model/src/test/derived/imported_position_field/attributes.cfg
+++ b/config-model/src/test/derived/imported_position_field/attributes.cfg
@@ -2,6 +2,7 @@ attribute[].name "parent_ref"
 attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -30,6 +31,7 @@ attribute[].name "my_pos_zcurve"
 attribute[].datatype INT64
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 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 f299756efb1..9e0b5f18170 100644
--- a/config-model/src/test/derived/imported_struct_fields/attributes.cfg
+++ b/config-model/src/test/derived/imported_struct_fields/attributes.cfg
@@ -2,6 +2,7 @@ attribute[].name "parent_ref"
 attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -30,6 +31,7 @@ attribute[].name "my_elem_array.name"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
@@ -58,6 +60,7 @@ attribute[].name "my_elem_array.weight"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -86,6 +89,7 @@ attribute[].name "my_elem_map.key"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
@@ -114,6 +118,7 @@ attribute[].name "my_elem_map.value.name"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
@@ -142,6 +147,7 @@ attribute[].name "my_elem_map.value.weight"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -170,6 +176,7 @@ attribute[].name "my_str_int_map.key"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
@@ -198,6 +205,7 @@ attribute[].name "my_str_int_map.value"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 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 680d6571939..68cd917336f 100644
--- a/config-model/src/test/derived/importedfields/attributes.cfg
+++ b/config-model/src/test/derived/importedfields/attributes.cfg
@@ -2,6 +2,7 @@ attribute[].name "a_ref"
 attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -30,6 +31,7 @@ attribute[].name "b_ref"
 attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -58,6 +60,7 @@ attribute[].name "b_ref_with_summary"
 attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -86,6 +89,7 @@ attribute[].name "my_int_field"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -114,6 +118,7 @@ attribute[].name "my_string_field"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -142,6 +147,7 @@ attribute[].name "my_int_array_field"
 attribute[].datatype INT32
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -170,6 +176,7 @@ attribute[].name "my_int_wset_field"
 attribute[].datatype INT32
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -198,6 +205,7 @@ attribute[].name "my_ancient_int_field"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 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 52367a04a30..a931af7af4d 100644
--- a/config-model/src/test/derived/inheritance/attributes.cfg
+++ b/config-model/src/test/derived/inheritance/attributes.cfg
@@ -2,6 +2,7 @@ attribute[].name "onlygrandparent"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -30,6 +31,7 @@ attribute[].name "overridden"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -58,6 +60,7 @@ attribute[].name "onlymother"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 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 b25a46dc433..11498de54b1 100644
--- a/config-model/src/test/derived/inheritfromparent/attributes.cfg
+++ b/config-model/src/test/derived/inheritfromparent/attributes.cfg
@@ -2,6 +2,7 @@ attribute[].name "weight"
 attribute[].datatype FLOAT
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 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 d9624e89500..acbdf119d0d 100644
--- a/config-model/src/test/derived/map_attribute/attributes.cfg
+++ b/config-model/src/test/derived/map_attribute/attributes.cfg
@@ -2,6 +2,7 @@ attribute[].name "str_map.key"
 attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
@@ -30,6 +31,7 @@ attribute[].name "str_map.value"
 attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -58,6 +60,7 @@ attribute[].name "int_map.key"
 attribute[].datatype INT32
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 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 5fd10269ceb..ecc8c2fd69d 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
@@ -2,6 +2,7 @@ attribute[].name "str_elem_map.key"
 attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
@@ -30,6 +31,7 @@ attribute[].name "str_elem_map.value.name"
 attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -58,6 +60,7 @@ attribute[].name "str_elem_map.value.weight"
 attribute[].datatype INT32
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -86,6 +89,7 @@ attribute[].name "int_elem_map.key"
 attribute[].datatype INT32
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -114,6 +118,7 @@ attribute[].name "int_elem_map.value.name"
 attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 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 ebb8eb10c14..a31325e67d0 100644
--- a/config-model/src/test/derived/music/attributes.cfg
+++ b/config-model/src/test/derived/music/attributes.cfg
@@ -2,6 +2,7 @@ attribute[].name "sales"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -30,6 +31,7 @@ attribute[].name "pto"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -58,6 +60,7 @@ attribute[].name "mid"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -86,6 +89,7 @@ attribute[].name "weight"
 attribute[].datatype FLOAT
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -114,6 +118,7 @@ attribute[].name "bgnpfrom"
 attribute[].datatype FLOAT
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -142,6 +147,7 @@ attribute[].name "newestedition"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -170,6 +176,7 @@ attribute[].name "year"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -198,6 +205,7 @@ attribute[].name "did"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -226,6 +234,7 @@ attribute[].name "cbid"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -254,6 +263,7 @@ attribute[].name "hiphopvalue_arr"
 attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -282,6 +292,7 @@ attribute[].name "metalvalue_arr"
 attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 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 5f5e7e62d83..68f24871f02 100644
--- a/config-model/src/test/derived/newrank/attributes.cfg
+++ b/config-model/src/test/derived/newrank/attributes.cfg
@@ -2,6 +2,7 @@ attribute[].name "sales"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -30,6 +31,7 @@ attribute[].name "pto"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -58,6 +60,7 @@ attribute[].name "mid"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -86,6 +89,7 @@ attribute[].name "weight"
 attribute[].datatype FLOAT
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -114,6 +118,7 @@ attribute[].name "bgnpfrom"
 attribute[].datatype FLOAT
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -142,6 +147,7 @@ attribute[].name "newestedition"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -170,6 +176,7 @@ attribute[].name "year"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -198,6 +205,7 @@ attribute[].name "did"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -226,6 +234,7 @@ attribute[].name "scorekey"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -254,6 +263,7 @@ attribute[].name "cbid"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 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 6a7ff8af7ad..ff45cf1a41e 100644
--- a/config-model/src/test/derived/predicate_attribute/attributes.cfg
+++ b/config-model/src/test/derived/predicate_attribute/attributes.cfg
@@ -2,6 +2,7 @@ attribute[].name "some_predicate_field"
 attribute[].datatype PREDICATE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 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 2a5fc890f9e..f9878068372 100644
--- a/config-model/src/test/derived/prefixexactattribute/attributes.cfg
+++ b/config-model/src/test/derived/prefixexactattribute/attributes.cfg
@@ -2,6 +2,7 @@ attribute[].name "attributefield1"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -30,6 +31,7 @@ attribute[].name "attributefield2"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 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 3ecd24d50dc..ad3ff5e62f8 100644
--- a/config-model/src/test/derived/reference_fields/attributes.cfg
+++ b/config-model/src/test/derived/reference_fields/attributes.cfg
@@ -2,6 +2,7 @@ attribute[].name "campaign_ref"
 attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -30,6 +31,7 @@ attribute[].name "other_ref"
 attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -58,6 +60,7 @@ attribute[].name "yet_another_ref"
 attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 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 a84c7780965..ebe0e83540e 100644
--- a/config-model/src/test/derived/sorting/attributes.cfg
+++ b/config-model/src/test/derived/sorting/attributes.cfg
@@ -2,6 +2,7 @@ attribute[].name "syntaxcheck"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -30,6 +31,7 @@ attribute[].name "syntaxcheck2"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -58,6 +60,7 @@ attribute[].name "infieldonly"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 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 cc28f1b6f84..398cdf5f8f8 100644
--- a/config-model/src/test/derived/tensor/attributes.cfg
+++ b/config-model/src/test/derived/tensor/attributes.cfg
@@ -2,6 +2,7 @@ attribute[].name "f2"
 attribute[].datatype TENSOR
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -30,6 +31,7 @@ attribute[].name "f3"
 attribute[].datatype TENSOR
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -58,6 +60,7 @@ attribute[].name "f4"
 attribute[].datatype TENSOR
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -86,6 +89,7 @@ attribute[].name "f5"
 attribute[].datatype TENSOR
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -114,6 +118,7 @@ attribute[].name "f6"
 attribute[].datatype FLOAT
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 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 d30c79efbc2..05e19a15d96 100644
--- a/config-model/src/test/derived/types/attributes.cfg
+++ b/config-model/src/test/derived/types/attributes.cfg
@@ -2,6 +2,7 @@ attribute[].name "abyte"
 attribute[].datatype INT8
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -30,6 +31,7 @@ attribute[].name "along"
 attribute[].datatype INT64
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -58,6 +60,7 @@ attribute[].name "abool"
 attribute[].datatype BOOL
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -86,6 +89,7 @@ attribute[].name "ashortfloat"
 attribute[].datatype FLOAT16
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -114,6 +118,7 @@ attribute[].name "arrayfield"
 attribute[].datatype INT32
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -142,6 +147,7 @@ attribute[].name "setfield"
 attribute[].datatype STRING
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -170,6 +176,7 @@ attribute[].name "setfield2"
 attribute[].datatype STRING
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero true
 attribute[].createifnonexistent true
 attribute[].fastsearch false
@@ -198,6 +205,7 @@ attribute[].name "setfield3"
 attribute[].datatype STRING
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero true
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -226,6 +234,7 @@ attribute[].name "setfield4"
 attribute[].datatype STRING
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent true
 attribute[].fastsearch false
@@ -254,6 +263,7 @@ attribute[].name "tagfield"
 attribute[].datatype STRING
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero true
 attribute[].createifnonexistent true
 attribute[].fastsearch false
@@ -282,6 +292,7 @@ attribute[].name "juletre"
 attribute[].datatype INT64
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
@@ -310,6 +321,7 @@ attribute[].name "album1"
 attribute[].datatype STRING
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero true
 attribute[].createifnonexistent true
 attribute[].fastsearch false
@@ -338,6 +350,7 @@ attribute[].name "other"
 attribute[].datatype INT64
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
+attribute[].dictionary.type BTREE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false