SERVER-16063 Rewrite the findAndModify command.

Changed UpdateStage to return the prior or newly-updated version of
a document if request. also changed DeleteStage to return the deleted
document if requested.

Added explain support to the findAndModify command.

1 files changed, 2 insertions, 8 deletions

diff --git a/src/mongo/db/ops/update_result.h b/src/mongo/db/ops/update_result.h
index 250b9d1fe23..568da353554 100644
--- a/src/mongo/db/ops/update_result.h
+++ b/src/mongo/db/ops/update_result.h
@@ -43,8 +43,7 @@ namespace mongo {
                       bool modifiers_,
                       unsigned long long numDocsModified_,
                       unsigned long long numMatched_,
-                      const BSONObj& upsertedObject_,
-                      const BSONObj& newObj_ );
+                      const BSONObj& upsertedObject_);
 
 
         // if existing objects were modified
@@ -62,18 +61,13 @@ namespace mongo {
         // if something was upserted, the new _id of the object
         BSONObj upserted;
 
-        // For a non-multi update, the new version of the document. If we did an insert, this
-        // is the full document that got inserted (whereas 'upserted' is just the _id field).
-        BSONObj newObj;
-
         const std::string toString() const {
             return str::stream()
                         << " upserted: " << upserted
                         << " modifiers: " << modifiers
                         << " existing: " << existing
                         << " numDocsModified: " << numDocsModified
-                        << " numMatched: " << numMatched
-                        << " newObj: " << newObj;
+                        << " numMatched: " << numMatched;
         }
     };