GC getString interface

3 files changed, 11 insertions, 7 deletions

diff --git a/searchlib/src/tests/attribute/extendattributes/extendattribute.cpp b/searchlib/src/tests/attribute/extendattributes/extendattribute.cpp
index 35dd0351f34..a44965ffb31 100644
--- a/searchlib/src/tests/attribute/extendattributes/extendattribute.cpp
+++ b/searchlib/src/tests/attribute/extendattributes/extendattribute.cpp
@@ -101,9 +101,11 @@ void ExtendAttributeTest::testExtendString(Attribute & attr)
     EXPECT_EQ(docId, 0u);
     EXPECT_EQ(attr.getNumDocs(), 1u);
     attr.add("1.7", 10);
-    EXPECT_EQ(std::string(attr.getString(0, NULL, 0)), "1.7");
+    auto buf = attr.get_raw(0);
+    EXPECT_EQ(std::string(buf.data(), buf.size()), "1.7");
     attr.add("2.3", 20);
-    EXPECT_EQ(std::string(attr.getString(0, NULL, 0)), attr.hasMultiValue() ? "1.7" : "2.3");
+    buf = attr.get_raw(0);
+    EXPECT_EQ(std::string(buf.data(), buf.size()), attr.hasMultiValue() ? "1.7" : "2.3");
     if (attr.hasMultiValue()) {
         AttributeVector::WeightedString v[2];
         EXPECT_EQ((static_cast<AttributeVector &>(attr)).get(0, v, 2), 2u);
@@ -118,7 +120,8 @@ void ExtendAttributeTest::testExtendString(Attribute & attr)
     EXPECT_EQ(docId, 1u);
     EXPECT_EQ(attr.getNumDocs(), 2u);
     attr.add("3.6", 30);
-    EXPECT_EQ(std::string(attr.getString(1, NULL, 0)), "3.6");
+    buf = attr.get_raw(1);
+    EXPECT_EQ(std::string(buf.data(), buf.size()), "3.6");
     if (attr.hasMultiValue()) {
         AttributeVector::WeightedString v[1];
         EXPECT_EQ((static_cast<AttributeVector &>(attr)).get(1, v, 1), 1u);
diff --git a/searchlib/src/tests/attribute/imported_attribute_vector/imported_attribute_vector_test.cpp b/searchlib/src/tests/attribute/imported_attribute_vector/imported_attribute_vector_test.cpp
index 0d2ce048111..9e65dfcfc07 100644
--- a/searchlib/src/tests/attribute/imported_attribute_vector/imported_attribute_vector_test.cpp
+++ b/searchlib/src/tests/attribute/imported_attribute_vector/imported_attribute_vector_test.cpp
@@ -258,9 +258,10 @@ SingleStringAttrFixture::~SingleStringAttrFixture() = default;
 
 TEST_F("Single-valued string attribute values can be retrieved via reference", SingleStringAttrFixture)
 {
-    char buf[64];
-    EXPECT_EQUAL(vespalib::string("foo"), f.get_imported_attr()->getString(DocId(2), buf, sizeof(buf)));
-    EXPECT_EQUAL(vespalib::string("bar"), f.get_imported_attr()->getString(DocId(4), buf, sizeof(buf)));
+    auto buf = f.get_imported_attr()->get_raw(DocId(2));
+    EXPECT_EQUAL(vespalib::stringref("foo"), vespalib::stringref(buf.data(), buf.size()));
+    buf = f.get_imported_attr()->get_raw(DocId(4));
+    EXPECT_EQUAL(vespalib::stringref("bar"), vespalib::stringref(buf.data(), buf.size()));
 }
 
 TEST_F("getEnum() returns target vector enum via reference", SingleStringAttrFixture)
diff --git a/searchlib/src/tests/attribute/stringattribute/stringattribute_test.cpp b/searchlib/src/tests/attribute/stringattribute/stringattribute_test.cpp
index e217e8c8533..3d4edcd4aea 100644
--- a/searchlib/src/tests/attribute/stringattribute/stringattribute_test.cpp
+++ b/searchlib/src/tests/attribute/stringattribute/stringattribute_test.cpp
@@ -303,7 +303,7 @@ testDefaultValueOnAddDoc(AttributeVector & v)
     EXPECT_EQUAL(1u, doc);
     EXPECT_EQUAL(2u, v.getNumDocs());
     EXPECT_TRUE( IEnumStore::Index(EntryRef(v.getEnum(doc))).valid() );
-    EXPECT_EQUAL(0u, strlen(v.getString(doc, NULL, 0)));
+    EXPECT_EQUAL(0u, v.get_raw(doc).size());
 }
 
 template <typename Attribute>