diff options
| author | Haavard <havardpe@yahoo-inc.com> | 2017-03-20 13:04:33 +0000 |
|---|---|---|
| committer | Haavard <havardpe@yahoo-inc.com> | 2017-03-27 09:53:26 +0000 |
| commit | 23abed1a0bc4f4c5ea47b43fc7ea0645e63a26e6 (patch) | |
| tree | 6d943bbe31738f7e9b84979e4fd63dfd76eef580 /storageserver | |
| parent | 8844ccb7297e8a5120dd903c85e923f2f93aa693 (diff) | |
remove most usage of LinkedPtr from vespa
Diffstat (limited to 'storageserver')
| -rw-r--r-- | storageserver/src/tests/storageservertest.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/storageserver/src/tests/storageservertest.cpp b/storageserver/src/tests/storageservertest.cpp index feff39fb8d4..5b4bae96a2f 100644 --- a/storageserver/src/tests/storageservertest.cpp +++ b/storageserver/src/tests/storageservertest.cpp @@ -693,14 +693,14 @@ namespace { } CPPUNIT_ASSERT_EQUAL(size_t(1), entries.size()); bucket = entries.begin()->first; - StorBucketDatabase::WrappedEntry entry( - entries.begin()->second); + auto *entry = &(*(entries.begin()->second)); + auto *entry_wrapper = &(entries.begin()->second); if (seed % 95 == 93) { // Delete bucket if ((entry->getBucketInfo().getChecksum() & 2) == 0) { cmd.reset(new api::DeleteBucketCommand(bucket)); entry->setChecksum( entry->getBucketInfo().getChecksum() | 2); - entry.write(); + entry_wrapper->write(); sendList.push_back( new mbusprot::StorageCommand(cmd)); } @@ -708,7 +708,8 @@ namespace { if (entry->getBucketInfo().getChecksum() == 0 && bucket.getUsedBits() > 3) { // Remove existing locks we have to not cause // deadlock - entry = StorBucketDatabase::WrappedEntry(); + entry = nullptr; + entry_wrapper = nullptr; entries.clear(); // Then continue document::BucketId super(bucket.getUsedBits() - 1, @@ -750,7 +751,7 @@ namespace { if (entry->getBucketInfo().getChecksum() == 0) { cmd.reset(new api::SplitBucketCommand(bucket)); entry->setChecksum(1); - entry.write(); + entry_wrapper->write(); sendList.push_back( new mbusprot::StorageCommand(cmd)); } |