Revert "SERVER-40567 benchRun support for pipeline updates"r4.1.11

This reverts commit c24b5c1df7d946dd1c931f5c93c7098c9cf8545d.

12 files changed, 54 insertions, 149 deletions

diff --git a/buildscripts/resmokeconfig/suites/multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough.yml
index 2406054200f..7c55c988dfc 100644
--- a/buildscripts/resmokeconfig/suites/multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough.yml
@@ -327,7 +327,6 @@ selector:
   # op3 will still be using the snapshot from op1, and not see op2 at all.
   - jstests/core/cursora.js
   - jstests/core/bench_test1.js
-  - jstests/core/benchrun_pipeline_updates.js
 
   # The tests below use applyOps, SERVER-1439.
   - jstests/core/list_collections1.js
diff --git a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_jscore_passthrough.yml
index 5b5b716b0dd..362cdfa1a83 100644
--- a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_jscore_passthrough.yml
@@ -354,7 +354,6 @@ selector:
   # op3 will still be using the snapshot from op1, and not see op2 at all.
   - jstests/core/cursora.js
   - jstests/core/bench_test1.js
-  - jstests/core/benchrun_pipeline_updates.js
 
   # The tests below use applyOps, SERVER-1439.
   - jstests/core/list_collections1.js
diff --git a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough.yml
index a22bbe5e58f..46375674947 100644
--- a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough.yml
@@ -339,7 +339,6 @@ selector:
   # op3 will still be using the snapshot from op1, and not see op2 at all.
   - jstests/core/cursora.js
   - jstests/core/bench_test1.js
-  - jstests/core/benchrun_pipeline_updates.js
 
   # auto_retry_on_network_error.js will timeout with assert.soon and give a different error from
   # what test expects. Excluding from suite since it doesn't really do any database operations, so
diff --git a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough.yml
index 1512af22c06..a15339fdcd3 100644
--- a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough.yml
@@ -348,7 +348,6 @@ selector:
   # op3 will still be using the snapshot from op1, and not see op2 at all.
   - jstests/core/cursora.js
   - jstests/core/bench_test1.js
-  - jstests/core/benchrun_pipeline_updates.js
 
   # auto_retry_on_network_error.js will timeout with assert.soon and give a different error from
   # what test expects. Excluding from suite since it doesn't really do any database operations, so
diff --git a/buildscripts/resmokeconfig/suites/multi_stmt_txn_jscore_passthrough_with_migration.yml b/buildscripts/resmokeconfig/suites/multi_stmt_txn_jscore_passthrough_with_migration.yml
index eecfc430143..4e664d4e999 100644
--- a/buildscripts/resmokeconfig/suites/multi_stmt_txn_jscore_passthrough_with_migration.yml
+++ b/buildscripts/resmokeconfig/suites/multi_stmt_txn_jscore_passthrough_with_migration.yml
@@ -370,7 +370,6 @@ selector:
   # op3 will still be using the snapshot from op1, and not see op2 at all.
   - jstests/core/cursora.js
   - jstests/core/bench_test1.js
-  - jstests/core/benchrun_pipeline_updates.js
 
   # The tests below use applyOps, SERVER-1439.
   - jstests/core/list_collections1.js
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_jscore_passthrough.yml
index 7f63d067d1e..dcc0a484991 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_jscore_passthrough.yml
@@ -267,7 +267,6 @@ selector:
   # op3 will still be using the snapshot from op1, and not see op2 at all.
   - jstests/core/cursora.js
   - jstests/core/bench_test1.js
-  - jstests/core/benchrun_pipeline_updates.js
 
   # Does not support tojson of command objects.
   - jstests/core/SERVER-23626.js
diff --git a/buildscripts/resmokeconfig/suites/sharded_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_multi_stmt_txn_jscore_passthrough.yml
index 50962990b1b..3abbe965717 100644
--- a/buildscripts/resmokeconfig/suites/sharded_multi_stmt_txn_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/sharded_multi_stmt_txn_jscore_passthrough.yml
@@ -300,7 +300,6 @@ selector:
   # op3 will still be using the snapshot from op1, and not see op2 at all.
   - jstests/core/cursora.js
   - jstests/core/bench_test1.js
