From c7fff4e03569a23a7306c03dd4cd7473291efe05 Mon Sep 17 00:00:00 2001 From: Tor Egge Date: Wed, 25 Oct 2017 09:59:55 +0000 Subject: Use document::Bucket as key for merge state tracking. --- storage/src/tests/persistence/mergehandlertest.cpp | 42 +++++++++++----------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'storage/src/tests/persistence/mergehandlertest.cpp') diff --git a/storage/src/tests/persistence/mergehandlertest.cpp b/storage/src/tests/persistence/mergehandlertest.cpp index 120dbd4ce45..47ed60b62ad 100644 --- a/storage/src/tests/persistence/mergehandlertest.cpp +++ b/storage/src/tests/persistence/mergehandlertest.cpp @@ -20,7 +20,7 @@ namespace storage { struct MergeHandlerTest : public SingleDiskPersistenceTestUtils { uint32_t _location; // Location used for all merge tests - document::BucketId _bucket; // Bucket used for all merge tests + document::Bucket _bucket; // Bucket used for all merge tests uint64_t _maxTimestamp; std::vector _nodes; std::unique_ptr _context; @@ -235,13 +235,13 @@ MergeHandlerTest::setUp() { SingleDiskPersistenceTestUtils::setUp(); _location = 1234; - _bucket = document::BucketId(16, _location); + _bucket = makeDocumentBucket(document::BucketId(16, _location)); _maxTimestamp = 11501; LOG(info, "Creating %s in bucket database", _bucket.toString().c_str()); bucketdb::StorageBucketInfo bucketDBEntry; bucketDBEntry.disk = 0; - getEnv().getBucketDatabase().insert(_bucket, bucketDBEntry, "mergetestsetup"); + getEnv().getBucketDatabase().insert(_bucket.getBucketId(), bucketDBEntry, "mergetestsetup"); LOG(info, "Creating bucket to merge"); createTestBucket(_bucket); @@ -267,7 +267,7 @@ MergeHandlerTest::testMergeBucketCommand() MergeHandler handler(getPersistenceProvider(), getEnv()); LOG(info, "Handle a merge bucket command"); - api::MergeBucketCommand cmd(makeDocumentBucket(_bucket), _nodes, _maxTimestamp); + api::MergeBucketCommand cmd(_bucket, _nodes, _maxTimestamp); cmd.setSourceIndex(1234); MessageTracker::UP tracker = handler.handleMergeBucket(cmd, *_context); @@ -294,7 +294,7 @@ MergeHandlerTest::testGetBucketDiffChain(bool midChain) MergeHandler handler(getPersistenceProvider(), getEnv()); LOG(info, "Verifying that get bucket diff is sent on"); - api::GetBucketDiffCommand cmd(makeDocumentBucket(_bucket), _nodes, _maxTimestamp); + api::GetBucketDiffCommand cmd(_bucket, _nodes, _maxTimestamp); MessageTracker::UP tracker1 = handler.handleGetBucketDiff(cmd, *_context); api::StorageMessage::SP replySent = tracker1->getReply(); @@ -338,7 +338,7 @@ MergeHandlerTest::testApplyBucketDiffChain(bool midChain) MergeHandler handler(getPersistenceProvider(), getEnv()); LOG(info, "Verifying that apply bucket diff is sent on"); - api::ApplyBucketDiffCommand cmd(makeDocumentBucket(_bucket), _nodes, _maxTimestamp); + api::ApplyBucketDiffCommand cmd(_bucket, _nodes, _maxTimestamp); MessageTracker::UP tracker1 = handler.handleApplyBucketDiff(cmd, *_context); api::StorageMessage::SP replySent = tracker1->getReply(); @@ -382,7 +382,7 @@ MergeHandlerTest::testMasterMessageFlow() MergeHandler handler(getPersistenceProvider(), getEnv()); LOG(info, "Handle a merge bucket command"); - api::MergeBucketCommand cmd(makeDocumentBucket(_bucket), _nodes, _maxTimestamp); + api::MergeBucketCommand cmd(_bucket, _nodes, _maxTimestamp); handler.handleMergeBucket(cmd, *_context); LOG(info, "Check state"); @@ -644,7 +644,7 @@ MergeHandlerTest::testChunkedApplyBucketDiff() MergeHandler handler(getPersistenceProvider(), getEnv(), maxChunkSize); LOG(info, "Handle a merge bucket command"); - api::MergeBucketCommand cmd(makeDocumentBucket(_bucket), _nodes, _maxTimestamp); + api::MergeBucketCommand cmd(_bucket, _nodes, _maxTimestamp); handler.handleMergeBucket(cmd, *_context); std::shared_ptr getBucketDiffCmd( @@ -732,7 +732,7 @@ MergeHandlerTest::testChunkLimitPartiallyFilledDiff() setUpChain(MIDDLE); std::shared_ptr applyBucketDiffCmd( - new api::ApplyBucketDiffCommand(makeDocumentBucket(_bucket), _nodes, maxChunkSize)); + new api::ApplyBucketDiffCommand(_bucket, _nodes, maxChunkSize)); applyBucketDiffCmd->getDiff() = applyDiff; MergeHandler handler( @@ -753,7 +753,7 @@ MergeHandlerTest::testMaxTimestamp() MergeHandler handler(getPersistenceProvider(), getEnv()); - api::MergeBucketCommand cmd(makeDocumentBucket(_bucket), _nodes, _maxTimestamp); + api::MergeBucketCommand cmd(_bucket, _nodes, _maxTimestamp); handler.handleMergeBucket(cmd, *_context); std::shared_ptr getCmd( @@ -820,7 +820,7 @@ MergeHandlerTest::createDummyApplyDiff(int timestampOffset, } std::shared_ptr applyBucketDiffCmd( - new api::ApplyBucketDiffCommand(makeDocumentBucket(_bucket), _nodes, 1024*1024)); + new api::ApplyBucketDiffCommand(_bucket, _nodes, 1024*1024)); applyBucketDiffCmd->getDiff() = applyDiff; return applyBucketDiffCmd; } @@ -856,7 +856,7 @@ MergeHandlerTest::createDummyGetBucketDiff(int timestampOffset, } std::shared_ptr getBucketDiffCmd( - new api::GetBucketDiffCommand(makeDocumentBucket(_bucket), _nodes, 1024*1024)); + new api::GetBucketDiffCommand(_bucket, _nodes, 1024*1024)); getBucketDiffCmd->getDiff() = diff; return getBucketDiffCmd; } @@ -907,7 +907,7 @@ void MergeHandlerTest::testMergeProgressSafeGuard() { MergeHandler handler(getPersistenceProvider(), getEnv()); - api::MergeBucketCommand cmd(makeDocumentBucket(_bucket), _nodes, _maxTimestamp); + api::MergeBucketCommand cmd(_bucket, _nodes, _maxTimestamp); handler.handleMergeBucket(cmd, *_context); std::shared_ptr getBucketDiffCmd( @@ -943,7 +943,7 @@ MergeHandlerTest::testSafeGuardNotInvokedWhenHasMaskChanges() _nodes.push_back(api::MergeBucketCommand::Node(0, false)); _nodes.push_back(api::MergeBucketCommand::Node(1, false)); _nodes.push_back(api::MergeBucketCommand::Node(2, false)); - api::MergeBucketCommand cmd(makeDocumentBucket(_bucket), _nodes, _maxTimestamp); + api::MergeBucketCommand cmd(_bucket, _nodes, _maxTimestamp); handler.handleMergeBucket(cmd, *_context); std::shared_ptr getBucketDiffCmd( @@ -991,7 +991,7 @@ MergeHandlerTest::testEntryRemovedAfterGetBucketDiff() } setUpChain(BACK); std::shared_ptr applyBucketDiffCmd( - new api::ApplyBucketDiffCommand(makeDocumentBucket(_bucket), _nodes, 1024*1024)); + new api::ApplyBucketDiffCommand(_bucket, _nodes, 1024*1024)); applyBucketDiffCmd->getDiff() = applyDiff; MessageTracker::UP tracker = handler.handleApplyBucketDiff(*applyBucketDiffCmd, *_context); @@ -1086,7 +1086,7 @@ MergeHandlerTest::HandleMergeBucketInvoker::invoke( MergeHandler& handler, spi::Context& context) { - api::MergeBucketCommand cmd(makeDocumentBucket(test._bucket), test._nodes, test._maxTimestamp); + api::MergeBucketCommand cmd(test._bucket, test._nodes, test._maxTimestamp); handler.handleMergeBucket(cmd, context); } @@ -1126,7 +1126,7 @@ MergeHandlerTest::HandleGetBucketDiffInvoker::invoke( MergeHandler& handler, spi::Context& context) { - api::GetBucketDiffCommand cmd(makeDocumentBucket(test._bucket), test._nodes, test._maxTimestamp); + api::GetBucketDiffCommand cmd(test._bucket, test._nodes, test._maxTimestamp); handler.handleGetBucketDiff(cmd, context); } @@ -1215,7 +1215,7 @@ MergeHandlerTest::HandleGetBucketDiffReplyInvoker::beforeInvoke( MergeHandler& handler, spi::Context& context) { - api::MergeBucketCommand cmd(makeDocumentBucket(test._bucket), test._nodes, test._maxTimestamp); + api::MergeBucketCommand cmd(test._bucket, test._nodes, test._maxTimestamp); handler.handleMergeBucket(cmd, context); _diffCmd = test.fetchSingleMessage(); } @@ -1287,7 +1287,7 @@ MergeHandlerTest::HandleApplyBucketDiffReplyInvoker::beforeInvoke( ++_counter; _stub.clear(); if (getChainPos() == FRONT) { - api::MergeBucketCommand cmd(makeDocumentBucket(test._bucket), test._nodes, test._maxTimestamp); + api::MergeBucketCommand cmd(test._bucket, test._nodes, test._maxTimestamp); handler.handleMergeBucket(cmd, context); std::shared_ptr diffCmd( test.fetchSingleMessage()); @@ -1470,7 +1470,7 @@ MergeHandlerTest::testRemovePutOnExistingTimestamp() } std::shared_ptr applyBucketDiffCmd( - new api::ApplyBucketDiffCommand(makeDocumentBucket(_bucket), _nodes, 1024*1024)); + new api::ApplyBucketDiffCommand(_bucket, _nodes, 1024*1024)); applyBucketDiffCmd->getDiff() = applyDiff; MessageTracker::UP tracker = handler.handleApplyBucketDiff(*applyBucketDiffCmd, *_context); @@ -1480,7 +1480,7 @@ MergeHandlerTest::testRemovePutOnExistingTimestamp() tracker->getReply())); CPPUNIT_ASSERT(applyBucketDiffReply.get()); - api::MergeBucketCommand cmd(makeDocumentBucket(_bucket), _nodes, _maxTimestamp); + api::MergeBucketCommand cmd(_bucket, _nodes, _maxTimestamp); handler.handleMergeBucket(cmd, *_context); std::shared_ptr getBucketDiffCmd( -- cgit v1.2.3