Remove subscribe to TLS.

5 files changed, 18 insertions, 83 deletions

diff --git a/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp b/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp
index 6d57795a734..17f1faffbba 100644
--- a/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp
+++ b/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp
@@ -315,7 +315,6 @@ public:
         }
         return RPC::OK;
     }
-    virtual void inSync() override { }
     virtual void eof() override { _eof = true; }
     bool isEof() const { return _eof; }
 };
diff --git a/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp b/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp
index 0ed3de93965..6b48c94fabd 100644
--- a/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp
@@ -776,14 +776,6 @@ FeedHandler::eof()
     _writeService.master().execute(makeTask(makeClosure(this, &FeedHandler::performEof)));
 }
 
-
-void
-FeedHandler::inSync()
-{
-    // Called by visit callback thread, when in sync
-}
-
-
 void
 FeedHandler::
 performPruneRemovedDocuments(PruneRemovedDocumentsOperation &pruneOp)
diff --git a/searchcore/src/vespa/searchcore/proton/server/feedhandler.h b/searchcore/src/vespa/searchcore/proton/server/feedhandler.h
index 32ff8f5d690..94e70ff0fd2 100644
--- a/searchcore/src/vespa/searchcore/proton/server/feedhandler.h
+++ b/searchcore/src/vespa/searchcore/proton/server/feedhandler.h
@@ -184,22 +184,19 @@ public:
                 search::transactionlog::Writer & writer,
                 TlsWriter * tlsWriter = nullptr);
 
-    virtual
-    ~FeedHandler();
+    virtual~FeedHandler();
 
     /**
      * Init this feed handler.
      *
      * @param oldestConfigSerial The serial number of the oldest config snapshot.
      */
-    void
-    init(SerialNum oldestConfigSerial);
+    void init(SerialNum oldestConfigSerial);
 
     /**
      * Close this feed handler and its components.
      */
-    void
-    close();
+    void close();
 
     /**
      * Start replay of the transaction log.
@@ -223,8 +220,7 @@ public:
      *
      * @param flushedSerial serial number flushed for all relevant flush targets.
      */
-    void
-    flushDone(SerialNum flushedSerial);
+    void flushDone(SerialNum flushedSerial);
 
     /**
      * Used to flip between normal and recovery feed states.
@@ -235,21 +231,14 @@ public:
      * Update the active feed view.
      * Always called by the master write thread so locking is not needed.
      */
-    void
-    setActiveFeedView(IFeedView *feedView)
-    {
+    void setActiveFeedView(IFeedView *feedView) {
         _activeFeedView = feedView;
     }
 
-    void
-    setBucketDBHandler(bucketdb::IBucketDBHandler *bucketDBHandler)
-    {
+    void setBucketDBHandler(bucketdb::IBucketDBHandler *bucketDBHandler) {
         _bucketDBHandler = bucketDBHandler;
     }
 
-    /**
-     * Wait until transaction log is replayed.
-     */
     void waitForReplayDone();
 
     void setSerialNum(SerialNum serialNum) { _serialNum = serialNum; }
@@ -270,46 +259,18 @@ public:
     void performOperation(FeedTokenUP token, FeedOperationUP op);
     void handleOperation(FeedToken token, FeedOperationUP op);
 
-    /**
-     * Implements IDocumentMoveHandler
-     */
-    virtual void handleMove(MoveOperation &op, std::shared_ptr<search::IDestructorCallback> moveDoneCtx) override;
-
-    /**
-     * Implements IHeartBeatHandler
-     */
-    virtual void
-    heartBeat() override;
-
-    virtual void
-    sync();
-
-    /**
-     * Implements TransLogClient::Session::Callback.
-     */
-    virtual RPC::Result
-    receive(const Packet &packet) override;
-
-    virtual void
-    eof() override;
-
-    virtual void
-    inSync() override;
+    void handleMove(MoveOperation &op, std::shared_ptr<search::IDestructorCallback> moveDoneCtx) override;
+    void heartBeat() override;
 
-    /**
-     * Implements IPruneRemovedDocumentsHandler
-     */
-    void
-    performPruneRemovedDocuments(PruneRemovedDocumentsOperation &pruneOp) override;
+    virtual void sync();
 
-    void
-    syncTls(SerialNum syncTo);
-
-    void
-    storeRemoteOperation(const FeedOperation &op);
+    RPC::Result receive(const Packet &packet) override;
 
-    // Implements IOperationStorer
-    virtual void storeOperation(FeedOperation &op) override;
+    void eof() override;
+    void performPruneRemovedDocuments(PruneRemovedDocumentsOperation &pruneOp) override;
+    void syncTls(SerialNum syncTo);
+    void storeRemoteOperation(const FeedOperation &op);
+    void storeOperation(FeedOperation &op) override;
 };
 
 } // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/server/transactionlogmanagerbase.cpp b/searchcore/src/vespa/searchcore/proton/server/transactionlogmanagerbase.cpp
