Merge pull request #1682 from yahoo/havardpe/wire-in-new-input-output-model

Havardpe/wire in new input output model

5 files changed, 10 insertions, 9 deletions

diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp
index 1450ef5fc37..9b8e7240376 100644
--- a/searchcore/src/tests/proton/docsummary/docsummary.cpp
+++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp
@@ -434,13 +434,13 @@ Test::assertSlime(const std::string &exp, const DocsumReply &reply, uint32_t id,
     memcpy(&classId, docsum.data.c_str(), sizeof(classId));
     ASSERT_EQUAL(::search::fs4transport::SLIME_MAGIC_ID, classId);
     vespalib::Slime slime;
-    vespalib::slime::Memory serialized(docsum.data.c_str() + sizeof(classId),
+    vespalib::Memory serialized(docsum.data.c_str() + sizeof(classId),
                                        docsum.data.size() - sizeof(classId));
     size_t decodeRes = vespalib::slime::BinaryFormat::decode(serialized,
                                                              slime);
     ASSERT_EQUAL(decodeRes, serialized.size);
     if (relaxed) {
-        vespalib::slime::SimpleBuffer buf;
+        vespalib::SimpleBuffer buf;
         vespalib::slime::JsonFormat::encode(slime, buf, false);
         vespalib::Slime tmpSlime;
         size_t used = vespalib::slime::JsonFormat::decode(buf.get(), tmpSlime);
diff --git a/searchcore/src/tests/proton/summaryengine/summaryengine.cpp b/searchcore/src/tests/proton/summaryengine/summaryengine.cpp
index c2ece54ff1a..8cd98da51eb 100644
--- a/searchcore/src/tests/proton/summaryengine/summaryengine.cpp
+++ b/searchcore/src/tests/proton/summaryengine/summaryengine.cpp
@@ -21,6 +21,7 @@ using namespace vespalib::slime;
 using vespalib::stringref;
 using vespalib::ConstBufferRef;
 using vespalib::DataBuffer;
+using vespalib::Memory;
 
 namespace proton {
 
@@ -226,7 +227,7 @@ verify(vespalib::stringref exp, const Slime & slime)
     vespalib::Slime expSlime;
     size_t used = vespalib::slime::JsonFormat::decode(expMemory, expSlime);
     EXPECT_EQUAL(used, expMemory.size);
-    SimpleBuffer output;
+    vespalib::SimpleBuffer output;
     vespalib::slime::JsonFormat::encode(slime, output, true);
     Slime reSlimed;
     used = vespalib::slime::JsonFormat::decode(output.get(), reSlimed);
@@ -386,7 +387,7 @@ verifyRPC(size_t count,
 {
     Server server;
     vespalib::Slime slimeRequest = createSlimeRequestLarger(count);
-    SimpleBuffer buf; 
+    vespalib::SimpleBuffer buf; 
     BinaryFormat::encode(slimeRequest, buf);
     EXPECT_EQUAL(requestSize, buf.get().size);
 
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp
index e1ba72ac710..508dafe4d0a 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp
@@ -13,7 +13,7 @@ using search::common::Location;
 using vespalib::string;
 using vespalib::slime::SymbolTable;
 using vespalib::slime::NIX;
-using vespalib::slime::Memory;
+using vespalib::Memory;
 using vespalib::slime::Cursor;
 using vespalib::slime::Symbol;
 using vespalib::slime::Inserter;
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summaryfieldconverter.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/summaryfieldconverter.cpp
index 03ae8055c1c..e4cb28b56e8 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/summaryfieldconverter.cpp
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/summaryfieldconverter.cpp
@@ -369,7 +369,7 @@ class JsonFiller : public ConstFieldValueVisitor {
         if (tensor) {
             auto slime =
                 vespalib::tensor::SlimeBinaryFormat::serialize(*tensor);
-            vespalib::slime::SimpleBuffer buf;
+            vespalib::SimpleBuffer buf;
             vespalib::slime::JsonFormat::encode(*slime, buf, true);
             _json.appendJSON(buf.get().make_string());
         } else {
@@ -652,7 +652,7 @@ class SlimeFiller : public ConstFieldValueVisitor {
         if (tensor) {
             vespalib::tensor::TypedBinaryFormat::serialize(s, *tensor);
         }
-        _inserter.insertData(vespalib::slime::Memory(s.peek(), s.size()));
+        _inserter.insertData(vespalib::Memory(s.peek(), s.size()));
     }
 
     void visit(const ReferenceFieldValue& value) override {
diff --git a/searchcore/src/vespa/searchcore/proton/summaryengine/docsum_by_slime.cpp b/searchcore/src/vespa/searchcore/proton/summaryengine/docsum_by_slime.cpp
index 163c8e7efd2..132856ef755 100644
--- a/searchcore/src/vespa/searchcore/proton/summaryengine/docsum_by_slime.cpp
+++ b/searchcore/src/vespa/searchcore/proton/summaryengine/docsum_by_slime.cpp
@@ -15,11 +15,11 @@ using search::engine::DocsumReply;
 using vespalib::slime::Inspector;
 using vespalib::slime::Cursor;
 using vespalib::slime::ObjectSymbolInserter;
-using vespalib::slime::Memory;
+using vespalib::Memory;
 using vespalib::slime::Symbol;
 using vespalib::slime::BinaryFormat;
 using vespalib::slime::ArrayTraverser;
-using vespalib::slime::SimpleBuffer;
+using vespalib::SimpleBuffer;
 using vespalib::DataBuffer;
 using vespalib::ConstBufferRef;
 using document::CompressionConfig;