SERVER-17573 move OpObserver calls into the datalayer as much as possible and eliminate repl bools

1 files changed, 10 insertions, 6 deletions

diff --git a/src/mongo/db/op_observer.h b/src/mongo/db/op_observer.h
index ebc296acf13..4769c0733a4 100644
--- a/src/mongo/db/op_observer.h
+++ b/src/mongo/db/op_observer.h
@@ -31,13 +31,20 @@
 #include <string>
 
 #include "mongo/base/disallow_copying.h"
+#include "mongo/db/jsobj.h"
 
 namespace mongo {
-    class BSONObj;
     struct CollectionOptions;
     class NamespaceString;
     class OperationContext;
 
+    struct oplogUpdateEntryArgs {
+        std::string ns;
+        BSONObj update;
+        BSONObj criteria;
+        bool fromMigrate;
+    };
+
     class OpObserver {
         MONGO_DISALLOW_COPYING(OpObserver);
 
@@ -49,14 +56,11 @@ namespace mongo {
                            BSONObj indexDoc,
                            bool fromMigrate = false);
         void onInsert(OperationContext* txn,
-                      const std::string& ns,
+                      const NamespaceString& ns,
                       BSONObj doc,
                       bool fromMigrate = false);
         void onUpdate(OperationContext* txn,
-                      const std::string& ns,
-                      const BSONObj& update,
-                      BSONObj& criteria,
-                      bool fromMigrate);
+                      oplogUpdateEntryArgs args);
         void onDelete(OperationContext* txn,
                       const std::string& ns,
                       const BSONObj& idDoc,