GC unused interface that has been misused once....

6 files changed, 0 insertions, 30 deletions

diff --git a/searchcore/src/tests/proton/common/pendinglidtracker_test.cpp b/searchcore/src/tests/proton/common/pendinglidtracker_test.cpp
index b276ed9e46d..bcf494346d8 100644
--- a/searchcore/src/tests/proton/common/pendinglidtracker_test.cpp
+++ b/searchcore/src/tests/proton/common/pendinglidtracker_test.cpp
@@ -34,23 +34,19 @@ operator << (std::ostream & os, ILidCommitState::State state) {
 
 void
 verifyPhase1ProduceAndNeedCommit(PendingLidTrackerBase & tracker, ILidCommitState::State expected) {
-    EXPECT_EQUAL(ILidCommitState::State::COMPLETED, tracker.getState());
     EXPECT_EQUAL(ILidCommitState::State::COMPLETED, tracker.getState(LID_1));
     EXPECT_EQUAL(ILidCommitState::State::COMPLETED, tracker.getState(LIDV_2_1_3));
 
     auto token = tracker.produce(LID_1);
-    EXPECT_EQUAL(expected, tracker.getState());
     EXPECT_EQUAL(expected, tracker.getState(LID_1));
     EXPECT_EQUAL(expected, tracker.getState(LIDV_2_1_3));
     EXPECT_EQUAL(ILidCommitState::State::COMPLETED, tracker.getState(LIDV_2_3));
     {
         auto token2 = tracker.produce(LID_1);
-        EXPECT_EQUAL(expected, tracker.getState());
         EXPECT_EQUAL(expected, tracker.getState(LID_1));
         EXPECT_EQUAL(expected, tracker.getState(LIDV_2_1_3));
         EXPECT_EQUAL(ILidCommitState::State::COMPLETED, tracker.getState(LIDV_2_3));
     }
-    EXPECT_EQUAL(expected, tracker.getState());
     EXPECT_EQUAL(expected, tracker.getState(LID_1));
     EXPECT_EQUAL(expected, tracker.getState(LIDV_2_1_3));
     EXPECT_EQUAL(ILidCommitState::State::COMPLETED, tracker.getState(LIDV_2_3));
@@ -59,29 +55,24 @@ verifyPhase1ProduceAndNeedCommit(PendingLidTrackerBase & tracker, ILidCommitStat
 TEST("test pendinglidtracker for needcommit") {
     PendingLidTracker tracker;
     verifyPhase1ProduceAndNeedCommit(tracker, ILidCommitState::State::WAITING);
-    EXPECT_EQUAL(ILidCommitState::State::COMPLETED, tracker.getState());
     EXPECT_EQUAL(ILidCommitState::State::COMPLETED, tracker.getState(LID_1));
     EXPECT_EQUAL(ILidCommitState::State::COMPLETED, tracker.getState(LIDV_2_1_3));
     {
         ILidCommitState::State incomplete = ILidCommitState::State::WAITING;
         auto token = tracker.produce(LID_1);
-        EXPECT_EQUAL(incomplete, tracker.getState());
         EXPECT_EQUAL(incomplete, tracker.getState(LID_1));
         EXPECT_EQUAL(incomplete, tracker.getState(LIDV_2_1_3));
         EXPECT_EQUAL(ILidCommitState::State::COMPLETED, tracker.getState(LIDV_2_3));
         {
             auto snapshot = tracker.produceSnapshot();
-            EXPECT_EQUAL(incomplete, tracker.getState());
             EXPECT_EQUAL(incomplete, tracker.getState(LID_1));
             EXPECT_EQUAL(incomplete, tracker.getState(LIDV_2_1_3));
             EXPECT_EQUAL(ILidCommitState::State::COMPLETED, tracker.getState(LIDV_2_3));
         }
-        EXPECT_EQUAL(incomplete, tracker.getState());
         EXPECT_EQUAL(incomplete, tracker.getState(LID_1));
         EXPECT_EQUAL(incomplete, tracker.getState(LIDV_2_1_3));
         EXPECT_EQUAL(ILidCommitState::State::COMPLETED, tracker.getState(LIDV_2_3));
     }
-    EXPECT_EQUAL(ILidCommitState::State::COMPLETED, tracker.getState());
     EXPECT_EQUAL(ILidCommitState::State::COMPLETED, tracker.getState(LID_1));
     EXPECT_EQUAL(ILidCommitState::State::COMPLETED, tracker.getState(LIDV_2_1_3));
 }
diff --git a/searchcore/src/tests/proton/document_iterator/document_iterator_test.cpp b/searchcore/src/tests/proton/document_iterator/document_iterator_test.cpp
index ee22e2668c6..7ee811e66bf 100644
--- a/searchcore/src/tests/proton/document_iterator/document_iterator_test.cpp
+++ b/searchcore/src/tests/proton/document_iterator/document_iterator_test.cpp
@@ -520,13 +520,6 @@ private:
         return state;
     }
 
-    State waitState(State state) const override {
-        assert(state == State::COMPLETED);
-        _lidState.waitComplete();
-        _waitCompleteCount++;
-        return state;
-    }
-
 public:
     mutable size_t _waitCompleteCount;
 private:
diff --git a/searchcore/src/vespa/searchcore/proton/common/ipendinglidtracker.cpp b/searchcore/src/vespa/searchcore/proton/common/ipendinglidtracker.cpp
index 2e182fa397f..d6cc9bf27d2 100644
--- a/searchcore/src/vespa/searchcore/proton/common/ipendinglidtracker.cpp
+++ b/searchcore/src/vespa/searchcore/proton/common/ipendinglidtracker.cpp
@@ -27,9 +27,5 @@ void
 ILidCommitState::waitComplete(const LidList & lids) const {
     waitState(State::COMPLETED, lids);
 }
-void
-ILidCommitState::waitComplete() const {
-    waitState(State::COMPLETED);
-}
 
 }
diff --git a/searchcore/src/vespa/searchcore/proton/common/ipendinglidtracker.h b/searchcore/src/vespa/searchcore/proton/common/ipendinglidtracker.h
index 9ca94441704..7ea7b8412e8 100644
--- a/searchcore/src/vespa/searchcore/proton/common/ipendinglidtracker.h
+++ b/searchcore/src/vespa/searchcore/proton/common/ipendinglidtracker.h
@@ -49,16 +49,13 @@ public:
     enum class State {NEED_COMMIT, WAITING, COMPLETED};
     using LidList = std::vector<uint32_t>;
     virtual ~ILidCommitState() = default;
-    State getState() const { return waitState(State::NEED_COMMIT); }
     State getState(uint32_t lid) const { return waitState(State::NEED_COMMIT, lid); }
     State getState(const LidList & lids) const { return waitState(State::NEED_COMMIT, lids); }
     void waitComplete(uint32_t lid) const;
     void waitComplete(const LidList & lids) const;
-    void waitComplete() const;
 private:
     virtual State waitState(State state, uint32_t lid) const = 0;
     virtual State waitState(State state, const LidList & lids) const = 0;
-    virtual State waitState(State state) const = 0;
 };
 
 }
