update sources to 12.2.7

[ceph.git] / ceph / src / test / objectstore / DeterministicOpSequence.h

diff --git a/ceph/src/test/objectstore/DeterministicOpSequence.h b/ceph/src/test/objectstore/DeterministicOpSequence.h
index b3707a202814d143a791cdae5c765cab25c7002a..92373e139290e5af176b83bd5e955d30b2f1e49b 100644 (file)
--- a/ceph/src/test/objectstore/DeterministicOpSequence.h
+++ b/ceph/src/test/objectstore/DeterministicOpSequence.h
@@ -39,9 +39,9 @@ class DeterministicOpSequence : public TestObjectStoreState {
     DSOP_CLONE = 2,
     DSOP_CLONE_RANGE = 3,
     DSOP_OBJ_REMOVE = 4,
-    DSOP_COLL_MOVE = 6,
-    DSOP_SET_ATTRS = 7,
-    DSOP_COLL_CREATE = 8,
+    DSOP_COLL_MOVE = 5,
+    DSOP_SET_ATTRS = 6,
+    DSOP_COLL_CREATE = 7,
 
     DSOP_FIRST = DSOP_TOUCH,
     DSOP_LAST = DSOP_COLL_CREATE,
@@ -67,31 +67,34 @@ class DeterministicOpSequence : public TestObjectStoreState {
   bool do_set_attrs(rngen_t& gen);
   bool do_coll_create(rngen_t& gen);
 
-  virtual void _do_touch(coll_t coll, hobject_t& obj);
-  virtual void _do_remove(coll_t coll, hobject_t& obj);
-  virtual void _do_write(coll_t coll, hobject_t& obj, uint64_t off,
+  virtual void _do_touch(coll_entry_t *entry, hobject_t& obj);
+  virtual void _do_remove(coll_entry_t *entry, hobject_t& obj);
+  virtual void _do_write(coll_entry_t *entry, hobject_t& obj, uint64_t off,
       uint64_t len, const bufferlist& data);
-  virtual void _do_set_attrs(coll_t coll,
+  virtual void _do_set_attrs(coll_entry_t *entry,
                             hobject_t &obj,
                             const map<string, bufferlist> &attrs);
-  virtual void _do_clone(coll_t coll, hobject_t& orig_obj, hobject_t& new_obj);
-  virtual void _do_clone_range(coll_t coll, hobject_t& orig_obj,
+  virtual void _do_clone(coll_entry_t *entry, hobject_t& orig_obj, hobject_t& new_obj);
+  virtual void _do_clone_range(coll_entry_t *entry, hobject_t& orig_obj,
       hobject_t& new_obj, uint64_t srcoff, uint64_t srclen, uint64_t dstoff);
-  virtual void _do_write_and_clone_range(coll_t coll, hobject_t& orig_obj,
+  virtual void _do_write_and_clone_range(coll_entry_t *entry, hobject_t& orig_obj,
       hobject_t& new_obj, uint64_t srcoff, uint64_t srclen,
       uint64_t dstoff, bufferlist& bl);
-  virtual void _do_coll_move(coll_t orig_coll, coll_t new_coll, hobject_t& obj);
-  virtual void _do_coll_create(coll_t cid, uint32_t pg_num, uint64_t num_objs);
+  virtual void _do_coll_move(coll_entry_t *entry, hobject_t& orig_obj, hobject_t& new_obj);
+  virtual void _do_coll_create(coll_entry_t *entry, uint32_t pg_num, uint64_t num_objs);
 
   int _gen_coll_id(rngen_t& gen);
   int _gen_obj_id(rngen_t& gen);
   void _print_status(int seq, int op);
 
  private:
-  bool _prepare_clone(rngen_t& gen, coll_t& coll_ret,
-      hobject_t& orig_obj_ret, hobject_t& new_obj_ret);
-  bool _prepare_colls(rngen_t& gen,
-      coll_entry_t* &orig_coll, coll_entry_t* &new_coll);
+  bool _prepare_clone(
+    rngen_t& gen,
+    coll_entry_t **entry_ret,
+    int *orig_obj_id,
+    hobject_t *orig_obj_ret,
+    int *new_obj_id,
+    hobject_t *new_obj_ret);
 };