Remove remains of spooler code from searchcore.

10 files changed, 0 insertions, 166 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 8ffe4807427..7af7951abba 100644
--- a/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp
+++ b/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp
@@ -192,8 +192,6 @@ public:
     virtual void replay(const SplitBucketOperation &op) override { print(op); }
     virtual void replay(const JoinBucketsOperation &op) override { print(op); }
     virtual void replay(const PruneRemovedDocumentsOperation &op) override { print(op); }
-    virtual void replay(const SpoolerReplayStartOperation &op) override { print(op); }
-    virtual void replay(const SpoolerReplayCompleteOperation &op) override { print(op); }
     virtual void replay(const MoveOperation &op) override { print(op); }
     virtual void replay(const CreateBucketOperation &op) override { print(op); }
     virtual void replay(const CompactLidSpaceOperation &op) override { print(op); }
@@ -275,8 +273,6 @@ public:
     virtual void replay(const SplitBucketOperation &) override { }
     virtual void replay(const JoinBucketsOperation &) override { }
     virtual void replay(const PruneRemovedDocumentsOperation &) override { }
-    virtual void replay(const SpoolerReplayStartOperation &) override { }
-    virtual void replay(const SpoolerReplayCompleteOperation &) override { }
     virtual void replay(const MoveOperation &) override { }
     virtual void replay(const CreateBucketOperation &) override { }
 };
diff --git a/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp b/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp
index e87e9209a17..6a9dc42b56d 100644
--- a/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp
+++ b/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp
@@ -12,7 +12,6 @@
 #include <vespa/searchcore/proton/feedoperation/putoperation.h>
 #include <vespa/searchcore/proton/feedoperation/removeoperation.h>
 #include <vespa/searchcore/proton/feedoperation/splitbucketoperation.h>
-#include <vespa/searchcore/proton/feedoperation/spoolerreplayoperation.h>
 #include <vespa/searchcore/proton/feedoperation/updateoperation.h>
 #include <vespa/searchcore/proton/feedoperation/wipehistoryoperation.h>
 #include <vespa/searchlib/query/base.h>
@@ -212,17 +211,6 @@ TEST("require that toString() on derived classes are meaningful")
                  "target2=BucketId(0x000000000000002c), serialNum=0)",
                  SplitBucketOperation(bucket_id1, bucket_id2, bucket_id3)
                  .toString());
