Moved databuffer and compresssion to vespalib

8 files changed, 15 insertions, 11 deletions

diff --git a/searchlib/src/tests/common/packets/packets_test.cpp b/searchlib/src/tests/common/packets/packets_test.cpp
index 7504e1c1570..cf0e858a014 100644
--- a/searchlib/src/tests/common/packets/packets_test.cpp
+++ b/searchlib/src/tests/common/packets/packets_test.cpp
@@ -8,6 +8,8 @@
 #include <vespa/fnet/controlpacket.h>
 
 using namespace search::fs4transport;
+using vespalib::compression::CompressionConfig;
+
 
 // ----------------------------------------------------------------------------
 //
@@ -524,7 +526,7 @@ TEST("test pre serializing packets with compression") {
     EXPECT_EQUAL(src->GetLength(), decoded->GetLength());
     FS4PersistentPacketStreamer::Instance.SetCompressionLimit(100);
     FS4Packet_PreSerialized serialized(*src);
-    EXPECT_EQUAL(218u | (document::CompressionConfig::LZ4 << 24), serialized.GetPCODE());
+    EXPECT_EQUAL(218u | (CompressionConfig::LZ4 << 24), serialized.GetPCODE());
     EXPECT_GREATER_EQUAL(321u, serialized.GetLength());
     FNET_Packet::UP decoded2(testEncodeDecode(serialized));
     EXPECT_EQUAL(500u, decoded2->GetLength());
diff --git a/searchlib/src/tests/docstore/chunk/chunk_test.cpp b/searchlib/src/tests/docstore/chunk/chunk_test.cpp
index 4687f45acde..84ac877c54d 100644
--- a/searchlib/src/tests/docstore/chunk/chunk_test.cpp
+++ b/searchlib/src/tests/docstore/chunk/chunk_test.cpp
@@ -12,7 +12,7 @@
 LOG_SETUP("chunk_test");
 
 using namespace search;
-using document::CompressionConfig;
+using vespalib::compression::CompressionConfig;
 
 TEST("require that Chunk obey limits")
 {
diff --git a/searchlib/src/tests/docstore/document_store/document_store_test.cpp b/searchlib/src/tests/docstore/document_store/document_store_test.cpp
index e3e4a1432d1..e8c2173a87f 100644
--- a/searchlib/src/tests/docstore/document_store/document_store_test.cpp
+++ b/searchlib/src/tests/docstore/document_store/document_store_test.cpp
@@ -5,6 +5,7 @@
 #include <vespa/document/repo/documenttyperepo.h>
 
 using namespace search;
+using CompressionConfig = vespalib::compression::CompressionConfig;
 
 document::DocumentTypeRepo repo;
 
@@ -43,7 +44,7 @@ struct NullDataStore : IDataStore {
 };
 
 TEST_FFF("require that uncache docstore lookups are counted",
-         DocumentStore::Config(document::CompressionConfig::NONE, 0, 0),
+         DocumentStore::Config(CompressionConfig::NONE, 0, 0),
          NullDataStore(), DocumentStore(f1, f2))
 {
     EXPECT_EQUAL(0u, f3.getCacheStats().misses);
@@ -52,7 +53,7 @@ TEST_FFF("require that uncache docstore lookups are counted",
 }
 
 TEST_FFF("require that cached docstore lookups are counted",
-         DocumentStore::Config(document::CompressionConfig::NONE, 100000, 100),
+         DocumentStore::Config(CompressionConfig::NONE, 100000, 100),
          NullDataStore(), DocumentStore(f1, f2))
 {
     EXPECT_EQUAL(0u, f3.getCacheStats().misses);
diff --git a/searchlib/src/tests/docstore/document_store/visitcache_test.cpp b/searchlib/src/tests/docstore/document_store/visitcache_test.cpp
index 70e0c7f01fb..d5d95097c66 100644
--- a/searchlib/src/tests/docstore/document_store/visitcache_test.cpp
+++ b/searchlib/src/tests/docstore/document_store/visitcache_test.cpp
@@ -56,11 +56,12 @@ void verifyAB(const BlobSet & a) {
 
 using B=vespalib::ConstBufferRef;
 TEST("require that BlobSet can be built") {
+    using CompressionConfig = vespalib::compression::CompressionConfig;
     BlobSet a;
     a.append(7, B("aaaaaa",6));
     a.append(9, B("bbbbb",5));
     verifyAB(a);
-    document::CompressionConfig cfg(document::CompressionConfig::LZ4);
+    CompressionConfig cfg(CompressionConfig::LZ4);
     CompressedBlobSet ca(cfg, a);
     BlobSet b = ca.getBlobSet();
     verifyAB(b);
diff --git a/searchlib/src/tests/docstore/document_store_visitor/document_store_visitor_test.cpp b/searchlib/src/tests/docstore/document_store_visitor/document_store_visitor_test.cpp
index 944d0a543f5..1c7053500c7 100644
--- a/searchlib/src/tests/docstore/document_store_visitor/document_store_visitor_test.cpp
+++ b/searchlib/src/tests/docstore/document_store_visitor/document_store_visitor_test.cpp
@@ -24,7 +24,7 @@ using document::Document;
 using document::DocumentId;
 using document::DocumentType;
 using document::DocumentTypeRepo;
-using document::CompressionConfig;
+using vespalib::compression::CompressionConfig;
 using vespalib::asciistream;
 using index::DummyFileHeaderContext;
 
diff --git a/searchlib/src/tests/docstore/file_chunk/file_chunk_test.cpp b/searchlib/src/tests/docstore/file_chunk/file_chunk_test.cpp
index 6d75c6365f9..598913a3222 100644
--- a/searchlib/src/tests/docstore/file_chunk/file_chunk_test.cpp
+++ b/searchlib/src/tests/docstore/file_chunk/file_chunk_test.cpp
@@ -113,6 +113,7 @@ struct ReadFixture : public FixtureBase {
 
 struct WriteFixture : public FixtureBase {
     WriteableFileChunk chunk;
+    using CompressionConfig = vespalib::compression::CompressionConfig;
 
     WriteFixture(const vespalib::string &baseName,
                  uint32_t docIdLimit,
@@ -124,7 +125,7 @@ struct WriteFixture : public FixtureBase {
                 baseName,
                 serialNum,
                 docIdLimit,
-                WriteableFileChunk::Config(document::CompressionConfig(), 0x1000),
+                WriteableFileChunk::Config(CompressionConfig(), 0x1000),
                 tuneFile,
                 fileHeaderCtx,
                 &bucketizer,
diff --git a/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp b/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp
index 82a158fd53e..ed6afb06681 100644
--- a/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp
+++ b/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp
@@ -15,7 +15,6 @@
 #include <vespa/vespalib/util/exceptions.h>
 #include <vespa/vespalib/util/threadstackexecutor.h>
 #include <iomanip>
-#include <iostream>
 
 using document::BucketId;
 using namespace search::docstore;
@@ -36,7 +35,7 @@ public:
 using namespace search;
 using namespace search::docstore;
 using search::index::DummyFileHeaderContext;
-using document::CompressionConfig;
+using vespalib::compression::CompressionConfig;
 
 namespace {
 
diff --git a/searchlib/src/tests/docstore/store_by_bucket/store_by_bucket_test.cpp b/searchlib/src/tests/docstore/store_by_bucket/store_by_bucket_test.cpp
index 3faf9395ec5..e9514c1d385 100644
--- a/searchlib/src/tests/docstore/store_by_bucket/store_by_bucket_test.cpp
+++ b/searchlib/src/tests/docstore/store_by_bucket/store_by_bucket_test.cpp
@@ -4,17 +4,17 @@
 
 #include <vespa/document/bucket/bucketid.h>
 #include <vespa/document/base/documentid.h>
-#include <vespa/log/log.h>
 #include <vespa/searchlib/docstore/storebybucket.h>
 #include <vespa/vespalib/stllike/asciistream.h>
 #include <vespa/vespalib/stllike/hash_set.h>
 #include <vespa/vespalib/util/threadstackexecutor.h>
 
+#include <vespa/log/log.h>
 LOG_SETUP("store_by_bucket_test");
 
 using namespace search::docstore;
 using document::BucketId;
-using document::CompressionConfig;
+using vespalib::compression::CompressionConfig;
 
 vespalib::string
 createPayload(BucketId b) {