GC redundant convenience wasy of assigning primitive field values.

2 files changed, 9 insertions, 5 deletions

diff --git a/searchlib/src/tests/docstore/document_store_visitor/document_store_visitor_test.cpp b/searchlib/src/tests/docstore/document_store_visitor/document_store_visitor_test.cpp
index 072efb06a07..dd23304fe50 100644
--- a/searchlib/src/tests/docstore/document_store_visitor/document_store_visitor_test.cpp
+++ b/searchlib/src/tests/docstore/document_store_visitor/document_store_visitor_test.cpp
@@ -8,6 +8,7 @@
 #include <vespa/searchlib/common/bitvector.h>
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/document/datatype/documenttype.h>
+#include <vespa/document/fieldvalue/stringfieldvalue.h>
 #include <vespa/document/repo/configbuilder.h>
 #include <vespa/document/fieldvalue/document.h>
 #include <vespa/vespalib/io/fileutil.h>
@@ -26,6 +27,7 @@ using document::Document;
 using document::DocumentId;
 using document::DocumentType;
 using document::DocumentTypeRepo;
+using document::StringFieldValue;
 using vespalib::compression::CompressionConfig;
 using vespalib::asciistream;
 using index::DummyFileHeaderContext;
@@ -66,9 +68,9 @@ makeDoc(const DocumentTypeRepo &repo, uint32_t i, bool before)
         mainstr << (j + i * 1000) << " ";
     }
     mainstr << " and end field";
-    doc->set("main", mainstr.c_str());
+    doc->setValue("main", std::make_unique<StringFieldValue>(mainstr.str()));
     if (!before) {
-        doc->set("extra", "foo");
+        doc->setValue("extra", std::make_unique<StringFieldValue>("foo"));
     }
     
     return doc;
@@ -160,7 +162,7 @@ MyRewriteVisitor::visit(uint32_t lid, const std::shared_ptr<Document> &doc)
     Document::UP expDoc(makeDoc(_repo, lid, _before));
     EXPECT_TRUE(*expDoc == *doc);
     _valid->setBitAndMaintainCount(lid);
-    doc->set("extra", "foo");
+    doc->setValue("extra", std::make_unique<StringFieldValue>("foo"));
 }
 
 
diff --git a/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp b/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp
index 378babb6ee1..e3d2490954c 100644
--- a/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp
+++ b/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp
@@ -4,6 +4,7 @@
 #include <vespa/document/repo/configbuilder.h>
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/document/datatype/documenttype.h>
+#include <vespa/document/fieldvalue/stringfieldvalue.h>
 #include <vespa/document/fieldvalue/document.h>
 #include <vespa/searchlib/docstore/chunkformats.h>
 #include <vespa/searchlib/docstore/logdocumentstore.h>
@@ -19,6 +20,7 @@
 #include <iomanip>
 
 using document::BucketId;
+using document::StringFieldValue;
 using namespace search::docstore;
 using namespace search;
 using namespace vespalib::alloc;
@@ -429,9 +431,9 @@ makeDoc(const DocumentTypeRepo &repo, uint32_t i, bool extra_field, size_t numRe
         mainstr << (j + i * 1000) << " ";
     }
     mainstr << " and end field";
-    doc->set("main", mainstr.c_str());
+    doc->setValue("main", std::make_unique<StringFieldValue>(mainstr.str()));
     if (extra_field) {
-        doc->set("extra", "foo");
+        doc->setValue("extra", std::make_unique<StringFieldValue>("foo"));
     }
     return doc;
 }