From: Radoslaw Zarzynski Date: Mon, 12 Aug 2019 18:11:20 +0000 (+0200) Subject: crimson/os, crimson/osd: make list_objects() const. X-Git-Tag: v15.1.0~1774^2~3 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7232b109209af937dc784ad46bef29dd758f2c58;p=ceph.git crimson/os, crimson/osd: make list_objects() const. Signed-off-by: Radoslaw Zarzynski --- diff --git a/src/crimson/os/cyan_store.cc b/src/crimson/os/cyan_store.cc index 922092711240..6fa66e18f351 100644 --- a/src/crimson/os/cyan_store.cc +++ b/src/crimson/os/cyan_store.cc @@ -126,7 +126,7 @@ seastar::future, ghobject_t> CyanStore::list_objects(CollectionRef c, const ghobject_t& start, const ghobject_t& end, - uint64_t limit) + uint64_t limit) const { logger().debug("{} {} {} {} {}", __func__, c->cid, start, end, limit); diff --git a/src/crimson/os/cyan_store.h b/src/crimson/os/cyan_store.h index c1a13ca7cd69..810e54bf6aad 100644 --- a/src/crimson/os/cyan_store.h +++ b/src/crimson/os/cyan_store.h @@ -64,7 +64,7 @@ public: CollectionRef c, const ghobject_t& start, const ghobject_t& end, - uint64_t limit) final; + uint64_t limit) const final; /// Retrieves paged set of values > start (if present) seastar::future omap_get_values( diff --git a/src/crimson/os/futurized_store.h b/src/crimson/os/futurized_store.h index 5287dc4da2d8..ac8a6fc2d557 100644 --- a/src/crimson/os/futurized_store.h +++ b/src/crimson/os/futurized_store.h @@ -87,7 +87,7 @@ public: CollectionRef c, const ghobject_t& start, const ghobject_t& end, - uint64_t limit) = 0; + uint64_t limit) const = 0; virtual seastar::future omap_get_values( CollectionRef c, ///< [in] collection const ghobject_t &oid, ///< [in] oid diff --git a/src/crimson/osd/pg_backend.cc b/src/crimson/osd/pg_backend.cc index 30ec868ac38c..41e05932d862 100644 --- a/src/crimson/osd/pg_backend.cc +++ b/src/crimson/osd/pg_backend.cc @@ -365,7 +365,7 @@ seastar::future<> PGBackend::remove(ObjectState& os, } seastar::future, hobject_t> -PGBackend::list_objects(const hobject_t& start, uint64_t limit) +PGBackend::list_objects(const hobject_t& start, uint64_t limit) const { auto gstart = start.is_min() ? ghobject_t{} : ghobject_t{start, 0, shard}; return store->list_objects(coll, diff --git a/src/crimson/osd/pg_backend.h b/src/crimson/osd/pg_backend.h index 6c40c09ec7fe..0c85dfe266e5 100644 --- a/src/crimson/osd/pg_backend.h +++ b/src/crimson/osd/pg_backend.h @@ -71,7 +71,7 @@ public: eversion_t ver); seastar::future, hobject_t> list_objects( const hobject_t& start, - uint64_t limit); + uint64_t limit) const; seastar::future<> setxattr( ObjectState& os, const OSDOp& osd_op,