From 9090ae3ecfbf9b50a398a5d8b178f14b88dc047e Mon Sep 17 00:00:00 2001 From: Mark Nelson Date: Wed, 18 Apr 2018 15:50:16 -0500 Subject: [PATCH] cache: fix clang override unhappiness. Signed-off-by: Mark Nelson --- cache/lru_cache.h | 8 ++++---- cache/sharded_cache.h | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/cache/lru_cache.h b/cache/lru_cache.h index d926e7d8..c80594a1 100644 --- a/cache/lru_cache.h +++ b/cache/lru_cache.h @@ -293,10 +293,10 @@ class LRUCache : public ShardedCache { virtual size_t GetCharge(Handle* handle) const override; virtual uint32_t GetHash(Handle* handle) const override; virtual void DisownData() override; - virtual size_t GetHighPriPoolCapacity() const; - virtual size_t GetHighPriPoolUsage() const; - virtual double GetHighPriPoolRatio() const; - virtual void SetHighPriPoolRatio(double high_pri_pool_ratio); + virtual size_t GetHighPriPoolCapacity() const override; + virtual size_t GetHighPriPoolUsage() const override; + virtual double GetHighPriPoolRatio() const override; + virtual void SetHighPriPoolRatio(double high_pri_pool_ratio) override; // Retrieves number of elements in LRU, for unit test purpose only size_t TEST_GetLRUSize(); diff --git a/cache/sharded_cache.h b/cache/sharded_cache.h index 4f9dea2a..54d0c377 100644 --- a/cache/sharded_cache.h +++ b/cache/sharded_cache.h @@ -59,7 +59,7 @@ class ShardedCache : public Cache { virtual void SetCapacity(size_t capacity) override; virtual void SetStrictCapacityLimit(bool strict_capacity_limit) override; - + virtual void SetHighPriPoolRatio(double high_pri_pool_ratio) override = 0; virtual Status Insert(const Slice& key, void* value, size_t charge, void (*deleter)(const Slice& key, void* value), Handle** handle, Priority priority) override; @@ -69,10 +69,14 @@ class ShardedCache : public Cache { virtual void Erase(const Slice& key) override; virtual uint64_t NewId() override; virtual size_t GetCapacity() const override; + virtual size_t GetHighPriPoolCapacity() const override = 0; virtual bool HasStrictCapacityLimit() const override; virtual size_t GetUsage() const override; virtual size_t GetUsage(Handle* handle) const override; virtual size_t GetPinnedUsage() const override; + virtual size_t GetHighPriPoolUsage() const override = 0; + virtual double GetHighPriPoolRatio() const override = 0; + virtual void ApplyToAllCacheEntries(void (*callback)(void*, size_t), bool thread_safe) override; virtual void EraseUnRefEntries() override; -- 2.47.3