From 28f18c4e3165d5cc654e1406fb3b3d7eff7dc883 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 2 Nov 2018 21:30:33 +0800 Subject: [PATCH] librados: remove redundant IoCtx::nobjects_begin() variants this change partially reverts 6eca7d08893abbe41f7fa6b2834fb05e84be572b Signed-off-by: Kefu Chai --- src/include/rados/librados.hpp | 9 +++------ src/librados/librados_cxx.cc | 18 ------------------ 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/src/include/rados/librados.hpp b/src/include/rados/librados.hpp index ce0b2500a745..069e5dc58b80 100644 --- a/src/include/rados/librados.hpp +++ b/src/include/rados/librados.hpp @@ -897,16 +897,13 @@ namespace librados /// Start enumerating objects for a pool - NObjectIterator nobjects_begin(); - NObjectIterator nobjects_begin(const bufferlist &filter); + NObjectIterator nobjects_begin(const bufferlist &filter=bufferlist()); /// Start enumerating objects for a pool starting from a hash position - NObjectIterator nobjects_begin(uint32_t start_hash_position); NObjectIterator nobjects_begin(uint32_t start_hash_position, - const bufferlist &filter); + const bufferlist &filter=bufferlist()); /// Start enumerating objects for a pool starting from cursor - NObjectIterator nobjects_begin(const librados::ObjectCursor& cursor); NObjectIterator nobjects_begin(const librados::ObjectCursor& cursor, - const bufferlist &filter); + const bufferlist &filter=bufferlist()); /// Iterator indicating the end of a pool const NObjectIterator& nobjects_end() const; diff --git a/src/librados/librados_cxx.cc b/src/librados/librados_cxx.cc index 33d5fde6cf05..4edd046831ae 100644 --- a/src/librados/librados_cxx.cc +++ b/src/librados/librados_cxx.cc @@ -1719,12 +1719,6 @@ int librados::IoCtx::list_lockers(const std::string &oid, const std::string &nam return tmp_lockers.size(); } -librados::NObjectIterator librados::IoCtx::nobjects_begin() -{ - bufferlist bl; - return nobjects_begin(bl); -} - librados::NObjectIterator librados::IoCtx::nobjects_begin( const bufferlist &filter) { @@ -1738,12 +1732,6 @@ librados::NObjectIterator librados::IoCtx::nobjects_begin( return iter; } -librados::NObjectIterator librados::IoCtx::nobjects_begin(uint32_t pos) -{ - bufferlist bl; - return nobjects_begin(pos, bl); -} - librados::NObjectIterator librados::IoCtx::nobjects_begin( uint32_t pos, const bufferlist &filter) { @@ -1757,12 +1745,6 @@ librados::NObjectIterator librados::IoCtx::nobjects_begin( return iter; } -librados::NObjectIterator librados::IoCtx::nobjects_begin(const ObjectCursor& cursor) -{ - bufferlist bl; - return nobjects_begin(cursor, bl); -} - librados::NObjectIterator librados::IoCtx::nobjects_begin( const ObjectCursor& cursor, const bufferlist &filter) { -- 2.47.3