From: Adam Kupczyk <akupczyk@redhat.com>
Date: Tue, 21 Apr 2020 10:27:40 +0000 (+0200)
Subject: kv/RocksDBStore: Modified merge operator name
X-Git-Tag: v16.1.0~2102^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e0a7ca51b89b1f6c2ddbb02f52df6ad5f7286125;p=ceph.git

kv/RocksDBStore: Modified merge operator name

Now merge operator name also includes operators from dedicated to shards.
This makes it possible to reshard that will move prefix with merge operator
away from default column family.
Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
---

diff --git a/src/kv/RocksDBStore.cc b/src/kv/RocksDBStore.cc
index 462939f002e..6aac85069e3 100644
--- a/src/kv/RocksDBStore.cc
+++ b/src/kv/RocksDBStore.cc
@@ -92,9 +92,6 @@ public:
     for (auto& p : store.merge_ops) {
       names[p.first] = p.second->name();
     }
-    for (auto& p : store.cf_handles) {
-      names.erase(p.first);
-    }
     for (auto& p : names) {
       store.assoc_name += '.';
       store.assoc_name += p.first;