-  - jstests/core/benchrun_pipeline_updates.js
 
   # The tests below use applyOps, SERVER-1439.
   - jstests/core/list_collections1.js
diff --git a/jstests/core/bench_test1.js b/jstests/core/bench_test1.js
index 8e316c8b25e..683b5be4713 100644
--- a/jstests/core/bench_test1.js
+++ b/jstests/core/bench_test1.js
@@ -4,41 +4,43 @@
 //   assumes_no_implicit_index_creation,
 //   uses_multiple_connections,
 // ]
-(function() {
-    "use strict";
-
-    const t = db.bench_test1;
-    t.drop();
-
-    t.insert({_id: 1, x: 1});
-    t.insert({_id: 2, x: 1});
-
-    const ops = [
-        {op: "findOne", ns: t.getFullName(), query: {_id: 1}},
-        {op: "update", ns: t.getFullName(), query: {_id: 1}, update: {$inc: {x: 1}}}
-    ];
-
-    const seconds = 10;
-
-    const benchArgs = {ops: ops, parallel: 2, seconds: seconds, host: db.getMongo().host};
-
-    if (jsTest.options().auth) {
-        benchArgs['db'] = 'admin';
-        benchArgs['username'] = jsTest.options().authUser;
-        benchArgs['password'] = jsTest.options().authPassword;
-    }
-    const res = benchRun(benchArgs);
-
-    assert.lte(seconds * res.update, t.findOne({_id: 1}).x * 1.5, "A1");
-
-    assert.eq(1, t.getIndexes().length, "B1");
-    benchArgs['ops'] = [{op: "createIndex", ns: t.getFullName(), key: {x: 1}}];
-    benchArgs['parallel'] = 1;
-    benchRun(benchArgs);
-    assert.eq(2, t.getIndexes().length, "B2");
-    benchArgs['ops'] = [{op: "dropIndex", ns: t.getFullName(), key: {x: 1}}];
-    benchRun(benchArgs);
-    assert.soon(function() {
-        return t.getIndexes().length == 1;
-    });
-}());
+
+t = db.bench_test1;
+t.drop();
+
+t.insert({_id: 1, x: 1});
+t.insert({_id: 2, x: 1});
+
+ops = [
+    {op: "findOne", ns: t.getFullName(), query: {_id: 1}},
+    {op: "update", ns: t.getFullName(), query: {_id: 1}, update: {$inc: {x: 1}}}
+];
+
+seconds = 10;
+
+benchArgs = {
+    ops: ops,
+    parallel: 2,
+    seconds: seconds,
+    host: db.getMongo().host
+};
+
+if (jsTest.options().auth) {
+    benchArgs['db'] = 'admin';
+    benchArgs['username'] = jsTest.options().authUser;
+    benchArgs['password'] = jsTest.options().authPassword;
+}
+res = benchRun(benchArgs);
+
+assert.lte(seconds * res.update, t.findOne({_id: 1}).x * 1.5, "A1");
+
+assert.eq(1, t.getIndexes().length, "B1");
+benchArgs['ops'] = [{op: "createIndex", ns: t.getFullName(), key: {x: 1}}];
+benchArgs['parallel'] = 1;
+benchRun(benchArgs);
+assert.eq(2, t.getIndexes().length, "B2");
+benchArgs['ops'] = [{op: "dropIndex", ns: t.getFullName(), key: {x: 1}}];
+benchRun(benchArgs);
+assert.soon(function() {
+    return t.getIndexes().length == 1;
+});
diff --git a/jstests/core/benchrun_pipeline_updates.js b/jstests/core/benchrun_pipeline_updates.js
deleted file mode 100644
index ef1ef719a0c..00000000000
--- a/jstests/core/benchrun_pipeline_updates.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Tests that benchRun can understand pipeline-style updates and findAndModifys.
- *
- * @tags: [uses_multiple_connections]
- */
-(function() {
-    "use strict";
-    const coll = db.benchrun_pipeline_updates;
-    coll.drop();
-
-    assert.commandWorked(coll.insert({_id: 0, x: 0}));
-
-    // Test that a basic pipeline can be used by an update op.
-    let benchArgs = {
-        ops: [
-            {
-              op: "update",
-              ns: coll.getFullName(),
-              query: {_id: 0},
-              writeCmd: true,
-              update: [{$addFields: {x: {$add: ["$x", 1]}}}]
-            },
-        ],
-        parallel: 2,
-        seconds: 1,
-        host: db.getMongo().host,
-    };
-    if (jsTest.options().auth) {
-        benchArgs['db'] = 'admin';
-        benchArgs['username'] = jsTest.options().authUser;
-        benchArgs['password'] = jsTest.options().authPassword;
-    }
-    let res = benchRun(benchArgs);
-    assert.eq(res.errCount, 0);
-    assert.gt(
-        coll.findOne({_id: 0}).x, 2, "Expected at least one update to succeed and increment 'x'");
-
-    // Now test that the pipeline is still subject to benchRun's keyword replacement.
-
-    // Initialize x to something outside the range we'll expect it to be in below if the updates
-    // succeed.
-    assert.commandWorked(coll.updateOne({_id: 0}, {$set: {x: 100}}));
-    benchArgs.ops = [{
-        op: "update",
-        ns: coll.getFullName(),
-        query: {_id: 0},
-        writeCmd: true,
-        update: [{$project: {x: {$literal: {"#RAND_INT_PLUS_THREAD": [0, 2]}}}}]
-    }];
-    res = benchRun(benchArgs);
-    assert.eq(res.errCount, 0);
-    assert.lte(
-        coll.findOne({_id: 0}).x, 3, "Expected 'x' to be no more than 3 after randInt replacement");
-}());
diff --git a/src/mongo/shell/bench.cpp b/src/mongo/shell/bench.cpp
index 78769755580..2b09ed443a5 100644
--- a/src/mongo/shell/bench.cpp
+++ b/src/mongo/shell/bench.cpp
@@ -558,7 +558,7 @@ BenchRunOp opFromBson(const BSONObj& op) {
                     str::stream() << "Field 'update' is only valid for update op type. Op type is "
                                   << opType,
                     (opType == "update"));
