Style chnages

5 files changed, 41 insertions, 27 deletions

diff --git a/searchlib/src/tests/transactionlogstress/translogstress.cpp b/searchlib/src/tests/transactionlogstress/translogstress.cpp
index 81a3006dbff..013ca81dcc9 100644
--- a/searchlib/src/tests/transactionlogstress/translogstress.cpp
+++ b/searchlib/src/tests/transactionlogstress/translogstress.cpp
@@ -8,7 +8,6 @@
 #include <vespa/searchlib/index/dummyfileheadercontext.h>
 #include <vespa/fastos/app.h>
 #include <iostream>
-#include <stdexcept>
 #include <sstream>
 #include <thread>
 
@@ -223,7 +222,6 @@ FeederThread::~FeederThread() = default;
 void
 FeederThread::commitPacket()
 {
-    _packet.close();
     const vespalib::nbostream& stream = _packet.getHandle();
     if (!_session->commit(ConstBufferRef(stream.data(), stream.size()))) {
         throw std::runtime_error(vespalib::make_string
@@ -238,8 +236,9 @@ FeederThread::commitPacket()
 bool
 FeederThread::addEntry(const Packet::Entry & e)
 {
-    //LOG(info, "FeederThread: add %s", EntryPrinter::toStr(e).c_str());
-    return _packet.add(e);
+    if (_packet.sizeBytes() > 0xf000) return false;
+    _packet.add(e);
+    return true;
 }
 
 void
diff --git a/searchlib/src/vespa/searchlib/transactionlog/common.cpp b/searchlib/src/vespa/searchlib/transactionlog/common.cpp
index a5eaa61af12..ee7d265427c 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/common.cpp
+++ b/searchlib/src/vespa/searchlib/transactionlog/common.cpp
@@ -22,7 +22,8 @@ int makeDirectory(const char * dir)
     return retval;
 }
 
-int64_t SerialNumRange::cmp(const SerialNumRange & b) const
+int64_t
+SerialNumRange::cmp(const SerialNumRange & b) const
 {
     int64_t diff(0);
     if ( ! (contains(b) || b.contains(*this)) ) {
@@ -71,7 +72,8 @@ nbostream & Packet::Entry::deserialize(nbostream & os)
     return os;
 }
 
-nbostream & Packet::Entry::serialize(nbostream & os) const
+nbostream &
+Packet::Entry::serialize(nbostream & os) const
 {
     os << _unique << _type << static_cast<uint32_t>(_data.size());
     os.write(_data.c_str(), _data.size());
diff --git a/searchlib/src/vespa/searchlib/transactionlog/domain.cpp b/searchlib/src/vespa/searchlib/transactionlog/domain.cpp
index 5a64d829183..5e7cfc74199 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/domain.cpp
+++ b/searchlib/src/vespa/searchlib/transactionlog/domain.cpp
@@ -131,7 +131,7 @@ Domain::begin(const LockGuard & guard) const
     assert(guard.locks(_lock));
     SerialNum s(0);
     if ( ! _parts.empty() ) {
-        s = _parts.begin()->second->range().from();
+        s = _parts.cbegin()->second->range().from();
     }
     return s;
 }
@@ -149,7 +149,7 @@ Domain::end(const LockGuard & guard) const
     assert(guard.locks(_lock));
     SerialNum s(0);
     if ( ! _parts.empty() ) {
-        s = _parts.rbegin()->second->range().to();
+        s = _parts.crbegin()->second->range().to();
     }
     return s;
 }
@@ -203,7 +203,8 @@ Domain::triggerSyncNow()
     }
 }
 
-DomainPart::SP Domain::findPart(SerialNum s)
+DomainPart::SP
+Domain::findPart(SerialNum s)
 {
     LockGuard guard(_lock);
     DomainPartList::iterator it(_parts.upper_bound(s));
@@ -220,12 +221,14 @@ DomainPart::SP Domain::findPart(SerialNum s)
     return DomainPart::SP();
 }
 
-uint64_t Domain::size() const
+uint64_t
+Domain::size() const
 {
     return size(LockGuard(_lock));
 }
 
-uint64_t Domain::size(const LockGuard & guard) const
+uint64_t
+Domain::size(const LockGuard & guard) const
 {
     (void) guard;
     assert(guard.locks(_lock));
@@ -236,7 +239,8 @@ uint64_t Domain::size(const LockGuard & guard) const
     return sz;
 }
 
-SerialNum Domain::findOldestActiveVisit() const
+SerialNum
+Domain::findOldestActiveVisit() const
 {
     SerialNum oldestActive(std::numeric_limits<SerialNum>::max());
     LockGuard guard(_sessionLock);
@@ -249,7 +253,8 @@ SerialNum Domain::findOldestActiveVisit() const
     return oldestActive;
 }
 
