use new input/output model in slime

5 files changed, 13 insertions, 10 deletions

diff --git a/searchlib/src/vespa/searchlib/common/packets.cpp b/searchlib/src/vespa/searchlib/common/packets.cpp
index 6ce62f228b8..e2025f77e43 100644
--- a/searchlib/src/vespa/searchlib/common/packets.cpp
+++ b/searchlib/src/vespa/searchlib/common/packets.cpp
@@ -612,9 +612,9 @@ FS4Packet_DOCSUM::toString(uint32_t indent) const
     if (_buf.size() >= sizeof(magic) &&
         memcmp(_buf.c_str(), &magic, sizeof(magic)) == 0) {
         vespalib::Slime slime;
-        vespalib::slime::Memory input(_buf.c_str() + sizeof(magic),
+        vespalib::Memory input(_buf.c_str() + sizeof(magic),
                                       _buf.size() - sizeof(magic));
-        vespalib::slime::SimpleBuffer buf;
+        vespalib::SimpleBuffer buf;
         vespalib::slime::BinaryFormat::decode(input, slime);
         vespalib::slime::JsonFormat::encode(slime, buf, false);
         s += make_string("%*s  json dump : ", indent, "");
diff --git a/searchlib/src/vespa/searchlib/predicate/predicate_tree_analyzer.cpp b/searchlib/src/vespa/searchlib/predicate/predicate_tree_analyzer.cpp
index d51de9b09f1..543d972e88b 100644
--- a/searchlib/src/vespa/searchlib/predicate/predicate_tree_analyzer.cpp
+++ b/searchlib/src/vespa/searchlib/predicate/predicate_tree_analyzer.cpp
@@ -16,7 +16,7 @@ using std::map;
 using std::min;
 using std::string;
 using vespalib::slime::Inspector;
-using vespalib::slime::Memory;
+using vespalib::Memory;
 
 namespace search {
 namespace predicate {
diff --git a/searchlib/src/vespa/searchlib/predicate/predicate_tree_annotator.cpp b/searchlib/src/vespa/searchlib/predicate/predicate_tree_annotator.cpp
index 84df5adc9d4..8c45b18c1e5 100644
--- a/searchlib/src/vespa/searchlib/predicate/predicate_tree_annotator.cpp
+++ b/searchlib/src/vespa/searchlib/predicate/predicate_tree_annotator.cpp
@@ -21,7 +21,7 @@ using document::Predicate;
 using std::map;
 using std::string;
 using vespalib::slime::Inspector;
-using vespalib::slime::Memory;
+using vespalib::Memory;
 
 namespace search {
 namespace predicate {
diff --git a/searchlib/src/vespa/searchlib/predicate/predicate_tree_annotator.h b/searchlib/src/vespa/searchlib/predicate/predicate_tree_annotator.h
index e6dd9dbaeb4..a955d90411b 100644
--- a/searchlib/src/vespa/searchlib/predicate/predicate_tree_annotator.h
+++ b/searchlib/src/vespa/searchlib/predicate/predicate_tree_annotator.h
@@ -4,7 +4,7 @@
 
 #include "predicate_interval.h"
 #include <unordered_map>
-#include <vespa/vespalib/data/slime/memory.h>
+#include <vespa/vespalib/data/memory.h>
 #include <vespa/vespalib/stllike/string.h>
 #include <climits>
 #include <vector>
@@ -15,7 +15,7 @@ namespace search {
 namespace predicate {
 
 struct RangeFeature {
-    vespalib::slime::Memory label;
+    vespalib::Memory label;
     int64_t from;
     int64_t to;
 };
diff --git a/searchlib/src/vespa/searchlib/util/slime_output_raw_buf_adapter.h b/searchlib/src/vespa/searchlib/util/slime_output_raw_buf_adapter.h
index 9ab88d07c28..771573a30a1 100644
--- a/searchlib/src/vespa/searchlib/util/slime_output_raw_buf_adapter.h
+++ b/searchlib/src/vespa/searchlib/util/slime_output_raw_buf_adapter.h
@@ -2,21 +2,24 @@
 
 #pragma once
 
-#include <vespa/vespalib/data/slime/output.h>
+#include <vespa/vespalib/data/output.h>
 #include "rawbuf.h"
 
 namespace search {
 
-class SlimeOutputRawBufAdapter : public ::vespalib::slime::Output
+class SlimeOutputRawBufAdapter : public ::vespalib::Output
 {
 private:
     RawBuf &_buf;
 
 public:
     SlimeOutputRawBufAdapter(RawBuf &buf) : _buf(buf) {}
-    virtual char *exchange(char *, size_t commit, size_t reserve) {
+    vespalib::WritableMemory reserve(size_t reserve) override {
+        return vespalib::WritableMemory(_buf.GetWritableFillPos(reserve), reserve);
+    }
+    Output &commit(size_t commit) override {
         _buf.Fill(commit);
-        return _buf.GetWritableFillPos(reserve);
+        return *this;
     }
 };