Rename storage::spi::test::makeBucket to storage::spi::test::makeSpiBucket.

6 files changed, 69 insertions, 69 deletions

diff --git a/memfilepersistence/src/tests/spi/basicoperationhandlertest.cpp b/memfilepersistence/src/tests/spi/basicoperationhandlertest.cpp
index 07bff2038e0..ba540d851a9 100644
--- a/memfilepersistence/src/tests/spi/basicoperationhandlertest.cpp
+++ b/memfilepersistence/src/tests/spi/basicoperationhandlertest.cpp
@@ -8,7 +8,7 @@
 #include <vespa/persistence/spi/test.h>
 #include <vespa/vdstestlib/cppunit/macros.h>
 
-using storage::spi::test::makeBucket;
+using storage::spi::test::makeSpiBucket;
 
 namespace storage {
 namespace memfile {
@@ -144,7 +144,7 @@ BasicOperationHandlerTest::testRemove()
                                         Timestamp(2),
                                         OperationHandler::PERSIST_REMOVE_IF_FOUND));
 
-    getPersistenceProvider().flush(makeBucket(bucketId), context);
+    getPersistenceProvider().flush(makeSpiBucket(bucketId), context);
 
     env()._cache.clear();
 
@@ -178,7 +178,7 @@ BasicOperationHandlerTest::doTestRemoveWithNonMatchingTimestamp(
                                          Timestamp(1233),
                                          persistRemove));
 
-    getPersistenceProvider().flush(makeBucket(bucketId), context);
+    getPersistenceProvider().flush(makeSpiBucket(bucketId), context);
 
     MemFilePtr file(getMemFile(bucketId));
     CPPUNIT_ASSERT_EQUAL(
@@ -241,7 +241,7 @@ BasicOperationHandlerTest::testRemoveForExistingRemoveSameTimestamp()
                                          Timestamp(1235),
                                          OperationHandler::PERSIST_REMOVE_IF_FOUND));
 
-    getPersistenceProvider().flush(makeBucket(bucketId), context);
+    getPersistenceProvider().flush(makeSpiBucket(bucketId), context);
 
     // Should only be one remove entry still
     MemFilePtr file(getMemFile(bucketId));
@@ -271,7 +271,7 @@ BasicOperationHandlerTest::doTestRemoveForExistingRemoveNewTimestamp(
                                         Timestamp(1236),
                                         persistRemove));
 
-    getPersistenceProvider().flush(makeBucket(bucketId), context);
+    getPersistenceProvider().flush(makeSpiBucket(bucketId), context);
 
     MemFilePtr file(getMemFile(bucketId));
     CPPUNIT_ASSERT_EQUAL(
@@ -325,14 +325,14 @@ BasicOperationHandlerTest::testRemoveExistingOlderDocumentVersion()
                                         Timestamp(1235),
                                         OperationHandler::ALWAYS_PERSIST_REMOVE));
 
-    getPersistenceProvider().flush(makeBucket(bucketId), context);
+    getPersistenceProvider().flush(makeSpiBucket(bucketId), context);
 
     CPPUNIT_ASSERT_EQUAL(true, doRemove(bucketId,
                                         doc->getId(),
                                         Timestamp(1234),
                                         OperationHandler::ALWAYS_PERSIST_REMOVE));
 
-    getPersistenceProvider().flush(makeBucket(bucketId), context);
+    getPersistenceProvider().flush(makeSpiBucket(bucketId), context);
 
     // Should now be two remove entries.
     MemFilePtr file(getMemFile(bucketId));
@@ -362,7 +362,7 @@ BasicOperationHandlerTest::doTestRemoveDocumentNotFound(
                                   Timestamp(1235),
                                   persistRemove));
 
