diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-03-05 19:14:25 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-05 19:14:25 +0100 |
commit | 71be2715b86b6181a5bf8a8a12c3ea2b78446479 (patch) | |
tree | e78d44b1548b599ce4120d9de5221ca3d155fb91 /searchcore/src/tests | |
parent | ba715525826666a104a6dd9914ae7582a784f4d7 (diff) |
Revert "If a document was removed or moved between th emove started and the d…"
Diffstat (limited to 'searchcore/src/tests')
3 files changed, 2 insertions, 58 deletions
diff --git a/searchcore/src/tests/proton/documentdb/documentbucketmover/bucketmover_common.h b/searchcore/src/tests/proton/documentdb/documentbucketmover/bucketmover_common.h index f70a4bfad11..e955f017d67 100644 --- a/searchcore/src/tests/proton/documentdb/documentbucketmover/bucketmover_common.h +++ b/searchcore/src/tests/proton/documentdb/documentbucketmover/bucketmover_common.h @@ -64,13 +64,8 @@ struct MyDocumentRetriever : public DocumentRetrieverBaseForTest { using DocumentVector = std::vector<Document::SP>; std::shared_ptr<const DocumentTypeRepo> _repo; DocumentVector _docs; - uint32_t _lid2Fail; - MyDocumentRetriever(std::shared_ptr<const DocumentTypeRepo> repo) - : _repo(std::move(repo)), - _docs(), - _lid2Fail(0) - { + MyDocumentRetriever(std::shared_ptr<const DocumentTypeRepo> repo) : _repo(std::move(repo)), _docs() { _docs.push_back(Document::UP()); // lid 0 invalid } @@ -81,11 +76,9 @@ struct MyDocumentRetriever : public DocumentRetrieverBaseForTest { DocumentMetaData getDocumentMetaData(const DocumentId &) const override { return DocumentMetaData(); } Document::UP getFullDocument(DocumentIdT lid) const override { - return (lid != _lid2Fail) ? Document::UP(_docs[lid]->clone()) : Document::UP(); + return Document::UP(_docs[lid]->clone()); } - void failRetrieveForLid(uint32_t lid) { _lid2Fail = lid; } - CachedSelect::SP parseSelect(const vespalib::string &) const override { return {}; } @@ -122,10 +115,6 @@ struct MySubDb { void insertDocs(const UserDocuments &docs_); - void failRetrieveForLid(uint32_t lid) { - _realRetriever->failRetrieveForLid(lid); - } - BucketId bucket(uint32_t userId) const { return _docs.getBucket(userId); } diff --git a/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_v2_test.cpp b/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_v2_test.cpp index d3f4b2fbedd..99692ec53bd 100644 --- a/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_v2_test.cpp +++ b/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_v2_test.cpp @@ -70,14 +70,6 @@ struct ControllerFixtureBase : public ::testing::Test _bucketHandler.notifyBucketStateChanged(bucket, BucketInfo::ActiveState::NOT_ACTIVE); return *this; } - void failRetrieveForLid(uint32_t lid) { - _ready.failRetrieveForLid(lid); - _notReady.failRetrieveForLid(lid); - } - void fixRetriever() { - _ready.failRetrieveForLid(0); - _notReady.failRetrieveForLid(0); - } const MoveOperationVector &docsMoved() const { return _moveHandler._moves; } @@ -208,28 +200,6 @@ TEST_F(ControllerFixture, require_that_ready_bucket_is_moved_to_not_ready_if_buc EXPECT_EQ(_ready.bucket(2), bucketsModified()[0]); } -TEST_F(ControllerFixture, require_that_bucket_is_moved_even_with_error) -{ - // bucket 2 should be moved - addReady(_ready.bucket(1)); - _bmj.recompute(); - failRetrieveForLid(5); - EXPECT_FALSE(_bmj.done()); - EXPECT_TRUE(_bmj.scanAndMove(4, 3)); - EXPECT_TRUE(_bmj.done()); - sync(); - EXPECT_FALSE(_bmj.done()); - fixRetriever(); - EXPECT_TRUE(_bmj.scanAndMove(4, 3)); - EXPECT_TRUE(_bmj.done()); - sync(); - EXPECT_EQ(2u, docsMoved().size()); - assertEqual(_ready.bucket(2), _ready.docs(2)[0], 1, 2, docsMoved()[0]); - assertEqual(_ready.bucket(2), _ready.docs(2)[1], 1, 2, docsMoved()[1]); - EXPECT_EQ(1u, bucketsModified().size()); - EXPECT_EQ(_ready.bucket(2), bucketsModified()[0]); -} - TEST_F(ControllerFixture, require_that_we_move_buckets_in_several_steps) { diff --git a/searchcore/src/tests/proton/documentdb/documentbucketmover/documentmover_test.cpp b/searchcore/src/tests/proton/documentdb/documentbucketmover/documentmover_test.cpp index 143d8f290c6..f49d806b6d4 100644 --- a/searchcore/src/tests/proton/documentdb/documentbucketmover/documentmover_test.cpp +++ b/searchcore/src/tests/proton/documentdb/documentbucketmover/documentmover_test.cpp @@ -35,7 +35,6 @@ struct DocumentMoverTest : ::testing::Test test::UserDocumentsBuilder _builder; std::shared_ptr<bucketdb::BucketDBOwner> _bucketDB; MyMoveOperationLimiter _limiter; - //TODO When we retire old bucket move job me must make rewrite this test to use the BucketMover directly. DocumentBucketMover _mover; MySubDbTwoBuckets _source; bucketdb::BucketDBOwner _bucketDb; @@ -72,10 +71,8 @@ TEST_F(DocumentMoverTest, require_that_initial_bucket_mover_is_done) MyMoveOperationLimiter limiter; DocumentBucketMover mover(limiter, _bucketDb); EXPECT_TRUE(mover.bucketDone()); - EXPECT_FALSE(mover.needReschedule()); mover.moveDocuments(2); EXPECT_TRUE(mover.bucketDone()); - EXPECT_FALSE(mover.needReschedule()); } TEST_F(DocumentMoverTest, require_that_we_can_move_all_documents) @@ -139,16 +136,4 @@ TEST_F(DocumentMoverTest, require_that_we_can_move_documents_in_several_steps) EXPECT_EQ(5u, _handler._moves.size()); } -TEST_F(DocumentMoverTest, require_that_cancel_signal_rescheduling_need) { - setupForBucket(_source.bucket(1), 6, 9); - EXPECT_FALSE(_mover.bucketDone()); - EXPECT_FALSE(_mover.needReschedule()); - EXPECT_TRUE(moveDocuments(2)); - EXPECT_FALSE(_mover.bucketDone()); - EXPECT_FALSE(_mover.needReschedule()); - _mover.cancel(); - EXPECT_TRUE(_mover.bucketDone()); - EXPECT_TRUE(_mover.needReschedule()); -} - GTEST_MAIN_RUN_ALL_TESTS() |