summaryrefslogtreecommitdiffstats
path: root/storage/src
diff options
context:
space:
mode:
Diffstat (limited to 'storage/src')
-rw-r--r--storage/src/tests/persistence/common/filestortestfixture.cpp4
-rw-r--r--storage/src/tests/persistence/filestorage/deactivatebucketstest.cpp4
-rw-r--r--storage/src/tests/persistence/filestorage/filestormanagertest.cpp20
-rw-r--r--storage/src/tests/persistence/filestorage/filestormodifiedbucketstest.cpp10
-rw-r--r--storage/src/tests/persistence/filestorage/sanitycheckeddeletetest.cpp6
-rw-r--r--storage/src/tests/persistence/legacyoperationhandlertest.cpp4
-rw-r--r--storage/src/tests/persistence/persistencetestutils.cpp22
-rw-r--r--storage/src/tests/persistence/persistencethread_splittest.cpp4
-rw-r--r--storage/src/tests/persistence/provider_error_wrapper_test.cpp4
-rw-r--r--storage/src/tests/persistence/splitbitdetectortest.cpp20
-rw-r--r--storage/src/tests/persistence/testandsettest.cpp4
11 files changed, 51 insertions, 51 deletions
diff --git a/storage/src/tests/persistence/common/filestortestfixture.cpp b/storage/src/tests/persistence/common/filestortestfixture.cpp
index 4694e8df363..4e2ddeb9616 100644
--- a/storage/src/tests/persistence/common/filestortestfixture.cpp
+++ b/storage/src/tests/persistence/common/filestortestfixture.cpp
@@ -8,7 +8,7 @@
#include <vespa/persistence/spi/test.h>
#include <sstream>
-using storage::spi::test::makeBucket;
+using storage::spi::test::makeSpiBucket;
using document::test::makeDocumentBucket;
namespace storage {
@@ -55,7 +55,7 @@ FileStorTestFixture::createBucket(const document::BucketId& bid)
spi::Context context(defaultLoadType, spi::Priority(0),
spi::Trace::TraceLevel(0));
_node->getPersistenceProvider().createBucket(
- makeBucket(bid), context);
+ makeSpiBucket(bid), context);
StorBucketDatabase::WrappedEntry entry(
_node->getStorageBucketDatabase().get(bid, "foo",
diff --git a/storage/src/tests/persistence/filestorage/deactivatebucketstest.cpp b/storage/src/tests/persistence/filestorage/deactivatebucketstest.cpp
index e76828c1eb2..4656924c1b6 100644
--- a/storage/src/tests/persistence/filestorage/deactivatebucketstest.cpp
+++ b/storage/src/tests/persistence/filestorage/deactivatebucketstest.cpp
@@ -8,7 +8,7 @@
#include <vespa/persistence/dummyimpl/dummypersistence.h>
#include <tests/persistence/common/filestortestfixture.h>
-using storage::spi::test::makeBucket;
+using storage::spi::test::makeSpiBucket;
namespace storage {
@@ -44,7 +44,7 @@ DeactivateBucketsTest::bucketsInDatabaseDeactivatedWhenNodeDownInClusterState()
lib::ClusterState::CSP(new lib::ClusterState(upState)));
document::BucketId bucket(8, 123);
- spi::Bucket spiBucket(makeBucket(bucket));
+ spi::Bucket spiBucket(makeSpiBucket(bucket));
createBucket(bucket);
api::BucketInfo serviceLayerInfo(1, 2, 3, 4, 5, true, true);
diff --git a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp
index 7b6bd4c5a86..bbfe2c19c7b 100644
--- a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp
+++ b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp
@@ -40,7 +40,7 @@ LOG_SETUP(".filestormanagertest");
using std::unique_ptr;
using document::Document;
using namespace storage::api;
-using storage::spi::test::makeBucket;
+using storage::spi::test::makeSpiBucket;
using document::test::makeDocumentBucket;
#define ASSERT_SINGLE_REPLY(replytype, reply, link, time) \
@@ -158,7 +158,7 @@ struct FileStorManagerTest : public CppUnit::TestFixture {
spi::Context context(defaultLoadType, spi::Priority(0),
spi::Trace::TraceLevel(0));
_node->getPersistenceProvider().createBucket(
- makeBucket(bid, spi::PartitionId(disk)), context);
+ makeSpiBucket(bid, spi::PartitionId(disk)), context);
StorBucketDatabase::WrappedEntry entry(
_node->getStorageBucketDatabase().get(bid, "foo",
@@ -1310,7 +1310,7 @@ FileStorManagerTest::testPriority()
spi::Trace::TraceLevel(0));
_node->getPersistenceProvider().createBucket(
- makeBucket(bucket), context);
+ makeSpiBucket(bucket), context);
}
// Populate bucket with the given data
@@ -1399,7 +1399,7 @@ FileStorManagerTest::testSplit1()
documents[i]->getId()).getRawId());
_node->getPersistenceProvider().createBucket(
- makeBucket(bucket), context);
+ makeSpiBucket(bucket), context);
std::shared_ptr<api::PutCommand> cmd(
new api::PutCommand(makeDocumentBucket(bucket), documents[i], 100 + i));
@@ -1574,7 +1574,7 @@ FileStorManagerTest::testSplitSingleGroup()
documents[i]->getId()).getRawId());
_node->getPersistenceProvider().createBucket(
- makeBucket(bucket), context);
+ makeSpiBucket(bucket), context);
std::shared_ptr<api::PutCommand> cmd(
new api::PutCommand(makeDocumentBucket(bucket), documents[i], 100 + i));
@@ -1649,7 +1649,7 @@ FileStorManagerTest::putDoc(DummyStorageLink& top,
document::BucketId bucket(16, factory.getBucketId(docId).getRawId());
//std::cerr << "doc bucket is " << bucket << " vs source " << source << "\n";
_node->getPersistenceProvider().createBucket(
- makeBucket(target), context);
+ makeSpiBucket(target), context);
Document::SP doc(new Document(*_testdoctype1, docId));
std::shared_ptr<api::PutCommand> cmd(
new api::PutCommand(makeDocumentBucket(target), doc, docNum+1));
@@ -1924,7 +1924,7 @@ createIterator(DummyStorageLink& link,
framework::MicroSecTime toTime = framework::MicroSecTime::max(),
bool headerOnly = false)
{
- spi::Bucket bucket(makeBucket(bucketId));
+ spi::Bucket bucket(makeSpiBucket(bucketId));
spi::Selection selection =
spi::Selection(spi::DocumentSelection(docSel));
@@ -2881,7 +2881,7 @@ FileStorManagerTest::testSetBucketActiveState()
createBucket(bid, disk);
spi::dummy::DummyPersistence& provider(
dynamic_cast<spi::dummy::DummyPersistence&>(_node->getPersistenceProvider()));
- CPPUNIT_ASSERT(!provider.isActive(makeBucket(bid, spi::PartitionId(disk))));
+ CPPUNIT_ASSERT(!provider.isActive(makeSpiBucket(bid, spi::PartitionId(disk))));
{
std::shared_ptr<api::SetBucketStateCommand> cmd(
@@ -2899,7 +2899,7 @@ FileStorManagerTest::testSetBucketActiveState()
CPPUNIT_ASSERT_EQUAL(ReturnCode(ReturnCode::OK), reply->getResult());
}
- CPPUNIT_ASSERT(provider.isActive(makeBucket(bid, spi::PartitionId(disk))));
+ CPPUNIT_ASSERT(provider.isActive(makeSpiBucket(bid, spi::PartitionId(disk))));
{
StorBucketDatabase::WrappedEntry entry(
_node->getStorageBucketDatabase().get(
@@ -2943,7 +2943,7 @@ FileStorManagerTest::testSetBucketActiveState()
CPPUNIT_ASSERT_EQUAL(ReturnCode(ReturnCode::OK), reply->getResult());
}
- CPPUNIT_ASSERT(!provider.isActive(makeBucket(bid, spi::PartitionId(disk))));
+ CPPUNIT_ASSERT(!provider.isActive(makeSpiBucket(bid, spi::PartitionId(disk))));
{
StorBucketDatabase::WrappedEntry entry(
_node->getStorageBucketDatabase().get(
diff --git a/storage/src/tests/persistence/filestorage/filestormodifiedbucketstest.cpp b/storage/src/tests/persistence/filestorage/filestormodifiedbucketstest.cpp
index 856add700e7..1fab3a8bcc1 100644
--- a/storage/src/tests/persistence/filestorage/filestormodifiedbucketstest.cpp
+++ b/storage/src/tests/persistence/filestorage/filestormodifiedbucketstest.cpp
@@ -8,7 +8,7 @@
#include <vespa/persistence/dummyimpl/dummypersistence.h>
#include <tests/persistence/common/filestortestfixture.h>
-using storage::spi::test::makeBucket;
+using storage::spi::test::makeSpiBucket;
namespace storage {
@@ -76,7 +76,7 @@ FileStorModifiedBucketsTest::modifyBuckets(uint32_t first, uint32_t count)
for (uint32_t i = 0; i < count; ++i) {
buckets.push_back(document::BucketId(16, first + i));
_node->getPersistenceProvider().setActiveState(
- makeBucket(buckets[i]),
+ makeSpiBucket(buckets[i]),
spi::BucketInfo::ACTIVE);
}
@@ -94,7 +94,7 @@ FileStorModifiedBucketsTest::modifiedBucketsSendNotifyBucketChange()
for (uint32_t i = 0; i < numBuckets; ++i) {
document::BucketId bucket(16, i);
- createBucket(makeBucket(bucket));
+ createBucket(makeSpiBucket(bucket));
c.sendPut(bucket, DocumentIndex(0), PutTimestamp(1000));
}
c.top.waitForMessages(numBuckets, MSG_WAIT_TIME);
@@ -122,7 +122,7 @@ FileStorModifiedBucketsTest::fileStorRepliesToRecheckBucketCommands()
setClusterState("storage:1 distributor:1");
document::BucketId bucket(16, 0);
- createBucket(makeBucket(bucket));
+ createBucket(makeSpiBucket(bucket));
c.sendPut(bucket, DocumentIndex(0), PutTimestamp(1000));
c.top.waitForMessages(1, MSG_WAIT_TIME);
c.top.reset();
@@ -134,7 +134,7 @@ FileStorModifiedBucketsTest::fileStorRepliesToRecheckBucketCommands()
// If we don't reply to the recheck bucket commands, we won't trigger
// a new round of getModifiedBuckets and recheck commands.
c.top.reset();
- createBucket(makeBucket(document::BucketId(16, 1)));
+ createBucket(makeSpiBucket(document::BucketId(16, 1)));
modifyBuckets(1, 1);
c.top.waitForMessages(1, MSG_WAIT_TIME);
assertIsNotifyCommandWithActiveBucket(*c.top.getReply(0));
diff --git a/storage/src/tests/persistence/filestorage/sanitycheckeddeletetest.cpp b/storage/src/tests/persistence/filestorage/sanitycheckeddeletetest.cpp
index 6f8741876aa..b906c9f67d6 100644
--- a/storage/src/tests/persistence/filestorage/sanitycheckeddeletetest.cpp
+++ b/storage/src/tests/persistence/filestorage/sanitycheckeddeletetest.cpp
@@ -8,7 +8,7 @@
#include <vespa/persistence/dummyimpl/dummypersistence.h>
#include <tests/persistence/common/filestortestfixture.h>
-using storage::spi::test::makeBucket;
+using storage::spi::test::makeSpiBucket;
using document::test::makeDocumentBucket;
namespace storage {
@@ -32,7 +32,7 @@ void SanityCheckedDeleteTest::delete_bucket_fails_when_provider_out_of_sync() {
TestFileStorComponents c(*this, "delete_bucket_fails_when_provider_out_of_sync");
document::BucketId bucket(8, 123);
document::BucketId syncBucket(8, 234);
- spi::Bucket spiBucket(makeBucket(bucket));
+ spi::Bucket spiBucket(makeSpiBucket(bucket));
// Send a put to ensure bucket isn't empty.
spi::BucketInfo infoBefore(send_put_and_get_bucket_info(c, spiBucket));
@@ -86,7 +86,7 @@ spi::BucketInfo SanityCheckedDeleteTest::send_put_and_get_bucket_info(
void SanityCheckedDeleteTest::differing_document_sizes_not_considered_out_of_sync() {
TestFileStorComponents c(*this, "differing_document_sizes_not_considered_out_of_sync");
document::BucketId bucket(8, 123);
- spi::Bucket spiBucket(makeBucket(bucket));
+ spi::Bucket spiBucket(makeSpiBucket(bucket));
spi::BucketInfo info_before(send_put_and_get_bucket_info(c, spiBucket));
// Expect 1 byte of reported size, which will mismatch with the actually put document.
diff --git a/storage/src/tests/persistence/legacyoperationhandlertest.cpp b/storage/src/tests/persistence/legacyoperationhandlertest.cpp
index 40fe3119747..817f85eedc5 100644
--- a/storage/src/tests/persistence/legacyoperationhandlertest.cpp
+++ b/storage/src/tests/persistence/legacyoperationhandlertest.cpp
@@ -12,7 +12,7 @@
using document::DocumentTypeRepo;
using document::TestDocRepo;
-using storage::spi::test::makeBucket;
+using storage::spi::test::makeSpiBucket;
using document::test::makeDocumentBucket;
namespace storage {
@@ -34,7 +34,7 @@ public:
spi::Context context(spi::LoadType(0, "default"), spi::Priority(0),
spi::Trace::TraceLevel(0));
getPersistenceProvider().createBucket(
- makeBucket(document::BucketId(16, 4)),
+ makeSpiBucket(document::BucketId(16, 4)),
context);
}
diff --git a/storage/src/tests/persistence/persistencetestutils.cpp b/storage/src/tests/persistence/persistencetestutils.cpp
index 480f236997a..c17c4837bfa 100644
--- a/storage/src/tests/persistence/persistencetestutils.cpp
+++ b/storage/src/tests/persistence/persistencetestutils.cpp
@@ -12,7 +12,7 @@
using document::DocumentType;
using storage::framework::defaultimplementation::AllocationLogic;
-using storage::spi::test::makeBucket;
+using storage::spi::test::makeSpiBucket;
using document::test::makeDocumentBucket;
namespace storage {
@@ -82,7 +82,7 @@ PersistenceTestUtils::~PersistenceTestUtils()
std::string
PersistenceTestUtils::dumpBucket(const document::BucketId& bid,
uint16_t disk) {
- return dynamic_cast<spi::dummy::DummyPersistence&>(_env->_node.getPersistenceProvider()).dumpBucket(makeBucket(bid, spi::PartitionId(disk)));
+ return dynamic_cast<spi::dummy::DummyPersistence&>(_env->_node.getPersistenceProvider()).dumpBucket(makeSpiBucket(bid, spi::PartitionId(disk)));
}
void
@@ -169,7 +169,7 @@ PersistenceTestUtils::doPutOnDisk(
{
document::Document::SP doc(createRandomDocumentAtLocation(
location, timestamp, minSize, maxSize));
- spi::Bucket b(makeBucket(document::BucketId(16, location), spi::PartitionId(disk)));
+ spi::Bucket b(makeSpiBucket(document::BucketId(16, location), spi::PartitionId(disk)));
spi::Context context(defaultLoadType, spi::Priority(0),
spi::Trace::TraceLevel(0));
@@ -193,12 +193,12 @@ PersistenceTestUtils::doRemoveOnDisk(
spi::Trace::TraceLevel(0));
if (persistRemove) {
spi::RemoveResult result = getPersistenceProvider().removeIfFound(
- makeBucket(bucketId, spi::PartitionId(disk)),
+ makeSpiBucket(bucketId, spi::PartitionId(disk)),
timestamp, docId, context);
return result.wasFound();
}
spi::RemoveResult result = getPersistenceProvider().remove(
- makeBucket(bucketId, spi::PartitionId(disk)),
+ makeSpiBucket(bucketId, spi::PartitionId(disk)),
timestamp, docId, context);
return result.wasFound();
@@ -214,7 +214,7 @@ PersistenceTestUtils::doUnrevertableRemoveOnDisk(
spi::Context context(defaultLoadType, spi::Priority(0),
spi::Trace::TraceLevel(0));
spi::RemoveResult result = getPersistenceProvider().remove(
- makeBucket(bucketId, spi::PartitionId(disk)),
+ makeSpiBucket(bucketId, spi::PartitionId(disk)),
timestamp, docId, context);
return result.wasFound();
}
@@ -232,7 +232,7 @@ PersistenceTestUtils::doGetOnDisk(
if (headerOnly) {
fieldSet.reset(new document::HeaderFields());
}
- return getPersistenceProvider().get(makeBucket(
+ return getPersistenceProvider().get(makeSpiBucket(
bucketId, spi::PartitionId(disk)), *fieldSet, docId, context);
}
@@ -308,7 +308,7 @@ PersistenceTestUtils::doPut(const document::Document::SP& doc,
spi::Timestamp time,
uint16_t disk)
{
- spi::Bucket b(makeBucket(bid, spi::PartitionId(disk)));
+ spi::Bucket b(makeSpiBucket(bid, spi::PartitionId(disk)));
spi::Context context(defaultLoadType, spi::Priority(0),
spi::Trace::TraceLevel(0));
getPersistenceProvider().createBucket(b, context);
@@ -324,7 +324,7 @@ PersistenceTestUtils::doUpdate(document::BucketId bid,
spi::Context context(defaultLoadType, spi::Priority(0),
spi::Trace::TraceLevel(0));
return getPersistenceProvider().update(
- makeBucket(bid, spi::PartitionId(disk)), time, update, context);
+ makeSpiBucket(bid, spi::PartitionId(disk)), time, update, context);
}
void
@@ -340,10 +340,10 @@ PersistenceTestUtils::doRemove(const document::DocumentId& id, spi::Timestamp ti
spi::Trace::TraceLevel(0));
if (unrevertableRemove) {
getPersistenceProvider().remove(
- makeBucket(bucket, spi::PartitionId(disk)), time, id, context);
+ makeSpiBucket(bucket, spi::PartitionId(disk)), time, id, context);
} else {
spi::RemoveResult result = getPersistenceProvider().removeIfFound(
- makeBucket(bucket, spi::PartitionId(disk)), time, id, context);
+ makeSpiBucket(bucket, spi::PartitionId(disk)), time, id, context);
if (!result.wasFound()) {
throw vespalib::IllegalStateException(
"Attempted to remove non-existing doc " + id.toString(),
diff --git a/storage/src/tests/persistence/persistencethread_splittest.cpp b/storage/src/tests/persistence/persistencethread_splittest.cpp
index b6e02e88540..9c10b9987e0 100644
--- a/storage/src/tests/persistence/persistencethread_splittest.cpp
+++ b/storage/src/tests/persistence/persistencethread_splittest.cpp
@@ -7,7 +7,7 @@
#include <tests/persistence/persistencetestutils.h>
#include <vespa/document/test/make_document_bucket.h>
-using storage::spi::test::makeBucket;
+using storage::spi::test::makeSpiBucket;
using document::test::makeDocumentBucket;
namespace storage {
@@ -179,7 +179,7 @@ PersistenceThread_SplitTest::doTest(SplitCase splitCase)
uint64_t splitMask = 1 << (splitLevelToDivide - 1);
spi::Context context(defaultLoadType, spi::Priority(0),
spi::Trace::TraceLevel(0));
- spi::Bucket bucket(makeBucket(document::BucketId(currentSplitLevel, 1)));
+ spi::Bucket bucket(makeSpiBucket(document::BucketId(currentSplitLevel, 1)));
spi::PersistenceProvider& spi(getPersistenceProvider());
spi.deleteBucket(bucket, context);
spi.createBucket(bucket, context);
diff --git a/storage/src/tests/persistence/provider_error_wrapper_test.cpp b/storage/src/tests/persistence/provider_error_wrapper_test.cpp
index 397bc740e55..b6b87b33666 100644
--- a/storage/src/tests/persistence/provider_error_wrapper_test.cpp
+++ b/storage/src/tests/persistence/provider_error_wrapper_test.cpp
@@ -5,7 +5,7 @@
#include <tests/persistence/persistencetestutils.h>
#include <tests/persistence/common/persistenceproviderwrapper.h>
-using storage::spi::test::makeBucket;
+using storage::spi::test::makeSpiBucket;
namespace storage {
@@ -64,7 +64,7 @@ struct Fixture {
~Fixture() {}
void perform_spi_operation() {
- errorWrapper.getBucketInfo(makeBucket(document::BucketId(16, 1234)));
+ errorWrapper.getBucketInfo(makeSpiBucket(document::BucketId(16, 1234)));
}
void check_no_listener_invoked_for_error(MockErrorListener& listener, spi::Result::ErrorType error) {
diff --git a/storage/src/tests/persistence/splitbitdetectortest.cpp b/storage/src/tests/persistence/splitbitdetectortest.cpp
index 30904e3da3d..c20aae373ec 100644
--- a/storage/src/tests/persistence/splitbitdetectortest.cpp
+++ b/storage/src/tests/persistence/splitbitdetectortest.cpp
@@ -10,7 +10,7 @@
#include <vespa/document/bucket/bucketidfactory.h>
#include <algorithm>
-using storage::spi::test::makeBucket;
+using storage::spi::test::makeSpiBucket;
namespace storage {
@@ -63,7 +63,7 @@ SplitBitDetectorTest::testTwoUsers()
document::TestDocMan testDocMan;
spi::dummy::DummyPersistence provider(testDocMan.getTypeRepoSP(), 1);
provider.getPartitionStates();
- spi::Bucket bucket(makeBucket(document::BucketId(1, 1)));
+ spi::Bucket bucket(makeSpiBucket(document::BucketId(1, 1)));
spi::Context context(defaultLoadType, spi::Priority(0),
spi::Trace::TraceLevel(0));
@@ -96,7 +96,7 @@ SplitBitDetectorTest::testSingleUser()
document::TestDocMan testDocMan;
spi::dummy::DummyPersistence provider(testDocMan.getTypeRepoSP(), 1);
provider.getPartitionStates();
- spi::Bucket bucket(makeBucket(document::BucketId(1, 1)));
+ spi::Bucket bucket(makeSpiBucket(document::BucketId(1, 1)));
spi::Context context(defaultLoadType, spi::Priority(0),
spi::Trace::TraceLevel(0));
@@ -123,7 +123,7 @@ SplitBitDetectorTest::testMaxBits()
document::TestDocMan testDocMan;
spi::dummy::DummyPersistence provider(testDocMan.getTypeRepoSP(), 1);
provider.getPartitionStates();
- spi::Bucket bucket(makeBucket(document::BucketId(1, 1)));
+ spi::Bucket bucket(makeSpiBucket(document::BucketId(1, 1)));
spi::Context context(defaultLoadType, spi::Priority(0),
spi::Trace::TraceLevel(0));
int minContentSize = 1, maxContentSize = 1;
@@ -152,7 +152,7 @@ SplitBitDetectorTest::testMaxBitsOneBelowMax()
document::TestDocMan testDocMan;
spi::dummy::DummyPersistence provider(testDocMan.getTypeRepoSP(), 1);
provider.getPartitionStates();
- spi::Bucket bucket(makeBucket(document::BucketId(15, 1)));
+ spi::Bucket bucket(makeSpiBucket(document::BucketId(15, 1)));
spi::Context context(defaultLoadType, spi::Priority(0),
spi::Trace::TraceLevel(0));
int minContentSize = 1, maxContentSize = 1;
@@ -190,7 +190,7 @@ SplitBitDetectorTest::testUnsplittable()
document::TestDocMan testDocMan;
spi::dummy::DummyPersistence provider(testDocMan.getTypeRepoSP(), 1);
provider.getPartitionStates();
- spi::Bucket bucket(makeBucket(document::BucketId(1, 1)));
+ spi::Bucket bucket(makeSpiBucket(document::BucketId(1, 1)));
spi::Context context(defaultLoadType, spi::Priority(0),
spi::Trace::TraceLevel(0));
@@ -218,7 +218,7 @@ SplitBitDetectorTest::testUnsplittableMinCount()
document::TestDocMan testDocMan;
spi::dummy::DummyPersistence provider(testDocMan.getTypeRepoSP(), 1);
provider.getPartitionStates();
- spi::Bucket bucket(makeBucket(document::BucketId(1, 1)));
+ spi::Bucket bucket(makeSpiBucket(document::BucketId(1, 1)));
spi::Context context(defaultLoadType, spi::Priority(0),
spi::Trace::TraceLevel(0));
@@ -248,7 +248,7 @@ SplitBitDetectorTest::testEmpty()
document::TestDocMan testDocMan;
spi::dummy::DummyPersistence provider(testDocMan.getTypeRepoSP(), 1);
provider.getPartitionStates();
- spi::Bucket bucket(makeBucket(document::BucketId(1, 1)));
+ spi::Bucket bucket(makeSpiBucket(document::BucketId(1, 1)));
spi::Context context(defaultLoadType, spi::Priority(0),
spi::Trace::TraceLevel(0));
@@ -267,7 +267,7 @@ SplitBitDetectorTest::testZeroDocLimitFallbacksToOneBitIncreaseWith1Doc()
document::TestDocMan testDocMan;
spi::dummy::DummyPersistence provider(testDocMan.getTypeRepoSP(), 1);
provider.getPartitionStates();
- spi::Bucket bucket(makeBucket(document::BucketId(1, 1)));
+ spi::Bucket bucket(makeSpiBucket(document::BucketId(1, 1)));
spi::Context context(defaultLoadType, spi::Priority(0),
spi::Trace::TraceLevel(0));
@@ -290,7 +290,7 @@ SplitBitDetectorTest::testZeroDocLimitFallbacksToOneBitIncreaseOnGidCollision()
document::TestDocMan testDocMan;
spi::dummy::DummyPersistence provider(testDocMan.getTypeRepoSP(), 1);
provider.getPartitionStates();
- spi::Bucket bucket(makeBucket(document::BucketId(1, 1)));
+ spi::Bucket bucket(makeSpiBucket(document::BucketId(1, 1)));
spi::Context context(defaultLoadType, spi::Priority(0),
spi::Trace::TraceLevel(0));
diff --git a/storage/src/tests/persistence/testandsettest.cpp b/storage/src/tests/persistence/testandsettest.cpp
index a19ba26e866..caf24c4a8fe 100644
--- a/storage/src/tests/persistence/testandsettest.cpp
+++ b/storage/src/tests/persistence/testandsettest.cpp
@@ -14,7 +14,7 @@ using std::unique_ptr;
using std::shared_ptr;
using namespace std::string_literals;
-using storage::spi::test::makeBucket;
+using storage::spi::test::makeSpiBucket;
using document::test::makeDocumentBucket;
namespace storage {
@@ -46,7 +46,7 @@ public:
createBucket(BUCKET_ID);
getPersistenceProvider().createBucket(
- makeBucket(BUCKET_ID),
+ makeSpiBucket(BUCKET_ID),
context);
thread = createPersistenceThread(0);