2 files changed, 55 insertions, 0 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/AttributeFields.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/AttributeFields.java
index 72ba6de7022..c7ca1a33ff2 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/AttributeFields.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/AttributeFields.java
@@ -2,8 +2,11 @@
 package com.yahoo.searchdefinition.derived;
 
 import com.yahoo.config.subscription.ConfigInstanceUtil;
+import com.yahoo.document.ArrayDataType;
 import com.yahoo.document.DataType;
+import com.yahoo.document.Field;
 import com.yahoo.document.PositionDataType;
+import com.yahoo.document.StructDataType;
 import com.yahoo.searchdefinition.Search;
 import com.yahoo.searchdefinition.document.Attribute;
 import com.yahoo.searchdefinition.document.ImmutableSDField;
@@ -41,18 +44,53 @@ public class AttributeFields extends Derived implements AttributesConfig.Produce
     /** Derives everything from a field */
     @Override
     protected void derive(ImmutableSDField field, Search search) {
+        boolean fieldIsArrayOfSimpleStruct = isArrayOfSimpleStruct(field);
         if (field.usesStructOrMap() &&
+            !fieldIsArrayOfSimpleStruct &&
             !field.getDataType().equals(PositionDataType.INSTANCE) &&
             !field.getDataType().equals(DataType.getArray(PositionDataType.INSTANCE))) {
             return; // Ignore struct fields for indexed search (only implemented for streaming search)
         }
         if (field.isImportedField()) {
             deriveImportedAttributes(field);
+        } else if (fieldIsArrayOfSimpleStruct) {
+            deriveArrayOfSimpleStruct(field);
         } else {
             deriveAttributes(field);
         }
     }
 
+    private static boolean isArrayOfSimpleStruct(ImmutableSDField field) {
+        DataType fieldType = field.getDataType();
+        if (fieldType instanceof ArrayDataType) {
+            ArrayDataType arrayType = (ArrayDataType)fieldType;
+            DataType nestedType = arrayType.getNestedType();
+            if (nestedType instanceof StructDataType &&
+                !(nestedType.equals(PositionDataType.INSTANCE))) {
+                StructDataType structType = (StructDataType)nestedType;
+                for (Field innerField : structType.getFields()) {
+                    if (!isPrimitiveType(innerField.getDataType())) {
+                        return false;
+                    }
+                }
+                return true;
+            } else {
+                return false;
+            }
+        } else {
+            return false;
+        }
+    }
+
+    private static boolean isPrimitiveType(DataType dataType) {
+        return dataType.equals(DataType.BYTE) ||
+                dataType.equals(DataType.INT) ||
+                dataType.equals(DataType.LONG) ||
+                dataType.equals(DataType.FLOAT) ||
+                dataType.equals(DataType.DOUBLE) ||
+                dataType.equals(DataType.STRING);
+    }
+
     /** Returns an attribute by name, or null if it doesn't exist */
     public Attribute getAttribute(String attributeName) {
         return attributes.get(attributeName);
@@ -98,6 +136,16 @@ public class AttributeFields extends Derived implements AttributesConfig.Produce
         }
     }
 
+    private void deriveArrayOfSimpleStruct(ImmutableSDField field) {
+        for (ImmutableSDField structField : field.getStructFields()) {
+            for (Attribute attribute : structField.getAttributes().values()) {
+                if (structField.getName().equals(attribute.getName())) {
+                    attributes.put(attribute.getName(), attribute.convertToArray());
+                }
+            }
+        }
+    }
+
     /** Returns a read only attribute iterator */
     public Iterator attributeIterator() {
         return attributes().iterator();
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/Attribute.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/Attribute.java
index f932265cb93..81e44850e71 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/document/Attribute.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/Attribute.java
@@ -147,6 +147,12 @@ public final class Attribute implements Cloneable, Serializable {
         this.referenceDocumentType = referenceDocumentType;
     }
 
+    public Attribute convertToArray() {
+        Attribute result = clone();
+        result.collectionType = CollectionType.ARRAY;
+        return result;
+    }
+
     /**
      * <p>Returns whether this attribute should be included in the "attributeprefetch" summary
      * which is returned to the Qrs by prefetchAttributes, used by blending, uniquing etc.
@@ -181,6 +187,7 @@ public final class Attribute implements Cloneable, Serializable {
     public long upperBound() { return upperBound; }
     public double densePostingListThreshold() { return densePostingListThreshold; }
     public Optional<TensorType> tensorType() { return tensorType; }
+    public Optional<StructuredDataType> referenceDocumentType() { return referenceDocumentType; }
 
     public Sorting getSorting() { return sorting; }