diff options
Diffstat (limited to 'recipes-extended/ceph/ceph/0003-kv-rocksdb_cache-define-DeleterFn-function-pointer-t.patch')
-rw-r--r-- | recipes-extended/ceph/ceph/0003-kv-rocksdb_cache-define-DeleterFn-function-pointer-t.patch | 101 |
1 files changed, 0 insertions, 101 deletions
diff --git a/recipes-extended/ceph/ceph/0003-kv-rocksdb_cache-define-DeleterFn-function-pointer-t.patch b/recipes-extended/ceph/ceph/0003-kv-rocksdb_cache-define-DeleterFn-function-pointer-t.patch deleted file mode 100644 index 01144b79..00000000 --- a/recipes-extended/ceph/ceph/0003-kv-rocksdb_cache-define-DeleterFn-function-pointer-t.patch +++ /dev/null | |||
@@ -1,101 +0,0 @@ | |||
1 | From 29f1e556c1e7c5ab195983552387e1410e0b5b6c Mon Sep 17 00:00:00 2001 | ||
2 | From: Kefu Chai <kchai@redhat.com> | ||
3 | Date: Tue, 17 Aug 2021 16:25:32 +0800 | ||
4 | Subject: [PATCH 3/6] kv/rocksdb_cache: define DeleterFn function pointer type | ||
5 | |||
6 | this paves the road to rocksdb v6.22.1 compatible implementation | ||
7 | |||
8 | Signed-off-by: Kefu Chai <kchai@redhat.com> | ||
9 | |||
10 | Upstream-Status: Backport [c7a6c74b62dfcc96f676eb6d8844852c4705b66f] | ||
11 | |||
12 | Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> | ||
13 | --- | ||
14 | src/kv/rocksdb_cache/BinnedLRUCache.cc | 2 +- | ||
15 | src/kv/rocksdb_cache/BinnedLRUCache.h | 4 ++-- | ||
16 | src/kv/rocksdb_cache/ShardedCache.cc | 2 +- | ||
17 | src/kv/rocksdb_cache/ShardedCache.h | 6 ++++-- | ||
18 | 4 files changed, 8 insertions(+), 6 deletions(-) | ||
19 | |||
20 | diff --git a/src/kv/rocksdb_cache/BinnedLRUCache.cc b/src/kv/rocksdb_cache/BinnedLRUCache.cc | ||
21 | index 2391a7f6..4e5f4dd4 100644 | ||
22 | --- a/src/kv/rocksdb_cache/BinnedLRUCache.cc | ||
23 | +++ b/src/kv/rocksdb_cache/BinnedLRUCache.cc | ||
24 | @@ -344,7 +344,7 @@ bool BinnedLRUCacheShard::Release(rocksdb::Cache::Handle* handle, bool force_era | ||
25 | |||
26 | rocksdb::Status BinnedLRUCacheShard::Insert(const rocksdb::Slice& key, uint32_t hash, void* value, | ||
27 | size_t charge, | ||
28 | - void (*deleter)(const rocksdb::Slice& key, void* value), | ||
29 | + DeleterFn deleter, | ||
30 | rocksdb::Cache::Handle** handle, rocksdb::Cache::Priority priority) { | ||
31 | auto e = new BinnedLRUHandle(); | ||
32 | rocksdb::Status s; | ||
33 | diff --git a/src/kv/rocksdb_cache/BinnedLRUCache.h b/src/kv/rocksdb_cache/BinnedLRUCache.h | ||
34 | index 96023ce2..b0fb7148 100644 | ||
35 | --- a/src/kv/rocksdb_cache/BinnedLRUCache.h | ||
36 | +++ b/src/kv/rocksdb_cache/BinnedLRUCache.h | ||
37 | @@ -56,7 +56,7 @@ std::shared_ptr<rocksdb::Cache> NewBinnedLRUCache( | ||
38 | |||
39 | struct BinnedLRUHandle { | ||
40 | void* value; | ||
41 | - void (*deleter)(const rocksdb::Slice&, void* value); | ||
42 | + DeleterFn deleter; | ||
43 | BinnedLRUHandle* next_hash; | ||
44 | BinnedLRUHandle* next; | ||
45 | BinnedLRUHandle* prev; | ||
46 | @@ -189,7 +189,7 @@ class alignas(CACHE_LINE_SIZE) BinnedLRUCacheShard : public CacheShard { | ||
47 | // Like Cache methods, but with an extra "hash" parameter. | ||
48 | virtual rocksdb::Status Insert(const rocksdb::Slice& key, uint32_t hash, void* value, | ||
49 | size_t charge, | ||
50 | - void (*deleter)(const rocksdb::Slice& key, void* value), | ||
51 | + DeleterFn deleter, | ||
52 | rocksdb::Cache::Handle** handle, | ||
53 | rocksdb::Cache::Priority priority) override; | ||
54 | virtual rocksdb::Cache::Handle* Lookup(const rocksdb::Slice& key, uint32_t hash) override; | ||
55 | diff --git a/src/kv/rocksdb_cache/ShardedCache.cc b/src/kv/rocksdb_cache/ShardedCache.cc | ||
56 | index 8e08deb8..ef3b3b98 100644 | ||
57 | --- a/src/kv/rocksdb_cache/ShardedCache.cc | ||
58 | +++ b/src/kv/rocksdb_cache/ShardedCache.cc | ||
59 | @@ -44,7 +44,7 @@ void ShardedCache::SetStrictCapacityLimit(bool strict_capacity_limit) { | ||
60 | } | ||
61 | |||
62 | rocksdb::Status ShardedCache::Insert(const rocksdb::Slice& key, void* value, size_t charge, | ||
63 | - void (*deleter)(const rocksdb::Slice& key, void* value), | ||
64 | + DeleterFn deleter, | ||
65 | rocksdb::Cache::Handle** handle, Priority priority) { | ||
66 | uint32_t hash = HashSlice(key); | ||
67 | return GetShard(Shard(hash)) | ||
68 | diff --git a/src/kv/rocksdb_cache/ShardedCache.h b/src/kv/rocksdb_cache/ShardedCache.h | ||
69 | index a16cf561..674e5322 100644 | ||
70 | --- a/src/kv/rocksdb_cache/ShardedCache.h | ||
71 | +++ b/src/kv/rocksdb_cache/ShardedCache.h | ||
72 | @@ -25,6 +25,8 @@ | ||
73 | |||
74 | namespace rocksdb_cache { | ||
75 | |||
76 | +using DeleterFn = void (*)(const rocksdb::Slice& key, void* value); | ||
77 | + | ||
78 | // Single cache shard interface. | ||
79 | class CacheShard { | ||
80 | public: | ||
81 | @@ -33,7 +35,7 @@ class CacheShard { | ||
82 | |||
83 | virtual rocksdb::Status Insert(const rocksdb::Slice& key, uint32_t hash, void* value, | ||
84 | size_t charge, | ||
85 | - void (*deleter)(const rocksdb::Slice& key, void* value), | ||
86 | + DeleterFn deleter, | ||
87 | rocksdb::Cache::Handle** handle, rocksdb::Cache::Priority priority) = 0; | ||
88 | virtual rocksdb::Cache::Handle* Lookup(const rocksdb::Slice& key, uint32_t hash) = 0; | ||
89 | virtual bool Ref(rocksdb::Cache::Handle* handle) = 0; | ||
90 | @@ -59,7 +61,7 @@ class ShardedCache : public rocksdb::Cache, public PriorityCache::PriCache { | ||
91 | // rocksdb::Cache | ||
92 | virtual const char* Name() const override = 0; | ||
93 | virtual rocksdb::Status Insert(const rocksdb::Slice& key, void* value, size_t charge, | ||
94 | - void (*deleter)(const rocksdb::Slice& key, void* value), | ||
95 | + DeleterFn, | ||
96 | rocksdb::Cache::Handle** handle, Priority priority) override; | ||
97 | virtual rocksdb::Cache::Handle* Lookup(const rocksdb::Slice& key, rocksdb::Statistics* stats) override; | ||
98 | virtual bool Ref(rocksdb::Cache::Handle* handle) override; | ||
99 | -- | ||
100 | 2.33.0 | ||
101 | |||