use new input/output model in slime

8 files changed, 16 insertions, 16 deletions

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 45e4fb009ac..f5f37468b79 100644
--- a/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp
+++ b/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp
@@ -6,7 +6,7 @@
 #include <vespa/searchlib/util/rawbuf.h>
 #include <vespa/searchlib/common/transport.h>
 #include <vespa/vespalib/data/slime/slime.h>
-#include <vespa/vespalib/data/slime/simple_buffer.h>
+#include <vespa/vespalib/data/simple_buffer.h>
 #include <vespa/vespalib/data/slime/json_format.h>
 #include <vespa/vespalib/data/slime/binary_format.h>
 #include <vespa/searchlib/util/slime_output_raw_buf_adapter.h>
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp
index 6af943c516b..eb5219153c1 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp
@@ -232,7 +232,7 @@ SingleAttrDFW::insertField(uint32_t docid,
             if (tensor) {
                 vespalib::nbostream str;
                 vespalib::tensor::TypedBinaryFormat::serialize(str, *tensor);
-                target.insertData(vespalib::slime::Memory(str.peek(), str.size()));
+                target.insertData(vespalib::Memory(str.peek(), str.size()));
             }
         }
         default:
@@ -246,13 +246,13 @@ SingleAttrDFW::insertField(uint32_t docid,
     case RES_LONG_STRING:
     case RES_STRING: {
         s = v.getString(docid, NULL, 0); // no need to pass in a buffer, this attribute has a string storage.
-        target.insertString(vespalib::slime::Memory(s));
+        target.insertString(vespalib::Memory(s));
         break;
     }
     case RES_LONG_DATA:
     case RES_DATA: {
         s = v.getString(docid, NULL, 0); // no need to pass in a buffer, this attribute has a string storage.
-        target.insertData(vespalib::slime::Memory(s));
+        target.insertData(vespalib::Memory(s));
         break;
     }
     default:
@@ -355,7 +355,7 @@ MultiAttrDFW::insertField(uint32_t docid,
                           vespalib::slime::Inserter &target)
 {
     using vespalib::slime::Cursor;
-    using vespalib::slime::Memory;
+    using vespalib::Memory;
     const IAttributeVector & v = vec(*state);
     uint32_t entries = v.getValueCount(docid);
     bool isWeightedSet = v.hasWeightedSetType();
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.cpp b/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.cpp
index 446ca347bff..ba30940f5e0 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.cpp
@@ -160,7 +160,7 @@ CopyDFW::insertField(uint32_t /*docid*/,
             // resolve field
             entry->_resolve_field(&spt, &len,
                                   &state->_docSumFieldSpace);
-            vespalib::slime::Memory value(spt, len);
+            vespalib::Memory value(spt, len);
             target.insertString(value);
             break; }
 
@@ -172,7 +172,7 @@ CopyDFW::insertField(uint32_t /*docid*/,
             // resolve field
             entry->_resolve_field(&dpt, &len,
                                   &state->_docSumFieldSpace);
-            vespalib::slime::Memory value(dpt, len);
+            vespalib::Memory value(dpt, len);
             target.insertData(value);
             break; }
         }
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/dynamicteaserdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/dynamicteaserdfw.cpp
index df92e0eaf02..f18cf1a4da4 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/dynamicteaserdfw.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/dynamicteaserdfw.cpp
@@ -480,7 +480,7 @@ DynamicTeaserDFW::insertField(uint32_t docid,
                               vespalib::slime::Inserter &target)
 {
     vespalib::string teaser = makeDynamicTeaser(docid, gres, state);
-    vespalib::slime::Memory value(teaser.c_str(), teaser.size());
+    vespalib::Memory value(teaser.c_str(), teaser.size());
     target.insertString(value);
 }
 
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.cpp
index 250ad272355..723238b1b8b 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.cpp
@@ -89,7 +89,7 @@ AbsDistanceDFW::insertField(uint32_t docid, GeneralResult *, GetDocsumsState *st
         target.insertLong(absdist);
     } else {
         vespalib::string value = vespalib::stringify(absdist);
-        vespalib::slime::Memory data(value.c_str(), value.size());
+        vespalib::Memory data(value.c_str(), value.size());
 
         if (type == RES_STRING      ||
             type == RES_LONG_STRING ||
@@ -272,7 +272,7 @@ PositionsDFW::insertField(uint32_t docid, GeneralResult *, GetDocsumsState * dsS
                           ResType type, vespalib::slime::Inserter &target)
 {
     vespalib::asciistream val(formatField(vec(*dsState), docid, type));
-    target.insertString(vespalib::slime::Memory(val.c_str(), val.size()));
+    target.insertString(vespalib::Memory(val.c_str(), val.size()));
 }
 
 //--------------------------------------------------------------------------
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp
index b81b1cc231d..07c82382233 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp
@@ -79,7 +79,7 @@ RankFeaturesDFW::insertField(uint32_t docid,
     if (type == RES_FEATUREDATA && values != NULL) {
         vespalib::slime::Cursor& obj = target.insertObject();
         for (uint32_t i = 0; i < names.size(); ++i) {
-            vespalib::slime::Memory name(names[i].c_str(), names[i].size());
+            vespalib::Memory name(names[i].c_str(), names[i].size());
             obj.setDouble(name, values[i]);
         }
         return;
@@ -92,7 +92,7 @@ RankFeaturesDFW::insertField(uint32_t docid,
             featureDump(json, names[i], values[i]);
         }
         json.endObject();
-        vespalib::slime::Memory value(json.toString().c_str(),
+        vespalib::Memory value(json.toString().c_str(),
                                       json.toString().size());
         if (type == RES_STRING || type == RES_LONG_STRING) {
             target.insertString(value);
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp
index 14a4383009b..66e50fdff1a 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp
@@ -31,7 +31,7 @@ SummaryFeaturesDFW::init(IDocsumEnvironment * env)
 }
 
 static vespalib::string _G_cached("vespa.summaryFeatures.cached");
-static vespalib::slime::Memory _M_cached("vespa.summaryFeatures.cached");
+static vespalib::Memory _M_cached("vespa.summaryFeatures.cached");
 
 void
 SummaryFeaturesDFW::insertField(uint32_t docid,
@@ -51,7 +51,7 @@ SummaryFeaturesDFW::insertField(uint32_t docid,
     if (type == RES_FEATUREDATA && values != NULL) {
         vespalib::slime::Cursor& obj = target.insertObject();
         for (uint32_t i = 0; i < names.size(); ++i) {
-            vespalib::slime::Memory name(names[i].c_str(), names[i].size());
+            vespalib::Memory name(names[i].c_str(), names[i].size());
             obj.setDouble(name, values[i]);
         }
         if (state->_summaryFeaturesCached) {
@@ -75,7 +75,7 @@ SummaryFeaturesDFW::insertField(uint32_t docid,
             json.appendDouble(0.0);
         }
         json.endObject();
-        vespalib::slime::Memory value(json.toString().c_str(),
+        vespalib::Memory value(json.toString().c_str(),
                                       json.toString().size());
         if (type == RES_STRING || type == RES_LONG_STRING) {
             target.insertString(value);
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/textextractordfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/textextractordfw.cpp
index 0be38f632db..716c4a024d8 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/textextractordfw.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/textextractordfw.cpp
@@ -49,7 +49,7 @@ TextExtractorDFW::insertField(uint32_t,
     } else {
         LOG(warning, "Did not find input entry using field enum %d. Write an empty field", _inputFieldEnum);
     }
-    target.insertString(vespalib::slime::Memory(extracted.c_str(), extracted.size()));
+    target.insertString(vespalib::Memory(extracted.c_str(), extracted.size()));
 }
 
 uint32_t