NextGraph
/
rocksdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor (Hyper)ClockCache code (#10887)

Browse Source 
Summary:
For clean-up and in preparation for some other anticipated changes, including
* A new dynamically-scaling variant of HyperClockCache
* SecondaryCache support for HyperClockCache

This change does some refactoring for current and future code sharing and reusability. (Including follow-up on https://github.com/facebook/rocksdb/issues/10843)

## clock_cache.h
* TBD whether new variant will be a HyperClockCache or use some other name, so namespace is just clock_cache for the family of structures.
* A number of helper functions introduced and used.
* Pre-emptively split ClockHandle (shared among lock-free clock cache variants) and HandleImpl (specific to a kind of Table), and introduce template to plug new Table implementation into ClockCacheShard.

## clock_cache.cc
* Mostly using helper functions. Some things like `Rollback()` and `FreeDataMarkEmpty()` were not combined because `Rollback()` is Table-specific while `FreeDataMarkEmpty()` can be used with different table implementations.
* Performance testing indicated that despite more opportunities for parallelism, making a local copy of handle data for processing after marking an entry empty was slower than doing that processing before marking the entry empty (but after marking it "under construction"), thus avoiding a few words of copying data. At least for now, this answers the "TODO? Delay freeing?" questions (no).

Pull Request resolved: https://github.com/facebook/rocksdb/pull/10887

Test Plan:
fixed a unit testing gap; other minor test updates for refactoring

No functionality change

## Performance
Same setup as https://github.com/facebook/rocksdb/issues/10801:

Before: `readrandom [AVG 81 runs] : 627992 (± 5124) ops/sec`
After: `readrandom [AVG 81 runs] : 637512 (± 4866) ops/sec`

I've been getting some inconsistent results on restarts like the system is not being fair to the two processes, so I'm not sure there's such a real difference.

Reviewed By: anand1976

Differential Revision: D40959240

Pulled By: pdillinger

fbshipit-source-id: 0a8f3646b3bdb5bc7aaad60b26790b0779189949
main
Peter Dillinger 2 years ago committed by Facebook GitHub Bot
parent 0d5dc5fdb9
commit cc8c8f6958
3 changed files with 550 additions and 426 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 745
      cache/clock_cache.cc
  2. 185
      cache/clock_cache.h
  3. 46
      cache/lru_cache_test.cc

745
cache/clock_cache.cc vendored
View File

File diff suppressed because it is too large Load Diff

185
cache/clock_cache.h vendored
Unescape View File

@ -27,7 +27,7 @@
namespace ROCKSDB_NAMESPACE { namespace ROCKSDB_NAMESPACE {
namespace hyper_clock_cache { namespace clock_cache {
// Forward declaration of friend class. // Forward declaration of friend class.
class ClockCacheTest; class ClockCacheTest;
@ -311,6 +311,14 @@ struct ClockHandleBasicData {
UniqueId64x2 hashed_key = kNullUniqueId64x2; UniqueId64x2 hashed_key = kNullUniqueId64x2;
size_t total_charge = 0; size_t total_charge = 0;
// For total_charge_and_flags
// "Detached" means the handle is allocated separately from hash table.
static constexpr uint64_t kFlagDetached = uint64_t{1} << 63;
// Extract just the total charge
static constexpr uint64_t kTotalChargeMask = kFlagDetached - 1;
inline size_t GetTotalCharge() const { return total_charge; }
// Calls deleter (if non-null) on cache key and value // Calls deleter (if non-null) on cache key and value
void FreeData() const; void FreeData() const;
@ -318,9 +326,7 @@ struct ClockHandleBasicData {
const UniqueId64x2& GetHash() const { return hashed_key; } const UniqueId64x2& GetHash() const { return hashed_key; }
}; };
// Target size to be exactly a common cache line size (see static_assert in struct ClockHandle : public ClockHandleBasicData {
// clock_cache.cc)
struct ALIGN_AS(64U) ClockHandle : public ClockHandleBasicData {
// Constants for handling the atomic `meta` word, which tracks most of the // Constants for handling the atomic `meta` word, which tracks most of the
// state of the handle. The meta word looks like this: // state of the handle. The meta word looks like this:
// low bits high bits // low bits high bits
@ -372,32 +378,54 @@ struct ALIGN_AS(64U) ClockHandle : public ClockHandleBasicData {
// See above // See above
std::atomic<uint64_t> meta{}; std::atomic<uint64_t> meta{};
// The number of elements that hash to this slot or a lower one, but wind
// up in this slot or a higher one.
std::atomic<uint32_t> displacements{};
// True iff the handle is allocated separately from hash table. // Anticipating use for SecondaryCache support
bool detached = false; void* reserved_for_future_use = nullptr;
}; // struct ClockHandle }; // struct ClockHandle
class ClockHandleTable { class HyperClockTable {
public: public:
explicit ClockHandleTable(int hash_bits, bool initial_charge_metadata); // Target size to be exactly a common cache line size (see static_assert in
~ClockHandleTable(); // clock_cache.cc)
struct ALIGN_AS(64U) HandleImpl : public ClockHandle {
// The number of elements that hash to this slot or a lower one, but wind
// up in this slot or a higher one.
std::atomic<uint32_t> displacements{};
// Whether this is a "deteched" handle that is independently allocated
// with `new` (so must be deleted with `delete`).
// TODO: ideally this would be packed into some other data field, such
// as upper bits of total_charge, but that incurs a measurable performance
// regression.
bool detached = false;
inline bool IsDetached() const { return detached; }
inline void SetDetached() { detached = true; }
}; // struct HandleImpl
struct Opts {
size_t estimated_value_size;
};
HyperClockTable(size_t capacity, bool strict_capacity_limit,
CacheMetadataChargePolicy metadata_charge_policy,
const Opts& opts);
~HyperClockTable();
Status Insert(const ClockHandleBasicData& proto, ClockHandle** handle, Status Insert(const ClockHandleBasicData& proto, HandleImpl** handle,
Cache::Priority priority, size_t capacity, Cache::Priority priority, size_t capacity,
bool strict_capacity_limit); bool strict_capacity_limit);
ClockHandle* Lookup(const UniqueId64x2& hashed_key); HandleImpl* Lookup(const UniqueId64x2& hashed_key);
bool Release(ClockHandle* handle, bool useful, bool erase_if_last_ref); bool Release(HandleImpl* handle, bool useful, bool erase_if_last_ref);
void Ref(ClockHandle& handle); void Ref(HandleImpl& handle);
void Erase(const UniqueId64x2& hashed_key); void Erase(const UniqueId64x2& hashed_key);
void ConstApplyToEntriesRange(std::function<void(const ClockHandle&)> func, void ConstApplyToEntriesRange(std::function<void(const HandleImpl&)> func,
size_t index_begin, size_t index_end, size_t index_begin, size_t index_end,
bool apply_if_will_be_deleted) const; bool apply_if_will_be_deleted) const;
@ -407,8 +435,6 @@ class ClockHandleTable {
int GetLengthBits() const { return length_bits_; } int GetLengthBits() const { return length_bits_; }
size_t GetOccupancyLimit() const { return occupancy_limit_; }
size_t GetOccupancy() const { size_t GetOccupancy() const {
return occupancy_.load(std::memory_order_relaxed); return occupancy_.load(std::memory_order_relaxed);
} }
@ -420,8 +446,8 @@ class ClockHandleTable {
} }
// Acquire/release N references // Acquire/release N references
void TEST_RefN(ClockHandle& handle, size_t n); void TEST_RefN(HandleImpl& handle, size_t n);
void TEST_ReleaseN(ClockHandle* handle, size_t n); void TEST_ReleaseN(HandleImpl* handle, size_t n);
private: // functions private: // functions
// Returns x mod 2^{length_bits_}. // Returns x mod 2^{length_bits_}.
@ -432,8 +458,8 @@ class ClockHandleTable {
// Runs the clock eviction algorithm trying to reclaim at least // Runs the clock eviction algorithm trying to reclaim at least
// requested_charge. Returns how much is evicted, which could be less // requested_charge. Returns how much is evicted, which could be less
// if it appears impossible to evict the requested amount without blocking. // if it appears impossible to evict the requested amount without blocking.
void Evict(size_t requested_charge, size_t* freed_charge, inline void Evict(size_t requested_charge, size_t* freed_charge,
size_t* freed_count); size_t* freed_count);
// Returns the first slot in the probe sequence, starting from the given // Returns the first slot in the probe sequence, starting from the given
// probe number, with a handle e such that match(e) is true. At every // probe number, with a handle e such that match(e) is true. At every
@ -446,15 +472,54 @@ class ClockHandleTable {
// value of probe is one more than the last non-aborting probe during the // value of probe is one more than the last non-aborting probe during the
// call. This is so that that the variable can be used to keep track of // call. This is so that that the variable can be used to keep track of
// progress across consecutive calls to FindSlot. // progress across consecutive calls to FindSlot.
inline ClockHandle* FindSlot(const UniqueId64x2& hashed_key, inline HandleImpl* FindSlot(const UniqueId64x2& hashed_key,
std::function<bool(ClockHandle*)> match, std::function<bool(HandleImpl*)> match,
std::function<bool(ClockHandle*)> stop, std::function<bool(HandleImpl*)> stop,
std::function<void(ClockHandle*)> update, std::function<void(HandleImpl*)> update,
size_t& probe); size_t& probe);
// Re-decrement all displacements in probe path starting from beginning // Re-decrement all displacements in probe path starting from beginning
// until (not including) the given handle // until (not including) the given handle
void Rollback(const UniqueId64x2& hashed_key, const ClockHandle* h); inline void Rollback(const UniqueId64x2& hashed_key, const HandleImpl* h);
// Subtracts `total_charge` from `usage_` and 1 from `occupancy_`.
// Ideally this comes after releasing the entry itself so that we
// actually have the available occupancy/usage that is claimed.
// However, that means total_charge has to be saved from the handle
// before releasing it so that it can be provided to this function.
inline void ReclaimEntryUsage(size_t total_charge);
// Helper for updating `usage_` for new entry with given `total_charge`
// and evicting if needed under strict_capacity_limit=true rules. This
// means the operation might fail with Status::MemoryLimit. If
// `need_evict_for_occupancy`, then eviction of at least one entry is
// required, and the operation should fail if not possible.
// NOTE: Otherwise, occupancy_ is not managed in this function
inline Status ChargeUsageMaybeEvictStrict(size_t total_charge,
size_t capacity,
bool need_evict_for_occupancy);
// Helper for updating `usage_` for new entry with given `total_charge`
// and evicting if needed under strict_capacity_limit=false rules. This
// means that updating `usage_` always succeeds even if forced to exceed
// capacity. If `need_evict_for_occupancy`, then eviction of at least one
// entry is required, and the operation should return false if such eviction
// is not possible. `usage_` is not updated in that case. Otherwise, returns
// true, indicating success.
// NOTE: occupancy_ is not managed in this function
inline bool ChargeUsageMaybeEvictNonStrict(size_t total_charge,
size_t capacity,
bool need_evict_for_occupancy);
// Creates a "detached" handle for returning from an Insert operation that
// cannot be completed by actually inserting into the table.
// Updates `detached_usage_` but not `usage_` nor `occupancy_`.
inline HandleImpl* DetachedInsert(const ClockHandleBasicData& proto);
// Returns the number of bits used to hash an element in the hash
// table.
static int CalcHashBits(size_t capacity, size_t estimated_value_size,
CacheMetadataChargePolicy metadata_charge_policy);
private: // data private: // data
// Number of hash bits used for table index. // Number of hash bits used for table index.
@ -468,7 +533,7 @@ class ClockHandleTable {
const size_t occupancy_limit_; const size_t occupancy_limit_;
// Array of slots comprising the hash table. // Array of slots comprising the hash table.
const std::unique_ptr<ClockHandle[]> array_; const std::unique_ptr<HandleImpl[]> array_;
// We partition the following members into different cache lines // We partition the following members into different cache lines
// to avoid false sharing among Lookup, Release, Erase and Insert // to avoid false sharing among Lookup, Release, Erase and Insert
@ -487,17 +552,18 @@ class ClockHandleTable {
// Part of usage by detached entries (not in table) // Part of usage by detached entries (not in table)
std::atomic<size_t> detached_usage_{}; std::atomic<size_t> detached_usage_{};
}; // class ClockHandleTable }; // class HyperClockTable
// A single shard of sharded cache. // A single shard of sharded cache.
template <class Table>
class ALIGN_AS(CACHE_LINE_SIZE) ClockCacheShard final : public CacheShardBase { class ALIGN_AS(CACHE_LINE_SIZE) ClockCacheShard final : public CacheShardBase {
public: public:
ClockCacheShard(size_t capacity, size_t estimated_value_size, ClockCacheShard(size_t capacity, bool strict_capacity_limit,
bool strict_capacity_limit, CacheMetadataChargePolicy metadata_charge_policy,
CacheMetadataChargePolicy metadata_charge_policy); const typename Table::Opts& opts);
// For CacheShard concept // For CacheShard concept
using HandleImpl = ClockHandle; using HandleImpl = typename Table::HandleImpl;
// Hash is lossless hash of 128-bit key // Hash is lossless hash of 128-bit key
using HashVal = UniqueId64x2; using HashVal = UniqueId64x2;
using HashCref = const HashVal&; using HashCref = const HashVal&;
@ -532,16 +598,16 @@ class ALIGN_AS(CACHE_LINE_SIZE) ClockCacheShard final : public CacheShardBase {
void SetStrictCapacityLimit(bool strict_capacity_limit); void SetStrictCapacityLimit(bool strict_capacity_limit);
Status Insert(const Slice& key, const UniqueId64x2& hashed_key, void* value, Status Insert(const Slice& key, const UniqueId64x2& hashed_key, void* value,
size_t charge, Cache::DeleterFn deleter, ClockHandle** handle, size_t charge, Cache::DeleterFn deleter, HandleImpl** handle,
Cache::Priority priority); Cache::Priority priority);
ClockHandle* Lookup(const Slice& key, const UniqueId64x2& hashed_key); HandleImpl* Lookup(const Slice& key, const UniqueId64x2& hashed_key);
bool Release(ClockHandle* handle, bool useful, bool erase_if_last_ref); bool Release(HandleImpl* handle, bool useful, bool erase_if_last_ref);
bool Release(ClockHandle* handle, bool erase_if_last_ref = false); bool Release(HandleImpl* handle, bool erase_if_last_ref = false);
bool Ref(ClockHandle* handle); bool Ref(HandleImpl* handle);
void Erase(const Slice& key, const UniqueId64x2& hashed_key); void Erase(const Slice& key, const UniqueId64x2& hashed_key);
@ -565,40 +631,29 @@ class ALIGN_AS(CACHE_LINE_SIZE) ClockCacheShard final : public CacheShardBase {
// SecondaryCache not yet supported // SecondaryCache not yet supported
Status Insert(const Slice& key, const UniqueId64x2& hashed_key, void* value, Status Insert(const Slice& key, const UniqueId64x2& hashed_key, void* value,
const Cache::CacheItemHelper* helper, size_t charge, const Cache::CacheItemHelper* helper, size_t charge,
ClockHandle** handle, Cache::Priority priority) { HandleImpl** handle, Cache::Priority priority) {
return Insert(key, hashed_key, value, charge, helper->del_cb, handle, return Insert(key, hashed_key, value, charge, helper->del_cb, handle,
priority); priority);
} }
ClockHandle* Lookup(const Slice& key, const UniqueId64x2& hashed_key, HandleImpl* Lookup(const Slice& key, const UniqueId64x2& hashed_key,
const Cache::CacheItemHelper* /*helper*/, const Cache::CacheItemHelper* /*helper*/,
const Cache::CreateCallback& /*create_cb*/, const Cache::CreateCallback& /*create_cb*/,
Cache::Priority /*priority*/, bool /*wait*/, Cache::Priority /*priority*/, bool /*wait*/,
Statistics* /*stats*/) { Statistics* /*stats*/) {
return Lookup(key, hashed_key); return Lookup(key, hashed_key);
} }
bool IsReady(ClockHandle* /*handle*/) { return true; } bool IsReady(HandleImpl* /*handle*/) { return true; }
void Wait(ClockHandle* /*handle*/) {} void Wait(HandleImpl* /*handle*/) {}
// Acquire/release N references // Acquire/release N references
void TEST_RefN(ClockHandle* handle, size_t n); void TEST_RefN(HandleImpl* handle, size_t n);
void TEST_ReleaseN(ClockHandle* handle, size_t n); void TEST_ReleaseN(HandleImpl* handle, size_t n);
private: // functions
friend class ClockCache;
friend class ClockCacheTest;
ClockHandle* DetachedInsert(const ClockHandleBasicData& h);
// Returns the number of bits used to hash an element in the hash
// table.
static int CalcHashBits(size_t capacity, size_t estimated_value_size,
CacheMetadataChargePolicy metadata_charge_policy);
private: // data private: // data
ClockHandleTable table_; Table table_;
// Maximum total charge of all elements stored in the table. // Maximum total charge of all elements stored in the table.
std::atomic<size_t> capacity_; std::atomic<size_t> capacity_;
@ -611,8 +666,10 @@ class HyperClockCache
#ifdef NDEBUG #ifdef NDEBUG
final final
#endif #endif
: public ShardedCache<ClockCacheShard> { : public ShardedCache<ClockCacheShard<HyperClockTable>> {
public: public:
using Shard = ClockCacheShard<HyperClockTable>;
HyperClockCache(size_t capacity, size_t estimated_value_size, HyperClockCache(size_t capacity, size_t estimated_value_size,
int num_shard_bits, bool strict_capacity_limit, int num_shard_bits, bool strict_capacity_limit,
CacheMetadataChargePolicy metadata_charge_policy, CacheMetadataChargePolicy metadata_charge_policy,
@ -627,6 +684,6 @@ class HyperClockCache
DeleterFn GetDeleter(Handle* handle) const override; DeleterFn GetDeleter(Handle* handle) const override;
}; // class HyperClockCache }; // class HyperClockCache
} // namespace hyper_clock_cache } // namespace clock_cache
} // namespace ROCKSDB_NAMESPACE } // namespace ROCKSDB_NAMESPACE

46
cache/lru_cache_test.cc vendored
Unescape View File

@ -506,10 +506,14 @@ TEST_F(FastLRUCacheTest, CalcHashBitsTest) {
} // namespace fast_lru_cache } // namespace fast_lru_cache
namespace hyper_clock_cache { namespace clock_cache {
class ClockCacheTest : public testing::Test { class ClockCacheTest : public testing::Test {
public: public:
using Shard = HyperClockCache::Shard;
using Table = HyperClockTable;
using HandleImpl = Shard::HandleImpl;
ClockCacheTest() {} ClockCacheTest() {}
~ClockCacheTest() override { DeleteShard(); } ~ClockCacheTest() override { DeleteShard(); }
@ -523,10 +527,13 @@ class ClockCacheTest : public testing::Test {
void NewShard(size_t capacity, bool strict_capacity_limit = true) { void NewShard(size_t capacity, bool strict_capacity_limit = true) {
DeleteShard(); DeleteShard();
shard_ = reinterpret_cast<ClockCacheShard*>( shard_ =
port::cacheline_aligned_alloc(sizeof(ClockCacheShard))); reinterpret_cast<Shard*>(port::cacheline_aligned_alloc(sizeof(Shard)));
new (shard_) ClockCacheShard(capacity, 1, strict_capacity_limit,
kDontChargeCacheMetadata); Table::Opts opts;
opts.estimated_value_size = 1;
new (shard_)
Shard(capacity, strict_capacity_limit, kDontChargeCacheMetadata, opts);
} }
Status Insert(const UniqueId64x2& hashed_key, Status Insert(const UniqueId64x2& hashed_key,
@ -580,7 +587,7 @@ class ClockCacheTest : public testing::Test {
return {(static_cast<uint64_t>(key) << 56) + 1234U, 5678U}; return {(static_cast<uint64_t>(key) << 56) + 1234U, 5678U};
} }
ClockCacheShard* shard_ = nullptr; Shard* shard_ = nullptr;
}; };
TEST_F(ClockCacheTest, Misc) { TEST_F(ClockCacheTest, Misc) {
@ -604,7 +611,8 @@ TEST_F(ClockCacheTest, Misc) {
} }
TEST_F(ClockCacheTest, Limits) { TEST_F(ClockCacheTest, Limits) {
NewShard(3, false /*strict_capacity_limit*/); constexpr size_t kCapacity = 3;
NewShard(kCapacity, false /*strict_capacity_limit*/);
for (bool strict_capacity_limit : {false, true, false}) { for (bool strict_capacity_limit : {false, true, false}) {
SCOPED_TRACE("strict_capacity_limit = " + SCOPED_TRACE("strict_capacity_limit = " +
std::to_string(strict_capacity_limit)); std::to_string(strict_capacity_limit));
@ -628,7 +636,7 @@ TEST_F(ClockCacheTest, Limits) {
// Single entry fills capacity // Single entry fills capacity
{ {
ClockHandle* h; HandleImpl* h;
ASSERT_OK(shard_->Insert(TestKey(hkey), hkey, nullptr /*value*/, ASSERT_OK(shard_->Insert(TestKey(hkey), hkey, nullptr /*value*/,
3 /*charge*/, nullptr /*deleter*/, &h, 3 /*charge*/, nullptr /*deleter*/, &h,
Cache::Priority::LOW)); Cache::Priority::LOW));
@ -644,15 +652,17 @@ TEST_F(ClockCacheTest, Limits) {
shard_->Release(h, false /*useful*/, false /*erase_if_last_ref*/); shard_->Release(h, false /*useful*/, false /*erase_if_last_ref*/);
} }
// Insert more than table size can handle (cleverly using zero-charge // Insert more than table size can handle to exceed occupancy limit.
// entries) to exceed occupancy limit. // (Cleverly using mostly zero-charge entries, but some non-zero to
// verify usage tracking on detached entries.)
{ {
size_t n = shard_->GetTableAddressCount() + 1; size_t n = shard_->GetTableAddressCount() + 1;
std::unique_ptr<ClockHandle* []> ha { new ClockHandle* [n] {} }; std::unique_ptr<HandleImpl* []> ha { new HandleImpl* [n] {} };
Status s; Status s;
for (size_t i = 0; i < n && s.ok(); ++i) { for (size_t i = 0; i < n && s.ok(); ++i) {
hkey[1] = i; hkey[1] = i;
s = shard_->Insert(TestKey(hkey), hkey, nullptr /*value*/, 0 /*charge*/, s = shard_->Insert(TestKey(hkey), hkey, nullptr /*value*/,
(i + kCapacity < n) ? 0 : 1 /*charge*/,
nullptr /*deleter*/, &ha[i], Cache::Priority::LOW); nullptr /*deleter*/, &ha[i], Cache::Priority::LOW);
if (i == 0) { if (i == 0) {
EXPECT_OK(s); EXPECT_OK(s);
@ -798,7 +808,7 @@ void IncrementIntDeleter(const Slice& /*key*/, void* value) {
// Testing calls to CorrectNearOverflow in Release // Testing calls to CorrectNearOverflow in Release
TEST_F(ClockCacheTest, ClockCounterOverflowTest) { TEST_F(ClockCacheTest, ClockCounterOverflowTest) {
NewShard(6, /*strict_capacity_limit*/ false); NewShard(6, /*strict_capacity_limit*/ false);
ClockHandle* h; HandleImpl* h;
int deleted = 0; int deleted = 0;
UniqueId64x2 hkey = TestHashedKey('x'); UniqueId64x2 hkey = TestHashedKey('x');
ASSERT_OK(shard_->Insert(TestKey(hkey), hkey, &deleted, 1, ASSERT_OK(shard_->Insert(TestKey(hkey), hkey, &deleted, 1,
@ -840,18 +850,18 @@ TEST_F(ClockCacheTest, CollidingInsertEraseTest) {
Slice key2 = TestKey(hkey2); Slice key2 = TestKey(hkey2);
UniqueId64x2 hkey3 = TestHashedKey('z'); UniqueId64x2 hkey3 = TestHashedKey('z');
Slice key3 = TestKey(hkey3); Slice key3 = TestKey(hkey3);
ClockHandle* h1; HandleImpl* h1;
ASSERT_OK(shard_->Insert(key1, hkey1, &deleted, 1, IncrementIntDeleter, &h1, ASSERT_OK(shard_->Insert(key1, hkey1, &deleted, 1, IncrementIntDeleter, &h1,
Cache::Priority::HIGH)); Cache::Priority::HIGH));
ClockHandle* h2; HandleImpl* h2;
ASSERT_OK(shard_->Insert(key2, hkey2, &deleted, 1, IncrementIntDeleter, &h2, ASSERT_OK(shard_->Insert(key2, hkey2, &deleted, 1, IncrementIntDeleter, &h2,
Cache::Priority::HIGH)); Cache::Priority::HIGH));
ClockHandle* h3; HandleImpl* h3;
ASSERT_OK(shard_->Insert(key3, hkey3, &deleted, 1, IncrementIntDeleter, &h3, ASSERT_OK(shard_->Insert(key3, hkey3, &deleted, 1, IncrementIntDeleter, &h3,
Cache::Priority::HIGH)); Cache::Priority::HIGH));
// Can repeatedly lookup+release despite the hash collision // Can repeatedly lookup+release despite the hash collision
ClockHandle* tmp_h; HandleImpl* tmp_h;
for (bool erase_if_last_ref : {true, false}) { // but not last ref for (bool erase_if_last_ref : {true, false}) { // but not last ref
tmp_h = shard_->Lookup(key1, hkey1); tmp_h = shard_->Lookup(key1, hkey1);
ASSERT_EQ(h1, tmp_h); ASSERT_EQ(h1, tmp_h);
@ -999,7 +1009,7 @@ TEST_F(ClockCacheTest, TableSizesTest) {
} }
} }
} // namespace hyper_clock_cache } // namespace clock_cache
class TestSecondaryCache : public SecondaryCache { class TestSecondaryCache : public SecondaryCache {
public: public:

Write Preview
Loading…
Cancel
Save