Stop flattening imported fields.

2 files changed, 77 insertions, 83 deletions

diff --git a/config-model/src/test/derived/imported_position_field_summary/index-info.cfg b/config-model/src/test/derived/imported_position_field_summary/index-info.cfg
index c87553d6537..4c8dafdf59b 100644
--- a/config-model/src/test/derived/imported_position_field_summary/index-info.cfg
+++ b/config-model/src/test/derived/imported_position_field_summary/index-info.cfg
@@ -9,18 +9,6 @@ indexinfo[].command[].indexname "parent_ref"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "parent_ref"
 indexinfo[].command[].command "word"
-indexinfo[].command[].indexname "my_pos.x"
-indexinfo[].command[].command "index"
-indexinfo[].command[].indexname "my_pos.x"
-indexinfo[].command[].command "numerical"
-indexinfo[].command[].indexname "my_pos.y"
-indexinfo[].command[].command "index"
-indexinfo[].command[].indexname "my_pos.y"
-indexinfo[].command[].command "numerical"
-indexinfo[].command[].indexname "my_pos"
-indexinfo[].command[].command "default-position"
-indexinfo[].command[].indexname "my_pos"
-indexinfo[].command[].command "index"
 indexinfo[].command[].indexname "my_pos.distance"
 indexinfo[].command[].command "index"
 indexinfo[].command[].indexname "my_pos.distance"
@@ -41,3 +29,7 @@ indexinfo[].command[].indexname "my_pos_zcurve"
 indexinfo[].command[].command "fast-search"
 indexinfo[].command[].indexname "my_pos_zcurve"
 indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "my_pos"
