Support that array of struct field is derived into array attributes.

3 files changed, 86 insertions, 0 deletions

diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java
index 95d5832b70d..4ee33abfc08 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java
@@ -1,12 +1,16 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.searchdefinition;
 
+import com.yahoo.document.StructDataType;
 import com.yahoo.searchdefinition.document.Attribute;
 import com.yahoo.searchdefinition.document.SDField;
+import com.yahoo.searchdefinition.document.Sorting;
 import com.yahoo.searchdefinition.parser.ParseException;
+import com.yahoo.tensor.TensorType;
 import org.junit.Test;
 
 import java.io.IOException;
+import java.util.Optional;
 
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.*;
@@ -88,4 +92,48 @@ public class AttributeSettingsTestCase extends SearchDefinitionTestCase {
         assertTrue(attr.isFastAccess());
     }
 
+    @Test
+    public void attribute_convert_to_array_copies_internal_state() {
+        StructDataType refType = new StructDataType("my_struct");
+        Attribute single = new Attribute("foo", Attribute.Type.STRING, Attribute.CollectionType.SINGLE,
+                Optional.of(TensorType.fromSpec("tensor(x{})")), Optional.of(refType));
+        single.setRemoveIfZero(true);
+        single.setCreateIfNonExistent(true);
+        single.setPrefetch(Boolean.TRUE);
+        single.setEnableBitVectors(true);
+        single.setEnableOnlyBitVector(true);
+        single.setFastSearch(true);
+        single.setHuge(true);
+        single.setFastAccess(true);
+        single.setPosition(true);
+        single.setArity(5);
+        single.setLowerBound(7);
+        single.setUpperBound(11);
+        single.setDensePostingListThreshold(13.3);
+        single.getSorting().setAscending();
+        single.getAliases().add("foo");
+
+        Attribute array = single.convertToArray();
+        assertEquals("foo", array.getName());
+        assertEquals(Attribute.Type.STRING, array.getType());
+        assertEquals(Attribute.CollectionType.ARRAY, array.getCollectionType());
+        assertEquals(Optional.of(TensorType.fromSpec("tensor(x{})")), array.tensorType());
+        assertSame(single.referenceDocumentType(), array.referenceDocumentType());
+        assertTrue(array.isRemoveIfZero());
+        assertTrue(array.isCreateIfNonExistent());
+        assertTrue(array.isPrefetch());
+        assertTrue(array.isEnabledBitVectors());
+        assertTrue(array.isEnabledOnlyBitVector());
+        assertTrue(array.isFastSearch());
+        assertTrue(array.isHuge());
+        assertTrue(array.isFastAccess());
+        assertTrue(array.isPosition());
+        assertEquals(5, array.arity());
+        assertEquals(7, array.lowerBound());
+        assertEquals(11, array.upperBound());
+        assertEquals(13.3, array.densePostingListThreshold(), 0.00001);
+        assertSame(single.getSorting(), array.getSorting());
+        assertSame(single.getAliases(), array.getAliases());
+    }
+
 }
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/AttributeListTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/AttributeListTestCase.java
index 86f30ba3c11..990ebe7f993 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/AttributeListTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/AttributeListTestCase.java
@@ -11,6 +11,7 @@ import org.junit.Test;
 import java.io.IOException;
 import java.util.Iterator;
 
+import static com.yahoo.config.model.test.TestUtil.joinLines;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -68,4 +69,36 @@ public class AttributeListTestCase extends SearchDefinitionTestCase {
         assertTrue(!attributes.hasNext());
     }
 
+    @Test
+    public void array_of_struct_field_is_derived_into_array_attributes() throws IOException, ParseException {
+        Search search = SearchBuilder.buildFromFile("src/test/derived/array_of_struct_attribute/test.sd");
+        Iterator<Attribute> attributes = new AttributeFields(search).attributeIterator();
+
+        assertAttribute("elem_array.name", Attribute.Type.STRING, Attribute.CollectionType.ARRAY, attributes.next());
+        assertAttribute("elem_array.weight", Attribute.Type.INTEGER, Attribute.CollectionType.ARRAY, attributes.next());
+        assertTrue(!attributes.hasNext());
+    }
+
+    private static void assertAttribute(String name, Attribute.Type type, Attribute.CollectionType collection, Attribute attr) {
+        assertEquals(name, attr.getName());
+        assertEquals(type, attr.getType());
+        assertEquals(collection, attr.getCollectionType());
+    }
+
+    @Test
+    public void only_zcurve_attribute_is_derived_from_array_of_position_field() throws ParseException {
+        Search search = SearchBuilder.createFromString(
+                joinLines("search test {",
+                          "  document test {",
+                          "    field pos_array type array<position> {",
+                          "      indexing: attribute",
+                          "    }",
+                          "  }",
+                          "}")).getSearch();
+        Iterator<Attribute> attributes = new AttributeFields(search).attributeIterator();
+
+        assertAttribute("pos_array_zcurve", Attribute.Type.LONG, Attribute.CollectionType.ARRAY, attributes.next());
+        assertTrue(!attributes.hasNext());
+    }
+
 }
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java
index 4600f6ae4c6..dc2d3b7cea1 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java
@@ -139,4 +139,9 @@ public class ExportingTestCase extends AbstractExportingTestCase {
         assertCorrectDeriving("tensor");
     }
 
+    @Test
+    public void testArrayOfStructAttribute() throws IOException, ParseException {
+        assertCorrectDeriving("array_of_struct_attribute");
+    }
+
 }