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(/'
jewkesy · May 14, 2014 · e3885ba · e3885ba
1 parent 6378da0
commit e3885ba
Show file tree

Hide file tree

Showing 80 changed files with 214 additions and 228 deletions.
diff --git a/src/mongo/db/client.cpp b/src/mongo/db/client.cpp
@@ -383,7 +383,7 @@ namespace mongo {
             actions.addAction(ActionType::internal);
             out->push_back(Privilege(ResourcePattern::forClusterResource(), actions));
         }
-        virtual bool run(const string& , BSONObj& cmdObj, int, string& errmsg, BSONObjBuilder& result, bool fromRepl) {
+        virtual bool run(TransactionExperiment* txn, const string& , BSONObj& cmdObj, int, string& errmsg, BSONObjBuilder& result, bool fromRepl) {
             Client& c = cc();
             c.gotHandshake( cmdObj );
             return 1;

diff --git a/src/mongo/db/clientcursor.cpp b/src/mongo/db/clientcursor.cpp
@@ -257,7 +257,7 @@ namespace mongo {
             actions.addAction(ActionType::cursorInfo);
             out->push_back(Privilege(ResourcePattern::forClusterResource(), actions));
         }
-        bool run(const string& dbname, BSONObj& jsobj, int, string& errmsg, BSONObjBuilder& result,
+        bool run(TransactionExperiment* txn, const string& dbname, BSONObj& jsobj, int, string& errmsg, BSONObjBuilder& result,
                  bool fromRepl ) {
             _appendCursorStats( result );
             return true;

diff --git a/src/mongo/db/cloner.cpp b/src/mongo/db/cloner.cpp
@@ -558,7 +558,7 @@ namespace mongo {
             return Status::OK();
         }
         CmdClone() : Command("clone") { }
-        virtual bool newRun(TransactionExperiment* txn, const string& dbname , BSONObj& cmdObj, int, string& errmsg, BSONObjBuilder& result, bool fromRepl) {
+        virtual bool run(TransactionExperiment* txn, const string& dbname , BSONObj& cmdObj, int, string& errmsg, BSONObjBuilder& result, bool fromRepl) {
             string from = cmdObj.getStringField("clone");
             if ( from.empty() )
                 return false;
@@ -629,7 +629,7 @@ namespace mongo {
                  "is placed at the same db.collection (namespace) as the source.\n"
                  ;
         }
-        virtual bool newRun(TransactionExperiment* txn, const string& dbname , BSONObj& cmdObj, int, string& errmsg, BSONObjBuilder& result, bool fromRepl) {
+        virtual bool run(TransactionExperiment* txn, const string& dbname , BSONObj& cmdObj, int, string& errmsg, BSONObjBuilder& result, bool fromRepl) {
             string fromhost = cmdObj.getStringField("from");
             if ( fromhost.empty() ) {
                 errmsg = "missing 'from' parameter";
@@ -696,7 +696,7 @@ namespace mongo {
             help << "get a nonce for subsequent copy db request from secure server\n";
             help << "usage: {copydbgetnonce: 1, fromhost: <hostname>}";
         }
-        virtual bool run(const string& , BSONObj& cmdObj, int, string& errmsg, BSONObjBuilder& result, bool fromRepl) {
+        virtual bool run(TransactionExperiment* txn, const string& , BSONObj& cmdObj, int, string& errmsg, BSONObjBuilder& result, bool fromRepl) {
             string fromhost = cmdObj.getStringField("fromhost");
             if ( fromhost.empty() ) {
                 /* copy from self */
@@ -780,7 +780,7 @@ namespace mongo {
             help << "usage: {copydb: 1, fromhost: <connection string>, fromdb: <db>, todb: <db>"
                  << "[, slaveOk: <bool>, username: <username>, nonce: <nonce>, key: <key>]}";
         }
-        virtual bool newRun(TransactionExperiment* txn, const string& dbname, BSONObj& cmdObj, int, string& errmsg, BSONObjBuilder& result, bool fromRepl) {
+        virtual bool run(TransactionExperiment* txn, const string& dbname, BSONObj& cmdObj, int, string& errmsg, BSONObjBuilder& result, bool fromRepl) {
             string fromhost = cmdObj.getStringField("fromhost");
             bool fromSelf = fromhost.empty();
             if ( fromSelf ) {

diff --git 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() );

diff --git a/src/mongo/db/commands.h b/src/mongo/db/commands.h
@@ -71,16 +71,14 @@ namespace mutablebson {
                       normally do not want to log the command to the local oplog.
 
            return value is true if succeeded.  if false, set errmsg text.
-
-           Default impl forwards to private run(). It will go away soon.
         */
-        virtual bool newRun(TransactionExperiment* txn,
+        virtual bool run(TransactionExperiment* txn,
                          const string& db,
                          BSONObj& cmdObj,
                          int options,
                          string& errmsg,
                          BSONObjBuilder& result,
-                         bool fromRepl = false );
+                         bool fromRepl = false ) = 0;
 
         /**
          * This designation for the command is only used by the 'help' call and has nothing to do 
@@ -160,7 +158,6 @@ namespace mutablebson {
         virtual ~Command() {}
 
     protected:
-
         /**
          * Appends to "*out" the privileges required to run this command on database "dbname" with
          * the invocation described by "cmdObj".  New commands shouldn't implement this, they should
@@ -234,10 +231,6 @@ namespace mutablebson {
         static int testCommandsEnabled;
 
     private:
-        // This method is deprecated. It should only be used by commands that don't transactions
-        virtual bool run(const string& db, BSONObj& cmdObj, int options, string& errmsg, BSONObjBuilder& result, bool fromRepl = false ) {
-            invariant(false);
-        }
 
         /**
          * Checks to see if the client is authorized to run the given command with the given

diff --git a/src/mongo/db/commands/apply_ops.cpp b/src/mongo/db/commands/apply_ops.cpp
@@ -59,7 +59,7 @@ namespace mongo {
             // applyOps can do pretty much anything, so require all privileges.
             RoleGraph::generateUniversalPrivileges(out);
         }
-        virtual bool newRun(TransactionExperiment* txn, const string& dbname, BSONObj& cmdObj, int, string& errmsg, BSONObjBuilder& result, bool fromRepl) {
+        virtual bool run(TransactionExperiment* txn, const string& dbname, BSONObj& cmdObj, int, string& errmsg, BSONObjBuilder& result, bool fromRepl) {
 
             if ( cmdObj.firstElement().type() != Array ) {
                 errmsg = "ops has to be an array";

diff --git a/src/mongo/db/commands/auth_schema_upgrade_d.cpp b/src/mongo/db/commands/auth_schema_upgrade_d.cpp
@@ -113,6 +113,7 @@ namespace {
 
     class CmdAuthSchemaUpgradeD : public CmdAuthSchemaUpgrade {
         virtual bool run(
+                TransactionExperiment* txn,
                 const string& dbname,
                 BSONObj& cmdObj,
                 int options,

diff --git a/src/mongo/db/commands/authentication_commands.cpp b/src/mongo/db/commands/authentication_commands.cpp
@@ -99,7 +99,7 @@ namespace mongo {
         virtual void addRequiredPrivileges(const std::string& dbname,
                                            const BSONObj& cmdObj,
                                            std::vector<Privilege>* out) {} // No auth required
-        bool run(const string&, BSONObj& cmdObj, int, string& errmsg, BSONObjBuilder& result, bool fromRepl) {
+        bool run(TransactionExperiment* txn, const string&, BSONObj& cmdObj, int, string& errmsg, BSONObjBuilder& result, bool fromRepl) {
             nonce64 n = getNextNonce();
             stringstream ss;
             ss << hex << n;
@@ -133,7 +133,7 @@ namespace mongo {
         }
     }
 
-    bool CmdAuthenticate::run(const string& dbname,
+    bool CmdAuthenticate::run(TransactionExperiment* txn, const string& dbname,
                               BSONObj& cmdObj,
                               int,
                               string& errmsg,
@@ -351,7 +351,7 @@ namespace mongo {
         void help(stringstream& h) const { h << "de-authenticate"; }
         virtual bool isWriteCommandForConfigServer() const { return false; }
         CmdLogout() : Command("logout") {}
-        bool run(const string& dbname,
+        bool run(TransactionExperiment* txn, const string& dbname,
                  BSONObj& cmdObj,
                  int options,
                  string& errmsg,

diff --git a/src/mongo/db/commands/authentication_commands.h b/src/mongo/db/commands/authentication_commands.h
@@ -51,7 +51,7 @@ namespace mongo {
         virtual void redactForLogging(mutablebson::Document* cmdObj);
 
         CmdAuthenticate() : Command("authenticate") {}
-        bool run(const string& dbname,
+        bool run(TransactionExperiment* txn, const string& dbname,
                  BSONObj& cmdObj,
                  int options,
                  string& errmsg,

diff --git a/src/mongo/db/commands/cleanup_orphaned_cmd.cpp b/src/mongo/db/commands/cleanup_orphaned_cmd.cpp
@@ -179,7 +179,7 @@ namespace mongo {
         // Output
         static BSONField<BSONObj> stoppedAtKeyField;
 
-        bool newRun( TransactionExperiment* txn,
+        bool run( TransactionExperiment* txn,
                   string const &db,
                   BSONObj &cmdObj,
                   int,

diff --git a/src/mongo/db/commands/collection_to_capped.cpp b/src/mongo/db/commands/collection_to_capped.cpp
@@ -142,7 +142,7 @@ namespace mongo {
                                              NamespaceString(dbname, collection)),
                                      targetActions));
         }
-        bool newRun(TransactionExperiment* txn, const string& dbname, BSONObj& jsobj, int, string& errmsg, BSONObjBuilder& result, bool fromRepl ) {
+        bool run(TransactionExperiment* txn, const string& dbname, BSONObj& jsobj, int, string& errmsg, BSONObjBuilder& result, bool fromRepl ) {
             string from = jsobj.getStringField( "cloneCollectionAsCapped" );
             string to = jsobj.getStringField( "toCollection" );
             double size = jsobj.getField( "size" ).number();
@@ -196,7 +196,7 @@ namespace mongo {
             return std::vector<BSONObj>();
         }
 
-        bool newRun(TransactionExperiment* txn, const string& dbname, BSONObj& jsobj, int, string& errmsg, BSONObjBuilder& result, bool fromRepl ) {
+        bool run(TransactionExperiment* txn, const string& dbname, BSONObj& jsobj, int, string& errmsg, BSONObjBuilder& result, bool fromRepl ) {
             // calls renamecollection which does a global lock, so we must too:
             //
             Lock::GlobalWrite globalWriteLock;

diff --git a/src/mongo/db/commands/compact.cpp b/src/mongo/db/commands/compact.cpp
@@ -83,7 +83,7 @@ namespace mongo {
             return IndexBuilder::killMatchingIndexBuilds(db->getCollection(ns), criteria);
         }
 
-        virtual bool newRun(TransactionExperiment* txn, const string& db, BSONObj& cmdObj, int, string& errmsg, BSONObjBuilder& result, bool fromRepl) {
+        virtual bool run(TransactionExperiment* txn, const string& db, BSONObj& cmdObj, int, string& errmsg, BSONObjBuilder& result, bool fromRepl) {
             string coll = cmdObj.firstElement().valuestr();
             if( coll.empty() || db.empty() ) {
                 errmsg = "no collection name specified";

diff --git a/src/mongo/db/commands/connection_status.cpp b/src/mongo/db/commands/connection_status.cpp
@@ -46,7 +46,7 @@ namespace mongo {
             h << "Returns connection-specific information such as logged-in users";
         }
 
-        bool run(const string&, BSONObj& cmdObj, int, string& errmsg,
+        bool run(TransactionExperiment* txn, const string&, BSONObj& cmdObj, int, string& errmsg,
                  BSONObjBuilder& result, bool fromRepl) {
             AuthorizationSession* authSession =
                     ClientBasic::getCurrent()->getAuthorizationSession();

diff --git a/src/mongo/db/commands/create_indexes.cpp b/src/mongo/db/commands/create_indexes.cpp
@@ -70,7 +70,7 @@ namespace mongo {
             return b.obj();
         }
 
-        virtual bool newRun(TransactionExperiment* txn,  const string& dbname, BSONObj& cmdObj, int options,
+        virtual bool run(TransactionExperiment* txn,  const string& dbname, BSONObj& cmdObj, int options,
                           string& errmsg, BSONObjBuilder& result,
                           bool fromRepl = false ) {
 

diff --git a/src/mongo/db/commands/dbhash.cpp b/src/mongo/db/commands/dbhash.cpp
@@ -125,7 +125,7 @@ namespace mongo {
         return hash;
     }
 
-    bool DBHashCmd::run(const string& dbname , BSONObj& cmdObj, int, string& errmsg, BSONObjBuilder& result, bool) {
+    bool DBHashCmd::run(TransactionExperiment* txn, const string& dbname , BSONObj& cmdObj, int, string& errmsg, BSONObjBuilder& result, bool) {
         Timer timer;
 
         set<string> desiredCollections;

diff --git a/src/mongo/db/commands/dbhash.h b/src/mongo/db/commands/dbhash.h
@@ -46,7 +46,7 @@ namespace mongo {
                                            const BSONObj& cmdObj,
                                            std::vector<Privilege>* out);
 
-        virtual bool run(const string& dbname , BSONObj& cmdObj, int, string& errmsg, BSONObjBuilder& result, bool);
+        virtual bool run(TransactionExperiment* txn, const string& dbname , BSONObj& cmdObj, int, string& errmsg, BSONObjBuilder& result, bool);
 
         void wipeCacheForCollection( const StringData& ns );
 

diff --git a/src/mongo/db/commands/distinct.cpp b/src/mongo/db/commands/distinct.cpp
@@ -68,7 +68,7 @@ namespace mongo {
             help << "{ distinct : 'collection name' , key : 'a.b' , query : {} }";
         }
 
-        bool run(const string& dbname, BSONObj& cmdObj, int, string& errmsg, BSONObjBuilder& result,
+        bool run(TransactionExperiment* txn, const string& dbname, BSONObj& cmdObj, int, string& errmsg, BSONObjBuilder& result,
                  bool fromRepl ) {
 
             Timer t;

diff --git a/src/mongo/db/commands/drop_indexes.cpp b/src/mongo/db/commands/drop_indexes.cpp
@@ -92,7 +92,7 @@ namespace mongo {
         }
 
         CmdDropIndexes() : Command("dropIndexes", false, "deleteIndexes") { }
-        bool newRun(TransactionExperiment* txn, const string& dbname, BSONObj& jsobj, int, string& errmsg, BSONObjBuilder& anObjBuilder, bool fromRepl) {
+        bool run(TransactionExperiment* txn, const string& dbname, BSONObj& jsobj, int, string& errmsg, BSONObjBuilder& anObjBuilder, bool fromRepl) {
             Lock::DBWrite dbXLock(dbname);
             bool ok = wrappedRun(txn, dbname, jsobj, errmsg, anObjBuilder);
             if (ok && !fromRepl)
@@ -212,7 +212,7 @@ namespace mongo {
             return IndexBuilder::killMatchingIndexBuilds(db->getCollection(ns), criteria);
         }
 
-        bool newRun(TransactionExperiment* txn, const string& dbname , BSONObj& jsobj, int, string& errmsg, BSONObjBuilder& result, bool /*fromRepl*/) {
+        bool run(TransactionExperiment* txn, const string& dbname , BSONObj& jsobj, int, string& errmsg, BSONObjBuilder& result, bool /*fromRepl*/) {
             static DBDirectClient db;
 
             BSONElement e = jsobj.firstElement();

diff --git a/src/mongo/db/commands/fail_point_cmd.cpp b/src/mongo/db/commands/fail_point_cmd.cpp
@@ -81,7 +81,7 @@ namespace mongo {
             h << "modifies the settings of a fail point";
         }
 
-        bool run(const string& dbname,
+        bool run(TransactionExperiment* txn, const string& dbname,
                 BSONObj& cmdObj,
                 int,
                 string& errmsg,

diff --git a/src/mongo/db/commands/find_and_modify.cpp b/src/mongo/db/commands/find_and_modify.cpp
@@ -297,7 +297,7 @@ namespace mongo {
             return true;
         }
 
-        virtual bool newRun(TransactionExperiment* txn, const string& dbname, BSONObj& cmdObj, int x, string& errmsg, BSONObjBuilder& result, bool y) {
+        virtual bool run(TransactionExperiment* txn, const string& dbname, BSONObj& cmdObj, int x, string& errmsg, BSONObjBuilder& result, bool y) {
             DBDirectClient db(txn);
 
             if (cmdObj["sort"].eoo()) {

diff --git a/src/mongo/db/commands/fsync.cpp b/src/mongo/db/commands/fsync.cpp
@@ -92,7 +92,7 @@ namespace mongo {
             actions.addAction(ActionType::fsync);
             out->push_back(Privilege(ResourcePattern::forClusterResource(), actions));
         }
-        virtual bool run(const string& dbname, BSONObj& cmdObj, int, string& errmsg, BSONObjBuilder& result, bool fromRepl) {
+        virtual bool run(TransactionExperiment* txn, const string& dbname, BSONObj& cmdObj, int, string& errmsg, BSONObjBuilder& result, bool fromRepl) {
 
             if (Lock::isLocked()) {
                 errmsg = "fsync: Cannot execute fsync command from contexts that hold a data lock";

diff --git a/src/mongo/db/commands/geonear.cpp b/src/mongo/db/commands/geonear.cpp
@@ -68,7 +68,7 @@ namespace mongo {
             out->push_back(Privilege(parseResourcePattern(dbname, cmdObj), actions));
         }
 
-        bool run(const string& dbname, BSONObj& cmdObj, int, string& errmsg, BSONObjBuilder& result, bool fromRepl) {
+        bool run(TransactionExperiment* txn, const string& dbname, BSONObj& cmdObj, int, string& errmsg, BSONObjBuilder& result, bool fromRepl) {
             const string ns = dbname + "." + cmdObj.firstElement().valuestr();
 
             if (!cmdObj["start"].eoo()) {

diff --git a/src/mongo/db/commands/get_last_error.cpp b/src/mongo/db/commands/get_last_error.cpp
@@ -57,7 +57,7 @@ namespace mongo {
             help << "reset error state (used with getpreverror)";
         }
         CmdResetError() : Command("resetError", false, "reseterror") {}
-        bool run(const string& db, BSONObj& cmdObj, int, string& errmsg, BSONObjBuilder& result, bool fromRepl) {
+        bool run(TransactionExperiment* txn, const string& db, BSONObj& cmdObj, int, string& errmsg, BSONObjBuilder& result, bool fromRepl) {
             LastError *le = lastError.get();
             verify( le );
             le->reset();
@@ -91,7 +91,7 @@ namespace mongo {
                  << "  { wtimeout:m} - timeout for w in m milliseconds";
         }
 
-        bool run( const string& dbname,
+        bool run(TransactionExperiment* txn, const string& dbname,
                   BSONObj& cmdObj,
                   int,
                   string& errmsg,
@@ -262,7 +262,7 @@ namespace mongo {
                                            const BSONObj& cmdObj,
                                            std::vector<Privilege>* out) {} // No auth required
         CmdGetPrevError() : Command("getPrevError", false, "getpreverror") {}
-        bool run(const string& dbname, BSONObj& cmdObj, int, string& errmsg, BSONObjBuilder& result, bool fromRepl) {
+        bool run(TransactionExperiment* txn, const string& dbname, BSONObj& cmdObj, int, string& errmsg, BSONObjBuilder& result, bool fromRepl) {
             LastError *le = lastError.disableForCommand();
             le->appendSelf( result );
             if ( le->valid )

diff --git a/src/mongo/db/commands/group.cpp b/src/mongo/db/commands/group.cpp
@@ -202,7 +202,7 @@ namespace mongo {
             return true;
         }
 
-        bool run(const string& dbname, BSONObj& jsobj, int, string& errmsg, BSONObjBuilder& result, bool fromRepl ) {
+        bool run(TransactionExperiment* txn, const string& dbname, BSONObj& jsobj, int, string& errmsg, BSONObjBuilder& result, bool fromRepl ) {
 
             if ( !globalScriptEngine ) {
                 errmsg = "server-side JavaScript execution is disabled";

diff --git a/src/mongo/db/commands/hashcmd.cpp b/src/mongo/db/commands/hashcmd.cpp
@@ -72,7 +72,7 @@ namespace mongo {
          *>  "out" : NumberLong(6271151123721111923),
          *>  "ok" : 1 }
          **/
-        bool run( const string& db,
+        bool run(TransactionExperiment* txn, const string& db,
                   BSONObj& cmdObj,
                   int options, string& errmsg,
                   BSONObjBuilder& result,

diff --git a/src/mongo/db/commands/index_filter_commands.cpp b/src/mongo/db/commands/index_filter_commands.cpp
@@ -120,7 +120,7 @@ namespace mongo {
         : Command(name),
           helpText(helpText) { }
 
-    bool IndexFilterCommand::run(const string& dbname, BSONObj& cmdObj, int options,
+    bool IndexFilterCommand::run(TransactionExperiment* txn, const string& dbname, BSONObj& cmdObj, int options,
                            string& errmsg, BSONObjBuilder& result, bool fromRepl) {
         string ns = parseNs(dbname, cmdObj);
 

diff --git a/src/mongo/db/commands/index_filter_commands.h b/src/mongo/db/commands/index_filter_commands.h
@@ -63,7 +63,7 @@ namespace mongo {
          * implement plan cache command functionality.
          */
 
-        bool run(const std::string& dbname, BSONObj& cmdObj, int options,
+        bool run(TransactionExperiment* txn, const std::string& dbname, BSONObj& cmdObj, int options,
                  std::string& errmsg, BSONObjBuilder& result, bool fromRepl);
 
         virtual bool isWriteCommandForConfigServer() const;