summaryrefslogtreecommitdiffstats
path: root/recipes-extended/ceph/ceph/0002-kv-rocksdb_cache-reorder-ShardedCache-methods-declar.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-extended/ceph/ceph/0002-kv-rocksdb_cache-reorder-ShardedCache-methods-declar.patch')
-rw-r--r--recipes-extended/ceph/ceph/0002-kv-rocksdb_cache-reorder-ShardedCache-methods-declar.patch70
1 files changed, 0 insertions, 70 deletions
diff --git a/recipes-extended/ceph/ceph/0002-kv-rocksdb_cache-reorder-ShardedCache-methods-declar.patch b/recipes-extended/ceph/ceph/0002-kv-rocksdb_cache-reorder-ShardedCache-methods-declar.patch
deleted file mode 100644
index 3fc8c860..00000000
--- a/recipes-extended/ceph/ceph/0002-kv-rocksdb_cache-reorder-ShardedCache-methods-declar.patch
+++ /dev/null
@@ -1,70 +0,0 @@
1From 6cdb1387a713fad765b5193d5acf4504f206a66f Mon Sep 17 00:00:00 2001
2From: Kefu Chai <kchai@redhat.com>
3Date: Tue, 17 Aug 2021 15:39:00 +0800
4Subject: [PATCH 2/6] kv/rocksdb_cache: reorder ShardedCache methods
5 declarations
6
7in the exact order in which rocksdb::Cache declare its public virtual
8methods.
9
10Signed-off-by: Kefu Chai <kchai@redhat.com>
11
12Upstream-Status: Backport [633656f8ade2c1d67a66f8b7ca3aa0a2ae82e6b1]
13
14Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
15---
16 src/kv/rocksdb_cache/ShardedCache.h | 21 ++++++++++-----------
17 1 file changed, 10 insertions(+), 11 deletions(-)
18
19diff --git a/src/kv/rocksdb_cache/ShardedCache.h b/src/kv/rocksdb_cache/ShardedCache.h
20index 8ab2587b..a16cf561 100644
21--- a/src/kv/rocksdb_cache/ShardedCache.h
22+++ b/src/kv/rocksdb_cache/ShardedCache.h
23@@ -56,34 +56,33 @@ class ShardedCache : public rocksdb::Cache, public PriorityCache::PriCache {
24 public:
25 ShardedCache(size_t capacity, int num_shard_bits, bool strict_capacity_limit);
26 virtual ~ShardedCache() = default;
27+ // rocksdb::Cache
28 virtual const char* Name() const override = 0;
29- virtual CacheShard* GetShard(int shard) = 0;
30- virtual const CacheShard* GetShard(int shard) const = 0;
31- virtual void* Value(Handle* handle) override = 0;
32- virtual size_t GetCharge(Handle* handle) const = 0;
33- virtual uint32_t GetHash(Handle* handle) const = 0;
34- virtual void DisownData() override = 0;
35-
36- virtual void SetCapacity(size_t capacity) override;
37- virtual void SetStrictCapacityLimit(bool strict_capacity_limit) override;
38-
39 virtual rocksdb::Status Insert(const rocksdb::Slice& key, void* value, size_t charge,
40 void (*deleter)(const rocksdb::Slice& key, void* value),
41 rocksdb::Cache::Handle** handle, Priority priority) override;
42 virtual rocksdb::Cache::Handle* Lookup(const rocksdb::Slice& key, rocksdb::Statistics* stats) override;
43 virtual bool Ref(rocksdb::Cache::Handle* handle) override;
44 virtual bool Release(rocksdb::Cache::Handle* handle, bool force_erase = false) override;
45+ virtual void* Value(Handle* handle) override = 0;
46 virtual void Erase(const rocksdb::Slice& key) override;
47 virtual uint64_t NewId() override;
48- virtual size_t GetCapacity() const override;
49+ virtual void SetCapacity(size_t capacity) override;
50+ virtual void SetStrictCapacityLimit(bool strict_capacity_limit) override;
51 virtual bool HasStrictCapacityLimit() const override;
52+ virtual size_t GetCapacity() const override;
53 virtual size_t GetUsage() const override;
54 virtual size_t GetUsage(rocksdb::Cache::Handle* handle) const override;
55 virtual size_t GetPinnedUsage() const override;
56+ virtual size_t GetCharge(Handle* handle) const = 0;
57+ virtual void DisownData() override = 0;
58 virtual void ApplyToAllCacheEntries(void (*callback)(void*, size_t),
59 bool thread_safe) override;
60 virtual void EraseUnRefEntries() override;
61 virtual std::string GetPrintableOptions() const override;
62+ virtual CacheShard* GetShard(int shard) = 0;
63+ virtual const CacheShard* GetShard(int shard) const = 0;
64+ virtual uint32_t GetHash(Handle* handle) const = 0;
65
66 int GetNumShardBits() const { return num_shard_bits_; }
67
68--
692.33.0
70