Test that attribute writer can handle put in two phases.

1 files changed, 27 insertions, 21 deletions

diff --git a/searchlib/src/vespa/searchlib/index/doctypebuilder.cpp b/searchlib/src/vespa/searchlib/index/doctypebuilder.cpp
index a7ad475d6aa..1491e3e21de 100644
--- a/searchlib/src/vespa/searchlib/index/doctypebuilder.cpp
+++ b/searchlib/src/vespa/searchlib/index/doctypebuilder.cpp
@@ -10,38 +10,44 @@ using namespace document;
 namespace search::index {
 namespace {
 
-TensorDataType tensorDataType(vespalib::eval::ValueType::from_spec("tensor(x{}, y{})"));
+const vespalib::string default_tensor_data_type = "tensor(x{},y{})";
 
-const DataType *convert(Schema::DataType type) {
+vespalib::string
+resolve_tensor_spec(const vespalib::string& field_tensor_spec)
+{
+    return field_tensor_spec.empty() ? default_tensor_data_type : field_tensor_spec;
+}
+
+DataType::Type convert(Schema::DataType type) {
     switch (type) {
     case schema::DataType::BOOL:
     case schema::DataType::UINT2:
     case schema::DataType::UINT4:
     case schema::DataType::INT8:
-        return DataType::BYTE;
+        return DataType::T_BYTE;
     case schema::DataType::INT16:
-        return DataType::SHORT;
+        return DataType::T_SHORT;
     case schema::DataType::INT32:
-        return DataType::INT;
+        return DataType::T_INT;
     case schema::DataType::INT64:
-        return DataType::LONG;
+        return DataType::T_LONG;
     case schema::DataType::FLOAT:
-        return DataType::FLOAT;
+        return DataType::T_FLOAT;
     case schema::DataType::DOUBLE:
-        return DataType::DOUBLE;
+        return DataType::T_DOUBLE;
     case schema::DataType::STRING:
-        return DataType::STRING;
+        return DataType::T_STRING;
     case schema::DataType::RAW:
-        return DataType::RAW;
+        return DataType::T_RAW;
     case schema::DataType::BOOLEANTREE:
-        return DataType::PREDICATE;
+        return DataType::T_PREDICATE;
     case schema::DataType::TENSOR:
-        return &tensorDataType;
+        return DataType::T_TENSOR;
     default:
         break;
     }
     assert(!"Unknown datatype in schema");
-    return 0;
+    return DataType::MAX;
 }
 
 void
@@ -142,12 +148,12 @@ document::DocumenttypesConfig DocTypeBuilder::makeConfig() const {
         if (usf != usedFields.end()) {
             continue;   // taken as index field
         }
-        const DataType *primitiveType = convert(field.getDataType());
-        if (primitiveType->getId() == DataType::T_TENSOR) {
-            header_struct.addTensorField(field.getName(), dynamic_cast<const TensorDataType &>(*primitiveType).getTensorType().to_spec());
+        auto type_id = convert(field.getDataType());
+        if (type_id == DataType::T_TENSOR) {
+            header_struct.addTensorField(field.getName(), resolve_tensor_spec(field.get_tensor_spec()));
         } else {
             header_struct.addField(field.getName(), type_cache.getType(
-                        primitiveType->getId(), field.getCollectionType()));
+                    type_id, field.getCollectionType()));
         }
         usedFields.insert(field.getName());
     }
@@ -158,12 +164,12 @@ document::DocumenttypesConfig DocTypeBuilder::makeConfig() const {
         if (usf != usedFields.end()) {
             continue;   // taken as index field or attribute field
         }
-        const DataType *primitiveType(convert(field.getDataType()));
-        if (primitiveType->getId() == DataType::T_TENSOR) {
-            header_struct.addTensorField(field.getName(), dynamic_cast<const TensorDataType &>(*primitiveType).getTensorType().to_spec());
+        auto type_id  = convert(field.getDataType());
+        if (type_id == DataType::T_TENSOR) {
+            header_struct.addTensorField(field.getName(), resolve_tensor_spec(field.get_tensor_spec()));
         } else {
             header_struct.addField(field.getName(), type_cache.getType(
-                        primitiveType->getId(), field.getCollectionType()));
+                    type_id, field.getCollectionType()));
         }
         usedFields.insert(field.getName());
     }