diff options
author | Mathias Stearn <mathias@10gen.com> | 2014-05-13 12:47:59 -0400 |
---|---|---|
committer | Mathias Stearn <mathias@10gen.com> | 2014-05-14 14:14:44 -0400 |
commit | e3885bae0383148dc36274b04662235f978de483 (patch) | |
tree | 0432f3060a95c1e7ff95223c80c6602836ed5b53 /src/mongo/db/commands.cpp | |
parent | 6378da06b637dbf86f916274c8f0457d925af6a9 (diff) | |
download | mongo-e3885bae0383148dc36274b04662235f978de483.tar.gz |
SERVER-13641 Unify Command::newRun into run
This is the result of the following seds and a few manual fixups, including
removing the old run() and fixing the comments.
git grep -l '\<run(const' | xargs sed -si -e 's/\brun(const/newRun(TransactionExperiment* txn, const/'
git grep -l '\<run( const' | xargs sed -si -e 's/\brun( const/newRun(TransactionExperiment* txn, const/'
git grep -l '\<newRun(' | xargs sed -si -e 's/\bnewRun(/run(/'
Diffstat (limited to 'src/mongo/db/commands.cpp')
-rw-r--r-- | src/mongo/db/commands.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/mongo/db/commands.cpp b/src/mongo/db/commands.cpp index 27aba2bf5ae..af626452997 100644 --- a/src/mongo/db/commands.cpp +++ b/src/mongo/db/commands.cpp @@ -90,16 +90,6 @@ namespace mongo { return ResourcePattern::forExactNamespace(NamespaceString(ns)); } - bool Command::newRun(TransactionExperiment* txn, - const string& db, - BSONObj& cmdObj, - int options, - string& errmsg, - BSONObjBuilder& result, - bool fromRepl) { - return run(db, cmdObj, options, errmsg, result, fromRepl); - } - void Command::htmlHelp(stringstream& ss) const { string helpStr; { @@ -346,7 +336,7 @@ namespace mongo { out->push_back(Privilege(ResourcePattern::forClusterResource(), actions)); } - virtual bool run(const string&, mongo::BSONObj&, int, std::string&, mongo::BSONObjBuilder& result, bool) { + virtual bool run(TransactionExperiment* txn, const string&, mongo::BSONObj&, int, std::string&, mongo::BSONObjBuilder& result, bool) { shardConnectionPool.flush(); pool.flush(); return true; @@ -369,7 +359,7 @@ namespace mongo { actions.addAction(ActionType::connPoolStats); out->push_back(Privilege(ResourcePattern::forClusterResource(), actions)); } - virtual bool run(const string&, mongo::BSONObj&, int, std::string&, mongo::BSONObjBuilder& result, bool) { + virtual bool run(TransactionExperiment* txn, const string&, mongo::BSONObj&, int, std::string&, mongo::BSONObjBuilder& result, bool) { pool.appendInfo( result ); result.append( "numDBClientConnection" , DBClientConnection::getNumConnections() ); result.append( "numAScopedConnection" , AScopedConnection::getNumConnections() ); |