+indexinfo[].command[].command "default-position"
+indexinfo[].command[].indexname "my_pos"
+indexinfo[].command[].command "index"
diff --git a/config-model/src/test/derived/imported_struct_fields/index-info.cfg b/config-model/src/test/derived/imported_struct_fields/index-info.cfg
index b32b487fe0f..8d7f4d4bece 100644
--- a/config-model/src/test/derived/imported_struct_fields/index-info.cfg
+++ b/config-model/src/test/derived/imported_struct_fields/index-info.cfg
@@ -1,71 +1,73 @@
-indexinfo[0].name "child"
-indexinfo[0].command[0].indexname "sddocname"
-indexinfo[0].command[0].command "index"
-indexinfo[0].command[1].indexname "sddocname"
-indexinfo[0].command[1].command "word"
-indexinfo[0].command[2].indexname "parent_ref"
-indexinfo[0].command[2].command "index"
-indexinfo[0].command[3].indexname "parent_ref"
-indexinfo[0].command[3].command "attribute"
-indexinfo[0].command[4].indexname "parent_ref"
-indexinfo[0].command[4].command "word"
-indexinfo[0].command[5].indexname "documentid"
-indexinfo[0].command[5].command "index"
-indexinfo[0].command[6].indexname "rankfeatures"
-indexinfo[0].command[6].command "index"
-indexinfo[0].command[7].indexname "summaryfeatures"
-indexinfo[0].command[7].command "index"
-indexinfo[0].command[8].indexname "my_elem_array.name"
-indexinfo[0].command[8].command "index"
-indexinfo[0].command[9].indexname "my_elem_array.name"
-indexinfo[0].command[9].command "attribute"
-indexinfo[0].command[10].indexname "my_elem_array.name"
-indexinfo[0].command[10].command "fast-search"
-indexinfo[0].command[11].indexname "my_elem_array.weight"
-indexinfo[0].command[11].command "index"
-indexinfo[0].command[12].indexname "my_elem_array.weight"
-indexinfo[0].command[12].command "attribute"
-indexinfo[0].command[13].indexname "my_elem_array.weight"
-indexinfo[0].command[13].command "numerical"
-indexinfo[0].command[14].indexname "my_elem_map.key"
-indexinfo[0].command[14].command "index"
-indexinfo[0].command[15].indexname "my_elem_map.key"
-indexinfo[0].command[15].command "attribute"
-indexinfo[0].command[16].indexname "my_elem_map.key"
-indexinfo[0].command[16].command "fast-search"
-indexinfo[0].command[17].indexname "my_elem_map.value.name"
-indexinfo[0].command[17].command "index"
-indexinfo[0].command[18].indexname "my_elem_map.value.name"
-indexinfo[0].command[18].command "attribute"
-indexinfo[0].command[19].indexname "my_elem_map.value.name"
-indexinfo[0].command[19].command "fast-search"
-indexinfo[0].command[20].indexname "my_elem_map.value.weight"
-indexinfo[0].command[20].command "index"
-indexinfo[0].command[21].indexname "my_elem_map.value.weight"
-indexinfo[0].command[21].command "attribute"
-indexinfo[0].command[22].indexname "my_elem_map.value.weight"
-indexinfo[0].command[22].command "numerical"
-indexinfo[0].command[23].indexname "my_str_int_map.key"
-indexinfo[0].command[23].command "index"
-indexinfo[0].command[24].indexname "my_str_int_map.key"
-indexinfo[0].command[24].command "attribute"
-indexinfo[0].command[25].indexname "my_str_int_map.key"
-indexinfo[0].command[25].command "fast-search"
-indexinfo[0].command[26].indexname "my_str_int_map.value"
-indexinfo[0].command[26].command "index"
-indexinfo[0].command[27].indexname "my_str_int_map.value"
-indexinfo[0].command[27].command "attribute"
-indexinfo[0].command[28].indexname "my_str_int_map.value"
-indexinfo[0].command[28].command "numerical"
-indexinfo[0].command[29].indexname "my_elem_array"
-indexinfo[0].command[29].command "multivalue"
-indexinfo[0].command[30].indexname "my_elem_array"
-indexinfo[0].command[30].command "index"
-indexinfo[0].command[31].indexname "my_elem_map"
-indexinfo[0].command[31].command "multivalue"
-indexinfo[0].command[32].indexname "my_elem_map"
-indexinfo[0].command[32].command "index"
-indexinfo[0].command[33].indexname "my_str_int_map"
-indexinfo[0].command[33].command "multivalue"
-indexinfo[0].command[34].indexname "my_str_int_map"
-indexinfo[0].command[34].command "index"
\ No newline at end of file
+indexinfo[].name "child"
+indexinfo[].command[].indexname "sddocname"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "sddocname"
+indexinfo[].command[].command "word"
+indexinfo[].command[].indexname "parent_ref"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "parent_ref"
+indexinfo[].command[].command "attribute"
+indexinfo[].command[].indexname "parent_ref"
+indexinfo[].command[].command "word"
+indexinfo[].command[].indexname "documentid"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "rankfeatures"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "summaryfeatures"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "my_elem_array.name"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "my_elem_array.name"
+indexinfo[].command[].command "attribute"
+indexinfo[].command[].indexname "my_elem_array.name"
+indexinfo[].command[].command "fast-search"
+indexinfo[].command[].indexname "my_elem_array.weight"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "my_elem_array.weight"
+indexinfo[].command[].command "attribute"
+indexinfo[].command[].indexname "my_elem_array.weight"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "my_elem_array"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "my_elem_array"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "my_elem_map.value.name"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "my_elem_map.value.name"
+indexinfo[].command[].command "attribute"
+indexinfo[].command[].indexname "my_elem_map.value.name"
+indexinfo[].command[].command "fast-search"
+indexinfo[].command[].indexname "my_elem_map.value.weight"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "my_elem_map.value.weight"
+indexinfo[].command[].command "attribute"
+indexinfo[].command[].indexname "my_elem_map.value.weight"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "my_elem_map.value"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "my_elem_map.key"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "my_elem_map.key"
+indexinfo[].command[].command "attribute"
+indexinfo[].command[].indexname "my_elem_map.key"
+indexinfo[].command[].command "fast-search"
+indexinfo[].command[].indexname "my_elem_map"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "my_elem_map"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "my_str_int_map.key"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "my_str_int_map.key"
+indexinfo[].command[].command "attribute"
+indexinfo[].command[].indexname "my_str_int_map.key"
+indexinfo[].command[].command "fast-search"
+indexinfo[].command[].indexname "my_str_int_map.value"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "my_str_int_map.value"
+indexinfo[].command[].command "attribute"
+indexinfo[].command[].indexname "my_str_int_map.value"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "my_str_int_map"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "my_str_int_map"
+indexinfo[].command[].command "multivalue"