diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2020-10-14 11:45:31 +0200 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2020-10-14 15:51:34 +0200 |
commit | d8d068e38bf581875ab78defae4ea15fa5502e83 (patch) | |
tree | 81d13f191ab5763d196e1c27c3b1a82b55289f74 /searchcore/src/tests | |
parent | 1ea40c61012e36f4cecf93194d3e15ef26a4b642 (diff) |
Remove partitions from SPI.
Diffstat (limited to 'searchcore/src/tests')
3 files changed, 6 insertions, 10 deletions
diff --git a/searchcore/src/tests/proton/documentdb/buckethandler/buckethandler_test.cpp b/searchcore/src/tests/proton/documentdb/buckethandler/buckethandler_test.cpp index 3adb153863c..4b548197ae1 100644 --- a/searchcore/src/tests/proton/documentdb/buckethandler/buckethandler_test.cpp +++ b/searchcore/src/tests/proton/documentdb/buckethandler/buckethandler_test.cpp @@ -20,7 +20,6 @@ using storage::spi::test::makeSpiBucket; using vespalib::ThreadStackExecutor; using proton::test::BucketStateCalculator; -const PartitionId PART_ID(0); const GlobalId GID_1("111111111111"); const BucketId BUCKET_1(8, GID_1.convertToBucketId().getRawId()); const Timestamp TIME_1(1u); @@ -147,7 +146,7 @@ struct Fixture } void sync() { _exec.sync(); } void handleGetBucketInfo(const BucketId &bucket) { - _handler.handleGetBucketInfo(makeSpiBucket(bucket, PART_ID), _bucketInfo); + _handler.handleGetBucketInfo(makeSpiBucket(bucket), _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 6351c187b45..0c79aacc050 100644 --- a/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp +++ b/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp @@ -332,13 +332,12 @@ document::DocumentUpdate::SP upd1(createUpd(type1, docId1)); document::DocumentUpdate::SP upd2(createUpd(type2, docId2)); document::DocumentUpdate::SP upd3(createUpd(type3, docId3)); document::DocumentUpdate::SP bad_id_upd(createUpd(type1, docId2)); -PartitionId partId(0); BucketId bckId1(1); BucketId bckId2(2); BucketId bckId3(3); Bucket bucket0; -Bucket bucket1(makeSpiBucket(bckId1, partId)); -Bucket bucket2(makeSpiBucket(bckId2, partId)); +Bucket bucket1(makeSpiBucket(bckId1)); +Bucket bucket2(makeSpiBucket(bckId2)); BucketChecksum checksum1(1); BucketChecksum checksum2(2); BucketChecksum checksum3(1+2); @@ -433,7 +432,7 @@ void assertBucketList(const BucketIdListResult &result, const std::vector<Bucket void assertBucketList(PersistenceProvider &spi, BucketSpace bucketSpace, const std::vector<BucketId> &expBuckets) { - BucketIdListResult result = spi.listBuckets(bucketSpace, partId); + BucketIdListResult result = spi.listBuckets(bucketSpace); TEST_DO(assertBucketList(result, expBuckets)); } @@ -577,7 +576,6 @@ TEST_F("require that remove is NOT rejected if resource limit is reached", Simpl TEST_F("require that listBuckets() is routed to handlers and merged", SimpleFixture) { f.hset.prepareListBuckets(); - EXPECT_TRUE(f.engine.listBuckets(makeBucketSpace(), PartitionId(1)).getList().empty()); TEST_DO(assertBucketList(f.engine, makeBucketSpace(), { bckId1, bckId2, bckId3 })); } diff --git a/searchcore/src/tests/proton/server/documentretriever_test.cpp b/searchcore/src/tests/proton/server/documentretriever_test.cpp index 90d76e4540b..314e1adcc14 100644 --- a/searchcore/src/tests/proton/server/documentretriever_test.cpp +++ b/searchcore/src/tests/proton/server/documentretriever_test.cpp @@ -387,13 +387,12 @@ TEST_F("require that document retriever can retrieve document meta data", Fixtur TEST_F("require that document retriever can retrieve bucket meta data", Fixture) { DocumentMetaData::Vector result; - f._retriever->getBucketMetaData(makeSpiBucket(f.bucket_id, PartitionId(0)), result); + f._retriever->getBucketMetaData(makeSpiBucket(f.bucket_id), 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(makeSpiBucket(BucketId(f.bucket_id.getId() + 1), - PartitionId(0)), result); + f._retriever->getBucketMetaData(makeSpiBucket(BucketId(f.bucket_id.getId() + 1)), result); EXPECT_EQUAL(0u, result.size()); } |