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

5 files changed, 12 insertions, 12 deletions

diff --git a/searchcore/src/tests/proton/document_iterator/document_iterator_test.cpp b/searchcore/src/tests/proton/document_iterator/document_iterator_test.cpp
index bef65add869..b3b05d03b9f 100644
--- a/searchcore/src/tests/proton/document_iterator/document_iterator_test.cpp
+++ b/searchcore/src/tests/proton/document_iterator/document_iterator_test.cpp
@@ -44,7 +44,7 @@ using storage::spi::IterateResult;
 using storage::spi::PartitionId;
 using storage::spi::Selection;
 using storage::spi::Timestamp;
-using storage::spi::test::makeBucket;
+using storage::spi::test::makeSpiBucket;
 
 using namespace proton;
 using namespace search::index;
@@ -52,7 +52,7 @@ using namespace search::index;
 const uint64_t largeNum = 10000000;
 
 Bucket bucket(size_t x) {
-    return makeBucket(BucketId(x));
+    return makeSpiBucket(BucketId(x));
 }
 
 Selection selectAll() {
diff --git a/searchcore/src/tests/proton/documentdb/buckethandler/buckethandler_test.cpp b/searchcore/src/tests/proton/documentdb/buckethandler/buckethandler_test.cpp
index 950571df6a4..677ad0a9883 100644
--- a/searchcore/src/tests/proton/documentdb/buckethandler/buckethandler_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/buckethandler/buckethandler_test.cpp
@@ -15,7 +15,7 @@ using storage::spi::Bucket;
 using storage::spi::BucketInfo;
 using storage::spi::PartitionId;
 using storage::spi::Timestamp;
-using storage::spi::test::makeBucket;
+using storage::spi::test::makeSpiBucket;
 using vespalib::ThreadStackExecutor;
 using proton::test::BucketStateCalculator;
 
@@ -146,7 +146,7 @@ struct Fixture
     }
     void sync() { _exec.sync(); }
     void handleGetBucketInfo(const BucketId &bucket) {
-        _handler.handleGetBucketInfo(makeBucket(bucket, PART_ID), _bucketInfo);
+        _handler.handleGetBucketInfo(makeSpiBucket(bucket, PART_ID), _bucketInfo);
     }
     void
     setNodeUp(bool value)
diff --git a/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp b/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp
index f7b35851696..9e13cf2ff7d 100644
--- a/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp
+++ b/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp
@@ -41,7 +41,7 @@ using storage::spi::Result;
 using storage::spi::Selection;
 using storage::spi::Timestamp;
 using storage::spi::UpdateResult;
-using storage::spi::test::makeBucket;
+using storage::spi::test::makeSpiBucket;
 using storage::spi::test::makeBucketSpace;
 using namespace proton;
 using namespace vespalib;
@@ -354,8 +354,8 @@ BucketId bckId1(1);
 BucketId bckId2(2);
 BucketId bckId3(3);
 Bucket bucket0;
-Bucket bucket1(makeBucket(bckId1, partId));
-Bucket bucket2(makeBucket(bckId2, partId));
+Bucket bucket1(makeSpiBucket(bckId1, partId));
+Bucket bucket2(makeSpiBucket(bckId2, partId));
 BucketChecksum checksum1(1);
 BucketChecksum checksum2(2);
 BucketChecksum checksum3(1+2);
diff --git a/searchcore/src/tests/proton/server/documentretriever_test.cpp b/searchcore/src/tests/proton/server/documentretriever_test.cpp
index b949046e8b6..69e90a6fdf8 100644
--- a/searchcore/src/tests/proton/server/documentretriever_test.cpp
+++ b/searchcore/src/tests/proton/server/documentretriever_test.cpp
@@ -70,7 +70,7 @@ using storage::spi::Bucket;
 using storage::spi::GetResult;
 using storage::spi::PartitionId;
 using storage::spi::Timestamp;
-using storage::spi::test::makeBucket;
+using storage::spi::test::makeSpiBucket;
 using vespalib::make_string;
 using vespalib::string;
 using namespace document::config_builder;
@@ -326,12 +326,12 @@ TEST_F("require that document retriever can retrieve document meta data",
 TEST_F("require that document retriever can retrieve bucket meta data",
        Fixture) {
     DocumentMetaData::Vector result;
-    f._retriever->getBucketMetaData(makeBucket(f.bucket_id, PartitionId(0)), result);
+    f._retriever->getBucketMetaData(makeSpiBucket(f.bucket_id, PartitionId(0)), result);
     ASSERT_EQUAL(1u, result.size());
     EXPECT_EQUAL(f.lid, result[0].lid);
     EXPECT_EQUAL(f.timestamp, result[0].timestamp);
     result.clear();
-    f._retriever->getBucketMetaData(makeBucket(BucketId(f.bucket_id.getId() + 1),
+    f._retriever->getBucketMetaData(makeSpiBucket(BucketId(f.bucket_id.getId() + 1),
                                          PartitionId(0)), result);
     EXPECT_EQUAL(0u, result.size());
 }
diff --git a/searchcore/src/vespa/searchcore/proton/test/bucketfactory.cpp b/searchcore/src/vespa/searchcore/proton/test/bucketfactory.cpp
index 37c0a965f48..463b825191e 100644
--- a/searchcore/src/vespa/searchcore/proton/test/bucketfactory.cpp
+++ b/searchcore/src/vespa/searchcore/proton/test/bucketfactory.cpp
@@ -7,7 +7,7 @@ using document::BucketId;
 using document::DocumentId;
 using storage::spi::Bucket;
 using storage::spi::PartitionId;
-using storage::spi::test::makeBucket;
+using storage::spi::test::makeSpiBucket;
 
 namespace proton {
 
@@ -23,7 +23,7 @@ BucketFactory::getBucketId(const DocumentId &docId)
 Bucket
 BucketFactory::getBucket(const DocumentId &docId)
 {
-    return makeBucket(getBucketId(docId));
+    return makeSpiBucket(getBucketId(docId));
 }
 
 } // namespace proton