diff options
Diffstat (limited to 'src/mongo/db/commands')
62 files changed, 5 insertions, 125 deletions
diff --git a/src/mongo/db/commands/apply_ops_cmd.cpp b/src/mongo/db/commands/apply_ops_cmd.cpp index 233fcc744e3..fed2ae7e2ee 100644 --- a/src/mongo/db/commands/apply_ops_cmd.cpp +++ b/src/mongo/db/commands/apply_ops_cmd.cpp @@ -89,7 +89,6 @@ public: virtual bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { validateApplyOpsCommand(cmdObj); diff --git a/src/mongo/db/commands/authentication_commands.cpp b/src/mongo/db/commands/authentication_commands.cpp index 95a92d89e3a..3d6b07d9754 100644 --- a/src/mongo/db/commands/authentication_commands.cpp +++ b/src/mongo/db/commands/authentication_commands.cpp @@ -116,7 +116,6 @@ public: bool run(OperationContext* opCtx, const string&, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { nonce64 n = getNextNonce(); @@ -154,7 +153,6 @@ void CmdAuthenticate::redactForLogging(mutablebson::Document* cmdObj) { bool CmdAuthenticate::run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { if (!serverGlobalParams.quiet.load()) { @@ -377,7 +375,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int options, string& errmsg, BSONObjBuilder& result) { AuthorizationSession* authSession = AuthorizationSession::get(Client::getCurrent()); diff --git a/src/mongo/db/commands/authentication_commands.h b/src/mongo/db/commands/authentication_commands.h index fddfcfdb1eb..e49c214091c 100644 --- a/src/mongo/db/commands/authentication_commands.h +++ b/src/mongo/db/commands/authentication_commands.h @@ -58,7 +58,6 @@ public: bool run(OperationContext* opCtx, const std::string& dbname, BSONObj& cmdObj, - int options, std::string& errmsg, BSONObjBuilder& result); diff --git a/src/mongo/db/commands/clone.cpp b/src/mongo/db/commands/clone.cpp index e5979d6d41b..68674aead43 100644 --- a/src/mongo/db/commands/clone.cpp +++ b/src/mongo/db/commands/clone.cpp @@ -90,7 +90,6 @@ public: virtual bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { boost::optional<DisableDocumentValidation> maybeDisableValidation; diff --git a/src/mongo/db/commands/clone_collection.cpp b/src/mongo/db/commands/clone_collection.cpp index d920ac62c05..f8aeb131026 100644 --- a/src/mongo/db/commands/clone_collection.cpp +++ b/src/mongo/db/commands/clone_collection.cpp @@ -106,7 +106,6 @@ public: virtual bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { boost::optional<DisableDocumentValidation> maybeDisableValidation; diff --git a/src/mongo/db/commands/collection_to_capped.cpp b/src/mongo/db/commands/collection_to_capped.cpp index 121d7d0a04a..62fab6dfe69 100644 --- a/src/mongo/db/commands/collection_to_capped.cpp +++ b/src/mongo/db/commands/collection_to_capped.cpp @@ -87,7 +87,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& jsobj, - int, string& errmsg, BSONObjBuilder& result) { const auto fromElt = jsobj["cloneCollectionAsCapped"]; @@ -172,7 +171,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& jsobj, - int, string& errmsg, BSONObjBuilder& result) { const NamespaceString nss(parseNsCollectionRequired(dbname, jsobj)); diff --git a/src/mongo/db/commands/compact.cpp b/src/mongo/db/commands/compact.cpp index c4e7a0e7cfd..bd408337cc5 100644 --- a/src/mongo/db/commands/compact.cpp +++ b/src/mongo/db/commands/compact.cpp @@ -89,7 +89,6 @@ public: virtual bool run(OperationContext* opCtx, const string& db, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { NamespaceString nss = parseNsCollectionRequired(db, cmdObj); diff --git a/src/mongo/db/commands/conn_pool_stats.cpp b/src/mongo/db/commands/conn_pool_stats.cpp index 1d23df5060d..c3700b839bf 100644 --- a/src/mongo/db/commands/conn_pool_stats.cpp +++ b/src/mongo/db/commands/conn_pool_stats.cpp @@ -72,7 +72,6 @@ public: bool run(OperationContext* opCtx, const std::string&, mongo::BSONObj&, - int, std::string&, mongo::BSONObjBuilder& result) override { executor::ConnectionPoolStats stats{}; diff --git a/src/mongo/db/commands/conn_pool_sync.cpp b/src/mongo/db/commands/conn_pool_sync.cpp index e3318079efd..84ba902d4ac 100644 --- a/src/mongo/db/commands/conn_pool_sync.cpp +++ b/src/mongo/db/commands/conn_pool_sync.cpp @@ -57,7 +57,6 @@ public: virtual bool run(OperationContext* opCtx, const std::string&, mongo::BSONObj&, - int, std::string&, mongo::BSONObjBuilder& result) { shardConnectionPool.flush(); diff --git a/src/mongo/db/commands/connection_status.cpp b/src/mongo/db/commands/connection_status.cpp index 651a84327fa..c21d1427414 100644 --- a/src/mongo/db/commands/connection_status.cpp +++ b/src/mongo/db/commands/connection_status.cpp @@ -58,7 +58,6 @@ public: bool run(OperationContext* opCtx, const string&, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { AuthorizationSession* authSession = AuthorizationSession::get(Client::getCurrent()); diff --git a/src/mongo/db/commands/copydb.cpp b/src/mongo/db/commands/copydb.cpp index b665bcefb12..88ef6540e02 100644 --- a/src/mongo/db/commands/copydb.cpp +++ b/src/mongo/db/commands/copydb.cpp @@ -118,7 +118,6 @@ public: virtual bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { boost::optional<DisableDocumentValidation> maybeDisableValidation; diff --git a/src/mongo/db/commands/copydb_start_commands.cpp b/src/mongo/db/commands/copydb_start_commands.cpp index f7a8949ca42..e028431cf71 100644 --- a/src/mongo/db/commands/copydb_start_commands.cpp +++ b/src/mongo/db/commands/copydb_start_commands.cpp @@ -99,7 +99,6 @@ public: virtual bool run(OperationContext* opCtx, const string&, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { string fromhost = cmdObj.getStringField("fromhost"); @@ -173,7 +172,6 @@ public: virtual bool run(OperationContext* opCtx, const string&, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { const auto fromdbElt = cmdObj["fromdb"]; diff --git a/src/mongo/db/commands/count_cmd.cpp b/src/mongo/db/commands/count_cmd.cpp index e5c7827ae0e..3b61e081ab4 100644 --- a/src/mongo/db/commands/count_cmd.cpp +++ b/src/mongo/db/commands/count_cmd.cpp @@ -168,7 +168,6 @@ public: virtual bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int options, string& errmsg, BSONObjBuilder& result) { const bool isExplain = false; @@ -200,7 +199,7 @@ public: BSONObjBuilder aggResult; (void)Command::findCommand("aggregate") - ->run(opCtx, dbname, viewAggregation.getValue(), options, errmsg, aggResult); + ->run(opCtx, dbname, viewAggregation.getValue(), errmsg, aggResult); if (ResolvedView::isResolvedViewErrorResponse(aggResult.asTempObj())) { result.appendElements(aggResult.obj()); diff --git a/src/mongo/db/commands/cpuprofile.cpp b/src/mongo/db/commands/cpuprofile.cpp index 00cddd59397..8f9c16901fe 100644 --- a/src/mongo/db/commands/cpuprofile.cpp +++ b/src/mongo/db/commands/cpuprofile.cpp @@ -106,7 +106,6 @@ public: virtual bool run(OperationContext* opCtx, std::string const& db, BSONObj& cmdObj, - int options, std::string& errmsg, BSONObjBuilder& result); @@ -123,7 +122,6 @@ public: virtual bool run(OperationContext* opCtx, std::string const& db, BSONObj& cmdObj, - int options, std::string& errmsg, BSONObjBuilder& result); @@ -136,7 +134,6 @@ char const* const CpuProfilerStopCommand::commandName = "_cpuProfilerStop"; bool CpuProfilerStartCommand::run(OperationContext* opCtx, std::string const& db, BSONObj& cmdObj, - int options, std::string& errmsg, BSONObjBuilder& result) { // The DB lock here is just so we have IX on the global lock in order to prevent shutdown @@ -154,7 +151,6 @@ bool CpuProfilerStartCommand::run(OperationContext* opCtx, bool CpuProfilerStopCommand::run(OperationContext* opCtx, std::string const& db, BSONObj& cmdObj, - int options, std::string& errmsg, BSONObjBuilder& result) { // The DB lock here is just so we have IX on the global lock in order to prevent shutdown diff --git a/src/mongo/db/commands/create_indexes.cpp b/src/mongo/db/commands/create_indexes.cpp index 8dfca9ed9cc..56d3fe56594 100644 --- a/src/mongo/db/commands/create_indexes.cpp +++ b/src/mongo/db/commands/create_indexes.cpp @@ -228,7 +228,6 @@ public: virtual bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int options, string& errmsg, BSONObjBuilder& result) { const NamespaceString ns(parseNsCollectionRequired(dbname, cmdObj)); diff --git a/src/mongo/db/commands/current_op.cpp b/src/mongo/db/commands/current_op.cpp index ebb4c15d207..0467e69b81a 100644 --- a/src/mongo/db/commands/current_op.cpp +++ b/src/mongo/db/commands/current_op.cpp @@ -88,7 +88,6 @@ public: bool run(OperationContext* opCtx, const std::string& db, BSONObj& cmdObj, - int options, std::string& errmsg, BSONObjBuilder& result) final { const bool includeAll = cmdObj["$all"].trueValue(); diff --git a/src/mongo/db/commands/dbcommands.cpp b/src/mongo/db/commands/dbcommands.cpp index 6213d6a64ac..ebd5ca79cb7 100644 --- a/src/mongo/db/commands/dbcommands.cpp +++ b/src/mongo/db/commands/dbcommands.cpp @@ -363,7 +363,6 @@ public: virtual bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int options, string& errmsg, BSONObjBuilder& result) { bool force = cmdObj.hasField("force") && cmdObj["force"].trueValue(); @@ -413,7 +412,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { // disallow dropping the config database @@ -482,7 +480,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { BSONElement e = cmdObj.firstElement(); @@ -586,7 +583,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int options, string& errmsg, BSONObjBuilder& result) { BSONElement firstElement = cmdObj.firstElement(); @@ -669,7 +665,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { const char* deprecationWarning = @@ -727,7 +722,6 @@ public: virtual bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { const NamespaceString nsToDrop = parseNsCollectionRequired(dbname, cmdObj); @@ -779,7 +773,6 @@ public: virtual bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { const NamespaceString ns(parseNsCollectionRequired(dbname, cmdObj)); @@ -921,7 +914,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& jsobj, - int, string& errmsg, BSONObjBuilder& result) { const NamespaceString nss(parseNs(dbname, jsobj)); @@ -1103,7 +1095,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& jsobj, - int, string& errmsg, BSONObjBuilder& result) { Timer timer; @@ -1248,7 +1239,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& jsobj, - int, string& errmsg, BSONObjBuilder& result) { const NamespaceString nss(parseNsCollectionRequired(dbname, jsobj)); @@ -1297,7 +1287,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& jsobj, - int, string& errmsg, BSONObjBuilder& result) { const NamespaceString nss(parseNsCollectionRequired(dbname, jsobj)); @@ -1333,7 +1322,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& jsobj, - int, string& errmsg, BSONObjBuilder& result) { int scale = 1; @@ -1418,7 +1406,6 @@ public: virtual bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { result << "you" << opCtx->getClient()->clientAddress(true /*includePort*/); @@ -1445,7 +1432,6 @@ public: virtual bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { result << "options" << QueryOption_AllSupported; @@ -1610,7 +1596,7 @@ bool Command::run(OperationContext* opCtx, } // TODO: remove queryOptions parameter from command's run method. - result = run(opCtx, db, cmd, 0, errmsg, inPlaceReplyBob); + result = run(opCtx, db, cmd, errmsg, inPlaceReplyBob); } else { auto wcResult = extractWriteConcern(opCtx, cmd, db); if (!wcResult.isOK()) { @@ -1625,7 +1611,7 @@ bool Command::run(OperationContext* opCtx, ON_BLOCK_EXIT([&] { opCtx->setWriteConcern(oldWC); }); opCtx->setWriteConcern(wcResult.getValue()); - result = run(opCtx, db, cmd, 0, errmsg, inPlaceReplyBob); + result = run(opCtx, db, cmd, errmsg, inPlaceReplyBob); // Nothing in run() should change the writeConcern. dassert(SimpleBSONObjComparator::kInstance.evaluate(opCtx->getWriteConcern().toBSON() == diff --git a/src/mongo/db/commands/dbhash.cpp b/src/mongo/db/commands/dbhash.cpp index 14800eff3d2..ea41c959bb2 100644 --- a/src/mongo/db/commands/dbhash.cpp +++ b/src/mongo/db/commands/dbhash.cpp @@ -83,7 +83,6 @@ public: virtual bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { Timer timer; diff --git a/src/mongo/db/commands/distinct.cpp b/src/mongo/db/commands/distinct.cpp index fee7ac17c58..6b67bd840c1 100644 --- a/src/mongo/db/commands/distinct.cpp +++ b/src/mongo/db/commands/distinct.cpp @@ -168,7 +168,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int options, string& errmsg, BSONObjBuilder& result) { const NamespaceString nss(parseNsCollectionRequired(dbname, cmdObj)); @@ -202,7 +201,7 @@ public: BSONObjBuilder aggResult; (void)Command::findCommand("aggregate") - ->run(opCtx, dbname, viewAggregation.getValue(), options, errmsg, aggResult); + ->run(opCtx, dbname, viewAggregation.getValue(), errmsg, aggResult); if (ResolvedView::isResolvedViewErrorResponse(aggResult.asTempObj())) { result.appendElements(aggResult.obj()); diff --git a/src/mongo/db/commands/driverHelpers.cpp b/src/mongo/db/commands/driverHelpers.cpp index c25887bf0a2..994eb54605c 100644 --- a/src/mongo/db/commands/driverHelpers.cpp +++ b/src/mongo/db/commands/driverHelpers.cpp @@ -76,7 +76,6 @@ public: virtual bool run(OperationContext* opCtx, const string&, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { if (cmdObj.firstElement().type() != jstOID) { diff --git a/src/mongo/db/commands/drop_indexes.cpp b/src/mongo/db/commands/drop_indexes.cpp index a187de7b4bc..12ccc5408f9 100644 --- a/src/mongo/db/commands/drop_indexes.cpp +++ b/src/mongo/db/commands/drop_indexes.cpp @@ -87,7 +87,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& jsobj, - int, string& errmsg, BSONObjBuilder& result) { const NamespaceString nss = parseNsCollectionRequired(dbname, jsobj); @@ -119,7 +118,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& jsobj, - int, string& errmsg, BSONObjBuilder& result) { DBDirectClient db(opCtx); diff --git a/src/mongo/db/commands/eval.cpp b/src/mongo/db/commands/eval.cpp index cec1369e4ad..fd9cb29f940 100644 --- a/src/mongo/db/commands/eval.cpp +++ b/src/mongo/db/commands/eval.cpp @@ -174,7 +174,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int options, string& errmsg, BSONObjBuilder& result) { if (cmdObj["nolock"].trueValue()) { diff --git a/src/mongo/db/commands/explain_cmd.cpp b/src/mongo/db/commands/explain_cmd.cpp index 1f431ec6f6e..948cd8dd530 100644 --- a/src/mongo/db/commands/explain_cmd.cpp +++ b/src/mongo/db/commands/explain_cmd.cpp @@ -111,7 +111,6 @@ public: virtual bool run(OperationContext* opCtx, const std::string& dbname, BSONObj& cmdObj, - int options, std::string& errmsg, BSONObjBuilder& result) { auto verbosity = ExplainOptions::parseCmdBSON(cmdObj); diff --git a/src/mongo/db/commands/fail_point_cmd.cpp b/src/mongo/db/commands/fail_point_cmd.cpp index 9e6795e9d78..0f75d8c1316 100644 --- a/src/mongo/db/commands/fail_point_cmd.cpp +++ b/src/mongo/db/commands/fail_point_cmd.cpp @@ -93,7 +93,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { const string failPointName(cmdObj.firstElement().str()); diff --git a/src/mongo/db/commands/find_and_modify.cpp b/src/mongo/db/commands/find_and_modify.cpp index c4a54ddf3c4..ce8ceb39fee 100644 --- a/src/mongo/db/commands/find_and_modify.cpp +++ b/src/mongo/db/commands/find_and_modify.cpp @@ -339,7 +339,6 @@ public: bool run(OperationContext* opCtx, const std::string& dbName, BSONObj& cmdObj, - int options, std::string& errmsg, BSONObjBuilder& result) override { // findAndModify command is not replicated directly. diff --git a/src/mongo/db/commands/find_cmd.cpp b/src/mongo/db/commands/find_cmd.cpp index 30620833db1..5cb37781525 100644 --- a/src/mongo/db/commands/find_cmd.cpp +++ b/src/mongo/db/commands/find_cmd.cpp @@ -230,7 +230,6 @@ public: bool run(OperationContext* opCtx, const std::string& dbname, BSONObj& cmdObj, - int options, std::string& errmsg, BSONObjBuilder& result) override { const NamespaceString nss(parseNs(dbname, cmdObj)); @@ -312,7 +311,7 @@ public: Command* agg = Command::findCommand("aggregate"); try { - agg->run(opCtx, dbname, viewAggregationCommand.getValue(), options, errmsg, result); + agg->run(opCtx, dbname, viewAggregationCommand.getValue(), errmsg, result); } catch (DBException& error) { if (error.getCode() == ErrorCodes::InvalidPipelineOperator) { return appendCommandStatus( diff --git a/src/mongo/db/commands/fsync.cpp b/src/mongo/db/commands/fsync.cpp index 1cae66a6b5f..1a9b7628503 100644 --- a/src/mongo/db/commands/fsync.cpp +++ b/src/mongo/db/commands/fsync.cpp @@ -120,7 +120,6 @@ public: virtual bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { if (opCtx->lockState()->isLocked()) { @@ -294,7 +293,6 @@ public: bool run(OperationContext* opCtx, const std::string& db, BSONObj& cmdObj, - int options, std::string& errmsg, BSONObjBuilder& result) override { log() << "command: unlock requested"; diff --git a/src/mongo/db/commands/generic.cpp b/src/mongo/db/commands/generic.cpp index 089f417a27c..082128ebf74 100644 --- a/src/mongo/db/commands/generic.cpp +++ b/src/mongo/db/commands/generic.cpp @@ -92,7 +92,6 @@ public: bool run(OperationContext* opCtx, const std::string& dbname, BSONObj& jsobj, - int, // options std::string& errmsg, BSONObjBuilder& result) { VersionInfoInterface::instance().appendBuildInfo(&result); @@ -122,7 +121,6 @@ public: virtual bool run(OperationContext* opCtx, const string& badns, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { // IMPORTANT: Don't put anything in here that might lock db - including authentication @@ -148,7 +146,6 @@ public: virtual bool run(OperationContext* opCtx, const string& ns, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { if (getGlobalScriptEngine()) { @@ -191,7 +188,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { ProcessInfo p; @@ -239,7 +235,6 @@ public: virtual bool run(OperationContext* opCtx, const string& ns, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { bool didRotate = rotateLogs(serverGlobalParams.logRenameOnRotate); @@ -271,7 +266,6 @@ public: virtual bool run(OperationContext* opCtx, const string& ns, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { // sort the commands before building the result BSON @@ -370,7 +364,6 @@ public: bool run(OperationContext* opCtx, const string& dbnamne, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { LastError::get(cc()).setLastError(10038, "forced error"); @@ -405,7 +398,6 @@ public: virtual bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { BSONElement val = cmdObj.firstElement(); @@ -477,7 +469,6 @@ public: virtual bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { std::string logName; @@ -530,7 +521,6 @@ public: virtual bool run(OperationContext* opCtx, const string&, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { result.append("argv", serverGlobalParams.argvArray); diff --git a/src/mongo/db/commands/geo_near_cmd.cpp b/src/mongo/db/commands/geo_near_cmd.cpp index 8345c82c9fb..340cd80bd0e 100644 --- a/src/mongo/db/commands/geo_near_cmd.cpp +++ b/src/mongo/db/commands/geo_near_cmd.cpp @@ -102,7 +102,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { if (!cmdObj["start"].eoo()) { diff --git a/src/mongo/db/commands/get_last_error.cpp b/src/mongo/db/commands/get_last_error.cpp index c5d8ff9b519..14e9c4fbf33 100644 --- a/src/mongo/db/commands/get_last_error.cpp +++ b/src/mongo/db/commands/get_last_error.cpp @@ -73,7 +73,6 @@ public: bool run(OperationContext* opCtx, const string& db, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { LastError::get(opCtx->getClient()).reset(); @@ -107,7 +106,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { // @@ -316,7 +314,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { LastError* le = &LastError::get(opCtx->getClient()); diff --git a/src/mongo/db/commands/getmore_cmd.cpp b/src/mongo/db/commands/getmore_cmd.cpp index 72e3ec5db34..2f69dc7b905 100644 --- a/src/mongo/db/commands/getmore_cmd.cpp +++ b/src/mongo/db/commands/getmore_cmd.cpp @@ -448,7 +448,6 @@ public: bool run(OperationContext* opCtx, const std::string& dbname, BSONObj& cmdObj, - int options, std::string& errmsg, BSONObjBuilder& result) override { // Counted as a getMore, not as a command. diff --git a/src/mongo/db/commands/group_cmd.cpp b/src/mongo/db/commands/group_cmd.cpp index 4b41fc9e42c..b2d1735c06b 100644 --- a/src/mongo/db/commands/group_cmd.cpp +++ b/src/mongo/db/commands/group_cmd.cpp @@ -152,7 +152,6 @@ private: virtual bool run(OperationContext* opCtx, const std::string& dbname, BSONObj& cmdObj, - int options, std::string& errmsg, BSONObjBuilder& result) { RARELY { diff --git a/src/mongo/db/commands/hashcmd.cpp b/src/mongo/db/commands/hashcmd.cpp index f7e54703898..b47b2352650 100644 --- a/src/mongo/db/commands/hashcmd.cpp +++ b/src/mongo/db/commands/hashcmd.cpp @@ -82,7 +82,6 @@ public: bool run(OperationContext* opCtx, const string& db, BSONObj& cmdObj, - int options, string& errmsg, BSONObjBuilder& result) { result.appendAs(cmdObj.firstElement(), "key"); diff --git a/src/mongo/db/commands/haystack.cpp b/src/mongo/db/commands/haystack.cpp index f9a41f0ccd2..77270437ff7 100644 --- a/src/mongo/db/commands/haystack.cpp +++ b/src/mongo/db/commands/haystack.cpp @@ -98,7 +98,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { const NamespaceString nss = parseNsCollectionRequired(dbname, cmdObj); diff --git a/src/mongo/db/commands/index_filter_commands.cpp b/src/mongo/db/commands/index_filter_commands.cpp index d85565ab49c..101294e4dde 100644 --- a/src/mongo/db/commands/index_filter_commands.cpp +++ b/src/mongo/db/commands/index_filter_commands.cpp @@ -118,7 +118,6 @@ IndexFilterCommand::IndexFilterCommand(const string& name, const string& helpTex bool IndexFilterCommand::run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int options, string& errmsg, BSONObjBuilder& result) { const NamespaceString nss(parseNsCollectionRequired(dbname, cmdObj)); diff --git a/src/mongo/db/commands/index_filter_commands.h b/src/mongo/db/commands/index_filter_commands.h index 1fada8269a5..9cedd30f765 100644 --- a/src/mongo/db/commands/index_filter_commands.h +++ b/src/mongo/db/commands/index_filter_commands.h @@ -66,7 +66,6 @@ public: bool run(OperationContext* opCtx, const std::string& dbname, BSONObj& cmdObj, - int options, std::string& errmsg, BSONObjBuilder& result); diff --git a/src/mongo/db/commands/isself.cpp b/src/mongo/db/commands/isself.cpp index 6e8c1509b5f..bb1a023c7b5 100644 --- a/src/mongo/db/commands/isself.cpp +++ b/src/mongo/db/commands/isself.cpp @@ -57,7 +57,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { result.append("id", repl::instanceId); diff --git a/src/mongo/db/commands/kill_op.cpp b/src/mongo/db/commands/kill_op.cpp index 1d16113ca93..f76159b0adf 100644 --- a/src/mongo/db/commands/kill_op.cpp +++ b/src/mongo/db/commands/kill_op.cpp @@ -131,7 +131,6 @@ public: bool run(OperationContext* opCtx, const std::string& db, BSONObj& cmdObj, - int options, std::string& errmsg, BSONObjBuilder& result) final { long long opId = parseOpId(cmdObj); diff --git a/src/mongo/db/commands/killcursors_common.cpp b/src/mongo/db/commands/killcursors_common.cpp index 570c1e1df0e..b20aeb3f734 100644 --- a/src/mongo/db/commands/killcursors_common.cpp +++ b/src/mongo/db/commands/killcursors_common.cpp @@ -66,7 +66,6 @@ Status KillCursorsCmdBase::checkAuthForCommand(Client* client, bool KillCursorsCmdBase::run(OperationContext* opCtx, const std::string& dbname, BSONObj& cmdObj, - int options, std::string& errmsg, BSONObjBuilder& result) { auto statusWithRequest = KillCursorsRequest::parseFromBSON(dbname, cmdObj); diff --git a/src/mongo/db/commands/killcursors_common.h b/src/mongo/db/commands/killcursors_common.h index c5b6e9db31d..8d4bcf07c75 100644 --- a/src/mongo/db/commands/killcursors_common.h +++ b/src/mongo/db/commands/killcursors_common.h @@ -73,7 +73,6 @@ public: bool run(OperationContext* opCtx, const std::string& dbname, BSONObj& cmdObj, - int options, std::string& errmsg, BSONObjBuilder& result) final; diff --git a/src/mongo/db/commands/list_collections.cpp b/src/mongo/db/commands/list_collections.cpp index e5b959296f1..5610a67ad66 100644 --- a/src/mongo/db/commands/list_collections.cpp +++ b/src/mongo/db/commands/list_collections.cpp @@ -227,7 +227,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& jsobj, - int, string& errmsg, BSONObjBuilder& result) { unique_ptr<MatchExpression> matcher; diff --git a/src/mongo/db/commands/list_databases.cpp b/src/mongo/db/commands/list_databases.cpp index ffe00a55362..4b3be3b27db 100644 --- a/src/mongo/db/commands/list_databases.cpp +++ b/src/mongo/db/commands/list_databases.cpp @@ -86,7 +86,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& jsobj, - int, string& errmsg, BSONObjBuilder& result) { // Parse the filter. diff --git a/src/mongo/db/commands/list_indexes.cpp b/src/mongo/db/commands/list_indexes.cpp index 7ef1f599828..387cb7a376d 100644 --- a/src/mongo/db/commands/list_indexes.cpp +++ b/src/mongo/db/commands/list_indexes.cpp @@ -119,7 +119,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { const NamespaceString ns(parseNsCollectionRequired(dbname, cmdObj)); diff --git a/src/mongo/db/commands/lock_info.cpp b/src/mongo/db/commands/lock_info.cpp index 69dd15a6c0b..1a118b80fc3 100644 --- a/src/mongo/db/commands/lock_info.cpp +++ b/src/mongo/db/commands/lock_info.cpp @@ -82,7 +82,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& jsobj, - int, string& errmsg, BSONObjBuilder& result) { std::map<LockerId, BSONObj> lockToClientMap; diff --git a/src/mongo/db/commands/mr.cpp b/src/mongo/db/commands/mr.cpp index dbff7942c96..f6338b0a2a7 100644 --- a/src/mongo/db/commands/mr.cpp +++ b/src/mongo/db/commands/mr.cpp @@ -1362,7 +1362,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmd, - int, string& errmsg, BSONObjBuilder& result) { Timer t; @@ -1716,7 +1715,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { if (serverGlobalParams.clusterRole == ClusterRole::ConfigServer) { diff --git a/src/mongo/db/commands/oplog_note.cpp b/src/mongo/db/commands/oplog_note.cpp index fd6083a6a89..abdd78901c9 100644 --- a/src/mongo/db/commands/oplog_note.cpp +++ b/src/mongo/db/commands/oplog_note.cpp @@ -116,7 +116,6 @@ public: virtual bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { BSONElement dataElement; diff --git a/src/mongo/db/commands/parallel_collection_scan.cpp b/src/mongo/db/commands/parallel_collection_scan.cpp index c5166658105..725e76b19ab 100644 --- a/src/mongo/db/commands/parallel_collection_scan.cpp +++ b/src/mongo/db/commands/parallel_collection_scan.cpp @@ -88,7 +88,6 @@ public: virtual bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int options, string& errmsg, BSONObjBuilder& result) { const NamespaceString ns(parseNsCollectionRequired(dbname, cmdObj)); diff --git a/src/mongo/db/commands/parameters.cpp b/src/mongo/db/commands/parameters.cpp index c908edb3390..785375c514f 100644 --- a/src/mongo/db/commands/parameters.cpp +++ b/src/mongo/db/commands/parameters.cpp @@ -91,7 +91,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { bool all = *cmdObj.firstElement().valuestrsafe() == '*'; @@ -140,7 +139,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { int numSet = 0; diff --git a/src/mongo/db/commands/pipeline_command.cpp b/src/mongo/db/commands/pipeline_command.cpp index 47db0e450c6..af863000b60 100644 --- a/src/mongo/db/commands/pipeline_command.cpp +++ b/src/mongo/db/commands/pipeline_command.cpp @@ -93,7 +93,6 @@ public: virtual bool run(OperationContext* opCtx, const std::string& db, BSONObj& cmdObj, - int options, std::string& errmsg, BSONObjBuilder& result) { const NamespaceString nss(parseNsCollectionRequired(db, cmdObj)); diff --git a/src/mongo/db/commands/plan_cache_commands.cpp b/src/mongo/db/commands/plan_cache_commands.cpp index bb4eebcb998..f194d17129e 100644 --- a/src/mongo/db/commands/plan_cache_commands.cpp +++ b/src/mongo/db/commands/plan_cache_commands.cpp @@ -113,7 +113,6 @@ PlanCacheCommand::PlanCacheCommand(const string& name, bool PlanCacheCommand::run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int options, string& errmsg, BSONObjBuilder& result) { const NamespaceString nss(parseNsCollectionRequired(dbname, cmdObj)); diff --git a/src/mongo/db/commands/plan_cache_commands.h b/src/mongo/db/commands/plan_cache_commands.h index 881bf475433..7b3da100782 100644 --- a/src/mongo/db/commands/plan_cache_commands.h +++ b/src/mongo/db/commands/plan_cache_commands.h @@ -60,7 +60,6 @@ public: bool run(OperationContext* opCtx, const std::string& dbname, BSONObj& cmdObj, - int options, std::string& errmsg, BSONObjBuilder& result); diff --git a/src/mongo/db/commands/rename_collection_cmd.cpp b/src/mongo/db/commands/rename_collection_cmd.cpp index 6aaa3b5f744..8a2afb4da64 100644 --- a/src/mongo/db/commands/rename_collection_cmd.cpp +++ b/src/mongo/db/commands/rename_collection_cmd.cpp @@ -88,7 +88,6 @@ public: virtual bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { const auto sourceNsElt = cmdObj[getName()]; diff --git a/src/mongo/db/commands/repair_cursor.cpp b/src/mongo/db/commands/repair_cursor.cpp index 1390b0281b3..bf45608ccff 100644 --- a/src/mongo/db/commands/repair_cursor.cpp +++ b/src/mongo/db/commands/repair_cursor.cpp @@ -70,7 +70,6 @@ public: virtual bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int options, string& errmsg, BSONObjBuilder& result) { NamespaceString ns(parseNs(dbname, cmdObj)); diff --git a/src/mongo/db/commands/server_status.cpp b/src/mongo/db/commands/server_status.cpp index fd429ed21b1..6fa1f9d56c7 100644 --- a/src/mongo/db/commands/server_status.cpp +++ b/src/mongo/db/commands/server_status.cpp @@ -88,7 +88,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { _runCalled = true; diff --git a/src/mongo/db/commands/set_feature_compatibility_version_command.cpp b/src/mongo/db/commands/set_feature_compatibility_version_command.cpp index 6e173143efc..10234b925ba 100644 --- a/src/mongo/db/commands/set_feature_compatibility_version_command.cpp +++ b/src/mongo/db/commands/set_feature_compatibility_version_command.cpp @@ -84,7 +84,6 @@ public: bool run(OperationContext* opCtx, const std::string& dbname, BSONObj& cmdObj, - int options, std::string& errmsg, BSONObjBuilder& result) { const auto version = uassertStatusOK( diff --git a/src/mongo/db/commands/snapshot_management.cpp b/src/mongo/db/commands/snapshot_management.cpp index 1eb6e2c2126..05782177b9e 100644 --- a/src/mongo/db/commands/snapshot_management.cpp +++ b/src/mongo/db/commands/snapshot_management.cpp @@ -67,7 +67,6 @@ public: bool run(OperationContext* opCtx, const std::string& dbname, BSONObj& cmdObj, - int, std::string& errmsg, BSONObjBuilder& result) { auto snapshotManager = @@ -117,7 +116,6 @@ public: bool run(OperationContext* opCtx, const std::string& dbname, BSONObj& cmdObj, - int, std::string& errmsg, BSONObjBuilder& result) { auto snapshotManager = diff --git a/src/mongo/db/commands/test_commands.cpp b/src/mongo/db/commands/test_commands.cpp index 17596a13e18..0c12a8c22ce 100644 --- a/src/mongo/db/commands/test_commands.cpp +++ b/src/mongo/db/commands/test_commands.cpp @@ -78,7 +78,6 @@ public: virtual bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { const NamespaceString nss(parseNsCollectionRequired(dbname, cmdObj)); @@ -153,7 +152,6 @@ public: bool run(OperationContext* opCtx, const string& ns, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { log() << "test only command sleep invoked"; @@ -217,7 +215,6 @@ public: virtual bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { const NamespaceString fullNs = parseNsCollectionRequired(dbname, cmdObj); @@ -298,7 +295,6 @@ public: virtual bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { const NamespaceString nss = parseNsCollectionRequired(dbname, cmdObj); diff --git a/src/mongo/db/commands/top_command.cpp b/src/mongo/db/commands/top_command.cpp index 80ef9171efd..0837e9a2d92 100644 --- a/src/mongo/db/commands/top_command.cpp +++ b/src/mongo/db/commands/top_command.cpp @@ -68,7 +68,6 @@ public: virtual bool run(OperationContext* opCtx, const std::string& db, BSONObj& cmdObj, - int options, std::string& errmsg, BSONObjBuilder& result) { { diff --git a/src/mongo/db/commands/touch.cpp b/src/mongo/db/commands/touch.cpp index 7cae0f979ee..18c99460650 100644 --- a/src/mongo/db/commands/touch.cpp +++ b/src/mongo/db/commands/touch.cpp @@ -85,7 +85,6 @@ public: virtual bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { const NamespaceString nss = parseNsCollectionRequired(dbname, cmdObj); diff --git a/src/mongo/db/commands/user_management_commands.cpp b/src/mongo/db/commands/user_management_commands.cpp index b6a55727c80..854a8be669f 100644 --- a/src/mongo/db/commands/user_management_commands.cpp +++ b/src/mongo/db/commands/user_management_commands.cpp @@ -618,7 +618,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int options, string& errmsg, BSONObjBuilder& result) { auth::CreateOrUpdateUserArgs args; @@ -764,7 +763,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int options, string& errmsg, BSONObjBuilder& result) { auth::CreateOrUpdateUserArgs args; @@ -882,7 +880,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int options, string& errmsg, BSONObjBuilder& result) { UserName userName; @@ -951,7 +948,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int options, string& errmsg, BSONObjBuilder& result) { Status status = auth::parseAndValidateDropAllUsersFromDatabaseCommand(cmdObj, dbname); @@ -1009,7 +1005,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int options, string& errmsg, BSONObjBuilder& result) { std::string userNameString; @@ -1084,7 +1079,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int options, string& errmsg, BSONObjBuilder& result) { std::string userNameString; @@ -1163,7 +1157,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int options, string& errmsg, BSONObjBuilder& result) { auth::UsersInfoArgs args; @@ -1274,7 +1267,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int options, string& errmsg, BSONObjBuilder& result) { auth::CreateOrUpdateRoleArgs args; @@ -1388,7 +1380,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int options, string& errmsg, BSONObjBuilder& result) { auth::CreateOrUpdateRoleArgs args; @@ -1487,7 +1478,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int options, string& errmsg, BSONObjBuilder& result) { @@ -1596,7 +1586,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int options, string& errmsg, BSONObjBuilder& result) { RoleName roleName; @@ -1707,7 +1696,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int options, string& errmsg, BSONObjBuilder& result) { std::string roleNameString; @@ -1799,7 +1787,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int options, string& errmsg, BSONObjBuilder& result) { std::string roleNameString; @@ -1890,7 +1877,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int options, string& errmsg, BSONObjBuilder& result) { RoleName roleName; @@ -2045,7 +2031,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int options, string& errmsg, BSONObjBuilder& result) { Status status = auth::parseDropAllRolesFromDatabaseCommand(cmdObj, dbname); @@ -2189,7 +2174,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int options, string& errmsg, BSONObjBuilder& result) { auth::RolesInfoArgs args; @@ -2271,7 +2255,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int options, string& errmsg, BSONObjBuilder& result) { AuthorizationManager* authzManager = getGlobalAuthorizationManager(); @@ -2310,7 +2293,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int options, string& errmsg, BSONObjBuilder& result) { AuthorizationManager* authzManager = getGlobalAuthorizationManager(); @@ -2688,7 +2670,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int options, string& errmsg, BSONObjBuilder& result) { auth::MergeAuthzCollectionsArgs args; @@ -2930,7 +2911,6 @@ public: virtual bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int options, string& errmsg, BSONObjBuilder& result) { auth::AuthSchemaUpgradeArgs parsedArgs; diff --git a/src/mongo/db/commands/validate.cpp b/src/mongo/db/commands/validate.cpp index b9387523e30..11a0806fbf9 100644 --- a/src/mongo/db/commands/validate.cpp +++ b/src/mongo/db/commands/validate.cpp @@ -78,7 +78,6 @@ public: bool run(OperationContext* opCtx, const string& dbname, BSONObj& cmdObj, - int, string& errmsg, BSONObjBuilder& result) { if (MONGO_FAIL_POINT(validateCmdCollectionNotValid)) { diff --git a/src/mongo/db/commands/write_commands/write_commands.cpp b/src/mongo/db/commands/write_commands/write_commands.cpp index b6896022583..905a93f0eb6 100644 --- a/src/mongo/db/commands/write_commands/write_commands.cpp +++ b/src/mongo/db/commands/write_commands/write_commands.cpp @@ -210,7 +210,6 @@ public: bool run(OperationContext* opCtx, const std::string& dbname, BSONObj& cmdObj, - int options, std::string& errmsg, BSONObjBuilder& result) final { try { |