1 files changed, 43 insertions, 9 deletions

diff --git a/src/os/ObjectStore.h b/src/os/ObjectStore.h
index 521435b6c31..df3ae920a2f 100644
--- a/src/os/ObjectStore.h
+++ b/src/os/ObjectStore.h
@@ -29,6 +29,7 @@
 
 #include <errno.h>
 #include <sys/stat.h>
+#include <functional>
 #include <map>
 #include <memory>
 #include <vector>
@@ -735,15 +736,6 @@ public:
     std::map<std::string, ceph::buffer::list> *out ///< [out] Returned keys and values
     ) = 0;
 
-#ifdef WITH_SEASTAR
-  virtual int omap_get_values(
-    CollectionHandle &c,         ///< [in] Collection containing oid
-    const ghobject_t &oid,       ///< [in] Object containing omap
-    const std::optional<std::string> &start_after,     ///< [in] Keys to get
-    std::map<std::string, ceph::buffer::list> *out ///< [out] Returned keys and values
-    ) = 0;
-#endif
-
   /// Filters keys into out which are defined on oid
   virtual int omap_check_keys(
     CollectionHandle &c,     ///< [in] Collection containing oid
@@ -766,6 +758,48 @@ public:
     const ghobject_t &oid  ///< [in] object
     ) = 0;
 
+  struct omap_iter_seek_t {
+    std::string seek_position;
+    enum {
+      // start with provided key (seek_position), if it exists
+      LOWER_BOUND,
+      // skip provided key (seek_position) even if it exists
+      UPPER_BOUND
+    } seek_type = LOWER_BOUND;
+    static omap_iter_seek_t min_lower_bound() { return {}; }
+  };
+  enum class omap_iter_ret_t {
+    STOP,
+    NEXT
+  };
+  /**
+   * Iterate over object map with user-provided callable
+   *
+   * Warning!  The callable is executed under lock on bluestore
+   * operations in c.  Do not use bluestore methods on c while
+   * iterating. (Filling in a transaction is no problem).
+   *
+   * @param c collection
+   * @param oid object
+   * @param start_from where the iterator should point to at
+   *                   the beginning
+   * @param visitor callable that takes OMAP key and corresponding
+   *                value as string_views and controls iteration
+   *                by the return. It is executed for every object's
+   *                OMAP entry from `start_from` till end of the
+   *                object's OMAP or till the iteration is stopped
+   *                by `STOP`. Please note that if there is no such
+   *                entry, `visitor` will be called 0 times.
+   * @return error code, zero on success
+   */
+  virtual int omap_iterate(
+    CollectionHandle &c,
+    const ghobject_t &oid,
+    omap_iter_seek_t start_from,
+    std::function<omap_iter_ret_t(std::string_view,
+                                  std::string_view)> visitor
+  ) = 0;
+
   virtual int flush_journal() { return -EOPNOTSUPP; }
 
   virtual int dump_journal(std::ostream& out) { return -EOPNOTSUPP; }