index 62ea321efbb..95f31f141d7 100644
--- a/searchcore/src/vespa/searchcore/proton/server/transactionlogmanagerbase.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/transactionlogmanagerbase.cpp
@@ -23,10 +23,7 @@ TransactionLogManagerBase::TransactionLogManagerBase(
 {
 }
 
-TransactionLogManagerBase::~TransactionLogManagerBase()
-{
-}
-
+TransactionLogManagerBase::~TransactionLogManagerBase() = default;
 
 TransactionLogManagerBase::StatusResult
 TransactionLogManagerBase::init()
@@ -65,7 +62,6 @@ TransactionLogManagerBase::init()
     return res;
 }
 
-
 void
 TransactionLogManagerBase::internalStartReplay()
 {
@@ -77,7 +73,6 @@ TransactionLogManagerBase::internalStartReplay()
     _replayStartTime = timer.MilliSecs();
 }
 
-
 void
 TransactionLogManagerBase::markReplayStarted()
 {
@@ -85,7 +80,6 @@ TransactionLogManagerBase::markReplayStarted()
     _replayStarted = true;
 }
 
-
 void TransactionLogManagerBase::changeReplayDone()
 {
     vespalib::MonitorGuard guard(_replayMonitor);
@@ -93,7 +87,6 @@ void TransactionLogManagerBase::changeReplayDone()
     guard.broadcast();
 }
 
-
 void
 TransactionLogManagerBase::waitForReplayDone() const
 {
@@ -103,7 +96,6 @@ TransactionLogManagerBase::waitForReplayDone() const
     }
 }
 
-
 void
 TransactionLogManagerBase::close()
 {
@@ -117,11 +109,6 @@ TransactionLogManagerBase::close()
     }
 }
 
-TransLogClient::Subscriber::UP TransactionLogManagerBase::createTlcSubscriber(
-        TransLogClient::Session::Callback &callback) {
-    return _tlc.createSubscriber(_domainName, callback);
-}
-
 TransLogClient::Visitor::UP TransactionLogManagerBase::createTlcVisitor(
         TransLogClient::Session::Callback &callback) {
     return _tlc.createVisitor(_domainName, callback);
diff --git a/searchcore/src/vespa/searchcore/proton/server/transactionlogmanagerbase.h b/searchcore/src/vespa/searchcore/proton/server/transactionlogmanagerbase.h
index ae2a8356016..1b109d8d9e1 100644
--- a/searchcore/src/vespa/searchcore/proton/server/transactionlogmanagerbase.h
+++ b/searchcore/src/vespa/searchcore/proton/server/transactionlogmanagerbase.h
@@ -51,10 +51,7 @@ public:
 
     void changeReplayDone();
     void close();
-    TransLogClient::Subscriber::UP createTlcSubscriber(
-            TransLogClient::Session::Callback &callback);
-    TransLogClient::Visitor::UP createTlcVisitor(
-            TransLogClient::Session::Callback &callback);
+    TransLogClient::Visitor::UP createTlcVisitor(TransLogClient::Session::Callback &callback);
 
     void waitForReplayDone() const;
 
@@ -64,8 +61,7 @@ public:
     bool getReplayDone() const;
     bool isDoingReplay() const;
     void logReplayComplete() const;
-    const vespalib::string &getRpcTarget() const
-    { return _tlc.getRPCTarget(); }
+    const vespalib::string &getRpcTarget() const { return _tlc.getRPCTarget(); }
 
     void
     markReplayStarted();