SERVER-6582 - find_and_modify - set lastErrorObject fields in some cases like older versions

Author: erh

jstests/find_and_modify_server6582.js

@@ -0,0 +1,18 @@
+
+t = db.find_and_modify_server6582;
+
+t.drop();
+x = t.runCommand( "findAndModify" , {query:{f:1}, update:{$set:{f:2}}, upsert:true, new:true})
+le = x.lastErrorObject
+assert.eq( le.updatedExisting, false )
+assert.eq( le.n, 1 )
+assert.eq( le.upserted, x.value._id )
+
+t.drop();
+t.insert( { f : 1 } )
+x = t.runCommand( "findAndModify" , {query:{f:1}, remove : true } )
+le = x.lastErrorObject
+assert.eq( le.n, 1 )
+
+
+

src/mongo/db/commands/find_and_modify.cpp

@@ -156,6 +156,9 @@ namespace mongo {
                 _appendHelper( result , doc , found , fields );
                 if ( found ) {
                     deleteObjects( ns.c_str() , queryModified , true , true );
+                    BSONObjBuilder le( result.subobjStart( "lastErrorObject" ) );
+                    le.appendNumber( "n" , 1 );
+                    le.done();
                 }
             }
             else {
@@ -182,6 +185,13 @@ namespace mongo {
                         _appendHelper( result , doc , true , fields );
                     }
 
+                    BSONObjBuilder le( result.subobjStart( "lastErrorObject" ) );
+                    le.appendBool( "updatedExisting" , res.existing );
+                    le.appendNumber( "n" , res.num );
+                    if ( res.upserted.isSet() )
+                        le.append( "upserted" , res.upserted );
+                    le.done();
+                    
                 }
             }