Moved databuffer and compresssion to vespalib

7 files changed, 28 insertions, 22 deletions

diff --git a/searchcore/src/apps/vespa-dump-feed/vespa-dump-feed.cpp b/searchcore/src/apps/vespa-dump-feed/vespa-dump-feed.cpp
index d942049192a..26a745df148 100644
--- a/searchcore/src/apps/vespa-dump-feed/vespa-dump-feed.cpp
+++ b/searchcore/src/apps/vespa-dump-feed/vespa-dump-feed.cpp
@@ -9,6 +9,7 @@
 #include <vespa/messagebus/destinationsession.h>
 #include <vespa/messagebus/protocolset.h>
 #include <vespa/messagebus/rpcmessagebus.h>
+#include <vespa/messagebus/network/rpcnetworkparams.h>
 #include <vespa/vespalib/io/fileutil.h>
 #include <vespa/vespalib/util/signalhandler.h>
 #include <vespa/vespalib/util/slaveproc.h>
diff --git a/searchcore/src/tests/proton/summaryengine/summaryengine.cpp b/searchcore/src/tests/proton/summaryengine/summaryengine.cpp
index a17c19804c5..82c7b22c8c7 100644
--- a/searchcore/src/tests/proton/summaryengine/summaryengine.cpp
+++ b/searchcore/src/tests/proton/summaryengine/summaryengine.cpp
@@ -6,7 +6,7 @@
 #include <vespa/searchlib/util/rawbuf.h>
 #include <vespa/searchlib/util/slime_output_raw_buf_adapter.h>
 #include <vespa/vespalib/data/databuffer.h>
-#include <vespa/document/util/compressor.h>
+#include <vespa/vespalib/util/compressor.h>
 #include <vespa/searchlib/common/transport.h>
 #include <vespa/fnet/frt/rpcrequest.h>
 #include <vespa/log/log.h>
@@ -20,6 +20,8 @@ using vespalib::stringref;
 using vespalib::ConstBufferRef;
 using vespalib::DataBuffer;
 using vespalib::Memory;
