SERVER-10497 Unify update API with fluent request object

Author: Andrew Morrow

src/mongo/db/commands/find_and_modify.cpp

@@ -206,8 +206,13 @@ namespace mongo {
                         _appendHelper( result , doc , found , fields );
                     }
 
-                    UpdateResult res = updateObjects( ns.c_str() , update , queryModified , upsert , false , true , cc().curop()->debug() );
-                    
+                    UpdateResult res = mongo::update(
+                        UpdateRequest(NamespaceString(ns), cc().curop()->debug())
+                        .query(queryModified)
+                        .updates(update)
+                        .upsert(upsert)
+                        .updateOpLog());
+
                     if ( returnNew ) {
                         if ( res.upserted.isSet() ) {
                             queryModified = BSON( "_id" << res.upserted );
@@ -229,7 +234,7 @@ namespace mongo {
 
                     BSONObjBuilder le( result.subobjStart( "lastErrorObject" ) );
                     le.appendBool( "updatedExisting" , res.existing );
-                    le.appendNumber( "n" , res.num );
+                    le.appendNumber( "n" , res.numMatched );
                     if ( res.upserted.isSet() )
                         le.append( "upserted" , res.upserted );
                     le.done();

src/mongo/db/commands/write_commands/batch_executor.cpp

@@ -241,15 +241,16 @@ namespace mongo {
         long long resNum = 0;
         OID resUpserted = OID();
         try {
-            UpdateResult res = updateObjects(ns.c_str(),
-                                             updateObj,
-                                             queryObj,
-                                             upsert,
-                                             multi,
-                                             /*logOp*/true,
-                                             opDebug);
+            UpdateResult res = update(
+                UpdateRequest(NamespaceString(ns), opDebug)
+                .query(queryObj)
+                .updates(updateObj)
+                .upsert(upsert)
+                .multi(multi)
+                .updateOpLog());
+
             resExisting = res.existing;
-            resNum = res.num;
+            resNum = res.numMatched;
             resUpserted = res.upserted;
         }
         catch (UserException& e) {

src/mongo/db/dbhelpers.cpp

@@ -30,6 +30,8 @@
 #include "mongo/db/json.h"
 #include "mongo/db/ops/delete.h"
 #include "mongo/db/ops/update.h"
+#include "mongo/db/ops/update_request.h"
+#include "mongo/db/ops/update_result.h"
 #include "mongo/db/pagefault.h"
 #include "mongo/db/pdfile.h"
 #include "mongo/db/query_optimizer.h"
@@ -200,28 +202,39 @@ namespace mongo {
 
         OpDebug debug;
         Client::Context context(ns);
-        updateObjects(ns.c_str(), o, /*pattern=*/id, /*upsert=*/true, /*multi=*/false , /*logtheop=*/true , debug, fromMigrate );
+
+        update(
+            UpdateRequest(NamespaceString(ns), debug)
+            .query(id)
+            .updates(o)
+            .upsert()
+            .updateOpLog()
+            .fromMigration(fromMigrate));
     }
 
     void Helpers::putSingleton(const char *ns, BSONObj obj) {
         OpDebug debug;
         Client::Context context(ns);
-        updateObjects(ns, obj, /*pattern=*/BSONObj(), /*upsert=*/true, /*multi=*/false , /*logtheop=*/true , debug );
+
+        update(
+            UpdateRequest(NamespaceString(ns), debug)
+            .updates(obj)
+            .upsert()
+            .updateOpLog());
+
         context.getClient()->curop()->done();
     }
 
     void Helpers::putSingletonGod(const char *ns, BSONObj obj, bool logTheOp) {
         OpDebug debug;
         Client::Context context(ns);
 
-        _updateObjects(/*god=*/true,
-                       ns,
-                       obj,
-                       /*pattern=*/BSONObj(),
-                       /*upsert=*/true,
-                       /*multi=*/false,
-                       logTheOp,
-                       debug );
+        update(
+            UpdateRequest(NamespaceString(ns), debug)
+            .god()
+            .updates(obj)
+            .upsert()
+            .updateOpLog(logTheOp));
 
         context.getClient()->curop()->done();
     }

src/mongo/db/instance.cpp

@@ -646,13 +646,17 @@ namespace mongo {
 
                 Client::Context ctx( ns );
 
-                UpdateResult res = updateObjects(
-                    &driver,
-                    ns, toupdate, query,
-                    upsert, multi, true, op.debug() );
+                UpdateResult res = update(
+                    UpdateRequest(NamespaceString(ns), op.debug())
+                    .upsert(upsert)
+                    .multi(multi)
+                    .query(query)
+                    .updates(toupdate)
+                    .updateOpLog(), // TODO: This is wasteful if repl is not active.
+                    &driver);
 
                 // for getlasterror
-                lastError.getSafe()->recordUpdate( res.existing , res.num , res.upserted );
+                lastError.getSafe()->recordUpdate( res.existing , res.numMatched , res.upserted );
                 break;
             }
             catch ( PageFaultException& e ) {