diff options
| author | Tor Egge <Tor.Egge@broadpark.no> | 2017-10-17 01:19:04 +0200 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@oath.com> | 2017-10-17 12:02:29 +0000 |
| commit | a110f409b9d56fc7542b110cd50956e3fefdb806 (patch) | |
| tree | 567d9ad6afdb65c5ffe40dccb55cc1cedab06226 /storageserver | |
| parent | dde45a05b010b6de1c62643cd9ecd37c091fdba9 (diff) | |
Take document::Bucket instead of document::BucketId as constructor
argument to storage commands that inherit from BucketCommand.
Diffstat (limited to 'storageserver')
| -rw-r--r-- | storageserver/src/tests/storageservertest.cpp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/storageserver/src/tests/storageservertest.cpp b/storageserver/src/tests/storageservertest.cpp index 21b190d9e76..66f2c546a42 100644 --- a/storageserver/src/tests/storageservertest.cpp +++ b/storageserver/src/tests/storageservertest.cpp @@ -650,6 +650,11 @@ namespace { monitor.signal(); return true; } + + static document::Bucket makeDocumentBucket(document::BucketId bucketId) { + return document::Bucket(document::BucketSpace::placeHolder(), bucketId); + } + void run() override { uint32_t seed = 0; uint32_t maxDocSize = 65536; @@ -686,7 +691,7 @@ namespace { entries[bucket].write(); entries[bucket] = _bucketDB.get(bucket, "foo"); CPPUNIT_ASSERT(entries[bucket].exist()); - cmd.reset(new api::CreateBucketCommand(bucket)); + cmd.reset(new api::CreateBucketCommand(makeDocumentBucket(bucket))); sendList.push_back(new mbusprot::StorageCommand(cmd)); } CPPUNIT_ASSERT_EQUAL(size_t(1), entries.size()); @@ -695,7 +700,7 @@ namespace { auto *entry = entry_wrapper->get(); if (seed % 95 == 93) { // Delete bucket if ((entry->getBucketInfo().getChecksum() & 2) == 0) { - cmd.reset(new api::DeleteBucketCommand(bucket)); + cmd.reset(new api::DeleteBucketCommand(makeDocumentBucket(bucket))); entry->setChecksum( entry->getBucketInfo().getChecksum() | 2); entry_wrapper->write(); @@ -714,7 +719,7 @@ namespace { bucket.getRawId()); super = super.stripUnused(); api::JoinBucketsCommand::SP jcmd( - new api::JoinBucketsCommand(super)); + new api::JoinBucketsCommand(makeDocumentBucket(super))); entries = _bucketDB.getAll(super, "foo"); bool foundAnyLocked = false; for (std::map<document::BucketId, @@ -747,7 +752,7 @@ namespace { // Use _checksum == 1 to mean that we have a pending // maintenance operation to this bucket. if (entry->getBucketInfo().getChecksum() == 0) { - cmd.reset(new api::SplitBucketCommand(bucket)); + cmd.reset(new api::SplitBucketCommand(makeDocumentBucket(bucket))); entry->setChecksum(1); entry_wrapper->write(); sendList.push_back( @@ -755,7 +760,7 @@ namespace { } } else if (seed % 7 == 5) { // Remove if ((entry->getBucketInfo().getChecksum() & 2) == 0) { - cmd.reset(new api::RemoveCommand(bucket, + cmd.reset(new api::RemoveCommand(makeDocumentBucket(bucket), doc->getId(), 1000ull * seed + 2)); sendList.push_back( new mbusprot::StorageCommand(cmd)); @@ -763,14 +768,14 @@ namespace { } else if (seed % 5 == 3) { // Get if ((entry->getBucketInfo().getChecksum() & 2) == 0) { cmd.reset(new api::GetCommand( - bucket, doc->getId(), "[all]")); + makeDocumentBucket(bucket), doc->getId(), "[all]")); sendList.push_back( new mbusprot::StorageCommand(cmd)); } } else { // Put if ((entry->getBucketInfo().getChecksum() & 2) == 0) { cmd.reset(new api::PutCommand( - bucket, doc, 1000ull * seed + 1)); + makeDocumentBucket(bucket), doc, 1000ull * seed + 1)); sendList.push_back( new mbusprot::StorageCommand(cmd)); } |