]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
kv/RocksDBStore: Modified merge operator name
authorAdam Kupczyk <akupczyk@redhat.com>
Tue, 21 Apr 2020 10:27:40 +0000 (12:27 +0200)
committerAdam Kupczyk <akupczyk@redhat.com>
Thu, 14 May 2020 16:09:58 +0000 (18:09 +0200)
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>
src/kv/RocksDBStore.cc

index 462939f002ec6a534eee2c5f57783f5e2a8bd7fa..6aac85069e3bd260ff4ac1559fe84d872cf28a90 100644 (file)
@@ -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;