Merge pull request #22060 from vespa-engine/arnej/fix-wrong-tensor-datatype

add missing tensor detailed type.

2 files changed, 83 insertions, 1 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DataTypeRecognizer.java b/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DataTypeRecognizer.java
index cce18be2522..a63728c403d 100644
--- a/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DataTypeRecognizer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DataTypeRecognizer.java
@@ -110,7 +110,8 @@ public class DataTypeRecognizer {
             return "{struct "+t.getName()+"}";
         }
         if (typeClass == TensorDataType.class) {
-            return "{tensor}";
+            var t = (TensorDataType) type;
+            return "{tensor" + t.getTensorType() + "}";
         }
         if (typeClass == WeightedSetDataType.class) {
             var t = (WeightedSetDataType) type;
diff --git a/config-model/src/test/derived/tensor/documentmanager.cfg b/config-model/src/test/derived/tensor/documentmanager.cfg
new file mode 100644
index 00000000000..d11c67fea01
--- /dev/null
+++ b/config-model/src/test/derived/tensor/documentmanager.cfg
@@ -0,0 +1,81 @@
+enablecompression false
+usev8geopositions false
+doctype[].name "document"
+doctype[].idx 10000
+doctype[].contentstruct 10001
+doctype[].primitivetype[].idx 10002
+doctype[].primitivetype[].name "bool"
+doctype[].primitivetype[].idx 10003
+doctype[].primitivetype[].name "byte"
+doctype[].primitivetype[].idx 10004
+doctype[].primitivetype[].name "double"
+doctype[].primitivetype[].idx 10005
+doctype[].primitivetype[].name "float"
+doctype[].primitivetype[].idx 10006
+doctype[].primitivetype[].name "float16"
+doctype[].primitivetype[].idx 10007
+doctype[].primitivetype[].name "int"
+doctype[].primitivetype[].idx 10008
+doctype[].primitivetype[].name "long"
+doctype[].primitivetype[].idx 10010
+doctype[].primitivetype[].name "predicate"
+doctype[].primitivetype[].idx 10011
+doctype[].primitivetype[].name "raw"
+doctype[].primitivetype[].idx 10012
+doctype[].primitivetype[].name "string"
+doctype[].primitivetype[].idx 10014
+doctype[].primitivetype[].name "uri"
+doctype[].wsettype[].idx 10013
+doctype[].wsettype[].elementtype 10012
+doctype[].wsettype[].createifnonexistent true
+doctype[].wsettype[].removeifzero true
+doctype[].structtype[].idx 10001
+doctype[].structtype[].name "document.header"
+doctype[].structtype[].idx 10009
+doctype[].structtype[].name "position"
+doctype[].structtype[].field[].name "x"
+doctype[].structtype[].field[].internalid 914677694
+doctype[].structtype[].field[].type 10007
+doctype[].structtype[].field[].name "y"
+doctype[].structtype[].field[].internalid 900009410
+doctype[].structtype[].field[].type 10007
+doctype[].name "tensor"
+doctype[].idx 10015
+doctype[].inherits[].idx 10000
+doctype[].contentstruct 10016
+doctype[].fieldsets{[document]}.fields[] "f1"
+doctype[].fieldsets{[document]}.fields[] "f2"
+doctype[].fieldsets{[document]}.fields[] "f3"
+doctype[].fieldsets{[document]}.fields[] "f4"
+doctype[].fieldsets{[document]}.fields[] "f5"
+doctype[].fieldsets{[document]}.fields[] "f6"
+doctype[].tensortype[].idx 10017
+doctype[].tensortype[].detailedtype "tensor(x[3])"
+doctype[].tensortype[].idx 10018
+doctype[].tensortype[].detailedtype "tensor<float>(x[2],y[1])"
+doctype[].tensortype[].idx 10019
+doctype[].tensortype[].detailedtype "tensor(x{})"
+doctype[].tensortype[].idx 10020
+doctype[].tensortype[].detailedtype "tensor(x[10],y[10])"
+doctype[].tensortype[].idx 10021
+doctype[].tensortype[].detailedtype "tensor<float>(x[10])"
+doctype[].structtype[].idx 10016
+doctype[].structtype[].name "tensor.header"
+doctype[].structtype[].field[].name "f1"
+doctype[].structtype[].field[].internalid 26661415
+doctype[].structtype[].field[].type 10017
+doctype[].structtype[].field[].name "f2"
+doctype[].structtype[].field[].internalid 2080644671
+doctype[].structtype[].field[].type 10018
+doctype[].structtype[].field[].name "f3"
+doctype[].structtype[].field[].internalid 1295091863
+doctype[].structtype[].field[].type 10019
+doctype[].structtype[].field[].name "f4"
+doctype[].structtype[].field[].internalid 1224191509
+doctype[].structtype[].field[].type 10020
+doctype[].structtype[].field[].name "f5"
+doctype[].structtype[].field[].internalid 329055840
+doctype[].structtype[].field[].type 10021
+doctype[].structtype[].field[].name "f6"
+doctype[].structtype[].field[].internalid 596352344
+doctype[].structtype[].field[].type 10005