diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-05-18 00:01:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-18 00:01:42 +0200 |
commit | a8c7dc00192bd0736844e2711f16532fd8c71daa (patch) | |
tree | 873c7ffabc9d08c7df996737d7f895edc950b8a2 /searchcore/src/tests | |
parent | db693286334d5966fb7e4a7d4549a6f9349fe6fa (diff) |
Revert "Revert "Revert "Revert "Revert "Revert "Now that everything is controlled bucketwise by the bucket db we shou…""""""
Diffstat (limited to 'searchcore/src/tests')
3 files changed, 0 insertions, 80 deletions
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 7ee811e66bf..93ad4cc8324 100644 --- a/searchcore/src/tests/proton/document_iterator/document_iterator_test.cpp +++ b/searchcore/src/tests/proton/document_iterator/document_iterator_test.cpp @@ -488,62 +488,6 @@ TEST("require that iterator ignoring maxbytes stops at the end, and does not aut TEST_DO(verifyIterateIgnoringStopSignal(itr)); } -void verifyReadConsistency(DocumentIterator & itr, ILidCommitState & lidCommitState) { - IDocumentRetriever::SP retriever = doc("id:ns:document::1", Timestamp(2), bucket(5)); - auto commitAndWaitRetriever = std::make_shared<CommitAndWaitDocumentRetriever>(retriever, lidCommitState); - itr.add(commitAndWaitRetriever); - - IterateResult res = itr.iterate(largeNum); - EXPECT_TRUE(res.isCompleted()); - EXPECT_EQUAL(1u, res.getEntries().size()); - TEST_DO(checkEntry(res, 0, Document(*DataType::DOCUMENT, DocumentId("id:ns:document::1")), Timestamp(2))); -} - -class ILidCommitStateProxy : public ILidCommitState { -public: - explicit ILidCommitStateProxy(ILidCommitState & lidState) - : _waitCompleteCount(0), - _lidState(lidState) - {} -private: - State waitState(State state, uint32_t lid) const override { - assert(state == State::COMPLETED); - _lidState.waitComplete(lid); - _waitCompleteCount++; - return state; - } - - State waitState(State state, const LidList &lids) const override { - assert(state == State::COMPLETED); - _lidState.waitComplete(lids); - _waitCompleteCount++; - return state; - } - -public: - mutable size_t _waitCompleteCount; -private: - ILidCommitState & _lidState; -}; - -void verifyStrongReadConsistency(DocumentIterator & itr) { - PendingLidTracker lidTracker; - - ILidCommitStateProxy lidCommitState(lidTracker); - TEST_DO(verifyReadConsistency(itr, lidCommitState)); - EXPECT_EQUAL(1u, lidCommitState._waitCompleteCount); -} - -TEST("require that default readconsistency does commit") { - DocumentIterator itr(bucket(5), std::make_shared<document::AllFields>(), selectAll(), newestV(), -1, false); - TEST_DO(verifyStrongReadConsistency(itr)); -} - -TEST("require that readconsistency::strong does commit") { - DocumentIterator itr(bucket(5), std::make_shared<document::AllFields>(), selectAll(), newestV(), -1, false, storage::spi::ReadConsistency::STRONG); - TEST_DO(verifyStrongReadConsistency(itr)); -} - TEST("require that docid limit is honoured") { IDocumentRetriever::SP retriever = doc("id:ns:document::1", Timestamp(2), bucket(5)); auto & udr = dynamic_cast<UnitDR &>(*retriever); diff --git a/searchcore/src/tests/proton/documentdb/documentbucketmover/documentmover_test.cpp b/searchcore/src/tests/proton/documentdb/documentbucketmover/documentmover_test.cpp index 143d8f290c6..475d5064104 100644 --- a/searchcore/src/tests/proton/documentdb/documentbucketmover/documentmover_test.cpp +++ b/searchcore/src/tests/proton/documentdb/documentbucketmover/documentmover_test.cpp @@ -90,23 +90,6 @@ TEST_F(DocumentMoverTest, require_that_we_can_move_all_documents) } } -TEST_F(DocumentMoverTest, require_that_move_is_stalled_if_document_is_pending_commit) -{ - setupForBucket(_source.bucket(1), 6, 9); - { - IPendingLidTracker::Token token = _pendingLidsForCommit.produce(1); - EXPECT_FALSE(moveDocuments(5)); - EXPECT_FALSE(_mover.bucketDone()); - } - EXPECT_TRUE(moveDocuments(5)); - EXPECT_TRUE(_mover.bucketDone()); - EXPECT_EQ(5u, _handler._moves.size()); - EXPECT_EQ(5u, _limiter.beginOpCount); - for (size_t i = 0; i < 5u; ++i) { - assertEqual(_source.bucket(1), _source.docs(1)[0], 6, 9, _handler._moves[0]); - } -} - TEST_F(DocumentMoverTest, require_that_bucket_is_cached_when_IDocumentMoveHandler_handles_move_operation) { setupForBucket(_source.bucket(1), 6, 9); diff --git a/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_handler_test.cpp b/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_handler_test.cpp index 2ca1101ac3a..369d4f85c73 100644 --- a/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_handler_test.cpp +++ b/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_handler_test.cpp @@ -38,13 +38,6 @@ TEST_F(HandlerTest, createMoveOperation_works_as_expected) const BucketId bucketId(100); const Timestamp timestamp(200); DocumentMetaData document(moveFromLid, timestamp, bucketId, GlobalId()); - { - EXPECT_FALSE(_subDb.maintenance_sub_db.lidNeedsCommit(moveFromLid)); - IPendingLidTracker::Token token = _subDb._pendingLidsForCommit.produce(moveFromLid); - EXPECT_TRUE(_subDb.maintenance_sub_db.lidNeedsCommit(moveFromLid)); - MoveOperation::UP op = _handler.createMoveOperation(document, moveToLid); - ASSERT_FALSE(op); - } EXPECT_FALSE(_subDb.maintenance_sub_db.lidNeedsCommit(moveFromLid)); MoveOperation::UP op = _handler.createMoveOperation(document, moveToLid); ASSERT_TRUE(op); |