1 files changed, 20 insertions, 14 deletions

diff --git a/src/mongo/db/catalog/collection.h b/src/mongo/db/catalog/collection.h
index f1518065aaf..9f537cb5fdb 100644
--- a/src/mongo/db/catalog/collection.h
+++ b/src/mongo/db/catalog/collection.h
@@ -39,6 +39,7 @@
 #include "mongo/db/catalog/index_catalog.h"
 #include "mongo/db/exec/collection_scan_common.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/op_observer.h"
 #include "mongo/db/record_id.h"
 #include "mongo/db/storage/capped_callback.h"
 #include "mongo/db/storage/record_store.h"
@@ -54,6 +55,9 @@ namespace mongo {
     class MultiIndexBlock;
     class OperationContext;
 
+    class UpdateDriver;
+    class UpdateRequest;
+
     class RecordIterator;
     class RecordFetcher;
 
@@ -167,7 +171,8 @@ namespace mongo {
          */
         StatusWith<RecordId> insertDocument( OperationContext* txn,
                                             const BSONObj& doc,
-                                            bool enforceQuota );
+                                            bool enforceQuota,
+                                            bool fromMigrate = false);
 
         StatusWith<RecordId> insertDocument( OperationContext* txn,
                                             const DocWriter* doc,
@@ -196,22 +201,23 @@ namespace mongo {
          * if not, it is moved
          * @return the post update location of the doc (may or may not be the same as oldLocation)
          */
-        StatusWith<RecordId> updateDocument( OperationContext* txn,
-                                             const RecordId& oldLocation,
-                                             const Snapshotted<BSONObj>& oldDoc,
-                                             const BSONObj& newDoc,
-                                             bool enforceQuota,
-                                             bool indexesAffected,
-                                             OpDebug* debug );
-
+        StatusWith<RecordId> updateDocument(OperationContext* txn,
+                                            const RecordId& oldLocation,
+                                            const Snapshotted<BSONObj>& oldDoc,
+                                            const BSONObj& newDoc,
+                                            bool enforceQuota,
+                                            bool indexesAffected,
+                                            OpDebug* debug,
+                                            oplogUpdateEntryArgs& args);
         /**
          * right now not allowed to modify indexes
          */
-        Status updateDocumentWithDamages( OperationContext* txn,
-                                          const RecordId& loc,
-                                          const Snapshotted<RecordData>& oldRec,
-                                          const char* damageSource,
-                                          const mutablebson::DamageVector& damages );
+        Status updateDocumentWithDamages(OperationContext* txn,
+                                         const RecordId& loc,
+                                         const Snapshotted<RecordData>& oldRec,
+                                         const char* damageSource,
+                                         const mutablebson::DamageVector& damages,
+                                         oplogUpdateEntryArgs& args);
 
         // -----------