diff --git a/searchcore/src/vespa/searchcore/proton/common/pendinglidtracker.cpp b/searchcore/src/vespa/searchcore/proton/common/pendinglidtracker.cpp
index 24ddacafaa8..096961cca18 100644
--- a/searchcore/src/vespa/searchcore/proton/common/pendinglidtracker.cpp
+++ b/searchcore/src/vespa/searchcore/proton/common/pendinglidtracker.cpp
@@ -9,12 +9,6 @@ PendingLidTrackerBase::PendingLidTrackerBase() = default;
 PendingLidTrackerBase::~PendingLidTrackerBase() = default;
 
 ILidCommitState::State
-PendingLidTrackerBase::waitState(State state) const {
-    auto pending = pendingLids();
-    return waitState(state, pending);
-}
-
-ILidCommitState::State
 PendingLidTrackerBase::waitState(State state, uint32_t lid) const {
     MonitorGuard guard(_mutex);
     return waitFor(guard, state, lid);
diff --git a/searchcore/src/vespa/searchcore/proton/common/pendinglidtracker.h b/searchcore/src/vespa/searchcore/proton/common/pendinglidtracker.h
index 079634f56bb..9f4800af5f3 100644
--- a/searchcore/src/vespa/searchcore/proton/common/pendinglidtracker.h
+++ b/searchcore/src/vespa/searchcore/proton/common/pendinglidtracker.h
@@ -28,7 +28,6 @@ public:
     using Snapshot = std::unique_ptr<Payload>;
     virtual Snapshot produceSnapshot() = 0;
 
-    State waitState(State state) const override;
     State waitState(State state, uint32_t lid) const override;
     State waitState(State state, const LidList & lids) const override;
 protected: