From: xinxin shu Date: Wed, 11 Mar 2015 01:43:04 +0000 (+0800) Subject: cleanup in_prefix function X-Git-Tag: v9.0.0~178^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F3957%2Fhead;p=ceph.git cleanup in_prefix function Signed-off-by: xinxin shu --- diff --git a/src/os/LevelDBStore.h b/src/os/LevelDBStore.h index 4617c5ca29a..0eedcb38e48 100644 --- a/src/os/LevelDBStore.h +++ b/src/os/LevelDBStore.h @@ -302,10 +302,6 @@ public: static string combine_strings(const string &prefix, const string &value); static int split_key(leveldb::Slice in, string *prefix, string *key); static bufferlist to_bufferlist(leveldb::Slice in); - static bool in_prefix(const string &prefix, leveldb::Slice key) { - return (key.compare(leveldb::Slice(past_prefix(prefix))) < 0) && - (key.compare(leveldb::Slice(prefix)) > 0); - } static string past_prefix(const string &prefix) { string limit = prefix; limit.push_back(1); diff --git a/src/os/RocksDBStore.cc b/src/os/RocksDBStore.cc index 4a45a15b242..dc5e8e6f22e 100644 --- a/src/os/RocksDBStore.cc +++ b/src/os/RocksDBStore.cc @@ -470,11 +470,6 @@ int RocksDBStore::RocksDBWholeSpaceIteratorImpl::status() return dbiter->status().ok() ? 0 : -1; } -bool RocksDBStore::in_prefix(const string &prefix, rocksdb::Slice key) -{ - return (key.compare(rocksdb::Slice(past_prefix(prefix))) < 0) && - (key.compare(rocksdb::Slice(prefix)) > 0); -} string RocksDBStore::past_prefix(const string &prefix) { string limit = prefix; diff --git a/src/os/RocksDBStore.h b/src/os/RocksDBStore.h index 5c3160f5c99..87c59de8cbd 100644 --- a/src/os/RocksDBStore.h +++ b/src/os/RocksDBStore.h @@ -253,7 +253,6 @@ public: static string combine_strings(const string &prefix, const string &value); static int split_key(rocksdb::Slice in, string *prefix, string *key); static bufferlist to_bufferlist(rocksdb::Slice in); - static bool in_prefix(const string &prefix, rocksdb::Slice key); static string past_prefix(const string &prefix); virtual uint64_t get_estimated_size(map &extra) {