Refactor Packet and read of TLS.

1 files changed, 21 insertions, 31 deletions

diff --git a/searchlib/src/tests/transactionlog/translogclient_test.cpp b/searchlib/src/tests/transactionlog/translogclient_test.cpp
index 861023b79b7..b61245c8137 100644
--- a/searchlib/src/tests/transactionlog/translogclient_test.cpp
+++ b/searchlib/src/tests/transactionlog/translogclient_test.cpp
@@ -5,7 +5,6 @@
 #include <vespa/vespalib/objects/identifiable.h>
 #include <vespa/searchlib/index/dummyfileheadercontext.h>
 #include <vespa/fastos/file.h>
-#include <map>
 
 #include <vespa/log/log.h>
 LOG_SETUP("translogclient_test");
@@ -221,6 +220,7 @@ public:
 
 IMPLEMENT_IDENTIFIABLE(TestIdentifiable, Identifiable);
 
+constexpr size_t DEFAULT_PACKET_SIZE = 0xf000;
 bool Test::partialUpdateTest()
 {
     bool retval(false);
@@ -239,9 +239,8 @@ bool Test::partialUpdateTest()
     vespalib::ConstBufferRef bb(os.c_str(), os.size());
     LOG(info, "DU : %s", myhex(bb.c_str(), bb.size()).c_str());
     Packet::Entry e(7, du.getClass().id(), bb);
-    Packet pa;
+    Packet pa(DEFAULT_PACKET_SIZE);
     pa.add(e);
-    pa.close();
     ASSERT_TRUE(session.commit(vespalib::ConstBufferRef(pa.getHandle().c_str(), pa.getHandle().size())));
 
     CallBackUpdate ca;
@@ -312,14 +311,12 @@ bool Test::fillDomainTest(TransLogClient::Session * s1, const vespalib::string &
     Packet::Entry e2(2, 2, vespalib::ConstBufferRef("Content in buffer B", 20));
     Packet::Entry e3(3, 1, vespalib::ConstBufferRef("Content in buffer C", 20));
 
-    Packet a;
-    ASSERT_TRUE (a.add(e1));
-    Packet b;
-    ASSERT_TRUE (b.add(e2));
-    ASSERT_TRUE (b.add(e3));
-    ASSERT_TRUE (!b.add(e1));
-    a.close();
-    b.close();
+    Packet a(DEFAULT_PACKET_SIZE);
+    a.add(e1);
+    Packet b(DEFAULT_PACKET_SIZE);
+    b.add(e2);
+    b.add(e3);
+    b.add(e1);
     ASSERT_TRUE (s1->commit(vespalib::ConstBufferRef(a.getHandle().c_str(), a.getHandle().size())));
     ASSERT_TRUE (s1->commit(vespalib::ConstBufferRef(b.getHandle().c_str(), b.getHandle().size())));
     try {
@@ -334,7 +331,7 @@ bool Test::fillDomainTest(TransLogClient::Session * s1, const vespalib::string &
     EXPECT_EQUAL(b.size(), 2u);
     EXPECT_EQUAL(b.range().from(), 2u);
     EXPECT_EQUAL(b.range().to(), 3u);
-    EXPECT_TRUE(a.merge(b));
+    a.merge(b);
     EXPECT_EQUAL(a.size(), 3u);
     EXPECT_EQUAL(a.range().from(), 1u);
     EXPECT_EQUAL(a.range().to(), 3u);
@@ -353,41 +350,35 @@ void Test::fillDomainTest(TransLogClient::Session * s1, size_t numPackets, size_
 {
     size_t value(0);
     for(size_t i=0; i < numPackets; i++) {
-        std::unique_ptr<Packet> p(new Packet());
+        std::unique_ptr<Packet> p(new Packet(DEFAULT_PACKET_SIZE));
         for(size_t j=0; j < numEntries; j++, value++) {
             Packet::Entry e(value+1, j+1, vespalib::ConstBufferRef((const char *)&value, sizeof(value)));
-            if ( ! p->add(e) ) {
-                p->close();
+            p->add(e);
+            if ( p->sizeBytes() > DEFAULT_PACKET_SIZE ) {
                 ASSERT_TRUE(s1->commit(vespalib::ConstBufferRef(p->getHandle().c_str(), p->getHandle().size())));
-                p.reset(new Packet());
-                ASSERT_TRUE(p->add(e));
+                p.reset(new Packet(DEFAULT_PACKET_SIZE));
             }
         }
-        p->close();
         ASSERT_TRUE(s1->commit(vespalib::ConstBufferRef(p->getHandle().c_str(), p->getHandle().size())));
     }
 }
 
 
 void
-Test::fillDomainTest(TransLogClient::Session * s1,
-                     size_t numPackets, size_t numEntries,
-                     size_t entrySize)
+Test::fillDomainTest(TransLogClient::Session * s1, size_t numPackets, size_t numEntries, size_t entrySize)
 {
     size_t value(0);
     std::vector<char> entryBuffer(entrySize); 
     for(size_t i=0; i < numPackets; i++) {
-        std::unique_ptr<Packet> p(new Packet());
+        std::unique_ptr<Packet> p(new Packet(DEFAULT_PACKET_SIZE));
         for(size_t j=0; j < numEntries; j++, value++) {
             Packet::Entry e(value+1, j+1, vespalib::ConstBufferRef((const char *)&entryBuffer[0], entryBuffer.size()));
-            if ( ! p->add(e) ) {
-                p->close();
+            p->add(e);
+            if ( p->sizeBytes() > DEFAULT_PACKET_SIZE ) {
                 ASSERT_TRUE(s1->commit(vespalib::ConstBufferRef(p->getHandle().c_str(), p->getHandle().size())));
-                p.reset(new Packet());
-                ASSERT_TRUE(p->add(e));
+                p.reset(new Packet(DEFAULT_PACKET_SIZE));
             }
         }
-        p->close();
         ASSERT_TRUE(s1->commit(vespalib::ConstBufferRef(p->getHandle().c_str(), p->getHandle().size())));
     }
 }
@@ -410,8 +401,7 @@ Test::countFiles(const vespalib::string &dir)
 
 
 void
-Test::checkFilledDomainTest(const TransLogClient::Session::UP &s1,
-                            size_t numEntries)
+Test::checkFilledDomainTest(const TransLogClient::Session::UP &s1, size_t numEntries)
 {
     SerialNum b(0), e(0);
     size_t c(0);
@@ -526,8 +516,8 @@ void Test::verifyDomain(const vespalib::string & name)
 
 void Test::testCrcVersions()
 {
-    createAndFillDomain("ccitt_crc32", DomainPart::ccitt_crc32, 0);
-    createAndFillDomain("xxh64", DomainPart::xxh64, 1);
+    createAndFillDomain("ccitt_crc32", Encoding::Crc::ccitt_crc32, 0);
+    createAndFillDomain("xxh64", Encoding::Crc::xxh64, 1);
 
     verifyDomain("ccitt_crc32");
     verifyDomain("xxh64");