SERVER-12664 Change nUpdated to nMatched in bulk api results

4 files changed, 11 insertions, 11 deletions

diff --git a/src/mongo/s/write_ops/batch_upconvert.cpp b/src/mongo/s/write_ops/batch_upconvert.cpp
index e30e0968c5f..81af67d4415 100644
--- a/src/mongo/s/write_ops/batch_upconvert.cpp
+++ b/src/mongo/s/write_ops/batch_upconvert.cpp
@@ -207,15 +207,15 @@ namespace mongo {
             if ( response.isUpsertDetailsSet() )
                 numUpserted = response.sizeUpsertDetails();
 
-            int numUpdated = response.getN() - numUpserted;
-            dassert( numUpdated >= 0 );
+            int numMatched = response.getN() - numUpserted;
+            dassert( numMatched >= 0 );
 
             // Wrap upserted id in "upserted" field
             BSONObj leUpsertedId;
             if ( !upsertedId.isEmpty() )
                 leUpsertedId = upsertedId.firstElement().wrap( kUpsertedFieldName );
 
-            error->recordUpdate( numUpdated > 0, response.getN(), leUpsertedId );
+            error->recordUpdate( numMatched > 0, response.getN(), leUpsertedId );
         }
         else if ( request.getBatchType() == BatchedCommandRequest::BatchType_Delete ) {
             error->recordDelete( response.getN() );
diff --git a/src/mongo/s/write_ops/batch_write_op.cpp b/src/mongo/s/write_ops/batch_write_op.cpp
index 67a3676aa73..7b9eb656f9f 100644
--- a/src/mongo/s/write_ops/batch_write_op.cpp
+++ b/src/mongo/s/write_ops/batch_write_op.cpp
@@ -56,7 +56,7 @@ namespace mongo {
     }
 
     BatchWriteStats::BatchWriteStats() :
-        numInserted( 0 ), numUpserted( 0 ), numUpdated( 0 ), numModified( 0 ), numDeleted( 0 ) {
+        numInserted( 0 ), numUpserted( 0 ), numMatched( 0 ), numModified( 0 ), numDeleted( 0 ) {
     }
 
     BatchWriteOp::BatchWriteOp() :
@@ -368,7 +368,7 @@ namespace mongo {
             if( response.isUpsertDetailsSet() ) {
                 numUpserted = response.sizeUpsertDetails();
             }
-            stats->numUpdated += ( response.getN() - numUpserted );
+            stats->numMatched += ( response.getN() - numUpserted );
             stats->numModified += response.getNModified();
             stats->numUpserted += numUpserted;
         }
@@ -615,7 +615,7 @@ namespace mongo {
         }
 
         // Stats
-        int nValue = _stats->numInserted + _stats->numUpserted + _stats->numUpdated
+        int nValue = _stats->numInserted + _stats->numUpserted + _stats->numMatched
                      + _stats->numDeleted;
         batchResp->setN( nValue );
         if ( _clientRequest->getBatchType() == BatchedCommandRequest::BatchType_Update )
diff --git a/src/mongo/s/write_ops/batch_write_op.h b/src/mongo/s/write_ops/batch_write_op.h
index f79dfd0cde3..22ed7f6b4e8 100644
--- a/src/mongo/s/write_ops/batch_write_op.h
+++ b/src/mongo/s/write_ops/batch_write_op.h
@@ -192,7 +192,7 @@ namespace mongo {
 
         int numInserted;
         int numUpserted;
-        int numUpdated;
+        int numMatched;
         int numModified;
         int numDeleted;
 
diff --git a/src/mongo/s/write_ops/batched_command_response.cpp b/src/mongo/s/write_ops/batched_command_response.cpp
index b766f080ab4..2db291f925b 100644
--- a/src/mongo/s/write_ops/batched_command_response.cpp
+++ b/src/mongo/s/write_ops/batched_command_response.cpp
@@ -152,9 +152,9 @@ namespace mongo {
 
         // We're using appendNumber on generation so we'll try a smaller type
         // (int) first and then fall back to the original type (long long).
-        BSONField<int> fieldNUpdated(nModified());
-        int tempNUpdated;
-        fieldState = FieldParser::extract(source, fieldNUpdated, &tempNUpdated, errMsg);
+        BSONField<int> fieldNModified(nModified());
+        int intNModified;
+        fieldState = FieldParser::extract(source, fieldNModified, &intNModified, errMsg);
         if (fieldState == FieldParser::FIELD_INVALID) {
             // try falling back to a larger type
             fieldState = FieldParser::extract(source, nModified, &_nModified, errMsg);
@@ -163,7 +163,7 @@ namespace mongo {
         }
         else if (fieldState == FieldParser::FIELD_SET) {
             _isNModifiedSet = true;
-            _nModified = tempNUpdated;
+            _nModified = intNModified;
         }
 
         std::vector<BatchedUpsertDetail*>* tempUpsertDetails = NULL;