Output tensor fields in summary config as type tensor instead of jsonstring

3 files changed, 29 insertions, 29 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java
index 99897d8a564..35ec45acba8 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java
@@ -75,8 +75,7 @@ public class SummaryClass extends Derived {
             SummaryClassField sf = fields.get(name);
             if (!SummaryClassField.convertDataType(type, transform).equals(sf.getType())) {
                 deployLogger.log(Level.WARNING, "Conflicting definition of field " + name + ". " +
-                               "Declared as type " + sf.getType() + " and " +
-                               type);
+                               "Declared as type " + sf.getType() + " and " + type);
             }
         } else {
             fields.put(name, new SummaryClassField(name, type, transform));
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClassField.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClassField.java
index 3416b15cd63..cf6afd609a2 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClassField.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClassField.java
@@ -33,7 +33,8 @@ public class SummaryClassField {
         LONGDATA("longdata"),
         XMLSTRING("xmlstring"),
         FEATUREDATA("featuredata"),
-        JSONSTRING("jsonstring");
+        JSONSTRING("jsonstring"),
+        TENSOR("tensor");
 
         private String name;
 
@@ -88,7 +89,7 @@ public class SummaryClassField {
         } else if (fval instanceof PredicateFieldValue) {
             return Type.STRING;
         } else if (fval instanceof TensorFieldValue) {
-            return Type.JSONSTRING;
+            return Type.TENSOR;
         } else if (fieldType instanceof CollectionDataType) {
             if (transform != null && transform.equals(SummaryTransform.POSITIONS)) {
                 return Type.XMLSTRING;
diff --git a/config-model/src/test/derived/tensor/summary.cfg b/config-model/src/test/derived/tensor/summary.cfg
index b6d00bc4799..b5b68cf6cd4 100644
--- a/config-model/src/test/derived/tensor/summary.cfg
+++ b/config-model/src/test/derived/tensor/summary.cfg
@@ -1,25 +1,25 @@
-defaultsummaryid 657634105
-classes[0].id 657634105
-classes[0].name "default"
-classes[0].fields[0].name "f1"
-classes[0].fields[0].type "jsonstring"
-classes[0].fields[1].name "f3"
-classes[0].fields[1].type "jsonstring"
-classes[0].fields[2].name "rankfeatures"
-classes[0].fields[2].type "featuredata"
-classes[0].fields[3].name "summaryfeatures"
-classes[0].fields[3].type "featuredata"
-classes[0].fields[4].name "documentid"
-classes[0].fields[4].type "longstring"
-classes[1].id 457955124
-classes[1].name "attributeprefetch"
-classes[1].fields[0].name "f2"
-classes[1].fields[0].type "jsonstring"
-classes[1].fields[1].name "f3"
-classes[1].fields[1].type "jsonstring"
-classes[1].fields[2].name "f4"
-classes[1].fields[2].type "jsonstring"
-classes[1].fields[3].name "rankfeatures"
-classes[1].fields[3].type "featuredata"
-classes[1].fields[4].name "summaryfeatures"
-classes[1].fields[4].type "featuredata"
\ No newline at end of file
+defaultsummaryid 788616935
+classes[].id 788616935
+classes[].name "default"
+classes[].fields[].name "f1"
+classes[].fields[].type "tensor"
+classes[].fields[].name "f3"
+classes[].fields[].type "tensor"
+classes[].fields[].name "rankfeatures"
+classes[].fields[].type "featuredata"
+classes[].fields[].name "summaryfeatures"
+classes[].fields[].type "featuredata"
+classes[].fields[].name "documentid"
+classes[].fields[].type "longstring"
+classes[].id 1860420340
+classes[].name "attributeprefetch"
+classes[].fields[].name "f2"
+classes[].fields[].type "tensor"
+classes[].fields[].name "f3"
+classes[].fields[].type "tensor"
+classes[].fields[].name "f4"
+classes[].fields[].type "tensor"
+classes[].fields[].name "rankfeatures"
+classes[].fields[].type "featuredata"
+classes[].fields[].name "summaryfeatures"
+classes[].fields[].type "featuredata"
\ No newline at end of file