SERVER-80293: Add summary fields to bulkWrite

Crescentek · Nov 9, 2023 · d160de1 · d160de1
1 parent d0de879
commit d160de1
Show file tree

Hide file tree

Showing 26 changed files with 382 additions and 176 deletions.
diff --git a/jstests/concurrency/fsm_workloads/random_DDL_bulkWrite_operations.js b/jstests/concurrency/fsm_workloads/random_DDL_bulkWrite_operations.js
@@ -288,7 +288,7 @@ export const $config = (function() {
                 // Check if insert succeeded
                 var res = db.adminCommand(bulkWriteCmd);
                 assert.commandWorked(res);
-                assert.eq(res.numErrors, 0);
+                assert.eq(res.nErrors, 0);
 
                 jsTestLog('BulkWrite - Update tid:' + tid + ' currentTid:' + this.tid +
                           ' collection:' + collNames);
@@ -311,7 +311,7 @@ export const $config = (function() {
                     nsInfo: [{ns: fullNs1}, {ns: fullNs2}]
                 };
                 res = db.adminCommand(bulkWriteCmd);
-                if (res.numErrors != 0) {
+                if (res.nErrors != 0) {
                     // Should only be possible for the first namespace to be renamed.
                     var err = res.cursor.firstBatch[0].code;
                     if (err == ErrorCodes.QueryPlanKilled) {
@@ -323,7 +323,7 @@ export const $config = (function() {
                     }
                 }
                 assert.commandWorked(res);
-                assert.eq(res.numErrors, 0);
+                assert.eq(res.nErrors, 0);
 
                 // Delete Data
                 jsTestLog('BulkWrite - Remove tid:' + tid + ' currentTid:' + this.tid +
@@ -339,7 +339,7 @@ export const $config = (function() {
                 };
                 res = db.adminCommand(bulkWriteCmd);
                 assert.commandWorked(res);
-                assert.eq(res.numErrors, 0);
+                assert.eq(res.nErrors, 0);
                 // Check guarantees IF NO CONCURRENT DROP is running.
                 assert.eq(countDocuments(coll, {generation: generation}), 0);
             } finally {

diff --git a/jstests/core/write/bulk/bulk_write.js b/jstests/core/write/bulk/bulk_write.js
@@ -33,7 +33,7 @@ var res = db.adminCommand({
 });
 
 assert.commandWorked(res);
-assert.eq(res.numErrors, 0, "bulkWrite command response: " + tojson(res));
+assert.eq(res.nErrors, 0, "bulkWrite command response: " + tojson(res));
 
 assert.eq(coll.find().itcount(), 1);
 assert.eq(coll1.find().itcount(), 0);
@@ -47,7 +47,7 @@ res = db.adminCommand({
 });
 
 assert.commandWorked(res);
-assert.eq(res.numErrors, 0, "bulkWrite command response: " + tojson(res));
+assert.eq(res.nErrors, 0, "bulkWrite command response: " + tojson(res));
 
 assert.eq(coll.find().itcount(), 1);
 assert.eq(coll1.find().itcount(), 1);
@@ -62,7 +62,7 @@ res = db.adminCommand({
 });
 
 assert.commandWorked(res);
-assert.eq(res.numErrors, 0, "bulkWrite command response: " + tojson(res));
+assert.eq(res.nErrors, 0, "bulkWrite command response: " + tojson(res));
 
 assert.eq(coll.find().itcount(), 2);
 assert.eq(coll1.find().itcount(), 0);
@@ -80,7 +80,7 @@ res = db.adminCommand({
 });
 
 assert.commandWorked(res);
-assert.eq(res.numErrors, 0, "bulkWrite command response: " + tojson(res));
+assert.eq(res.nErrors, 0, "bulkWrite command response: " + tojson(res));
 
 assert.eq(1, coll.count({_id: 3}));
 

diff --git a/jstests/core/write/bulk/bulk_write_delete_cursor.js b/jstests/core/write/bulk/bulk_write_delete_cursor.js
@@ -9,7 +9,11 @@
  *   featureFlagBulkWriteCommand,
  * ]
  */
-import {cursorEntryValidator, cursorSizeValidator} from "jstests/libs/bulk_write_utils.js";
+import {
+    cursorEntryValidator,
+    cursorSizeValidator,
+    summaryFieldsValidator
+} from "jstests/libs/bulk_write_utils.js";
 
 var coll = db.getCollection("coll");
 var coll1 = db.getCollection("coll1");
@@ -27,7 +31,8 @@ var res = db.adminCommand({
 });
 
 assert.commandWorked(res);
-assert.eq(res.numErrors, 0, "bulkWrite command response: " + tojson(res));
+summaryFieldsValidator(
+    res, {nErrors: 0, nInserted: 1, nDeleted: 1, nMatched: 0, nModified: 0, nUpserted: 0});
 
 cursorSizeValidator(res, 2);
 cursorEntryValidator(res.cursor.firstBatch[0], {ok: 1, idx: 0, n: 1});
@@ -50,7 +55,8 @@ res = db.adminCommand({
 
 assert.commandWorked(res);
 cursorSizeValidator(res, 3);
-assert.eq(res.numErrors, 0, "bulkWrite command response: " + tojson(res));
+summaryFieldsValidator(
+    res, {nErrors: 0, nInserted: 2, nDeleted: 1, nMatched: 0, nModified: 0, nUpserted: 0});
 cursorEntryValidator(res.cursor.firstBatch[0], {ok: 1, idx: 0, n: 1});
 cursorEntryValidator(res.cursor.firstBatch[1], {ok: 1, idx: 1, n: 1});
 cursorEntryValidator(res.cursor.firstBatch[2], {ok: 1, idx: 2, n: 1});
@@ -71,7 +77,8 @@ res = db.adminCommand({
 
 assert.commandWorked(res);
 cursorSizeValidator(res, 1);
-assert.eq(res.numErrors, 0, "bulkWrite command response: " + tojson(res));
+summaryFieldsValidator(
+    res, {nErrors: 0, nInserted: 0, nDeleted: 1, nMatched: 0, nModified: 0, nUpserted: 0});
 cursorEntryValidator(res.cursor.firstBatch[0], {ok: 1, idx: 0, n: 1});
 assert(!coll.findOne());
 
@@ -90,7 +97,8 @@ res = db.adminCommand({
 
 assert.commandWorked(res);
 cursorSizeValidator(res, 1);
-assert.eq(res.numErrors, 0, "bulkWrite command response: " + tojson(res));
+summaryFieldsValidator(
+    res, {nErrors: 0, nInserted: 0, nDeleted: 0, nMatched: 0, nModified: 0, nUpserted: 0});
 cursorEntryValidator(res.cursor.firstBatch[0], {ok: 1, idx: 0, n: 0});
 assert.eq("MongoDB", coll1.findOne().skey);
 
@@ -112,7 +120,8 @@ res = db.adminCommand({
 
 assert.commandWorked(res);
 cursorSizeValidator(res, 4);
-assert.eq(res.numErrors, 0, "bulkWrite command response: " + tojson(res));
+summaryFieldsValidator(
+    res, {nErrors: 0, nInserted: 3, nDeleted: 1, nMatched: 0, nModified: 0, nUpserted: 0});
 
 cursorEntryValidator(res.cursor.firstBatch[0], {ok: 1, idx: 0, n: 1});
 cursorEntryValidator(res.cursor.firstBatch[1], {ok: 1, idx: 1, n: 1});

diff --git a/jstests/core/write/bulk/bulk_write_getMore.js b/jstests/core/write/bulk/bulk_write_getMore.js
@@ -17,7 +17,11 @@
  *   featureFlagBulkWriteCommand,
  * ]
  */
-import {cursorEntryValidator, cursorSizeValidator} from "jstests/libs/bulk_write_utils.js";
+import {
+    cursorEntryValidator,
+    cursorSizeValidator,
+    summaryFieldsValidator
+} from "jstests/libs/bulk_write_utils.js";
 
 var coll = db.getCollection("coll");
 var coll1 = db.getCollection("coll1");
@@ -38,7 +42,8 @@ var res = db.adminCommand({
 
 assert.commandWorked(res);
 cursorSizeValidator(res, 1);
-assert.eq(res.numErrors, 0, "bulkWrite command response: " + tojson(res));
+summaryFieldsValidator(
+    res, {nErrors: 0, nInserted: 2, nDeleted: 0, nMatched: 0, nModified: 0, nUpserted: 0});
 
 assert(res.cursor.id != 0,
        "Unexpectedly found cursor ID 0 in bulkWrite command response: " + tojson(res));

diff --git a/jstests/core/write/bulk/bulk_write_insert_cursor.js b/jstests/core/write/bulk/bulk_write_insert_cursor.js
@@ -9,7 +9,11 @@
  *   featureFlagBulkWriteCommand,
  * ]
  */
-import {cursorEntryValidator, cursorSizeValidator} from "jstests/libs/bulk_write_utils.js";
+import {
+    cursorEntryValidator,
+    cursorSizeValidator,
+    summaryFieldsValidator
+} from "jstests/libs/bulk_write_utils.js";
 
 var coll = db.getCollection("coll");
 var coll1 = db.getCollection("coll1");
@@ -22,7 +26,8 @@ var res = db.adminCommand(
 
 assert.commandWorked(res);
 cursorSizeValidator(res, 1);
-assert.eq(res.numErrors, 0, "bulkWrite command response: " + tojson(res));
+summaryFieldsValidator(
+    res, {nErrors: 0, nInserted: 1, nDeleted: 0, nMatched: 0, nModified: 0, nUpserted: 0});
 
 assert(res.cursor.id == 0,
        "Unexpectedly found non-zero cursor ID in bulkWrite command response: " + tojson(res));
@@ -42,7 +47,8 @@ res = db.adminCommand({
 
 assert.commandWorked(res);
 cursorSizeValidator(res, 2);
-assert.eq(res.numErrors, 0, "bulkWrite command response: " + tojson(res));
+summaryFieldsValidator(
+    res, {nErrors: 0, nInserted: 2, nDeleted: 0, nMatched: 0, nModified: 0, nUpserted: 0});
 
 assert(res.cursor.id == 0,
        "Unexpectedly found non-zero cursor ID in bulkWrite command response: " + tojson(res));

diff --git a/jstests/core/write/bulk/bulk_write_non_auth.js b/jstests/core/write/bulk/bulk_write_non_auth.js
@@ -35,7 +35,7 @@ let res = db.adminCommand({
 
 assert.commandWorked(res);
 cursorSizeValidator(res, 1);
-assert.eq(res.numErrors, 1, "bulkWrite command response: " + tojson(res));
+assert.eq(res.nErrors, 1, "bulkWrite command response: " + tojson(res));
 
 cursorEntryValidator(res.cursor.firstBatch[0],
                      {ok: 0, idx: 0, n: 0, nModified: 0, code: ErrorCodes.InvalidNamespace});
@@ -54,7 +54,7 @@ res = db.adminCommand({
 
 assert.commandWorked(res);
 cursorSizeValidator(res, 1);
-assert.eq(res.numErrors, 1, "bulkWrite command response: " + tojson(res));
+assert.eq(res.nErrors, 1, "bulkWrite command response: " + tojson(res));
 
 cursorEntryValidator(res.cursor.firstBatch[0],
                      {ok: 0, idx: 0, n: 0, code: ErrorCodes.InvalidNamespace});
@@ -76,7 +76,7 @@ res = db.adminCommand({
 
 assert.commandWorked(res);
 cursorSizeValidator(res, 2);
-assert.eq(res.numErrors, 1, "bulkWrite command response: " + tojson(res));
+assert.eq(res.nErrors, 1, "bulkWrite command response: " + tojson(res));
 
 cursorEntryValidator(res.cursor.firstBatch[0],
                      {ok: 0, idx: 0, n: 0, code: ErrorCodes.InvalidNamespace});
@@ -103,7 +103,7 @@ res = db.adminCommand({
 
 assert.commandWorked(res);
 cursorSizeValidator(res, 1);
-assert.eq(res.numErrors, 1, "bulkWrite command response: " + tojson(res));
+assert.eq(res.nErrors, 1, "bulkWrite command response: " + tojson(res));
 
 cursorEntryValidator(res.cursor.firstBatch[0],
                      {ok: 0, idx: 0, n: 0, code: ErrorCodes.InvalidNamespace});
@@ -133,5 +133,5 @@ res = db.adminCommand({
 
 assert.commandWorked(res);
 cursorSizeValidator(res, 7);
-assert.eq(res.numErrors, 3, "bulkWrite command response: " + tojson(res));
+assert.eq(res.nErrors, 3, "bulkWrite command response: " + tojson(res));
 coll.drop();
diff --git a/jstests/core/write/bulk/bulk_write_non_retryable_cursor.js b/jstests/core/write/bulk/bulk_write_non_retryable_cursor.js
@@ -13,7 +13,11 @@
  *   featureFlagBulkWriteCommand,
  * ]
  */
-import {cursorEntryValidator, cursorSizeValidator} from "jstests/libs/bulk_write_utils.js";
+import {
+    cursorEntryValidator,
+    cursorSizeValidator,
+    summaryFieldsValidator
+} from "jstests/libs/bulk_write_utils.js";
 
 var coll = db.getCollection("coll");
 var coll1 = db.getCollection("coll1");
@@ -35,7 +39,8 @@ var res = db.adminCommand({
 
 assert.commandWorked(res);
 cursorSizeValidator(res, 3);
-assert.eq(res.numErrors, 0, "bulkWrite command response: " + tojson(res));
+summaryFieldsValidator(
+    res, {nErrors: 0, nInserted: 2, nDeleted: 0, nMatched: 2, nModified: 2, nUpserted: 0});
 
 cursorEntryValidator(res.cursor.firstBatch[0], {ok: 1, idx: 0, n: 1});
 cursorEntryValidator(res.cursor.firstBatch[1], {ok: 1, idx: 1, n: 1});
@@ -58,7 +63,8 @@ res = db.adminCommand({
 
 assert.commandWorked(res);
 cursorSizeValidator(res, 3);
-assert.eq(res.numErrors, 0, "bulkWrite command response: " + tojson(res));
+summaryFieldsValidator(
+    res, {nErrors: 0, nInserted: 2, nDeleted: 2, nMatched: 0, nModified: 0, nUpserted: 0});
 
 cursorEntryValidator(res.cursor.firstBatch[0], {ok: 1, idx: 0, n: 1});
 cursorEntryValidator(res.cursor.firstBatch[1], {ok: 1, idx: 1, n: 1});
@@ -97,7 +103,8 @@ res = db.adminCommand({
 
 assert.commandWorked(res);
 cursorSizeValidator(res, 5);
-assert.eq(res.numErrors, 0, "bulkWrite command response: " + tojson(res));
+summaryFieldsValidator(
+    res, {nErrors: 0, nInserted: 2, nDeleted: 1, nMatched: 2, nModified: 2, nUpserted: 0});
 
 cursorEntryValidator(res.cursor.firstBatch[0], {ok: 1, idx: 0, n: 1});
 cursorEntryValidator(res.cursor.firstBatch[1], {ok: 1, idx: 1, n: 1});

diff --git a/jstests/core/write/bulk/bulk_write_non_transaction.js b/jstests/core/write/bulk/bulk_write_non_transaction.js
@@ -14,7 +14,11 @@
  *   featureFlagBulkWriteCommand,
  * ]
  */
-import {cursorEntryValidator, cursorSizeValidator} from "jstests/libs/bulk_write_utils.js";
+import {
+    cursorEntryValidator,
+    cursorSizeValidator,
+    summaryFieldsValidator
+} from "jstests/libs/bulk_write_utils.js";
 
 var coll = db.getCollection("coll");
 var coll1 = db.getCollection("coll1");
@@ -160,7 +164,8 @@ res = db.adminCommand({
 
 assert.commandWorked(res);
 cursorSizeValidator(res, 2);
-assert.eq(res.numErrors, 1, "bulkWrite command response: " + tojson(res));
+summaryFieldsValidator(
+    res, {nErrors: 1, nInserted: 0, nDeleted: 0, nMatched: 1, nModified: 0, nUpserted: 1});
 
 cursorEntryValidator(res.cursor.firstBatch[0],
                      {ok: 0, idx: 0, n: 0, nModified: 0, code: ErrorCodes.ImmutableField});
@@ -184,7 +189,8 @@ res = db.adminCommand({
 
 assert.commandWorked(res);
 cursorSizeValidator(res, 1);
-assert.eq(res.numErrors, 1, "bulkWrite command response: " + tojson(res));
+summaryFieldsValidator(
+    res, {nErrors: 1, nInserted: 0, nDeleted: 0, nMatched: 0, nModified: 0, nUpserted: 0});
 
 cursorEntryValidator(res.cursor.firstBatch[0],
                      {ok: 0, idx: 0, n: 0, nModified: 0, code: ErrorCodes.ImmutableField});
@@ -217,7 +223,8 @@ res = db.adminCommand({
 
 assert.commandWorked(res);
 cursorSizeValidator(res, 3);
-assert.eq(res.numErrors, 1, "bulkWrite command response: " + tojson(res));
+summaryFieldsValidator(
+    res, {nErrors: 1, nInserted: 2, nDeleted: 0, nMatched: 0, nModified: 0, nUpserted: 0});
 
 assert.eq(res.cursor.id, 0);
 cursorEntryValidator(res.cursor.firstBatch[0], {ok: 1, n: 1, idx: 0});
@@ -250,7 +257,8 @@ res = db.adminCommand({
 
 assert.commandWorked(res);
 cursorSizeValidator(res, 2);
-assert.eq(res.numErrors, 1, "bulkWrite command response: " + tojson(res));
+summaryFieldsValidator(
+    res, {nErrors: 1, nInserted: 1, nDeleted: 0, nMatched: 0, nModified: 0, nUpserted: 0});
 
 assert.eq(res.cursor.id, 0);
 cursorEntryValidator(res.cursor.firstBatch[0], {ok: 1, n: 1, idx: 0});
@@ -281,7 +289,8 @@ res = db.adminCommand({
 
 assert.commandWorked(res);
 cursorSizeValidator(res, 2);
-assert.eq(res.numErrors, 1, "bulkWrite command response: " + tojson(res));
+summaryFieldsValidator(
+    res, {nErrors: 1, nInserted: 1, nDeleted: 0, nMatched: 0, nModified: 0, nUpserted: 0});
 
 assert.eq(res.cursor.id, 0);
 cursorEntryValidator(res.cursor.firstBatch[0], {ok: 1, n: 1, idx: 0});
@@ -309,7 +318,8 @@ res = db.adminCommand({
 
 assert.commandWorked(res);
 cursorSizeValidator(res, 3);
-assert.eq(res.numErrors, 1, "bulkWrite command response: " + tojson(res));
+summaryFieldsValidator(
+    res, {nErrors: 1, nInserted: 2, nDeleted: 0, nMatched: 0, nModified: 0, nUpserted: 0});
 
 assert.eq(res.cursor.id, 0);
 cursorEntryValidator(res.cursor.firstBatch[0], {ok: 1, n: 1, idx: 0});
@@ -332,7 +342,7 @@ res = db.adminCommand({
     bypassDocumentValidation: false,
 });
 assert.commandWorked(res);
-assert.eq(res.numErrors, 1, "bulkWrite command response: " + tojson(res));
+assert.eq(res.nErrors, 1, "bulkWrite command response: " + tojson(res));
 
 assert.eq(0, coll.count({_id: 3}));
 coll.drop();
@@ -350,7 +360,8 @@ res = db.adminCommand({
 
 assert.commandWorked(res);
 cursorSizeValidator(res, 3);
-assert.eq(res.numErrors, 1, "bulkWrite command response: " + tojson(res));
+summaryFieldsValidator(
+    res, {nErrors: 1, nInserted: 1, nDeleted: 0, nMatched: 1, nModified: 1, nUpserted: 0});
 
 cursorEntryValidator(res.cursor.firstBatch[0], {ok: 1, idx: 0, n: 1});
 cursorEntryValidator(res.cursor.firstBatch[1], {ok: 1, idx: 1, n: 1, nModified: 1});
@@ -375,7 +386,8 @@ res = db.adminCommand({
 
 assert.commandWorked(res);
 cursorSizeValidator(res, 1);
-assert.eq(res.numErrors, 1, "bulkWrite command response: " + tojson(res));
+summaryFieldsValidator(
+    res, {nErrors: 1, nInserted: 0, nDeleted: 0, nMatched: 0, nModified: 0, nUpserted: 0});
 
 cursorEntryValidator(res.cursor.firstBatch[0], {ok: 0, idx: 0, n: 0, nModified: 0, code: 51198});
 assert.eq(res.cursor.firstBatch[0].errmsg,
@@ -401,7 +413,8 @@ res = db.adminCommand({
 
 assert.commandWorked(res);
 cursorSizeValidator(res, 1);
-assert.eq(res.numErrors, 1, "bulkWrite command response: " + tojson(res));
+summaryFieldsValidator(
+    res, {nErrors: 1, nInserted: 0, nDeleted: 0, nMatched: 0, nModified: 0, nUpserted: 0});
 
 cursorEntryValidator(res.cursor.firstBatch[0], {ok: 0, idx: 0, n: 0, nModified: 0, code: 9});
 assert.eq(res.cursor.firstBatch[0].errmsg,
@@ -419,7 +432,8 @@ res = db.adminCommand({
 
 assert.commandWorked(res, "bulkWrite command response: " + tojson(res));
 cursorSizeValidator(res, 1);
-assert.eq(res.numErrors, 1, "bulkWrite command response: " + tojson(res));
+summaryFieldsValidator(
+    res, {nErrors: 1, nInserted: 1, nDeleted: 0, nMatched: 0, nModified: 0, nUpserted: 0});
 
 assert(res.cursor.id == 0, "bulkWrite command response: " + tojson(res));
 cursorEntryValidator(res.cursor.firstBatch[0], {ok: 0, n: 0, idx: 1, code: 11000});