use SerializedFastValueAttribute if possible

1 files changed, 5 insertions, 1 deletions

diff --git a/searchlib/src/vespa/searchlib/attribute/createsinglestd.cpp b/searchlib/src/vespa/searchlib/attribute/createsinglestd.cpp
index 7325ab0d414..29033944d4b 100644
--- a/searchlib/src/vespa/searchlib/attribute/createsinglestd.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/createsinglestd.cpp
@@ -7,7 +7,9 @@
 #include "singlenumericattribute.hpp"
 #include "singlestringattribute.h"
 #include "singleboolattribute.h"
+#include <vespa/eval/eval/engine_or_factory.h>
 #include <vespa/searchlib/tensor/dense_tensor_attribute.h>
+#include <vespa/searchlib/tensor/serialized_tensor_attribute.h>
 #include <vespa/searchlib/tensor/serialized_fast_value_attribute.h>
 
 namespace search {
@@ -45,8 +47,10 @@ AttributeFactory::createSingleStd(stringref name, const Config & info)
     case BasicType::TENSOR:
         if (info.tensorType().is_dense()) {
             return std::make_shared<tensor::DenseTensorAttribute>(name, info);
-        } else {
+        } else if (vespalib::eval::EngineOrFactory::get().is_factory()) {
             return std::make_shared<tensor::SerializedFastValueAttribute>(name, info);
+        } else {
+            return std::make_shared<tensor::SerializedTensorAttribute>(name, info);
         }
     case BasicType::REFERENCE:
         return std::make_shared<attribute::ReferenceAttribute>(name, info);