Enable imported tensor attributes.

2 files changed, 11 insertions, 20 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolver.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolver.java
index f2d32f85a16..9b6a86ad13e 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolver.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolver.java
@@ -2,7 +2,6 @@
 package com.yahoo.searchdefinition.processing;
 
 import com.yahoo.config.application.api.DeployLogger;
-import com.yahoo.document.TensorDataType;
 import com.yahoo.searchdefinition.DocumentReference;
 import com.yahoo.searchdefinition.DocumentReferences;
 import com.yahoo.searchdefinition.RankProfileRegistry;
@@ -66,8 +65,6 @@ public class ImportedFieldsResolver extends Processor {
             fail(importedField, targetFieldAsString(targetFieldName, reference) + ": Is not an attribute field. Only attribute fields supported");
         } else if (targetField.doesIndexing()) {
             fail(importedField, targetFieldAsString(targetFieldName, reference) + ": Is an index field. Not supported");
-        } else if (targetField.getDataType() instanceof TensorDataType) {
-            fail(importedField, targetFieldAsString(targetFieldName, reference) + ": Is of type 'tensor'. Not supported");
         }
         return targetField;
     }
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolverTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolverTestCase.java
index 9f7c7458738..7fb05c03cbf 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolverTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolverTestCase.java
@@ -38,18 +38,23 @@ public class ImportedFieldsResolverTestCase {
     @Rule
     public final ExpectedException exceptionRule = ExpectedException.none();
 
-    @Test
-    public void valid_imported_fields_are_resolved() {
+    private void resolve_imported_field(String fieldName, String targetFieldName) {
         SearchModel model = new SearchModel();
-        model.addImportedField("my_attribute_field", "ref", "attribute_field").resolve();
+        model.addImportedField(fieldName, "ref", targetFieldName).resolve();
 
         assertEquals(1, model.importedFields.fields().size());
-        ImportedField myField = model.importedFields.fields().get("my_attribute_field");
+        ImportedField myField = model.importedFields.fields().get(fieldName);
         assertNotNull(myField);
-        assertEquals("my_attribute_field", myField.fieldName());
+        assertEquals(fieldName, myField.fieldName());
         assertSame(model.childSearch.getConcreteField("ref"), myField.reference().referenceField());
         assertSame(model.parentSearch, myField.reference().targetSearch());
-        assertSame(model.parentSearch.getConcreteField("attribute_field"), myField.targetField());
+        assertSame(model.parentSearch.getConcreteField(targetFieldName), myField.targetField());
+    }
+
+    @Test
+    public void valid_imported_fields_are_resolved() {
+	resolve_imported_field("my_attribute_field", "attribute_field");
+	resolve_imported_field("my_tensor_field", "tensor_field");
     }
 
     @Test
@@ -88,17 +93,6 @@ public class ImportedFieldsResolverTestCase {
     }
 
     @Test
-    public void resolver_fails_if_imported_field_is_tensor_type() {
-        exceptionRule.expect(IllegalArgumentException.class);
-        exceptionRule.expectMessage(
-                "For search 'child', import field 'my_tensor_field': " +
-                        "Field 'tensor_field' via reference field 'ref': Is of type 'tensor'. Not supported");
-        new SearchModel()
-                .addImportedField("my_tensor_field", "ref", "tensor_field")
-                .resolve();
-    }
-
-    @Test
     public void resolver_fails_if_imported_field_is_also_an_imported_field() {
         exceptionRule.expect(IllegalArgumentException.class);
         exceptionRule.expectMessage(