diff options
Diffstat (limited to 'storage/src/tests/persistence/persistencetestutils.cpp')
| -rw-r--r-- | storage/src/tests/persistence/persistencetestutils.cpp | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/storage/src/tests/persistence/persistencetestutils.cpp b/storage/src/tests/persistence/persistencetestutils.cpp index b0efed07fab..b069ac078ef 100644 --- a/storage/src/tests/persistence/persistencetestutils.cpp +++ b/storage/src/tests/persistence/persistencetestutils.cpp @@ -170,17 +170,13 @@ PersistenceTestUtils::getBucketStatus(const document::BucketId& id) } document::Document::SP -PersistenceTestUtils::doPutOnDisk( - uint32_t location, - spi::Timestamp timestamp, - uint32_t minSize, - uint32_t maxSize) +PersistenceTestUtils::doPutOnDisk(uint32_t location, spi::Timestamp timestamp, uint32_t minSize, uint32_t maxSize) { document::Document::SP doc(createRandomDocumentAtLocation(location, timestamp, minSize, maxSize)); spi::Bucket b(makeSpiBucket(document::BucketId(16, location))); spi::Context context(spi::Priority(0), spi::Trace::TraceLevel(0)); - getPersistenceProvider().createBucket(b, context); - getPersistenceProvider().put(spi::Bucket(b), timestamp, doc, context); + getPersistenceProvider().createBucket(b); + getPersistenceProvider().put(spi::Bucket(b), timestamp, doc); return doc; } @@ -191,12 +187,11 @@ PersistenceTestUtils::doRemoveOnDisk( spi::Timestamp timestamp, bool persistRemove) { - spi::Context context(spi::Priority(0), spi::Trace::TraceLevel(0)); if (persistRemove) { - spi::RemoveResult result = getPersistenceProvider().removeIfFound(makeSpiBucket(bucketId),timestamp, docId, context); + spi::RemoveResult result = getPersistenceProvider().removeIfFound(makeSpiBucket(bucketId),timestamp, docId); return result.wasFound(); } - spi::RemoveResult result = getPersistenceProvider().remove(makeSpiBucket(bucketId), timestamp, docId, context); + spi::RemoveResult result = getPersistenceProvider().remove(makeSpiBucket(bucketId), timestamp, docId); return result.wasFound(); } @@ -207,8 +202,7 @@ PersistenceTestUtils::doUnrevertableRemoveOnDisk( const document::DocumentId& docId, spi::Timestamp timestamp) { - spi::Context context(spi::Priority(0),spi::Trace::TraceLevel(0)); - spi::RemoveResult result = getPersistenceProvider().remove(makeSpiBucket(bucketId), timestamp, docId, context); + spi::RemoveResult result = getPersistenceProvider().remove(makeSpiBucket(bucketId), timestamp, docId); return result.wasFound(); } @@ -250,9 +244,8 @@ void PersistenceTestUtils::doPut(const document::Document::SP& doc, document::BucketId bid, spi::Timestamp time) { spi::Bucket b(makeSpiBucket(bid)); - spi::Context context(spi::Priority(0), spi::Trace::TraceLevel(0)); - getPersistenceProvider().createBucket(b, context); - getPersistenceProvider().put(b, time, std::move(doc), context); + getPersistenceProvider().createBucket(b); + getPersistenceProvider().put(b, time, std::move(doc)); } spi::UpdateResult @@ -261,7 +254,7 @@ PersistenceTestUtils::doUpdate(document::BucketId bid, spi::Timestamp time) { spi::Context context(spi::Priority(0), spi::Trace::TraceLevel(0)); - return getPersistenceProvider().update(makeSpiBucket(bid), time, update, context); + return getPersistenceProvider().update(makeSpiBucket(bid), time, update); } void @@ -273,11 +266,9 @@ PersistenceTestUtils::doRemove(const document::DocumentId& id, spi::Timestamp ti bucket.setUsedBits(usedBits); spi::Context context(spi::Priority(0), spi::Trace::TraceLevel(0)); if (unrevertableRemove) { - getPersistenceProvider().remove( - makeSpiBucket(bucket), time, id, context); + getPersistenceProvider().remove(makeSpiBucket(bucket), time, id); } else { - spi::RemoveResult result = getPersistenceProvider().removeIfFound( - makeSpiBucket(bucket), time, id, context); + spi::RemoveResult result = getPersistenceProvider().removeIfFound(makeSpiBucket(bucket), time, id); if (!result.wasFound()) { throw vespalib::IllegalStateException( "Attempted to remove non-existing doc " + id.toString(), |