From 4e2dbbc64561204633debdbc7b8abde63402b4fc Mon Sep 17 00:00:00 2001 From: Tor Brede Vekterli Date: Wed, 3 Jun 2020 12:48:50 +0000 Subject: Remove unused legacy bucket DB functionality --- storage/src/tests/bucketdb/lockablemaptest.cpp | 149 --------------------- storage/src/vespa/storage/bucketdb/lockablemap.h | 5 - storage/src/vespa/storage/bucketdb/lockablemap.hpp | 34 ----- 3 files changed, 188 deletions(-) (limited to 'storage/src') diff --git a/storage/src/tests/bucketdb/lockablemaptest.cpp b/storage/src/tests/bucketdb/lockablemaptest.cpp index 3dd4dfccf77..101b9d014fa 100644 --- a/storage/src/tests/bucketdb/lockablemaptest.cpp +++ b/storage/src/tests/bucketdb/lockablemaptest.cpp @@ -641,155 +641,6 @@ TEST(LockableMapTest, find_all_inconsistent_below_16_bits) { EXPECT_EQ(A(3,4,5), *results[id3.stripUnused()]); // sub bucket } -TEST(LockableMapTest, create) { - Map map; - { - document::BucketId id1(58, 0x43d6c878000004d2ull); - - auto entries = map.getContained(id1, "foo"); - - EXPECT_EQ(0, entries.size()); - - Map::WrappedEntry entry = map.createAppropriateBucket(36, "", id1); - EXPECT_EQ(document::BucketId(36,0x8000004d2ull), entry.getBucketId()); - } - { - document::BucketId id1(58, 0x423bf1e0000004d2ull); - - auto entries = map.getContained(id1, "foo"); - EXPECT_EQ(0, entries.size()); - - Map::WrappedEntry entry = map.createAppropriateBucket(36, "", id1); - EXPECT_EQ(document::BucketId(36,0x0000004d2ull), entry.getBucketId()); - } - - EXPECT_EQ(2, map.size()); -} - -TEST(LockableMapTest, create_2) { - Map map; - { - document::BucketId id1(58, 0xeaf77782000004d2); - Map::WrappedEntry entry( - map.get(id1.stripUnused().toKey(), "foo", true)); - } - { - document::BucketId id1(58, 0x00000000000004d2); - auto entries = map.getContained(id1, "foo"); - - EXPECT_EQ(0, entries.size()); - - Map::WrappedEntry entry = map.createAppropriateBucket(16, "", id1); - - EXPECT_EQ(document::BucketId(34, 0x0000004d2ull), entry.getBucketId()); - } - - EXPECT_EQ(2, map.size()); -} - -TEST(LockableMapTest, create_3) { - Map map; - { - document::BucketId id1(58, 0xeaf77780000004d2); - Map::WrappedEntry entry( - map.get(id1.stripUnused().toKey(), "foo", true)); - } - { - document::BucketId id1(58, 0xeaf77782000004d2); - Map::WrappedEntry entry( - map.get(id1.stripUnused().toKey(), "foo", true)); - } - { - document::BucketId id1(58, 0x00000000000004d2); - auto entries = map.getContained(id1, "foo"); - - EXPECT_EQ(0, entries.size()); - - Map::WrappedEntry entry = map.createAppropriateBucket(16, "", id1); - EXPECT_EQ(document::BucketId(40, 0x0000004d2ull), entry.getBucketId()); - } -} - -TEST(LockableMapTest, create_4) { - Map map; - { - document::BucketId id1(16, 0x00000000000004d1); - Map::WrappedEntry entry( - map.get(id1.stripUnused().toKey(), "foo", true)); - } - { - document::BucketId id1(40, 0x00000000000004d2); - Map::WrappedEntry entry( - map.get(id1.stripUnused().toKey(), "foo", true)); - } - { - document::BucketId id1(58, 0x00000000010004d2); - Map::WrappedEntry entry = map.createAppropriateBucket(16, "", id1); - - EXPECT_EQ(document::BucketId(25, 0x0010004d2ull), entry.getBucketId()); - } -} - -TEST(LockableMapTest, create_5) { - Map map; - { - document::BucketId id1(0x8c000000000004d2); - Map::WrappedEntry entry( - map.get(id1.stripUnused().toKey(), "foo", true)); - } - - { - document::BucketId id1(0xeb54b3ac000004d2); - Map::WrappedEntry entry( - map.get(id1.stripUnused().toKey(), "foo", true)); - } - - { - document::BucketId id1(0x88000002000004d2); - Map::WrappedEntry entry( - map.get(id1.stripUnused().toKey(), "foo", true)); - } - { - document::BucketId id1(0x84000001000004d2); - Map::WrappedEntry entry( - map.get(id1.stripUnused().toKey(), "foo", true)); - } - { - document::BucketId id1(0xe9944a44000004d2); - Map::WrappedEntry entry = map.createAppropriateBucket(16, "", id1); - EXPECT_EQ(document::BucketId(0x90000004000004d2), entry.getBucketId()); - } -} - -TEST(LockableMapTest, create_6) { - Map map; - { - document::BucketId id1(58, 0xeaf77780000004d2); - Map::WrappedEntry entry( - map.get(id1.stripUnused().toKey(), "foo", true)); - } - { - document::BucketId id1(40, 0x00000000000004d1); - - Map::WrappedEntry entry( - map.get(id1.stripUnused().toKey(), "foo", true)); - } - { - document::BucketId id1(58, 0x00000000010004d2); - Map::WrappedEntry entry = map.createAppropriateBucket(16, "", id1); - EXPECT_EQ(document::BucketId(25, 0x0010004d2ull), entry.getBucketId()); - } -} - -TEST(LockableMapTest, create_empty) { - Map map; - { - document::BucketId id1(58, 0x00000000010004d2); - Map::WrappedEntry entry = map.createAppropriateBucket(16, "", id1); - EXPECT_EQ(document::BucketId(16, 0x0000004d2ull), entry.getBucketId()); - } -} - TEST(LockableMapTest, is_consistent) { Map map; document::BucketId id1(16, 0x00001); // contains id2-id3 diff --git a/storage/src/vespa/storage/bucketdb/lockablemap.h b/storage/src/vespa/storage/bucketdb/lockablemap.h index f6357e8851e..8b4e403b899 100644 --- a/storage/src/vespa/storage/bucketdb/lockablemap.h +++ b/storage/src/vespa/storage/bucketdb/lockablemap.h @@ -187,11 +187,6 @@ public: std::map getContained(const BucketId& bucketId, const char* clientId); - WrappedEntry - createAppropriateBucket(uint16_t newBucketBits, - const char* clientId, - const BucketId& bucket); - typedef std::map EntryMap; /** diff --git a/storage/src/vespa/storage/bucketdb/lockablemap.hpp b/storage/src/vespa/storage/bucketdb/lockablemap.hpp index a0d7e63c1fd..2ca2183ae26 100644 --- a/storage/src/vespa/storage/bucketdb/lockablemap.hpp +++ b/storage/src/vespa/storage/bucketdb/lockablemap.hpp @@ -590,40 +590,6 @@ LockableMap::addAndLockResults( uint8_t getMinDiffBits(uint16_t minBits, const document::BucketId& a, const document::BucketId& b); -template -typename LockableMap::WrappedEntry -LockableMap::createAppropriateBucket( - uint16_t newBucketBits, - const char* clientId, - const BucketId& bucket) -{ - std::unique_lock guard(_lock); - typename Map::const_iterator iter = _map.lower_bound(bucket.toKey()); - - // Find the two buckets around the possible new bucket. The new - // bucket's used bits should be the highest used bits it can be while - // still being different from both of these. - if (iter != _map.end()) { - newBucketBits = getMinDiffBits(newBucketBits, BucketId(BucketId::keyToBucketId(iter->first)), bucket); - } - - if (iter != _map.begin()) { - --iter; - newBucketBits = getMinDiffBits(newBucketBits, BucketId(BucketId::keyToBucketId(iter->first)), bucket); - } - - BucketId newBucket(newBucketBits, bucket.getRawId()); - newBucket.setUsedBits(newBucketBits); - BucketId::Type key = newBucket.stripUnused().toKey(); - - LockId lid(key, clientId); - acquireKey(lid, guard); - bool preExisted; - typename Map::iterator it = _map.find(key, true, preExisted); - _lockedKeys.insert(LockId(key, clientId)); - return WrappedEntry(*this, key, it->second, clientId, preExisted); -} - template std::map::WrappedEntry> LockableMap::getContained(const BucketId& bucket, -- cgit v1.2.3