formatting

1 files changed, 190 insertions, 186 deletions

diff --git a/tools/tool.cpp b/tools/tool.cpp
index 9162045b688..2e0cc6cd418 100644
--- a/tools/tool.cpp
+++ b/tools/tool.cpp
@@ -30,238 +30,242 @@ using namespace mongo;
 
 namespace po = boost::program_options;
 
-mongo::Tool::Tool( string name , bool localDBAllowed , string defaultDB , string defaultCollection ) :
-    _name( name ) , _db( defaultDB ) , _coll( defaultCollection ) , _conn(0), _paired(false) {
+namespace mongo {
+
+    Tool::Tool( string name , bool localDBAllowed , string defaultDB , string defaultCollection ) :
+        _name( name ) , _db( defaultDB ) , _coll( defaultCollection ) , _conn(0), _paired(false) {
     
-    _options = new po::options_description( "options" );
-    _options->add_options()
-        ("help","produce help message")
-        ("verbose,v", "be more verbose (include multiple times for more verbosity e.g. -vvvvv)")
-        ("host,h",po::value<string>(), "mongo host to connect to (\"left,right\" for pairs)" )
-        ("db,d",po::value<string>(), "database to use" )
-        ("collection,c",po::value<string>(), "collection to use (some commands)" )
-        ("username,u",po::value<string>(), "username" )
-        ("password,p",po::value<string>(), "password" )
-        ;
-    if ( localDBAllowed )
+        _options = new po::options_description( "options" );
         _options->add_options()
-            ("dbpath",po::value<string>(), "directly access mongod data files in this path, instead of connecting to a mongod instance" )
-            ("directoryperdb", "if dbpath specified, each db is in a separate directory" )
-        ;
-
-    _hidden_options = new po::options_description( name + " hidden options" );
-
-    /* support for -vv -vvvv etc. */
-    for (string s = "vv"; s.length() <= 10; s.append("v")) {
-        _hidden_options->add_options()(s.c_str(), "verbose");
+            ("help","produce help message")
+            ("verbose,v", "be more verbose (include multiple times for more verbosity e.g. -vvvvv)")
+            ("host,h",po::value<string>(), "mongo host to connect to (\"left,right\" for pairs)" )
+            ("db,d",po::value<string>(), "database to use" )
+            ("collection,c",po::value<string>(), "collection to use (some commands)" )
+            ("username,u",po::value<string>(), "username" )
+            ("password,p",po::value<string>(), "password" )
+            ;
+        if ( localDBAllowed )
+            _options->add_options()
+                ("dbpath",po::value<string>(), "directly access mongod data files in this path, instead of connecting to a mongod instance" )
+                ("directoryperdb", "if dbpath specified, each db is in a separate directory" )
+                ;
+
+        _hidden_options = new po::options_description( name + " hidden options" );
+
+        /* support for -vv -vvvv etc. */
+        for (string s = "vv"; s.length() <= 10; s.append("v")) {
+            _hidden_options->add_options()(s.c_str(), "verbose");
+        }
     }
-}
 
-mongo::Tool::~Tool(){
-    delete( _options );
-    delete( _hidden_options );
-    if ( _conn )
-        delete _conn;
-}
+    Tool::~Tool(){
+        delete( _options );
+        delete( _hidden_options );
+        if ( _conn )
+            delete _conn;
+    }
 
-void mongo::Tool::printExtraHelp( ostream & out ){
-}
+    void Tool::printExtraHelp( ostream & out ){
+    }
 
-void mongo::Tool::printHelp(ostream &out) {
-    printExtraHelp(out);
-    _options->print(out);
-}
+    void Tool::printHelp(ostream &out) {
+        printExtraHelp(out);
+        _options->print(out);
+    }
 
-int mongo::Tool::main( int argc , char ** argv ){
-    cmdLine.prealloc = false;
+    int Tool::main( int argc , char ** argv ){
+        cmdLine.prealloc = false;
 
-    boost::filesystem::path::default_name_check( boost::filesystem::no_check );
+        boost::filesystem::path::default_name_check( boost::filesystem::no_check );
 
-    _name = argv[0];
+        _name = argv[0];
 
-    /* using the same style as db.cpp */
-    int command_line_style = (((po::command_line_style::unix_style ^
-                                po::command_line_style::allow_guessing) |
-                               po::command_line_style::allow_long_disguise) ^
-                              po::command_line_style::allow_sticky);
-    try {
-        po::options_description all_options("all options");
-        all_options.add(*_options).add(*_hidden_options);
+        /* using the same style as db.cpp */
+        int command_line_style = (((po::command_line_style::unix_style ^
+                                    po::command_line_style::allow_guessing) |
+                                   po::command_line_style::allow_long_disguise) ^
+                                  po::command_line_style::allow_sticky);
+        try {
+            po::options_description all_options("all options");
+            all_options.add(*_options).add(*_hidden_options);
 
-        po::store( po::command_line_parser( argc , argv ).
-                   options(all_options).
-                   positional( _positonalOptions ).
-                   style(command_line_style).run() , _params );
+            po::store( po::command_line_parser( argc , argv ).
+                       options(all_options).
+                       positional( _positonalOptions ).
+                       style(command_line_style).run() , _params );
 
-        po::notify( _params );
-    } catch (po::error &e) {
-        cerr << "ERROR: " << e.what() << endl << endl;
-        printHelp(cerr);
-        return EXIT_BADOPTIONS;
-    }
+            po::notify( _params );
+        } catch (po::error &e) {
+            cerr << "ERROR: " << e.what() << endl << endl;
+            printHelp(cerr);
+            return EXIT_BADOPTIONS;
+        }
 
-    if ( _params.count( "help" ) ){
-        printHelp(cerr);
-        return 0;
-    }
+        if ( _params.count( "help" ) ){
+            printHelp(cerr);
+            return 0;
+        }
 
-    if ( _params.count( "verbose" ) ) {
-        logLevel = 1;
-    }
+        if ( _params.count( "verbose" ) ) {
+            logLevel = 1;
+        }
 
-    for (string s = "vv"; s.length() <= 10; s.append("v")) {
-        if (_params.count(s)) {
-            logLevel = s.length();
+        for (string s = "vv"; s.length() <= 10; s.append("v")) {
+            if (_params.count(s)) {
+                logLevel = s.length();
+            }
         }
-    }
 
-    bool useDirectClient = hasParam( "dbpath" );
+        bool useDirectClient = hasParam( "dbpath" );
 
-    if ( ! useDirectClient ) {
-        _host = "127.0.0.1";
-        if ( _params.count( "host" ) )
-            _host = _params["host"].as<string>();
+        if ( ! useDirectClient ) {
+            _host = "127.0.0.1";
+            if ( _params.count( "host" ) )
+                _host = _params["host"].as<string>();
 
-        if ( _host.find( "," ) == string::npos ){
-            DBClientConnection * c = new DBClientConnection();
-            _conn = c;
+            if ( _host.find( "," ) == string::npos ){
+                DBClientConnection * c = new DBClientConnection();
+                _conn = c;
 
-            string errmsg;
-            if ( ! c->connect( _host , errmsg ) ){
-                cerr << "couldn't connect to [" << _host << "] " << errmsg << endl;
-                return -1;
+                string errmsg;
+                if ( ! c->connect( _host , errmsg ) ){
+                    cerr << "couldn't connect to [" << _host << "] " << errmsg << endl;
+                    return -1;
+                }
+            }
+            else {
+                log(1) << "using pairing" << endl;
+                DBClientPaired * c = new DBClientPaired();
+                _paired = true;
+                _conn = c;
+
+                if ( ! c->connect( _host ) ){
+                    cerr << "couldn't connect to paired server: " << _host << endl;
+                    return -1;
+                }
             }
+
+            cerr << "connected to: " << _host << endl;
         }
         else {
-            log(1) << "using pairing" << endl;
-            DBClientPaired * c = new DBClientPaired();
-            _paired = true;
-            _conn = c;
-
-            if ( ! c->connect( _host ) ){
-                cerr << "couldn't connect to paired server: " << _host << endl;
-                return -1;
+            if ( _params.count( "directoryperdb" ) ) {
+                directoryperdb = true;
             }
+            Client::initThread("tools");
+            _conn = new DBDirectClient();
+            _host = "DIRECT";
+            static string myDbpath = getParam( "dbpath" );
+            dbpath = myDbpath.c_str();
+            acquirePathLock();
+            theFileAllocator().start();
         }
 
-        cerr << "connected to: " << _host << endl;
-    }
-    else {
-        if ( _params.count( "directoryperdb" ) ) {
-            directoryperdb = true;
-        }
-        Client::initThread("tools");
-        _conn = new DBDirectClient();
-        _host = "DIRECT";
-        static string myDbpath = getParam( "dbpath" );
-        mongo::dbpath = myDbpath.c_str();
-        mongo::acquirePathLock();
-        theFileAllocator().start();
-    }
-
-    if ( _params.count( "db" ) )
-        _db = _params["db"].as<string>();
+        if ( _params.count( "db" ) )
+            _db = _params["db"].as<string>();
 
-    if ( _params.count( "collection" ) )
-        _coll = _params["collection"].as<string>();
+        if ( _params.count( "collection" ) )
+            _coll = _params["collection"].as<string>();
 
-    if ( _params.count( "username" ) )
-        _username = _params["username"].as<string>();
+        if ( _params.count( "username" ) )
+            _username = _params["username"].as<string>();
 
-    if ( _params.count( "password" ) )
-        _password = _params["password"].as<string>();
+        if ( _params.count( "password" ) )
+            _password = _params["password"].as<string>();
 
-    int ret = -1;
-    try {
-        ret = run();
-    }
-    catch ( DBException& e ){
-        cerr << "assertion: " << e.toString() << endl;
-        ret = -1;
-    }
+        int ret = -1;
+        try {
+            ret = run();
+        }
+        catch ( DBException& e ){
+            cerr << "assertion: " << e.toString() << endl;
+            ret = -1;
+        }
     
-    if ( currentClient.get() )
-        currentClient->shutdown();
+        if ( currentClient.get() )
+            currentClient->shutdown();
 
-    if ( useDirectClient )
-        dbexit( EXIT_CLEAN );
-    return ret;
-}
+        if ( useDirectClient )
+            dbexit( EXIT_CLEAN );
+        return ret;
+    }
 
-mongo::DBClientBase& mongo::Tool::conn( bool slaveIfPaired ){
-    if ( _paired && slaveIfPaired )
-        return ((DBClientPaired*)_conn)->slaveConn();
-    return *_conn;
-}
+    DBClientBase& Tool::conn( bool slaveIfPaired ){
+        if ( _paired && slaveIfPaired )
+            return ((DBClientPaired*)_conn)->slaveConn();
+        return *_conn;
+    }
 
-void mongo::Tool::addFieldOptions(){
-    add_options()
-        ("fields,f" , po::value<string>() , "comma seperated list of field names e.g. -f name,age" )
-        ("fieldFile" , po::value<string>() , "file with fields names - 1 per line" )
-        ;
-}
+    void Tool::addFieldOptions(){
+        add_options()
+            ("fields,f" , po::value<string>() , "comma seperated list of field names e.g. -f name,age" )
+            ("fieldFile" , po::value<string>() , "file with fields names - 1 per line" )
+            ;
+    }
 
-void mongo::Tool::needFields(){
+    void Tool::needFields(){
 
-    if ( hasParam( "fields" ) ){
-        BSONObjBuilder b;
+        if ( hasParam( "fields" ) ){
+            BSONObjBuilder b;
         
-        string fields_arg = getParam("fields");
-        pcrecpp::StringPiece input(fields_arg);
+            string fields_arg = getParam("fields");
+            pcrecpp::StringPiece input(fields_arg);
         
-        string f;
-        pcrecpp::RE re("([\\w\\.]+),?" );
-        while ( re.Consume( &input, &f ) ){
-            _fields.push_back( f );
-            b.append( f.c_str() , 1 );
-        }
+            string f;
+            pcrecpp::RE re("([\\w\\.]+),?" );
+            while ( re.Consume( &input, &f ) ){
+                _fields.push_back( f );
+                b.append( f.c_str() , 1 );
+            }
         
-        _fieldsObj = b.obj();
-        return;
-    }
+            _fieldsObj = b.obj();
+            return;
+        }
 
-    if ( hasParam( "fieldFile" ) ){
-        string fn = getParam( "fieldFile" );
-        if ( ! exists( fn ) )
-            throw UserException( 9999 , ((string)"file: " + fn ) + " doesn't exist" );
-
-        const int BUF_SIZE = 1024;
-        char line[ 1024 + 128];
-        ifstream file( fn.c_str() );
-
-        BSONObjBuilder b;
-        while ( file.rdstate() == ios_base::goodbit ){
-            file.getline( line , BUF_SIZE );
-            const char * cur = line;
-            while ( isspace( cur[0] ) ) cur++;
-            if ( strlen( cur ) == 0 )
-                continue;
-
-            _fields.push_back( cur );
-            b.append( cur , 1 );
+        if ( hasParam( "fieldFile" ) ){
+            string fn = getParam( "fieldFile" );
+            if ( ! exists( fn ) )
+                throw UserException( 9999 , ((string)"file: " + fn ) + " doesn't exist" );
+
+            const int BUF_SIZE = 1024;
+            char line[ 1024 + 128];
+            ifstream file( fn.c_str() );
+
+            BSONObjBuilder b;
+            while ( file.rdstate() == ios_base::goodbit ){
+                file.getline( line , BUF_SIZE );
+                const char * cur = line;
+                while ( isspace( cur[0] ) ) cur++;
+                if ( strlen( cur ) == 0 )
+                    continue;
+
+                _fields.push_back( cur );
+                b.append( cur , 1 );
+            }
+            _fieldsObj = b.obj();
+            return;
         }
-        _fieldsObj = b.obj();
-        return;
+
+        throw UserException( 9998 , "you need to specify fields" );
     }
 
-    throw UserException( 9998 , "you need to specify fields" );
-}
+    void Tool::auth( string dbname ){
+        if ( ! dbname.size() )
+            dbname = _db;
 
-void mongo::Tool::auth( string dbname ){
-    if ( ! dbname.size() )
-        dbname = _db;
+        if ( ! ( _username.size() || _password.size() ) )
+            return;
 
-    if ( ! ( _username.size() || _password.size() ) )
-        return;
+        string errmsg;
+        if ( _conn->auth( dbname , _username , _password , errmsg ) )
+            return;
 
-    string errmsg;
-    if ( _conn->auth( dbname , _username , _password , errmsg ) )
-        return;
+        // try against the admin db
+        string err2;
+        if ( _conn->auth( "admin" , _username , _password , errmsg ) )
+            return;
 
-    // try against the admin db
-    string err2;
-    if ( _conn->auth( "admin" , _username , _password , errmsg ) )
-        return;
+        throw UserException( 9997 , (string)"auth failed: " + errmsg );
+    }
 
-    throw mongo::UserException( 9997 , (string)"auth failed: " + errmsg );
 }