-            myOp.update = write_ops::UpdateModification::parseFromBSON(arg);
+            myOp.update = arg.Obj();
         } else if (name == "upsert") {
             uassert(34392,
                     str::stream() << "Field 'upsert' is only valid for update op type. Op type is "
@@ -931,7 +931,7 @@ void BenchRunWorker::generateLoadOnConnection(DBClientBase* conn) {
                         return;
                 }
                 if (!_config->handleErrors && !op.handleError)
-                    throw;
+                    return;
 
                 sleepFor(_config->delayMillisOnFailedOperation);
 
@@ -1151,36 +1151,16 @@ void BenchRunOp::executeOnce(DBClientBase* conn,
             {
                 BenchRunEventTrace _bret(&state->stats->updateCounter);
                 BSONObj query = fixQuery(this->query, *state->bsonTemplateEvaluator);
+                BSONObj update = fixQuery(this->update, *state->bsonTemplateEvaluator);
 
                 if (this->useWriteCmd) {
                     BSONObjBuilder builder;
                     builder.append("update", nsToCollectionSubstring(this->ns));
-                    BSONArrayBuilder updateArray(builder.subarrayStart("updates"));
-                    {
-                        BSONObjBuilder singleUpdate;
-                        singleUpdate.append("q", query);
-                        switch (this->update.type()) {
-                            case write_ops::UpdateModification::Type::kClassic: {
-                                singleUpdate.append("u",
-                                                    fixQuery(this->update.getUpdateClassic(),
-                                                             *state->bsonTemplateEvaluator));
-                                break;
-                            }
-                            case write_ops::UpdateModification::Type::kPipeline: {
-                                BSONArrayBuilder pipelineBuilder(singleUpdate.subarrayStart("u"));
-                                for (auto&& stage : this->update.getUpdatePipeline()) {
-                                    pipelineBuilder.append(
-                                        fixQuery(stage, *state->bsonTemplateEvaluator));
-                                }
-                                pipelineBuilder.doneFast();
-                                break;
-                            }
-                        }
-                        singleUpdate.append("multi", this->multi);
-                        singleUpdate.append("upsert", this->upsert);
-                        updateArray.append(singleUpdate.done());
-                    }
-                    updateArray.doneFast();
+                    BSONArrayBuilder docBuilder(builder.subarrayStart("updates"));
+                    docBuilder.append(BSON("q" << query << "u" << update << "multi" << this->multi
+                                               << "upsert"
+                                               << this->upsert));
+                    docBuilder.done();
                     builder.append("writeConcern", this->writeConcern);
 
                     boost::optional<TxnNumber> txnNumberForOp;
@@ -1196,16 +1176,11 @@ void BenchRunOp::executeOnce(DBClientBase* conn,
                                           txnNumberForOp,
                                           &result);
                 } else {
-                    uassert(
-                        30015,
-                        "cannot use legacy write protocol for anything but classic style updates",
-                        this->update.type() == write_ops::UpdateModification::Type::kClassic);
-                    auto toSend = makeUpdateMessage(
-                        this->ns,
-                        query,
-                        fixQuery(this->update.getUpdateClassic(), *state->bsonTemplateEvaluator),
-                        (this->upsert ? UpdateOption_Upsert : 0) |
-                            (this->multi ? UpdateOption_Multi : 0));
+                    auto toSend = makeUpdateMessage(this->ns,
+                                                    query,
+                                                    update,
+                                                    (this->upsert ? UpdateOption_Upsert : 0) |
+                                                        (this->multi ? UpdateOption_Multi : 0));
                     conn->say(toSend);
                     if (this->safe)
                         result = conn->getLastErrorDetailed();
diff --git a/src/mongo/shell/bench.h b/src/mongo/shell/bench.h
index 527beecae49..7683ad4b089 100644
--- a/src/mongo/shell/bench.h
+++ b/src/mongo/shell/bench.h
@@ -36,7 +36,6 @@
 #include "mongo/client/dbclient_base.h"
 #include "mongo/db/jsobj.h"
 #include "mongo/db/logical_session_id.h"
-#include "mongo/db/ops/write_ops_parsers.h"
 #include "mongo/platform/atomic_word.h"
 #include "mongo/stdx/condition_variable.h"
 #include "mongo/stdx/mutex.h"
@@ -117,7 +116,7 @@ struct BenchRunOp {
     bool showResult = false;
     std::string target;
     bool throwGLE = false;
-    write_ops::UpdateModification update;
+    BSONObj update;
     bool upsert = false;
     bool useCheck = false;
     bool useReadCmd = false;
diff --git a/src/mongo/shell/dbshell.cpp b/src/mongo/shell/dbshell.cpp
index f7ff703b665..633a99d8fc5 100644
--- a/src/mongo/shell/dbshell.cpp
+++ b/src/mongo/shell/dbshell.cpp
@@ -46,7 +46,6 @@
 #include "mongo/client/mongo_uri.h"
 #include "mongo/db/auth/sasl_command_constants.h"
 #include "mongo/db/client.h"
-#include "mongo/db/commands/test_commands_enabled.h"
 #include "mongo/db/log_process_details.h"
 #include "mongo/db/server_options.h"
 #include "mongo/logger/console_appender.h"
@@ -106,15 +105,6 @@ MONGO_INITIALIZER_WITH_PREREQUISITES(SetFeatureCompatibilityVersion42, ("EndStar
         ServerGlobalParams::FeatureCompatibility::Version::kFullyUpgradedTo42);
     return Status::OK();
 }
-
-// Initialize the testCommandsEnabled server parameter to true since the mongo shell does not have
-// any test-only commands that could cause harm to the server, and it may be necessary to enable
-// this to test certain features, for example through benchRun (see SERVER-40419).
-MONGO_INITIALIZER_WITH_PREREQUISITES(EnableShellTestCommands, ("EndStartupOptionSetup"))
-(InitializerContext* context) {
-    setTestCommandsEnabled(true);
-    return Status::OK();
-}
 const auto kAuthParam = "authSource"s;
 
 /**