ceph_test_idempotent_sequence: use coll_entry_t

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/test/objectstore/DeterministicOpSequence.cc b/src/test/objectstore/DeterministicOpSequence.cc
index 5067168939c755cd1869b9b8617a62b66b46e100..e93ea80fcb6cd77800feb10133189161b66c446d 100644 (file)
--- a/src/test/objectstore/DeterministicOpSequence.cc
+++ b/src/test/objectstore/DeterministicOpSequence.cc
@@ -167,7 +167,7 @@ bool DeterministicOpSequence::do_touch(rngen_t& gen)
 
   dout(0) << "do_touch " << entry->m_coll << "/" << obj << dendl;
 
-  _do_touch(entry->m_coll, *obj);
+  _do_touch(entry, *obj);
   return true;
 }
 
@@ -188,7 +188,7 @@ bool DeterministicOpSequence::do_remove(rngen_t& gen)
 
   dout(0) << "do_remove " << entry->m_coll << "/" << obj << dendl;
 
-  _do_remove(entry->m_coll, *obj);
+  _do_remove(entry, *obj);
   hobject_t *rmobj = entry->remove_obj(obj_id);
   ceph_assert(rmobj);
   delete rmobj;
@@ -246,7 +246,7 @@ bool DeterministicOpSequence::do_set_attrs(rngen_t& gen)
   gen_attrs(gen, &out);
 
   dout(0) << "do_set_attrs " << out.size() << " entries" << dendl;
-  _do_set_attrs(entry->m_coll, *obj, out);
+  _do_set_attrs(entry, *obj, out);
   return true;
 }
 
@@ -273,7 +273,7 @@ bool DeterministicOpSequence::do_write(rngen_t& gen)
   dout(0) << "do_write " << entry->m_coll << "/" << obj
          << " 0~" << size << dendl;
 
-  _do_write(entry->m_coll, *obj, 0, bl.length(), bl);
+  _do_write(entry, *obj, 0, bl.length(), bl);
   return true;
 }
 
@@ -324,7 +324,7 @@ bool DeterministicOpSequence::do_clone(rngen_t& gen)
   dout(0) << "do_clone " << entry->m_coll << "/" << orig_obj
       << " => " << entry->m_coll << "/" << new_obj << dendl;
 
-  _do_clone(entry->m_coll, orig_obj, new_obj);
+  _do_clone(entry, orig_obj, new_obj);
   return true;
 }
 
@@ -356,7 +356,7 @@ bool DeterministicOpSequence::do_clone_range(rngen_t& gen)
       << " (0~" << size << ")"
       << " => " << entry->m_coll << "/" << new_obj
       << " (0)" << dendl;
-  _do_write_and_clone_range(entry->m_coll, orig_obj, new_obj, 0, size, 0, bl);
+  _do_write_and_clone_range(entry, orig_obj, new_obj, 0, size, 0, bl);
   return true;
 }
 
@@ -373,7 +373,7 @@ bool DeterministicOpSequence::do_coll_move(rngen_t& gen)
         << " => " << entry->m_coll << "/" << new_obj << dendl;
   entry->remove_obj(orig_id);
 
-  _do_coll_move(entry->m_coll, orig_obj, new_obj);
+  _do_coll_move(entry, orig_obj, new_obj);
 
   return true;
 }
@@ -385,82 +385,83 @@ bool DeterministicOpSequence::do_coll_create(rngen_t& gen)
   m_collections.insert(make_pair(i, entry));
   m_collections_ids.push_back(i);
 
-  _do_coll_create(entry->m_coll, 10, 10);
+  _do_coll_create(entry, 10, 10);
   
   return true;
 }
 
-void DeterministicOpSequence::_do_coll_create(coll_t cid, uint32_t pg_num, uint64_t num_objs)
+void DeterministicOpSequence::_do_coll_create(coll_entry_t *entry, uint32_t pg_num, uint64_t num_objs)
 {
   ObjectStore::Transaction t;
   note_txn(&t);
-  t.create_collection(cid, 32);
+  t.create_collection(entry->m_coll, 32);
   bufferlist hint;
   encode(pg_num, hint);
   encode(num_objs, hint);
-  t.collection_hint(cid, ObjectStore::Transaction::COLL_HINT_EXPECTED_NUM_OBJECTS, hint);
-  dout(0) << "Give collection: " << cid << " a hint, pg_num is: " << pg_num << ", num_objs is: "
-    << num_objs << dendl;
+  t.collection_hint(entry->m_coll, ObjectStore::Transaction::COLL_HINT_EXPECTED_NUM_OBJECTS, hint);
+  dout(0) << "Give collection: " << entry->m_coll
+         << " a hint, pg_num is: " << pg_num << ", num_objs is: "
+         << num_objs << dendl;
 
   m_store->apply_transaction(&m_osr, std::move(t));
 }
 
-void DeterministicOpSequence::_do_touch(coll_t coll, hobject_t& obj)
+void DeterministicOpSequence::_do_touch(coll_entry_t *entry, hobject_t& obj)
 {
   ObjectStore::Transaction t;
   note_txn(&t);
-  t.touch(coll, ghobject_t(obj));
+  t.touch(entry->m_coll, ghobject_t(obj));
   m_store->apply_transaction(&m_osr, std::move(t));
 }
 