-void Domain::cleanSessions()
+void
+Domain::cleanSessions()
 {
     if ( _sessions.empty()) {
         return;
@@ -269,7 +274,8 @@ void Domain::cleanSessions()
 
 namespace {
 
-void waitPendingSync(vespalib::Monitor &syncMonitor, bool &pendingSync)
+void
+waitPendingSync(vespalib::Monitor &syncMonitor, bool &pendingSync)
 {
     MonitorGuard guard(syncMonitor);
     while (pendingSync) {
@@ -302,7 +308,8 @@ void Domain::commit(const Packet & packet)
     cleanSessions();
 }
 
-bool Domain::erase(SerialNum to)
+bool
+Domain::erase(SerialNum to)
 {
     bool retval(true);
     /// Do not erase the last element
@@ -321,8 +328,9 @@ bool Domain::erase(SerialNum to)
     return retval;
 }
 
-int Domain::visit(const Domain::SP & domain, SerialNum from, SerialNum to,
-                  std::unique_ptr<Session::Destination> dest)
+int
+Domain::visit(const Domain::SP & domain, SerialNum from, SerialNum to,
+              std::unique_ptr<Session::Destination> dest)
 {
     assert(this == domain.get());
     cleanSessions();
@@ -334,7 +342,8 @@ int Domain::visit(const Domain::SP & domain, SerialNum from, SerialNum to,
     return id;
 }
 
-int Domain::startSession(int sessionId)
+int
+Domain::startSession(int sessionId)
 {
     int retval(-1);
     LockGuard guard(_sessionLock);
@@ -350,7 +359,8 @@ int Domain::startSession(int sessionId)
     return retval;
 }
 
-int Domain::closeSession(int sessionId)
+int
+Domain::closeSession(int sessionId)
 {
     _commitExecutor.sync();
     int retval(-1);
diff --git a/searchlib/src/vespa/searchlib/transactionlog/session.cpp b/searchlib/src/vespa/searchlib/transactionlog/session.cpp
index e703c32484f..dda840808ce 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/session.cpp
+++ b/searchlib/src/vespa/searchlib/transactionlog/session.cpp
@@ -31,7 +31,7 @@ Session::VisitTask::run()
 
 bool
 Session::visit(FastOS_FileInterface & file, DomainPart & dp) {
-    Packet packet;
+    Packet packet(size_t(-1));
     bool more(false);
     if (dp.isClosed()) {
         more = dp.visit(file, _range, packet);
diff --git a/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp b/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp
index a3528c4f615..caef792704a 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp
+++ b/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp
@@ -18,6 +18,9 @@ using vespalib::make_string;
 using vespalib::stringref;
 using vespalib::IllegalArgumentException;
 using search::common::FileHeaderContext;
+using std::make_shared;
+using std::runtime_error;
+using namespace std::chrono_literals;
 
 namespace search::transactionlog {
 
@@ -31,10 +34,10 @@ class SyncHandler : public FNET_Task
     SerialNum                   _syncTo;
     
 public:
-    SyncHandler(FRT_Supervisor *supervisor, FRT_RPCRequest *req,const Domain::SP &domain,
+    SyncHandler(FRT_Supervisor *supervisor, FRT_RPCRequest *req, const Domain::SP &domain,
                 const TransLogServer::Session::SP &session, SerialNum syncTo);
 
-    ~SyncHandler();
+    ~SyncHandler() override;
     void PerformTask() override;
 };
 
@@ -157,17 +160,17 @@ bool
 TransLogServer::onStop()
 {
     LOG(info, "Stopping TLS");
-    _reqQ.push(NULL);
+    _reqQ.push(nullptr);
     return true;
 }
 
 void
 TransLogServer::run()
 {
-    FRT_RPCRequest *req(NULL);
+    FRT_RPCRequest *req(nullptr);
     bool hasPacket(false);
     do {
-        for (req = NULL; (hasPacket = _reqQ.pop(req, 60000)) && (req != NULL); req = NULL) {
+        for (req = nullptr; (hasPacket = _reqQ.pop(req, 60000)) && (req != nullptr); req = nullptr) {
             bool immediate = true;
             if (strcmp(req->GetMethodName(), "domainSessionClose") == 0) {
                 domainSessionClose(req);
@@ -675,7 +678,7 @@ TransLogServer::finiSession(FRT_RPCRequest *req)
 {
     FNET_Connection *conn = req->GetConnection();
     void *vctx = conn->GetContext()._value.VOIDP;
-    conn->GetContextPT()->_value.VOIDP = NULL;
+    conn->GetContextPT()->_value.VOIDP = nullptr;
     Session::SP *sessionspp = static_cast<Session::SP *>(vctx);
     delete sessionspp;
 }
@@ -696,7 +699,7 @@ TransLogServer::domainSync(FRT_RPCRequest *req)
     Domain::SP domain(findDomain(domainName));
     Session::SP session(getSession(req));
 
-    if (domain.get() == nullptr) {
+    if ( ! domain) {
         FRT_Values &rvals = *req->GetReturn();
         rvals.AddInt32(0);
         rvals.AddInt64(0);