-
-    EXPECT_EQUAL("SpoolerReplayStart(spoolerSerialNum=0, serialNum=0)",
-                 SpoolerReplayStartOperation().toString());
-    EXPECT_EQUAL("SpoolerReplayStart(spoolerSerialNum=20, serialNum=10)",
-                 SpoolerReplayStartOperation(10, 20).toString());
-
-    EXPECT_EQUAL("SpoolerReplayComplete(spoolerSerialNum=0, serialNum=0)",
-                 SpoolerReplayCompleteOperation().toString());
-    EXPECT_EQUAL("SpoolerReplayComplete(spoolerSerialNum=2, serialNum=1)",
-                 SpoolerReplayCompleteOperation(1, 2).toString());
-
     EXPECT_EQUAL("Update(NULL, BucketId(0x0000000000000000), timestamp=0, dbdId=(subDbId=0, lid=0), "
                  "prevDbdId=(subDbId=0, lid=0), prevMarkedAsRemoved=false, prevTimestamp=0, serialNum=0)",
                  UpdateOperation().toString());
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/CMakeLists.txt b/searchcore/src/vespa/searchcore/proton/feedoperation/CMakeLists.txt
index d64fbc6722f..f5e09b81313 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/CMakeLists.txt
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/CMakeLists.txt
@@ -16,7 +16,6 @@ vespa_add_library(searchcore_feedoperation STATIC
     removedocumentsoperation.cpp
     removeoperation.cpp
     splitbucketoperation.cpp
-    spoolerreplayoperation.cpp
     updateoperation.cpp
     wipehistoryoperation.cpp
     DEPENDS
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/feedoperation.h b/searchcore/src/vespa/searchcore/proton/feedoperation/feedoperation.h
index 77b95547bd0..3509af0de5c 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/feedoperation.h
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/feedoperation.h
@@ -33,8 +33,6 @@ public:
         SPLIT_BUCKET            = 10,
         JOIN_BUCKETS            = 11,
         PRUNE_REMOVED_DOCUMENTS = 12,
-        SPOOLER_REPLAY_START    = 13,
-        SPOOLER_REPLAY_COMPLETE = 14,
         MOVE                    = 15,
         CREATE_BUCKET           = 16,
         COMPACT_LID_SPACE       = 17,
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/operations.h b/searchcore/src/vespa/searchcore/proton/feedoperation/operations.h
index 2cdf92fc8b7..df9f22b2462 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/operations.h
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/operations.h
@@ -15,7 +15,6 @@
 #include "removedocumentsoperation.h"
 #include "removeoperation.h"
 #include "splitbucketoperation.h"
-#include "spoolerreplayoperation.h"
 #include "updateoperation.h"
 #include "wipehistoryoperation.h"
 
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/spoolerreplayoperation.cpp b/searchcore/src/vespa/searchcore/proton/feedoperation/spoolerreplayoperation.cpp
deleted file mode 100644
index 16ddedc4745..00000000000
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/spoolerreplayoperation.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#include "spoolerreplayoperation.h"
-#include <vespa/vespalib/objects/nbostream.h>
-#include <vespa/vespalib/util/stringfmt.h>
-
-using vespalib::make_string;
-
-namespace proton {
-
-
-SpoolerReplayOperation::SpoolerReplayOperation(Type type)
-    : FeedOperation(type),
-    _spoolerSerialNum()
-{
-}
-
-SpoolerReplayOperation::SpoolerReplayOperation(Type type, SerialNum serialNum, SerialNum spoolerSerialNum)
-    : FeedOperation(type),
-    _spoolerSerialNum(spoolerSerialNum)
-{
-    setSerialNum(serialNum);
-}
-
-
-void
-SpoolerReplayOperation::serialize(vespalib::nbostream &os) const
-{
-    os << _spoolerSerialNum;
-}
-
-
-void
-SpoolerReplayOperation::deserialize(vespalib::nbostream &is)
-{
-    is >> _spoolerSerialNum;
-}
-
-vespalib::string SpoolerReplayOperation::toString() const {
-    return make_string("SpoolerReplay%s(spoolerSerialNum=%" PRIu64", serialNum=%" PRIu64 ")",
-            getType() == SPOOLER_REPLAY_START ? "Start" : "Complete", _spoolerSerialNum, getSerialNum());
-}
-
-
-SpoolerReplayStartOperation::SpoolerReplayStartOperation()
-    : SpoolerReplayOperation(FeedOperation::SPOOLER_REPLAY_START)
-{
-}
-
-
-SpoolerReplayStartOperation::SpoolerReplayStartOperation(SerialNum serialNum, SerialNum spoolerSerialNum)
-    : SpoolerReplayOperation(FeedOperation::SPOOLER_REPLAY_START,
-                             serialNum,
-                             spoolerSerialNum)
-{
-}
-
-
-SpoolerReplayCompleteOperation::SpoolerReplayCompleteOperation()
-    : SpoolerReplayOperation(FeedOperation::SPOOLER_REPLAY_COMPLETE)
-{
-}
-
-
-SpoolerReplayCompleteOperation::SpoolerReplayCompleteOperation(SerialNum serialNum,
-                                                               SerialNum spoolerSerialNum)
-    : SpoolerReplayOperation(FeedOperation::SPOOLER_REPLAY_COMPLETE, serialNum, spoolerSerialNum)
-{
-}
-
-} // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/spoolerreplayoperation.h b/searchcore/src/vespa/searchcore/proton/feedoperation/spoolerreplayoperation.h
deleted file mode 100644
index 028ad1c6bfa..00000000000
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/spoolerreplayoperation.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#pragma once
-
-#include "feedoperation.h"
-
-namespace proton {
-
-class SpoolerReplayOperation : public FeedOperation
-{
-private:
-    SerialNum _spoolerSerialNum;
-protected:
-    SpoolerReplayOperation(Type type);
-    SpoolerReplayOperation(Type type, SerialNum serialNum, SerialNum spoolerSerialNum);
-public:
-    ~SpoolerReplayOperation() override {}
-    SerialNum getSpoolerSerialNum() const { return _spoolerSerialNum; }
-    void serialize(vespalib::nbostream &os) const override;
-    void deserialize(vespalib::nbostream &is, const document::DocumentTypeRepo &) override {
-        deserialize(is);
-    }
-    void deserialize(vespalib::nbostream &is);
-    virtual vespalib::string toString() const override;
-};
-
-
-/**
- * Indicate that we are starting replaying the spooler log.
- */
-class SpoolerReplayStartOperation : public SpoolerReplayOperation
-{
-public:
-    SpoolerReplayStartOperation();
-    /**
-     * @param serialNum the current serial number of the transaction log.
-     * @param spoolerSerialNum the serial number of the first entry of the spooler log replay.
-     */
-    SpoolerReplayStartOperation(SerialNum serialNum, SerialNum spoolerSerialNum);
-};
-
-
-/**
- * Indicate that we are complete replaying the spooler log.
- */
-class SpoolerReplayCompleteOperation : public SpoolerReplayOperation
-{
-public:
-    SpoolerReplayCompleteOperation();
-    /**
-     * @param serialNum the current serial number of the transaction log.
-     * @param spoolerSerialNum the serial number of the last entry of the spooler log replay.
-     */
-    SpoolerReplayCompleteOperation(SerialNum serialNum, SerialNum spoolerSerialNum);
-};
-
-} // namespace proton
-
diff --git a/searchcore/src/vespa/searchcore/proton/server/feedstates.cpp b/searchcore/src/vespa/searchcore/proton/server/feedstates.cpp
index ae323bc93df..e45e3d7e423 100644
--- a/searchcore/src/vespa/searchcore/proton/server/feedstates.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/feedstates.cpp
@@ -112,12 +112,6 @@ public:
     virtual void replay(const PruneRemovedDocumentsOperation &op) override {
         _feed_view_ptr->handlePruneRemovedDocuments(op);
     }
-    virtual void replay(const SpoolerReplayStartOperation &op) override {
-        (void) op;
-    }
-    virtual void replay(const SpoolerReplayCompleteOperation &op) override {
-        (void) op;
-    }
     virtual void replay(const MoveOperation &op) override {
         _feed_view_ptr->handleMove(op, search::IDestructorCallback::SP());
     }
diff --git a/searchcore/src/vespa/searchcore/proton/server/ireplaypackethandler.h b/searchcore/src/vespa/searchcore/proton/server/ireplaypackethandler.h
index e93821e2a36..9acc3a530d3 100644
--- a/searchcore/src/vespa/searchcore/proton/server/ireplaypackethandler.h
+++ b/searchcore/src/vespa/searchcore/proton/server/ireplaypackethandler.h
@@ -16,8 +16,6 @@ class DeleteBucketOperation;
 class SplitBucketOperation;
 class JoinBucketsOperation;
 class PruneRemovedDocumentsOperation;
-class SpoolerReplayStartOperation;
-class SpoolerReplayCompleteOperation;
 class MoveOperation;
 class CreateBucketOperation;
 class CompactLidSpaceOperation;
@@ -41,8 +39,6 @@ struct IReplayPacketHandler
     virtual void replay(const SplitBucketOperation &op) = 0;
     virtual void replay(const JoinBucketsOperation &op) = 0;
     virtual void replay(const PruneRemovedDocumentsOperation &op) = 0;
-    virtual void replay(const SpoolerReplayStartOperation &op) = 0;
-    virtual void replay(const SpoolerReplayCompleteOperation &op) = 0;
     virtual void replay(const MoveOperation &op) = 0;
     virtual void replay(const CreateBucketOperation &op) = 0;
     virtual void replay(const CompactLidSpaceOperation &op) = 0;
diff --git a/searchcore/src/vespa/searchcore/proton/server/replaypacketdispatcher.cpp b/searchcore/src/vespa/searchcore/proton/server/replaypacketdispatcher.cpp
index 42451f08315..447bd0d8624 100644
--- a/searchcore/src/vespa/searchcore/proton/server/replaypacketdispatcher.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/replaypacketdispatcher.cpp
@@ -74,14 +74,6 @@ ReplayPacketDispatcher::replayEntry(const Packet::Entry &entry)
         PruneRemovedDocumentsOperation op;
         replay(op, is, entry);
         break;
-    } case FeedOperation::SPOOLER_REPLAY_START: {
-        SpoolerReplayStartOperation op;
-        replay(op, is, entry);
-        break;
-    } case FeedOperation::SPOOLER_REPLAY_COMPLETE: {
-        SpoolerReplayCompleteOperation op;
-        replay(op, is, entry);
-        break;
     } case FeedOperation::MOVE: {
         MoveOperation op;
         replay(op, is, entry);