Revert "Only wait for th elids that you are interested in."

2 files changed, 0 insertions, 112 deletions

diff --git a/searchcore/src/tests/proton/common/CMakeLists.txt b/searchcore/src/tests/proton/common/CMakeLists.txt
index 30ec8c035ad..da0bc9b5b10 100644
--- a/searchcore/src/tests/proton/common/CMakeLists.txt
+++ b/searchcore/src/tests/proton/common/CMakeLists.txt
@@ -15,10 +15,3 @@ vespa_add_executable(searchcore_cachedselect_test_app TEST
     searchlib_test
 )
 vespa_add_test(NAME searchcore_cachedselect_test_app COMMAND searchcore_cachedselect_test_app)
-vespa_add_executable(pendinglidtracker_test_app TEST
-    SOURCES
-    pendinglidtracker_test.cpp
-    DEPENDS
-    searchcore_pcommon
-)
-vespa_add_test(NAME pendinglidtracker_test_app COMMAND pendinglidtracker_test_app)
diff --git a/searchcore/src/tests/proton/common/pendinglidtracker_test.cpp b/searchcore/src/tests/proton/common/pendinglidtracker_test.cpp
deleted file mode 100644
index 575033ad19a..00000000000
--- a/searchcore/src/tests/proton/common/pendinglidtracker_test.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#include <vespa/vespalib/testkit/testapp.h>
-#include <vespa/searchcore/proton/common/pendinglidtracker.h>
-
-#include <vespa/log/log.h>
-LOG_SETUP("pendinglidtracker_test");
-
-using namespace proton;
-
-constexpr uint32_t LID_1 = 1u;
-const std::vector<uint32_t> LIDV_2_1_3({2u, LID_1, 3u});
-const std::vector<uint32_t> LIDV_2_3({2u, 3u});
-
-std::ostream &
-operator << (std::ostream & os, ILidCommitState::State state) {
-    switch (state) {
-    case ILidCommitState::State::NEED_COMMIT:
-        os << "NEED_COMMIT";
-        break;
-    case ILidCommitState::State::WAITING:
-        os << "WAITING";
-        break;
-    case ILidCommitState::State::COMPLETED:
-        os << "COMPLETED";
-        break;
-    }
-    return os;
-}
-
-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));
-}
-
-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));
-}
-
-TEST("test two phase pendinglidtracker for needcommit") {
-    TwoPhasePendingLidTracker tracker;
-    ILidCommitState::State incomplete = ILidCommitState::State::NEED_COMMIT;
-    verifyPhase1ProduceAndNeedCommit(tracker, incomplete);
-    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));
-    {
-        ILidCommitState::State waiting = ILidCommitState::State::WAITING;
-        auto snapshot = tracker.produceSnapshot();
-        EXPECT_EQUAL(waiting, tracker.getState());
-        EXPECT_EQUAL(waiting, tracker.getState(LID_1));
-        EXPECT_EQUAL(waiting, tracker.getState(LIDV_2_1_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));
-}
-
-TEST_MAIN() { TEST_RUN_ALL(); }