From d548b5fbb42c72b6430cc7eec2ca6500a693d720 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Piotr=20Da=C5=82ek?= Date: Tue, 10 Nov 2015 12:50:55 +0100 Subject: [PATCH] mon: revert MonitorDBStore's WholeStoreIteratorImpl::get MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Revert MonitorDBStore's WholeStoreIteratorImpl::get method to state before commit 66b7b920cf5a0a9c71212573ef47fb2c7ea9b5ff until better, long-term solution for #13742 will be provided. Signed-off-by: Piotr Dałek --- src/mon/MonitorDBStore.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/mon/MonitorDBStore.h b/src/mon/MonitorDBStore.h index b9b0ee54c938b..15558e3da986c 100644 --- a/src/mon/MonitorDBStore.h +++ b/src/mon/MonitorDBStore.h @@ -507,12 +507,14 @@ class MonitorDBStore } int get(const string& prefix, const string& key, bufferlist& bl) { - - bufferlist outbl; - db->get(prefix, key, &outbl); - if (outbl.length() == 0) + set k; + k.insert(key); + map out; + + db->get(prefix, k, &out); + if (out.empty()) return -ENOENT; - bl.append(outbl); + bl.append(out[key]); return 0; } -- 2.39.5