Reduce usage of RawBuf.

Remove some unused code.

4 files changed, 13 insertions, 30 deletions

diff --git a/searchsummary/src/tests/docsummary/positionsdfw_test.cpp b/searchsummary/src/tests/docsummary/positionsdfw_test.cpp
index 09051e2e9c0..3531efe1798 100644
--- a/searchsummary/src/tests/docsummary/positionsdfw_test.cpp
+++ b/searchsummary/src/tests/docsummary/positionsdfw_test.cpp
@@ -9,7 +9,6 @@
 #include <vespa/searchsummary/docsummary/idocsumenvironment.h>
 #include <vespa/searchsummary/docsummary/docsumstate.h>
 #include <vespa/searchsummary/test/slime_value.h>
-#include <vespa/searchlib/util/rawbuf.h>
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/vespalib/data/slime/slime.h>
 #include <vespa/juniper/rpinterface.h>
diff --git a/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp b/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp
index 5e4d375c49f..cab6090da43 100644
--- a/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp
+++ b/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp
@@ -17,7 +17,7 @@
 #include <vespa/searchsummary/docsummary/keywordextractor.h>
 #include <vespa/searchsummary/docsummary/docsum_store_document.h>
 #include <vespa/vespalib/data/slime/slime.h>
-#include <vespa/searchlib/util/slime_output_raw_buf_adapter.h>
+#include <vespa/searchlib/util/rawbuf.h>
 #include <vespa/vespalib/util/size_literals.h>
 
 using namespace vespalib::slime::convenience;
@@ -41,29 +41,13 @@ using document::StructFieldValue;
 
 namespace {
 
-struct FieldBlock {
-    Slime slime;
-    search::RawBuf binary;
-
-    explicit FieldBlock(const vespalib::string &jsonInput)
-        : slime(), binary(1024)
-    {
-        size_t used = vespalib::slime::JsonFormat::decode(jsonInput, slime);
-        EXPECT_TRUE(used > 0);
-        search::SlimeOutputRawBufAdapter adapter(binary);
-        vespalib::slime::BinaryFormat::encode(slime, adapter);
-    }
-    const char *data() const { return binary.GetDrainPos(); }
-    size_t dataLen() const { return binary.GetUsedLen(); }
-};
-
 struct DocsumFixture : IDocsumStore, GetDocsumsStateCallback {
     std::unique_ptr<DynamicDocsumWriter> writer;
     StructDataType  int_pair_type;
     DocumentType    doc_type;
     GetDocsumsState state;
     DocsumFixture();
-    ~DocsumFixture();
+    ~DocsumFixture() override;
     void getDocsum(Slime &slime) {
         uint32_t classId;
         search::RawBuf buf(4_Ki);
@@ -111,7 +95,7 @@ DocsumFixture::DocsumFixture()
 {
     auto config = std::make_unique<ResultConfig>();
     ResultClass *cfg = config->AddResultClass("default", 0);
-    EXPECT_TRUE(cfg != 0);
+    EXPECT_TRUE(cfg != nullptr);
     EXPECT_TRUE(cfg->AddConfigEntry("int_field", RES_INT));
     EXPECT_TRUE(cfg->AddConfigEntry("short_field", RES_SHORT));
     EXPECT_TRUE(cfg->AddConfigEntry("byte_field", RES_BYTE));
@@ -140,7 +124,7 @@ DocsumFixture::DocsumFixture()
     doc_type.addField(Field("longdata_field", *DataType::RAW));
     doc_type.addField(Field("int_pair_field", int_pair_type));
 }
-DocsumFixture::~DocsumFixture() {}
+DocsumFixture::~DocsumFixture() = default;
 
 } // namespace <unnamed>
 
diff --git a/searchsummary/src/tests/docsummary/summary_field_converter/summary_field_converter_test.cpp b/searchsummary/src/tests/docsummary/summary_field_converter/summary_field_converter_test.cpp
index c6f310f2d53..1d7795d26dc 100644
--- a/searchsummary/src/tests/docsummary/summary_field_converter/summary_field_converter_test.cpp
+++ b/searchsummary/src/tests/docsummary/summary_field_converter/summary_field_converter_test.cpp
@@ -132,7 +132,7 @@ FieldBlock::FieldBlock(const vespalib::string &jsonInput)
     vespalib::slime::BinaryFormat::encode(slime, adapter);
 }
 
-FieldBlock::~FieldBlock() {}
+FieldBlock::~FieldBlock() = default;
 
 class Test : public vespalib::TestApp {
     std::unique_ptr<Schema> _schema;
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/summaryfieldconverter.cpp b/searchsummary/src/vespa/searchsummary/docsummary/summaryfieldconverter.cpp
index 218a9b82803..8bf78b90c77 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/summaryfieldconverter.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/summaryfieldconverter.cpp
@@ -35,8 +35,8 @@
 #include <vespa/vespalib/util/size_literals.h>
 #include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/vespalib/data/slime/slime.h>
+#include <vespa/vespalib/data/smart_buffer.h>
 #include <vespa/vespalib/objects/nbostream.h>
-#include <vespa/searchlib/util/slime_output_raw_buf_adapter.h>
 #include <vespa/vespalib/util/exceptions.h>
 
 
@@ -152,11 +152,11 @@ void handleIndexingTerms(Handler &handler, const StringFieldValue &value) {
         }
     }
     sort(terms.begin(), terms.end());
-    SpanTermVector::const_iterator it = terms.begin();
-    SpanTermVector::const_iterator ite = terms.end();
+    auto it = terms.begin();
+    auto ite = terms.end();
     int32_t endPos = 0;
     for (; it != ite; ) {
-        SpanTermVector::const_iterator it_begin = it;
+        auto it_begin = it;
         if (it_begin->first.from() >  endPos) {
             Span tmpSpan(endPos, it_begin->first.from() - endPos);
             handler.handleAnnotations(tmpSpan, it, it);
@@ -584,10 +584,10 @@ public:
         SlimeInserter inserter(slime);
         SlimeFiller visitor(inserter, _tokenize, _matching_elems);
         input.accept(visitor);
-        search::RawBuf rbuf(4_Ki);
-        search::SlimeOutputRawBufAdapter adapter(rbuf);
-        vespalib::slime::BinaryFormat::encode(slime, adapter);
-        return std::make_unique<RawFieldValue>(rbuf.GetDrainPos(), rbuf.GetUsedLen());
+        vespalib::SmartBuffer buffer(4_Ki);
+        vespalib::slime::BinaryFormat::encode(slime, buffer);
+        vespalib::Memory mem = buffer.obtain();
+        return std::make_unique<RawFieldValue>(mem.data, mem.size);
     }
 };