+using vespalib::compression::CompressionConfig;
+
 
 namespace proton {
 
@@ -377,7 +379,7 @@ TEST("requireThatSlimeInterfaceWorksFine") {
 }
 
 void
-verifyReply(size_t count, document::CompressionConfig::Type encoding, size_t orgSize, size_t compressedSize,
+verifyReply(size_t count, CompressionConfig::Type encoding, size_t orgSize, size_t compressedSize,
             FRT_RPCRequest *request) {
     FRT_Values &ret = *request->GetReturn();
     EXPECT_EQUAL(encoding, ret[0]._intval8);
@@ -386,7 +388,8 @@ verifyReply(size_t count, document::CompressionConfig::Type encoding, size_t org
 
     DataBuffer uncompressed;
     ConstBufferRef blob(ret[2]._data._buf, ret[2]._data._len);
-    compression::decompress(CompressionConfig::toType(ret[0]._intval8), ret[1]._intval32, blob, uncompressed, false);
+    vespalib::compression::decompress(CompressionConfig::toType(ret[0]._intval8), ret[1]._intval32,
+                                      blob, uncompressed, false);
     EXPECT_EQUAL(orgSize, uncompressed.getDataLen());
 
     vespalib::Slime summaries;
@@ -396,8 +399,8 @@ verifyReply(size_t count, document::CompressionConfig::Type encoding, size_t org
 
 void
 verifyRPC(size_t count,
-          document::CompressionConfig::Type requestCompression, size_t requestSize, size_t requestBlobSize,
-          document::CompressionConfig::Type replyCompression, size_t replySize, size_t replyBlobSize) {
+          CompressionConfig::Type requestCompression, size_t requestSize, size_t requestBlobSize,
+          CompressionConfig::Type replyCompression, size_t replySize, size_t replyBlobSize) {
     Server server;
     vespalib::Slime slimeRequest = createSlimeRequestLarger(count);
     vespalib::SimpleBuffer buf;
@@ -406,8 +409,9 @@ verifyRPC(size_t count,
 
     CompressionConfig config(requestCompression, 9, 100);
     DataBuffer compressed(const_cast<char *>(buf.get().data), buf.get().size);
-    CompressionConfig::Type type = compression::compress(config, ConstBufferRef(buf.get().data, buf.get().size),
-                                                         compressed, true);
+    CompressionConfig::Type type = vespalib::compression::compress(config,
+                                                                   ConstBufferRef(buf.get().data, buf.get().size),
+                                                                   compressed, true);
     EXPECT_EQUAL(type, requestCompression);
 
     FRT_RPCRequest *request = new FRT_RPCRequest();
@@ -424,9 +428,9 @@ verifyRPC(size_t count,
 }
 
 TEST("requireThatRPCInterfaceWorks") {
-    verifyRPC(1, document::CompressionConfig::NONE, 55, 55, document::CompressionConfig::NONE, 38, 38);
-    verifyRPC(100, document::CompressionConfig::NONE, 2631, 2631, document::CompressionConfig::LZ4, 1426, 46);
-    verifyRPC(100, document::CompressionConfig::LZ4, 2631, 69, document::CompressionConfig::LZ4, 1426, 46);
+    verifyRPC(1, CompressionConfig::NONE, 55, 55, CompressionConfig::NONE, 38, 38);
+    verifyRPC(100, CompressionConfig::NONE, 2631, 2631, CompressionConfig::LZ4, 1426, 46);
+    verifyRPC(100, CompressionConfig::LZ4, 2631, 69, CompressionConfig::LZ4, 1426, 46);
 }
 
 }
diff --git a/searchcore/src/vespa/searchcore/fdispatch/program/fdispatch.cpp b/searchcore/src/vespa/searchcore/fdispatch/program/fdispatch.cpp
index fc0a57ff519..b6a1133d01d 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/program/fdispatch.cpp
+++ b/searchcore/src/vespa/searchcore/fdispatch/program/fdispatch.cpp
@@ -19,7 +19,7 @@ LOG_SETUP(".fdispatch");
 using search::fs4transport::FS4PersistentPacketStreamer;
 using vespa::config::search::core::FdispatchrcConfig;
 using vespa::config::search::core::internal::InternalFdispatchrcType;
-using document::CompressionConfig;
+using vespalib::compression::CompressionConfig;
 
 char FastS_VersionTag[] = V_TAG;
 
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp
index e65209bf526..79d82108ee8 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp
@@ -13,7 +13,6 @@
 #include <vespa/searchsummary/docsummary/docsumconfig.h>
 #include <vespa/vespalib/util/exceptions.h>
 #include <sstream>
-#include <future>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.docsummary.summarymanager");
@@ -26,6 +25,8 @@ using namespace vespa::config::search::summary;
 using namespace vespa::config::search;
 using vespalib::make_string;
 using vespalib::IllegalArgumentException;
+using vespalib::compression::CompressionConfig;
+
 using search::DocumentStore;
 using search::IDocumentStore;
 using search::LogDocumentStore;
@@ -160,13 +161,13 @@ SummaryManager::createSummarySetup(const SummaryConfig & summaryCfg,
 namespace {
 
 template<typename T>
-document::CompressionConfig
+CompressionConfig
 deriveCompression(const T & config) {
-    document::CompressionConfig compression;
+    CompressionConfig compression;
     if (config.type == T::LZ4) {
-        compression.type = document::CompressionConfig::LZ4;
+        compression.type = CompressionConfig::LZ4;
     } else if (config.type == T::ZSTD) {
-        compression.type = document::CompressionConfig::ZSTD;
+        compression.type = CompressionConfig::ZSTD;
     }
     compression.compressionLevel = config.level;
     return compression;
diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.cpp b/searchcore/src/vespa/searchcore/proton/server/proton.cpp
index ed350453da2..d95b0fd44d1 100644
--- a/searchcore/src/vespa/searchcore/proton/server/proton.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/proton.cpp
@@ -48,7 +48,7 @@ using search::index::SchemaBuilder;
 using search::transactionlog::DomainStats;
 using vespa::config::search::core::ProtonConfig;
 using vespa::config::search::core::internal::InternalProtonType;
-using document::CompressionConfig;
+using vespalib::compression::CompressionConfig;
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.cpp b/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.cpp
index 2e8c985fc0a..0595cb5d983 100644
--- a/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.cpp
@@ -9,7 +9,7 @@
 LOG_SETUP(".proton.server.rtchooks");
 
 using namespace vespalib;
-using document::CompressionConfig;
+using vespalib::compression::CompressionConfig;
 
 namespace {
 
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 9a37e0ae495..79928f96d7a 100644
--- a/searchcore/src/vespa/searchcore/proton/summaryengine/docsum_by_slime.cpp
+++ b/searchcore/src/vespa/searchcore/proton/summaryengine/docsum_by_slime.cpp
@@ -1,6 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include "docsum_by_slime.h"
-#include <vespa/document/util/compressor.h>
+#include <vespa/vespalib/util/compressor.h>
 #include <vespa/searchlib/util/slime_output_raw_buf_adapter.h>
 #include <vespa/searchlib/common/packets.h>
 #include <vespa/fnet/frt/rpcrequest.h>
@@ -23,7 +23,7 @@ using vespalib::slime::ArrayTraverser;
 using vespalib::SimpleBuffer;
 using vespalib::DataBuffer;
 using vespalib::ConstBufferRef;
-using document::CompressionConfig;
+using vespalib::compression::CompressionConfig;
 
 namespace {
 
@@ -99,8 +99,8 @@ DocsumByRPC::DocsumByRPC(DocsumBySlime & slimeDocsumServer) :
 void
 DocsumByRPC::getDocsums(FRT_RPCRequest & req)
 {
-    using document::compression::decompress;
-    using document::compression::compress;
+    using vespalib::compression::decompress;
+    using vespalib::compression::compress;
     FRT_Values &arg = *req.GetParams();
     uint8_t encoding = arg[0]._intval8;
     uint32_t uncompressedSize = arg[1]._intval32;