SERVER-100924: make bulkWrite with rawData explainable (#33952)

malikendsley · gregorynoma · MongoDB Bot · commit 491a4a89b751 · 2025-04-10T03:35:40.000Z
Co-authored-by: Gregory Noma <gregory.noma@gmail.com> GitOrigin-RevId: 79ee243
diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_causally_consistent_jscore_passthrough.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_causally_consistent_jscore_passthrough.yml
@@ -60,7 +60,6 @@ selector:
     - jstests/core/query/parsing/write_commands_reject_unknown_fields.js
     - jstests/core/query/explain/explain_uuid.js
     - jstests/core/query/explain/explain_includes_command.js
-    - jstests/core/timeseries/write/timeseries_buckets_write_explain.js
     - jstests/core/txns/transactions_profiling.js
     - jstests/core/txns/currentop_blocked_operations.js
     - jstests/core/txns/transactions_profiling_with_drops.js
diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_replica_sets_jscore_passthrough.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_replica_sets_jscore_passthrough.yml
@@ -58,7 +58,6 @@ selector:
     - jstests/core/query/parsing/write_commands_reject_unknown_fields.js
     - jstests/core/query/explain/explain_uuid.js
     - jstests/core/query/explain/explain_includes_command.js
-    - jstests/core/timeseries/write/timeseries_buckets_write_explain.js
     - jstests/core/txns/transactions_profiling.js
     - jstests/core/txns/currentop_blocked_operations.js
     - jstests/core/txns/transactions_profiling_with_drops.js
diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_replica_sets_kill_stepdown_terminate_jscore_passthrough.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_replica_sets_kill_stepdown_terminate_jscore_passthrough.yml
@@ -112,7 +112,6 @@ selector:
     - jstests/core/query/parsing/write_commands_reject_unknown_fields.js
     - jstests/core/query/explain/explain_uuid.js
     - jstests/core/query/explain/explain_includes_command.js
-    - jstests/core/timeseries/write/timeseries_buckets_write_explain.js
     - jstests/fle2/**/*.js
     - src/mongo/db/modules/*/jstests/fle2/**/*.js
   exclude_with_any_tags:
diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_replica_sets_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_replica_sets_multi_stmt_txn_jscore_passthrough.yml
@@ -194,7 +194,6 @@ selector:
     - jstests/core/query/parsing/write_commands_reject_unknown_fields.js
     - jstests/core/query/explain/explain_uuid.js
     - jstests/core/query/explain/explain_includes_command.js
-    - jstests/core/timeseries/write/timeseries_buckets_write_explain.js
     - jstests/libs/txns/txn_passthrough_runner_selftest.js
   exclude_with_any_tags:
     - assumes_standalone_mongod
diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_replica_sets_multi_stmt_txn_kill_stepdown_terminate_jscore_passthrough.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_replica_sets_multi_stmt_txn_kill_stepdown_terminate_jscore_passthrough.yml
@@ -228,7 +228,6 @@ selector:
     - jstests/core/query/parsing/write_commands_reject_unknown_fields.js
     - jstests/core/query/explain/explain_uuid.js
     - jstests/core/query/explain/explain_includes_command.js
-    - jstests/core/timeseries/write/timeseries_buckets_write_explain.js
   exclude_with_any_tags:
     - assumes_standalone_mongod
     - requires_getmore
diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_sharded_causally_consistent_jscore_passthrough.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_sharded_causally_consistent_jscore_passthrough.yml
@@ -85,7 +85,6 @@ selector:
     - jstests/core/query/parsing/write_commands_reject_unknown_fields.js
     - jstests/core/query/explain/explain_uuid.js
     - jstests/core/query/explain/explain_includes_command.js
-    - jstests/core/timeseries/write/timeseries_buckets_write_explain.js
     - jstests/core/txns/transactions_profiling.js
     - jstests/core/txns/currentop_blocked_operations.js
     - jstests/core/txns/transactions_profiling_with_drops.js
diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_sharded_collections_jscore_passthrough.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_sharded_collections_jscore_passthrough.yml
@@ -85,7 +85,6 @@ selector:
     - jstests/core/query/parsing/write_commands_reject_unknown_fields.js
     - jstests/core/query/explain/explain_uuid.js
     - jstests/core/query/explain/explain_includes_command.js
-    - jstests/core/timeseries/write/timeseries_buckets_write_explain.js
     - jstests/core/txns/transactions_profiling.js
     - jstests/core/txns/currentop_blocked_operations.js
     - jstests/core/txns/transactions_profiling_with_drops.js
diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_sharded_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_sharded_multi_stmt_txn_jscore_passthrough.yml
@@ -208,7 +208,6 @@ selector:
     - jstests/core/query/parsing/write_commands_reject_unknown_fields.js
     - jstests/core/query/explain/explain_uuid.js
     - jstests/core/query/explain/explain_includes_command.js
-    - jstests/core/timeseries/write/timeseries_buckets_write_explain.js
     - jstests/core/txns/transactions_profiling.js
     - jstests/core/txns/currentop_blocked_operations.js
     - jstests/core/txns/transactions_profiling_with_drops.js
diff --git a/buildscripts/resmokeconfig/matrix_suites/overrides/bulk_write.yml b/buildscripts/resmokeconfig/matrix_suites/overrides/bulk_write.yml
@@ -33,9 +33,6 @@
       # Checks for specific name in the command that was executed that we override.
       - jstests/core/query/explain/explain_includes_command.js
 
-      # TODO: Remove this exclusion when SERVER-100924 is completed.
-      - jstests/core/timeseries/write/timeseries_buckets_write_explain.js
-
 - name: single_op_txns_excluded_files
   value:
     exclude_files:
diff --git a/jstests/core/timeseries/write/timeseries_buckets_write_explain.js b/jstests/core/timeseries/write/timeseries_buckets_write_explain.js
@@ -27,11 +27,21 @@ assert.commandWorked(coll.insert([
 
 const assertExplain = function(commandResult, commandName) {
     assert(commandResult.ok);
-    assert.eq(commandResult.command[commandName],
-              coll.getName(),
-              `Expected command namespace to be ${tojson(coll.getName())} but got ${
-                  tojson(commandResult.command[commandName])}`);
-
+    if (commandResult.command.bulkWrite) {
+        assert.eq(commandResult.command.nsInfo.length,
+                  1,
+                  `Expected 1 namespace in explain command but got ${
+                      commandResult.command.nsInfo.length}`);
+        assert.eq(commandResult.command.nsInfo[0].ns,
+                  coll.getFullName(),
+                  `Expected command namespace to be ${tojson(coll.getFullName())} but got ${
+                      tojson(commandResult.command.nsInfo[0].ns)}`);
+    } else {
+        assert.eq(commandResult.command[commandName],
+                  coll.getName(),
+                  `Expected command namespace to be ${tojson(coll.getName())} but got ${
+                      tojson(commandResult.command[commandName])}`);
+    }
     assert(commandResult.command.rawData);
     assert.isnull(getPlanStage(commandResult, "TS_MODIFY")),
         "Expected not to find TS_MODIFY stage " + tojson(commandResult);
@@ -47,8 +57,8 @@ assertExplain(coll.explain().remove({"control.count": 2}, {rawData: true}), "del
 assertExplain(coll.explain().update({"control.count": 1}, {$set: {meta: "3"}}, {rawData: true}),
               "update");
 
-// Additionally run an explain that issues a cluster write without a shard key to test that
-// path.
+// Additionally run explains that issue a cluster write without a shard key in a sharded environment
+// to test that path.
 // TODO SERVER-102697: Cluster write without shard key for findAndModify (if not put into its own
 // test).
 assertExplain(coll.explain().remove({"control.count": 2}, {rawData: true, justOne: true}),
diff --git a/src/mongo/db/commands/query_cmd/bulk_write.cpp b/src/mongo/db/commands/query_cmd/bulk_write.cpp
@@ -1387,7 +1387,10 @@ class BulkWriteCmd : public BulkWriteCmdVersion1Gen<BulkWriteCmd> {
 
             const BulkWriteCRUDOp bulkOp(ops[0]);
             const auto opType = bulkOp.getType();
-            const auto& nsEntry = req.getNsInfo()[bulkOp.getNsInfoIdx()];
+            auto nsEntry = req.getNsInfo()[bulkOp.getNsInfoIdx()];
+            if (isRawDataOperation(opCtx)) {
+                nsEntry.setNs(timeseries::isTimeseriesViewRequest(opCtx, nsEntry).second);
+            }
 
             if (opType == BulkWriteCRUDOp::kInsert) {
                 uasserted(ErrorCodes::IllegalOperation, "Cannot explain insert cmd for bulkWrite");
diff --git a/src/mongo/db/commands/query_cmd/bulk_write_common.cpp b/src/mongo/db/commands/query_cmd/bulk_write_common.cpp
@@ -49,6 +49,7 @@
 #include "mongo/db/query/write_ops/delete_request_gen.h"
 #include "mongo/db/query/write_ops/update_request.h"
 #include "mongo/db/query/write_ops/write_ops.h"
+#include "mongo/db/raw_data_operation.h"
 #include "mongo/db/repl/oplog.h"
 #include "mongo/idl/idl_parser.h"
 #include "mongo/util/assert_util.h"
@@ -259,6 +260,9 @@ write_ops::UpdateCommandRequest makeUpdateCommandRequestFromUpdateOp(
     write_ops::UpdateCommandRequest updateCommand(nsEntry.getNs(), updates);
 
     updateCommand.setLet(req.getLet());
+    if (req.getRawData()) {
+        updateCommand.setRawData(true);
+    }
 
     auto& requestBase = updateCommand.getWriteCommandRequestBase();
     requestBase.setIsTimeseriesNamespace(nsEntry.getIsTimeseriesNamespace());
@@ -292,6 +296,9 @@ write_ops::DeleteCommandRequest makeDeleteCommandRequestForFLE(
     write_ops::DeleteCommandRequest deleteRequest(nsEntry.getNs(), deletes);
     deleteRequest.setLet(req.getLet());
     deleteRequest.setLegacyRuntimeConstants(Variables::generateRuntimeConstants(opCtx));
+    if (isRawDataOperation(opCtx)) {
+        deleteRequest.setRawData(true);
+    }
 
     auto& requestBase = deleteRequest.getWriteCommandRequestBase();
     requestBase.setCollectionUUID(nsEntry.getCollectionUUID());