-    getPersistenceProvider().flush(makeBucket(bucketId), context);
+    getPersistenceProvider().flush(makeSpiBucket(bucketId), context);
 
     MemFilePtr file(getMemFile(bucketId));
     CPPUNIT_ASSERT_EQUAL(
@@ -576,8 +576,8 @@ BasicOperationHandlerTest::testRemoveEntry()
     Document::SP doc = doPut(4, Timestamp(2345));
     doPut(4, Timestamp(3456));
 
-    getPersistenceProvider().removeEntry(makeBucket(bucketId), spi::Timestamp(1234), context);
-    getPersistenceProvider().removeEntry(makeBucket(bucketId), spi::Timestamp(3456), context);
+    getPersistenceProvider().removeEntry(makeSpiBucket(bucketId), spi::Timestamp(1234), context);
+    getPersistenceProvider().removeEntry(makeSpiBucket(bucketId), spi::Timestamp(3456), context);
     flush(bucketId);
 
     memfile::MemFilePtr file(getMemFile(bucketId));
@@ -674,7 +674,7 @@ BasicOperationHandlerTest::testEraseFromCacheOnMaintainException()
         std::unique_ptr<Environment::LazyFileFactory>(
                 new SimulatedFailureLazyFile::Factory);
 
-        spi::Result result = getPersistenceProvider().maintain(makeBucket(bucketId), spi::HIGH);
+        spi::Result result = getPersistenceProvider().maintain(makeSpiBucket(bucketId), spi::HIGH);
         CPPUNIT_ASSERT(result.hasError());
         CPPUNIT_ASSERT(result.getErrorMessage().find("A simulated I/O write")
                        != vespalib::string::npos);
@@ -709,7 +709,7 @@ BasicOperationHandlerTest::testEraseFromCacheOnDeleteBucketException()
         std::unique_ptr<Environment::LazyFileFactory>(factory);
 
     // loadFile will fail
-    spi::Result result = getPersistenceProvider().deleteBucket(makeBucket(bucketId), context);
+    spi::Result result = getPersistenceProvider().deleteBucket(makeSpiBucket(bucketId), context);
     CPPUNIT_ASSERT(result.hasError());
     CPPUNIT_ASSERT(result.getErrorMessage().find("A simulated I/O read")
                    != vespalib::string::npos);
diff --git a/memfilepersistence/src/tests/spi/iteratorhandlertest.cpp b/memfilepersistence/src/tests/spi/iteratorhandlertest.cpp
index 6deabc3dfe1..418ead076fd 100644
--- a/memfilepersistence/src/tests/spi/iteratorhandlertest.cpp
+++ b/memfilepersistence/src/tests/spi/iteratorhandlertest.cpp
@@ -7,7 +7,7 @@
 #include <vespa/persistence/spi/test.h>
 #include <vespa/document/select/parser.h>
 
-using storage::spi::test::makeBucket;
+using storage::spi::test::makeSpiBucket;
 
 namespace storage {
 namespace memfile {
@@ -122,7 +122,7 @@ IteratorHandlerTest::createSelection(const std::string& docSel) const
 void
 IteratorHandlerTest::testCreateIterator()
 {
-    spi::Bucket b(makeBucket(BucketId(16, 1234)));
+    spi::Bucket b(makeSpiBucket(BucketId(16, 1234)));
 
     spi::CreateIteratorResult iter1(create(b, createSelection("true")));
     CPPUNIT_ASSERT_EQUAL(spi::IteratorId(1), iter1.getIteratorId());
@@ -290,7 +290,7 @@ IteratorHandlerTest::testSomeSlotsRemovedBetweenInvocations()
 {
     std::vector<DocAndTimestamp> docs = feedDocs(100, 4096, 4096);
 
-    spi::Bucket b(makeBucket(BucketId(16, 4)));
+    spi::Bucket b(makeSpiBucket(BucketId(16, 4)));
     spi::Selection sel(createSelection("true"));
 
     spi::CreateIteratorResult iter(create(b, sel));
@@ -330,7 +330,7 @@ IteratorHandlerTest::testAllSlotsRemovedBetweenInvocations()
 {
     std::vector<DocAndTimestamp> docs = feedDocs(100, 4096, 4096);
 
-    spi::Bucket b(makeBucket(BucketId(16, 4)));
+    spi::Bucket b(makeSpiBucket(BucketId(16, 4)));
     spi::Selection sel(createSelection("true"));
 
     spi::CreateIteratorResult iter(create(b, sel));
@@ -362,7 +362,7 @@ IteratorHandlerTest::testAllSlotsRemovedBetweenInvocations()
 void
 IteratorHandlerTest::testIterateMetadataOnly()
 {
-    spi::Bucket b(makeBucket(BucketId(16, 4)));
+    spi::Bucket b(makeSpiBucket(BucketId(16, 4)));
     std::vector<DocAndTimestamp> docs = feedDocs(10);
 
     CPPUNIT_ASSERT(
@@ -418,7 +418,7 @@ IteratorHandlerTest::testIterateHeadersOnly()
         clearBody(*docs[i].first);
     }
 
-    spi::Bucket b(makeBucket(BucketId(16, 4)));
+    spi::Bucket b(makeSpiBucket(BucketId(16, 4)));
     spi::Selection sel(createSelection("true"));
 
     spi::CreateIteratorResult iter(create(b, sel, spi::NEWEST_DOCUMENT_ONLY,
@@ -439,7 +439,7 @@ IteratorHandlerTest::testIterateLargeDocument()
     std::vector<DocAndTimestamp> largedoc;
     largedoc.push_back(docs.back());
 
-    spi::Bucket b(makeBucket(BucketId(16, 4)));
+    spi::Bucket b(makeSpiBucket(BucketId(16, 4)));
     spi::Selection sel(createSelection("true"));
 
     spi::CreateIteratorResult iter(create(b, sel));
@@ -458,7 +458,7 @@ IteratorHandlerTest::testDocumentsRemovedBetweenInvocations()
     int docCount = 100;
     std::vector<DocAndTimestamp> docs = feedDocs(docCount);
 
-    spi::Bucket b(makeBucket(BucketId(16, 4)));
+    spi::Bucket b(makeSpiBucket(BucketId(16, 4)));
     spi::Selection sel(createSelection("true"));
 
     spi::CreateIteratorResult iter(create(b, sel));
@@ -500,7 +500,7 @@ IteratorHandlerTest::doTestUnrevertableRemoveBetweenInvocations(bool includeRemo
     int docCount = 100;
     std::vector<DocAndTimestamp> docs = feedDocs(docCount);
 
-    spi::Bucket b(makeBucket(BucketId(16, 4)));
+    spi::Bucket b(makeSpiBucket(BucketId(16, 4)));
     spi::Selection sel(createSelection("true"));
     spi::CreateIteratorResult iter(
             create(b, sel,
@@ -594,7 +594,7 @@ IteratorHandlerTest::testMatchTimestampRangeDocAltered()
                      OperationHandler::PERSIST_REMOVE_IF_FOUND));
     flush(bucketId);
 
-    spi::Bucket b(makeBucket(bucketId));
+    spi::Bucket b(makeSpiBucket(bucketId));
 
     {
         spi::Selection sel(createSelection("true"));
@@ -699,7 +699,7 @@ IteratorHandlerTest::testMatchTimestampRangeDocAltered()
 void
 IteratorHandlerTest::testIterateAllVersions()
 {
-    spi::Bucket b(makeBucket(BucketId(16, 4)));
+    spi::Bucket b(makeSpiBucket(BucketId(16, 4)));
     std::vector<DocAndTimestamp> docs;
 
     Document::SP originalDoc(createRandomDocumentAtLocation(
@@ -736,7 +736,7 @@ IteratorHandlerTest::testIterateAllVersions()
 void
 IteratorHandlerTest::testFieldSetFiltering()
 {
-    spi::Bucket b(makeBucket(BucketId(16, 4)));
+    spi::Bucket b(makeSpiBucket(BucketId(16, 4)));
     Document::SP doc(createRandomDocumentAtLocation(
                              4, 1001, 110, 110));
     doc->setValue(doc->getField("headerval"), document::IntFieldValue(42));
@@ -763,7 +763,7 @@ IteratorHandlerTest::testFieldSetFiltering()
 void
 IteratorHandlerTest::testIteratorInactiveOnException()
 {
-    spi::Bucket b(makeBucket(BucketId(16, 4)));
+    spi::Bucket b(makeSpiBucket(BucketId(16, 4)));
     feedDocs(10);
 
     env()._cache.clear();
@@ -790,7 +790,7 @@ IteratorHandlerTest::testIteratorInactiveOnException()
 void
 IteratorHandlerTest::testDocsCachedBeforeDocumentSelection()
 {
-    spi::Bucket b(makeBucket(BucketId(16, 4)));
+    spi::Bucket b(makeSpiBucket(BucketId(16, 4)));
     std::vector<DocAndTimestamp> docs = feedDocs(100, 4096, 4096);
 
     env()._cache.clear();
@@ -819,7 +819,7 @@ IteratorHandlerTest::testDocsCachedBeforeDocumentSelection()
 void
 IteratorHandlerTest::testTimestampRangeLimitedPrefetch()
 {
-    spi::Bucket b(makeBucket(BucketId(16, 4)));
+    spi::Bucket b(makeSpiBucket(BucketId(16, 4)));
     // Feed docs with timestamp range [1000, 1100)
     feedDocs(100, 4096, 4096);
 
@@ -907,7 +907,7 @@ IteratorHandlerTest::testCachePrefetchRequirements()
 void
 IteratorHandlerTest::testBucketEvictedFromCacheOnIterateException()
 {
-    spi::Bucket b(makeBucket(BucketId(16, 4)));
+    spi::Bucket b(makeSpiBucket(BucketId(16, 4)));
     feedDocs(10);
     env()._cache.clear();
 
diff --git a/memfilepersistence/src/tests/spi/joinoperationhandlertest.cpp b/memfilepersistence/src/tests/spi/joinoperationhandlertest.cpp
index 07c2bab5bae..67542afd12f 100644
--- a/memfilepersistence/src/tests/spi/joinoperationhandlertest.cpp
+++ b/memfilepersistence/src/tests/spi/joinoperationhandlertest.cpp
@@ -5,7 +5,7 @@
 #include <vespa/persistence/spi/test.h>
 
 using document::DocumentType;
-using storage::spi::test::makeBucket;
+using storage::spi::test::makeSpiBucket;
 
 namespace storage {
 namespace memfile {
@@ -140,9 +140,9 @@ JoinOperationHandlerTest::doJoin(const document::BucketId to,
     spi::Context context(defaultLoadType, spi::Priority(0),
                          spi::Trace::TraceLevel(0));
     return getPersistenceProvider().join(
-            makeBucket(from1),
-            makeBucket(from2),
-            makeBucket(to),
+            makeSpiBucket(from1),
+            makeSpiBucket(from2),
+            makeSpiBucket(to),
             context);
 }
 
@@ -252,9 +252,9 @@ JoinOperationHandlerTest::testMultiDisk()
     setupDisks(10);
     feedMultiDisk();
 
-    getPersistenceProvider().join(makeBucket(SOURCE2, spi::PartitionId(7)),
-                                  makeBucket(SOURCE1, spi::PartitionId(4)),
-                                  makeBucket(TARGET, spi::PartitionId(3)),
+    getPersistenceProvider().join(makeSpiBucket(SOURCE2, spi::PartitionId(7)),
+                                  makeSpiBucket(SOURCE1, spi::PartitionId(4)),
+                                  makeSpiBucket(TARGET, spi::PartitionId(3)),
                                   context);
 
     CPPUNIT_ASSERT_EQUAL(
@@ -278,9 +278,9 @@ JoinOperationHandlerTest::testMultiDiskFlushed()
     env()._cache.flushDirtyEntries();
     env()._cache.clear();
 
-    getPersistenceProvider().join(makeBucket(SOURCE2, spi::PartitionId(7)),
-                                  makeBucket(SOURCE1, spi::PartitionId(4)),
-                                  makeBucket(TARGET, spi::PartitionId(3)),
+    getPersistenceProvider().join(makeSpiBucket(SOURCE2, spi::PartitionId(7)),
+                                  makeSpiBucket(SOURCE1, spi::PartitionId(4)),
+                                  makeSpiBucket(TARGET, spi::PartitionId(3)),
                                   context);
 
     CPPUNIT_ASSERT_EQUAL(
@@ -324,9 +324,9 @@ JoinOperationHandlerTest::testInternalJoin()
     mon->overrideRealStat(512, 100000, 50000);
     CPPUNIT_ASSERT(!mon->isFull(0, .80f));
 
-    getPersistenceProvider().join(makeBucket(SOURCE1, spi::PartitionId(4)),
-                                  makeBucket(SOURCE1, spi::PartitionId(4)),
-                                  makeBucket(SOURCE1, spi::PartitionId(5)),
+    getPersistenceProvider().join(makeSpiBucket(SOURCE1, spi::PartitionId(4)),
+                                  makeSpiBucket(SOURCE1, spi::PartitionId(4)),
+                                  makeSpiBucket(SOURCE1, spi::PartitionId(5)),
                                   context);
 
     env()._cache.clear();
@@ -370,9 +370,9 @@ JoinOperationHandlerTest::testInternalJoinDiskFull()
     CPPUNIT_ASSERT(mon->isFull(0, .08f));
 
     spi::Result result =
-        getPersistenceProvider().join(makeBucket(SOURCE1, spi::PartitionId(4)),
-                                      makeBucket(SOURCE1, spi::PartitionId(4)),
-                                      makeBucket(SOURCE1, spi::PartitionId(5)),
+        getPersistenceProvider().join(makeSpiBucket(SOURCE1, spi::PartitionId(4)),
+                                      makeSpiBucket(SOURCE1, spi::PartitionId(4)),
+                                      makeSpiBucket(SOURCE1, spi::PartitionId(5)),
                                       context);
 
     CPPUNIT_ASSERT(result.hasError());
diff --git a/memfilepersistence/src/tests/spi/memfileautorepairtest.cpp b/memfilepersistence/src/tests/spi/memfileautorepairtest.cpp
index 1bae9d929e3..b7fbeba1649 100644
--- a/memfilepersistence/src/tests/spi/memfileautorepairtest.cpp
+++ b/memfilepersistence/src/tests/spi/memfileautorepairtest.cpp
@@ -6,7 +6,7 @@
 #include <tests/spi/memfiletestutils.h>
 #include <vespa/persistence/spi/test.h>
 
-using storage::spi::test::makeBucket;
+using storage::spi::test::makeSpiBucket;
 
 namespace storage {
 namespace memfile {
@@ -226,7 +226,7 @@ MemFileAutoRepairTest::testRepairFailureInMaintainEvictsBucketFromCache()
     prepareBucket(*this, *_file);
     corruptBodyBlock();
     spi::Result result(getPersistenceProvider().maintain(
-            makeBucket(_bucket), spi::HIGH));
+            makeSpiBucket(_bucket), spi::HIGH));
     // File being successfully repaired does not constitute a failure of
     // the maintain() call.
     CPPUNIT_ASSERT_EQUAL(spi::Result::NONE, result.getErrorCode());
@@ -243,7 +243,7 @@ MemFileAutoRepairTest::testZeroLengthFileIsDeleted()
 
     // No way to deal with zero-length files aside from deleting them.
     spi::Result result(getPersistenceProvider().maintain(
-            makeBucket(_bucket), spi::HIGH));
+            makeSpiBucket(_bucket), spi::HIGH));
     CPPUNIT_ASSERT_EQUAL(spi::Result::NONE, result.getErrorCode());
     CPPUNIT_ASSERT(!env()._cache.contains(_bucket));
     CPPUNIT_ASSERT(!vespalib::fileExists(_file->getPath()));
@@ -275,7 +275,7 @@ MemFileAutoRepairTest::assertDocumentIsSilentlyRemoved(
 {
     // Corrupted (truncated) slot should be transparently removed during
     // loadFile and it should be as if it was never there!
-    spi::Bucket spiBucket(makeBucket(bucket));
+    spi::Bucket spiBucket(makeSpiBucket(bucket));
     spi::GetResult res(doGet(spiBucket, docId, document::AllFields()));
     CPPUNIT_ASSERT_EQUAL(spi::Result::NONE, res.getErrorCode());
     CPPUNIT_ASSERT(!res.hasDocument());
diff --git a/memfilepersistence/src/tests/spi/memfiletestutils.cpp b/memfilepersistence/src/tests/spi/memfiletestutils.cpp
index 71a3e6a0999..04f2e87c812 100644
--- a/memfilepersistence/src/tests/spi/memfiletestutils.cpp
+++ b/memfilepersistence/src/tests/spi/memfiletestutils.cpp
@@ -13,7 +13,7 @@
 #include <sys/time.h>
 
 using document::DocumentType;
-using storage::spi::test::makeBucket;
+using storage::spi::test::makeSpiBucket;
 using storage::spi::test::makeBucketSpace;
 
 namespace storage {
@@ -139,7 +139,7 @@ MemFileTestUtils::flush(const document::BucketId& id, uint16_t disk)
     spi::Context context(defaultLoadType, spi::Priority(0),
                          spi::Trace::TraceLevel(0));
     return getPersistenceProvider().flush(
-            makeBucket(id, spi::PartitionId(disk)), context);
+            makeSpiBucket(id, spi::PartitionId(disk)), context);
 }
 
 document::Document::SP
@@ -155,7 +155,7 @@ MemFileTestUtils::doPutOnDisk(
     document::Document::SP doc(createRandomDocumentAtLocation(
                              location, timestamp.getTime(), minSize, maxSize));
     getPersistenceProvider().put(
-            makeBucket(document::BucketId(16, location), spi::PartitionId(disk)),
+            makeSpiBucket(document::BucketId(16, location), spi::PartitionId(disk)),
             spi::Timestamp(timestamp.getTime()),
             doc,
             context);
@@ -174,14 +174,14 @@ MemFileTestUtils::doRemoveOnDisk(
                          spi::Trace::TraceLevel(0));
     if (persistRemove == OperationHandler::PERSIST_REMOVE_IF_FOUND) {
         spi::RemoveResult result = getPersistenceProvider().removeIfFound(
-            makeBucket(bucketId, spi::PartitionId(disk)),
+            makeSpiBucket(bucketId, spi::PartitionId(disk)),
             spi::Timestamp(timestamp.getTime()),
             docId,
             context);
         return result.wasFound();
     }
     spi::RemoveResult result = getPersistenceProvider().remove(
-            makeBucket(bucketId, spi::PartitionId(disk)),
+            makeSpiBucket(bucketId, spi::PartitionId(disk)),
             spi::Timestamp(timestamp.getTime()),
             docId,
             context);
@@ -200,7 +200,7 @@ MemFileTestUtils::doUnrevertableRemoveOnDisk(
                          spi::Trace::TraceLevel(0));
     spi::RemoveResult result =
         getPersistenceProvider().remove(
-                makeBucket(bucketId, spi::PartitionId(disk)),
+                makeSpiBucket(bucketId, spi::PartitionId(disk)),
                 spi::Timestamp(timestamp.getTime()),
                 docId, context);
 
@@ -217,7 +217,7 @@ MemFileTestUtils::doGetOnDisk(
     spi::Context context(defaultLoadType, spi::Priority(0),
                          spi::Trace::TraceLevel(0));
     return getPersistenceProvider().get(
-            makeBucket(bucketId, spi::PartitionId(disk)),
+            makeSpiBucket(bucketId, spi::PartitionId(disk)),
             fields, docId, context);
 }
 
@@ -275,7 +275,7 @@ MemFileTestUtils::doPut(const document::Document::SP& doc,
 {
     spi::Context context(defaultLoadType, spi::Priority(0),
                          spi::Trace::TraceLevel(0));
-    getPersistenceProvider().put(makeBucket(bid, spi::PartitionId(disk)),
+    getPersistenceProvider().put(makeSpiBucket(bid, spi::PartitionId(disk)),
                                  spi::Timestamp(time.getTime()), doc, context);
 }
 
@@ -288,7 +288,7 @@ MemFileTestUtils::doUpdate(document::BucketId bid,
     spi::Context context(defaultLoadType, spi::Priority(0),
                          spi::Trace::TraceLevel(0));
     return getPersistenceProvider().update(
-            makeBucket(bid, spi::PartitionId(disk)),
+            makeSpiBucket(bid, spi::PartitionId(disk)),
             spi::Timestamp(time.getTime()), update, context);
 }
 
@@ -304,12 +304,12 @@ MemFileTestUtils::doRemove(const document::DocumentId& id, Timestamp time,
 
     if (unrevertableRemove) {
         getPersistenceProvider().remove(
-                makeBucket(bucket, spi::PartitionId(disk)),
+                makeSpiBucket(bucket, spi::PartitionId(disk)),
                 spi::Timestamp(time.getTime()),
                 id, context);
     } else {
         spi::RemoveResult result = getPersistenceProvider().removeIfFound(
-                makeBucket(bucket, spi::PartitionId(disk)),
+                makeSpiBucket(bucket, spi::PartitionId(disk)),
                 spi::Timestamp(time.getTime()),
                 id, context);
 
diff --git a/memfilepersistence/src/tests/spi/splitoperationhandlertest.cpp b/memfilepersistence/src/tests/spi/splitoperationhandlertest.cpp
index 98f722e749c..89a7d0f6e03 100644
--- a/memfilepersistence/src/tests/spi/splitoperationhandlertest.cpp
+++ b/memfilepersistence/src/tests/spi/splitoperationhandlertest.cpp
@@ -5,7 +5,7 @@
 #include <vespa/persistence/spi/test.h>
 
 using document::DocumentType;
-using storage::spi::test::makeBucket;
+using storage::spi::test::makeSpiBucket;
 
 namespace storage {
 namespace memfile {
@@ -62,9 +62,9 @@ SplitOperationHandlerTest::testSimple()
 
     SplitOperationHandler handler(env());
     spi::Result result = getPersistenceProvider().split(
-            makeBucket(sourceBucket),
-            makeBucket(target1),
-            makeBucket(target2),
+            makeSpiBucket(sourceBucket),
+            makeSpiBucket(target1),
+            makeSpiBucket(target2),
             context);
 
     env()._cache.clear();
@@ -118,9 +118,9 @@ SplitOperationHandlerTest::doTestMultiDisk(uint16_t sourceDisk,
 
     SplitOperationHandler handler(env());
     spi::Result result = getPersistenceProvider().split(
-            makeBucket(sourceBucket, spi::PartitionId(sourceDisk)),
-            makeBucket(target1, spi::PartitionId(targetDisk0)),
-            makeBucket(target2, spi::PartitionId(targetDisk1)),
+            makeSpiBucket(sourceBucket, spi::PartitionId(sourceDisk)),
+            makeSpiBucket(target1, spi::PartitionId(targetDisk0)),
+            makeSpiBucket(target2, spi::PartitionId(targetDisk1)),
             context);
 
     env()._cache.clear();
@@ -185,9 +185,9 @@ SplitOperationHandlerTest::testExceptionDuringSplittingEvictsAllBuckets()
     try {
         SplitOperationHandler handler(env());
         spi::Result result = getPersistenceProvider().split(
-                makeBucket(sourceBucket),
-                makeBucket(target1),
-                makeBucket(target2),
+                makeSpiBucket(sourceBucket),
+                makeSpiBucket(target1),
+                makeSpiBucket(target2),
                 context);
         CPPUNIT_FAIL("Exception not thrown on flush failure");
     } catch (std::exception&) {