Add data and collection type to imported-fields config.

These are the same as the data and collection type of the target attribute field.

6 files changed, 47 insertions, 1 deletions

diff --git a/config-model/src/test/derived/importedfields/child.sd b/config-model/src/test/derived/importedfields/child.sd
index a7428433ca8..5ab9962f614 100644
--- a/config-model/src/test/derived/importedfields/child.sd
+++ b/config-model/src/test/derived/importedfields/child.sd
@@ -5,6 +5,8 @@ search child {
   }
   import field a_ref.int_field as my_int_field {}
   import field b_ref.string_field as my_string_field {}
+  import field a_ref.int_array_field as my_int_array_field {}
+  import field a_ref.int_wset_field as my_int_wset_field {}
 
   fieldset myfieldset {
     fields: my_int_field, my_string_field
@@ -14,5 +16,7 @@ search child {
     summary a_ref type reference<parent_a> {}
     summary my_int_field type int {}
     summary my_string_field type string {}
+    summary my_int_array_field type array<int> {}
+    summary my_int_wset_field type weightedset<int> {}
   }
 }
diff --git a/config-model/src/test/derived/importedfields/imported-fields.cfg b/config-model/src/test/derived/importedfields/imported-fields.cfg
index 63e6819ca90..48eb8a58af3 100644
--- a/config-model/src/test/derived/importedfields/imported-fields.cfg
+++ b/config-model/src/test/derived/importedfields/imported-fields.cfg
@@ -1,6 +1,20 @@
 attribute[].name "my_int_field"
 attribute[].referencefield "a_ref"
 attribute[].targetfield "int_field"
+attribute[].datatype INT32
+attribute[].collectiontype SINGLE
 attribute[].name "my_string_field"
 attribute[].referencefield "b_ref"
 attribute[].targetfield "string_field"
+attribute[].datatype STRING
+attribute[].collectiontype SINGLE
+attribute[].name "my_int_array_field"
+attribute[].referencefield "a_ref"
+attribute[].targetfield "int_array_field"
+attribute[].datatype INT32
+attribute[].collectiontype ARRAY
+attribute[].name "my_int_wset_field"
+attribute[].referencefield "a_ref"
+attribute[].targetfield "int_wset_field"
+attribute[].datatype INT32
+attribute[].collectiontype WEIGHTEDSET
diff --git a/config-model/src/test/derived/importedfields/index-info.cfg b/config-model/src/test/derived/importedfields/index-info.cfg
index d4511bcf198..b33091bff04 100644
--- a/config-model/src/test/derived/importedfields/index-info.cfg
+++ b/config-model/src/test/derived/importedfields/index-info.cfg
@@ -31,6 +31,18 @@ indexinfo[].command[].indexname "my_string_field"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "my_string_field"
 indexinfo[].command[].command "word"
+indexinfo[].command[].indexname "my_int_array_field"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "my_int_array_field"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "my_int_array_field"
+indexinfo[].command[].command "attribute"
+indexinfo[].command[].indexname "my_int_wset_field"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "my_int_wset_field"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "my_int_wset_field"
+indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "myfieldset"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "myfieldset"
diff --git a/config-model/src/test/derived/importedfields/parent_a.sd b/config-model/src/test/derived/importedfields/parent_a.sd
index 9107817f4f6..9508393cf3f 100644
--- a/config-model/src/test/derived/importedfields/parent_a.sd
+++ b/config-model/src/test/derived/importedfields/parent_a.sd
@@ -3,5 +3,11 @@ search parent_a {
     field int_field type int {
       indexing: attribute
     }
+    field int_array_field type array<int> {
+      indexing: attribute
+    }
+    field int_wset_field type weightedset<int> {
+      indexing: attribute
+    }
   }
 }
diff --git a/config-model/src/test/derived/importedfields/summary.cfg b/config-model/src/test/derived/importedfields/summary.cfg
index 19726d2e08a..95a9c2bb318 100644
--- a/config-model/src/test/derived/importedfields/summary.cfg
+++ b/config-model/src/test/derived/importedfields/summary.cfg
@@ -7,7 +7,7 @@ classes[].fields[].name "summaryfeatures"
 classes[].fields[].type "featuredata"
 classes[].fields[].name "documentid"
 classes[].fields[].type "longstring"
-classes[].id 2082780611
+classes[].id 665629335
 classes[].name "mysummary"
 classes[].fields[].name "a_ref"
 classes[].fields[].type "longstring"
@@ -15,6 +15,10 @@ classes[].fields[].name "my_int_field"
 classes[].fields[].type "integer"
 classes[].fields[].name "my_string_field"
 classes[].fields[].type "longstring"
+classes[].fields[].name "my_int_array_field"
+classes[].fields[].type "jsonstring"
+classes[].fields[].name "my_int_wset_field"
+classes[].fields[].type "jsonstring"
 classes[].fields[].name "rankfeatures"
 classes[].fields[].type "featuredata"
 classes[].fields[].name "summaryfeatures"
diff --git a/config-model/src/test/derived/importedfields/summarymap.cfg b/config-model/src/test/derived/importedfields/summarymap.cfg
index d0b8be1d903..84f76490dd9 100644
--- a/config-model/src/test/derived/importedfields/summarymap.cfg
+++ b/config-model/src/test/derived/importedfields/summarymap.cfg
@@ -5,6 +5,12 @@ override[].arguments "my_int_field"
 override[].field "my_string_field"
 override[].command "attribute"
 override[].arguments "my_string_field"
+override[].field "my_int_array_field"
+override[].command "attribute"
+override[].arguments "my_int_array_field"
+override[].field "my_int_wset_field"
+override[].command "attribute"
+override[].arguments "my_int_wset_field"
 override[].field "rankfeatures"
 override[].command "rankfeatures"
 override[].arguments ""