-void DeterministicOpSequence::_do_remove(coll_t coll, hobject_t& obj)
+void DeterministicOpSequence::_do_remove(coll_entry_t *entry, hobject_t& obj)
 {
   ObjectStore::Transaction t;
   note_txn(&t);
-  t.remove(coll, ghobject_t(obj));
+  t.remove(entry->m_coll, ghobject_t(obj));
   m_store->apply_transaction(&m_osr, std::move(t));
 }
 
-void DeterministicOpSequence::_do_set_attrs(coll_t coll,
+void DeterministicOpSequence::_do_set_attrs(coll_entry_t *entry,
                                            hobject_t &obj,
                                            const map<string, bufferlist> &attrs)
 {
   ObjectStore::Transaction t;
   note_txn(&t);
-  t.omap_setkeys(coll, ghobject_t(obj), attrs);
+  t.omap_setkeys(entry->m_coll, ghobject_t(obj), attrs);
   m_store->apply_transaction(&m_osr, std::move(t));
 }
 
-void DeterministicOpSequence::_do_write(coll_t coll, hobject_t& obj,
+void DeterministicOpSequence::_do_write(coll_entry_t *entry, hobject_t& obj,
                                        uint64_t off, uint64_t len, const bufferlist& data)
 {
   ObjectStore::Transaction t;
   note_txn(&t);
-  t.write(coll, ghobject_t(obj), off, len, data);
+  t.write(entry->m_coll, ghobject_t(obj), off, len, data);
   m_store->apply_transaction(&m_osr, std::move(t));
 }
 
-void DeterministicOpSequence::_do_clone(coll_t coll, hobject_t& orig_obj,
+void DeterministicOpSequence::_do_clone(coll_entry_t *entry, hobject_t& orig_obj,
                                        hobject_t& new_obj)
 {
   ObjectStore::Transaction t;
   note_txn(&t);
-  t.clone(coll, ghobject_t(orig_obj), ghobject_t(new_obj));
+  t.clone(entry->m_coll, ghobject_t(orig_obj), ghobject_t(new_obj));
   m_store->apply_transaction(&m_osr, std::move(t));
 }
 
-void DeterministicOpSequence::_do_clone_range(coll_t coll,
+void DeterministicOpSequence::_do_clone_range(coll_entry_t *entry,
                                              hobject_t& orig_obj, hobject_t& new_obj, uint64_t srcoff,
                                              uint64_t srclen, uint64_t dstoff)
 {
   ObjectStore::Transaction t;
   note_txn(&t);
-  t.clone_range(coll, ghobject_t(orig_obj), ghobject_t(new_obj),
+  t.clone_range(entry->m_coll, ghobject_t(orig_obj), ghobject_t(new_obj),
                srcoff, srclen, dstoff);
   m_store->apply_transaction(&m_osr, std::move(t));
 }
 
-void DeterministicOpSequence::_do_write_and_clone_range(coll_t coll,
+void DeterministicOpSequence::_do_write_and_clone_range(coll_entry_t *entry,
                                                         hobject_t& orig_obj,
                                                         hobject_t& new_obj,
                                                         uint64_t srcoff,
@@ -470,21 +471,21 @@ void DeterministicOpSequence::_do_write_and_clone_range(coll_t coll,
 {
   ObjectStore::Transaction t;
   note_txn(&t);
-  t.write(coll, ghobject_t(orig_obj), srcoff, bl.length(), bl);
-  t.clone_range(coll, ghobject_t(orig_obj), ghobject_t(new_obj),
+  t.write(entry->m_coll, ghobject_t(orig_obj), srcoff, bl.length(), bl);
+  t.clone_range(entry->m_coll, ghobject_t(orig_obj), ghobject_t(new_obj),
                srcoff, srclen, dstoff);
   m_store->apply_transaction(&m_osr, std::move(t));
 }
 
-void DeterministicOpSequence::_do_coll_move(coll_t coll,
+void DeterministicOpSequence::_do_coll_move(coll_entry_t *entry,
                                            hobject_t& orig_obj,
                                            hobject_t& new_obj)
 {
   ObjectStore::Transaction t;
   note_txn(&t);
-  t.remove(coll, ghobject_t(new_obj));
-  t.collection_move_rename(coll, ghobject_t(orig_obj),
-                          coll, ghobject_t(new_obj));
+  t.remove(entry->m_coll, ghobject_t(new_obj));
+  t.collection_move_rename(entry->m_coll, ghobject_t(orig_obj),
+                          entry->m_coll, ghobject_t(new_obj));
   m_store->apply_transaction(&m_osr, std::move(t));
 }
 

diff --git a/src/test/objectstore/DeterministicOpSequence.h b/src/test/objectstore/DeterministicOpSequence.h
index 8f8cc12d6a09147b590b73346cee53eb8db891df..92373e139290e5af176b83bd5e955d30b2f1e49b 100644 (file)
--- a/src/test/objectstore/DeterministicOpSequence.h
+++ b/src/test/objectstore/DeterministicOpSequence.h
@@ -67,21 +67,21 @@ 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 cid, hobject_t& orig_obj, hobject_t& new_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);