ObjectStore: move queue_transaction into ObjectStore

This will simplify the SnapMapper implementation.

Signed-off-by: Samuel Just <sam.just@inktank.com>

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index 535417eaa71be5468415ca7c04a7d340ae0eb44b..cff138b97f46be0e2993f2ffa871220f8fd41451 100644 (file)
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -2007,13 +2007,6 @@ struct C_JournaledAhead : public Context {
   }
 };
 
-int FileStore::queue_transaction(Sequencer *osr, Transaction *t)
-{
-  list<Transaction*> tls;
-  tls.push_back(t);
-  return queue_transactions(osr, tls, new C_DeleteTransaction(t));
-}
-
 int FileStore::queue_transactions(Sequencer *posr, list<Transaction*> &tls,
                                  Context *onreadable, Context *ondisk,
                                  Context *onreadable_sync,

diff --git a/src/os/FileStore.h b/src/os/FileStore.h
index 94c34c1fee17400f920561bc99657c1fff802c66..144939a26679b960d3a761074e3f261f52b71ef7 100644 (file)
--- a/src/os/FileStore.h
+++ b/src/os/FileStore.h
@@ -314,7 +314,6 @@ public:
   }
   unsigned _do_transaction(Transaction& t, uint64_t op_seq, int trans_num);
 
-  int queue_transaction(Sequencer *osr, Transaction* t);
   int queue_transactions(Sequencer *osr, list<Transaction*>& tls,
                         Context *onreadable, Context *ondisk=0,
                         Context *onreadable_sync=0,

diff --git a/src/os/ObjectStore.h b/src/os/ObjectStore.h
index 2f3d73133949998af5ca03edf5696a622732d022..a36a7fbb3c4b802b15f3efd485e755bef08e6d2f 100644 (file)
--- a/src/os/ObjectStore.h
+++ b/src/os/ObjectStore.h
@@ -659,8 +659,12 @@ public:
   }
   unsigned apply_transactions(Sequencer *osr, list<Transaction*>& tls, Context *ondisk=0);
 
-  virtual int queue_transaction(Sequencer *osr, Transaction* t) = 0;
-  virtual int queue_transaction(Sequencer *osr, Transaction *t, Context *onreadable, Context *ondisk=0,
+  int queue_transaction(Sequencer *osr, Transaction* t) {
+    list<Transaction *> tls;
+    tls.push_back(t);
+    return queue_transactions(osr, tls, new C_DeleteTransaction(t));
+  }
+  int queue_transaction(Sequencer *osr, Transaction *t, Context *onreadable, Context *ondisk=0,
                                Context *onreadable_sync=0,
                                TrackedOpRef op = TrackedOpRef()) {
     list<Transaction*> tls;